rename key

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

@@ -33,7 +33,7 @@ class PresentationForm extends React.Component {
 
   render() {
     const { t, markDownSettingContainer } = this.props;
-    const { pageBreakOption, customRegularExpression } = markDownSettingContainer.state;
+    const { pageBreakSeparator, pageBreakCustomSeparator } = markDownSettingContainer.state;
 
     return (
       <fieldset className="form-group row my-2">
@@ -46,8 +46,8 @@ class PresentationForm extends React.Component {
           <input
             type="radio"
             id="pageBreakOption1"
-            checked={pageBreakOption === 1}
-            onChange={() => { markDownSettingContainer.setState({ pageBreakOption: 1 }) }}
+            checked={pageBreakSeparator === 1}
+            onChange={() => { markDownSettingContainer.setState({ pageBreakSeparator: 1 }) }}
           />
           <label htmlFor="pageBreakOption1">
             <p className="font-weight-bold">{ t('markdown_setting.Preset one separator') }</p>
@@ -62,8 +62,8 @@ class PresentationForm extends React.Component {
           <input
             type="radio"
             id="pageBreakOption2"
-            checked={pageBreakOption === 2}
-            onChange={() => { markDownSettingContainer.setState({ pageBreakOption: 2 }) }}
+            checked={pageBreakSeparator === 2}
+            onChange={() => { markDownSettingContainer.setState({ pageBreakSeparator: 2 }) }}
           />
           <label htmlFor="pageBreakOption2">
             <p className="font-weight-bold">{ t('markdown_setting.Preset two separator') }</p>
@@ -78,8 +78,8 @@ class PresentationForm extends React.Component {
           <input
             type="radio"
             id="pageBreakOption3"
-            checked={pageBreakOption === 3}
-            onChange={() => { markDownSettingContainer.setState({ pageBreakOption: 3 }) }}
+            checked={pageBreakSeparator === 3}
+            onChange={() => { markDownSettingContainer.setState({ pageBreakSeparator: 3 }) }}
           />
           <label htmlFor="pageBreakOption3">
             <p className="font-weight-bold">{ t('markdown_setting.Custom separator') }</p>
@@ -87,8 +87,8 @@ class PresentationForm extends React.Component {
               { t('markdown_setting.Custom separator desc') }
               <input
                 className="form-control"
-                value={customRegularExpression}
-                onChange={(e) => { markDownSettingContainer.setState({ customRegularExpression: e.target.value }) }}
+                value={pageBreakCustomSeparator}
+                onChange={(e) => { markDownSettingContainer.setState({ pageBreakCustomSeparator: e.target.value }) }}
               />
             </div>
           </label>

src/client/js/services/MarkDownSettingContainer.js

@@ -12,8 +12,8 @@ export default class MarkDownSettingContainer extends Container {
     this.appContainer = appContainer;
 
     this.state = {
-      pageBreakOption: appContainer.config.pageBreakOption,
-      customRegularExpression: appContainer.config.customRegularExpression || '',
+      pageBreakSeparator: appContainer.config.pageBreakSeparator,
+      pageBreakCustomSeparator: appContainer.config.pageBreakCustomSeparator || '',
       isEnabledXss: (appContainer.config.xssOption != null),
       xssOption: appContainer.config.xssOption,
       tagWhiteList: appContainer.config.tagWhiteList || '',
@@ -61,8 +61,8 @@ export default class MarkDownSettingContainer extends Container {
   async updatePresentationSetting() {
 
     const response = await this.appContainer.apiv3.put('/markdown-setting/presentation', {
-      pageBreakOption: this.state.pageBreakOption,
-      customRegularExpression: this.state.customRegularExpression,
+      pageBreakSeparator: this.state.pageBreakSeparator,
+      pageBreakCustomSeparator: this.state.pageBreakCustomSeparator,
     });
 
     return response;

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

@@ -30,7 +30,7 @@ module.exports = (crowi) => {
   const { ApiV3FormValidator } = crowi.middlewares;
 
   validator.presentationSetting = [
-    body('pageBreakOption').isInt().not().isEmpty(),
+    body('pageBreakSeparator').isInt().not().isEmpty(),
   ];
 
   /**
@@ -64,12 +64,13 @@ module.exports = (crowi) => {
    *                      description: new presentation params
    */
   router.put('/presentation', loginRequiredStrictly, adminRequired, csrf, validator.presentationSetting, ApiV3FormValidator, async(req, res) => {
-    if (req.body.pageBreakOption === 3 && req.body.customRegularExpression === '') {
+    if (req.body.pageBreakSeparator === 3 && req.body.pageBreakCustomSeparator === '') {
       return res.apiv3Err(new ErrorV3('customRegularExpression is required'));
     }
 
     const presentationParams = {
-      'markdown:presentation:pageBreakOption': req.body.pageBreakOption,
+      'markdown:presentation:pageBreakSeparator': req.body.pageBreakSeparator,
+      'markdown:presentation:pageBreakCustomSeparator': req.body.pageBreakCustomSeparator,
     };
 
     try {