From a6eed6ffccf9ef7f51509a5068c23e72869b2056 Mon Sep 17 00:00:00 2001
From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Date: Wed, 20 Oct 2021 23:53:15 +0530
Subject: [PATCH] Enhancement/webhooks redesign (#1005)

---
 pages/api/webhook.ts                 |  1 +
 pages/integrations/index.tsx         | 85 ++++++++++++++--------------
 public/static/locales/en/common.json |  1 +
 3 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/pages/api/webhook.ts b/pages/api/webhook.ts
index ec4d786311..7b2d724359 100644
--- a/pages/api/webhook.ts
+++ b/pages/api/webhook.ts
@@ -39,6 +39,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
         userId: session.user.id,
         subscriberUrl: req.body.subscriberUrl,
         eventTriggers: req.body.eventTriggers,
+        active: req.body.enabled,
       },
     });
 
diff --git a/pages/integrations/index.tsx b/pages/integrations/index.tsx
index e2a7aebb4f..3e8169b37d 100644
--- a/pages/integrations/index.tsx
+++ b/pages/integrations/index.tsx
@@ -50,33 +50,33 @@ function WebhookListItem(props: { webhook: TWebhook; onEditWebhook: () => void }
 
   return (
     <ListItem className="flex w-full p-4">
-      <div className="flex justify-between w-full my-4">
-        <div className="flex pr-2 border-r border-gray-100">
-          <span className="flex flex-col space-y-2 text-xs">
-            {props.webhook.eventTriggers.map((eventTrigger, ind) => (
-              <span key={ind} className="px-1 text-xs text-blue-700 rounded-md w-max bg-blue-50">
-                {t(`${eventTrigger.toLowerCase()}`)}
-              </span>
-            ))}
-          </span>
-        </div>
-        <div className="flex w-full">
-          <div className="self-center inline-block ml-3 space-y-1">
-            <span className="flex text-sm text-neutral-700">{props.webhook.subscriberUrl}</span>
+      <div className="flex justify-between w-full">
+        <div className="flex flex-col">
+          <div className="inline-block space-y-1">
+            <span
+              className={classNames(
+                "flex text-sm ",
+                props.webhook.active ? "text-neutral-700" : "text-neutral-200"
+              )}>
+              {props.webhook.subscriberUrl}
+            </span>
+          </div>
+          <div className="flex mt-2">
+            <span className="flex space-x-2 text-xs">
+              {props.webhook.eventTriggers.map((eventTrigger, ind) => (
+                <span
+                  key={ind}
+                  className={classNames(
+                    "px-1 text-xs rounded-sm w-max ",
+                    props.webhook.active ? "text-blue-700 bg-blue-100" : "text-blue-200 bg-blue-50"
+                  )}>
+                  {t(`${eventTrigger.toLowerCase()}`)}
+                </span>
+              ))}
+            </span>
           </div>
         </div>
         <div className="flex">
-          {!props.webhook.active && (
-            <span className="self-center h-6 px-3 py-1 text-xs text-red-700 capitalize rounded-md bg-red-50">
-              {t("disabled")}
-            </span>
-          )}
-          {!!props.webhook.active && (
-            <span className="self-center h-6 px-3 py-1 text-xs text-green-700 capitalize rounded-md bg-green-50">
-              {t("enabled")}
-            </span>
-          )}
-
           <Tooltip content={t("edit_webhook")}>
             <Button
               onClick={() => props.onEditWebhook()}
@@ -164,11 +164,28 @@ function WebhookDialogForm(props: {
       }}
       className="space-y-4">
       <input type="hidden" {...form.register("id")} />
+      <fieldset className="space-y-2">
+        <InputGroupBox className="border-0 bg-gray-50">
+          <Controller
+            control={form.control}
+            name="active"
+            render={({ field }) => (
+              <Switch
+                label={field.value ? t("webhook_enabled") : t("webhook_disabled")}
+                defaultChecked={field.value}
+                onCheckedChange={(isChecked) => {
+                  form.setValue("active", isChecked);
+                }}
+              />
+            )}
+          />
+        </InputGroupBox>
+      </fieldset>
       <TextField label={t("subscriber_url")} {...form.register("subscriberUrl")} required type="url" />
 
       <fieldset className="space-y-2">
         <FieldsetLegend>{t("event_triggers")}</FieldsetLegend>
-        <InputGroupBox>
+        <InputGroupBox className="border-0 bg-gray-50">
           {ALL_TRIGGERS.map((key) => (
             <Controller
               key={key}
@@ -192,24 +209,6 @@ function WebhookDialogForm(props: {
           ))}
         </InputGroupBox>
       </fieldset>
-      <fieldset className="space-y-2">
-        <FieldsetLegend>{t("webhook_status")}</FieldsetLegend>
-        <InputGroupBox>
-          <Controller
-            control={form.control}
-            name="active"
-            render={({ field }) => (
-              <Switch
-                label={t("webhook_enabled")}
-                defaultChecked={field.value}
-                onCheckedChange={(isChecked) => {
-                  form.setValue("active", isChecked);
-                }}
-              />
-            )}
-          />
-        </InputGroupBox>
-      </fieldset>
       <DialogFooter>
         <Button type="button" color="secondary" onClick={props.handleClose} tabIndex={-1}>
           {t("cancel")}
diff --git a/public/static/locales/en/common.json b/public/static/locales/en/common.json
index a0c07c4c79..ff2de8ab6f 100644
--- a/public/static/locales/en/common.json
+++ b/public/static/locales/en/common.json
@@ -5,6 +5,7 @@
   "delete_webhook": "Delete Webhook",
   "webhook_status": "Webhook Status",
   "webhook_enabled": "Webhook Enabled",
+  "webhook_disabled": "Webhook Disabled",
   "manage_your_webhook": "Manage your webhook",
   "webhook_created_successfully": "Webhook created successfully!",
   "webhook_updated_successfully": "Webhook updated successfully!",