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 system fields from getting deleted manually #8285

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

fix: prevent system fields from getting deleted manually #8285

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1149d0e
fix: prevent system fields from getting deleted manually
sreehari2003 Apr 16, 2024
080c031
feat: added tool tip
sreehari2003 Apr 17, 2024
be77f75
fix: removed unwanted change
sreehari2003 Apr 17, 2024
7740360
fix: extra options
sreehari2003 May 17, 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
39 changes: 33 additions & 6 deletions packages/nc-gui/components/smartsheet/header/Menu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,15 +502,42 @@ const filterOrGroupByThisField = (event: SmartsheetStoreEvents) => {
</div>
</NcMenuItem>
</template>
<a-divider v-if="!column?.pv" class="!my-0" />

<NcMenuItem v-if="!column?.pv" :disabled="!isDeleteAllowed" class="!hover:bg-red-50" @click="handleDelete">
<div class="nc-column-delete nc-header-menu-item text-red-600">
<component :is="iconMap.delete" />
<!-- Delete -->
{{ $t('general.delete') }}
<a-divider v-if="!column?.pk" class="!my-0" />

<NcMenuItem v-if="!column?.pk" :disabled="!isDuplicateAllowed" @click="openDuplicateDlg">
<div v-e="['a:field:duplicate']" class="nc-column-duplicate nc-header-menu-item">
<component :is="iconMap.duplicate" class="text-gray-700" />
<!-- Duplicate -->
{{ t('general.duplicate') }}
</div>
</NcMenuItem>
<NcMenuItem @click="onInsertAfter">
<div v-e="['a:field:insert:after']" class="nc-column-insert-after nc-header-menu-item">
<component :is="iconMap.colInsertAfter" class="text-gray-700 !w-4.5 !h-4.5" />
<!-- Insert After -->
{{ t('general.insertAfter') }}
</div>
</NcMenuItem>
<NcMenuItem v-if="!column?.pv" @click="onInsertBefore">
<div v-e="['a:field:insert:before']" class="nc-column-insert-before nc-header-menu-item">
<component :is="iconMap.colInsertBefore" class="text-gray-600 !w-4.5 !h-4.5" />
<!-- Insert Before -->
{{ t('general.insertBefore') }}
</div>
</NcMenuItem>
<a-divider class="!my-0" />

<NcTooltip :disabled="isDeleteAllowed && !column?.pk">
<template #title>{{ $t('labels.deleteSystemFieldNotAllowed') }}</template>
<NcMenuItem class="!hover:bg-red-50" :disabled="column?.pk || !isDeleteAllowed" @click="handleDelete">
<div class="nc-column-delete nc-header-menu-item text-red-600">
<component :is="iconMap.delete" />
<!-- Delete -->
{{ $t('general.delete') }}
</div>
</NcMenuItem>
</NcTooltip>
</NcMenu>
</template>
</a-dropdown>
Expand Down
1 change: 1 addition & 0 deletions packages/nc-gui/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,7 @@
"userOptions": "User Options",
"deleteThisOrganization": "Delete this Organisation",
"dangerZone": "Dangerzone",
"deleteSystemFieldNotAllowed": "Deleting system field is not allowed",
"selectYear": "Select Year",
"save": "Save",
"cancel": "Cancel",
Expand Down