From 1149d0e43684437bebca0c8af5c52324aa246ea5 Mon Sep 17 00:00:00 2001
From: sreehari jayaraj <sreeharivijaya2003@gmail.com>
Date: Tue, 16 Apr 2024 16:29:09 +0530
Subject: [PATCH 1/4] fix: prevent system fields from getting deleted manually

---
 .../components/smartsheet/header/Menu.vue     | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/header/Menu.vue b/packages/nc-gui/components/smartsheet/header/Menu.vue
index 3fa673c3100..810fe519f14 100644
--- a/packages/nc-gui/components/smartsheet/header/Menu.vue
+++ b/packages/nc-gui/components/smartsheet/header/Menu.vue
@@ -502,9 +502,33 @@ 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">
+        <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 v-if="!column?.pk && isDeleteAllowed" class="!my-0" />
+
+        <NcMenuItem v-if="!column?.pk && 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 -->

From 080c0311fb654de5e28f9bf33477ca7dc7a7d91a Mon Sep 17 00:00:00 2001
From: sreehari jayaraj <sreeharivijaya2003@gmail.com>
Date: Wed, 17 Apr 2024 19:48:58 +0530
Subject: [PATCH 2/4] feat: added tool tip

---
 .../components/smartsheet/header/Menu.vue     | 23 +++++++++++--------
 packages/nc-gui/lang/en.json                  |  1 +
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/header/Menu.vue b/packages/nc-gui/components/smartsheet/header/Menu.vue
index 810fe519f14..8b4cafb290a 100644
--- a/packages/nc-gui/components/smartsheet/header/Menu.vue
+++ b/packages/nc-gui/components/smartsheet/header/Menu.vue
@@ -519,22 +519,25 @@ const filterOrGroupByThisField = (event: SmartsheetStoreEvents) => {
             {{ t('general.insertAfter') }}
           </div>
         </NcMenuItem>
-        <NcMenuItem v-if="!column?.pv" @click="onInsertBefore">
+        <NcMenuItem v-if="!column?.pk" @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 v-if="!column?.pk && isDeleteAllowed" class="!my-0" />
-
-        <NcMenuItem v-if="!column?.pk && 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') }}
-          </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>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index c481dcfce56..39ec7ae6fb0 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -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",

From be77f75d899a0a6fe6711b5c9b0610492c5e1482 Mon Sep 17 00:00:00 2001
From: sreehari jayaraj <sreeharivijaya2003@gmail.com>
Date: Wed, 17 Apr 2024 21:36:42 +0530
Subject: [PATCH 3/4] fix: removed unwanted change

---
 packages/nc-gui/components/smartsheet/header/Menu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/header/Menu.vue b/packages/nc-gui/components/smartsheet/header/Menu.vue
index 8b4cafb290a..04bb4b0d35c 100644
--- a/packages/nc-gui/components/smartsheet/header/Menu.vue
+++ b/packages/nc-gui/components/smartsheet/header/Menu.vue
@@ -519,7 +519,7 @@ const filterOrGroupByThisField = (event: SmartsheetStoreEvents) => {
             {{ t('general.insertAfter') }}
           </div>
         </NcMenuItem>
-        <NcMenuItem v-if="!column?.pk" @click="onInsertBefore">
+        <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 -->

From 774036003852850e851b5deec1e5932a1f18d324 Mon Sep 17 00:00:00 2001
From: sreehari jayaraj <sreeharivijaya2003@gmail.com>
Date: Fri, 17 May 2024 17:14:43 +0530
Subject: [PATCH 4/4] fix: extra options

---
 .../components/smartsheet/header/Menu.vue     | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/header/Menu.vue b/packages/nc-gui/components/smartsheet/header/Menu.vue
index 04bb4b0d35c..199d34e6714 100644
--- a/packages/nc-gui/components/smartsheet/header/Menu.vue
+++ b/packages/nc-gui/components/smartsheet/header/Menu.vue
@@ -502,32 +502,7 @@ const filterOrGroupByThisField = (event: SmartsheetStoreEvents) => {
             </div>
           </NcMenuItem>
         </template>
-
-        <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">