fix: Remvoed isLocked logic from all cell types

packages/nc-gui/components/cell/DatePicker.vue

@@ -32,8 +32,6 @@ const columnMeta = inject(ColumnInj, null)!
 
 const readOnly = inject(ReadonlyInj, ref(false))
 
-const isLockedMode = inject(IsLockedInj, ref(false))
-
 const isEditColumn = inject(EditColumnInj, ref(false))
 
 const active = inject(ActiveCellInj, ref(false))
@@ -188,9 +186,7 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
 const isOpen = computed(() => {
   if (readOnly.value) return false
 
-  return ((readOnly.value || (localState.value && isPk)) && !active.value && !editable.value) || isLockedMode.value
-    ? false
-    : open.value
+  return (readOnly.value || (localState.value && isPk)) && !active.value && !editable.value ? false : open.value
 })
 
 // use the default date picker open sync only to close the picker

packages/nc-gui/components/cell/DateTimePicker.vue

@@ -37,8 +37,6 @@ const active = inject(ActiveCellInj, ref(false))
 
 const editable = inject(EditModeInj, ref(false))
 
-const isLockedMode = inject(IsLockedInj, ref(false))
-
 const { t } = useI18n()
 
 const isEditColumn = inject(EditColumnInj, ref(false))
@@ -126,9 +124,7 @@ const open = ref(false)
 const isOpen = computed(() => {
   if (readOnly.value) return false
 
-  return readOnly.value || (localState.value && isPk) || isLockedMode.value
-    ? false
-    : open.value && (active.value || editable.value)
+  return readOnly.value || (localState.value && isPk) ? false : open.value && (active.value || editable.value)
 })
 
 const randomClass = `picker_${Math.floor(Math.random() * 99999)}`

packages/nc-gui/components/cell/MultiSelect.vue

@@ -49,8 +49,6 @@ const column = inject(ColumnInj)!
 
 const readOnly = inject(ReadonlyInj)!
 
-const isLockedMode = inject(IsLockedInj, ref(false))
-
 const isEditable = inject(EditModeInj, ref(false))
 
 const activeCell = inject(ActiveCellInj, ref(false))
