From 4eb4f20fb5371097d39b52b8dff3412cf1fbc8a8 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 24 Feb 2022 12:25:14 +0000 Subject: [PATCH 1/3] Always update asset type when required, even if no assets of that type exist --- .../app/[application]/design/[assetType]/index.svelte | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[assetType]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[assetType]/index.svelte index a767b56b4f..444835de22 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[assetType]/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[assetType]/index.svelte @@ -45,6 +45,14 @@ store.actions.screens.select(id) } } + + // If we didn't find a valid asset, just update the preview type + if (!id) { + store.update(state => { + state.currentFrontEndType = assetType + return state + }) + } } From dd706d84fb80d15bdb8a8cb1c67135799e334b7b Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 24 Feb 2022 12:26:31 +0000 Subject: [PATCH 2/3] Key client app layout rendering by builder store asset type to ensure preview is always remounted properly --- packages/client/src/components/ClientApp.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte index 5bd5d2d46f..06b240f3ee 100644 --- a/packages/client/src/components/ClientApp.svelte +++ b/packages/client/src/components/ClientApp.svelte @@ -108,7 +108,7 @@
- {#key $screenStore.activeLayout._id} + {#key `${$screenStore.activeLayout._id}-${$builderStore.previewType}`} Date: Fri, 25 Feb 2022 13:45:29 +0000 Subject: [PATCH 3/3] v1.0.76-alpha.5 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- packages/bbui/package.json | 2 +- 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, 23 insertions(+), 23 deletions(-) diff --git a/lerna.json b/lerna.json index 1972f5d7d2..03a6c0f4e6 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.76-alpha.4", + "version": "1.0.76-alpha.5", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 0897aef02f..198c62df25 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.76-alpha.4", + "version": "1.0.76-alpha.5", "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 b3087cfd49..064bc7a55a 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.76-alpha.4", + "version": "1.0.76-alpha.5", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index cf3f9a7d00..23f3d9f7dd 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.76-alpha.4", + "version": "1.0.76-alpha.5", "license": "GPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.76-alpha.4", - "@budibase/client": "^1.0.76-alpha.4", - "@budibase/frontend-core": "^1.0.76-alpha.4", - "@budibase/string-templates": "^1.0.76-alpha.4", + "@budibase/bbui": "^1.0.76-alpha.5", + "@budibase/client": "^1.0.76-alpha.5", + "@budibase/frontend-core": "^1.0.76-alpha.5", + "@budibase/string-templates": "^1.0.76-alpha.5", "@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 c7b30b3749..c3343949ff 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.76-alpha.4", + "version": "1.0.76-alpha.5", "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 798d2f0073..16c41d1e24 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.76-alpha.4", + "version": "1.0.76-alpha.5", "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.76-alpha.4", - "@budibase/frontend-core": "^1.0.76-alpha.4", - "@budibase/string-templates": "^1.0.76-alpha.4", + "@budibase/bbui": "^1.0.76-alpha.5", + "@budibase/frontend-core": "^1.0.76-alpha.5", + "@budibase/string-templates": "^1.0.76-alpha.5", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index cbf854616d..52c7dceedb 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.76-alpha.4", + "version": "1.0.76-alpha.5", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.76-alpha.4", + "@budibase/bbui": "^1.0.76-alpha.5", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 714901291c..5b45e6f6a4 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.76-alpha.4", + "version": "1.0.76-alpha.5", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -73,9 +73,9 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.76-alpha.4", - "@budibase/client": "^1.0.76-alpha.4", - "@budibase/string-templates": "^1.0.76-alpha.4", + "@budibase/backend-core": "^1.0.76-alpha.5", + "@budibase/client": "^1.0.76-alpha.5", + "@budibase/string-templates": "^1.0.76-alpha.5", "@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 cf79901c5c..bb9d7cb66c 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.76-alpha.4", + "version": "1.0.76-alpha.5", "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 7f4c8ad9ff..6fa4ebb9a4 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.76-alpha.4", + "version": "1.0.76-alpha.5", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,8 +34,8 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.76-alpha.4", - "@budibase/string-templates": "^1.0.76-alpha.4", + "@budibase/backend-core": "^1.0.76-alpha.5", + "@budibase/string-templates": "^1.0.76-alpha.5", "@koa/router": "^8.0.0", "@sentry/node": "^6.0.0", "@techpass/passport-openidconnect": "^0.3.0",