From 9564285917305920a55459d9a845c5022b313459 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 25 May 2021 12:42:55 +0100 Subject: [PATCH 01/10] fix stale topNav history state causing wrong apps to show --- packages/builder/src/builderStore/store/frontend.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index 0d80065f2f..50f75d69e4 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -65,6 +65,7 @@ export const getFrontendStore = () => { hasAppPackage: true, appInstance: application.instance, clientLibPath, + previousTopNavPath: {}, })) await hostingStore.actions.fetch() From 3a53dbe1f78b3c48591e785d215135da5025ad18 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 25 May 2021 12:44:36 +0100 Subject: [PATCH 02/10] v0.9.4 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 6 +++--- packages/server/package.json | 10 +++++----- packages/standard-components/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lerna.json b/lerna.json index 01ddc677aa..1bcec1de4c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.3", + "version": "0.9.4", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index 29b9ef380c..be54f04537 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "0.9.3", + "version": "0.9.4", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index e30c0821af..80adccd4eb 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": "0.9.3", + "version": "0.9.4", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index 62891c187d..d931d11db3 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.9.3", + "version": "0.9.4", "license": "AGPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^0.9.3", - "@budibase/client": "^0.9.3", + "@budibase/bbui": "^0.9.4", + "@budibase/client": "^0.9.4", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^0.9.3", + "@budibase/string-templates": "^0.9.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 2c41142a08..73da05ec0b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "0.9.3", + "version": "0.9.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 879332db7e..236a5dabbd 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.9.3", + "version": "0.9.4", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -18,13 +18,13 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/string-templates": "^0.9.3", + "@budibase/string-templates": "^0.9.4", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" }, "devDependencies": { - "@budibase/standard-components": "^0.9.3", + "@budibase/standard-components": "^0.9.4", "@rollup/plugin-commonjs": "^18.0.0", "@rollup/plugin-node-resolve": "^11.2.1", "fs-extra": "^8.1.0", diff --git a/packages/server/package.json b/packages/server/package.json index a8446bb76c..eaf2f37805 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.9.3", + "version": "0.9.4", "description": "Budibase Web Server", "main": "src/electron.js", "repository": { @@ -55,9 +55,9 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.3", - "@budibase/client": "^0.9.3", - "@budibase/string-templates": "^0.9.3", + "@budibase/auth": "^0.9.4", + "@budibase/client": "^0.9.4", + "@budibase/string-templates": "^0.9.4", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", @@ -107,7 +107,7 @@ "zlib": "1.0.5" }, "devDependencies": { - "@budibase/standard-components": "^0.9.3", + "@budibase/standard-components": "^0.9.4", "@jest/test-sequencer": "^24.8.0", "docker-compose": "^0.23.6", "eslint": "^6.8.0", diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index ccbdd00f33..811d7eacfc 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -29,11 +29,11 @@ "keywords": [ "svelte" ], - "version": "0.9.3", + "version": "0.9.4", "license": "MIT", "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc", "dependencies": { - "@budibase/bbui": "^0.9.3", + "@budibase/bbui": "^0.9.4", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", "apexcharts": "^3.22.1", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index ae1e4f3a51..3ed19ad37b 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.9.3", + "version": "0.9.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 d849d98450..0e777ded5d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "0.9.3", + "version": "0.9.4", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -21,8 +21,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.3", - "@budibase/string-templates": "^0.9.3", + "@budibase/auth": "^0.9.4", + "@budibase/string-templates": "^0.9.4", "@koa/router": "^8.0.0", "aws-sdk": "^2.811.0", "bcryptjs": "^2.4.3", From 9efc5162ab68c25157143ea275454b7d3bdc8e75 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 25 May 2021 13:29:15 +0100 Subject: [PATCH 03/10] Removing request button. --- .../builder/app/[application]/_layout.svelte | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index 8a83439911..d9ffdda8cf 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -91,14 +91,6 @@ -
- -
{:catch error} @@ -200,14 +192,4 @@ i:hover { color: var(--ink); } - - .beta { - position: absolute; - bottom: var(--spacing-m); - left: var(--spacing-m); - z-index: 1; - } - .beta :global(button) { - background-color: var(--background); - } From 0340c735e89f14bf3bceb180694be04ef975c5d8 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 25 May 2021 13:39:30 +0100 Subject: [PATCH 04/10] fix cron trigger output --- packages/server/src/api/controllers/automation.js | 5 ++++- packages/server/src/automations/triggers.js | 10 +++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/server/src/api/controllers/automation.js b/packages/server/src/api/controllers/automation.js index 20e54fe238..c9c8759fd6 100644 --- a/packages/server/src/api/controllers/automation.js +++ b/packages/server/src/api/controllers/automation.js @@ -65,7 +65,10 @@ async function checkForCronTriggers({ appId, oldAuto, newAuto }) { // need to create cron job else if (isCronTrigger(newAuto) && cronTriggerActivated) { const job = await triggers.automationQueue.add( - { automation: newAuto, event: { appId } }, + { + automation: newAuto, + event: { appId, timestamp: Date.now() }, + }, { repeat: { cron: newTrigger.inputs.cron } } ) // Assign cron job ID from bull so we can remove it later if the cron trigger is removed diff --git a/packages/server/src/automations/triggers.js b/packages/server/src/automations/triggers.js index 812c601fa7..332710a3e4 100644 --- a/packages/server/src/automations/triggers.js +++ b/packages/server/src/automations/triggers.js @@ -216,7 +216,15 @@ const BUILTIN_DEFINITIONS = { }, required: ["cron"], }, - outputs: {}, + outputs: { + properties: { + timestamp: { + type: "number", + description: "Timestamp the cron was executed", + }, + }, + required: ["timestamp"], + }, }, type: "TRIGGER", }, From 0cd8d50fcc24054731b207a8c2288cf3edc5b1b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Tue, 25 May 2021 15:12:25 +0200 Subject: [PATCH 05/10] add node target to cli package --- packages/cli/package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/cli/package.json b/packages/cli/package.json index 73da05ec0b..453ee6d06f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -11,6 +11,10 @@ "scripts": { "build": "pkg . --out-path build" }, + "pkg": { + "targets": [ "node14" ], + "outputPath": "build" + }, "dependencies": { "axios": "^0.21.1", "chalk": "^4.1.0", From 122c1f6fe087b7edd548446f0f3964a26e7bb37c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Tue, 25 May 2021 15:15:11 +0200 Subject: [PATCH 06/10] remove unused dependencies in top level package file --- package.json | 7 ------- yarn.lock | 25 ------------------------- 2 files changed, 32 deletions(-) diff --git a/package.json b/package.json index 71296665c7..380407d48d 100644 --- a/package.json +++ b/package.json @@ -40,12 +40,5 @@ "test:e2e:ci": "lerna run cy:ci", "build:docker": "lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh && cd -", "build:docker:staging": "cd hosting/scripts/linux/ && ./release-to-docker-hub.sh staging && cd -" - }, - "dependencies": { - "@spectrum-css/actionbutton": "^1.0.1", - "@spectrum-css/actiongroup": "^1.0.1", - "@spectrum-css/link": "^3.1.1", - "@spectrum-css/menu": "^3.0.1", - "@spectrum-css/toast": "^3.0.1" } } diff --git a/yarn.lock b/yarn.lock index f344bd8338..8678a07d03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -824,31 +824,6 @@ estree-walker "^1.0.1" micromatch "^4.0.2" -"@spectrum-css/actionbutton@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.1.tgz#9c75da37ea6915919fb574c74bd60dacc03b6577" - integrity sha512-AUqtyNabHF451Aj9i3xz82TxS5Z6k1dttA68/1hMeU9kbPCSS4P6Viw3vaRGs9CSspuR8xnnhDgrq+F+zMy2Hw== - -"@spectrum-css/actiongroup@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.1.tgz#b95b86e7af229e90fe1e70399d8d4b547b4bd31c" - integrity sha512-5Q6uMjzv5BFA2TwGASr/jAtJpTWl26fhWvgGY8kOA0RCSij35l+YJg/FPXf6Nnj2qCOl8DkNycjT9YXJ+bhyVA== - -"@spectrum-css/link@^3.1.1": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.1.tgz#cb526a2e10b50ef5a7ae29cca7272e2610d597eb" - integrity sha512-Bi88lRhTY7g6nM/ryW1yY4Cji211ZYNtRxkxbV7n2lPvwMAAQtyx0qVD3ru4kTGj/FFVvmPR3XiOE10K13HSNA== - -"@spectrum-css/menu@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.1.tgz#2a376f991acc24e12ec892bb6b9db2650fc41fbe" - integrity sha512-Qjg0+1O0eC89sb/bRFq2AGnQ8XqhVy23TUXHyffNM8qdcMssnlny3QmhzjURCZKvx/Y5UytCpzhedPQqSpQwZg== - -"@spectrum-css/toast@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.1.tgz#36f62ea05302761e59b9d53e05f6c04423861796" - integrity sha512-jov++S358BrN2tmMfaoYk1N6u9HojgeuQk61keXrK2m3VE5/n94x7Lg3kIPeSWO0odyDfBlMqT9jacbRey3QTg== - "@types/estree@0.0.39": version "0.0.39" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" From 3dc7ba268e362328b8fe382baf783ef0c6944cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Tue, 25 May 2021 15:19:10 +0200 Subject: [PATCH 07/10] remove unused component in manage layout --- .../builder/src/pages/builder/portal/manage/_layout.svelte | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/manage/_layout.svelte b/packages/builder/src/pages/builder/portal/manage/_layout.svelte index 356b362b0b..bb09efb6f2 100644 --- a/packages/builder/src/pages/builder/portal/manage/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/manage/_layout.svelte @@ -12,7 +12,5 @@ {#if $auth.isAdmin} - - - + {/if} From ab56fceaae3d6cbfe3fef2f2f5bbe044d4cda684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Tue, 25 May 2021 15:25:56 +0200 Subject: [PATCH 08/10] fix double page component issue in email section --- .../builder/portal/manage/_layout.svelte | 8 +- .../portal/manage/email/[template].svelte | 124 +++++++++--------- .../builder/portal/manage/email/index.svelte | 122 +++++++++-------- 3 files changed, 127 insertions(+), 127 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/manage/_layout.svelte b/packages/builder/src/pages/builder/portal/manage/_layout.svelte index bb09efb6f2..98ae140b25 100644 --- a/packages/builder/src/pages/builder/portal/manage/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/manage/_layout.svelte @@ -1,7 +1,7 @@ {#if $auth.isAdmin} - + + + {/if} diff --git a/packages/builder/src/pages/builder/portal/manage/email/[template].svelte b/packages/builder/src/pages/builder/portal/manage/email/[template].svelte index 182201d2ba..d1001b2d76 100644 --- a/packages/builder/src/pages/builder/portal/manage/email/[template].svelte +++ b/packages/builder/src/pages/builder/portal/manage/email/[template].svelte @@ -69,71 +69,69 @@ } - - -
- $goto("./")} - quiet - size="S" - icon="BackAndroid" - > - Back to email settings - -
-
- - Email Template: {template} - - -
- Change the email template here. Add dynamic content by using the bindings - menu on the right. +
+ $goto("./")} + quiet + size="S" + icon="BackAndroid" > - - - -
- { - selectedTemplate.contents = e.detail.value - }} - value={selectedTemplate?.contents} - /> -
- Bindings - {#if mounted} - - - - - - - - - {/if} -
+ Back to email settings + +
+
+ + Email Template: {template} + + +
+ Change the email template here. Add dynamic content by using the bindings + menu on the right. + + + +
+ { + selectedTemplate.contents = e.detail.value + }} + value={selectedTemplate?.contents} + /> +
+ Bindings + {#if mounted} + + + + + + + + + {/if}
- - -
-