From a6b96c92700c99008a4d8dcf4d5e868d168aaa24 Mon Sep 17 00:00:00 2001
From: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
Date: Tue, 23 May 2023 08:26:09 +0200
Subject: [PATCH] Follow-up team webhooks (#9052)

* fix subsriber url already defined error when editing webhook

* don't show form submitted for team and event type webhooks

---------

Co-authored-by: CarinaWolli <wollencarina@gmail.com>
---
 apps/web/components/eventtype/EventWebhooksTab.tsx     | 4 +++-
 packages/features/webhooks/components/WebhookForm.tsx  | 2 ++
 packages/features/webhooks/pages/webhook-edit-view.tsx | 1 +
 packages/features/webhooks/pages/webhook-new-view.tsx  | 7 +++++--
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/apps/web/components/eventtype/EventWebhooksTab.tsx b/apps/web/components/eventtype/EventWebhooksTab.tsx
index 89a6956765..59f7bc7d36 100644
--- a/apps/web/components/eventtype/EventWebhooksTab.tsx
+++ b/apps/web/components/eventtype/EventWebhooksTab.tsx
@@ -160,6 +160,7 @@ export const EventWebhooksTab = ({ eventType }: Pick<EventTypeSetupProps, "event
               title={t("create_webhook")}
               description={t("create_webhook_team_event_type")}>
               <WebhookForm
+                noRoutingFormTriggers={true}
                 onSubmit={onCreateWebhook}
                 onCancel={() => setCreateModalOpen(false)}
                 apps={installedApps?.items.map((app) => app.slug)}
@@ -170,6 +171,7 @@ export const EventWebhooksTab = ({ eventType }: Pick<EventTypeSetupProps, "event
           <Dialog open={editModalOpen} onOpenChange={(isOpen) => !isOpen && setEditModalOpen(false)}>
             <DialogContent enableOverflow title={t("edit_webhook")}>
               <WebhookForm
+                noRoutingFormTriggers={true}
                 webhook={webhookToEdit}
                 apps={installedApps?.items.map((app) => app.slug)}
                 onCancel={() => setEditModalOpen(false)}
@@ -177,7 +179,7 @@ export const EventWebhooksTab = ({ eventType }: Pick<EventTypeSetupProps, "event
                   if (
                     subscriberUrlReserved({
                       subscriberUrl: values.subscriberUrl,
-                      id: values.id,
+                      id: webhookToEdit?.id,
                       webhooks,
                       eventTypeId: eventType.id,
                     })
diff --git a/packages/features/webhooks/components/WebhookForm.tsx b/packages/features/webhooks/components/WebhookForm.tsx
index 56d6e06ab2..2e4fc7310c 100644
--- a/packages/features/webhooks/components/WebhookForm.tsx
+++ b/packages/features/webhooks/components/WebhookForm.tsx
@@ -44,6 +44,7 @@ const WebhookForm = (props: {
   apps?: (keyof typeof WEBHOOK_TRIGGER_EVENTS_GROUPED_BY_APP_V2)[];
   onSubmit: (event: WebhookFormSubmitData) => void;
   onCancel?: () => void;
+  noRoutingFormTriggers: boolean;
 }) => {
   const { apps = [] } = props;
   const { t } = useLocale();
@@ -51,6 +52,7 @@ const WebhookForm = (props: {
   const triggerOptions = [...WEBHOOK_TRIGGER_EVENTS_GROUPED_BY_APP_V2["core"]];
   if (apps) {
     for (const app of apps) {
+      if (app === "routing-forms" && props.noRoutingFormTriggers) continue;
       if (WEBHOOK_TRIGGER_EVENTS_GROUPED_BY_APP_V2[app]) {
         triggerOptions.push(...WEBHOOK_TRIGGER_EVENTS_GROUPED_BY_APP_V2[app]);
       }
diff --git a/packages/features/webhooks/pages/webhook-edit-view.tsx b/packages/features/webhooks/pages/webhook-edit-view.tsx
index acd949c909..b3c84975df 100644
--- a/packages/features/webhooks/pages/webhook-edit-view.tsx
+++ b/packages/features/webhooks/pages/webhook-edit-view.tsx
@@ -59,6 +59,7 @@ const EditWebhook = () => {
         />
         <WebhookForm
           webhook={webhook}
+          noRoutingFormTriggers={!!webhook.teamId}
           onSubmit={(values: WebhookFormSubmitData) => {
             if (
               subscriberUrlReserved({
diff --git a/packages/features/webhooks/pages/webhook-new-view.tsx b/packages/features/webhooks/pages/webhook-new-view.tsx
index a3723a4f19..08c4ea38d7 100644
--- a/packages/features/webhooks/pages/webhook-new-view.tsx
+++ b/packages/features/webhooks/pages/webhook-new-view.tsx
@@ -79,8 +79,11 @@ const NewWebhookView = () => {
         description={t("add_webhook_description", { appName: APP_NAME })}
         backButton
       />
-
-      <WebhookForm onSubmit={onCreateWebhook} apps={installedApps?.items.map((app) => app.slug)} />
+      <WebhookForm
+        onSubmit={onCreateWebhook}
+        apps={installedApps?.items.map((app) => app.slug)}
+        noRoutingFormTriggers={!!teamId}
+      />
     </>
   );
 };