From 505cace23778050744ab5facedba6883d19c34bd Mon Sep 17 00:00:00 2001 From: DarkPhoenix2704 Date: Sat, 27 Jul 2024 06:04:53 +0000 Subject: [PATCH] fix: handle when active_view is null --- .../components/dashboard/TreeView/TableNode.vue | 17 +++++++++-------- packages/nc-gui/composables/useTableNew.ts | 1 - 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue index b226482f27..653d7d72b7 100644 --- a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue +++ b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue @@ -51,8 +51,6 @@ const { loadViews: _loadViews, navigateToView } = useViewsStore() const { activeView, activeViewTitleOrId, viewsByTable } = storeToRefs(useViewsStore()) const { isLeftSidebarOpen } = storeToRefs(useSidebarStore()) -const views = computed(() => viewsByTable.value.get(table.value.id!)) - const { refreshCommandPalette } = useCommandPalette() // todo: temp @@ -214,18 +212,21 @@ const deleteTable = () => { function onDuplicate() { isOptionsOpen.value = false + const views = viewsByTable.value.get(table.value.id as string) + const defaultView = views?.find((v) => v.is_default) || views?.[0] + const isOpen = ref(true) const { close } = useDialog(resolveComponent('DlgViewCreate'), { 'modelValue': isOpen, - 'title': activeView.value!.title, - 'type': activeView.value!.type as ViewTypes, + 'title': defaultView!.title, + 'type': defaultView!.type as ViewTypes, 'tableId': table.value!.id, - 'selectedViewId': activeView.value!.id, - 'groupingFieldColumnId': activeView.value!.view!.fk_grp_col_id, + 'selectedViewId': defaultView!.id, + 'groupingFieldColumnId': defaultView!.view!.fk_grp_col_id, 'views': views, - 'calendarRange': activeView.value!.view!.calendar_range, - 'coverImageColumnId': activeView.value!.view!.fk_cover_image_col_id, + 'calendarRange': defaultView!.view!.calendar_range, + 'coverImageColumnId': defaultView!.view!.fk_cover_image_col_id, 'onUpdate:modelValue': closeDialog, 'onCreated': async (view: ViewType) => { closeDialog() diff --git a/packages/nc-gui/composables/useTableNew.ts b/packages/nc-gui/composables/useTableNew.ts index 513512ff63..d092edf07c 100644 --- a/packages/nc-gui/composables/useTableNew.ts +++ b/packages/nc-gui/composables/useTableNew.ts @@ -266,7 +266,6 @@ export function useTableNew(param: { onTableCreate?: (tableMeta: TableType) => v table, tables, base, - createTable, generateUniqueTitle, deleteTable,