From c20fde41ee70d1c3fc1ac17bda0ff10742aede94 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 14 Jul 2021 11:23:24 +0100 Subject: [PATCH 01/11] Some quick fixes after a user had some confusion over how the email templating works, just adding some detail that should help explain. --- .../portal/manage/email/[template].svelte | 13 ++++++--- .../email/_components/TemplateLink.svelte | 13 --------- .../builder/portal/manage/email/index.svelte | 27 +++++++++++-------- .../src/api/controllers/admin/templates.js | 8 +++++- packages/worker/src/constants/index.js | 21 ++++++++++++--- 5 files changed, 50 insertions(+), 32 deletions(-) delete mode 100644 packages/builder/src/pages/builder/portal/manage/email/_components/TemplateLink.svelte diff --git a/packages/builder/src/pages/builder/portal/manage/email/[template].svelte b/packages/builder/src/pages/builder/portal/manage/email/[template].svelte index cd4c7c739d..41e682eb7c 100644 --- a/packages/builder/src/pages/builder/portal/manage/email/[template].svelte +++ b/packages/builder/src/pages/builder/portal/manage/email/[template].svelte @@ -16,6 +16,7 @@ import Editor from "components/integration/QueryEditor.svelte" import TemplateBindings from "./_components/TemplateBindings.svelte" + // this is the email purpose export let template let htmlEditor @@ -24,9 +25,11 @@ $: selectedTemplate = $email.templates?.find( ({ purpose }) => purpose === template ) + $: name = $email.definitions?.info[template]?.name + $: description = $email.definitions?.info[template]?.description $: baseTemplate = $email.templates?.find(({ purpose }) => purpose === "base") $: templateBindings = - $email.definitions?.bindings?.[selectedTemplate.purpose] || [] + $email.definitions?.bindings?.[selectedTemplate?.purpose] || [] $: previewContent = makePreviewContent(baseTemplate, selectedTemplate) async function saveTemplate() { @@ -81,13 +84,15 @@
- Email Template: {template} + Email Template: {name}
+ Description + {description} Change the email template here. Add dynamic content by using the bindings - menu on the right.Change the email template here. Add dynamic content by using the bindings + menu on the right. diff --git a/packages/builder/src/pages/builder/portal/manage/email/_components/TemplateLink.svelte b/packages/builder/src/pages/builder/portal/manage/email/_components/TemplateLink.svelte deleted file mode 100644 index 060f533bd2..0000000000 --- a/packages/builder/src/pages/builder/portal/manage/email/_components/TemplateLink.svelte +++ /dev/null @@ -1,13 +0,0 @@ - - - $goto(`./${value}`)}>{value} - - diff --git a/packages/builder/src/pages/builder/portal/manage/email/index.svelte b/packages/builder/src/pages/builder/portal/manage/email/index.svelte index 2c7b798d5e..250e4d9375 100644 --- a/packages/builder/src/pages/builder/portal/manage/email/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/email/index.svelte @@ -14,7 +14,6 @@ Checkbox, } from "@budibase/bbui" import { email } from "stores/portal" - import TemplateLink from "./_components/TemplateLink.svelte" import api from "builderStore/api" import { cloneDeep } from "lodash/fp" @@ -23,23 +22,30 @@ } const templateSchema = { - purpose: { - displayName: "Email", + name: { + displayName: "Name", editable: false, }, + category: { + displayName: "Category", + editable: false, + } } - const customRenderers = [ - { - column: "purpose", - component: TemplateLink, - }, - ] + $: emailInfo = getEmailInfo($email.definitions) let smtpConfig let loading let requireAuth = false + function getEmailInfo(definitions) { + if (!definitions) { + return [] + } + const entries = Object.entries(definitions.info) + return entries.map(([key, value]) => ({ purpose: key, ...value })) + } + async function saveSmtp() { // clone it so we can remove stuff if required const smtp = cloneDeep(smtpConfig) @@ -159,8 +165,7 @@ $goto(`./${detail.purpose}`)} diff --git a/packages/worker/src/api/controllers/admin/templates.js b/packages/worker/src/api/controllers/admin/templates.js index dde92ecca5..ab9c52cb5a 100644 --- a/packages/worker/src/api/controllers/admin/templates.js +++ b/packages/worker/src/api/controllers/admin/templates.js @@ -28,12 +28,18 @@ exports.save = async ctx => { exports.definitions = async ctx => { const bindings = {} - + const info = {} for (let template of TemplateMetadata.email) { bindings[template.purpose] = template.bindings + info[template.purpose] = { + name: template.name, + description: template.description, + category: template.category, + } } ctx.body = { + info, bindings: { ...bindings, common: Object.values(TemplateBindings), diff --git a/packages/worker/src/constants/index.js b/packages/worker/src/constants/index.js index b40446cc89..efb832ee1a 100644 --- a/packages/worker/src/constants/index.js +++ b/packages/worker/src/constants/index.js @@ -96,7 +96,9 @@ const TemplateBindings = { const TemplateMetadata = { [TemplateTypes.EMAIL]: [ { - name: "Base Format", + name: "Base format", + description: "This is the base template, all others are based on it. The {{ body }} will be replaced with another email template.", + category: "miscellaneous", purpose: EmailTemplatePurpose.BASE, bindings: [ { @@ -110,7 +112,9 @@ const TemplateMetadata = { ], }, { - name: "Password Recovery", + name: "Password recovery", + description: "When a user requests a password reset, this template will be used.", + category: "user management", purpose: EmailTemplatePurpose.PASSWORD_RECOVERY, bindings: [ { @@ -126,7 +130,16 @@ const TemplateMetadata = { ], }, { - name: "New User Invitation", + name: "User welcome", + description: "When a new user is added to the system, the welcome email will use this template.", + category: "user management", + purpose: EmailTemplatePurpose.WELCOME, + bindings: [], + }, + { + name: "User invitation", + description: "When using the email invitation system, this template will be used.", + category: "user management", purpose: EmailTemplatePurpose.INVITATION, bindings: [ { @@ -143,6 +156,8 @@ const TemplateMetadata = { }, { name: "Custom", + description: "A custom format, this is currently used for SMTP email actions in automations.", + category: "automations", purpose: EmailTemplatePurpose.CUSTOM, bindings: [ { From a31cce0ff9f1e06f5234d6b9f32740119fd83717 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 14 Jul 2021 13:18:27 +0100 Subject: [PATCH 02/11] Linting. --- .../builder/portal/manage/email/[template].svelte | 4 ++-- .../builder/portal/manage/email/index.svelte | 2 +- packages/worker/src/constants/index.js | 15 ++++++++++----- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/manage/email/[template].svelte b/packages/builder/src/pages/builder/portal/manage/email/[template].svelte index 41e682eb7c..60ff3d6110 100644 --- a/packages/builder/src/pages/builder/portal/manage/email/[template].svelte +++ b/packages/builder/src/pages/builder/portal/manage/email/[template].svelte @@ -91,8 +91,8 @@ Description {description} Change the email template here. Add dynamic content by using the bindings - menu on the right.Change the email template here. Add dynamic content by using the bindings + menu on the right. diff --git a/packages/builder/src/pages/builder/portal/manage/email/index.svelte b/packages/builder/src/pages/builder/portal/manage/email/index.svelte index 250e4d9375..4a2b21b691 100644 --- a/packages/builder/src/pages/builder/portal/manage/email/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/email/index.svelte @@ -29,7 +29,7 @@ category: { displayName: "Category", editable: false, - } + }, } $: emailInfo = getEmailInfo($email.definitions) diff --git a/packages/worker/src/constants/index.js b/packages/worker/src/constants/index.js index efb832ee1a..f18b94c794 100644 --- a/packages/worker/src/constants/index.js +++ b/packages/worker/src/constants/index.js @@ -97,7 +97,8 @@ const TemplateMetadata = { [TemplateTypes.EMAIL]: [ { name: "Base format", - description: "This is the base template, all others are based on it. The {{ body }} will be replaced with another email template.", + description: + "This is the base template, all others are based on it. The {{ body }} will be replaced with another email template.", category: "miscellaneous", purpose: EmailTemplatePurpose.BASE, bindings: [ @@ -113,7 +114,8 @@ const TemplateMetadata = { }, { name: "Password recovery", - description: "When a user requests a password reset, this template will be used.", + description: + "When a user requests a password reset, this template will be used.", category: "user management", purpose: EmailTemplatePurpose.PASSWORD_RECOVERY, bindings: [ @@ -131,14 +133,16 @@ const TemplateMetadata = { }, { name: "User welcome", - description: "When a new user is added to the system, the welcome email will use this template.", + description: + "When a new user is added to the system, the welcome email will use this template.", category: "user management", purpose: EmailTemplatePurpose.WELCOME, bindings: [], }, { name: "User invitation", - description: "When using the email invitation system, this template will be used.", + description: + "When using the email invitation system, this template will be used.", category: "user management", purpose: EmailTemplatePurpose.INVITATION, bindings: [ @@ -156,7 +160,8 @@ const TemplateMetadata = { }, { name: "Custom", - description: "A custom format, this is currently used for SMTP email actions in automations.", + description: + "A custom format, this is currently used for SMTP email actions in automations.", category: "automations", purpose: EmailTemplatePurpose.CUSTOM, bindings: [ From a9160f59143f15484728e61a0f65d8c9fd03fb9d Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 14 Jul 2021 13:24:46 +0100 Subject: [PATCH 03/11] Rewording email template descriptions. --- packages/worker/src/constants/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/worker/src/constants/index.js b/packages/worker/src/constants/index.js index f18b94c794..aec864be97 100644 --- a/packages/worker/src/constants/index.js +++ b/packages/worker/src/constants/index.js @@ -115,7 +115,7 @@ const TemplateMetadata = { { name: "Password recovery", description: - "When a user requests a password reset, this template will be used.", + "When a user requests a password reset they will receive an email built with this template.", category: "user management", purpose: EmailTemplatePurpose.PASSWORD_RECOVERY, bindings: [ @@ -134,7 +134,7 @@ const TemplateMetadata = { { name: "User welcome", description: - "When a new user is added to the system, the welcome email will use this template.", + "When a new user is added they will be sent a welcome email using this template.", category: "user management", purpose: EmailTemplatePurpose.WELCOME, bindings: [], @@ -142,7 +142,7 @@ const TemplateMetadata = { { name: "User invitation", description: - "When using the email invitation system, this template will be used.", + "When inviting a user via the email on-boarding this template will be used.", category: "user management", purpose: EmailTemplatePurpose.INVITATION, bindings: [ @@ -161,7 +161,7 @@ const TemplateMetadata = { { name: "Custom", description: - "A custom format, this is currently used for SMTP email actions in automations.", + "A custom template, this is currently used for SMTP email actions in automations.", category: "automations", purpose: EmailTemplatePurpose.CUSTOM, bindings: [ From 2bd79345188e59ac2a091a793a0067341ba742b4 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 15 Jul 2021 10:12:28 +0000 Subject: [PATCH 04/11] v0.9.75 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/server/package.json | 10 +++++----- packages/standard-components/package.json | 4 ++-- 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 0982cc8bb4..811c289001 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.74", + "version": "0.9.75", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index d93a57b47d..fd22b3c0f6 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "0.9.74", + "version": "0.9.75", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 5118c1b7cf..8be3d57649 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": "0.9.74", + "version": "0.9.75", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index 261db322d7..82ec7f4e5c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.9.74", + "version": "0.9.75", "license": "AGPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^0.9.74", - "@budibase/client": "^0.9.74", + "@budibase/bbui": "^0.9.75", + "@budibase/client": "^0.9.75", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^0.9.74", + "@budibase/string-templates": "^0.9.75", "@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 84ed8b7c91..788d8d0fd0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "0.9.74", + "version": "0.9.75", "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 c9f3935569..a8c6c050bf 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.9.74", + "version": "0.9.75", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -18,9 +18,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^0.9.74", - "@budibase/standard-components": "^0.9.74", - "@budibase/string-templates": "^0.9.74", + "@budibase/bbui": "^0.9.75", + "@budibase/standard-components": "^0.9.75", + "@budibase/string-templates": "^0.9.75", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index 4e225bd108..bef62d2615 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.9.74", + "version": "0.9.75", "description": "Budibase Web Server", "main": "src/index.js", "repository": { @@ -59,9 +59,9 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.74", - "@budibase/client": "^0.9.74", - "@budibase/string-templates": "^0.9.74", + "@budibase/auth": "^0.9.75", + "@budibase/client": "^0.9.75", + "@budibase/string-templates": "^0.9.75", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", @@ -114,7 +114,7 @@ "devDependencies": { "@babel/core": "^7.14.3", "@babel/preset-env": "^7.14.4", - "@budibase/standard-components": "^0.9.74", + "@budibase/standard-components": "^0.9.75", "@jest/test-sequencer": "^24.8.0", "@types/bull": "^3.15.1", "@types/jest": "^26.0.23", diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index 92fb39c914..d236ed72a8 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -29,11 +29,11 @@ "keywords": [ "svelte" ], - "version": "0.9.74", + "version": "0.9.75", "license": "MIT", "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc", "dependencies": { - "@budibase/bbui": "^0.9.74", + "@budibase/bbui": "^0.9.75", "@spectrum-css/link": "^3.1.3", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index f75a11cf4b..c888e6e8c6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.9.74", + "version": "0.9.75", "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 4d06b614ef..574a903b9b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "0.9.74", + "version": "0.9.75", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -21,8 +21,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.74", - "@budibase/string-templates": "^0.9.74", + "@budibase/auth": "^0.9.75", + "@budibase/string-templates": "^0.9.75", "@koa/router": "^8.0.0", "aws-sdk": "^2.811.0", "bcryptjs": "^2.4.3", From cda15789f7ace2de0d5613c4463ea933b77759b2 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Sat, 10 Jul 2021 11:56:32 +0100 Subject: [PATCH 05/11] Remove padding from empty layouts and add option for full width layout content --- packages/standard-components/manifest.json | 2 +- packages/standard-components/src/Layout.svelte | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json index 1fb470dfc3..78879e2803 100644 --- a/packages/standard-components/manifest.json +++ b/packages/standard-components/manifest.json @@ -27,7 +27,7 @@ "type": "select", "label": "Width", "key": "width", - "options": ["Small", "Medium", "Large"], + "options": ["Small", "Medium", "Large", "Max"], "defaultValue": "Large" }, { diff --git a/packages/standard-components/src/Layout.svelte b/packages/standard-components/src/Layout.svelte index 19a8404699..41110d6706 100644 --- a/packages/standard-components/src/Layout.svelte +++ b/packages/standard-components/src/Layout.svelte @@ -20,6 +20,7 @@ None: "none", } const widthClasses = { + Max: "max", Large: "l", Medium: "m", Small: "s", @@ -176,6 +177,9 @@ position: relative; padding: 32px; } + .layout--none .main { + padding: 0; + } .size--s { width: 800px; } @@ -185,6 +189,9 @@ .size--l { width: 1400px; } + .size--max { + width: 100%; + } /* Nav components */ .burger { From 2668f2ba405ca061c6aede967a1bea0438823884 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 15 Jul 2021 23:23:00 +0000 Subject: [PATCH 06/11] v0.9.76 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/server/package.json | 10 +++++----- packages/standard-components/package.json | 4 ++-- 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 811c289001..be14e50dcd 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.75", + "version": "0.9.76", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index fd22b3c0f6..ea691034d3 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "0.9.75", + "version": "0.9.76", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 8be3d57649..8853008bfe 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": "0.9.75", + "version": "0.9.76", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index 82ec7f4e5c..47df53f7f8 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.9.75", + "version": "0.9.76", "license": "AGPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^0.9.75", - "@budibase/client": "^0.9.75", + "@budibase/bbui": "^0.9.76", + "@budibase/client": "^0.9.76", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^0.9.75", + "@budibase/string-templates": "^0.9.76", "@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 788d8d0fd0..afdd2888ec 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "0.9.75", + "version": "0.9.76", "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 a8c6c050bf..82bacb4793 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.9.75", + "version": "0.9.76", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -18,9 +18,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^0.9.75", - "@budibase/standard-components": "^0.9.75", - "@budibase/string-templates": "^0.9.75", + "@budibase/bbui": "^0.9.76", + "@budibase/standard-components": "^0.9.76", + "@budibase/string-templates": "^0.9.76", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index bef62d2615..e366e3eb1c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.9.75", + "version": "0.9.76", "description": "Budibase Web Server", "main": "src/index.js", "repository": { @@ -59,9 +59,9 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.75", - "@budibase/client": "^0.9.75", - "@budibase/string-templates": "^0.9.75", + "@budibase/auth": "^0.9.76", + "@budibase/client": "^0.9.76", + "@budibase/string-templates": "^0.9.76", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", @@ -114,7 +114,7 @@ "devDependencies": { "@babel/core": "^7.14.3", "@babel/preset-env": "^7.14.4", - "@budibase/standard-components": "^0.9.75", + "@budibase/standard-components": "^0.9.76", "@jest/test-sequencer": "^24.8.0", "@types/bull": "^3.15.1", "@types/jest": "^26.0.23", diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index d236ed72a8..02e3e71582 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -29,11 +29,11 @@ "keywords": [ "svelte" ], - "version": "0.9.75", + "version": "0.9.76", "license": "MIT", "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc", "dependencies": { - "@budibase/bbui": "^0.9.75", + "@budibase/bbui": "^0.9.76", "@spectrum-css/link": "^3.1.3", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index c888e6e8c6..9fed87c6a0 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.9.75", + "version": "0.9.76", "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 574a903b9b..086191b058 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "0.9.75", + "version": "0.9.76", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -21,8 +21,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.75", - "@budibase/string-templates": "^0.9.75", + "@budibase/auth": "^0.9.76", + "@budibase/string-templates": "^0.9.76", "@koa/router": "^8.0.0", "aws-sdk": "^2.811.0", "bcryptjs": "^2.4.3", From 126bf74347fac68ab72e4ef18d550b925dc3bcce Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Fri, 16 Jul 2021 19:13:44 +0100 Subject: [PATCH 07/11] Fixing issue with update row after rows API changed. --- packages/server/src/automations/steps/updateRow.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/server/src/automations/steps/updateRow.js b/packages/server/src/automations/steps/updateRow.js index f873eecbdb..206e429efa 100644 --- a/packages/server/src/automations/steps/updateRow.js +++ b/packages/server/src/automations/steps/updateRow.js @@ -76,7 +76,10 @@ module.exports.run = async function ({ inputs, appId, emitter }) { rowId: inputs.rowId, }, request: { - body: inputs.row, + body: { + ...inputs.row, + _id: inputs.rowId, + }, }, appId, eventEmitter: emitter, From ec19ff23c2c5a202167ca3acb1eb8126bddeabd4 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 16 Jul 2021 18:52:46 +0000 Subject: [PATCH 08/11] v0.9.77 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/server/package.json | 10 +++++----- packages/standard-components/package.json | 4 ++-- 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 be14e50dcd..ef3fc2205f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.76", + "version": "0.9.77", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index ea691034d3..c2ab51abf5 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "0.9.76", + "version": "0.9.77", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 8853008bfe..db4a38fadc 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": "0.9.76", + "version": "0.9.77", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index 47df53f7f8..1f17c24138 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.9.76", + "version": "0.9.77", "license": "AGPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^0.9.76", - "@budibase/client": "^0.9.76", + "@budibase/bbui": "^0.9.77", + "@budibase/client": "^0.9.77", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^0.9.76", + "@budibase/string-templates": "^0.9.77", "@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 afdd2888ec..8c969b0c96 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "0.9.76", + "version": "0.9.77", "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 82bacb4793..31a9fd1317 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.9.76", + "version": "0.9.77", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -18,9 +18,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^0.9.76", - "@budibase/standard-components": "^0.9.76", - "@budibase/string-templates": "^0.9.76", + "@budibase/bbui": "^0.9.77", + "@budibase/standard-components": "^0.9.77", + "@budibase/string-templates": "^0.9.77", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index e366e3eb1c..cad591aa0b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.9.76", + "version": "0.9.77", "description": "Budibase Web Server", "main": "src/index.js", "repository": { @@ -59,9 +59,9 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.76", - "@budibase/client": "^0.9.76", - "@budibase/string-templates": "^0.9.76", + "@budibase/auth": "^0.9.77", + "@budibase/client": "^0.9.77", + "@budibase/string-templates": "^0.9.77", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", @@ -114,7 +114,7 @@ "devDependencies": { "@babel/core": "^7.14.3", "@babel/preset-env": "^7.14.4", - "@budibase/standard-components": "^0.9.76", + "@budibase/standard-components": "^0.9.77", "@jest/test-sequencer": "^24.8.0", "@types/bull": "^3.15.1", "@types/jest": "^26.0.23", diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index 02e3e71582..3f64b47605 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -29,11 +29,11 @@ "keywords": [ "svelte" ], - "version": "0.9.76", + "version": "0.9.77", "license": "MIT", "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc", "dependencies": { - "@budibase/bbui": "^0.9.76", + "@budibase/bbui": "^0.9.77", "@spectrum-css/link": "^3.1.3", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 9fed87c6a0..c1be820ebc 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.9.76", + "version": "0.9.77", "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 086191b058..c1e8e32a3d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "0.9.76", + "version": "0.9.77", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -21,8 +21,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.76", - "@budibase/string-templates": "^0.9.76", + "@budibase/auth": "^0.9.77", + "@budibase/string-templates": "^0.9.77", "@koa/router": "^8.0.0", "aws-sdk": "^2.811.0", "bcryptjs": "^2.4.3", From 65358cf10d3cfdf13da8b2aac8f0e266a5854626 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 19 Jul 2021 14:31:06 +0100 Subject: [PATCH 09/11] Fixing an issue with lucene equality searching, strings weren't handled correctly. --- packages/server/src/api/controllers/row/internalSearch.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js index 7225ab633a..91cfdcbcb6 100644 --- a/packages/server/src/api/controllers/row/internalSearch.js +++ b/packages/server/src/api/controllers/row/internalSearch.js @@ -148,12 +148,16 @@ class QueryBuilder { } if (this.query.equal) { build(this.query.equal, (key, value) => { - return value ? `${key}:${luceneEscape(value.toLowerCase())}` : null + const escapedValue = luceneEscape(value.toLowerCase()) + // have to do the or to manage straight values, or strings + return value ? `(${key}:${escapedValue} OR ${key}:"${escapedValue}")` : null }) } if (this.query.notEqual) { build(this.query.notEqual, (key, value) => { - return value ? `!${key}:${luceneEscape(value.toLowerCase())}` : null + const escapedValue = luceneEscape(value.toLowerCase()) + // have to do the or to manage straight values, or strings + return value ? `(!${key}:${escapedValue} OR !${key}:"${escapedValue}")` : null }) } if (this.query.empty) { From 2ec00c32b6a0d3c94902f52fa5b6b28c93eec9ac Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 19 Jul 2021 14:32:14 +0100 Subject: [PATCH 10/11] Linting. --- packages/server/src/api/controllers/row/internalSearch.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js index 91cfdcbcb6..72f5e6e5c8 100644 --- a/packages/server/src/api/controllers/row/internalSearch.js +++ b/packages/server/src/api/controllers/row/internalSearch.js @@ -150,14 +150,18 @@ class QueryBuilder { build(this.query.equal, (key, value) => { const escapedValue = luceneEscape(value.toLowerCase()) // have to do the or to manage straight values, or strings - return value ? `(${key}:${escapedValue} OR ${key}:"${escapedValue}")` : null + return value + ? `(${key}:${escapedValue} OR ${key}:"${escapedValue}")` + : null }) } if (this.query.notEqual) { build(this.query.notEqual, (key, value) => { const escapedValue = luceneEscape(value.toLowerCase()) // have to do the or to manage straight values, or strings - return value ? `(!${key}:${escapedValue} OR !${key}:"${escapedValue}")` : null + return value + ? `(!${key}:${escapedValue} OR !${key}:"${escapedValue}")` + : null }) } if (this.query.empty) { From d8136d07040e6d683c9ccc1b1b17520cdc4e11d9 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 19 Jul 2021 14:23:03 +0000 Subject: [PATCH 11/11] v0.9.78 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/server/package.json | 10 +++++----- packages/standard-components/package.json | 4 ++-- 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 ef3fc2205f..27fbed5858 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.77", + "version": "0.9.78", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index c2ab51abf5..b6fb24c147 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "0.9.77", + "version": "0.9.78", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index db4a38fadc..5e11c19012 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": "0.9.77", + "version": "0.9.78", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index 1f17c24138..aa6b165731 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.9.77", + "version": "0.9.78", "license": "AGPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^0.9.77", - "@budibase/client": "^0.9.77", + "@budibase/bbui": "^0.9.78", + "@budibase/client": "^0.9.78", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^0.9.77", + "@budibase/string-templates": "^0.9.78", "@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 8c969b0c96..549eda4f42 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "0.9.77", + "version": "0.9.78", "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 31a9fd1317..5c75abd6b8 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.9.77", + "version": "0.9.78", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -18,9 +18,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^0.9.77", - "@budibase/standard-components": "^0.9.77", - "@budibase/string-templates": "^0.9.77", + "@budibase/bbui": "^0.9.78", + "@budibase/standard-components": "^0.9.78", + "@budibase/string-templates": "^0.9.78", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index cad591aa0b..7a879db68b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.9.77", + "version": "0.9.78", "description": "Budibase Web Server", "main": "src/index.js", "repository": { @@ -59,9 +59,9 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.77", - "@budibase/client": "^0.9.77", - "@budibase/string-templates": "^0.9.77", + "@budibase/auth": "^0.9.78", + "@budibase/client": "^0.9.78", + "@budibase/string-templates": "^0.9.78", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", @@ -114,7 +114,7 @@ "devDependencies": { "@babel/core": "^7.14.3", "@babel/preset-env": "^7.14.4", - "@budibase/standard-components": "^0.9.77", + "@budibase/standard-components": "^0.9.78", "@jest/test-sequencer": "^24.8.0", "@types/bull": "^3.15.1", "@types/jest": "^26.0.23", diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index 3f64b47605..7874a9ef04 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -29,11 +29,11 @@ "keywords": [ "svelte" ], - "version": "0.9.77", + "version": "0.9.78", "license": "MIT", "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc", "dependencies": { - "@budibase/bbui": "^0.9.77", + "@budibase/bbui": "^0.9.78", "@spectrum-css/link": "^3.1.3", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index c1be820ebc..b120864673 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.9.77", + "version": "0.9.78", "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 c1e8e32a3d..958087ac0a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "0.9.77", + "version": "0.9.78", "description": "Budibase background service", "main": "src/index.js", "repository": { @@ -21,8 +21,8 @@ "author": "Budibase", "license": "AGPL-3.0-or-later", "dependencies": { - "@budibase/auth": "^0.9.77", - "@budibase/string-templates": "^0.9.77", + "@budibase/auth": "^0.9.78", + "@budibase/string-templates": "^0.9.78", "@koa/router": "^8.0.0", "aws-sdk": "^2.811.0", "bcryptjs": "^2.4.3",