From 9b814e8231347d6588dbefddf324e68b5298b0ff Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 14 Aug 2023 17:32:03 +0100 Subject: [PATCH 01/11] updating build script to get QA core working again --- scripts/build.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.js b/scripts/build.js index b93ae1bbe6..f0a5966535 100755 --- a/scripts/build.js +++ b/scripts/build.js @@ -25,10 +25,10 @@ function runBuild(entry, outfile) { if (!fs.existsSync("../pro/src")) { // If we don't have pro, we cannot bundle backend-core. // Otherwise, the main context will not be shared between libraries - delete tsconfigPathPluginContent.compilerOptions.paths[ + delete tsconfigPathPluginContent?.compilerOptions?.paths[ "@budibase/backend-core" ] - delete tsconfigPathPluginContent.compilerOptions.paths[ + delete tsconfigPathPluginContent?.compilerOptions?.paths[ "@budibase/backend-core/*" ] } From e7fd37c156719b2bc219a0c42e3dc0c522ed1eba Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 14 Aug 2023 16:32:30 +0000 Subject: [PATCH 02/11] Bump version to 2.9.24 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 0df96afd31..4e08cb9459 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.9.23", + "version": "2.9.24", "npmClient": "yarn", "packages": [ "packages/*" From b80c7d7fabab8ef41825c6c1a1147644cf1b1217 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 14 Aug 2023 17:44:24 +0100 Subject: [PATCH 03/11] add paths to the optional chaining --- scripts/build.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.js b/scripts/build.js index f0a5966535..3d1f65ff76 100755 --- a/scripts/build.js +++ b/scripts/build.js @@ -25,10 +25,10 @@ function runBuild(entry, outfile) { if (!fs.existsSync("../pro/src")) { // If we don't have pro, we cannot bundle backend-core. // Otherwise, the main context will not be shared between libraries - delete tsconfigPathPluginContent?.compilerOptions?.paths[ + delete tsconfigPathPluginContent?.compilerOptions?.paths?.[ "@budibase/backend-core" ] - delete tsconfigPathPluginContent?.compilerOptions?.paths[ + delete tsconfigPathPluginContent?.compilerOptions?.paths?.[ "@budibase/backend-core/*" ] } From f487a4d3caf938ac2beb2da9bdc6811c4dbf5d53 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 14 Aug 2023 16:46:07 +0000 Subject: [PATCH 04/11] Bump version to 2.9.25 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 4e08cb9459..7f64cf74d1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.9.24", + "version": "2.9.25", "npmClient": "yarn", "packages": [ "packages/*" From 658675553874bfded29aace5bf4b1b632d76d351 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 14 Aug 2023 18:16:40 +0100 Subject: [PATCH 05/11] remove special chars from access and secret key in dynamo lib --- .../src/integrations/validators/dynamodb.integration.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa-core/src/integrations/validators/dynamodb.integration.spec.ts b/qa-core/src/integrations/validators/dynamodb.integration.spec.ts index c885f64213..d1cec7bca1 100644 --- a/qa-core/src/integrations/validators/dynamodb.integration.spec.ts +++ b/qa-core/src/integrations/validators/dynamodb.integration.spec.ts @@ -28,8 +28,8 @@ describe("datasource validators", () => { 8000 )}`, } - env._set("AWS_ACCESS_KEY_ID", "mocked_key") - env._set("AWS_SECRET_ACCESS_KEY", "mocked_secret") + env._set("AWS_ACCESS_KEY_ID", "mockedkey") + env._set("AWS_SECRET_ACCESS_KEY", "mockedsecret") }) it("test valid connection string", async () => { From 6436aefa339ff61bac464738f93e2d032c6604cf Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 14 Aug 2023 17:25:15 +0000 Subject: [PATCH 06/11] Bump version to 2.9.26-alpha.0 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 7f64cf74d1..369927cfdd 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.9.25", + "version": "2.9.26-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" From a5f8d9994b957d48141b7882f55a77949bb26a39 Mon Sep 17 00:00:00 2001 From: Jonny McCullagh Date: Tue, 15 Aug 2023 10:59:46 +0100 Subject: [PATCH 07/11] adoptjdk repo has changed to adoptium (#11521) --- hosting/couchdb/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosting/couchdb/Dockerfile b/hosting/couchdb/Dockerfile index 70b4413859..ce77002052 100644 --- a/hosting/couchdb/Dockerfile +++ b/hosting/couchdb/Dockerfile @@ -5,11 +5,11 @@ ENV COUCHDB_PASSWORD admin EXPOSE 5984 RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common wget unzip curl && \ - wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \ + wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | sudo apt-key add - && \ apt-add-repository 'deb http://security.debian.org/debian-security bullseye-security/updates main' && \ apt-add-repository 'deb http://archive.debian.org/debian stretch-backports main' && \ - apt-add-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ && \ - apt-get update && apt-get install -y --no-install-recommends adoptopenjdk-8-hotspot && \ + apt-add-repository 'deb https://packages.adoptium.net/artifactory/deb bullseye main' && \ + apt-get update && apt-get install -y --no-install-recommends temurin-8-jdk && \ rm -rf /var/lib/apt/lists/ # setup clouseau From a8b3249a8f737c746a068a187b728189d6c61ffb Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Wed, 16 Aug 2023 15:59:02 +0100 Subject: [PATCH 08/11] Add bindable setting for initial form step (#11530) --- packages/client/manifest.json | 7 +++++ .../src/components/app/forms/Form.svelte | 11 ++++++- yarn.lock | 30 ++++++++++++------- 3 files changed, 37 insertions(+), 11 deletions(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 925c87e61d..4c3b432de0 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -2408,6 +2408,13 @@ "label": "Disabled", "key": "disabled", "defaultValue": false + }, + + { + "type": "text", + "label": "Initial form step", + "key": "initialFormStep", + "defaultValue": 1 } ], "context": [ diff --git a/packages/client/src/components/app/forms/Form.svelte b/packages/client/src/components/app/forms/Form.svelte index 39c9bf4b59..87883fe4b6 100644 --- a/packages/client/src/components/app/forms/Form.svelte +++ b/packages/client/src/components/app/forms/Form.svelte @@ -9,6 +9,7 @@ export let size export let disabled = false export let actionType = "Create" + export let initialFormStep = 1 // Not exposed as a builder setting. Used internally to disable validation // for fields rendered in things like search blocks. @@ -21,10 +22,18 @@ const context = getContext("context") const { API, fetchDatasourceSchema } = getContext("sdk") + const getInitialFormStep = () => { + const parsedFormStep = parseInt(initialFormStep) + if (isNaN(parsedFormStep)) { + return 1 + } + return parsedFormStep + } + let loaded = false let schema let table - let currentStep = writable(1) + let currentStep = writable(getInitialFormStep()) $: fetchSchema(dataSource) $: schemaKey = generateSchemaKey(schema) diff --git a/yarn.lock b/yarn.lock index 827c94a176..4f5e0db2e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10283,7 +10283,7 @@ denque@^1.1.0: resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf" integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw== -denque@^2.0.1, denque@^2.1.0: +denque@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1" integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw== @@ -16986,6 +16986,11 @@ long@^5.0.0: resolved "https://registry.yarnpkg.com/long/-/long-5.2.1.tgz#e27595d0083d103d2fa2c20c7699f8e0c92b897f" integrity sha512-GKSNGeNAtw8IryjjkhZxuKB3JzlcLTwjtiQCHKvqQet81I93kXslhDQruGI/QsddO83mcDToBVy7GqGS/zYf/A== +long@^5.2.1: + version "5.2.3" + resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1" + integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q== + lookpath@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/lookpath/-/lookpath-1.1.0.tgz#932d68371a2f0b4a5644f03d6a2b4728edba96d2" @@ -17052,6 +17057,11 @@ lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1: resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89" integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== +lru-cache@^8.0.0: + version "8.0.5" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-8.0.5.tgz#983fe337f3e176667f8e567cfcce7cb064ea214e" + integrity sha512-MhWWlVnuab1RG5/zMRRcVGXZLCXrZTgfwMikgzCegsPnG62yDQo5JnqKkrK4jO5iKqDAZGItAqN5CtKBCBWRUA== + lru-cache@^9.0.0: version "9.0.1" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.0.1.tgz#ac061ed291f8b9adaca2b085534bb1d3b61bef83" @@ -17952,17 +17962,17 @@ mute-stream@~1.0.0: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e" integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA== -mysql2@2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.3.3.tgz#944f3deca4b16629052ff8614fbf89d5552545a0" - integrity sha512-wxJUev6LgMSgACDkb/InIFxDprRa6T95+VEoR+xPvtngtccNH2dGjEB/fVZ8yg1gWv1510c9CvXuJHi5zUm0ZA== +mysql2@3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.5.2.tgz#a06050e1514e9ac15711a8b883ffd51cb44b2dc8" + integrity sha512-cptobmhYkYeTBIFp2c0piw2+gElpioga1rUw5UidHvo8yaHijMZoo8A3zyBVoo/K71f7ZFvrShA9iMIy9dCzCA== dependencies: - denque "^2.0.1" + denque "^2.1.0" generate-function "^2.3.1" iconv-lite "^0.6.3" - long "^4.0.0" - lru-cache "^6.0.0" - named-placeholders "^1.1.2" + long "^5.2.1" + lru-cache "^8.0.0" + named-placeholders "^1.1.3" seq-queue "^0.0.5" sqlstring "^2.3.2" @@ -17975,7 +17985,7 @@ mz@^2.4.0, mz@^2.7.0: object-assign "^4.0.1" thenify-all "^1.0.0" -named-placeholders@^1.1.2: +named-placeholders@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.3.tgz#df595799a36654da55dda6152ba7a137ad1d9351" integrity sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w== From b6064f170ecbeeaf28297cd234c07ca1a38e3b7f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 16 Aug 2023 14:59:21 +0000 Subject: [PATCH 09/11] Bump version to 2.9.26-alpha.1 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 369927cfdd..93ef14fe1f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.9.26-alpha.0", + "version": "2.9.26-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" From 9bac4b8bf25772578eb00df46ef6b204f9826370 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 16 Aug 2023 16:58:35 +0100 Subject: [PATCH 10/11] Getting shared-core to build consistently as part of the yarn dev command. --- packages/shared-core/package.json | 11 +++++++++++ packages/shared-core/tsconfig.build.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 382f3fa731..8edea4870a 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -32,7 +32,18 @@ "target": "build" } ] + }, + "dev:builder": { + "dependsOn": [ + { + "projects": [ + "@budibase/types" + ], + "target": "build" + } + ] } + } } } diff --git a/packages/shared-core/tsconfig.build.json b/packages/shared-core/tsconfig.build.json index 31dc1afc10..5b356a1f08 100644 --- a/packages/shared-core/tsconfig.build.json +++ b/packages/shared-core/tsconfig.build.json @@ -1,7 +1,7 @@ { "compilerOptions": { "target": "es6", - "moduleResolution": "node", + "module": "commonjs", "lib": ["es2020"], "strict": true, "noImplicitAny": true, From 2557997db6c828745ac4c0fbd6eb723482ac0490 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 16 Aug 2023 16:09:58 +0000 Subject: [PATCH 11/11] Bump version to 2.9.26-alpha.2 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 93ef14fe1f..d00419f904 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.9.26-alpha.1", + "version": "2.9.26-alpha.2", "npmClient": "yarn", "packages": [ "packages/*"