From 564c724be11895fa6bc1766aef3a149fae3223e3 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 8 Mar 2023 16:30:26 +0000 Subject: [PATCH 01/77] Provides the option for blacklisting IPs. --- .../backend-core/src/blacklist/blacklist.ts | 54 +++++++++++++++++++ packages/backend-core/src/blacklist/index.ts | 1 + .../src/blacklist/tests/blacklist.spec.ts | 46 ++++++++++++++++ packages/backend-core/src/environment.ts | 1 + packages/backend-core/src/index.ts | 1 + packages/server/src/integrations/rest.ts | 4 ++ 6 files changed, 107 insertions(+) create mode 100644 packages/backend-core/src/blacklist/blacklist.ts create mode 100644 packages/backend-core/src/blacklist/index.ts create mode 100644 packages/backend-core/src/blacklist/tests/blacklist.spec.ts diff --git a/packages/backend-core/src/blacklist/blacklist.ts b/packages/backend-core/src/blacklist/blacklist.ts new file mode 100644 index 0000000000..1fbb4683f9 --- /dev/null +++ b/packages/backend-core/src/blacklist/blacklist.ts @@ -0,0 +1,54 @@ +import dns from "dns" +import net from "net" +import env from "../environment" +import { promisify } from "util" + +let blackListArray: string[] | undefined +const performLookup = promisify(dns.lookup) + +async function lookup(address: string): Promise { + if (!net.isIP(address)) { + // need this for URL parsing simply + if (!address.startsWith("http")) { + address = `https://${address}` + } + address = new URL(address).hostname + } + const addresses = await performLookup(address, { + all: true, + }) + return addresses.map(addr => addr.address) +} + +export async function refreshBlacklist() { + const blacklist = env.BLACKLIST_IPS + const list = blacklist?.split(",") || [] + let final: string[] = [] + for (let addr of list) { + const trimmed = addr.trim() + if (!net.isIP(trimmed)) { + const addresses = await lookup(trimmed) + final = final.concat(addresses) + } else { + final.push(trimmed) + } + } + blackListArray = final +} + +export async function isBlacklisted(address: string): Promise { + if (!blackListArray) { + await refreshBlacklist() + } + if (blackListArray?.length === 0) { + return false + } + // no need for DNS + let ips: string[] + if (!net.isIP(address)) { + ips = await lookup(address) + } else { + ips = [address] + } + return !!blackListArray?.find(addr => ips.includes(addr)) +} diff --git a/packages/backend-core/src/blacklist/index.ts b/packages/backend-core/src/blacklist/index.ts new file mode 100644 index 0000000000..b5123eed3e --- /dev/null +++ b/packages/backend-core/src/blacklist/index.ts @@ -0,0 +1 @@ +export * from "./blacklist" diff --git a/packages/backend-core/src/blacklist/tests/blacklist.spec.ts b/packages/backend-core/src/blacklist/tests/blacklist.spec.ts new file mode 100644 index 0000000000..23a8dd1454 --- /dev/null +++ b/packages/backend-core/src/blacklist/tests/blacklist.spec.ts @@ -0,0 +1,46 @@ +import { refreshBlacklist, isBlacklisted } from ".." +import env from "../../environment" + +describe("blacklist", () => { + beforeAll(async () => { + env._set( + "BLACKLIST_IPS", + "www.google.com,192.168.1.1, 1.1.1.1,2.2.2.2/something" + ) + await refreshBlacklist() + }) + + it("should blacklist 192.168.1.1", async () => { + expect(await isBlacklisted("192.168.1.1")).toBe(true) + }) + + it("should allow 192.168.1.2", async () => { + expect(await isBlacklisted("192.168.1.2")).toBe(false) + }) + + it("should blacklist www.google.com", async () => { + expect(await isBlacklisted("www.google.com")).toBe(true) + }) + + it("should handle a complex domain", async () => { + expect( + await isBlacklisted("https://www.google.com/derp/?something=1") + ).toBe(true) + }) + + it("should allow www.microsoft.com", async () => { + expect(await isBlacklisted("www.microsoft.com")).toBe(false) + }) + + it("should blacklist an IP that needed trimming", async () => { + expect(await isBlacklisted("1.1.1.1")).toBe(true) + }) + + it("should blacklist 1.1.1.1/something", async () => { + expect(await isBlacklisted("1.1.1.1/something")).toBe(true) + }) + + it("should blacklist 2.2.2.2", async () => { + expect(await isBlacklisted("2.2.2.2")).toBe(true) + }) +}) diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts index 8dc2cce487..cd10f9eb8a 100644 --- a/packages/backend-core/src/environment.ts +++ b/packages/backend-core/src/environment.ts @@ -95,6 +95,7 @@ const environment = { SMTP_PORT: parseInt(process.env.SMTP_PORT || ""), SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS, DISABLE_JWT_WARNING: process.env.DISABLE_JWT_WARNING, + BLACKLIST_IPS: process.env.BLACKLIST_IPS, /** * Enable to allow an admin user to login using a password. * This can be useful to prevent lockout when configuring SSO. diff --git a/packages/backend-core/src/index.ts b/packages/backend-core/src/index.ts index 48569548e3..724ecd21ba 100644 --- a/packages/backend-core/src/index.ts +++ b/packages/backend-core/src/index.ts @@ -25,6 +25,7 @@ export * as locks from "./redis/redlockImpl" export * as utils from "./utils" export * as errors from "./errors" export { default as env } from "./environment" +export * as blacklist from "./blacklist" export { SearchParams } from "./db" // Add context to tenancy for backwards compatibility // only do this for external usages to prevent internal diff --git a/packages/server/src/integrations/rest.ts b/packages/server/src/integrations/rest.ts index c24636a5fd..dc63b961c4 100644 --- a/packages/server/src/integrations/rest.ts +++ b/packages/server/src/integrations/rest.ts @@ -19,6 +19,7 @@ import { formatBytes } from "../utilities" import { performance } from "perf_hooks" import FormData from "form-data" import { URLSearchParams } from "url" +import { blacklist } from "@budibase/backend-core" const BodyTypes = { NONE: "none", @@ -398,6 +399,9 @@ class RestIntegration implements IntegrationBase { this.startTimeMs = performance.now() const url = this.getUrl(path, queryString, pagination, paginationValues) + if (await blacklist.isBlacklisted(url)) { + throw new Error("Cannot connect to URL.") + } const response = await fetch(url, input) return await this.parseResponse(response, pagination) } From bd7c91b1bd7e1ecf87eb620758454a12e9beea52 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Fri, 10 Mar 2023 14:40:26 +0000 Subject: [PATCH 02/77] Fix automation saving issue --- .../automation/SetupPanel/AutomationBlockSetup.svelte | 3 +-- packages/server/src/automations/automationUtils.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index f47fb8a086..7ede3757ce 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -50,7 +50,7 @@ $: tempFilters = filters $: stepId = block.stepId $: bindings = getAvailableBindings(block, $selectedAutomation?.definition) - $: getInputData(testData, block.inputs) + $: getInputData(testData, cloneDeep(block.inputs)) $: tableId = inputData ? inputData.tableId : null $: table = tableId ? $tables.list.find(table => table._id === inputData.tableId) @@ -79,7 +79,6 @@ searchableSchema: true, }).schema } - try { if (isTestModal) { let newTestData = { schema } diff --git a/packages/server/src/automations/automationUtils.ts b/packages/server/src/automations/automationUtils.ts index 254d9c624b..8de529834f 100644 --- a/packages/server/src/automations/automationUtils.ts +++ b/packages/server/src/automations/automationUtils.ts @@ -107,7 +107,7 @@ export function substituteLoopStep(hbsString: string, substitute: string) { let pointer = 0, openPointer = 0, closedPointer = 0 - while (pointer < hbsString.length) { + while (pointer < hbsString?.length) { openPointer = hbsString.indexOf(open, pointer) closedPointer = hbsString.indexOf(closed, pointer) + 2 if (openPointer < 0 || closedPointer < 0) { From 6d6a4816a0f075a6b5ba507d46958c1a25b278c7 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Fri, 10 Mar 2023 15:01:31 +0000 Subject: [PATCH 03/77] lint --- .../components/automation/SetupPanel/AutomationBlockSetup.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 7ede3757ce..5c999bf636 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -79,6 +79,7 @@ searchableSchema: true, }).schema } + try { if (isTestModal) { let newTestData = { schema } From b854e06b33552a3d079fdb1bc92257cafcf2dc65 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Tue, 14 Mar 2023 13:57:36 +0000 Subject: [PATCH 04/77] fix direct mutation of inputdata in rowselector --- .../automation/SetupPanel/AutomationBlockSetup.svelte | 5 ----- .../components/automation/SetupPanel/RowSelector.svelte | 7 +++++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 5c999bf636..30ab738ac9 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -63,9 +63,6 @@ const getInputData = (testData, blockInputs) => { let newInputData = testData || blockInputs - if (block.event === "app:trigger" && !newInputData?.fields) { - newInputData = cloneDeep(blockInputs) - } inputData = newInputData } @@ -214,8 +211,6 @@ function saveFilters(key) { const filters = LuceneUtils.buildLuceneQuery(tempFilters) const defKey = `${key}-def` - inputData[key] = filters - inputData[defKey] = tempFilters onChange({ detail: filters }, key) // need to store the builder definition in the automation onChange({ detail: tempFilters }, defKey) diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte index c14455b7fc..1080fc7305 100644 --- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte +++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte @@ -95,8 +95,11 @@ } const onChange = (e, field, type) => { - value[field] = coerce(e.detail, type) - dispatch("change", value) + let newValue = { + ...value, + [field]: coerce(e.detail, type), + } + dispatch("change", newValue) } const onChangeSetting = (e, field) => { From 352791dd9b3c10fe1cb7c8014ad78ac06d7e588f Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Tue, 14 Mar 2023 14:09:10 +0000 Subject: [PATCH 05/77] remove unneeded cloneDeep --- .../automation/SetupPanel/AutomationBlockSetup.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 30ab738ac9..9479aee708 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -50,7 +50,7 @@ $: tempFilters = filters $: stepId = block.stepId $: bindings = getAvailableBindings(block, $selectedAutomation?.definition) - $: getInputData(testData, cloneDeep(block.inputs)) + $: getInputData(testData, block.inputs) $: tableId = inputData ? inputData.tableId : null $: table = tableId ? $tables.list.find(table => table._id === inputData.tableId) From 17cb6bc97d831c23db7d19c211ae641f109f280d Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 14 Mar 2023 14:13:54 +0000 Subject: [PATCH 06/77] v2.4.27 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index b47cca4c23..a7781108e5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.26", + "version": "2.4.27", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index c27893051d..94bf5a2ba6 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.26", + "version": "2.4.27", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.4.26", + "@budibase/types": "^2.4.27", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 6f37501ca6..5b06197714 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.4.26", + "version": "2.4.27", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.4.26", - "@budibase/string-templates": "^2.4.26", + "@budibase/shared-core": "^2.4.27", + "@budibase/string-templates": "^2.4.27", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 1b910f2def..4d5041f5c8 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.26", + "version": "2.4.27", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.26", - "@budibase/client": "^2.4.26", - "@budibase/frontend-core": "^2.4.26", - "@budibase/shared-core": "^2.4.26", - "@budibase/string-templates": "^2.4.26", + "@budibase/bbui": "^2.4.27", + "@budibase/client": "^2.4.27", + "@budibase/frontend-core": "^2.4.27", + "@budibase/shared-core": "^2.4.27", + "@budibase/string-templates": "^2.4.27", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 146e76f19e..2753bdb47f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.26", + "version": "2.4.27", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.4.26", - "@budibase/string-templates": "^2.4.26", - "@budibase/types": "^2.4.26", + "@budibase/backend-core": "^2.4.27", + "@budibase/string-templates": "^2.4.27", + "@budibase/types": "^2.4.27", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index ea62d102fc..2ab8d12ee3 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.26", + "version": "2.4.27", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.4.26", - "@budibase/frontend-core": "^2.4.26", - "@budibase/shared-core": "^2.4.26", - "@budibase/string-templates": "^2.4.26", - "@budibase/types": "^2.4.26", + "@budibase/bbui": "^2.4.27", + "@budibase/frontend-core": "^2.4.27", + "@budibase/shared-core": "^2.4.27", + "@budibase/string-templates": "^2.4.27", + "@budibase/types": "^2.4.27", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 402a95474c..aa8cd04b59 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.26", + "version": "2.4.27", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.4.26", - "@budibase/shared-core": "^2.4.26", + "@budibase/bbui": "^2.4.27", + "@budibase/shared-core": "^2.4.27", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index b9ee415bd5..6290cdc868 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.26", + "version": "2.4.27", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 8a14b00fee..35771adbdf 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.26", + "version": "2.4.27", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.26", - "@budibase/client": "^2.4.26", + "@budibase/backend-core": "^2.4.27", + "@budibase/client": "^2.4.27", "@budibase/pro": "2.4.26", - "@budibase/shared-core": "^2.4.26", - "@budibase/string-templates": "^2.4.26", - "@budibase/types": "^2.4.26", + "@budibase/shared-core": "^2.4.27", + "@budibase/string-templates": "^2.4.27", + "@budibase/types": "^2.4.27", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 1ed7d4243e..6440822f16 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.26", + "version": "2.4.27", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.4.26" + "@budibase/types": "^2.4.27" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 998715179f..afded1b9a5 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.26", + "version": "2.4.27", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 56f4e56dd0..17a02be23c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.26", + "version": "2.4.27", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 7f4797bd1b..635c50c072 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.26", + "version": "2.4.27", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.4.26", + "@budibase/backend-core": "^2.4.27", "@budibase/pro": "2.4.26", - "@budibase/string-templates": "^2.4.26", - "@budibase/types": "^2.4.26", + "@budibase/string-templates": "^2.4.27", + "@budibase/types": "^2.4.27", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 940c402992a6ee199c0c82e460625ab749b18f69 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 14 Mar 2023 14:17:10 +0000 Subject: [PATCH 07/77] Update pro version to 2.4.27 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 35771adbdf..9cd91208f9 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.4.27", "@budibase/client": "^2.4.27", - "@budibase/pro": "2.4.26", + "@budibase/pro": "2.4.27", "@budibase/shared-core": "^2.4.27", "@budibase/string-templates": "^2.4.27", "@budibase/types": "^2.4.27", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index d09ac3c7c9..f43ee3af07 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1278,14 +1278,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.26": - version "2.4.26" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.26.tgz#ae9679f20e86ce1706d6d549aed78a342365a4b4" - integrity sha512-9QYJbAT9WPiOckBIR6a/CoqqbUiP9vlmc/Iy5TR5Yj2wy1JnWsf09ReTuL3CsHmh+8bCJlUHZZC4m6PUMg7+ow== +"@budibase/backend-core@2.4.27": + version "2.4.27" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.27.tgz#cb4f9a0330b11576895bb659419831a855d3567e" + integrity sha512-pz/taKJ+w0quOzWpG0G4TlVKZuX2f9vit+9LS88HbMwGiIfQg8u9l4qH6H6ALkf89JI98EiW0YAdr30HwQdZYQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.26" + "@budibase/types" "^2.4.27" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1417,14 +1417,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.26": - version "2.4.26" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.26.tgz#37ca2b94f5dfc28ee4ff0ffa088e29112de5b66f" - integrity sha512-PXpsj5DFnUaSlp3AHZRZa/N4CD02HPpvVFv35/FUGkeGwGJ5AihhmzxlD54U9Q9X3Ln8miejYTFoWvEnV5Ei8w== +"@budibase/pro@2.4.27": + version "2.4.27" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.27.tgz#6aeffb71e75ef80d291a6ed7efb5ebd25741fd53" + integrity sha512-wfkMfa5fnquwjzH2hRoJSFW78Y8O8+usoi5PuTHwgsH3h4pxI/7f1tu60SKHziQsydu7N6Erc6GAk7RMvkV+ig== dependencies: - "@budibase/backend-core" "2.4.26" + "@budibase/backend-core" "2.4.27" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.26" + "@budibase/types" "2.4.27" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1463,10 +1463,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.26", "@budibase/types@^2.4.26": - version "2.4.26" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.26.tgz#c4efd9286e736feee56d623c21a9f6fd7c922b94" - integrity sha512-q2QfDXJAopmHNq6Y25udmVJoEtnoskZEtaMy5d7/hX4jePJX3QnBd9sjgnAoOeSC3NOuXDjmvcRGtqXz6ao/Ag== +"@budibase/types@2.4.27", "@budibase/types@^2.4.27": + version "2.4.27" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.27.tgz#340a5d1ff93a3d3295931dda0ed6cc8983eef9cc" + integrity sha512-bmkCuEgmFliM0b7fwt4ikkpqKWuN90tRvhKjTGtzuYJqA8daefTK+U1LoXpJZZDYrVWZt8apckBID4HHBf8fkg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 635c50c072..8eecfebcde 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.4.27", - "@budibase/pro": "2.4.26", + "@budibase/pro": "2.4.27", "@budibase/string-templates": "^2.4.27", "@budibase/types": "^2.4.27", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 7855e71965..a7c9393fcc 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.26": - version "2.4.26" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.26.tgz#ae9679f20e86ce1706d6d549aed78a342365a4b4" - integrity sha512-9QYJbAT9WPiOckBIR6a/CoqqbUiP9vlmc/Iy5TR5Yj2wy1JnWsf09ReTuL3CsHmh+8bCJlUHZZC4m6PUMg7+ow== +"@budibase/backend-core@2.4.27": + version "2.4.27" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.27.tgz#cb4f9a0330b11576895bb659419831a855d3567e" + integrity sha512-pz/taKJ+w0quOzWpG0G4TlVKZuX2f9vit+9LS88HbMwGiIfQg8u9l4qH6H6ALkf89JI98EiW0YAdr30HwQdZYQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.26" + "@budibase/types" "^2.4.27" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.26": - version "2.4.26" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.26.tgz#37ca2b94f5dfc28ee4ff0ffa088e29112de5b66f" - integrity sha512-PXpsj5DFnUaSlp3AHZRZa/N4CD02HPpvVFv35/FUGkeGwGJ5AihhmzxlD54U9Q9X3Ln8miejYTFoWvEnV5Ei8w== +"@budibase/pro@2.4.27": + version "2.4.27" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.27.tgz#6aeffb71e75ef80d291a6ed7efb5ebd25741fd53" + integrity sha512-wfkMfa5fnquwjzH2hRoJSFW78Y8O8+usoi5PuTHwgsH3h4pxI/7f1tu60SKHziQsydu7N6Erc6GAk7RMvkV+ig== dependencies: - "@budibase/backend-core" "2.4.26" + "@budibase/backend-core" "2.4.27" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.26" + "@budibase/types" "2.4.27" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.26", "@budibase/types@^2.4.26": - version "2.4.26" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.26.tgz#c4efd9286e736feee56d623c21a9f6fd7c922b94" - integrity sha512-q2QfDXJAopmHNq6Y25udmVJoEtnoskZEtaMy5d7/hX4jePJX3QnBd9sjgnAoOeSC3NOuXDjmvcRGtqXz6ao/Ag== +"@budibase/types@2.4.27", "@budibase/types@^2.4.27": + version "2.4.27" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.27.tgz#340a5d1ff93a3d3295931dda0ed6cc8983eef9cc" + integrity sha512-bmkCuEgmFliM0b7fwt4ikkpqKWuN90tRvhKjTGtzuYJqA8daefTK+U1LoXpJZZDYrVWZt8apckBID4HHBf8fkg== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 4591bf64ee5fce4e85c5dfa810821914b9f2555c Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Tue, 14 Mar 2023 14:23:39 +0000 Subject: [PATCH 08/77] lint --- .../components/automation/SetupPanel/AutomationBlockSetup.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 9479aee708..7a9d766ab2 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -32,7 +32,6 @@ import { getSchemaForTable } from "builderStore/dataBinding" import { Utils } from "@budibase/frontend-core" import { TriggerStepID, ActionStepID } from "constants/backend/automations" - import { cloneDeep } from "lodash/fp" import { onMount } from "svelte" export let block From b11b1b447efff86de513155f900735aa23ca9bfb Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 14 Mar 2023 14:47:54 +0000 Subject: [PATCH 09/77] v2.4.28 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index a7781108e5..f061fa7074 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.27", + "version": "2.4.28", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 94bf5a2ba6..fff5455ef8 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.27", + "version": "2.4.28", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.4.27", + "@budibase/types": "^2.4.28", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 5b06197714..9f47f56084 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.4.27", + "version": "2.4.28", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.4.27", - "@budibase/string-templates": "^2.4.27", + "@budibase/shared-core": "^2.4.28", + "@budibase/string-templates": "^2.4.28", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 4d5041f5c8..9fb52b4312 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.27", + "version": "2.4.28", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.27", - "@budibase/client": "^2.4.27", - "@budibase/frontend-core": "^2.4.27", - "@budibase/shared-core": "^2.4.27", - "@budibase/string-templates": "^2.4.27", + "@budibase/bbui": "^2.4.28", + "@budibase/client": "^2.4.28", + "@budibase/frontend-core": "^2.4.28", + "@budibase/shared-core": "^2.4.28", + "@budibase/string-templates": "^2.4.28", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 2753bdb47f..7503bbf8d0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.27", + "version": "2.4.28", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.4.27", - "@budibase/string-templates": "^2.4.27", - "@budibase/types": "^2.4.27", + "@budibase/backend-core": "^2.4.28", + "@budibase/string-templates": "^2.4.28", + "@budibase/types": "^2.4.28", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 2ab8d12ee3..1546981f02 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.27", + "version": "2.4.28", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.4.27", - "@budibase/frontend-core": "^2.4.27", - "@budibase/shared-core": "^2.4.27", - "@budibase/string-templates": "^2.4.27", - "@budibase/types": "^2.4.27", + "@budibase/bbui": "^2.4.28", + "@budibase/frontend-core": "^2.4.28", + "@budibase/shared-core": "^2.4.28", + "@budibase/string-templates": "^2.4.28", + "@budibase/types": "^2.4.28", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index aa8cd04b59..302aa109ea 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.27", + "version": "2.4.28", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.4.27", - "@budibase/shared-core": "^2.4.27", + "@budibase/bbui": "^2.4.28", + "@budibase/shared-core": "^2.4.28", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 6290cdc868..7eed78514e 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.27", + "version": "2.4.28", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 9cd91208f9..ba64e3c2ba 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.27", + "version": "2.4.28", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.27", - "@budibase/client": "^2.4.27", + "@budibase/backend-core": "^2.4.28", + "@budibase/client": "^2.4.28", "@budibase/pro": "2.4.27", - "@budibase/shared-core": "^2.4.27", - "@budibase/string-templates": "^2.4.27", - "@budibase/types": "^2.4.27", + "@budibase/shared-core": "^2.4.28", + "@budibase/string-templates": "^2.4.28", + "@budibase/types": "^2.4.28", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 6440822f16..84928e1423 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.27", + "version": "2.4.28", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.4.27" + "@budibase/types": "^2.4.28" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index afded1b9a5..eee8e06727 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.27", + "version": "2.4.28", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 17a02be23c..b112f760f6 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.27", + "version": "2.4.28", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 8eecfebcde..0e66b146b5 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.27", + "version": "2.4.28", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.4.27", + "@budibase/backend-core": "^2.4.28", "@budibase/pro": "2.4.27", - "@budibase/string-templates": "^2.4.27", - "@budibase/types": "^2.4.27", + "@budibase/string-templates": "^2.4.28", + "@budibase/types": "^2.4.28", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 1f6ba71071f152dc76eaae17f213ec37e16345a4 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 14 Mar 2023 14:50:58 +0000 Subject: [PATCH 10/77] Update pro version to 2.4.28 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index ba64e3c2ba..d434427225 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.4.28", "@budibase/client": "^2.4.28", - "@budibase/pro": "2.4.27", + "@budibase/pro": "2.4.28", "@budibase/shared-core": "^2.4.28", "@budibase/string-templates": "^2.4.28", "@budibase/types": "^2.4.28", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index f43ee3af07..5ac7548465 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1278,14 +1278,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.27": - version "2.4.27" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.27.tgz#cb4f9a0330b11576895bb659419831a855d3567e" - integrity sha512-pz/taKJ+w0quOzWpG0G4TlVKZuX2f9vit+9LS88HbMwGiIfQg8u9l4qH6H6ALkf89JI98EiW0YAdr30HwQdZYQ== +"@budibase/backend-core@2.4.28": + version "2.4.28" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.28.tgz#37f31d1dc36a22872e47382253b394694e83feb7" + integrity sha512-q2z2V7Q8BXSN/U6NcWuJORZB64DSC5L9O7UxQ71UMIKclkjAKbL0NHU0Cbe2dwknyGqCYeL7vhPeZ8IODKEjTA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.27" + "@budibase/types" "^2.4.28" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1417,14 +1417,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.27": - version "2.4.27" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.27.tgz#6aeffb71e75ef80d291a6ed7efb5ebd25741fd53" - integrity sha512-wfkMfa5fnquwjzH2hRoJSFW78Y8O8+usoi5PuTHwgsH3h4pxI/7f1tu60SKHziQsydu7N6Erc6GAk7RMvkV+ig== +"@budibase/pro@2.4.28": + version "2.4.28" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.28.tgz#d06cdbba98cd91175d6646e9e0d3c3bcef653e15" + integrity sha512-xHGG5WGgUc3jKTgw7PK6tfircvig1nDX6gtQYt1qnEtwK8KO68zKlHqy3VJR52a0h5RNJhEntUo7sJjgqlQvOA== dependencies: - "@budibase/backend-core" "2.4.27" + "@budibase/backend-core" "2.4.28" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.27" + "@budibase/types" "2.4.28" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1463,10 +1463,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.27", "@budibase/types@^2.4.27": - version "2.4.27" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.27.tgz#340a5d1ff93a3d3295931dda0ed6cc8983eef9cc" - integrity sha512-bmkCuEgmFliM0b7fwt4ikkpqKWuN90tRvhKjTGtzuYJqA8daefTK+U1LoXpJZZDYrVWZt8apckBID4HHBf8fkg== +"@budibase/types@2.4.28", "@budibase/types@^2.4.28": + version "2.4.28" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.28.tgz#1d78bc7fb9de9f77b9f8dee8388f4ed7041c9f84" + integrity sha512-UHgdQSgpoKsgs2SVGe0wuYpieZ1is0tO793V2vdgQPzitpwvpxTqgKG/wk+i87vjC51ChcXniGi+mKhkoU6Qiw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 0e66b146b5..17cd51592c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.4.28", - "@budibase/pro": "2.4.27", + "@budibase/pro": "2.4.28", "@budibase/string-templates": "^2.4.28", "@budibase/types": "^2.4.28", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index a7c9393fcc..a7a493083c 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.27": - version "2.4.27" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.27.tgz#cb4f9a0330b11576895bb659419831a855d3567e" - integrity sha512-pz/taKJ+w0quOzWpG0G4TlVKZuX2f9vit+9LS88HbMwGiIfQg8u9l4qH6H6ALkf89JI98EiW0YAdr30HwQdZYQ== +"@budibase/backend-core@2.4.28": + version "2.4.28" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.28.tgz#37f31d1dc36a22872e47382253b394694e83feb7" + integrity sha512-q2z2V7Q8BXSN/U6NcWuJORZB64DSC5L9O7UxQ71UMIKclkjAKbL0NHU0Cbe2dwknyGqCYeL7vhPeZ8IODKEjTA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.27" + "@budibase/types" "^2.4.28" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.27": - version "2.4.27" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.27.tgz#6aeffb71e75ef80d291a6ed7efb5ebd25741fd53" - integrity sha512-wfkMfa5fnquwjzH2hRoJSFW78Y8O8+usoi5PuTHwgsH3h4pxI/7f1tu60SKHziQsydu7N6Erc6GAk7RMvkV+ig== +"@budibase/pro@2.4.28": + version "2.4.28" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.28.tgz#d06cdbba98cd91175d6646e9e0d3c3bcef653e15" + integrity sha512-xHGG5WGgUc3jKTgw7PK6tfircvig1nDX6gtQYt1qnEtwK8KO68zKlHqy3VJR52a0h5RNJhEntUo7sJjgqlQvOA== dependencies: - "@budibase/backend-core" "2.4.27" + "@budibase/backend-core" "2.4.28" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.27" + "@budibase/types" "2.4.28" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.27", "@budibase/types@^2.4.27": - version "2.4.27" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.27.tgz#340a5d1ff93a3d3295931dda0ed6cc8983eef9cc" - integrity sha512-bmkCuEgmFliM0b7fwt4ikkpqKWuN90tRvhKjTGtzuYJqA8daefTK+U1LoXpJZZDYrVWZt8apckBID4HHBf8fkg== +"@budibase/types@2.4.28", "@budibase/types@^2.4.28": + version "2.4.28" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.28.tgz#1d78bc7fb9de9f77b9f8dee8388f4ed7041c9f84" + integrity sha512-UHgdQSgpoKsgs2SVGe0wuYpieZ1is0tO793V2vdgQPzitpwvpxTqgKG/wk+i87vjC51ChcXniGi+mKhkoU6Qiw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From fe3a819b9010fa009749f1a3dcfc9c649bb98ace Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 15 Mar 2023 08:58:46 +0000 Subject: [PATCH 11/77] v2.4.29 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index f061fa7074..b4d6b8cdc0 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.28", + "version": "2.4.29", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index fff5455ef8..3b92d189a6 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.28", + "version": "2.4.29", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.4.28", + "@budibase/types": "^2.4.29", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 9f47f56084..ed8994e171 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.4.28", + "version": "2.4.29", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.4.28", - "@budibase/string-templates": "^2.4.28", + "@budibase/shared-core": "^2.4.29", + "@budibase/string-templates": "^2.4.29", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 9fb52b4312..4b46cb233c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.28", + "version": "2.4.29", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.28", - "@budibase/client": "^2.4.28", - "@budibase/frontend-core": "^2.4.28", - "@budibase/shared-core": "^2.4.28", - "@budibase/string-templates": "^2.4.28", + "@budibase/bbui": "^2.4.29", + "@budibase/client": "^2.4.29", + "@budibase/frontend-core": "^2.4.29", + "@budibase/shared-core": "^2.4.29", + "@budibase/string-templates": "^2.4.29", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 7503bbf8d0..ec78cb17a0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.28", + "version": "2.4.29", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.4.28", - "@budibase/string-templates": "^2.4.28", - "@budibase/types": "^2.4.28", + "@budibase/backend-core": "^2.4.29", + "@budibase/string-templates": "^2.4.29", + "@budibase/types": "^2.4.29", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 1546981f02..ecc9f1743f 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.28", + "version": "2.4.29", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.4.28", - "@budibase/frontend-core": "^2.4.28", - "@budibase/shared-core": "^2.4.28", - "@budibase/string-templates": "^2.4.28", - "@budibase/types": "^2.4.28", + "@budibase/bbui": "^2.4.29", + "@budibase/frontend-core": "^2.4.29", + "@budibase/shared-core": "^2.4.29", + "@budibase/string-templates": "^2.4.29", + "@budibase/types": "^2.4.29", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 302aa109ea..6e95113b97 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.28", + "version": "2.4.29", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.4.28", - "@budibase/shared-core": "^2.4.28", + "@budibase/bbui": "^2.4.29", + "@budibase/shared-core": "^2.4.29", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 7eed78514e..063f1a29e5 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.28", + "version": "2.4.29", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index d434427225..52000b3b2a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.28", + "version": "2.4.29", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.28", - "@budibase/client": "^2.4.28", + "@budibase/backend-core": "^2.4.29", + "@budibase/client": "^2.4.29", "@budibase/pro": "2.4.28", - "@budibase/shared-core": "^2.4.28", - "@budibase/string-templates": "^2.4.28", - "@budibase/types": "^2.4.28", + "@budibase/shared-core": "^2.4.29", + "@budibase/string-templates": "^2.4.29", + "@budibase/types": "^2.4.29", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 84928e1423..42734292c1 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.28", + "version": "2.4.29", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.4.28" + "@budibase/types": "^2.4.29" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index eee8e06727..346a5d9902 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.28", + "version": "2.4.29", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index b112f760f6..fd4ec46e45 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.28", + "version": "2.4.29", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 17cd51592c..dd6d9ef6f2 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.28", + "version": "2.4.29", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.4.28", + "@budibase/backend-core": "^2.4.29", "@budibase/pro": "2.4.28", - "@budibase/string-templates": "^2.4.28", - "@budibase/types": "^2.4.28", + "@budibase/string-templates": "^2.4.29", + "@budibase/types": "^2.4.29", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 8b0841cb4f197b96b0c955a1fb370ef48f33e0b9 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 15 Mar 2023 09:01:41 +0000 Subject: [PATCH 12/77] Update pro version to 2.4.29 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 52000b3b2a..d912b9b5e2 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.4.29", "@budibase/client": "^2.4.29", - "@budibase/pro": "2.4.28", + "@budibase/pro": "2.4.29", "@budibase/shared-core": "^2.4.29", "@budibase/string-templates": "^2.4.29", "@budibase/types": "^2.4.29", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 5ac7548465..466b80d8ac 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1278,14 +1278,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.28": - version "2.4.28" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.28.tgz#37f31d1dc36a22872e47382253b394694e83feb7" - integrity sha512-q2z2V7Q8BXSN/U6NcWuJORZB64DSC5L9O7UxQ71UMIKclkjAKbL0NHU0Cbe2dwknyGqCYeL7vhPeZ8IODKEjTA== +"@budibase/backend-core@2.4.29": + version "2.4.29" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.29.tgz#729fe802ed115a2081f05bb5496c445a52688578" + integrity sha512-nn30MrJl51NDjla/vH4d3ij+UqT4q1lFpsemVNylW33GkQedzVPv+kh+SYQNoRg7tQLJ0AdZYRH8qw6umEJbbQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.28" + "@budibase/types" "^2.4.29" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1417,14 +1417,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.28": - version "2.4.28" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.28.tgz#d06cdbba98cd91175d6646e9e0d3c3bcef653e15" - integrity sha512-xHGG5WGgUc3jKTgw7PK6tfircvig1nDX6gtQYt1qnEtwK8KO68zKlHqy3VJR52a0h5RNJhEntUo7sJjgqlQvOA== +"@budibase/pro@2.4.29": + version "2.4.29" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.29.tgz#6b2f5fa214a02b45e0bfd8a5c79325a34c6e4c3e" + integrity sha512-R2GCi4NdiCHplPgpr2wM6ecGuOoNJw5Sbp4ntdeX/k/Xs2o1es/RLA1G/Ofn5YlCLsTHvX1SXOW3fi0q8+JN1Q== dependencies: - "@budibase/backend-core" "2.4.28" + "@budibase/backend-core" "2.4.29" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.28" + "@budibase/types" "2.4.29" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1463,10 +1463,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.28", "@budibase/types@^2.4.28": - version "2.4.28" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.28.tgz#1d78bc7fb9de9f77b9f8dee8388f4ed7041c9f84" - integrity sha512-UHgdQSgpoKsgs2SVGe0wuYpieZ1is0tO793V2vdgQPzitpwvpxTqgKG/wk+i87vjC51ChcXniGi+mKhkoU6Qiw== +"@budibase/types@2.4.29", "@budibase/types@^2.4.29": + version "2.4.29" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.29.tgz#56bf9e561ffc3f38d16cc1320b2c92a4129af275" + integrity sha512-lwryRRsXIVm8j+DGL408HWmVPFmxsUT31ZKPIsa5qyDtYxaSQ9t3erotECmzZIMuoyJmiu1t2V+QAW2Lic9Ddg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index dd6d9ef6f2..9176059581 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.4.29", - "@budibase/pro": "2.4.28", + "@budibase/pro": "2.4.29", "@budibase/string-templates": "^2.4.29", "@budibase/types": "^2.4.29", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index a7a493083c..10d7b7b8a1 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.28": - version "2.4.28" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.28.tgz#37f31d1dc36a22872e47382253b394694e83feb7" - integrity sha512-q2z2V7Q8BXSN/U6NcWuJORZB64DSC5L9O7UxQ71UMIKclkjAKbL0NHU0Cbe2dwknyGqCYeL7vhPeZ8IODKEjTA== +"@budibase/backend-core@2.4.29": + version "2.4.29" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.29.tgz#729fe802ed115a2081f05bb5496c445a52688578" + integrity sha512-nn30MrJl51NDjla/vH4d3ij+UqT4q1lFpsemVNylW33GkQedzVPv+kh+SYQNoRg7tQLJ0AdZYRH8qw6umEJbbQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.28" + "@budibase/types" "^2.4.29" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.28": - version "2.4.28" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.28.tgz#d06cdbba98cd91175d6646e9e0d3c3bcef653e15" - integrity sha512-xHGG5WGgUc3jKTgw7PK6tfircvig1nDX6gtQYt1qnEtwK8KO68zKlHqy3VJR52a0h5RNJhEntUo7sJjgqlQvOA== +"@budibase/pro@2.4.29": + version "2.4.29" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.29.tgz#6b2f5fa214a02b45e0bfd8a5c79325a34c6e4c3e" + integrity sha512-R2GCi4NdiCHplPgpr2wM6ecGuOoNJw5Sbp4ntdeX/k/Xs2o1es/RLA1G/Ofn5YlCLsTHvX1SXOW3fi0q8+JN1Q== dependencies: - "@budibase/backend-core" "2.4.28" + "@budibase/backend-core" "2.4.29" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.28" + "@budibase/types" "2.4.29" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.28", "@budibase/types@^2.4.28": - version "2.4.28" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.28.tgz#1d78bc7fb9de9f77b9f8dee8388f4ed7041c9f84" - integrity sha512-UHgdQSgpoKsgs2SVGe0wuYpieZ1is0tO793V2vdgQPzitpwvpxTqgKG/wk+i87vjC51ChcXniGi+mKhkoU6Qiw== +"@budibase/types@2.4.29", "@budibase/types@^2.4.29": + version "2.4.29" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.29.tgz#56bf9e561ffc3f38d16cc1320b2c92a4129af275" + integrity sha512-lwryRRsXIVm8j+DGL408HWmVPFmxsUT31ZKPIsa5qyDtYxaSQ9t3erotECmzZIMuoyJmiu1t2V+QAW2Lic9Ddg== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 931c295c9af50ade970d0fe4ad95493c2e7675ab Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Wed, 15 Mar 2023 10:13:02 +0000 Subject: [PATCH 13/77] Fix preprod stale deploy (#10034) --- .github/workflows/deploy-preprod.yml | 1 + .github/workflows/release-master.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml index 3015a9ad27..0df8d20405 100644 --- a/.github/workflows/deploy-preprod.yml +++ b/.github/workflows/deploy-preprod.yml @@ -17,6 +17,7 @@ jobs: id: version run: | if [ -z "${{ github.event.inputs.version }}" ]; then + git pull release_version=$(cat lerna.json | jq -r '.version') else release_version=${{ github.event.inputs.version }} diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index 20a48f5802..41af142bfc 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -134,6 +134,7 @@ jobs: - name: Get the latest budibase release version id: version run: | + git pull release_version=$(cat lerna.json | jq -r '.version') echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV From af55dd132edd828a9fb384e4da8d6b24a7786a34 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 15 Mar 2023 10:22:07 +0000 Subject: [PATCH 14/77] v2.4.30 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index b4d6b8cdc0..ddb9ba4ca3 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.29", + "version": "2.4.30", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 3b92d189a6..8fbf23ec7e 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.29", + "version": "2.4.30", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.4.29", + "@budibase/types": "^2.4.30", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index ed8994e171..5430c4f368 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.4.29", + "version": "2.4.30", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.4.29", - "@budibase/string-templates": "^2.4.29", + "@budibase/shared-core": "^2.4.30", + "@budibase/string-templates": "^2.4.30", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 4b46cb233c..0f0b0f454a 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.29", + "version": "2.4.30", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.29", - "@budibase/client": "^2.4.29", - "@budibase/frontend-core": "^2.4.29", - "@budibase/shared-core": "^2.4.29", - "@budibase/string-templates": "^2.4.29", + "@budibase/bbui": "^2.4.30", + "@budibase/client": "^2.4.30", + "@budibase/frontend-core": "^2.4.30", + "@budibase/shared-core": "^2.4.30", + "@budibase/string-templates": "^2.4.30", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index ec78cb17a0..37438bc8ee 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.29", + "version": "2.4.30", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.4.29", - "@budibase/string-templates": "^2.4.29", - "@budibase/types": "^2.4.29", + "@budibase/backend-core": "^2.4.30", + "@budibase/string-templates": "^2.4.30", + "@budibase/types": "^2.4.30", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index ecc9f1743f..e53525077c 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.29", + "version": "2.4.30", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.4.29", - "@budibase/frontend-core": "^2.4.29", - "@budibase/shared-core": "^2.4.29", - "@budibase/string-templates": "^2.4.29", - "@budibase/types": "^2.4.29", + "@budibase/bbui": "^2.4.30", + "@budibase/frontend-core": "^2.4.30", + "@budibase/shared-core": "^2.4.30", + "@budibase/string-templates": "^2.4.30", + "@budibase/types": "^2.4.30", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 6e95113b97..981582a652 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.29", + "version": "2.4.30", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.4.29", - "@budibase/shared-core": "^2.4.29", + "@budibase/bbui": "^2.4.30", + "@budibase/shared-core": "^2.4.30", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 063f1a29e5..76ad560d00 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.29", + "version": "2.4.30", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index d912b9b5e2..3321e97667 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.29", + "version": "2.4.30", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.29", - "@budibase/client": "^2.4.29", + "@budibase/backend-core": "^2.4.30", + "@budibase/client": "^2.4.30", "@budibase/pro": "2.4.29", - "@budibase/shared-core": "^2.4.29", - "@budibase/string-templates": "^2.4.29", - "@budibase/types": "^2.4.29", + "@budibase/shared-core": "^2.4.30", + "@budibase/string-templates": "^2.4.30", + "@budibase/types": "^2.4.30", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 42734292c1..462263cbdb 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.29", + "version": "2.4.30", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.4.29" + "@budibase/types": "^2.4.30" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 346a5d9902..2d5118fa62 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.29", + "version": "2.4.30", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index fd4ec46e45..908343d807 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.29", + "version": "2.4.30", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 9176059581..8ed8c3b8a3 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.29", + "version": "2.4.30", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.4.29", + "@budibase/backend-core": "^2.4.30", "@budibase/pro": "2.4.29", - "@budibase/string-templates": "^2.4.29", - "@budibase/types": "^2.4.29", + "@budibase/string-templates": "^2.4.30", + "@budibase/types": "^2.4.30", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 3edb9a76d5319a13d4722c64c7c84f1004d9ccd9 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 15 Mar 2023 10:25:04 +0000 Subject: [PATCH 15/77] Update pro version to 2.4.30 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 3321e97667..b8c88f173d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.4.30", "@budibase/client": "^2.4.30", - "@budibase/pro": "2.4.29", + "@budibase/pro": "2.4.30", "@budibase/shared-core": "^2.4.30", "@budibase/string-templates": "^2.4.30", "@budibase/types": "^2.4.30", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 466b80d8ac..ee65ace137 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1278,14 +1278,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.29": - version "2.4.29" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.29.tgz#729fe802ed115a2081f05bb5496c445a52688578" - integrity sha512-nn30MrJl51NDjla/vH4d3ij+UqT4q1lFpsemVNylW33GkQedzVPv+kh+SYQNoRg7tQLJ0AdZYRH8qw6umEJbbQ== +"@budibase/backend-core@2.4.30": + version "2.4.30" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.30.tgz#f39ac017b033f71ffc1ec872338391b8ee1960c3" + integrity sha512-k/brv60QQbba0FgTJ9hZiWPVhRRLv6kticaWqfeaQc601sbSiqDwaAjWtPyBD6w8JrReD+/DaTewhkyBjvDRVg== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.29" + "@budibase/types" "^2.4.30" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1417,14 +1417,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.29": - version "2.4.29" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.29.tgz#6b2f5fa214a02b45e0bfd8a5c79325a34c6e4c3e" - integrity sha512-R2GCi4NdiCHplPgpr2wM6ecGuOoNJw5Sbp4ntdeX/k/Xs2o1es/RLA1G/Ofn5YlCLsTHvX1SXOW3fi0q8+JN1Q== +"@budibase/pro@2.4.30": + version "2.4.30" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.30.tgz#8dbecb75c3d0a2b7feecaa3ae811bc80a64e495f" + integrity sha512-gH3QUhCCTDzFqIUhzHbLGRH6mGy0t5hlOa8wkF64Dqa8Sl34uYwHQjdJm61tQ3k7BfidSas/JXGklskam7U/dw== dependencies: - "@budibase/backend-core" "2.4.29" + "@budibase/backend-core" "2.4.30" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.29" + "@budibase/types" "2.4.30" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1463,10 +1463,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.29", "@budibase/types@^2.4.29": - version "2.4.29" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.29.tgz#56bf9e561ffc3f38d16cc1320b2c92a4129af275" - integrity sha512-lwryRRsXIVm8j+DGL408HWmVPFmxsUT31ZKPIsa5qyDtYxaSQ9t3erotECmzZIMuoyJmiu1t2V+QAW2Lic9Ddg== +"@budibase/types@2.4.30", "@budibase/types@^2.4.30": + version "2.4.30" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.30.tgz#43012bbdcd58d3fa064894e64712f4dcf65de64e" + integrity sha512-kCnVrI+lHQQwOj5op+Oivaj//S8gAGYrybWWixcoA8Ke3vwQfqY70rqqq+ALW7rFzP9plb/8toWec1cRoU5OFQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 8ed8c3b8a3..b6ea682173 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.4.30", - "@budibase/pro": "2.4.29", + "@budibase/pro": "2.4.30", "@budibase/string-templates": "^2.4.30", "@budibase/types": "^2.4.30", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 10d7b7b8a1..2c1738672e 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.29": - version "2.4.29" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.29.tgz#729fe802ed115a2081f05bb5496c445a52688578" - integrity sha512-nn30MrJl51NDjla/vH4d3ij+UqT4q1lFpsemVNylW33GkQedzVPv+kh+SYQNoRg7tQLJ0AdZYRH8qw6umEJbbQ== +"@budibase/backend-core@2.4.30": + version "2.4.30" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.30.tgz#f39ac017b033f71ffc1ec872338391b8ee1960c3" + integrity sha512-k/brv60QQbba0FgTJ9hZiWPVhRRLv6kticaWqfeaQc601sbSiqDwaAjWtPyBD6w8JrReD+/DaTewhkyBjvDRVg== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.29" + "@budibase/types" "^2.4.30" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.29": - version "2.4.29" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.29.tgz#6b2f5fa214a02b45e0bfd8a5c79325a34c6e4c3e" - integrity sha512-R2GCi4NdiCHplPgpr2wM6ecGuOoNJw5Sbp4ntdeX/k/Xs2o1es/RLA1G/Ofn5YlCLsTHvX1SXOW3fi0q8+JN1Q== +"@budibase/pro@2.4.30": + version "2.4.30" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.30.tgz#8dbecb75c3d0a2b7feecaa3ae811bc80a64e495f" + integrity sha512-gH3QUhCCTDzFqIUhzHbLGRH6mGy0t5hlOa8wkF64Dqa8Sl34uYwHQjdJm61tQ3k7BfidSas/JXGklskam7U/dw== dependencies: - "@budibase/backend-core" "2.4.29" + "@budibase/backend-core" "2.4.30" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.29" + "@budibase/types" "2.4.30" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.29", "@budibase/types@^2.4.29": - version "2.4.29" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.29.tgz#56bf9e561ffc3f38d16cc1320b2c92a4129af275" - integrity sha512-lwryRRsXIVm8j+DGL408HWmVPFmxsUT31ZKPIsa5qyDtYxaSQ9t3erotECmzZIMuoyJmiu1t2V+QAW2Lic9Ddg== +"@budibase/types@2.4.30", "@budibase/types@^2.4.30": + version "2.4.30" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.30.tgz#43012bbdcd58d3fa064894e64712f4dcf65de64e" + integrity sha512-kCnVrI+lHQQwOj5op+Oivaj//S8gAGYrybWWixcoA8Ke3vwQfqY70rqqq+ALW7rFzP9plb/8toWec1cRoU5OFQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 6174b6ae18fe39fb9ae5c8d9da4c7c4c6a55947b Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 15 Mar 2023 14:16:45 +0000 Subject: [PATCH 16/77] Squashing #10024 for master merge. --- .../DataTable/modals/CreateEditColumn.svelte | 9 +- .../CreateExternalTableModal.svelte | 4 +- .../modals/GoogleDatasourceConfigModal.svelte | 32 ++- .../builder/portal/settings/auth/index.svelte | 17 +- .../server/src/api/controllers/datasource.ts | 3 +- .../src/api/controllers/row/external.ts | 42 ++-- .../server/src/api/controllers/row/index.ts | 9 +- .../src/api/controllers/row/internal.ts | 7 - .../server/src/api/controllers/row/utils.ts | 7 +- .../src/api/controllers/table/external.ts | 41 ++-- .../server/src/api/controllers/table/index.ts | 18 +- .../server/src/api/controllers/table/utils.ts | 20 +- packages/server/src/constants/index.ts | 1 + .../server/src/integrations/googlesheets.ts | 222 ++++++++++++------ packages/server/src/integrations/utils.ts | 20 +- packages/types/src/documents/app/table.ts | 1 + 16 files changed, 302 insertions(+), 151 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte index 352f094507..b4293a2a0a 100644 --- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte @@ -308,7 +308,7 @@ { name: "Auto Column", type: AUTO_TYPE }, ] } else { - return [ + let fields = [ FIELDS.STRING, FIELDS.BARCODEQR, FIELDS.LONGFORM, @@ -316,10 +316,13 @@ FIELDS.DATETIME, FIELDS.NUMBER, FIELDS.BOOLEAN, - FIELDS.ARRAY, FIELDS.FORMULA, - FIELDS.LINK, ] + // no-sql or a spreadsheet + if (!external || table.sql) { + fields = [...fields, FIELDS.LINK, FIELDS.ARRAY] + } + return fields } } diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/CreateExternalTableModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/CreateExternalTableModal.svelte index 45269a365c..664b5629d4 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/CreateExternalTableModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/CreateExternalTableModal.svelte @@ -35,7 +35,9 @@ await datasources.fetch() $goto(`../../table/${table._id}`) } catch (error) { - notifications.error("Error saving table") + notifications.error( + `Error saving table - ${error?.message || "unknown error"}` + ) } } diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte index 7d03dafeb9..c12ddab78d 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte @@ -1,15 +1,22 @@ - - Authenticate with your google account to use the {IntegrationNames[ - datasource.type - ]} integration. + {#if isGoogleConfigured === true} + + Authenticate with your google account to use the {IntegrationNames[ + datasource.type + ]} integration. + + save(datasource, true)} /> + {:else if isGoogleConfigured === false} + Google authentication is not enabled, please complete Google SSO + configuration. - - save(datasource, true)} /> + Configure Google SSO + {/if} diff --git a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte index 0e82dd31e7..2d4dc7ee46 100644 --- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte @@ -47,8 +47,9 @@ $: googleCallbackTooltip = $admin.cloud ? null : googleCallbackReadonly - ? "Vist the organisation page to update the platform URL" + ? "Visit the organisation page to update the platform URL" : "Leave blank to use the default callback URL" + $: googleSheetsCallbackUrl = `${$organisation.platformUrl}/api/global/auth/datasource/google/callback` $: GoogleConfigFields = { Google: [ @@ -62,6 +63,14 @@ placeholder: $organisation.googleCallbackUrl, copyButton: true, }, + { + name: "sheetsURL", + label: "Sheets URL", + readonly: googleCallbackReadonly, + tooltip: googleCallbackTooltip, + placeholder: googleSheetsCallbackUrl, + copyButton: true, + }, ], } @@ -396,7 +405,11 @@ To allow users to authenticate using their Google accounts, fill out the - fields below. + fields below. Read the documentation for more information. diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index d212f7f361..3d41cd89af 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -84,8 +84,9 @@ export async function buildSchemaFromDb(ctx: UserCtx) { setDefaultDisplayColumns(datasource) const dbResp = await db.put(datasource) datasource._rev = dbResp.rev + const cleanedDatasource = await sdk.datasources.removeSecretSingle(datasource) - const response: any = { datasource } + const response: any = { datasource: cleanedDatasource } if (error) { response.error = error } diff --git a/packages/server/src/api/controllers/row/external.ts b/packages/server/src/api/controllers/row/external.ts index 8a7a9a6c69..ee796e32d4 100644 --- a/packages/server/src/api/controllers/row/external.ts +++ b/packages/server/src/api/controllers/row/external.ts @@ -12,7 +12,7 @@ import * as exporters from "../view/exporters" import { apiFileReturn } from "../../../utilities/fileSystem" import { Operation, - BBContext, + UserCtx, Row, PaginationJson, Table, @@ -21,6 +21,7 @@ import { SortJson, } from "@budibase/types" import sdk from "../../../sdk" +import * as utils from "./utils" const { cleanExportRows } = require("./utils") @@ -49,12 +50,19 @@ export async function handleRequest( ) } -export async function patch(ctx: BBContext) { +export async function patch(ctx: UserCtx) { const inputs = ctx.request.body const tableId = ctx.params.tableId const id = inputs._id // don't save the ID to db delete inputs._id + const validateResult = await utils.validate({ + row: inputs, + tableId, + }) + if (!validateResult.valid) { + throw { validation: validateResult.errors } + } return handleRequest(Operation.UPDATE, tableId, { id: breakRowIdField(id), row: inputs, @@ -62,16 +70,23 @@ export async function patch(ctx: BBContext) { }) } -export async function save(ctx: BBContext) { +export async function save(ctx: UserCtx) { const inputs = ctx.request.body const tableId = ctx.params.tableId + const validateResult = await utils.validate({ + row: inputs, + tableId, + }) + if (!validateResult.valid) { + throw { validation: validateResult.errors } + } return handleRequest(Operation.CREATE, tableId, { row: inputs, includeSqlRelationships: IncludeRelationship.EXCLUDE, }) } -export async function fetchView(ctx: BBContext) { +export async function fetchView(ctx: UserCtx) { // there are no views in external datasources, shouldn't ever be called // for now just fetch const split = ctx.params.viewName.split("all_") @@ -79,14 +94,14 @@ export async function fetchView(ctx: BBContext) { return fetch(ctx) } -export async function fetch(ctx: BBContext) { +export async function fetch(ctx: UserCtx) { const tableId = ctx.params.tableId return handleRequest(Operation.READ, tableId, { includeSqlRelationships: IncludeRelationship.INCLUDE, }) } -export async function find(ctx: BBContext) { +export async function find(ctx: UserCtx) { const id = ctx.params.rowId const tableId = ctx.params.tableId const response = (await handleRequest(Operation.READ, tableId, { @@ -96,7 +111,7 @@ export async function find(ctx: BBContext) { return response ? response[0] : response } -export async function destroy(ctx: BBContext) { +export async function destroy(ctx: UserCtx) { const tableId = ctx.params.tableId const id = ctx.request.body._id const { row } = (await handleRequest(Operation.DELETE, tableId, { @@ -106,7 +121,7 @@ export async function destroy(ctx: BBContext) { return { response: { ok: true }, row } } -export async function bulkDestroy(ctx: BBContext) { +export async function bulkDestroy(ctx: UserCtx) { const { rows } = ctx.request.body const tableId = ctx.params.tableId let promises: Promise[] = [] @@ -122,7 +137,7 @@ export async function bulkDestroy(ctx: BBContext) { return { response: { ok: true }, rows: responses.map(resp => resp.row) } } -export async function search(ctx: BBContext) { +export async function search(ctx: UserCtx) { const tableId = ctx.params.tableId const { paginate, query, ...params } = ctx.request.body let { bookmark, limit } = params @@ -185,12 +200,7 @@ export async function search(ctx: BBContext) { } } -export async function validate(ctx: BBContext) { - // can't validate external right now - maybe in future - return { valid: true } -} - -export async function exportRows(ctx: BBContext) { +export async function exportRows(ctx: UserCtx) { const { datasourceId, tableName } = breakExternalTableId(ctx.params.tableId) const format = ctx.query.format const { columns } = ctx.request.body @@ -244,7 +254,7 @@ export async function exportRows(ctx: BBContext) { return apiFileReturn(exporter(headers, exportRows)) } -export async function fetchEnrichedRow(ctx: BBContext) { +export async function fetchEnrichedRow(ctx: UserCtx) { const id = ctx.params.rowId const tableId = ctx.params.tableId const { datasourceId, tableName } = breakExternalTableId(tableId) diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts index b59f245098..348d441c78 100644 --- a/packages/server/src/api/controllers/row/index.ts +++ b/packages/server/src/api/controllers/row/index.ts @@ -2,6 +2,8 @@ import { quotas } from "@budibase/pro" import * as internal from "./internal" import * as external from "./external" import { isExternalTable } from "../../../integrations/utils" +import { Ctx } from "@budibase/types" +import * as utils from "./utils" function pickApi(tableId: any) { if (isExternalTable(tableId)) { @@ -129,9 +131,12 @@ export async function search(ctx: any) { }) } -export async function validate(ctx: any) { +export async function validate(ctx: Ctx) { const tableId = getTableId(ctx) - ctx.body = await pickApi(tableId).validate(ctx) + ctx.body = await utils.validate({ + row: ctx.request.body, + tableId, + }) } export async function fetchEnrichedRow(ctx: any) { diff --git a/packages/server/src/api/controllers/row/internal.ts b/packages/server/src/api/controllers/row/internal.ts index d36f9bf2f1..039f03c015 100644 --- a/packages/server/src/api/controllers/row/internal.ts +++ b/packages/server/src/api/controllers/row/internal.ts @@ -387,13 +387,6 @@ export async function search(ctx: Ctx) { return response } -export async function validate(ctx: Ctx) { - return utils.validate({ - tableId: ctx.params.tableId, - row: ctx.request.body, - }) -} - export async function exportRows(ctx: Ctx) { const db = context.getAppDB() const table = await db.get(ctx.params.tableId) diff --git a/packages/server/src/api/controllers/row/utils.ts b/packages/server/src/api/controllers/row/utils.ts index 82232b7f98..2e8f2f4536 100644 --- a/packages/server/src/api/controllers/row/utils.ts +++ b/packages/server/src/api/controllers/row/utils.ts @@ -4,11 +4,11 @@ import { FieldTypes } from "../../../constants" import { context } from "@budibase/backend-core" import { makeExternalQuery } from "../../../integrations/base/query" import { Row, Table } from "@budibase/types" -const validateJs = require("validate.js") -const { cloneDeep } = require("lodash/fp") import { Format } from "../view/exporters" import { Ctx } from "@budibase/types" import sdk from "../../../sdk" +const validateJs = require("validate.js") +const { cloneDeep } = require("lodash/fp") validateJs.extend(validateJs.validators.datetime, { parse: function (value: string) { @@ -56,8 +56,7 @@ export async function validate({ }) { let fetchedTable: Table if (!table) { - const db = context.getAppDB() - fetchedTable = await db.get(tableId) + fetchedTable = await sdk.tables.getTable(tableId) } else { fetchedTable = table } diff --git a/packages/server/src/api/controllers/table/external.ts b/packages/server/src/api/controllers/table/external.ts index a6ad5bba99..a00e65687f 100644 --- a/packages/server/src/api/controllers/table/external.ts +++ b/packages/server/src/api/controllers/table/external.ts @@ -7,6 +7,7 @@ import { generateJunctionTableName, foreignKeyStructure, hasTypeChanged, + setStaticSchemas, } from "./utils" import { FieldTypes } from "../../../constants" import { makeExternalQuery } from "../../../integrations/base/query" @@ -20,7 +21,7 @@ import { Operation, RenameColumn, FieldSchema, - BBContext, + UserCtx, TableRequest, RelationshipTypes, } from "@budibase/types" @@ -194,20 +195,20 @@ function isRelationshipSetup(column: FieldSchema) { return column.foreignKey || column.through } -export async function save(ctx: BBContext) { - const table: TableRequest = ctx.request.body - const renamed = table?._rename +export async function save(ctx: UserCtx) { + const inputs: TableRequest = ctx.request.body + const renamed = inputs?._rename // can't do this right now - delete table.rows + delete inputs.rows const datasourceId = getDatasourceId(ctx.request.body)! // table doesn't exist already, note that it is created - if (!table._id) { - table.created = true + if (!inputs._id) { + inputs.created = true } let tableToSave: TableRequest = { type: "table", - _id: buildExternalTableId(datasourceId, table.name), - ...table, + _id: buildExternalTableId(datasourceId, inputs.name), + ...inputs, } let oldTable @@ -224,6 +225,10 @@ export async function save(ctx: BBContext) { if (!datasource.entities) { datasource.entities = {} } + + // GSheets is a specific case - only ever has a static primary key + tableToSave = setStaticSchemas(datasource, tableToSave) + const oldTables = cloneDeep(datasource.entities) const tables: Record = datasource.entities @@ -246,7 +251,7 @@ export async function save(ctx: BBContext) { const junctionTable = generateManyLinkSchema( datasource, schema, - table, + tableToSave, relatedTable ) if (tables[junctionTable.name]) { @@ -256,10 +261,12 @@ export async function save(ctx: BBContext) { extraTablesToUpdate.push(junctionTable) } else { const fkTable = - relationType === RelationshipTypes.ONE_TO_MANY ? table : relatedTable + relationType === RelationshipTypes.ONE_TO_MANY + ? tableToSave + : relatedTable const foreignKey = generateLinkSchema( schema, - table, + tableToSave, relatedTable, relationType ) @@ -271,11 +278,11 @@ export async function save(ctx: BBContext) { fkTable.constrained.push(foreignKey) } // foreign key is in other table, need to save it to external - if (fkTable._id !== table._id) { + if (fkTable._id !== tableToSave._id) { extraTablesToUpdate.push(fkTable) } } - generateRelatedSchema(schema, relatedTable, table, relatedColumnName) + generateRelatedSchema(schema, relatedTable, tableToSave, relatedColumnName) schema.main = true } @@ -313,7 +320,7 @@ export async function save(ctx: BBContext) { return tableToSave } -export async function destroy(ctx: BBContext) { +export async function destroy(ctx: UserCtx) { const tableToDelete: TableRequest = await sdk.tables.getTable( ctx.params.tableId ) @@ -339,7 +346,7 @@ export async function destroy(ctx: BBContext) { return tableToDelete } -export async function bulkImport(ctx: BBContext) { +export async function bulkImport(ctx: UserCtx) { const table = await sdk.tables.getTable(ctx.params.tableId) const { rows }: { rows: unknown } = ctx.request.body const schema: unknown = table.schema @@ -348,7 +355,7 @@ export async function bulkImport(ctx: BBContext) { ctx.throw(400, "Provided data import information is invalid.") } - const parsedRows = await parse(rows, schema) + const parsedRows = parse(rows, schema) await handleRequest(Operation.BULK_CREATE, table._id!, { rows: parsedRows, }) diff --git a/packages/server/src/api/controllers/table/index.ts b/packages/server/src/api/controllers/table/index.ts index aa6dfde536..2ab7ad7b38 100644 --- a/packages/server/src/api/controllers/table/index.ts +++ b/packages/server/src/api/controllers/table/index.ts @@ -8,7 +8,7 @@ import { import { isExternalTable, isSQL } from "../../../integrations/utils" import { getDatasourceParams } from "../../../db/utils" import { context, events } from "@budibase/backend-core" -import { Table, BBContext } from "@budibase/types" +import { Table, UserCtx } from "@budibase/types" import sdk from "../../../sdk" import csv from "csvtojson" @@ -25,7 +25,7 @@ function pickApi({ tableId, table }: { tableId?: string; table?: Table }) { } // covers both internal and external -export async function fetch(ctx: BBContext) { +export async function fetch(ctx: UserCtx) { const db = context.getAppDB() const internal = await sdk.tables.getAllInternalTables() @@ -53,12 +53,12 @@ export async function fetch(ctx: BBContext) { ctx.body = [...internal, ...external] } -export async function find(ctx: BBContext) { +export async function find(ctx: UserCtx) { const tableId = ctx.params.tableId ctx.body = await sdk.tables.getTable(tableId) } -export async function save(ctx: BBContext) { +export async function save(ctx: UserCtx) { const appId = ctx.appId const table = ctx.request.body const isImport = table.rows @@ -79,7 +79,7 @@ export async function save(ctx: BBContext) { ctx.body = savedTable } -export async function destroy(ctx: BBContext) { +export async function destroy(ctx: UserCtx) { const appId = ctx.appId const tableId = ctx.params.tableId const deletedTable = await pickApi({ tableId }).destroy(ctx) @@ -91,7 +91,7 @@ export async function destroy(ctx: BBContext) { ctx.body = { message: `Table ${tableId} deleted.` } } -export async function bulkImport(ctx: BBContext) { +export async function bulkImport(ctx: UserCtx) { const tableId = ctx.params.tableId await pickApi({ tableId }).bulkImport(ctx) // right now we don't trigger anything for bulk import because it @@ -101,7 +101,7 @@ export async function bulkImport(ctx: BBContext) { ctx.body = { message: `Bulk rows created.` } } -export async function csvToJson(ctx: BBContext) { +export async function csvToJson(ctx: UserCtx) { const { csvString } = ctx.request.body const result = await csv().fromString(csvString) @@ -110,7 +110,7 @@ export async function csvToJson(ctx: BBContext) { ctx.body = result } -export async function validateNewTableImport(ctx: BBContext) { +export async function validateNewTableImport(ctx: UserCtx) { const { rows, schema }: { rows: unknown; schema: unknown } = ctx.request.body if (isRows(rows) && isSchema(schema)) { @@ -121,7 +121,7 @@ export async function validateNewTableImport(ctx: BBContext) { } } -export async function validateExistingTableImport(ctx: BBContext) { +export async function validateExistingTableImport(ctx: UserCtx) { const { rows, tableId }: { rows: unknown; tableId: unknown } = ctx.request.body diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts index bbccde467b..7c5c81939a 100644 --- a/packages/server/src/api/controllers/table/utils.ts +++ b/packages/server/src/api/controllers/table/utils.ts @@ -1,7 +1,11 @@ import { parse, isSchema, isRows } from "../../../utilities/schema" import { getRowParams, generateRowID, InternalTables } from "../../../db/utils" import { isEqual } from "lodash" -import { AutoFieldSubTypes, FieldTypes } from "../../../constants" +import { + AutoFieldSubTypes, + FieldTypes, + GOOGLE_SHEETS_PRIMARY_KEY, +} from "../../../constants" import { inputProcessing, cleanupAttachments, @@ -16,7 +20,7 @@ import viewTemplate from "../view/viewBuilder" import { cloneDeep } from "lodash/fp" import { quotas } from "@budibase/pro" import { events, context } from "@budibase/backend-core" -import { Database } from "@budibase/types" +import { Database, Datasource, SourceName, Table } from "@budibase/types" export async function clearColumns(table: any, columnNames: any) { const db: Database = context.getAppDB() @@ -392,5 +396,17 @@ export function hasTypeChanged(table: any, oldTable: any) { return false } +// used for external tables, some of them will have static schemas that need +// to be hard set +export function setStaticSchemas(datasource: Datasource, table: Table) { + // GSheets is a specific case - only ever has a static primary key + if (table && datasource.source === SourceName.GOOGLE_SHEETS) { + table.primary = [GOOGLE_SHEETS_PRIMARY_KEY] + // if there is an id column, remove it, should never exist in GSheets + delete table.schema?.id + } + return table +} + const _TableSaveFunctions = TableSaveFunctions export { _TableSaveFunctions as TableSaveFunctions } diff --git a/packages/server/src/constants/index.ts b/packages/server/src/constants/index.ts index e55ad09add..9d6a1c247a 100644 --- a/packages/server/src/constants/index.ts +++ b/packages/server/src/constants/index.ts @@ -180,3 +180,4 @@ export enum AutomationErrors { // pass through the list from the auth/core lib export const ObjectStoreBuckets = objectStore.ObjectStoreBuckets export const MAX_AUTOMATION_RECURRING_ERRORS = 5 +export const GOOGLE_SHEETS_PRIMARY_KEY = "rowNumber" diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts index 0c658df0f5..f8bc84adea 100644 --- a/packages/server/src/integrations/googlesheets.ts +++ b/packages/server/src/integrations/googlesheets.ts @@ -1,22 +1,25 @@ import { DatasourceFieldType, DatasourcePlus, + FieldType, Integration, + Operation, PaginationJson, QueryJson, QueryType, + Row, SearchFilters, SortJson, Table, - TableSchema, + TableRequest, } from "@budibase/types" import { OAuth2Client } from "google-auth-library" -import { buildExternalTableId } from "./utils" -import { DataSourceOperation, FieldTypes } from "../constants" +import { buildExternalTableId, finaliseExternalTables } from "./utils" import { GoogleSpreadsheet } from "google-spreadsheet" import fetch from "node-fetch" import { configs, HTTPError } from "@budibase/backend-core" import { dataFilters } from "@budibase/shared-core" +import { GOOGLE_SHEETS_PRIMARY_KEY } from "../constants" interface GoogleSheetsConfig { spreadsheetId: string @@ -39,6 +42,17 @@ interface AuthTokenResponse { access_token: string } +const ALLOWED_TYPES = [ + FieldType.STRING, + FieldType.FORMULA, + FieldType.NUMBER, + FieldType.LONGFORM, + FieldType.DATETIME, + FieldType.OPTIONS, + FieldType.BOOLEAN, + FieldType.BARCODEQR, +] + const SCHEMA: Integration = { plus: true, auth: { @@ -199,73 +213,90 @@ class GoogleSheetsIntegration implements DatasourcePlus { this.client.useOAuth2Client(oauthClient) await this.client.loadInfo() - } catch (err) { + } catch (err: any) { + // this happens for xlsx imports + if (err.message?.includes("operation is not supported")) { + err.message = + "This operation is not supported - XLSX sheets must be converted." + } console.error("Error connecting to google sheets", err) throw err } } - async buildSchema(datasourceId: string) { + getTableSchema(title: string, headerValues: string[], id?: string) { + // base table + const table: Table = { + name: title, + primary: [GOOGLE_SHEETS_PRIMARY_KEY], + schema: {}, + } + if (id) { + table._id = id + } + // build schema from headers + for (let header of headerValues) { + table.schema[header] = { + name: header, + type: FieldType.STRING, + } + } + return table + } + + async buildSchema(datasourceId: string, entities: Record) { await this.connect() const sheets = this.client.sheetsByIndex const tables: Record = {} for (let sheet of sheets) { // must fetch rows to determine schema await sheet.getRows() - // build schema - const schema: TableSchema = {} - // build schema from headers - for (let header of sheet.headerValues) { - schema[header] = { - name: header, - type: FieldTypes.STRING, - } - } - - // create tables - tables[sheet.title] = { - _id: buildExternalTableId(datasourceId, sheet.title), - name: sheet.title, - primary: ["rowNumber"], - schema, - } + const id = buildExternalTableId(datasourceId, sheet.title) + tables[sheet.title] = this.getTableSchema( + sheet.title, + sheet.headerValues, + id + ) } - - this.tables = tables + const final = finaliseExternalTables(tables, entities) + this.tables = final.tables + this.schemaErrors = final.errors } async query(json: QueryJson) { const sheet = json.endpoint.entityId - - const handlers = { - [DataSourceOperation.CREATE]: () => - this.create({ sheet, row: json.body }), - [DataSourceOperation.READ]: () => this.read({ ...json, sheet }), - [DataSourceOperation.UPDATE]: () => - this.update({ + switch (json.endpoint.operation) { + case Operation.CREATE: + return this.create({ sheet, row: json.body as Row }) + case Operation.BULK_CREATE: + return this.createBulk({ sheet, rows: json.body as Row[] }) + case Operation.READ: + return this.read({ ...json, sheet }) + case Operation.UPDATE: + return this.update({ // exclude the header row and zero index rowIndex: json.extra?.idFilter?.equal?.rowNumber - 2, sheet, row: json.body, - }), - [DataSourceOperation.DELETE]: () => - this.delete({ + }) + case Operation.DELETE: + return this.delete({ // exclude the header row and zero index rowIndex: json.extra?.idFilter?.equal?.rowNumber - 2, sheet, - }), - [DataSourceOperation.CREATE_TABLE]: () => - this.createTable(json?.table?.name), - [DataSourceOperation.UPDATE_TABLE]: () => this.updateTable(json.table), - [DataSourceOperation.DELETE_TABLE]: () => - this.deleteTable(json?.table?.name), + }) + case Operation.CREATE_TABLE: + return this.createTable(json?.table?.name) + case Operation.UPDATE_TABLE: + return this.updateTable(json.table!) + case Operation.DELETE_TABLE: + return this.deleteTable(json?.table?.name) + default: + throw new Error( + `GSheets integration does not support "${json.endpoint.operation}".` + ) } - - // @ts-ignore - const internalQueryMethod = handlers[json.endpoint.operation] - - return await internalQueryMethod() } buildRowObject(headers: string[], values: string[], rowNumber: number) { @@ -278,47 +309,70 @@ class GoogleSheetsIntegration implements DatasourcePlus { } async createTable(name?: string) { + if (!name) { + throw new Error("Must provide name for new sheet.") + } try { await this.connect() - return await this.client.addSheet({ title: name, headerValues: ["test"] }) + return await this.client.addSheet({ title: name, headerValues: [name] }) } catch (err) { console.error("Error creating new table in google sheets", err) throw err } } - async updateTable(table?: any) { - try { - await this.connect() - const sheet = this.client.sheetsByTitle[table.name] - await sheet.loadHeaderRow() + async updateTable(table: TableRequest) { + await this.connect() + const sheet = this.client.sheetsByTitle[table.name] + await sheet.loadHeaderRow() - if (table._rename) { - const headers = [] - for (let header of sheet.headerValues) { - if (header === table._rename.old) { - headers.push(table._rename.updated) - } else { - headers.push(header) - } + if (table._rename) { + const headers = [] + for (let header of sheet.headerValues) { + if (header === table._rename.old) { + headers.push(table._rename.updated) + } else { + headers.push(header) } - await sheet.setHeaderRow(headers) - } else { - const updatedHeaderValues = [...sheet.headerValues] - - const newField = Object.keys(table.schema).find( - key => !sheet.headerValues.includes(key) - ) - - if (newField) { - updatedHeaderValues.push(newField) - } - - await sheet.setHeaderRow(updatedHeaderValues) } - } catch (err) { - console.error("Error updating table in google sheets", err) - throw err + try { + await sheet.setHeaderRow(headers) + } catch (err) { + console.error("Error updating column name in google sheets", err) + throw err + } + } else { + const updatedHeaderValues = [...sheet.headerValues] + + // add new column - doesn't currently exist + for (let [key, column] of Object.entries(table.schema)) { + if (!ALLOWED_TYPES.includes(column.type)) { + throw new Error( + `Column type: ${column.type} not allowed for GSheets integration.` + ) + } + if ( + !sheet.headerValues.includes(key) && + column.type !== FieldType.FORMULA + ) { + updatedHeaderValues.push(key) + } + } + + // clear out deleted columns + for (let key of sheet.headerValues) { + if (!Object.keys(table.schema).includes(key)) { + const idx = updatedHeaderValues.indexOf(key) + updatedHeaderValues.splice(idx, 1) + } + } + + try { + await sheet.setHeaderRow(updatedHeaderValues) + } catch (err) { + console.error("Error updating table in google sheets", err) + throw err + } } } @@ -349,6 +403,24 @@ class GoogleSheetsIntegration implements DatasourcePlus { } } + async createBulk(query: { sheet: string; rows: any[] }) { + try { + await this.connect() + const sheet = this.client.sheetsByTitle[query.sheet] + let rowsToInsert = [] + for (let row of query.rows) { + rowsToInsert.push(typeof row === "string" ? JSON.parse(row) : row) + } + const rows = await sheet.addRows(rowsToInsert) + return rows.map(row => + this.buildRowObject(sheet.headerValues, row._rawData, row._rowNumber) + ) + } catch (err) { + console.error("Error bulk writing to google sheets", err) + throw err + } + } + async read(query: { sheet: string filters?: SearchFilters diff --git a/packages/server/src/integrations/utils.ts b/packages/server/src/integrations/utils.ts index 356a08f4a0..de8b318bb1 100644 --- a/packages/server/src/integrations/utils.ts +++ b/packages/server/src/integrations/utils.ts @@ -4,6 +4,7 @@ import { FieldTypes, BuildSchemaErrors, InvalidColumns } from "../constants" const DOUBLE_SEPARATOR = `${SEPARATOR}${SEPARATOR}` const ROW_ID_REGEX = /^\[.*]$/g +const ENCODED_SPACE = encodeURIComponent(" ") const SQL_NUMBER_TYPE_MAP = { integer: FieldTypes.NUMBER, @@ -79,6 +80,10 @@ export function isExternalTable(tableId: string) { } export function buildExternalTableId(datasourceId: string, tableName: string) { + // encode spaces + if (tableName.includes(" ")) { + tableName = encodeURIComponent(tableName) + } return `${datasourceId}${DOUBLE_SEPARATOR}${tableName}` } @@ -90,6 +95,10 @@ export function breakExternalTableId(tableId: string | undefined) { let datasourceId = parts.shift() // if they need joined let tableName = parts.join(DOUBLE_SEPARATOR) + // if contains encoded spaces, decode it + if (tableName.includes(ENCODED_SPACE)) { + tableName = decodeURIComponent(tableName) + } return { datasourceId, tableName } } @@ -200,9 +209,9 @@ export function isIsoDateString(str: string) { * @param column The column to check, to see if it is a valid relationship. * @param tableIds The IDs of the tables which currently exist. */ -function shouldCopyRelationship( +export function shouldCopyRelationship( column: { type: string; tableId?: string }, - tableIds: [string] + tableIds: string[] ) { return ( column.type === FieldTypes.LINK && @@ -219,7 +228,7 @@ function shouldCopyRelationship( * @param column The column to check for options or boolean type. * @param fetchedColumn The fetched column to check for the type in the external database. */ -function shouldCopySpecialColumn( +export function shouldCopySpecialColumn( column: { type: string }, fetchedColumn: { type: string } | undefined ) { @@ -257,9 +266,12 @@ function copyExistingPropsOver( tableIds: [string] ) { if (entities && entities[tableName]) { - if (entities[tableName].primaryDisplay) { + if (entities[tableName]?.primaryDisplay) { table.primaryDisplay = entities[tableName].primaryDisplay } + if (entities[tableName]?.created) { + table.created = entities[tableName]?.created + } const existingTableSchema = entities[tableName].schema for (let key in existingTableSchema) { if (!existingTableSchema.hasOwnProperty(key)) { diff --git a/packages/types/src/documents/app/table.ts b/packages/types/src/documents/app/table.ts index 01d2486dcb..929409d0e9 100644 --- a/packages/types/src/documents/app/table.ts +++ b/packages/types/src/documents/app/table.ts @@ -76,6 +76,7 @@ export interface Table extends Document { sql?: boolean indexes?: { [key: string]: any } rows?: { [key: string]: any } + created?: boolean } export interface TableRequest extends Table { From 8d79a23700704869ff3604fcefec7afebe201847 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 16 Mar 2023 08:30:16 +0000 Subject: [PATCH 17/77] Fix component settings which have no labels appearing as undefined in the conditional UI drawer --- .../builder/src/builderStore/componentUtils.js | 7 ++++++- .../settings/controls/PropertyControl.svelte | 3 ++- .../settings/ComponentSettingsSection.svelte | 1 + .../settings/ConditionalUIDrawer.svelte | 14 +++++++++++++- packages/client/manifest.json | 8 +++++++- 5 files changed, 29 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/builderStore/componentUtils.js b/packages/builder/src/builderStore/componentUtils.js index a9425da742..16b972058e 100644 --- a/packages/builder/src/builderStore/componentUtils.js +++ b/packages/builder/src/builderStore/componentUtils.js @@ -163,7 +163,12 @@ export const getComponentSettings = componentType => { def.settings ?.filter(setting => setting.section) .forEach(section => { - settings = settings.concat(section.settings || []) + settings = settings.concat( + (section.settings || []).map(setting => ({ + ...setting, + section: section.name, + })) + ) }) } componentSettingCache[componentType] = settings diff --git a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte index ab448b850c..85d0eec184 100644 --- a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte +++ b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte @@ -8,6 +8,7 @@ import { onDestroy } from "svelte" export let label = "" + export let labelHidden = false export let componentInstance = {} export let control = null export let key = "" @@ -75,7 +76,7 @@
- {#if type !== "boolean" && label} + {#if type !== "boolean" && label && !labelHidden}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte index 21bed847f5..89577bbfbe 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte @@ -132,6 +132,7 @@ type={setting.type} control={getComponentForSetting(setting)} label={setting.label} + labelHidden={setting.labelHidden} key={setting.key} value={componentInstance[setting.key]} defaultValue={setting.defaultValue} diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte index 855c42173b..581b14ae5f 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte @@ -62,7 +62,7 @@ type: "text", }) $: settingOptions = settings.map(setting => ({ - label: setting.label, + label: makeLabel(setting), value: setting.key, })) $: conditions.forEach(link => { @@ -71,6 +71,18 @@ } }) + const makeLabel = setting => { + if (setting.section) { + let label = setting.section + if (setting.label) { + return `${label} - ${setting.label}` + } + return label + } else { + return setting.label + } + } + const getSettingDefinition = key => { return settings.find(setting => setting.key === key) } diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 2579cdedaa..710fa12614 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -4380,6 +4380,8 @@ "name": "On row click", "settings": [ { + "label": "Behaviour", + "labelHidden": true, "type": "radio", "key": "clickBehaviour", "sendEvents": true, @@ -4397,6 +4399,8 @@ ] }, { + "label": "Actions", + "labelHidden": true, "type": "event", "key": "onClick", "nested": true, @@ -4433,7 +4437,7 @@ { "type": "radio", "key": "titleButtonClickBehaviour", - "label": "On Click", + "label": "Behaviour", "dependsOn": "showTitleButton", "defaultValue": "actions", "info": "New row side panel is only compatible with internal or SQL tables", @@ -4450,6 +4454,8 @@ }, { "type": "event", + "label": "On click", + "labelHidden": true, "key": "onClickTitleButton", "nested": true, "dependsOn": { From 75057e2b054fddaeaf98642553ef6f31575f4651 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 16 Mar 2023 08:35:22 +0000 Subject: [PATCH 18/77] Simplify logic --- .../_components/settings/ConditionalUIDrawer.svelte | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte index 581b14ae5f..db6e66b87b 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte @@ -72,14 +72,11 @@ }) const makeLabel = setting => { - if (setting.section) { - let label = setting.section - if (setting.label) { - return `${label} - ${setting.label}` - } - return label + const { section, label } = setting + if (section) { + return label ? `${section} - ${label}` : section } else { - return setting.label + return label } } From eeb8e49b5400c18684a9d1baa9dc205e71a03559 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Thu, 16 Mar 2023 11:36:47 +0000 Subject: [PATCH 19/77] Re-add clone for App Action (#10052) --- .../automation/SetupPanel/AutomationBlockSetup.svelte | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 7a9d766ab2..eb9c618c24 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -33,6 +33,7 @@ import { Utils } from "@budibase/frontend-core" import { TriggerStepID, ActionStepID } from "constants/backend/automations" import { onMount } from "svelte" + import { cloneDeep } from "lodash/fp" export let block export let testData @@ -62,6 +63,9 @@ const getInputData = (testData, blockInputs) => { let newInputData = testData || blockInputs + if (block.event === "app:trigger" && !newInputData?.fields) { + newInputData = cloneDeep(blockInputs) + } inputData = newInputData } From ab6d95acc600d75ca51507f2c2f6217572cc0216 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 16 Mar 2023 11:45:05 +0000 Subject: [PATCH 20/77] v2.4.31 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index ddb9ba4ca3..55df40669a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.30", + "version": "2.4.31", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 8fbf23ec7e..08e0337dde 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.30", + "version": "2.4.31", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.4.30", + "@budibase/types": "^2.4.31", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 5430c4f368..d17c2725ff 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.4.30", + "version": "2.4.31", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.4.30", - "@budibase/string-templates": "^2.4.30", + "@budibase/shared-core": "^2.4.31", + "@budibase/string-templates": "^2.4.31", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 0f0b0f454a..f6c1fac71b 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.30", + "version": "2.4.31", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.30", - "@budibase/client": "^2.4.30", - "@budibase/frontend-core": "^2.4.30", - "@budibase/shared-core": "^2.4.30", - "@budibase/string-templates": "^2.4.30", + "@budibase/bbui": "^2.4.31", + "@budibase/client": "^2.4.31", + "@budibase/frontend-core": "^2.4.31", + "@budibase/shared-core": "^2.4.31", + "@budibase/string-templates": "^2.4.31", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 37438bc8ee..c2f7579bcc 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.30", + "version": "2.4.31", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.4.30", - "@budibase/string-templates": "^2.4.30", - "@budibase/types": "^2.4.30", + "@budibase/backend-core": "^2.4.31", + "@budibase/string-templates": "^2.4.31", + "@budibase/types": "^2.4.31", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index e53525077c..feff8265aa 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.30", + "version": "2.4.31", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.4.30", - "@budibase/frontend-core": "^2.4.30", - "@budibase/shared-core": "^2.4.30", - "@budibase/string-templates": "^2.4.30", - "@budibase/types": "^2.4.30", + "@budibase/bbui": "^2.4.31", + "@budibase/frontend-core": "^2.4.31", + "@budibase/shared-core": "^2.4.31", + "@budibase/string-templates": "^2.4.31", + "@budibase/types": "^2.4.31", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 981582a652..821b6a3597 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.30", + "version": "2.4.31", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.4.30", - "@budibase/shared-core": "^2.4.30", + "@budibase/bbui": "^2.4.31", + "@budibase/shared-core": "^2.4.31", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 76ad560d00..22c04db77c 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.30", + "version": "2.4.31", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index b8c88f173d..a7869ae4cb 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.30", + "version": "2.4.31", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.30", - "@budibase/client": "^2.4.30", + "@budibase/backend-core": "^2.4.31", + "@budibase/client": "^2.4.31", "@budibase/pro": "2.4.30", - "@budibase/shared-core": "^2.4.30", - "@budibase/string-templates": "^2.4.30", - "@budibase/types": "^2.4.30", + "@budibase/shared-core": "^2.4.31", + "@budibase/string-templates": "^2.4.31", + "@budibase/types": "^2.4.31", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 462263cbdb..415338717a 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.30", + "version": "2.4.31", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.4.30" + "@budibase/types": "^2.4.31" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 2d5118fa62..39c24f8d72 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.30", + "version": "2.4.31", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 908343d807..959a9c60d8 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.30", + "version": "2.4.31", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index b6ea682173..9461371062 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.30", + "version": "2.4.31", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.4.30", + "@budibase/backend-core": "^2.4.31", "@budibase/pro": "2.4.30", - "@budibase/string-templates": "^2.4.30", - "@budibase/types": "^2.4.30", + "@budibase/string-templates": "^2.4.31", + "@budibase/types": "^2.4.31", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From e841ccd0ed3947a27ca2871feac9fb49b8e3b530 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 16 Mar 2023 11:48:02 +0000 Subject: [PATCH 21/77] Update pro version to 2.4.31 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index a7869ae4cb..ff963b8a09 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.4.31", "@budibase/client": "^2.4.31", - "@budibase/pro": "2.4.30", + "@budibase/pro": "2.4.31", "@budibase/shared-core": "^2.4.31", "@budibase/string-templates": "^2.4.31", "@budibase/types": "^2.4.31", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index ee65ace137..0cff77f929 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1278,14 +1278,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.30": - version "2.4.30" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.30.tgz#f39ac017b033f71ffc1ec872338391b8ee1960c3" - integrity sha512-k/brv60QQbba0FgTJ9hZiWPVhRRLv6kticaWqfeaQc601sbSiqDwaAjWtPyBD6w8JrReD+/DaTewhkyBjvDRVg== +"@budibase/backend-core@2.4.31": + version "2.4.31" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.31.tgz#69613497fedf18fbe29d007926f434a4ec422ce3" + integrity sha512-TjgUAKPh8IpFsSd1lylNjK9nm0EY3O9duwsCjd5ZN2X6VdjWTorQON+8/3NHcUeDgnTdWImoWRQSuEwkgeHPuA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.30" + "@budibase/types" "^2.4.31" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1417,14 +1417,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.30": - version "2.4.30" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.30.tgz#8dbecb75c3d0a2b7feecaa3ae811bc80a64e495f" - integrity sha512-gH3QUhCCTDzFqIUhzHbLGRH6mGy0t5hlOa8wkF64Dqa8Sl34uYwHQjdJm61tQ3k7BfidSas/JXGklskam7U/dw== +"@budibase/pro@2.4.31": + version "2.4.31" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.31.tgz#f296c5025b4c081c9f59a19fb57b0c68759c830f" + integrity sha512-nzeaUo6T11OamM2AAyIjbvwV8Y3TWK7vhdzQuseCgprhsvSkXz5ndrraLY6J3xKYqM03cgmEbywSOcNDfEuP0w== dependencies: - "@budibase/backend-core" "2.4.30" + "@budibase/backend-core" "2.4.31" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.30" + "@budibase/types" "2.4.31" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1463,10 +1463,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.30", "@budibase/types@^2.4.30": - version "2.4.30" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.30.tgz#43012bbdcd58d3fa064894e64712f4dcf65de64e" - integrity sha512-kCnVrI+lHQQwOj5op+Oivaj//S8gAGYrybWWixcoA8Ke3vwQfqY70rqqq+ALW7rFzP9plb/8toWec1cRoU5OFQ== +"@budibase/types@2.4.31", "@budibase/types@^2.4.31": + version "2.4.31" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.31.tgz#11a50f27060cde780c00145ef0446dfa596544a6" + integrity sha512-6+gHJBiEwx7u245AQfwU+ffJ+SMm6Trv0IQKvXC+Dc2y2DFPQqsJEp8FAUtq9BwJJn/mJFwN48+S3Yn7nLwuPw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 9461371062..2e3446b39f 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.4.31", - "@budibase/pro": "2.4.30", + "@budibase/pro": "2.4.31", "@budibase/string-templates": "^2.4.31", "@budibase/types": "^2.4.31", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 2c1738672e..aa694e9e0e 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.30": - version "2.4.30" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.30.tgz#f39ac017b033f71ffc1ec872338391b8ee1960c3" - integrity sha512-k/brv60QQbba0FgTJ9hZiWPVhRRLv6kticaWqfeaQc601sbSiqDwaAjWtPyBD6w8JrReD+/DaTewhkyBjvDRVg== +"@budibase/backend-core@2.4.31": + version "2.4.31" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.31.tgz#69613497fedf18fbe29d007926f434a4ec422ce3" + integrity sha512-TjgUAKPh8IpFsSd1lylNjK9nm0EY3O9duwsCjd5ZN2X6VdjWTorQON+8/3NHcUeDgnTdWImoWRQSuEwkgeHPuA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.30" + "@budibase/types" "^2.4.31" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.30": - version "2.4.30" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.30.tgz#8dbecb75c3d0a2b7feecaa3ae811bc80a64e495f" - integrity sha512-gH3QUhCCTDzFqIUhzHbLGRH6mGy0t5hlOa8wkF64Dqa8Sl34uYwHQjdJm61tQ3k7BfidSas/JXGklskam7U/dw== +"@budibase/pro@2.4.31": + version "2.4.31" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.31.tgz#f296c5025b4c081c9f59a19fb57b0c68759c830f" + integrity sha512-nzeaUo6T11OamM2AAyIjbvwV8Y3TWK7vhdzQuseCgprhsvSkXz5ndrraLY6J3xKYqM03cgmEbywSOcNDfEuP0w== dependencies: - "@budibase/backend-core" "2.4.30" + "@budibase/backend-core" "2.4.31" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.30" + "@budibase/types" "2.4.31" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.30", "@budibase/types@^2.4.30": - version "2.4.30" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.30.tgz#43012bbdcd58d3fa064894e64712f4dcf65de64e" - integrity sha512-kCnVrI+lHQQwOj5op+Oivaj//S8gAGYrybWWixcoA8Ke3vwQfqY70rqqq+ALW7rFzP9plb/8toWec1cRoU5OFQ== +"@budibase/types@2.4.31", "@budibase/types@^2.4.31": + version "2.4.31" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.31.tgz#11a50f27060cde780c00145ef0446dfa596544a6" + integrity sha512-6+gHJBiEwx7u245AQfwU+ffJ+SMm6Trv0IQKvXC+Dc2y2DFPQqsJEp8FAUtq9BwJJn/mJFwN48+S3Yn7nLwuPw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 044a88dd8a71797a2cd0aff5bbd1807026ba5bad Mon Sep 17 00:00:00 2001 From: Vinoth Kirubakaran Date: Wed, 15 Mar 2023 21:32:32 +0530 Subject: [PATCH 22/77] Ability to configure schedulerName for helm charts (#10018) * Update minio-service-deployment.yaml * Update redis-service-deployment.yaml * Update couchdb-backup.yaml * Update proxy-service-deployment.yaml * Update app-service-deployment.yaml * Update worker-service-deployment.yaml * Update app-service-deployment.yaml * Update couchdb-backup.yaml * Update minio-service-deployment.yaml * Update proxy-service-deployment.yaml * Update redis-service-deployment.yaml * Update worker-service-deployment.yaml --- charts/budibase/templates/app-service-deployment.yaml | 3 +++ charts/budibase/templates/couchdb-backup.yaml | 3 +++ charts/budibase/templates/minio-service-deployment.yaml | 3 +++ charts/budibase/templates/proxy-service-deployment.yaml | 3 +++ charts/budibase/templates/redis-service-deployment.yaml | 3 +++ charts/budibase/templates/worker-service-deployment.yaml | 3 +++ 6 files changed, 18 insertions(+) diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml index 41b0dc48c9..9ff7dc1ddc 100644 --- a/charts/budibase/templates/app-service-deployment.yaml +++ b/charts/budibase/templates/app-service-deployment.yaml @@ -232,6 +232,9 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{ if .Values.schedulerName }} + schedulerName: {{ .Values.schedulerName | quote }} + {{ end }} {{ if .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml .Values.imagePullSecrets | nindent 6 }} diff --git a/charts/budibase/templates/couchdb-backup.yaml b/charts/budibase/templates/couchdb-backup.yaml index 68e5eab617..7396f97476 100644 --- a/charts/budibase/templates/couchdb-backup.yaml +++ b/charts/budibase/templates/couchdb-backup.yaml @@ -50,5 +50,8 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{ if .Values.schedulerName }} + schedulerName: {{ .Values.schedulerName | quote }} + {{ end }} status: {} {{- end }} diff --git a/charts/budibase/templates/minio-service-deployment.yaml b/charts/budibase/templates/minio-service-deployment.yaml index d0a367653d..41af2624bf 100644 --- a/charts/budibase/templates/minio-service-deployment.yaml +++ b/charts/budibase/templates/minio-service-deployment.yaml @@ -72,6 +72,9 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{ if .Values.schedulerName }} + schedulerName: {{ .Values.schedulerName | quote }} + {{ end }} {{ if .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml .Values.imagePullSecrets | nindent 6 }} diff --git a/charts/budibase/templates/proxy-service-deployment.yaml b/charts/budibase/templates/proxy-service-deployment.yaml index 0dea38fcbd..42af458a8c 100644 --- a/charts/budibase/templates/proxy-service-deployment.yaml +++ b/charts/budibase/templates/proxy-service-deployment.yaml @@ -78,6 +78,9 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{ if .Values.schedulerName }} + schedulerName: {{ .Values.schedulerName | quote }} + {{ end }} {{ if .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml .Values.imagePullSecrets | nindent 6 }} diff --git a/charts/budibase/templates/redis-service-deployment.yaml b/charts/budibase/templates/redis-service-deployment.yaml index 5916c6d3f9..9b39d14291 100644 --- a/charts/budibase/templates/redis-service-deployment.yaml +++ b/charts/budibase/templates/redis-service-deployment.yaml @@ -50,6 +50,9 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{ if .Values.schedulerName }} + schedulerName: {{ .Values.schedulerName | quote }} + {{ end }} {{ if .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml .Values.imagePullSecrets | nindent 6 }} diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml index 7886d55b28..f998e5dfb9 100644 --- a/charts/budibase/templates/worker-service-deployment.yaml +++ b/charts/budibase/templates/worker-service-deployment.yaml @@ -222,6 +222,9 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{ if .Values.schedulerName }} + schedulerName: {{ .Values.schedulerName | quote }} + {{ end }} {{ if .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml .Values.imagePullSecrets | nindent 6 }} From 0b26cc87430023b8a099b10d8af3e81c73bdb1fd Mon Sep 17 00:00:00 2001 From: Vinoth Kirubakaran Date: Mon, 6 Mar 2023 20:56:09 +0530 Subject: [PATCH 23/77] Update environment.ts Added new ENV variables for auth redirect paths --- packages/worker/src/environment.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/worker/src/environment.ts b/packages/worker/src/environment.ts index 3f762ea5ab..3509e0602c 100644 --- a/packages/worker/src/environment.ts +++ b/packages/worker/src/environment.ts @@ -66,6 +66,15 @@ const environment = { * Mock the email service in use - links to ethereal hosted emails are logged instead. */ ENABLE_EMAIL_TEST_MODE: process.env.ENABLE_EMAIL_TEST_MODE, + PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT: + process.env.PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT || "/", + PASSPORT_GOOGLEAUTH_FAILURE_REDIRECT: + process.env.PASSPORT_GOOGLEAUTH_FAILURE_REDIRECT || "/error", + PASSPORT_OIDCAUTH_SUCCESS_REDIRECT: + process.env.PASSPORT_OIDCAUTH_SUCCESS_REDIRECT || "/", + PASSPORT_OIDCAUTH_FAILURE_REDIRECT: + process.env.PASSPORT_OIDCAUTH_FAILURE_REDIRECT || "/error", + _set(key: any, value: any) { process.env[key] = value // @ts-ignore @@ -100,3 +109,4 @@ for (let [key, value] of Object.entries(environment)) { } export default environment + From 9407383c548f6ad9d444d205af72fb6327715234 Mon Sep 17 00:00:00 2001 From: Vinoth Kirubakaran Date: Mon, 6 Mar 2023 20:57:24 +0530 Subject: [PATCH 24/77] Update auth.ts Updated success and error redirect paths using ENV variables --- .../worker/src/api/controllers/global/auth.ts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/worker/src/api/controllers/global/auth.ts b/packages/worker/src/api/controllers/global/auth.ts index 362723abd9..3327f7dc6d 100644 --- a/packages/worker/src/api/controllers/global/auth.ts +++ b/packages/worker/src/api/controllers/global/auth.ts @@ -204,13 +204,16 @@ export const googleCallback = async (ctx: any, next: any) => { return passport.authenticate( strategy, - { successRedirect: "/", failureRedirect: "/error" }, + { + successRedirect: env.PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT, + failureRedirect: env.PASSPORT_GOOGLEAUTH_FAILURE_REDIRECT, + }, async (err: any, user: SSOUser, info: any) => { await passportCallback(ctx, user, err, info) await context.identity.doInUserContext(user, ctx, async () => { await events.auth.login("google-internal", user.email) }) - ctx.redirect("/") + ctx.redirect(env.PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT) } )(ctx, next) } @@ -269,13 +272,17 @@ export const oidcCallback = async (ctx: any, next: any) => { return passport.authenticate( strategy, - { successRedirect: "/", failureRedirect: "/error" }, + { + successRedirect: env.PASSPORT_OIDCAUTH_SUCCESS_REDIRECT, + failureRedirect: env.PASSPORT_OIDCAUTH_FAILURE_REDIRECT, + }, async (err: any, user: SSOUser, info: any) => { await passportCallback(ctx, user, err, info) await context.identity.doInUserContext(user, ctx, async () => { await events.auth.login("oidc", user.email) }) - ctx.redirect("/") + ctx.redirect(env.PASSPORT_OIDCAUTH_SUCCESS_REDIRECT) } )(ctx, next) } + From a46a33877b3102e10567e9875696852cfd8cdf2f Mon Sep 17 00:00:00 2001 From: Vinoth Kirubakaran Date: Mon, 6 Mar 2023 15:55:29 +0000 Subject: [PATCH 25/77] chore: ran prettier for environment.ts and auth.ts --- packages/worker/src/api/controllers/global/auth.ts | 1 - packages/worker/src/environment.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/worker/src/api/controllers/global/auth.ts b/packages/worker/src/api/controllers/global/auth.ts index 3327f7dc6d..1286fd519d 100644 --- a/packages/worker/src/api/controllers/global/auth.ts +++ b/packages/worker/src/api/controllers/global/auth.ts @@ -285,4 +285,3 @@ export const oidcCallback = async (ctx: any, next: any) => { } )(ctx, next) } - diff --git a/packages/worker/src/environment.ts b/packages/worker/src/environment.ts index 3509e0602c..812af6aacd 100644 --- a/packages/worker/src/environment.ts +++ b/packages/worker/src/environment.ts @@ -109,4 +109,3 @@ for (let [key, value] of Object.entries(environment)) { } export default environment - From 1d7abe7031d3287ff6fe88d0d706d7a692e9c290 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 16 Mar 2023 13:45:11 +0000 Subject: [PATCH 26/77] v2.4.32 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index 55df40669a..b6f963aa54 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.31", + "version": "2.4.32", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 08e0337dde..50bf70f3e1 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.31", + "version": "2.4.32", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.4.31", + "@budibase/types": "^2.4.32", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index d17c2725ff..450f8d7ea6 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.4.31", + "version": "2.4.32", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.4.31", - "@budibase/string-templates": "^2.4.31", + "@budibase/shared-core": "^2.4.32", + "@budibase/string-templates": "^2.4.32", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index f6c1fac71b..c2f630c40e 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.31", + "version": "2.4.32", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.31", - "@budibase/client": "^2.4.31", - "@budibase/frontend-core": "^2.4.31", - "@budibase/shared-core": "^2.4.31", - "@budibase/string-templates": "^2.4.31", + "@budibase/bbui": "^2.4.32", + "@budibase/client": "^2.4.32", + "@budibase/frontend-core": "^2.4.32", + "@budibase/shared-core": "^2.4.32", + "@budibase/string-templates": "^2.4.32", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index c2f7579bcc..86d8031976 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.31", + "version": "2.4.32", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.4.31", - "@budibase/string-templates": "^2.4.31", - "@budibase/types": "^2.4.31", + "@budibase/backend-core": "^2.4.32", + "@budibase/string-templates": "^2.4.32", + "@budibase/types": "^2.4.32", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index feff8265aa..644f53970e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.31", + "version": "2.4.32", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.4.31", - "@budibase/frontend-core": "^2.4.31", - "@budibase/shared-core": "^2.4.31", - "@budibase/string-templates": "^2.4.31", - "@budibase/types": "^2.4.31", + "@budibase/bbui": "^2.4.32", + "@budibase/frontend-core": "^2.4.32", + "@budibase/shared-core": "^2.4.32", + "@budibase/string-templates": "^2.4.32", + "@budibase/types": "^2.4.32", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 821b6a3597..6e5af64276 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.31", + "version": "2.4.32", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.4.31", - "@budibase/shared-core": "^2.4.31", + "@budibase/bbui": "^2.4.32", + "@budibase/shared-core": "^2.4.32", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 22c04db77c..c15d2d9d72 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.31", + "version": "2.4.32", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index ff963b8a09..1c1b65e890 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.31", + "version": "2.4.32", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.31", - "@budibase/client": "^2.4.31", + "@budibase/backend-core": "^2.4.32", + "@budibase/client": "^2.4.32", "@budibase/pro": "2.4.31", - "@budibase/shared-core": "^2.4.31", - "@budibase/string-templates": "^2.4.31", - "@budibase/types": "^2.4.31", + "@budibase/shared-core": "^2.4.32", + "@budibase/string-templates": "^2.4.32", + "@budibase/types": "^2.4.32", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 415338717a..b6ed87f8df 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.31", + "version": "2.4.32", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.4.31" + "@budibase/types": "^2.4.32" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 39c24f8d72..aab8549455 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.31", + "version": "2.4.32", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 959a9c60d8..e48f99f27d 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.31", + "version": "2.4.32", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 2e3446b39f..98bc32096b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.31", + "version": "2.4.32", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.4.31", + "@budibase/backend-core": "^2.4.32", "@budibase/pro": "2.4.31", - "@budibase/string-templates": "^2.4.31", - "@budibase/types": "^2.4.31", + "@budibase/string-templates": "^2.4.32", + "@budibase/types": "^2.4.32", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 7ee305231d7c4c6ea63543bfac753f0b3d373235 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 16 Mar 2023 13:48:54 +0000 Subject: [PATCH 27/77] Update pro version to 2.4.32 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 1c1b65e890..d13359b5e1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.4.32", "@budibase/client": "^2.4.32", - "@budibase/pro": "2.4.31", + "@budibase/pro": "2.4.32", "@budibase/shared-core": "^2.4.32", "@budibase/string-templates": "^2.4.32", "@budibase/types": "^2.4.32", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 0cff77f929..2c42423cc2 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1278,14 +1278,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.31": - version "2.4.31" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.31.tgz#69613497fedf18fbe29d007926f434a4ec422ce3" - integrity sha512-TjgUAKPh8IpFsSd1lylNjK9nm0EY3O9duwsCjd5ZN2X6VdjWTorQON+8/3NHcUeDgnTdWImoWRQSuEwkgeHPuA== +"@budibase/backend-core@2.4.32": + version "2.4.32" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.32.tgz#ec1010eed05bd284534de26fdd0c21d5c54f203a" + integrity sha512-Y6fyUGDeVaAjxczx0GxiSizPVgAW3dQ3/W/wGcxeEXG1roV/9LqxwkXGw7ndR0DyrIB3M/xPettZMao5XVEHng== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.31" + "@budibase/types" "^2.4.32" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1417,14 +1417,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.31": - version "2.4.31" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.31.tgz#f296c5025b4c081c9f59a19fb57b0c68759c830f" - integrity sha512-nzeaUo6T11OamM2AAyIjbvwV8Y3TWK7vhdzQuseCgprhsvSkXz5ndrraLY6J3xKYqM03cgmEbywSOcNDfEuP0w== +"@budibase/pro@2.4.32": + version "2.4.32" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.32.tgz#ebc757b50aeb69147d1af96ec9210ea94e4fe67d" + integrity sha512-vxknQFY9+RybO9jTcA8uJpTthoAiWD32sfwJ+2PMrUYIO+InTbKZMR7F96uHeVqoXDPzTsiTXzWt8okPidTsyA== dependencies: - "@budibase/backend-core" "2.4.31" + "@budibase/backend-core" "2.4.32" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.31" + "@budibase/types" "2.4.32" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1463,10 +1463,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.31", "@budibase/types@^2.4.31": - version "2.4.31" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.31.tgz#11a50f27060cde780c00145ef0446dfa596544a6" - integrity sha512-6+gHJBiEwx7u245AQfwU+ffJ+SMm6Trv0IQKvXC+Dc2y2DFPQqsJEp8FAUtq9BwJJn/mJFwN48+S3Yn7nLwuPw== +"@budibase/types@2.4.32", "@budibase/types@^2.4.32": + version "2.4.32" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.32.tgz#93bede81f10f47b41323265c41c6f1620d216650" + integrity sha512-UN+AH4oztpPzTMy7F7SobFNwQ2AyUETvDiLeEGOzSf8yeqFT3mpO3BRbsrV3mMQqnZ8/eupFLdGHtQ82N1jFrw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 98bc32096b..e961a3dd0f 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.4.32", - "@budibase/pro": "2.4.31", + "@budibase/pro": "2.4.32", "@budibase/string-templates": "^2.4.32", "@budibase/types": "^2.4.32", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index aa694e9e0e..abebef17e4 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.31": - version "2.4.31" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.31.tgz#69613497fedf18fbe29d007926f434a4ec422ce3" - integrity sha512-TjgUAKPh8IpFsSd1lylNjK9nm0EY3O9duwsCjd5ZN2X6VdjWTorQON+8/3NHcUeDgnTdWImoWRQSuEwkgeHPuA== +"@budibase/backend-core@2.4.32": + version "2.4.32" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.32.tgz#ec1010eed05bd284534de26fdd0c21d5c54f203a" + integrity sha512-Y6fyUGDeVaAjxczx0GxiSizPVgAW3dQ3/W/wGcxeEXG1roV/9LqxwkXGw7ndR0DyrIB3M/xPettZMao5XVEHng== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.31" + "@budibase/types" "^2.4.32" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.31": - version "2.4.31" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.31.tgz#f296c5025b4c081c9f59a19fb57b0c68759c830f" - integrity sha512-nzeaUo6T11OamM2AAyIjbvwV8Y3TWK7vhdzQuseCgprhsvSkXz5ndrraLY6J3xKYqM03cgmEbywSOcNDfEuP0w== +"@budibase/pro@2.4.32": + version "2.4.32" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.32.tgz#ebc757b50aeb69147d1af96ec9210ea94e4fe67d" + integrity sha512-vxknQFY9+RybO9jTcA8uJpTthoAiWD32sfwJ+2PMrUYIO+InTbKZMR7F96uHeVqoXDPzTsiTXzWt8okPidTsyA== dependencies: - "@budibase/backend-core" "2.4.31" + "@budibase/backend-core" "2.4.32" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.31" + "@budibase/types" "2.4.32" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.31", "@budibase/types@^2.4.31": - version "2.4.31" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.31.tgz#11a50f27060cde780c00145ef0446dfa596544a6" - integrity sha512-6+gHJBiEwx7u245AQfwU+ffJ+SMm6Trv0IQKvXC+Dc2y2DFPQqsJEp8FAUtq9BwJJn/mJFwN48+S3Yn7nLwuPw== +"@budibase/types@2.4.32", "@budibase/types@^2.4.32": + version "2.4.32" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.32.tgz#93bede81f10f47b41323265c41c6f1620d216650" + integrity sha512-UN+AH4oztpPzTMy7F7SobFNwQ2AyUETvDiLeEGOzSf8yeqFT3mpO3BRbsrV3mMQqnZ8/eupFLdGHtQ82N1jFrw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 8eaba806d411ef70877688a3ff075bd37068f3ce Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 20 Mar 2023 09:12:50 +0000 Subject: [PATCH 28/77] Fix regression that prevented custom placeholders from working (#9994) --- packages/bbui/src/Form/Core/Select.svelte | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte index af45c1d9ff..2fad886910 100644 --- a/packages/bbui/src/Form/Core/Select.svelte +++ b/packages/bbui/src/Form/Core/Select.svelte @@ -42,9 +42,13 @@ } const getFieldText = (value, options, placeholder) => { - // Always use placeholder if no value if (value == null || value === "") { - return placeholder !== false ? "Choose an option" : "" + // Explicit false means use no placeholder and allow an empty fields + if (placeholder === false) { + return "" + } + // Otherwise we use the placeholder if possible + return placeholder || "Choose an option" } return getFieldAttribute(getOptionLabel, value, options) From 1d6fa91249ee8c1d77df97c8be91034aa2f99415 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 20 Mar 2023 09:22:52 +0000 Subject: [PATCH 29/77] v2.4.33 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index b6f963aa54..d2bb75e843 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.32", + "version": "2.4.33", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 50bf70f3e1..477a9c6376 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.32", + "version": "2.4.33", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.4.32", + "@budibase/types": "^2.4.33", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 450f8d7ea6..c56c4bcbe1 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.4.32", + "version": "2.4.33", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.4.32", - "@budibase/string-templates": "^2.4.32", + "@budibase/shared-core": "^2.4.33", + "@budibase/string-templates": "^2.4.33", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index c2f630c40e..16eb6e0e3e 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.32", + "version": "2.4.33", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.32", - "@budibase/client": "^2.4.32", - "@budibase/frontend-core": "^2.4.32", - "@budibase/shared-core": "^2.4.32", - "@budibase/string-templates": "^2.4.32", + "@budibase/bbui": "^2.4.33", + "@budibase/client": "^2.4.33", + "@budibase/frontend-core": "^2.4.33", + "@budibase/shared-core": "^2.4.33", + "@budibase/string-templates": "^2.4.33", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 86d8031976..53aed89c9f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.32", + "version": "2.4.33", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.4.32", - "@budibase/string-templates": "^2.4.32", - "@budibase/types": "^2.4.32", + "@budibase/backend-core": "^2.4.33", + "@budibase/string-templates": "^2.4.33", + "@budibase/types": "^2.4.33", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 644f53970e..4bd83884ad 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.32", + "version": "2.4.33", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.4.32", - "@budibase/frontend-core": "^2.4.32", - "@budibase/shared-core": "^2.4.32", - "@budibase/string-templates": "^2.4.32", - "@budibase/types": "^2.4.32", + "@budibase/bbui": "^2.4.33", + "@budibase/frontend-core": "^2.4.33", + "@budibase/shared-core": "^2.4.33", + "@budibase/string-templates": "^2.4.33", + "@budibase/types": "^2.4.33", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 6e5af64276..0041905103 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.32", + "version": "2.4.33", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.4.32", - "@budibase/shared-core": "^2.4.32", + "@budibase/bbui": "^2.4.33", + "@budibase/shared-core": "^2.4.33", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index c15d2d9d72..cf5c95bd79 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.32", + "version": "2.4.33", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index d13359b5e1..34154cfcf6 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.32", + "version": "2.4.33", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.32", - "@budibase/client": "^2.4.32", + "@budibase/backend-core": "^2.4.33", + "@budibase/client": "^2.4.33", "@budibase/pro": "2.4.32", - "@budibase/shared-core": "^2.4.32", - "@budibase/string-templates": "^2.4.32", - "@budibase/types": "^2.4.32", + "@budibase/shared-core": "^2.4.33", + "@budibase/string-templates": "^2.4.33", + "@budibase/types": "^2.4.33", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index b6ed87f8df..4b765a603f 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.32", + "version": "2.4.33", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.4.32" + "@budibase/types": "^2.4.33" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index aab8549455..3078dca29d 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.32", + "version": "2.4.33", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index e48f99f27d..82d68e5cc9 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.32", + "version": "2.4.33", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index e961a3dd0f..ba33846d66 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.32", + "version": "2.4.33", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.4.32", + "@budibase/backend-core": "^2.4.33", "@budibase/pro": "2.4.32", - "@budibase/string-templates": "^2.4.32", - "@budibase/types": "^2.4.32", + "@budibase/string-templates": "^2.4.33", + "@budibase/types": "^2.4.33", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 31863738372a128a8c9b1e9c8e2d3355a2a363ed Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 20 Mar 2023 09:26:00 +0000 Subject: [PATCH 30/77] Update pro version to 2.4.33 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 34154cfcf6..638a92f9a0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.4.33", "@budibase/client": "^2.4.33", - "@budibase/pro": "2.4.32", + "@budibase/pro": "2.4.33", "@budibase/shared-core": "^2.4.33", "@budibase/string-templates": "^2.4.33", "@budibase/types": "^2.4.33", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 2c42423cc2..70e8921421 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1278,14 +1278,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.32": - version "2.4.32" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.32.tgz#ec1010eed05bd284534de26fdd0c21d5c54f203a" - integrity sha512-Y6fyUGDeVaAjxczx0GxiSizPVgAW3dQ3/W/wGcxeEXG1roV/9LqxwkXGw7ndR0DyrIB3M/xPettZMao5XVEHng== +"@budibase/backend-core@2.4.33": + version "2.4.33" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.33.tgz#7ad53ca120b8084cf96823b53691702391db3152" + integrity sha512-AJQ9ekAm8HmvZCoE167HAch5VqIZVZhwdor3W7Kt0MexN/pjLlJeq1wesSouNX0Hh/Yv3lEGr4brxAkgedy08g== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.32" + "@budibase/types" "^2.4.33" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1417,14 +1417,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.32": - version "2.4.32" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.32.tgz#ebc757b50aeb69147d1af96ec9210ea94e4fe67d" - integrity sha512-vxknQFY9+RybO9jTcA8uJpTthoAiWD32sfwJ+2PMrUYIO+InTbKZMR7F96uHeVqoXDPzTsiTXzWt8okPidTsyA== +"@budibase/pro@2.4.33": + version "2.4.33" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.33.tgz#1c0c2704bc57b1da58710f2c94f05b65e305fabc" + integrity sha512-BkbatNw2rtRWFtLKi4QJ7heI/SiSiKelK91eZzUfiKpp8xJlj38pgNN/c/pcVDhMlZnRDhdcae8E0YM55n1j0A== dependencies: - "@budibase/backend-core" "2.4.32" + "@budibase/backend-core" "2.4.33" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.32" + "@budibase/types" "2.4.33" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1463,10 +1463,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.32", "@budibase/types@^2.4.32": - version "2.4.32" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.32.tgz#93bede81f10f47b41323265c41c6f1620d216650" - integrity sha512-UN+AH4oztpPzTMy7F7SobFNwQ2AyUETvDiLeEGOzSf8yeqFT3mpO3BRbsrV3mMQqnZ8/eupFLdGHtQ82N1jFrw== +"@budibase/types@2.4.33", "@budibase/types@^2.4.33": + version "2.4.33" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.33.tgz#007a57dc64640458b89fcdabee540359ccba0ea6" + integrity sha512-e/NybRtPbhU0arBXkkhN8ONY8JRFU1Eek1k8SCOxlwerKg5GWZFg31RD1Ryh2hBVEeX9Qtf618DizOcv8LzTxQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index ba33846d66..69e7d51c05 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.4.33", - "@budibase/pro": "2.4.32", + "@budibase/pro": "2.4.33", "@budibase/string-templates": "^2.4.33", "@budibase/types": "^2.4.33", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index abebef17e4..19cc7fe343 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.32": - version "2.4.32" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.32.tgz#ec1010eed05bd284534de26fdd0c21d5c54f203a" - integrity sha512-Y6fyUGDeVaAjxczx0GxiSizPVgAW3dQ3/W/wGcxeEXG1roV/9LqxwkXGw7ndR0DyrIB3M/xPettZMao5XVEHng== +"@budibase/backend-core@2.4.33": + version "2.4.33" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.33.tgz#7ad53ca120b8084cf96823b53691702391db3152" + integrity sha512-AJQ9ekAm8HmvZCoE167HAch5VqIZVZhwdor3W7Kt0MexN/pjLlJeq1wesSouNX0Hh/Yv3lEGr4brxAkgedy08g== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.32" + "@budibase/types" "^2.4.33" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.32": - version "2.4.32" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.32.tgz#ebc757b50aeb69147d1af96ec9210ea94e4fe67d" - integrity sha512-vxknQFY9+RybO9jTcA8uJpTthoAiWD32sfwJ+2PMrUYIO+InTbKZMR7F96uHeVqoXDPzTsiTXzWt8okPidTsyA== +"@budibase/pro@2.4.33": + version "2.4.33" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.33.tgz#1c0c2704bc57b1da58710f2c94f05b65e305fabc" + integrity sha512-BkbatNw2rtRWFtLKi4QJ7heI/SiSiKelK91eZzUfiKpp8xJlj38pgNN/c/pcVDhMlZnRDhdcae8E0YM55n1j0A== dependencies: - "@budibase/backend-core" "2.4.32" + "@budibase/backend-core" "2.4.33" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.32" + "@budibase/types" "2.4.33" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.32", "@budibase/types@^2.4.32": - version "2.4.32" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.32.tgz#93bede81f10f47b41323265c41c6f1620d216650" - integrity sha512-UN+AH4oztpPzTMy7F7SobFNwQ2AyUETvDiLeEGOzSf8yeqFT3mpO3BRbsrV3mMQqnZ8/eupFLdGHtQ82N1jFrw== +"@budibase/types@2.4.33", "@budibase/types@^2.4.33": + version "2.4.33" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.33.tgz#007a57dc64640458b89fcdabee540359ccba0ea6" + integrity sha512-e/NybRtPbhU0arBXkkhN8ONY8JRFU1Eek1k8SCOxlwerKg5GWZFg31RD1Ryh2hBVEeX9Qtf618DizOcv8LzTxQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 775ae5800398e4f1169df7ddc00f93ab0b5a48b6 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 20 Mar 2023 10:42:57 +0000 Subject: [PATCH 31/77] v2.4.34 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index d2bb75e843..4ea22fb0ad 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.33", + "version": "2.4.34", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 477a9c6376..b29af17821 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.33", + "version": "2.4.34", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.4.33", + "@budibase/types": "^2.4.34", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index c56c4bcbe1..e5c85a8539 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.4.33", + "version": "2.4.34", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.4.33", - "@budibase/string-templates": "^2.4.33", + "@budibase/shared-core": "^2.4.34", + "@budibase/string-templates": "^2.4.34", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 16eb6e0e3e..32e4499d96 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.33", + "version": "2.4.34", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.33", - "@budibase/client": "^2.4.33", - "@budibase/frontend-core": "^2.4.33", - "@budibase/shared-core": "^2.4.33", - "@budibase/string-templates": "^2.4.33", + "@budibase/bbui": "^2.4.34", + "@budibase/client": "^2.4.34", + "@budibase/frontend-core": "^2.4.34", + "@budibase/shared-core": "^2.4.34", + "@budibase/string-templates": "^2.4.34", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 53aed89c9f..213e01c8b0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.33", + "version": "2.4.34", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.4.33", - "@budibase/string-templates": "^2.4.33", - "@budibase/types": "^2.4.33", + "@budibase/backend-core": "^2.4.34", + "@budibase/string-templates": "^2.4.34", + "@budibase/types": "^2.4.34", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 4bd83884ad..69a14e9cf7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.33", + "version": "2.4.34", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.4.33", - "@budibase/frontend-core": "^2.4.33", - "@budibase/shared-core": "^2.4.33", - "@budibase/string-templates": "^2.4.33", - "@budibase/types": "^2.4.33", + "@budibase/bbui": "^2.4.34", + "@budibase/frontend-core": "^2.4.34", + "@budibase/shared-core": "^2.4.34", + "@budibase/string-templates": "^2.4.34", + "@budibase/types": "^2.4.34", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 0041905103..6a042aec75 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.33", + "version": "2.4.34", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.4.33", - "@budibase/shared-core": "^2.4.33", + "@budibase/bbui": "^2.4.34", + "@budibase/shared-core": "^2.4.34", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index cf5c95bd79..119b34261c 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.33", + "version": "2.4.34", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 638a92f9a0..c06eccc192 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.33", + "version": "2.4.34", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.33", - "@budibase/client": "^2.4.33", + "@budibase/backend-core": "^2.4.34", + "@budibase/client": "^2.4.34", "@budibase/pro": "2.4.33", - "@budibase/shared-core": "^2.4.33", - "@budibase/string-templates": "^2.4.33", - "@budibase/types": "^2.4.33", + "@budibase/shared-core": "^2.4.34", + "@budibase/string-templates": "^2.4.34", + "@budibase/types": "^2.4.34", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 4b765a603f..c725faa569 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.33", + "version": "2.4.34", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.4.33" + "@budibase/types": "^2.4.34" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 3078dca29d..f2fd01a139 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.33", + "version": "2.4.34", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 82d68e5cc9..763cddac8e 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.33", + "version": "2.4.34", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 69e7d51c05..b47cc77c3d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.33", + "version": "2.4.34", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.4.33", + "@budibase/backend-core": "^2.4.34", "@budibase/pro": "2.4.33", - "@budibase/string-templates": "^2.4.33", - "@budibase/types": "^2.4.33", + "@budibase/string-templates": "^2.4.34", + "@budibase/types": "^2.4.34", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From ed927475d5e1a332feb3b98586a71d2a127f7286 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 20 Mar 2023 10:45:56 +0000 Subject: [PATCH 32/77] Update pro version to 2.4.34 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index c06eccc192..63e3c139ef 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.4.34", "@budibase/client": "^2.4.34", - "@budibase/pro": "2.4.33", + "@budibase/pro": "2.4.34", "@budibase/shared-core": "^2.4.34", "@budibase/string-templates": "^2.4.34", "@budibase/types": "^2.4.34", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 70e8921421..970e4070ce 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1278,14 +1278,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.33": - version "2.4.33" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.33.tgz#7ad53ca120b8084cf96823b53691702391db3152" - integrity sha512-AJQ9ekAm8HmvZCoE167HAch5VqIZVZhwdor3W7Kt0MexN/pjLlJeq1wesSouNX0Hh/Yv3lEGr4brxAkgedy08g== +"@budibase/backend-core@2.4.34": + version "2.4.34" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.34.tgz#567e9aa1254e5e8463dae48b7b3b0f13bbdf2a21" + integrity sha512-i1OKvSywaJWKleU48Mg+1IdiSRZ3ymsjyAcbW5ZcEwT86n78XHPEv1WEASMSUaVfHoincQNoJsNLG/vIck713A== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.33" + "@budibase/types" "^2.4.34" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1417,14 +1417,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.33": - version "2.4.33" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.33.tgz#1c0c2704bc57b1da58710f2c94f05b65e305fabc" - integrity sha512-BkbatNw2rtRWFtLKi4QJ7heI/SiSiKelK91eZzUfiKpp8xJlj38pgNN/c/pcVDhMlZnRDhdcae8E0YM55n1j0A== +"@budibase/pro@2.4.34": + version "2.4.34" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.34.tgz#40297230ae5a2bc8d6b57e30d8f6cf0e72e1f3f2" + integrity sha512-aATHuszRCm/ipCrZ2VxGEQa7SmWmcs0uZcB/LpcOECYVpokN8IEil3C85bLIsuGtiwkB1yJoRJuXM6NfVl+Pgg== dependencies: - "@budibase/backend-core" "2.4.33" + "@budibase/backend-core" "2.4.34" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.33" + "@budibase/types" "2.4.34" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1463,10 +1463,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.33", "@budibase/types@^2.4.33": - version "2.4.33" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.33.tgz#007a57dc64640458b89fcdabee540359ccba0ea6" - integrity sha512-e/NybRtPbhU0arBXkkhN8ONY8JRFU1Eek1k8SCOxlwerKg5GWZFg31RD1Ryh2hBVEeX9Qtf618DizOcv8LzTxQ== +"@budibase/types@2.4.34", "@budibase/types@^2.4.34": + version "2.4.34" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.34.tgz#c7d6d2eaa2f5c39a37aeab5cf8b2cf164bdcf71c" + integrity sha512-7kCo0Y8S0OoX06+tDKi75ZrghF0rR3t/cYnupHSQqBz0CKZxIfR4q2rjBu5oyxp9buktMoy6bP5pu7jOXAvCmA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index b47cc77c3d..13806221bb 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.4.34", - "@budibase/pro": "2.4.33", + "@budibase/pro": "2.4.34", "@budibase/string-templates": "^2.4.34", "@budibase/types": "^2.4.34", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 19cc7fe343..7b0d31312d 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.33": - version "2.4.33" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.33.tgz#7ad53ca120b8084cf96823b53691702391db3152" - integrity sha512-AJQ9ekAm8HmvZCoE167HAch5VqIZVZhwdor3W7Kt0MexN/pjLlJeq1wesSouNX0Hh/Yv3lEGr4brxAkgedy08g== +"@budibase/backend-core@2.4.34": + version "2.4.34" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.34.tgz#567e9aa1254e5e8463dae48b7b3b0f13bbdf2a21" + integrity sha512-i1OKvSywaJWKleU48Mg+1IdiSRZ3ymsjyAcbW5ZcEwT86n78XHPEv1WEASMSUaVfHoincQNoJsNLG/vIck713A== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.33" + "@budibase/types" "^2.4.34" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.33": - version "2.4.33" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.33.tgz#1c0c2704bc57b1da58710f2c94f05b65e305fabc" - integrity sha512-BkbatNw2rtRWFtLKi4QJ7heI/SiSiKelK91eZzUfiKpp8xJlj38pgNN/c/pcVDhMlZnRDhdcae8E0YM55n1j0A== +"@budibase/pro@2.4.34": + version "2.4.34" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.34.tgz#40297230ae5a2bc8d6b57e30d8f6cf0e72e1f3f2" + integrity sha512-aATHuszRCm/ipCrZ2VxGEQa7SmWmcs0uZcB/LpcOECYVpokN8IEil3C85bLIsuGtiwkB1yJoRJuXM6NfVl+Pgg== dependencies: - "@budibase/backend-core" "2.4.33" + "@budibase/backend-core" "2.4.34" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.33" + "@budibase/types" "2.4.34" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.33", "@budibase/types@^2.4.33": - version "2.4.33" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.33.tgz#007a57dc64640458b89fcdabee540359ccba0ea6" - integrity sha512-e/NybRtPbhU0arBXkkhN8ONY8JRFU1Eek1k8SCOxlwerKg5GWZFg31RD1Ryh2hBVEeX9Qtf618DizOcv8LzTxQ== +"@budibase/types@2.4.34", "@budibase/types@^2.4.34": + version "2.4.34" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.34.tgz#c7d6d2eaa2f5c39a37aeab5cf8b2cf164bdcf71c" + integrity sha512-7kCo0Y8S0OoX06+tDKi75ZrghF0rR3t/cYnupHSQqBz0CKZxIfR4q2rjBu5oyxp9buktMoy6bP5pu7jOXAvCmA== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 32e1fd00d37d5192732cbad79265f47375a5f4f4 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 22 Mar 2023 07:21:26 +0000 Subject: [PATCH 33/77] v2.4.35 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index 4ea22fb0ad..73389a3b65 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.34", + "version": "2.4.35", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index b29af17821..b3ba20c6ba 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.34", + "version": "2.4.35", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.4.34", + "@budibase/types": "^2.4.35", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index e5c85a8539..d1fd52680c 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.4.34", + "version": "2.4.35", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.4.34", - "@budibase/string-templates": "^2.4.34", + "@budibase/shared-core": "^2.4.35", + "@budibase/string-templates": "^2.4.35", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 32e4499d96..3919e294fc 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.34", + "version": "2.4.35", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.34", - "@budibase/client": "^2.4.34", - "@budibase/frontend-core": "^2.4.34", - "@budibase/shared-core": "^2.4.34", - "@budibase/string-templates": "^2.4.34", + "@budibase/bbui": "^2.4.35", + "@budibase/client": "^2.4.35", + "@budibase/frontend-core": "^2.4.35", + "@budibase/shared-core": "^2.4.35", + "@budibase/string-templates": "^2.4.35", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 213e01c8b0..35bb0780a3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.34", + "version": "2.4.35", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.4.34", - "@budibase/string-templates": "^2.4.34", - "@budibase/types": "^2.4.34", + "@budibase/backend-core": "^2.4.35", + "@budibase/string-templates": "^2.4.35", + "@budibase/types": "^2.4.35", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 69a14e9cf7..94688f37e5 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.34", + "version": "2.4.35", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.4.34", - "@budibase/frontend-core": "^2.4.34", - "@budibase/shared-core": "^2.4.34", - "@budibase/string-templates": "^2.4.34", - "@budibase/types": "^2.4.34", + "@budibase/bbui": "^2.4.35", + "@budibase/frontend-core": "^2.4.35", + "@budibase/shared-core": "^2.4.35", + "@budibase/string-templates": "^2.4.35", + "@budibase/types": "^2.4.35", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 6a042aec75..e71cd756e5 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.34", + "version": "2.4.35", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.4.34", - "@budibase/shared-core": "^2.4.34", + "@budibase/bbui": "^2.4.35", + "@budibase/shared-core": "^2.4.35", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 119b34261c..a8c6e4b3fe 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.34", + "version": "2.4.35", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 63e3c139ef..f5f2ae072b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.34", + "version": "2.4.35", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.34", - "@budibase/client": "^2.4.34", + "@budibase/backend-core": "^2.4.35", + "@budibase/client": "^2.4.35", "@budibase/pro": "2.4.34", - "@budibase/shared-core": "^2.4.34", - "@budibase/string-templates": "^2.4.34", - "@budibase/types": "^2.4.34", + "@budibase/shared-core": "^2.4.35", + "@budibase/string-templates": "^2.4.35", + "@budibase/types": "^2.4.35", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index c725faa569..0151a25177 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.34", + "version": "2.4.35", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.4.34" + "@budibase/types": "^2.4.35" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index f2fd01a139..3ce36a3ea8 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.34", + "version": "2.4.35", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 763cddac8e..79b3284826 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.34", + "version": "2.4.35", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 13806221bb..be7803174c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.34", + "version": "2.4.35", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.4.34", + "@budibase/backend-core": "^2.4.35", "@budibase/pro": "2.4.34", - "@budibase/string-templates": "^2.4.34", - "@budibase/types": "^2.4.34", + "@budibase/string-templates": "^2.4.35", + "@budibase/types": "^2.4.35", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 033b7a2355ee2082f49c89663c28691d3c2c8abe Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 22 Mar 2023 07:24:29 +0000 Subject: [PATCH 34/77] Update pro version to 2.4.35 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index f5f2ae072b..9c4a2a515d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.4.35", "@budibase/client": "^2.4.35", - "@budibase/pro": "2.4.34", + "@budibase/pro": "2.4.35", "@budibase/shared-core": "^2.4.35", "@budibase/string-templates": "^2.4.35", "@budibase/types": "^2.4.35", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 970e4070ce..e270972766 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1278,14 +1278,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.34": - version "2.4.34" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.34.tgz#567e9aa1254e5e8463dae48b7b3b0f13bbdf2a21" - integrity sha512-i1OKvSywaJWKleU48Mg+1IdiSRZ3ymsjyAcbW5ZcEwT86n78XHPEv1WEASMSUaVfHoincQNoJsNLG/vIck713A== +"@budibase/backend-core@2.4.35": + version "2.4.35" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.35.tgz#cbf165e2f37c409115bb28f90e657e4fc51018be" + integrity sha512-eJq64DAhVTqjs2vzI7xet82DiFU5BF3t/ZxYiigYuq7H55VE6eaRkAuDylQtZ4lmDyuHlLpKlJaY7qNuZgpPgQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.34" + "@budibase/types" "^2.4.35" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1417,14 +1417,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.34": - version "2.4.34" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.34.tgz#40297230ae5a2bc8d6b57e30d8f6cf0e72e1f3f2" - integrity sha512-aATHuszRCm/ipCrZ2VxGEQa7SmWmcs0uZcB/LpcOECYVpokN8IEil3C85bLIsuGtiwkB1yJoRJuXM6NfVl+Pgg== +"@budibase/pro@2.4.35": + version "2.4.35" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.35.tgz#d4aba60d35bc683b1cca5fc8ab8acf8d3600d169" + integrity sha512-9yTM7K6MxIRkwbthzmD+A/VO85O5KKpmnKx1JWbLNR1PvG2wvUibM/KQPAjhkqlaf+tcUSyr1j8Giw2hb8/JnQ== dependencies: - "@budibase/backend-core" "2.4.34" + "@budibase/backend-core" "2.4.35" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.34" + "@budibase/types" "2.4.35" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1463,10 +1463,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.34", "@budibase/types@^2.4.34": - version "2.4.34" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.34.tgz#c7d6d2eaa2f5c39a37aeab5cf8b2cf164bdcf71c" - integrity sha512-7kCo0Y8S0OoX06+tDKi75ZrghF0rR3t/cYnupHSQqBz0CKZxIfR4q2rjBu5oyxp9buktMoy6bP5pu7jOXAvCmA== +"@budibase/types@2.4.35", "@budibase/types@^2.4.35": + version "2.4.35" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.35.tgz#53cd5c1719aaa1b7099c8e295ddb4db3eb3879bb" + integrity sha512-MoOKOrifJ7yJYpLvcSu2MieodXWhMDQeKHz8MR8B99IFhDD34ppCdqRpyD0ugtqN9jiufnxeDKVjrw2t0/FPpA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index be7803174c..42c8607c91 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.4.35", - "@budibase/pro": "2.4.34", + "@budibase/pro": "2.4.35", "@budibase/string-templates": "^2.4.35", "@budibase/types": "^2.4.35", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 7b0d31312d..cee974d9c7 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.34": - version "2.4.34" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.34.tgz#567e9aa1254e5e8463dae48b7b3b0f13bbdf2a21" - integrity sha512-i1OKvSywaJWKleU48Mg+1IdiSRZ3ymsjyAcbW5ZcEwT86n78XHPEv1WEASMSUaVfHoincQNoJsNLG/vIck713A== +"@budibase/backend-core@2.4.35": + version "2.4.35" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.35.tgz#cbf165e2f37c409115bb28f90e657e4fc51018be" + integrity sha512-eJq64DAhVTqjs2vzI7xet82DiFU5BF3t/ZxYiigYuq7H55VE6eaRkAuDylQtZ4lmDyuHlLpKlJaY7qNuZgpPgQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.34" + "@budibase/types" "^2.4.35" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.34": - version "2.4.34" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.34.tgz#40297230ae5a2bc8d6b57e30d8f6cf0e72e1f3f2" - integrity sha512-aATHuszRCm/ipCrZ2VxGEQa7SmWmcs0uZcB/LpcOECYVpokN8IEil3C85bLIsuGtiwkB1yJoRJuXM6NfVl+Pgg== +"@budibase/pro@2.4.35": + version "2.4.35" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.35.tgz#d4aba60d35bc683b1cca5fc8ab8acf8d3600d169" + integrity sha512-9yTM7K6MxIRkwbthzmD+A/VO85O5KKpmnKx1JWbLNR1PvG2wvUibM/KQPAjhkqlaf+tcUSyr1j8Giw2hb8/JnQ== dependencies: - "@budibase/backend-core" "2.4.34" + "@budibase/backend-core" "2.4.35" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.34" + "@budibase/types" "2.4.35" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.34", "@budibase/types@^2.4.34": - version "2.4.34" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.34.tgz#c7d6d2eaa2f5c39a37aeab5cf8b2cf164bdcf71c" - integrity sha512-7kCo0Y8S0OoX06+tDKi75ZrghF0rR3t/cYnupHSQqBz0CKZxIfR4q2rjBu5oyxp9buktMoy6bP5pu7jOXAvCmA== +"@budibase/types@2.4.35", "@budibase/types@^2.4.35": + version "2.4.35" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.35.tgz#53cd5c1719aaa1b7099c8e295ddb4db3eb3879bb" + integrity sha512-MoOKOrifJ7yJYpLvcSu2MieodXWhMDQeKHz8MR8B99IFhDD34ppCdqRpyD0ugtqN9jiufnxeDKVjrw2t0/FPpA== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From a5b66358504bc8b4006daf8aaf21c5501532da7f Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 27 Mar 2023 16:52:46 +0000 Subject: [PATCH 35/77] v2.4.36 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index 73389a3b65..245e50b78b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.35", + "version": "2.4.36", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index b3ba20c6ba..efbba14205 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.35", + "version": "2.4.36", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.4.35", + "@budibase/types": "^2.4.36", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index d1fd52680c..126d2b39d6 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.4.35", + "version": "2.4.36", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.4.35", - "@budibase/string-templates": "^2.4.35", + "@budibase/shared-core": "^2.4.36", + "@budibase/string-templates": "^2.4.36", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 3919e294fc..e3d6765783 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.35", + "version": "2.4.36", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.35", - "@budibase/client": "^2.4.35", - "@budibase/frontend-core": "^2.4.35", - "@budibase/shared-core": "^2.4.35", - "@budibase/string-templates": "^2.4.35", + "@budibase/bbui": "^2.4.36", + "@budibase/client": "^2.4.36", + "@budibase/frontend-core": "^2.4.36", + "@budibase/shared-core": "^2.4.36", + "@budibase/string-templates": "^2.4.36", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 35bb0780a3..d1aed8a8cd 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.35", + "version": "2.4.36", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.4.35", - "@budibase/string-templates": "^2.4.35", - "@budibase/types": "^2.4.35", + "@budibase/backend-core": "^2.4.36", + "@budibase/string-templates": "^2.4.36", + "@budibase/types": "^2.4.36", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 94688f37e5..e7ae3c053d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.35", + "version": "2.4.36", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.4.35", - "@budibase/frontend-core": "^2.4.35", - "@budibase/shared-core": "^2.4.35", - "@budibase/string-templates": "^2.4.35", - "@budibase/types": "^2.4.35", + "@budibase/bbui": "^2.4.36", + "@budibase/frontend-core": "^2.4.36", + "@budibase/shared-core": "^2.4.36", + "@budibase/string-templates": "^2.4.36", + "@budibase/types": "^2.4.36", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index e71cd756e5..42313145b7 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.35", + "version": "2.4.36", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.4.35", - "@budibase/shared-core": "^2.4.35", + "@budibase/bbui": "^2.4.36", + "@budibase/shared-core": "^2.4.36", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index a8c6e4b3fe..e49fb5f5d9 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.35", + "version": "2.4.36", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 9c4a2a515d..8e26059901 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.35", + "version": "2.4.36", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.35", - "@budibase/client": "^2.4.35", + "@budibase/backend-core": "^2.4.36", + "@budibase/client": "^2.4.36", "@budibase/pro": "2.4.35", - "@budibase/shared-core": "^2.4.35", - "@budibase/string-templates": "^2.4.35", - "@budibase/types": "^2.4.35", + "@budibase/shared-core": "^2.4.36", + "@budibase/string-templates": "^2.4.36", + "@budibase/types": "^2.4.36", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 0151a25177..d9bb8c12d4 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.35", + "version": "2.4.36", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.4.35" + "@budibase/types": "^2.4.36" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 3ce36a3ea8..4606bba4b2 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.35", + "version": "2.4.36", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 79b3284826..84b1fc524f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.35", + "version": "2.4.36", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 42c8607c91..6d5edff14c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.35", + "version": "2.4.36", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.4.35", + "@budibase/backend-core": "^2.4.36", "@budibase/pro": "2.4.35", - "@budibase/string-templates": "^2.4.35", - "@budibase/types": "^2.4.35", + "@budibase/string-templates": "^2.4.36", + "@budibase/types": "^2.4.36", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From d5ccd1cc87168325d94bfa9bb668503900c96130 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 27 Mar 2023 16:55:39 +0000 Subject: [PATCH 36/77] Update pro version to 2.4.36 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 8e26059901..01774de5dd 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.4.36", "@budibase/client": "^2.4.36", - "@budibase/pro": "2.4.35", + "@budibase/pro": "2.4.36", "@budibase/shared-core": "^2.4.36", "@budibase/string-templates": "^2.4.36", "@budibase/types": "^2.4.36", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index e270972766..8433456e18 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1278,14 +1278,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.35": - version "2.4.35" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.35.tgz#cbf165e2f37c409115bb28f90e657e4fc51018be" - integrity sha512-eJq64DAhVTqjs2vzI7xet82DiFU5BF3t/ZxYiigYuq7H55VE6eaRkAuDylQtZ4lmDyuHlLpKlJaY7qNuZgpPgQ== +"@budibase/backend-core@2.4.36": + version "2.4.36" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.36.tgz#7c6c50515563eb16621ddefeeb79cb13dcc2cfb1" + integrity sha512-UNPuKQPCTnnrvtX7bg+dHEfDytCVQ75KftjCLtVOh2Tj58EkaTV/Mc8mEzK5H8qxE8ix4bLMPAOfhdOPno78Pw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.35" + "@budibase/types" "^2.4.36" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1417,14 +1417,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.35": - version "2.4.35" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.35.tgz#d4aba60d35bc683b1cca5fc8ab8acf8d3600d169" - integrity sha512-9yTM7K6MxIRkwbthzmD+A/VO85O5KKpmnKx1JWbLNR1PvG2wvUibM/KQPAjhkqlaf+tcUSyr1j8Giw2hb8/JnQ== +"@budibase/pro@2.4.36": + version "2.4.36" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.36.tgz#819db5d7691a789ad507fe7c35d9164499121f35" + integrity sha512-cn/Y9pPwXANu4dFSULmKUqDrFSQuVqWmvBZl0uM8L0Hdj79mWf8g+CHY95nMIFgQt5gQakvR9bFPkrPTnwkZgQ== dependencies: - "@budibase/backend-core" "2.4.35" + "@budibase/backend-core" "2.4.36" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.35" + "@budibase/types" "2.4.36" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1463,10 +1463,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.35", "@budibase/types@^2.4.35": - version "2.4.35" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.35.tgz#53cd5c1719aaa1b7099c8e295ddb4db3eb3879bb" - integrity sha512-MoOKOrifJ7yJYpLvcSu2MieodXWhMDQeKHz8MR8B99IFhDD34ppCdqRpyD0ugtqN9jiufnxeDKVjrw2t0/FPpA== +"@budibase/types@2.4.36", "@budibase/types@^2.4.36": + version "2.4.36" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.36.tgz#d2110490f262747dc4cedbee785cf77c9c953c07" + integrity sha512-oMaB0D/jATcdRk4YA/1fPpY6iSAGASRxylXWyb4gKBoeGFDlLuCJ6PYQaJBQ6SO7TGfU/nGoTqrlUXdHxumtNw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 6d5edff14c..7315a664db 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.4.36", - "@budibase/pro": "2.4.35", + "@budibase/pro": "2.4.36", "@budibase/string-templates": "^2.4.36", "@budibase/types": "^2.4.36", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index cee974d9c7..dd77e7777a 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.35": - version "2.4.35" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.35.tgz#cbf165e2f37c409115bb28f90e657e4fc51018be" - integrity sha512-eJq64DAhVTqjs2vzI7xet82DiFU5BF3t/ZxYiigYuq7H55VE6eaRkAuDylQtZ4lmDyuHlLpKlJaY7qNuZgpPgQ== +"@budibase/backend-core@2.4.36": + version "2.4.36" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.36.tgz#7c6c50515563eb16621ddefeeb79cb13dcc2cfb1" + integrity sha512-UNPuKQPCTnnrvtX7bg+dHEfDytCVQ75KftjCLtVOh2Tj58EkaTV/Mc8mEzK5H8qxE8ix4bLMPAOfhdOPno78Pw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.35" + "@budibase/types" "^2.4.36" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.35": - version "2.4.35" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.35.tgz#d4aba60d35bc683b1cca5fc8ab8acf8d3600d169" - integrity sha512-9yTM7K6MxIRkwbthzmD+A/VO85O5KKpmnKx1JWbLNR1PvG2wvUibM/KQPAjhkqlaf+tcUSyr1j8Giw2hb8/JnQ== +"@budibase/pro@2.4.36": + version "2.4.36" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.36.tgz#819db5d7691a789ad507fe7c35d9164499121f35" + integrity sha512-cn/Y9pPwXANu4dFSULmKUqDrFSQuVqWmvBZl0uM8L0Hdj79mWf8g+CHY95nMIFgQt5gQakvR9bFPkrPTnwkZgQ== dependencies: - "@budibase/backend-core" "2.4.35" + "@budibase/backend-core" "2.4.36" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.35" + "@budibase/types" "2.4.36" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.35", "@budibase/types@^2.4.35": - version "2.4.35" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.35.tgz#53cd5c1719aaa1b7099c8e295ddb4db3eb3879bb" - integrity sha512-MoOKOrifJ7yJYpLvcSu2MieodXWhMDQeKHz8MR8B99IFhDD34ppCdqRpyD0ugtqN9jiufnxeDKVjrw2t0/FPpA== +"@budibase/types@2.4.36", "@budibase/types@^2.4.36": + version "2.4.36" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.36.tgz#d2110490f262747dc4cedbee785cf77c9c953c07" + integrity sha512-oMaB0D/jATcdRk4YA/1fPpY6iSAGASRxylXWyb4gKBoeGFDlLuCJ6PYQaJBQ6SO7TGfU/nGoTqrlUXdHxumtNw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 9e8ab55e18364544e6261353356f3ea77aea54a1 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Tue, 28 Mar 2023 11:46:29 +0100 Subject: [PATCH 37/77] Lowercase values for Oracle LIKE (#10134) --- packages/server/src/integrations/base/sql.ts | 6 +- .../server/src/integrations/tests/sql.spec.ts | 55 +++++++++++++++++-- 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts index a21c8e7d54..90107dfd4e 100644 --- a/packages/server/src/integrations/base/sql.ts +++ b/packages/server/src/integrations/base/sql.ts @@ -156,7 +156,7 @@ class InternalBuilder { const rawFnc = `${fnc}Raw` // @ts-ignore query = query[rawFnc](`LOWER(${likeKey(this.client, key)}) LIKE ?`, [ - `%${value}%`, + `%${value.toLowerCase()}%`, ]) } } @@ -202,7 +202,7 @@ class InternalBuilder { let statement = "" for (let i in value) { if (typeof value[i] === "string") { - value[i] = `%"${value[i]}"%` + value[i] = `%"${value[i].toLowerCase()}"%` } else { value[i] = `%${value[i]}%` } @@ -238,7 +238,7 @@ class InternalBuilder { const rawFnc = `${fnc}Raw` // @ts-ignore query = query[rawFnc](`LOWER(${likeKey(this.client, key)}) LIKE ?`, [ - `${value}%`, + `${value.toLowerCase()}%`, ]) } }) diff --git a/packages/server/src/integrations/tests/sql.spec.ts b/packages/server/src/integrations/tests/sql.spec.ts index 2b9a0f1f10..bd1497bdc7 100644 --- a/packages/server/src/integrations/tests/sql.spec.ts +++ b/packages/server/src/integrations/tests/sql.spec.ts @@ -351,7 +351,7 @@ describe("SQL query builder", () => { }) ) expect(query).toEqual({ - bindings: [10, "%20%", "%25%", `%"John"%`, `%"Mary"%`], + bindings: [10, "%20%", "%25%", `%"john"%`, `%"mary"%`], sql: `select * from (select top (@p0) * from [${TABLE_NAME}] where (LOWER([${TABLE_NAME}].[age]) LIKE @p1 AND LOWER([${TABLE_NAME}].[age]) LIKE @p2) and (LOWER([${TABLE_NAME}].[name]) LIKE @p3 AND LOWER([${TABLE_NAME}].[name]) LIKE @p4)) as [${TABLE_NAME}]`, }) }) @@ -402,7 +402,7 @@ describe("SQL query builder", () => { }) ) expect(query).toEqual({ - bindings: [10, "%20%", `%"John"%`], + bindings: [10, "%20%", `%"john"%`], sql: `select * from (select top (@p0) * from [${TABLE_NAME}] where NOT (LOWER([${TABLE_NAME}].[age]) LIKE @p1) and NOT (LOWER([${TABLE_NAME}].[name]) LIKE @p2)) as [${TABLE_NAME}]`, }) }) @@ -453,7 +453,7 @@ describe("SQL query builder", () => { }) ) expect(query).toEqual({ - bindings: [10, "%20%", "%25%", `%"John"%`, `%"Mary"%`], + bindings: [10, "%20%", "%25%", `%"john"%`, `%"mary"%`], sql: `select * from (select top (@p0) * from [${TABLE_NAME}] where (LOWER([${TABLE_NAME}].[age]) LIKE @p1 OR LOWER([${TABLE_NAME}].[age]) LIKE @p2) and (LOWER([${TABLE_NAME}].[name]) LIKE @p3 OR LOWER([${TABLE_NAME}].[name]) LIKE @p4)) as [${TABLE_NAME}]`, }) }) @@ -531,7 +531,7 @@ describe("SQL query builder", () => { }) ) expect(query).toEqual({ - bindings: ["John%", limit], + bindings: ["john%", limit], sql: `select * from (select * from \`${tableName}\` where LOWER(\`${tableName}\`.\`name\`) LIKE ? limit ?) as \`${tableName}\``, }) }) @@ -549,7 +549,7 @@ describe("SQL query builder", () => { }) ) expect(query).toEqual({ - bindings: [limit, "John%"], + bindings: [limit, "john%"], sql: `select * from (select top (@p0) * from [${tableName}] where LOWER([${tableName}].[name]) LIKE @p1) as [${tableName}]`, }) }) @@ -591,4 +591,49 @@ describe("SQL query builder", () => { sql: `select * from (select * from \"${TABLE_NAME}\" where \"${TABLE_NAME}\".\"dob\" < $1 limit $2) as \"${TABLE_NAME}\"`, }) }) + + it("should lowercase the values for Oracle LIKE statements", () => { + let query = new Sql(SqlClient.ORACLE, limit)._query( + generateReadJson({ + filters: { + string: { + name: "John", + }, + }, + }) + ) + expect(query).toEqual({ + bindings: ["john%", limit], + sql: `select * from (select * from (select * from \"test\" where LOWER(\"test\".\"name\") LIKE :1) where rownum <= :2) \"test\"`, + }) + + query = new Sql(SqlClient.ORACLE, limit)._query( + generateReadJson({ + filters: { + contains: { + age: [20, 25], + name: ["John", "Mary"], + }, + }, + }) + ) + expect(query).toEqual({ + bindings: ["%20%", "%25%", `%"john"%`, `%"mary"%`, limit], + sql: `select * from (select * from (select * from \"test\" where (LOWER(\"test\".\"age\") LIKE :1 AND LOWER(\"test\".\"age\") LIKE :2) and (LOWER(\"test\".\"name\") LIKE :3 AND LOWER(\"test\".\"name\") LIKE :4)) where rownum <= :5) \"test\"`, + }) + + query = new Sql(SqlClient.ORACLE, limit)._query( + generateReadJson({ + filters: { + fuzzy: { + name: "Jo", + }, + }, + }) + ) + expect(query).toEqual({ + bindings: [`%jo%`, limit], + sql: `select * from (select * from (select * from \"test\" where LOWER(\"test\".\"name\") LIKE :1) where rownum <= :2) \"test\"`, + }) + }) }) From a3ee18824e6801de9daa52491eb063e50bae7178 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 28 Mar 2023 10:55:00 +0000 Subject: [PATCH 38/77] v2.4.37 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index 245e50b78b..d58cd62dde 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.36", + "version": "2.4.37", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index efbba14205..98c2b7491b 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.36", + "version": "2.4.37", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.4.36", + "@budibase/types": "^2.4.37", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 126d2b39d6..b49989a37e 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.4.36", + "version": "2.4.37", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.4.36", - "@budibase/string-templates": "^2.4.36", + "@budibase/shared-core": "^2.4.37", + "@budibase/string-templates": "^2.4.37", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index e3d6765783..c224d994c6 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.36", + "version": "2.4.37", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.36", - "@budibase/client": "^2.4.36", - "@budibase/frontend-core": "^2.4.36", - "@budibase/shared-core": "^2.4.36", - "@budibase/string-templates": "^2.4.36", + "@budibase/bbui": "^2.4.37", + "@budibase/client": "^2.4.37", + "@budibase/frontend-core": "^2.4.37", + "@budibase/shared-core": "^2.4.37", + "@budibase/string-templates": "^2.4.37", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index d1aed8a8cd..11a3027e30 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.36", + "version": "2.4.37", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.4.36", - "@budibase/string-templates": "^2.4.36", - "@budibase/types": "^2.4.36", + "@budibase/backend-core": "^2.4.37", + "@budibase/string-templates": "^2.4.37", + "@budibase/types": "^2.4.37", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index e7ae3c053d..880db0c435 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.36", + "version": "2.4.37", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.4.36", - "@budibase/frontend-core": "^2.4.36", - "@budibase/shared-core": "^2.4.36", - "@budibase/string-templates": "^2.4.36", - "@budibase/types": "^2.4.36", + "@budibase/bbui": "^2.4.37", + "@budibase/frontend-core": "^2.4.37", + "@budibase/shared-core": "^2.4.37", + "@budibase/string-templates": "^2.4.37", + "@budibase/types": "^2.4.37", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 42313145b7..3353136ad5 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.36", + "version": "2.4.37", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.4.36", - "@budibase/shared-core": "^2.4.36", + "@budibase/bbui": "^2.4.37", + "@budibase/shared-core": "^2.4.37", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index e49fb5f5d9..f4a5d2dff9 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.36", + "version": "2.4.37", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 01774de5dd..8a2592ff77 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.36", + "version": "2.4.37", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.36", - "@budibase/client": "^2.4.36", + "@budibase/backend-core": "^2.4.37", + "@budibase/client": "^2.4.37", "@budibase/pro": "2.4.36", - "@budibase/shared-core": "^2.4.36", - "@budibase/string-templates": "^2.4.36", - "@budibase/types": "^2.4.36", + "@budibase/shared-core": "^2.4.37", + "@budibase/string-templates": "^2.4.37", + "@budibase/types": "^2.4.37", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index d9bb8c12d4..dbe87af4e4 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.36", + "version": "2.4.37", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.4.36" + "@budibase/types": "^2.4.37" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 4606bba4b2..0664fcc25e 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.36", + "version": "2.4.37", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 84b1fc524f..8e8fa931c3 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.36", + "version": "2.4.37", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 7315a664db..5806fcce40 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.36", + "version": "2.4.37", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.4.36", + "@budibase/backend-core": "^2.4.37", "@budibase/pro": "2.4.36", - "@budibase/string-templates": "^2.4.36", - "@budibase/types": "^2.4.36", + "@budibase/string-templates": "^2.4.37", + "@budibase/types": "^2.4.37", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From b173e805822bc9dd6c68023cefec9cc0191ca00d Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 28 Mar 2023 10:57:56 +0000 Subject: [PATCH 39/77] Update pro version to 2.4.37 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 8a2592ff77..16c0172933 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.4.37", "@budibase/client": "^2.4.37", - "@budibase/pro": "2.4.36", + "@budibase/pro": "2.4.37", "@budibase/shared-core": "^2.4.37", "@budibase/string-templates": "^2.4.37", "@budibase/types": "^2.4.37", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 8433456e18..065d2950c7 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1278,14 +1278,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.36": - version "2.4.36" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.36.tgz#7c6c50515563eb16621ddefeeb79cb13dcc2cfb1" - integrity sha512-UNPuKQPCTnnrvtX7bg+dHEfDytCVQ75KftjCLtVOh2Tj58EkaTV/Mc8mEzK5H8qxE8ix4bLMPAOfhdOPno78Pw== +"@budibase/backend-core@2.4.37": + version "2.4.37" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.37.tgz#d32627cdc95e7cc572a00f0a0639f104834dd7c7" + integrity sha512-ud2Pgj7LFzFiGpLb4vCooAh8m/2wHeU+0Wd+1v3zoxjHyISJ7xy14MyoUUFc0KMXKz8sP2OAezbDYCWZT+5Kmg== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.36" + "@budibase/types" "^2.4.37" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1417,14 +1417,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.36": - version "2.4.36" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.36.tgz#819db5d7691a789ad507fe7c35d9164499121f35" - integrity sha512-cn/Y9pPwXANu4dFSULmKUqDrFSQuVqWmvBZl0uM8L0Hdj79mWf8g+CHY95nMIFgQt5gQakvR9bFPkrPTnwkZgQ== +"@budibase/pro@2.4.37": + version "2.4.37" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.37.tgz#ed06c15a697a85b1a7cc4565fba37de13c716f05" + integrity sha512-N3dts+pXCqu8U8izZPm6sX/LRYtGDW7xDsBrftynz8Huz/5/dqb3yj7dNCYtX/q1EBT9+yQS7HgO+KiK/cr/hQ== dependencies: - "@budibase/backend-core" "2.4.36" + "@budibase/backend-core" "2.4.37" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.36" + "@budibase/types" "2.4.37" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1463,10 +1463,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.36", "@budibase/types@^2.4.36": - version "2.4.36" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.36.tgz#d2110490f262747dc4cedbee785cf77c9c953c07" - integrity sha512-oMaB0D/jATcdRk4YA/1fPpY6iSAGASRxylXWyb4gKBoeGFDlLuCJ6PYQaJBQ6SO7TGfU/nGoTqrlUXdHxumtNw== +"@budibase/types@2.4.37", "@budibase/types@^2.4.37": + version "2.4.37" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.37.tgz#2493e41a35b791cf2b9dbe43bc0f83700b1373bf" + integrity sha512-BtRPE5wdxjY+emy3pUoveIG3JrKm+zBGnS1PhCfomRsInShBmv33EQJ0wUvdxadOjmPcOrtxzBgTyN9MFET7cw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 5806fcce40..904c812e70 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.4.37", - "@budibase/pro": "2.4.36", + "@budibase/pro": "2.4.37", "@budibase/string-templates": "^2.4.37", "@budibase/types": "^2.4.37", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index dd77e7777a..4d651cdfad 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.36": - version "2.4.36" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.36.tgz#7c6c50515563eb16621ddefeeb79cb13dcc2cfb1" - integrity sha512-UNPuKQPCTnnrvtX7bg+dHEfDytCVQ75KftjCLtVOh2Tj58EkaTV/Mc8mEzK5H8qxE8ix4bLMPAOfhdOPno78Pw== +"@budibase/backend-core@2.4.37": + version "2.4.37" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.37.tgz#d32627cdc95e7cc572a00f0a0639f104834dd7c7" + integrity sha512-ud2Pgj7LFzFiGpLb4vCooAh8m/2wHeU+0Wd+1v3zoxjHyISJ7xy14MyoUUFc0KMXKz8sP2OAezbDYCWZT+5Kmg== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.36" + "@budibase/types" "^2.4.37" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.36": - version "2.4.36" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.36.tgz#819db5d7691a789ad507fe7c35d9164499121f35" - integrity sha512-cn/Y9pPwXANu4dFSULmKUqDrFSQuVqWmvBZl0uM8L0Hdj79mWf8g+CHY95nMIFgQt5gQakvR9bFPkrPTnwkZgQ== +"@budibase/pro@2.4.37": + version "2.4.37" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.37.tgz#ed06c15a697a85b1a7cc4565fba37de13c716f05" + integrity sha512-N3dts+pXCqu8U8izZPm6sX/LRYtGDW7xDsBrftynz8Huz/5/dqb3yj7dNCYtX/q1EBT9+yQS7HgO+KiK/cr/hQ== dependencies: - "@budibase/backend-core" "2.4.36" + "@budibase/backend-core" "2.4.37" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.36" + "@budibase/types" "2.4.37" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.36", "@budibase/types@^2.4.36": - version "2.4.36" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.36.tgz#d2110490f262747dc4cedbee785cf77c9c953c07" - integrity sha512-oMaB0D/jATcdRk4YA/1fPpY6iSAGASRxylXWyb4gKBoeGFDlLuCJ6PYQaJBQ6SO7TGfU/nGoTqrlUXdHxumtNw== +"@budibase/types@2.4.37", "@budibase/types@^2.4.37": + version "2.4.37" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.37.tgz#2493e41a35b791cf2b9dbe43bc0f83700b1373bf" + integrity sha512-BtRPE5wdxjY+emy3pUoveIG3JrKm+zBGnS1PhCfomRsInShBmv33EQJ0wUvdxadOjmPcOrtxzBgTyN9MFET7cw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 06794d808557d3176d3c87be37d83b5f49f17ad8 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 28 Mar 2023 14:49:46 +0100 Subject: [PATCH 40/77] Chore: Account deletion via API (#10137) --- packages/worker/src/api/controllers/system/tenants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/worker/src/api/controllers/system/tenants.ts b/packages/worker/src/api/controllers/system/tenants.ts index 151507358f..ddc6c39c0f 100644 --- a/packages/worker/src/api/controllers/system/tenants.ts +++ b/packages/worker/src/api/controllers/system/tenants.ts @@ -5,7 +5,7 @@ export async function destroy(ctx: UserCtx) { const user = ctx.user! const tenantId = ctx.params.tenantId - if (tenantId !== user.tenantId) { + if (!ctx.internal && tenantId !== user.tenantId) { ctx.throw(403, "Tenant ID does not match current user") } From 071a6e0994676b518c031335db1ba83b5cf8207d Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 28 Mar 2023 14:01:14 +0000 Subject: [PATCH 41/77] v2.4.38 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index d58cd62dde..d8fa58078d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.37", + "version": "2.4.38", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 98c2b7491b..dcaf9ccafd 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.37", + "version": "2.4.38", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.4.37", + "@budibase/types": "^2.4.38", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index b49989a37e..76721e7e32 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.4.37", + "version": "2.4.38", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.4.37", - "@budibase/string-templates": "^2.4.37", + "@budibase/shared-core": "^2.4.38", + "@budibase/string-templates": "^2.4.38", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index c224d994c6..bc52f98a91 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.37", + "version": "2.4.38", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.37", - "@budibase/client": "^2.4.37", - "@budibase/frontend-core": "^2.4.37", - "@budibase/shared-core": "^2.4.37", - "@budibase/string-templates": "^2.4.37", + "@budibase/bbui": "^2.4.38", + "@budibase/client": "^2.4.38", + "@budibase/frontend-core": "^2.4.38", + "@budibase/shared-core": "^2.4.38", + "@budibase/string-templates": "^2.4.38", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 11a3027e30..8218c1e363 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.37", + "version": "2.4.38", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.4.37", - "@budibase/string-templates": "^2.4.37", - "@budibase/types": "^2.4.37", + "@budibase/backend-core": "^2.4.38", + "@budibase/string-templates": "^2.4.38", + "@budibase/types": "^2.4.38", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 880db0c435..119440ba8f 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.37", + "version": "2.4.38", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.4.37", - "@budibase/frontend-core": "^2.4.37", - "@budibase/shared-core": "^2.4.37", - "@budibase/string-templates": "^2.4.37", - "@budibase/types": "^2.4.37", + "@budibase/bbui": "^2.4.38", + "@budibase/frontend-core": "^2.4.38", + "@budibase/shared-core": "^2.4.38", + "@budibase/string-templates": "^2.4.38", + "@budibase/types": "^2.4.38", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 3353136ad5..ed0fd2cfdf 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.37", + "version": "2.4.38", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.4.37", - "@budibase/shared-core": "^2.4.37", + "@budibase/bbui": "^2.4.38", + "@budibase/shared-core": "^2.4.38", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index f4a5d2dff9..b2df062c62 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.37", + "version": "2.4.38", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 16c0172933..d9726f0b9c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.37", + "version": "2.4.38", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.37", - "@budibase/client": "^2.4.37", + "@budibase/backend-core": "^2.4.38", + "@budibase/client": "^2.4.38", "@budibase/pro": "2.4.37", - "@budibase/shared-core": "^2.4.37", - "@budibase/string-templates": "^2.4.37", - "@budibase/types": "^2.4.37", + "@budibase/shared-core": "^2.4.38", + "@budibase/string-templates": "^2.4.38", + "@budibase/types": "^2.4.38", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index dbe87af4e4..e0f56c6f27 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.37", + "version": "2.4.38", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.4.37" + "@budibase/types": "^2.4.38" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 0664fcc25e..a4fc80c4cc 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.37", + "version": "2.4.38", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 8e8fa931c3..bbcba777c8 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.37", + "version": "2.4.38", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 904c812e70..ac1f262dbd 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.37", + "version": "2.4.38", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.4.37", + "@budibase/backend-core": "^2.4.38", "@budibase/pro": "2.4.37", - "@budibase/string-templates": "^2.4.37", - "@budibase/types": "^2.4.37", + "@budibase/string-templates": "^2.4.38", + "@budibase/types": "^2.4.38", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 927599a5b6fa39309cad89460778252cfff5c5b4 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 28 Mar 2023 14:04:24 +0000 Subject: [PATCH 42/77] Update pro version to 2.4.38 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index d9726f0b9c..a2302f49ef 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.4.38", "@budibase/client": "^2.4.38", - "@budibase/pro": "2.4.37", + "@budibase/pro": "2.4.38", "@budibase/shared-core": "^2.4.38", "@budibase/string-templates": "^2.4.38", "@budibase/types": "^2.4.38", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 065d2950c7..8115b14731 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1278,14 +1278,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.37": - version "2.4.37" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.37.tgz#d32627cdc95e7cc572a00f0a0639f104834dd7c7" - integrity sha512-ud2Pgj7LFzFiGpLb4vCooAh8m/2wHeU+0Wd+1v3zoxjHyISJ7xy14MyoUUFc0KMXKz8sP2OAezbDYCWZT+5Kmg== +"@budibase/backend-core@2.4.38": + version "2.4.38" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.38.tgz#28e11f0c5be5013a0b1b051770a105a190236da1" + integrity sha512-utYQFop4TVVoGZQ6L+qSS6yte/PcXVel6QA+14k9CWuS3GwuLbup1CUdCflNLS9Oi04+l2ydSQq/uhU8Pthj6w== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.37" + "@budibase/types" "^2.4.38" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1417,14 +1417,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.37": - version "2.4.37" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.37.tgz#ed06c15a697a85b1a7cc4565fba37de13c716f05" - integrity sha512-N3dts+pXCqu8U8izZPm6sX/LRYtGDW7xDsBrftynz8Huz/5/dqb3yj7dNCYtX/q1EBT9+yQS7HgO+KiK/cr/hQ== +"@budibase/pro@2.4.38": + version "2.4.38" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.38.tgz#50e329b8918551976f793aef2a394dbd75b55b44" + integrity sha512-DMCs8e1YJ6oaJ/m2wLQ6li1jpRFxQ0NlJVJ3x3+AUQYdY20xRR0b1ffxoPRclRx0gqGZBXmtQBBEPrWz2auvNQ== dependencies: - "@budibase/backend-core" "2.4.37" + "@budibase/backend-core" "2.4.38" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.37" + "@budibase/types" "2.4.38" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1463,10 +1463,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.37", "@budibase/types@^2.4.37": - version "2.4.37" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.37.tgz#2493e41a35b791cf2b9dbe43bc0f83700b1373bf" - integrity sha512-BtRPE5wdxjY+emy3pUoveIG3JrKm+zBGnS1PhCfomRsInShBmv33EQJ0wUvdxadOjmPcOrtxzBgTyN9MFET7cw== +"@budibase/types@2.4.38", "@budibase/types@^2.4.38": + version "2.4.38" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.38.tgz#717c75077320025b2a623882acd1c6169bbc9dd4" + integrity sha512-JELOTGPp+d+uEg7xbziaA42V0crkJ9sDCr6ogTBiRi8mWKA243UWodnIU3l3B4XYoMLld1l+kR7q7lUdwMvpYw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index ac1f262dbd..def1ec30b1 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.4.38", - "@budibase/pro": "2.4.37", + "@budibase/pro": "2.4.38", "@budibase/string-templates": "^2.4.38", "@budibase/types": "^2.4.38", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 4d651cdfad..1562f0e1c2 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.37": - version "2.4.37" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.37.tgz#d32627cdc95e7cc572a00f0a0639f104834dd7c7" - integrity sha512-ud2Pgj7LFzFiGpLb4vCooAh8m/2wHeU+0Wd+1v3zoxjHyISJ7xy14MyoUUFc0KMXKz8sP2OAezbDYCWZT+5Kmg== +"@budibase/backend-core@2.4.38": + version "2.4.38" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.38.tgz#28e11f0c5be5013a0b1b051770a105a190236da1" + integrity sha512-utYQFop4TVVoGZQ6L+qSS6yte/PcXVel6QA+14k9CWuS3GwuLbup1CUdCflNLS9Oi04+l2ydSQq/uhU8Pthj6w== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.37" + "@budibase/types" "^2.4.38" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.37": - version "2.4.37" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.37.tgz#ed06c15a697a85b1a7cc4565fba37de13c716f05" - integrity sha512-N3dts+pXCqu8U8izZPm6sX/LRYtGDW7xDsBrftynz8Huz/5/dqb3yj7dNCYtX/q1EBT9+yQS7HgO+KiK/cr/hQ== +"@budibase/pro@2.4.38": + version "2.4.38" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.38.tgz#50e329b8918551976f793aef2a394dbd75b55b44" + integrity sha512-DMCs8e1YJ6oaJ/m2wLQ6li1jpRFxQ0NlJVJ3x3+AUQYdY20xRR0b1ffxoPRclRx0gqGZBXmtQBBEPrWz2auvNQ== dependencies: - "@budibase/backend-core" "2.4.37" + "@budibase/backend-core" "2.4.38" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.37" + "@budibase/types" "2.4.38" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.37", "@budibase/types@^2.4.37": - version "2.4.37" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.37.tgz#2493e41a35b791cf2b9dbe43bc0f83700b1373bf" - integrity sha512-BtRPE5wdxjY+emy3pUoveIG3JrKm+zBGnS1PhCfomRsInShBmv33EQJ0wUvdxadOjmPcOrtxzBgTyN9MFET7cw== +"@budibase/types@2.4.38", "@budibase/types@^2.4.38": + version "2.4.38" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.38.tgz#717c75077320025b2a623882acd1c6169bbc9dd4" + integrity sha512-JELOTGPp+d+uEg7xbziaA42V0crkJ9sDCr6ogTBiRi8mWKA243UWodnIU3l3B4XYoMLld1l+kR7q7lUdwMvpYw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From c57e69d0827fd9d9ee301a56b6aa6685cec96c4f Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 28 Mar 2023 16:07:03 +0100 Subject: [PATCH 43/77] Chore: Update livenessprobe timeout, add readinessprobe (#10139) * Chore: Update livenessprobe timeout, add readinessprobe * Remove liveness and readiness probes from values * Add clarifying comment to existing liveness and readiness probes * U[date failureThreshold on readiness probe to be 3 --- .../budibase/templates/app-service-deployment.yaml | 13 +++++++++++++ .../templates/worker-service-deployment.yaml | 12 ++++++++++++ charts/budibase/values.yaml | 1 + 3 files changed, 26 insertions(+) diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml index 9ff7dc1ddc..df4070806f 100644 --- a/charts/budibase/templates/app-service-deployment.yaml +++ b/charts/budibase/templates/app-service-deployment.yaml @@ -212,11 +212,24 @@ spec: image: budibase/apps:{{ .Values.globals.appVersion }} imagePullPolicy: Always livenessProbe: + httpGet: + path: /health + port: {{ .Values.services.apps.port }} + initialDelaySeconds: 10 + periodSeconds: 5 + successThreshold: 1 + failureThreshold: 3 + timeoutSeconds: 3 + readinessProbe: httpGet: path: /health port: {{ .Values.services.apps.port }} initialDelaySeconds: 5 periodSeconds: 5 + successThreshold: 1 + failureThreshold: 3 + timeoutSeconds: 3 + name: bbapps ports: - containerPort: {{ .Values.services.apps.port }} diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml index f998e5dfb9..f48d19689b 100644 --- a/charts/budibase/templates/worker-service-deployment.yaml +++ b/charts/budibase/templates/worker-service-deployment.yaml @@ -202,11 +202,23 @@ spec: image: budibase/worker:{{ .Values.globals.appVersion }} imagePullPolicy: Always livenessProbe: + httpGet: + path: /health + port: {{ .Values.services.worker.port }} + initialDelaySeconds: 10 + periodSeconds: 5 + successThreshold: 1 + failureThreshold: 3 + timeoutSeconds: 3 + readinessProbe: httpGet: path: /health port: {{ .Values.services.worker.port }} initialDelaySeconds: 5 periodSeconds: 5 + successThreshold: 1 + failureThreshold: 3 + timeoutSeconds: 3 name: bbworker ports: - containerPort: {{ .Values.services.worker.port }} diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml index ed4ff014a9..ccbbf9878e 100644 --- a/charts/budibase/values.yaml +++ b/charts/budibase/values.yaml @@ -343,6 +343,7 @@ couchdb: ## Configure liveness and readiness probe values ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes + # FOR COUCHDB livenessProbe: enabled: true failureThreshold: 3 From ceacffa9b60826c7bcfdb754dbe0afa9083e4c84 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 28 Mar 2023 15:18:48 +0000 Subject: [PATCH 44/77] v2.4.39 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index d8fa58078d..e0217339c9 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.38", + "version": "2.4.39", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index dcaf9ccafd..4ac97c9ef3 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.38", + "version": "2.4.39", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.4.38", + "@budibase/types": "^2.4.39", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 76721e7e32..79e2caa270 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.4.38", + "version": "2.4.39", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.4.38", - "@budibase/string-templates": "^2.4.38", + "@budibase/shared-core": "^2.4.39", + "@budibase/string-templates": "^2.4.39", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index bc52f98a91..ce430f0e1a 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.38", + "version": "2.4.39", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.38", - "@budibase/client": "^2.4.38", - "@budibase/frontend-core": "^2.4.38", - "@budibase/shared-core": "^2.4.38", - "@budibase/string-templates": "^2.4.38", + "@budibase/bbui": "^2.4.39", + "@budibase/client": "^2.4.39", + "@budibase/frontend-core": "^2.4.39", + "@budibase/shared-core": "^2.4.39", + "@budibase/string-templates": "^2.4.39", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 8218c1e363..8becbb5ce9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.38", + "version": "2.4.39", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.4.38", - "@budibase/string-templates": "^2.4.38", - "@budibase/types": "^2.4.38", + "@budibase/backend-core": "^2.4.39", + "@budibase/string-templates": "^2.4.39", + "@budibase/types": "^2.4.39", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 119440ba8f..a9fd56425b 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.38", + "version": "2.4.39", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.4.38", - "@budibase/frontend-core": "^2.4.38", - "@budibase/shared-core": "^2.4.38", - "@budibase/string-templates": "^2.4.38", - "@budibase/types": "^2.4.38", + "@budibase/bbui": "^2.4.39", + "@budibase/frontend-core": "^2.4.39", + "@budibase/shared-core": "^2.4.39", + "@budibase/string-templates": "^2.4.39", + "@budibase/types": "^2.4.39", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index ed0fd2cfdf..b07938e422 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.38", + "version": "2.4.39", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.4.38", - "@budibase/shared-core": "^2.4.38", + "@budibase/bbui": "^2.4.39", + "@budibase/shared-core": "^2.4.39", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index b2df062c62..a9f880cfb1 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.38", + "version": "2.4.39", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index a2302f49ef..8906817933 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.38", + "version": "2.4.39", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.38", - "@budibase/client": "^2.4.38", + "@budibase/backend-core": "^2.4.39", + "@budibase/client": "^2.4.39", "@budibase/pro": "2.4.38", - "@budibase/shared-core": "^2.4.38", - "@budibase/string-templates": "^2.4.38", - "@budibase/types": "^2.4.38", + "@budibase/shared-core": "^2.4.39", + "@budibase/string-templates": "^2.4.39", + "@budibase/types": "^2.4.39", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index e0f56c6f27..16417eeafb 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.38", + "version": "2.4.39", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.4.38" + "@budibase/types": "^2.4.39" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index a4fc80c4cc..d4fcfe7ec1 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.38", + "version": "2.4.39", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index bbcba777c8..4b3dbe37d2 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.38", + "version": "2.4.39", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index def1ec30b1..3ffa8cba4d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.38", + "version": "2.4.39", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.4.38", + "@budibase/backend-core": "^2.4.39", "@budibase/pro": "2.4.38", - "@budibase/string-templates": "^2.4.38", - "@budibase/types": "^2.4.38", + "@budibase/string-templates": "^2.4.39", + "@budibase/types": "^2.4.39", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 8e368525e482c41601734aa7af4cd910dcbf699b Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 28 Mar 2023 15:22:27 +0000 Subject: [PATCH 45/77] Update pro version to 2.4.39 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 8906817933..c4c202b21a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.4.39", "@budibase/client": "^2.4.39", - "@budibase/pro": "2.4.38", + "@budibase/pro": "2.4.39", "@budibase/shared-core": "^2.4.39", "@budibase/string-templates": "^2.4.39", "@budibase/types": "^2.4.39", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 8115b14731..48c5ee80f3 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1278,14 +1278,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.38": - version "2.4.38" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.38.tgz#28e11f0c5be5013a0b1b051770a105a190236da1" - integrity sha512-utYQFop4TVVoGZQ6L+qSS6yte/PcXVel6QA+14k9CWuS3GwuLbup1CUdCflNLS9Oi04+l2ydSQq/uhU8Pthj6w== +"@budibase/backend-core@2.4.39": + version "2.4.39" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.39.tgz#ca3486d3bd44e11bbf498d2b4e21e25812ad45df" + integrity sha512-8C7oINVdnF1QYIRwYYJlzYIjLAe4VYwShMXqfk77IeTgy7qpdq+Np5X7kXdiaA8gUmk+pRcc5NHzNTXIS4VnUQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.38" + "@budibase/types" "^2.4.39" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1417,14 +1417,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.38": - version "2.4.38" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.38.tgz#50e329b8918551976f793aef2a394dbd75b55b44" - integrity sha512-DMCs8e1YJ6oaJ/m2wLQ6li1jpRFxQ0NlJVJ3x3+AUQYdY20xRR0b1ffxoPRclRx0gqGZBXmtQBBEPrWz2auvNQ== +"@budibase/pro@2.4.39": + version "2.4.39" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.39.tgz#2f163dc7aa7a6643755fa1db8bb3c4f1d35fe676" + integrity sha512-34c73d7+RdrHPKwLJpJ2RCjlixMKXp86B7eCal7aOvCrFaJmccDMtHsh7PgY8v6PzRna16SRTCiFyoMM/0TDFA== dependencies: - "@budibase/backend-core" "2.4.38" + "@budibase/backend-core" "2.4.39" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.38" + "@budibase/types" "2.4.39" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1463,10 +1463,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.38", "@budibase/types@^2.4.38": - version "2.4.38" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.38.tgz#717c75077320025b2a623882acd1c6169bbc9dd4" - integrity sha512-JELOTGPp+d+uEg7xbziaA42V0crkJ9sDCr6ogTBiRi8mWKA243UWodnIU3l3B4XYoMLld1l+kR7q7lUdwMvpYw== +"@budibase/types@2.4.39", "@budibase/types@^2.4.39": + version "2.4.39" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.39.tgz#5df65a1c1beeff3e21ce4b9b542b8cf07678e554" + integrity sha512-gb4aNTK8GB5mECTmlJLH3GoSr32EDjmlpIFpWUFLXgmd874avugSN68GRcE7vKLirGmLCpeGKIGLBOf9qnzMMw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 3ffa8cba4d..49bc33d03b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.4.39", - "@budibase/pro": "2.4.38", + "@budibase/pro": "2.4.39", "@budibase/string-templates": "^2.4.39", "@budibase/types": "^2.4.39", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 1562f0e1c2..2c3254a286 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.38": - version "2.4.38" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.38.tgz#28e11f0c5be5013a0b1b051770a105a190236da1" - integrity sha512-utYQFop4TVVoGZQ6L+qSS6yte/PcXVel6QA+14k9CWuS3GwuLbup1CUdCflNLS9Oi04+l2ydSQq/uhU8Pthj6w== +"@budibase/backend-core@2.4.39": + version "2.4.39" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.39.tgz#ca3486d3bd44e11bbf498d2b4e21e25812ad45df" + integrity sha512-8C7oINVdnF1QYIRwYYJlzYIjLAe4VYwShMXqfk77IeTgy7qpdq+Np5X7kXdiaA8gUmk+pRcc5NHzNTXIS4VnUQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.38" + "@budibase/types" "^2.4.39" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.38": - version "2.4.38" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.38.tgz#50e329b8918551976f793aef2a394dbd75b55b44" - integrity sha512-DMCs8e1YJ6oaJ/m2wLQ6li1jpRFxQ0NlJVJ3x3+AUQYdY20xRR0b1ffxoPRclRx0gqGZBXmtQBBEPrWz2auvNQ== +"@budibase/pro@2.4.39": + version "2.4.39" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.39.tgz#2f163dc7aa7a6643755fa1db8bb3c4f1d35fe676" + integrity sha512-34c73d7+RdrHPKwLJpJ2RCjlixMKXp86B7eCal7aOvCrFaJmccDMtHsh7PgY8v6PzRna16SRTCiFyoMM/0TDFA== dependencies: - "@budibase/backend-core" "2.4.38" + "@budibase/backend-core" "2.4.39" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.38" + "@budibase/types" "2.4.39" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.38", "@budibase/types@^2.4.38": - version "2.4.38" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.38.tgz#717c75077320025b2a623882acd1c6169bbc9dd4" - integrity sha512-JELOTGPp+d+uEg7xbziaA42V0crkJ9sDCr6ogTBiRi8mWKA243UWodnIU3l3B4XYoMLld1l+kR7q7lUdwMvpYw== +"@budibase/types@2.4.39", "@budibase/types@^2.4.39": + version "2.4.39" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.39.tgz#5df65a1c1beeff3e21ce4b9b542b8cf07678e554" + integrity sha512-gb4aNTK8GB5mECTmlJLH3GoSr32EDjmlpIFpWUFLXgmd874avugSN68GRcE7vKLirGmLCpeGKIGLBOf9qnzMMw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From b7fe83ad175f2cefd6aee3a9a7b3167f6f2458d0 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 28 Mar 2023 18:14:04 +0100 Subject: [PATCH 46/77] Adding a check to config for isDev - don't use multi-tenant google SSO default in dev. --- packages/backend-core/src/configs/configs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend-core/src/configs/configs.ts b/packages/backend-core/src/configs/configs.ts index b461497747..305a074152 100644 --- a/packages/backend-core/src/configs/configs.ts +++ b/packages/backend-core/src/configs/configs.ts @@ -162,7 +162,7 @@ export async function getGoogleConfig(): Promise< export async function getGoogleDatasourceConfig(): Promise< GoogleInnerConfig | undefined > { - if (!env.SELF_HOSTED) { + if (!env.isDev() && !env.SELF_HOSTED) { // always use the env vars in cloud return getDefaultGoogleConfig() } From 89d19a87a721662e938ada406cf2ed2c42e78b77 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Wed, 29 Mar 2023 08:48:06 +0100 Subject: [PATCH 47/77] Revert "Merge pull request #10038 from Budibase/fix/budi-6723" (#10143) This reverts commit b1b18bef18ae6af65eed8716bef71d2a663972b7, reversing changes made to e841ccd0ed3947a27ca2871feac9fb49b8e3b530. --- .../DataTable/modals/CreateEditColumn.svelte | 9 +- .../CreateExternalTableModal.svelte | 4 +- .../modals/GoogleDatasourceConfigModal.svelte | 32 +-- .../builder/portal/settings/auth/index.svelte | 17 +- .../server/src/api/controllers/datasource.ts | 3 +- .../src/api/controllers/row/external.ts | 42 ++-- .../server/src/api/controllers/row/index.ts | 9 +- .../src/api/controllers/row/internal.ts | 7 + .../server/src/api/controllers/row/utils.ts | 7 +- .../src/api/controllers/table/external.ts | 41 ++-- .../server/src/api/controllers/table/index.ts | 18 +- .../server/src/api/controllers/table/utils.ts | 20 +- packages/server/src/constants/index.ts | 1 - .../server/src/integrations/googlesheets.ts | 210 ++++++------------ packages/server/src/integrations/utils.ts | 20 +- packages/types/src/documents/app/table.ts | 1 - 16 files changed, 145 insertions(+), 296 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte index b4293a2a0a..352f094507 100644 --- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte @@ -308,7 +308,7 @@ { name: "Auto Column", type: AUTO_TYPE }, ] } else { - let fields = [ + return [ FIELDS.STRING, FIELDS.BARCODEQR, FIELDS.LONGFORM, @@ -316,13 +316,10 @@ FIELDS.DATETIME, FIELDS.NUMBER, FIELDS.BOOLEAN, + FIELDS.ARRAY, FIELDS.FORMULA, + FIELDS.LINK, ] - // no-sql or a spreadsheet - if (!external || table.sql) { - fields = [...fields, FIELDS.LINK, FIELDS.ARRAY] - } - return fields } } diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/CreateExternalTableModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/CreateExternalTableModal.svelte index 664b5629d4..45269a365c 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/CreateExternalTableModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/CreateExternalTableModal.svelte @@ -35,9 +35,7 @@ await datasources.fetch() $goto(`../../table/${table._id}`) } catch (error) { - notifications.error( - `Error saving table - ${error?.message || "unknown error"}` - ) + notifications.error("Error saving table") } } diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte index c12ddab78d..7d03dafeb9 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte @@ -1,22 +1,15 @@ - - {#if isGoogleConfigured === true} - - Authenticate with your google account to use the {IntegrationNames[ - datasource.type - ]} integration. - - save(datasource, true)} /> - {:else if isGoogleConfigured === false} - Google authentication is not enabled, please complete Google SSO - configuration. + Authenticate with your google account to use the {IntegrationNames[ + datasource.type + ]} integration. - Configure Google SSO - {/if} + + save(datasource, true)} /> diff --git a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte index 2d4dc7ee46..0e82dd31e7 100644 --- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte @@ -47,9 +47,8 @@ $: googleCallbackTooltip = $admin.cloud ? null : googleCallbackReadonly - ? "Visit the organisation page to update the platform URL" + ? "Vist the organisation page to update the platform URL" : "Leave blank to use the default callback URL" - $: googleSheetsCallbackUrl = `${$organisation.platformUrl}/api/global/auth/datasource/google/callback` $: GoogleConfigFields = { Google: [ @@ -63,14 +62,6 @@ placeholder: $organisation.googleCallbackUrl, copyButton: true, }, - { - name: "sheetsURL", - label: "Sheets URL", - readonly: googleCallbackReadonly, - tooltip: googleCallbackTooltip, - placeholder: googleSheetsCallbackUrl, - copyButton: true, - }, ], } @@ -405,11 +396,7 @@ To allow users to authenticate using their Google accounts, fill out the - fields below. Read the documentation for more information. + fields below. diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index 3d41cd89af..d212f7f361 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -84,9 +84,8 @@ export async function buildSchemaFromDb(ctx: UserCtx) { setDefaultDisplayColumns(datasource) const dbResp = await db.put(datasource) datasource._rev = dbResp.rev - const cleanedDatasource = await sdk.datasources.removeSecretSingle(datasource) - const response: any = { datasource: cleanedDatasource } + const response: any = { datasource } if (error) { response.error = error } diff --git a/packages/server/src/api/controllers/row/external.ts b/packages/server/src/api/controllers/row/external.ts index ee796e32d4..8a7a9a6c69 100644 --- a/packages/server/src/api/controllers/row/external.ts +++ b/packages/server/src/api/controllers/row/external.ts @@ -12,7 +12,7 @@ import * as exporters from "../view/exporters" import { apiFileReturn } from "../../../utilities/fileSystem" import { Operation, - UserCtx, + BBContext, Row, PaginationJson, Table, @@ -21,7 +21,6 @@ import { SortJson, } from "@budibase/types" import sdk from "../../../sdk" -import * as utils from "./utils" const { cleanExportRows } = require("./utils") @@ -50,19 +49,12 @@ export async function handleRequest( ) } -export async function patch(ctx: UserCtx) { +export async function patch(ctx: BBContext) { const inputs = ctx.request.body const tableId = ctx.params.tableId const id = inputs._id // don't save the ID to db delete inputs._id - const validateResult = await utils.validate({ - row: inputs, - tableId, - }) - if (!validateResult.valid) { - throw { validation: validateResult.errors } - } return handleRequest(Operation.UPDATE, tableId, { id: breakRowIdField(id), row: inputs, @@ -70,23 +62,16 @@ export async function patch(ctx: UserCtx) { }) } -export async function save(ctx: UserCtx) { +export async function save(ctx: BBContext) { const inputs = ctx.request.body const tableId = ctx.params.tableId - const validateResult = await utils.validate({ - row: inputs, - tableId, - }) - if (!validateResult.valid) { - throw { validation: validateResult.errors } - } return handleRequest(Operation.CREATE, tableId, { row: inputs, includeSqlRelationships: IncludeRelationship.EXCLUDE, }) } -export async function fetchView(ctx: UserCtx) { +export async function fetchView(ctx: BBContext) { // there are no views in external datasources, shouldn't ever be called // for now just fetch const split = ctx.params.viewName.split("all_") @@ -94,14 +79,14 @@ export async function fetchView(ctx: UserCtx) { return fetch(ctx) } -export async function fetch(ctx: UserCtx) { +export async function fetch(ctx: BBContext) { const tableId = ctx.params.tableId return handleRequest(Operation.READ, tableId, { includeSqlRelationships: IncludeRelationship.INCLUDE, }) } -export async function find(ctx: UserCtx) { +export async function find(ctx: BBContext) { const id = ctx.params.rowId const tableId = ctx.params.tableId const response = (await handleRequest(Operation.READ, tableId, { @@ -111,7 +96,7 @@ export async function find(ctx: UserCtx) { return response ? response[0] : response } -export async function destroy(ctx: UserCtx) { +export async function destroy(ctx: BBContext) { const tableId = ctx.params.tableId const id = ctx.request.body._id const { row } = (await handleRequest(Operation.DELETE, tableId, { @@ -121,7 +106,7 @@ export async function destroy(ctx: UserCtx) { return { response: { ok: true }, row } } -export async function bulkDestroy(ctx: UserCtx) { +export async function bulkDestroy(ctx: BBContext) { const { rows } = ctx.request.body const tableId = ctx.params.tableId let promises: Promise[] = [] @@ -137,7 +122,7 @@ export async function bulkDestroy(ctx: UserCtx) { return { response: { ok: true }, rows: responses.map(resp => resp.row) } } -export async function search(ctx: UserCtx) { +export async function search(ctx: BBContext) { const tableId = ctx.params.tableId const { paginate, query, ...params } = ctx.request.body let { bookmark, limit } = params @@ -200,7 +185,12 @@ export async function search(ctx: UserCtx) { } } -export async function exportRows(ctx: UserCtx) { +export async function validate(ctx: BBContext) { + // can't validate external right now - maybe in future + return { valid: true } +} + +export async function exportRows(ctx: BBContext) { const { datasourceId, tableName } = breakExternalTableId(ctx.params.tableId) const format = ctx.query.format const { columns } = ctx.request.body @@ -254,7 +244,7 @@ export async function exportRows(ctx: UserCtx) { return apiFileReturn(exporter(headers, exportRows)) } -export async function fetchEnrichedRow(ctx: UserCtx) { +export async function fetchEnrichedRow(ctx: BBContext) { const id = ctx.params.rowId const tableId = ctx.params.tableId const { datasourceId, tableName } = breakExternalTableId(tableId) diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts index 348d441c78..b59f245098 100644 --- a/packages/server/src/api/controllers/row/index.ts +++ b/packages/server/src/api/controllers/row/index.ts @@ -2,8 +2,6 @@ import { quotas } from "@budibase/pro" import * as internal from "./internal" import * as external from "./external" import { isExternalTable } from "../../../integrations/utils" -import { Ctx } from "@budibase/types" -import * as utils from "./utils" function pickApi(tableId: any) { if (isExternalTable(tableId)) { @@ -131,12 +129,9 @@ export async function search(ctx: any) { }) } -export async function validate(ctx: Ctx) { +export async function validate(ctx: any) { const tableId = getTableId(ctx) - ctx.body = await utils.validate({ - row: ctx.request.body, - tableId, - }) + ctx.body = await pickApi(tableId).validate(ctx) } export async function fetchEnrichedRow(ctx: any) { diff --git a/packages/server/src/api/controllers/row/internal.ts b/packages/server/src/api/controllers/row/internal.ts index 039f03c015..d36f9bf2f1 100644 --- a/packages/server/src/api/controllers/row/internal.ts +++ b/packages/server/src/api/controllers/row/internal.ts @@ -387,6 +387,13 @@ export async function search(ctx: Ctx) { return response } +export async function validate(ctx: Ctx) { + return utils.validate({ + tableId: ctx.params.tableId, + row: ctx.request.body, + }) +} + export async function exportRows(ctx: Ctx) { const db = context.getAppDB() const table = await db.get(ctx.params.tableId) diff --git a/packages/server/src/api/controllers/row/utils.ts b/packages/server/src/api/controllers/row/utils.ts index 2e8f2f4536..82232b7f98 100644 --- a/packages/server/src/api/controllers/row/utils.ts +++ b/packages/server/src/api/controllers/row/utils.ts @@ -4,11 +4,11 @@ import { FieldTypes } from "../../../constants" import { context } from "@budibase/backend-core" import { makeExternalQuery } from "../../../integrations/base/query" import { Row, Table } from "@budibase/types" +const validateJs = require("validate.js") +const { cloneDeep } = require("lodash/fp") import { Format } from "../view/exporters" import { Ctx } from "@budibase/types" import sdk from "../../../sdk" -const validateJs = require("validate.js") -const { cloneDeep } = require("lodash/fp") validateJs.extend(validateJs.validators.datetime, { parse: function (value: string) { @@ -56,7 +56,8 @@ export async function validate({ }) { let fetchedTable: Table if (!table) { - fetchedTable = await sdk.tables.getTable(tableId) + const db = context.getAppDB() + fetchedTable = await db.get(tableId) } else { fetchedTable = table } diff --git a/packages/server/src/api/controllers/table/external.ts b/packages/server/src/api/controllers/table/external.ts index a00e65687f..a6ad5bba99 100644 --- a/packages/server/src/api/controllers/table/external.ts +++ b/packages/server/src/api/controllers/table/external.ts @@ -7,7 +7,6 @@ import { generateJunctionTableName, foreignKeyStructure, hasTypeChanged, - setStaticSchemas, } from "./utils" import { FieldTypes } from "../../../constants" import { makeExternalQuery } from "../../../integrations/base/query" @@ -21,7 +20,7 @@ import { Operation, RenameColumn, FieldSchema, - UserCtx, + BBContext, TableRequest, RelationshipTypes, } from "@budibase/types" @@ -195,20 +194,20 @@ function isRelationshipSetup(column: FieldSchema) { return column.foreignKey || column.through } -export async function save(ctx: UserCtx) { - const inputs: TableRequest = ctx.request.body - const renamed = inputs?._rename +export async function save(ctx: BBContext) { + const table: TableRequest = ctx.request.body + const renamed = table?._rename // can't do this right now - delete inputs.rows + delete table.rows const datasourceId = getDatasourceId(ctx.request.body)! // table doesn't exist already, note that it is created - if (!inputs._id) { - inputs.created = true + if (!table._id) { + table.created = true } let tableToSave: TableRequest = { type: "table", - _id: buildExternalTableId(datasourceId, inputs.name), - ...inputs, + _id: buildExternalTableId(datasourceId, table.name), + ...table, } let oldTable @@ -225,10 +224,6 @@ export async function save(ctx: UserCtx) { if (!datasource.entities) { datasource.entities = {} } - - // GSheets is a specific case - only ever has a static primary key - tableToSave = setStaticSchemas(datasource, tableToSave) - const oldTables = cloneDeep(datasource.entities) const tables: Record = datasource.entities @@ -251,7 +246,7 @@ export async function save(ctx: UserCtx) { const junctionTable = generateManyLinkSchema( datasource, schema, - tableToSave, + table, relatedTable ) if (tables[junctionTable.name]) { @@ -261,12 +256,10 @@ export async function save(ctx: UserCtx) { extraTablesToUpdate.push(junctionTable) } else { const fkTable = - relationType === RelationshipTypes.ONE_TO_MANY - ? tableToSave - : relatedTable + relationType === RelationshipTypes.ONE_TO_MANY ? table : relatedTable const foreignKey = generateLinkSchema( schema, - tableToSave, + table, relatedTable, relationType ) @@ -278,11 +271,11 @@ export async function save(ctx: UserCtx) { fkTable.constrained.push(foreignKey) } // foreign key is in other table, need to save it to external - if (fkTable._id !== tableToSave._id) { + if (fkTable._id !== table._id) { extraTablesToUpdate.push(fkTable) } } - generateRelatedSchema(schema, relatedTable, tableToSave, relatedColumnName) + generateRelatedSchema(schema, relatedTable, table, relatedColumnName) schema.main = true } @@ -320,7 +313,7 @@ export async function save(ctx: UserCtx) { return tableToSave } -export async function destroy(ctx: UserCtx) { +export async function destroy(ctx: BBContext) { const tableToDelete: TableRequest = await sdk.tables.getTable( ctx.params.tableId ) @@ -346,7 +339,7 @@ export async function destroy(ctx: UserCtx) { return tableToDelete } -export async function bulkImport(ctx: UserCtx) { +export async function bulkImport(ctx: BBContext) { const table = await sdk.tables.getTable(ctx.params.tableId) const { rows }: { rows: unknown } = ctx.request.body const schema: unknown = table.schema @@ -355,7 +348,7 @@ export async function bulkImport(ctx: UserCtx) { ctx.throw(400, "Provided data import information is invalid.") } - const parsedRows = parse(rows, schema) + const parsedRows = await parse(rows, schema) await handleRequest(Operation.BULK_CREATE, table._id!, { rows: parsedRows, }) diff --git a/packages/server/src/api/controllers/table/index.ts b/packages/server/src/api/controllers/table/index.ts index 2ab7ad7b38..aa6dfde536 100644 --- a/packages/server/src/api/controllers/table/index.ts +++ b/packages/server/src/api/controllers/table/index.ts @@ -8,7 +8,7 @@ import { import { isExternalTable, isSQL } from "../../../integrations/utils" import { getDatasourceParams } from "../../../db/utils" import { context, events } from "@budibase/backend-core" -import { Table, UserCtx } from "@budibase/types" +import { Table, BBContext } from "@budibase/types" import sdk from "../../../sdk" import csv from "csvtojson" @@ -25,7 +25,7 @@ function pickApi({ tableId, table }: { tableId?: string; table?: Table }) { } // covers both internal and external -export async function fetch(ctx: UserCtx) { +export async function fetch(ctx: BBContext) { const db = context.getAppDB() const internal = await sdk.tables.getAllInternalTables() @@ -53,12 +53,12 @@ export async function fetch(ctx: UserCtx) { ctx.body = [...internal, ...external] } -export async function find(ctx: UserCtx) { +export async function find(ctx: BBContext) { const tableId = ctx.params.tableId ctx.body = await sdk.tables.getTable(tableId) } -export async function save(ctx: UserCtx) { +export async function save(ctx: BBContext) { const appId = ctx.appId const table = ctx.request.body const isImport = table.rows @@ -79,7 +79,7 @@ export async function save(ctx: UserCtx) { ctx.body = savedTable } -export async function destroy(ctx: UserCtx) { +export async function destroy(ctx: BBContext) { const appId = ctx.appId const tableId = ctx.params.tableId const deletedTable = await pickApi({ tableId }).destroy(ctx) @@ -91,7 +91,7 @@ export async function destroy(ctx: UserCtx) { ctx.body = { message: `Table ${tableId} deleted.` } } -export async function bulkImport(ctx: UserCtx) { +export async function bulkImport(ctx: BBContext) { const tableId = ctx.params.tableId await pickApi({ tableId }).bulkImport(ctx) // right now we don't trigger anything for bulk import because it @@ -101,7 +101,7 @@ export async function bulkImport(ctx: UserCtx) { ctx.body = { message: `Bulk rows created.` } } -export async function csvToJson(ctx: UserCtx) { +export async function csvToJson(ctx: BBContext) { const { csvString } = ctx.request.body const result = await csv().fromString(csvString) @@ -110,7 +110,7 @@ export async function csvToJson(ctx: UserCtx) { ctx.body = result } -export async function validateNewTableImport(ctx: UserCtx) { +export async function validateNewTableImport(ctx: BBContext) { const { rows, schema }: { rows: unknown; schema: unknown } = ctx.request.body if (isRows(rows) && isSchema(schema)) { @@ -121,7 +121,7 @@ export async function validateNewTableImport(ctx: UserCtx) { } } -export async function validateExistingTableImport(ctx: UserCtx) { +export async function validateExistingTableImport(ctx: BBContext) { const { rows, tableId }: { rows: unknown; tableId: unknown } = ctx.request.body diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts index 7c5c81939a..bbccde467b 100644 --- a/packages/server/src/api/controllers/table/utils.ts +++ b/packages/server/src/api/controllers/table/utils.ts @@ -1,11 +1,7 @@ import { parse, isSchema, isRows } from "../../../utilities/schema" import { getRowParams, generateRowID, InternalTables } from "../../../db/utils" import { isEqual } from "lodash" -import { - AutoFieldSubTypes, - FieldTypes, - GOOGLE_SHEETS_PRIMARY_KEY, -} from "../../../constants" +import { AutoFieldSubTypes, FieldTypes } from "../../../constants" import { inputProcessing, cleanupAttachments, @@ -20,7 +16,7 @@ import viewTemplate from "../view/viewBuilder" import { cloneDeep } from "lodash/fp" import { quotas } from "@budibase/pro" import { events, context } from "@budibase/backend-core" -import { Database, Datasource, SourceName, Table } from "@budibase/types" +import { Database } from "@budibase/types" export async function clearColumns(table: any, columnNames: any) { const db: Database = context.getAppDB() @@ -396,17 +392,5 @@ export function hasTypeChanged(table: any, oldTable: any) { return false } -// used for external tables, some of them will have static schemas that need -// to be hard set -export function setStaticSchemas(datasource: Datasource, table: Table) { - // GSheets is a specific case - only ever has a static primary key - if (table && datasource.source === SourceName.GOOGLE_SHEETS) { - table.primary = [GOOGLE_SHEETS_PRIMARY_KEY] - // if there is an id column, remove it, should never exist in GSheets - delete table.schema?.id - } - return table -} - const _TableSaveFunctions = TableSaveFunctions export { _TableSaveFunctions as TableSaveFunctions } diff --git a/packages/server/src/constants/index.ts b/packages/server/src/constants/index.ts index 9d6a1c247a..e55ad09add 100644 --- a/packages/server/src/constants/index.ts +++ b/packages/server/src/constants/index.ts @@ -180,4 +180,3 @@ export enum AutomationErrors { // pass through the list from the auth/core lib export const ObjectStoreBuckets = objectStore.ObjectStoreBuckets export const MAX_AUTOMATION_RECURRING_ERRORS = 5 -export const GOOGLE_SHEETS_PRIMARY_KEY = "rowNumber" diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts index f8bc84adea..0c658df0f5 100644 --- a/packages/server/src/integrations/googlesheets.ts +++ b/packages/server/src/integrations/googlesheets.ts @@ -1,25 +1,22 @@ import { DatasourceFieldType, DatasourcePlus, - FieldType, Integration, - Operation, PaginationJson, QueryJson, QueryType, - Row, SearchFilters, SortJson, Table, - TableRequest, + TableSchema, } from "@budibase/types" import { OAuth2Client } from "google-auth-library" -import { buildExternalTableId, finaliseExternalTables } from "./utils" +import { buildExternalTableId } from "./utils" +import { DataSourceOperation, FieldTypes } from "../constants" import { GoogleSpreadsheet } from "google-spreadsheet" import fetch from "node-fetch" import { configs, HTTPError } from "@budibase/backend-core" import { dataFilters } from "@budibase/shared-core" -import { GOOGLE_SHEETS_PRIMARY_KEY } from "../constants" interface GoogleSheetsConfig { spreadsheetId: string @@ -42,17 +39,6 @@ interface AuthTokenResponse { access_token: string } -const ALLOWED_TYPES = [ - FieldType.STRING, - FieldType.FORMULA, - FieldType.NUMBER, - FieldType.LONGFORM, - FieldType.DATETIME, - FieldType.OPTIONS, - FieldType.BOOLEAN, - FieldType.BARCODEQR, -] - const SCHEMA: Integration = { plus: true, auth: { @@ -213,90 +199,73 @@ class GoogleSheetsIntegration implements DatasourcePlus { this.client.useOAuth2Client(oauthClient) await this.client.loadInfo() - } catch (err: any) { - // this happens for xlsx imports - if (err.message?.includes("operation is not supported")) { - err.message = - "This operation is not supported - XLSX sheets must be converted." - } + } catch (err) { console.error("Error connecting to google sheets", err) throw err } } - getTableSchema(title: string, headerValues: string[], id?: string) { - // base table - const table: Table = { - name: title, - primary: [GOOGLE_SHEETS_PRIMARY_KEY], - schema: {}, - } - if (id) { - table._id = id - } - // build schema from headers - for (let header of headerValues) { - table.schema[header] = { - name: header, - type: FieldType.STRING, - } - } - return table - } - - async buildSchema(datasourceId: string, entities: Record) { + async buildSchema(datasourceId: string) { await this.connect() const sheets = this.client.sheetsByIndex const tables: Record = {} for (let sheet of sheets) { // must fetch rows to determine schema await sheet.getRows() + // build schema + const schema: TableSchema = {} - const id = buildExternalTableId(datasourceId, sheet.title) - tables[sheet.title] = this.getTableSchema( - sheet.title, - sheet.headerValues, - id - ) + // build schema from headers + for (let header of sheet.headerValues) { + schema[header] = { + name: header, + type: FieldTypes.STRING, + } + } + + // create tables + tables[sheet.title] = { + _id: buildExternalTableId(datasourceId, sheet.title), + name: sheet.title, + primary: ["rowNumber"], + schema, + } } - const final = finaliseExternalTables(tables, entities) - this.tables = final.tables - this.schemaErrors = final.errors + + this.tables = tables } async query(json: QueryJson) { const sheet = json.endpoint.entityId - switch (json.endpoint.operation) { - case Operation.CREATE: - return this.create({ sheet, row: json.body as Row }) - case Operation.BULK_CREATE: - return this.createBulk({ sheet, rows: json.body as Row[] }) - case Operation.READ: - return this.read({ ...json, sheet }) - case Operation.UPDATE: - return this.update({ + + const handlers = { + [DataSourceOperation.CREATE]: () => + this.create({ sheet, row: json.body }), + [DataSourceOperation.READ]: () => this.read({ ...json, sheet }), + [DataSourceOperation.UPDATE]: () => + this.update({ // exclude the header row and zero index rowIndex: json.extra?.idFilter?.equal?.rowNumber - 2, sheet, row: json.body, - }) - case Operation.DELETE: - return this.delete({ + }), + [DataSourceOperation.DELETE]: () => + this.delete({ // exclude the header row and zero index rowIndex: json.extra?.idFilter?.equal?.rowNumber - 2, sheet, - }) - case Operation.CREATE_TABLE: - return this.createTable(json?.table?.name) - case Operation.UPDATE_TABLE: - return this.updateTable(json.table!) - case Operation.DELETE_TABLE: - return this.deleteTable(json?.table?.name) - default: - throw new Error( - `GSheets integration does not support "${json.endpoint.operation}".` - ) + }), + [DataSourceOperation.CREATE_TABLE]: () => + this.createTable(json?.table?.name), + [DataSourceOperation.UPDATE_TABLE]: () => this.updateTable(json.table), + [DataSourceOperation.DELETE_TABLE]: () => + this.deleteTable(json?.table?.name), } + + // @ts-ignore + const internalQueryMethod = handlers[json.endpoint.operation] + + return await internalQueryMethod() } buildRowObject(headers: string[], values: string[], rowNumber: number) { @@ -309,70 +278,47 @@ class GoogleSheetsIntegration implements DatasourcePlus { } async createTable(name?: string) { - if (!name) { - throw new Error("Must provide name for new sheet.") - } try { await this.connect() - return await this.client.addSheet({ title: name, headerValues: [name] }) + return await this.client.addSheet({ title: name, headerValues: ["test"] }) } catch (err) { console.error("Error creating new table in google sheets", err) throw err } } - async updateTable(table: TableRequest) { - await this.connect() - const sheet = this.client.sheetsByTitle[table.name] - await sheet.loadHeaderRow() + async updateTable(table?: any) { + try { + await this.connect() + const sheet = this.client.sheetsByTitle[table.name] + await sheet.loadHeaderRow() - if (table._rename) { - const headers = [] - for (let header of sheet.headerValues) { - if (header === table._rename.old) { - headers.push(table._rename.updated) - } else { - headers.push(header) + if (table._rename) { + const headers = [] + for (let header of sheet.headerValues) { + if (header === table._rename.old) { + headers.push(table._rename.updated) + } else { + headers.push(header) + } } - } - try { await sheet.setHeaderRow(headers) - } catch (err) { - console.error("Error updating column name in google sheets", err) - throw err - } - } else { - const updatedHeaderValues = [...sheet.headerValues] + } else { + const updatedHeaderValues = [...sheet.headerValues] - // add new column - doesn't currently exist - for (let [key, column] of Object.entries(table.schema)) { - if (!ALLOWED_TYPES.includes(column.type)) { - throw new Error( - `Column type: ${column.type} not allowed for GSheets integration.` - ) - } - if ( - !sheet.headerValues.includes(key) && - column.type !== FieldType.FORMULA - ) { - updatedHeaderValues.push(key) - } - } + const newField = Object.keys(table.schema).find( + key => !sheet.headerValues.includes(key) + ) - // clear out deleted columns - for (let key of sheet.headerValues) { - if (!Object.keys(table.schema).includes(key)) { - const idx = updatedHeaderValues.indexOf(key) - updatedHeaderValues.splice(idx, 1) + if (newField) { + updatedHeaderValues.push(newField) } - } - try { await sheet.setHeaderRow(updatedHeaderValues) - } catch (err) { - console.error("Error updating table in google sheets", err) - throw err } + } catch (err) { + console.error("Error updating table in google sheets", err) + throw err } } @@ -403,24 +349,6 @@ class GoogleSheetsIntegration implements DatasourcePlus { } } - async createBulk(query: { sheet: string; rows: any[] }) { - try { - await this.connect() - const sheet = this.client.sheetsByTitle[query.sheet] - let rowsToInsert = [] - for (let row of query.rows) { - rowsToInsert.push(typeof row === "string" ? JSON.parse(row) : row) - } - const rows = await sheet.addRows(rowsToInsert) - return rows.map(row => - this.buildRowObject(sheet.headerValues, row._rawData, row._rowNumber) - ) - } catch (err) { - console.error("Error bulk writing to google sheets", err) - throw err - } - } - async read(query: { sheet: string filters?: SearchFilters diff --git a/packages/server/src/integrations/utils.ts b/packages/server/src/integrations/utils.ts index de8b318bb1..356a08f4a0 100644 --- a/packages/server/src/integrations/utils.ts +++ b/packages/server/src/integrations/utils.ts @@ -4,7 +4,6 @@ import { FieldTypes, BuildSchemaErrors, InvalidColumns } from "../constants" const DOUBLE_SEPARATOR = `${SEPARATOR}${SEPARATOR}` const ROW_ID_REGEX = /^\[.*]$/g -const ENCODED_SPACE = encodeURIComponent(" ") const SQL_NUMBER_TYPE_MAP = { integer: FieldTypes.NUMBER, @@ -80,10 +79,6 @@ export function isExternalTable(tableId: string) { } export function buildExternalTableId(datasourceId: string, tableName: string) { - // encode spaces - if (tableName.includes(" ")) { - tableName = encodeURIComponent(tableName) - } return `${datasourceId}${DOUBLE_SEPARATOR}${tableName}` } @@ -95,10 +90,6 @@ export function breakExternalTableId(tableId: string | undefined) { let datasourceId = parts.shift() // if they need joined let tableName = parts.join(DOUBLE_SEPARATOR) - // if contains encoded spaces, decode it - if (tableName.includes(ENCODED_SPACE)) { - tableName = decodeURIComponent(tableName) - } return { datasourceId, tableName } } @@ -209,9 +200,9 @@ export function isIsoDateString(str: string) { * @param column The column to check, to see if it is a valid relationship. * @param tableIds The IDs of the tables which currently exist. */ -export function shouldCopyRelationship( +function shouldCopyRelationship( column: { type: string; tableId?: string }, - tableIds: string[] + tableIds: [string] ) { return ( column.type === FieldTypes.LINK && @@ -228,7 +219,7 @@ export function shouldCopyRelationship( * @param column The column to check for options or boolean type. * @param fetchedColumn The fetched column to check for the type in the external database. */ -export function shouldCopySpecialColumn( +function shouldCopySpecialColumn( column: { type: string }, fetchedColumn: { type: string } | undefined ) { @@ -266,12 +257,9 @@ function copyExistingPropsOver( tableIds: [string] ) { if (entities && entities[tableName]) { - if (entities[tableName]?.primaryDisplay) { + if (entities[tableName].primaryDisplay) { table.primaryDisplay = entities[tableName].primaryDisplay } - if (entities[tableName]?.created) { - table.created = entities[tableName]?.created - } const existingTableSchema = entities[tableName].schema for (let key in existingTableSchema) { if (!existingTableSchema.hasOwnProperty(key)) { diff --git a/packages/types/src/documents/app/table.ts b/packages/types/src/documents/app/table.ts index 929409d0e9..01d2486dcb 100644 --- a/packages/types/src/documents/app/table.ts +++ b/packages/types/src/documents/app/table.ts @@ -76,7 +76,6 @@ export interface Table extends Document { sql?: boolean indexes?: { [key: string]: any } rows?: { [key: string]: any } - created?: boolean } export interface TableRequest extends Table { From f941ba6fe87ef75bc929203f9c33ed33367c0c12 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 29 Mar 2023 07:57:56 +0000 Subject: [PATCH 48/77] v2.4.40 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index e0217339c9..c46d1c496d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.39", + "version": "2.4.40", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 4ac97c9ef3..18c8c9aa65 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.39", + "version": "2.4.40", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.4.39", + "@budibase/types": "^2.4.40", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 79e2caa270..3e2068c811 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.4.39", + "version": "2.4.40", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.4.39", - "@budibase/string-templates": "^2.4.39", + "@budibase/shared-core": "^2.4.40", + "@budibase/string-templates": "^2.4.40", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index ce430f0e1a..b30dae3c48 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.39", + "version": "2.4.40", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.39", - "@budibase/client": "^2.4.39", - "@budibase/frontend-core": "^2.4.39", - "@budibase/shared-core": "^2.4.39", - "@budibase/string-templates": "^2.4.39", + "@budibase/bbui": "^2.4.40", + "@budibase/client": "^2.4.40", + "@budibase/frontend-core": "^2.4.40", + "@budibase/shared-core": "^2.4.40", + "@budibase/string-templates": "^2.4.40", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 8becbb5ce9..0c9d74b53d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.39", + "version": "2.4.40", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.4.39", - "@budibase/string-templates": "^2.4.39", - "@budibase/types": "^2.4.39", + "@budibase/backend-core": "^2.4.40", + "@budibase/string-templates": "^2.4.40", + "@budibase/types": "^2.4.40", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index a9fd56425b..f5f13ef4f1 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.39", + "version": "2.4.40", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.4.39", - "@budibase/frontend-core": "^2.4.39", - "@budibase/shared-core": "^2.4.39", - "@budibase/string-templates": "^2.4.39", - "@budibase/types": "^2.4.39", + "@budibase/bbui": "^2.4.40", + "@budibase/frontend-core": "^2.4.40", + "@budibase/shared-core": "^2.4.40", + "@budibase/string-templates": "^2.4.40", + "@budibase/types": "^2.4.40", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index b07938e422..6f5783c239 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.39", + "version": "2.4.40", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.4.39", - "@budibase/shared-core": "^2.4.39", + "@budibase/bbui": "^2.4.40", + "@budibase/shared-core": "^2.4.40", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index a9f880cfb1..3d922974ac 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.39", + "version": "2.4.40", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index c4c202b21a..a765223509 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.39", + "version": "2.4.40", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.39", - "@budibase/client": "^2.4.39", + "@budibase/backend-core": "^2.4.40", + "@budibase/client": "^2.4.40", "@budibase/pro": "2.4.39", - "@budibase/shared-core": "^2.4.39", - "@budibase/string-templates": "^2.4.39", - "@budibase/types": "^2.4.39", + "@budibase/shared-core": "^2.4.40", + "@budibase/string-templates": "^2.4.40", + "@budibase/types": "^2.4.40", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 16417eeafb..e8df9745a3 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.39", + "version": "2.4.40", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.4.39" + "@budibase/types": "^2.4.40" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index d4fcfe7ec1..d84dc3d13e 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.39", + "version": "2.4.40", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 4b3dbe37d2..ebcb090817 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.39", + "version": "2.4.40", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 49bc33d03b..efb308d74a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.39", + "version": "2.4.40", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.4.39", + "@budibase/backend-core": "^2.4.40", "@budibase/pro": "2.4.39", - "@budibase/string-templates": "^2.4.39", - "@budibase/types": "^2.4.39", + "@budibase/string-templates": "^2.4.40", + "@budibase/types": "^2.4.40", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 8dc5f87972db0db2cdae989c5735b9944335f84f Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 29 Mar 2023 08:00:57 +0000 Subject: [PATCH 49/77] Update pro version to 2.4.40 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index a765223509..3e9f1c6a6a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.4.40", "@budibase/client": "^2.4.40", - "@budibase/pro": "2.4.39", + "@budibase/pro": "2.4.40", "@budibase/shared-core": "^2.4.40", "@budibase/string-templates": "^2.4.40", "@budibase/types": "^2.4.40", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 48c5ee80f3..c803d67672 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1278,14 +1278,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.39": - version "2.4.39" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.39.tgz#ca3486d3bd44e11bbf498d2b4e21e25812ad45df" - integrity sha512-8C7oINVdnF1QYIRwYYJlzYIjLAe4VYwShMXqfk77IeTgy7qpdq+Np5X7kXdiaA8gUmk+pRcc5NHzNTXIS4VnUQ== +"@budibase/backend-core@2.4.40": + version "2.4.40" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.40.tgz#770158f360bcb30251aa2e50b0df40052e8ae3ce" + integrity sha512-ISN5100YjUwaJV5FJGr/4jccbottPhcp9CVBVxw90r0qKtlLVkG3zMRKJ9brSo3qx0Q8H3f1n7MrII3xoRyk3A== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.39" + "@budibase/types" "^2.4.40" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1417,14 +1417,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.39": - version "2.4.39" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.39.tgz#2f163dc7aa7a6643755fa1db8bb3c4f1d35fe676" - integrity sha512-34c73d7+RdrHPKwLJpJ2RCjlixMKXp86B7eCal7aOvCrFaJmccDMtHsh7PgY8v6PzRna16SRTCiFyoMM/0TDFA== +"@budibase/pro@2.4.40": + version "2.4.40" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.40.tgz#2c1812fe35344ce8edf1401f2d8e4f289066c841" + integrity sha512-6ZXEv2J/AdaOAa2i/2XVDdCbgn2V//MN9LHx1/tr6ixcP/nCnBXjnBXrYqLrXsHcB6IiFXJwjOtirSrn3eXyuA== dependencies: - "@budibase/backend-core" "2.4.39" + "@budibase/backend-core" "2.4.40" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.39" + "@budibase/types" "2.4.40" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1463,10 +1463,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.39", "@budibase/types@^2.4.39": - version "2.4.39" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.39.tgz#5df65a1c1beeff3e21ce4b9b542b8cf07678e554" - integrity sha512-gb4aNTK8GB5mECTmlJLH3GoSr32EDjmlpIFpWUFLXgmd874avugSN68GRcE7vKLirGmLCpeGKIGLBOf9qnzMMw== +"@budibase/types@2.4.40", "@budibase/types@^2.4.40": + version "2.4.40" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.40.tgz#12d02240e6d31f47a91eb93c971f0f835da6f950" + integrity sha512-3rk626nhpeH88l4WzU7bjG4fo8SDELSEuko7Jb+DmZdEGxrP+5NVCyNTswndXa7oSuvmg/Wg17W/aatCBNCkxA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index efb308d74a..455dee2ace 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.4.40", - "@budibase/pro": "2.4.39", + "@budibase/pro": "2.4.40", "@budibase/string-templates": "^2.4.40", "@budibase/types": "^2.4.40", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 2c3254a286..3e46a1117b 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.39": - version "2.4.39" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.39.tgz#ca3486d3bd44e11bbf498d2b4e21e25812ad45df" - integrity sha512-8C7oINVdnF1QYIRwYYJlzYIjLAe4VYwShMXqfk77IeTgy7qpdq+Np5X7kXdiaA8gUmk+pRcc5NHzNTXIS4VnUQ== +"@budibase/backend-core@2.4.40": + version "2.4.40" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.40.tgz#770158f360bcb30251aa2e50b0df40052e8ae3ce" + integrity sha512-ISN5100YjUwaJV5FJGr/4jccbottPhcp9CVBVxw90r0qKtlLVkG3zMRKJ9brSo3qx0Q8H3f1n7MrII3xoRyk3A== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.39" + "@budibase/types" "^2.4.40" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.39": - version "2.4.39" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.39.tgz#2f163dc7aa7a6643755fa1db8bb3c4f1d35fe676" - integrity sha512-34c73d7+RdrHPKwLJpJ2RCjlixMKXp86B7eCal7aOvCrFaJmccDMtHsh7PgY8v6PzRna16SRTCiFyoMM/0TDFA== +"@budibase/pro@2.4.40": + version "2.4.40" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.40.tgz#2c1812fe35344ce8edf1401f2d8e4f289066c841" + integrity sha512-6ZXEv2J/AdaOAa2i/2XVDdCbgn2V//MN9LHx1/tr6ixcP/nCnBXjnBXrYqLrXsHcB6IiFXJwjOtirSrn3eXyuA== dependencies: - "@budibase/backend-core" "2.4.39" + "@budibase/backend-core" "2.4.40" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.39" + "@budibase/types" "2.4.40" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.39", "@budibase/types@^2.4.39": - version "2.4.39" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.39.tgz#5df65a1c1beeff3e21ce4b9b542b8cf07678e554" - integrity sha512-gb4aNTK8GB5mECTmlJLH3GoSr32EDjmlpIFpWUFLXgmd874avugSN68GRcE7vKLirGmLCpeGKIGLBOf9qnzMMw== +"@budibase/types@2.4.40", "@budibase/types@^2.4.40": + version "2.4.40" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.40.tgz#12d02240e6d31f47a91eb93c971f0f835da6f950" + integrity sha512-3rk626nhpeH88l4WzU7bjG4fo8SDELSEuko7Jb+DmZdEGxrP+5NVCyNTswndXa7oSuvmg/Wg17W/aatCBNCkxA== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 25fd16f75389903110df3d378d27d156de6e309b Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 29 Mar 2023 12:12:38 +0100 Subject: [PATCH 50/77] Revert "Revert "Merge pull request #10038 from Budibase/fix/budi-6723" (#10143)" This reverts commit 89d19a87a721662e938ada406cf2ed2c42e78b77. --- .../DataTable/modals/CreateEditColumn.svelte | 9 +- .../CreateExternalTableModal.svelte | 4 +- .../modals/GoogleDatasourceConfigModal.svelte | 32 ++- .../builder/portal/settings/auth/index.svelte | 17 +- .../server/src/api/controllers/datasource.ts | 3 +- .../src/api/controllers/row/external.ts | 42 ++-- .../server/src/api/controllers/row/index.ts | 9 +- .../src/api/controllers/row/internal.ts | 7 - .../server/src/api/controllers/row/utils.ts | 7 +- .../src/api/controllers/table/external.ts | 41 ++-- .../server/src/api/controllers/table/index.ts | 18 +- .../server/src/api/controllers/table/utils.ts | 20 +- packages/server/src/constants/index.ts | 1 + .../server/src/integrations/googlesheets.ts | 222 ++++++++++++------ packages/server/src/integrations/utils.ts | 20 +- packages/types/src/documents/app/table.ts | 1 + 16 files changed, 302 insertions(+), 151 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte index 352f094507..b4293a2a0a 100644 --- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte @@ -308,7 +308,7 @@ { name: "Auto Column", type: AUTO_TYPE }, ] } else { - return [ + let fields = [ FIELDS.STRING, FIELDS.BARCODEQR, FIELDS.LONGFORM, @@ -316,10 +316,13 @@ FIELDS.DATETIME, FIELDS.NUMBER, FIELDS.BOOLEAN, - FIELDS.ARRAY, FIELDS.FORMULA, - FIELDS.LINK, ] + // no-sql or a spreadsheet + if (!external || table.sql) { + fields = [...fields, FIELDS.LINK, FIELDS.ARRAY] + } + return fields } } diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/CreateExternalTableModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/CreateExternalTableModal.svelte index 45269a365c..664b5629d4 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/CreateExternalTableModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/CreateExternalTableModal.svelte @@ -35,7 +35,9 @@ await datasources.fetch() $goto(`../../table/${table._id}`) } catch (error) { - notifications.error("Error saving table") + notifications.error( + `Error saving table - ${error?.message || "unknown error"}` + ) } } diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte index 7d03dafeb9..c12ddab78d 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte @@ -1,15 +1,22 @@ - - Authenticate with your google account to use the {IntegrationNames[ - datasource.type - ]} integration. + {#if isGoogleConfigured === true} + + Authenticate with your google account to use the {IntegrationNames[ + datasource.type + ]} integration. + + save(datasource, true)} /> + {:else if isGoogleConfigured === false} + Google authentication is not enabled, please complete Google SSO + configuration. - - save(datasource, true)} /> + Configure Google SSO + {/if} diff --git a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte index 0e82dd31e7..2d4dc7ee46 100644 --- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte @@ -47,8 +47,9 @@ $: googleCallbackTooltip = $admin.cloud ? null : googleCallbackReadonly - ? "Vist the organisation page to update the platform URL" + ? "Visit the organisation page to update the platform URL" : "Leave blank to use the default callback URL" + $: googleSheetsCallbackUrl = `${$organisation.platformUrl}/api/global/auth/datasource/google/callback` $: GoogleConfigFields = { Google: [ @@ -62,6 +63,14 @@ placeholder: $organisation.googleCallbackUrl, copyButton: true, }, + { + name: "sheetsURL", + label: "Sheets URL", + readonly: googleCallbackReadonly, + tooltip: googleCallbackTooltip, + placeholder: googleSheetsCallbackUrl, + copyButton: true, + }, ], } @@ -396,7 +405,11 @@ To allow users to authenticate using their Google accounts, fill out the - fields below. + fields below. Read the documentation for more information. diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index d212f7f361..3d41cd89af 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -84,8 +84,9 @@ export async function buildSchemaFromDb(ctx: UserCtx) { setDefaultDisplayColumns(datasource) const dbResp = await db.put(datasource) datasource._rev = dbResp.rev + const cleanedDatasource = await sdk.datasources.removeSecretSingle(datasource) - const response: any = { datasource } + const response: any = { datasource: cleanedDatasource } if (error) { response.error = error } diff --git a/packages/server/src/api/controllers/row/external.ts b/packages/server/src/api/controllers/row/external.ts index 8a7a9a6c69..ee796e32d4 100644 --- a/packages/server/src/api/controllers/row/external.ts +++ b/packages/server/src/api/controllers/row/external.ts @@ -12,7 +12,7 @@ import * as exporters from "../view/exporters" import { apiFileReturn } from "../../../utilities/fileSystem" import { Operation, - BBContext, + UserCtx, Row, PaginationJson, Table, @@ -21,6 +21,7 @@ import { SortJson, } from "@budibase/types" import sdk from "../../../sdk" +import * as utils from "./utils" const { cleanExportRows } = require("./utils") @@ -49,12 +50,19 @@ export async function handleRequest( ) } -export async function patch(ctx: BBContext) { +export async function patch(ctx: UserCtx) { const inputs = ctx.request.body const tableId = ctx.params.tableId const id = inputs._id // don't save the ID to db delete inputs._id + const validateResult = await utils.validate({ + row: inputs, + tableId, + }) + if (!validateResult.valid) { + throw { validation: validateResult.errors } + } return handleRequest(Operation.UPDATE, tableId, { id: breakRowIdField(id), row: inputs, @@ -62,16 +70,23 @@ export async function patch(ctx: BBContext) { }) } -export async function save(ctx: BBContext) { +export async function save(ctx: UserCtx) { const inputs = ctx.request.body const tableId = ctx.params.tableId + const validateResult = await utils.validate({ + row: inputs, + tableId, + }) + if (!validateResult.valid) { + throw { validation: validateResult.errors } + } return handleRequest(Operation.CREATE, tableId, { row: inputs, includeSqlRelationships: IncludeRelationship.EXCLUDE, }) } -export async function fetchView(ctx: BBContext) { +export async function fetchView(ctx: UserCtx) { // there are no views in external datasources, shouldn't ever be called // for now just fetch const split = ctx.params.viewName.split("all_") @@ -79,14 +94,14 @@ export async function fetchView(ctx: BBContext) { return fetch(ctx) } -export async function fetch(ctx: BBContext) { +export async function fetch(ctx: UserCtx) { const tableId = ctx.params.tableId return handleRequest(Operation.READ, tableId, { includeSqlRelationships: IncludeRelationship.INCLUDE, }) } -export async function find(ctx: BBContext) { +export async function find(ctx: UserCtx) { const id = ctx.params.rowId const tableId = ctx.params.tableId const response = (await handleRequest(Operation.READ, tableId, { @@ -96,7 +111,7 @@ export async function find(ctx: BBContext) { return response ? response[0] : response } -export async function destroy(ctx: BBContext) { +export async function destroy(ctx: UserCtx) { const tableId = ctx.params.tableId const id = ctx.request.body._id const { row } = (await handleRequest(Operation.DELETE, tableId, { @@ -106,7 +121,7 @@ export async function destroy(ctx: BBContext) { return { response: { ok: true }, row } } -export async function bulkDestroy(ctx: BBContext) { +export async function bulkDestroy(ctx: UserCtx) { const { rows } = ctx.request.body const tableId = ctx.params.tableId let promises: Promise[] = [] @@ -122,7 +137,7 @@ export async function bulkDestroy(ctx: BBContext) { return { response: { ok: true }, rows: responses.map(resp => resp.row) } } -export async function search(ctx: BBContext) { +export async function search(ctx: UserCtx) { const tableId = ctx.params.tableId const { paginate, query, ...params } = ctx.request.body let { bookmark, limit } = params @@ -185,12 +200,7 @@ export async function search(ctx: BBContext) { } } -export async function validate(ctx: BBContext) { - // can't validate external right now - maybe in future - return { valid: true } -} - -export async function exportRows(ctx: BBContext) { +export async function exportRows(ctx: UserCtx) { const { datasourceId, tableName } = breakExternalTableId(ctx.params.tableId) const format = ctx.query.format const { columns } = ctx.request.body @@ -244,7 +254,7 @@ export async function exportRows(ctx: BBContext) { return apiFileReturn(exporter(headers, exportRows)) } -export async function fetchEnrichedRow(ctx: BBContext) { +export async function fetchEnrichedRow(ctx: UserCtx) { const id = ctx.params.rowId const tableId = ctx.params.tableId const { datasourceId, tableName } = breakExternalTableId(tableId) diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts index b59f245098..348d441c78 100644 --- a/packages/server/src/api/controllers/row/index.ts +++ b/packages/server/src/api/controllers/row/index.ts @@ -2,6 +2,8 @@ import { quotas } from "@budibase/pro" import * as internal from "./internal" import * as external from "./external" import { isExternalTable } from "../../../integrations/utils" +import { Ctx } from "@budibase/types" +import * as utils from "./utils" function pickApi(tableId: any) { if (isExternalTable(tableId)) { @@ -129,9 +131,12 @@ export async function search(ctx: any) { }) } -export async function validate(ctx: any) { +export async function validate(ctx: Ctx) { const tableId = getTableId(ctx) - ctx.body = await pickApi(tableId).validate(ctx) + ctx.body = await utils.validate({ + row: ctx.request.body, + tableId, + }) } export async function fetchEnrichedRow(ctx: any) { diff --git a/packages/server/src/api/controllers/row/internal.ts b/packages/server/src/api/controllers/row/internal.ts index d36f9bf2f1..039f03c015 100644 --- a/packages/server/src/api/controllers/row/internal.ts +++ b/packages/server/src/api/controllers/row/internal.ts @@ -387,13 +387,6 @@ export async function search(ctx: Ctx) { return response } -export async function validate(ctx: Ctx) { - return utils.validate({ - tableId: ctx.params.tableId, - row: ctx.request.body, - }) -} - export async function exportRows(ctx: Ctx) { const db = context.getAppDB() const table = await db.get(ctx.params.tableId) diff --git a/packages/server/src/api/controllers/row/utils.ts b/packages/server/src/api/controllers/row/utils.ts index 82232b7f98..2e8f2f4536 100644 --- a/packages/server/src/api/controllers/row/utils.ts +++ b/packages/server/src/api/controllers/row/utils.ts @@ -4,11 +4,11 @@ import { FieldTypes } from "../../../constants" import { context } from "@budibase/backend-core" import { makeExternalQuery } from "../../../integrations/base/query" import { Row, Table } from "@budibase/types" -const validateJs = require("validate.js") -const { cloneDeep } = require("lodash/fp") import { Format } from "../view/exporters" import { Ctx } from "@budibase/types" import sdk from "../../../sdk" +const validateJs = require("validate.js") +const { cloneDeep } = require("lodash/fp") validateJs.extend(validateJs.validators.datetime, { parse: function (value: string) { @@ -56,8 +56,7 @@ export async function validate({ }) { let fetchedTable: Table if (!table) { - const db = context.getAppDB() - fetchedTable = await db.get(tableId) + fetchedTable = await sdk.tables.getTable(tableId) } else { fetchedTable = table } diff --git a/packages/server/src/api/controllers/table/external.ts b/packages/server/src/api/controllers/table/external.ts index a6ad5bba99..a00e65687f 100644 --- a/packages/server/src/api/controllers/table/external.ts +++ b/packages/server/src/api/controllers/table/external.ts @@ -7,6 +7,7 @@ import { generateJunctionTableName, foreignKeyStructure, hasTypeChanged, + setStaticSchemas, } from "./utils" import { FieldTypes } from "../../../constants" import { makeExternalQuery } from "../../../integrations/base/query" @@ -20,7 +21,7 @@ import { Operation, RenameColumn, FieldSchema, - BBContext, + UserCtx, TableRequest, RelationshipTypes, } from "@budibase/types" @@ -194,20 +195,20 @@ function isRelationshipSetup(column: FieldSchema) { return column.foreignKey || column.through } -export async function save(ctx: BBContext) { - const table: TableRequest = ctx.request.body - const renamed = table?._rename +export async function save(ctx: UserCtx) { + const inputs: TableRequest = ctx.request.body + const renamed = inputs?._rename // can't do this right now - delete table.rows + delete inputs.rows const datasourceId = getDatasourceId(ctx.request.body)! // table doesn't exist already, note that it is created - if (!table._id) { - table.created = true + if (!inputs._id) { + inputs.created = true } let tableToSave: TableRequest = { type: "table", - _id: buildExternalTableId(datasourceId, table.name), - ...table, + _id: buildExternalTableId(datasourceId, inputs.name), + ...inputs, } let oldTable @@ -224,6 +225,10 @@ export async function save(ctx: BBContext) { if (!datasource.entities) { datasource.entities = {} } + + // GSheets is a specific case - only ever has a static primary key + tableToSave = setStaticSchemas(datasource, tableToSave) + const oldTables = cloneDeep(datasource.entities) const tables: Record = datasource.entities @@ -246,7 +251,7 @@ export async function save(ctx: BBContext) { const junctionTable = generateManyLinkSchema( datasource, schema, - table, + tableToSave, relatedTable ) if (tables[junctionTable.name]) { @@ -256,10 +261,12 @@ export async function save(ctx: BBContext) { extraTablesToUpdate.push(junctionTable) } else { const fkTable = - relationType === RelationshipTypes.ONE_TO_MANY ? table : relatedTable + relationType === RelationshipTypes.ONE_TO_MANY + ? tableToSave + : relatedTable const foreignKey = generateLinkSchema( schema, - table, + tableToSave, relatedTable, relationType ) @@ -271,11 +278,11 @@ export async function save(ctx: BBContext) { fkTable.constrained.push(foreignKey) } // foreign key is in other table, need to save it to external - if (fkTable._id !== table._id) { + if (fkTable._id !== tableToSave._id) { extraTablesToUpdate.push(fkTable) } } - generateRelatedSchema(schema, relatedTable, table, relatedColumnName) + generateRelatedSchema(schema, relatedTable, tableToSave, relatedColumnName) schema.main = true } @@ -313,7 +320,7 @@ export async function save(ctx: BBContext) { return tableToSave } -export async function destroy(ctx: BBContext) { +export async function destroy(ctx: UserCtx) { const tableToDelete: TableRequest = await sdk.tables.getTable( ctx.params.tableId ) @@ -339,7 +346,7 @@ export async function destroy(ctx: BBContext) { return tableToDelete } -export async function bulkImport(ctx: BBContext) { +export async function bulkImport(ctx: UserCtx) { const table = await sdk.tables.getTable(ctx.params.tableId) const { rows }: { rows: unknown } = ctx.request.body const schema: unknown = table.schema @@ -348,7 +355,7 @@ export async function bulkImport(ctx: BBContext) { ctx.throw(400, "Provided data import information is invalid.") } - const parsedRows = await parse(rows, schema) + const parsedRows = parse(rows, schema) await handleRequest(Operation.BULK_CREATE, table._id!, { rows: parsedRows, }) diff --git a/packages/server/src/api/controllers/table/index.ts b/packages/server/src/api/controllers/table/index.ts index aa6dfde536..2ab7ad7b38 100644 --- a/packages/server/src/api/controllers/table/index.ts +++ b/packages/server/src/api/controllers/table/index.ts @@ -8,7 +8,7 @@ import { import { isExternalTable, isSQL } from "../../../integrations/utils" import { getDatasourceParams } from "../../../db/utils" import { context, events } from "@budibase/backend-core" -import { Table, BBContext } from "@budibase/types" +import { Table, UserCtx } from "@budibase/types" import sdk from "../../../sdk" import csv from "csvtojson" @@ -25,7 +25,7 @@ function pickApi({ tableId, table }: { tableId?: string; table?: Table }) { } // covers both internal and external -export async function fetch(ctx: BBContext) { +export async function fetch(ctx: UserCtx) { const db = context.getAppDB() const internal = await sdk.tables.getAllInternalTables() @@ -53,12 +53,12 @@ export async function fetch(ctx: BBContext) { ctx.body = [...internal, ...external] } -export async function find(ctx: BBContext) { +export async function find(ctx: UserCtx) { const tableId = ctx.params.tableId ctx.body = await sdk.tables.getTable(tableId) } -export async function save(ctx: BBContext) { +export async function save(ctx: UserCtx) { const appId = ctx.appId const table = ctx.request.body const isImport = table.rows @@ -79,7 +79,7 @@ export async function save(ctx: BBContext) { ctx.body = savedTable } -export async function destroy(ctx: BBContext) { +export async function destroy(ctx: UserCtx) { const appId = ctx.appId const tableId = ctx.params.tableId const deletedTable = await pickApi({ tableId }).destroy(ctx) @@ -91,7 +91,7 @@ export async function destroy(ctx: BBContext) { ctx.body = { message: `Table ${tableId} deleted.` } } -export async function bulkImport(ctx: BBContext) { +export async function bulkImport(ctx: UserCtx) { const tableId = ctx.params.tableId await pickApi({ tableId }).bulkImport(ctx) // right now we don't trigger anything for bulk import because it @@ -101,7 +101,7 @@ export async function bulkImport(ctx: BBContext) { ctx.body = { message: `Bulk rows created.` } } -export async function csvToJson(ctx: BBContext) { +export async function csvToJson(ctx: UserCtx) { const { csvString } = ctx.request.body const result = await csv().fromString(csvString) @@ -110,7 +110,7 @@ export async function csvToJson(ctx: BBContext) { ctx.body = result } -export async function validateNewTableImport(ctx: BBContext) { +export async function validateNewTableImport(ctx: UserCtx) { const { rows, schema }: { rows: unknown; schema: unknown } = ctx.request.body if (isRows(rows) && isSchema(schema)) { @@ -121,7 +121,7 @@ export async function validateNewTableImport(ctx: BBContext) { } } -export async function validateExistingTableImport(ctx: BBContext) { +export async function validateExistingTableImport(ctx: UserCtx) { const { rows, tableId }: { rows: unknown; tableId: unknown } = ctx.request.body diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts index bbccde467b..7c5c81939a 100644 --- a/packages/server/src/api/controllers/table/utils.ts +++ b/packages/server/src/api/controllers/table/utils.ts @@ -1,7 +1,11 @@ import { parse, isSchema, isRows } from "../../../utilities/schema" import { getRowParams, generateRowID, InternalTables } from "../../../db/utils" import { isEqual } from "lodash" -import { AutoFieldSubTypes, FieldTypes } from "../../../constants" +import { + AutoFieldSubTypes, + FieldTypes, + GOOGLE_SHEETS_PRIMARY_KEY, +} from "../../../constants" import { inputProcessing, cleanupAttachments, @@ -16,7 +20,7 @@ import viewTemplate from "../view/viewBuilder" import { cloneDeep } from "lodash/fp" import { quotas } from "@budibase/pro" import { events, context } from "@budibase/backend-core" -import { Database } from "@budibase/types" +import { Database, Datasource, SourceName, Table } from "@budibase/types" export async function clearColumns(table: any, columnNames: any) { const db: Database = context.getAppDB() @@ -392,5 +396,17 @@ export function hasTypeChanged(table: any, oldTable: any) { return false } +// used for external tables, some of them will have static schemas that need +// to be hard set +export function setStaticSchemas(datasource: Datasource, table: Table) { + // GSheets is a specific case - only ever has a static primary key + if (table && datasource.source === SourceName.GOOGLE_SHEETS) { + table.primary = [GOOGLE_SHEETS_PRIMARY_KEY] + // if there is an id column, remove it, should never exist in GSheets + delete table.schema?.id + } + return table +} + const _TableSaveFunctions = TableSaveFunctions export { _TableSaveFunctions as TableSaveFunctions } diff --git a/packages/server/src/constants/index.ts b/packages/server/src/constants/index.ts index e55ad09add..9d6a1c247a 100644 --- a/packages/server/src/constants/index.ts +++ b/packages/server/src/constants/index.ts @@ -180,3 +180,4 @@ export enum AutomationErrors { // pass through the list from the auth/core lib export const ObjectStoreBuckets = objectStore.ObjectStoreBuckets export const MAX_AUTOMATION_RECURRING_ERRORS = 5 +export const GOOGLE_SHEETS_PRIMARY_KEY = "rowNumber" diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts index 0c658df0f5..f8bc84adea 100644 --- a/packages/server/src/integrations/googlesheets.ts +++ b/packages/server/src/integrations/googlesheets.ts @@ -1,22 +1,25 @@ import { DatasourceFieldType, DatasourcePlus, + FieldType, Integration, + Operation, PaginationJson, QueryJson, QueryType, + Row, SearchFilters, SortJson, Table, - TableSchema, + TableRequest, } from "@budibase/types" import { OAuth2Client } from "google-auth-library" -import { buildExternalTableId } from "./utils" -import { DataSourceOperation, FieldTypes } from "../constants" +import { buildExternalTableId, finaliseExternalTables } from "./utils" import { GoogleSpreadsheet } from "google-spreadsheet" import fetch from "node-fetch" import { configs, HTTPError } from "@budibase/backend-core" import { dataFilters } from "@budibase/shared-core" +import { GOOGLE_SHEETS_PRIMARY_KEY } from "../constants" interface GoogleSheetsConfig { spreadsheetId: string @@ -39,6 +42,17 @@ interface AuthTokenResponse { access_token: string } +const ALLOWED_TYPES = [ + FieldType.STRING, + FieldType.FORMULA, + FieldType.NUMBER, + FieldType.LONGFORM, + FieldType.DATETIME, + FieldType.OPTIONS, + FieldType.BOOLEAN, + FieldType.BARCODEQR, +] + const SCHEMA: Integration = { plus: true, auth: { @@ -199,73 +213,90 @@ class GoogleSheetsIntegration implements DatasourcePlus { this.client.useOAuth2Client(oauthClient) await this.client.loadInfo() - } catch (err) { + } catch (err: any) { + // this happens for xlsx imports + if (err.message?.includes("operation is not supported")) { + err.message = + "This operation is not supported - XLSX sheets must be converted." + } console.error("Error connecting to google sheets", err) throw err } } - async buildSchema(datasourceId: string) { + getTableSchema(title: string, headerValues: string[], id?: string) { + // base table + const table: Table = { + name: title, + primary: [GOOGLE_SHEETS_PRIMARY_KEY], + schema: {}, + } + if (id) { + table._id = id + } + // build schema from headers + for (let header of headerValues) { + table.schema[header] = { + name: header, + type: FieldType.STRING, + } + } + return table + } + + async buildSchema(datasourceId: string, entities: Record) { await this.connect() const sheets = this.client.sheetsByIndex const tables: Record = {} for (let sheet of sheets) { // must fetch rows to determine schema await sheet.getRows() - // build schema - const schema: TableSchema = {} - // build schema from headers - for (let header of sheet.headerValues) { - schema[header] = { - name: header, - type: FieldTypes.STRING, - } - } - - // create tables - tables[sheet.title] = { - _id: buildExternalTableId(datasourceId, sheet.title), - name: sheet.title, - primary: ["rowNumber"], - schema, - } + const id = buildExternalTableId(datasourceId, sheet.title) + tables[sheet.title] = this.getTableSchema( + sheet.title, + sheet.headerValues, + id + ) } - - this.tables = tables + const final = finaliseExternalTables(tables, entities) + this.tables = final.tables + this.schemaErrors = final.errors } async query(json: QueryJson) { const sheet = json.endpoint.entityId - - const handlers = { - [DataSourceOperation.CREATE]: () => - this.create({ sheet, row: json.body }), - [DataSourceOperation.READ]: () => this.read({ ...json, sheet }), - [DataSourceOperation.UPDATE]: () => - this.update({ + switch (json.endpoint.operation) { + case Operation.CREATE: + return this.create({ sheet, row: json.body as Row }) + case Operation.BULK_CREATE: + return this.createBulk({ sheet, rows: json.body as Row[] }) + case Operation.READ: + return this.read({ ...json, sheet }) + case Operation.UPDATE: + return this.update({ // exclude the header row and zero index rowIndex: json.extra?.idFilter?.equal?.rowNumber - 2, sheet, row: json.body, - }), - [DataSourceOperation.DELETE]: () => - this.delete({ + }) + case Operation.DELETE: + return this.delete({ // exclude the header row and zero index rowIndex: json.extra?.idFilter?.equal?.rowNumber - 2, sheet, - }), - [DataSourceOperation.CREATE_TABLE]: () => - this.createTable(json?.table?.name), - [DataSourceOperation.UPDATE_TABLE]: () => this.updateTable(json.table), - [DataSourceOperation.DELETE_TABLE]: () => - this.deleteTable(json?.table?.name), + }) + case Operation.CREATE_TABLE: + return this.createTable(json?.table?.name) + case Operation.UPDATE_TABLE: + return this.updateTable(json.table!) + case Operation.DELETE_TABLE: + return this.deleteTable(json?.table?.name) + default: + throw new Error( + `GSheets integration does not support "${json.endpoint.operation}".` + ) } - - // @ts-ignore - const internalQueryMethod = handlers[json.endpoint.operation] - - return await internalQueryMethod() } buildRowObject(headers: string[], values: string[], rowNumber: number) { @@ -278,47 +309,70 @@ class GoogleSheetsIntegration implements DatasourcePlus { } async createTable(name?: string) { + if (!name) { + throw new Error("Must provide name for new sheet.") + } try { await this.connect() - return await this.client.addSheet({ title: name, headerValues: ["test"] }) + return await this.client.addSheet({ title: name, headerValues: [name] }) } catch (err) { console.error("Error creating new table in google sheets", err) throw err } } - async updateTable(table?: any) { - try { - await this.connect() - const sheet = this.client.sheetsByTitle[table.name] - await sheet.loadHeaderRow() + async updateTable(table: TableRequest) { + await this.connect() + const sheet = this.client.sheetsByTitle[table.name] + await sheet.loadHeaderRow() - if (table._rename) { - const headers = [] - for (let header of sheet.headerValues) { - if (header === table._rename.old) { - headers.push(table._rename.updated) - } else { - headers.push(header) - } + if (table._rename) { + const headers = [] + for (let header of sheet.headerValues) { + if (header === table._rename.old) { + headers.push(table._rename.updated) + } else { + headers.push(header) } - await sheet.setHeaderRow(headers) - } else { - const updatedHeaderValues = [...sheet.headerValues] - - const newField = Object.keys(table.schema).find( - key => !sheet.headerValues.includes(key) - ) - - if (newField) { - updatedHeaderValues.push(newField) - } - - await sheet.setHeaderRow(updatedHeaderValues) } - } catch (err) { - console.error("Error updating table in google sheets", err) - throw err + try { + await sheet.setHeaderRow(headers) + } catch (err) { + console.error("Error updating column name in google sheets", err) + throw err + } + } else { + const updatedHeaderValues = [...sheet.headerValues] + + // add new column - doesn't currently exist + for (let [key, column] of Object.entries(table.schema)) { + if (!ALLOWED_TYPES.includes(column.type)) { + throw new Error( + `Column type: ${column.type} not allowed for GSheets integration.` + ) + } + if ( + !sheet.headerValues.includes(key) && + column.type !== FieldType.FORMULA + ) { + updatedHeaderValues.push(key) + } + } + + // clear out deleted columns + for (let key of sheet.headerValues) { + if (!Object.keys(table.schema).includes(key)) { + const idx = updatedHeaderValues.indexOf(key) + updatedHeaderValues.splice(idx, 1) + } + } + + try { + await sheet.setHeaderRow(updatedHeaderValues) + } catch (err) { + console.error("Error updating table in google sheets", err) + throw err + } } } @@ -349,6 +403,24 @@ class GoogleSheetsIntegration implements DatasourcePlus { } } + async createBulk(query: { sheet: string; rows: any[] }) { + try { + await this.connect() + const sheet = this.client.sheetsByTitle[query.sheet] + let rowsToInsert = [] + for (let row of query.rows) { + rowsToInsert.push(typeof row === "string" ? JSON.parse(row) : row) + } + const rows = await sheet.addRows(rowsToInsert) + return rows.map(row => + this.buildRowObject(sheet.headerValues, row._rawData, row._rowNumber) + ) + } catch (err) { + console.error("Error bulk writing to google sheets", err) + throw err + } + } + async read(query: { sheet: string filters?: SearchFilters diff --git a/packages/server/src/integrations/utils.ts b/packages/server/src/integrations/utils.ts index 356a08f4a0..de8b318bb1 100644 --- a/packages/server/src/integrations/utils.ts +++ b/packages/server/src/integrations/utils.ts @@ -4,6 +4,7 @@ import { FieldTypes, BuildSchemaErrors, InvalidColumns } from "../constants" const DOUBLE_SEPARATOR = `${SEPARATOR}${SEPARATOR}` const ROW_ID_REGEX = /^\[.*]$/g +const ENCODED_SPACE = encodeURIComponent(" ") const SQL_NUMBER_TYPE_MAP = { integer: FieldTypes.NUMBER, @@ -79,6 +80,10 @@ export function isExternalTable(tableId: string) { } export function buildExternalTableId(datasourceId: string, tableName: string) { + // encode spaces + if (tableName.includes(" ")) { + tableName = encodeURIComponent(tableName) + } return `${datasourceId}${DOUBLE_SEPARATOR}${tableName}` } @@ -90,6 +95,10 @@ export function breakExternalTableId(tableId: string | undefined) { let datasourceId = parts.shift() // if they need joined let tableName = parts.join(DOUBLE_SEPARATOR) + // if contains encoded spaces, decode it + if (tableName.includes(ENCODED_SPACE)) { + tableName = decodeURIComponent(tableName) + } return { datasourceId, tableName } } @@ -200,9 +209,9 @@ export function isIsoDateString(str: string) { * @param column The column to check, to see if it is a valid relationship. * @param tableIds The IDs of the tables which currently exist. */ -function shouldCopyRelationship( +export function shouldCopyRelationship( column: { type: string; tableId?: string }, - tableIds: [string] + tableIds: string[] ) { return ( column.type === FieldTypes.LINK && @@ -219,7 +228,7 @@ function shouldCopyRelationship( * @param column The column to check for options or boolean type. * @param fetchedColumn The fetched column to check for the type in the external database. */ -function shouldCopySpecialColumn( +export function shouldCopySpecialColumn( column: { type: string }, fetchedColumn: { type: string } | undefined ) { @@ -257,9 +266,12 @@ function copyExistingPropsOver( tableIds: [string] ) { if (entities && entities[tableName]) { - if (entities[tableName].primaryDisplay) { + if (entities[tableName]?.primaryDisplay) { table.primaryDisplay = entities[tableName].primaryDisplay } + if (entities[tableName]?.created) { + table.created = entities[tableName]?.created + } const existingTableSchema = entities[tableName].schema for (let key in existingTableSchema) { if (!existingTableSchema.hasOwnProperty(key)) { diff --git a/packages/types/src/documents/app/table.ts b/packages/types/src/documents/app/table.ts index 01d2486dcb..929409d0e9 100644 --- a/packages/types/src/documents/app/table.ts +++ b/packages/types/src/documents/app/table.ts @@ -76,6 +76,7 @@ export interface Table extends Document { sql?: boolean indexes?: { [key: string]: any } rows?: { [key: string]: any } + created?: boolean } export interface TableRequest extends Table { From e10943e6f8cd957c5fbfd440fe87a07ba66258be Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 29 Mar 2023 12:13:23 +0100 Subject: [PATCH 51/77] Removing external table validation - will have to come up with a best way to do this and a test suite for it. --- .../server/src/api/controllers/row/external.ts | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/packages/server/src/api/controllers/row/external.ts b/packages/server/src/api/controllers/row/external.ts index ee796e32d4..9fb92cccc2 100644 --- a/packages/server/src/api/controllers/row/external.ts +++ b/packages/server/src/api/controllers/row/external.ts @@ -56,13 +56,6 @@ export async function patch(ctx: UserCtx) { const id = inputs._id // don't save the ID to db delete inputs._id - const validateResult = await utils.validate({ - row: inputs, - tableId, - }) - if (!validateResult.valid) { - throw { validation: validateResult.errors } - } return handleRequest(Operation.UPDATE, tableId, { id: breakRowIdField(id), row: inputs, @@ -73,13 +66,6 @@ export async function patch(ctx: UserCtx) { export async function save(ctx: UserCtx) { const inputs = ctx.request.body const tableId = ctx.params.tableId - const validateResult = await utils.validate({ - row: inputs, - tableId, - }) - if (!validateResult.valid) { - throw { validation: validateResult.errors } - } return handleRequest(Operation.CREATE, tableId, { row: inputs, includeSqlRelationships: IncludeRelationship.EXCLUDE, From e5ba70e7b42c5ca3303cd50502820c17f7072e70 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 29 Mar 2023 12:16:14 +0100 Subject: [PATCH 52/77] Removing validation endpoint for external tables, always valid. --- packages/server/src/api/controllers/row/index.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts index 348d441c78..349c4e72e7 100644 --- a/packages/server/src/api/controllers/row/index.ts +++ b/packages/server/src/api/controllers/row/index.ts @@ -133,10 +133,15 @@ export async function search(ctx: any) { export async function validate(ctx: Ctx) { const tableId = getTableId(ctx) - ctx.body = await utils.validate({ - row: ctx.request.body, - tableId, - }) + // external tables are hard to validate currently + if (isExternalTable(tableId)) { + ctx.body = { valid: true } + } else { + ctx.body = await utils.validate({ + row: ctx.request.body, + tableId, + }) + } } export async function fetchEnrichedRow(ctx: any) { From 1f0cf9b604b0e7c4b30738b6f0d5bc92ecddc5f0 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 29 Mar 2023 11:39:46 +0000 Subject: [PATCH 53/77] v2.4.41 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index c46d1c496d..2ef1df9a1f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.40", + "version": "2.4.41", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 18c8c9aa65..5a1fa4c83c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.40", + "version": "2.4.41", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.4.40", + "@budibase/types": "^2.4.41", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 3e2068c811..71ab358bbf 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.4.40", + "version": "2.4.41", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.4.40", - "@budibase/string-templates": "^2.4.40", + "@budibase/shared-core": "^2.4.41", + "@budibase/string-templates": "^2.4.41", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index b30dae3c48..74420ec679 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.40", + "version": "2.4.41", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.40", - "@budibase/client": "^2.4.40", - "@budibase/frontend-core": "^2.4.40", - "@budibase/shared-core": "^2.4.40", - "@budibase/string-templates": "^2.4.40", + "@budibase/bbui": "^2.4.41", + "@budibase/client": "^2.4.41", + "@budibase/frontend-core": "^2.4.41", + "@budibase/shared-core": "^2.4.41", + "@budibase/string-templates": "^2.4.41", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 0c9d74b53d..0bdccdcf89 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.40", + "version": "2.4.41", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.4.40", - "@budibase/string-templates": "^2.4.40", - "@budibase/types": "^2.4.40", + "@budibase/backend-core": "^2.4.41", + "@budibase/string-templates": "^2.4.41", + "@budibase/types": "^2.4.41", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index f5f13ef4f1..a3b82b0931 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.40", + "version": "2.4.41", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.4.40", - "@budibase/frontend-core": "^2.4.40", - "@budibase/shared-core": "^2.4.40", - "@budibase/string-templates": "^2.4.40", - "@budibase/types": "^2.4.40", + "@budibase/bbui": "^2.4.41", + "@budibase/frontend-core": "^2.4.41", + "@budibase/shared-core": "^2.4.41", + "@budibase/string-templates": "^2.4.41", + "@budibase/types": "^2.4.41", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 6f5783c239..e4ce0bbd0c 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.40", + "version": "2.4.41", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.4.40", - "@budibase/shared-core": "^2.4.40", + "@budibase/bbui": "^2.4.41", + "@budibase/shared-core": "^2.4.41", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 3d922974ac..64be4c725c 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.40", + "version": "2.4.41", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 3e9f1c6a6a..d671b5c02a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.40", + "version": "2.4.41", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,12 +43,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.40", - "@budibase/client": "^2.4.40", + "@budibase/backend-core": "^2.4.41", + "@budibase/client": "^2.4.41", "@budibase/pro": "2.4.40", - "@budibase/shared-core": "^2.4.40", - "@budibase/string-templates": "^2.4.40", - "@budibase/types": "^2.4.40", + "@budibase/shared-core": "^2.4.41", + "@budibase/string-templates": "^2.4.41", + "@budibase/types": "^2.4.41", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index e8df9745a3..56ffacfa2f 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.40", + "version": "2.4.41", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.4.40" + "@budibase/types": "^2.4.41" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index d84dc3d13e..06a52e8be6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.40", + "version": "2.4.41", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index ebcb090817..bba3281944 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.40", + "version": "2.4.41", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 455dee2ace..7759015679 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.40", + "version": "2.4.41", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.4.40", + "@budibase/backend-core": "^2.4.41", "@budibase/pro": "2.4.40", - "@budibase/string-templates": "^2.4.40", - "@budibase/types": "^2.4.40", + "@budibase/string-templates": "^2.4.41", + "@budibase/types": "^2.4.41", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From de4c3deb0446662e651e941d98dfea6964f6e5ce Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 29 Mar 2023 12:08:36 +0000 Subject: [PATCH 54/77] v2.4.42-alpha.0 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index 2ef1df9a1f..17f6dfa0d7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.41", + "version": "2.4.42-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 5a1fa4c83c..0d1b67444a 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.41", + "version": "2.4.42-alpha.0", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.4.41", + "@budibase/types": "2.4.42-alpha.0", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 71ab358bbf..16bc43d6bc 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.4.41", + "version": "2.4.42-alpha.0", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.4.41", - "@budibase/string-templates": "^2.4.41", + "@budibase/shared-core": "2.4.42-alpha.0", + "@budibase/string-templates": "2.4.42-alpha.0", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 74420ec679..f92295e4d0 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.41", + "version": "2.4.42-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.41", - "@budibase/client": "^2.4.41", - "@budibase/frontend-core": "^2.4.41", - "@budibase/shared-core": "^2.4.41", - "@budibase/string-templates": "^2.4.41", + "@budibase/bbui": "2.4.42-alpha.0", + "@budibase/client": "2.4.42-alpha.0", + "@budibase/frontend-core": "2.4.42-alpha.0", + "@budibase/shared-core": "2.4.42-alpha.0", + "@budibase/string-templates": "2.4.42-alpha.0", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 0bdccdcf89..03a5253dc3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.41", + "version": "2.4.42-alpha.0", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.4.41", - "@budibase/string-templates": "^2.4.41", - "@budibase/types": "^2.4.41", + "@budibase/backend-core": "2.4.42-alpha.0", + "@budibase/string-templates": "2.4.42-alpha.0", + "@budibase/types": "2.4.42-alpha.0", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index a3b82b0931..b019d52fd8 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.41", + "version": "2.4.42-alpha.0", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.4.41", - "@budibase/frontend-core": "^2.4.41", - "@budibase/shared-core": "^2.4.41", - "@budibase/string-templates": "^2.4.41", - "@budibase/types": "^2.4.41", + "@budibase/bbui": "2.4.42-alpha.0", + "@budibase/frontend-core": "2.4.42-alpha.0", + "@budibase/shared-core": "2.4.42-alpha.0", + "@budibase/string-templates": "2.4.42-alpha.0", + "@budibase/types": "2.4.42-alpha.0", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index e4ce0bbd0c..0238dfd0a8 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.41", + "version": "2.4.42-alpha.0", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.4.41", - "@budibase/shared-core": "^2.4.41", + "@budibase/bbui": "2.4.42-alpha.0", + "@budibase/shared-core": "2.4.42-alpha.0", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 64be4c725c..c40c901d69 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.41", + "version": "2.4.42-alpha.0", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 1dd9a4e295..23322945ba 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.41", + "version": "2.4.42-alpha.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.41", - "@budibase/client": "^2.4.41", + "@budibase/backend-core": "2.4.42-alpha.0", + "@budibase/client": "2.4.42-alpha.0", "@budibase/pro": "2.4.40", - "@budibase/shared-core": "^2.4.41", - "@budibase/string-templates": "^2.4.41", - "@budibase/types": "^2.4.41", + "@budibase/shared-core": "2.4.42-alpha.0", + "@budibase/string-templates": "2.4.42-alpha.0", + "@budibase/types": "2.4.42-alpha.0", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 56ffacfa2f..a072efa470 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.41", + "version": "2.4.42-alpha.0", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.4.41" + "@budibase/types": "2.4.42-alpha.0" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 06a52e8be6..33d2d112be 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.41", + "version": "2.4.42-alpha.0", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index bba3281944..2d8514bae7 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.41", + "version": "2.4.42-alpha.0", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 7759015679..41b618a74b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.41", + "version": "2.4.42-alpha.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.4.41", + "@budibase/backend-core": "2.4.42-alpha.0", "@budibase/pro": "2.4.40", - "@budibase/string-templates": "^2.4.41", - "@budibase/types": "^2.4.41", + "@budibase/string-templates": "2.4.42-alpha.0", + "@budibase/types": "2.4.42-alpha.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 981fd586a9ef646be6e4838c22da2d09b093aba3 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 29 Mar 2023 12:11:38 +0000 Subject: [PATCH 55/77] Update pro version to 2.4.42-alpha.0 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 23322945ba..e306ccf4f2 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -46,7 +46,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.4.42-alpha.0", "@budibase/client": "2.4.42-alpha.0", - "@budibase/pro": "2.4.40", + "@budibase/pro": "2.4.42-alpha.0", "@budibase/shared-core": "2.4.42-alpha.0", "@budibase/string-templates": "2.4.42-alpha.0", "@budibase/types": "2.4.42-alpha.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 5fe177d095..96e8394e06 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1290,14 +1290,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.40": - version "2.4.40" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.40.tgz#770158f360bcb30251aa2e50b0df40052e8ae3ce" - integrity sha512-ISN5100YjUwaJV5FJGr/4jccbottPhcp9CVBVxw90r0qKtlLVkG3zMRKJ9brSo3qx0Q8H3f1n7MrII3xoRyk3A== +"@budibase/backend-core@2.4.42-alpha.0": + version "2.4.42-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.0.tgz#48d70f48da652fa22efbf68bc8fcfb8730629967" + integrity sha512-XIuydOqyKM4PxDKxXKNQxBVNkju0o2xkvewZ7IcQv8ooOxVM4ox9WMonQVSZx7Z7ZHaEmBqexSlk0Lse5RoclQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.40" + "@budibase/types" "2.4.42-alpha.0" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1429,14 +1429,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.40": - version "2.4.40" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.40.tgz#2c1812fe35344ce8edf1401f2d8e4f289066c841" - integrity sha512-6ZXEv2J/AdaOAa2i/2XVDdCbgn2V//MN9LHx1/tr6ixcP/nCnBXjnBXrYqLrXsHcB6IiFXJwjOtirSrn3eXyuA== +"@budibase/pro@2.4.42-alpha.0": + version "2.4.42-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.0.tgz#d139dc9771535a1a9606ddd9e14ac3a57ae426b1" + integrity sha512-PMUlN3/fn8XjYqDPuqYd1Zh/mWzMnZ6HssHgHywo5FXqn85npMl+RfBvVIwPUw0L+u600p5VedkDfKBLcpmpBQ== dependencies: - "@budibase/backend-core" "2.4.40" + "@budibase/backend-core" "2.4.42-alpha.0" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.40" + "@budibase/types" "2.4.42-alpha.0" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1475,10 +1475,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.40", "@budibase/types@^2.4.40": - version "2.4.40" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.40.tgz#12d02240e6d31f47a91eb93c971f0f835da6f950" - integrity sha512-3rk626nhpeH88l4WzU7bjG4fo8SDELSEuko7Jb+DmZdEGxrP+5NVCyNTswndXa7oSuvmg/Wg17W/aatCBNCkxA== +"@budibase/types@2.4.42-alpha.0": + version "2.4.42-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.0.tgz#b63e3db3bb38e25dffb3307328a74b26e68aa249" + integrity sha512-RxNZIoeckA2nyZO5ghGNA/jmHcXW1ZpivwNfLpce7msNkKMCCuNElDTbxayPtmyHC8VRpL8k6OJlpzilWkXdBw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 41b618a74b..f43f29cfc5 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.4.42-alpha.0", - "@budibase/pro": "2.4.40", + "@budibase/pro": "2.4.42-alpha.0", "@budibase/string-templates": "2.4.42-alpha.0", "@budibase/types": "2.4.42-alpha.0", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 3e46a1117b..f9797a98dc 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.40": - version "2.4.40" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.40.tgz#770158f360bcb30251aa2e50b0df40052e8ae3ce" - integrity sha512-ISN5100YjUwaJV5FJGr/4jccbottPhcp9CVBVxw90r0qKtlLVkG3zMRKJ9brSo3qx0Q8H3f1n7MrII3xoRyk3A== +"@budibase/backend-core@2.4.42-alpha.0": + version "2.4.42-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.0.tgz#48d70f48da652fa22efbf68bc8fcfb8730629967" + integrity sha512-XIuydOqyKM4PxDKxXKNQxBVNkju0o2xkvewZ7IcQv8ooOxVM4ox9WMonQVSZx7Z7ZHaEmBqexSlk0Lse5RoclQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.40" + "@budibase/types" "2.4.42-alpha.0" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.40": - version "2.4.40" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.40.tgz#2c1812fe35344ce8edf1401f2d8e4f289066c841" - integrity sha512-6ZXEv2J/AdaOAa2i/2XVDdCbgn2V//MN9LHx1/tr6ixcP/nCnBXjnBXrYqLrXsHcB6IiFXJwjOtirSrn3eXyuA== +"@budibase/pro@2.4.42-alpha.0": + version "2.4.42-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.0.tgz#d139dc9771535a1a9606ddd9e14ac3a57ae426b1" + integrity sha512-PMUlN3/fn8XjYqDPuqYd1Zh/mWzMnZ6HssHgHywo5FXqn85npMl+RfBvVIwPUw0L+u600p5VedkDfKBLcpmpBQ== dependencies: - "@budibase/backend-core" "2.4.40" + "@budibase/backend-core" "2.4.42-alpha.0" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.40" + "@budibase/types" "2.4.42-alpha.0" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.40", "@budibase/types@^2.4.40": - version "2.4.40" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.40.tgz#12d02240e6d31f47a91eb93c971f0f835da6f950" - integrity sha512-3rk626nhpeH88l4WzU7bjG4fo8SDELSEuko7Jb+DmZdEGxrP+5NVCyNTswndXa7oSuvmg/Wg17W/aatCBNCkxA== +"@budibase/types@2.4.42-alpha.0": + version "2.4.42-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.0.tgz#b63e3db3bb38e25dffb3307328a74b26e68aa249" + integrity sha512-RxNZIoeckA2nyZO5ghGNA/jmHcXW1ZpivwNfLpce7msNkKMCCuNElDTbxayPtmyHC8VRpL8k6OJlpzilWkXdBw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 70d91acc4170f89b2c0b8150dec5d1d8cc865dda Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 29 Mar 2023 14:19:54 +0100 Subject: [PATCH 56/77] Adding a check for the tenant ID - to make sure it is a real tenant before forcing the user out of the platform based on it. --- .../builder/src/pages/builder/_layout.svelte | 8 ++++++- packages/builder/src/stores/portal/index.js | 1 + packages/builder/src/stores/portal/tenants.js | 24 +++++++++++++++++++ packages/frontend-core/src/api/index.js | 2 ++ packages/frontend-core/src/api/tenants.js | 8 +++++++ .../src/api/controllers/system/tenants.ts | 4 ++++ .../worker/src/api/routes/system/tenants.ts | 2 ++ .../api/routes/system/tests/tenants.spec.ts | 13 ++++++++++ packages/worker/src/sdk/tenants/tenants.ts | 7 ++++++ packages/worker/src/tests/api/tenants.ts | 9 +++++++ 10 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 packages/builder/src/stores/portal/tenants.js create mode 100644 packages/frontend-core/src/api/tenants.js diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte index 25b25e754c..73e2f2f5f1 100644 --- a/packages/builder/src/pages/builder/_layout.svelte +++ b/packages/builder/src/pages/builder/_layout.svelte @@ -1,6 +1,6 @@
diff --git a/packages/builder/src/stores/backend/tables.js b/packages/builder/src/stores/backend/tables.js index ee38504dd1..3b7ce35dde 100644 --- a/packages/builder/src/stores/backend/tables.js +++ b/packages/builder/src/stores/backend/tables.js @@ -22,6 +22,18 @@ export function createTablesStore() { })) } + const fetchTable = async tableId => { + const table = await API.fetchTableDefinition(tableId) + + store.update(state => { + const indexToUpdate = state.list.findIndex(t => t._id === table._id) + state.list[indexToUpdate] = table + return { + ...state, + } + }) + } + const select = tableId => { store.update(state => ({ ...state, @@ -126,6 +138,7 @@ export function createTablesStore() { return { subscribe: derivedStore.subscribe, fetch, + fetchTable, init: fetch, select, save, From 6f69798f2724aea7d84846a3f28ca50bc021e4ef Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 31 Mar 2023 11:27:44 +0100 Subject: [PATCH 75/77] Undo wrongly commited code --- .../builder/src/components/backend/DataTable/DataTable.svelte | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte index d315e68356..0c5adfc18c 100644 --- a/packages/builder/src/components/backend/DataTable/DataTable.svelte +++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte @@ -149,10 +149,8 @@ // When importing new rows it is better to reinitialise request/paging data. // Not doing so causes inconsistency in paging behaviour and content. const onImportData = () => { - fetch.getInitialData(enrichedSchema) + fetch.getInitialData() } - - $: console.log(enrichedSchema)
From 889ea356e660dc0d9b4c23dafc752a47f99ea31d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 31 Mar 2023 10:43:16 +0000 Subject: [PATCH 76/77] v2.4.42-alpha.5 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index a6309f4420..7926e03ecb 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.42-alpha.4", + "version": "2.4.42-alpha.5", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index fd7a416125..e7c6217cee 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.42-alpha.4", + "version": "2.4.42-alpha.5", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.4.42-alpha.4", + "@budibase/types": "2.4.42-alpha.5", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index e65f6eda98..b4c0241a49 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.4.42-alpha.4", + "version": "2.4.42-alpha.5", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.4.42-alpha.4", - "@budibase/string-templates": "2.4.42-alpha.4", + "@budibase/shared-core": "2.4.42-alpha.5", + "@budibase/string-templates": "2.4.42-alpha.5", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index b0ee045824..1e175eb757 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.42-alpha.4", + "version": "2.4.42-alpha.5", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.42-alpha.4", - "@budibase/client": "2.4.42-alpha.4", - "@budibase/frontend-core": "2.4.42-alpha.4", - "@budibase/shared-core": "2.4.42-alpha.4", - "@budibase/string-templates": "2.4.42-alpha.4", + "@budibase/bbui": "2.4.42-alpha.5", + "@budibase/client": "2.4.42-alpha.5", + "@budibase/frontend-core": "2.4.42-alpha.5", + "@budibase/shared-core": "2.4.42-alpha.5", + "@budibase/string-templates": "2.4.42-alpha.5", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index bb0b78b81d..8dc178342f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.42-alpha.4", + "version": "2.4.42-alpha.5", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.4.42-alpha.4", - "@budibase/string-templates": "2.4.42-alpha.4", - "@budibase/types": "2.4.42-alpha.4", + "@budibase/backend-core": "2.4.42-alpha.5", + "@budibase/string-templates": "2.4.42-alpha.5", + "@budibase/types": "2.4.42-alpha.5", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 2c57516046..b491cad175 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.42-alpha.4", + "version": "2.4.42-alpha.5", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.4.42-alpha.4", - "@budibase/frontend-core": "2.4.42-alpha.4", - "@budibase/shared-core": "2.4.42-alpha.4", - "@budibase/string-templates": "2.4.42-alpha.4", - "@budibase/types": "2.4.42-alpha.4", + "@budibase/bbui": "2.4.42-alpha.5", + "@budibase/frontend-core": "2.4.42-alpha.5", + "@budibase/shared-core": "2.4.42-alpha.5", + "@budibase/string-templates": "2.4.42-alpha.5", + "@budibase/types": "2.4.42-alpha.5", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 68f36b4bed..8c5c854bbd 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.42-alpha.4", + "version": "2.4.42-alpha.5", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.4.42-alpha.4", - "@budibase/shared-core": "2.4.42-alpha.4", + "@budibase/bbui": "2.4.42-alpha.5", + "@budibase/shared-core": "2.4.42-alpha.5", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index acbbe90da4..57d0973471 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.42-alpha.4", + "version": "2.4.42-alpha.5", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index cff1a6c68f..6f485eaba2 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.42-alpha.4", + "version": "2.4.42-alpha.5", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.4.42-alpha.4", - "@budibase/client": "2.4.42-alpha.4", + "@budibase/backend-core": "2.4.42-alpha.5", + "@budibase/client": "2.4.42-alpha.5", "@budibase/pro": "2.4.42-alpha.4", - "@budibase/shared-core": "2.4.42-alpha.4", - "@budibase/string-templates": "2.4.42-alpha.4", - "@budibase/types": "2.4.42-alpha.4", + "@budibase/shared-core": "2.4.42-alpha.5", + "@budibase/string-templates": "2.4.42-alpha.5", + "@budibase/types": "2.4.42-alpha.5", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 796b6a39b1..8a827b1969 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.42-alpha.4", + "version": "2.4.42-alpha.5", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.4.42-alpha.4" + "@budibase/types": "2.4.42-alpha.5" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 1517bd0e70..d8609616b7 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.42-alpha.4", + "version": "2.4.42-alpha.5", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 58fb202a86..c48a4fe708 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.42-alpha.4", + "version": "2.4.42-alpha.5", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index c370365a56..7befc0efc0 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.42-alpha.4", + "version": "2.4.42-alpha.5", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.4.42-alpha.4", + "@budibase/backend-core": "2.4.42-alpha.5", "@budibase/pro": "2.4.42-alpha.4", - "@budibase/string-templates": "2.4.42-alpha.4", - "@budibase/types": "2.4.42-alpha.4", + "@budibase/string-templates": "2.4.42-alpha.5", + "@budibase/types": "2.4.42-alpha.5", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From a999a434069d76bd974f39b2046c85d33da51f6a Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 31 Mar 2023 10:46:08 +0000 Subject: [PATCH 77/77] Update pro version to 2.4.42-alpha.5 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 6f485eaba2..8d92bd490d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -46,7 +46,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.4.42-alpha.5", "@budibase/client": "2.4.42-alpha.5", - "@budibase/pro": "2.4.42-alpha.4", + "@budibase/pro": "2.4.42-alpha.5", "@budibase/shared-core": "2.4.42-alpha.5", "@budibase/string-templates": "2.4.42-alpha.5", "@budibase/types": "2.4.42-alpha.5", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 0c2c983c83..6e48c2c5ec 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1290,14 +1290,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.42-alpha.4": - version "2.4.42-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.4.tgz#e4e86811dab639e211c3c4ad540841279f634115" - integrity sha512-var93QWJbwPHQtR4zIy/7g8ABOT2fQb43FMC2A+CLAQnJxBCu0Rcvk/5jkwOe18Te2+AiylC1OIGfvVbD3TTYA== +"@budibase/backend-core@2.4.42-alpha.5": + version "2.4.42-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.5.tgz#3e4b44c6e1b7f9c0652527a48dfa46dbe022e93b" + integrity sha512-vclysH06NASv9XZ55W9yonPIodVTCWklo6alfKPQTbvjINGBopfTglV9new+OVJoqlaYPyt4AyBVp0si29vuKg== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.4.42-alpha.4" + "@budibase/types" "2.4.42-alpha.5" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1429,14 +1429,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.42-alpha.4": - version "2.4.42-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.4.tgz#8e81d08b4363c59e6aa872f532287327c2ef5e1e" - integrity sha512-6/CMcDnLRSzimR1JVy2FindRzN0YEo/B4lwYPtS2T5ORyCSBL24flwD15lhp2W4g0e1TF/+fPK/EaEXhJZglBg== +"@budibase/pro@2.4.42-alpha.5": + version "2.4.42-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.5.tgz#99774e2e06fc22892c545b7208d78144395859db" + integrity sha512-Axxx4zqsBsu2fl5UKetNXCJWoMi2pcA/kVY88Z9BYNPmGp7k3s2pKU/kShy751I2fDF0TGgxSCGzpVzWqM8ZEg== dependencies: - "@budibase/backend-core" "2.4.42-alpha.4" + "@budibase/backend-core" "2.4.42-alpha.5" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.42-alpha.4" + "@budibase/types" "2.4.42-alpha.5" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1475,10 +1475,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.42-alpha.4": - version "2.4.42-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.4.tgz#4a1ae0a9cd03e4ee0f81f64a494fbfd13ddbfdf6" - integrity sha512-eBB+VVtkld140Jno/quRlwlu9Q1GkeLyUQeXSrOed8dlmmImS4UKpOpAru+YxTklIvexJsM9H+AQw39IZR7L3g== +"@budibase/types@2.4.42-alpha.5": + version "2.4.42-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.5.tgz#21408ab88b74833f176003f9e54dc109252d8080" + integrity sha512-3uZmKryzMcAxIrR0hnBwoNfuqR8yvCWjK880h4Mdi2ik/uYfndUAhdVi/Bh/oU3ZGu9KiJzqh/IE29IuRboiNg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 7befc0efc0..5dd8074b9f 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.4.42-alpha.5", - "@budibase/pro": "2.4.42-alpha.4", + "@budibase/pro": "2.4.42-alpha.5", "@budibase/string-templates": "2.4.42-alpha.5", "@budibase/types": "2.4.42-alpha.5", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 82a492003a..e090e273aa 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.42-alpha.4": - version "2.4.42-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.4.tgz#e4e86811dab639e211c3c4ad540841279f634115" - integrity sha512-var93QWJbwPHQtR4zIy/7g8ABOT2fQb43FMC2A+CLAQnJxBCu0Rcvk/5jkwOe18Te2+AiylC1OIGfvVbD3TTYA== +"@budibase/backend-core@2.4.42-alpha.5": + version "2.4.42-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.42-alpha.5.tgz#3e4b44c6e1b7f9c0652527a48dfa46dbe022e93b" + integrity sha512-vclysH06NASv9XZ55W9yonPIodVTCWklo6alfKPQTbvjINGBopfTglV9new+OVJoqlaYPyt4AyBVp0si29vuKg== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.4.42-alpha.4" + "@budibase/types" "2.4.42-alpha.5" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.42-alpha.4": - version "2.4.42-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.4.tgz#8e81d08b4363c59e6aa872f532287327c2ef5e1e" - integrity sha512-6/CMcDnLRSzimR1JVy2FindRzN0YEo/B4lwYPtS2T5ORyCSBL24flwD15lhp2W4g0e1TF/+fPK/EaEXhJZglBg== +"@budibase/pro@2.4.42-alpha.5": + version "2.4.42-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.42-alpha.5.tgz#99774e2e06fc22892c545b7208d78144395859db" + integrity sha512-Axxx4zqsBsu2fl5UKetNXCJWoMi2pcA/kVY88Z9BYNPmGp7k3s2pKU/kShy751I2fDF0TGgxSCGzpVzWqM8ZEg== dependencies: - "@budibase/backend-core" "2.4.42-alpha.4" + "@budibase/backend-core" "2.4.42-alpha.5" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.42-alpha.4" + "@budibase/types" "2.4.42-alpha.5" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.42-alpha.4": - version "2.4.42-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.4.tgz#4a1ae0a9cd03e4ee0f81f64a494fbfd13ddbfdf6" - integrity sha512-eBB+VVtkld140Jno/quRlwlu9Q1GkeLyUQeXSrOed8dlmmImS4UKpOpAru+YxTklIvexJsM9H+AQw39IZR7L3g== +"@budibase/types@2.4.42-alpha.5": + version "2.4.42-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.42-alpha.5.tgz#21408ab88b74833f176003f9e54dc109252d8080" + integrity sha512-3uZmKryzMcAxIrR0hnBwoNfuqR8yvCWjK880h4Mdi2ik/uYfndUAhdVi/Bh/oU3ZGu9KiJzqh/IE29IuRboiNg== "@cspotcode/source-map-support@^0.8.0": version "0.8.1"