From 2fb7777c5d7847fb20fcc7d80f44a1a7623f45b7 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 18 May 2022 16:21:17 +0100 Subject: [PATCH 1/6] Return QA templates when TEST_ENV environmentvariable is set --- packages/frontend-core/src/api/templates.js | 2 +- packages/server/src/api/controllers/templates.js | 3 ++- packages/server/src/environment.js | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/frontend-core/src/api/templates.js b/packages/frontend-core/src/api/templates.js index 3c474dabc6..660a85d745 100644 --- a/packages/frontend-core/src/api/templates.js +++ b/packages/frontend-core/src/api/templates.js @@ -29,7 +29,7 @@ export const buildTemplateEndpoints = API => ({ */ getAppTemplates: async () => { return await API.get({ - url: "/api/templates?type=app", + url: "/api/templates", }) }, }) diff --git a/packages/server/src/api/controllers/templates.js b/packages/server/src/api/controllers/templates.js index 03dbbd2ee2..e18da3b9d3 100644 --- a/packages/server/src/api/controllers/templates.js +++ b/packages/server/src/api/controllers/templates.js @@ -1,12 +1,13 @@ const fetch = require("node-fetch") const { downloadTemplate } = require("../../utilities/fileSystem") +const env = require("../../environment") // development flag, can be used to test against templates exported locally const DEFAULT_TEMPLATES_BUCKET = "prod-budi-templates.s3-eu-west-1.amazonaws.com" exports.fetch = async function (ctx) { - const { type = "app" } = ctx.query + let type = env.TEST_ENV ? "qa" : "app" let response, error = false try { diff --git a/packages/server/src/environment.js b/packages/server/src/environment.js index ff1061dbaf..d9fa28ecff 100644 --- a/packages/server/src/environment.js +++ b/packages/server/src/environment.js @@ -78,6 +78,7 @@ module.exports = { ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS, DISABLE_THREADING: process.env.DISABLE_THREADING, SQL_MAX_ROWS: process.env.SQL_MAX_ROWS, + TEST_ENV: true, _set(key, value) { process.env[key] = value module.exports[key] = value From ae8548b15358a1ca5d94786017e36f5ef3d5440f Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 18 May 2022 16:30:05 +0100 Subject: [PATCH 2/6] remove test boolean --- packages/server/src/environment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/environment.js b/packages/server/src/environment.js index d9fa28ecff..f06c369cd0 100644 --- a/packages/server/src/environment.js +++ b/packages/server/src/environment.js @@ -78,7 +78,7 @@ module.exports = { ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS, DISABLE_THREADING: process.env.DISABLE_THREADING, SQL_MAX_ROWS: process.env.SQL_MAX_ROWS, - TEST_ENV: true, + TEST_ENV: process.env.TEST_ENV, _set(key, value) { process.env[key] = value module.exports[key] = value From f999554361f3b2458b3ef933a9542bea70dae0c2 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 19 May 2022 10:24:19 +0100 Subject: [PATCH 3/6] use env variable as the folder setting --- packages/server/src/api/controllers/templates.js | 2 +- packages/server/src/environment.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/src/api/controllers/templates.js b/packages/server/src/api/controllers/templates.js index e18da3b9d3..57a175d4ff 100644 --- a/packages/server/src/api/controllers/templates.js +++ b/packages/server/src/api/controllers/templates.js @@ -7,7 +7,7 @@ const DEFAULT_TEMPLATES_BUCKET = "prod-budi-templates.s3-eu-west-1.amazonaws.com" exports.fetch = async function (ctx) { - let type = env.TEST_ENV ? "qa" : "app" + let type = env.TEMPLATE_REPOSITORY || "app" let response, error = false try { diff --git a/packages/server/src/environment.js b/packages/server/src/environment.js index f06c369cd0..fd28e4c369 100644 --- a/packages/server/src/environment.js +++ b/packages/server/src/environment.js @@ -78,7 +78,7 @@ module.exports = { ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS, DISABLE_THREADING: process.env.DISABLE_THREADING, SQL_MAX_ROWS: process.env.SQL_MAX_ROWS, - TEST_ENV: process.env.TEST_ENV, + TEMPLATE_REPOSITORY: process.env.TEMPLATE_REPOSITORY, _set(key, value) { process.env[key] = value module.exports[key] = value From a7a27aa34966e73c21f35e123c81c529cec5b8bc Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 19 May 2022 10:56:51 +0100 Subject: [PATCH 4/6] default value for env variable --- packages/server/src/api/controllers/templates.js | 2 +- packages/server/src/environment.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/src/api/controllers/templates.js b/packages/server/src/api/controllers/templates.js index 57a175d4ff..3a1cafdf5a 100644 --- a/packages/server/src/api/controllers/templates.js +++ b/packages/server/src/api/controllers/templates.js @@ -7,7 +7,7 @@ const DEFAULT_TEMPLATES_BUCKET = "prod-budi-templates.s3-eu-west-1.amazonaws.com" exports.fetch = async function (ctx) { - let type = env.TEMPLATE_REPOSITORY || "app" + let type = env.TEMPLATE_REPOSITORY let response, error = false try { diff --git a/packages/server/src/environment.js b/packages/server/src/environment.js index fd28e4c369..4807ef5493 100644 --- a/packages/server/src/environment.js +++ b/packages/server/src/environment.js @@ -78,7 +78,7 @@ module.exports = { ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS, DISABLE_THREADING: process.env.DISABLE_THREADING, SQL_MAX_ROWS: process.env.SQL_MAX_ROWS, - TEMPLATE_REPOSITORY: process.env.TEMPLATE_REPOSITORY, + TEMPLATE_REPOSITORY: process.env.TEMPLATE_REPOSITORY || "app", _set(key, value) { process.env[key] = value module.exports[key] = value From bb388f8d3dac55b1926b5c583557860f3c944ef5 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 19 May 2022 14:17:02 +0000 Subject: [PATCH 5/6] v1.0.167-alpha.4 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 75c6bf2f90..ce7aa07df6 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.167-alpha.3", + "version": "1.0.167-alpha.4", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index f95d8736ea..2767bbc80d 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.167-alpha.3", + "version": "1.0.167-alpha.4", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index bbf5ac6a78..586a02e97c 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": "1.0.167-alpha.3", + "version": "1.0.167-alpha.4", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.167-alpha.3", + "@budibase/string-templates": "^1.0.167-alpha.4", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index fed7e0382a..d9bb6f28d1 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.167-alpha.3", + "version": "1.0.167-alpha.4", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.167-alpha.3", - "@budibase/client": "^1.0.167-alpha.3", - "@budibase/frontend-core": "^1.0.167-alpha.3", - "@budibase/string-templates": "^1.0.167-alpha.3", + "@budibase/bbui": "^1.0.167-alpha.4", + "@budibase/client": "^1.0.167-alpha.4", + "@budibase/frontend-core": "^1.0.167-alpha.4", + "@budibase/string-templates": "^1.0.167-alpha.4", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index d4302d28ab..454aa63957 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.167-alpha.3", + "version": "1.0.167-alpha.4", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 6aa9c6a34a..e7bee51e7f 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.167-alpha.3", + "version": "1.0.167-alpha.4", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.167-alpha.3", - "@budibase/frontend-core": "^1.0.167-alpha.3", - "@budibase/string-templates": "^1.0.167-alpha.3", + "@budibase/bbui": "^1.0.167-alpha.4", + "@budibase/frontend-core": "^1.0.167-alpha.4", + "@budibase/string-templates": "^1.0.167-alpha.4", "@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 7cd15de482..686d03fcf6 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.167-alpha.3", + "version": "1.0.167-alpha.4", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.167-alpha.3", + "@budibase/bbui": "^1.0.167-alpha.4", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index fc61c91006..4630044df2 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.167-alpha.3", + "version": "1.0.167-alpha.4", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -69,10 +69,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.167-alpha.3", - "@budibase/client": "^1.0.167-alpha.3", + "@budibase/backend-core": "^1.0.167-alpha.4", + "@budibase/client": "^1.0.167-alpha.4", "@budibase/pro": "1.0.167-alpha.3", - "@budibase/string-templates": "^1.0.167-alpha.3", + "@budibase/string-templates": "^1.0.167-alpha.4", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 823d2401d0..65f3d567cf 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.167-alpha.3", + "version": "1.0.167-alpha.4", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 8c57f233d3..16e1cd538b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.167-alpha.3", + "version": "1.0.167-alpha.4", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -31,9 +31,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.167-alpha.3", + "@budibase/backend-core": "^1.0.167-alpha.4", "@budibase/pro": "1.0.167-alpha.3", - "@budibase/string-templates": "^1.0.167-alpha.3", + "@budibase/string-templates": "^1.0.167-alpha.4", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From 504c415b2a4e61114f6cfff1e5169b9a1c390bef Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 19 May 2022 14:18:34 +0000 Subject: [PATCH 6/6] Update pro version to 1.0.167-alpha.4 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 4630044df2..9218fb43ed 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -71,7 +71,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.167-alpha.4", "@budibase/client": "^1.0.167-alpha.4", - "@budibase/pro": "1.0.167-alpha.3", + "@budibase/pro": "1.0.167-alpha.4", "@budibase/string-templates": "^1.0.167-alpha.4", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 16e1cd538b..1c36e80963 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -32,7 +32,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.167-alpha.4", - "@budibase/pro": "1.0.167-alpha.3", + "@budibase/pro": "1.0.167-alpha.4", "@budibase/string-templates": "^1.0.167-alpha.4", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7",