Browse Source

Nc fix: prevent commentor/viewer from enabling hidden columns (#8971)

* fix(nc-gui): show proper error msg instead of harcoded text

* fix(nc-gui): disable show field switch is user don't have permission

* fix(nc-gui): hide hidden field for commenter/viewer role

* fix(nc-gui): hide groupby option in local mode

* fix(nc-gui): groupby issue in shared view if grouping field is hidden

* fix(nc-gui): show pagination even if total no pages is 1

* fix(nc-gui): show hidden grouping field in shared view

* chore(nc-gui): type mistake

* fix(nc-gui): show/hide all columns in local mode issue

* fix(nc-gui): pw test fail issue

* fix(nc-gui): hide/show field local mode save issue
pull/8989/head
Ramesh Mane 5 months ago committed by GitHub
parent
commit
7577fddcb3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 243
      packages/nc-gui/components/nc/PaginationV2.vue
  2. 4
      packages/nc-gui/components/smartsheet/Toolbar.vue
  3. 14
      packages/nc-gui/components/smartsheet/expanded-form/index.vue
  4. 20
      packages/nc-gui/components/smartsheet/toolbar/FieldListAutoCompleteDropdown.vue
  5. 3
      packages/nc-gui/components/smartsheet/toolbar/FieldListWithSearch.vue
  6. 10
      packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
  7. 4
      packages/nc-gui/components/smartsheet/toolbar/RowHeight.vue
  8. 2
      packages/nc-gui/composables/useSharedView.ts
  9. 74
      packages/nc-gui/composables/useViewColumns.ts
  10. 1
      packages/nc-gui/lib/types.ts
  11. 11
      packages/nocodb/src/services/public-metas.service.ts

243
packages/nc-gui/components/nc/PaginationV2.vue

@ -99,136 +99,135 @@ const pageSizeOptions = [
<template> <template>
<div class="nc-pagination flex flex-row items-center gap-x-0.25"> <div class="nc-pagination flex flex-row items-center gap-x-0.25">
<template v-if="totalPages > 1"> <component :is="props.firstPageTooltip && mode === 'full' ? NcTooltip : 'div'" v-if="mode === 'full'">
<component :is="props.firstPageTooltip && mode === 'full' ? NcTooltip : 'div'" v-if="mode === 'full'"> <template v-if="props.firstPageTooltip" #title>
<template v-if="props.firstPageTooltip" #title> {{ props.firstPageTooltip }}
{{ props.firstPageTooltip }} </template>
</template> <NcButton
<NcButton v-e="[`a:pagination:${entityName}:first-page`]"
v-e="[`a:pagination:${entityName}:first-page`]" class="first-page !border-0"
class="first-page !border-0" type="text"
type="text" size="xsmall"
size="xsmall" :disabled="current === 1"
:disabled="current === 1" @click="goToFirstPage"
@click="goToFirstPage" >
> <GeneralIcon icon="doubleLeftArrow" class="nc-pagination-icon" />
<GeneralIcon icon="doubleLeftArrow" class="nc-pagination-icon" /> </NcButton>
</component>
<component :is="props.prevPageTooltip && mode === 'full' ? NcTooltip : 'div'">
<template v-if="props.prevPageTooltip" #title>
{{ props.prevPageTooltip }}
</template>
<NcButton
v-e="[`a:pagination:${entityName}:prev-page`]"
class="prev-page !border-0"
type="secondary"
size="xsmall"
:disabled="current === 1"
@click="changePage({ increase: false })"
>
<GeneralIcon icon="arrowLeft" class="nc-pagination-icon" />
</NcButton>
</component>
<div v-if="!isMobileMode" class="text-gray-500">
<NcDropdown placement="top" overlay-class-name="!shadow-none">
<NcButton class="!border-0 nc-select-page" type="secondary" size="xsmall">
<div class="flex gap-1 items-center px-2">
<span class="nc-current-page">
{{ current }}
</span>
<GeneralIcon icon="arrowDown" class="text-gray-800 mt-0.5 nc-select-expand-btn" />
</div>
</NcButton> </NcButton>
</component>
<component :is="props.prevPageTooltip && mode === 'full' ? NcTooltip : 'div'"> <template #overlay>
<template v-if="props.prevPageTooltip" #title> <NcMenu class="nc-pagination-menu overflow-hidden">
{{ props.prevPageTooltip }} <NcSubMenu v-if="showSizeChanger" :key="`${localPageSize}page`" class="bg-gray-100 z-20 top-0 !sticky">
</template> <template #title>
<NcButton <div class="rounded-lg text-[13px] font-medium w-full">{{ localPageSize }} / page</div>
v-e="[`a:pagination:${entityName}:prev-page`]" </template>
class="prev-page !border-0"
type="secondary" <NcMenuItem v-for="option in pageSizeOptions" :key="option.value" @click="localPageSize = option.value">
size="xsmall" <span
:disabled="current === 1" class="text-[13px]"
@click="changePage({ increase: false })" :class="{
> '!text-brand-500': option.value === localPageSize,
<GeneralIcon icon="arrowLeft" class="nc-pagination-icon" /> }"
</NcButton> >
</component> {{ option.value }} / page
</span>
<div v-if="!isMobileMode" class="text-gray-500"> </NcMenuItem>
<NcDropdown placement="top" overlay-class-name="!shadow-none"> </NcSubMenu>
<NcButton class="!border-0 nc-select-page" type="secondary" size="xsmall">
<div class="flex gap-1 items-center px-2"> <UseVirtualList
<span class="nc-current-page"> :key="localPageSize"
{{ current }} :list="pagesList"
</span> height="auto"
<GeneralIcon icon="arrowDown" class="text-gray-800 mt-0.5 nc-select-expand-btn" /> :options="{ itemHeight: 36 }"
</div> class="mt-1 max-h-46"
</NcButton> >
<template #default="{ data: item }">
<template #overlay> <NcMenuItem
<NcMenu class="nc-pagination-menu overflow-hidden"> :key="`${localPageSize}${item.value}`"
<NcSubMenu v-if="showSizeChanger" :key="`${localPageSize}page`" class="bg-gray-100 z-20 top-0 !sticky"> :style="{
<template #title> height: '36px',
<div class="rounded-lg text-[13px] font-medium w-full">{{ localPageSize }} / page</div> }"
</template> @click.stop="
changePage({
<NcMenuItem v-for="option in pageSizeOptions" :key="option.value" @click="localPageSize = option.value"> set: item.value,
<span })
class="text-[13px]" "
>
<div
:class="{ :class="{
'!text-brand-500': option.value === localPageSize, 'text-brand-500': item.value === current,
}" }"
class="flex text-[13px] !w-full text-gray-800 items-center justify-between"
> >
{{ option.value }} / page {{ item.label }}
</span> </div>
</NcMenuItem> </NcMenuItem>
</NcSubMenu> </template>
</UseVirtualList>
<UseVirtualList </NcMenu>
:key="localPageSize"
:list="pagesList"
height="auto"
:options="{ itemHeight: 36 }"
class="mt-1 max-h-46"
>
<template #default="{ data: item }">
<NcMenuItem
:key="`${localPageSize}${item.value}`"
:style="{
height: '36px',
}"
@click.stop="
changePage({
set: item.value,
})
"
>
<div
:class="{
'text-brand-500': item.value === current,
}"
class="flex text-[13px] !w-full text-gray-800 items-center justify-between"
>
{{ item.label }}
</div>
</NcMenuItem>
</template>
</UseVirtualList>
</NcMenu>
</template>
</NcDropdown>
</div>
<component :is="props.nextPageTooltip && mode === 'full' ? NcTooltip : 'div'">
<template v-if="props.nextPageTooltip" #title>
{{ props.nextPageTooltip }}
</template> </template>
<NcButton </NcDropdown>
v-e="[`a:pagination:${entityName}:next-page`]" </div>
class="next-page !border-0"
type="secondary" <component :is="props.nextPageTooltip && mode === 'full' ? NcTooltip : 'div'">
size="xsmall" <template v-if="props.nextPageTooltip" #title>
:disabled="current === totalPages" {{ props.nextPageTooltip }}
@click="changePage({ increase: true })" </template>
> <NcButton
<GeneralIcon icon="arrowRight" class="nc-pagination-icon" /> v-e="[`a:pagination:${entityName}:next-page`]"
</NcButton> class="next-page !border-0"
</component> type="secondary"
size="xsmall"
:disabled="current === totalPages"
@click="changePage({ increase: true })"
>
<GeneralIcon icon="arrowRight" class="nc-pagination-icon" />
</NcButton>
</component>
<component :is="props.lastPageTooltip && mode === 'full' ? NcTooltip : 'div'" v-if="mode === 'full'">
<template v-if="props.lastPageTooltip" #title>
{{ props.lastPageTooltip }}
</template>
<NcButton
v-e="[`a:pagination:${entityName}:last-page`]"
class="last-page !border-0"
type="secondary"
size="xsmall"
:disabled="current === totalPages"
@click="goToLastPage"
>
<GeneralIcon icon="doubleRightArrow" class="nc-pagination-icon" />
</NcButton>
</component>
<component :is="props.lastPageTooltip && mode === 'full' ? NcTooltip : 'div'" v-if="mode === 'full'">
<template v-if="props.lastPageTooltip" #title>
{{ props.lastPageTooltip }}
</template>
<NcButton
v-e="[`a:pagination:${entityName}:last-page`]"
class="last-page !border-0"
type="secondary"
size="xsmall"
:disabled="current === totalPages"
@click="goToLastPage"
>
<GeneralIcon icon="doubleRightArrow" class="nc-pagination-icon" />
</NcButton>
</component>
</template>
<div v-if="showSizeChanger && !isMobileMode" class="text-gray-500"></div> <div v-if="showSizeChanger && !isMobileMode" class="text-gray-500"></div>
</div> </div>
</template> </template>

