Merge pull request #411 from Workgrid/ask-update

Author: TuckerWhitehouse

packages/workgrid-client-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workgrid/client-react",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "main": "dist/client-react.js",
   "types": "dist/client-react.d.ts",
   "files": [
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@testing-library/react-hooks": "^5.1.0",
-    "@workgrid/client": "^0.0.7",
+    "@workgrid/client": "^0.0.8",
     "react-query": "^3.12.2"
   },
   "devDependencies": {

packages/workgrid-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workgrid/client",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "main": "dist/client.js",
   "types": "dist/client.d.ts",
   "files": [

packages/workgrid-client/src/client.test.ts

@@ -112,7 +112,7 @@ const server = setupServer(
   rest.post(`https://company-code.workgrid.com/v2/ask`, (req, res, ctx) => {
     return res(
       ctx.json({
-        text: "Why couldn't the pony speak?",
+        text: JSON.stringify(req.body),
         actions: ['laugh', 'cringe'],
         suggestions: ['ask another'],
       })
@@ -384,7 +384,33 @@ describe('@workgrid/client', () => {
           "suggestions": Array [
             "ask another",
           ],
-          "text": "Why couldn't the pony speak?",
+          "text": "{\\"utterance\\":\\"Tell me a joke\\",\\"channel\\":\\"msteams\\",\\"locale\\":\\"en-US\\"}",
+        }
+      `)
+    })
+    test('ask with ids', async () => {
+      const result = await client.query([
+        'ask',
+        {
+          spaceId: 'space-id',
+          utterance: 'Tell me a joke',
+          channel: 'msteams',
+          locale: 'en-US',
+          botId: '123456',
+          botAliasId: '123456',
+        },
+      ])
+
+      expect(result).toMatchInlineSnapshot(`
+        Object {
+          "actions": Array [
+            "laugh",
+            "cringe",
+          ],
+          "suggestions": Array [
+            "ask another",
+          ],
+          "text": "{\\"utterance\\":\\"Tell me a joke\\",\\"channel\\":\\"msteams\\",\\"locale\\":\\"en-US\\",\\"botId\\":\\"123456\\",\\"botAliasId\\":\\"123456\\"}",
         }
       `)
     })

packages/workgrid-client/src/client.ts

@@ -645,11 +645,11 @@ export interface Queries {
 
 setTypedQueryDefaults('ask', (client) => ({
   queryFn: async (context) => {
-    const { spaceId, utterance, channel, locale } = context.queryKey[1]
+    const { spaceId, utterance, channel, locale, botId, botAliasId } = context.queryKey[1]
 
     const response = await client.httpClient.post(
       '/v2/ask',
-      { utterance, channel, locale },
+      { utterance, channel, locale, ...(botId ? { botId, botAliasId } : null) },
       {
         headers: { 'x-workgrid-space': spaceId },
       }