From 7c615768b6ea233a4cd08ee9459794b5cd60db94 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 19 Nov 2022 19:10:44 +0800
Subject: [PATCH 01/16] feat(nc-gui): add save & exit and save & stay

---
 packages/nc-gui/lang/en.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 08db4c8610..bd19e8ad4a 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -368,6 +368,8 @@
     "setPrimary": "Set as Primary value",
     "addRow": "Add new row",
     "saveRow": "Save row",
+    "saveAndExit": "Save & Exit",
+    "saveAndStay": "Save & Stay",
     "insertRow": "Insert New Row",
     "deleteRow": "Delete Row",
     "deleteSelectedRow": "Delete Selected Rows",

From 633fec95f92ea19ac7564ff8069d507b876dd0ae Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 19 Nov 2022 19:11:20 +0800
Subject: [PATCH 02/16] feat(nc-gui): remove important on py-0

---
 packages/nc-gui/assets/style.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss
index 7e3d0f5cd5..76489a82dd 100644
--- a/packages/nc-gui/assets/style.scss
+++ b/packages/nc-gui/assets/style.scss
@@ -261,7 +261,7 @@ a {
 }
 
 .ant-dropdown-menu-item, .ant-menu-item {
-  @apply !py-0 active:(ring ring-accent ring-opacity-100);
+  @apply py-0 active:(ring ring-accent ring-opacity-100);
 }
 
 .ant-dropdown-menu-title-content,

From d57d722566d619bfc52663532870149ff0fde467 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 19 Nov 2022 19:13:06 +0800
Subject: [PATCH 03/16] feat(nc-gui): add MdiCancel, MdiContentSaveEdit &
 ADropdownButton

---
 packages/nc-gui/components.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts
