From 14a7ab65449e5e97f8d8fe39ebbb92d8d6d748ea Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 3 Apr 2024 19:45:01 +0100 Subject: [PATCH 1/6] update account portal SHA --- packages/account-portal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/account-portal b/packages/account-portal index 360ad2dc29..1828e332c1 160000 --- a/packages/account-portal +++ b/packages/account-portal @@ -1 +1 @@ -Subproject commit 360ad2dc29c3f1fd5a1182ae258c45666b7f5eb1 +Subproject commit 1828e332c1d477b13a608a13e6ed4aea6d55b366 From e943555473debfd2da2a0e76d091031b4e9b863b Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 3 Apr 2024 20:24:04 +0100 Subject: [PATCH 2/6] acct portal sha --- packages/account-portal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/account-portal b/packages/account-portal index 1828e332c1..011fa3c175 160000 --- a/packages/account-portal +++ b/packages/account-portal @@ -1 +1 @@ -Subproject commit 1828e332c1d477b13a608a13e6ed4aea6d55b366 +Subproject commit 011fa3c175ae0a1bbbb0f6e1341ba0154bca5c76 From 996984ec37cbc62b6c2f8825f1e4e039d81f0fcd Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 4 Apr 2024 07:55:39 +0000 Subject: [PATCH 3/6] Bump version to 2.22.16 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 93b103ee00..7186c0ca17 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.22.15", + "version": "2.22.16", "npmClient": "yarn", "packages": [ "packages/*", From a1a06b5d186623d765a14b643b3fbc5679bd48e8 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 4 Apr 2024 13:52:57 +0200 Subject: [PATCH 4/6] Fix import --- packages/server/src/utilities/schema.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/utilities/schema.ts b/packages/server/src/utilities/schema.ts index 85dfdd3506..34113759ed 100644 --- a/packages/server/src/utilities/schema.ts +++ b/packages/server/src/utilities/schema.ts @@ -54,7 +54,7 @@ export function validate(rows: Rows, schema: TableSchema): ValidationResults { type: columnType, subtype: columnSubtype, autocolumn: isAutoColumn, - } = schema[columnName] + } = schema[columnName] || {} // If the column had an invalid value we don't want to override it if (results.schemaValidation[columnName] === false) { From 5a82de01dd31c2fde07172d154ed41a1234b4f12 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 4 Apr 2024 13:54:45 +0200 Subject: [PATCH 5/6] Display "Attachment" on UI --- .../backend/TableNavigator/ExistingTableDataImport.svelte | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte index eb1e7bc7ff..efbfd26565 100644 --- a/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte +++ b/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte @@ -49,7 +49,10 @@ label: "Long Form Text", value: FIELDS.LONGFORM.type, }, - + { + label: "Attachment", + value: FIELDS.ATTACHMENT.type, + }, { label: "User", value: `${FIELDS.USER.type}${FIELDS.USER.subtype}`, From 60f782d33d5fd0bde71cfe9489656d7af544f8fb Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 4 Apr 2024 14:14:51 +0200 Subject: [PATCH 6/6] Update account-portal --- packages/account-portal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/account-portal b/packages/account-portal index 011fa3c175..532c4db35c 160000 --- a/packages/account-portal +++ b/packages/account-portal @@ -1 +1 @@ -Subproject commit 011fa3c175ae0a1bbbb0f6e1341ba0154bca5c76 +Subproject commit 532c4db35cecd346b5c24f0b89ab7b397a122a36