فهرست منبع

GW-6712 show message

hakumizuki 4 سال پیش
والد
کامیت
93ccbbadb6
2فایلهای تغییر یافته به همراه14 افزوده شده و 10 حذف شده
  1. 0 2
      src/server/routes/apiv3/slack-integration.js
  2. 14 8
      src/server/service/slackbot.js

+ 0 - 2
src/server/routes/apiv3/slack-integration.js

@@ -174,11 +174,9 @@ module.exports = (crowi) => {
       }
       }
       case 'togetterCancelPageCreation': {
       case 'togetterCancelPageCreation': {
         console.log('ここでCancelする');
         console.log('ここでCancelする');
-        console.log(payload);
         break;
         break;
       }
       }
       default:
       default:
-        console.log(payload);
         break;
         break;
     }
     }
   };
   };

+ 14 - 8
src/server/service/slackbot.js

@@ -500,12 +500,10 @@ class SlackBotService extends S2sMessageHandlable {
 
 
   togetterMessageBlocks() {
   togetterMessageBlocks() {
     return [
     return [
-      this.generateMarkdownSectionBlock('Select messages to use.'),
+      this.inputBlock(this.togetterCheckboxesElement(), 'selected_messages', 'Select massages to use.'),
       this.actionsBlock(this.buttonElement('Show more', 'togetterShowMore')),
       this.actionsBlock(this.buttonElement('Show more', 'togetterShowMore')),
-      this.actionsBlock(this.togetterCheckboxesElement()),
-      this.inputBlock(this.togetterInputBlockElement('page_path'), 'page_path', 'Page path'),
-      this.inputBlock(this.togetterCheckboxesElement(), 'check', 'CHECK'),
-      this.actionsBlock(this.buttonElement('Cancel', 'togetterCancelPageCreation'), this.buttonElement('Create page', 'togetterCreatePage')),
+      this.inputBlock(this.togetterInputBlockElement('page_path', '/'), 'page_path', 'Page path'),
+      this.actionsBlock(this.buttonElement('Cancel', 'togetterCancelPageCreation'), this.buttonElement('Create page', 'togetterCreatePage', 'primary')),
     ];
     ];
   }
   }
 
 
@@ -535,8 +533,8 @@ class SlackBotService extends S2sMessageHandlable {
    * Button element
    * Button element
    * https://api.slack.com/reference/block-kit/block-elements#button
    * https://api.slack.com/reference/block-kit/block-elements#button
    */
    */
-  buttonElement(text, actionId) {
-    return {
+  buttonElement(text, actionId, style = undefined) {
+    const button = {
       type: 'button',
       type: 'button',
       text: {
       text: {
         type: 'plain_text',
         type: 'plain_text',
@@ -544,6 +542,10 @@ class SlackBotService extends S2sMessageHandlable {
       },
       },
       action_id: actionId,
       action_id: actionId,
     };
     };
+    if (style === 'primary' || style === 'danger') {
+      button.style = style;
+    }
+    return button;
   }
   }
 
 
   togetterCheckboxesElement() {
   togetterCheckboxesElement() {
@@ -587,9 +589,13 @@ class SlackBotService extends S2sMessageHandlable {
    * Plain-text input element
    * Plain-text input element
    * https://api.slack.com/reference/block-kit/block-elements#input
    * https://api.slack.com/reference/block-kit/block-elements#input
    */
    */
-  togetterInputBlockElement(actionId) {
+  togetterInputBlockElement(actionId, placeholderText = 'Write something ...') {
     return {
     return {
       type: 'plain_text_input',
       type: 'plain_text_input',
+      placeholder: {
+        type: 'plain_text',
+        text: placeholderText,
+      },
       action_id: actionId,
       action_id: actionId,
     };
     };
   }
   }