From 90a344e90b0a28bca5f20c2fd7340cc3f1199262 Mon Sep 17 00:00:00 2001
From: sreehari jayaraj <sreeharivijaya2003@gmail.com>
Date: Wed, 30 Aug 2023 11:52:18 +0530
Subject: [PATCH 1/4] fix: removed edit option of cell in locked view

---
 packages/nc-gui/components/smartsheet/grid/Table.vue  | 2 +-
 packages/nc-gui/components/smartsheet/header/Cell.vue | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/grid/Table.vue b/packages/nc-gui/components/smartsheet/grid/Table.vue
index b7075a1335..ef05be4d58 100644
--- a/packages/nc-gui/components/smartsheet/grid/Table.vue
+++ b/packages/nc-gui/components/smartsheet/grid/Table.vue
@@ -1124,7 +1124,7 @@ defineExpose({
 })
 
 // when expand is clicked the drawer should open
-// and cell should loose focs
+// and cell should loose focus
 const expandAndLooseFocus = (row: Row, col: Record<string, any>) => {
   if (expandForm) {
     expandForm(row, col)
diff --git a/packages/nc-gui/components/smartsheet/header/Cell.vue b/packages/nc-gui/components/smartsheet/header/Cell.vue
index 4ba762705d..d19301a897 100644
--- a/packages/nc-gui/components/smartsheet/header/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/header/Cell.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { ColumnReqType, ColumnType } from 'nocodb-sdk'
-import { ColumnInj, IsFormInj, IsKanbanInj, inject, provide, ref, toRef, useUIPermission } from '#imports'
+import { ActiveViewInj, ColumnInj, IsFormInj, IsKanbanInj, inject, provide, ref, toRef, useUIPermission } from '#imports'
 
 interface Props {
   column: ColumnType
@@ -18,6 +18,10 @@ const isDropDownOpen = ref(false)
 
 const isKanban = inject(IsKanbanInj, ref(false))
 
+const activeInj = inject(ActiveViewInj, ref())
+
+const isLockedView = computed(() => activeInj.value?.lock_type === 'locked')
+
 const column = toRef(props, 'column')
 
 const { isUIAllowed } = useUIPermission()
@@ -39,6 +43,7 @@ const closeAddColumnDropdown = () => {
 }
 
 const openHeaderMenu = () => {
+  if (isLockedView.value) return
   if (!isForm.value && isUIAllowed('edit-column')) {
     editColumnDropdown.value = true
   }

From 68b7dcf2dfa0db332f3b839d8d46c536cd4c0290 Mon Sep 17 00:00:00 2001
From: sreehari jayaraj <sreeharivijaya2003@gmail.com>
Date: Wed, 30 Aug 2023 13:36:40 +0530
Subject: [PATCH 2/4] fix: refactor

---
 packages/nc-gui/components/smartsheet/header/Cell.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/header/Cell.vue b/packages/nc-gui/components/smartsheet/header/Cell.vue
index d19301a897..9c18483841 100644
--- a/packages/nc-gui/components/smartsheet/header/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/header/Cell.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { ColumnReqType, ColumnType } from 'nocodb-sdk'
-import { ActiveViewInj, ColumnInj, IsFormInj, IsKanbanInj, inject, provide, ref, toRef, useUIPermission } from '#imports'
+import { IsFormInj, IsKanbanInj, IsLockedInj, inject, provide, ref, toRef, useUIPermission } from '#imports'
 
 interface Props {
   column: ColumnType
@@ -18,9 +18,7 @@ const isDropDownOpen = ref(false)
 
 const isKanban = inject(IsKanbanInj, ref(false))
 
-const activeInj = inject(ActiveViewInj, ref())
-
-const isLockedView = computed(() => activeInj.value?.lock_type === 'locked')
+const isLocked = inject(IsLockedInj, ref(false))
 
 const column = toRef(props, 'column')
 
@@ -43,8 +41,7 @@ const closeAddColumnDropdown = () => {
 }
 
 const openHeaderMenu = () => {
-  if (isLockedView.value) return
-  if (!isForm.value && isUIAllowed('edit-column')) {
+  if (!isLocked.value && !isForm.value && isUIAllowed('edit-column')) {
     editColumnDropdown.value = true
   }
 }

From 2fc2b4812631e80e1c31b082badcdb1457a54eb4 Mon Sep 17 00:00:00 2001
From: sreehari jayaraj <sreeharivijaya2003@gmail.com>
Date: Wed, 30 Aug 2023 14:21:31 +0530
Subject: [PATCH 3/4] Missing import

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

diff --git a/packages/nc-gui/components/smartsheet/header/Cell.vue b/packages/nc-gui/components/smartsheet/header/Cell.vue
index 9c18483841..2b10e9b2ca 100644
--- a/packages/nc-gui/components/smartsheet/header/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/header/Cell.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { ColumnReqType, ColumnType } from 'nocodb-sdk'
-import { IsFormInj, IsKanbanInj, IsLockedInj, inject, provide, ref, toRef, useUIPermission } from '#imports'
+import { ColumnInj, IsFormInj, IsKanbanInj, IsLockedInj, inject, provide, ref, toRef, useUIPermission } from '#imports'
 
 interface Props {
   column: ColumnType

From 7df4a2519b1513bebc81a70513ab425eef39954d Mon Sep 17 00:00:00 2001
From: sreehari jayaraj <sreeharivijaya2003@gmail.com>
Date: Wed, 30 Aug 2023 16:59:48 +0530
Subject: [PATCH 4/4] fix: hover effect

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

diff --git a/packages/nc-gui/components/smartsheet/header/Cell.vue b/packages/nc-gui/components/smartsheet/header/Cell.vue
index 2b10e9b2ca..dc287fb699 100644
--- a/packages/nc-gui/components/smartsheet/header/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/header/Cell.vue
@@ -59,7 +59,7 @@ const openHeaderMenu = () => {
     <div
       v-if="column"
       class="name pl-1 !truncate"
-      :class="{ 'cursor-pointer pt-0.25': !isForm && isUIAllowed('edit-column') && !hideMenu }"
+      :class="{ 'cursor-pointer pt-0.25': !isForm && isUIAllowed('edit-column') && !hideMenu && !isLocked }"
       style="white-space: pre-line"
       :title="column.title"
     >