From 7fd0427cafdefcd56b340688194d4c1856916943 Mon Sep 17 00:00:00 2001 From: hardik Date: Sat, 9 Mar 2024 18:23:23 +0530 Subject: [PATCH 1/3] fix: modified logic for toggle --- .../admin/integrations/outgoing/EditOutgoingWebhook.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/meteor/client/views/admin/integrations/outgoing/EditOutgoingWebhook.tsx b/apps/meteor/client/views/admin/integrations/outgoing/EditOutgoingWebhook.tsx index a8a3c1b8f508a..070d57100bd9b 100644 --- a/apps/meteor/client/views/admin/integrations/outgoing/EditOutgoingWebhook.tsx +++ b/apps/meteor/client/views/admin/integrations/outgoing/EditOutgoingWebhook.tsx @@ -14,7 +14,7 @@ import { useUpdateIntegration } from '../hooks/useUpdateIntegration'; import OutgoingWebhookForm from './OutgoingWebhookForm'; const getInitialValue = (webhookData: Serialized | undefined, defaultToken: string) => ({ - enabled: webhookData?.enabled || true, + enabled: webhookData?.enabled ?? true, impersonateUser: webhookData?.impersonateUser || false, event: webhookData?.event || 'sendMessage', urls: webhookData?.urls?.join('\n') ?? '', @@ -30,11 +30,11 @@ const getInitialValue = (webhookData: Serialized | undefin scriptEnabled: webhookData?.scriptEnabled || false, scriptEngine: webhookData?.scriptEngine || 'isolated-vm', script: webhookData?.script || '', - retryFailedCalls: webhookData?.retryFailedCalls || true, + retryFailedCalls: webhookData?.retryFailedCalls ?? true, retryCount: webhookData?.retryCount || 6, retryDelay: webhookData?.retryDelay || 'powers-of-ten', triggerWordAnywhere: webhookData?.triggerWordAnywhere || false, - runOnEdits: webhookData?.runOnEdits || true, + runOnEdits: webhookData?.runOnEdits ?? true, }); const OUTGOING_TYPE = 'webhook-outgoing'; From 30300d9187b400b3b7001e0d0a3d70bc82fbae6e Mon Sep 17 00:00:00 2001 From: hardik Date: Mon, 11 Mar 2024 21:30:43 +0530 Subject: [PATCH 2/3] fix: changed all other logic --- .../incoming/EditIncomingWebhook.tsx | 22 ++++++------ .../outgoing/EditOutgoingWebhook.tsx | 34 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/apps/meteor/client/views/admin/integrations/incoming/EditIncomingWebhook.tsx b/apps/meteor/client/views/admin/integrations/incoming/EditIncomingWebhook.tsx index 87a29dcce5c05..c14c2b19d02e5 100644 --- a/apps/meteor/client/views/admin/integrations/incoming/EditIncomingWebhook.tsx +++ b/apps/meteor/client/views/admin/integrations/incoming/EditIncomingWebhook.tsx @@ -13,17 +13,17 @@ import { useUpdateIntegration } from '../hooks/useUpdateIntegration'; import IncomingWebhookForm from './IncomingWebhookForm'; const getInitialValue = (webhookData: Serialized | undefined) => ({ - enabled: webhookData?.enabled || false, - channel: webhookData?.channel.join(', ') || '', - username: webhookData?.username || '', - name: webhookData?.name || '', - alias: webhookData?.alias || '', - avatar: webhookData?.avatar || '', - emoji: webhookData?.emoji || '', - scriptEnabled: webhookData?.scriptEnabled || false, - scriptEngine: webhookData?.scriptEngine || 'isolated-vm', - overrideDestinationChannelEnabled: webhookData?.overrideDestinationChannelEnabled || false, - script: webhookData?.script || '', + enabled: webhookData?.enabled ?? true, + channel: webhookData?.channel.join(', ') ?? '', + username: webhookData?.username ?? '', + name: webhookData?.name ?? '', + alias: webhookData?.alias ?? '', + avatar: webhookData?.avatar ?? '', + emoji: webhookData?.emoji ?? '', + scriptEnabled: webhookData?.scriptEnabled ?? false, + scriptEngine: webhookData?.scriptEngine ?? 'isolated-vm', + overrideDestinationChannelEnabled: webhookData?.overrideDestinationChannelEnabled ?? false, + script: webhookData?.script ?? '', }); const INCOMING_TYPE = 'webhook-incoming'; diff --git a/apps/meteor/client/views/admin/integrations/outgoing/EditOutgoingWebhook.tsx b/apps/meteor/client/views/admin/integrations/outgoing/EditOutgoingWebhook.tsx index 070d57100bd9b..1ca7d1f481cde 100644 --- a/apps/meteor/client/views/admin/integrations/outgoing/EditOutgoingWebhook.tsx +++ b/apps/meteor/client/views/admin/integrations/outgoing/EditOutgoingWebhook.tsx @@ -15,25 +15,25 @@ import OutgoingWebhookForm from './OutgoingWebhookForm'; const getInitialValue = (webhookData: Serialized | undefined, defaultToken: string) => ({ enabled: webhookData?.enabled ?? true, - impersonateUser: webhookData?.impersonateUser || false, - event: webhookData?.event || 'sendMessage', + impersonateUser: webhookData?.impersonateUser ?? false, + event: webhookData?.event ?? 'sendMessage', urls: webhookData?.urls?.join('\n') ?? '', - token: webhookData?.token || defaultToken, - triggerWords: triggerWordsToString(webhookData?.triggerWords) || '', - targetRoom: webhookData?.targetRoom || '', - channel: webhookData?.channel.join(', ') || '', - username: webhookData?.username || '', - name: webhookData?.name || '', - alias: webhookData?.alias || '', - avatar: webhookData?.avatar || '', - emoji: webhookData?.emoji || '', - scriptEnabled: webhookData?.scriptEnabled || false, - scriptEngine: webhookData?.scriptEngine || 'isolated-vm', - script: webhookData?.script || '', + token: webhookData?.token ?? defaultToken, + triggerWords: triggerWordsToString(webhookData?.triggerWords) ?? '', + targetRoom: webhookData?.targetRoom ?? '', + channel: webhookData?.channel.join(', ') ?? '', + username: webhookData?.username ?? '', + name: webhookData?.name ?? '', + alias: webhookData?.alias ?? '', + avatar: webhookData?.avatar ?? '', + emoji: webhookData?.emoji ?? '', + scriptEnabled: webhookData?.scriptEnabled ?? false, + scriptEngine: webhookData?.scriptEngine ?? 'isolated-vm', + script: webhookData?.script ?? '', retryFailedCalls: webhookData?.retryFailedCalls ?? true, - retryCount: webhookData?.retryCount || 6, - retryDelay: webhookData?.retryDelay || 'powers-of-ten', - triggerWordAnywhere: webhookData?.triggerWordAnywhere || false, + retryCount: webhookData?.retryCount ?? 6, + retryDelay: webhookData?.retryDelay ?? 'powers-of-ten', + triggerWordAnywhere: webhookData?.triggerWordAnywhere ?? false, runOnEdits: webhookData?.runOnEdits ?? true, }); From cc753b78a75bef0d7b7400c507316f41baf580ba Mon Sep 17 00:00:00 2001 From: dougfabris Date: Mon, 18 Mar 2024 14:01:53 -0300 Subject: [PATCH 3/3] chore: changeset --- .changeset/breezy-fireants-float.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/breezy-fireants-float.md diff --git a/.changeset/breezy-fireants-float.md b/.changeset/breezy-fireants-float.md new file mode 100644 index 0000000000000..c43d2c6934bda --- /dev/null +++ b/.changeset/breezy-fireants-float.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Fixes an issue not allowing edit webhooks properly