read page.extended.slack

lib/routes/page.js

@@ -271,15 +271,6 @@ module.exports = function(crowi, app) {
         return res.redirect(encodeURI(page.redirectTo + '?redirectFrom=' + pagePathUtil.encodePagePath(page.path)));
       }
 
-      let slackChannels = '';
-      UpdatePost.findSettingsByPath(path)
-      .then(function(data) {
-        slackChannels = data[0].channel;
-        page.updateSlackChannel(slackChannels).then(function() {}).catch(function() {});
-      }).catch(function(err) {
-        debug('Error occured while get setting', err);
-      });
-
       renderVars.page = page;
 
       if (page) {

resource/js/app.js

@@ -47,11 +47,13 @@ let pagePath;
 let pageContent = '';
 let markdown = '';
 let pageGrant = null;
+let slackChannels = '';
 if (mainContent !== null) {
   pageId = mainContent.getAttribute('data-page-id');
   pageRevisionId = mainContent.getAttribute('data-page-revision-id');
   pageRevisionCreatedAt = +mainContent.getAttribute('data-page-revision-created');
   pagePath = mainContent.attributes['data-path'].value;
+  slackChannels = mainContent.getAttribute('data-slack-channels');
   const rawText = document.getElementById('raw-text-original');
   if (rawText) {
     pageContent = rawText.innerHTML;
@@ -175,7 +177,14 @@ if (writeCommentElem) {
     }
   };
   ReactDOM.render(
-    <CommentForm crowi={crowi} crowiOriginRenderer={crowiRenderer} pageId={pageId} revisionId={pageRevisionId} pagePath={pagePath} onPostComplete={postCompleteHandler} editorOptions={editorOptions}/>,
+    <CommentForm crowi={crowi}
+      crowiOriginRenderer={crowiRenderer}
+      pageId={pageId}
+      revisionId={pageRevisionId}
+      pagePath={pagePath}
+      onPostComplete={postCompleteHandler}
+      editorOptions={editorOptions}
+      slackChannels = {slackChannels}/>,
     writeCommentElem);
 }
 

resource/js/components/PageComment/CommentForm.js

@@ -42,7 +42,7 @@ export default class CommentForm extends React.Component {
       errorMessage: undefined,
       hasSlackConfig: config.hasSlackConfig,
       isNotification: false,
-      notifSlackChannel: '',
+      slackChannels: this.props.slackChannels,
     };
 
     this.growiRenderer = new GrowiRenderer(this.props.crowi, this.props.crowiOriginRenderer, {mode: 'comment'});
@@ -65,7 +65,7 @@ export default class CommentForm extends React.Component {
   updateStateCheckbox(event) {
     const value = event.target.checked;
     this.setState({isMarkdown: value});
-      // changeMode
+    // changeMode
     this.refs.editor.setGfmMode(value);
   }
 
@@ -79,7 +79,7 @@ export default class CommentForm extends React.Component {
   }
 
   onChannelChange(value) {
-    this.setState({notifSlackChannel: value});
+    this.setState({slackChannels: value});
   }
 
   /**
@@ -100,7 +100,7 @@ export default class CommentForm extends React.Component {
       },
       slackNotificationForm: {
         isNotification: this.state.isNotification,
-        notifSlackChannel: this.state.notifSlackChannel,
+        slackChannels: this.state.slackChannels,
       }
     })
     .then((res) => {
@@ -273,6 +273,7 @@ export default class CommentForm extends React.Component {
                       pagePath={this.props.pagePath}
                       onSlackOnChange={this.onSlackOnChange}
                       onChannelChange={this.onChannelChange}
+                      slackChannels={this.state.slackChannels}
                     />
                   }
                   <Button type="submit" value="Submit" bsStyle="primary" className="fcbtn btn btn-sm btn-primary btn-outline btn-rounded btn-1b">
@@ -298,6 +299,7 @@ CommentForm.propTypes = {
   revisionId: PropTypes.string,
   pagePath: PropTypes.string,
   editorOptions: PropTypes.object,
+  slackChannels: PropTypes.string,
 };
 CommentForm.defaultProps = {
   editorOptions: {},

resource/js/components/SlackNotification.js

@@ -17,46 +17,22 @@ export default class SlackNotification extends React.Component {
 
     this.state = {
       isNotification: false,
-      notifSlackChannel: '',
+      slackChannels: this.props.slackChannels,
     };
 
-    this.init = this.init.bind(this);
     this.updateState = this.updateState.bind(this);
     this.updateStateCheckbox = this.updateStateCheckbox.bind(this);
   }
 
-  componentWillMount() {
-    const pageId = this.props.pageId;
-
-    if (pageId) {
-      this.init();
-    }
-
-    this.retrieveData = this.retrieveData.bind(this);
-  }
-
-  init() {
-    if (!this.props.pageId) {
-      return ;
-    }
-    this.retrieveData();
-  }
-
-  /**
-   * Load data of comments and store them in state
-   */
-  retrieveData() {
-    // get data (desc order array)
-    this.props.crowi.apiGet('/pages.updatePost', {path: this.props.pagePath})
-    .then(res => {
-      if (res.ok) {
-        this.setState({notifSlackChannel: res.updatePost.join(',')});
-      }
+  componentWillReceiveProps(nextProps) {
+    this.setState({
+      slackChannels: nextProps.slackChannels
     });
+    console.log('next props');
   }
 
   updateState(value) {
-    this.setState({notifSlackChannel: value});
+    this.setState({slackChannels: value});
     this.props.onChannelChange(value);
   }
 
@@ -75,7 +51,7 @@ export default class SlackNotification extends React.Component {
             <img id="slack-mark-black" src="/images/icons/slack/mark-monochrome_black.svg" width="18" height="18"/>
             <input className="comment-form-slack" type="checkbox" name="slack" value="1" onChange={this.updateStateCheckbox}/>
           </label>
-          <input className="form-control" type="text" value={this.state.notifSlackChannel} placeholder="slack-channel-name"
+          <input className="form-control" type="text" value={this.state.slackChannels} placeholder="slack-channel-name"
             id="comment-form-slack-channel"
             data-toggle="popover"
             title="Slack通知"
@@ -98,4 +74,5 @@ SlackNotification.propTypes = {
   pagePath: PropTypes.string,
   onChannelChange: PropTypes.func.isRequired,
   onSlackOnChange: PropTypes.func.isRequired,
+  slackChannels: PropTypes.string,
 };