@budibase/server 2.6.19-alpha.0 → 2.6.19

package/src/sdk/app/datasources/datasources.ts

@@ -13,7 +13,6 @@ import {
 import { cloneDeep } from "lodash/fp"
 import { getEnvironmentVariables } from "../../utils"
 import { getDefinitions, getDefinition } from "../../../integrations"
-import _ from "lodash"
 
 const ENV_VAR_PREFIX = "env."
 
@@ -42,7 +41,7 @@ async function enrichDatasourceWithValues(datasource: Datasource) {
     { onlyFound: true }
   ) as Datasource
   const definition = await getDefinition(processed.source)
-  processed.config = checkDatasourceTypes(definition!, processed.config)
+  processed.config = checkDatasourceTypes(definition, processed.config)
   return {
     datasource: processed,
     envVars: env as Record<string, string>,
@@ -148,11 +147,6 @@ export function mergeConfigs(update: Datasource, old: Datasource) {
       }
     }
   }
-
-  if (old.config?.auth) {
-    update.config = _.merge(old.config, update.config)
-  }
-
   // update back to actual passwords for everything else
   for (let [key, value] of Object.entries(update.config)) {
     if (value !== PASSWORD_REPLACEMENT) {

package/tsconfig.json

@@ -11,7 +11,7 @@
       "@budibase/backend-core": ["../backend-core/src"],
       "@budibase/backend-core/*": ["../backend-core/*"],
       "@budibase/shared-core": ["../shared-core/src"],
-      "@budibase/pro": ["../pro/packages/pro/src"]
+      "@budibase/pro": ["../../../budibase-pro/packages/pro/src"]
     }
   },
   "ts-node": {

package/src/automations/tests/make.spec.ts

@@ -1,54 +0,0 @@
-import { getConfig, afterAll, runStep, actions } from "./utilities"
-
-describe("test the outgoing webhook action", () => {
-  let config = getConfig()
-
-  beforeAll(async () => {
-    await config.init()
-  })
-
-  afterAll()
-
-  it("should be able to run the action", async () => {
-    const res = await runStep(actions.integromat.stepId, {
-      value1: "test",
-      url: "http://www.test.com",
-    })
-    expect(res.response.url).toEqual("http://www.test.com")
-    expect(res.response.method).toEqual("post")
-    expect(res.success).toEqual(true)
-  })
-
-  it("should add the payload props when a JSON string is provided", async () => {
-    const payload = `{"value1":1,"value2":2,"value3":3,"value4":4,"value5":5,"name":"Adam","age":9}`
-    const res = await runStep(actions.integromat.stepId, {
-      value1: "ONE",
-      value2: "TWO",
-      value3: "THREE",
-      value4: "FOUR",
-      value5: "FIVE",
-      body: {
-        value: payload,
-      },
-      url: "http://www.test.com",
-    })
-    expect(res.response.url).toEqual("http://www.test.com")
-    expect(res.response.method).toEqual("post")
-    expect(res.response.body).toEqual(payload)
-    expect(res.success).toEqual(true)
-  })
-
-  it("should return a 400 if the JSON payload string is malformed", async () => {
-    const payload = `{ value1 1 }`
-    const res = await runStep(actions.integromat.stepId, {
-      value1: "ONE",
-      body: {
-        value: payload,
-      },
-      url: "http://www.test.com",
-    })
-    expect(res.httpStatus).toEqual(400)
-    expect(res.response).toEqual("Invalid payload JSON")
-    expect(res.success).toEqual(false)
-  })
-})

package/src/automations/tests/zapier.spec.ts

@@ -1,56 +0,0 @@
-import { getConfig, afterAll, runStep, actions } from "./utilities"
-
-describe("test the outgoing webhook action", () => {
-  let config = getConfig()
-
-  beforeAll(async () => {
-    await config.init()
-  })
-
-  afterAll()
-
-  it("should be able to run the action", async () => {
-    const res = await runStep(actions.zapier.stepId, {
-      value1: "test",
-      url: "http://www.test.com",
-    })
-    expect(res.response.url).toEqual("http://www.test.com")
-    expect(res.response.method).toEqual("post")
-    expect(res.success).toEqual(true)
-  })
-
-  it("should add the payload props when a JSON string is provided", async () => {
-    const payload = `{ "value1": 1, "value2": 2, "value3": 3, "value4": 4, "value5": 5, "name": "Adam", "age": 9 }`
-    const res = await runStep(actions.zapier.stepId, {
-      value1: "ONE",
-      value2: "TWO",
-      value3: "THREE",
-      value4: "FOUR",
-      value5: "FIVE",
-      body: {
-        value: payload,
-      },
-      url: "http://www.test.com",
-    })
-    expect(res.response.url).toEqual("http://www.test.com")
-    expect(res.response.method).toEqual("post")
-    expect(res.response.body).toEqual(
-      `{"platform":"budibase","value1":1,"value2":2,"value3":3,"value4":4,"value5":5,"name":"Adam","age":9}`
-    )
-    expect(res.success).toEqual(true)
-  })
-
-  it("should return a 400 if the JSON payload string is malformed", async () => {
-    const payload = `{ value1 1 }`
-    const res = await runStep(actions.zapier.stepId, {
-      value1: "ONE",
-      body: {
-        value: payload,
-      },
-      url: "http://www.test.com",
-    })
-    expect(res.httpStatus).toEqual(400)
-    expect(res.response).toEqual("Invalid payload JSON")
-    expect(res.success).toEqual(false)
-  })
-})