From 1bfe823bce01b8244d828eb8ab89a52cd6ca9088 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 15 May 2023 17:45:09 +0100 Subject: [PATCH 01/88] Fix filtering in automations not accounting for number prefixes in filter expression --- packages/server/src/automations/steps/queryRows.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/server/src/automations/steps/queryRows.ts b/packages/server/src/automations/steps/queryRows.ts index 1d7e8a419e..f12aa49fea 100644 --- a/packages/server/src/automations/steps/queryRows.ts +++ b/packages/server/src/automations/steps/queryRows.ts @@ -13,6 +13,7 @@ import { SearchFilters, Table, } from "@budibase/types" +import { db as dbCore } from "@budibase/backend-core" enum SortOrder { ASCENDING = "ascending", @@ -117,7 +118,11 @@ function typeCoercion(filters: SearchFilters, table: Table) { const searchParam = filters[key] if (typeof searchParam === "object") { for (let [property, value] of Object.entries(searchParam)) { - const column = table.schema[property] + // We need to strip numerical prefixes here, so that we can look up + // the correct field name in the schema + const columnName = dbCore.removeKeyNumbering(property) + const column = table.schema[columnName] + // convert string inputs if (!column || typeof value !== "string") { continue From 5fdd7d9076ba750e8cf1d534c57dfee58bb9be50 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 17 May 2023 19:21:32 +0100 Subject: [PATCH 02/88] Fixing an issue with the tenant ID not being found in self host (default) for identification purposes, stopping doc update queue from activating and working as expected. --- packages/backend-core/src/events/identification.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/backend-core/src/events/identification.ts b/packages/backend-core/src/events/identification.ts index 5c02e5db9e..5eb11d1354 100644 --- a/packages/backend-core/src/events/identification.ts +++ b/packages/backend-core/src/events/identification.ts @@ -86,6 +86,7 @@ const getCurrentIdentity = async (): Promise => { installationId, tenantId, environment, + realTenantId: context.getTenantId(), hostInfo: userContext.hostInfo, } } else { From cf7107d19ab3618b521f78f67704749b63b27472 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 17 May 2023 19:35:00 +0100 Subject: [PATCH 03/88] Updating sync to cover both prod and dev apps. --- packages/server/src/sdk/users/utils.ts | 56 ++++++++++++++----------- packages/server/src/utilities/global.ts | 5 +-- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/packages/server/src/sdk/users/utils.ts b/packages/server/src/sdk/users/utils.ts index 7f7f0b4809..619a7199cd 100644 --- a/packages/server/src/sdk/users/utils.ts +++ b/packages/server/src/sdk/users/utils.ts @@ -7,7 +7,7 @@ import { InternalTables, } from "../../db/utils" import { isEqual } from "lodash" -import { ContextUser, UserMetadata, User } from "@budibase/types" +import { ContextUser, UserMetadata, User, Database } from "@budibase/types" export function combineMetadataAndUser( user: ContextUser, @@ -51,8 +51,10 @@ export function combineMetadataAndUser( return null } -export async function rawUserMetadata() { - const db = context.getAppDB() +export async function rawUserMetadata(db?: Database) { + if (!db) { + db = context.getAppDB() + } return ( await db.allDocs( getUserMetadataParams(null, { @@ -64,30 +66,36 @@ export async function rawUserMetadata() { export async function syncGlobalUsers() { // sync user metadata - const db = context.getAppDB() - const resp = await Promise.all([getGlobalUsers(), rawUserMetadata()]) - const users = resp[0] as User[] - const metadata = resp[1] as UserMetadata[] - const toWrite = [] - for (let user of users) { - const combined = combineMetadataAndUser(user, metadata) - if (combined) { - toWrite.push(combined) - } - } - let foundEmails: string[] = [] - for (let data of metadata) { - if (!data._id) { + const dbs = [context.getDevAppDB(), context.getProdAppDB()] + for (let db of dbs) { + if (!(await db.exists())) { continue } - const alreadyExisting = data.email && foundEmails.indexOf(data.email) !== -1 - const globalId = getGlobalIDFromUserMetadataID(data._id) - if (!users.find(user => user._id === globalId) || alreadyExisting) { - toWrite.push({ ...data, _deleted: true }) + const resp = await Promise.all([getGlobalUsers(), rawUserMetadata(db)]) + const users = resp[0] as User[] + const metadata = resp[1] as UserMetadata[] + const toWrite = [] + for (let user of users) { + const combined = combineMetadataAndUser(user, metadata) + if (combined) { + toWrite.push(combined) + } } - if (data.email) { - foundEmails.push(data.email) + let foundEmails: string[] = [] + for (let data of metadata) { + if (!data._id) { + continue + } + const alreadyExisting = + data.email && foundEmails.indexOf(data.email) !== -1 + const globalId = getGlobalIDFromUserMetadataID(data._id) + if (!users.find(user => user._id === globalId) || alreadyExisting) { + toWrite.push({ ...data, _deleted: true }) + } + if (data.email) { + foundEmails.push(data.email) + } } + await db.bulkDocs(toWrite) } - await db.bulkDocs(toWrite) } diff --git a/packages/server/src/utilities/global.ts b/packages/server/src/utilities/global.ts index 21e86a28b9..93b7fc1207 100644 --- a/packages/server/src/utilities/global.ts +++ b/packages/server/src/utilities/global.ts @@ -122,11 +122,8 @@ export async function getGlobalUsers( delete user.forceResetPassword return user }) - if (!appId) { - return globalUsers - } - if (opts?.noProcessing) { + if (opts?.noProcessing || !appId) { return globalUsers } else { // pass in the groups, meaning we don't actually need to retrieve them for From 8894f549607841e53a7853dd68c4a6e6af34d757 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 18 May 2023 07:54:19 +0000 Subject: [PATCH 04/88] v2.6.19 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 81677cb994..9c0e9294da 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.18", + "version": "2.6.19", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index c48e11efc1..c72cda93c5 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.6.18", + "version": "2.6.19", "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.6.18", + "@budibase/types": "^2.6.19", "@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 3ab8642bc7..e1cff3335a 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.6.18", + "version": "2.6.19", "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.6.18", - "@budibase/string-templates": "^2.6.18", + "@budibase/shared-core": "^2.6.19", + "@budibase/string-templates": "^2.6.19", "@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 07712b6f3b..ca4ecf173d 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.6.18", + "version": "2.6.19", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.6.18", - "@budibase/frontend-core": "^2.6.18", - "@budibase/shared-core": "^2.6.18", - "@budibase/string-templates": "^2.6.18", + "@budibase/bbui": "^2.6.19", + "@budibase/frontend-core": "^2.6.19", + "@budibase/shared-core": "^2.6.19", + "@budibase/string-templates": "^2.6.19", "@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 38c51d80b9..ea9c08ae10 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.6.18", + "version": "2.6.19", "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.6.18", - "@budibase/string-templates": "^2.6.18", - "@budibase/types": "^2.6.18", + "@budibase/backend-core": "^2.6.19", + "@budibase/string-templates": "^2.6.19", + "@budibase/types": "^2.6.19", "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 affca2cf28..1ba8a4b7e7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.6.18", + "version": "2.6.19", "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.6.18", - "@budibase/frontend-core": "^2.6.18", - "@budibase/shared-core": "^2.6.18", - "@budibase/string-templates": "^2.6.18", - "@budibase/types": "^2.6.18", + "@budibase/bbui": "^2.6.19", + "@budibase/frontend-core": "^2.6.19", + "@budibase/shared-core": "^2.6.19", + "@budibase/string-templates": "^2.6.19", + "@budibase/types": "^2.6.19", "@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 fb45a88805..56a13b36b9 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.6.18", + "version": "2.6.19", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.6.18", - "@budibase/shared-core": "^2.6.18", + "@budibase/bbui": "^2.6.19", + "@budibase/shared-core": "^2.6.19", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 7d6461c3e5..2f39ab145a 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.6.18", + "version": "2.6.19", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index e1afcafac0..4d28e4c497 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.6.18", + "version": "2.6.19", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.6.18", - "@budibase/client": "^2.6.18", + "@budibase/backend-core": "^2.6.19", + "@budibase/client": "^2.6.19", "@budibase/pro": "2.6.18", - "@budibase/shared-core": "^2.6.18", - "@budibase/string-templates": "^2.6.18", - "@budibase/types": "^2.6.18", + "@budibase/shared-core": "^2.6.19", + "@budibase/string-templates": "^2.6.19", + "@budibase/types": "^2.6.19", "@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 d9d7d4ab31..d94820bc3a 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.6.18", + "version": "2.6.19", "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.6.18" + "@budibase/types": "^2.6.19" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 30c67b7d68..9e1857c81d 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.6.18", + "version": "2.6.19", "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 487f5b9767..740f82c995 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.6.18", + "version": "2.6.19", "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 9a82edfb4e..2227c8c599 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.6.18", + "version": "2.6.19", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.6.18", + "@budibase/backend-core": "^2.6.19", "@budibase/pro": "2.6.18", - "@budibase/string-templates": "^2.6.18", - "@budibase/types": "^2.6.18", + "@budibase/string-templates": "^2.6.19", + "@budibase/types": "^2.6.19", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 7a1978c374a147f1c07d53c2b30abc9e116d9273 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 18 May 2023 07:55:49 +0000 Subject: [PATCH 05/88] Update pro version to 2.6.19 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 4d28e4c497..79421b8b07 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.6.19", "@budibase/client": "^2.6.19", - "@budibase/pro": "2.6.18", + "@budibase/pro": "2.6.19", "@budibase/shared-core": "^2.6.19", "@budibase/string-templates": "^2.6.19", "@budibase/types": "^2.6.19", diff --git a/packages/worker/package.json b/packages/worker/package.json index 2227c8c599..1d63d3fda1 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.6.19", - "@budibase/pro": "2.6.18", + "@budibase/pro": "2.6.19", "@budibase/string-templates": "^2.6.19", "@budibase/types": "^2.6.19", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 4eaf610f15..7ee50032ac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.6.17": - version "2.6.17" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.17.tgz#1f238370d2aa92a650e35798a3b00c5c0aadf1ad" - integrity sha512-WWvgicSlqkYpx0cNbAhYi/W/CjIQyjzS7We7aXncwHtWWJIeYfItmxxZsX7aPOEYygG7650wCA/+j57oKfzYmA== +"@budibase/pro@2.6.18": + version "2.6.18" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.18.tgz#f032bcf7242cb8152d59e572e0de88e08ec95d98" + integrity sha512-OJfJJDQy3Ly/YWUf6RF63NpxCvqPBjrcXGcX1eyVam6zGDxMFBT2lgGtVVxKMIITjzkQsmDZkiVkNdTfmcnIXQ== dependencies: - "@budibase/backend-core" "2.6.17" + "@budibase/backend-core" "2.6.18" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.6.17" + "@budibase/types" "2.6.18" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From ad90dc7713019423a2824b25c6ec2aa74a74c8c0 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 18 May 2023 09:54:29 +0000 Subject: [PATCH 06/88] v2.6.20 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 9c0e9294da..6ca716ec4f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.19", + "version": "2.6.20", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index c72cda93c5..ee09589979 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.6.19", + "version": "2.6.20", "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.6.19", + "@budibase/types": "^2.6.20", "@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 e1cff3335a..f59d77f9b4 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.6.19", + "version": "2.6.20", "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.6.19", - "@budibase/string-templates": "^2.6.19", + "@budibase/shared-core": "^2.6.20", + "@budibase/string-templates": "^2.6.20", "@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 ca4ecf173d..f9e5d078ff 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.6.19", + "version": "2.6.20", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.6.19", - "@budibase/frontend-core": "^2.6.19", - "@budibase/shared-core": "^2.6.19", - "@budibase/string-templates": "^2.6.19", + "@budibase/bbui": "^2.6.20", + "@budibase/frontend-core": "^2.6.20", + "@budibase/shared-core": "^2.6.20", + "@budibase/string-templates": "^2.6.20", "@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 ea9c08ae10..b35adc6219 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.6.19", + "version": "2.6.20", "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.6.19", - "@budibase/string-templates": "^2.6.19", - "@budibase/types": "^2.6.19", + "@budibase/backend-core": "^2.6.20", + "@budibase/string-templates": "^2.6.20", + "@budibase/types": "^2.6.20", "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 1ba8a4b7e7..62b0ea0d5e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.6.19", + "version": "2.6.20", "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.6.19", - "@budibase/frontend-core": "^2.6.19", - "@budibase/shared-core": "^2.6.19", - "@budibase/string-templates": "^2.6.19", - "@budibase/types": "^2.6.19", + "@budibase/bbui": "^2.6.20", + "@budibase/frontend-core": "^2.6.20", + "@budibase/shared-core": "^2.6.20", + "@budibase/string-templates": "^2.6.20", + "@budibase/types": "^2.6.20", "@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 56a13b36b9..1ce09c4c2f 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.6.19", + "version": "2.6.20", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.6.19", - "@budibase/shared-core": "^2.6.19", + "@budibase/bbui": "^2.6.20", + "@budibase/shared-core": "^2.6.20", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 2f39ab145a..1e04d94dae 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.6.19", + "version": "2.6.20", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 79421b8b07..dda6ef1428 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.6.19", + "version": "2.6.20", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.6.19", - "@budibase/client": "^2.6.19", + "@budibase/backend-core": "^2.6.20", + "@budibase/client": "^2.6.20", "@budibase/pro": "2.6.19", - "@budibase/shared-core": "^2.6.19", - "@budibase/string-templates": "^2.6.19", - "@budibase/types": "^2.6.19", + "@budibase/shared-core": "^2.6.20", + "@budibase/string-templates": "^2.6.20", + "@budibase/types": "^2.6.20", "@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 d94820bc3a..1c9d13f9b9 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.6.19", + "version": "2.6.20", "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.6.19" + "@budibase/types": "^2.6.20" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 9e1857c81d..6fa21dc96b 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.6.19", + "version": "2.6.20", "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 740f82c995..7c1ec73ae6 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.6.19", + "version": "2.6.20", "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 1d63d3fda1..fff7a46ecd 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.6.19", + "version": "2.6.20", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.6.19", + "@budibase/backend-core": "^2.6.20", "@budibase/pro": "2.6.19", - "@budibase/string-templates": "^2.6.19", - "@budibase/types": "^2.6.19", + "@budibase/string-templates": "^2.6.20", + "@budibase/types": "^2.6.20", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 7bdc5b0e15424d6705d22ba809480bcd602fbbca Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 18 May 2023 09:55:52 +0000 Subject: [PATCH 07/88] Update pro version to 2.6.20 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index dda6ef1428..9053fefd64 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.6.20", "@budibase/client": "^2.6.20", - "@budibase/pro": "2.6.19", + "@budibase/pro": "2.6.20", "@budibase/shared-core": "^2.6.20", "@budibase/string-templates": "^2.6.20", "@budibase/types": "^2.6.20", diff --git a/packages/worker/package.json b/packages/worker/package.json index fff7a46ecd..976cdb5c14 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.6.20", - "@budibase/pro": "2.6.19", + "@budibase/pro": "2.6.20", "@budibase/string-templates": "^2.6.20", "@budibase/types": "^2.6.20", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 7ee50032ac..38619ef170 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.6.18": - version "2.6.18" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.18.tgz#f032bcf7242cb8152d59e572e0de88e08ec95d98" - integrity sha512-OJfJJDQy3Ly/YWUf6RF63NpxCvqPBjrcXGcX1eyVam6zGDxMFBT2lgGtVVxKMIITjzkQsmDZkiVkNdTfmcnIXQ== +"@budibase/pro@2.6.19": + version "2.6.19" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.19.tgz#833b389abad0e8cf13d13f6f8cfbb5fce2872568" + integrity sha512-wH9EDKEbYJcKIm/v+kroRsQwrz/ABui9stiIa1Rq2lvajh6leddjtg4MCdGbD6Dv3kj8iDoSPR3a2cW2gBiVsw== dependencies: - "@budibase/backend-core" "2.6.18" + "@budibase/backend-core" "2.6.19" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.6.18" + "@budibase/types" "2.6.19" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From eb2984180fa1b9e4c000417f0e21031ddf1863d6 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 22 May 2023 12:20:50 +0000 Subject: [PATCH 08/88] v2.6.21 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 6ca716ec4f..9a7916f549 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.20", + "version": "2.6.21", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ee09589979..b8990cc2e3 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.6.20", + "version": "2.6.21", "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.6.20", + "@budibase/types": "^2.6.21", "@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 f59d77f9b4..5ca6f1984b 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.6.20", + "version": "2.6.21", "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.6.20", - "@budibase/string-templates": "^2.6.20", + "@budibase/shared-core": "^2.6.21", + "@budibase/string-templates": "^2.6.21", "@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 f9e5d078ff..ef051b3610 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.6.20", + "version": "2.6.21", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.6.20", - "@budibase/frontend-core": "^2.6.20", - "@budibase/shared-core": "^2.6.20", - "@budibase/string-templates": "^2.6.20", + "@budibase/bbui": "^2.6.21", + "@budibase/frontend-core": "^2.6.21", + "@budibase/shared-core": "^2.6.21", + "@budibase/string-templates": "^2.6.21", "@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 b35adc6219..e2d504918a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.6.20", + "version": "2.6.21", "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.6.20", - "@budibase/string-templates": "^2.6.20", - "@budibase/types": "^2.6.20", + "@budibase/backend-core": "^2.6.21", + "@budibase/string-templates": "^2.6.21", + "@budibase/types": "^2.6.21", "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 62b0ea0d5e..6717df1c0a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.6.20", + "version": "2.6.21", "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.6.20", - "@budibase/frontend-core": "^2.6.20", - "@budibase/shared-core": "^2.6.20", - "@budibase/string-templates": "^2.6.20", - "@budibase/types": "^2.6.20", + "@budibase/bbui": "^2.6.21", + "@budibase/frontend-core": "^2.6.21", + "@budibase/shared-core": "^2.6.21", + "@budibase/string-templates": "^2.6.21", + "@budibase/types": "^2.6.21", "@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 1ce09c4c2f..6771d30de2 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.6.20", + "version": "2.6.21", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.6.20", - "@budibase/shared-core": "^2.6.20", + "@budibase/bbui": "^2.6.21", + "@budibase/shared-core": "^2.6.21", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 1e04d94dae..b196e7116c 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.6.20", + "version": "2.6.21", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 9053fefd64..8e1b6473a5 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.6.20", + "version": "2.6.21", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.6.20", - "@budibase/client": "^2.6.20", + "@budibase/backend-core": "^2.6.21", + "@budibase/client": "^2.6.21", "@budibase/pro": "2.6.20", - "@budibase/shared-core": "^2.6.20", - "@budibase/string-templates": "^2.6.20", - "@budibase/types": "^2.6.20", + "@budibase/shared-core": "^2.6.21", + "@budibase/string-templates": "^2.6.21", + "@budibase/types": "^2.6.21", "@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 1c9d13f9b9..683b386e0f 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.6.20", + "version": "2.6.21", "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.6.20" + "@budibase/types": "^2.6.21" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 6fa21dc96b..d45a2c7d1d 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.6.20", + "version": "2.6.21", "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 7c1ec73ae6..1a11c96b15 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.6.20", + "version": "2.6.21", "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 976cdb5c14..77c6e97b7a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.6.20", + "version": "2.6.21", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.6.20", + "@budibase/backend-core": "^2.6.21", "@budibase/pro": "2.6.20", - "@budibase/string-templates": "^2.6.20", - "@budibase/types": "^2.6.20", + "@budibase/string-templates": "^2.6.21", + "@budibase/types": "^2.6.21", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From eb899cecacc4207548bb9692ca5cd0701647e271 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 22 May 2023 12:22:19 +0000 Subject: [PATCH 09/88] Update pro version to 2.6.21 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 8e1b6473a5..e15e24c7b8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.6.21", "@budibase/client": "^2.6.21", - "@budibase/pro": "2.6.20", + "@budibase/pro": "2.6.21", "@budibase/shared-core": "^2.6.21", "@budibase/string-templates": "^2.6.21", "@budibase/types": "^2.6.21", diff --git a/packages/worker/package.json b/packages/worker/package.json index 77c6e97b7a..a11ebd00c6 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.6.21", - "@budibase/pro": "2.6.20", + "@budibase/pro": "2.6.21", "@budibase/string-templates": "^2.6.21", "@budibase/types": "^2.6.21", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 38619ef170..bdc48dc7f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.6.19": - version "2.6.19" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.19.tgz#833b389abad0e8cf13d13f6f8cfbb5fce2872568" - integrity sha512-wH9EDKEbYJcKIm/v+kroRsQwrz/ABui9stiIa1Rq2lvajh6leddjtg4MCdGbD6Dv3kj8iDoSPR3a2cW2gBiVsw== +"@budibase/pro@2.6.20": + version "2.6.20" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.20.tgz#8ca83d578e9d5af848eb547cb9542073c47279dd" + integrity sha512-D/R+uSLC7jUSJ583Di/o19nm9WCW8sBClV7vDBpBLTwi1wwNRgWS/uP5FPvqKH1812/TLAcqF3qQsD6tK7FvoQ== dependencies: - "@budibase/backend-core" "2.6.19" + "@budibase/backend-core" "2.6.20" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.6.19" + "@budibase/types" "2.6.20" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 7b9d56ac2507cea0780f24f3125ee46660927bfd Mon Sep 17 00:00:00 2001 From: andz-bb Date: Tue, 23 May 2023 12:38:50 +0100 Subject: [PATCH 10/88] add role field to snowflake datasource connection --- packages/server/src/integrations/snowflake.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/server/src/integrations/snowflake.ts b/packages/server/src/integrations/snowflake.ts index db702520f9..7277a11e27 100644 --- a/packages/server/src/integrations/snowflake.ts +++ b/packages/server/src/integrations/snowflake.ts @@ -29,6 +29,9 @@ const SCHEMA: Integration = { type: "password", required: true, }, + role: { + type: "string", + }, warehouse: { type: "string", required: true, From 65abee10d06cd0186e6725672d9eef9f7d5186c4 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 23 May 2023 16:02:05 +0100 Subject: [PATCH 11/88] Fix issue with schema mutation in grids. Use displayName to represent grid column labels. Allow deletion of duplicated user columns --- .../backend/DataTable/DataTable.svelte | 10 +++++----- .../src/components/grid/stores/columns.js | 20 ++++++++++++++++--- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte index dfe30a3711..d51be23baf 100644 --- a/packages/builder/src/components/backend/DataTable/DataTable.svelte +++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte @@ -16,11 +16,11 @@ import GridEditColumnModal from "components/backend/DataTable/modals/grid/GridEditColumnModal.svelte" const userSchemaOverrides = { - firstName: { name: "First name", disabled: true }, - lastName: { name: "Last name", disabled: true }, - email: { name: "Email", disabled: true }, - roleId: { name: "Role", disabled: true }, - status: { name: "Status", disabled: true }, + firstName: { displayName: "First name", disabled: true }, + lastName: { displayName: "Last name", disabled: true }, + email: { displayName: "Email", disabled: true }, + roleId: { displayName: "Role", disabled: true }, + status: { displayName: "Status", disabled: true }, } $: id = $tables.selected?._id diff --git a/packages/frontend-core/src/components/grid/stores/columns.js b/packages/frontend-core/src/components/grid/stores/columns.js index e953977487..a66aef0411 100644 --- a/packages/frontend-core/src/components/grid/stores/columns.js +++ b/packages/frontend-core/src/components/grid/stores/columns.js @@ -116,10 +116,24 @@ export const initialise = context => { const schema = derived( [table, schemaOverrides], ([$table, $schemaOverrides]) => { - let newSchema = $table?.schema - if (!newSchema) { + if (!$table?.schema) { return null } + let newSchema = { ...$table?.schema } + + // Edge case to temporarily allow deletion of duplicated user + // fields that were saved with the "disabled" flag set. + // By overriding the saved schema we ensure only overrides can + // set the disabled flag. + // TODO: remove in future + Object.keys(newSchema).forEach(field => { + newSchema[field] = { + ...newSchema[field], + disabled: false, + } + }) + + // Apply schema overrides Object.keys($schemaOverrides || {}).forEach(field => { if (newSchema[field]) { newSchema[field] = { @@ -160,7 +174,7 @@ export const initialise = context => { fields .map(field => ({ name: field, - label: $schema[field].name || field, + label: $schema[field].displayName || field, schema: $schema[field], width: $schema[field].width || DefaultColumnWidth, visible: $schema[field].visible ?? true, From f0b27f06748e2666fdbf48dd838e406c52190c68 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 23 May 2023 18:01:04 +0100 Subject: [PATCH 12/88] Ensure text cells account for being used for number cells too --- .../frontend-core/src/components/grid/cells/TextCell.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend-core/src/components/grid/cells/TextCell.svelte b/packages/frontend-core/src/components/grid/cells/TextCell.svelte index 533b030b5c..04485a6b50 100644 --- a/packages/frontend-core/src/components/grid/cells/TextCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/TextCell.svelte @@ -52,7 +52,7 @@ {:else}
- {value || ""} + {value ?? ""}
{/if} From 99b4370a756f47b5c49a010c0e33e0c960851914 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 24 May 2023 07:52:24 +0000 Subject: [PATCH 13/88] v2.6.22 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 9a7916f549..f00b490226 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.21", + "version": "2.6.22", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index b8990cc2e3..d1867c7aeb 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.6.21", + "version": "2.6.22", "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.6.21", + "@budibase/types": "^2.6.22", "@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 5ca6f1984b..62613f1ce9 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.6.21", + "version": "2.6.22", "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.6.21", - "@budibase/string-templates": "^2.6.21", + "@budibase/shared-core": "^2.6.22", + "@budibase/string-templates": "^2.6.22", "@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 ef051b3610..28caaa1acf 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.6.21", + "version": "2.6.22", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.6.21", - "@budibase/frontend-core": "^2.6.21", - "@budibase/shared-core": "^2.6.21", - "@budibase/string-templates": "^2.6.21", + "@budibase/bbui": "^2.6.22", + "@budibase/frontend-core": "^2.6.22", + "@budibase/shared-core": "^2.6.22", + "@budibase/string-templates": "^2.6.22", "@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 e2d504918a..e2c3ab9f86 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.6.21", + "version": "2.6.22", "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.6.21", - "@budibase/string-templates": "^2.6.21", - "@budibase/types": "^2.6.21", + "@budibase/backend-core": "^2.6.22", + "@budibase/string-templates": "^2.6.22", + "@budibase/types": "^2.6.22", "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 6717df1c0a..e1febafb84 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.6.21", + "version": "2.6.22", "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.6.21", - "@budibase/frontend-core": "^2.6.21", - "@budibase/shared-core": "^2.6.21", - "@budibase/string-templates": "^2.6.21", - "@budibase/types": "^2.6.21", + "@budibase/bbui": "^2.6.22", + "@budibase/frontend-core": "^2.6.22", + "@budibase/shared-core": "^2.6.22", + "@budibase/string-templates": "^2.6.22", + "@budibase/types": "^2.6.22", "@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 6771d30de2..e84fd09f19 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.6.21", + "version": "2.6.22", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.6.21", - "@budibase/shared-core": "^2.6.21", + "@budibase/bbui": "^2.6.22", + "@budibase/shared-core": "^2.6.22", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index b196e7116c..33f60d9769 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.6.21", + "version": "2.6.22", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index e15e24c7b8..3f67a2e31c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.6.21", + "version": "2.6.22", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.6.21", - "@budibase/client": "^2.6.21", + "@budibase/backend-core": "^2.6.22", + "@budibase/client": "^2.6.22", "@budibase/pro": "2.6.21", - "@budibase/shared-core": "^2.6.21", - "@budibase/string-templates": "^2.6.21", - "@budibase/types": "^2.6.21", + "@budibase/shared-core": "^2.6.22", + "@budibase/string-templates": "^2.6.22", + "@budibase/types": "^2.6.22", "@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 683b386e0f..df6355ad32 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.6.21", + "version": "2.6.22", "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.6.21" + "@budibase/types": "^2.6.22" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index d45a2c7d1d..ea275185d5 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.6.21", + "version": "2.6.22", "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 1a11c96b15..d598d08c74 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.6.21", + "version": "2.6.22", "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 a11ebd00c6..9df05c8759 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.6.21", + "version": "2.6.22", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.6.21", + "@budibase/backend-core": "^2.6.22", "@budibase/pro": "2.6.21", - "@budibase/string-templates": "^2.6.21", - "@budibase/types": "^2.6.21", + "@budibase/string-templates": "^2.6.22", + "@budibase/types": "^2.6.22", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From bac252364b9e2d98fb111bed6fb2a7f6d1c89f34 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 24 May 2023 07:54:03 +0000 Subject: [PATCH 14/88] Update pro version to 2.6.22 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 3f67a2e31c..8d62d87c31 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.6.22", "@budibase/client": "^2.6.22", - "@budibase/pro": "2.6.21", + "@budibase/pro": "2.6.22", "@budibase/shared-core": "^2.6.22", "@budibase/string-templates": "^2.6.22", "@budibase/types": "^2.6.22", diff --git a/packages/worker/package.json b/packages/worker/package.json index 9df05c8759..fa23d60804 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.6.22", - "@budibase/pro": "2.6.21", + "@budibase/pro": "2.6.22", "@budibase/string-templates": "^2.6.22", "@budibase/types": "^2.6.22", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index bdc48dc7f1..19ceb44440 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.6.20": - version "2.6.20" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.20.tgz#8ca83d578e9d5af848eb547cb9542073c47279dd" - integrity sha512-D/R+uSLC7jUSJ583Di/o19nm9WCW8sBClV7vDBpBLTwi1wwNRgWS/uP5FPvqKH1812/TLAcqF3qQsD6tK7FvoQ== +"@budibase/pro@2.6.21": + version "2.6.21" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.21.tgz#6046cdd764a51014b9d28586ccf827ffee093bc7" + integrity sha512-oRTMda64YU1QQUmzulYo0oXTMdiBnzQb8VsfiF95fVWIzrkLfttbRBiUzE5Vq9n3DV9bhY7771h+fc/zqopXvA== dependencies: - "@budibase/backend-core" "2.6.20" + "@budibase/backend-core" "2.6.21" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.6.20" + "@budibase/types" "2.6.21" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From df8e76b153f157f36aa867ca8a2388bc9da9a2af Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 24 May 2023 14:26:12 +0000 Subject: [PATCH 15/88] v2.6.23 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- 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, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index f00b490226..39c3634921 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.22", + "version": "2.6.23", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index d1867c7aeb..1f3feea7a9 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.6.22", + "version": "2.6.23", "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.6.22", + "@budibase/types": "^2.6.23", "@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 62613f1ce9..32c47b3c49 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.6.22", + "version": "2.6.23", "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.6.22", - "@budibase/string-templates": "^2.6.22", + "@budibase/shared-core": "^2.6.23", + "@budibase/string-templates": "^2.6.23", "@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 28caaa1acf..8785679898 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.6.22", + "version": "2.6.23", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.6.22", - "@budibase/frontend-core": "^2.6.22", - "@budibase/shared-core": "^2.6.22", - "@budibase/string-templates": "^2.6.22", + "@budibase/bbui": "^2.6.23", + "@budibase/frontend-core": "^2.6.23", + "@budibase/shared-core": "^2.6.23", + "@budibase/string-templates": "^2.6.23", "@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 e2c3ab9f86..a2252380da 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.6.22", + "version": "2.6.23", "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.6.22", - "@budibase/string-templates": "^2.6.22", - "@budibase/types": "^2.6.22", + "@budibase/backend-core": "^2.6.23", + "@budibase/string-templates": "^2.6.23", + "@budibase/types": "^2.6.23", "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 e1febafb84..67ba1db160 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.6.22", + "version": "2.6.23", "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.6.22", - "@budibase/frontend-core": "^2.6.22", - "@budibase/shared-core": "^2.6.22", - "@budibase/string-templates": "^2.6.22", - "@budibase/types": "^2.6.22", + "@budibase/bbui": "^2.6.23", + "@budibase/frontend-core": "^2.6.23", + "@budibase/shared-core": "^2.6.23", + "@budibase/string-templates": "^2.6.23", + "@budibase/types": "^2.6.23", "@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 e84fd09f19..dc192bfdc3 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.6.22", + "version": "2.6.23", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.6.22", - "@budibase/shared-core": "^2.6.22", + "@budibase/bbui": "^2.6.23", + "@budibase/shared-core": "^2.6.23", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 33f60d9769..18e553ad32 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.6.22", + "version": "2.6.23", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 8d62d87c31..5a3de02d27 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.6.22", + "version": "2.6.23", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.6.22", - "@budibase/client": "^2.6.22", + "@budibase/backend-core": "^2.6.23", + "@budibase/client": "^2.6.23", "@budibase/pro": "2.6.22", - "@budibase/shared-core": "^2.6.22", - "@budibase/string-templates": "^2.6.22", - "@budibase/types": "^2.6.22", + "@budibase/shared-core": "^2.6.23", + "@budibase/string-templates": "^2.6.23", + "@budibase/types": "^2.6.23", "@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 df6355ad32..92e6dc06b5 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.6.22", + "version": "2.6.23", "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.6.22" + "@budibase/types": "^2.6.23" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index ea275185d5..d78b6a0a3b 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.6.22", + "version": "2.6.23", "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 d598d08c74..1d53606dd0 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.6.22", + "version": "2.6.23", "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 fa23d60804..cdf5955c90 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.6.22", + "version": "2.6.23", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.6.22", + "@budibase/backend-core": "^2.6.23", "@budibase/pro": "2.6.22", - "@budibase/string-templates": "^2.6.22", - "@budibase/types": "^2.6.22", + "@budibase/string-templates": "^2.6.23", + "@budibase/types": "^2.6.23", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From cbe76ee65b7c22c2d762c035774c1b48f6d4c98b Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 24 May 2023 14:27:59 +0000 Subject: [PATCH 16/88] Update pro version to 2.6.23 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 5a3de02d27..28e2e6a91f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.6.23", "@budibase/client": "^2.6.23", - "@budibase/pro": "2.6.22", + "@budibase/pro": "2.6.23", "@budibase/shared-core": "^2.6.23", "@budibase/string-templates": "^2.6.23", "@budibase/types": "^2.6.23", diff --git a/packages/worker/package.json b/packages/worker/package.json index cdf5955c90..684b1b8212 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.6.23", - "@budibase/pro": "2.6.22", + "@budibase/pro": "2.6.23", "@budibase/string-templates": "^2.6.23", "@budibase/types": "^2.6.23", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 19ceb44440..522e57a770 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.6.21": - version "2.6.21" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.21.tgz#6046cdd764a51014b9d28586ccf827ffee093bc7" - integrity sha512-oRTMda64YU1QQUmzulYo0oXTMdiBnzQb8VsfiF95fVWIzrkLfttbRBiUzE5Vq9n3DV9bhY7771h+fc/zqopXvA== +"@budibase/pro@2.6.22": + version "2.6.22" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.22.tgz#b5547dc8619c1eb78528ae9be236c673cabe42e2" + integrity sha512-VF4lio/tUsrPWbOVYn5s8i/Ct8POb8+b17+sXK46lAbBkzu4rHTZsbssQjKP2Yuyaf96VU6A8YKNoGPSiSJFGQ== dependencies: - "@budibase/backend-core" "2.6.21" + "@budibase/backend-core" "2.6.22" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.6.21" + "@budibase/types" "2.6.22" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From ee81fd7a5931770f4b1647bed2aac87cfeefd52b Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 29 May 2023 15:39:39 +0200 Subject: [PATCH 17/88] Split auth google section --- .../portal/settings/auth/google.svelte | 235 ++++++++++++++++++ .../builder/portal/settings/auth/index.svelte | 154 +----------- 2 files changed, 237 insertions(+), 152 deletions(-) create mode 100644 packages/builder/src/pages/builder/portal/settings/auth/google.svelte diff --git a/packages/builder/src/pages/builder/portal/settings/auth/google.svelte b/packages/builder/src/pages/builder/portal/settings/auth/google.svelte new file mode 100644 index 0000000000..82ab13cc8e --- /dev/null +++ b/packages/builder/src/pages/builder/portal/settings/auth/google.svelte @@ -0,0 +1,235 @@ + + +{#if providers.google} + + + +
+ + Google +
+ + + To allow users to authenticate using their Google accounts, fill out the + fields below. Read the documentation for more information. + + + + {#each GoogleConfigFields.Google as field} +
+ +
+
+ +
+ {#if field.copyButton} +
copyToClipboard(field.placeholder)} + > + +
+ {/if} +
+
+ {/each} +
+ + +
+ +
+ +
+{/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 38f5e0788b..36cf5c13a8 100644 --- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte @@ -1,5 +1,4 @@ - - {#if isGoogleConfigured === true} - + {#if step === GoogleDatasouceConfigStep.AUTH} + + {#if isGoogleConfigured === true} + + Authenticate with your google account to use the {integrationName} integration. + + + {:else if isGoogleConfigured === false} Authenticate with your google account to use the {IntegrationNames[ - datasource.type - ]} integration.Google authentication is not enabled, please complete Google SSO + configuration. + Configure Google SSO + {/if} + {/if} + {#if step === GoogleDatasouceConfigStep.SET_URL} + + Add the URL of the sheet you want to connect - - {:else if isGoogleConfigured === false} - Google authentication is not enabled, please complete Google SSO - configuration. - Configure Google SSO {/if} diff --git a/packages/builder/src/pages/builder/app/[application]/data/new.svelte b/packages/builder/src/pages/builder/app/[application]/data/new.svelte index fedaf013da..ed2e7f360d 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/new.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/new.svelte @@ -17,6 +17,7 @@ import IntegrationIcon from "components/backend/DatasourceNavigator/IntegrationIcon.svelte" import ICONS from "components/backend/DatasourceNavigator/icons/index.js" import FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte" + import { onMount } from "svelte" let internalTableModal let externalDatasourceModal @@ -24,6 +25,7 @@ let integration = null let disabled = false let promptUpload = false + let continueGoogleSetup $: hasData = $datasources.list.length > 1 || $tables.list.length > 1 $: hasDefaultData = @@ -135,15 +137,29 @@ } $: fetchIntegrations() + + onMount(() => { + const urlParams = new URLSearchParams(window.location.search) + const action = urlParams.get("action") + if (action === "google_continue") { + continueGoogleSetup = true + externalDatasourceModal.show() + } + }) - - {#if integration?.auth?.type === "google"} - + { + continueGoogleSetup = false + }} +> + {#if integration?.auth?.type === "google" || continueGoogleSetup} + {:else} {/if} From 1e238ce69376987e13db2ac1fabfe281a0d7df52 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 31 May 2023 12:26:01 +0200 Subject: [PATCH 45/88] Validate google sheets url --- .../modals/GoogleDatasourceConfigModal.svelte | 40 +++++++++++++++++-- .../builder/app/[application]/data/new.svelte | 33 +++++++++------ .../server/src/integrations/googlesheets.ts | 2 +- 3 files changed, 57 insertions(+), 18 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte index 79fb0f6b5b..a0b0902480 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte @@ -4,9 +4,15 @@ import GoogleButton from "../_components/GoogleButton.svelte" import { organisation } from "stores/portal" import { onMount } from "svelte" + import { validateDatasourceConfig } from "builderStore/datasource" + import cloneDeep from "lodash/cloneDeepWith" + import IntegrationConfigForm from "../TableIntegrationMenu/IntegrationConfigForm.svelte" + export let integration export let continueSetup = false + let datasource = cloneDeep(integration) + $: isGoogleConfigured = !!$organisation.googleDatasourceConfigured onMount(async () => { @@ -22,13 +28,32 @@ let step = continueSetup ? GoogleDatasouceConfigStep.SET_URL : GoogleDatasouceConfigStep.AUTH + + let isValid + + const modalConfig = { + [GoogleDatasouceConfigStep.AUTH]: {}, + [GoogleDatasouceConfigStep.SET_URL]: { + confirmButtonText: "Connect", + onConfirm: async () => { + const resp = await validateDatasourceConfig(datasource) + if (!resp.connected) { + displayError(`Unable to connect - ${resp.error}`) + } + + return false + }, + }, + } {#if step === GoogleDatasouceConfigStep.AUTH} @@ -48,8 +73,15 @@ {/if} {/if} {#if step === GoogleDatasouceConfigStep.SET_URL} - - Add the URL of the sheet you want to connect + + Add the URL of the sheet you want to connect. + + (isValid = e.detail)} + /> {/if} diff --git a/packages/builder/src/pages/builder/app/[application]/data/new.svelte b/packages/builder/src/pages/builder/app/[application]/data/new.svelte index ed2e7f360d..536859d4f9 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/new.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/new.svelte @@ -131,21 +131,25 @@ return integrationsArray } - const fetchIntegrations = async () => { - const unsortedIntegrations = await API.getIntegrations() - integrations = sortIntegrations(unsortedIntegrations) - } - - $: fetchIntegrations() - + let isGoogleContinueAction onMount(() => { const urlParams = new URLSearchParams(window.location.search) const action = urlParams.get("action") - if (action === "google_continue") { - continueGoogleSetup = true - externalDatasourceModal.show() - } + + isGoogleContinueAction = action === "google_continue" }) + + const fetchIntegrations = async () => { + const unsortedIntegrations = await API.getIntegrations() + integrations = sortIntegrations(unsortedIntegrations) + console.log(integrations[IntegrationTypes.GOOGLE_SHEETS]) + + if (isGoogleContinueAction) { + handleIntegrationSelect(IntegrationTypes.GOOGLE_SHEETS) + } + } + + $: fetchIntegrations() @@ -158,8 +162,11 @@ continueGoogleSetup = false }} > - {#if integration?.auth?.type === "google" || continueGoogleSetup} - + {#if integration?.auth?.type === "google"} + {:else} {/if} diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts index 8863aa0b3a..2598f6db62 100644 --- a/packages/server/src/integrations/googlesheets.ts +++ b/packages/server/src/integrations/googlesheets.ts @@ -72,7 +72,7 @@ const SCHEMA: Integration = { }, datasource: { spreadsheetId: { - display: "Google Sheet URL", + display: "Spreadsheet URL", type: DatasourceFieldType.STRING, required: true, }, From 25c921e3406eb653f3acf21fc5a6878bc945a05c Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 31 May 2023 13:00:33 +0200 Subject: [PATCH 46/88] Validate url --- .../src/middleware/passport/datasource/google.ts | 2 +- .../modals/GoogleDatasourceConfigModal.svelte | 15 +++++++++++---- .../builder/app/[application]/data/new.svelte | 13 +++++-------- packages/server/src/api/controllers/datasource.ts | 3 ++- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/packages/backend-core/src/middleware/passport/datasource/google.ts b/packages/backend-core/src/middleware/passport/datasource/google.ts index 7f5e7f0d90..2f91e01d9a 100644 --- a/packages/backend-core/src/middleware/passport/datasource/google.ts +++ b/packages/backend-core/src/middleware/passport/datasource/google.ts @@ -88,7 +88,7 @@ export async function postAuth( } ) - ctx.redirect(`${baseUrl}/new?action=google_continue&id=${id}`) + ctx.redirect(`${baseUrl}/new?continue_google_setup=${id}`) } )(ctx, next) } diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte index a0b0902480..f93f7b29da 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte @@ -1,5 +1,11 @@ - {#if step === GoogleDatasouceConfigStep.AUTH} - - {#if isGoogleConfigured === true} - - Authenticate with your google account to use the {integrationName} integration. - - - {:else if isGoogleConfigured === false} + + {#if isGoogleConfigured === true} + 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} - {/if} - {#if step === GoogleDatasouceConfigStep.SET_URL} - - Add the URL of the sheet you want to connect. - - (isValid = e.detail)} - /> + save(datasource, true)} /> + {:else if isGoogleConfigured === false} + Google authentication is not enabled, please complete Google SSO + configuration. + Configure Google SSO {/if} diff --git a/packages/builder/src/pages/builder/app/[application]/data/new.svelte b/packages/builder/src/pages/builder/app/[application]/data/new.svelte index 8ff974112b..fedaf013da 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/new.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/new.svelte @@ -17,7 +17,6 @@ import IntegrationIcon from "components/backend/DatasourceNavigator/IntegrationIcon.svelte" import ICONS from "components/backend/DatasourceNavigator/icons/index.js" import FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte" - import { onMount } from "svelte" let internalTableModal let externalDatasourceModal @@ -130,19 +129,9 @@ return integrationsArray } - let continueGoogleSetup - onMount(() => { - const urlParams = new URLSearchParams(window.location.search) - continueGoogleSetup = urlParams.get("continue_google_setup") - }) - const fetchIntegrations = async () => { const unsortedIntegrations = await API.getIntegrations() integrations = sortIntegrations(unsortedIntegrations) - - if (continueGoogleSetup) { - handleIntegrationSelect(IntegrationTypes.GOOGLE_SHEETS) - } } $: fetchIntegrations() @@ -152,17 +141,9 @@ - { - continueGoogleSetup = null - }} -> + {#if integration?.auth?.type === "google"} - + {:else} {/if} diff --git a/packages/builder/src/pages/builder/portal/settings/auth/google.svelte b/packages/builder/src/pages/builder/portal/settings/auth/google.svelte deleted file mode 100644 index 82ab13cc8e..0000000000 --- a/packages/builder/src/pages/builder/portal/settings/auth/google.svelte +++ /dev/null @@ -1,235 +0,0 @@ - - -{#if providers.google} - - - -
- - Google -
- - - To allow users to authenticate using their Google accounts, fill out the - fields below. Read the documentation for more information. - - - - {#each GoogleConfigFields.Google as field} -
- -
-
- -
- {#if field.copyButton} -
copyToClipboard(field.placeholder)} - > - -
- {/if} -
-
- {/each} -
- - -
- -
- -
-{/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 36cf5c13a8..38f5e0788b 100644 --- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte @@ -1,4 +1,5 @@ - - {#if isGoogleConfigured === true} - + {#if step === GoogleDatasouceConfigStep.AUTH} + + {#if isGoogleConfigured === true} + + Authenticate with your google account to use the {integrationName} integration. + + + {:else if isGoogleConfigured === false} Authenticate with your google account to use the {IntegrationNames[ - datasource.type - ]} integration.Google authentication is not enabled, please complete Google SSO + configuration. + Configure Google SSO + {/if} + {/if} + {#if step === GoogleDatasouceConfigStep.SET_URL} + + Add the URL of the sheet you want to connect. + + (isValid = e.detail)} + /> - save(datasource, true)} /> - {:else if isGoogleConfigured === false} - Google authentication is not enabled, please complete Google SSO - configuration. - Configure Google SSO {/if} diff --git a/packages/builder/src/pages/builder/app/[application]/data/new.svelte b/packages/builder/src/pages/builder/app/[application]/data/new.svelte index fedaf013da..8ff974112b 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/new.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/new.svelte @@ -17,6 +17,7 @@ import IntegrationIcon from "components/backend/DatasourceNavigator/IntegrationIcon.svelte" import ICONS from "components/backend/DatasourceNavigator/icons/index.js" import FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte" + import { onMount } from "svelte" let internalTableModal let externalDatasourceModal @@ -129,9 +130,19 @@ return integrationsArray } + let continueGoogleSetup + onMount(() => { + const urlParams = new URLSearchParams(window.location.search) + continueGoogleSetup = urlParams.get("continue_google_setup") + }) + const fetchIntegrations = async () => { const unsortedIntegrations = await API.getIntegrations() integrations = sortIntegrations(unsortedIntegrations) + + if (continueGoogleSetup) { + handleIntegrationSelect(IntegrationTypes.GOOGLE_SHEETS) + } } $: fetchIntegrations() @@ -141,9 +152,17 @@ - + { + continueGoogleSetup = null + }} +> {#if integration?.auth?.type === "google"} - + {:else} {/if} diff --git a/packages/builder/src/pages/builder/portal/settings/auth/google.svelte b/packages/builder/src/pages/builder/portal/settings/auth/google.svelte new file mode 100644 index 0000000000..82ab13cc8e --- /dev/null +++ b/packages/builder/src/pages/builder/portal/settings/auth/google.svelte @@ -0,0 +1,235 @@ + + +{#if providers.google} + + + +
+ + Google +
+ + + To allow users to authenticate using their Google accounts, fill out the + fields below. Read the documentation for more information. + + + + {#each GoogleConfigFields.Google as field} +
+ +
+
+ +
+ {#if field.copyButton} +
copyToClipboard(field.placeholder)} + > + +
+ {/if} +
+
+ {/each} +
+ + +
+ +
+ +
+{/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 38f5e0788b..36cf5c13a8 100644 --- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte @@ -1,5 +1,4 @@