mirror of
https://github.com/nocodb/nocodb.git
synced 2026-04-25 06:56:29 +00:00
fix: add members count in tab
This commit is contained in:
@@ -14,9 +14,9 @@ const { integrations } = useProvideIntegrationViewStore()
|
|||||||
|
|
||||||
const basesStore = useBases()
|
const basesStore = useBases()
|
||||||
|
|
||||||
const { openedProject, activeProjectId, basesUser, bases } = storeToRefs(basesStore)
|
const { openedProject, activeProjectId, basesUser, bases, basesTeams } = storeToRefs(basesStore)
|
||||||
const { activeTable } = storeToRefs(useTablesStore())
|
const { activeTable } = storeToRefs(useTablesStore())
|
||||||
const { activeWorkspace } = storeToRefs(useWorkspace())
|
const { activeWorkspace, isTeamsEnabled } = storeToRefs(useWorkspace())
|
||||||
|
|
||||||
const { isSharedBase, isPrivateBase } = storeToRefs(useBase())
|
const { isSharedBase, isPrivateBase } = storeToRefs(useBase())
|
||||||
|
|
||||||
@@ -53,17 +53,22 @@ const baseSettingsState = ref('')
|
|||||||
|
|
||||||
const userCount = computed(() => {
|
const userCount = computed(() => {
|
||||||
// if private base and don't have owner permission then return
|
// if private base and don't have owner permission then return
|
||||||
if (base.value?.default_role && !baseRoles.value[ProjectRoles.OWNER]) {
|
if (base.value?.default_role && !baseRoles.value?.[ProjectRoles.OWNER]) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
return activeProjectId.value ? basesUser.value.get(activeProjectId.value)?.filter((user) => !user?.deleted)?.length : 0
|
if (activeProjectId.value) {
|
||||||
|
const teamsCount = !isAdminPanel.value && isTeamsEnabled.value ? basesTeams.value.get(activeProjectId.value)?.length ?? 0 : 0
|
||||||
|
const usersCount = activeProjectId.value
|
||||||
|
? basesUser.value.get(activeProjectId.value)?.filter((user) => !user?.deleted)?.length ?? 0
|
||||||
|
: 0
|
||||||
|
|
||||||
|
return teamsCount + usersCount
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0
|
||||||
})
|
})
|
||||||
|
|
||||||
const { isTableAndFieldPermissionsEnabled } = usePermissions()
|
|
||||||
|
|
||||||
const { isFeatureEnabled } = useBetaFeatureToggle()
|
|
||||||
|
|
||||||
const isOverviewTabVisible = computed(() => isUIAllowed('projectOverviewTab'))
|
const isOverviewTabVisible = computed(() => isUIAllowed('projectOverviewTab'))
|
||||||
|
|
||||||
const projectPageTab = computed({
|
const projectPageTab = computed({
|
||||||
|
|||||||
Reference in New Issue
Block a user