From bec5a095a7f6dfe2899a6744bdf1a9b8b7551b65 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 4 Aug 2022 00:26:12 +0530
Subject: [PATCH 1/2] fix(gui-v2): provide editEnabled from cell component

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui-v2/components/smartsheet/Cell.vue  | 19 +++++++++----------
 .../nc-gui-v2/components/smartsheet/Grid.vue  |  4 +---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet/Cell.vue b/packages/nc-gui-v2/components/smartsheet/Cell.vue
index 9a01b36ba8..66a1a91f75 100644
--- a/packages/nc-gui-v2/components/smartsheet/Cell.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Cell.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { UITypes } from 'nocodb-sdk'
 import type { ColumnType } from 'nocodb-sdk'
-import { provide } from 'vue'
+import { provide, toRef } from 'vue'
 import { computed, useColumn, useDebounceFn, useVModel } from '#imports'
-import { ColumnInj } from '~/context'
+import { ColumnInj, EditModeInj } from '~/context'
 
 interface Props {
   column: ColumnType
@@ -15,19 +15,18 @@ interface Emits {
   (event: 'update:modelValue', value: any): void
 }
 
-const { column, editEnabled, ...rest } = defineProps<Props>()
+const { column, ...props } = defineProps<Props>()
 
 const emit = defineEmits(['update:modelValue', 'save'])
 
 provide(ColumnInj, column)
 
-provide(
-  'editEnabled',
-  computed(() => editEnabled),
-)
+
+provide(EditModeInj, toRef(props, 'editEnabled'))
+
 
 let changed = $ref(false)
-const syncValue = useDebounceFn(function () {
+const syncValue = useDebounceFn(function() {
   emit('save')
 }, 1000)
 
@@ -53,9 +52,9 @@ const isManualSaved = $computed(() => {
 })
 
 const vModel = computed({
-  get: () => rest.modelValue,
+  get: () => props.modelValue,
   set: (val) => {
-    if (val !== rest.modelValue) {
+    if (val !== props.modelValue) {
       changed = true
       emit('update:modelValue', val)
       if (isAutoSaved) {
diff --git a/packages/nc-gui-v2/components/smartsheet/Grid.vue b/packages/nc-gui-v2/components/smartsheet/Grid.vue
index a45bcdcecc..59a9d45409 100644
--- a/packages/nc-gui-v2/components/smartsheet/Grid.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Grid.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { ColumnType, isVirtualCol } from 'nocodb-sdk'
+import { isVirtualCol } from 'nocodb-sdk'
 import {
   Row,
   inject,
@@ -14,7 +14,6 @@ import {
 import {
   ActiveViewInj,
   ChangePageInj,
-  EditModeInj,
   FieldsInj,
   IsFormInj,
   IsGridInj,
@@ -65,7 +64,6 @@ onMounted(loadGridViewColumns)
 provide(IsFormInj, false)
 provide(IsGridInj, true)
 provide(PaginationDataInj, paginationData)
-provide(EditModeInj, editEnabled)
 provide(ChangePageInj, changePage)
 
 const reloadViewDataHook = inject(ReloadViewDataHookInj)

From 6ec63d9f9b0b6a053c3a23ecc2a15cd1ad853d12 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 4 Aug 2022 00:27:30 +0530
Subject: [PATCH 2/2] chore(gui-v2): lint

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui-v2/components/smartsheet-header/CellIcon.vue    | 7 +++----
 packages/nc-gui-v2/components/smartsheet/Cell.vue          | 4 +---
 packages/nc-gui-v2/composables/useColumnCreateStore.ts     | 2 --
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue b/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
index 10ea007c32..8b3a41f476 100644
--- a/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
+++ b/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
@@ -11,11 +11,10 @@ import WebIcon from '~icons/mdi/web'
 import TextAreaIcon from '~icons/mdi/card-text-outline'
 import StringIcon from '~icons/mdi/alpha-a-box-outline'
 import BooleanIcon from '~icons/mdi/check-box-outline'
-import YearIcon from '~icons/mdi/calendar'
+import CalendarIcon from '~icons/mdi/calendar'
 import SingleSelectIcon from '~icons/mdi/radiobox-marked'
 import MultiSelectIcon from '~icons/mdi/checkbox-multiple-marked'
 import DatetimeIcon from '~icons/mdi/calendar-clock'
-import DateIcon from '~icons/mdi/calendar'
 import RatingIcon from '~icons/mdi/star'
 import GenericIcon from '~icons/mdi/square-rounded'
 import NumericIcon from '~icons/mdi/numeric'
@@ -37,7 +36,7 @@ const icon = computed(() => {
   } else if (additionalColMeta.isJSON) {
     return JSONIcon
   } else if (additionalColMeta.isDate) {
-    return DateIcon
+    return CalendarIcon
   } else if (additionalColMeta.isDateTime) {
     return DatetimeIcon
   } else if (additionalColMeta.isSet) {
@@ -51,7 +50,7 @@ const icon = computed(() => {
   } else if (additionalColMeta.isEmail) {
     return EmailIcon
   } else if (additionalColMeta.isYear) {
-    return YearIcon
+    return CalendarIcon
   } else if (additionalColMeta.isTime) {
     return ClockIcon
   } else if (additionalColMeta.isRating) {
diff --git a/packages/nc-gui-v2/components/smartsheet/Cell.vue b/packages/nc-gui-v2/components/smartsheet/Cell.vue
index 66a1a91f75..fccce1ed79 100644
--- a/packages/nc-gui-v2/components/smartsheet/Cell.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Cell.vue
@@ -21,12 +21,10 @@ const emit = defineEmits(['update:modelValue', 'save'])
 
 provide(ColumnInj, column)
 
-
 provide(EditModeInj, toRef(props, 'editEnabled'))
 
-
 let changed = $ref(false)
-const syncValue = useDebounceFn(function() {
+const syncValue = useDebounceFn(function () {
   emit('save')
 }, 1000)
 
diff --git a/packages/nc-gui-v2/composables/useColumnCreateStore.ts b/packages/nc-gui-v2/composables/useColumnCreateStore.ts
index cdf2b78063..fb289f7101 100644
--- a/packages/nc-gui-v2/composables/useColumnCreateStore.ts
+++ b/packages/nc-gui-v2/composables/useColumnCreateStore.ts
@@ -89,7 +89,6 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState
     formState.value = { meta: {}, ...sqlUi.value.getNewColumn((meta.value.columns?.length || 0) + 1) }
   }
 
-
   const onUidtOrIdTypeChange = () => {
     const { isCurrency } = useColumn(formState.value as ColumnType)
 
@@ -174,7 +173,6 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState
   }
 
   const addOrUpdate = async (onSuccess: () => {}) => {
-
     try {
       console.log(formState, validators)
       if (!(await validate())) return