Revert "logger and deleted server side code for slack channels"

This reverts commit 0263e97a59412a466fd2c963e2f5f3645e3ee561.

lib/routes/comment.js

@@ -6,7 +6,7 @@ module.exports = function(crowi, app) {
     , User = crowi.model('User')
     , Page = crowi.model('Page')
     , ApiResponse = require('../util/apiResponse')
-    , logger = require('@alias/logger')('growi:routes:comment')
+    , slack = require('../util/slack')
     , actions = {}
     , api = {};
 
@@ -93,7 +93,7 @@ module.exports = function(crowi, app) {
         });
       }
       catch (err) {
-        logger.error('error occured in sending slack notification: ', err);
+        console.log('error occured in sending slack notification: ', err);
       }
     }
 

lib/routes/page.js

@@ -10,6 +10,7 @@ module.exports = function(crowi, app) {
     , Bookmark = crowi.model('Bookmark')
     , UserGroupRelation = crowi.model('UserGroupRelation')
     , PageGroupRelation = crowi.model('PageGroupRelation')
+    , UpdatePost = crowi.model('UpdatePost')
     , ApiResponse = require('../util/apiResponse')
     , interceptorManager = crowi.getInterceptorManager()
     , pagePathUtil = require('../util/pagePathUtil')
@@ -289,6 +290,20 @@ module.exports = function(crowi, app) {
             renderVars.pageRelatedGroup = pageGroupRelation.relatedGroup;
           }
         })
+        .then(() => {
+          if (page.extended.slack) {
+            renderVars.slack = page.extended.slack;
+            return;
+          }
+          else {
+            return UpdatePost.findSettingsByPath(page.path)
+            .then(function(data) {
+              renderVars.slack = data.map(e => e.channel).join(', ');
+            }).catch(function(err) {
+              debug('Error occured in getting slack channels', err);
+            });
+          }
+        })
         .then(function() {
           var userPage = isUserPage(page.path);
           var userData = null;
@@ -475,6 +490,7 @@ module.exports = function(crowi, app) {
       page: pageData,
       revision: pageData.revision || {},
       author: pageData.revision.author || false,
+      slack: '',
     };
     var userPage = isUserPage(pageData.path);
     var userData = null;
@@ -491,6 +507,20 @@ module.exports = function(crowi, app) {
         renderVars.pageRelatedGroup = pageGroupRelation.relatedGroup;
       }
     })
+    .then(() => {
+      if (pageData.extended.slack) {
+        renderVars.slack = pageData.extended.slack;
+        return;
+      }
+      else {
+        return UpdatePost.findSettingsByPath(pageData.path)
+        .then(function(data) {
+          renderVars.slack = data.map(e => e.channel).join(', ');
+        }).catch(function(err) {
+          debug('Error occured in getting slack channels', err);
+        });
+      }
+    })
     .then(function() {
       if (userPage) {
         return User.findUserByUsername(User.getUsernameByPath(pageData.path))

lib/views/_form.html

@@ -35,7 +35,7 @@
           <img id="slack-mark-black" src="/images/icons/slack/mark-monochrome_black.svg" width="18" height="18">
           <input class="" type="checkbox" name="pageForm[notify][slack][on]" value="1">
         </label>
-        <input class="form-control" type="text" name="pageForm[notify][slack][channel]" value="slack channel coming from react" placeholder="slack-channel-name"
+        <input class="form-control" type="text" name="pageForm[notify][slack][channel]" value="{{ slack|default('') }}" placeholder="slack-channel-name"
           id="page-form-slack-channel"
           data-toggle="popover"
           title="Slack通知"

lib/views/widget/page_content.html

@@ -6,6 +6,7 @@
   data-page-revision-id="{% if revision %}{{ revision._id.toString() }}{% endif %}"
   data-page-revision-created="{% if revision %}{{ revision.createdAt|datetz('U') }}{% endif %}"
   data-page-is-seen="{% if page and page.isSeenUser(user) %}1{% else %}0{% endif %}"
+  data-slack-channels="{{ slack|default('') }}"
   >
 
   {% include 'page_alerts.html' %}

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;
@@ -181,7 +183,8 @@ if (writeCommentElem) {
       revisionId={pageRevisionId}
       pagePath={pagePath}
       onPostComplete={postCompleteHandler}
-      editorOptions={editorOptions} />,
+      editorOptions={editorOptions}
+      slackChannels = {slackChannels}/>,
     writeCommentElem);
 }