From a790d6cd74147fd487367bdcd380e245ecedad2e Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Fri, 22 Sep 2023 11:05:24 +0100 Subject: [PATCH 1/3] Let null and blank strings be saved as they are --- packages/server/src/api/controllers/row/ExternalRequest.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts index 2c4428599b..e5b2a82311 100644 --- a/packages/server/src/api/controllers/row/ExternalRequest.ts +++ b/packages/server/src/api/controllers/row/ExternalRequest.ts @@ -305,12 +305,7 @@ export class ExternalRequest { manyRelationships: ManyRelationship[] = [] for (let [key, field] of Object.entries(table.schema)) { // if set already, or not set just skip it - if (row[key] == null || newRow[key] || !isEditableColumn(field)) { - continue - } - // if its an empty string then it means return the column to null (if possible) - if (row[key] === "") { - newRow[key] = null + if (row[key] === undefined || newRow[key] || !isEditableColumn(field)) { continue } // parse floats/numbers From fc5f14e04f1b3405238c79a884a014377c2cafe2 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Fri, 22 Sep 2023 11:17:09 +0100 Subject: [PATCH 2/3] Use null coalescing --- packages/bbui/src/Form/Core/TextField.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/bbui/src/Form/Core/TextField.svelte b/packages/bbui/src/Form/Core/TextField.svelte index b3b0865c64..7afd8f86c3 100644 --- a/packages/bbui/src/Form/Core/TextField.svelte +++ b/packages/bbui/src/Form/Core/TextField.svelte @@ -96,8 +96,8 @@ {disabled} {readonly} {id} - value={value || ""} - placeholder={placeholder || ""} + value={value ?? ""} + placeholder={placeholder ?? ""} on:click on:blur on:focus From 3bae1662ef368729c050e50fec6980dc075351ef Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Fri, 22 Sep 2023 11:35:01 +0100 Subject: [PATCH 3/3] Null coalesce --- .../frontend-core/src/components/grid/cells/TextCell.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend-core/src/components/grid/cells/TextCell.svelte b/packages/frontend-core/src/components/grid/cells/TextCell.svelte index 04485a6b50..d2ee0189fe 100644 --- a/packages/frontend-core/src/components/grid/cells/TextCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/TextCell.svelte @@ -45,7 +45,7 @@ on:focus={() => (active = true)} on:blur={() => (active = false)} {type} - value={value || ""} + value={value ?? ""} on:change={handleChange} spellcheck="false" />