From 87be6230575647e3f4eb4f2678711e78a04b0bf8 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Fri, 19 Jan 2024 11:26:13 +0000 Subject: [PATCH 1/3] Remove auto naming of columns (#12816) * Remove auto column naming * Let enter key save edit table name * update submodules --- .../DataTable/modals/CreateEditColumn.svelte | 21 ------------------- .../popovers/EditTablePopover.svelte | 19 ++++++++++------- yarn.lock | 5 +++++ 3 files changed, 16 insertions(+), 29 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte index 936eb614d6..0328759908 100644 --- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte @@ -172,22 +172,6 @@ } } } - if (!savingColumn && !originalName) { - let highestNumber = 0 - Object.keys(table.schema).forEach(columnName => { - const columnNumber = extractColumnNumber(columnName) - if (columnNumber > highestNumber) { - highestNumber = columnNumber - } - return highestNumber - }) - - if (highestNumber >= 1) { - editableColumn.name = `Column 0${highestNumber + 1}` - } else { - editableColumn.name = "Column 01" - } - } if (!savingColumn) { editableColumn.fieldId = makeFieldId( @@ -389,11 +373,6 @@ deleteColName = "" } - function extractColumnNumber(columnName) { - const match = columnName.match(/Column (\d+)/) - return match ? parseInt(match[1]) : 0 - } - function getAllowedTypes() { if ( originalName && diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte index 18c0d460a8..f4b2a2fc25 100644 --- a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte +++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte @@ -17,7 +17,7 @@ export let table - let editorModal + let editorModal, editTableNameModal let confirmDeleteDialog let error = "" @@ -101,18 +101,21 @@ - +
editTableNameModal.confirm()}> + +
Date: Fri, 19 Jan 2024 11:32:13 +0000 Subject: [PATCH 2/3] Support custom validation rules for ejected block fields (#12799) --- .../components/app/blocks/CardsBlock.svelte | 2 +- .../components/app/blocks/TableBlock.svelte | 2 +- .../src/components/app/forms/Form.svelte | 4 +-- .../src/components/app/forms/InnerForm.svelte | 35 +++++++++---------- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/packages/client/src/components/app/blocks/CardsBlock.svelte b/packages/client/src/components/app/blocks/CardsBlock.svelte index 3e48247f92..e0985a8979 100644 --- a/packages/client/src/components/app/blocks/CardsBlock.svelte +++ b/packages/client/src/components/app/blocks/CardsBlock.svelte @@ -88,7 +88,7 @@ {#if title || enrichedSearchColumns?.length || showTitleButton} diff --git a/packages/client/src/components/app/forms/InnerForm.svelte b/packages/client/src/components/app/forms/InnerForm.svelte index 9d0db43bf4..55c9c938c3 100644 --- a/packages/client/src/components/app/forms/InnerForm.svelte +++ b/packages/client/src/components/app/forms/InnerForm.svelte @@ -11,7 +11,7 @@ export let size export let schema export let table - export let disableValidation = false + export let disableSchemaValidation = false export let editAutoColumns = false // We export this store so that when we remount the inner form we can still @@ -156,17 +156,16 @@ if (!field) { return } - // Create validation function based on field schema - const schemaConstraints = schema?.[field]?.constraints - const validator = disableValidation + const schemaConstraints = disableSchemaValidation ? null - : createValidatorFromConstraints( - schemaConstraints, - validationRules, - field, - table - ) + : schema?.[field]?.constraints + const validator = createValidatorFromConstraints( + schemaConstraints, + validationRules, + field, + table + ) // Sanitise the default value to ensure it doesn't contain invalid data defaultValue = sanitiseValue(defaultValue, schema?.[field], type) @@ -332,15 +331,15 @@ const { value, error } = fieldState // Create new validator - const schemaConstraints = schema?.[field]?.constraints - const validator = disableValidation + const schemaConstraints = disableSchemaValidation ? null - : createValidatorFromConstraints( - schemaConstraints, - validationRules, - field, - table - ) + : schema?.[field]?.constraints + const validator = createValidatorFromConstraints( + schemaConstraints, + validationRules, + field, + table + ) // Update validator fieldInfo.update(state => { From 2f410cf0b69d8913b7bf4ec50ada30032b0863b3 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 19 Jan 2024 11:34:43 +0000 Subject: [PATCH 3/3] Bump version to 2.15.1 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index f058050495..5fe9a6b261 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.15.0", + "version": "2.15.1", "npmClient": "yarn", "packages": [ "packages/*",