Browse Source

fix: Review changes in PR #7148

pull/7148/head
Ramesh Mane 9 months ago
parent
commit
b430c4c156
  1. 3
      packages/nc-gui/components/dashboard/TreeView/ViewsNode.vue
  2. 11
      packages/nc-gui/components/project/View.vue

3
packages/nc-gui/components/dashboard/TreeView/ViewsNode.vue

@ -129,8 +129,7 @@ onKeyStroke('Enter', (event) => {
})
const onRenameMenuClick = () => {
if (isMobileMode.value) return
if (!isUIAllowed('viewCreateOrEdit')) return
if (isMobileMode.value || !isUIAllowed('viewCreateOrEdit')) return
if (!isEditing.value) {
isEditing.value = true

11
packages/nc-gui/components/project/View.vue

@ -1,12 +1,15 @@
<script lang="ts" setup>
import { useTitle } from '@vueuse/core'
import NcLayout from '~icons/nc-icons/layout'
import { isEeUI } from '#imports'
const basesStore = useBases()
const { getProjectUsers } = basesStore
const { openedProject, activeProjectId, baseUserCount } = storeToRefs(basesStore)
const { activeTables } = storeToRefs(useTablesStore())
const { activeWorkspace, workspaceUserCount } = storeToRefs(useWorkspace())
import { isEeUI } from '#imports'
const { navigateToProjectPage } = useBase()
@ -29,6 +32,8 @@ const { isMobileMode } = useGlobal()
const baseSettingsState = ref('')
const userCount = isEeUI ? workspaceUserCount : baseUserCount
const updateBaseUserCount = async () => {
try {
const { totalRows } = await getProjectUsers({
@ -148,14 +153,14 @@ watch(
<GeneralIcon icon="users" class="!h-3.5 !w-3.5" />
<div>{{ $t('labels.members') }}</div>
<div
v-if="isEeUI ? workspaceUserCount : baseUserCount"
v-if="userCount"
class="tab-info"
:class="{
'bg-primary-selected': projectPageTab === 'collaborator',
'bg-gray-50': projectPageTab !== 'collaborator',
}"
>
{{ isEeUI ? workspaceUserCount : baseUserCount }}
{{ userCount }}
</div>
</div>
</template>

Loading…
Cancel
Save