4
packages/nc-gui/components/smartsheet/Toolbar.vue

@ -6,6 +6,8 @@ const { isLeftSidebarOpen } = storeToRefs(useSidebarStore())
const { isViewsLoading } = storeToRefs(useViewsStore()) const { isViewsLoading } = storeToRefs(useViewsStore())
const { isLocalMode } = useViewColumnsOrThrow()
const containerRef = ref<HTMLElement>() const containerRef = ref<HTMLElement>()
const { width } = useElementSize(containerRef) const { width } = useElementSize(containerRef)
@ -49,7 +51,7 @@ const isTab = computed(() => {
<LazySmartsheetToolbarColumnFilterMenu v-if="isGrid || isGallery || isKanban || isMap" /> <LazySmartsheetToolbarColumnFilterMenu v-if="isGrid || isGallery || isKanban || isMap" />
<LazySmartsheetToolbarGroupByMenu v-if="isGrid" /> <LazySmartsheetToolbarGroupByMenu v-if="isGrid && !isLocalMode" />
<LazySmartsheetToolbarSortListMenu v-if="isGrid || isGallery || isKanban" /> <LazySmartsheetToolbarSortListMenu v-if="isGrid || isGallery || isKanban" />
</div> </div>

14
packages/nc-gui/components/smartsheet/expanded-form/index.vue

@ -48,6 +48,8 @@ const { copy } = useClipboard()
const { isMobileMode } = useGlobal() const { isMobileMode } = useGlobal()
const { fieldsMap, isLocalMode } = useViewColumnsOrThrow()
const { t } = useI18n() const { t } = useI18n()
const rowId = toRef(props, 'rowId') const rowId = toRef(props, 'rowId')
@ -102,11 +104,19 @@ const fields = computedInject(FieldsInj, (_fields) => {
return _fields?.value ?? [] return _fields?.value ?? []
}) })
const displayField = computed(() => meta.value?.columns?.find((c) => c.pv && fields.value.includes(c)) ?? null) const displayField = computed(() => meta.value?.columns?.find((c) => c.pv && fields.value?.includes(c)) ?? null)
const hiddenFields = computed(() => { const hiddenFields = computed(() => {
// todo: figure out when meta.value is undefined // todo: figure out when meta.value is undefined
return (meta.value?.columns ?? []).filter((col) => !fields.value?.includes(col)).filter((col) => !isSystemColumn(col)) return (meta.value?.columns ?? [])
.filter(
(col) =>
!fields.value?.includes(col) &&
(isLocalMode.value && col?.id && fieldsMap.value[col.id]
? fieldsMap.value[col.id]?.initialShow
: true),
)
.filter((col) => !isSystemColumn(col))
}) })
const showHiddenFields = ref(false) const showHiddenFields = ref(false)

