From e40ed4e8cfa8bb5336364829b3d8a75a34c85c5d Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 25 Dec 2023 12:33:56 +0530
Subject: [PATCH 01/30] fix: disable input field after Enter key is pressed

---
 packages/nc-gui/components/smartsheet/expanded-form/Comments.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
index e91285dea0..641e2373fe 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -260,6 +260,7 @@ watch(commentInputDomRef, () => {
               placeholder="Start typing..."
               data-testid="expanded-form-comment-input"
               :bordered="false"
+              :disabled="isSaving"
               @keyup.enter.prevent="saveComment"
             >
             </a-input>

From e8424afcdc39126fac131b73408261339d988858 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 25 Dec 2023 18:09:15 +0530
Subject: [PATCH 02/30] fix: tab navigation and focus outline issue

---
 packages/nc-gui/components/cell/Checkbox.vue         |  2 +-
 packages/nc-gui/components/cell/GeoData.vue          | 12 ++++++++++--
 packages/nc-gui/components/cell/RichText.vue         |  3 ++-
 .../components/smartsheet/column/DefaultValue.vue    |  2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/cell/Checkbox.vue b/packages/nc-gui/components/cell/Checkbox.vue
index 36c57dbc1c..0f4dcce494 100644
--- a/packages/nc-gui/components/cell/Checkbox.vue
+++ b/packages/nc-gui/components/cell/Checkbox.vue
@@ -84,7 +84,7 @@ useSelectedCellKeyupListener(active, (e) => {
 
 <template>
   <div
-    class="flex cursor-pointer w-full h-full items-center focus:outline-transparent"
+    class="flex cursor-pointer w-full h-full items-center focus:outline-none"
     :class="{
       'w-full flex-start pl-2': isForm || isGallery || isExpandedFormOpen,
       'w-full justify-center': !isForm && !isGallery && !isExpandedFormOpen,
diff --git a/packages/nc-gui/components/cell/GeoData.vue b/packages/nc-gui/components/cell/GeoData.vue
index add965fb3b..9434d0309a 100644
--- a/packages/nc-gui/components/cell/GeoData.vue
+++ b/packages/nc-gui/components/cell/GeoData.vue
@@ -86,7 +86,8 @@ const openInOSM = () => {
   <a-dropdown :is="isExpanded ? AModal : 'div'" v-model:visible="isExpanded" :trigger="['click']">
     <div
       v-if="!isLocationSet"
-      class="group cursor-pointer flex gap-1 items-center mx-auto max-w-64 justify-center active:(ring ring-accent ring-opacity-100) rounded border-1 p-1 shadow-sm hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
+      class="group cursor-pointer flex gap-1 items-center mx-auto max-w-64 justify-center active:(ring ring-accent ring-opacity-100) rounded border-1 p-1 shadow-sm hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500) my-1"
+      tabindex="0"
     >
       <div class="flex items-center gap-2" data-testid="nc-geo-data-set-location-button">
         <component
@@ -98,7 +99,14 @@ const openInOSM = () => {
         </div>
       </div>
     </div>
-    <div v-else data-testid="nc-geo-data-lat-long-set">{{ latLongStr }}</div>
+    <div
+      v-else
+      data-testid="nc-geo-data-lat-long-set"
+      tabindex="0"
+      class="focus-visible:!outline-none h-full w-full flex items-center"
+    >
+      {{ latLongStr }}
+    </div>
     <template #overlay>
       <a-form :model="formState" class="flex flex-col w-max-64 border-1 border-gray-200" @finish="handleFinish">
         <a-form-item>
diff --git a/packages/nc-gui/components/cell/RichText.vue b/packages/nc-gui/components/cell/RichText.vue
index c9a73f0cf2..e936a68482 100644
--- a/packages/nc-gui/components/cell/RichText.vue
+++ b/packages/nc-gui/components/cell/RichText.vue
@@ -156,11 +156,12 @@ watch(editorDom, () => {
 
 <template>
   <div
-    class="h-full"
+    class="h-full focus-visible:!outline-none"
     :class="{
       'flex flex-col flex-grow nc-rich-text-full': props.fullMode,
       'nc-rich-text-embed flex flex-col pl-1 w-full': !props.fullMode,
     }"
+    tabindex="0"
   >
     <div v-if="props.showMenu" class="absolute top-0 right-0.5">
       <CellRichTextSelectedBubbleMenu v-if="editor" :editor="editor" embed-mode />
diff --git a/packages/nc-gui/components/smartsheet/column/DefaultValue.vue b/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
index 92576bc44a..8b057b24d8 100644
--- a/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
+++ b/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
@@ -47,7 +47,7 @@ watch(
   <div class="!my-3 text-xs">{{ $t('placeholder.defaultValue') }}</div>
   <div class="flex flex-row gap-2">
     <div
-      class="border-1 flex items-center w-full px-3 my-[-4px] border-gray-300 rounded-md"
+      class="border-1 flex items-center w-full px-3 my-[-4px] border-gray-300 rounded-md sm:min-h-[32px] flex items-center focus-within:(border-brand-500 shadow-none ring-0)"
       :class="{
         '!border-brand-500': editEnabled,
       }"

From ffcf84752dd280d8e6e94cb0a209e30d944a46cf Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 25 Dec 2023 23:02:18 +0530
Subject: [PATCH 03/30] fix: number input up-down button should be hidden

---
 packages/nc-gui/components/cell/Currency.vue | 14 ++++++++++++++
 packages/nc-gui/components/cell/Percent.vue  | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/packages/nc-gui/components/cell/Currency.vue b/packages/nc-gui/components/cell/Currency.vue
index a3e07c780c..71d6d82607 100644
--- a/packages/nc-gui/components/cell/Currency.vue
+++ b/packages/nc-gui/components/cell/Currency.vue
@@ -99,3 +99,17 @@ onMounted(() => {
   <!-- possibly unexpected string / null with showNull == false  -->
   <span v-else />
 </template>
+
+<style lang="scss" scoped>
+/* Chrome, Safari, Edge, Opera */
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+/* Firefox */
+input[type='number'] {
+  -moz-appearance: textfield;
+}
+</style>
diff --git a/packages/nc-gui/components/cell/Percent.vue b/packages/nc-gui/components/cell/Percent.vue
index 36b858229b..096a817d6f 100644
--- a/packages/nc-gui/components/cell/Percent.vue
+++ b/packages/nc-gui/components/cell/Percent.vue
@@ -150,3 +150,17 @@ const onTabPress = (e: KeyboardEvent) => {
     <span v-else>{{ vModel }}&nbsp;</span>
   </div>
 </template>
+
+<style lang="scss" scoped>
+/* Chrome, Safari, Edge, Opera */
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+/* Firefox */
+input[type='number'] {
+  -moz-appearance: textfield;
+}
+</style>

From 4bce0c5846b569f264e1367aa1ba9ce660223635 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 25 Dec 2023 23:03:31 +0530
Subject: [PATCH 04/30] fix: form view double border issue

---
 packages/nc-gui/components/smartsheet/Form.vue       | 12 ++++++++++--
 .../components/smartsheet/column/DefaultValue.vue    |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 5510e0d149..8db4add0d9 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -739,7 +739,7 @@ const onFormItemClick = (element: any) => {
                     <a-form-item
                       v-if="isVirtualCol(element)"
                       :name="element.title"
-                      class="!mb-0 nc-input-required-error"
+                      class="!mb-0 nc-input-required-error nc-form-input-item"
                       :rules="[
                         {
                           required: isRequired(element, element.required),
@@ -761,7 +761,7 @@ const onFormItemClick = (element: any) => {
                     <a-form-item
                       v-else
                       :name="element.title"
-                      class="!mb-0 nc-input-required-error"
+                      class="!mb-0 nc-input-required-error nc-form-input-item"
                       :rules="[
                         {
                           required: isRequired(element, element.required),
@@ -934,4 +934,12 @@ const onFormItemClick = (element: any) => {
     }
   }
 }
+
+.nc-form-input-item .nc-data-cell {
+  @apply !border-none rounded-none;
+
+  &:focus-within {
+    @apply !border-none;
+  }
+}
 </style>
diff --git a/packages/nc-gui/components/smartsheet/column/DefaultValue.vue b/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
index 8b057b24d8..87341b6ec9 100644
--- a/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
+++ b/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
@@ -47,7 +47,7 @@ watch(
   <div class="!my-3 text-xs">{{ $t('placeholder.defaultValue') }}</div>
   <div class="flex flex-row gap-2">
     <div
-      class="border-1 flex items-center w-full px-3 my-[-4px] border-gray-300 rounded-md sm:min-h-[32px] flex items-center focus-within:(border-brand-500 shadow-none ring-0)"
+      class="border-1 flex items-center w-full px-3 my-[-4px] border-gray-300 rounded-md sm:min-h-[32px] xs:min-h-13 flex items-center focus-within:(border-brand-500 shadow-none ring-0)"
       :class="{
         '!border-brand-500': editEnabled,
       }"

From cba6af4456a074203c00f2c2ed0c13fa772d2a2c Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 26 Dec 2023 00:27:29 +0530
Subject: [PATCH 05/30] fix: input field double border issue of shared form

---
 packages/nc-gui/components/cell/GeoData.vue                 | 2 +-
 packages/nc-gui/components/cell/RichText.vue                | 2 +-
 .../nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue   | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/cell/GeoData.vue b/packages/nc-gui/components/cell/GeoData.vue
index 9434d0309a..c409b73a5e 100644
--- a/packages/nc-gui/components/cell/GeoData.vue
+++ b/packages/nc-gui/components/cell/GeoData.vue
@@ -103,7 +103,7 @@ const openInOSM = () => {
       v-else
       data-testid="nc-geo-data-lat-long-set"
       tabindex="0"
-      class="focus-visible:!outline-none h-full w-full flex items-center"
+      class="focus-visible:!outline-none focus:!outline-none h-full w-full flex items-center"
     >
       {{ latLongStr }}
     </div>
diff --git a/packages/nc-gui/components/cell/RichText.vue b/packages/nc-gui/components/cell/RichText.vue
index e936a68482..c562e934ec 100644
--- a/packages/nc-gui/components/cell/RichText.vue
+++ b/packages/nc-gui/components/cell/RichText.vue
@@ -156,7 +156,7 @@ watch(editorDom, () => {
 
 <template>
   <div
-    class="h-full focus-visible:!outline-none"
+    class="h-full focus:!outline-none focus-visible:!outline-none"
     :class="{
       'flex flex-col flex-grow nc-rich-text-full': props.fullMode,
       'nc-rich-text-embed flex flex-col pl-1 w-full': !props.fullMode,
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue
index ea043051fb..9a82be83d7 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue
@@ -68,6 +68,10 @@ p {
 }
 
 .nc-form-view {
+  .nc-data-cell {
+    @apply border-solid border-1 border-gray-300 dark:border-slate-200;
+  }
+
   .nc-cell {
     @apply bg-white dark:bg-slate-500;
 
@@ -91,7 +95,7 @@ p {
       @apply bg-white dark:bg-slate-500;
 
       &.nc-input {
-        @apply w-full rounded p-2 min-h-[40px] flex items-center border-solid border-1 border-gray-300 dark:border-slate-200;
+        @apply w-full px-2 min-h-[40px] flex items-center;
 
         .duration-cell-wrapper {
           @apply w-full;

From e6a60e94b0617248ccc7fdc5348014ffd2c613ba Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 26 Dec 2023 00:28:43 +0530
Subject: [PATCH 06/30] fix: long/rich text field default value issue in form
 view

---
 packages/nc-gui/components/cell/TextArea.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index b87e13af1d..3846f7468f 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -38,7 +38,7 @@ const isForm = inject(IsFormInj, ref(false))
 
 const { showNull } = useGlobal()
 
-const vModel = useVModel(props, 'modelValue', emits, { defaultValue: column?.value.cdf ? String(column?.value.cdf) : '' })
+const vModel = useVModel(props, 'modelValue', emits)
 
 const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
 

From 8e7aaf8d16e15fe1c66b2c7f983c16442f2795c0 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 27 Dec 2023 00:10:45 +0530
Subject: [PATCH 07/30] fix: field alignment issue in expanded form

---
 packages/nc-gui/components/cell/Currency.vue  |  5 ++++-
 .../nc-gui/components/cell/DatePicker.vue     |  7 ++++--
 .../nc-gui/components/cell/DateTimePicker.vue |  7 ++++--
 packages/nc-gui/components/cell/Decimal.vue   |  5 ++++-
 packages/nc-gui/components/cell/Duration.vue  |  6 +++--
 packages/nc-gui/components/cell/Email.vue     |  5 ++++-
 packages/nc-gui/components/cell/GeoData.vue   |  9 ++++++--
 packages/nc-gui/components/cell/Integer.vue   |  6 ++---
 .../nc-gui/components/cell/MultiSelect.vue    |  8 ++++++-
 packages/nc-gui/components/cell/Percent.vue   |  8 ++++---
 .../nc-gui/components/cell/PhoneNumber.vue    |  5 ++++-
 packages/nc-gui/components/cell/Rating.vue    | 14 ++++++++++--
 .../nc-gui/components/cell/SingleSelect.vue   | 13 +++++++++--
 packages/nc-gui/components/cell/Text.vue      |  6 ++---
 packages/nc-gui/components/cell/TextArea.vue  |  2 +-
 .../nc-gui/components/cell/TimePicker.vue     |  7 ++++--
 packages/nc-gui/components/cell/Url.vue       |  5 ++++-
 packages/nc-gui/components/cell/User.vue      |  8 ++++++-
 .../nc-gui/components/cell/YearPicker.vue     |  9 +++++---
 .../components/cell/attachment/index.vue      |  2 +-
 .../components/virtual-cell/Formula.vue       | 22 +++++++++++++++++--
 .../nc-gui/components/virtual-cell/Links.vue  | 20 +++++++++++++++--
 22 files changed, 140 insertions(+), 39 deletions(-)

diff --git a/packages/nc-gui/components/cell/Currency.vue b/packages/nc-gui/components/cell/Currency.vue
index 71d6d82607..a11a8aa46f 100644
--- a/packages/nc-gui/components/cell/Currency.vue
+++ b/packages/nc-gui/components/cell/Currency.vue
@@ -78,7 +78,10 @@ onMounted(() => {
     :ref="focus"
     v-model="vModel"
     type="number"
-    class="w-full h-full text-sm border-none rounded-md outline-none focus:outline-transparent focus:ring-0"
+    class="w-full h-full text-sm border-none rounded-md px-0 py-1 outline-none focus:outline-none focus:ring-0"
+    :class="{
+      '!px-2': isExpandedFormOpen,
+    }"
     :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="submitCurrency"
     @keydown.down.stop
diff --git a/packages/nc-gui/components/cell/DatePicker.vue b/packages/nc-gui/components/cell/DatePicker.vue
index 6c6568b4e8..07a723cd31 100644
--- a/packages/nc-gui/components/cell/DatePicker.vue
+++ b/packages/nc-gui/components/cell/DatePicker.vue
@@ -20,6 +20,7 @@ import {
   useI18n,
   useSelectedCellKeyupListener,
   watch,
+  IsExpandedFormOpenInj,
 } from '#imports'
 
 interface Props {
@@ -41,6 +42,8 @@ const readOnly = inject(ReadonlyInj, ref(false))
 
 const isEditColumn = inject(EditColumnInj, ref(false))
 
+const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))
+
 const active = inject(ActiveCellInj, ref(false))
 
 const editable = inject(EditModeInj, ref(false))
@@ -240,8 +243,8 @@ const clickHandler = () => {
     :picker="picker"
     tabindex="0"
     :bordered="false"
-    class="!w-full !px-1 !border-none"
-    :class="{ 'nc-null': modelValue === null && showNull }"
+    class="!w-full !py-1 !border-none"
+    :class="{ 'nc-null': modelValue === null && showNull, '!px-2': isExpandedFormOpen, '!px-0': !isExpandedFormOpen }"
     :format="dateFormat"
     :placeholder="placeholder"
     :allow-clear="!readOnly && !localState && !isPk"
diff --git a/packages/nc-gui/components/cell/DateTimePicker.vue b/packages/nc-gui/components/cell/DateTimePicker.vue
index f02780e069..4b1e0379be 100644
--- a/packages/nc-gui/components/cell/DateTimePicker.vue
+++ b/packages/nc-gui/components/cell/DateTimePicker.vue
@@ -14,6 +14,7 @@ import {
   useBase,
   useSelectedCellKeyupListener,
   watch,
+  IsExpandedFormOpenInj,
 } from '#imports'
 
 interface Props {
@@ -39,6 +40,8 @@ const { t } = useI18n()
 
 const isEditColumn = inject(EditColumnInj, ref(false))
 
+const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))
+
 const column = inject(ColumnInj)!
 
 const isDateInvalid = ref(false)
@@ -293,8 +296,8 @@ const isColDisabled = computed(() => {
     :disabled="isColDisabled"
     :show-time="true"
     :bordered="false"
-    class="!w-full !px-0 !py-1 !border-none"
-    :class="{ 'nc-null': modelValue === null && showNull }"
+    class="!w-full !py-1 !border-none"
+    :class="{ 'nc-null': modelValue === null && showNull, '!px-2': isExpandedFormOpen, '!px-0': !isExpandedFormOpen }"
     :format="dateTimeFormat"
     :placeholder="placeholder"
     :allow-clear="!readOnly && !localState && !isPk"
diff --git a/packages/nc-gui/components/cell/Decimal.vue b/packages/nc-gui/components/cell/Decimal.vue
index 72398a3ff6..32a619a2a3 100644
--- a/packages/nc-gui/components/cell/Decimal.vue
+++ b/packages/nc-gui/components/cell/Decimal.vue
@@ -94,7 +94,10 @@ watch(isExpandedFormOpen, () => {
     v-if="editEnabled"
     :ref="focus"
     v-model="vModel"
-    class="outline-none !py-2 !px-1 border-none rounded-md w-full h-full !text-sm"
+    class="outline-none px-0 py-1 border-none rounded-md w-full h-full !text-sm"
+    :class="{
+      '!px-2': isExpandedFormOpen,
+    }"
     type="number"
     :step="precision"
     :placeholder="isEditColumn ? $t('labels.optional') : ''"
diff --git a/packages/nc-gui/components/cell/Duration.vue b/packages/nc-gui/components/cell/Duration.vue
index 83566923ad..eae79f28a3 100644
--- a/packages/nc-gui/components/cell/Duration.vue
+++ b/packages/nc-gui/components/cell/Duration.vue
@@ -92,8 +92,10 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value
       v-if="editEnabled"
       :ref="focus"
       v-model="localState"
-      class="w-full !border-none !outline-none p-0"
-      :class="{ '!px-2 !py-1': editEnabled }"
+      class="w-full !border-none !outline-none px-0 py-1"
+      :class="{
+        '!px-2': isExpandedFormOpen,
+      }"
       :placeholder="durationPlaceholder"
       @blur="submitDuration"
       @keypress="checkDurationFormat($event)"
diff --git a/packages/nc-gui/components/cell/Email.vue b/packages/nc-gui/components/cell/Email.vue
index 1aaa956205..42915c970d 100644
--- a/packages/nc-gui/components/cell/Email.vue
+++ b/packages/nc-gui/components/cell/Email.vue
@@ -70,7 +70,10 @@ watch(
     v-if="editEnabled"
     :ref="focus"
     v-model="vModel"
-    class="w-full outline-none text-sm px-1 py-2"
+    class="w-full outline-none text-sm px-0 py-1"
+    :class="{
+      '!px-2': isExpandedFormOpen,
+    }"
     :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="editEnabled = false"
     @keydown.down.stop
diff --git a/packages/nc-gui/components/cell/GeoData.vue b/packages/nc-gui/components/cell/GeoData.vue
index c409b73a5e..de44b34630 100644
--- a/packages/nc-gui/components/cell/GeoData.vue
+++ b/packages/nc-gui/components/cell/GeoData.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { GeoLocationType } from 'nocodb-sdk'
-import { Modal as AModal, iconMap, latLongToJoinedString, useVModel } from '#imports'
+import { Modal as AModal, iconMap, latLongToJoinedString, useVModel, IsExpandedFormOpenInj } from '#imports'
 
 interface Props {
   modelValue?: string | null
@@ -16,6 +16,8 @@ const emits = defineEmits<Emits>()
 
 const vModel = useVModel(props, 'modelValue', emits)
 
+const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))
+
 const isExpanded = ref(false)
 
 const isLoading = ref(false)
@@ -103,7 +105,10 @@ const openInOSM = () => {
       v-else
       data-testid="nc-geo-data-lat-long-set"
       tabindex="0"
-      class="focus-visible:!outline-none focus:!outline-none h-full w-full flex items-center"
+      class="h-full w-full flex items-center py-1 focus-visible:!outline-none focus:!outline-none"
+      :class="{
+        'px-2': isExpandedFormOpen,
+      }"
     >
       {{ latLongStr }}
     </div>
diff --git a/packages/nc-gui/components/cell/Integer.vue b/packages/nc-gui/components/cell/Integer.vue
index 5c0bf8944a..f1737067cc 100644
--- a/packages/nc-gui/components/cell/Integer.vue
+++ b/packages/nc-gui/components/cell/Integer.vue
@@ -85,11 +85,11 @@ function onKeyDown(e: any) {
     v-if="editEnabled"
     :ref="focus"
     v-model="vModel"
-    class="outline-none py-2 px-1 border-none w-full h-full text-sm"
-    type="number"
+    class="outline-none px-0 py-1 border-none w-full h-full text-sm"
     :class="{
-      'pl-2': isExpandedFormOpen,
+      '!px-2': isExpandedFormOpen,
     }"
+    type="number"
     style="letter-spacing: 0.06rem"
     :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="editEnabled = false"
diff --git a/packages/nc-gui/components/cell/MultiSelect.vue b/packages/nc-gui/components/cell/MultiSelect.vue
index e5185aa97d..c6ea16581b 100644
--- a/packages/nc-gui/components/cell/MultiSelect.vue
+++ b/packages/nc-gui/components/cell/MultiSelect.vue
@@ -27,6 +27,7 @@ import {
   useRoles,
   useSelectedCellKeyupListener,
   watch,
+  IsExpandedFormOpenInj,
 } from '#imports'
 import MdiCloseCircle from '~icons/mdi/close-circle'
 
@@ -63,6 +64,8 @@ const isEditColumn = inject(EditColumnInj, ref(false))
 
 const rowHeight = inject(RowHeightInj, ref(undefined))
 
+const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
+
 const selectedIds = ref<string[]>([])
 
 const aselect = ref<typeof AntSelect>()
@@ -355,6 +358,9 @@ const onFocus = () => {
     <div
       v-if="!active"
       class="flex flex-wrap"
+      :class="{
+        '!px-2': isExpandedFormOpen,
+      }"
       :style="{
         'display': '-webkit-box',
         'max-width': '100%',
@@ -407,7 +413,7 @@ const onFocus = () => {
       :show-arrow="editAllowed && !readOnly"
       :open="isOpen && editAllowed"
       :disabled="readOnly || !editAllowed"
-      :class="{ 'caret-transparent': !hasEditRoles }"
+      :class="{ 'caret-transparent': !hasEditRoles, '!px-2': isExpandedFormOpen }"
       :dropdown-class-name="`nc-dropdown-multi-select-cell !min-w-200px ${isOpen ? 'active' : ''}`"
       @search="search"
       @keydown="onKeyDown"
diff --git a/packages/nc-gui/components/cell/Percent.vue b/packages/nc-gui/components/cell/Percent.vue
index 096a817d6f..1bb97f7fb1 100644
--- a/packages/nc-gui/components/cell/Percent.vue
+++ b/packages/nc-gui/components/cell/Percent.vue
@@ -117,11 +117,13 @@ const onTabPress = (e: KeyboardEvent) => {
     @focus="onWrapperFocus"
   >
     <input
-      v-if="(!isExpandedFormOpen && editEnabled) || (isExpandedFormOpen && expandedEditEnabled)"
+      v-if="editEnabled"
       :ref="focus"
       v-model="vModel"
-      class="w-full !text-sm !border-none !outline-none focus:ring-0 text-base p-1"
-      :class="{ '!px-2': editEnabled }"
+      class="w-full !text-sm !border-none !outline-none focus:ring-0 text-base px-0 py-1"
+      :class="{
+        '!px-2': isExpandedFormOpen,
+      }"
       type="number"
       :placeholder="isEditColumn ? $t('labels.optional') : ''"
       @blur="onBlur"
diff --git a/packages/nc-gui/components/cell/PhoneNumber.vue b/packages/nc-gui/components/cell/PhoneNumber.vue
index 6a74c90caa..5db583a2d2 100644
--- a/packages/nc-gui/components/cell/PhoneNumber.vue
+++ b/packages/nc-gui/components/cell/PhoneNumber.vue
@@ -62,7 +62,10 @@ watch(
     v-if="editEnabled"
     :ref="focus"
     v-model="vModel"
-    class="w-full outline-none text-sm px-1 py-2"
+    class="w-full outline-none text-sm px-0 py-1"
+    :class="{
+      '!px-2': isExpandedFormOpen,
+    }"
     :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="editEnabled = false"
     @keydown.down.stop
diff --git a/packages/nc-gui/components/cell/Rating.vue b/packages/nc-gui/components/cell/Rating.vue
index 6bb9244c15..ee6a86b052 100644
--- a/packages/nc-gui/components/cell/Rating.vue
+++ b/packages/nc-gui/components/cell/Rating.vue
@@ -1,5 +1,13 @@
 <script setup lang="ts">
-import { ActiveCellInj, ColumnInj, computed, inject, parseProp, useSelectedCellKeyupListener } from '#imports'
+import {
+  ActiveCellInj,
+  ColumnInj,
+  computed,
+  inject,
+  parseProp,
+  useSelectedCellKeyupListener,
+  IsExpandedFormOpenInj,
+} from '#imports'
 
 interface Props {
   modelValue?: number | null | undefined
@@ -13,6 +21,8 @@ const column = inject(ColumnInj)!
 
 const readonly = inject(ReadonlyInj, ref(false))
 
+const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
+
 const ratingMeta = computed(() => {
   return {
     icon: {
@@ -65,7 +75,7 @@ watch(rateDomRef, () => {
     v-model:value="vModel"
     :disabled="readonly"
     :count="ratingMeta.max"
-    :style="`color: ${ratingMeta.color}; padding: 0px 5px`"
+    :style="`color: ${ratingMeta.color}; padding: ${isExpandedFormOpen ? '0px 8px' : '0px 5px'};`"
     @keydown="onKeyPress"
   >
     <template #character>
diff --git a/packages/nc-gui/components/cell/SingleSelect.vue b/packages/nc-gui/components/cell/SingleSelect.vue
index 7b39081220..912ecfae3e 100644
--- a/packages/nc-gui/components/cell/SingleSelect.vue
+++ b/packages/nc-gui/components/cell/SingleSelect.vue
@@ -23,6 +23,7 @@ import {
   useRoles,
   useSelectedCellKeyupListener,
   watch,
+  IsExpandedFormOpenInj,
 } from '#imports'
 
 interface Props {
@@ -47,6 +48,8 @@ const activeCell = inject(ActiveCellInj, ref(false))
 
 const isForm = inject(IsFormInj, ref(false))
 
+const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
+
 // use both ActiveCellInj or EditModeInj to determine the active state
 // since active will be false in case of form view
 const active = computed(() => activeCell.value || isEditable.value || isForm.value)
@@ -276,7 +279,13 @@ const onFocus = () => {
     @click="toggleMenu"
     @keydown.enter.stop.prevent="toggleMenu"
   >
-    <div v-if="!(active || isEditable)" class="w-full">
+    <div
+      v-if="!(active || isEditable)"
+      class="w-full"
+      :class="{
+        '!px-2': isExpandedFormOpen,
+      }"
+    >
       <a-tag v-if="selectedOpt" class="rounded-tag max-w-full" :color="selectedOpt.color">
         <span
           :style="{
@@ -311,7 +320,7 @@ const onFocus = () => {
       ref="aselect"
       v-model:value="vModel"
       class="w-full overflow-hidden xs:min-h-12"
-      :class="{ 'caret-transparent': !hasEditRoles }"
+      :class="{ 'caret-transparent': !hasEditRoles, '!px-2': isExpandedFormOpen }"
       :placeholder="isEditColumn ? $t('labels.optional') : ''"
       :allow-clear="!column.rqd && editAllowed"
       :bordered="false"
diff --git a/packages/nc-gui/components/cell/Text.vue b/packages/nc-gui/components/cell/Text.vue
index 2e4f6f2cde..eb6d44be76 100644
--- a/packages/nc-gui/components/cell/Text.vue
+++ b/packages/nc-gui/components/cell/Text.vue
@@ -32,11 +32,11 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value
     v-if="!readonly && editEnabled"
     :ref="focus"
     v-model="vModel"
-    class="h-full w-full outline-none p-2 bg-transparent"
-    :placeholder="isEditColumn ? $t('labels.optional') : ''"
+    class="h-full w-full outline-none py-1 bg-transparent"
     :class="{
-      'px-1': isExpandedFormOpen,
+      'px-2': isExpandedFormOpen,
     }"
+    :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="editEnabled = false"
     @keydown.down.stop
     @keydown.left.stop
diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index 3846f7468f..0e62fbedd7 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -204,7 +204,7 @@ watch(editEnabled, () => {
         :class="{
           'p-2': editEnabled,
           'py-1 h-full': isForm,
-          'px-1': isExpandedFormOpen,
+          'px-2': isExpandedFormOpen,
         }"
         :style="{
           minHeight: `${height}px`,
diff --git a/packages/nc-gui/components/cell/TimePicker.vue b/packages/nc-gui/components/cell/TimePicker.vue
index 6d8e4930e4..09a7b6b0fd 100644
--- a/packages/nc-gui/components/cell/TimePicker.vue
+++ b/packages/nc-gui/components/cell/TimePicker.vue
@@ -9,6 +9,7 @@ import {
   useBase,
   useSelectedCellKeyupListener,
   watch,
+  IsExpandedFormOpenInj,
 } from '#imports'
 
 interface Props {
@@ -34,6 +35,8 @@ const isEditColumn = inject(EditColumnInj, ref(false))
 
 const column = inject(ColumnInj)!
 
+const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
+
 const isTimeInvalid = ref(false)
 
 const dateFormat = isMysql(column.value.source_id) ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD HH:mm:ssZ'
@@ -130,8 +133,8 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
     :bordered="false"
     use12-hours
     format="HH:mm"
-    class="!w-full !px-1 !border-none"
-    :class="{ 'nc-null': modelValue === null && showNull }"
+    class="!w-full !py-1 !border-none"
+    :class="{ 'nc-null': modelValue === null && showNull, '!px-2': isExpandedFormOpen, '!px-0': !isExpandedFormOpen }"
     :placeholder="placeholder"
     :allow-clear="!readOnly && !localState && !isPk"
     :input-read-only="true"
diff --git a/packages/nc-gui/components/cell/Url.vue b/packages/nc-gui/components/cell/Url.vue
index 71f7c57563..d2ecb6972d 100644
--- a/packages/nc-gui/components/cell/Url.vue
+++ b/packages/nc-gui/components/cell/Url.vue
@@ -92,7 +92,10 @@ watch(
       :ref="focus"
       v-model="vModel"
       :placeholder="isEditColumn ? $t('labels.enterDefaultUrlOptional') : ''"
-      class="outline-none text-sm w-full px-2 py-2 bg-transparent h-full"
+      class="outline-none text-sm w-full px-0 py-1 bg-transparent h-full"
+      :class="{
+        '!px-2': isExpandedFormOpen,
+      }"
       @blur="editEnabled = false"
       @keydown.down.stop
       @keydown.left.stop
diff --git a/packages/nc-gui/components/cell/User.vue b/packages/nc-gui/components/cell/User.vue
index 31e59ff727..24ebfb5b50 100644
--- a/packages/nc-gui/components/cell/User.vue
+++ b/packages/nc-gui/components/cell/User.vue
@@ -22,6 +22,7 @@ import {
   useRoles,
   useSelectedCellKeyupListener,
   watch,
+  IsExpandedFormOpenInj,
 } from '#imports'
 import MdiCloseCircle from '~icons/mdi/close-circle'
 
@@ -48,6 +49,8 @@ const isEditable = inject(EditModeInj, ref(false))
 
 const activeCell = inject(ActiveCellInj, ref(false))
 
+const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
+
 const basesStore = useBases()
 
 const { basesUser } = storeToRefs(basesStore)
@@ -264,6 +267,9 @@ const filterOption = (input: string, option: any) => {
     <div
       v-if="!active"
       class="flex flex-wrap"
+      :class="{
+        '!px-2': isExpandedFormOpen,
+      }"
       :style="{
         'display': '-webkit-box',
         'max-width': '100%',
@@ -302,7 +308,7 @@ const filterOption = (input: string, option: any) => {
       :show-arrow="editAllowed && !readOnly"
       :open="isOpen && editAllowed"
       :disabled="readOnly || !editAllowed"
-      :class="{ 'caret-transparent': !hasEditRoles }"
+      :class="{ 'caret-transparent': !hasEditRoles, '!px-2': isExpandedFormOpen }"
       :dropdown-class-name="`nc-dropdown-user-select-cell ${isOpen ? 'active' : ''}`"
       :filter-option="filterOption"
       @search="search"
diff --git a/packages/nc-gui/components/cell/YearPicker.vue b/packages/nc-gui/components/cell/YearPicker.vue
index 3e51e35b4e..b19df65e62 100644
--- a/packages/nc-gui/components/cell/YearPicker.vue
+++ b/packages/nc-gui/components/cell/YearPicker.vue
@@ -10,6 +10,7 @@ import {
   ref,
   useSelectedCellKeyupListener,
   watch,
+  IsExpandedFormOpenInj,
 } from '#imports'
 
 interface Props {
@@ -31,6 +32,8 @@ const editable = inject(EditModeInj, ref(false))
 
 const isEditColumn = inject(EditColumnInj, ref(false))
 
+const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
+
 const isYearInvalid = ref(false)
 
 const { t } = useI18n()
@@ -113,11 +116,11 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
 <template>
   <a-date-picker
     v-model:value="localState"
-    tabindex="0"
+    :tabindex="0"
     picker="year"
     :bordered="false"
-    class="!w-full !px-1 !border-none"
-    :class="{ 'nc-null': modelValue === null && showNull }"
+    class="!w-full !py-1 !border-none"
+    :class="{ 'nc-null': modelValue === null && showNull, '!px-2': isExpandedFormOpen, '!px-0': !isExpandedFormOpen }"
     :placeholder="placeholder"
     :allow-clear="(!readOnly && !localState && !isPk) || isEditColumn"
     :input-read-only="true"
diff --git a/packages/nc-gui/components/cell/attachment/index.vue b/packages/nc-gui/components/cell/attachment/index.vue
index 0f6989022d..5ec6f19b08 100644
--- a/packages/nc-gui/components/cell/attachment/index.vue
+++ b/packages/nc-gui/components/cell/attachment/index.vue
@@ -184,7 +184,7 @@ const onImageClick = (item: any) => {
       height: isForm || isExpandedForm ? undefined : `max(${(rowHeight || 1) * 1.8}rem, 41px)`,
     }"
     class="nc-attachment-cell relative flex color-transition flex items-center w-full xs:(min-h-12 max-h-32)"
-    :class="{ 'justify-center': !active, 'justify-between': active }"
+    :class="{ 'justify-center': !active, 'justify-between': active, 'px-2': isExpandedForm }"
   >
     <LazyCellAttachmentCarousel />
 
diff --git a/packages/nc-gui/components/virtual-cell/Formula.vue b/packages/nc-gui/components/virtual-cell/Formula.vue
index 164c0f3b48..bda85d9fff 100644
--- a/packages/nc-gui/components/virtual-cell/Formula.vue
+++ b/packages/nc-gui/components/virtual-cell/Formula.vue
@@ -2,13 +2,24 @@
 import { handleTZ } from 'nocodb-sdk'
 import type { ColumnType } from 'nocodb-sdk'
 import type { Ref } from 'vue'
-import { CellValueInj, ColumnInj, computed, inject, renderValue, replaceUrlsWithLink, useBase } from '#imports'
+import {
+  CellValueInj,
+  ColumnInj,
+  computed,
+  inject,
+  renderValue,
+  replaceUrlsWithLink,
+  useBase,
+  IsExpandedFormOpenInj,
+} from '#imports'
 
 // todo: column type doesn't have required property `error` - throws in typecheck
 const column = inject(ColumnInj) as Ref<ColumnType & { colOptions: { error: any } }>
 
 const cellValue = inject(CellValueInj)
 
+const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
+
 const { isPg } = useBase()
 
 const result = computed(() =>
@@ -30,7 +41,14 @@ const { showEditNonEditableFieldWarning, showClearNonEditableFieldWarning, activ
       <span>ERR!</span>
     </a-tooltip>
 
-    <div v-else class="py-2" @dblclick="activateShowEditNonEditableFieldWarning">
+    <div
+      v-else
+      class="py-1"
+      :class="{
+        'px-2': isExpandedFormOpen,
+      }"
+      @dblclick="activateShowEditNonEditableFieldWarning"
+    >
       <div v-if="urls" v-html="urls" />
 
       <div v-else>{{ result }}</div>
diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index e8d6109f50..5e09a613bb 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -3,7 +3,15 @@ import { computed } from '@vue/reactivity'
 import type { ColumnType } from 'nocodb-sdk'
 import { ref } from 'vue'
 import type { Ref } from 'vue'
-import { ActiveCellInj, CellValueInj, ColumnInj, IsUnderLookupInj, inject, useSelectedCellKeyupListener } from '#imports'
+import {
+  ActiveCellInj,
+  CellValueInj,
+  ColumnInj,
+  IsUnderLookupInj,
+  inject,
+  useSelectedCellKeyupListener,
+  IsExpandedFormOpenInj,
+} from '#imports'
 
 const value = inject(CellValueInj, ref(0))
 
@@ -19,6 +27,8 @@ const readOnly = inject(ReadonlyInj, ref(false))
 
 const isUnderLookup = inject(IsUnderLookupInj, ref(false))
 
+const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
+
 const colTitle = computed(() => column.value?.title || '')
 
 const listItemsDlg = ref(false)
@@ -120,7 +130,13 @@ watch([listItemsDlg], () => {
 </script>
 
 <template>
-  <div class="flex w-full group items-center nc-links-wrapper" @dblclick.stop="openChildList">
+  <div
+    class="flex w-full group items-center nc-links-wrapper py-1"
+    :class="{
+      'px-2': isExpandedFormOpen,
+    }"
+    @dblclick.stop="openChildList"
+  >
     <div class="block flex-shrink truncate">
       <component
         :is="isUnderLookup ? 'span' : 'a'"

From e3e3e7d73e36aaa849a0c23a8a2b7c076c0b0129 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 27 Dec 2023 00:19:45 +0530
Subject: [PATCH 08/30] fix: lint errors

---
 packages/nc-gui/components/cell/DatePicker.vue        | 2 +-
 packages/nc-gui/components/cell/DateTimePicker.vue    | 2 +-
 packages/nc-gui/components/cell/GeoData.vue           | 2 +-
 packages/nc-gui/components/cell/MultiSelect.vue       | 2 +-
 packages/nc-gui/components/cell/Rating.vue            | 2 +-
 packages/nc-gui/components/cell/SingleSelect.vue      | 2 +-
 packages/nc-gui/components/cell/TimePicker.vue        | 2 +-
 packages/nc-gui/components/cell/User.vue              | 2 +-
 packages/nc-gui/components/cell/YearPicker.vue        | 2 +-
 packages/nc-gui/components/project/AccessSettings.vue | 2 +-
 packages/nc-gui/components/virtual-cell/Formula.vue   | 2 +-
 packages/nc-gui/components/virtual-cell/Links.vue     | 2 +-
 packages/nc-gui/pages/forgot-password.vue             | 2 +-
 packages/nc-gui/pages/signup/[[token]].vue            | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/nc-gui/components/cell/DatePicker.vue b/packages/nc-gui/components/cell/DatePicker.vue
index 07a723cd31..b50f4189b1 100644
--- a/packages/nc-gui/components/cell/DatePicker.vue
+++ b/packages/nc-gui/components/cell/DatePicker.vue
@@ -7,6 +7,7 @@ import {
   ColumnInj,
   EditColumnInj,
   EditModeInj,
+  IsExpandedFormOpenInj,
   ReadonlyInj,
   computed,
   inject,
@@ -20,7 +21,6 @@ import {
   useI18n,
   useSelectedCellKeyupListener,
   watch,
-  IsExpandedFormOpenInj,
 } from '#imports'
 
 interface Props {
diff --git a/packages/nc-gui/components/cell/DateTimePicker.vue b/packages/nc-gui/components/cell/DateTimePicker.vue
index 4b1e0379be..321b42adae 100644
--- a/packages/nc-gui/components/cell/DateTimePicker.vue
+++ b/packages/nc-gui/components/cell/DateTimePicker.vue
@@ -6,6 +6,7 @@ import {
   CellClickHookInj,
   ColumnInj,
   EditColumnInj,
+  IsExpandedFormOpenInj,
   ReadonlyInj,
   inject,
   isDrawerOrModalExist,
@@ -14,7 +15,6 @@ import {
   useBase,
   useSelectedCellKeyupListener,
   watch,
-  IsExpandedFormOpenInj,
 } from '#imports'
 
 interface Props {
diff --git a/packages/nc-gui/components/cell/GeoData.vue b/packages/nc-gui/components/cell/GeoData.vue
index de44b34630..17ce48118c 100644
--- a/packages/nc-gui/components/cell/GeoData.vue
+++ b/packages/nc-gui/components/cell/GeoData.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { GeoLocationType } from 'nocodb-sdk'
-import { Modal as AModal, iconMap, latLongToJoinedString, useVModel, IsExpandedFormOpenInj } from '#imports'
+import { Modal as AModal, IsExpandedFormOpenInj, iconMap, latLongToJoinedString, useVModel } from '#imports'
 
 interface Props {
   modelValue?: string | null
diff --git a/packages/nc-gui/components/cell/MultiSelect.vue b/packages/nc-gui/components/cell/MultiSelect.vue
index c6ea16581b..541c5d880e 100644
--- a/packages/nc-gui/components/cell/MultiSelect.vue
+++ b/packages/nc-gui/components/cell/MultiSelect.vue
@@ -8,6 +8,7 @@ import {
   ColumnInj,
   EditColumnInj,
   EditModeInj,
+  IsExpandedFormOpenInj,
   IsKanbanInj,
   ReadonlyInj,
   RowHeightInj,
@@ -27,7 +28,6 @@ import {
   useRoles,
   useSelectedCellKeyupListener,
   watch,
-  IsExpandedFormOpenInj,
 } from '#imports'
 import MdiCloseCircle from '~icons/mdi/close-circle'
 
diff --git a/packages/nc-gui/components/cell/Rating.vue b/packages/nc-gui/components/cell/Rating.vue
index ee6a86b052..d49022c472 100644
--- a/packages/nc-gui/components/cell/Rating.vue
+++ b/packages/nc-gui/components/cell/Rating.vue
@@ -2,11 +2,11 @@
 import {
   ActiveCellInj,
   ColumnInj,
+  IsExpandedFormOpenInj,
   computed,
   inject,
   parseProp,
   useSelectedCellKeyupListener,
-  IsExpandedFormOpenInj,
 } from '#imports'
 
 interface Props {
diff --git a/packages/nc-gui/components/cell/SingleSelect.vue b/packages/nc-gui/components/cell/SingleSelect.vue
index 912ecfae3e..0a45f9f263 100644
--- a/packages/nc-gui/components/cell/SingleSelect.vue
+++ b/packages/nc-gui/components/cell/SingleSelect.vue
@@ -8,6 +8,7 @@ import {
   ColumnInj,
   EditColumnInj,
   EditModeInj,
+  IsExpandedFormOpenInj,
   IsFormInj,
   IsKanbanInj,
   ReadonlyInj,
@@ -23,7 +24,6 @@ import {
   useRoles,
   useSelectedCellKeyupListener,
   watch,
-  IsExpandedFormOpenInj,
 } from '#imports'
 
 interface Props {
diff --git a/packages/nc-gui/components/cell/TimePicker.vue b/packages/nc-gui/components/cell/TimePicker.vue
index 09a7b6b0fd..e61297f53f 100644
--- a/packages/nc-gui/components/cell/TimePicker.vue
+++ b/packages/nc-gui/components/cell/TimePicker.vue
@@ -3,13 +3,13 @@ import dayjs from 'dayjs'
 import {
   ActiveCellInj,
   EditColumnInj,
+  IsExpandedFormOpenInj,
   ReadonlyInj,
   inject,
   onClickOutside,
   useBase,
   useSelectedCellKeyupListener,
   watch,
-  IsExpandedFormOpenInj,
 } from '#imports'
 
 interface Props {
diff --git a/packages/nc-gui/components/cell/User.vue b/packages/nc-gui/components/cell/User.vue
index 24ebfb5b50..512266bfe1 100644
--- a/packages/nc-gui/components/cell/User.vue
+++ b/packages/nc-gui/components/cell/User.vue
@@ -9,6 +9,7 @@ import {
   ColumnInj,
   EditColumnInj,
   EditModeInj,
+  IsExpandedFormOpenInj,
   IsKanbanInj,
   ReadonlyInj,
   RowHeightInj,
@@ -22,7 +23,6 @@ import {
   useRoles,
   useSelectedCellKeyupListener,
   watch,
-  IsExpandedFormOpenInj,
 } from '#imports'
 import MdiCloseCircle from '~icons/mdi/close-circle'
 
diff --git a/packages/nc-gui/components/cell/YearPicker.vue b/packages/nc-gui/components/cell/YearPicker.vue
index b19df65e62..69e3302912 100644
--- a/packages/nc-gui/components/cell/YearPicker.vue
+++ b/packages/nc-gui/components/cell/YearPicker.vue
@@ -3,6 +3,7 @@ import dayjs from 'dayjs'
 import {
   ActiveCellInj,
   EditColumnInj,
+  IsExpandedFormOpenInj,
   ReadonlyInj,
   computed,
   inject,
@@ -10,7 +11,6 @@ import {
   ref,
   useSelectedCellKeyupListener,
   watch,
-  IsExpandedFormOpenInj,
 } from '#imports'
 
 interface Props {
diff --git a/packages/nc-gui/components/project/AccessSettings.vue b/packages/nc-gui/components/project/AccessSettings.vue
index 24b9275b3f..4a8f7ac062 100644
--- a/packages/nc-gui/components/project/AccessSettings.vue
+++ b/packages/nc-gui/components/project/AccessSettings.vue
@@ -5,8 +5,8 @@ import {
   ProjectRoles,
   WorkspaceRolesToProjectRoles,
   extractRolesObj,
-  timeAgo,
   parseStringDateTime,
+  timeAgo,
 } from 'nocodb-sdk'
 import type { WorkspaceUserRoles } from 'nocodb-sdk'
 import { isEeUI, storeToRefs } from '#imports'
diff --git a/packages/nc-gui/components/virtual-cell/Formula.vue b/packages/nc-gui/components/virtual-cell/Formula.vue
index bda85d9fff..6e628e1455 100644
--- a/packages/nc-gui/components/virtual-cell/Formula.vue
+++ b/packages/nc-gui/components/virtual-cell/Formula.vue
@@ -5,12 +5,12 @@ import type { Ref } from 'vue'
 import {
   CellValueInj,
   ColumnInj,
+  IsExpandedFormOpenInj,
   computed,
   inject,
   renderValue,
   replaceUrlsWithLink,
   useBase,
-  IsExpandedFormOpenInj,
 } from '#imports'
 
 // todo: column type doesn't have required property `error` - throws in typecheck
diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index 5e09a613bb..09c69a5d85 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -7,10 +7,10 @@ import {
   ActiveCellInj,
   CellValueInj,
   ColumnInj,
+  IsExpandedFormOpenInj,
   IsUnderLookupInj,
   inject,
   useSelectedCellKeyupListener,
-  IsExpandedFormOpenInj,
 } from '#imports'
 
 const value = inject(CellValueInj, ref(0))
diff --git a/packages/nc-gui/pages/forgot-password.vue b/packages/nc-gui/pages/forgot-password.vue
index 02b57eec49..b41d19d458 100644
--- a/packages/nc-gui/pages/forgot-password.vue
+++ b/packages/nc-gui/pages/forgot-password.vue
@@ -29,7 +29,7 @@ const formRules = {
       validator: (_: unknown, v: string) => {
         return new Promise((resolve, reject) => {
           if (!v?.length || validateEmail(v)) return resolve()
-          
+
           reject(new Error(t('msg.error.signUpRules.emailInvalid')))
         })
       },
diff --git a/packages/nc-gui/pages/signup/[[token]].vue b/packages/nc-gui/pages/signup/[[token]].vue
index 103075c2c0..00fefdc79c 100644
--- a/packages/nc-gui/pages/signup/[[token]].vue
+++ b/packages/nc-gui/pages/signup/[[token]].vue
@@ -50,7 +50,7 @@ const formRules = {
       validator: (_: unknown, v: string) => {
         return new Promise((resolve, reject) => {
           if (!v?.length || validateEmail(v)) return resolve()
-          
+
           reject(new Error(t('msg.error.signUpRules.emailInvalid')))
         })
       },

From 04b55f54d56c08241c9b1b50cacf23c76c4cf933 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 27 Dec 2023 01:51:04 +0530
Subject: [PATCH 09/30] fix: form field alignment issue

---
 packages/nc-gui/components/smartsheet/Form.vue     |  5 +++++
 .../pages/index/[typeOrId]/form/[viewId]/index.vue | 14 ++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 8db4add0d9..cf419aba6a 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -897,6 +897,11 @@ const onFormItemClick = (element: any) => {
 .nc-input {
   @apply appearance-none w-full !bg-white rounded px-2 py-2 my-2 border-solid border-1 border-primary border-opacity-50;
 
+  &.nc-cell-rating,
+  &.nc-cell-geodata {
+    @apply !py-1;
+  }
+
   :deep(input) {
     @apply !px-1;
   }
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue
index 9a82be83d7..eded02fb98 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue
@@ -69,7 +69,7 @@ p {
 
 .nc-form-view {
   .nc-data-cell {
-    @apply border-solid border-1 border-gray-300 dark:border-slate-200;
+    @apply border-solid border-1 !border-gray-300 dark:!border-slate-200;
   }
 
   .nc-cell {
@@ -95,7 +95,15 @@ p {
       @apply bg-white dark:bg-slate-500;
 
       &.nc-input {
-        @apply w-full px-2 min-h-[40px] flex items-center;
+        @apply w-full px-3 min-h-[40px] flex items-center;
+
+        &.nc-cell-longtext {
+          @apply !px-1;
+        }
+
+        &.nc-cell-json {
+          @apply !h-auto;
+        }
 
         .duration-cell-wrapper {
           @apply w-full;
@@ -125,8 +133,6 @@ p {
         }
 
         textarea {
-          @apply px-4 py-2 rounded;
-
           &:focus {
             box-shadow: none !important;
           }

From 9116bb7d034127d9618dd9e91c60bc131d78080b Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 27 Dec 2023 11:09:26 +0530
Subject: [PATCH 10/30] fix: comment input focus issue after saving comment

---
 .../nc-gui/components/smartsheet/expanded-form/Comments.vue   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
index 641e2373fe..3e9aaeaede 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -116,6 +116,10 @@ const saveComment = async () => {
     console.error(e)
   } finally {
     isSaving.value = false
+
+    setTimeout(() => {
+      commentInputDomRef.value?.focus()
+    }, 400)
   }
 }
 

From c17860b1c284ac6a8eb1ffd1d153adad56de9bdb Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 27 Dec 2023 11:10:23 +0530
Subject: [PATCH 11/30] fix: checkbox toggle issue on pressing enter key

---
 packages/nc-gui/components/cell/Checkbox.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/cell/Checkbox.vue b/packages/nc-gui/components/cell/Checkbox.vue
index 0f4dcce494..1689d07fcf 100644
--- a/packages/nc-gui/components/cell/Checkbox.vue
+++ b/packages/nc-gui/components/cell/Checkbox.vue
@@ -97,7 +97,7 @@ useSelectedCellKeyupListener(active, (e) => {
     }"
     tabindex="0"
     @click="onClick(false, $event)"
-    @keydown.enter.stop="onClick(false, $event)"
+    @keydown.enter.stop="onClick(true, $event)"
   >
     <div
       class="flex items-center"

From 4f4a0715150623eccedbf7bf24cd9a008b2e8acc Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 27 Dec 2023 11:22:03 +0530
Subject: [PATCH 12/30] fix: percent field text select on focus issue

---
 packages/nc-gui/components/cell/Percent.vue         |  1 +
 .../smartsheet/expanded-form/Comments.vue           |  8 ++++----
 packages/nc-gui/components/virtual-cell/Formula.vue | 13 +++++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/cell/Percent.vue b/packages/nc-gui/components/cell/Percent.vue
index 1bb97f7fb1..1d6a4e6d1a 100644
--- a/packages/nc-gui/components/cell/Percent.vue
+++ b/packages/nc-gui/components/cell/Percent.vue
@@ -69,6 +69,7 @@ const onWrapperFocus = () => {
 
   nextTick(() => {
     wrapperRef.value?.querySelector('input')?.focus()
+    wrapperRef.value?.querySelector('input')?.select()
   })
 }
 
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
index 3e9aaeaede..f144978060 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -116,11 +116,11 @@ const saveComment = async () => {
     console.error(e)
   } finally {
     isSaving.value = false
-
-    setTimeout(() => {
-      commentInputDomRef.value?.focus()
-    }, 400)
   }
+
+  nextTick(() => {
+    commentInputDomRef.value?.focus()
+  })
 }
 
 watch(commentsWrapperEl, () => {
diff --git a/packages/nc-gui/components/virtual-cell/Formula.vue b/packages/nc-gui/components/virtual-cell/Formula.vue
index f1356eceb2..a55e864d66 100644
--- a/packages/nc-gui/components/virtual-cell/Formula.vue
+++ b/packages/nc-gui/components/virtual-cell/Formula.vue
@@ -2,7 +2,17 @@
 import { handleTZ } from 'nocodb-sdk'
 import type { ColumnType } from 'nocodb-sdk'
 import type { Ref } from 'vue'
-import { CellValueInj, ColumnInj, IsExpandedFormOpenInj, computed, inject, renderValue, replaceUrlsWithLink, useBase, useGlobal } from '#imports'
+import {
+  CellValueInj,
+  ColumnInj,
+  IsExpandedFormOpenInj,
+  computed,
+  inject,
+  renderValue,
+  replaceUrlsWithLink,
+  useBase,
+  useGlobal,
+} from '#imports'
 
 // todo: column type doesn't have required property `error` - throws in typecheck
 const column = inject(ColumnInj) as Ref<ColumnType & { colOptions: { error: any } }>
@@ -42,7 +52,6 @@ const { showEditNonEditableFieldWarning, showClearNonEditableFieldWarning, activ
       }"
       @dblclick="activateShowEditNonEditableFieldWarning"
     >
-
       <div v-if="urls" v-html="urls" />
 
       <div v-else>{{ result }}</div>

From 291532a6515ab736a3afe131c596466a22436542 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 27 Dec 2023 12:47:46 +0530
Subject: [PATCH 13/30] fix: review changes

---
 packages/nc-gui/components/cell/Currency.vue    | 6 ++----
 packages/nc-gui/components/cell/Decimal.vue     | 6 ++----
 packages/nc-gui/components/cell/Duration.vue    | 6 ++----
 packages/nc-gui/components/cell/Email.vue       | 6 ++----
 packages/nc-gui/components/cell/Integer.vue     | 6 ++----
 packages/nc-gui/components/cell/Percent.vue     | 6 ++----
 packages/nc-gui/components/cell/PhoneNumber.vue | 6 ++----
 packages/nc-gui/components/cell/RichText.vue    | 2 +-
 packages/nc-gui/components/cell/Text.vue        | 4 +---
 packages/nc-gui/components/cell/Url.vue         | 6 ++----
 10 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/packages/nc-gui/components/cell/Currency.vue b/packages/nc-gui/components/cell/Currency.vue
index a11a8aa46f..cf38769f9c 100644
--- a/packages/nc-gui/components/cell/Currency.vue
+++ b/packages/nc-gui/components/cell/Currency.vue
@@ -78,10 +78,8 @@ onMounted(() => {
     :ref="focus"
     v-model="vModel"
     type="number"
-    class="w-full h-full text-sm border-none rounded-md px-0 py-1 outline-none focus:outline-none focus:ring-0"
-    :class="{
-      '!px-2': isExpandedFormOpen,
-    }"
+    class="w-full h-full text-sm border-none rounded-md py-1 outline-none focus:outline-none focus:ring-0"
+    :class="isExpandedFormOpen ? 'px-2' : 'px-0'"
     :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="submitCurrency"
     @keydown.down.stop
diff --git a/packages/nc-gui/components/cell/Decimal.vue b/packages/nc-gui/components/cell/Decimal.vue
index 32a619a2a3..8fc76956a6 100644
--- a/packages/nc-gui/components/cell/Decimal.vue
+++ b/packages/nc-gui/components/cell/Decimal.vue
@@ -94,10 +94,8 @@ watch(isExpandedFormOpen, () => {
     v-if="editEnabled"
     :ref="focus"
     v-model="vModel"
-    class="outline-none px-0 py-1 border-none rounded-md w-full h-full !text-sm"
-    :class="{
-      '!px-2': isExpandedFormOpen,
-    }"
+    class="outline-none py-1 border-none rounded-md w-full h-full !text-sm"
+    :class="isExpandedFormOpen ? 'px-2' : 'px-0'"
     type="number"
     :step="precision"
     :placeholder="isEditColumn ? $t('labels.optional') : ''"
diff --git a/packages/nc-gui/components/cell/Duration.vue b/packages/nc-gui/components/cell/Duration.vue
index eae79f28a3..3905e3bea6 100644
--- a/packages/nc-gui/components/cell/Duration.vue
+++ b/packages/nc-gui/components/cell/Duration.vue
@@ -92,10 +92,8 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value
       v-if="editEnabled"
       :ref="focus"
       v-model="localState"
-      class="w-full !border-none !outline-none px-0 py-1"
-      :class="{
-        '!px-2': isExpandedFormOpen,
-      }"
+      class="w-full !border-none !outline-none py-1"
+      :class="isExpandedFormOpen ? 'px-2' : 'px-0'"
       :placeholder="durationPlaceholder"
       @blur="submitDuration"
       @keypress="checkDurationFormat($event)"
diff --git a/packages/nc-gui/components/cell/Email.vue b/packages/nc-gui/components/cell/Email.vue
index 42915c970d..088542563a 100644
--- a/packages/nc-gui/components/cell/Email.vue
+++ b/packages/nc-gui/components/cell/Email.vue
@@ -70,10 +70,8 @@ watch(
     v-if="editEnabled"
     :ref="focus"
     v-model="vModel"
-    class="w-full outline-none text-sm px-0 py-1"
-    :class="{
-      '!px-2': isExpandedFormOpen,
-    }"
+    class="w-full outline-none text-sm py-1"
+    :class="isExpandedFormOpen ? 'px-2' : 'px-0'"
     :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="editEnabled = false"
     @keydown.down.stop
diff --git a/packages/nc-gui/components/cell/Integer.vue b/packages/nc-gui/components/cell/Integer.vue
index f1737067cc..9f27e38478 100644
--- a/packages/nc-gui/components/cell/Integer.vue
+++ b/packages/nc-gui/components/cell/Integer.vue
@@ -85,10 +85,8 @@ function onKeyDown(e: any) {
     v-if="editEnabled"
     :ref="focus"
     v-model="vModel"
-    class="outline-none px-0 py-1 border-none w-full h-full text-sm"
-    :class="{
-      '!px-2': isExpandedFormOpen,
-    }"
+    class="outline-none py-1 border-none w-full h-full text-sm"
+    :class="isExpandedFormOpen ? 'px-2' : 'px-0'"
     type="number"
     style="letter-spacing: 0.06rem"
     :placeholder="isEditColumn ? $t('labels.optional') : ''"
diff --git a/packages/nc-gui/components/cell/Percent.vue b/packages/nc-gui/components/cell/Percent.vue
index 1d6a4e6d1a..c776bd3fc6 100644
--- a/packages/nc-gui/components/cell/Percent.vue
+++ b/packages/nc-gui/components/cell/Percent.vue
@@ -121,10 +121,8 @@ const onTabPress = (e: KeyboardEvent) => {
       v-if="editEnabled"
       :ref="focus"
       v-model="vModel"
-      class="w-full !text-sm !border-none !outline-none focus:ring-0 text-base px-0 py-1"
-      :class="{
-        '!px-2': isExpandedFormOpen,
-      }"
+      class="w-full !text-sm !border-none !outline-none focus:ring-0 text-base py-1"
+      :class="isExpandedFormOpen ? 'px-2' : 'px-0'"
       type="number"
       :placeholder="isEditColumn ? $t('labels.optional') : ''"
       @blur="onBlur"
diff --git a/packages/nc-gui/components/cell/PhoneNumber.vue b/packages/nc-gui/components/cell/PhoneNumber.vue
index 5db583a2d2..46923aecdc 100644
--- a/packages/nc-gui/components/cell/PhoneNumber.vue
+++ b/packages/nc-gui/components/cell/PhoneNumber.vue
@@ -62,10 +62,8 @@ watch(
     v-if="editEnabled"
     :ref="focus"
     v-model="vModel"
-    class="w-full outline-none text-sm px-0 py-1"
-    :class="{
-      '!px-2': isExpandedFormOpen,
-    }"
+    class="w-full outline-none text-sm py-1"
+    :class="isExpandedFormOpen ? 'px-2' : 'px-0'"
     :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="editEnabled = false"
     @keydown.down.stop
diff --git a/packages/nc-gui/components/cell/RichText.vue b/packages/nc-gui/components/cell/RichText.vue
index c562e934ec..67f26f28cb 100644
--- a/packages/nc-gui/components/cell/RichText.vue
+++ b/packages/nc-gui/components/cell/RichText.vue
@@ -156,7 +156,7 @@ watch(editorDom, () => {
 
 <template>
   <div
-    class="h-full focus:!outline-none focus-visible:!outline-none"
+    class="h-full focus:outline-none"
     :class="{
       'flex flex-col flex-grow nc-rich-text-full': props.fullMode,
       'nc-rich-text-embed flex flex-col pl-1 w-full': !props.fullMode,
diff --git a/packages/nc-gui/components/cell/Text.vue b/packages/nc-gui/components/cell/Text.vue
index eb6d44be76..f8d237a530 100644
--- a/packages/nc-gui/components/cell/Text.vue
+++ b/packages/nc-gui/components/cell/Text.vue
@@ -33,9 +33,7 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value
     :ref="focus"
     v-model="vModel"
     class="h-full w-full outline-none py-1 bg-transparent"
-    :class="{
-      'px-2': isExpandedFormOpen,
-    }"
+    :class="isExpandedFormOpen ? 'px-2' : 'px-0'"
     :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="editEnabled = false"
     @keydown.down.stop
diff --git a/packages/nc-gui/components/cell/Url.vue b/packages/nc-gui/components/cell/Url.vue
index d2ecb6972d..a622a8e94f 100644
--- a/packages/nc-gui/components/cell/Url.vue
+++ b/packages/nc-gui/components/cell/Url.vue
@@ -92,10 +92,8 @@ watch(
       :ref="focus"
       v-model="vModel"
       :placeholder="isEditColumn ? $t('labels.enterDefaultUrlOptional') : ''"
-      class="outline-none text-sm w-full px-0 py-1 bg-transparent h-full"
-      :class="{
-        '!px-2': isExpandedFormOpen,
-      }"
+      class="outline-none text-sm w-full py-1 bg-transparent h-full"
+      :class="isExpandedFormOpen ? 'px-2' : 'px-0'"
       @blur="editEnabled = false"
       @keydown.down.stop
       @keydown.left.stop

From 42fcaa4a11db870c2747bdc47bea7dacabe182ce Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Thu, 28 Dec 2023 11:49:00 +0530
Subject: [PATCH 14/30] fix: text area exapnd on enter keypress in form

---
 packages/nc-gui/components/cell/TextArea.vue | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index 0e62fbedd7..eb94769b73 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -192,6 +192,7 @@ watch(editEnabled, () => {
           minHeight: `${height}px !important`,
         }"
         @dblclick="onExpand"
+        @keydown.enter="onExpand"
       >
         <LazyCellRichText v-model:value="vModel" sync-value-change readonly />
       </div>
@@ -241,13 +242,8 @@ watch(editEnabled, () => {
       <NcTooltip
         v-if="!isVisible"
         placement="bottom"
-        class="!absolute right-0 bottom-1 hidden nc-text-area-expand-btn"
-        :class="{
-          'right-0 bottom-1': editEnabled,
-          '!bottom-0': !isRichMode,
-          'top-1 hidden !group-hover:block': isExpandedFormOpen,
-          'bottom-1': !isExpandedFormOpen,
-        }"
+        class="!absolute right-0 hidden nc-text-area-expand-btn group-hover:block"
+        :class="isExpandedFormOpen || isForm || isRichMode ? 'top-1' : 'bottom-1'"
       >
         <template #title>{{ $t('title.expand') }}</template>
         <NcButton type="secondary" size="xsmall" data-testid="attachment-cell-file-picker-button" @click.stop="onExpand">

From 44754e1e9b03030f48d56eb465ed9facdb7733bc Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Thu, 28 Dec 2023 14:12:28 +0530
Subject: [PATCH 15/30] fix: tab focus issue in shared form and expanded form

---
 packages/nc-gui/components/cell/Currency.vue  | 17 ++++++++++++--
 .../nc-gui/components/cell/DatePicker.vue     |  2 +-
 packages/nc-gui/components/cell/Decimal.vue   |  7 ++++--
 packages/nc-gui/components/cell/Duration.vue  |  6 ++++-
 packages/nc-gui/components/cell/Email.vue     |  6 ++++-
 packages/nc-gui/components/cell/Float.vue     |  7 ++++--
 packages/nc-gui/components/cell/Integer.vue   |  7 ++++--
 packages/nc-gui/components/cell/Percent.vue   | 19 ++++++++++-----
 .../nc-gui/components/cell/PhoneNumber.vue    |  7 ++++--
 packages/nc-gui/components/cell/Text.vue      | 17 ++++++++++++--
 packages/nc-gui/components/cell/TextArea.vue  |  3 ++-
 packages/nc-gui/components/cell/Url.vue       |  6 ++++-
 .../components/smartsheet/DivDataCell.vue     | 23 ++++++++++++++++++-
 13 files changed, 103 insertions(+), 24 deletions(-)

diff --git a/packages/nc-gui/components/cell/Currency.vue b/packages/nc-gui/components/cell/Currency.vue
index cf38769f9c..998830186b 100644
--- a/packages/nc-gui/components/cell/Currency.vue
+++ b/packages/nc-gui/components/cell/Currency.vue
@@ -1,6 +1,16 @@
 <script setup lang="ts">
 import type { VNodeRef } from '@vue/runtime-core'
-import { ColumnInj, EditColumnInj, EditModeInj, IsExpandedFormOpenInj, computed, inject, parseProp, useVModel } from '#imports'
+import {
+  ColumnInj,
+  EditColumnInj,
+  EditModeInj,
+  IsExpandedFormOpenInj,
+  IsFormInj,
+  computed,
+  inject,
+  parseProp,
+  useVModel,
+} from '#imports'
 
 interface Props {
   modelValue: number | null | undefined
@@ -57,7 +67,10 @@ const currency = computed(() => {
 
 const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
 
-const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value && (el as HTMLInputElement)?.focus()
+const isForm = inject(IsFormInj)!
+
+const focus: VNodeRef = (el) =>
+  !isExpandedFormOpen.value && !isEditColumn.value && !isForm.value && (el as HTMLInputElement)?.focus()
 
 const submitCurrency = () => {
   if (lastSaved.value !== vModel.value) {
diff --git a/packages/nc-gui/components/cell/DatePicker.vue b/packages/nc-gui/components/cell/DatePicker.vue
index b50f4189b1..39d807774b 100644
--- a/packages/nc-gui/components/cell/DatePicker.vue
+++ b/packages/nc-gui/components/cell/DatePicker.vue
@@ -241,7 +241,7 @@ const clickHandler = () => {
   <a-date-picker
     v-model:value="localState"
     :picker="picker"
-    tabindex="0"
+    :tabindex="0"
     :bordered="false"
     class="!w-full !py-1 !border-none"
     :class="{ 'nc-null': modelValue === null && showNull, '!px-2': isExpandedFormOpen, '!px-0': !isExpandedFormOpen }"
diff --git a/packages/nc-gui/components/cell/Decimal.vue b/packages/nc-gui/components/cell/Decimal.vue
index 8fc76956a6..aad130039f 100644
--- a/packages/nc-gui/components/cell/Decimal.vue
+++ b/packages/nc-gui/components/cell/Decimal.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { VNodeRef } from '@vue/runtime-core'
-import { EditColumnInj, EditModeInj, IsExpandedFormOpenInj, inject, useVModel } from '#imports'
+import { EditColumnInj, EditModeInj, IsExpandedFormOpenInj, IsFormInj, inject, useVModel } from '#imports'
 
 interface Props {
   // when we set a number, then it is number type
@@ -63,6 +63,8 @@ const precision = computed(() => {
 
 const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
 
+const isForm = inject(IsFormInj)!
+
 // Handle the arrow keys as its default behavior is to increment/decrement the value
 const onKeyDown = (e: any) => {
   if (e.key === 'ArrowDown') {
@@ -80,7 +82,8 @@ const onKeyDown = (e: any) => {
   }
 }
 
-const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value && (el as HTMLInputElement)?.focus()
+const focus: VNodeRef = (el) =>
+  !isExpandedFormOpen.value && !isEditColumn.value && !isForm.value && (el as HTMLInputElement)?.focus()
 
 watch(isExpandedFormOpen, () => {
   if (!isExpandedFormOpen.value) {
diff --git a/packages/nc-gui/components/cell/Duration.vue b/packages/nc-gui/components/cell/Duration.vue
index 3905e3bea6..b4bf77263c 100644
--- a/packages/nc-gui/components/cell/Duration.vue
+++ b/packages/nc-gui/components/cell/Duration.vue
@@ -5,6 +5,7 @@ import {
   EditColumnInj,
   EditModeInj,
   IsExpandedFormOpenInj,
+  IsFormInj,
   computed,
   convertDurationToSeconds,
   convertMS2Duration,
@@ -83,7 +84,10 @@ const submitDuration = () => {
 
 const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
 
-const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value && (el as HTMLInputElement)?.focus()
+const isForm = inject(IsFormInj)!
+
+const focus: VNodeRef = (el) =>
+  !isExpandedFormOpen.value && !isEditColumn.value && !isForm.value && (el as HTMLInputElement)?.focus()
 </script>
 
 <template>
diff --git a/packages/nc-gui/components/cell/Email.vue b/packages/nc-gui/components/cell/Email.vue
index 088542563a..b68282574c 100644
--- a/packages/nc-gui/components/cell/Email.vue
+++ b/packages/nc-gui/components/cell/Email.vue
@@ -4,6 +4,7 @@ import {
   EditColumnInj,
   EditModeInj,
   IsExpandedFormOpenInj,
+  IsFormInj,
   IsSurveyFormInj,
   computed,
   inject,
@@ -50,7 +51,10 @@ const validEmail = computed(() => vModel.value && validateEmail(vModel.value))
 
 const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
 
-const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value && (el as HTMLInputElement)?.focus()
+const isForm = inject(IsFormInj)!
+
+const focus: VNodeRef = (el) =>
+  !isExpandedFormOpen.value && !isEditColumn.value && !isForm.value && (el as HTMLInputElement)?.focus()
 
 watch(
   () => editEnabled.value,
diff --git a/packages/nc-gui/components/cell/Float.vue b/packages/nc-gui/components/cell/Float.vue
index b40a33f701..8460cbcf35 100644
--- a/packages/nc-gui/components/cell/Float.vue
+++ b/packages/nc-gui/components/cell/Float.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { VNodeRef } from '@vue/runtime-core'
-import { EditColumnInj, EditModeInj, IsExpandedFormOpenInj, inject, useVModel } from '#imports'
+import { EditColumnInj, EditModeInj, IsExpandedFormOpenInj, IsFormInj, inject, useVModel } from '#imports'
 
 interface Props {
   // when we set a number, then it is number type
@@ -40,7 +40,10 @@ const vModel = computed({
 
 const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
 
-const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value && (el as HTMLInputElement)?.focus()
+const isForm = inject(IsFormInj)!
+
+const focus: VNodeRef = (el) =>
+  !isExpandedFormOpen.value && !isEditColumn.value && !isForm.value && (el as HTMLInputElement)?.focus()
 </script>
 
 <template>
diff --git a/packages/nc-gui/components/cell/Integer.vue b/packages/nc-gui/components/cell/Integer.vue
index 9f27e38478..c1e27ef338 100644
--- a/packages/nc-gui/components/cell/Integer.vue
+++ b/packages/nc-gui/components/cell/Integer.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { VNodeRef } from '@vue/runtime-core'
-import { EditColumnInj, EditModeInj, IsExpandedFormOpenInj, inject, useVModel } from '#imports'
+import { EditColumnInj, EditModeInj, IsExpandedFormOpenInj, IsFormInj, inject, useVModel } from '#imports'
 
 interface Props {
   // when we set a number, then it is number type
@@ -48,7 +48,10 @@ const vModel = computed({
 
 const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
 
-const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value && (el as HTMLInputElement)?.focus()
+const isForm = inject(IsFormInj)!
+
+const focus: VNodeRef = (el) =>
+  !isExpandedFormOpen.value && !isEditColumn.value && !isForm.value && (el as HTMLInputElement)?.focus()
 
 function onKeyDown(e: any) {
   const cmdOrCtrl = isMac() ? e.metaKey : e.ctrlKey
diff --git a/packages/nc-gui/components/cell/Percent.vue b/packages/nc-gui/components/cell/Percent.vue
index c776bd3fc6..94acc9186a 100644
--- a/packages/nc-gui/components/cell/Percent.vue
+++ b/packages/nc-gui/components/cell/Percent.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { VNodeRef } from '@vue/runtime-core'
-import { EditColumnInj, EditModeInj, IsExpandedFormOpenInj, inject, useVModel } from '#imports'
+import { EditColumnInj, EditModeInj, IsExpandedFormOpenInj, IsFormInj, inject, useVModel } from '#imports'
 
 interface Props {
   modelValue?: number | string | null
@@ -35,7 +35,10 @@ const vModel = computed({
 
 const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
 
-const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value && (el as HTMLInputElement)?.focus()
+const isForm = inject(IsFormInj)!
+
+const focus: VNodeRef = (el) =>
+  !isExpandedFormOpen.value && !isEditColumn.value && !isForm.value && (el as HTMLInputElement)?.focus()
 
 const cellFocused = ref(false)
 
@@ -84,18 +87,22 @@ const onMouseleave = () => {
 }
 
 const onTabPress = (e: KeyboardEvent) => {
-  if (e.shiftKey) {
+  if (e.shiftKey && (isExpandedFormOpen.value || isForm.value)) {
     e.preventDefault()
 
     // Shift + Tab does not work for percent cell
     // so we manually focus on the last form item
-
-    const focusesNcCellIndex = Array.from(document.querySelectorAll('.nc-expanded-form-row .nc-data-cell')).findIndex((el) => {
+    const focusesNcCellIndex = Array.from(
+      document.querySelectorAll(`${isExpandedFormOpen.value ? '.nc-expanded-form-row' : '.nc-form-wrapper'} .nc-data-cell`),
+    ).findIndex((el) => {
       return el.querySelector('.nc-filter-value-select') === wrapperRef.value
     })
 
     if (focusesNcCellIndex >= 0) {
-      const nodes = document.querySelectorAll('.nc-expanded-form-row .nc-data-cell')
+      const nodes = document.querySelectorAll(
+        `${isExpandedFormOpen.value ? '.nc-expanded-form-row' : '.nc-form-wrapper'} .nc-data-cell`,
+      )
+
       for (let i = focusesNcCellIndex - 1; i >= 0; i--) {
         const lastFormItem = nodes[i].querySelector('[tabindex="0"]') as HTMLElement
         if (lastFormItem) {
diff --git a/packages/nc-gui/components/cell/PhoneNumber.vue b/packages/nc-gui/components/cell/PhoneNumber.vue
index 46923aecdc..1211a863e6 100644
--- a/packages/nc-gui/components/cell/PhoneNumber.vue
+++ b/packages/nc-gui/components/cell/PhoneNumber.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { VNodeRef } from '@vue/runtime-core'
 import isMobilePhone from 'validator/lib/isMobilePhone'
-import { EditColumnInj, EditModeInj, IsExpandedFormOpenInj, IsSurveyFormInj, computed, inject } from '#imports'
+import { EditColumnInj, EditModeInj, IsExpandedFormOpenInj, IsFormInj, IsSurveyFormInj, computed, inject } from '#imports'
 
 interface Props {
   modelValue: string | null | number | undefined
@@ -42,7 +42,10 @@ const validEmail = computed(() => vModel.value && isMobilePhone(vModel.value))
 
 const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
 
-const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value && (el as HTMLInputElement)?.focus()
+const isForm = inject(IsFormInj)!
+
+const focus: VNodeRef = (el) =>
+  !isExpandedFormOpen.value && !isEditColumn.value && !isForm.value && (el as HTMLInputElement)?.focus()
 
 watch(
   () => editEnabled.value,
diff --git a/packages/nc-gui/components/cell/Text.vue b/packages/nc-gui/components/cell/Text.vue
index f8d237a530..c8d69d06f0 100644
--- a/packages/nc-gui/components/cell/Text.vue
+++ b/packages/nc-gui/components/cell/Text.vue
@@ -1,6 +1,16 @@
 <script setup lang="ts">
 import type { VNodeRef } from '@vue/runtime-core'
-import { EditColumnInj, EditModeInj, IsExpandedFormOpenInj, ReadonlyInj, RowHeightInj, inject, ref, useVModel } from '#imports'
+import {
+  EditColumnInj,
+  EditModeInj,
+  IsExpandedFormOpenInj,
+  IsFormInj,
+  ReadonlyInj,
+  RowHeightInj,
+  inject,
+  ref,
+  useVModel,
+} from '#imports'
 
 interface Props {
   modelValue?: string | null
@@ -24,7 +34,10 @@ const vModel = useVModel(props, 'modelValue', emits)
 
 const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
 
-const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value && (el as HTMLInputElement)?.focus()
+const isForm = inject(IsFormInj)!
+
+const focus: VNodeRef = (el) =>
+  !isExpandedFormOpen.value && !isEditColumn.value && !isForm.value && (el as HTMLInputElement)?.focus()
 </script>
 
 <template>
diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index eb94769b73..ec3b5efa68 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -55,7 +55,8 @@ const position = ref<
 
 const isDragging = ref(false)
 
-const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value && (el as HTMLTextAreaElement)?.focus()
+const focus: VNodeRef = (el) =>
+  !isExpandedFormOpen.value && !isEditColumn.value && isForm.value && (el as HTMLTextAreaElement)?.focus()
 
 const height = computed(() => {
   if (isExpandedFormOpen.value) return 36 * 4
diff --git a/packages/nc-gui/components/cell/Url.vue b/packages/nc-gui/components/cell/Url.vue
index a622a8e94f..b624417e93 100644
--- a/packages/nc-gui/components/cell/Url.vue
+++ b/packages/nc-gui/components/cell/Url.vue
@@ -6,6 +6,7 @@ import {
   EditColumnInj,
   EditModeInj,
   IsExpandedFormOpenInj,
+  IsFormInj,
   IsSurveyFormInj,
   computed,
   inject,
@@ -70,7 +71,10 @@ const { cellUrlOptions } = useCellUrlConfig(url)
 
 const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
 
-const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value && (el as HTMLInputElement)?.focus()
+const isForm = inject(IsFormInj)!
+
+const focus: VNodeRef = (el) =>
+  !isExpandedFormOpen.value && !isEditColumn.value && isForm.value && (el as HTMLInputElement)?.focus()
 
 watch(
   () => editEnabled.value,
diff --git a/packages/nc-gui/components/smartsheet/DivDataCell.vue b/packages/nc-gui/components/smartsheet/DivDataCell.vue
index 9796cdec03..9dd1f911f0 100644
--- a/packages/nc-gui/components/smartsheet/DivDataCell.vue
+++ b/packages/nc-gui/components/smartsheet/DivDataCell.vue
@@ -4,10 +4,31 @@ import { CurrentCellInj, ref } from '#imports'
 const el = ref()
 
 provide(CurrentCellInj, el)
+
+const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
+
+const isForm = inject(IsFormInj)!
+
+const onTabPress = () => {
+  if (!isExpandedFormOpen.value && !isForm.value) return
+
+  // Find the focused element
+  const focusedElement = document.activeElement
+
+  if (focusedElement) {
+    // Check if the focused element is a descendant of the wrapper
+    const closestWrapper = focusedElement.closest('.nc-data-cell')
+
+    // Scroll it into view
+    if (closestWrapper === el.value) {
+      el.value?.scrollIntoView({ block: 'center' })
+    }
+  }
+}
 </script>
 
 <template>
-  <div ref="el" class="select-none nc-data-cell">
+  <div ref="el" class="select-none nc-data-cell" @keydown.tab="onTabPress">
     <slot />
   </div>
 </template>

From 7d20a3ca8ff0e1da9f3c712f813100dbddad31f1 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 28 Dec 2023 15:28:36 +0530
Subject: [PATCH 16/30] chore: update sdk path

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/package.json | 2 +-
 packages/nocodb/package.json | 4 ++--
 pnpm-lock.yaml               | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
index 2840354f4b..25f2681a4f 100644
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@@ -65,7 +65,7 @@
     "locale-codes": "^1.3.1",
     "monaco-editor": "^0.33.0",
     "monaco-sql-languages": "^0.11.0",
-    "nocodb-sdk": "0.203.0",
+    "nocodb-sdk": "workspace:^",
     "papaparse": "^5.4.1",
     "parse-github-url": "^1.0.2",
     "pinia": "^2.1.7",
diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
index be39efc406..89a4e06349 100644
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@@ -137,7 +137,7 @@
     "ncp": "^2.0.0",
     "nestjs-kafka": "^1.0.6",
     "nestjs-throttler-storage-redis": "^0.3.3",
-    "nocodb-sdk": "0.203.0",
+    "nocodb-sdk": "workspace:^",
     "nodemailer": "^6.4.10",
     "object-hash": "^3.0.0",
     "object-sizeof": "^2.6.3",
@@ -229,4 +229,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
\ No newline at end of file
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2791097a45..4722025010 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -139,7 +139,7 @@ importers:
         specifier: ^0.11.0
         version: 0.11.0
       nocodb-sdk:
-        specifier: 0.203.0
+        specifier: workspace:^
         version: link:../nocodb-sdk
       papaparse:
         specifier: ^5.4.1
@@ -686,7 +686,7 @@ importers:
         specifier: ^0.3.3
         version: 0.3.3(@nestjs/common@10.2.10)(@nestjs/core@10.2.10)(@nestjs/throttler@4.2.1)(ioredis@5.3.2)(reflect-metadata@0.1.14)
       nocodb-sdk:
-        specifier: 0.203.0
+        specifier: workspace:^
         version: link:../nocodb-sdk
       nodemailer:
         specifier: ^6.4.10

From 466049ff8a63ab94c57ceb2c9deea43a798c71dd Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Thu, 28 Dec 2023 16:08:02 +0530
Subject: [PATCH 17/30] fix: expanded comment input focus issue

---
 .../smartsheet/expanded-form/Comments.vue     | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
index f144978060..4fd776cfd7 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -29,8 +29,19 @@ const editLog = ref<AuditType>()
 
 const isEditing = ref<boolean>(false)
 
-const commentInputDomRef = ref<HTMLInputElement>()
-
+const isCommentMode = ref(false)
+
+const focusCommentInput: VNodeRef = (el) => {
+  if (!isExpandedFormLoading.value && (isCommentMode.value || isExpandedFormCommentMode.value) && !isEditing.value) {
+    if (isExpandedFormCommentMode.value) {
+      setTimeout(() => {
+        isExpandedFormCommentMode.value = false
+      }, 400)
+    }
+    return (el as HTMLInputElement)?.focus()
+  }
+  return el
+}
 const focusInput: VNodeRef = (el) => (el as HTMLInputElement)?.focus()
 
 function onKeyDown(event: KeyboardEvent) {
@@ -55,6 +66,9 @@ function onKeyEsc(event: KeyboardEvent) {
 
 async function onEditComment() {
   if (!isEditing.value || !editLog.value) return
+
+  isCommentMode.value = true
+
   await updateComment(editLog.value.id!, {
     description: editLog.value.description,
   })
@@ -106,6 +120,7 @@ const isSaving = ref(false)
 const saveComment = async () => {
   if (isSaving.value) return
 
+  isCommentMode.value = true
   isSaving.value = true
 
   try {
@@ -117,10 +132,6 @@ const saveComment = async () => {
   } finally {
     isSaving.value = false
   }
-
-  nextTick(() => {
-    commentInputDomRef.value?.focus()
-  })
 }
 
 watch(commentsWrapperEl, () => {
@@ -132,15 +143,6 @@ const onClickAudit = () => {
 
   tab.value = 'audits'
 }
-
-watch(commentInputDomRef, () => {
-  if (commentInputDomRef.value && isExpandedFormCommentMode.value) {
-    setTimeout(() => {
-      commentInputDomRef.value?.focus()
-      isExpandedFormCommentMode.value = false
-    }, 400)
-  }
-})
 </script>
 
 <template>
@@ -258,7 +260,7 @@ watch(commentInputDomRef, () => {
           <div class="h-14 flex flex-row w-full bg-white py-2.75 px-1.5 items-center rounded-xl border-1 border-gray-200">
             <GeneralUserIcon size="base" class="!w-10" :email="user?.email" :name="user?.display_name" />
             <a-input
-              ref="commentInputDomRef"
+              :ref="focusCommentInput"
               v-model:value="comment"
               class="!rounded-lg border-1 bg-white !px-2.5 !py-2 !border-gray-200 nc-comment-box !outline-none"
               placeholder="Start typing..."

From dbf4da0910609d31e6a7b28e035f23a4f3275dfb Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 28 Dec 2023 13:40:07 +0000
Subject: [PATCH 18/30] fix: properly handle null for user field meta

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

diff --git a/packages/nc-gui/components/smartsheet/header/CellIcon.ts b/packages/nc-gui/components/smartsheet/header/CellIcon.ts
index 8c270af2a9..251c7d7c99 100644
--- a/packages/nc-gui/components/smartsheet/header/CellIcon.ts
+++ b/packages/nc-gui/components/smartsheet/header/CellIcon.ts
@@ -84,7 +84,7 @@ const renderIcon = (column: ColumnType, abstractType: any) => {
   } else if (isGeometry(column)) {
     return iconMap.calculator
   } else if (isUser(column)) {
-    if ((column.meta as { is_multi: boolean; notify: boolean }).is_multi) {
+    if ((column.meta as { is_multi?: boolean; notify?: boolean })?.is_multi) {
       return iconMap.phUsers
     }
     return iconMap.phUser

From 635ece86e3f15241f0de897d6b8f10d7e5aff91a Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 28 Dec 2023 13:40:07 +0000
Subject: [PATCH 19/30] fix: shared form view user field

---
 packages/nc-gui/composables/useSharedFormViewStore.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index c790c9451c..24a75723f5 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -60,6 +60,9 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
   const baseStore = useBase()
   const { base } = storeToRefs(baseStore)
 
+  const basesStore = useBases()
+  const { basesUser } = storeToRefs(basesStore)
+
   const { t } = useI18n()
 
   const formState = ref<Record<string, any>>({})
@@ -127,6 +130,10 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
       const relatedMetas = { ...viewMeta.relatedMetas }
 
       Object.keys(relatedMetas).forEach((key) => setMeta(relatedMetas[key]))
+
+      if (viewMeta.users) {
+        basesUser.value.set(viewMeta.base_id, viewMeta.users)
+      }
     } catch (e: any) {
       if (e.response && e.response.status === 404) {
         notFound.value = true

From 9422e9aa5f67b19140916d0bd3ffa9cb4e4b53bc Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 28 Dec 2023 15:45:51 +0000
Subject: [PATCH 20/30] fix: strike and underline for rich text

---
 packages/nc-gui/components/cell/RichText.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/nc-gui/components/cell/RichText.vue b/packages/nc-gui/components/cell/RichText.vue
index c9a73f0cf2..b1c9e3b8c4 100644
--- a/packages/nc-gui/components/cell/RichText.vue
+++ b/packages/nc-gui/components/cell/RichText.vue
@@ -46,6 +46,15 @@ turndownService.addRule('taskList', {
   },
 })
 
+turndownService.addRule('strikethrough', {
+  filter: ['s'],
+  replacement: (content) => {
+    return `~${content}~`
+  },
+})
+
+turndownService.keep(['u', 'del'])
+
 const checkListItem = {
   name: 'checkListItem',
   level: 'block',

From 1bac68e350a10a17aee66dab60e758375aa5f2db Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Thu, 28 Dec 2023 15:47:28 +0000
Subject: [PATCH 21/30] New translations en.json (Russian)

---
 packages/nc-gui/lang/ru.json | 394 +++++++++++++++++------------------
 1 file changed, 197 insertions(+), 197 deletions(-)

diff --git a/packages/nc-gui/lang/ru.json b/packages/nc-gui/lang/ru.json
index bc2b34d75a..173ce73cdb 100644
--- a/packages/nc-gui/lang/ru.json
+++ b/packages/nc-gui/lang/ru.json
@@ -1,45 +1,45 @@
 {
   "dashboards": {
-    "create_new_dashboard_project": "Create New Interface",
-    "connect_data_sources": "Connect data sources",
-    "alert": "Alert",
-    "alert-message": "No databases have been connected. Connect database bases to build interfaces. Skip this step and add databases from the base home page later.",
-    "select_database_projects_that_you_want_to_link_to_this_dashboard_projects": "Select Database Bases that you want to link to this Interface.",
-    "create_interface": "Create interface",
-    "project_name": "Base Name",
-    "connect": "Connect",
+    "create_new_dashboard_project": "Создать новый интерфейс",
+    "connect_data_sources": "Подключить источники данных",
+    "alert": "Оповещение",
+    "alert-message": "Базы данных не подключены. Подключите базы данных для создания интерфейсов. Пропустите этот шаг и добавьте базы данных с основной домашней страницы позже.",
+    "select_database_projects_that_you_want_to_link_to_this_dashboard_projects": "Выберите базы данных, которые вы хотите связать с этим интерфейсом.",
+    "create_interface": "Создать интерфейс",
+    "project_name": "Основное имя",
+    "connect": "Подключиться",
     "buttonActionTypes": {
-      "open_external_url": "Open external link",
-      "delete_record": "Delete record",
-      "update_record": "Update record",
-      "open_layout": "Open layout"
+      "open_external_url": "Открыть внешнюю ссылку",
+      "delete_record": "Удалить запись",
+      "update_record": "Обновить запись",
+      "open_layout": "Открыть макет"
     },
     "widgets": {
-      "static_text": "Text",
-      "chart": "Chart",
-      "table": "Table",
-      "image": "Image",
-      "map": "Map",
-      "button": "Button",
-      "number": "Number",
-      "bar_chart": "Bar Chart",
-      "line_chart": "Line Chart",
-      "area_chart": "Area Chart",
-      "pie_chart": "Pie Chart",
-      "donut_chart": "Donut Chart",
-      "scatter_plot": "Scatter Plot",
-      "bubble_chart": "Bubble Chart",
-      "radar_chart": "Radar Chart",
-      "polar_area_chart": "Polar Area Chart",
-      "radial_bar_chart": "Radial Bar Chart",
-      "heatmap_chart": "Heatmap Chart",
-      "treemap_chart": "Treemap Chart",
-      "box_plot_chart": "Box Plot Chart",
-      "candlestick_chart": "Candlestick Chart"
+      "static_text": "Текст",
+      "chart": "Диаграмма",
+      "table": "Таблица",
+      "image": "Изображение",
+      "map": "Карта",
+      "button": "Кнопка",
+      "number": "Число",
+      "bar_chart": "Гистограмма",
+      "line_chart": "Линейная диаграмма",
+      "area_chart": "Диаграмма области",
+      "pie_chart": "Круговая диаграмма",
+      "donut_chart": "Кольцевая диаграмма",
+      "scatter_plot": "Рассеянный участок",
+      "bubble_chart": "Пузырьковая диаграмма",
+      "radar_chart": "Радарная диаграмма",
+      "polar_area_chart": "Полярная диаграмма",
+      "radial_bar_chart": "Радиальная гистограмма",
+      "heatmap_chart": "Тепловая карта",
+      "treemap_chart": "Древовидная карта",
+      "box_plot_chart": "Диаграмма ячеек",
+      "candlestick_chart": "Японские свечи"
     }
   },
   "general": {
-    "quit": "Quit",
+    "quit": "Выйти",
     "home": "На главную",
     "load": "Загрузка",
     "open": "Открыть",
@@ -47,29 +47,29 @@
     "yes": "Да",
     "no": "Нет",
     "ok": "Ок",
-    "back": "Back",
+    "back": "Назад",
     "and": "И",
     "or": "Или",
     "add": "Добавить",
     "edit": "Изменить",
-    "link": "Link",
-    "links": "Links",
+    "link": "Ссылка",
+    "links": "Ссылки",
     "remove": "Удалить",
-    "import": "Import",
-    "logout": "Log Out",
-    "empty": "Empty",
-    "changeIcon": "Change Icon",
+    "import": "Импорт",
+    "logout": "Выйти",
+    "empty": "Пусто",
+    "changeIcon": "Сменить иконку",
     "save": "Сохранить",
-    "available": "Available",
-    "abort": "Abort",
-    "saving": "Saving",
+    "available": "Доступно",
+    "abort": "Прервать",
+    "saving": "Сохранение",
     "cancel": "Отмена",
-    "null": "Null",
-    "escape": "Escape",
-    "hex": "Hex",
-    "clear": "Clear",
+    "null": "Пустой",
+    "escape": "Выход",
+    "hex": "Гекс",
+    "clear": "Очистить",
     "slack": "Slack",
-    "comment": "Comment",
+    "comment": "Комментарий",
     "microsoftTeams": "Microsoft Teams",
     "discord": "Discord",
     "matterMost": "Mattermost",
@@ -183,17 +183,17 @@
     "sumDistinct": "Sum Distinct",
     "avgDistinct": "Avg Distinct",
     "join": "Join",
-    "options": "Options",
-    "primaryValue": "Primary Value",
-    "useSurveyMode": "Use Survey Mode",
-    "shift": "Shift",
-    "enter": "Enter",
-    "seconds": "Seconds",
-    "paste": "Paste"
+    "options": "Опции",
+    "primaryValue": "Первичное значение",
+    "useSurveyMode": "Использовать режим анкеты",
+    "shift": "Сдвиг",
+    "enter": "Вход",
+    "seconds": "Секунды",
+    "paste": "Вставить"
   },
   "objects": {
-    "workspace": "Workspace",
-    "workspaces": "Workspaces",
+    "workspace": "Рабочее пространство",
+    "workspaces": "Рабочие пространства",
     "project": "Проект",
     "projects": "Проекты",
     "table": "Таблица",
@@ -210,7 +210,7 @@
     "webhooks": "Вебхуки (Webhooks)",
     "view": "Представление",
     "views": "Представления",
-    "sidebar": "Sidebar",
+    "sidebar": "Боковая панель",
     "viewType": {
       "grid": "Сетка",
       "gallery": "Галерея",
@@ -223,27 +223,27 @@
     "users": "Пользователи",
     "role": "Роль",
     "roles": "Роли",
-    "developer": "Developer",
+    "developer": "Разработчик",
     "roleType": {
       "owner": "Владелец",
       "creator": "Создатель",
       "editor": "Редактор",
       "commenter": "Комментатор",
       "viewer": "Наблюдатель",
-      "noaccess": "No Access",
-      "superAdmin": "Super Admin",
+      "noaccess": "Нет доступа",
+      "superAdmin": "Супер админ",
       "orgLevelCreator": "Уровень Создатель",
       "orgLevelViewer": "Уровень Наблюдатель"
     },
     "sqlVIew": "Представление SQL",
-    "rowHeight": "Record Height",
+    "rowHeight": "Высота записи",
     "heightClass": {
-      "short": "Short",
-      "medium": "Medium",
-      "tall": "Tall",
-      "extra": "Extra"
+      "short": "Коротко",
+      "medium": "Среднее",
+      "tall": "Высокий",
+      "extra": "Экстра"
     },
-    "externalDb": "External Database"
+    "externalDb": "Внешняя база данных"
   },
   "datatype": {
     "ID": "ID",
@@ -298,37 +298,37 @@
     "isNotNull": "не равно Null"
   },
   "title": {
-    "docs": "Docs",
-    "forum": "Forum",
-    "parameter": "Parameter",
-    "headers": "Headers",
-    "parameterName": "Parameter Name",
-    "currencyLocale": "Currency Locale",
-    "currencyCode": "Currency Code",
-    "searchMembers": "Search Members",
-    "noMembersFound": "No members found",
-    "dateJoined": "Date Joined",
-    "tokenName": "Token name",
-    "inDesktop": "in Desktop",
-    "rowData": "Record data",
-    "creator": "Creator",
-    "qrCode": "QR Code",
-    "termsOfService": "Terms of Service",
-    "updateSelectedRows": "Update Selected Records",
-    "noFiltersAdded": "No filters added",
-    "editCards": "Edit Cards",
-    "noFieldsFound": "No fields found",
-    "displayValue": "Display Value",
-    "expand": "Expand",
-    "hideAll": "Hide all",
-    "hideSystemFields": "Hide system fields",
-    "removeFile": "Remove File",
-    "hasMany": "Has Many",
-    "manyToMany": "Many to Many",
-    "virtualRelation": "Virtual Relation",
-    "linkMore": "Link More",
-    "linkMoreRecords": "Link more records",
-    "downloadFile": "Download File",
+    "docs": "Документация",
+    "forum": "Форум",
+    "parameter": "Параметр",
+    "headers": "Заголовки",
+    "parameterName": "Имя параметра",
+    "currencyLocale": "Валютная локаль",
+    "currencyCode": "Код валюты",
+    "searchMembers": "Поиск участников",
+    "noMembersFound": "Участников не найдено",
+    "dateJoined": "Дата вступления",
+    "tokenName": "Имя токена",
+    "inDesktop": "на рабочем столе",
+    "rowData": "Запись данных",
+    "creator": "Создатель",
+    "qrCode": "QR Код",
+    "termsOfService": "Пользовательское Соглашение",
+    "updateSelectedRows": "Обновить выбранные записи",
+    "noFiltersAdded": "Фильтры не добавлены",
+    "editCards": "Изменить карты",
+    "noFieldsFound": "Поля не найдены",
+    "displayValue": "Отображаемое значение",
+    "expand": "Развернуть",
+    "hideAll": "Скрыть все",
+    "hideSystemFields": "Скрыть системные поля",
+    "removeFile": "Удалить файл",
+    "hasMany": "Имеет много",
+    "manyToMany": "Многие ко многим",
+    "virtualRelation": "Виртуальные отношения",
+    "linkMore": "Ссылка Подробнее",
+    "linkMoreRecords": "Связать больше записей",
+    "downloadFile": "Скачать файл",
     "renameTable": "Rename Table",
     "renamingTable": "Renaming Table",
     "renamingWs": "Renaming Workspace",
@@ -421,56 +421,56 @@
     "italic": "Italic",
     "underline": "Underline",
     "strike": "Strike",
-    "taskList": "Task List",
-    "bulletList": "Bullet List",
-    "numberedList": "Numbered List",
-    "downloadData": "Download Data",
-    "blockQuote": "Block Quote",
-    "noToken": "No Token",
-    "tokenLimit": "Only one token per user is allowed",
-    "duplicateAttachment": "File with name {filename} already attached",
+    "taskList": "Список задач",
+    "bulletList": "Маркированный список",
+    "numberedList": "Нумерованный список",
+    "downloadData": "Скачать данные",
+    "blockQuote": "Цитата",
+    "noToken": "Нет токена",
+    "tokenLimit": "Для каждого пользователя разрешен только один токен",
+    "duplicateAttachment": "Файл с именем {filename} уже прикреплен",
     "viewIdColon": "VIEW ID: {viewId}",
-    "toAddress": "To Address",
-    "subject": "Subject",
-    "body": "Body",
-    "commaSeparatedMobileNumber": "Comma separated Mobile #",
-    "headerName": "Header Name",
-    "icon": "Icon",
-    "max": "Max",
-    "enableRichText": "Enable Rich Text",
+    "toAddress": "Адрес",
+    "subject": "Тема",
+    "body": "Тело письма",
+    "commaSeparatedMobileNumber": "Мобильные # через запятую",
+    "headerName": "Название заголовка",
+    "icon": "Иконка",
+    "max": "Макс",
+    "enableRichText": "Включить насыщенный текст",
     "idColon": "Id:",
-    "copiedRecordURL": "Copied Record URL",
-    "copyRecordURL": "Copy Record URL",
-    "duplicateRecord": "Duplicate record",
-    "binaryEncodingFormat": "Binary encoding format",
-    "syntax": "Syntax",
-    "examples": "Examples",
-    "durationInfo": "A duration of time in minutes or seconds (e.g. 1:23).",
-    "addHeader": "Add Header",
-    "enterDefaultUrlOptional": "Enter default URL (Optional)",
-    "negative": "Negative",
-    "discard": "Discard",
-    "default": "Default",
-    "defaultNumberPercent": "Default Number (%)",
-    "durationFormat": "Duration Format",
-    "dateFormat": "Date Format",
-    "timeFormat": "Time Format",
-    "singularLabel": "Singular Label",
-    "pluralLabel": "Plural Label",
-    "optional": "(Optional)",
-    "clickToMake": "Click to make",
-    "visibleForRole": "visible for role:",
-    "inUI": "in UI Dashboard",
-    "projectSettings": "Base Settings",
-    "clickToHide": "Click to hide",
-    "clickToDownload": "Click to download",
-    "forRole": "for role",
-    "clickToCopyViewID": "Click to copy View ID",
-    "viewMode": "View Mode",
-    "searchUsers": "Search Users",
-    "superAdmin": "Super Admin",
-    "allTables": "All Tables",
-    "members": "Members",
+    "copiedRecordURL": "URL скопированной записи",
+    "copyRecordURL": "Копировать URL записи",
+    "duplicateRecord": "Дублировать запись",
+    "binaryEncodingFormat": "Формат двоичного кодирования",
+    "syntax": "Синтаксис",
+    "examples": "Примеры",
+    "durationInfo": "Длительность времени в минутах или секундах (например, 1:23).",
+    "addHeader": "Добавить заголовок",
+    "enterDefaultUrlOptional": "Введите URL по умолчанию (необязательно)",
+    "negative": "Отрицательный",
+    "discard": "Сбросить",
+    "default": "По умолчанию",
+    "defaultNumberPercent": "Номер по умолчанию (%)",
+    "durationFormat": "Формат продолжительности",
+    "dateFormat": "Формат даты",
+    "timeFormat": "Формат времени",
+    "singularLabel": "Единственное число",
+    "pluralLabel": "Множественное число",
+    "optional": "(Необязательно)",
+    "clickToMake": "Нажмите, чтобы сделать",
+    "visibleForRole": "видимый для роли:",
+    "inUI": "в пользовательском интерфейсе",
+    "projectSettings": "Базовые настройки",
+    "clickToHide": "Нажмите, чтобы скрыть",
+    "clickToDownload": "Нажмите, чтобы загрузить",
+    "forRole": "для роли",
+    "clickToCopyViewID": "Нажмите, чтобы скопировать ID вида",
+    "viewMode": "Режим просмотра",
+    "searchUsers": "Поиск пользователей",
+    "superAdmin": "Супер админ",
+    "allTables": "Все таблицы",
+    "members": "Участники",
     "dataSources": "Data Sources",
     "connectDataSource": "Connect a Data Source",
     "searchProjects": "Search Bases",
@@ -632,56 +632,56 @@
     "noAccess": "No access",
     "restApis": "Rest APIs",
     "apis": "APIs",
-    "includeData": "Include Data",
-    "includeView": "Include View",
-    "includeWebhook": "Include Webhook",
-    "zoomInToViewColumns": "Zoom in to view columns",
-    "embedInSite": "Embed this view in your site",
-    "titleRequired": "title is required.",
-    "sourceNameRequired": "Source name is required",
-    "changeWsName": "Change Workspace Name",
-    "pressEnter": "Press Enter",
-    "newFormLoaded": "New form will be loaded after",
-    "webhook": "Webhook"
+    "includeData": "Включить данные",
+    "includeView": "Включить вид",
+    "includeWebhook": "Включить вебхук",
+    "zoomInToViewColumns": "Увеличить масштаб для просмотра столбцов",
+    "embedInSite": "Вставить этот вид на ваш сайт",
+    "titleRequired": "название обязательно.",
+    "sourceNameRequired": "Имя источника обязательно",
+    "changeWsName": "Изменить название рабочего пространства",
+    "pressEnter": "Нажмите Enter",
+    "newFormLoaded": "Новая форма будет загружена после",
+    "webhook": "Вебхук"
   },
   "activity": {
-    "openInANewTab": "Open in a new tab",
-    "copyIFrameCode": "Copy IFrame code",
-    "onCondition": "On Condition",
-    "bulkDownload": "Bulk Download",
-    "attachFile": "Attach File",
-    "viewAttachment": "View Attachments",
-    "attachmentDrop": "Click or drop a file into cell",
-    "addFiles": "Add File(s)",
-    "hideInUI": "Hide in UI",
-    "addBase": "Add Base",
-    "addParameter": "Add Parameter",
-    "submitAnotherForm": "Submit Another Form",
-    "dragAndDropFieldsHereToAdd": "Drag and drop fields here to add",
-    "editSource": "Edit Data Source",
-    "enterText": "Enter text",
-    "okEditBase": "Ok & Edit Base",
-    "showInUI": "Show in UI",
-    "outOfSync": "Out of sync",
-    "newSource": "New Data Source",
-    "newWebhook": "New Webhook",
-    "enablePublicAccess": "Enable Public Access",
-    "doYouWantToSaveTheChanges": "Do you want to save the changes ?",
-    "editingAccess": "Editing access",
+    "openInANewTab": "Открыть в новой вкладке",
+    "copyIFrameCode": "Копировать код IFrame",
+    "onCondition": "На Условии",
+    "bulkDownload": "Массовая загрузка",
+    "attachFile": "Прикрепить файл",
+    "viewAttachment": "Просмотр вложений",
+    "attachmentDrop": "Нажмите или перетащите файл в ячейку",
+    "addFiles": "Добавить файл(ы)",
+    "hideInUI": "Скрыть в пользовательском интерфейсе",
+    "addBase": "Добавить базу",
+    "addParameter": "Добавить параметр",
+    "submitAnotherForm": "Отправить другую форму",
+    "dragAndDropFieldsHereToAdd": "Перетащите поля сюда для добавления",
+    "editSource": "Изменить источник данных",
+    "enterText": "Введите текст",
+    "okEditBase": "Ок и редактировать базу",
+    "showInUI": "Показать в пользовательском интерфейсе",
+    "outOfSync": "Не синхронизировано",
+    "newSource": "Новый источник данных",
+    "newWebhook": "Новый вебхук",
+    "enablePublicAccess": "Включить публичный доступ",
+    "doYouWantToSaveTheChanges": "Вы хотите сохранить изменения?",
+    "editingAccess": "Редактирование доступа",
     "enabledPublicViewing": "Enable public viewing",
-    "restrictAccessWithPassword": "Restrict access with password",
-    "manageProjectAccess": "Manage Base Access",
-    "allowDownload": "Allow Download",
-    "surveyMode": "Survey Mode",
-    "rtlOrientation": "RTL Orientation",
-    "useTheme": "Use Theme",
-    "copyLink": "Copy Link",
-    "copiedLink": "Link Copied",
-    "copyInviteLink": "Copy invite link",
-    "copiedInviteLink": "Copied invite link",
+    "restrictAccessWithPassword": "Ограничить доступ паролем",
+    "manageProjectAccess": "Управление доступом к базе",
+    "allowDownload": "Разрешить загрузку",
+    "surveyMode": "Режим опроса",
+    "rtlOrientation": "Ориентация RTL",
+    "useTheme": "Использовать тему",
+    "copyLink": "Скопировать ссылку",
+    "copiedLink": "Ссылка скопирована",
+    "copyInviteLink": "Скопируйте ссылку на приглашение",
+    "copiedInviteLink": "Скопированная ссылка на приглашение",
     "copyUrl": "Скопировать URL",
-    "moreColors": "More Colors",
-    "moveProject": "Move Base",
+    "moreColors": "Больше цветов",
+    "moveProject": "Переместить базу",
     "createProject": "Создать проект",
     "importProject": "Импорт проекта",
     "searchProject": "Найти проект",
@@ -692,7 +692,7 @@
     "deleteProject": "Удалить проект",
     "refreshProject": "Обновить проекты",
     "saveProject": "Сохранить проект",
-    "saveAndQuit": "Save & Quit",
+    "saveAndQuit": "Сохранить и выйти",
     "deleteKanbanStack": "Удалить стек?",
     "createProjectExtended": {
       "extDB": "Создать подключение к внешней базе данных",
@@ -708,7 +708,7 @@
     "translate": "Помочь перевести",
     "account": {
       "authToken": "Скопировать токен авторизации",
-      "authTokenCopied": "Copied Auth Token",
+      "authTokenCopied": "Токен аутентификации скопирован",
       "swagger": "Swagger: REST APIs",
       "projInfo": "Информация о проекте",
       "themes": "Темы"
@@ -718,8 +718,8 @@
     "filter": "Фильтр",
     "addFilter": "Добавить фильтр",
     "share": "Поделиться",
-    "groupBy": "Group By",
-    "addSubGroup": "Add subgroup",
+    "groupBy": "Группировать по",
+    "addSubGroup": "Добавить подгруппу",
     "shareBase": {
       "label": "Share base",
       "disable": "Отключить общую базу",

From a5fd82dcb3a1d743101d320b4f6220bfed5e31c7 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Fri, 29 Dec 2023 00:04:41 +0530
Subject: [PATCH 22/30] fix: review changes

---
 packages/nc-gui/components/cell/MultiSelect.vue  | 2 +-
 packages/nc-gui/components/cell/SingleSelect.vue | 2 +-
 packages/nc-gui/components/cell/User.vue         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/cell/MultiSelect.vue b/packages/nc-gui/components/cell/MultiSelect.vue
index 541c5d880e..fcf4017f07 100644
--- a/packages/nc-gui/components/cell/MultiSelect.vue
+++ b/packages/nc-gui/components/cell/MultiSelect.vue
@@ -359,7 +359,7 @@ const onFocus = () => {
       v-if="!active"
       class="flex flex-wrap"
       :class="{
-        '!px-2': isExpandedFormOpen,
+        'px-2': isExpandedFormOpen,
       }"
       :style="{
         'display': '-webkit-box',
diff --git a/packages/nc-gui/components/cell/SingleSelect.vue b/packages/nc-gui/components/cell/SingleSelect.vue
index 0a45f9f263..54680fe910 100644
--- a/packages/nc-gui/components/cell/SingleSelect.vue
+++ b/packages/nc-gui/components/cell/SingleSelect.vue
@@ -283,7 +283,7 @@ const onFocus = () => {
       v-if="!(active || isEditable)"
       class="w-full"
       :class="{
-        '!px-2': isExpandedFormOpen,
+        'px-2': isExpandedFormOpen,
       }"
     >
       <a-tag v-if="selectedOpt" class="rounded-tag max-w-full" :color="selectedOpt.color">
diff --git a/packages/nc-gui/components/cell/User.vue b/packages/nc-gui/components/cell/User.vue
index 512266bfe1..33ad5cda88 100644
--- a/packages/nc-gui/components/cell/User.vue
+++ b/packages/nc-gui/components/cell/User.vue
@@ -268,7 +268,7 @@ const filterOption = (input: string, option: any) => {
       v-if="!active"
       class="flex flex-wrap"
       :class="{
-        '!px-2': isExpandedFormOpen,
+        'px-2': isExpandedFormOpen,
       }"
       :style="{
         'display': '-webkit-box',

From 1a10890092f6d470277e8109c8bf07377f184ffd Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Fri, 29 Dec 2023 02:56:32 +0530
Subject: [PATCH 23/30] fix: select default user test issue

---
 .../pages/Dashboard/Grid/Column/UserOptionColumn.ts       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/Grid/Column/UserOptionColumn.ts b/tests/playwright/pages/Dashboard/Grid/Column/UserOptionColumn.ts
index 52feb78846..c58d661a85 100644
--- a/tests/playwright/pages/Dashboard/Grid/Column/UserOptionColumn.ts
+++ b/tests/playwright/pages/Dashboard/Grid/Column/UserOptionColumn.ts
@@ -57,14 +57,14 @@ export class UserOptionColumnPageObject extends BasePage {
       for (const op of optionsToSelect) {
         await this.selectOption({ option: op });
       }
+
+      // Press `Escape` to close the dropdown
+      await this.rootPage.keyboard.press('Escape');
+      await this.rootPage.locator('.nc-dropdown-user-select-cell').waitFor({ state: 'hidden' });
     } else if (!Array.isArray(option)) {
       await this.selectOption({ option });
     }
 
-    // Press `Escape` to close the dropdown
-    await this.rootPage.keyboard.press('Escape');
-    await this.rootPage.locator('.nc-dropdown-user-select-cell').waitFor({ state: 'hidden' });
-
     await this.column.save({ isUpdated: true });
   }
 

From d12a18781e7d20612ab1e34f72b2b239b57e954b Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Fri, 29 Dec 2023 12:23:31 +0530
Subject: [PATCH 24/30] fix: review changes of select dropdown fields

---
 packages/nc-gui/components/cell/MultiSelect.vue  | 11 ++++++-----
 packages/nc-gui/components/cell/SingleSelect.vue | 12 +++---------
 packages/nc-gui/components/cell/User.vue         | 11 ++++++-----
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/packages/nc-gui/components/cell/MultiSelect.vue b/packages/nc-gui/components/cell/MultiSelect.vue
index fcf4017f07..08fe8192e9 100644
--- a/packages/nc-gui/components/cell/MultiSelect.vue
+++ b/packages/nc-gui/components/cell/MultiSelect.vue
@@ -354,13 +354,14 @@ const onFocus = () => {
 </script>
 
 <template>
-  <div class="nc-multi-select h-full w-full flex items-center" :class="{ 'read-only': readOnly }" @click="toggleMenu">
+  <div
+    class="nc-multi-select h-full w-full flex items-center"
+    :class="{ 'read-only': readOnly, 'px-2': isExpandedFormOpen }"
+    @click="toggleMenu"
+  >
     <div
       v-if="!active"
       class="flex flex-wrap"
-      :class="{
-        'px-2': isExpandedFormOpen,
-      }"
       :style="{
         'display': '-webkit-box',
         'max-width': '100%',
@@ -413,7 +414,7 @@ const onFocus = () => {
       :show-arrow="editAllowed && !readOnly"
       :open="isOpen && editAllowed"
       :disabled="readOnly || !editAllowed"
-      :class="{ 'caret-transparent': !hasEditRoles, '!px-2': isExpandedFormOpen }"
+      :class="{ 'caret-transparent': !hasEditRoles }"
       :dropdown-class-name="`nc-dropdown-multi-select-cell !min-w-200px ${isOpen ? 'active' : ''}`"
       @search="search"
       @keydown="onKeyDown"
diff --git a/packages/nc-gui/components/cell/SingleSelect.vue b/packages/nc-gui/components/cell/SingleSelect.vue
index 54680fe910..708b59d4c0 100644
--- a/packages/nc-gui/components/cell/SingleSelect.vue
+++ b/packages/nc-gui/components/cell/SingleSelect.vue
@@ -275,17 +275,11 @@ const onFocus = () => {
 <template>
   <div
     class="h-full w-full flex items-center nc-single-select focus:outline-transparent"
-    :class="{ 'read-only': readOnly }"
+    :class="{ 'read-only': readOnly, 'px-2': isExpandedFormOpen }"
     @click="toggleMenu"
     @keydown.enter.stop.prevent="toggleMenu"
   >
-    <div
-      v-if="!(active || isEditable)"
-      class="w-full"
-      :class="{
-        'px-2': isExpandedFormOpen,
-      }"
-    >
+    <div v-if="!(active || isEditable)" class="w-full">
       <a-tag v-if="selectedOpt" class="rounded-tag max-w-full" :color="selectedOpt.color">
         <span
           :style="{
@@ -320,7 +314,7 @@ const onFocus = () => {
       ref="aselect"
       v-model:value="vModel"
       class="w-full overflow-hidden xs:min-h-12"
-      :class="{ 'caret-transparent': !hasEditRoles, '!px-2': isExpandedFormOpen }"
+      :class="{ 'caret-transparent': !hasEditRoles }"
       :placeholder="isEditColumn ? $t('labels.optional') : ''"
       :allow-clear="!column.rqd && editAllowed"
       :bordered="false"
diff --git a/packages/nc-gui/components/cell/User.vue b/packages/nc-gui/components/cell/User.vue
index 33ad5cda88..e12394268a 100644
--- a/packages/nc-gui/components/cell/User.vue
+++ b/packages/nc-gui/components/cell/User.vue
@@ -263,13 +263,14 @@ const filterOption = (input: string, option: any) => {
 </script>
 
 <template>
-  <div class="nc-user-select h-full w-full flex items-center" :class="{ 'read-only': readOnly }" @click="toggleMenu">
+  <div
+    class="nc-user-select h-full w-full flex items-center"
+    :class="{ 'read-only': readOnly, 'px-2': isExpandedFormOpen }"
+    @click="toggleMenu"
+  >
     <div
       v-if="!active"
       class="flex flex-wrap"
-      :class="{
-        'px-2': isExpandedFormOpen,
-      }"
       :style="{
         'display': '-webkit-box',
         'max-width': '100%',
@@ -308,7 +309,7 @@ const filterOption = (input: string, option: any) => {
       :show-arrow="editAllowed && !readOnly"
       :open="isOpen && editAllowed"
       :disabled="readOnly || !editAllowed"
-      :class="{ 'caret-transparent': !hasEditRoles, '!px-2': isExpandedFormOpen }"
+      :class="{ 'caret-transparent': !hasEditRoles }"
       :dropdown-class-name="`nc-dropdown-user-select-cell ${isOpen ? 'active' : ''}`"
       :filter-option="filterOption"
       @search="search"

From 51954f147273b38b70473871ee77c3f2dab55384 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Fri, 29 Dec 2023 12:24:13 +0530
Subject: [PATCH 25/30] fix: form submit button focus css issue

---
 .../index/[typeOrId]/form/[viewId]/index/index.vue    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
index ee1ee5afee..8d6d6796a8 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
@@ -3,7 +3,7 @@ import type { ColumnType } from 'nocodb-sdk'
 import { RelationTypes, UITypes, isVirtualCol } from 'nocodb-sdk'
 import { ref } from 'vue'
 import { StreamBarcodeReader } from 'vue-barcode-reader'
-import { iconMap, useSharedFormStoreOrThrow } from '#imports'
+import { iconMap, useGlobal, useSharedFormStoreOrThrow } from '#imports'
 
 const { sharedFormView, submitForm, v$, formState, notFound, formColumns, submitted, secondsRemain, isLoading } =
   useSharedFormStoreOrThrow()
@@ -21,6 +21,7 @@ function isRequired(_columnObj: Record<string, any>, required = false) {
   return !!(required || (columnObj && columnObj.rqd && !columnObj.cdf))
 }
 
+const { isMobileMode } = useGlobal()
 const fieldTitleForCurrentScan = ref('')
 
 const scannerIsReady = ref(false)
@@ -68,7 +69,13 @@ const onDecode = async (scannedCodeValue: string) => {
 </script>
 
 <template>
-  <div class="h-full flex flex-col items-center">
+  <div
+    class="h-full flex flex-col items-center"
+    :class="{
+      mobile: isMobileMode,
+      desktop: !isMobileMode,
+    }"
+  >
     <div
       class="color-transition flex flex-col justify-center gap-2 w-full max-w-[max(33%,600px)] m-auto py-4 pb-8 px-16 md:(bg-white dark:bg-slate-700 rounded-lg border-1 border-gray-200 shadow-xl)"
     >

From 937ac53be950fdc5e91cad5a30cddb7a3b8af368 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Fri, 29 Dec 2023 12:29:55 +0530
Subject: [PATCH 26/30] fix: review changes

---
 .../pages/index/[typeOrId]/form/[viewId]/index/index.vue  | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
index 8d6d6796a8..38b9cb133b 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
@@ -69,13 +69,7 @@ const onDecode = async (scannedCodeValue: string) => {
 </script>
 
 <template>
-  <div
-    class="h-full flex flex-col items-center"
-    :class="{
-      mobile: isMobileMode,
-      desktop: !isMobileMode,
-    }"
-  >
+  <div class="h-full flex flex-col items-center" :class="isMobileMode ? 'mobile' : 'desktop'">
     <div
       class="color-transition flex flex-col justify-center gap-2 w-full max-w-[max(33%,600px)] m-auto py-4 pb-8 px-16 md:(bg-white dark:bg-slate-700 rounded-lg border-1 border-gray-200 shadow-xl)"
     >

From 37ab476224f0269a5f00368a74dbcbfbbfe60b01 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Fri, 29 Dec 2023 12:31:26 +0530
Subject: [PATCH 27/30] fix: added missing line break

---
 .../nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
index 38b9cb133b..416de6a64d 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
@@ -22,6 +22,7 @@ function isRequired(_columnObj: Record<string, any>, required = false) {
 }
 
 const { isMobileMode } = useGlobal()
+
 const fieldTitleForCurrentScan = ref('')
 
 const scannerIsReady = ref(false)

From 11b8f68da8ece5b00f6be4c595fb3dd790f0b526 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 29 Dec 2023 12:38:09 +0530
Subject: [PATCH 28/30] fix: SUBTR argument validation correction

---
 packages/nocodb-sdk/src/lib/formulaHelpers.ts | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb-sdk/src/lib/formulaHelpers.ts b/packages/nocodb-sdk/src/lib/formulaHelpers.ts
index 89689677d0..d6e91ee7ff 100644
--- a/packages/nocodb-sdk/src/lib/formulaHelpers.ts
+++ b/packages/nocodb-sdk/src/lib/formulaHelpers.ts
@@ -913,7 +913,38 @@ export const formulas: Record<string, FormulaMeta> = {
       args: {
         min: 2,
         max: 3,
-        type: FormulaDataTypes.STRING,
+      },
+      custom(argTypes: FormulaDataTypes[], parsedTree) {
+        if (argTypes[0] !== FormulaDataTypes.STRING) {
+          throw new FormulaError(
+            FormulaErrorType.INVALID_ARG,
+            {
+              key: 'msg.formula.stringTypeIsExpected',
+              calleeName: parsedTree.callee?.name?.toUpperCase(),
+            },
+            'String type is expected'
+          );
+        }
+        if (argTypes[1] !== FormulaDataTypes.NUMERIC) {
+          throw new FormulaError(
+            FormulaErrorType.INVALID_ARG,
+            {
+              key: 'msg.formula.numericTypeIsExpected',
+              calleeName: parsedTree.callee?.name?.toUpperCase(),
+            },
+            'Numeric type is expected'
+          );
+        }
+        if (argTypes[2] && argTypes[2] !== FormulaDataTypes.NUMERIC) {
+          throw new FormulaError(
+            FormulaErrorType.INVALID_ARG,
+            {
+              key: 'msg.formula.numericTypeIsExpected',
+              calleeName: parsedTree.callee?.name?.toUpperCase(),
+            },
+            'Numeric type is expected'
+          );
+        }
       },
     },
     description:

From 156f420c3bd4e16df212f35641ee911efb93b92a Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 29 Dec 2023 12:47:52 +0530
Subject: [PATCH 29/30] fix: type validation corrections

RIGHT, LEFT and MID
---
 packages/nocodb-sdk/src/lib/formulaHelpers.ts | 79 +++++++++++++++++--
 1 file changed, 72 insertions(+), 7 deletions(-)

diff --git a/packages/nocodb-sdk/src/lib/formulaHelpers.ts b/packages/nocodb-sdk/src/lib/formulaHelpers.ts
index d6e91ee7ff..6b9450e0d8 100644
--- a/packages/nocodb-sdk/src/lib/formulaHelpers.ts
+++ b/packages/nocodb-sdk/src/lib/formulaHelpers.ts
@@ -321,7 +321,6 @@ export const formulas: Record<string, FormulaMeta> = {
     validation: {
       args: {
         rqd: 3,
-        type: FormulaDataTypes.DATE,
       },
       custom: (_argTypes: FormulaDataTypes[], parsedTree: any) => {
         if (parsedTree.arguments[0].type === JSEPNode.LITERAL) {
@@ -377,6 +376,7 @@ export const formulas: Record<string, FormulaMeta> = {
     validation: {
       args: {
         rqd: 1,
+        type: FormulaDataTypes.DATE,
       },
     },
     syntax: 'DATESTR(date | datetime)',
@@ -388,6 +388,7 @@ export const formulas: Record<string, FormulaMeta> = {
     validation: {
       args: {
         rqd: 1,
+        type: FormulaDataTypes.DATE,
       },
     },
     syntax: 'DAY(date | datetime)',
@@ -399,6 +400,7 @@ export const formulas: Record<string, FormulaMeta> = {
     validation: {
       args: {
         rqd: 1,
+        type: FormulaDataTypes.DATE,
       },
     },
     syntax: 'MONTH(date | datetime)',
@@ -410,6 +412,7 @@ export const formulas: Record<string, FormulaMeta> = {
     validation: {
       args: {
         rqd: 1,
+        type: FormulaDataTypes.DATE,
       },
     },
     syntax: 'DAY(time | datetime)',
@@ -425,7 +428,6 @@ export const formulas: Record<string, FormulaMeta> = {
       args: {
         min: 2,
         max: 3,
-        type: FormulaDataTypes.DATE,
       },
       custom: (_argTypes: FormulaDataTypes[], parsedTree: any) => {
         if (parsedTree.arguments[0].type === JSEPNode.LITERAL) {
@@ -814,7 +816,6 @@ export const formulas: Record<string, FormulaMeta> = {
     validation: {
       args: {
         rqd: 0,
-        type: FormulaDataTypes.DATE,
       },
     },
     description: 'Retrieve the current time and day.',
@@ -882,8 +883,29 @@ export const formulas: Record<string, FormulaMeta> = {
     validation: {
       args: {
         rqd: 2,
-        type: FormulaDataTypes.STRING,
       },
+      custom(argTypes: FormulaDataTypes[], parsedTree) {
+        if (argTypes[0] !== FormulaDataTypes.STRING) {
+          throw new FormulaError(
+            FormulaErrorType.INVALID_ARG,
+            {
+              key: 'msg.formula.stringTypeIsExpected',
+              calleeName: parsedTree.callee?.name?.toUpperCase(),
+            },
+            'String type is expected'
+          );
+        }
+        if (argTypes[1] !== FormulaDataTypes.NUMERIC) {
+          throw new FormulaError(
+            FormulaErrorType.INVALID_ARG,
+            {
+              key: 'msg.formula.numericTypeIsExpected',
+              calleeName: parsedTree.callee?.name?.toUpperCase(),
+            },
+            'Numeric type is expected'
+          );
+        }
+      }
     },
     description: 'Retrieve the last n characters from the input string.',
     syntax: 'RIGHT(str, n)',
@@ -897,8 +919,29 @@ export const formulas: Record<string, FormulaMeta> = {
     validation: {
       args: {
         rqd: 2,
-        type: FormulaDataTypes.STRING,
       },
+      custom(argTypes: FormulaDataTypes[], parsedTree) {
+        if (argTypes[0] !== FormulaDataTypes.STRING) {
+          throw new FormulaError(
+            FormulaErrorType.INVALID_ARG,
+            {
+              key: 'msg.formula.stringTypeIsExpected',
+              calleeName: parsedTree.callee?.name?.toUpperCase(),
+            },
+            'String type is expected'
+          );
+        }
+        if (argTypes[1] !== FormulaDataTypes.NUMERIC) {
+          throw new FormulaError(
+            FormulaErrorType.INVALID_ARG,
+            {
+              key: 'msg.formula.numericTypeIsExpected',
+              calleeName: parsedTree.callee?.name?.toUpperCase(),
+            },
+            'Numeric type is expected'
+          );
+        }
+      }
     },
     description: 'Retrieve the first n characters from the input string.',
     syntax: 'LEFT(str, n)',
@@ -964,8 +1007,31 @@ export const formulas: Record<string, FormulaMeta> = {
     validation: {
       args: {
         rqd: 3,
-        type: FormulaDataTypes.STRING,
       },
+      custom(argTypes: FormulaDataTypes[], parsedTree) {
+        if (argTypes[0] !== FormulaDataTypes.STRING) {
+          throw new FormulaError(
+            FormulaErrorType.INVALID_ARG,
+            {
+              key: 'msg.formula.stringTypeIsExpected',
+              calleeName: parsedTree.callee?.name?.toUpperCase(),
+            },
+            'String type is expected'
+          );
+        }
+        for(const i in [1,2]) {
+          if (argTypes[i] !== FormulaDataTypes.NUMERIC) {
+            throw new FormulaError(
+              FormulaErrorType.INVALID_ARG,
+              {
+                key: 'msg.formula.numericTypeIsExpected',
+                calleeName: parsedTree.callee?.name?.toUpperCase(),
+              },
+              'Numeric type is expected'
+            );
+          }
+        }
+      }
     },
     description: 'Extracts a substring; an alias for SUBSTR.',
     syntax: 'MID(str, position, [count])',
@@ -1083,7 +1149,6 @@ export const formulas: Record<string, FormulaMeta> = {
       args: {
         min: 1,
         max: 2,
-        type: FormulaDataTypes.NUMERIC,
       },
       custom(_argTypes: FormulaDataTypes[], parsedTree: any) {
         if (parsedTree.arguments[0].type === JSEPNode.LITERAL) {

From 1588962182e68f6284d6ddb535d92911e7af1bf3 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 29 Dec 2023 12:52:36 +0530
Subject: [PATCH 30/30] fix: typo correction

---
 packages/nocodb-sdk/src/lib/formulaHelpers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nocodb-sdk/src/lib/formulaHelpers.ts b/packages/nocodb-sdk/src/lib/formulaHelpers.ts
index 6b9450e0d8..3b472b47ef 100644
--- a/packages/nocodb-sdk/src/lib/formulaHelpers.ts
+++ b/packages/nocodb-sdk/src/lib/formulaHelpers.ts
@@ -1019,7 +1019,7 @@ export const formulas: Record<string, FormulaMeta> = {
             'String type is expected'
           );
         }
-        for(const i in [1,2]) {
+        for(const i of [1,2]) {
           if (argTypes[i] !== FormulaDataTypes.NUMERIC) {
             throw new FormulaError(
               FormulaErrorType.INVALID_ARG,