From 88582b871ee651460bd0359df583ae388e93c132 Mon Sep 17 00:00:00 2001
From: Gerard Burns <gjburns9@hotmail.com>
Date: Mon, 26 Jun 2023 14:15:04 +0100
Subject: [PATCH] replace use of datasources.save with datasources.update

---
 .../buttons/ExistingRelationshipButton.svelte       |  9 +++++++--
 .../modals/UpdateDatasourceModal.svelte             |  9 +++++++--
 .../components/integration/RestQueryViewer.svelte   |  5 ++++-
 .../data/datasource/[datasourceId]/index.svelte     |  2 +-
 packages/builder/src/stores/backend/datasources.js  | 13 +------------
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
index 0f4bafb001..aa666ea8d6 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
@@ -1,8 +1,10 @@
 <script>
+  import { get } from "svelte/store"
   import { ActionButton, Modal, notifications } from "@budibase/bbui"
   import CreateEditRelationship from "../../Datasources/CreateEditRelationship.svelte"
-  import { datasources } from "../../../../stores/backend"
+  import { datasources, integrations } from "../../../../stores/backend"
   import { createEventDispatcher } from "svelte"
+  import { integrationForDatasource } from "stores/selectors"
 
   export let table
   const dispatch = createEventDispatcher()
@@ -27,7 +29,10 @@
   async function saveRelationship() {
     try {
       // Create datasource
-      await datasources.save(datasource)
+      await datasources.update({
+        datasource,
+        integration: integrationForDatasource(get(integrations), datasource),
+      })
       notifications.success(`Relationship information saved.`)
       dispatch("updatecolumns")
     } catch (err) {
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
index 89721773cf..991e170a2e 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
@@ -1,7 +1,9 @@
 <script>
-  import { datasources } from "stores/backend"
+  import { get } from "svelte/store"
+  import { datasources, integrations } from "stores/backend"
   import { notifications } from "@budibase/bbui"
   import { Input, ModalContent, Modal } from "@budibase/bbui"
+  import { integrationForDatasource } from "stores/selectors"
 
   let error = ""
   let modal
@@ -32,7 +34,10 @@
       ...datasource,
       name,
     }
-    await datasources.save(updatedDatasource)
+    await datasources.update({
+      datasource: updatedDatasource,
+      integration: integrationForDatasource(get(integrations), datasource),
+    })
     notifications.success(`Datasource ${name} updated successfully.`)
     hide()
   }
diff --git a/packages/builder/src/components/integration/RestQueryViewer.svelte b/packages/builder/src/components/integration/RestQueryViewer.svelte
index 1f21ae897e..88c10422de 100644
--- a/packages/builder/src/components/integration/RestQueryViewer.svelte
+++ b/packages/builder/src/components/integration/RestQueryViewer.svelte
@@ -176,7 +176,10 @@
       notifications.success(`Request saved successfully`)
       if (dynamicVariables) {
         datasource.config.dynamicVariables = rebuildVariables(saveId)
-        datasource = await datasources.save(datasource)
+        datasource = await datasources.update({
+          integration: integrationInfo,
+          datasource,
+        })
       }
       prettifyQueryRequestBody(
         query,
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
index cd2daa8698..3e189f68ef 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
@@ -50,7 +50,7 @@
   const saveDatasource = async () => {
     try {
       // Create datasource
-      await datasources.save(datasource)
+      await datasources.update({ datasource, integration })
       if (datasource?.plus) {
         await tables.fetch()
       }
diff --git a/packages/builder/src/stores/backend/datasources.js b/packages/builder/src/stores/backend/datasources.js
index 2e59bea183..d84e7a7515 100644
--- a/packages/builder/src/stores/backend/datasources.js
+++ b/packages/builder/src/stores/backend/datasources.js
@@ -122,6 +122,7 @@ export function createDatasourcesStore() {
   }
 
   const update = async ({ integration, datasource }) => {
+    console.log(integration, datasource)
     if (await isDatasourceInvalid(integration, datasource)) {
       throw new Error("Unable to connect")
     }
@@ -131,17 +132,6 @@ export function createDatasourcesStore() {
     return updateDatasource(response)
   }
 
-  // TODO deprecate
-  const save = async datasource => {
-    if (await isDatasourceInvalid(datasource)) {
-      throw new Error("Unable to connect")
-    }
-
-    const response = await API.updateDatasource(datasource)
-
-    return updateDatasource(response)
-  }
-
   const deleteDatasource = async datasource => {
     await API.deleteDatasource({
       datasourceId: datasource?._id,
@@ -213,7 +203,6 @@ export function createDatasourcesStore() {
     updateSchema,
     create,
     update,
-    save,
     delete: deleteDatasource,
     removeSchemaError,
     replaceDatasource,