From f087bebd8acbf05e357637073dddd3091f8886e5 Mon Sep 17 00:00:00 2001 From: jakub-tldr <78603704+jakub-tldr@users.noreply.github.com> Date: Wed, 4 Mar 2026 15:38:40 +0100 Subject: [PATCH 1/2] allow for empty secret --- .../modals/CEWebhookModal/CEWebhookModal.tsx | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/web/src/pages/WebhooksPage/modals/CEWebhookModal/CEWebhookModal.tsx b/web/src/pages/WebhooksPage/modals/CEWebhookModal/CEWebhookModal.tsx index 898aa83052..69180f7549 100644 --- a/web/src/pages/WebhooksPage/modals/CEWebhookModal/CEWebhookModal.tsx +++ b/web/src/pages/WebhooksPage/modals/CEWebhookModal/CEWebhookModal.tsx @@ -77,13 +77,13 @@ const formSchema = z.object({ ), token: z .string() - .min(1, m.form_error_required()) .max( 250, m.form_error_max_len({ length: 250, }), - ), + ) + .nullable(), enabled: z.boolean(), on_user_created: z.boolean(), on_user_deleted: z.boolean(), @@ -98,7 +98,10 @@ const ModalContent = ({ webhook }: ModalData) => { const defaultValues = useMemo((): FormFields => { if (isPresent(webhook)) { - return webhook; + return { + ...webhook, + token: webhook.token || null, + }; } return { description: '', @@ -107,7 +110,7 @@ const ModalContent = ({ webhook }: ModalData) => { on_user_created: false, on_user_deleted: false, on_user_modified: false, - token: '', + token: null, url: '', }; }, [webhook]); @@ -139,13 +142,14 @@ const ModalContent = ({ webhook }: ModalData) => { onChange: formSchema, }, onSubmit: async ({ value }) => { + const payload = { ...value, token: value.token ?? '' }; if (isEdit) { await editWebhook({ id: webhook.id, - ...value, + ...payload, }); } else { - await addWebhook(value); + await addWebhook(payload); } }, }); @@ -172,7 +176,6 @@ const ModalContent = ({ webhook }: ModalData) => { {(field) => ( From ccd467e809edd731b5072396480fd1b5800ca149 Mon Sep 17 00:00:00 2001 From: jakub-tldr <78603704+jakub-tldr@users.noreply.github.com> Date: Wed, 4 Mar 2026 15:42:27 +0100 Subject: [PATCH 2/2] lint --- .../WebhooksPage/modals/CEWebhookModal/CEWebhookModal.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/web/src/pages/WebhooksPage/modals/CEWebhookModal/CEWebhookModal.tsx b/web/src/pages/WebhooksPage/modals/CEWebhookModal/CEWebhookModal.tsx index 69180f7549..d852daab05 100644 --- a/web/src/pages/WebhooksPage/modals/CEWebhookModal/CEWebhookModal.tsx +++ b/web/src/pages/WebhooksPage/modals/CEWebhookModal/CEWebhookModal.tsx @@ -175,10 +175,7 @@ const ModalContent = ({ webhook }: ModalData) => { {(field) => ( - + )}