@@ -343,11 +341,7 @@ const selectedOpts = computed(() => {
 </script>
 
 <template>
-  <div
-    class="nc-multi-select h-full w-full flex items-center"
-    :class="{ 'read-only': readOnly || isLockedMode }"
-    @click="toggleMenu"
-  >
+  <div class="nc-multi-select h-full w-full flex items-center" :class="{ 'read-only': readOnly }" @click="toggleMenu">
     <div
       v-if="!active"
       class="flex flex-wrap"
@@ -386,9 +380,9 @@ const selectedOpts = computed(() => {
       :bordered="false"
       clear-icon
       :show-search="!isMobileMode"
-      :show-arrow="editAllowed && !(readOnly || isLockedMode)"
+      :show-arrow="editAllowed && !readOnly"
       :open="isOpen && editAllowed"
-      :disabled="readOnly || !editAllowed || isLockedMode"
+      :disabled="readOnly || !editAllowed"
       :class="{ 'caret-transparent': !hasEditRoles }"
       :dropdown-class-name="`nc-dropdown-multi-select-cell ${isOpen ? 'active' : ''}`"
       @search="search"

packages/nc-gui/components/cell/SingleSelect.vue

@@ -43,8 +43,6 @@ const column = inject(ColumnInj)!
 
 const readOnly = inject(ReadonlyInj)!
 
-const isLockedMode = inject(IsLockedInj, ref(false))
-
 const isEditable = inject(EditModeInj, ref(false))
 
 const activeCell = inject(ActiveCellInj, ref(false))
@@ -264,11 +262,7 @@ const selectedOpt = computed(() => {
 </script>
 
 <template>
-  <div
-    class="h-full w-full flex items-center nc-single-select"
-    :class="{ 'read-only': readOnly || isLockedMode }"
-    @click="toggleMenu"
-  >
+  <div class="h-full w-full flex items-center nc-single-select" :class="{ 'read-only': readOnly }" @click="toggleMenu">
     <div v-if="!(active || isEditable)">
       <a-tag v-if="selectedOpt" class="rounded-tag" :color="selectedOpt.color">
         <span
@@ -295,8 +289,8 @@ const selectedOpt = computed(() => {
       :allow-clear="!column.rqd && editAllowed"
       :bordered="false"
       :open="isOpen && editAllowed"
-      :disabled="readOnly || !editAllowed || isLockedMode"
-      :show-arrow="hasEditRoles && !(readOnly || isLockedMode) && active && vModel === null"
+      :disabled="readOnly || !editAllowed"
+      :show-arrow="hasEditRoles && !readOnly && active && vModel === null"
       :dropdown-class-name="`nc-dropdown-single-select-cell ${isOpen && active ? 'active' : ''}`"
       :show-search="!isMobileMode && isOpen && active"
       @select="onSelect"

packages/nc-gui/components/cell/attachment/Modal.vue

@@ -25,8 +25,6 @@ const {
   renameFile,
 } = useAttachmentCell()!
 
-const isLocked = inject(IsLockedInj, ref(false))
-
 const dropZoneRef = ref<HTMLDivElement>()
 
 const sortableRef = ref<HTMLDivElement>()
@@ -96,7 +94,7 @@ const handleFileDelete = (i: number) => {
     <template #title>
       <div class="flex gap-4">
         <div
-          v-if="isSharedForm || (!readOnly && isUIAllowed('dataEdit') && !isPublic && !isLocked)"
+          v-if="isSharedForm || (!readOnly && isUIAllowed('dataEdit') && !isPublic)"
           class="nc-attach-file group"
           data-testid="attachment-expand-file-picker-button"
           @click="open"
@@ -143,7 +141,7 @@ const handleFileDelete = (i: number) => {
               <template #title> {{ $t('title.removeFile') }} </template>
               <component
                 :is="iconMap.closeCircle"
-                v-if="isSharedForm || (isUIAllowed('dataEdit') && !isPublic && !isLocked)"
+                v-if="isSharedForm || (isUIAllowed('dataEdit') && !isPublic)"
                 class="nc-attachment-remove"
                 @click.stop="onRemoveFileClick(item.title, i)"
               />
@@ -157,7 +155,7 @@ const handleFileDelete = (i: number) => {
               </div>
             </a-tooltip>
 
-            <a-tooltip v-if="isSharedForm || (!readOnly && isUIAllowed('dataEdit') && !isPublic && !isLocked)" placement="bottom">
+            <a-tooltip v-if="isSharedForm || (!readOnly && isUIAllowed('dataEdit') && !isPublic)" placement="bottom">
               <template #title> {{ $t('title.renameFile') }} </template>
 
               <div class="nc-attachment-download group-hover:(opacity-100) mr-[35px]">

packages/nc-gui/components/cell/attachment/index.vue

@@ -43,8 +43,6 @@ const sortableRef = ref<HTMLDivElement>()
 
 const currentCellRef = inject(CurrentCellInj, dropZoneInjection.value)
 
-const isLockedMode = inject(IsLockedInj, ref(false))
-
 const isGallery = inject(IsGalleryInj, ref(false))
 
 const isKanban = inject(IsKanbanInj, ref(false))
@@ -69,18 +67,14 @@ const {
   open: _open,
   FileIcon,
   selectedImage,
-  isReadonly: _isReadonly,
+  isReadonly,
   storedFiles,
 } = useProvideAttachmentCell(updateModelValue)
 
-const { dragging } = useSortable(sortableRef, visibleItems, updateModelValue, _isReadonly)
+const { dragging } = useSortable(sortableRef, visibleItems, updateModelValue, isReadonly)
 
 const active = inject(ActiveCellInj, ref(false))
 
-const isReadonly = computed(() => {
-  return isLockedMode.value || _isReadonly.value
-})
-
 const { state: rowState } = useSmartsheetRowStoreOrThrow()
 
 const { isOverDropZone } = useDropZone(currentCellRef as any, onDrop)

packages/nc-gui/components/smartsheet/Cell.vue

@@ -87,8 +87,6 @@ const isGrid = inject(IsGridInj, ref(false))
 
 const isPublic = inject(IsPublicInj, ref(false))
 
-const isLocked = inject(IsLockedInj, ref(false))
-
 const isSurveyForm = inject(IsSurveyFormInj, ref(false))
 
 const isEditColumnMenu = inject(EditColumnInj, ref(false))
@@ -255,11 +253,7 @@ onUnmounted(() => {
         <LazyCellJson v-else-if="isJSON(column)" v-model="vModel" />
         <LazyCellText v-else v-model="vModel" />
         <div
-          v-if="
-            (isLocked || (isPublic && readOnly && !isForm) || isSystemColumn(column)) &&
-            !isAttachment(column) &&
-            !isTextArea(column)
-          "
+          v-if="(isPublic && readOnly && !isForm) || (isSystemColumn(column) && !isAttachment(column) && !isTextArea(column))"
           class="nc-locked-overlay"
         />
       </template>

packages/nc-gui/components/virtual-cell/BelongsTo.vue

@@ -6,7 +6,6 @@ import {
   CellValueInj,
   ColumnInj,
   IsFormInj,
-  IsLockedInj,
   IsUnderLookupInj,
   ReadonlyInj,
   ReloadRowDataHookInj,
@@ -35,8 +34,6 @@ const readOnly = inject(ReadonlyInj, ref(false))
 
 const isForm = inject(IsFormInj, ref(false))
 
-const isLocked = inject(IsLockedInj, ref(false))
-
 const isUnderLookup = inject(IsUnderLookupInj, ref(false))
 
 const { isUIAllowed } = useRoles()
@@ -103,7 +100,7 @@ const belongsToColumn = computed(
     </div>
 
     <div
-      v-if="!readOnly && !isLocked && (isUIAllowed('dataEdit') || isForm) && !isUnderLookup"
+      v-if="!readOnly && (isUIAllowed('dataEdit') || isForm) && !isUnderLookup"
       class="flex justify-end gap-1 min-h-[30px] items-center"
     >
       <GeneralIcon

packages/nc-gui/components/virtual-cell/HasMany.vue

@@ -5,7 +5,6 @@ import {
   CellValueInj,
   ColumnInj,
   IsFormInj,
-  IsLockedInj,
   IsUnderLookupInj,
   ReadonlyInj,
   ReloadRowDataHookInj,
@@ -31,8 +30,6 @@ const isForm = inject(IsFormInj)
 
 const readOnly = inject(ReadonlyInj, ref(false))
 
-const isLocked = inject(IsLockedInj)
-
 const isUnderLookup = inject(IsUnderLookupInj, ref(false))
 
 const listItemsDlg = ref(false)
@@ -121,7 +118,7 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEven
       </template>
     </div>
 
-    <div v-if="!isLocked && !isUnderLookup" class="flex justify-end gap-1 min-h-[30px] items-center">
+    <div v-if="!isUnderLookup" class="flex justify-end gap-1 min-h-[30px] items-center">
       <GeneralIcon
         icon="expand"
         class="select-none transform text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-arrow-expand"

packages/nc-gui/components/virtual-cell/Links.vue

@@ -17,8 +17,6 @@ const isForm = inject(IsFormInj)
 
 const readOnly = inject(ReadonlyInj, ref(false))
 
-const isLocked = inject(IsLockedInj, ref(false))
-
 const isUnderLookup = inject(IsUnderLookupInj, ref(false))
 
 const colTitle = computed(() => column.value?.title || '')
@@ -79,15 +77,13 @@ const onAttachRecord = () => {
 const openChildList = () => {
   if (isUnderLookup.value) return
 
-  if (!isLocked.value) {
   childListDlg.value = true
-  }
 }
 
 useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEvent) => {
   switch (e.key) {
     case 'Enter':
-      if (isLocked.value || listItemsDlg.value) return
+      if (listItemsDlg.value) return
       childListDlg.value = true
       e.stopPropagation()
       break
@@ -112,7 +108,7 @@ const openListDlg = () => {
   <div class="flex w-full group items-center nc-links-wrapper" @dblclick.stop="openChildList">
     <div class="block flex-shrink truncate">
       <component
-        :is="isLocked || isUnderLookup ? 'span' : 'a'"
+        :is="isUnderLookup ? 'span' : 'a'"
         v-e="['c:cell:links:modal:open']"
         :title="textVal"
         class="text-center nc-datatype-link underline-transparent"
@@ -124,7 +120,7 @@ const openListDlg = () => {
     </div>
     <div class="flex-grow" />
 
-    <div v-if="!isLocked && !isUnderLookup" class="!xs:hidden flex justify-end hidden group-hover:flex items-center">
+    <div v-if="!isUnderLookup" class="!xs:hidden flex justify-end hidden group-hover:flex items-center">
       <MdiPlus
         v-if="(!readOnly && isUIAllowed('dataEdit')) || isForm"
         class="select-none !text-md text-gray-700 nc-action-icon nc-plus"

packages/nc-gui/components/virtual-cell/ManyToMany.vue

@@ -6,7 +6,6 @@ import {
   CellValueInj,
   ColumnInj,
   IsFormInj,
-  IsLockedInj,
   IsUnderLookupInj,
   ReadonlyInj,
   ReloadRowDataHookInj,
@@ -33,8 +32,6 @@ const isForm = inject(IsFormInj)
 
 const readOnly = inject(ReadonlyInj, ref(false))
 
-const isLocked = inject(IsLockedInj)
-
 const isUnderLookup = inject(IsUnderLookupInj, ref(false))
 
 const listItemsDlg = ref(false)
@@ -123,7 +120,7 @@ const m2mColumn = computed(
       </template>
     </div>
 
-    <div v-if="(!isLocked && !isUnderLookup) || isForm" class="flex justify-end gap-1 min-h-[30px] items-center">
+    <div v-if="!isUnderLookup || isForm" class="flex justify-end gap-1 min-h-[30px] items-center">
       <GeneralIcon
         icon="expand"
         class="text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-arrow-expand"

packages/nc-gui/components/virtual-cell/components/ItemChip.vue

@@ -4,7 +4,6 @@ import { UITypes, isVirtualCol } from 'nocodb-sdk'
 import {
   ActiveCellInj,
   IsFormInj,
-  IsLockedInj,
   ReadonlyInj,
   iconMap,
   inject,
@@ -37,13 +36,11 @@ const active = inject(ActiveCellInj, ref(false))
 
 const isForm = inject(IsFormInj)!
 
-const isLocked = inject(IsLockedInj, ref(false))
-
 const { open } = useExpandedFormDetached()
 
 function openExpandedForm() {
   const rowId = extractPkFromRow(item, relatedTableMeta.value.columns as ColumnType[])
-  if (!readOnly.value && !isLocked.value && !readonlyProp && rowId) {
+  if (!readOnly.value && !readonlyProp && rowId) {
     open({
       isOpen: true,
       row: { row: item, rowMeta: {}, oldRow: { ...item } },
@@ -98,11 +95,7 @@ export default {
       </template>
     </span>
 
-    <div
-      v-show="active || isForm"
-      v-if="showUnlinkButton && !readOnly && !isLocked && isUIAllowed('dataEdit')"
-      class="flex items-center"
-    >
+    <div v-show="active || isForm" v-if="showUnlinkButton && !readOnly && isUIAllowed('dataEdit')" class="flex items-center">
       <component
         :is="iconMap.closeThick"
         class="nc-icon unlink-icon text-xs text-gray-500/50 group-hover:text-gray-500"