From a052f8873d5324efb499e0cbc3e429b32dae5493 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 4 Jan 2024 13:57:10 +0100 Subject: [PATCH 1/5] Register paths on ts-node from worker --- packages/worker/tsconfig.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/worker/tsconfig.json b/packages/worker/tsconfig.json index 4bcb6283d4..a02147aa81 100644 --- a/packages/worker/tsconfig.json +++ b/packages/worker/tsconfig.json @@ -4,6 +4,9 @@ "composite": true, "baseUrl": "." }, + "ts-node": { + "require": ["tsconfig-paths/register"] + }, "include": ["src/**/*", "__mocks__/**/*"], "exclude": ["node_modules", "dist"] } From afd1db4fb74f9a502ac778b39a7c71faed99be38 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Thu, 4 Jan 2024 13:02:28 +0000 Subject: [PATCH 2/5] Support bindings in User field for automations (#12704) --- .../components/common/bindings/DrawerBindableSlot.svelte | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte b/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte index 6689ddb650..771f5d7fe2 100644 --- a/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte +++ b/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte @@ -44,7 +44,11 @@ }) const onChange = value => { - if (type === "link" && value && hasValidLinks(value)) { + if ( + (type === "link" || type === "bb_reference") && + value && + hasValidLinks(value) + ) { currentVal = value.split(",") } else if (type === "array" && value && hasValidOptions(value)) { currentVal = value.split(",") @@ -95,6 +99,7 @@ date: isValidDate, datetime: isValidDate, link: hasValidLinks, + bb_reference: hasValidLinks, array: hasValidOptions, longform: value => !isJSBinding(value), json: value => !isJSBinding(value), From ed148c71d1183eb871ba42f7a7bbd0eb6b2d6c4d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 4 Jan 2024 13:04:57 +0000 Subject: [PATCH 3/5] Bump version to 2.14.1 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index a63b824b87..5560f895c7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.14.0", + "version": "2.14.1", "npmClient": "yarn", "packages": [ "packages/*", From 91fb70b2263fea510d812f455cb13a6bbada09b6 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 4 Jan 2024 15:05:09 +0000 Subject: [PATCH 4/5] Bump version to 2.14.2 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 5560f895c7..71c53cd3fa 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.14.1", + "version": "2.14.2", "npmClient": "yarn", "packages": [ "packages/*", From 92950cef91893f4b6f3d8e3d10e8ed2f03196e5a Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 4 Jan 2024 15:43:11 +0100 Subject: [PATCH 5/5] Maintain views on finaliseExternalTables --- packages/server/src/integrations/utils.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/server/src/integrations/utils.ts b/packages/server/src/integrations/utils.ts index 89612cc251..102dfe2935 100644 --- a/packages/server/src/integrations/utils.ts +++ b/packages/server/src/integrations/utils.ts @@ -305,8 +305,8 @@ export function shouldCopySpecialColumn( } /** - * Looks for columns which need to be copied over into the new table definitions, like relationships - * and options types. + * Looks for columns which need to be copied over into the new table definitions, like relationships, + * options types and views. * @param tableName The name of the table which is being checked. * @param table The specific table which is being checked. * @param entities All the tables that existed before - the old table definitions. @@ -325,6 +325,9 @@ function copyExistingPropsOver( if (entities[tableName]?.created) { table.created = entities[tableName]?.created } + + table.views = entities[tableName].views + const existingTableSchema = entities[tableName].schema for (let key in existingTableSchema) { if (!existingTableSchema.hasOwnProperty(key)) {