Merge pull request #41 from litencatt/fix-slack-submit-search-result

Set filter for slack submit result search
litencatt · Dec 17, 2023 · f002d09 · f002d09
2 parents 9aa92e1 + 2de3db1
commit f002d09
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -578,11 +578,14 @@ app.view("search-db-modal", async ({ ack, view, client, logger }) => {
     const metaData = JSON.parse(view.private_metadata) as MetaData
     console.dir({ metaData }, { depth: null })
 
-    const res = await notion.client.databases.query({
+    const params = {
       database_id: metaData.selected_db_id,
-      // filter: metaData.filters as QueryDatabaseParameters["filter"],
       page_size: 10,
-    })
+    }
+    if (metaData.filters != null) {
+      params["filter"] = metaData.filters as QueryDatabaseParameters["filter"]
+    }
+    const res = await notion.client.databases.query(params)
     const urls = await notion.getPageUrls(res)
     if (urls.length == 0) {
       urls.push("No Results")
@@ -605,7 +608,7 @@ app.view("search-db-modal", async ({ ack, view, client, logger }) => {
           type: "section",
           text: {
             type: "mrkdwn",
-            text: "フィルター:\n```" + JSON.stringify(metaData.filters) + "```",
+            text: "Filter:\n```" + JSON.stringify(metaData.filters) + "```",
           },
         },
         {
@@ -615,7 +618,7 @@ app.view("search-db-modal", async ({ ack, view, client, logger }) => {
           type: "section",
           text: {
             type: "mrkdwn",
-            text: "*検索結果*:\n" + urls.join("\n"),
+            text: "*Search Result*:\n" + urls.join("\n"),
           },
         },
       ],

diff --git a/src/slack.ts b/src/slack.ts
@@ -11,7 +11,7 @@ export const modalButtonMessage = (message_ts: string) => {
             type: "button",
             text: {
               type: "plain_text",
-              text: "モーダルを開いて検索する",
+              text: "Open modal",
             },
             action_id: "open-modal-button",
           },
@@ -61,7 +61,7 @@ export const searchDbView = (metaData: any, data: any[]) => {
         },
         label: {
           type: "plain_text",
-          text: "DB選択",
+          text: "Select DB",
         },
       },
     ],