diff --git a/packages/nc-gui/components/cell/MultiSelect.vue b/packages/nc-gui/components/cell/MultiSelect.vue index 8adc8d6382..1060125573 100644 --- a/packages/nc-gui/components/cell/MultiSelect.vue +++ b/packages/nc-gui/components/cell/MultiSelect.vue @@ -280,7 +280,6 @@ async function addIfMissingAndSave() { updatedColMeta, ) - column.value.colOptions = data.columns.find((c) => c.id === column.value.id).colOptions activeOptCreateInProgress.value-- diff --git a/packages/nc-gui/composables/useExtensions.ts b/packages/nc-gui/composables/useExtensions.ts index c9a571b03e..97afd9b705 100644 --- a/packages/nc-gui/composables/useExtensions.ts +++ b/packages/nc-gui/composables/useExtensions.ts @@ -447,7 +447,7 @@ export const useExtensions = createSharedComposable(() => { if (availableExtensions.value.length + disabledCount === extensionCount) { // Sort extensions - availableExtensions.value.sort((a, b) => a.title.localeCompare(b.title)) + availableExtensions.value.sort((a, b) => (a.order ?? Infinity) - (b.order ?? Infinity)) extensionsLoaded.value = true } } catch (error) { diff --git a/packages/nc-gui/utils/dataUtils.ts b/packages/nc-gui/utils/dataUtils.ts index dbdd9c0f58..34f7a04ff1 100644 --- a/packages/nc-gui/utils/dataUtils.ts +++ b/packages/nc-gui/utils/dataUtils.ts @@ -141,16 +141,16 @@ export const rowDefaultData = (columns: ColumnType[] = []) => { } export const isRowEmpty = (record: Row, col: ColumnType): boolean => { - if (!record || !col || !col.title) return true; + if (!record || !col || !col.title) return true - return !isValidValue(record.row[col.title]); -}; + return !isValidValue(record.row[col.title]) +} export const isRowRecordEmpty = (record: Record, col: ColumnType): boolean => { - if (!record || !col || !col.title) return true; + if (!record || !col || !col.title) return true - return !isValidValue(record[col.title]); -}; + return !isValidValue(record[col.title]) +} export function validateRowFilters(_filters: FilterType[], data: any, columns: ColumnType[], client: any) { if (!_filters.length) {