From fe92a00323b8af8347ac6822dc7c06788686b9f9 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Thu, 2 Jun 2022 18:45:54 +0800
Subject: [PATCH] Set values of editWebhook formInputProps

---
 packages/web/pages/settings/webhooks.tsx | 68 ++++++++++++------------
 1 file changed, 33 insertions(+), 35 deletions(-)

diff --git a/packages/web/pages/settings/webhooks.tsx b/packages/web/pages/settings/webhooks.tsx
index 0e634347c..32e5eaee5 100644
--- a/packages/web/pages/settings/webhooks.tsx
+++ b/packages/web/pages/settings/webhooks.tsx
@@ -59,30 +59,39 @@ export default function Webhooks(): JSX.Element {
   }, [addModelOpen])
 
   useEffect(() => {
-    if (webhook) {
-      setFormInputs([
-        {
-          label: 'URL',
-          onChange: setUrl,
-          name: 'url',
-          value: webhook.url,
-        },
-        {
-          label: 'Event Types',
-          name: 'eventTypes',
-          disabled: true,
-          value: webhook.eventTypes.join(', '),
-        },
-        {
-          label: 'Enabled',
-          name: 'enabled',
-          type: 'checkbox',
-          onChange: setEnabled,
-          value: webhook.enabled,
-        },
-      ])
-    }
-  }, [webhook])
+    setFormInputs([
+      {
+        label: 'URL',
+        onChange: setUrl,
+        name: 'url',
+        value: onEditWebhook?.url,
+        required: true,
+      },
+      {
+        label: 'Event Types',
+        name: 'eventTypes',
+        value: onEditWebhook?.eventTypes,
+        onChange: setEventTypes,
+      },
+      {
+        label: 'Enabled',
+        name: 'enabled',
+        type: 'checkbox',
+        onChange: setEnabled,
+        value: onEditWebhook?.enabled === 'Yes',
+      },
+    ])
+  }, [onEditWebhook])
+
+  const headers = ['URL', 'Event Types', 'Enabled']
+  const rows = new Map<string, Webhook>()
+  webhooks.forEach((webhook) =>
+    rows.set(webhook.id, {
+      url: webhook.url,
+      eventTypes: webhook.eventTypes.join(', '),
+      enabled: webhook.enabled ? 'Yes' : 'No',
+    })
+  )
 
   applyStoredTheme(false)
 
@@ -119,20 +128,9 @@ export default function Webhooks(): JSX.Element {
     } else {
       showErrorToast('Failed to update', { position: 'bottom-right' })
     }
-    setUrl('')
     revalidate()
   }
 
-  const headers = ['URL', 'Event Types', 'Enabled']
-  const rows = new Map<string, string[]>()
-  webhooks.forEach((webhook) =>
-    rows.set(webhook.id, [
-      webhook.url,
-      webhook.eventTypes.join(', '),
-      webhook.enabled ? 'Yes' : 'No',
-    ])
-  )
-
   return (
     <PrimaryLayout pageTestId={'webhooks'}>
       <Toaster