From 52c3372ef952d57bd09e8d44665f8c730c17c6c8 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Thu, 11 Aug 2022 14:59:19 +0200
Subject: [PATCH 1/6] fix(gui-v2): abort renaming view on failed validation

---
 packages/nc-gui-v2/components/smartsheet/sidebar/MenuTop.vue  | 4 +++-
 .../components/smartsheet/sidebar/RenameableMenuItem.vue      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet/sidebar/MenuTop.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/MenuTop.vue
index 411dce49dc..d207685fc1 100644
--- a/packages/nc-gui-v2/components/smartsheet/sidebar/MenuTop.vue
+++ b/packages/nc-gui-v2/components/smartsheet/sidebar/MenuTop.vue
@@ -148,12 +148,14 @@ async function onRename(view: ViewType) {
       message: valid,
       duration: 2,
     })
+
+    return
   }
 
   try {
     await api.dbView.update(view.id!, {
       title: view.title,
-      order: view.order,
+      order: String(view.order),
     })
 
     notification.success({
diff --git a/packages/nc-gui-v2/components/smartsheet/sidebar/RenameableMenuItem.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/RenameableMenuItem.vue
index d28ad94026..32db58713a 100644
--- a/packages/nc-gui-v2/components/smartsheet/sidebar/RenameableMenuItem.vue
+++ b/packages/nc-gui-v2/components/smartsheet/sidebar/RenameableMenuItem.vue
@@ -8,11 +8,11 @@ interface Props {
 }
 
 interface Emits {
-  (event: 'openModal', data: { type: ViewTypes; title?: string }): void
   (event: 'update:view', data: Record<string, any>): void
   (event: 'changeView', view: Record<string, any>): void
   (event: 'rename', view: Record<string, any>): void
   (event: 'delete', view: Record<string, any>): void
+  (event: 'openModal', data: { type: ViewTypes; title?: string; copyViewId?: string }): void
 }
 
 const props = defineProps<Props>()

From 3ea6f02d5655b4b182b6b2772efa23871a996d8c Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Thu, 11 Aug 2022 15:01:12 +0200
Subject: [PATCH 2/6] chore(gui-v2): make `required` prop optional in Cell.vue

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

diff --git a/packages/nc-gui-v2/components/smartsheet-header/Cell.vue b/packages/nc-gui-v2/components/smartsheet-header/Cell.vue
index 8585a49221..e5d32acd1e 100644
--- a/packages/nc-gui-v2/components/smartsheet-header/Cell.vue
+++ b/packages/nc-gui-v2/components/smartsheet-header/Cell.vue
@@ -5,7 +5,7 @@ import { inject, toRef } from 'vue'
 import { ColumnInj, IsFormInj, MetaInj } from '~/context'
 import { useProvideColumnCreateStore } from '#imports'
 
-const props = defineProps<{ column: ColumnType & { meta: any }; required: boolean; hideMenu?: boolean }>()
+const props = defineProps<{ column: ColumnType & { meta: any }; required?: boolean; hideMenu?: boolean }>()
 
 const hideMenu = toRef(props, 'hideMenu')
 

From 5c6fa6aacbe5e45f4ce7f8ff3e4a279f38e6c024 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Thu, 11 Aug 2022 15:17:33 +0200
Subject: [PATCH 3/6] fix(gui-v2): pass validation cb to `RenameableMenuItem`
 and validate before rename event

---
 .../components/smartsheet/sidebar/MenuTop.vue  | 18 ++++--------------
 .../smartsheet/sidebar/RenameableMenuItem.vue  | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet/sidebar/MenuTop.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/MenuTop.vue
index d207685fc1..0d60374ebe 100644
--- a/packages/nc-gui-v2/components/smartsheet/sidebar/MenuTop.vue
+++ b/packages/nc-gui-v2/components/smartsheet/sidebar/MenuTop.vue
@@ -61,12 +61,12 @@ function markItem(id: string) {
 }
 
 /** validate view title */
-function validate(value?: string) {
-  if (!value || value.trim().length < 0) {
+function validate(view: Record<string, any>) {
+  if (!view.title || view.title.trim().length < 0) {
     return 'View name is required'
   }
 
-  if (views.value.every((v1) => v1.title !== value)) {
+  if (views.value.some((v) => v.title === view.title && v.id !== view.id)) {
     return 'View name should be unique'
   }
 
@@ -141,17 +141,6 @@ function changeView(view: { id: string; alias?: string; title?: string; type: Vi
 
 /** Rename a view */
 async function onRename(view: ViewType) {
-  const valid = validate(view.title)
-
-  if (valid !== true) {
-    notification.error({
-      message: valid,
-      duration: 2,
-    })
-
-    return
-  }
-
   try {
     await api.dbView.update(view.id!, {
       title: view.title,
@@ -195,6 +184,7 @@ function onDeleted() {
       :id="view.id"
       :key="view.id"
       :view="view"
+      :on-validate="validate"
       class="transition-all ease-in duration-300"
       :class="[
         isMarked === view.id ? 'bg-gray-200' : '',
diff --git a/packages/nc-gui-v2/components/smartsheet/sidebar/RenameableMenuItem.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/RenameableMenuItem.vue
index 32db58713a..1e9186be49 100644
--- a/packages/nc-gui-v2/components/smartsheet/sidebar/RenameableMenuItem.vue
+++ b/packages/nc-gui-v2/components/smartsheet/sidebar/RenameableMenuItem.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup>
 import type { ViewTypes } from 'nocodb-sdk'
+import { notification } from 'ant-design-vue'
 import { viewIcons } from '~/utils'
-import { useDebounceFn, useNuxtApp, useVModel } from '#imports'
+import { onKeyStroke, useDebounceFn, useNuxtApp, useVModel } from '#imports'
 
 interface Props {
   view: Record<string, any>
+  onValidate: (view: Record<string, any>) => boolean | string
 }
 
 interface Emits {
@@ -99,6 +101,18 @@ async function onDelete() {
 async function onRename() {
   if (!isEditing) return
 
+  const isValid = props.onValidate(vModel.value)
+
+  if (isValid !== true) {
+    notification.error({
+      message: isValid,
+      duration: 2,
+    })
+
+    onCancel()
+    return
+  }
+
   if (vModel.value.title === '' || vModel.value.title === originalTitle) {
     onCancel()
     return

From 41f509ebfd267f87029125870be20ac522d0edd8 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 11 Aug 2022 23:58:58 +0530
Subject: [PATCH 4/6] fix(gui-v2): close timepicker on outside click

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui-v2/components/cell/TimePicker.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui-v2/components/cell/TimePicker.vue b/packages/nc-gui-v2/components/cell/TimePicker.vue
index 09763085f2..65a50421cc 100644
--- a/packages/nc-gui-v2/components/cell/TimePicker.vue
+++ b/packages/nc-gui-v2/components/cell/TimePicker.vue
@@ -79,7 +79,7 @@ watch(
     :allow-clear="!readOnlyMode"
     :input-read-only="true"
     :open="readOnlyMode ? false : open"
-    :dropdown-class-name="randomClass"
+    :popup-class-name="randomClass"
     @click="open = !open"
     @ok="open = !open"
   >

From 44e8d82cdd8d53c33b8b74f196972e2418cb6cd5 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Fri, 12 Aug 2022 09:41:53 +0530
Subject: [PATCH 5/6] fix: i18n update (database)

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 packages/nc-gui-v2/lang/en.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui-v2/lang/en.json b/packages/nc-gui-v2/lang/en.json
index fcac603a2e..2618f2af58 100644
--- a/packages/nc-gui-v2/lang/en.json
+++ b/packages/nc-gui-v2/lang/en.json
@@ -194,6 +194,7 @@
     "username": "Username",
     "password": "Password",
     "schemaName": "Schema name",
+    "database": "Database",
     "action": "Action",
     "actions": "Actions",
     "operation": "Operation",

From c3e19f370205935127cf548a075b2f0e453d167b Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 12 Aug 2022 13:30:14 +0800
Subject: [PATCH 6/6] chore(gui-v2): lint

---
 .../nc-gui-v2/components/dashboard/TreeView.vue |  6 +++++-
 .../components/dashboard/settings/Metadata.vue  |  2 +-
 .../nc-gui-v2/components/smartsheet/Toolbar.vue |  4 +---
 .../components/tabs/auth/UserManagement.vue     |  4 ++--
 .../nc-gui-v2/components/webhook/Drawer.vue     | 17 +++++++++++------
 .../nc-gui-v2/components/webhook/Editor.vue     |  1 -
 6 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/packages/nc-gui-v2/components/dashboard/TreeView.vue b/packages/nc-gui-v2/components/dashboard/TreeView.vue
index cae59b41eb..90f2fbe3cd 100644
--- a/packages/nc-gui-v2/components/dashboard/TreeView.vue
+++ b/packages/nc-gui-v2/components/dashboard/TreeView.vue
@@ -170,7 +170,11 @@ const activeTable = computed(() => {
           />
         </div>
         <div style="direction: ltr" class="flex-1">
-          <div v-if="tables.length" class="transition-height duration-200 overflow-hidden" :class="{ 'h-100': showTableList, 'h-0': !showTableList }">
+          <div
+            v-if="tables.length"
+            class="transition-height duration-200 overflow-hidden"
+            :class="{ 'h-100': showTableList, 'h-0': !showTableList }"
+          >
             <div :key="key" ref="menuRef" class="border-none sortable-list">
               <div
                 v-for="table of tables"
diff --git a/packages/nc-gui-v2/components/dashboard/settings/Metadata.vue b/packages/nc-gui-v2/components/dashboard/settings/Metadata.vue
index 18055feeda..215ead1339 100644
--- a/packages/nc-gui-v2/components/dashboard/settings/Metadata.vue
+++ b/packages/nc-gui-v2/components/dashboard/settings/Metadata.vue
@@ -117,4 +117,4 @@ const columns = [
       </div>
     </div>
   </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/packages/nc-gui-v2/components/smartsheet/Toolbar.vue b/packages/nc-gui-v2/components/smartsheet/Toolbar.vue
index 5030b9b25d..c51d082e4a 100644
--- a/packages/nc-gui-v2/components/smartsheet/Toolbar.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Toolbar.vue
@@ -6,8 +6,7 @@ const { isGrid, isForm } = useSmartsheetStoreOrThrow()
 
 <template>
   <div class="nc-table-toolbar w-full py-1 flex gap-1 items-center h-[48px] px-2" style="z-index: 7">
-
-    <SmartsheetToolbarFieldsMenu v-if="isGrid" :show-system-fields="false" class="ml-1"/>
+    <SmartsheetToolbarFieldsMenu v-if="isGrid" :show-system-fields="false" class="ml-1" />
 
     <SmartsheetToolbarColumnFilterMenu v-if="isGrid" />
 
@@ -19,7 +18,6 @@ const { isGrid, isForm } = useSmartsheetStoreOrThrow()
 
     <SmartsheetToolbarSearchData v-if="isGrid" class="shrink ml-2" />
 
-
     <div class="flex-1" />
   </div>
 </template>
diff --git a/packages/nc-gui-v2/components/tabs/auth/UserManagement.vue b/packages/nc-gui-v2/components/tabs/auth/UserManagement.vue
index a549ccbbb2..354a662e87 100644
--- a/packages/nc-gui-v2/components/tabs/auth/UserManagement.vue
+++ b/packages/nc-gui-v2/components/tabs/auth/UserManagement.vue
@@ -256,7 +256,7 @@ watchDebounced(searchText, () => loadUsers(), { debounce: 300, maxWait: 600 })
             </template>
             <a-button type="text" class="!rounded-md" @click="onDelete(user)">
               <template #icon>
-                <MdiDeleteOutlineIcon class="flex mx-auto h-[1.1rem] text-gray-500 " />
+                <MdiDeleteOutlineIcon class="flex mx-auto h-[1.1rem] text-gray-500" />
               </template>
             </a-button>
           </a-tooltip>
@@ -279,7 +279,7 @@ watchDebounced(searchText, () => loadUsers(), { debounce: 300, maxWait: 600 })
                 </a-menu-item>
                 <a-menu-item>
                   <div class="flex flex-row items-center py-1" @click="copyInviteUrl(user)">
-                    <MdiContentCopyIcon class="flex h-[1rem] text-gray-500"  />
+                    <MdiContentCopyIcon class="flex h-[1rem] text-gray-500" />
                     <div class="text-xs pl-2">{{ $t('activity.copyInviteURL') }}</div>
                   </div>
                 </a-menu-item>
diff --git a/packages/nc-gui-v2/components/webhook/Drawer.vue b/packages/nc-gui-v2/components/webhook/Drawer.vue
index 47f7458c0e..45fdd7d580 100644
--- a/packages/nc-gui-v2/components/webhook/Drawer.vue
+++ b/packages/nc-gui-v2/components/webhook/Drawer.vue
@@ -23,12 +23,17 @@ async function editHook(hook: Record<string, any>) {
 </script>
 
 <template>
-  <a-drawer v-model:visible="vModel" :closable="false" placement="right" width="700px" @keydown.esc="vModel = false"
-            :body-style="{background:'rgba(67, 81, 232, 0.05)',padding:'50px'}">
-    <WebhookEditor v-if="editOrAdd" ref="webhookEditorRef" @back-to-list="editOrAdd = false"/>
-    <WebhookList v-else @edit="editHook" @add="editOrAdd = true"/>
-    <div
-        class="self-center flex flex-column flex-wrap gap-4 items-center mt-4 md:mx-8 md:justify-between justify-center">
+  <a-drawer
+    v-model:visible="vModel"
+    :closable="false"
+    placement="right"
+    width="700px"
+    :body-style="{ background: 'rgba(67, 81, 232, 0.05)', padding: '50px' }"
+    @keydown.esc="vModel = false"
+  >
+    <WebhookEditor v-if="editOrAdd" ref="webhookEditorRef" @back-to-list="editOrAdd = false" />
+    <WebhookList v-else @edit="editHook" @add="editOrAdd = true" />
+    <div class="self-center flex flex-column flex-wrap gap-4 items-center mt-4 md:mx-8 md:justify-between justify-center">
       <a-button v-t="['e:hiring']" href="https://angel.co/company/nocodb" target="_blank" size="large">
         🚀 We are Hiring! 🚀
       </a-button>
diff --git a/packages/nc-gui-v2/components/webhook/Editor.vue b/packages/nc-gui-v2/components/webhook/Editor.vue
index 6951a122ac..8c2940322a 100644
--- a/packages/nc-gui-v2/components/webhook/Editor.vue
+++ b/packages/nc-gui-v2/components/webhook/Editor.vue
@@ -490,7 +490,6 @@ onMounted(() => {
 
         <a-col :span="24">
           <a-tabs v-model:activeKey="urlTabKey" type="card" closeable="false" class="shadow-sm">
-
             <a-tab-pane key="body" tab="Body">
               <MonacoEditor v-model="hook.notification.payload.body" :validate="false" class="min-h-60 max-h-80" />
             </a-tab-pane>