Merge pull request RocketChat#45 from Shailesh351/sb_upstream_catchup

[Upstream Catchup] Merge RocketChat/Apps.Dialogflow:master to master
Shailesh351 · Feb 16, 2021 · 491e16c · 491e16c
2 parents d3c8042 + 155ab14
commit 491e16c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/docs/QuickReplies.md b/docs/QuickReplies.md
@@ -73,12 +73,12 @@ These buttons perform a specific action in the app. You can add them by simply p
 
 - Parameters:
 
-|      Param Name      |  Dependency  | Param Type |      Acceptable Value      |
-|:--------------------:|:------------:|:----------:|:--------------------------:|
-|      `actionId`      | **Required** |   String   |    `df_perform_handover`   |
-|        `text`        | **Required** |   String   |           **Any**          |
-| `salesforceButtonId` | **Optional** |   String   | **Any Liveagent ButtonId** |
-|     `buttonStyle`    | **Optional** |   String   |    `primary` or `danger`   |
+|    Param Name    |  Dependency  | Param Type |           Acceptable Value          |
+|:----------------:|:------------:|:----------:|:-----------------------------------:|
+|    `actionId`    | **Required** |   String   |        `df_perform_handover`        |
+|      `text`      | **Required** |   String   |               **Any**               |
+|   `buttonStyle`  | **Optional** |   String   |        `primary` or `danger`        |
+| `data` | **Optional** |   String   | **Object(Key: Value), departmentName : Any Omnichannel department name** |
 
 - Example Structure:
 
@@ -87,7 +87,9 @@ These buttons perform a specific action in the app. You can add them by simply p
    "text": "Perform Handover",
    "buttonStyle": "primary",
    "actionId": "df_perform_handover",
-   "departmentName": "sales"
+   "data": {
+      "departmentName": "sales",
+   }
 }
 ```
 

diff --git a/enum/Dialogflow.ts b/enum/Dialogflow.ts
@@ -39,7 +39,6 @@ export interface IDialogflowQuickReplyOptions {
     text: string;
     actionId?: string;
     buttonStyle?: ButtonStyle;
-    salesforceButtonId?: string;
     data?: {
         [prop: string]: any;
     };

diff --git a/lib/Message.ts b/lib/Message.ts
@@ -36,7 +36,7 @@ export const createDialogflowMessage = async (rid: string, read: IRead,  modify:
                 };
 
                 if (payload.actionId && payload.actionId === ActionIds.PERFORM_HANDOVER) {
-                    buttonElement.value = payload.salesforceButtonId ? payload.salesforceButtonId : undefined;
+                    buttonElement.value = payload.data && payload.data.departmentName ? payload.data.departmentName : undefined;
                 }
 
                 return buttonElement;
@@ -70,7 +70,8 @@ export const createDialogflowMessage = async (rid: string, read: IRead,  modify:
                         };
 
                         if (cardElementPayload.actionId && cardElementPayload.actionId === ActionIds.PERFORM_HANDOVER) {
-                            buttonElement.value = cardElementPayload.salesforceButtonId ? cardElementPayload.salesforceButtonId : undefined;
+                            buttonElement.value = cardElementPayload.data && cardElementPayload.data.departmentName
+                                ? cardElementPayload.data.departmentName : undefined;
                         }
 
                         return buttonElement;

diff --git a/package-lock.json b/package-lock.json