From da706f4252ff169d7527251f9c2c2bfa762d840d Mon Sep 17 00:00:00 2001 From: Mert E Date: Fri, 14 Jun 2024 12:05:03 +0300 Subject: [PATCH] fix: avoid marking updated on select (#8741) * fix: avoid marking updated on select * fix: handle null/undefined meta * fix: use local meta for field details * fix: avoid creating options on update * fix: improve readability --- .../smartsheet/column/AttachmentOptions.vue | 2 +- .../smartsheet/column/BarcodeOptions.vue | 20 +-- .../smartsheet/column/CheckboxOptions.vue | 10 +- .../smartsheet/column/CurrencyOptions.vue | 7 +- .../smartsheet/column/DateOptions.vue | 9 +- .../smartsheet/column/DateTimeOptions.vue | 18 +-- .../smartsheet/column/DecimalOptions.vue | 5 +- .../smartsheet/column/DurationOptions.vue | 6 +- .../smartsheet/column/LinkOptions.vue | 2 +- .../smartsheet/column/NumberOptions.vue | 4 +- .../smartsheet/column/PercentOptions.vue | 6 +- .../smartsheet/column/RatingOptions.vue | 36 +----- .../smartsheet/column/TimeOptions.vue | 4 +- .../smartsheet/column/UserOptions.vue | 7 +- .../components/smartsheet/details/Fields.vue | 45 +++++-- packages/nc-gui/composables/useViewGroupBy.ts | 2 + packages/nc-gui/helpers/columnDefaultMeta.ts | 119 ++++++++++++++++++ .../nocodb/src/services/columns.service.ts | 2 +- 18 files changed, 207 insertions(+), 97 deletions(-) create mode 100644 packages/nc-gui/helpers/columnDefaultMeta.ts diff --git a/packages/nc-gui/components/smartsheet/column/AttachmentOptions.vue b/packages/nc-gui/components/smartsheet/column/AttachmentOptions.vue index ac631a85be..be8a20d35f 100644 --- a/packages/nc-gui/components/smartsheet/column/AttachmentOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/AttachmentOptions.vue @@ -33,7 +33,7 @@ vModel.value.meta = { // allow all mime types by default supportedAttachmentMimeTypes: ['*'], }), - ...vModel.value.meta, + ...(vModel.value.meta || {}), } const expandedKeys = ref<(string | number)[]>([]) diff --git a/packages/nc-gui/components/smartsheet/column/BarcodeOptions.vue b/packages/nc-gui/components/smartsheet/column/BarcodeOptions.vue index e1085cffaa..14bff16e65 100644 --- a/packages/nc-gui/components/smartsheet/column/BarcodeOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/BarcodeOptions.vue @@ -1,5 +1,5 @@ diff --git a/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue b/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue index 8ecb98be33..81c4e69ae9 100644 --- a/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue @@ -1,5 +1,5 @@ diff --git a/packages/nc-gui/components/smartsheet/column/DecimalOptions.vue b/packages/nc-gui/components/smartsheet/column/DecimalOptions.vue index 11adec8061..42ac23ffd2 100644 --- a/packages/nc-gui/components/smartsheet/column/DecimalOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/DecimalOptions.vue @@ -1,4 +1,6 @@ diff --git a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue index 3c4fd075c0..69109f7e4c 100644 --- a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue @@ -44,7 +44,7 @@ setAdditionalValidations({ vModel.value.meta = { singular: '', plural: '', - ...vModel.value.meta, + ...(vModel.value.meta || {}), } diff --git a/packages/nc-gui/components/smartsheet/column/NumberOptions.vue b/packages/nc-gui/components/smartsheet/column/NumberOptions.vue index e43bb4efcd..2732180a26 100644 --- a/packages/nc-gui/components/smartsheet/column/NumberOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/NumberOptions.vue @@ -1,4 +1,6 @@ diff --git a/packages/nc-gui/components/smartsheet/column/PercentOptions.vue b/packages/nc-gui/components/smartsheet/column/PercentOptions.vue index 26c43fd463..7e3592dbe8 100644 --- a/packages/nc-gui/components/smartsheet/column/PercentOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/PercentOptions.vue @@ -1,4 +1,6 @@ diff --git a/packages/nc-gui/components/smartsheet/column/RatingOptions.vue b/packages/nc-gui/components/smartsheet/column/RatingOptions.vue index 596d282016..892517542f 100644 --- a/packages/nc-gui/components/smartsheet/column/RatingOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/RatingOptions.vue @@ -1,4 +1,6 @@ diff --git a/packages/nc-gui/components/smartsheet/column/UserOptions.vue b/packages/nc-gui/components/smartsheet/column/UserOptions.vue index 4235bb120e..f8135393d7 100644 --- a/packages/nc-gui/components/smartsheet/column/UserOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/UserOptions.vue @@ -1,4 +1,6 @@