@budibase/server 2.6.16-alpha.1 → 2.6.16

package/jest.config.ts

@@ -20,9 +20,9 @@ const baseConfig: Config.InitialProjectOptions = {
 }
 
 // add pro sources if they exist
-if (fs.existsSync("../pro/packages")) {
-  baseConfig.moduleNameMapper!["@budibase/pro"] =
-    "<rootDir>/../pro/packages/pro/src"
+if (fs.existsSync("../../../budibase-pro")) {
+  baseConfig.moduleNameMapper["@budibase/pro"] =
+    "<rootDir>/../../../budibase-pro/packages/pro/src"
 }
 
 const config: Config.InitialOptions = {

package/nodemon.json

@@ -1,10 +1,6 @@
 {
-  "watch": ["src", "../backend-core", "../pro/packages/pro"],
+  "watch": ["src", "../backend-core", "../../../budibase-pro/packages/pro"],
   "ext": "js,ts,json",
-  "ignore": [
-    "src/**/*.spec.ts",
-    "src/**/*.spec.js",
-    "../backend-core/dist/**/*"
-  ],
+  "ignore": ["src/**/*.spec.ts", "src/**/*.spec.js", "../backend-core/dist/**/*"],
   "exec": "ts-node src/index.ts"
-}
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.6.16-alpha.1",
+  "version": "2.6.16",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.6.16-alpha.1",
-    "@budibase/client": "2.6.16-alpha.1",
-    "@budibase/pro": "2.6.16-alpha.1",
-    "@budibase/shared-core": "2.6.16-alpha.1",
-    "@budibase/string-templates": "2.6.16-alpha.1",
-    "@budibase/types": "2.6.16-alpha.1",
+    "@budibase/backend-core": "^2.6.16",
+    "@budibase/client": "^2.6.16",
+    "@budibase/pro": "2.6.15",
+    "@budibase/shared-core": "^2.6.16",
+    "@budibase/string-templates": "^2.6.16",
+    "@budibase/types": "^2.6.16",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -176,5 +176,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "f117256d4e83d59b5ac23b0070ee25591e8f6d93"
+  "gitHead": "d43a6a44bd074e077ea131303c0f7a2b0e0ddb75"
 }

package/src/automations/steps/make.ts

@@ -26,10 +26,6 @@ export const definition: AutomationStepSchema = {
           type: AutomationIOType.STRING,
           title: "Webhook URL",
         },
-        body: {
-          type: AutomationIOType.JSON,
-          title: "Payload",
-        },
         value1: {
           type: AutomationIOType.STRING,
           title: "Input Value 1",
@@ -74,19 +70,7 @@ export const definition: AutomationStepSchema = {
 }
 
 export async function run({ inputs }: AutomationStepInput) {
-  //TODO - Remove deprecated values 1,2,3,4,5 after November 2023
-  const { url, value1, value2, value3, value4, value5, body } = inputs
-
-  let payload = {}
-  try {
-    payload = body?.value ? JSON.parse(body?.value) : {}
-  } catch (err) {
-    return {
-      httpStatus: 400,
-      response: "Invalid payload JSON",
-      success: false,
-    }
-  }
+  const { url, value1, value2, value3, value4, value5 } = inputs
 
   if (!url?.trim()?.length) {
     return {
@@ -105,7 +89,6 @@ export async function run({ inputs }: AutomationStepInput) {
         value3,
         value4,
         value5,
-        ...payload,
       }),
       headers: {
         "Content-Type": "application/json",

package/src/automations/steps/zapier.ts

@@ -24,10 +24,6 @@ export const definition: AutomationStepSchema = {
           type: AutomationIOType.STRING,
           title: "Webhook URL",
         },
-        body: {
-          type: AutomationIOType.JSON,
-          title: "Payload",
-        },
         value1: {
           type: AutomationIOType.STRING,
           title: "Payload Value 1",
@@ -67,19 +63,7 @@ export const definition: AutomationStepSchema = {
 }
 
 export async function run({ inputs }: AutomationStepInput) {
-  //TODO - Remove deprecated values 1,2,3,4,5 after November 2023
-  const { url, value1, value2, value3, value4, value5, body } = inputs
-
-  let payload = {}
-  try {
-    payload = body?.value ? JSON.parse(body?.value) : {}
-  } catch (err) {
-    return {
-      httpStatus: 400,
-      response: "Invalid payload JSON",
-      success: false,
-    }
-  }
+  const { url, value1, value2, value3, value4, value5 } = inputs
 
   if (!url?.trim()?.length) {
     return {
@@ -101,7 +85,6 @@ export async function run({ inputs }: AutomationStepInput) {
         value3,
         value4,
         value5,
-        ...payload,
       }),
       headers: {
         "Content-Type": "application/json",

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

@@ -0,0 +1,27 @@
+const setup = require("./utilities")
+const fetch = require("node-fetch")
+
+jest.mock("node-fetch")
+
+describe("test the outgoing webhook action", () => {
+    let inputs
+    let config = setup.getConfig()
+
+    beforeAll(async () => {
+        await config.init()
+        inputs = {
+            value1: "test",
+            url: "http://www.test.com",
+        }
+    })
+
+    afterAll(setup.afterAll)
+
+    it("should be able to run the action", async () => {
+        const res = await setup.runStep(setup.actions.zapier.stepId, inputs)
+        expect(res.response.url).toEqual("http://www.test.com")
+        expect(res.response.method).toEqual("post")
+        expect(res.success).toEqual(true)
+    })
+
+})

package/src/integrations/googlesheets.ts

@@ -15,7 +15,7 @@ import {
 } from "@budibase/types"
 import { OAuth2Client } from "google-auth-library"
 import { buildExternalTableId, finaliseExternalTables } from "./utils"
-import { GoogleSpreadsheet, GoogleSpreadsheetRow } from "google-spreadsheet"
+import { GoogleSpreadsheet } from "google-spreadsheet"
 import fetch from "node-fetch"
 import { configs, HTTPError } from "@budibase/backend-core"
 import { dataFilters } from "@budibase/shared-core"
@@ -434,20 +434,7 @@ class GoogleSheetsIntegration implements DatasourcePlus {
     try {
       await this.connect()
       const sheet = this.client.sheetsByTitle[query.sheet]
-      let rows: GoogleSpreadsheetRow[] = []
-      if (query.paginate) {
-        const limit = query.paginate.limit || 100
-        let page: number =
-          typeof query.paginate.page === "number"
-            ? query.paginate.page
-            : parseInt(query.paginate.page || "1")
-        rows = await sheet.getRows({
-          limit,
-          offset: (page - 1) * limit,
-        })
-      } else {
-        rows = await sheet.getRows()
-      }
+      const rows = await sheet.getRows()
       const filtered = dataFilters.runLuceneQuery(rows, query.filters)
       const headerValues = sheet.headerValues
       let response = []

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)
-  })
-})