From b1a76ad74d49385fc59c83f94c25296f3688dcd8 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 27 Jan 2021 15:04:13 +0000 Subject: [PATCH 1/5] v0.6.0 --- 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 22963e707b..4ef7575771 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.5.3", + "version": "0.6.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/builder/package.json b/packages/builder/package.json index 52fa846db3..0fe3f38d9b 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.5.3", + "version": "0.6.0", "license": "AGPL-3.0", "private": true, "scripts": { @@ -64,9 +64,9 @@ }, "dependencies": { "@budibase/bbui": "^1.55.2", - "@budibase/client": "^0.5.3", + "@budibase/client": "^0.6.0", "@budibase/colorpicker": "^1.0.1", - "@budibase/string-templates": "^0.5.3", + "@budibase/string-templates": "^0.6.0", "@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 18c5e9a78d..2b8d4ce52b 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.5.3", + "version": "0.6.0", "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.5.3", + "@budibase/string-templates": "^0.6.0", "deep-equal": "^2.0.1", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" }, "devDependencies": { - "@budibase/standard-components": "^0.5.3", + "@budibase/standard-components": "^0.6.0", "@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 feefffb827..c775d3bea1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.5.3", + "version": "0.6.0", "description": "Budibase Web Server", "main": "src/electron.js", "repository": { @@ -49,8 +49,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/client": "^0.5.3", - "@budibase/string-templates": "^0.5.3", + "@budibase/client": "^0.6.0", + "@budibase/string-templates": "^0.6.0", "@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 b5b3a64888..d2a60c4912 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -29,7 +29,7 @@ "keywords": [ "svelte" ], - "version": "0.5.3", + "version": "0.6.0", "license": "MIT", "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491", "dependencies": { diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 77e8f7ded5..ba052ee66d 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.5.3", + "version": "0.6.0", "description": "Handlebars wrapper for Budibase templating.", "main": "dist/bundle.js", "module": "dist/bundle.js", diff --git a/packages/worker/package.json b/packages/worker/package.json index c53d4e9429..45a642fcae 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/deployment", "email": "hi@budibase.com", - "version": "0.5.3", + "version": "0.6.0", "description": "Budibase Deployment Server", "main": "src/index.js", "repository": { From baf2f8bec5d9501161e84da09a34847f28844c11 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 27 Jan 2021 16:40:47 +0000 Subject: [PATCH 2/5] replace npmignore with package JSON files field --- packages/standard-components/.npmignore | 3 --- packages/standard-components/package.json | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 packages/standard-components/.npmignore diff --git a/packages/standard-components/.npmignore b/packages/standard-components/.npmignore deleted file mode 100644 index 81c5644598..0000000000 --- a/packages/standard-components/.npmignore +++ /dev/null @@ -1,3 +0,0 @@ -* -!dist/* -!components.json \ No newline at end of file diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index d2a60c4912..202dd9452e 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -10,6 +10,11 @@ "start:dev": "sirv public --single --dev", "dev:builder": "rollup -cw" }, + "files": [ + "manifest.json", + "package.json", + "dist" + ], "devDependencies": { "@rollup/plugin-alias": "^3.1.1", "@rollup/plugin-commonjs": "^16.0.0", From 23899840d37c65a59f5cc38a832c373166300f03 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 27 Jan 2021 16:47:44 +0000 Subject: [PATCH 3/5] v0.6.1 --- 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 4ef7575771..5a71180145 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.6.0", + "version": "0.6.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/builder/package.json b/packages/builder/package.json index 0fe3f38d9b..e56f01ae49 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.6.0", + "version": "0.6.1", "license": "AGPL-3.0", "private": true, "scripts": { @@ -64,9 +64,9 @@ }, "dependencies": { "@budibase/bbui": "^1.55.2", - "@budibase/client": "^0.6.0", + "@budibase/client": "^0.6.1", "@budibase/colorpicker": "^1.0.1", - "@budibase/string-templates": "^0.6.0", + "@budibase/string-templates": "^0.6.1", "@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 2b8d4ce52b..eea47390e5 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.6.0", + "version": "0.6.1", "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.6.0", + "@budibase/string-templates": "^0.6.1", "deep-equal": "^2.0.1", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" }, "devDependencies": { - "@budibase/standard-components": "^0.6.0", + "@budibase/standard-components": "^0.6.1", "@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 c775d3bea1..2984aff7cd 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.6.0", + "version": "0.6.1", "description": "Budibase Web Server", "main": "src/electron.js", "repository": { @@ -49,8 +49,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/client": "^0.6.0", - "@budibase/string-templates": "^0.6.0", + "@budibase/client": "^0.6.1", + "@budibase/string-templates": "^0.6.1", "@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 202dd9452e..decd725967 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -34,7 +34,7 @@ "keywords": [ "svelte" ], - "version": "0.6.0", + "version": "0.6.1", "license": "MIT", "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491", "dependencies": { diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index ba052ee66d..0fee9f3df7 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.6.0", + "version": "0.6.1", "description": "Handlebars wrapper for Budibase templating.", "main": "dist/bundle.js", "module": "dist/bundle.js", diff --git a/packages/worker/package.json b/packages/worker/package.json index 45a642fcae..3f6c7584ec 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/deployment", "email": "hi@budibase.com", - "version": "0.6.0", + "version": "0.6.1", "description": "Budibase Deployment Server", "main": "src/index.js", "repository": { From 0f18ee70ef0f9299c8f3e07e3171f055bcae21d4 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 27 Jan 2021 17:29:30 +0000 Subject: [PATCH 4/5] actions fix --- .../popovers/EditQueryParamsPopover.svelte | 11 +- .../Notification/NotificationDisplay.svelte | 2 +- .../EventsEditor/EventEditor.svelte | 6 +- .../PropertyControls/TableViewSelect.svelte | 20 +-- .../integration/QueryFieldsBuilder.svelte | 8 +- .../components/integration/QueryViewer.svelte | 36 +++--- .../src/components/integration/index.svelte | 1 - .../[selectedDatasource]/index.svelte | 1 - .../client/src/components/ClientApp.svelte | 11 +- .../src/components/NotificationDisplay.svelte | 117 +++++++++--------- 10 files changed, 113 insertions(+), 100 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryParamsPopover.svelte b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryParamsPopover.svelte index bc34d4d80c..c657bd682f 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryParamsPopover.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryParamsPopover.svelte @@ -20,12 +20,9 @@
- - - Add Parameters + + + Add Parameters
@@ -39,4 +36,4 @@ padding: var(--spacing-xl); min-width: 600px; } - \ No newline at end of file + diff --git a/packages/builder/src/components/common/Notification/NotificationDisplay.svelte b/packages/builder/src/components/common/Notification/NotificationDisplay.svelte index 3a7c03a716..2a89426ca8 100644 --- a/packages/builder/src/components/common/Notification/NotificationDisplay.svelte +++ b/packages/builder/src/components/common/Notification/NotificationDisplay.svelte @@ -1,6 +1,6 @@
-
- {#each schemaKeys as field} +
+ {#each schemaKeys as field} - {/each} -
+ {/each} +
{#if schema.customisable}
{#if config} -
-
Query type: {config[query.queryVerb].type}
-
- -
+
+
+ Query type: + {config[query.queryVerb].type} +
+
+ +
- + {/if} @@ -182,7 +187,11 @@ {#each fields as field, idx}
- +