From f2dc94d9b040152fe9b179d910f493c88a7d1736 Mon Sep 17 00:00:00 2001 From: dougfabris Date: Tue, 6 Feb 2024 16:01:05 -0300 Subject: [PATCH 1/3] fix: input for time-on-site --- .../client/views/omnichannel/triggers/EditTrigger.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx b/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx index 0739641535b0f..58cf470582869 100644 --- a/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx +++ b/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx @@ -12,6 +12,7 @@ import { ToggleSwitch, Select, TextAreaInput, + NumberInput, } from '@rocket.chat/fuselage'; import { useUniqueId } from '@rocket.chat/fuselage-hooks'; import { useToastMessageDispatch, useRouter, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts'; @@ -227,7 +228,13 @@ const EditTrigger = ({ triggerData }: { triggerData?: Serialized } + render={({ field }) => { + if (conditions[index].name === 'time-on-site') { + return ; + } + + return ; + }} /> )} From d4b6474e5fb572842bf0582d721a1bf48b5527ea Mon Sep 17 00:00:00 2001 From: dougfabris Date: Tue, 6 Feb 2024 16:05:15 -0300 Subject: [PATCH 2/3] chore: changeset --- .changeset/moody-cups-search.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/moody-cups-search.md diff --git a/.changeset/moody-cups-search.md b/.changeset/moody-cups-search.md new file mode 100644 index 0000000000000..a4846da652a48 --- /dev/null +++ b/.changeset/moody-cups-search.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Fixes an issue allowing only numbers, if trigger's condition is 'visitor time on site' From a0b807baddda8836398923882c368f054488fe35 Mon Sep 17 00:00:00 2001 From: dougfabris Date: Tue, 6 Feb 2024 16:57:02 -0300 Subject: [PATCH 3/3] fix: e2e test --- apps/meteor/tests/e2e/page-objects/omnichannel-triggers.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-triggers.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-triggers.ts index 2ac39a4b52fd7..407bd6a349973 100644 --- a/apps/meteor/tests/e2e/page-objects/omnichannel-triggers.ts +++ b/apps/meteor/tests/e2e/page-objects/omnichannel-triggers.ts @@ -88,7 +88,7 @@ export class OmnichannelTriggers { name: triggersName, description: 'Creating a fresh trigger', condition: 'time-on-site', - conditionValue: '5s', + conditionValue: 5, triggerMessage, }); await this.btnSave.click(); @@ -110,7 +110,7 @@ export class OmnichannelTriggers { name: string; description: string; condition: 'time-on-site' | 'chat-opened-by-visitor' | 'after-guest-registration'; - conditionValue?: string; + conditionValue?: string | number; sender: 'queue' | 'custom'; agentName?: string; triggerMessage: string; @@ -121,7 +121,7 @@ export class OmnichannelTriggers { data.condition && (await this.selectCondition(data.condition)); if (data.conditionValue) { - await this.inputConditionValue.fill(data.conditionValue); + await this.inputConditionValue.fill(data.conditionValue.toString()); } data.sender && (await this.selectSender(data.sender));