From 0bf36882443a27f3bf6c99cc1dd0998652633769 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Fri, 8 Dec 2023 12:24:52 +0530
Subject: [PATCH] fix: lint errors and some review changes

---
 packages/nc-gui/components/dashboard/settings/DataSources.vue | 2 +-
 packages/nc-gui/components/smartsheet/column/EditOrAdd.vue    | 2 +-
 packages/nc-gui/components/smartsheet/details/Fields.vue      | 2 +-
 packages/nc-gui/components/smartsheet/grid/Table.vue          | 2 +-
 packages/nc-gui/components/tabs/Smartsheet.vue                | 2 +-
 packages/nc-gui/helpers/parsers/parserHelpers.ts              | 1 +
 packages/nc-gui/lang/en.json                                  | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/settings/DataSources.vue b/packages/nc-gui/components/dashboard/settings/DataSources.vue
index ae55090948..400d29a878 100644
--- a/packages/nc-gui/components/dashboard/settings/DataSources.vue
+++ b/packages/nc-gui/components/dashboard/settings/DataSources.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import Draggable from 'vuedraggable'
 import type { SourceType } from 'nocodb-sdk'
-import { ClientType, DataSourcesSubTab, storeToRefs, useBase, useCommandPalette, useNuxtApp, isEeUI } from '#imports'
+import { ClientType, DataSourcesSubTab, isEeUI, storeToRefs, useBase, useCommandPalette, useNuxtApp } from '#imports'
 
 interface Props {
   state: string
diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index 096994826e..191612508e 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -160,7 +160,7 @@ onMounted(() => {
       message.info(t('msg.info.editingPKnotSupported'))
       emit('cancel')
     } else if (isSystemColumn(formState.value)) {
-      message.info(t('msg.info.editingSystemKeynotSupported'))
+      message.info(t('msg.info.editingSystemKeyNotSupported'))
       emit('cancel')
     }
   }
diff --git a/packages/nc-gui/components/smartsheet/details/Fields.vue b/packages/nc-gui/components/smartsheet/details/Fields.vue
index 4f6557b6fc..e9c5ade692 100644
--- a/packages/nc-gui/components/smartsheet/details/Fields.vue
+++ b/packages/nc-gui/components/smartsheet/details/Fields.vue
@@ -1081,7 +1081,7 @@ const onFieldOptionUpdate = () => {
             </Draggable>
           </div>
           <Transition v-if="!changingField" name="slide-fade">
-            <div class="border-gray-200 border-l-1 nc-scrollbar-md nc-fields-height !overflow-y-auto">
+            <div v-if="!changingField" class="border-gray-200 border-l-1 nc-scrollbar-md nc-fields-height !overflow-y-auto">
               <SmartsheetColumnEditOrAddProvider
                 v-if="activeField"
                 class="p-4 w-[25rem]"
diff --git a/packages/nc-gui/components/smartsheet/grid/Table.vue b/packages/nc-gui/components/smartsheet/grid/Table.vue
index 9e79e502b6..c2af1522a7 100644
--- a/packages/nc-gui/components/smartsheet/grid/Table.vue
+++ b/packages/nc-gui/components/smartsheet/grid/Table.vue
@@ -1716,8 +1716,8 @@ onKeyStroke('ArrowDown', onDown)
             <NcMenuItem
               v-else-if="contextMenuTarget && hasEditPermission"
               class="nc-base-menu-item"
-              @click="clearSelectedRangeOfCells()"
               :disabled="isSystemColumn(fields[contextMenuTarget.col])"
+              @click="clearSelectedRangeOfCells()"
             >
               <div v-e="['a:row:clear-range']" class="flex gap-2 items-center">
                 <GeneralIcon icon="closeBox" class="text-gray-500" />
diff --git a/packages/nc-gui/components/tabs/Smartsheet.vue b/packages/nc-gui/components/tabs/Smartsheet.vue
index 4ac9f6d284..ca6982178f 100644
--- a/packages/nc-gui/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui/components/tabs/Smartsheet.vue
@@ -171,7 +171,7 @@ watch([activeViewTitleOrId, activeTableId], () => {
         <LazySmartsheetToolbar v-if="!isForm" />
         <div class="flex flex-row w-full" style="height: calc(100% - var(--topbar-height))">
           <Transition name="layout" mode="out-in">
-            <div class="flex flex-1 min-h-0 w-3/4">
+            <div v-if="openedViewsTab === 'view'" class="flex flex-1 min-h-0 w-3/4">
               <div class="h-full flex-1 min-w-0 min-h-0 bg-white">
                 <LazySmartsheetGrid v-if="isGrid || !meta || !activeView" ref="grid" />
 
diff --git a/packages/nc-gui/helpers/parsers/parserHelpers.ts b/packages/nc-gui/helpers/parsers/parserHelpers.ts
index d938d86374..b629fe4192 100644
--- a/packages/nc-gui/helpers/parsers/parserHelpers.ts
+++ b/packages/nc-gui/helpers/parsers/parserHelpers.ts
@@ -211,6 +211,7 @@ export const extractNextDefaultName = (namesData: string[], defaultName: string,
         if (_defaultName === defaultName && !isNaN(Number(number?.trim()))) {
           return Number(number?.trim())
         }
+        return undefined
       })
       .filter((e) => e)
       .sort((a, b) => {
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 53538138b4..21a024729c 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -1210,7 +1210,7 @@
       "goToNext": "Go to next",
       "thankYou": "Thank you!",
       "submittedFormData": "You have successfully submitted the form data.",
-      "editingSystemKeynotSupported": "Editing system key not supported"
+      "editingSystemKeyNotSupported": "Editing system key not supported"
 
     },
     "error": {