From 74ed70dc2a958672d884032cfe853efd9a1d9338 Mon Sep 17 00:00:00 2001 From: Muhammed Mustafa Date: Thu, 26 Oct 2023 17:05:38 +0000 Subject: [PATCH] fix: Added feature flag for create view btn --- .../components/dashboard/TreeView/TableNode.vue | 5 ++++- .../components/dashboard/TreeView/ViewsList.vue | 4 +++- packages/nc-gui/components/smartsheet/Toolbar.vue | 12 ++++++++++++ packages/nc-gui/store/config.ts | 4 ++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue index af6b05e45c..9ba6b50641 100644 --- a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue +++ b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue @@ -51,6 +51,7 @@ const { setMenuContext, openRenameTableDialog, duplicateTable } = inject(TreeVie const { loadViews: _loadViews } = useViewsStore() const { activeView } = storeToRefs(useViewsStore()) const { isLeftSidebarOpen } = storeToRefs(useSidebarStore()) +const { showCreateViewAllTimes } = storeToRefs(useConfigStore()) const { viewsByTable } = storeToRefs(useViewsStore()) @@ -122,7 +123,7 @@ const onOpenTable = async () => { isLeftSidebarOpen.value = false } - emit('openTable', true) + if (!showCreateViewAllTimes.value) emit('openTable', true) } catch (e) { message.error(await extractSdkResponseErrorMsg(e)) } finally { @@ -150,6 +151,8 @@ const isTableOpened = computed(() => { }) watch(activeTableId, () => { + if (showCreateViewAllTimes.value) return + if (activeTableId.value !== table.value.id && views.value.length === 0) { isExpanded.value = false } diff --git a/packages/nc-gui/components/dashboard/TreeView/ViewsList.vue b/packages/nc-gui/components/dashboard/TreeView/ViewsList.vue index 6423f3e1f3..9fcffd60be 100644 --- a/packages/nc-gui/components/dashboard/TreeView/ViewsList.vue +++ b/packages/nc-gui/components/dashboard/TreeView/ViewsList.vue @@ -33,6 +33,8 @@ const table = inject(SidebarTableInj)! const { isLeftSidebarOpen } = storeToRefs(useSidebarStore()) +const { showCreateViewAllTimes } = storeToRefs(useConfigStore()) + const { activeTableId } = storeToRefs(useTablesStore()) const { isUIAllowed } = useRoles() @@ -387,7 +389,7 @@ function onOpenModal({ { + showCreateViewAllTimes.value = !showCreateViewAllTimes.value + + message.info({ + content: showCreateViewAllTimes.value ? 'Create View All Times' : 'Create View Once', + }) +} +
+