From a9ab12b9999358b50ca32a8faab2e47148a1cfd5 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 3 Mar 2021 17:05:18 +0000 Subject: [PATCH 1/3] v0.8.4 --- lerna.json | 2 +- packages/builder/package.json | 6 +++--- packages/cli/package.json | 2 +- 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 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lerna.json b/lerna.json index 367a66a926..e957a5c59c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.8.3", + "version": "0.8.4", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/builder/package.json b/packages/builder/package.json index 6d0bb15083..1288380565 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.8.3", + "version": "0.8.4", "license": "AGPL-3.0", "private": true, "scripts": { @@ -64,9 +64,9 @@ }, "dependencies": { "@budibase/bbui": "^1.58.13", - "@budibase/client": "^0.8.3", + "@budibase/client": "^0.8.4", "@budibase/colorpicker": "1.0.1", - "@budibase/string-templates": "^0.8.3", + "@budibase/string-templates": "^0.8.4", "@budibase/svelte-ag-grid": "^1.0.4", "@sentry/browser": "5.19.1", "@svelteschool/svelte-forms": "0.7.0", diff --git a/packages/cli/package.json b/packages/cli/package.json index 24ea8808c1..a957e8415d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "cli", - "version": "0.7.8", + "version": "0.8.4", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": "src/index.js", diff --git a/packages/client/package.json b/packages/client/package.json index 8eb481c1fe..8166dec3da 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.8.3", + "version": "0.8.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.8.3", + "@budibase/string-templates": "^0.8.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.8.3", + "@budibase/standard-components": "^0.8.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 2e8c742ccd..0b2849fb16 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.8.3", + "version": "0.8.4", "description": "Budibase Web Server", "main": "src/electron.js", "repository": { @@ -66,8 +66,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/client": "^0.8.3", - "@budibase/string-templates": "^0.8.3", + "@budibase/client": "^0.8.4", + "@budibase/string-templates": "^0.8.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 1e6cf6b595..f4b8fad2c2 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -35,7 +35,7 @@ "keywords": [ "svelte" ], - "version": "0.8.3", + "version": "0.8.4", "license": "MIT", "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd", "dependencies": { diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index b703bbd300..1afe39e4dd 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.8.3", + "version": "0.8.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 baf4890d94..4bdfbe3c0d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/deployment", "email": "hi@budibase.com", - "version": "0.8.3", + "version": "0.8.4", "description": "Budibase Deployment Server", "main": "src/index.js", "repository": { From 7f384159672117a2ec237790c201cfef8e24b4ba Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 3 Mar 2021 17:46:36 +0000 Subject: [PATCH 2/3] v0.8.5 --- lerna.json | 2 +- packages/builder/package.json | 6 +++--- packages/client/package.json | 8 ++++---- packages/server/package.json | 8 ++++---- packages/standard-components/package.json | 4 ++-- packages/string-templates/package.json | 4 ++-- packages/worker/package.json | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lerna.json b/lerna.json index e957a5c59c..3425a979b8 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.8.4", + "version": "0.8.5", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/builder/package.json b/packages/builder/package.json index 1288380565..e19514d2ac 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.8.4", + "version": "0.8.5", "license": "AGPL-3.0", "private": true, "scripts": { @@ -64,9 +64,9 @@ }, "dependencies": { "@budibase/bbui": "^1.58.13", - "@budibase/client": "^0.8.4", + "@budibase/client": "^0.8.5", "@budibase/colorpicker": "1.0.1", - "@budibase/string-templates": "^0.8.4", + "@budibase/string-templates": "^0.8.5", "@budibase/svelte-ag-grid": "^1.0.4", "@sentry/browser": "5.19.1", "@svelteschool/svelte-forms": "0.7.0", diff --git a/packages/client/package.json b/packages/client/package.json index 8166dec3da..49ece2ed43 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.8.4", + "version": "0.8.5", "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.8.4", + "@budibase/string-templates": "^0.8.5", "deep-equal": "^2.0.1", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" }, "devDependencies": { - "@budibase/standard-components": "^0.8.4", + "@budibase/standard-components": "^0.8.5", "@rollup/plugin-commonjs": "^16.0.0", "@rollup/plugin-node-resolve": "^10.0.0", "fs-extra": "^8.1.0", @@ -30,5 +30,5 @@ "svelte": "^3.30.0", "svelte-jester": "^1.0.6" }, - "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd" + "gitHead": "768a9d59da12cfefcd7ccaba05f975e878669504" } diff --git a/packages/server/package.json b/packages/server/package.json index 0b2849fb16..3ecaa7690b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.8.4", + "version": "0.8.5", "description": "Budibase Web Server", "main": "src/electron.js", "repository": { @@ -66,8 +66,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/client": "^0.8.4", - "@budibase/string-templates": "^0.8.4", + "@budibase/client": "^0.8.5", + "@budibase/string-templates": "^0.8.5", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", @@ -132,5 +132,5 @@ "pouchdb-adapter-memory": "^7.2.1", "supertest": "^4.0.2" }, - "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd" + "gitHead": "768a9d59da12cfefcd7ccaba05f975e878669504" } diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index f4b8fad2c2..8bce8b2f0b 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -35,9 +35,9 @@ "keywords": [ "svelte" ], - "version": "0.8.4", + "version": "0.8.5", "license": "MIT", - "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd", + "gitHead": "768a9d59da12cfefcd7ccaba05f975e878669504", "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.1.0", "@budibase/bbui": "^1.58.13", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 1afe39e4dd..ec7858da74 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.8.4", + "version": "0.8.5", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.js", "module": "src/index.js", @@ -33,5 +33,5 @@ "rollup-plugin-terser": "^7.0.2", "typescript": "^4.1.3" }, - "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd" + "gitHead": "768a9d59da12cfefcd7ccaba05f975e878669504" } diff --git a/packages/worker/package.json b/packages/worker/package.json index 4bdfbe3c0d..9f12a0ac1a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/deployment", "email": "hi@budibase.com", - "version": "0.8.4", + "version": "0.8.5", "description": "Budibase Deployment Server", "main": "src/index.js", "repository": { @@ -34,5 +34,5 @@ "pouchdb-all-dbs": "^1.0.2", "server-destroy": "^1.0.1" }, - "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd" + "gitHead": "768a9d59da12cfefcd7ccaba05f975e878669504" } From 9609c59368944abc28feab7fe8bf875d905f7278 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 5 Mar 2021 15:19:33 +0000 Subject: [PATCH 3/3] Fixing an issue discovered where the relationshipType currently specifies the wrong cardinality, for now just flipping the way it is specified in the front end as this will accurately describe what the backend is performing. --- .../backend/DataTable/modals/CreateEditColumn.svelte | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte index 598bcdaad2..ad2371f3ea 100644 --- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte @@ -162,15 +162,15 @@ linkName = truncate(linkTable.name, { length: 15 }) return [ { - name: `Many ${thisName} rows has many ${linkName} rows`, + name: `Many ${thisName} rows → many ${linkName} rows`, value: RelationshipTypes.MANY_TO_MANY, }, { - name: `One ${thisName} row has many ${linkName} rows`, + name: `One ${linkName} row → many ${thisName} rows`, value: RelationshipTypes.ONE_TO_MANY, }, { - name: `Many ${thisName} rows has one ${linkName} row`, + name: `One ${thisName} row → many ${linkName} rows`, value: RelationshipTypes.MANY_TO_ONE, }, ] @@ -270,9 +270,9 @@ {value} bind:group={field.relationshipType}>
- - - + + +
{/each}