{
return (basesUser.value.get(base.value?.id) || []).map((user: any) => {
@@ -199,10 +199,6 @@ function openTableCreateDialog(sourceIndex?: number | undefined, showSourceSelec
onCloseCallback: () => {
base.value.isExpanded = true
- if (forceShowBaseList.value) {
- forceShowBaseList.value = false
- }
-
if (!activeKey.value || !activeKey.value.includes(`collapse-${sourceId}`)) {
activeKey.value.push(`collapse-${sourceId}`)
}
@@ -245,7 +241,6 @@ const onProjectClick = async (base: NcProject, ignoreNavigation?: boolean, toggl
const cmdOrCtrl = isMac() ? metaKey.value : control.value
if (!cmdOrCtrl && activeProjectId.value === base.id) {
- forceShowBaseList.value = false
showProjectList.value = false
return
}
@@ -301,7 +296,6 @@ const onProjectClick = async (base: NcProject, ignoreNavigation?: boolean, toggl
updatedProject.isLoading = false
}
- forceShowBaseList.value = false
showProjectList.value = false
}
diff --git a/packages/nc-gui/pages/index.vue b/packages/nc-gui/pages/index.vue
index b6048cc6e3..367867f316 100644
--- a/packages/nc-gui/pages/index.vue
+++ b/packages/nc-gui/pages/index.vue
@@ -10,8 +10,6 @@ const { isSharedBase, isSharedErd } = storeToRefs(useBase())
const basesStore = useBases()
-const { forceShowBaseList } = storeToRefs(basesStore)
-
const { populateWorkspace } = useWorkspace()
const { signedIn } = useGlobal()
@@ -25,9 +23,6 @@ const route = router.currentRoute
const { basesList } = storeToRefs(basesStore)
const autoNavigateToProject = async () => {
- // If it is auto navigate to project that means we have to show base list sidebar instead of directly showing active base sidebar
- forceShowBaseList.value = true
-
const routeName = route.value.name as string
if (routeName !== 'index-typeOrId' && routeName !== 'index') {
return
diff --git a/packages/nc-gui/pages/signup/[[token]].vue b/packages/nc-gui/pages/signup/[[token]].vue
index d10374d1a6..c3e96e0a05 100644
--- a/packages/nc-gui/pages/signup/[[token]].vue
+++ b/packages/nc-gui/pages/signup/[[token]].vue
@@ -111,7 +111,6 @@ async function signUp() {
baseId: base.id,
tableId: table.id,
workspaceId: 'nc',
- resetForceShowBaseList: false,
})
}
} catch (e) {
diff --git a/packages/nc-gui/store/bases.ts b/packages/nc-gui/store/bases.ts
index bb91bb6845..a0756b7391 100644
--- a/packages/nc-gui/store/bases.ts
+++ b/packages/nc-gui/store/bases.ts
@@ -39,8 +39,6 @@ export const useBases = defineStore('basesStore', () => {
return route.value.params.baseId as string | undefined
})
- const forceShowBaseList = ref(false)
-
const showProjectList = ref(route.value.params.typeOrId === 'base' ? false : !route.value.params.baseId)
const baseHomeSearchQuery = ref('')
@@ -398,32 +396,8 @@ export const useBases = defineStore('basesStore', () => {
watch(
() => route.value.params.baseId,
- (newBaseId, oldBaseId) => {
+ () => {
baseHomeSearchQuery.value = ''
-
- if (newBaseId) {
- if (!forceShowBaseList.value) return
-
- /**
- * If oldBaseId is present that means we are navigation from one base to another base
- * In that case we have to set forceShowBaseList to false
- * */
- if (oldBaseId) {
- forceShowBaseList.value = false
- }
-
- return
- }
-
- /**
- * If base id is undefined that means are navigated to different page,
- * So in that case set forceShowBaseList to true so that on returning to bases we can show baseList sidebar
- * @note - Manually we have to set to false on click any base or on toggle from minisidebar
- * */
- forceShowBaseList.value = true
- },
- {
- immediate: true,
},
)
@@ -433,9 +407,11 @@ export const useBases = defineStore('basesStore', () => {
watch(
[() => route.value.params.baseId, () => route.value.params.viewId, () => route.value.params.viewTitle],
([newBaseId, newTableId, newViewId], [oldBaseId, oldTableId, oldViewId]) => {
- const shouldShowProjectList =
- forceShowBaseList.value ||
- !((newBaseId && newBaseId !== oldBaseId) || newTableId !== oldTableId || newViewId !== oldViewId)
+ const shouldShowProjectList = !(
+ (newBaseId && newBaseId !== oldBaseId) ||
+ newTableId !== oldTableId ||
+ newViewId !== oldViewId
+ )
if (showProjectList.value === shouldShowProjectList) return
@@ -443,19 +419,16 @@ export const useBases = defineStore('basesStore', () => {
},
)
- watch(
- () => route.value.params.baseId,
- (newBaseId) => {
- if (newBaseId) return
+ watch([() => basesList.value.length, () => isProjectsLoaded.value], ([baseListLength, newIsProjectsLoaded]) => {
+ /**
+ * Use case:
+ * If project list is empty and showProjectList is false,
+ * then we have to show project list else it will stuck in loading state (blank sidebar state)
+ */
+ if (baseListLength || !newIsProjectsLoaded || showProjectList.value) return
- /**
- * If base id is undefined that means are navigated to different page,
- * So in that case set forceShowBaseList to true so that on returning to bases we can show baseList sidebar
- * @note - Manually we have to set to false on click any base or on toggle from minisidebar
- * */
- forceShowBaseList.value = true
- },
- )
+ showProjectList.value = true
+ })
watch(activeProjectId, () => {
ncLastVisitedBase().set(activeProjectId.value)
@@ -495,7 +468,6 @@ export const useBases = defineStore('basesStore', () => {
basesUser,
clearBasesUser,
isDataSourceLimitReached,
- forceShowBaseList,
showProjectList,
baseHomeSearchQuery,
getBaseRoles,
diff --git a/packages/nc-gui/store/tables.ts b/packages/nc-gui/store/tables.ts
index bf6b3804af..29dc67ed43 100644
--- a/packages/nc-gui/store/tables.ts
+++ b/packages/nc-gui/store/tables.ts
@@ -15,7 +15,6 @@ export const useTablesStore = defineStore('tablesStore', () => {
const baseTables = ref>(new Map())
const basesStore = useBases()
- const { forceShowBaseList } = storeToRefs(basesStore)
// const baseStore = useBase()
const workspaceStore = useWorkspace()
@@ -94,13 +93,11 @@ export const useTablesStore = defineStore('tablesStore', () => {
tableId,
viewTitle,
workspaceId,
- resetForceShowBaseList = true,
}: {
baseId?: string
tableId: string
viewTitle?: string
workspaceId?: string
- resetForceShowBaseList?: boolean
}) => {
const workspaceIdOrType = workspaceId ?? workspaceStore.activeWorkspaceId
const baseIdOrBaseId = baseId ?? basesStore.activeProjectId
@@ -113,11 +110,6 @@ export const useTablesStore = defineStore('tablesStore', () => {
query = route.value.query
}
- // If baselist is visible and we are navigating to a table, we need to reset the baselist to false
- if (resetForceShowBaseList && forceShowBaseList.value) {
- forceShowBaseList.value = false
- }
-
await ncNavigateTo({
workspaceId: workspaceIdOrType,
baseId: baseIdOrBaseId,
@@ -127,7 +119,7 @@ export const useTablesStore = defineStore('tablesStore', () => {
})
}
- const openTable = async (table: TableType, replace = false, query?: any, resetForceShowBaseList = true) => {
+ const openTable = async (table: TableType, replace = false, query?: any) => {
if (!table.base_id) return
const bases = basesStore.bases
@@ -160,10 +152,6 @@ export const useTablesStore = defineStore('tablesStore', () => {
baseIdOrBaseId = route.value.params.baseId as string
}
- if (resetForceShowBaseList && forceShowBaseList.value) {
- forceShowBaseList.value = false
- }
-
ncNavigateTo({
workspaceId: workspaceIdOrType,
baseId: baseIdOrBaseId,
diff --git a/packages/nc-gui/utils/iconUtils.ts b/packages/nc-gui/utils/iconUtils.ts
index 191871bd49..59eae77f7a 100644
--- a/packages/nc-gui/utils/iconUtils.ts
+++ b/packages/nc-gui/utils/iconUtils.ts
@@ -797,7 +797,6 @@ import NcCrown from '~icons/nc-icons-v2/crown'
import NcMultiCircle from '~icons/nc-icons-v2/multi-circle'
import NcChatwoot from '~icons/nc-icons-v2/chatwoot'
import NcGraduationCap from '~icons/nc-icons-v2/graduation-cap'
-import NcSupportAgent from '~icons/nc-icons-v2/support-agent'
// keep it for reference
// todo: remove it after all icons are migrated
@@ -1802,7 +1801,6 @@ export const iconMap = {
'ncChartPie': h(NcChartPie, { stroke: 'transparent' }),
'ncSun': NcSun,
'ncGraduationCap': NcGraduationCap,
- 'ncSupportAgent': h(NcSupportAgent, { stroke: 'transparent' }),
}
export const getMdiIcon = (type: string): any => {
@@ -4578,10 +4576,6 @@ export const searchableMap = {
icon: NcGraduationCap,
keywords: ['graduation', 'cap', 'school', 'education', 'academic'],
},
- ncSupportAgent: {
- icon: h(NcSupportAgent, { stroke: 'transparent' }),
- keywords: ['support', 'agent', 'help', 'customer', 'service'],
- },
}
export const searchIcons = (searchTerm: string) => {
diff --git a/tests/playwright/pages/Dashboard/ViewSidebar/index.ts b/tests/playwright/pages/Dashboard/ViewSidebar/index.ts
index 8e391d2b41..fc7febbd61 100644
--- a/tests/playwright/pages/Dashboard/ViewSidebar/index.ts
+++ b/tests/playwright/pages/Dashboard/ViewSidebar/index.ts
@@ -90,27 +90,7 @@ export class ViewSidebarPage extends BasePage {
}
// Todo: Make selection better
- async verifyView({
- title,
- index,
- baseTitle,
- sourceTitle,
- }: {
- title: string;
- index: number;
- baseTitle?: string;
- sourceTitle?: string;
- }) {
- await this.dashboard.leftSidebar.verifyBaseListOpen(!!baseTitle);
-
- if (baseTitle) {
- await this.dashboard.sidebar.baseNode.verifyActiveProject({ baseTitle, open: true });
- }
-
- if (sourceTitle) {
- await this.dashboard.treeView.openSource({ title: sourceTitle });
- }
-
+ async verifyView({ title, index }: { title: string; index: number }) {
// flicker while page loading
await this.get()
.locator('[data-testid="view-item"]')
diff --git a/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts b/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts
index aaabe699ab..d10c7d854e 100644
--- a/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts
+++ b/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts
@@ -59,7 +59,7 @@ test.describe('Verify shortcuts', () => {
skipOpeningModal: true,
baseTitle: context.base.title,
});
- await dashboard.treeView.verifyTable({ title: 'New Table', baseTitle: context.base.title });
+ await dashboard.treeView.verifyTable({ title: 'New Table' });
// create new row
await grid.column.clickColumnHeader({ title: 'Title' });
diff --git a/tests/playwright/tests/db/usersAccounts/rolesPreview.spec.ts b/tests/playwright/tests/db/usersAccounts/rolesPreview.spec.ts
index a04f958db6..ade7bdc818 100644
--- a/tests/playwright/tests/db/usersAccounts/rolesPreview.spec.ts
+++ b/tests/playwright/tests/db/usersAccounts/rolesPreview.spec.ts
@@ -123,17 +123,14 @@ test.describe('Preview Mode', () => {
await dashboard.treeView.verifyTable({
title: 'Actor',
exists: true,
- baseTitle: context.base.title,
});
await dashboard.treeView.verifyTable({
title: 'Language',
exists: false,
- baseTitle: context.base.title,
});
await dashboard.treeView.verifyTable({
title: 'CustomerList',
exists: false,
- baseTitle: context.base.title,
});
});
});