From 827f78f8a03956f29e8f6d81eb245f40334e652b Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Thu, 12 May 2022 16:57:05 +0100
Subject: [PATCH 1/3] Add deleteConfig to API

---
 packages/frontend-core/src/api/configs.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/frontend-core/src/api/configs.js b/packages/frontend-core/src/api/configs.js
index 9e320f7499..3d38cf4728 100644
--- a/packages/frontend-core/src/api/configs.js
+++ b/packages/frontend-core/src/api/configs.js
@@ -20,6 +20,17 @@ export const buildConfigEndpoints = API => ({
     })
   },
 
+  /**
+   * Deletes a global config 
+   * @param id the id of the config to delete
+   * @param rev the revision of the config to delete
+   */
+  deleteConfig: async ({ id, rev }) => {
+    return await API.delete({
+      url: `/api/global/configs/${id}/${rev}`
+    })
+  },
+
   /**
    * Gets the config for a certain tenant.
    * @param tenantId the tenant ID to get the config for

From db2cfd077fdf2f11ac3df798b075795a65e71a6a Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Thu, 12 May 2022 16:57:54 +0100
Subject: [PATCH 2/3] Allow SMTP config to be cleared

---
 .../builder/portal/manage/email/index.svelte  | 27 ++++++++++++++++++-
 packages/frontend-core/src/api/configs.js     |  4 +--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/manage/email/index.svelte b/packages/builder/src/pages/builder/portal/manage/email/index.svelte
index 56242f0fe4..057620f6ad 100644
--- a/packages/builder/src/pages/builder/portal/manage/email/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/email/index.svelte
@@ -68,6 +68,26 @@
     }
   }
 
+  async function clearSmtp() {
+    // Delete the SMTP config
+    try {
+      await API.deleteConfig({
+        id: smtpConfig._id,
+        rev: smtpConfig._rev,
+      })
+      smtpConfig = {
+        config: {},
+      }
+      await admin.getChecklist()
+      notifications.success(`Settings cleared`)
+      analytics.captureEvent(Events.SMTP.SAVED)
+    } catch (error) {
+      notifications.error(
+        `Failed to clear email settings, reason: ${error?.message || "Unknown"}`
+      )
+    }
+  }
+
   async function fetchSmtp() {
     loading = true
     try {
@@ -156,8 +176,9 @@
         </div>
       {/if}
     </Layout>
-    <div>
+    <div class="spectrum-ButtonGroup spectrum-Settings-buttonGroup">
       <Button cta on:click={saveSmtp}>Save</Button>
+      <Button secondary on:click={clearSmtp}>Clear</Button>
     </div>
     <Divider />
     <Layout gap="XS" noPadding>
@@ -186,4 +207,8 @@
     grid-gap: var(--spacing-l);
     align-items: center;
   }
+  .spectrum-Settings-buttonGroup {
+    gap: var(--spectrum-global-dimension-static-size-200);
+    align-items: flex-end;
+  }
 </style>
diff --git a/packages/frontend-core/src/api/configs.js b/packages/frontend-core/src/api/configs.js
index 3d38cf4728..8447e0d79d 100644
--- a/packages/frontend-core/src/api/configs.js
+++ b/packages/frontend-core/src/api/configs.js
@@ -21,13 +21,13 @@ export const buildConfigEndpoints = API => ({
   },
 
   /**
-   * Deletes a global config 
+   * Deletes a global config
    * @param id the id of the config to delete
    * @param rev the revision of the config to delete
    */
   deleteConfig: async ({ id, rev }) => {
     return await API.delete({
-      url: `/api/global/configs/${id}/${rev}`
+      url: `/api/global/configs/${id}/${rev}`,
     })
   },
 

From 1e33d3601e60ccbf4ffe7ea56adea1673c4d0ba2 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Thu, 12 May 2022 17:25:49 +0100
Subject: [PATCH 3/3] Disable reset button if SMTP not configured

---
 .../src/pages/builder/portal/manage/email/index.svelte | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/manage/email/index.svelte b/packages/builder/src/pages/builder/portal/manage/email/index.svelte
index 057620f6ad..a1595072af 100644
--- a/packages/builder/src/pages/builder/portal/manage/email/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/email/index.svelte
@@ -68,7 +68,7 @@
     }
   }
 
-  async function clearSmtp() {
+  async function deleteSmtp() {
     // Delete the SMTP config
     try {
       await API.deleteConfig({
@@ -178,7 +178,13 @@
     </Layout>
     <div class="spectrum-ButtonGroup spectrum-Settings-buttonGroup">
       <Button cta on:click={saveSmtp}>Save</Button>
-      <Button secondary on:click={clearSmtp}>Clear</Button>
+      <Button
+        secondary
+        on:click={deleteSmtp}
+        disabled={!$admin.checklist.smtp.checked}
+      >
+        Reset
+      </Button>
     </div>
     <Divider />
     <Layout gap="XS" noPadding>