Merge branch 'master' into feat/duplicate-with-subordinate-page

CHANGES.md

@@ -9,6 +9,7 @@
 
 ### Updates
 
+* Feature: File Upload Settings on admin pages
 * Improvement: Basic layout of page
 * Support: Support MongoDB 4.0, 4.2 and 4.4
 * Support: Upgrade libs

src/client/js/components/Page/CopyDropdown.jsx

@@ -41,7 +41,7 @@ const CopyDropdown = (props) => {
    * functions to construct labels and URLs
    */
   const getUriParams = useCallback(() => {
-    if (!isParamsAppended) {
+    if (!isParamsAppended || !dropdownOpen) {
       return '';
     }
 
@@ -50,7 +50,7 @@ const CopyDropdown = (props) => {
     } = window.location;
 
     return `${search}${hash}`;
-  }, [isParamsAppended]);
+  }, [isParamsAppended, dropdownOpen]);
 
   const pagePathWithParams = useMemo(() => {
     const { pagePath } = props;

src/server/routes/apiv3/customize-setting.js

@@ -88,14 +88,10 @@ module.exports = (crowi) => {
 
   const validator = {
     themeAssetPath: [
-      query('themeName').isString().isIn([
-        'default', 'nature', 'mono-blue', 'wood', 'island', 'christmas', 'antarctic', 'future', 'halloween', 'spring',
-      ]),
+      query('themeName').isString(),
     ],
     theme: [
-      body('themeType').isString().isIn([
-        'default', 'nature', 'mono-blue', 'wood', 'island', 'christmas', 'antarctic', 'future', 'halloween', 'spring', 'kibela',
-      ]),
+      body('themeType').isString(),
     ],
     function: [
       body('isEnabledTimeline').isBoolean(),