Merge pull request RocketChat#30 from Kailash0311/upstream-merge

Upstream Merge

Author: ear-dev

config/Settings.ts

@@ -22,11 +22,11 @@ export enum AppSetting {
 
 export enum DefaultMessage {
     DEFAULT_DialogflowServiceUnavailableMessage = 'Sorry, I\'m having trouble answering your question.',
+    DEFAULT_DialogflowRequestFailedMessage = 'Sorry, something went wrong.',
     DEFAULT_DialogflowHandoverMessage = 'Transferring to an online agent',
     DEFAULT_DialogflowHandoverFailedMessage = 'Sorry I\'m unable to transfer you to an agent.',
     DEFAULT_DialogflowCloseChatMessage = 'Closing the chat, Goodbye',
     DEFAULT_DialogflowWelcomeMessage = 'Thanks for connecting',
-    DEFAULT_DialogflowRequestFailedMessage = 'Apologies but your request cannot be completed.',
 }
 
 export const settings: Array<ISetting> = [

docs/QuickReplies.md

@@ -67,7 +67,9 @@ These buttons perform a specific action in the app. You can add them by simply p
 
 ### Handover Button
 
-- On clicking this button, the visitor will be handed over to another departement. You can set the target department in the app setting called **Target Department for Handover**. Add the following block in your Quick Replies payload, with **actionId** set as `df_perform_handover`, to include this button in your response:
+- On clicking this button, the visitor will be handed over to another departement. You can set the target department in the app setting called **Target Department for Handover** or add a `departmentName` param in your payload. On failing to provide a department name in either way, will send a request failure message back to the visitor, when visitor clicks the button. 
+
+- Add the following block in your Quick Replies payload, with **actionId** set as `df_perform_handover`, to include this button in your response:
 
 - Parameters:
 
@@ -84,7 +86,8 @@ 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"
+   "actionId": "df_perform_handover",
+   "departmentName": "sales"
 }
 ```
 
@@ -113,4 +116,3 @@ These buttons perform a specific action in the app. You can add them by simply p
 ## Example
 
 ![Pre-Programmed Example Payload](https://user-images.githubusercontent.com/41849970/92283593-d5e70a80-ef1d-11ea-8860-e91a4980515f.png)
-

enum/Dialogflow.ts

@@ -39,6 +39,9 @@ export interface IDialogflowQuickReplyOptions {
     actionId?: string;
     buttonStyle?: ButtonStyle;
     salesforceButtonId?: string;
+    data?: {
+        [prop: string]: any;
+    };
 }
 
 export interface IDialogflowAccessToken {

handler/ExecuteLivechatBlockActionHandler.ts

@@ -7,7 +7,7 @@ import { IUser } from '@rocket.chat/apps-engine/definition/users';
 import { AppSetting, DefaultMessage } from '../config/Settings';
 import { ActionIds } from '../enum/ActionIds';
 import { createLivechatMessage, createMessage, deleteAllActionBlocks } from '../lib/Message';
-import { closeChat, performHandover, updateRoomCustomFields } from '../lib/Room';
+import { closeChat, performHandover } from '../lib/Room';
 import { getAppSettingValue } from '../lib/Settings';
 
 export class ExecuteLivechatBlockActionHandler {
@@ -39,12 +39,10 @@ export class ExecuteLivechatBlockActionHandler {
             switch (actionId) {
                 case ActionIds.PERFORM_HANDOVER:
                     const targetDepartment: string = value || await getAppSettingValue(this.read, AppSetting.FallbackTargetDepartment);
-
                     if (!targetDepartment) {
                         await createMessage(rid, this.read, this.modify, { text: DefaultMessage.DEFAULT_DialogflowRequestFailedMessage });
                         break;
                     }
-
                     await performHandover(this.modify, this.read, rid, visitor.token, targetDepartment);
                     break;