20
packages/nc-gui/components/smartsheet/toolbar/FieldListAutoCompleteDropdown.vue

@ -24,11 +24,20 @@ const localValue = computed({
set: (val) => emit('update:modelValue', val), set: (val) => emit('update:modelValue', val),
}) })
const { showSystemFields, metaColumnById, fieldsMap } = useViewColumnsOrThrow() const { showSystemFields, metaColumnById, fieldsMap, isLocalMode } = useViewColumnsOrThrow()
const options = computed<SelectProps['options']>(() => const options = computed<SelectProps['options']>(() =>
( (
customColumns.value?.filter((c: ColumnType) => { customColumns.value?.filter((c: ColumnType) => {
if (
isLocalMode.value &&
c?.id &&
fieldsMap.value[c.id] &&
(!fieldsMap.value[c.id]?.initialShow || (!showSystemFields.value && isSystemColumn(metaColumnById?.value?.[c.id!])))
) {
return false
}
if (isSystemColumn(metaColumnById?.value?.[c.id!])) { if (isSystemColumn(metaColumnById?.value?.[c.id!])) {
if (isHiddenCol(c)) { if (isHiddenCol(c)) {
/** ignore mm relation column, created by and last modified by system field */ /** ignore mm relation column, created by and last modified by system field */
@ -38,6 +47,15 @@ const options = computed<SelectProps['options']>(() =>
return true return true
}) || }) ||
meta.value?.columns?.filter((c: ColumnType) => { meta.value?.columns?.filter((c: ColumnType) => {
if (
isLocalMode.value &&
c?.id &&
fieldsMap.value[c.id] &&
(!fieldsMap.value[c.id]?.initialShow || (!showSystemFields.value && isSystemColumn(metaColumnById?.value?.[c.id!])))
) {
return false
}
if (c.uidt === UITypes.Links) { if (c.uidt === UITypes.Links) {
return true return true
} }

3
packages/nc-gui/components/smartsheet/toolbar/FieldListWithSearch.vue

@ -15,12 +15,13 @@ const emits = defineEmits<{ selected: [ColumnType] }>()
const { isParentOpen, toolbarMenu, searchInputPlaceholder, selectedOptionId, showSelectedOption } = toRefs(props) const { isParentOpen, toolbarMenu, searchInputPlaceholder, selectedOptionId, showSelectedOption } = toRefs(props)
const { fieldsMap } = useViewColumnsOrThrow() const { fieldsMap, isLocalMode } = useViewColumnsOrThrow()
const searchQuery = ref('') const searchQuery = ref('')
const options = computed(() => const options = computed(() =>
(props.options || []) (props.options || [])
.filter((c) => (isLocalMode.value && c?.id && fieldsMap.value[c.id] ? fieldsMap.value[c.id]?.initialShow : true))
.map((c) => c) .map((c) => c)
.sort((field1, field2) => { .sort((field1, field2) => {
// sort by view column order and keep system columns at the end // sort by view column order and keep system columns at the end

10
packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue

@ -29,6 +29,7 @@ const {
showSystemFields, showSystemFields,
fields, fields,
filteredFieldList, filteredFieldList,
numberOfHiddenFields,
filterQuery, filterQuery,
showAll, showAll,
hideAll, hideAll,
@ -37,6 +38,7 @@ const {
loadViewColumns, loadViewColumns,
toggleFieldStyles, toggleFieldStyles,
toggleFieldVisibility, toggleFieldVisibility,
isLocalMode,
} = useViewColumnsOrThrow() } = useViewColumnsOrThrow()
const { eventBus, isDefaultView } = useSmartsheetStoreOrThrow() const { eventBus, isDefaultView } = useSmartsheetStoreOrThrow()
@ -51,8 +53,6 @@ eventBus.on((event) => {
} }
}) })
const numberOfHiddenFields = computed(() => filteredFieldList.value?.filter((field) => !field.show)?.length)
const gridDisplayValueField = computed(() => { const gridDisplayValueField = computed(() => {
if (activeView.value?.type !== ViewTypes.GRID && activeView.value?.type !== ViewTypes.CALENDAR) return null if (activeView.value?.type !== ViewTypes.GRID && activeView.value?.type !== ViewTypes.CALENDAR) return null
const pvCol = Object.values(metaColumnById.value)?.find((col) => col?.pv) const pvCol = Object.values(metaColumnById.value)?.find((col) => col?.pv)
@ -608,7 +608,7 @@ useMenuCloseOnEsc(open)
<component :is="iconMap.drag" class="cursor-move !h-3.75 text-gray-600 mr-1" /> <component :is="iconMap.drag" class="cursor-move !h-3.75 text-gray-600 mr-1" />
<div <div
v-e="['a:fields:show-hide']" v-e="['a:fields:show-hide']"
class="flex flex-row items-center w-full truncate cursor-pointer ml-1 py-[5px] pr-2" class="flex flex-row items-center w-full cursor-pointer truncate ml-1 py-[5px] pr-2"
@click=" @click="
() => { () => {
field.show = !field.show field.show = !field.show
@ -662,7 +662,7 @@ useMenuCloseOnEsc(open)
:checked="field.show" :checked="field.show"
:disabled="field.isViewEssentialField" :disabled="field.isViewEssentialField"
size="xsmall" size="xsmall"
@change="$t('a:fields:show-hide')" @change="$e('a:fields:show-hide')"
/> />
</div> </div>
@ -677,7 +677,7 @@ useMenuCloseOnEsc(open)
{{ showAllColumns ? $t('general.hideAll') : $t('general.showAll') }} {{ $t('objects.fields').toLowerCase() }} {{ showAllColumns ? $t('general.hideAll') : $t('general.showAll') }} {{ $t('objects.fields').toLowerCase() }}
</NcButton> </NcButton>
<NcButton <NcButton
v-if="!isPublic" v-if="!isLocalMode"
class="nc-fields-show-system-fields" class="nc-fields-show-system-fields"
size="small" size="small"
type="ghost" type="ghost"

4
packages/nc-gui/components/smartsheet/toolbar/RowHeight.vue

@ -72,8 +72,8 @@ const updateRowHeight = async (rh: number, undo = false) => {
;(view.value.view as GridType).row_height = rh ;(view.value.view as GridType).row_height = rh
open.value = false open.value = false
} catch (e) { } catch (e: any) {
message.error('There was an error while updating view!') message.error((await extractSdkResponseErrorMsg(e)) || 'There was an error while updating view!')
} }
} }
} }

2
packages/nc-gui/composables/useSharedView.ts

@ -97,7 +97,7 @@ export function useSharedView() {
if (meta.value) { if (meta.value) {
meta.value.columns = [...viewMeta.model.columns] meta.value.columns = [...viewMeta.model.columns]
.filter((c) => c.show || rangeFields.includes(c.id)) .filter((c) => c.show || rangeFields.includes(c.id) || (sharedView.value?.type === ViewTypes.GRID && c?.group_by))
.map((c) => ({ ...c, order: order++ })) .map((c) => ({ ...c, order: order++ }))
.sort((a, b) => a.order - b.order) .sort((a, b) => a.order - b.order)
} }

74
packages/nc-gui/composables/useViewColumns.ts

@ -42,11 +42,9 @@ const [useProvideViewColumns, useViewColumns] = useInjectionState(
const { addUndo, defineViewScope } = useUndoRedo() const { addUndo, defineViewScope } = useUndoRedo()
const isLocalMode = computed( const isLocalMode = computed(() => isPublic || !isUIAllowed('viewFieldEdit') || isSharedBase.value)
() => isPublic || !isUIAllowed('viewFieldEdit') || !isUIAllowed('viewFieldEdit') || isSharedBase.value,
)
const localChanges = ref<Field[]>([]) const localChanges = ref<Record<string, Field>>({})
const isColumnViewEssential = (column: ColumnType) => { const isColumnViewEssential = (column: ColumnType) => {
// TODO: consider at some point ti delegate this via a cleaner design pattern to view specific check logic // TODO: consider at some point ti delegate this via a cleaner design pattern to view specific check logic
@ -71,6 +69,7 @@ const [useProvideViewColumns, useViewColumns] = useInjectionState(
const loadViewColumns = async () => { const loadViewColumns = async () => {
if (!meta || !view) return if (!meta || !view) return
let order = 1 let order = 1
if (view.value?.id) { if (view.value?.id) {
@ -103,15 +102,19 @@ const [useProvideViewColumns, useViewColumns] = useInjectionState(
aggregation: currentColumnField?.aggregation ?? CommonAggregations.None, aggregation: currentColumnField?.aggregation ?? CommonAggregations.None,
system: isSystemColumn(metaColumnById?.value?.[currentColumnField.fk_column_id!]), system: isSystemColumn(metaColumnById?.value?.[currentColumnField.fk_column_id!]),
isViewEssentialField: isColumnViewEssential(column), isViewEssentialField: isColumnViewEssential(column),
initialShow:
currentColumnField.show ||
isColumnViewEssential(currentColumnField) ||
(currentColumnField as GridColumnType)?.group_by,
} }
}) })
.sort((a: Field, b: Field) => a.order - b.order) .sort((a: Field, b: Field) => a.order - b.order)
if (isLocalMode.value && fields.value) { if (isLocalMode.value && fields.value) {
for (const field of localChanges.value) { for (const key in localChanges.value) {
const fieldIndex = fields.value.findIndex((f) => f.fk_column_id === field.fk_column_id) const fieldIndex = fields.value.findIndex((f) => f.fk_column_id === key)
if (fieldIndex !== undefined && fieldIndex > -1) { if (fieldIndex !== undefined && fieldIndex > -1) {
fields.value[fieldIndex] = field fields.value[fieldIndex] = localChanges.value[key]
fields.value = fields.value.sort((a: Field, b: Field) => a.order - b.order) fields.value = fields.value.sort((a: Field, b: Field) => a.order - b.order)
} }
} }
@ -133,16 +136,20 @@ const [useProvideViewColumns, useViewColumns] = useInjectionState(
if (isLocalMode.value) { if (isLocalMode.value) {
const fieldById = (fields.value || []).reduce<Record<string, any>>((acc, curr) => { const fieldById = (fields.value || []).reduce<Record<string, any>>((acc, curr) => {
if (curr.fk_column_id) { if (curr.fk_column_id) {
curr.show = true curr.show = curr.initialShow ? true : false
acc[curr.fk_column_id] = curr acc[curr.fk_column_id] = curr
} }
return acc return acc
}, {}) }, {})
fields.value = fields.value?.map((field: Field) => ({ fields.value = (fields.value || [])?.map((field: Field) => {
...field, const updateField = {
show: fieldById[field.fk_column_id!]?.show, ...field,
})) show: fieldById[field.fk_column_id!]?.show,
}
localChanges.value[field.fk_column_id!] = field
return updateField
})
meta.value!.columns = meta.value!.columns?.map((column: ColumnType) => { meta.value!.columns = meta.value!.columns?.map((column: ColumnType) => {
if (fieldById[column.id!]) { if (fieldById[column.id!]) {
@ -177,16 +184,20 @@ const [useProvideViewColumns, useViewColumns] = useInjectionState(
if (isLocalMode.value) { if (isLocalMode.value) {
const fieldById = (fields.value || []).reduce<Record<string, any>>((acc, curr) => { const fieldById = (fields.value || []).reduce<Record<string, any>>((acc, curr) => {
if (curr.fk_column_id) { if (curr.fk_column_id) {
curr.show = !!curr.isViewEssentialField curr.show = !!metaColumnById?.value?.[curr.fk_column_id!]?.pv || !!curr.isViewEssentialField
acc[curr.fk_column_id] = curr acc[curr.fk_column_id] = curr
} }
return acc return acc
}, {}) }, {})
fields.value = fields.value?.map((field: Field) => ({ fields.value = (fields.value || [])?.map((field: Field) => {
...field, const updateField = {
show: fieldById[field.fk_column_id!]?.show, ...field,
})) show: fieldById[field.fk_column_id!]?.show,
}
localChanges.value[field.fk_column_id!] = field
return updateField
})
meta.value!.columns = meta.value!.columns?.map((column: ColumnType) => { meta.value!.columns = meta.value!.columns?.map((column: ColumnType) => {
if (fieldById[column.id!]) { if (fieldById[column.id!]) {
@ -237,7 +248,7 @@ const [useProvideViewColumns, useViewColumns] = useInjectionState(
return column return column
}) })
localChanges.value.push(field) localChanges.value[field.fk_column_id] = field
} }
if (isUIAllowed('viewFieldEdit')) { if (isUIAllowed('viewFieldEdit')) {
@ -284,6 +295,10 @@ const [useProvideViewColumns, useViewColumns] = useInjectionState(
const filteredFieldList = computed(() => { const filteredFieldList = computed(() => {
return ( return (
fields.value?.filter((field: Field) => { fields.value?.filter((field: Field) => {
if (!field.initialShow && isLocalMode.value) {
return false
}
if ( if (
metaColumnById?.value?.[field.fk_column_id!]?.pv && metaColumnById?.value?.[field.fk_column_id!]?.pv &&
(!filterQuery.value || field.title.toLowerCase().includes(filterQuery.value.toLowerCase())) (!filterQuery.value || field.title.toLowerCase().includes(filterQuery.value.toLowerCase()))
@ -305,6 +320,27 @@ const [useProvideViewColumns, useViewColumns] = useInjectionState(
) )
}) })
const numberOfHiddenFields = computed(() => {
return (fields.value || [])
?.filter((field: Field) => {
if (!field.initialShow && isLocalMode.value) {
return false
}
if (metaColumnById?.value?.[field.fk_column_id!]?.pv) {
return true
}
// hide system columns if not enabled
if (!showSystemFields.value && isSystemColumn(metaColumnById?.value?.[field.fk_column_id!])) {
return false
}
return true
})
.filter((field) => !field.show)?.length
})
const sortedAndFilteredFields = computed<ColumnType[]>(() => { const sortedAndFilteredFields = computed<ColumnType[]>(() => {
return (fields?.value return (fields?.value
?.filter((field: Field) => { ?.filter((field: Field) => {
@ -432,6 +468,7 @@ const [useProvideViewColumns, useViewColumns] = useInjectionState(
fieldsMap, fieldsMap,
loadViewColumns, loadViewColumns,
filteredFieldList, filteredFieldList,
numberOfHiddenFields,
filterQuery, filterQuery,
showAll, showAll,
hideAll, hideAll,
@ -445,6 +482,7 @@ const [useProvideViewColumns, useViewColumns] = useInjectionState(
updateGridViewColumn, updateGridViewColumn,
gridViewCols, gridViewCols,
resizingColOldWith, resizingColOldWith,
isLocalMode,
} }
}, },
'useViewColumnsOrThrow', 'useViewColumnsOrThrow',

1
packages/nc-gui/lib/types.ts

@ -51,6 +51,7 @@ interface Field {
fk_column_id?: string fk_column_id?: string
system?: boolean system?: boolean
isViewEssentialField?: boolean isViewEssentialField?: boolean
initialShow?: boolean
} }
type Filter = FilterType & { type Filter = FilterType & {

11
packages/nocodb/src/services/public-metas.service.ts

@ -12,7 +12,15 @@ import type {
LookupColumn, LookupColumn,
} from '~/models'; } from '~/models';
import type { NcContext } from '~/interface/config'; import type { NcContext } from '~/interface/config';
import { Base, BaseUser, Column, Model, Source, View } from '~/models'; import {
Base,
BaseUser,
Column,
GridViewColumn,
Model,
Source,
View,
} from '~/models';
import { NcError } from '~/helpers/catchError'; import { NcError } from '~/helpers/catchError';
@Injectable() @Injectable()
@ -71,6 +79,7 @@ export class PublicMetasService {
if (!column) return false; if (!column) return false;
return ( return (
(c instanceof GridViewColumn && c.group_by) ||
c.show || c.show ||
(column.rqd && !column.cdf && !column.ai) || (column.rqd && !column.cdf && !column.ai) ||
column.pk || column.pk ||

Loading…
Cancel
Save