From 6b36b8824eb7655b95f3dbda2c449ce914b0ed8d Mon Sep 17 00:00:00 2001
From: Gerard Burns <gjburns9@hotmail.com>
Date: Mon, 26 Jun 2023 15:21:24 +0100
Subject: [PATCH] PR Feedback

---
 .../backend/Datasources/ConfigEditor/index.svelte     | 11 ++---------
 .../CreateExternalDatasourceModal/index.svelte        |  2 +-
 .../_components/EditDatasourceConfig.svelte           | 10 ++--------
 packages/builder/src/stores/backend/datasources.js    |  2 --
 4 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/packages/builder/src/components/backend/Datasources/ConfigEditor/index.svelte b/packages/builder/src/components/backend/Datasources/ConfigEditor/index.svelte
index c00c3e78ee..fc24266959 100644
--- a/packages/builder/src/components/backend/Datasources/ConfigEditor/index.svelte
+++ b/packages/builder/src/components/backend/Datasources/ConfigEditor/index.svelte
@@ -31,16 +31,9 @@
         config: get(configStore).config,
         name: get(nameStore).name,
       })
-    } else {
-      notifications.send("Invalid fields", {
-        type: "error",
-        icon: "Alert",
-        autoDismiss: true,
-      })
-
-      // Prevent modal closing
-      return false
     }
+
+    return false
   }
 
   let createVariableModal
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte
index 8e20caa49d..9dfe18a407 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte
@@ -66,7 +66,7 @@
       })
       store.setDatasource(datasource)
 
-      notifications.success("Datasource created successfully.")
+      notifications.success("Datasource created successfully")
     } catch (e) {
       notifications.error(`Error creating datasource: ${e.message}`)
     }
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfig.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfig.svelte
index 218c9e1583..033b21e44c 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfig.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfig.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Modal, notifications } from "@budibase/bbui"
   import { integrationForDatasource } from "stores/selectors"
-  import { datasources, integrations, tables } from "stores/backend"
+  import { datasources, integrations } from "stores/backend"
   import DatasourceConfigEditor from "components/backend/Datasources/ConfigEditor/index.svelte"
   import EditDatasourceConfigButton from "./EditDatasourceConfigButton.svelte"
 
@@ -18,14 +18,8 @@
         datasource: { ...datasource, config, name },
       })
 
-      if (datasource?.plus) {
-        await tables.fetch()
-      }
-
-      await datasources.fetch()
-
       notifications.success(
-        `Datasource ${datasource.name} updated successfully.`
+        `Datasource ${datasource.name} updated successfully`
       )
     } catch (err) {
       notifications.error(err?.message ?? "Error saving datasource")
diff --git a/packages/builder/src/stores/backend/datasources.js b/packages/builder/src/stores/backend/datasources.js
index d84e7a7515..4e8e1cb6ad 100644
--- a/packages/builder/src/stores/backend/datasources.js
+++ b/packages/builder/src/stores/backend/datasources.js
@@ -92,7 +92,6 @@ export function createDatasourcesStore() {
   const isDatasourceInvalid = async (integration, datasource) => {
     if (integration.features?.[DatasourceFeature.CONNECTION_CHECKING]) {
       const { connected } = await API.validateDatasource(datasource)
-      console.log(connected)
       if (!connected) return true
     }
 
@@ -122,7 +121,6 @@ export function createDatasourcesStore() {
   }
 
   const update = async ({ integration, datasource }) => {
-    console.log(integration, datasource)
     if (await isDatasourceInvalid(integration, datasource)) {
       throw new Error("Unable to connect")
     }