diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilter.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilter.vue index 6671de9c75..87d4bb03c8 100644 --- a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilter.vue +++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilter.vue @@ -3,9 +3,9 @@ import type { FilterType } from 'nocodb-sdk' import { UITypes } from 'nocodb-sdk' import FieldListAutoCompleteDropdown from './FieldListAutoCompleteDropdown.vue' import { useNuxtApp } from '#app' -import { inject, useViewFilters, watchEffect } from '#imports' +import { inject, useViewFilters } from '#imports' import { comparisonOpList } from '~/utils/filterUtils' -import { ActiveViewInj, MetaInj, ReloadViewDataHookInj } from '~/context' +import { ActiveViewInj, IsLockedInj, MetaInj, ReloadViewDataHookInj } from '~/context' import MdiDeleteIcon from '~icons/mdi/close-box' import MdiAddIcon from '~icons/mdi/plus' @@ -16,6 +16,7 @@ const emit = defineEmits(['update:filtersLength']) const meta = inject(MetaInj) const activeView = inject(ActiveViewInj) const reloadDataHook = inject(ReloadViewDataHookInj) +const isLocked = inject(IsLockedInj) // todo: replace with inject or get from state const shared = ref(false) diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue index fd067d6e2c..ff4ec2a87e 100644 --- a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue +++ b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue @@ -16,8 +16,8 @@ const { fieldsOrder, coverImageField, modelValue } = defineProps<{ const meta = inject(MetaInj) const activeView = inject(ActiveViewInj) const reloadDataHook = inject(ReloadViewDataHookInj) -const isLocked = inject(IsLockedInj) const rootFields = inject(FieldsInj) +const isLocked = inject(IsLockedInj) const { $e } = useNuxtApp() @@ -94,7 +94,7 @@ const onMove = (event: { moved: { newIndex: number } }) => {
- + - +
diff --git a/packages/nc-gui-v2/composables/useUIPermission/index.ts b/packages/nc-gui-v2/composables/useUIPermission/index.ts index f2bdd4d8a6..dcfbcd8352 100644 --- a/packages/nc-gui-v2/composables/useUIPermission/index.ts +++ b/packages/nc-gui-v2/composables/useUIPermission/index.ts @@ -10,7 +10,6 @@ export function useUIPermission() { const isUIAllowed = (permission: RolePermissions, _skipPreviewAs = false) => { const user = $state.user let userRoles = user?.value?.roles || {} - // if string populate key-value paired object if (typeof userRoles === 'string') { userRoles = userRoles.split(',').reduce>((acc, role) => { @@ -37,9 +36,8 @@ export function useUIPermission() { return ( hasRole && - (rolePermission === '*' || typeof rolePermission === 'object' - ? rolePermission[permission as keyof typeof rolePermission] === true - : false) + (rolePermission === '*' || + (typeof rolePermission === 'object' && rolePermission[permission as keyof typeof rolePermission])) ) }) }