index 1be206af09..681ddee0f7 100644
--- a/packages/nc-gui/components.d.ts
+++ b/packages/nc-gui/components.d.ts
@@ -24,6 +24,7 @@ declare module '@vue/runtime-core' {
     ADivider: typeof import('ant-design-vue/es')['Divider']
     ADrawer: typeof import('ant-design-vue/es')['Drawer']
     ADropdown: typeof import('ant-design-vue/es')['Dropdown']
+    ADropdownButton: typeof import('ant-design-vue/es')['DropdownButton']
     AEmpty: typeof import('ant-design-vue/es')['Empty']
     AForm: typeof import('ant-design-vue/es')['Form']
     AFormItem: typeof import('ant-design-vue/es')['FormItem']
@@ -126,6 +127,7 @@ declare module '@vue/runtime-core' {
     MdiBugOutline: typeof import('~icons/mdi/bug-outline')['default']
     MdiCalculator: typeof import('~icons/mdi/calculator')['default']
     MdiCalendarMonth: typeof import('~icons/mdi/calendar-month')['default']
+    MdiCancel: typeof import('~icons/mdi/cancel')['default']
     MdiCardsHeart: typeof import('~icons/mdi/cards-heart')['default']
     MdiCellphoneMessage: typeof import('~icons/mdi/cellphone-message')['default']
     MdiChat: typeof import('~icons/mdi/chat')['default']
@@ -143,6 +145,7 @@ declare module '@vue/runtime-core' {
     MdiCommentTextOutline: typeof import('~icons/mdi/comment-text-outline')['default']
     MdiContentCopy: typeof import('~icons/mdi/content-copy')['default']
     MdiContentSave: typeof import('~icons/mdi/content-save')['default']
+    MdiContentSaveEdit: typeof import('~icons/mdi/content-save-edit')['default']
     MdiCurrencyUsd: typeof import('~icons/mdi/currency-usd')['default']
     MdiDatabaseOutline: typeof import('~icons/mdi/database-outline')['default']
     MdiDatabaseSync: typeof import('~icons/mdi/database-sync')['default']

From f9250b7c95c1125585d9b6c89db25ffae1bf6080 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 19 Nov 2022 19:13:28 +0800
Subject: [PATCH 04/16] feat(nc-gui): add save and exit / stay logic

---
 .../smartsheet/expanded-form/Header.vue       | 42 ++++++++++++++++---
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
index 8519599e32..9e67e7fb98 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
@@ -25,6 +25,8 @@ const { isUIAllowed } = useUIPermission()
 
 const reloadTrigger = inject(ReloadRowDataHookInj, createEventHook())
 
+const saveRowAndStay = ref(0)
+
 const save = async () => {
   if (isNew.value) {
     const data = await _save(state.value)
@@ -34,6 +36,9 @@ const save = async () => {
     await _save()
     reloadTrigger?.trigger()
   }
+  if (!saveRowAndStay.value) {
+    emit('cancel')
+  }
 }
 
 // todo: accept as a prop / inject
@@ -101,14 +106,39 @@ const copyRecordUrl = () => {
     </a-tooltip>
 
     <a-button class="!text mx-1 nc-expand-form-close-btn" @click="emit('cancel')">
-      <!-- Cancel -->
-      {{ $t('general.cancel') }}
+      <div class="flex items-center">
+        <MdiCancel class="mr-1" />
+        <!-- Cancel -->
+        {{ $t('general.cancel') }}
+      </div>
     </a-button>
 
-    <a-button :disabled="!isUIAllowed('tableRowUpdate')" type="primary" class="mx-1" @click="save">
-      <!-- Save Row -->
-      {{ $t('activity.saveRow') }}
-    </a-button>
+    <a-dropdown-button type="primary" :disabled="!isUIAllowed('tableRowUpdate')" @click="save">
+      <template #overlay>
+        <a-menu>
+          <a-menu-item key="0" class="!py-2 flex gap-2" @click="saveRowAndStay = 0">
+            <div class="flex items-center">
+              <MdiContentSave class="mr-1" />
+              {{ $t('activity.saveAndExit') }}
+            </div>
+          </a-menu-item>
+          <a-menu-item key="1" class="!py-2 flex gap-2 items-center" @click="saveRowAndStay = 1">
+            <div class="flex items-center">
+              <MdiContentSaveEdit class="mr-1" />
+              {{ $t('activity.saveAndStay') }}
+            </div>
+          </a-menu-item>
+        </a-menu>
+      </template>
+      <div v-if="saveRowAndStay === 0" class="flex items-center">
+        <MdiContentSave class="mr-1" />
+        {{ $t('activity.saveAndExit') }}
+      </div>
+      <div v-if="saveRowAndStay === 1" class="flex items-center">
+        <MdiContentSaveEdit class="mr-1" />
+        {{ $t('activity.saveAndStay') }}
+      </div>
+    </a-dropdown-button>
   </div>
 </template>
 

From 6e153b7bfcf9ece5a1702016f19563d7411de9a3 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 19 Nov 2022 23:18:01 +0800
Subject: [PATCH 05/16] test(playwright): update Save Row button text

---
 tests/playwright/pages/Dashboard/ExpandedForm/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/ExpandedForm/index.ts b/tests/playwright/pages/Dashboard/ExpandedForm/index.ts
index 22dc0bfe03..df73b29a4a 100644
--- a/tests/playwright/pages/Dashboard/ExpandedForm/index.ts
+++ b/tests/playwright/pages/Dashboard/ExpandedForm/index.ts
@@ -57,7 +57,7 @@ export class ExpandedFormPage extends BasePage {
   }: {
     waitForRowsData?: boolean;
   } = {}) {
-    const saveRowAction = this.get().locator('button:has-text("Save Row")').click();
+    const saveRowAction = this.get().locator('button:has-text("Save & Exit")').click();
     if (waitForRowsData) {
       await this.waitForResponse({
         uiAction: saveRowAction,
@@ -104,9 +104,9 @@ export class ExpandedFormPage extends BasePage {
 
   async validateRoleAccess(param: { role: string }) {
     if (param.role === 'commenter' || param.role === 'viewer') {
-      await expect(await this.get().locator('button:has-text("Save Row")')).toBeDisabled();
+      await expect(await this.get().locator('button:has-text("Save & Exit")')).toBeDisabled();
     } else {
-      await expect(await this.get().locator('button:has-text("Save Row")')).toBeEnabled();
+      await expect(await this.get().locator('button:has-text("Save & Exit")')).toBeEnabled();
     }
     if (param.role === 'viewer') {
       await expect(await this.toggleCommentsButton).toHaveCount(0);

From 874a3f122ba5206973f1ad6b20bcfad88a12c534 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sun, 20 Nov 2022 09:57:35 +0800
Subject: [PATCH 06/16] feat(nc-gui): rename cancel button to close

---
 .../nc-gui/components/smartsheet/expanded-form/Header.vue   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
index 9e67e7fb98..0517ee6c54 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
@@ -107,9 +107,9 @@ const copyRecordUrl = () => {
 
     <a-button class="!text mx-1 nc-expand-form-close-btn" @click="emit('cancel')">
       <div class="flex items-center">
-        <MdiCancel class="mr-1" />
-        <!-- Cancel -->
-        {{ $t('general.cancel') }}
+        <MdiCloseCircleOutline class="mr-1" />
+        <!-- Close -->
+        {{ $t('general.close') }}
       </div>
     </a-button>
 

From d1aaef0a6aaceeec621b410af6fefca72a6ceebd Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 21 Nov 2022 11:42:15 +0800
Subject: [PATCH 07/16] feat(nc-gui): add classes for playwright

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

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
index 0517ee6c54..5141bc8313 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
@@ -113,9 +113,9 @@ const copyRecordUrl = () => {
       </div>
     </a-button>
 
-    <a-dropdown-button type="primary" :disabled="!isUIAllowed('tableRowUpdate')" @click="save">
+    <a-dropdown-button class="nc-expand-form-save-btn" type="primary" :disabled="!isUIAllowed('tableRowUpdate')" @click="save">
       <template #overlay>
-        <a-menu>
+        <a-menu class="nc-expand-form-save-dropdown-menu">
           <a-menu-item key="0" class="!py-2 flex gap-2" @click="saveRowAndStay = 0">
             <div class="flex items-center">
               <MdiContentSave class="mr-1" />

From 5936a2042c98a007ab5a14e5f0819adbe0eca4b5 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 21 Nov 2022 11:43:09 +0800
Subject: [PATCH 08/16] feat(playwright): add saveAndExitMode logic in expanded
 form

---
 .../pages/Dashboard/ExpandedForm/index.ts      | 18 ++++++++++++++++--
 .../tests/tableColumnOperation.spec.ts         | 14 +++++++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/ExpandedForm/index.ts b/tests/playwright/pages/Dashboard/ExpandedForm/index.ts
index df73b29a4a..c5039f86d8 100644
--- a/tests/playwright/pages/Dashboard/ExpandedForm/index.ts
+++ b/tests/playwright/pages/Dashboard/ExpandedForm/index.ts
@@ -54,10 +54,21 @@ export class ExpandedFormPage extends BasePage {
 
   async save({
     waitForRowsData = true,
+    saveAndExitMode = true,
   }: {
     waitForRowsData?: boolean;
+    saveAndExitMode?: boolean;
   } = {}) {
-    const saveRowAction = this.get().locator('button:has-text("Save & Exit")').click();
+    if (!saveAndExitMode) {
+      await this.get().locator('.nc-expand-form-save-btn .ant-dropdown-trigger').click();
+      const dropdownList = this.rootPage.locator('.nc-expand-form-save-dropdown-menu');
+      await dropdownList.locator('.ant-dropdown-menu-item:has-text("Save & Stay")').click();
+    }
+
+    const saveRowAction = saveAndExitMode
+      ? this.get().locator('button:has-text("Save & Exit")').click()
+      : this.get().locator('button:has-text("Save & Stay")').click();
+
     if (waitForRowsData) {
       await this.waitForResponse({
         uiAction: saveRowAction,
@@ -73,7 +84,10 @@ export class ExpandedFormPage extends BasePage {
       });
     }
 
-    await this.get().press('Escape');
+    if (!saveAndExitMode) {
+      await this.get().press('Escape');
+    }
+
     await this.get().waitFor({ state: 'hidden' });
     await this.verifyToast({ message: `updated successfully.` });
     await this.rootPage.locator('[data-testid="grid-load-spinner"]').waitFor({ state: 'hidden' });
diff --git a/tests/playwright/tests/tableColumnOperation.spec.ts b/tests/playwright/tests/tableColumnOperation.spec.ts
index 6c921d3b6b..8042af8ebe 100644
--- a/tests/playwright/tests/tableColumnOperation.spec.ts
+++ b/tests/playwright/tests/tableColumnOperation.spec.ts
@@ -36,13 +36,25 @@ test.describe('Table Column Operations', () => {
       columnTitle: 'Title',
       value: 'value_a',
     });
-    await dashboard.expandedForm.save();
+    await dashboard.expandedForm.save({ saveAndExitMode: true });
     await grid.cell.verify({
       index: 0,
       columnHeader: 'Title',
       value: 'value_a',
     });
 
+    await grid.openExpandedRow({ index: 0 });
+    await dashboard.expandedForm.fillField({
+      columnTitle: 'Title',
+      value: 'value_a_a',
+    });
+    await dashboard.expandedForm.save({ saveAndExitMode: false });
+    await grid.cell.verify({
+      index: 0,
+      columnHeader: 'Title',
+      value: 'value_a_a',
+    });
+
     await grid.deleteRow(0);
     await grid.verifyRowDoesNotExist({ index: 0 });
 

From 75a15735f9cc4af89b612ae58d7b61157299e1a1 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 21 Nov 2022 12:43:46 +0800
Subject: [PATCH 09/16] fix(playwright): change close to escape and cancel to
 close

---
 tests/playwright/pages/Dashboard/ExpandedForm/index.ts |  6 +++---
 tests/playwright/tests/expandedFormUrl.spec.ts         | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/ExpandedForm/index.ts b/tests/playwright/pages/Dashboard/ExpandedForm/index.ts
index c5039f86d8..05ba80d9c7 100644
--- a/tests/playwright/pages/Dashboard/ExpandedForm/index.ts
+++ b/tests/playwright/pages/Dashboard/ExpandedForm/index.ts
@@ -98,13 +98,13 @@ export class ExpandedFormPage extends BasePage {
     await expect.poll(() => this.rootPage.url()).toContain(url);
   }
 
-  async close() {
+  async escape() {
     await this.rootPage.keyboard.press('Escape');
     await this.get().waitFor({ state: 'hidden' });
   }
 
-  async cancel() {
-    await this.get().locator('button:has-text("Cancel")').last().click();
+  async close() {
+    await this.get().locator('button:has-text("Close")').last().click();
   }
 
   async openChildCard(param: { column: string; title: string }) {
diff --git a/tests/playwright/tests/expandedFormUrl.spec.ts b/tests/playwright/tests/expandedFormUrl.spec.ts
index e8e9d61e8a..8195920eca 100644
--- a/tests/playwright/tests/expandedFormUrl.spec.ts
+++ b/tests/playwright/tests/expandedFormUrl.spec.ts
@@ -37,7 +37,7 @@ test.describe('Expanded form URL', () => {
     // expand row & verify URL
     await viewObj.openExpandedRow({ index: 0 });
     const url = await dashboard.expandedForm.getShareRowUrl();
-    await dashboard.expandedForm.close();
+    await dashboard.expandedForm.escape();
     await dashboard.rootPage.goto(url);
 
     await dashboard.expandedForm.verify({
@@ -81,13 +81,13 @@ test.describe('Expanded form URL', () => {
     // expect(expandedFormUrl).toContain("rowId=1");
 
     // access a new rowID using URL
-    await dashboard.expandedForm.close();
+    await dashboard.expandedForm.escape();
     await dashboard.expandedForm.gotoUsingUrlAndRowId({ rowId: '2' });
     await dashboard.expandedForm.verify({
       header: 'Algeria',
       url: 'rowId=2',
     });
-    await dashboard.expandedForm.close();
+    await dashboard.expandedForm.escape();
 
     // visit invalid rowID
     await dashboard.expandedForm.gotoUsingUrlAndRowId({ rowId: '999' });
@@ -114,12 +114,12 @@ test.describe('Expanded form URL', () => {
     await dashboard.expandedForm.verifyCount({ count: 2 });
 
     // close child card
-    await dashboard.expandedForm.cancel();
+    await dashboard.expandedForm.close();
     await dashboard.expandedForm.verify({
       header: 'Afghanistan',
       url: 'rowId=1',
     });
-    await dashboard.expandedForm.cancel();
+    await dashboard.expandedForm.close();
   }
 
   test('Grid', async () => {

From e074b6338e8170e6bb28247d534173b4ecf5c44c Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 16 Nov 2022 15:14:54 +0530
Subject: [PATCH 10/16] fix(gui): avoid rendering cell component while
 switching tab

- to avoid passing wrong(previous tabs data) data to cell

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/smartsheet/Grid.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 5dd1569e1c..03fe973f6e 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -521,11 +521,14 @@ provide(ReloadRowDataHookInj, reloadViewDataHook)
 // trigger initial data load in grid
 // reloadViewDataHook.trigger()
 
+const switchingTab = ref(false)
+
 watch(
   view,
   async (next, old) => {
     try {
       if (next && next.id !== old?.id) {
+        switchingTab.value = true
         // whenever tab changes or view changes save any unsaved data
         if (old?.id) {
           const oldMeta = await getMeta(old.fk_model_id!)
@@ -541,6 +544,8 @@ watch(
       }
     } catch (e) {
       console.log(e)
+    } finally {
+      switchingTab.value = false
     }
   },
   { immediate: true },
@@ -707,7 +712,7 @@ watch(
                     @mouseover="selectBlock(rowIndex, colIndex)"
                     @contextmenu="showContextMenu($event, { row: rowIndex, col: colIndex })"
                   >
-                    <div class="w-full h-full">
+                    <div class="w-full h-full" v-if="!switchingTab">
                       <LazySmartsheetVirtualCell
                         v-if="isVirtualCol(columnObj)"
                         v-model="row.row[columnObj.title]"

From 3b3d842ba1bc953e9e77504ebd6ab066bfdcc276 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 21 Nov 2022 22:15:29 +0530
Subject: [PATCH 11/16] fix: focus percentage input on enter key press and on
 enter key press save and navigate to next row

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/cell/Percent.vue    | 7 +++++++
 packages/nc-gui/components/smartsheet/Cell.vue | 1 -
 packages/nc-gui/components/smartsheet/Grid.vue | 3 +--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/cell/Percent.vue b/packages/nc-gui/components/cell/Percent.vue
index 04bbfe2dcf..9ce099db23 100644
--- a/packages/nc-gui/components/cell/Percent.vue
+++ b/packages/nc-gui/components/cell/Percent.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { EditModeInj, inject, useVModel } from '#imports'
+import { VNodeRef } from '@vue/runtime-core'
 
 interface Props {
   modelValue?: number | string | null
@@ -12,15 +13,21 @@ const emits = defineEmits(['update:modelValue'])
 const editEnabled = inject(EditModeInj)
 
 const vModel = useVModel(props, 'modelValue', emits)
+
+const focus: VNodeRef = (el) => {
+  ;(el as HTMLInputElement)?.focus()
+}
 </script>
 
 <template>
   <input
+    :ref="focus"
     v-if="editEnabled"
     v-model="vModel"
     class="w-full !border-none text-base"
     :class="{ '!px-2': editEnabled }"
     type="number"
+    @blur="editEnabled = false"
     @keydown.down.stop
     @keydown.left.stop
     @keydown.right.stop
diff --git a/packages/nc-gui/components/smartsheet/Cell.vue b/packages/nc-gui/components/smartsheet/Cell.vue
index 92eb352933..95f3c682e4 100644
--- a/packages/nc-gui/components/smartsheet/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/Cell.vue
@@ -111,7 +111,6 @@ const vModel = computed({
 })
 
 const syncAndNavigate = (dir: NavigateDir, e: KeyboardEvent) => {
-  console.log('syncAndNavigate', e.target)
   if (isJSON(column.value)) return
 
   if (currentRow.value.rowMeta.changed || currentRow.value.rowMeta.new) {
diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 5dd1569e1c..cab806d55d 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -423,6 +423,7 @@ onClickOutside(smartTable, (e) => {
 
 const onNavigate = (dir: NavigateDir) => {
   if (selected.row === null || selected.col === null) return
+  editEnabled = false
   switch (dir) {
     case NavigateDir.NEXT:
       if (selected.row < data.value.length - 1) {
@@ -435,8 +436,6 @@ const onNavigate = (dir: NavigateDir) => {
     case NavigateDir.PREV:
       if (selected.row > 0) {
         selected.row--
-      } else {
-        editEnabled = false
       }
       break
   }

From 183e596b212379fb8b39a93ddc54ed80ab45b709 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 22 Nov 2022 00:53:45 +0530
Subject: [PATCH 12/16] fix: pass table alias when renaming

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/dlg/TableRename.vue | 1 +
 packages/nocodb-sdk/src/lib/Api.ts             | 1 +
 scripts/sdk/swagger.json                       | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/packages/nc-gui/components/dlg/TableRename.vue b/packages/nc-gui/components/dlg/TableRename.vue
index e2f6f86bad..3c18db606c 100644
--- a/packages/nc-gui/components/dlg/TableRename.vue
+++ b/packages/nc-gui/components/dlg/TableRename.vue
@@ -119,6 +119,7 @@ const renameTable = async () => {
     await $api.dbTable.update(tableMeta.id as string, {
       project_id: tableMeta.project_id,
       table_name: formState.title,
+      title: formState.title,
     })
 
     dialogShow.value = false
diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index 495d7ca56c..8388bb2f4e 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -1950,6 +1950,7 @@ export class Api<
       tableId: string,
       data: {
         table_name?: string;
+        title?: string;
         project_id?: string;
       },
       params: RequestParams = {}
diff --git a/scripts/sdk/swagger.json b/scripts/sdk/swagger.json
index cfe2c4cd86..5116c33b62 100644
--- a/scripts/sdk/swagger.json
+++ b/scripts/sdk/swagger.json
@@ -1703,6 +1703,9 @@
                   "table_name": {
                     "type": "string"
                   },
+                  "title": {
+                    "type": "string"
+                  },
                   "project_id": {
                     "type": "string"
                   }

From a7b6790a9f87395b3e73adc8c5df94756a684f07 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 22 Nov 2022 00:56:26 +0530
Subject: [PATCH 13/16] refactor: set default inflection to none

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/pages/index/index/create-external.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/pages/index/index/create-external.vue b/packages/nc-gui/pages/index/index/create-external.vue
index d45dddecde..fe726570ca 100644
--- a/packages/nc-gui/pages/index/index/create-external.vue
+++ b/packages/nc-gui/pages/index/index/create-external.vue
@@ -46,8 +46,8 @@ let formState = $ref<ProjectCreateForm>({
   title: '',
   dataSource: { ...getDefaultConnectionConfig(ClientType.MYSQL) },
   inflection: {
-    inflectionColumn: 'camelize',
-    inflectionTable: 'camelize',
+    inflectionColumn: 'none',
+    inflectionTable: 'none',
   },
   sslUse: SSLUsage.No,
   extraParameters: [],
@@ -57,8 +57,8 @@ const customFormState = ref<ProjectCreateForm>({
   title: '',
   dataSource: { ...getDefaultConnectionConfig(ClientType.MYSQL) },
   inflection: {
-    inflectionColumn: 'camelize',
-    inflectionTable: 'camelize',
+    inflectionColumn: 'none',
+    inflectionTable: 'none',
   },
   sslUse: SSLUsage.No,
   extraParameters: [],

From db0db46a5d8ca07f6c8b02cb9b15edbdee6565ab Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 22 Nov 2022 12:24:35 +0800
Subject: [PATCH 14/16] fix(nc-gui):  return loadGalleryData if it is public

---
 packages/nc-gui/composables/useViewData.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts
index 7b25a42123..e8cfce4a2c 100644
--- a/packages/nc-gui/composables/useViewData.ts
+++ b/packages/nc-gui/composables/useViewData.ts
@@ -203,8 +203,7 @@ export function useViewData(
   }
 
   async function loadGalleryData() {
-    if (!viewMeta?.value?.id) return
-
+    if (!viewMeta?.value?.id || isPublic.value) return
     galleryData.value = await $api.dbView.galleryRead(viewMeta.value.id)
   }
 

From 19f8fd61fa6976d529db80a7f6d7a78a167ce6b6 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 22 Nov 2022 12:25:15 +0800
Subject: [PATCH 15/16] fix(nc-gui): trigger useKanbanViewStoreOrThrow only in
 kanban view

---
 packages/nc-gui/composables/useExpandedFormStore.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/nc-gui/composables/useExpandedFormStore.ts b/packages/nc-gui/composables/useExpandedFormStore.ts
index fe528de320..90a9dff500 100644
--- a/packages/nc-gui/composables/useExpandedFormStore.ts
+++ b/packages/nc-gui/composables/useExpandedFormStore.ts
@@ -46,8 +46,6 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
 
   const activeView = inject(ActiveViewInj, ref())
 
-  const { addOrEditStackRow } = useKanbanViewStoreOrThrow()
-
   const { sharedView } = useSharedView()
 
   // getters
@@ -197,6 +195,7 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
       }
 
       if (activeView.value?.type === ViewTypes.KANBAN) {
+        const { addOrEditStackRow } = useKanbanViewStoreOrThrow()
         addOrEditStackRow(row.value, isNewRow)
       }
 

From eedea07beaca9ed0ec8410f37850b09d5b392999 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 22 Nov 2022 13:32:22 +0800
Subject: [PATCH 16/16] chore(nc-gui): lint

---
 packages/nc-gui/components/cell/Percent.vue    | 4 ++--
 packages/nc-gui/components/smartsheet/Grid.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/cell/Percent.vue b/packages/nc-gui/components/cell/Percent.vue
index 9ce099db23..641f00890f 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 { EditModeInj, inject, useVModel } from '#imports'
-import { VNodeRef } from '@vue/runtime-core'
 
 interface Props {
   modelValue?: number | string | null
@@ -21,8 +21,8 @@ const focus: VNodeRef = (el) => {
 
 <template>
   <input
-    :ref="focus"
     v-if="editEnabled"
+    :ref="focus"
     v-model="vModel"
     class="w-full !border-none text-base"
     :class="{ '!px-2': editEnabled }"
diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index cd0a7da2b7..d007bfb074 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -711,7 +711,7 @@ watch(
                     @mouseover="selectBlock(rowIndex, colIndex)"
                     @contextmenu="showContextMenu($event, { row: rowIndex, col: colIndex })"
                   >
-                    <div class="w-full h-full" v-if="!switchingTab">
+                    <div v-if="!switchingTab" class="w-full h-full">
                       <LazySmartsheetVirtualCell
                         v-if="isVirtualCol(columnObj)"
                         v-model="row.row[columnObj.title]"