Merge pull request #10831 from Budibase/fix/save-rest-connector

Fix/save rest connector
Budibase · Jun 8, 2023 · a1afbc8 · a1afbc8
2 parents 3e1a570 + 520e52f
commit a1afbc8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...es/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte b/...es/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte
@@ -37,7 +37,7 @@
   }
 
   async function saveDatasource() {
-    if (integration.features[DatasourceFeature.CONNECTION_CHECKING]) {
+    if (integration.features?.[DatasourceFeature.CONNECTION_CHECKING]) {
       const valid = await validateConfig()
       if (!valid) {
         return false

diff --git a/...s/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte b/...s/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
@@ -65,7 +65,7 @@
   }
 
   const saveDatasource = async () => {
-    if (integration.features[DatasourceFeature.CONNECTION_CHECKING]) {
+    if (integration.features?.[DatasourceFeature.CONNECTION_CHECKING]) {
       const valid = await validateConfig()
       if (!valid) {
         return false

diff --git a/packages/server/src/sdk/app/datasources/datasources.ts b/packages/server/src/sdk/app/datasources/datasources.ts
@@ -135,7 +135,7 @@ export function mergeConfigs(update: Datasource, old: Datasource) {
   // specific to REST datasources, fix the auth configs again if required
   if (hasAuthConfigs(update)) {
     const configs = update.config.authConfigs as RestAuthConfig[]
-    const oldConfigs = old.config?.authConfigs as RestAuthConfig[]
+    const oldConfigs = old.config?.authConfigs as RestAuthConfig[] || []
     for (let config of configs) {
       if (config.type !== RestAuthType.BASIC) {
         continue