From 481e949b3e82eaa8d6299fecd9dee686dff4796e Mon Sep 17 00:00:00 2001 From: Joe <49767913+joebudi@users.noreply.github.com> Date: Fri, 5 Feb 2021 10:32:10 +0000 Subject: [PATCH 1/3] I emphasized the naming of a query Label text added and made semi-bold Removed placeholder text --- .../src/components/integration/QueryViewer.svelte | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte index 77f6d51476..0f38f7650f 100644 --- a/packages/builder/src/components/integration/QueryViewer.svelte +++ b/packages/builder/src/components/integration/QueryViewer.svelte @@ -132,7 +132,8 @@
- +
Enter query name:
+
{#if config}
@@ -216,7 +217,9 @@ From 2cb0e35b2541b5dfe4ce500baa16fb0ad5393c6d Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 5 Feb 2021 10:55:54 +0000 Subject: [PATCH 2/3] app export with space in name --- packages/builder/src/components/start/AppCard.svelte | 12 +++++++----- packages/client/package.json | 2 +- packages/server/package.json | 2 +- packages/server/src/api/controllers/backup.js | 4 +++- packages/standard-components/package.json | 2 +- packages/string-templates/package.json | 3 ++- packages/worker/package.json | 2 +- 7 files changed, 16 insertions(+), 11 deletions(-) diff --git a/packages/builder/src/components/start/AppCard.svelte b/packages/builder/src/components/start/AppCard.svelte index f4dac1dc6c..4efc298cdd 100644 --- a/packages/builder/src/components/start/AppCard.svelte +++ b/packages/builder/src/components/start/AppCard.svelte @@ -14,7 +14,9 @@ async function exportApp() { appExportLoading = true try { - download(`/api/backups/export?appId=${_id}&appname=${name}`) + download( + `/api/backups/export?appId=${_id}&appname=${encodeURIComponent(name)}` + ) notifier.success("App Export Complete.") } catch (err) { console.error(err) @@ -30,13 +32,13 @@
- Open - {name} - → + Open {name} → {#if appExportLoading} - {:else}{/if} + {:else} + + {/if}
diff --git a/packages/client/package.json b/packages/client/package.json index 4ba1845f84..81504ceb06 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -30,5 +30,5 @@ "svelte": "^3.30.0", "svelte-jester": "^1.0.6" }, - "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491" + "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd" } diff --git a/packages/server/package.json b/packages/server/package.json index 9bda59d551..424f6c36de 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -120,5 +120,5 @@ "./scripts/jestSetup.js" ] }, - "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491" + "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd" } diff --git a/packages/server/src/api/controllers/backup.js b/packages/server/src/api/controllers/backup.js index c8bcafcb7c..a83f96165b 100644 --- a/packages/server/src/api/controllers/backup.js +++ b/packages/server/src/api/controllers/backup.js @@ -4,7 +4,9 @@ const os = require("os") const fs = require("fs-extra") exports.exportAppDump = async function(ctx) { - const { appId, appname } = ctx.query + const { appId } = ctx.query + + const appname = decodeURI(ctx.query.appname) const backupsDir = path.join(os.homedir(), ".budibase", "backups") fs.ensureDirSync(backupsDir) diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index 61697d8e9c..5d8889f21d 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -36,7 +36,7 @@ ], "version": "0.7.3", "license": "MIT", - "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491", + "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd", "dependencies": { "@budibase/bbui": "^1.55.1", "@budibase/svelte-ag-grid": "^0.0.16", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 4fcf45aa36..2b4fbcbaee 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -32,5 +32,6 @@ "rollup-plugin-node-resolve": "^5.2.0", "rollup-plugin-terser": "^7.0.2", "typescript": "^4.1.3" - } + }, + "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd" } diff --git a/packages/worker/package.json b/packages/worker/package.json index fb0097fd0c..cae7411659 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -34,5 +34,5 @@ "pouchdb-all-dbs": "^1.0.2", "server-destroy": "^1.0.1" }, - "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491" + "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd" } From cca4b93c5332fc99caca5aab34b2a8630d5d7cc3 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 5 Feb 2021 10:59:29 +0000 Subject: [PATCH 3/3] v0.7.4 --- lerna.json | 2 +- packages/builder/package.json | 6 +++--- packages/client/package.json | 6 +++--- packages/server/package.json | 6 +++--- packages/standard-components/package.json | 2 +- packages/string-templates/package.json | 2 +- packages/worker/package.json | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lerna.json b/lerna.json index 7c813d3e3d..b53f4142a5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.7.3", + "version": "0.7.4", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/builder/package.json b/packages/builder/package.json index 3bdcde1cee..9de3db2b7b 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.7.3", + "version": "0.7.4", "license": "AGPL-3.0", "private": true, "scripts": { @@ -64,9 +64,9 @@ }, "dependencies": { "@budibase/bbui": "^1.56.0", - "@budibase/client": "^0.7.3", + "@budibase/client": "^0.7.4", "@budibase/colorpicker": "1.0.1", - "@budibase/string-templates": "^0.7.3", + "@budibase/string-templates": "^0.7.4", "@budibase/svelte-ag-grid": "^0.0.16", "@sentry/browser": "5.19.1", "@svelteschool/svelte-forms": "0.7.0", diff --git a/packages/client/package.json b/packages/client/package.json index 81504ceb06..46a25f4baf 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.7.3", + "version": "0.7.4", "license": "MPL-2.0", "main": "dist/budibase-client.js", "module": "dist/budibase-client.js", @@ -9,14 +9,14 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/string-templates": "^0.7.3", + "@budibase/string-templates": "^0.7.4", "deep-equal": "^2.0.1", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" }, "devDependencies": { - "@budibase/standard-components": "^0.7.3", + "@budibase/standard-components": "^0.7.4", "@rollup/plugin-commonjs": "^16.0.0", "@rollup/plugin-node-resolve": "^10.0.0", "fs-extra": "^8.1.0", diff --git a/packages/server/package.json b/packages/server/package.json index 424f6c36de..bd8df61846 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.7.3", + "version": "0.7.4", "description": "Budibase Web Server", "main": "src/electron.js", "repository": { @@ -50,8 +50,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/client": "^0.7.3", - "@budibase/string-templates": "^0.7.3", + "@budibase/client": "^0.7.4", + "@budibase/string-templates": "^0.7.4", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index 5d8889f21d..8a6652341a 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -34,7 +34,7 @@ "keywords": [ "svelte" ], - "version": "0.7.3", + "version": "0.7.4", "license": "MIT", "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd", "dependencies": { diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 2b4fbcbaee..f6a7a12f77 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.7.3", + "version": "0.7.4", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.js", "module": "src/index.js", diff --git a/packages/worker/package.json b/packages/worker/package.json index cae7411659..24e357bf7d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/deployment", "email": "hi@budibase.com", - "version": "0.7.3", + "version": "0.7.4", "description": "Budibase Deployment Server", "main": "src/index.js", "repository": {