From d6e568dbe3364603cf6a4a2805c861185cfca726 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 14 Feb 2022 10:21:31 +0000 Subject: [PATCH 1/2] Replace all spaces with underscores in column names rather than just the first one --- packages/server/src/api/controllers/row/internalSearch.js | 2 +- packages/server/src/db/views/staticViews.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js index 611b3272f3..ad95a25fc5 100644 --- a/packages/server/src/api/controllers/row/internalSearch.js +++ b/packages/server/src/api/controllers/row/internalSearch.js @@ -235,7 +235,7 @@ class QueryBuilder { if (this.sort) { const order = this.sortOrder === "descending" ? "-" : "" const type = `<${this.sortType}>` - body.sort = `${order}${this.sort.replace(/ /, "_")}${type}` + body.sort = `${order}${this.sort.replace(/ /g, "_")}${type}` } return body } diff --git a/packages/server/src/db/views/staticViews.js b/packages/server/src/db/views/staticViews.js index 50b7c305d3..fa0b1f3605 100644 --- a/packages/server/src/db/views/staticViews.js +++ b/packages/server/src/db/views/staticViews.js @@ -96,7 +96,7 @@ exports.createAllSearchIndex = async () => { function idx(input, prev) { for (let key of Object.keys(input)) { let idxKey = prev != null ? `${prev}.${key}` : key - idxKey = idxKey.replace(/ /, "_") + idxKey = idxKey.replace(/ /g, "_") if (Array.isArray(input[key])) { for (let val of input[key]) { if (typeof val !== "object") { From 1339c066bda32770e5ca8f7b8beab40acac16bda Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 15 Feb 2022 09:22:36 +0000 Subject: [PATCH 2/2] v1.0.64 --- 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 fc04f585c7..0ad0687cd5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.63", + "version": "1.0.64", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 012ee13101..27b00cee3b 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.63", + "version": "1.0.64", "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 1f0ca898c9..5c126edfd5 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.63", + "version": "1.0.64", "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 013ccd7c47..9b6fc5884f 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.63", + "version": "1.0.64", "license": "GPL-3.0", "private": true, "scripts": { @@ -64,10 +64,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.63", - "@budibase/client": "^1.0.63", - "@budibase/frontend-core": "^1.0.63", - "@budibase/string-templates": "^1.0.63", + "@budibase/bbui": "^1.0.64", + "@budibase/client": "^1.0.64", + "@budibase/frontend-core": "^1.0.64", + "@budibase/string-templates": "^1.0.64", "@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 300482966d..eaf5546cc7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.63", + "version": "1.0.64", "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 cc8a85cb8e..fdf0125afa 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.63", + "version": "1.0.64", "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.63", - "@budibase/frontend-core": "^1.0.63", - "@budibase/string-templates": "^1.0.63", + "@budibase/bbui": "^1.0.64", + "@budibase/frontend-core": "^1.0.64", + "@budibase/string-templates": "^1.0.64", "regexparam": "^1.3.0", "rollup-plugin-polyfill-node": "^0.8.0", "shortid": "^2.2.15", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 1cff3ccae2..7b0d3126c8 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.63", + "version": "1.0.64", "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.63", + "@budibase/bbui": "^1.0.64", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 6109e7d705..74f63e5996 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.63", + "version": "1.0.64", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,9 +70,9 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.63", - "@budibase/client": "^1.0.63", - "@budibase/string-templates": "^1.0.63", + "@budibase/backend-core": "^1.0.64", + "@budibase/client": "^1.0.64", + "@budibase/string-templates": "^1.0.64", "@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 817293d8a4..729c6706d8 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.63", + "version": "1.0.64", "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 eb64c29e7b..d9285381ed 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.63", + "version": "1.0.64", "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.63", - "@budibase/string-templates": "^1.0.63", + "@budibase/backend-core": "^1.0.64", + "@budibase/string-templates": "^1.0.64", "@koa/router": "^8.0.0", "@sentry/node": "^6.0.0", "@techpass/passport-openidconnect": "^0.3.0",