added new setting and logic as per CC-13, allowing the default behavi…

…or or the new one, enabling Agents to place chats onHold at anytime
RocketChat · Oct 2, 2023 · aff1d43 · aff1d43
1 parent 06b610c
commit aff1d43
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useQuickActions.tsx b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useQuickActions.tsx
@@ -309,8 +309,9 @@ export const useQuickActions = (): {
 	const canSendTranscriptPDF = usePermission('request-pdf-transcript');
 	const canCloseRoom = usePermission('close-livechat-room');
 	const canCloseOthersRoom = usePermission('close-others-livechat-room');
-	const canPlaceChatOnHold = Boolean(!room.onHold && room.u && manualOnHoldAllowed);
-
+	const allowManualOnHoldUponAgentEngagement = useSetting('Livechat_allow_manual_on_hold_upon_agent_engagement_only');
+	const canPlaceChatOnHold = !room.onHold && room.u && manualOnHoldAllowed &&
+							   (allowManualOnHoldUponAgentEngagement ? !(room as any).lastMessage?.token : true);
 	const hasPermissionButtons = (id: string): boolean => {
 		switch (id) {
 			case QuickActionsEnum.MoveQueue:

diff --git a/apps/meteor/ee/app/livechat-enterprise/server/settings.ts b/apps/meteor/ee/app/livechat-enterprise/server/settings.ts
@@ -198,6 +198,18 @@ export const createSettings = async (): Promise<void> => {
 		enableQuery: omnichannelEnabledQuery,
 	});
 
+	await settingsRegistry.add('Livechat_allow_manual_on_hold_upon_agent_engagement_only', true, {
+        type: 'boolean',
+        group: 'Omnichannel',
+        section: 'Sessions',
+        enterprise: true,
+        invalidValue: false,
+        public: true,
+        modules: ['livechat-enterprise'],
+        enableQuery: { _id: 'Livechat_allow_manual_on_hold', value: true },
+    });
+
+
 	await settingsRegistry.add('Livechat_auto_transfer_chat_timeout', 0, {
 		type: 'int',
 		group: 'Omnichannel',

diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -3051,7 +3051,8 @@
   "Livechat_agents": "Omnichannel agents",
   "Livechat_Agents": "Agents",
   "Livechat_allow_manual_on_hold": "Allow agents to manually place chat On Hold",
-  "Livechat_allow_manual_on_hold_Description": "If enabled, the agent will get a new option to place a chat On Hold, provided the agent has sent the last message",
+  "Livechat_allow_manual_on_hold_upon_agent_engagement_only": "Allow agents to manually place chat On Hold, provided the agent has sent the last message",
+  "Livechat_allow_manual_on_hold__upon_agent_engagement_only_Description": "If enabled, the agent will get a new option to place a chat On Hold, provided the agent has sent the last message, otherwise Agents are able to place chats onHold irrespective",
   "Livechat_AllowedDomainsList": "Livechat Allowed Domains",
   "Livechat_Appearance": "Livechat Appearance",
   "Livechat_auto_close_on_hold_chats_custom_message": "Custom message for closed chats in On Hold queue",

diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -2628,7 +2628,8 @@
   "Livechat_agents": "Agentes do omnichannel",
   "Livechat_Agents": "Agentes",
   "Livechat_allow_manual_on_hold": "Permitir que agentes coloquem a conversa em espera manualmente",
-  "Livechat_allow_manual_on_hold_Description": "Se habilitado, o agente terá uma nova opção para colocar a conversa em espera, desde que o agente tenha enviado a última mensagem",
+  "Livechat_allow_manual_on_hold_upon_agent_engagement_only": "Permitir que agentes coloquem a conversa em espera manualmente, sempre que o agente tenha enviado a última mensagem",
+  "Livechat_allow_manual_on_hold__upon_agent_engagement_only_Description": "Se habilitado, o agente terá uma nova opção para colocar a conversa em espera, desde que o agente tenha enviado a última mensagem. Caso contrário poderá sempre colocar a conversa em espera.",
   "Livechat_AllowedDomainsList": "Domínios permitidos em Livechat",
   "Livechat_Appearance": "Aparência do livechat",
   "Livechat_auto_close_on_hold_chats_custom_message": "Mensagem personalizada para conversas encerradas na fila em espera",
@@ -4971,4 +4972,4 @@
   "RegisterWorkspace_Features_Omnichannel_Title": "Omnichannel",
   "RegisterWorkspace_Setup_Label": "E-mail da conta da nuvem",
   "cloud.RegisterWorkspace_Setup_Terms_Privacy": "Eu concordo com os <1>Termos e condições</1> e a <3>Política de privacidade</3>"
-}
+}