Merge branch 'reactify-admin/markDownSettings' into rewritte-swagger

src/client/js/components/Admin/MarkdownSetting/PresentationForm.jsx

@@ -9,7 +9,7 @@ import { toastSuccess, toastError } from '../../../util/apiNotification';
 import AppContainer from '../../../services/AppContainer';
 import MarkDownSettingContainer from '../../../services/MarkDownSettingContainer';
 
-const logger = loggerFactory('growi:importer');
+const logger = loggerFactory('growi:markdown:presentation');
 
 class PresentationForm extends React.Component {
 
@@ -88,7 +88,7 @@ class PresentationForm extends React.Component {
               <input
                 className="form-control"
                 value={pageBreakCustomSeparator}
-                onChange={(e) => { markDownSettingContainer.setState({ pageBreakCustomSeparator: e.target.value }) }}
+                onChange={(e) => { markDownSettingContainer.setPageBreakCustomSeparator(e.target.value) }}
               />
             </div>
           </label>

src/client/js/services/MarkDownSettingContainer.js

@@ -41,6 +41,13 @@ export default class MarkDownSettingContainer extends Container {
     this.setState({ pageBreakSeparator });
   }
 
+  /**
+   * Set PageBreakCustomSeparator
+   */
+  setPageBreakCustomSeparator(pageBreakCustomSeparator) {
+    this.setState({ pageBreakCustomSeparator });
+  }
+
   /**
    * Switch enableXss
    */
@@ -89,6 +96,10 @@ export default class MarkDownSettingContainer extends Container {
       pageBreakCustomSeparator: this.state.pageBreakCustomSeparator,
     });
 
+    this.setState({
+      pageBreakSeparator: response.data.presentationParams.pageBreakSeparator,
+      pageBreakCustomSeparator: response.data.presentationParams.pageBreakCustomSeparator,
+    });
     return response;
   }
 

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

@@ -116,13 +116,17 @@ module.exports = (crowi) => {
       return res.apiv3Err(new ErrorV3('customRegularExpression is required'));
     }
 
-    const presentationParams = {
+    const requestPresentationParams = {
       'markdown:presentation:pageBreakSeparator': req.body.pageBreakSeparator,
       'markdown:presentation:pageBreakCustomSeparator': req.body.pageBreakCustomSeparator,
     };
 
     try {
-      await crowi.configManager.updateConfigsInTheSameNamespace('markdown', presentationParams);
+      await crowi.configManager.updateConfigsInTheSameNamespace('markdown', requestPresentationParams);
+      const presentationParams = {
+        pageBreakSeparator: await crowi.configManager.getConfig('markdown', 'markdown:presentation:pageBreakSeparator'),
+        pageBreakCustomSeparator: await crowi.configManager.getConfig('markdown', 'markdown:presentation:pageBreakCustomSeparator') || '',
+      };
       return res.apiv3({ presentationParams });
     }
     catch (err) {