Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: prevent commentor/viewer from enabling hidden columns #8268

Open
wants to merge 9 commits into
base: develop
Choose a base branch
from
+91 −14
Open

fix: prevent commentor/viewer from enabling hidden columns #8268

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3045f94
fix: prevent commentor/viewer from enabling hidden columns
sreehari2003 Apr 13, 2024
87f2002
fix: removed total hidden count
sreehari2003 Apr 16, 2024
3092ed2
fix: removed unwanted log
sreehari2003 Apr 16, 2024
a1c01bd
fix: added support for local fields count
sreehari2003 Apr 17, 2024
048ea0c
fix: invalid count issue
sreehari2003 Apr 17, 2024
8de2ab4
fix: fields error in admin view
sreehari2003 Apr 18, 2024
9aa9f80
Merge branch 'develop' into 7867-field-view
sreehari2003 May 19, 2024
9dba839
Merge branch 'develop' into 7867-field-view
sreehari2003 May 23, 2024
b419e9f
fix: duplicate variable
sreehari2003 May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts" setup>
import type { CalendarType, ColumnType, GalleryType, KanbanType } from 'nocodb-sdk'
import { UITypes, ViewTypes, isVirtualCol } from 'nocodb-sdk'
import { ProjectRoles, UITypes, ViewTypes, isVirtualCol } from 'nocodb-sdk'
import Draggable from 'vuedraggable'

import type { SelectProps } from 'ant-design-vue'
Expand All @@ -17,12 +17,15 @@ import {
resolveComponent,
useMenuCloseOnEsc,
useNuxtApp,
useRoles,
useSmartsheetStoreOrThrow,
useUndoRedo,
useViewColumnsOrThrow,
watch,
} from '#imports'

const { baseRoles } = useRoles()

const activeView = inject(ActiveViewInj, ref())

const reloadViewMetaHook = inject(ReloadViewMetaHookInj, undefined)!
Expand Down Expand Up @@ -54,6 +57,9 @@ const {
toggleFieldVisibility,
} = useViewColumnsOrThrow()

const shouldShowField = (show: boolean) =>
!((baseRoles?.value[ProjectRoles.COMMENTER] || baseRoles?.value[ProjectRoles.VIEWER]) && !show)

const { eventBus } = useSmartsheetStoreOrThrow()

const { addUndo, defineViewScope } = useUndoRedo()
Expand Down Expand Up @@ -409,7 +415,7 @@ useMenuCloseOnEsc(open)
v-if="
filteredFieldList
.filter((el) => (activeView.type !== ViewTypes.CALENDAR ? el !== gridDisplayValueField : true))
.includes(field)
.includes(field) && shouldShowField(field.show)
"
:key="field.id"
:data-testid="`nc-fields-menu-${field.title}`"
Expand Down