From def2a31e75bbee615602199c40bfc7c5f0ce72b5 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 20 Jul 2021 10:55:39 +0100
Subject: [PATCH] only enable form save button when config has changed

---
 .../builder/portal/manage/auth/index.svelte   | 49 +++++++------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/manage/auth/index.svelte b/packages/builder/src/pages/builder/portal/manage/auth/index.svelte
index 7f132b5638..78c0a5a52c 100644
--- a/packages/builder/src/pages/builder/portal/manage/auth/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/auth/index.svelte
@@ -6,6 +6,7 @@
   import OktaLogo from "assets/okta-logo.png"
   import OneLoginLogo from "assets/onelogin-logo.png"
   import OidcLogoPng from "assets/oidc-logo.png"
+  import { isEqual, cloneDeep } from "lodash/fp"
 
   import {
     Button,
@@ -91,18 +92,22 @@
   let google
   let oidc
   const providers = { google, oidc }
+
+  // control the state of the save button depending on whether form has changed
+  let originalGoogleDoc
+  let originalOidcDoc
   let googleSaveButtonDisabled
   let oidcSaveButtonDisabled
-
-  $: googleSaveButtonDisabled =
-    providers.google?.config && !providers.google?.config.activated && true
-  $: oidcSaveButtonDisabled =
-    providers.oidc?.config.configs[0] &&
-    !providers.oidc?.config.configs[0].activated &&
-    true
+  $: {
+    isEqual(providers.google, originalGoogleDoc)
+      ? (googleSaveButtonDisabled = true)
+      : (googleSaveButtonDisabled = false)
+    isEqual(providers.oidc, originalOidcDoc)
+      ? (oidcSaveButtonDisabled = true)
+      : (oidcSaveButtonDisabled = false)
+  }
 
   // Create a flag so that it will only try to save completed forms
-
   $: partialGoogle =
     providers.google?.config?.clientID ||
     providers.google?.config?.clientSecret ||
@@ -138,22 +143,6 @@
     iconDropdownOptions.unshift({ label: fileName, value: fileName })
   }
 
-  const toggleGoogle = ({ detail }) => {
-    // Only save on de-activation, as the user can save themselves when toggle is active
-    if (!detail) {
-      providers.google.config.activated = detail
-      save([providers.google])
-    }
-  }
-
-  const toggleOidc = ({ detail }) => {
-    // Only save on de-activation, as the user can save themselves when toggle is active
-    if (!detail) {
-      providers.oidc.config.configs[0].activated = detail
-      save([providers.oidc])
-    }
-  }
-
   async function save(docs) {
     // only if the user has provided an image, upload it.
     image && uploadLogo(image)
@@ -225,6 +214,7 @@
         config: { activated: true },
       }
     } else {
+      originalGoogleDoc = googleDoc
       providers.google = googleDoc
     }
 
@@ -247,13 +237,15 @@
     }
     const oidcResponse = await api.get(`/api/admin/configs/${ConfigTypes.OIDC}`)
     const oidcDoc = await oidcResponse.json()
-
+    console.log("teaste")
     if (!oidcDoc._id) {
       providers.oidc = {
         type: ConfigTypes.OIDC,
         config: { configs: [{ activated: true }] },
       }
     } else {
+      console.log("hello")
+      originalOidcDoc = cloneDeep(oidcDoc)
       providers.oidc = oidcDoc
     }
   })
@@ -303,11 +295,7 @@
         <div class="field">
           <Label size="L">Activated</Label>
           <span class="alignedToggle">
-            <Toggle
-              text=""
-              on:change={toggleGoogle}
-              bind:value={providers.google.config.activated}
-            />
+            <Toggle text="" bind:value={providers.google.config.activated} />
           </span>
         </div>
       </div>
@@ -377,7 +365,6 @@
         <span class="alignedToggle">
           <Toggle
             text=""
-            on:change={toggleOidc}
             bind:value={providers.oidc.config.configs[0].activated}
           />
         </span>