From ab9b9fa8c4aabbdfb6752b15910476deb0cca8a3 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Tue, 26 Jul 2022 20:08:18 +0300
Subject: [PATCH 01/27] feat(gui-v2): project metadata

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../dashboard/settings/Metadata.vue           | 110 ++++++++++++++++++
 .../dashboard/settings/SettingsModal.vue      |   3 +-
 2 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 packages/nc-gui-v2/components/dashboard/settings/Metadata.vue

diff --git a/packages/nc-gui-v2/components/dashboard/settings/Metadata.vue b/packages/nc-gui-v2/components/dashboard/settings/Metadata.vue
new file mode 100644
index 0000000000..334bec0c80
--- /dev/null
+++ b/packages/nc-gui-v2/components/dashboard/settings/Metadata.vue
@@ -0,0 +1,110 @@
+<script setup lang="ts">
+import { useToast } from 'vue-toastification'
+import { h, useNuxtApp, useProject } from '#imports'
+import MdiReload from '~icons/mdi/reload'
+import MdiDatabaseSync from '~icons/mdi/database-sync'
+
+const { $api } = useNuxtApp()
+const { project } = useProject()
+const toast = useToast()
+
+let isLoading = $ref(false)
+let isDifferent = $ref(false)
+let metadiff = $ref<Array<any>>([])
+
+async function loadMetaDiff() {
+  try {
+    if (!project.value?.id) return
+    isLoading = true
+    isDifferent = false
+    metadiff = await $api.project.metaDiffGet(project.value?.id)
+    for (const model of metadiff) {
+      if (model.detectedChanges?.length > 0) {
+        model.syncState = model.detectedChanges.map((el: any) => el?.msg).join(', ')
+        isDifferent = true
+      }
+    }
+  } catch (e) {
+    console.error(e)
+  } finally {
+    isLoading = false
+  }
+}
+
+async function syncMetaDiff() {
+  try {
+    if (!project.value?.id || !isDifferent) return
+    isLoading = true
+    await $api.project.metaDiffSync(project.value.id)
+    toast.info(`Table metadata recreated successfully`)
+    await loadMetaDiff()
+  } catch (e: any) {
+    if (e.response?.status === 402) {
+      toast.info(e.message)
+    } else {
+      toast.error(e.message)
+    }
+  } finally {
+    isLoading = false
+  }
+}
+
+onMounted(async () => {
+  if (metadiff.length === 0) {
+    await loadMetaDiff()
+  }
+})
+
+const tableHeaderRenderer = (label: string) => () => h('div', { class: 'text-gray-500' }, label)
+
+const columns = [
+  {
+    title: tableHeaderRenderer('Models'),
+    dataIndex: 'title',
+    key: 'title',
+  },
+  {
+    title: tableHeaderRenderer('Sync State'),
+    dataIndex: 'syncState',
+    key: 'syncState',
+    customRender: (value: { text: string }) =>
+      h('div', { style: { color: value.text ? 'red' : 'gray' } }, value.text || 'No change identified'),
+  },
+]
+</script>
+
+<template>
+  <div class="flex flex-row w-full">
+    <div class="flex flex-column w-3/5">
+      <div class="flex flex-row justify-end items-center w-full mb-4">
+        <a-button class="self-start" @click="loadMetaDiff">
+          <div class="flex items-center gap-2 text-gray-600 font-light">
+            <MdiReload :class="{ 'animate-infinite animate-spin !text-success': isLoading }" />
+            Reload
+          </div>
+        </a-button>
+      </div>
+      <a-table
+        class="w-full"
+        :data-source="metadiff ?? []"
+        :columns="columns"
+        :pagination="false"
+        :loading="isLoading"
+        bordered
+      />
+    </div>
+    <div class="flex place-content-center w-2/5">
+      <div v-if="isDifferent">
+        <a-button v-t="['a:proj-meta:meta-data:sync']" type="primary" @click="syncMetaDiff">
+          <div class="flex items-center gap-2">
+            <MdiDatabaseSync />
+            Sync Now
+          </div>
+        </a-button>
+      </div>
+      <div v-else>
+        <span><a-alert message="Tables metadata is in sync" type="success" show-icon /></span>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/packages/nc-gui-v2/components/dashboard/settings/SettingsModal.vue b/packages/nc-gui-v2/components/dashboard/settings/SettingsModal.vue
index ddc82ef0cc..ccb6bd4974 100644
--- a/packages/nc-gui-v2/components/dashboard/settings/SettingsModal.vue
+++ b/packages/nc-gui-v2/components/dashboard/settings/SettingsModal.vue
@@ -2,6 +2,7 @@
 import type { FunctionalComponent, SVGAttributes } from 'vue'
 import AuditTab from './AuditTab.vue'
 import AppStore from './AppStore.vue'
+import Metadata from './Metadata.vue'
 import StoreFrontOutline from '~icons/mdi/storefront-outline'
 import TeamFillIcon from '~icons/ri/team-fill'
 import MultipleTableIcon from '~icons/mdi/table-multiple'
@@ -61,7 +62,7 @@ const tabsInfo: TabGroup = {
     subTabs: {
       metaData: {
         title: 'Metadata',
-        body: () => AuditTab,
+        body: () => Metadata,
       },
       acl: {
         title: 'UI Access Control',

From d3e11dafafc73981e58d6b91e7a264d5f22159d0 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Tue, 26 Jul 2022 20:08:30 +0300
Subject: [PATCH 02/27] feat(gui-v2): project UI ACL

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../dashboard/settings/SettingsModal.vue      |   3 +-
 .../components/dashboard/settings/UIAcl.vue   | 167 ++++++++++++++++++
 2 files changed, 169 insertions(+), 1 deletion(-)
 create mode 100644 packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue

diff --git a/packages/nc-gui-v2/components/dashboard/settings/SettingsModal.vue b/packages/nc-gui-v2/components/dashboard/settings/SettingsModal.vue
index ccb6bd4974..b3eb076fa7 100644
--- a/packages/nc-gui-v2/components/dashboard/settings/SettingsModal.vue
+++ b/packages/nc-gui-v2/components/dashboard/settings/SettingsModal.vue
@@ -3,6 +3,7 @@ import type { FunctionalComponent, SVGAttributes } from 'vue'
 import AuditTab from './AuditTab.vue'
 import AppStore from './AppStore.vue'
 import Metadata from './Metadata.vue'
+import UIAcl from './UIAcl.vue'
 import StoreFrontOutline from '~icons/mdi/storefront-outline'
 import TeamFillIcon from '~icons/ri/team-fill'
 import MultipleTableIcon from '~icons/mdi/table-multiple'
@@ -66,7 +67,7 @@ const tabsInfo: TabGroup = {
       },
       acl: {
         title: 'UI Access Control',
-        body: () => AuditTab,
+        body: () => UIAcl,
       },
     },
   },
diff --git a/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue b/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue
new file mode 100644
index 0000000000..7a2b5eeaea
--- /dev/null
+++ b/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue
@@ -0,0 +1,167 @@
+<script setup lang="ts">
+import { useToast } from 'vue-toastification'
+import { viewIcons } from '~/utils/viewUtils'
+import { h, useNuxtApp, useProject } from '#imports'
+import MdiReload from '~icons/mdi/reload'
+import MdiContentSave from '~icons/mdi/content-save'
+import MdiMagnify from '~icons/mdi/magnify'
+
+const { $api, $e } = useNuxtApp()
+const { project } = useProject()
+const toast = useToast()
+
+let isLoading = $ref(false)
+let tables = $ref<Array<any>>([])
+let searchInput = $ref<string>('')
+
+async function loadTableList() {
+  try {
+    if (!project.value?.id) return
+    isLoading = true
+    // TODO includeM2M
+    tables = await $api.project.modelVisibilityList(project.value?.id, {
+      includeM2M: '',
+    })
+  } catch (e) {
+    console.error(e)
+  } finally {
+    isLoading = false
+  }
+}
+
+async function saveUIAcl() {
+  try {
+    if (!project.value?.id) return
+    await $api.project.modelVisibilitySet(
+      project.value.id,
+      tables.filter((t) => t.edited),
+    )
+    toast.success('Updated UI ACL for tables successfully')
+  } catch (e: any) {
+    toast.error(e?.message)
+  }
+  $e('a:proj-meta:ui-acl')
+}
+
+onMounted(async () => {
+  if (tables.length === 0) {
+    await loadTableList()
+  }
+})
+
+const tableHeaderRenderer = (label: string) => () => h('div', { class: 'text-gray-500' }, label)
+
+const columns = [
+  {
+    title: tableHeaderRenderer('Table name'),
+    name: 'table_name',
+    onFilter: (value: string, record: any) => record._ptn.indexOf(value) === 0,
+  },
+  {
+    title: tableHeaderRenderer('View name'),
+    name: 'view_name',
+  },
+  {
+    // { icon: MdiGridIcon, color: 'blue' },
+    title: tableHeaderRenderer('Editor'),
+    name: 'editor',
+  },
+  {
+    title: tableHeaderRenderer('Commenter'),
+    name: 'commenter',
+  },
+  {
+    title: tableHeaderRenderer('Viewer'),
+    name: 'viewer',
+  },
+]
+</script>
+
+<template>
+  <div class="flex flex-row w-full">
+    <div class="flex flex-column w-full">
+      <div class="flex flex-row items-center w-full mb-4 gap-2">
+        <a-input v-model:value="searchInput" placeholder="Search models">
+          <template #prefix>
+            <MdiMagnify />
+          </template>
+        </a-input>
+        <a-button class="self-start" @click="loadTableList">
+          <div class="flex items-center gap-2 text-gray-600 font-light">
+            <MdiReload :class="{ 'animate-infinite animate-spin !text-success': isLoading }" />
+            Reload
+          </div>
+        </a-button>
+        <a-button class="self-start" @click="saveUIAcl">
+          <div class="flex items-center gap-2 text-gray-600 font-light">
+            <MdiContentSave />
+            Save
+          </div>
+        </a-button>
+      </div>
+      <a-table
+        class="w-full"
+        :data-source="
+          tables.filter(
+            (el) =>
+              (typeof el?._ptn === 'string' && el._ptn.toLowerCase().includes(searchInput.toLowerCase())) ||
+              (typeof el?.title === 'string' && el.title.toLowerCase().includes(searchInput.toLowerCase())),
+          )
+        "
+        :columns="columns"
+        :pagination="false"
+        :loading="isLoading"
+        bordered
+      >
+        <template #bodyCell="{ record, column }">
+          <div v-if="column.name === 'table_name'">{{ record._ptn }}</div>
+          <div v-if="column.name === 'view_name'">
+            <div class="flex align-center">
+              <component :is="viewIcons[record.type].icon" :class="`text-${viewIcons[record.type].color} mr-1`" />
+              {{ record.title }}
+            </div>
+          </div>
+          <div v-if="column.name === 'editor'">
+            <a-tooltip>
+              <template #title>Click to hide '{{ record.title }}' for role:Editor in UI dashboard</template>
+              <a-checkbox
+                :checked="!record.disabled.editor"
+                @change="
+                  // eslint-disable-next-line prettier/prettier
+                  record.disabled.editor = !record.disabled.editor;
+                  record.edited = true
+                "
+              ></a-checkbox>
+            </a-tooltip>
+          </div>
+          <div v-if="column.name === 'commenter'">
+            <a-tooltip>
+              <template #title>Click to hide '{{ record.title }}' for role:Commenter in UI dashboard</template>
+              <a-checkbox
+                :checked="!record.disabled.commenter"
+                @change="
+                  // eslint-disable-next-line prettier/prettier
+                  record.disabled.commenter = !record.disabled.commenter;
+                  record.edited = true
+                "
+              ></a-checkbox>
+            </a-tooltip>
+          </div>
+          <div v-if="column.name === 'viewer'">
+            <a-tooltip>
+              <template #title>Click to hide '{{ record.title }}' for role:Viewer in UI dashboard</template>
+              <a-checkbox
+                :checked="!record.disabled.viewer"
+                @change="
+                  // eslint-disable-next-line prettier/prettier
+                  record.disabled.viewer = !record.disabled.viewer;
+                  record.edited = true
+                "
+              ></a-checkbox>
+            </a-tooltip>
+          </div>
+        </template>
+      </a-table>
+    </div>
+  </div>
+</template>

From ab835aed092808526492de226d9b9dc065d24cf2 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Tue, 26 Jul 2022 20:43:41 +0300
Subject: [PATCH 03/27] fix(gui-v2): make UI ACL role columns same size

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue b/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue
index 7a2b5eeaea..b361ded48f 100644
--- a/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue
+++ b/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue
@@ -55,7 +55,6 @@ const columns = [
   {
     title: tableHeaderRenderer('Table name'),
     name: 'table_name',
-    onFilter: (value: string, record: any) => record._ptn.indexOf(value) === 0,
   },
   {
     title: tableHeaderRenderer('View name'),
@@ -65,14 +64,17 @@ const columns = [
     // { icon: MdiGridIcon, color: 'blue' },
     title: tableHeaderRenderer('Editor'),
     name: 'editor',
+    width: 150,
   },
   {
     title: tableHeaderRenderer('Commenter'),
     name: 'commenter',
+    width: 150,
   },
   {
     title: tableHeaderRenderer('Viewer'),
     name: 'viewer',
+    width: 150,
   },
 ]
 </script>

From ce93117f890ceb2348ffd7da2f8b1fe3645fbb49 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Tue, 26 Jul 2022 20:44:28 +0300
Subject: [PATCH 04/27] feat(gui-v2): improved UI ACL table role handling

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../components/dashboard/settings/UIAcl.vue   | 53 ++++++-------------
 1 file changed, 15 insertions(+), 38 deletions(-)

diff --git a/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue b/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue
index b361ded48f..c50ff05a51 100644
--- a/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue
+++ b/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue
@@ -10,6 +10,7 @@ const { $api, $e } = useNuxtApp()
 const { project } = useProject()
 const toast = useToast()
 
+const roles = $ref<Array<string>>(['editor', 'commenter', 'viewer'])
 let isLoading = $ref(false)
 let tables = $ref<Array<any>>([])
 let searchInput = $ref<string>('')
@@ -123,44 +124,20 @@ const columns = [
               {{ record.title }}
             </div>
           </div>
-          <div v-if="column.name === 'editor'">
-            <a-tooltip>
-              <template #title>Click to hide '{{ record.title }}' for role:Editor in UI dashboard</template>
-              <a-checkbox
-                :checked="!record.disabled.editor"
-                @change="
-                  // eslint-disable-next-line prettier/prettier
-                  record.disabled.editor = !record.disabled.editor;
-                  record.edited = true
-                "
-              ></a-checkbox>
-            </a-tooltip>
-          </div>
-          <div v-if="column.name === 'commenter'">
-            <a-tooltip>
-              <template #title>Click to hide '{{ record.title }}' for role:Commenter in UI dashboard</template>
-              <a-checkbox
-                :checked="!record.disabled.commenter"
-                @change="
-                  // eslint-disable-next-line prettier/prettier
-                  record.disabled.commenter = !record.disabled.commenter;
-                  record.edited = true
-                "
-              ></a-checkbox>
-            </a-tooltip>
-          </div>
-          <div v-if="column.name === 'viewer'">
-            <a-tooltip>
-              <template #title>Click to hide '{{ record.title }}' for role:Viewer in UI dashboard</template>
-              <a-checkbox
-                :checked="!record.disabled.viewer"
-                @change="
-                  // eslint-disable-next-line prettier/prettier
-                  record.disabled.viewer = !record.disabled.viewer;
-                  record.edited = true
-                "
-              ></a-checkbox>
-            </a-tooltip>
+          <div v-for="role in roles" :key="role">
+            <div v-if="column.name === role">
+              <a-tooltip>
+                <template #title>Click to hide '{{ record.title }}' for role:{{ role }} in UI dashboard</template>
+                <a-checkbox
+                  :checked="!record.disabled[role]"
+                  @change="
+                    // eslint-disable-next-line prettier/prettier
+                    record.disabled[role] = !record.disabled[role];
+                    record.edited = true
+                  "
+                ></a-checkbox>
+              </a-tooltip>
+            </div>
           </div>
         </template>
       </a-table>

From bb2a0e395e12b8b9eb6cd484568d37b06ab9984e Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Tue, 26 Jul 2022 21:42:03 +0300
Subject: [PATCH 05/27] fix(gui-v2): requested changes for PR

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../dashboard/settings/Metadata.vue           |  4 +-
 .../components/dashboard/settings/UIAcl.vue   | 45 +++++++++----------
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/packages/nc-gui-v2/components/dashboard/settings/Metadata.vue b/packages/nc-gui-v2/components/dashboard/settings/Metadata.vue
index 334bec0c80..54bbb68ebb 100644
--- a/packages/nc-gui-v2/components/dashboard/settings/Metadata.vue
+++ b/packages/nc-gui-v2/components/dashboard/settings/Metadata.vue
@@ -10,11 +10,12 @@ const toast = useToast()
 
 let isLoading = $ref(false)
 let isDifferent = $ref(false)
-let metadiff = $ref<Array<any>>([])
+let metadiff = $ref<any[]>([])
 
 async function loadMetaDiff() {
   try {
     if (!project.value?.id) return
+
     isLoading = true
     isDifferent = false
     metadiff = await $api.project.metaDiffGet(project.value?.id)
@@ -34,6 +35,7 @@ async function loadMetaDiff() {
 async function syncMetaDiff() {
   try {
     if (!project.value?.id || !isDifferent) return
+
     isLoading = true
     await $api.project.metaDiffSync(project.value.id)
     toast.info(`Table metadata recreated successfully`)
diff --git a/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue b/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue
index c50ff05a51..19efc18801 100644
--- a/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue
+++ b/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue
@@ -10,14 +10,23 @@ const { $api, $e } = useNuxtApp()
 const { project } = useProject()
 const toast = useToast()
 
-const roles = $ref<Array<string>>(['editor', 'commenter', 'viewer'])
+const roles = $ref<string[]>(['editor', 'commenter', 'viewer'])
 let isLoading = $ref(false)
-let tables = $ref<Array<any>>([])
-let searchInput = $ref<string>('')
+let tables = $ref<any[]>([])
+let searchInput = $ref('')
+
+const filteredTables = computed(() =>
+  tables.filter(
+    (el) =>
+      (typeof el?._ptn === 'string' && el._ptn.toLowerCase().includes(searchInput.toLowerCase())) ||
+      (typeof el?.title === 'string' && el.title.toLowerCase().includes(searchInput.toLowerCase())),
+  ),
+)
 
 async function loadTableList() {
   try {
     if (!project.value?.id) return
+
     isLoading = true
     // TODO includeM2M
     tables = await $api.project.modelVisibilityList(project.value?.id, {
@@ -33,6 +42,7 @@ async function loadTableList() {
 async function saveUIAcl() {
   try {
     if (!project.value?.id) return
+
     await $api.project.modelVisibilitySet(
       project.value.id,
       tables.filter((t) => t.edited),
@@ -44,6 +54,11 @@ async function saveUIAcl() {
   $e('a:proj-meta:ui-acl')
 }
 
+const onRoleCheck = (record: any, role: string) => {
+  record.disabled[role] = !record.disabled[role]
+  record.edited = true
+}
+
 onMounted(async () => {
   if (tables.length === 0) {
     await loadTableList()
@@ -102,20 +117,7 @@ const columns = [
           </div>
         </a-button>
       </div>
-      <a-table
-        class="w-full"
-        :data-source="
-          tables.filter(
-            (el) =>
-              (typeof el?._ptn === 'string' && el._ptn.toLowerCase().includes(searchInput.toLowerCase())) ||
-              (typeof el?.title === 'string' && el.title.toLowerCase().includes(searchInput.toLowerCase())),
-          )
-        "
-        :columns="columns"
-        :pagination="false"
-        :loading="isLoading"
-        bordered
-      >
+      <a-table class="w-full" :data-source="filteredTables" :columns="columns" :pagination="false" :loading="isLoading" bordered>
         <template #bodyCell="{ record, column }">
           <div v-if="column.name === 'table_name'">{{ record._ptn }}</div>
           <div v-if="column.name === 'view_name'">
@@ -128,14 +130,7 @@ const columns = [
             <div v-if="column.name === role">
               <a-tooltip>
                 <template #title>Click to hide '{{ record.title }}' for role:{{ role }} in UI dashboard</template>
-                <a-checkbox
-                  :checked="!record.disabled[role]"
-                  @change="
-                    // eslint-disable-next-line prettier/prettier
-                    record.disabled[role] = !record.disabled[role];
-                    record.edited = true
-                  "
-                ></a-checkbox>
+                <a-checkbox :checked="!record.disabled[role]" @change="onRoleCheck(record, role)"></a-checkbox>
               </a-tooltip>
             </div>
           </div>

From 07651bfdcc3b415d11e552d40b09557ff7992659 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Tue, 26 Jul 2022 21:47:11 +0300
Subject: [PATCH 06/27] chore: remove unnecessary comment

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue b/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue
index 19efc18801..53dc342609 100644
--- a/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue
+++ b/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue
@@ -77,7 +77,6 @@ const columns = [
     name: 'view_name',
   },
   {
-    // { icon: MdiGridIcon, color: 'blue' },
     title: tableHeaderRenderer('Editor'),
     name: 'editor',
     width: 150,

From 7f2d22ef3143d90cf1b023d4423e14ab683071fb Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Wed, 27 Jul 2022 12:18:40 +0530
Subject: [PATCH 07/27] test: cypress markers on spreadsheet tab

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 packages/nc-gui-v2/components/dashboard/TreeView.vue            | 2 +-
 .../components/smartsheet-toolbar/ColumnFilterMenu.vue          | 2 +-
 packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue | 2 +-
 .../nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui-v2/components/dashboard/TreeView.vue b/packages/nc-gui-v2/components/dashboard/TreeView.vue
index ab122869b1..a6e74fc257 100644
--- a/packages/nc-gui-v2/components/dashboard/TreeView.vue
+++ b/packages/nc-gui-v2/components/dashboard/TreeView.vue
@@ -218,7 +218,7 @@ const addTableTab = (table: TableType) => {
           <span class="flex-grow text-bold nc-project-tree"
             >{{ $t('objects.tables') }} <template v-if="tables?.length">({{ tables.length }})</template></span
           >
-          <MdiPlus v-t="['c:table:create:navdraw']" class="text-gray-500" @click.stop="tableCreateDlg = true" />
+          <MdiPlus v-t="['c:table:create:navdraw']" class="text-gray-500 nc-btn-tbl-add" @click.stop="tableCreateDlg = true" />
           <MdiMenuDown
             class="transition-transform !duration-100 text-gray-500"
             :class="{ 'transform rotate-180': showTableList }"
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
index c27688aa71..9f83379156 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
@@ -33,7 +33,7 @@ const applyChanges = () => {}
         >
           <MdiFilterIcon class="mr-1 text-grey" />
           <!-- Filter -->
-          <span class="text-capitalize">{{ $t('activity.filter') }}</span>
+          <span class="text-capitalize nc-filter-menu-btn">{{ $t('activity.filter') }}</span>
           <MdiMenuDownIcon class="text-grey" />
         </v-btn>
       </v-badge>
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
index 73edd42973..8c397aff5c 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
@@ -329,7 +329,7 @@ export default {
           <!--          <v-icon small class="mr-1" color="#777"> mdi-eye-off-outline </v-icon> -->
           <MdiEyeIcon class="mr-1 text-grey"></MdiEyeIcon>
           <!-- Fields -->
-          <span class="text-sm text-capitalize">{{ $t('objects.fields') }}</span>
+          <span class="text-sm text-capitalize nc-fields-menu-btn">{{ $t('objects.fields') }}</span>
           <MdiMenuDownIcon class="text-grey"></MdiMenuDownIcon>
         </v-btn>
       </v-badge>
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
index 322d81eded..49cfeb5381 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
@@ -43,7 +43,7 @@ watch(
         >
           <MdiSortIcon class="mr-1 text-grey" />
           <!-- Sort -->
-          <span class="text-capitalize">{{ $t('activity.sort') }}</span>
+          <span class="text-capitalize nc-sort-menu-btn">{{ $t('activity.sort') }}</span>
           <MdiMenuDownIcon class="text-grey" />
         </v-btn>
       </v-badge>

From 1e5794f2354ba3286f2d51f8fa395b330335a632 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 21 Jul 2022 12:53:21 +0530
Subject: [PATCH 08/27] feat(gui-v2): convert tabview into nested page

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../{[projectId].vue => [projectId]/index.vue}  |  3 ++-
 .../pages/nc/[projectId]/index/index.vue        | 11 +++++++++++
 .../pages/nc/[projectId]/index/index/index.vue  | 17 +++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)
 rename packages/nc-gui-v2/pages/nc/{[projectId].vue => [projectId]/index.vue} (94%)
 create mode 100644 packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
 create mode 100644 packages/nc-gui-v2/pages/nc/[projectId]/index/index/index.vue

diff --git a/packages/nc-gui-v2/pages/nc/[projectId].vue b/packages/nc-gui-v2/pages/nc/[projectId]/index.vue
similarity index 94%
rename from packages/nc-gui-v2/pages/nc/[projectId].vue
rename to packages/nc-gui-v2/pages/nc/[projectId]/index.vue
index 01b32f99f0..ce224f7857 100644
--- a/packages/nc-gui-v2/pages/nc/[projectId].vue
+++ b/packages/nc-gui-v2/pages/nc/[projectId]/index.vue
@@ -29,7 +29,8 @@ $state.sidebarOpen.value = true
     </template>
 
     <v-container fluid>
-      <DashboardTabView />
+      <!--      <DashboardTabView /> -->
+      <NuxtPage />
     </v-container>
   </NuxtLayout>
 </template>
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
new file mode 100644
index 0000000000..8119a0ec08
--- /dev/null
+++ b/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
@@ -0,0 +1,11 @@
+<script lang="ts" setup>
+</script>
+
+<template>
+  <NuxtPage/>
+</template>
+
+<style scoped>
+.nc-main-tab {
+}
+</style>
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index/index/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index/index/index.vue
new file mode 100644
index 0000000000..d40f82d345
--- /dev/null
+++ b/packages/nc-gui-v2/pages/nc/[projectId]/index/index/index.vue
@@ -0,0 +1,17 @@
+<script>
+export default {
+  name: 'Index',
+}
+</script>
+
+<template>
+  <div class="nc-main-tab">
+    <span>Welcome to NocoDB!</span>
+  </div>
+</template>
+
+<style scoped>
+.nc-main-tab {
+  @apply w-full text-3xl text-gray-400 flex align-center justify-center;
+}
+</style>

From 6292e1f2aa4442d94cfb5cca955ef3c222e88f8c Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 23 Jul 2022 13:43:26 +0530
Subject: [PATCH 09/27] wip(gui-v2): route based tab navigation

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui-v2/composables/useTabs.ts     | 37 ++++++++++++++++++-
 .../pages/nc/[projectId]/index/index.vue      | 33 ++++++++++++++---
 .../index/table/[title]/[viewTitle]/index.vue |  9 +++++
 .../index/index/table/[title]/index.vue       |  9 +++++
 4 files changed, 81 insertions(+), 7 deletions(-)
 create mode 100644 packages/nc-gui-v2/pages/nc/[projectId]/index/index/table/[title]/[viewTitle]/index.vue
 create mode 100644 packages/nc-gui-v2/pages/nc/[projectId]/index/index/table/[title]/index.vue

diff --git a/packages/nc-gui-v2/composables/useTabs.ts b/packages/nc-gui-v2/composables/useTabs.ts
index d2fef08531..e2e5a65517 100644
--- a/packages/nc-gui-v2/composables/useTabs.ts
+++ b/packages/nc-gui-v2/composables/useTabs.ts
@@ -15,7 +15,42 @@ function getPredicate(key: Partial<TabItem>) {
 
 export default () => {
   const tabs = useState<TabItem[]>('tabs', () => [])
-  const activeTab = useState<number>('activeTab', () => 0)
+  // const activeTab = useState<number>('activeTab', () => 0)
+
+  const route = useRoute()
+  const router = useRouter()
+  const { tables } = useProject()
+
+  const activeTab: WritableComputedRef<number> = computed({
+    get() {
+      if ((route?.name as string)?.startsWith('nc-projectId-index-index-table-title') && tables?.value?.length) {
+        const tab: Partial<TabItem> = { type: 'table', title: route.params.title as string }
+        const id = tables.value?.find((t) => t.title === tab.title)?.id
+        tab.id = id as string
+        let index = tabs.value.findIndex((t) => t.id === tab.id)
+        if (index === -1) {
+          tabs.value.push(tab as TabItem)
+          index = tabs.value.length - 1
+        }
+        return index
+      }
+      return -1
+    },
+    set(index: number) {
+      if (index === -1) {
+        router.push(`/nc/${route.params.projectId}`)
+      } else {
+        router.push(`/nc/${route.params.projectId}/table/${tabs.value?.[index]?.title}`)
+      }
+    },
+
+    // if (route.params.title) {
+    //   const tab = tabs.value.find(t => t.id === route.params.tab)
+    //   if (tab) {
+    //     activeTab.value = tabs.value.indexOf(tab)
+    //   }
+    // }
+  })
 
   const addTab = (tabMeta: TabItem) => {
     const tabIndex = tabs.value.findIndex((tab) => tab.id === tabMeta.id)
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
index 8119a0ec08..2f2ce1a288 100644
--- a/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
+++ b/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
@@ -1,11 +1,32 @@
-<script lang="ts" setup>
+<script setup lang="ts">
+import useTabs from '~/composables/useTabs'
+
+const { tabs, activeTab, closeTab } = useTabs()
+const tableCreateDialog = ref(false)
 </script>
 
 <template>
-  <NuxtPage/>
+  <div>
+    <!--    <v-tabs v-model="activeTab" height="32" density="compact" color="primary">
+      <v-tab v-for="(tab, i) in tabs" :key="i" :value="i" class="text-capitalize">
+        {{ tab.title }}
+        <MdiCloseIcon class="ml-2 text-gray-500/50" @click.stop="closeTab(i)"></MdiCloseIcon>
+      </v-tab>
+      <MdiPlusIcon @click="tableCreateDialog = true" />
+      <DlgTableCreate v-if="tableCreateDialog" v-model="tableCreateDialog" />
+    </v-tabs> -->
+
+    <a-tabs v-model:activeKey="activeTab" size="small" type="editable-card" @edit="closeTab">
+      <a-tab-pane v-for="(tab, i) in tabs" :key="i" :tab="tab.title" />
+    </a-tabs>
+
+    <NuxtPage />
+    <!--    <v-window v-model="activeTab">
+      <v-window-item v-for="(tab, i) in tabs" :key="i" :value="i">
+        <TabsSmartsheet :tab-meta="tab" />
+      </v-window-item>
+    </v-window> -->
+  </div>
 </template>
 
-<style scoped>
-.nc-main-tab {
-}
-</style>
+<style scoped></style>
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index/index/table/[title]/[viewTitle]/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index/index/table/[title]/[viewTitle]/index.vue
new file mode 100644
index 0000000000..8435a144c0
--- /dev/null
+++ b/packages/nc-gui-v2/pages/nc/[projectId]/index/index/table/[title]/[viewTitle]/index.vue
@@ -0,0 +1,9 @@
+<script>
+export default {
+  name: 'Index',
+}
+</script>
+
+<template></template>
+
+<style scoped></style>
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index/index/table/[title]/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index/index/table/[title]/index.vue
new file mode 100644
index 0000000000..10745f6de9
--- /dev/null
+++ b/packages/nc-gui-v2/pages/nc/[projectId]/index/index/table/[title]/index.vue
@@ -0,0 +1,9 @@
+<script>
+export default {
+  name: 'Index',
+}
+</script>
+
+<template>test</template>
+
+<style scoped></style>

From 73d532f145335744f8c90b20f7d7d2a4ed2d4521 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 25 Jul 2022 12:36:21 +0530
Subject: [PATCH 10/27] fix(gui-v2): handle closing active tab

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui-v2/composables/useTabs.ts | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/nc-gui-v2/composables/useTabs.ts b/packages/nc-gui-v2/composables/useTabs.ts
index e2e5a65517..2485fb46bb 100644
--- a/packages/nc-gui-v2/composables/useTabs.ts
+++ b/packages/nc-gui-v2/composables/useTabs.ts
@@ -1,4 +1,6 @@
+import type { WritableComputedRef } from '@vue/reactivity'
 import { useState } from '#app'
+import useProject from '~/composables/useProject'
 
 export interface TabItem {
   type: 'table' | 'view' | 'auth'
@@ -43,13 +45,6 @@ export default () => {
         router.push(`/nc/${route.params.projectId}/table/${tabs.value?.[index]?.title}`)
       }
     },
-
-    // if (route.params.title) {
-    //   const tab = tabs.value.find(t => t.id === route.params.tab)
-    //   if (tab) {
-    //     activeTab.value = tabs.value.indexOf(tab)
-    //   }
-    // }
   })
 
   const addTab = (tabMeta: TabItem) => {
@@ -67,13 +62,18 @@ export default () => {
   const clearTabs = () => {
     tabs.value = []
   }
-
-  const closeTab = (key: number | Partial<TabItem>) => {
-    if (typeof key === 'number') tabs.value.splice(key, 1)
-    else {
-      const index = tabs.value.findIndex(getPredicate(key))
-      if (index > -1) tabs.value.splice(index, 1)
+  const closeTab = async (key: number | Partial<TabItem>) => {
+    const index = typeof key === 'number' ? key : tabs.value.findIndex(getPredicate(key))
+    if (activeTab.value === index) {
+      let newTabIndex = index - 1
+      if (newTabIndex < 0 && tabs.value?.length > 1) newTabIndex = index + 1
+      if (newTabIndex === -1) {
+        await router.push(`/nc/${route.params.projectId}`)
+      } else {
+        await router.push(`/nc/${route.params.projectId}/table/${tabs.value?.[newTabIndex]?.title}`)
+      }
     }
+    tabs.value.splice(index, 1)
   }
 
   const updateTab = (key: number | Partial<TabItem>, newTabItemProps: Partial<TabItem>) => {

From 78a8c1caa62396810c431528e3ab52833b550797 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 25 Jul 2022 13:03:46 +0530
Subject: [PATCH 11/27] feat(gui-v2): render smartsheet based on route

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/dashboard/TreeView.vue         |  2 +-
 .../nc-gui-v2/components/tabs/Smartsheet.vue  | 19 +++++-------
 packages/nc-gui-v2/composables/useTabs.ts     | 29 ++++++++++++++-----
 packages/nc-gui-v2/context/index.ts           |  5 ++--
 .../nc-gui-v2/pages/nc/[projectId]/index.vue  |  2 ++
 .../pages/nc/[projectId]/index/index.vue      |  8 +++--
 .../[title]/[viewTitle]/index.vue             |  4 ++-
 .../index/{table => [type]}/[title]/index.vue |  4 ++-
 .../pages/nc/[projectId]/index/index/auth.vue |  5 ++++
 .../pages/project/index/create-external.vue   |  1 -
 .../nocodb-sdk/src/lib/helperFunctions.ts     | 13 +++++----
 11 files changed, 58 insertions(+), 34 deletions(-)
 rename packages/nc-gui-v2/pages/nc/[projectId]/index/index/{table => [type]}/[title]/[viewTitle]/index.vue (64%)
 rename packages/nc-gui-v2/pages/nc/[projectId]/index/index/{table => [type]}/[title]/index.vue (64%)
 create mode 100644 packages/nc-gui-v2/pages/nc/[projectId]/index/index/auth.vue

diff --git a/packages/nc-gui-v2/components/dashboard/TreeView.vue b/packages/nc-gui-v2/components/dashboard/TreeView.vue
index ab122869b1..2a0b628fda 100644
--- a/packages/nc-gui-v2/components/dashboard/TreeView.vue
+++ b/packages/nc-gui-v2/components/dashboard/TreeView.vue
@@ -192,7 +192,7 @@ const reloadTables = async () => {
 }
 const addTableTab = (table: TableType) => {
   $e('a:table:open')
-  addTab({ title: table.title, id: table.id })
+  addTab({ title: table.title, id: table.id, type: table.type as any })
 }
 </script>
 
diff --git a/packages/nc-gui-v2/components/tabs/Smartsheet.vue b/packages/nc-gui-v2/components/tabs/Smartsheet.vue
index cfbf6b7a07..763689697a 100644
--- a/packages/nc-gui-v2/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui-v2/components/tabs/Smartsheet.vue
@@ -1,25 +1,22 @@
 <script setup lang="ts">
-import { useEventBus } from '@vueuse/core'
-import type { ColumnType, FormType, GalleryType, GridType, KanbanType } from 'nocodb-sdk'
+import type { ColumnType, ViewType } from 'nocodb-sdk'
 import { ViewTypes } from 'nocodb-sdk'
-import { computed, onMounted, provide, watch } from '#imports'
+import { computed, inject, onMounted, provide, watch, watchEffect } from '#imports'
 import { ActiveViewInj, FieldsInj, IsLockedInj, MetaInj, ReloadViewDataHookInj, TabMetaInj } from '~/context'
 import useMetas from '~/composables/useMetas'
 
-const { tabMeta } = defineProps({
-  tabMeta: Object,
-})
-
 const { getMeta, metas } = useMetas()
 
-const activeView = ref<GridType | FormType | KanbanType | GalleryType>()
+const activeView = ref<ViewType>()
 const el = ref<any>()
 const fields = ref<ColumnType[]>([])
 
-const meta = computed(() => metas.value?.[tabMeta?.id])
+const tabMeta = inject(TabMetaInj)
+
+const meta = computed(() => metas.value?.[tabMeta?.value?.id as string])
 
-onMounted(async () => {
-  await getMeta(tabMeta?.id)
+watchEffect(async () => {
+  await getMeta(tabMeta?.value?.id as string)
 })
 
 const reloadEventHook = createEventHook<void>()
diff --git a/packages/nc-gui-v2/composables/useTabs.ts b/packages/nc-gui-v2/composables/useTabs.ts
index 2485fb46bb..a381668792 100644
--- a/packages/nc-gui-v2/composables/useTabs.ts
+++ b/packages/nc-gui-v2/composables/useTabs.ts
@@ -23,11 +23,12 @@ export default () => {
   const router = useRouter()
   const { tables } = useProject()
 
-  const activeTab: WritableComputedRef<number> = computed({
+  const activeTabIndex: WritableComputedRef<number> = computed({
     get() {
-      if ((route?.name as string)?.startsWith('nc-projectId-index-index-table-title') && tables?.value?.length) {
+      console.log(route?.name)
+      if ((route?.name as string)?.startsWith('nc-projectId-index-index-type-title') && tables?.value?.length) {
         const tab: Partial<TabItem> = { type: 'table', title: route.params.title as string }
-        const id = tables.value?.find((t) => t.title === tab.title)?.id
+        const id = tables?.value?.find((t) => t.title === tab.title)?.id
         tab.id = id as string
         let index = tabs.value.findIndex((t) => t.id === tab.id)
         if (index === -1) {
@@ -35,6 +36,8 @@ export default () => {
           index = tabs.value.length - 1
         }
         return index
+      } else if ((route?.name as string)?.startsWith('nc-projectId-index-index-auth')) {
+        return tabs.value.findIndex((t) => t.type === 'auth')
       }
       return -1
     },
@@ -42,21 +45,31 @@ export default () => {
       if (index === -1) {
         router.push(`/nc/${route.params.projectId}`)
       } else {
-        router.push(`/nc/${route.params.projectId}/table/${tabs.value?.[index]?.title}`)
+        const tab = tabs.value[index]
+        if (!tab) {
+        } else if (tab.type === 'table') {
+          router.push(`/nc/${route.params.projectId}/table/${tab?.title}`)
+        } else if (tab.type === 'view') {
+          router.push(`/nc/${route.params.projectId}/view/${tab?.title}`)
+        } else if (tab.type === 'auth') {
+          router.push(`/nc/${route.params.projectId}/auth`)
+        }
       }
     },
   })
 
+  const activeTab = computed(() => tabs.value?.[activeTabIndex.value])
+
   const addTab = (tabMeta: TabItem) => {
     const tabIndex = tabs.value.findIndex((tab) => tab.id === tabMeta.id)
     // if tab already found make it active
     if (tabIndex > -1) {
-      activeTab.value = tabIndex
+      activeTabIndex.value = tabIndex
     }
     // if tab not found add it
     else {
       tabs.value = [...(tabs.value || []), tabMeta]
-      activeTab.value = tabs.value.length - 1
+      activeTabIndex.value = tabs.value.length - 1
     }
   }
   const clearTabs = () => {
@@ -64,7 +77,7 @@ export default () => {
   }
   const closeTab = async (key: number | Partial<TabItem>) => {
     const index = typeof key === 'number' ? key : tabs.value.findIndex(getPredicate(key))
-    if (activeTab.value === index) {
+    if (activeTabIndex.value === index) {
       let newTabIndex = index - 1
       if (newTabIndex < 0 && tabs.value?.length > 1) newTabIndex = index + 1
       if (newTabIndex === -1) {
@@ -83,5 +96,5 @@ export default () => {
     }
   }
 
-  return { tabs, addTab, activeTab, clearTabs, closeTab, updateTab }
+  return { tabs, addTab, activeTabIndex, activeTab, clearTabs, closeTab, updateTab }
 }
diff --git a/packages/nc-gui-v2/context/index.ts b/packages/nc-gui-v2/context/index.ts
index f03f1c0429..9c7c0da7d0 100644
--- a/packages/nc-gui-v2/context/index.ts
+++ b/packages/nc-gui-v2/context/index.ts
@@ -1,11 +1,12 @@
 import type { ColumnType, TableType, ViewType } from 'nocodb-sdk'
-import type { InjectionKey, Ref } from 'vue'
+import type { ComputedRef, InjectionKey, Ref } from 'vue'
 import type { EventHook } from '@vueuse/core'
 import type { useViewData } from '#imports'
+import type { TabItem } from '~/composables/useTabs'
 
 export const ColumnInj: InjectionKey<ColumnType & { meta: any }> = Symbol('column-injection')
 export const MetaInj: InjectionKey<Ref<TableType>> = Symbol('meta-injection')
-export const TabMetaInj: InjectionKey<any> = Symbol('tab-meta-injection')
+export const TabMetaInj: InjectionKey<ComputedRef<TabItem>> = Symbol('tab-meta-injection')
 export const PaginationDataInj: InjectionKey<ReturnType<typeof useViewData>['paginationData']> =
   Symbol('pagination-data-injection')
 export const ChangePageInj: InjectionKey<ReturnType<typeof useViewData>['changePage']> = Symbol('pagination-data-injection')
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index.vue
index ce224f7857..67f6799c76 100644
--- a/packages/nc-gui-v2/pages/nc/[projectId]/index.vue
+++ b/packages/nc-gui-v2/pages/nc/[projectId]/index.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import useTabs from '~/composables/useTabs'
+
 const route = useRoute()
 const { loadProject, loadTables } = useProject(route.params.projectId as string)
 const { clearTabs, addTab } = useTabs()
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
index 2f2ce1a288..1ee8d54135 100644
--- a/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
+++ b/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
@@ -1,8 +1,11 @@
 <script setup lang="ts">
 import useTabs from '~/composables/useTabs'
+import { TabMetaInj } from '~/context'
 
-const { tabs, activeTab, closeTab } = useTabs()
+const { tabs, activeTabIndex, activeTab, closeTab } = useTabs()
 const tableCreateDialog = ref(false)
+
+provide(TabMetaInj, activeTab)
 </script>
 
 <template>
@@ -15,8 +18,7 @@ const tableCreateDialog = ref(false)
       <MdiPlusIcon @click="tableCreateDialog = true" />
       <DlgTableCreate v-if="tableCreateDialog" v-model="tableCreateDialog" />
     </v-tabs> -->
-
-    <a-tabs v-model:activeKey="activeTab" size="small" type="editable-card" @edit="closeTab">
+    <a-tabs v-model:activeKey="activeTabIndex" size="small" type="editable-card" @edit="closeTab">
       <a-tab-pane v-for="(tab, i) in tabs" :key="i" :tab="tab.title" />
     </a-tabs>
 
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index/index/table/[title]/[viewTitle]/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index/index/[type]/[title]/[viewTitle]/index.vue
similarity index 64%
rename from packages/nc-gui-v2/pages/nc/[projectId]/index/index/table/[title]/[viewTitle]/index.vue
rename to packages/nc-gui-v2/pages/nc/[projectId]/index/index/[type]/[title]/[viewTitle]/index.vue
index 8435a144c0..ec671406ea 100644
--- a/packages/nc-gui-v2/pages/nc/[projectId]/index/index/table/[title]/[viewTitle]/index.vue
+++ b/packages/nc-gui-v2/pages/nc/[projectId]/index/index/[type]/[title]/[viewTitle]/index.vue
@@ -4,6 +4,8 @@ export default {
 }
 </script>
 
-<template></template>
+<template>
+  <TabsSmartsheet />
+</template>
 
 <style scoped></style>
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index/index/table/[title]/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index/index/[type]/[title]/index.vue
similarity index 64%
rename from packages/nc-gui-v2/pages/nc/[projectId]/index/index/table/[title]/index.vue
rename to packages/nc-gui-v2/pages/nc/[projectId]/index/index/[type]/[title]/index.vue
index 10745f6de9..ec671406ea 100644
--- a/packages/nc-gui-v2/pages/nc/[projectId]/index/index/table/[title]/index.vue
+++ b/packages/nc-gui-v2/pages/nc/[projectId]/index/index/[type]/[title]/index.vue
@@ -4,6 +4,8 @@ export default {
 }
 </script>
 
-<template>test</template>
+<template>
+  <TabsSmartsheet />
+</template>
 
 <style scoped></style>
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index/index/auth.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index/index/auth.vue
new file mode 100644
index 0000000000..11a17bc2e2
--- /dev/null
+++ b/packages/nc-gui-v2/pages/nc/[projectId]/index/index/auth.vue
@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <h2 class="text-3xl mt-3">Team & Auth</h2>
+  </div>
+</template>
diff --git a/packages/nc-gui-v2/pages/project/index/create-external.vue b/packages/nc-gui-v2/pages/project/index/create-external.vue
index b06019f463..510003261b 100644
--- a/packages/nc-gui-v2/pages/project/index/create-external.vue
+++ b/packages/nc-gui-v2/pages/project/index/create-external.vue
@@ -8,7 +8,6 @@ import { navigateTo, useNuxtApp } from '#app'
 import { ClientType } from '~/lib/enums'
 import { extractSdkResponseErrorMsg } from '~/utils/errorUtils'
 import { readFile } from '~/utils/fileUtils'
-
 import type { ProjectCreateForm } from '~/utils/projectCreateUtils'
 import {
   clientTypes,
diff --git a/packages/nocodb-sdk/src/lib/helperFunctions.ts b/packages/nocodb-sdk/src/lib/helperFunctions.ts
index 9140469d28..5ed58b1372 100644
--- a/packages/nocodb-sdk/src/lib/helperFunctions.ts
+++ b/packages/nocodb-sdk/src/lib/helperFunctions.ts
@@ -12,12 +12,13 @@ const getSystemColumnsIds = (columns) => {
 const getSystemColumns = (columns) => columns.filter(isSystemColumn) || [];
 
 const isSystemColumn = (col) =>
-  col.uidt === UITypes.ForeignKey ||
-  col.column_name === 'created_at' ||
-  col.column_name === 'updated_at' ||
-  (col.pk && (col.ai || col.cdf)) ||
-  (col.pk && col.meta && col.meta.ag) ||
-  col.system;
+  col &&
+  (col.uidt === UITypes.ForeignKey ||
+    col.column_name === 'created_at' ||
+    col.column_name === 'updated_at' ||
+    (col.pk && (col.ai || col.cdf)) ||
+    (col.pk && col.meta && col.meta.ag) ||
+    col.system);
 
 export {
   filterOutSystemColumns,

From 06d635aab454de027f238132716e10ededa6785a Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 25 Jul 2022 16:49:59 +0530
Subject: [PATCH 12/27] feat(gui-v2): basic layout

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/dashboard/TreeView.vue         |  2 +-
 .../components/smartsheet/Toolbar.vue         |  4 +-
 .../nc-gui-v2/components/tabs/Smartsheet.vue  |  2 +-
 packages/nc-gui-v2/composables/useTabs.ts     | 21 +++++++---
 .../nc-gui-v2/pages/nc/[projectId]/index.vue  | 39 ++-----------------
 .../pages/nc/[projectId]/index/index.vue      | 38 +++++++++---------
 .../index.vue => [[viewTitle]].vue}           |  0
 .../index/index/[type]/[title]/index.vue      | 11 ------
 8 files changed, 41 insertions(+), 76 deletions(-)
 rename packages/nc-gui-v2/pages/nc/[projectId]/index/index/[type]/[title]/{[viewTitle]/index.vue => [[viewTitle]].vue} (100%)
 delete mode 100644 packages/nc-gui-v2/pages/nc/[projectId]/index/index/[type]/[title]/index.vue

diff --git a/packages/nc-gui-v2/components/dashboard/TreeView.vue b/packages/nc-gui-v2/components/dashboard/TreeView.vue
index 2a0b628fda..06ec40b4cf 100644
--- a/packages/nc-gui-v2/components/dashboard/TreeView.vue
+++ b/packages/nc-gui-v2/components/dashboard/TreeView.vue
@@ -248,7 +248,7 @@ const addTableTab = (table: TableType) => {
                     <MdiMenuIcon class="transition-opacity opacity-0 group-hover:opacity-100" />
                     <template #overlay>
                       <a-menu class="cursor-pointer">
-                        <a-menu-item class="!text-xs" @click="showRenameTableDlg(table)"> Rename </a-menu-item>
+                        <a-menu-item v-t="" class="!text-xs" @click="showRenameTableDlg(table)"><div>Rename</div></a-menu-item>
                         <a-menu-item class="!text-xs" @click="deleteTable(table)"> Delete</a-menu-item>
                       </a-menu>
                     </template>
diff --git a/packages/nc-gui-v2/components/smartsheet/Toolbar.vue b/packages/nc-gui-v2/components/smartsheet/Toolbar.vue
index a67a8c90e7..5d1c7ed5da 100644
--- a/packages/nc-gui-v2/components/smartsheet/Toolbar.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Toolbar.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts"></script>
 
 <template>
-  <v-toolbar dense class="nc-table-toolbar elevation-0 xc-toolbar xc-border-bottom" style="z-index: 7">
+  <div dense class="nc-table-toolbar w-100 p-1 flex gap-1" style="z-index: 7">
     <SmartsheetToolbarFieldsMenu :show-system-fields="false" />
     <SmartsheetToolbarColumnFilterMenu />
     <SmartsheetToolbarSortListMenu />
-  </v-toolbar>
+  </div>
 </template>
 
 <style scoped></style>
diff --git a/packages/nc-gui-v2/components/tabs/Smartsheet.vue b/packages/nc-gui-v2/components/tabs/Smartsheet.vue
index 763689697a..afd90c7c27 100644
--- a/packages/nc-gui-v2/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui-v2/components/tabs/Smartsheet.vue
@@ -37,7 +37,7 @@ watch(
 </script>
 
 <template>
-  <div class="overflow-auto">
+  <div class="overflow-auto nc-container">
     <SmartsheetToolbar />
     <template v-if="meta">
       <div class="d-flex">
diff --git a/packages/nc-gui-v2/composables/useTabs.ts b/packages/nc-gui-v2/composables/useTabs.ts
index a381668792..2ef34dbac5 100644
--- a/packages/nc-gui-v2/composables/useTabs.ts
+++ b/packages/nc-gui-v2/composables/useTabs.ts
@@ -2,8 +2,14 @@ import type { WritableComputedRef } from '@vue/reactivity'
 import { useState } from '#app'
 import useProject from '~/composables/useProject'
 
+enum TabType {
+  TABLE = 'table',
+  VIEW = 'view',
+  AUTH = 'auth',
+}
+
 export interface TabItem {
-  type: 'table' | 'view' | 'auth'
+  type: TabType
   title: string
   id?: string
 }
@@ -26,8 +32,8 @@ export default () => {
   const activeTabIndex: WritableComputedRef<number> = computed({
     get() {
       console.log(route?.name)
-      if ((route?.name as string)?.startsWith('nc-projectId-index-index-type-title') && tables?.value?.length) {
-        const tab: Partial<TabItem> = { type: 'table', title: route.params.title as string }
+      if ((route?.name as string)?.startsWith('nc-projectId-index-index-type-title-viewTitle') && tables?.value?.length) {
+        const tab: Partial<TabItem> = { type: route.params.type as TabType, title: route.params.title as string }
         const id = tables?.value?.find((t) => t.title === tab.title)?.id
         tab.id = id as string
         let index = tabs.value.findIndex((t) => t.id === tab.id)
@@ -47,11 +53,14 @@ export default () => {
       } else {
         const tab = tabs.value[index]
         if (!tab) {
-        } else if (tab.type === 'table') {
+          return
+        }
+
+        if (tab.type === TabType.TABLE) {
           router.push(`/nc/${route.params.projectId}/table/${tab?.title}`)
-        } else if (tab.type === 'view') {
+        } else if (tab.type === TabType.VIEW) {
           router.push(`/nc/${route.params.projectId}/view/${tab?.title}`)
-        } else if (tab.type === 'auth') {
+        } else if (tab.type === TabType.AUTH) {
           router.push(`/nc/${route.params.projectId}/auth`)
         }
       }
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index.vue
index 67f6799c76..6e621feb1b 100644
--- a/packages/nc-gui-v2/pages/nc/[projectId]/index.vue
+++ b/packages/nc-gui-v2/pages/nc/[projectId]/index.vue
@@ -6,7 +6,9 @@ const { loadProject, loadTables } = useProject(route.params.projectId as string)
 const { clearTabs, addTab } = useTabs()
 const { $state } = useNuxtApp()
 
-addTab({ type: 'auth', title: 'Team & Auth' })
+if (!route.params.type) {
+  addTab({ type: 'auth', title: 'Team & Auth' })
+}
 
 watch(
   () => route.params.projectId,
@@ -29,39 +31,6 @@ $state.sidebarOpen.value = true
     <template #sidebar>
       <DashboardTreeView />
     </template>
-
-    <v-container fluid>
-      <!--      <DashboardTabView /> -->
-      <NuxtPage />
-    </v-container>
+    <NuxtPage />
   </NuxtLayout>
 </template>
-
-<style scoped lang="scss">
-.nc-container {
-  .nc-topbar {
-    position: fixed;
-    top: 0;
-    left: 0;
-    height: 50px;
-    width: 100%;
-    z-index: 5;
-  }
-
-  .nc-sidebar {
-    position: fixed;
-    top: 50px;
-    left: 0;
-    height: calc(100% - 50px);
-    width: 250px;
-  }
-
-  .nc-content {
-    position: fixed;
-    top: 50px;
-    left: 250px;
-    height: calc(100% - 50px);
-    width: calc(100% - 250px);
-  }
-}
-</style>
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
index 1ee8d54135..15e78b95ce 100644
--- a/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
+++ b/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
@@ -9,26 +9,24 @@ provide(TabMetaInj, activeTab)
 </script>
 
 <template>
-  <div>
-    <!--    <v-tabs v-model="activeTab" height="32" density="compact" color="primary">
-      <v-tab v-for="(tab, i) in tabs" :key="i" :value="i" class="text-capitalize">
-        {{ tab.title }}
-        <MdiCloseIcon class="ml-2 text-gray-500/50" @click.stop="closeTab(i)"></MdiCloseIcon>
-      </v-tab>
-      <MdiPlusIcon @click="tableCreateDialog = true" />
-      <DlgTableCreate v-if="tableCreateDialog" v-model="tableCreateDialog" />
-    </v-tabs> -->
-    <a-tabs v-model:activeKey="activeTabIndex" size="small" type="editable-card" @edit="closeTab">
-      <a-tab-pane v-for="(tab, i) in tabs" :key="i" :tab="tab.title" />
-    </a-tabs>
-
-    <NuxtPage />
-    <!--    <v-window v-model="activeTab">
-      <v-window-item v-for="(tab, i) in tabs" :key="i" :value="i">
-        <TabsSmartsheet :tab-meta="tab" />
-      </v-window-item>
-    </v-window> -->
+  <div class="nc-container d-flex flex-column">
+    <div>
+      <a-tabs v-model:activeKey="activeTabIndex" size="small" type="editable-card" @edit="closeTab">
+        <a-tab-pane v-for="(tab, i) in tabs" :key="i" :tab="tab.title" />
+      </a-tabs>
+    </div>
+    <div class="flex-1">
+      <NuxtPage />
+    </div>
   </div>
 </template>
 
-<style scoped></style>
+<style scoped>
+.nc-container {
+  height: calc(100vh - var(--header-height));
+}
+
+:deep(.ant-tabs-nav) {
+  @apply !mb-0;
+}
+</style>
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index/index/[type]/[title]/[viewTitle]/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index/index/[type]/[title]/[[viewTitle]].vue
similarity index 100%
rename from packages/nc-gui-v2/pages/nc/[projectId]/index/index/[type]/[title]/[viewTitle]/index.vue
rename to packages/nc-gui-v2/pages/nc/[projectId]/index/index/[type]/[title]/[[viewTitle]].vue
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index/index/[type]/[title]/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index/index/[type]/[title]/index.vue
deleted file mode 100644
index ec671406ea..0000000000
--- a/packages/nc-gui-v2/pages/nc/[projectId]/index/index/[type]/[title]/index.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<script>
-export default {
-  name: 'Index',
-}
-</script>
-
-<template>
-  <TabsSmartsheet />
-</template>
-
-<style scoped></style>

From f0bcafae2a82b20e948d5e6506b55429447d2742 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 25 Jul 2022 22:38:03 +0530
Subject: [PATCH 13/27] refactor(gui-v2): ui corrections

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/dashboard/TreeView.vue         |   2 +-
 .../smartsheet-toolbar/ColumnFilterMenu.vue   |  17 +-
 .../smartsheet-toolbar/FieldsMenu.vue         |  19 +-
 .../smartsheet-toolbar/SortListMenu.vue       |  16 +-
 .../nc-gui-v2/components/smartsheet/Grid.vue  | 246 +++++++++---------
 .../components/smartsheet/Pagination.vue      |  20 +-
 .../nc-gui-v2/components/tabs/Smartsheet.vue  |  24 +-
 .../pages/nc/[projectId]/index/index.vue      |   5 +-
 8 files changed, 189 insertions(+), 160 deletions(-)

diff --git a/packages/nc-gui-v2/components/dashboard/TreeView.vue b/packages/nc-gui-v2/components/dashboard/TreeView.vue
index 06ec40b4cf..66348c7385 100644
--- a/packages/nc-gui-v2/components/dashboard/TreeView.vue
+++ b/packages/nc-gui-v2/components/dashboard/TreeView.vue
@@ -208,7 +208,7 @@ const addTableTab = (table: TableType) => {
     </div>
 
     <a-dropdown :trigger="['contextmenu']">
-      <div class="p-1 flex-1 overflow-y-auto flex flex-column">
+      <div class="p-1 flex-1 overflow-y-auto flex flex-column scrollbar-thin-primary">
         <div
           class="py-1 px-3 flex w-full align-center gap-1 cursor-pointer"
           @click="showTableList = !showTableList"
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
index c27688aa71..7c5e85a00f 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
@@ -19,23 +19,24 @@ const applyChanges = () => {}
   <v-menu offset-y eager transition="slide-y-transition">
     <template #activator="{ props }">
       <v-badge :value="filters.length" color="primary" dot overlap>
-        <v-btn
+        <a-button
           v-t="['c:filter']"
           class="nc-filter-menu-btn px-2 nc-remove-border"
           :disabled="isLocked"
           outlined
-          small
+          size="small"
           text
           :class="{
             'primary lighten-5 grey--text text--darken-3': filters.length,
           }"
           v-bind="props"
-        >
-          <MdiFilterIcon class="mr-1 text-grey" />
-          <!-- Filter -->
-          <span class="text-capitalize">{{ $t('activity.filter') }}</span>
-          <MdiMenuDownIcon class="text-grey" />
-        </v-btn>
+          ><div class="flex align-center gap-1 text-sm">
+            <MdiFilterIcon class="text-grey" />
+            <!-- Filter -->
+            <span class="text-capitalize">{{ $t('activity.filter') }}</span>
+            <MdiMenuDownIcon class="text-grey" />
+          </div>
+        </a-button>
       </v-badge>
     </template>
     <SmartsheetToolbarColumnFilter>
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
index 73edd42973..78fe9ea7ba 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
@@ -315,23 +315,24 @@ export default {
   <v-menu>
     <template #activator="{ props }">
       <v-badge :value="isAnyFieldHidden" color="primary" dot overlap v-bind="props">
-        <v-btn
+        <a-button
           v-t="['c:fields']"
           class="nc-fields-menu-btn px-2 nc-remove-border"
           :disabled="isLocked"
           outlined
-          small
+          size="small"
           text
           :class="{
             'primary lighten-5 grey--text text--darken-3': isAnyFieldHidden,
           }"
-        >
-          <!--          <v-icon small class="mr-1" color="#777"> mdi-eye-off-outline </v-icon> -->
-          <MdiEyeIcon class="mr-1 text-grey"></MdiEyeIcon>
-          <!-- Fields -->
-          <span class="text-sm text-capitalize">{{ $t('objects.fields') }}</span>
-          <MdiMenuDownIcon class="text-grey"></MdiMenuDownIcon>
-        </v-btn>
+          ><div class="flex align-center gap-1 text-sm">
+            <!--          <v-icon small class="mr-1" color="#777"> mdi-eye-off-outline </v-icon> -->
+            <MdiEyeIcon class="text-grey"></MdiEyeIcon>
+            <!-- Fields -->
+            <span class="text-capitalize">{{ $t('objects.fields') }}</span>
+            <MdiMenuDownIcon class="text-grey"></MdiMenuDownIcon>
+          </div>
+        </a-button>
       </v-badge>
     </template>
 
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
index 322d81eded..f655e10b62 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
@@ -29,8 +29,9 @@ watch(
   <v-menu offset-y transition="slide-y-transition">
     <template #activator="{ props }">
       <v-badge :value="sorts && sorts.length" color="primary" dot overlap>
-        <v-btn
+        <a-button
           v-t="['c:sort']"
+          size="small"
           class="nc-sort-menu-btn px-2 nc-remove-border"
           :disabled="isLocked"
           small
@@ -40,12 +41,13 @@ watch(
             'primary lighten-5 grey&#45;&#45;text text&#45;&#45;darken-3': sorts && sorts.length,
           }"
           v-bind="props"
-        >
-          <MdiSortIcon class="mr-1 text-grey" />
-          <!-- Sort -->
-          <span class="text-capitalize">{{ $t('activity.sort') }}</span>
-          <MdiMenuDownIcon class="text-grey" />
-        </v-btn>
+          ><div class="flex align-center gap-1 text-sm">
+            <MdiSortIcon class="text-grey" />
+            <!-- Sort -->
+            <span class="text-capitalize">{{ $t('activity.sort') }}</span>
+            <MdiMenuDownIcon class="text-grey" />
+          </div>
+        </a-button>
       </v-badge>
     </template>
     <div class="backgroundColor pa-2 menu-filter-dropdown bg-background min-w-[400px]">
diff --git a/packages/nc-gui-v2/components/smartsheet/Grid.vue b/packages/nc-gui-v2/components/smartsheet/Grid.vue
index 7a57d550d5..143695c2fa 100644
--- a/packages/nc-gui-v2/components/smartsheet/Grid.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Grid.vue
@@ -65,129 +65,131 @@ defineExpose({
 </script>
 
 <template>
-  <div class="nc-grid-wrapper">
-    <table class="xc-row-table nc-grid backgroundColorDefault">
-      <thead>
-        <tr>
-          <th>#</th>
-          <th v-for="col in fields" :key="col.title">
-            <SmartsheetHeaderVirtualCell v-if="isVirtualCol(col)" :column="col" />
-            <SmartsheetHeaderCell v-else :column="col" />
-          </th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr v-for="({ row }, rowIndex) in data" :key="rowIndex" class="nc-grid-row">
-          <td key="row-index" style="width: 65px" class="caption nc-grid-cell">
-            <div class="d-flex align-center">
-              {{ rowIndex + 1 }}
-            </div>
-          </td>
-          <td
-            v-for="(columnObj, colIndex) in fields"
-            :key="rowIndex + columnObj.title"
-            class="cell pointer nc-grid-cell"
-            :class="{
-              active: !isPublicView && selected.col === colIndex && selected.row === rowIndex,
-              // 'primary-column': primaryValueColumn === columnObj.title,
-              // 'text-center': isCentrallyAligned(columnObj),
-              // 'required': isRequired(columnObj, rowObj),
-            }"
-            :data-col="columnObj.title"
-            @click="selectCell(rowIndex, colIndex)"
-            @dblclick="editEnabled = true"
-          >
-            <!--          @contextmenu=" -->
-            <!--            showRowContextMenu($event, rowObj, rowMeta, row, col, columnObj) -->
-            <!--          " -->
-            <!--        > -->
-            <!--          <virtual-cell -->
-            <!--            v-if="isVirtualCol(columnObj)" -->
-            <!--            :password="password" -->
-            <!--            :is-public="isPublicView" -->
-            <!--            :metas="metas" -->
-            <!--            :is-locked="isLocked" -->
-            <!--            :column="columnObj" -->
-            <!--            :row="rowObj" -->
-            <!--            :nodes="nodes" -->
-            <!--            :meta="meta" -->
-            <!--            :api="api" -->
-            <!--            :active="selected.col === col && selected.row === row" -->
-            <!--            :sql-ui="sqlUi" -->
-            <!--            :is-new="rowMeta.new" -->
-            <!--            v-on="$listeners" -->
-            <!--            @updateCol=" -->
-            <!--              (...args) => -->
-            <!--                updateCol( -->
-            <!--                  ...args, -->
-            <!--                  columnObj.bt -->
-            <!--                    && meta.columns.find( -->
-            <!--                      (c) => c.column_name === columnObj.bt.column_name, -->
-            <!--                    ), -->
-            <!--                  col, -->
-            <!--                  row, -->
-            <!--                ) -->
-            <!--            " -->
-            <!--            @saveRow="onCellValueChange(col, row, columnObj, true)" -->
-            <!--          /> -->
-
-            <!--          <editable-cell -->
-            <!--            v-else-if=" -->
-            <!--              ((isPkAvail || rowMeta.new) -->
-            <!--                && !isView -->
-            <!--                && !isLocked -->
-            <!--                && !isPublicView -->
-            <!--                && editEnabled.col === col -->
-            <!--                && editEnabled.row === row) -->
-            <!--                || enableEditable(columnObj) -->
-            <!--            " -->
-            <!--            v-model="rowObj[columnObj.title]" -->
-            <!--            :column="columnObj" -->
-            <!--            :meta="meta" -->
-            <!--            :active="selected.col === col && selected.row === row" -->
-            <!--            :sql-ui="sqlUi" -->
-            <!--            :db-alias="nodes.dbAlias" -->
-            <!--            :is-locked="isLocked" -->
-            <!--            :is-public="isPublicView" -->
-            <!--            :view-id="viewId" -->
-            <!--            @save="editEnabled = {}; onCellValueChange(col, row, columnObj, true);" -->
-            <!--            @cancel="editEnabled = {}" -->
-            <!--            @update="onCellValueChange(col, row, columnObj, false)" -->
-            <!--            @blur="onCellValueChange(col, row, columnObj, true)" -->
-            <!--            @input="unsaved = true" -->
-            <!--            @navigateToNext="navigateToNext" -->
-            <!--            @navigateToPrev="navigateToPrev" -->
-            <!--          /> -->
-
-            <SmartsheetVirtualCell v-if="isVirtualCol(columnObj)" v-model="row[columnObj.title]" :column="columnObj" />
-
-            <SmartsheetCell
-              v-else
-              v-model="row[columnObj.title]"
-              :column="columnObj"
-              :edit-enabled="editEnabled && selected.col === colIndex && selected.row === rowIndex"
-              @update:model-value="updateRowProperty(row, columnObj.title)"
-            />
-
-            <!--          <SmartsheetCell v-else :column="columnObj" :value="row[columnObj.title]" /> -->
-            <!-- :selected="selected.col === col && selected.row === row" -->
-            <!--        :is-locked="isLocked" -->
-            <!--            :column="columnObj" -->
-            <!--            :meta="meta" -->
-            <!--            :db-alias="nodes.dbAlias" -->
-            <!--            :value="rowObj[columnObj.title]" -->
-            <!--            :sql-ui="sqlUi" -->
-            <!--            @enableedit=" -->
-            <!--              makeSelected(col, row); -->
-            <!--              makeEditable(col, row, columnObj.ai, rowMeta); -->
-            <!--            " -->
-            <!--          /> -->
-          </td>
-        </tr>
-      </tbody>
-    </table>
+  <div class="flex flex-col h-100 min-h-0 w-100">
+    <div class="nc-grid-wrapper min-h-0 flex-1 scrollbar-thin-primary">
+      <table class="xc-row-table nc-grid backgroundColorDefault">
+        <thead>
+          <tr>
+            <th>#</th>
+            <th v-for="col in fields" :key="col.title">
+              <SmartsheetHeaderVirtualCell v-if="isVirtualCol(col)" :column="col" />
+              <SmartsheetHeaderCell v-else :column="col" />
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="({ row }, rowIndex) in data" :key="rowIndex" class="nc-grid-row">
+            <td key="row-index" style="width: 65px" class="caption nc-grid-cell">
+              <div class="d-flex align-center">
+                {{ rowIndex + 1 }}
+              </div>
+            </td>
+            <td
+              v-for="(columnObj, colIndex) in fields"
+              :key="rowIndex + columnObj.title"
+              class="cell pointer nc-grid-cell"
+              :class="{
+                active: !isPublicView && selected.col === colIndex && selected.row === rowIndex,
+                // 'primary-column': primaryValueColumn === columnObj.title,
+                // 'text-center': isCentrallyAligned(columnObj),
+                // 'required': isRequired(columnObj, rowObj),
+              }"
+              :data-col="columnObj.title"
+              @click="selectCell(rowIndex, colIndex)"
+              @dblclick="editEnabled = true"
+            >
+              <!--          @contextmenu=" -->
+              <!--            showRowContextMenu($event, rowObj, rowMeta, row, col, columnObj) -->
+              <!--          " -->
+              <!--        > -->
+              <!--          <virtual-cell -->
+              <!--            v-if="isVirtualCol(columnObj)" -->
+              <!--            :password="password" -->
+              <!--            :is-public="isPublicView" -->
+              <!--            :metas="metas" -->
+              <!--            :is-locked="isLocked" -->
+              <!--            :column="columnObj" -->
+              <!--            :row="rowObj" -->
+              <!--            :nodes="nodes" -->
+              <!--            :meta="meta" -->
+              <!--            :api="api" -->
+              <!--            :active="selected.col === col && selected.row === row" -->
+              <!--            :sql-ui="sqlUi" -->
+              <!--            :is-new="rowMeta.new" -->
+              <!--            v-on="$listeners" -->
+              <!--            @updateCol=" -->
+              <!--              (...args) => -->
+              <!--                updateCol( -->
+              <!--                  ...args, -->
+              <!--                  columnObj.bt -->
+              <!--                    && meta.columns.find( -->
+              <!--                      (c) => c.column_name === columnObj.bt.column_name, -->
+              <!--                    ), -->
+              <!--                  col, -->
+              <!--                  row, -->
+              <!--                ) -->
+              <!--            " -->
+              <!--            @saveRow="onCellValueChange(col, row, columnObj, true)" -->
+              <!--          /> -->
+
+              <!--          <editable-cell -->
+              <!--            v-else-if=" -->
+              <!--              ((isPkAvail || rowMeta.new) -->
+              <!--                && !isView -->
+              <!--                && !isLocked -->
+              <!--                && !isPublicView -->
+              <!--                && editEnabled.col === col -->
+              <!--                && editEnabled.row === row) -->
+              <!--                || enableEditable(columnObj) -->
+              <!--            " -->
+              <!--            v-model="rowObj[columnObj.title]" -->
+              <!--            :column="columnObj" -->
+              <!--            :meta="meta" -->
+              <!--            :active="selected.col === col && selected.row === row" -->
+              <!--            :sql-ui="sqlUi" -->
+              <!--            :db-alias="nodes.dbAlias" -->
+              <!--            :is-locked="isLocked" -->
+              <!--            :is-public="isPublicView" -->
+              <!--            :view-id="viewId" -->
+              <!--            @save="editEnabled = {}; onCellValueChange(col, row, columnObj, true);" -->
+              <!--            @cancel="editEnabled = {}" -->
+              <!--            @update="onCellValueChange(col, row, columnObj, false)" -->
+              <!--            @blur="onCellValueChange(col, row, columnObj, true)" -->
+              <!--            @input="unsaved = true" -->
+              <!--            @navigateToNext="navigateToNext" -->
+              <!--            @navigateToPrev="navigateToPrev" -->
+              <!--          /> -->
+
+              <SmartsheetVirtualCell v-if="isVirtualCol(columnObj)" v-model="row[columnObj.title]" :column="columnObj" />
+
+              <SmartsheetCell
+                v-else
+                v-model="row[columnObj.title]"
+                :column="columnObj"
+                :edit-enabled="editEnabled && selected.col === colIndex && selected.row === rowIndex"
+                @update:model-value="updateRowProperty(row, columnObj.title)"
+              />
+
+              <!--          <SmartsheetCell v-else :column="columnObj" :value="row[columnObj.title]" /> -->
+              <!-- :selected="selected.col === col && selected.row === row" -->
+              <!--        :is-locked="isLocked" -->
+              <!--            :column="columnObj" -->
+              <!--            :meta="meta" -->
+              <!--            :db-alias="nodes.dbAlias" -->
+              <!--            :value="rowObj[columnObj.title]" -->
+              <!--            :sql-ui="sqlUi" -->
+              <!--            @enableedit=" -->
+              <!--              makeSelected(col, row); -->
+              <!--              makeEditable(col, row, columnObj.ai, rowMeta); -->
+              <!--            " -->
+              <!--          /> -->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <SmartsheetPagination />
   </div>
-  <SmartsheetPagination />
 </template>
 
 <style scoped lang="scss">
diff --git a/packages/nc-gui-v2/components/smartsheet/Pagination.vue b/packages/nc-gui-v2/components/smartsheet/Pagination.vue
index 84fc428d77..352d66494e 100644
--- a/packages/nc-gui-v2/components/smartsheet/Pagination.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Pagination.vue
@@ -48,7 +48,7 @@ export default {
   <div class="d-flex align-center">
     <span v-if="count !== null && count !== Infinity" class="caption ml-2"> {{ count }} record{{ count !== 1 ? 's' : '' }} </span>
     <v-spacer />
-    <v-pagination
+    <!--    <v-pagination
       v-if="count !== Infinity"
       v-model="page"
       style="max-width: 100%"
@@ -56,6 +56,17 @@ export default {
       :total-visible="8"
       color="primary lighten-2"
       class="nc-pagination"
+    /> -->
+
+    <a-pagination
+      v-if="count !== Infinity"
+      v-model:current="page"
+      size="small"
+      class="!text-xs !m-1"
+      :total="count"
+      :page-size="size"
+      show-less-items
+      :show-size-changer="false"
     />
     <div v-else class="mx-auto d-flex align-center mt-n1" style="max-width: 250px">
       <span class="caption" style="white-space: nowrap"> Change page:</span>
@@ -79,3 +90,10 @@ export default {
     <v-spacer />
   </div>
 </template>
+
+<style scoped>
+:deep(.ant-pagination-item a) {
+  line-height: 21px !important;
+  @apply text-sm;
+}
+</style>
diff --git a/packages/nc-gui-v2/components/tabs/Smartsheet.vue b/packages/nc-gui-v2/components/tabs/Smartsheet.vue
index afd90c7c27..7f4e678c4c 100644
--- a/packages/nc-gui-v2/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui-v2/components/tabs/Smartsheet.vue
@@ -37,17 +37,21 @@ watch(
 </script>
 
 <template>
-  <div class="overflow-auto nc-container">
-    <SmartsheetToolbar />
-    <template v-if="meta">
-      <div class="d-flex">
-        <div v-if="activeView" class="flex-grow-1 min-w-0">
-          <SmartsheetGrid v-if="activeView.type === ViewTypes.GRID" :ref="el" />
-          <SmartsheetGallery v-else-if="activeView.type === ViewTypes.GALLERY" />
-          <SmartsheetForm v-else-if="activeView.type === ViewTypes.FORM" />
+  <div class="nc-container flex h-full">
+    <div class="flex flex-col h-full flex-1 min-w-0">
+      <SmartsheetToolbar />
+      <template v-if="meta">
+        <div class="flex flex-1 min-h-0">
+          <div v-if="activeView" class="h-full flex-grow min-w-0 min-h-0">
+            <SmartsheetGrid v-if="activeView.type === ViewTypes.GRID" :ref="el" />
+            <SmartsheetGallery v-else-if="activeView.type === ViewTypes.GALLERY" />
+            <SmartsheetForm v-else-if="activeView.type === ViewTypes.FORM" />
+          </div>
         </div>
-        <SmartsheetSidebar />
-      </div>
+      </template>
+    </div>
+    <template v-if="meta">
+      <SmartsheetSidebar />
     </template>
   </div>
 </template>
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
index 15e78b95ce..6af756e0d9 100644
--- a/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
+++ b/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
@@ -15,7 +15,7 @@ provide(TabMetaInj, activeTab)
         <a-tab-pane v-for="(tab, i) in tabs" :key="i" :tab="tab.title" />
       </a-tabs>
     </div>
-    <div class="flex-1">
+    <div class="flex-1 min-h-0">
       <NuxtPage />
     </div>
   </div>
@@ -23,7 +23,8 @@ provide(TabMetaInj, activeTab)
 
 <style scoped>
 .nc-container {
-  height: calc(100vh - var(--header-height));
+  height: calc(calc(100vh - var(--header-height)));
+  @apply overflow-hidden;
 }
 
 :deep(.ant-tabs-nav) {

From ec448b571005666d97f01eba575f4ab72994f02f Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 26 Jul 2022 13:13:22 +0530
Subject: [PATCH 14/27] feat(gui-v2): fields menu

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../smartsheet-toolbar/ColumnFilterMenu.vue   |   2 +-
 .../smartsheet-toolbar/FieldsMenu.vue         | 687 ++----------------
 .../smartsheet-toolbar/SortListMenu.vue       |   2 +-
 .../nc-gui-v2/composables/useViewColumns.ts   |   5 +
 packages/nc-gui-v2/nuxt.config.ts             |   2 +-
 packages/nc-gui-v2/package.json               |   3 +-
 6 files changed, 84 insertions(+), 617 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
index 7c5e85a00f..b4ba00eb05 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
@@ -21,7 +21,7 @@ const applyChanges = () => {}
       <v-badge :value="filters.length" color="primary" dot overlap>
         <a-button
           v-t="['c:filter']"
-          class="nc-filter-menu-btn px-2 nc-remove-border"
+          class="nc-filter-menu-btn px-2 nc-remove-border border-0"
           :disabled="isLocked"
           outlined
           size="small"
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
index 78fe9ea7ba..9f8d2e2bf0 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
@@ -1,9 +1,11 @@
 <script setup lang="ts">
 import { computed, inject } from 'vue'
+import Draggable from 'vuedraggable'
 import { ActiveViewInj, FieldsInj, IsLockedInj, MetaInj, ReloadViewDataHookInj } from '~/context'
 import useViewColumns from '~/composables/useViewColumns'
 import MdiMenuDownIcon from '~icons/mdi/menu-down'
 import MdiEyeIcon from '~icons/mdi/eye-off-outline'
+import MdiDragIcon from '~icons/mdi/drag'
 
 const { fieldsOrder, coverImageField, modelValue } = defineProps<{
   coverImageField?: string
@@ -23,6 +25,8 @@ const isAnyFieldHidden = computed(() => {
   // return meta?.fields?.some(field => field.hidden)
 })
 
+const { $e } = useNuxtApp()
+
 const {
   showSystemFields,
   sortedAndFilteredFields,
@@ -33,6 +37,7 @@ const {
   showAll,
   hideAll,
   saveOrUpdate,
+  sortedFields,
 } = useViewColumns(activeView, meta, false, () => reloadDataHook?.trigger())
 
 watch(
@@ -52,635 +57,91 @@ watch(
   { immediate: true },
 )
 
-/* import draggable from 'vuedraggable'
-import { getSystemColumnsIds } from 'nocodb-sdk'
-import { getUIDTIcon } from '~/components/project/spreadsheet/helpers/uiTypes'
-
-export default {
-  name: 'FieldsMenu',
-  components: {
-    Draggable: draggable,
-  },
-  props: {
-    coverImageField: String,
-    groupingField: String,
-    isGallery: Boolean,
-    isKanban: Boolean,
-    sqlUi: [Object, Function],
-    meta: Object,
-    fieldsOrder: [Array],
-    value: [Object, Array],
-    fieldList: [Array, Object],
-    showSystemFields: {
-      type: [Boolean, Number],
-      default: false,
-    },
-    isLocked: Boolean,
-    isPublic: Boolean,
-    viewId: String,
-  },
-  data: () => ({
-    fields: [],
-    fieldFilter: '',
-    showFields: {},
-    fieldsOrderLoc: [],
-  }),
-  computed: {
-    systemColumnsIds() {
-      return getSystemColumnsIds(this.meta && this.meta.columns)
-    },
-    attachmentFields() {
-      return [
-        ...(this.meta && this.meta.columns ? this.meta.columns.filter((f) => f.uidt === 'Attachment') : []),
-        {
-          alias: 'None',
-          id: null,
-        },
-      ]
-    },
-    singleSelectFields() {
-      return [
-        ...(this.meta && this.meta.columns ? this.meta.columns.filter((f) => f.uidt === 'SingleSelect') : []),
-        {
-          alias: 'None',
-          id: null,
-        },
-      ]
-    },
-    coverImageFieldLoc: {
-      get() {
-        return this.coverImageField
-      },
-      set(val) {
-        this.$emit('update:coverImageField', val)
-      },
-    },
-    groupingFieldLoc: {
-      get() {
-        return this.groupingField
-      },
-      set(val) {
-        this.$emit('update:groupingField', val)
-      },
-    },
-    columnMeta() {
-      return this.meta && this.meta.columns
-        ? this.meta.columns.reduce(
-            (o, c) => ({
-              ...o,
-              [c.title]: c,
-            }),
-            {},
-          )
-        : {}
-    },
-
-    isAnyFieldHidden() {
-      return this.fields.some((f) => !(!this.showSystemFieldsLoc && this.systemColumnsIds.includes(f.fk_column_id)) && !f.show) // Object.values(this.showFields).some(v => !v)
-    },
-    showSystemFieldsLoc: {
-      get() {
-        return this.showSystemFields
-      },
-      set(v) {
-        this.$emit('update:showSystemFields', v)
-        this.showFields = this.fields.reduce((o, c) => ({ [c.title]: c.show, ...o }), {})
-        this.$emit(
-          'update:fieldsOrder',
-          this.fields.map((c) => c.title),
-        )
-
-        this.$e('a:fields:system-fields')
-      },
-    },
-  },
-  watch: {
-    async viewId(v) {
-      if (v) {
-        await this.loadFields()
-      }
-    },
-    fieldList(f) {
-      this.fieldsOrderLoc = [...f]
-    },
-    showFields: {
-      handler(v) {
-        this.$nextTick(() => {
-          this.$emit('input', v)
-        })
-      },
-      deep: true,
-    },
-    value(v) {
-      this.showFields = v || []
-    },
-    fieldsOrder(n, o) {
-      if ((n && n.join()) !== (o && o.join())) {
-        this.fieldsOrderLoc = n
-      }
-
-      this.fieldsOrderLoc = n && n.length ? n : [...this.fieldList]
-    },
-    fieldsOrderLoc: {
-      handler(n, o) {
-        if ((n && n.join()) !== (o && o.join())) {
-          this.$emit('update:fieldsOrder', n)
-        }
-      },
-      deep: true,
-    },
-  },
-  created() {
-    this.loadFields()
-    this.showFields = this.value
-    this.fieldsOrderLoc = this.fieldsOrder && this.fieldsOrder.length ? this.fieldsOrder : [...this.fieldList]
-  },
-  methods: {
-    async loadFields() {
-      let fields = []
-      let order = 1
-      if (this.viewId) {
-        const data = await this.$api.dbViewColumn.list(this.viewId)
-        const fieldById = data.reduce(
-          (o, f) => ({
-            ...o,
-            [f.fk_column_id]: f,
-          }),
-          {},
-        )
-        fields = this.meta.columns
-          .map((c) => ({
-            title: c.title,
-            fk_column_id: c.id,
-            ...(fieldById[c.id] ? fieldById[c.id] : {}),
-            order: (fieldById[c.id] && fieldById[c.id].order) || order++,
-            icon: getUIDTIcon(c.uidt),
-          }))
-          .sort((a, b) => a.order - b.order)
-      } else if (this.isPublic) {
-        fields = this.meta.columns
-      }
-
-      this.fields = fields
-
-      this.$emit(
-        'input',
-        this.fields.reduce(
-          (o, c) => ({
-            ...o,
-            [c.title]: c.show,
-          }),
-          {},
-        ),
-      )
-      this.$emit(
-        'update:fieldsOrder',
-        this.fields.map((c) => c.title),
-      )
-    },
-    async saveOrUpdate(field, i) {
-      if (!this.isPublic && this._isUIAllowed('fieldsSync')) {
-        if (field.id) {
-          await this.$api.dbViewColumn.update(this.viewId, field.id, field)
-        } else {
-          this.fields[i] = await this.$api.dbViewColumn.create(this.viewId, field)
-        }
-      }
-      this.$emit('updated')
-      this.$emit(
-        'input',
-        this.fields.reduce(
-          (o, c) => ({
-            ...o,
-            [c.title]: c.show,
-          }),
-          {},
-        ),
-      )
-      this.$emit(
-        'update:fieldsOrder',
-        this.fields.map((c) => c.title),
-      )
-
-      this.$e('a:fields:show-hide')
-    },
-    async showAll() {
-      if (!this.isPublic) {
-        await this.$api.dbView.showAllColumn(this.viewId)
-      }
-      for (const f of this.fields) {
-        f.show = true
-      }
-      this.$emit('updated')
-
-      this.showFields = (this.fieldsOrderLoc || Object.keys(this.showFields)).reduce((o, k) => ((o[k] = true), o), {})
-
-      this.$e('a:fields:show-all')
-    },
-    async hideAll() {
-      if (!this.isPublic) {
-        await this.$api.dbView.hideAllColumn(this.viewId)
-      }
-      for (const f of this.fields) {
-        f.show = false
-      }
-      this.$emit('updated')
-
-      this.$nextTick(() => {
-        this.showFields = (this.fieldsOrderLoc || Object.keys(this.showFields)).reduce((o, k) => ((o[k] = false), o), {})
-      })
+const onMove = (event) => {
+  // todo : sync with server
+  // if (!sortedFields?.value) return
+  // if (sortedFields?.value.length - 1 === event.moved.newIndex) {
+  //   sortedFields.value[event.moved.newIndex].order = sortedFields.value[event.moved.newIndex - 1].order + 1
+  // } else if (event.moved.newIndex === 0) {
+  //   sortedFields.value[event.moved.newIndex].order = sortedFields.value[1].order / 2
+  // } else {
+  //   sortedFields.value[event.moved.newIndex].order =
+  //     (sortedFields?.value[event.moved.newIndex - 1].order + sortedFields?.value[event.moved.newIndex + 1].order) / 2
+  //   // );
+  // }
+  // saveOrUpdate(sortedFields[event.moved.newIndex], event.moved.newIndex);
+  $e('a:fields:reorder')
+}
 
-      this.$e('a:fields:hide-all')
-    },
-    onMove(event) {
-      if (this.fields.length - 1 === event.moved.newIndex) {
-        this.$set(this.fields[event.moved.newIndex], 'order', this.fields[event.moved.newIndex - 1].order + 1)
-      } else if (event.moved.newIndex === 0) {
-        this.$set(this.fields[event.moved.newIndex], 'order', this.fields[1].order / 2)
-      } else {
-        this.$set(
-          this.fields[event.moved.newIndex],
-          'order',
-          (this.fields[event.moved.newIndex - 1].order + this.fields[event.moved.newIndex + 1].order) / 2,
-        )
-      }
-      this.saveOrUpdate(this.fields[event.moved.newIndex], event.moved.newIndex)
-      this.$e('a:fields:reorder')
-    },
-  },
-} */
 </script>
 
 <template>
-  <v-menu>
-    <template #activator="{ props }">
-      <v-badge :value="isAnyFieldHidden" color="primary" dot overlap v-bind="props">
-        <a-button
-          v-t="['c:fields']"
-          class="nc-fields-menu-btn px-2 nc-remove-border"
-          :disabled="isLocked"
-          outlined
-          size="small"
-          text
-          :class="{
-            'primary lighten-5 grey--text text--darken-3': isAnyFieldHidden,
-          }"
-          ><div class="flex align-center gap-1 text-sm">
-            <!--          <v-icon small class="mr-1" color="#777"> mdi-eye-off-outline </v-icon> -->
-            <MdiEyeIcon class="text-grey"></MdiEyeIcon>
-            <!-- Fields -->
-            <span class="text-capitalize">{{ $t('objects.fields') }}</span>
-            <MdiMenuDownIcon class="text-grey"></MdiMenuDownIcon>
-          </div>
-        </a-button>
-      </v-badge>
-    </template>
-
-    <v-list density="compact" class="pt-0" min-width="280" @click.stop>
-      <div class="nc-fields-list py-1">
-        <!--        <Draggable v-model="fields" @start="drag = true" @end="drag = false" @change="onMove($event)"> -->
-        <v-list-item v-for="(field, i) in filteredFieldList" :key="field.id" dense>
-          <input
-            :id="`show-field-${field.id}`"
-            v-model="field.show"
-            type="checkbox"
-            class="mt-0 pt-0"
-            @click.stop
-            @change="saveOrUpdate(field, i)"
-          />
-          <!--                        @change="saveOrUpdate(field, i)"> -->
-          <!--            <template #label>
-                        &lt;!&ndash;                <v-icon small class="mr-1">
-                          {{ field.icon }}
-                        </v-icon> &ndash;&gt;
-                        <span class="caption">{{ field.title }}</span>
-                      </template> -->
-          <!--          </input> -->
-          <label :for="`show-field-${field.id}`" class="ml-2 text-sm">{{ field.title }}</label>
-          <v-spacer />
-
-          <!--          <v-icon small color="grey" :class="`align-self-center drag-icon nc-child-draggable-icon-${field}`"> mdi-drag </v-icon> -->
-        </v-list-item>
-        <!--        </Draggable> -->
-      </div>
-      <v-divider class="my-2" />
-
-      <v-list-item v-if="!isPublic" dense>
-        <!--
-show_system_fields
-<v-checkbox v-model="showSystemFields" class="mt-0 pt-0" dense hide-details @click.stop>
-          <template #label>
-            <span class="caption text-sm">
-              &lt;!&ndash; Show System Fields &ndash;&gt;
-              {{ $t('activity.showSystemFields') }}
-            </span>
-          </template>
-        </v-checkbox> -->
-        <input :id="`${activeView?.id}-show-system-fields`" v-model="showSystemFields" type="checkbox" />
-        <label :for="`${activeView.id}-show-system-fields`" class="caption text-sm ml-2">{{
-          $t('activity.showSystemFields')
-        }}</label>
-      </v-list-item>
-      <v-list-item dense class="mt-2 list-btn mb-3">
-        <v-btn small class="elevation-0 grey--text text-sm text-capitalize" @click.stop="showAll">
-          <!-- Show All -->
-          {{ $t('general.showAll') }}
-        </v-btn>
-        <v-btn small class="elevation-0 grey--text text-sm text-capitalize" @click.stop="hideAll">
-          <!-- Hide All -->
-          {{ $t('general.hideAll') }}
-        </v-btn>
-      </v-list-item>
-    </v-list>
-
-    <!--
-    <v-list dense class="pt-0" min-width="280" @click.stop>
-      <template v-if="isGallery && _isUIAllowed('updateCoverImage')">
-        <div class="pa-2">
-          <v-select
-            v-model="coverImageFieldLoc"
-            label="Cover Image"
-            class="caption field-caption"
-            dense
-            outlined
-            :items="attachmentFields"
-            item-text="alias"
-            item-value="id"
-            hide-details
-            @click.stop
-          >
-            <template #prepend-inner>
-              <v-icon small class="field-icon"> mdi-image </v-icon>
-            </template>
-          </v-select>
+  <a-dropdown :trigger="['click']">
+    <v-badge :value="isAnyFieldHidden" color="primary" dot overlap v-bind="props">
+      <a-button
+        v-t="['c:fields']"
+        class="nc-fields-menu-btn px-2 nc-remove-border border-0"
+        :disabled="isLocked"
+        outlined
+        size="small"
+        text
+        :class="{
+          'primary lighten-5 grey--text text--darken-3': isAnyFieldHidden,
+        }"
+      >
+        <div class="flex align-center gap-1 text-sm">
+          <!--          <v-icon small class="mr-1" color="#777"> mdi-eye-off-outline </v-icon> -->
+          <MdiEyeIcon class="text-grey"></MdiEyeIcon>
+          <!-- Fields -->
+          <span class="text-capitalize">{{ $t('objects.fields') }}</span>
+          <MdiMenuDownIcon class="text-grey"></MdiMenuDownIcon>
         </div>
-        <v-divider />
-      </template>
-
-      <template v-if="isKanban">
-        <div class="pa-2">
-          <v-select
-            v-model="groupingFieldLoc"
-            label="Grouping Field"
-            class="caption field-caption"
-            dense
-            outlined
-            :items="singleSelectFields"
-            item-text="alias"
-            item-value="title"
-            hide-details
-            @click.stop
-          >
-            <template #prepend-inner>
-              <v-icon small class="field-icon"> mdi-select-group </v-icon>
+      </a-button>
+    </v-badge>
+
+    <template #overlay>
+      <div class="pt-0 min-w-[280px] bg-white shadow" @click.stop>
+        <div class="nc-fields-list py-1">
+          <Draggable :list="sortedFields" @change="onMove($event)">
+            <template #item="{ element: field }">
+              <div :key="field.id" class="px-2 py-1 flex" @click.stop>
+                <a-checkbox v-model:checked="field.show" class="flex-shrink" @change="saveOrUpdate(field, i)">
+                  <span class="text-xs">{{ field.title }}</span>
+                </a-checkbox>
+                <div class="flex-1" />
+                <MdiDragIcon class="cursor-move" />
+              </div>
             </template>
-          </v-select>
+          </Draggable>
         </div>
-        <v-divider />
-      </template>
+        <v-divider class="my-2" />
 
-      <v-list-item dense class="">
-        <v-text-field
-          v-model="fieldFilter"
-          dense
-          flat
-          class="caption mt-3 mb-2"
-          color="grey"
-          :placeholder="$t('placeholder.searchFields')"
-          hide-details
-          @click.stop
-        >
-          &lt;!&ndash;          <template v-slot:prepend-inner>
-          <v-icon small color="grey" class="mt-2">
-            mdi-magnify
-          </v-icon>
-        </template> &ndash;&gt;
-        </v-text-field>
-      </v-list-item>
-      <div class="nc-fields-list py-1">
-        &lt;!&ndash;        <Draggable v-model="fields" @start="drag = true" @end="drag = false" @change="onMove($event)"> &ndash;&gt;
-        <template v-for="(field, i) in fields">
-          <v-list-item
-            v-show="
-              (!fieldFilter || (field.title || '').toLowerCase().includes(fieldFilter.toLowerCase())) &&
-              !(!showSystemFieldsLoc && systemColumnsIds.includes(field.fk_column_id))
-            "
-            :key="field.id"
-            dense
-          >
-            <v-checkbox v-model="field.show" class="mt-0 pt-0" dense hide-details @click.stop @change="saveOrUpdate(field, i)">
-              <template #label>
-                <v-icon small class="mr-1">
-                  {{ field.icon }}
-                </v-icon>
-                <span class="caption">{{ field.title }}</span>
-              </template>
-            </v-checkbox>
-            <v-spacer />
-            <v-icon small color="grey" :class="`align-self-center drag-icon nc-child-draggable-icon-${field}`"> mdi-drag </v-icon>
-          </v-list-item>
-        </template>
-        &lt;!&ndash;        </Draggable> &ndash;&gt;
-      </div>
-      <v-divider class="my-2" />
 
-      <v-list-item v-if="!isPublic" dense>
-        <v-checkbox v-model="showSystemFieldsLoc" class="mt-0 pt-0" dense hide-details @click.stop>
-          <template #label>
-            <span class="caption">
-              &lt;!&ndash; Show System Fields &ndash;&gt;
-              {{ $t('activity.showSystemFields') }}
-            </span>
-          </template>
-        </v-checkbox>
-      </v-list-item>
-      <v-list-item dense class="mt-2 list-btn mb-3">
-        <v-btn small class="elevation-0 grey&#45;&#45;text" @click.stop="showAll">
-          &lt;!&ndash; Show All &ndash;&gt;
-          {{ $t('general.showAll') }}
-        </v-btn>
-        <v-btn small class="elevation-0 grey&#45;&#45;text" @click.stop="hideAll">
-          &lt;!&ndash; Hide All &ndash;&gt;
-          {{ $t('general.hideAll') }}
-        </v-btn>
-      </v-list-item>
-    </v-list> -->
-  </v-menu>
-  <!--  <v-menu offset-y transition="slide-y-transition">
-    <template #activator="{ on }">
-      <v-badge :value="isAnyFieldHidden" color="primary" dot overlap>
-        <v-btn
-          v-t="['c:fields']"
-          class="nc-fields-menu-btn px-2 nc-remove-border"
-          :disabled="isLocked"
-          outlined
-          small
-          text
-          :class="{
-            'primary lighten-5 grey&#45;&#45;text text&#45;&#45;darken-3': isAnyFieldHidden,
-          }"
-          v-on="on"
-        >
-          <v-icon small class="mr-1" color="#777"> mdi-eye-off-outline </v-icon>
-          &lt;!&ndash; Fields &ndash;&gt;
-          {{ $t('objects.fields') }}
-          <v-icon small color="#777"> mdi-menu-down </v-icon>
-        </v-btn>
-      </v-badge>
-    </template>
+        <div class="p-2 py-1 flex" @click.stop>
 
-    <v-list dense class="pt-0" min-width="280" @click.stop>
-      <template v-if="isGallery && _isUIAllowed('updateCoverImage')">
-        <div class="pa-2">
-          <v-select
-            v-model="coverImageFieldLoc"
-            label="Cover Image"
-            class="caption field-caption"
-            dense
-            outlined
-            :items="attachmentFields"
-            item-text="alias"
-            item-value="id"
-            hide-details
-            @click.stop
-          >
-            <template #prepend-inner>
-              <v-icon small class="field-icon"> mdi-image </v-icon>
-            </template>
-          </v-select>
+          <a-checkbox v-model:checked="showSystemFields">
+            <span class="text-xs"> {{ $t('activity.showSystemFields') }}</span>
+          </a-checkbox>
         </div>
-        <v-divider />
-      </template>
-
-      <template v-if="isKanban">
-        <div class="pa-2">
-          <v-select
-            v-model="groupingFieldLoc"
-            label="Grouping Field"
-            class="caption field-caption"
-            dense
-            outlined
-            :items="singleSelectFields"
-            item-text="alias"
-            item-value="title"
-            hide-details
-            @click.stop
-          >
-            <template #prepend-inner>
-              <v-icon small class="field-icon"> mdi-select-group </v-icon>
-            </template>
-          </v-select>
+        <div class="p-2 flex gap-2" @click.stop>
+          <a-button size="small" class="text-gray-500 text-sm text-capitalize" @click.stop="showAll">
+            <!-- Show All -->
+            {{ $t('general.showAll') }}
+          </a-button>
+          <a-button size="small" class="text-gray-500 text-sm text-capitalize" @click.stop="hideAll">
+            <!-- Hide All -->
+            {{ $t('general.hideAll') }}
+          </a-button>
         </div>
-        <v-divider />
-      </template>
-
-      <v-list-item dense class="">
-        <v-text-field
-          v-model="fieldFilter"
-          dense
-          flat
-          class="caption mt-3 mb-2"
-          color="grey"
-          :placeholder="$t('placeholder.searchFields')"
-          hide-details
-          @click.stop
-        >
-          &lt;!&ndash;          <template v-slot:prepend-inner>
-                      <v-icon small color="grey" class="mt-2">
-                        mdi-magnify
-                      </v-icon>
-                    </template> &ndash;&gt;
-        </v-text-field>
-      </v-list-item>
-      <div class="nc-fields-list py-1">
-        <Draggable v-model="fields" @start="drag = true" @end="drag = false" @change="onMove($event)">
-          <template v-for="(field, i) in fields">
-            <v-list-item
-              v-show="
-                (!fieldFilter || (field.title || '').toLowerCase().includes(fieldFilter.toLowerCase())) &&
-                !(!showSystemFieldsLoc && systemColumnsIds.includes(field.fk_column_id))
-              "
-              :key="field.id"
-              dense
-            >
-              <v-checkbox v-model="field.show" class="mt-0 pt-0" dense hide-details @click.stop @change="saveOrUpdate(field, i)">
-                <template #label>
-                  <v-icon small class="mr-1">
-                    {{ field.icon }}
-                  </v-icon>
-                  <span class="caption">{{ field.title }}</span>
-                </template>
-              </v-checkbox>
-              <v-spacer />
-              <v-icon small color="grey" :class="`align-self-center drag-icon nc-child-draggable-icon-${field}`">
-                mdi-drag
-              </v-icon>
-            </v-list-item>
-          </template>
-        </Draggable>
       </div>
-      <v-divider class="my-2" />
+    </template>
+
+  </a-dropdown>
 
-      <v-list-item v-if="!isPublic" dense>
-        <v-checkbox v-model="showSystemFieldsLoc" class="mt-0 pt-0" dense hide-details @click.stop>
-          <template #label>
-            <span class="caption">
-              &lt;!&ndash; Show System Fields &ndash;&gt;
-              {{ $t('activity.showSystemFields') }}
-            </span>
-          </template>
-        </v-checkbox>
-      </v-list-item>
-      <v-list-item dense class="mt-2 list-btn mb-3">
-        <v-btn small class="elevation-0 grey&#45;&#45;text" @click.stop="showAll">
-          &lt;!&ndash; Show All &ndash;&gt;
-          {{ $t('general.showAll') }}
-        </v-btn>
-        <v-btn small class="elevation-0 grey&#45;&#45;text" @click.stop="hideAll">
-          &lt;!&ndash; Hide All &ndash;&gt;
-          {{ $t('general.hideAll') }}
-        </v-btn>
-      </v-list-item>
-    </v-list>
-  </v-menu> -->
 </template>
 
 <style scoped lang="scss">
-/*::v-deep {
-  .v-list-item {
-    min-height: 30px;
-  }
-
-  .v-input--checkbox .v-icon {
-    font-size: 12px !important;
-  }
-
-  .field-caption {
-    .v-input__append-inner {
-      margin-top: 4px !important;
-    }
-
-    .v-input__slot {
-      min-height: 25px !important;
-    }
-
-    &.v-input input {
-      max-height: 20px !important;
-    }
-
-    .field-icon {
-      margin-top: 2px;
-    }
-  }
+:deep(.ant-checkbox-input) {
+  transform: scale(0.7);
 }
-
-.drag-icon {
-  cursor: all-scroll; !*cursor: grab;*!
-}
-
-.nc-fields-list {
-  height: auto;
-  max-height: 500px;
-  overflow-y: auto;
-}*/
 </style>
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
index f655e10b62..3dc3faa0f0 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
@@ -32,7 +32,7 @@ watch(
         <a-button
           v-t="['c:sort']"
           size="small"
-          class="nc-sort-menu-btn px-2 nc-remove-border"
+          class="nc-sort-menu-btn px-2 nc-remove-border border-0"
           :disabled="isLocked"
           small
           text
diff --git a/packages/nc-gui-v2/composables/useViewColumns.ts b/packages/nc-gui-v2/composables/useViewColumns.ts
index ddb1c0cb02..6851e387c6 100644
--- a/packages/nc-gui-v2/composables/useViewColumns.ts
+++ b/packages/nc-gui-v2/composables/useViewColumns.ts
@@ -119,6 +119,10 @@ export default function (
       ?.sort((c1, c2) => c1.order - c2.order)
       ?.map((c) => metaColumnById?.value?.[c.fk_column_id as string]) || []) as ColumnType[]
   })
+  const sortedFields = computed<ColumnType[]>(() => {
+    return (fields?.value?.sort((c1, c2) => c1.order - c2.order)?.map((c) => metaColumnById?.value?.[c.fk_column_id as string]) ||
+      []) as ColumnType[]
+  })
 
   return {
     fields,
@@ -130,5 +134,6 @@ export default function (
     saveOrUpdate,
     sortedAndFilteredFields,
     showSystemFields,
+    sortedFields,
   }
 }
diff --git a/packages/nc-gui-v2/nuxt.config.ts b/packages/nc-gui-v2/nuxt.config.ts
index 978d70430b..816ec0443e 100644
--- a/packages/nc-gui-v2/nuxt.config.ts
+++ b/packages/nc-gui-v2/nuxt.config.ts
@@ -49,7 +49,7 @@ export default defineNuxtConfig({
     css: {
       preprocessorOptions: {
         less: {
-          modifyVars: { 'primary-color': '#1348ba' },
+          modifyVars: { 'primary-color': '#1348ba', 'text-color': 'rgba(61, 61, 61, 1)' },
           javascriptEnabled: true,
         },
       },
diff --git a/packages/nc-gui-v2/package.json b/packages/nc-gui-v2/package.json
index 33edaaefe0..fa34ac69ef 100644
--- a/packages/nc-gui-v2/package.json
+++ b/packages/nc-gui-v2/package.json
@@ -24,8 +24,9 @@
     "unique-names-generator": "^4.7.1",
     "vue-i18n": "^9.1.10",
     "vue-toastification": "^2.0.0-rc.5",
-    "vuetify": "^3.0.0-alpha.13",
     "xlsx": "^0.17.3"
+    "vuedraggable": "^4.1.0",
+    "vuetify": "^3.0.0-alpha.13"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^0.25.2",

From ce8156fe687b02f76c21a599d731e212a20ac5bf Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 26 Jul 2022 13:39:39 +0530
Subject: [PATCH 15/27] feat(gui-v2): filter layout

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../smartsheet-toolbar/ColumnFilter.vue       | 73 +++++++++---------
 .../smartsheet-toolbar/ColumnFilterMenu.vue   | 70 ++++++-----------
 .../FieldListAutoCompleteDropdown.vue         | 76 ++++++++++++-------
 .../smartsheet-toolbar/FieldsMenu.vue         |  5 --
 4 files changed, 110 insertions(+), 114 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilter.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilter.vue
index 8470008f4c..28e10616db 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilter.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilter.vue
@@ -7,7 +7,7 @@ import { comparisonOpList } from '~/utils/filterUtils'
 import { ActiveViewInj, MetaInj, ReloadViewDataHookInj } from '~/context'
 import useViewFilters from '~/composables/useViewFilters'
 import MdiDeleteIcon from '~icons/mdi/close-box'
-
+import MdiAddIcon from '~icons/mdi/plus'
 const { nested = false, parentId } = defineProps<{ nested?: boolean; parentId?: string }>()
 
 const meta = inject(MetaInj)
@@ -72,13 +72,13 @@ watch(
 </script>
 
 <template>
-  <div class="backgroundColor pa-2 menu-filter-dropdown bg-background" :style="{ width: nested ? '100%' : '630px' }">
+  <div class="bg-white shadow pa-2 menu-filter-dropdown" :style="{ width: nested ? '100%' : '630px' }">
     <div v-if="filters && filters.length" class="grid" @click.stop>
       <template v-for="(filter, i) in filters" :key="filter.id || i">
         <template v-if="filter.status !== 'delete'">
           <div v-if="filter.is_group" :key="i" style="grid-column: span 4; padding: 6px" class="elevation-4">
             <div class="d-flex" style="gap: 6px; padding: 0 6px">
-              <v-icon
+              <!--              <v-icon
                 v-if="!filter.readOnly"
                 :key="`${i}_3`"
                 small
@@ -86,10 +86,18 @@ watch(
                 @click.stop="deleteFilter(filter, i)"
               >
                 mdi-close-box
-              </v-icon>
+              </v-icon> -->
+              <MdiDeleteIcon
+                v-if="!filter.readOnly"
+                small
+                class="nc-filter-item-remove-btn"
+                @click.stop="deleteFilter(filter, i)"
+              />
+
               <span v-else :key="`${i}_1`" />
-              <v-select
-                v-model="filter.logical_op"
+
+              <a-select
+                v-model:value="filter.logical_op"
                 class="flex-shrink-1 flex-grow-0 elevation-0 caption"
                 :items="['and', 'or']"
                 density="compact"
@@ -102,7 +110,7 @@ watch(
                 <!--                <template #item="{ item }"> -->
                 <!--                  <span class="caption font-weight-regular">{{ item }}</span> -->
                 <!--                </template> -->
-              </v-select>
+              </a-select>
             </div>
             <!--            <column-filter
               v-if="filter.id || shared"
@@ -134,28 +142,24 @@ watch(
               v-if="!filter.readOnly"
               class="nc-filter-item-remove-btn text-grey align-self-center"
               @click.stop="deleteFilter(filter, i)"
-            ></MdiDeleteIcon>
+            />
             <span v-else />
 
-            <span v-if="!i" :key="`${i}_2`" class="text-xs d-flex align-center">{{ $t('labels.where') }}</span>
+            <span v-if="!i" class="text-xs d-flex align-center">{{ $t('labels.where') }}</span>
 
-            <v-select
+            <a-select
               v-else
-              :key="`${i}_4`"
-              v-model="filter.logical_op"
-              class="w-full elevation-0 caption"
-              :items="['and', 'or']"
-              density="compact"
-              variant="solo"
+              v-model:value="filter.logical_op"
+              class="h-full"
+              :options="[
+                { value: 'and', text: 'AND' },
+                { value: 'or', text: 'OR' },
+              ]"
               hide-details
               :disabled="filter.readOnly"
               @click.stop
               @change="filterUpdateCondition(filter, i)"
             />
-            <!--              <template #item="{ item }">
-                <span class="caption font-weight-regular">{{ item }}</span>
-              </template>
-            </v-select> -->
 
             <FieldListAutoCompleteDropdown
               :key="`${i}_6`"
@@ -167,10 +171,10 @@ watch(
               @change="saveOrUpdate(filter, i)"
             />
 
-            <v-select
-              v-model="filter.comparison_op"
+            <a-select
+              v-model:value="filter.comparison_op"
               class="caption nc-filter-operation-select text-sm"
-              :items="comparisonOpList.map((it) => it.value)"
+              :options="comparisonOpList"
               :placeholder="$t('labels.operation')"
               density="compact"
               variant="solo"
@@ -189,21 +193,17 @@ watch(
             <!--              </template> -->
             <!--            </v-select> -->
             <span v-if="['null', 'notnull', 'empty', 'notempty'].includes(filter.comparison_op)" :key="`span${i}`" />
-            <v-checkbox
+            <a-checkbox
               v-else-if="types[filter.field] === 'boolean'"
-              :key="`${i}_7`"
-              v-model="filter.value"
+              v-model:value="filter.value"
               dense
               :disabled="filter.readOnly"
               @change="saveOrUpdate(filter, i)"
             />
-            <v-text-field
+            <a-input
               v-else
               :key="`${i}_7`"
               v-model="filter.value"
-              density="compact"
-              variant="solo"
-              hide-details
               class="caption text-sm nc-filter-value-select"
               :disabled="filter.readOnly"
               @click.stop
@@ -214,11 +214,14 @@ watch(
       </template>
     </div>
 
-    <v-btn small class="elevation-0 text-sm text-capitalize text-grey my-3" @click.stop="addFilter">
-      <!--      <v-icon small color="grey"> mdi-plus </v-icon> -->
-      <!-- Add Filter -->
-      {{ $t('activity.addFilter') }}
-    </v-btn>
+    <a-button small class="elevation-0 text-sm text-capitalize text-grey my-3" @click.stop="addFilter">
+      <div class="flex align-center gap-1">
+        <!--      <v-icon small color="grey"> mdi-plus </v-icon> -->
+        <MdiAddIcon />
+        <!-- Add Filter -->
+        {{ $t('activity.addFilter') }}
+      </div>
+    </a-button>
     <slot />
   </div>
 </template>
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
index b4ba00eb05..d432c5d179 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
@@ -16,51 +16,29 @@ const applyChanges = () => {}
 </script>
 
 <template>
-  <v-menu offset-y eager transition="slide-y-transition">
-    <template #activator="{ props }">
-      <v-badge :value="filters.length" color="primary" dot overlap>
-        <a-button
-          v-t="['c:filter']"
-          class="nc-filter-menu-btn px-2 nc-remove-border border-0"
-          :disabled="isLocked"
-          outlined
-          size="small"
-          text
-          :class="{
-            'primary lighten-5 grey--text text--darken-3': filters.length,
-          }"
-          v-bind="props"
-          ><div class="flex align-center gap-1 text-sm">
-            <MdiFilterIcon class="text-grey" />
-            <!-- Filter -->
-            <span class="text-capitalize">{{ $t('activity.filter') }}</span>
-            <MdiMenuDownIcon class="text-grey" />
-          </div>
-        </a-button>
-      </v-badge>
+  <a-dropdown :trigger="['click']">
+    <v-badge :value="filters.length" color="primary" dot overlap>
+      <a-button
+        v-t="['c:filter']"
+        class="nc-filter-menu-btn px-2 nc-remove-border border-0"
+        :disabled="isLocked"
+        outlined
+        size="small"
+        text
+        :class="{
+          'primary lighten-5 grey--text text--darken-3': filters.length,
+        }"
+      >
+        <div class="flex align-center gap-1 text-sm">
+          <MdiFilterIcon class="text-grey" />
+          <!-- Filter -->
+          <span class="text-capitalize">{{ $t('activity.filter') }}</span>
+          <MdiMenuDownIcon class="text-grey" />
+        </div>
+      </a-button>
+    </v-badge>
+    <template #overlay>
+      <SmartsheetToolbarColumnFilter />
     </template>
-    <SmartsheetToolbarColumnFilter>
-      <!--      <div class="d-flex align-center mx-2" @click.stop>
-        <v-checkbox
-          id="col-filter-checkbox"
-          v-model="autoApplyFilter"
-          class="col-filter-checkbox"
-          hide-details
-          dense
-          type="checkbox"
-          color="grey"
-        >
-          <template #label>
-            <span class="grey&#45;&#45;text caption">
-              {{ $t('msg.info.filterAutoApply') }}
-              &lt;!&ndash; Auto apply &ndash;&gt;
-            </span>
-          </template>
-        </v-checkbox>
-
-        <v-spacer />
-        <v-btn v-show="!autoApplyFilter" color="primary" small class="caption ml-2" @click="applyChanges"> Apply changes </v-btn>
-      </div> -->
-    </SmartsheetToolbarColumnFilter>
-  </v-menu>
+  </a-dropdown>
 </template>
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldListAutoCompleteDropdown.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldListAutoCompleteDropdown.vue
index d354e28503..b008c84b6c 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldListAutoCompleteDropdown.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldListAutoCompleteDropdown.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import type { SelectProps } from 'ant-design-vue'
+import { computed } from 'vue'
 import { MetaInj } from '~/context'
 
 interface Props {
@@ -42,37 +44,55 @@ const localValue = computed({
     },
   },
 } */
+const options = computed<SelectProps['options']>(() =>
+  meta?.value?.columns?.map((c) => ({
+    value: c.id,
+    label: c.title,
+  })),
+)
+
+const filterOption = (input: string, option: any) => {
+  return option.value.toLowerCase()?.includes(input.toLowerCase())
+}
 </script>
 
 <template>
-  <v-autocomplete
-    ref="field"
-    v-model="localValue"
-    class="caption"
-    :items="meta.columns"
-    item-value="id"
-    item-text="title"
-    :label="$t('objects.field')"
-    variant="solo"
-    hide-details
-    @click.stop
-  >
-    <!--    &lt;!&ndash; @change="$emit('change')" &ndash;&gt; -->
-    <!--    <template #selection="{ item }"> -->
-    <!--      <v-icon small class="mr-1"> -->
-    <!--        {{ item.icon }} -->
-    <!--      </v-icon> -->
-    <!--      {{ item.title }} -->
-    <!--    </template> -->
-    <!--    <template #item="{ item }"> -->
-    <!--      <span :class="`caption font-weight-regular nc-fld-${item.title}`"> -->
-    <!--        <v-icon color="grey" small class="mr-1"> -->
-    <!--          {{ item.icon }} -->
-    <!--        </v-icon> -->
-    <!--        {{ item.title }} -->
-    <!--      </span> -->
-    <!--    </template> -->
-  </v-autocomplete>
+  <a-select
+    v-model:value="localValue"
+    show-search
+    placeholder="Select a field"
+    :options="options"
+    :filter-option="filterOption"
+  ></a-select>
+
+  <!--  <v-autocomplete
+      ref="field"
+      v-model="localValue"
+      class="caption"
+      :items="meta.columns"
+      item-value="id"
+      item-text="title"
+      :label="$t('objects.field')"
+      variant="solo"
+      hide-details
+      @click.stop
+    >
+      &lt;!&ndash;    &lt;!&ndash; @change="$emit('change')" &ndash;&gt; &ndash;&gt;
+      &lt;!&ndash;    <template #selection="{ item }"> &ndash;&gt;
+      &lt;!&ndash;      <v-icon small class="mr-1"> &ndash;&gt;
+      &lt;!&ndash;        {{ item.icon }} &ndash;&gt;
+      &lt;!&ndash;      </v-icon> &ndash;&gt;
+      &lt;!&ndash;      {{ item.title }} &ndash;&gt;
+      &lt;!&ndash;    </template> &ndash;&gt;
+      &lt;!&ndash;    <template #item="{ item }"> &ndash;&gt;
+      &lt;!&ndash;      <span :class="`caption font-weight-regular nc-fld-${item.title}`"> &ndash;&gt;
+      &lt;!&ndash;        <v-icon color="grey" small class="mr-1"> &ndash;&gt;
+      &lt;!&ndash;          {{ item.icon }} &ndash;&gt;
+      &lt;!&ndash;        </v-icon> &ndash;&gt;
+      &lt;!&ndash;        {{ item.title }} &ndash;&gt;
+      &lt;!&ndash;      </span> &ndash;&gt;
+      &lt;!&ndash;    </template> &ndash;&gt;
+    </v-autocomplete> -->
 </template>
 
 <style scoped></style>
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
index 9f8d2e2bf0..3a6dda994e 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
@@ -72,7 +72,6 @@ const onMove = (event) => {
   // saveOrUpdate(sortedFields[event.moved.newIndex], event.moved.newIndex);
   $e('a:fields:reorder')
 }
-
 </script>
 
 <template>
@@ -116,9 +115,7 @@ const onMove = (event) => {
         </div>
         <v-divider class="my-2" />
 
-
         <div class="p-2 py-1 flex" @click.stop>
-
           <a-checkbox v-model:checked="showSystemFields">
             <span class="text-xs"> {{ $t('activity.showSystemFields') }}</span>
           </a-checkbox>
@@ -135,9 +132,7 @@ const onMove = (event) => {
         </div>
       </div>
     </template>
-
   </a-dropdown>
-
 </template>
 
 <style scoped lang="scss">

From 26b8edbb62bb2aca42e9326665048f4886eea697 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 26 Jul 2022 15:23:09 +0530
Subject: [PATCH 16/27] feat(gui-v2): sort layout

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../smartsheet-toolbar/SortListMenu.vue       | 128 +++++++++---------
 1 file changed, 67 insertions(+), 61 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
index 3dc3faa0f0..ed3ef5dc36 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
@@ -6,6 +6,7 @@ import useViewSorts from '~/composables/useViewSorts'
 import MdiMenuDownIcon from '~icons/mdi/menu-down'
 import MdiSortIcon from '~icons/mdi/sort'
 import MdiDeleteIcon from '~icons/mdi/close-box'
+import MdiAddIcon from '~icons/mdi/plus'
 
 const meta = inject(MetaInj)
 const view = inject(ActiveViewInj)
@@ -26,70 +27,75 @@ watch(
 </script>
 
 <template>
-  <v-menu offset-y transition="slide-y-transition">
-    <template #activator="{ props }">
-      <v-badge :value="sorts && sorts.length" color="primary" dot overlap>
-        <a-button
-          v-t="['c:sort']"
-          size="small"
-          class="nc-sort-menu-btn px-2 nc-remove-border border-0"
-          :disabled="isLocked"
-          small
-          text
-          outlined
-          :class="{
-            'primary lighten-5 grey&#45;&#45;text text&#45;&#45;darken-3': sorts && sorts.length,
-          }"
-          v-bind="props"
-          ><div class="flex align-center gap-1 text-sm">
-            <MdiSortIcon class="text-grey" />
-            <!-- Sort -->
-            <span class="text-capitalize">{{ $t('activity.sort') }}</span>
-            <MdiMenuDownIcon class="text-grey" />
+  <a-dropdown offset-y class="" :trigger="['click']">
+    <v-badge :value="sorts && sorts.length" color="primary" dot overlap>
+      <a-button
+        v-t="['c:sort']"
+        size="small"
+        class="nc-sort-menu-btn px-2 nc-remove-border border-0"
+        :disabled="isLocked"
+        small
+        text
+        outlined
+        :class="{
+          'primary lighten-5 grey&#45;&#45;text text&#45;&#45;darken-3': sorts && sorts.length,
+        }"
+        v-bind="props"
+        ><div class="flex align-center gap-1 text-sm">
+          <MdiSortIcon class="text-grey" />
+          <!-- Sort -->
+          <span class="text-capitalize">{{ $t('activity.sort') }}</span>
+          <MdiMenuDownIcon class="text-grey" />
+        </div>
+      </a-button>
+    </v-badge>
+    <template #overlay>
+      <div class="bg-white shadow p-2 menu-filter-dropdown min-w-[400px]">
+        <div class="sort-grid" @click.stop>
+          <template v-for="(sort, i) in sorts || []" :key="i">
+            <!--          <v-icon :key="`${i}icon`" class="nc-sort-item-remove-btn" small @click.stop="deleteSort(sort)"> mdi-close-box </v-icon> -->
+            <MdiDeleteIcon
+              class="nc-sort-item-remove-btn text-grey align-self-center"
+              small
+              @click.stop="deleteSort(sort, i)"
+            ></MdiDeleteIcon>
+            <FieldListAutoCompleteDropdown
+              v-model="sort.fk_column_id"
+              class="caption nc-sort-field-select"
+              :columns="columns"
+              @click.stop
+              @update:model-value="saveOrUpdate(sort, i)"
+            />
+            <a-select
+              v-model:value="sort.direction"
+              class="flex-shrink-1 flex-grow-0 caption nc-sort-dir-select"
+              :items="[
+                { text: 'asc', value: 'asc' },
+                { text: 'desc', value: 'desc' },
+              ]"
+              :label="$t('labels.operation')"
+              density="compact"
+              variant="solo"
+              hide-details
+              @click.stop
+              @update:model-value="saveOrUpdate(sort, i)"
+            />
+            <!--            <template #item="{ item }"> -->
+            <!--              <span class="caption font-weight-regular">{{ item.text }}</span> -->
+            <!--            </template> -->
+            <!--          </v-select> -->
+          </template>
+        </div>
+        <a-button size="small" class="text-grey text-capitalize text-sm my-3" @click.stop="addSort">
+          <div class="flex gap-1 align-center">
+            <MdiAddIcon />
+            <!-- Add Sort Option -->
+            {{ $t('activity.addSort') }}
           </div>
         </a-button>
-      </v-badge>
-    </template>
-    <div class="backgroundColor pa-2 menu-filter-dropdown bg-background min-w-[400px]">
-      <div class="sort-grid" @click.stop>
-        <template v-for="(sort, i) in sorts || []" :key="i">
-          <!--          <v-icon :key="`${i}icon`" class="nc-sort-item-remove-btn" small @click.stop="deleteSort(sort)"> mdi-close-box </v-icon> -->
-          <MdiDeleteIcon
-            class="nc-sort-item-remove-btn text-grey align-self-center"
-            small
-            @click.stop="deleteSort(sort, i)"
-          ></MdiDeleteIcon>
-          <FieldListAutoCompleteDropdown
-            v-model="sort.fk_column_id"
-            class="caption nc-sort-field-select"
-            :columns="columns"
-            @click.stop
-            @update:model-value="saveOrUpdate(sort, i)"
-          />
-          <v-select
-            v-model="sort.direction"
-            class="flex-shrink-1 flex-grow-0 caption nc-sort-dir-select"
-            :items="['asc', 'desc']"
-            :label="$t('labels.operation')"
-            density="compact"
-            variant="solo"
-            hide-details
-            @click.stop
-            @update:model-value="saveOrUpdate(sort, i)"
-          />
-          <!--            <template #item="{ item }"> -->
-          <!--              <span class="caption font-weight-regular">{{ item.text }}</span> -->
-          <!--            </template> -->
-          <!--          </v-select> -->
-        </template>
       </div>
-      <v-btn small class="elevation-0 text-grey text-capitalize text-sm my-3" @click.stop="addSort">
-        <!-- todo:        <v-icon small color="grey"> mdi-plus </v-icon> -->
-        <!-- Add Sort Option -->
-        {{ $t('activity.addSort') }}
-      </v-btn>
-    </div>
-  </v-menu>
+    </template>
+  </a-dropdown>
 </template>
 
 <style scoped>

From bdc57f0188fa5ab6559a73f0e7e9e6c21fed30b5 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 26 Jul 2022 15:44:21 +0530
Subject: [PATCH 17/27] feat(gui-v2): search component layout

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../smartsheet-toolbar/SearchData.vue         | 37 +++++++++++++++++++
 .../components/smartsheet/Toolbar.vue         |  3 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 packages/nc-gui-v2/components/smartsheet-toolbar/SearchData.vue

diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/SearchData.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/SearchData.vue
new file mode 100644
index 0000000000..0ad8bf0d87
--- /dev/null
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/SearchData.vue
@@ -0,0 +1,37 @@
+<script lang="ts" setup>
+import { MetaInj } from '~/context'
+
+const { modelValue, field } = defineProps<{
+  modelValue?: string
+  field?: any
+}>()
+
+const emit = defineEmits(['update:modelValue', 'update:field'])
+
+const localValue = computed({
+  get: () => modelValue,
+  set: (val) => emit('update:modelValue', val),
+})
+const localField = computed({
+  get: () => field,
+  set: (val) => emit('update:field', val),
+})
+
+const meta = inject(MetaInj)
+const columns = computed(() =>
+  meta?.value?.columns?.map((c) => ({
+    value: c.id,
+    label: c.title,
+  })),
+)
+</script>
+
+<template>
+  <a-input-search v-model:value="localValue" class="max-w-[250px]">
+    <template #addonBefore>
+      <a-select v-model:value="localField" :options="columns" style="width: 100px" class="!text-xs" />
+    </template>
+  </a-input-search>
+</template>
+
+<style scoped></style>
diff --git a/packages/nc-gui-v2/components/smartsheet/Toolbar.vue b/packages/nc-gui-v2/components/smartsheet/Toolbar.vue
index 5d1c7ed5da..69d5ec5689 100644
--- a/packages/nc-gui-v2/components/smartsheet/Toolbar.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Toolbar.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts"></script>
 
 <template>
-  <div dense class="nc-table-toolbar w-100 p-1 flex gap-1" style="z-index: 7">
+  <div dense class="nc-table-toolbar w-100 p-1 flex gap-1 align-center" style="z-index: 7">
+    <SmartsheetToolbarSearchData class="flex-shrink" />
     <SmartsheetToolbarFieldsMenu :show-system-fields="false" />
     <SmartsheetToolbarColumnFilterMenu />
     <SmartsheetToolbarSortListMenu />

From 9f4e7894187c2b2a34d0d89d02a7ce90ac49bd89 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 26 Jul 2022 17:52:36 +0530
Subject: [PATCH 18/27] feat(gui-v2): add all options in toolbar

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/smartsheet-toolbar/AddRow.vue  |  10 +
 .../smartsheet-toolbar/ColumnFilterMenu.vue   |  14 +-
 .../smartsheet-toolbar/DeleteTable.vue        |   9 +
 .../smartsheet-toolbar/FieldsMenu.vue         |  14 +-
 .../smartsheet-toolbar/LockMenu.vue           | 182 ++++++++----
 .../smartsheet-toolbar/MoreActions.vue        | 276 ++----------------
 .../components/smartsheet-toolbar/Reload.vue  |  11 +
 .../smartsheet-toolbar/SearchData.vue         |   4 +-
 .../smartsheet-toolbar/ShareView.vue          |  18 ++
 .../smartsheet-toolbar/SortListMenu.vue       |  15 +-
 .../smartsheet-toolbar/ToggleDrawer.vue       |  14 +
 .../components/smartsheet/Toolbar.vue         |  14 +-
 .../nc-gui-v2/components/tabs/Smartsheet.vue  |   4 +-
 13 files changed, 228 insertions(+), 357 deletions(-)
 create mode 100644 packages/nc-gui-v2/components/smartsheet-toolbar/AddRow.vue
 create mode 100644 packages/nc-gui-v2/components/smartsheet-toolbar/DeleteTable.vue
 create mode 100644 packages/nc-gui-v2/components/smartsheet-toolbar/Reload.vue
 create mode 100644 packages/nc-gui-v2/components/smartsheet-toolbar/ShareView.vue
 create mode 100644 packages/nc-gui-v2/components/smartsheet-toolbar/ToggleDrawer.vue

diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/AddRow.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/AddRow.vue
new file mode 100644
index 0000000000..9cd8e47b82
--- /dev/null
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/AddRow.vue
@@ -0,0 +1,10 @@
+<script setup lang="ts">
+import MdiAddIcon from '~icons/mdi/plus-outline '
+const emit = defineEmits(['add-row'])
+</script>
+
+<template>
+  <MdiAddIcon class="text-grey" @click="emit('add-row')" />
+</template>
+
+<style scoped></style>
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
index d432c5d179..a7b310048d 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue
@@ -18,18 +18,8 @@ const applyChanges = () => {}
 <template>
   <a-dropdown :trigger="['click']">
     <v-badge :value="filters.length" color="primary" dot overlap>
-      <a-button
-        v-t="['c:filter']"
-        class="nc-filter-menu-btn px-2 nc-remove-border border-0"
-        :disabled="isLocked"
-        outlined
-        size="small"
-        text
-        :class="{
-          'primary lighten-5 grey--text text--darken-3': filters.length,
-        }"
-      >
-        <div class="flex align-center gap-1 text-sm">
+      <a-button v-t="['c:filter']" class="nc-filter-menu-btn nc-toolbar-btn" :disabled="isLocked" size="small">
+        <div class="flex align-center gap-1">
           <MdiFilterIcon class="text-grey" />
           <!-- Filter -->
           <span class="text-capitalize">{{ $t('activity.filter') }}</span>
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/DeleteTable.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/DeleteTable.vue
new file mode 100644
index 0000000000..65a93e6176
--- /dev/null
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/DeleteTable.vue
@@ -0,0 +1,9 @@
+<script setup lang="ts">
+import MdiDeleteIcon from '~icons/mdi/delete-outline'
+</script>
+
+<template>
+  <MdiDeleteIcon class="text-grey" />
+</template>
+
+<style scoped></style>
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
index 3a6dda994e..1588ff57a4 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
@@ -77,18 +77,8 @@ const onMove = (event) => {
 <template>
   <a-dropdown :trigger="['click']">
     <v-badge :value="isAnyFieldHidden" color="primary" dot overlap v-bind="props">
-      <a-button
-        v-t="['c:fields']"
-        class="nc-fields-menu-btn px-2 nc-remove-border border-0"
-        :disabled="isLocked"
-        outlined
-        size="small"
-        text
-        :class="{
-          'primary lighten-5 grey--text text--darken-3': isAnyFieldHidden,
-        }"
-      >
-        <div class="flex align-center gap-1 text-sm">
+      <a-button v-t="['c:fields']" class="nc-fields-menu-btn nc-toolbar-btn" :disabled="isLocked" size="small">
+        <div class="flex align-center gap-1">
           <!--          <v-icon small class="mr-1" color="#777"> mdi-eye-off-outline </v-icon> -->
           <MdiEyeIcon class="text-grey"></MdiEyeIcon>
           <!-- Fields -->
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/LockMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/LockMenu.vue
index 7cced01c4f..1a627b96e5 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/LockMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/LockMenu.vue
@@ -1,5 +1,10 @@
 <script lang="ts" setup>
+import { computed } from '@vue/reactivity'
 import { useToast } from 'vue-toastification'
+import MdiLockOutlineIcon from '~icons/mdi/lock-outline'
+import MdiAccountIcon from '~icons/mdi/account'
+import MdiAccountGroupIcon from '~icons/mdi/account-group'
+import MdiCheckIcon from '~icons/mdi/check-bold'
 
 interface Props {
   modelValue?: LockType
@@ -32,6 +37,18 @@ function changeLockType(type: LockType) {
 
   toast.success(`Successfully Switched to ${type} view`, { timeout: 3000 })
 }
+
+const Icon = computed(() => {
+  switch (vModel.value) {
+    case LockType.Personal:
+      return MdiAccountIcon
+    case LockType.Locked:
+      return MdiLockOutlineIcon
+    case LockType.Collaborative:
+    default:
+      return MdiAccountGroupIcon
+  }
+})
 </script>
 
 <script lang="ts">
@@ -41,68 +58,109 @@ export default {
 </script>
 
 <template>
-  <v-menu offset-y max-width="350">
-    <template #activator="{ props: menuProps }">
-      <v-icon v-if="vModel === LockType.Locked" small class="mx-1 nc-view-lock-menu" v-bind="menuProps.onClick">
-        mdi-lock-outline
-      </v-icon>
-      <v-icon v-else-if="vModel === LockType.Personal" small class="mx-1 nc-view-lock-menu" v-bind="menuProps.onClick">
-        mdi-account
-      </v-icon>
-      <v-icon v-else small class="mx-1 nc-view-lock-menu" v-bind="menuProps.onClick"> mdi-account-group-outline </v-icon>
+  <a-dropdown max-width="350" :trigger="['click']">
+    <Icon class="mx-1 nc-view-lock-menu text-grey"> mdi-lock-outline </Icon>
+    <template #overlay>
+      <div class="min-w-[350px] max-w-[500px] shadow bg-white">
+        <div>
+          <div class="nc-menu-option">
+            <MdiCheckIcon v-if="!vModel || vModel === LockType.Collaborative" />
+            <span v-else />
+
+            <div>
+              <MdiAccountGroupIcon />
+              Collaborative view
+              <div class="nc-subtitle">Collaborators with edit permissions or higher can change the view configuration.</div>
+            </div>
+          </div>
+          <div class="nc-menu-option">
+            <MdiCheckIcon v-if="vModel === LockType.Locked" />
+            <span v-else />
+            <div>
+              <MdiLockOutlineIcon />
+              Locked View
+              <div class="nc-subtitle">No one can edit the view configuration until it is unlocked.</div>
+            </div>
+          </div>
+          <div class="nc-menu-option">
+            <MdiCheckIcon v-if="vModel === LockType.Personal" />
+            <span v-else />
+            <div>
+              <MdiAccountIcon />
+              Personal view
+              <div class="nc-subtitle">
+                Only you can edit the view configuration. Other collaborators’ personal views are hidden by default.
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
     </template>
-    <v-list maxc-width="350">
-      <v-list-item two-line class="pb-4" @click="changeLockType(LockType.Collaborative)">
-        <v-list-item-icon class="mr-1 align-self-center">
-          <v-icon v-if="!vModel || vModel === LockType.Collaborative" small> mdi-check-bold </v-icon>
-        </v-list-item-icon>
-        <v-list-item-content class="pb-1">
-          <v-list-item-title>
-            <v-icon small class="mt-n1" color="primary"> mdi-account-group </v-icon>
-            Collaborative view
-          </v-list-item-title>
-
-          <v-list-item-subtitle class="pt-2 pl- font-weight-light" style="white-space: normal">
-            Collaborators with edit permissions or higher can change the view configuration.
-          </v-list-item-subtitle>
-        </v-list-item-content>
-      </v-list-item>
-      <v-list-item two-line class="pb-4" @click="changeLockType(LockType.Locked)">
-        <v-list-item-icon class="mr-1 align-self-center">
-          <v-icon v-if="vModel === LockType.Locked" small> mdi-check-bold </v-icon>
-        </v-list-item-icon>
-
-        <v-list-item-content class="pb-1">
-          <v-list-item-title>
-            <v-icon small class="mt-n1" color="primary"> mdi-lock </v-icon>
-            Locked View
-          </v-list-item-title>
-
-          <v-list-item-subtitle class="pt-2 pl- font-weight-light" style="white-space: normal">
-            No one can edit the view configuration until it is unlocked.
-          </v-list-item-subtitle>
-          <span class="caption mt-3"><v-icon class="mr-1 mt-n1" x-small color="#fcb401"> mdi-star</v-icon>Locked view.</span>
-        </v-list-item-content>
-      </v-list-item>
-      <v-list-item three-line @click="changeLockType(LockType.Personal)">
-        <v-list-item-icon class="mr-1 align-self-center">
-          <v-icon v-if="vModel === LockType.Personal" small> mdi-check-bold </v-icon>
-        </v-list-item-icon>
-
-        <v-list-item-content>
-          <v-list-item-title>
-            <v-icon small class="mt-n1" color="primary"> mdi-account </v-icon>
-            Personal view
-          </v-list-item-title>
-
-          <v-list-item-subtitle class="pt-2 pl- font-weight-light" style="white-space: normal">
-            Only you can edit the view configuration. Other collaborators’ personal views are hidden by default.
-          </v-list-item-subtitle>
-          <span class="caption mt-3"><v-icon class="mr-1 mt-n1" x-small color="#fcb401"> mdi-star</v-icon>Coming soon.</span>
-        </v-list-item-content>
-      </v-list-item>
-    </v-list>
-  </v-menu>
+
+    <!--    <v-list maxc-width="350">
+          <v-list-item two-line class="pb-4" @click="changeLockType(LockType.Collaborative)">
+            <v-list-item-icon class="mr-1 align-self-center">
+              <v-icon v-if="!vModel || vModel === LockType.Collaborative" small> mdi-check-bold </v-icon>
+            </v-list-item-icon>
+            <v-list-item-content class="pb-1">
+              <v-list-item-title>
+                <v-icon small class="mt-n1" color="primary"> mdi-account-group </v-icon>
+                Collaborative view
+              </v-list-item-title>
+
+              <v-list-item-subtitle class="pt-2 pl- font-weight-light" style="white-space: normal">
+                Collaborators with edit permissions or higher can change the view configuration.
+              </v-list-item-subtitle>
+            </v-list-item-content>
+          </v-list-item>
+          <v-list-item two-line class="pb-4" @click="changeLockType(LockType.Locked)">
+            <v-list-item-icon class="mr-1 align-self-center">
+              <v-icon v-if="vModel === LockType.Locked" small> mdi-check-bold </v-icon>
+            </v-list-item-icon>
+
+            <v-list-item-content class="pb-1">
+              <v-list-item-title>
+                <v-icon small class="mt-n1" color="primary"> mdi-lock </v-icon>
+                Locked View
+              </v-list-item-title>
+
+              <v-list-item-subtitle class="pt-2 pl- font-weight-light" style="white-space: normal">
+                No one can edit the view configuration until it is unlocked.
+              </v-list-item-subtitle>
+              <span class="caption mt-3"><v-icon class="mr-1 mt-n1" x-small color="#fcb401"> mdi-star</v-icon>Locked view.</span>
+            </v-list-item-content>
+          </v-list-item>
+          <v-list-item three-line @click="changeLockType(LockType.Personal)">
+            <v-list-item-icon class="mr-1 align-self-center">
+              <v-icon v-if="vModel === LockType.Personal" small> mdi-check-bold </v-icon>
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>
+                <v-icon small class="mt-n1" color="primary"> mdi-account </v-icon>
+                Personal view
+              </v-list-item-title>
+
+              <v-list-item-subtitle class="pt-2 pl- font-weight-light" style="white-space: normal">
+                Only you can edit the view configuration. Other collaborators’ personal views are hidden by default.
+              </v-list-item-subtitle>
+              <span class="caption mt-3"><v-icon class="mr-1 mt-n1" x-small color="#fcb401"> mdi-star</v-icon>Coming soon.</span>
+            </v-list-item-content>
+          </v-list-item>
+        </v-list> -->
+  </a-dropdown>
 </template>
 
-<style scoped></style>
+<style scoped>
+.nc-menu-option {
+  @apply grid grid-cols-[30px,auto] gap-2  p-4;
+}
+
+.nc-menu-option > :first-child {
+  @apply align-self-center;
+}
+
+.nc-subtitle {
+  @apply font-size-sm font-weight-light;
+}
+</style>
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
index 13f1bc5f98..873b3a1348 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
@@ -1,251 +1,23 @@
-<script>
-import FileSaver from 'file-saver'
-import { ExportTypes } from 'nocodb-sdk'
-import { NOCO } from '~/lib/constants'
-import DropOrSelectFileModal from '~/components/import/DropOrSelectFileModal'
-import ColumnMappingModal from '~/components/project/spreadsheet/components/importExport/ColumnMappingModal'
-import CSVTemplateAdapter from '~/components/import/templateParsers/CSVTemplateAdapter'
-import { UITypes } from '~/components/project/spreadsheet/helpers/uiTypes'
-import WebhookModal from '~/components/project/tableTabs/webhook/WebhookModal'
-import WebhookSlider from '~/components/project/tableTabs/webhook/WebhookSlider'
-
-export default {
-  name: 'ExportImport',
-  components: {
-    WebhookSlider,
-    ColumnMappingModal,
-    DropOrSelectFileModal,
-  },
-  props: {
-    meta: Object,
-    nodes: Object,
-    selectedView: Object,
-    publicViewId: String,
-    queryParams: Object,
-    isView: Boolean,
-    reqPayload: Object,
-  },
-  emits: ['reload', 'showAdditionalFeatOverlay'],
-  data() {
-    return {
-      importModal: false,
-      columnMappingModal: false,
-      parsedCsv: {},
-      webhookModal: false,
-    }
-  },
-
-  methods: {
-    async onCsvFileSelection(file) {
-      const reader = new FileReader()
-      reader.onload = async (e) => {
-        const templateGenerator = new CSVTemplateAdapter(file.name, e.target.result)
-        await templateGenerator.init()
-        templateGenerator.parseData()
-        this.parsedCsv.columns = templateGenerator.getColumns()
-        this.parsedCsv.data = templateGenerator.getData()
-        this.columnMappingModal = true
-        this.importModal = false
-      }
-
-      reader.readAsText(file)
-    },
-
-    async extractCsvData() {
-      return Promise.all(
-        this.data.map(async (r) => {
-          const row = {}
-          for (const col of this.availableColumns) {
-            if (col.virtual) {
-              let prop, cn
-              if (col.mm || (col.lk && col.lk.type === 'mm')) {
-                const tn = col.mm ? col.mm.rtn : col.lk.ltn
-                const title = col.mm ? col.mm._rtn : col.lk._ltn
-                await this.$store.dispatch('meta/ActLoadMeta', {
-                  env: this.nodes.env,
-                  dbAlias: this.nodes.dbAlias,
-                  tn,
-                })
-
-                prop = `${title}MMList`
-                cn = col.lk
-                  ? col.lk._lcn
-                  : (
-                      this.$store.state.meta.metas[tn].columns.find((c) => c.pv) ||
-                      this.$store.state.meta.metas[tn].columns.find((c) => c.pk) ||
-                      {}
-                    ).title
-
-                row[col.title] = r.row[prop] && r.row[prop].map((r) => cn && r[cn])
-              } else if (col.hm || (col.lk && col.lk.type === 'hm')) {
-                const tn = col.hm ? col.hm.table_name : col.lk.ltn
-                const title = col.hm ? col.hm.title : col.lk._ltn
-
-                await this.$store.dispatch('meta/ActLoadMeta', {
-                  env: this.nodes.env,
-                  dbAlias: this.nodes.dbAlias,
-                  tn,
-                })
-
-                prop = `${title}List`
-                cn = col.lk
-                  ? col.lk._lcn
-                  : (
-                      this.$store.state.meta.metas[tn].columns.find((c) => c.pv) ||
-                      this.$store.state.meta.metas[tn].columns.find((c) => c.pk)
-                    ).title
-                row[col.title] = r.row[prop] && r.row[prop].map((r) => cn && r[cn])
-              } else if (col.bt || (col.lk && col.lk.type === 'bt')) {
-                const tn = col.bt ? col.bt.rtn : col.lk.ltn
-                const title = col.bt ? col.bt._rtn : col.lk._ltn
-                await this.$store.dispatch('meta/ActLoadMeta', {
-                  env: this.nodes.env,
-                  dbAlias: this.nodes.dbAlias,
-                  tn,
-                })
-
-                prop = `${title}Read`
-                cn = col.lk
-                  ? col.lk._lcn
-                  : (
-                      this.$store.state.meta.metas[tn].columns.find((c) => c.pv) ||
-                      this.$store.state.meta.metas[tn].columns.find((c) => c.pk) ||
-                      {}
-                    ).title
-                row[col.title] = r.row[prop] && r.row[prop] && cn && r.row[prop][cn]
-              } else {
-                row[col.title] = r.row[col.title]
-              }
-            } else if (col.uidt === 'Attachment') {
-              let data = []
-              try {
-                if (typeof r.row[col.title] === 'string') {
-                  data = JSON.parse(r.row[col.title])
-                } else if (r.row[col.title]) {
-                  data = r.row[col.title]
-                }
-              } catch {}
-              row[col.title] = (data || []).map((a) => `${a.title}(${a.url})`)
-            } else {
-              row[col.title] = r.row[col.title]
-            }
-          }
-          return row
-        }),
-      )
-    },
-    async exportCsv() {
-      let offset = 0
-      let c = 1
-
-      try {
-        while (!isNaN(offset) && offset > -1) {
-          let res
-          if (this.publicViewId) {
-            res = await this.$api.public.csvExport(this.publicViewId, ExportTypes.CSV, {
-              responseType: 'blob',
-              query: {
-                fields:
-                  this.queryParams &&
-                  this.queryParams.fieldsOrder &&
-                  this.queryParams.fieldsOrder.filter((c) => this.queryParams.showFields[c]),
-                offset,
-                sortArrJson: JSON.stringify(
-                  this.reqPayload &&
-                    this.reqPayload.sorts &&
-                    this.reqPayload.sorts.map(({ fk_column_id, direction }) => ({
-                      direction,
-                      fk_column_id,
-                    })),
-                ),
-                filterArrJson: JSON.stringify(this.reqPayload && this.reqPayload.filters),
-              },
-              headers: {
-                'xc-password': this.reqPayload && this.reqPayload.password,
-              },
-            })
-          } else {
-            res = await this.$api.dbViewRow.export(
-              NOCO,
-              this.projectName,
-              this.meta.title,
-              this.selectedView.title,
-              ExportTypes.CSV,
-              {
-                responseType: 'blob',
-                query: {
-                  offset,
-                },
-              },
-            )
-          }
-          const { data } = res
-
-          offset = +res.headers['nc-export-offset']
-          const blob = new Blob([data], { type: 'text/plain;charset=utf-8' })
-          FileSaver.saveAs(blob, `${this.meta.title}_exported_${c++}.csv`)
-          if (offset > -1) {
-            this.$toast.info('Downloading more files').goAway(3000)
-          } else {
-            this.$toast.success('Successfully exported all table data').goAway(3000)
-          }
-        }
-      } catch (e) {
-        console.log(e)
-        this.$toast.error(e.message).goAway(3000)
-      }
-    },
-    async importData(columnMappings) {
-      try {
-        const data = this.parsedCsv.data
-        for (let i = 0, progress = 0; i < data.length; i += 500) {
-          const batchData = data.slice(i, i + 500).map((row) =>
-            columnMappings.reduce((res, col) => {
-              // todo: parse data
-              if (col.enabled && col.destCn) {
-                const v = this.meta && this.meta.columns.find((c) => c.title === col.destCn)
-                let input = row[col.sourceCn]
-                // parse potential boolean values
-                if (v.uidt === UITypes.Checkbox) {
-                  input = input.replace(/["']/g, '').toLowerCase().trim()
-                  if (input === 'false' || input === 'no' || input === 'n') {
-                    input = '0'
-                  } else if (input === 'true' || input === 'yes' || input === 'y') {
-                    input = '1'
-                  }
-                } else if (v.uidt === UITypes.Number) {
-                  if (input === '') {
-                    input = null
-                  }
-                } else if (v.uidt === UITypes.SingleSelect || v.uidt === UITypes.MultiSelect) {
-                  if (input === '') {
-                    input = null
-                  }
-                }
-                res[col.destCn] = input
-              }
-              return res
-            }, {}),
-          )
-          await this.$api.dbTableRow.bulkCreate(NOCO, this.projectName, this.meta.title, batchData)
-          progress += batchData.length
-          this.$store.commit('loader/MutMessage', `Importing data : ${progress}/${data.length}`)
-          this.$store.commit('loader/MutProgress', Math.round((100 * progress) / data.length))
-        }
-        this.columnMappingModal = false
-        this.$store.commit('loader/MutClear')
-        this.$emit('reload')
-        this.$toast.success('Successfully imported table data').goAway(3000)
-      } catch (e) {
-        this.$toast.error(e.message).goAway(3000)
-      }
-    },
-  },
-}
+<script lang="ts" setup>
+import MdiFlashIcon from '~icons/mdi/flash-outline'
+import MdiMenuDownIcon from '~icons/mdi/menu-down'
 </script>
 
 <template>
-  <div>
+  <v-dropdown>
+    <a-button v-t="['c:actions']" class="nc-actions-menu-btn nc-toolbar-btn">
+      <div class="flex gap-1 align-center">
+        <MdiFlashIcon class="text-grey" />
+        <!-- More -->
+        {{ $t('general.more') }}
+        <MdiMenuDownIcon class="text-grey" />
+      </div>
+    </a-button>
+    <template #overlay>
+      <div></div>
+    </template>
+  </v-dropdown>
+  <!--  <div>
     <v-menu open-on-hover bottom offset-y transition="slide-y-transition">
       <template #activator="{ on }">
         <v-btn
@@ -257,7 +29,7 @@ export default {
           v-on="on"
         >
           <v-icon small color="#777"> mdi-flash-outline </v-icon>
-          <!-- More -->
+          &lt;!&ndash; More &ndash;&gt;
           {{ $t('general.more') }}
 
           <v-icon small color="#777"> mdi-menu-down </v-icon>
@@ -269,7 +41,7 @@ export default {
           <v-list-item-title>
             <v-icon small class="mr-1"> mdi-download-outline </v-icon>
             <span class="caption">
-              <!-- Download as CSV -->
+              &lt;!&ndash; Download as CSV &ndash;&gt;
               {{ $t('activity.downloadCSV') }}
             </span>
           </v-list-item-title>
@@ -278,11 +50,11 @@ export default {
           <v-list-item-title>
             <v-icon small class="mr-1" color=""> mdi-upload-outline </v-icon>
             <span class="caption">
-              <!-- Upload CSV -->
+              &lt;!&ndash; Upload CSV &ndash;&gt;
               {{ $t('activity.uploadCSV') }}
             </span>
 
-            <span class="caption grey--text">(<x-icon small color="grey lighten-2"> mdi-alpha </x-icon> version)</span>
+            <span class="caption grey&#45;&#45;text">(<x-icon small color="grey lighten-2"> mdi-alpha </x-icon> version)</span>
           </v-list-item-title>
         </v-list-item>
         <v-list-item
@@ -294,7 +66,7 @@ export default {
           <v-list-item-title>
             <v-icon small class="mr-1" color=""> mdi-view-list-outline </v-icon>
             <span class="caption">
-              <!-- Shared View List -->
+              &lt;!&ndash; Shared View List &ndash;&gt;
               {{ $t('activity.listSharedView') }}
             </span>
           </v-list-item-title>
@@ -316,9 +88,9 @@ export default {
       :parsed-csv="parsedCsv"
       @import="importData"
     />
-    <!--    <webhook-modal v-if="webhookModal" v-model="webhookModal" :meta="meta" /> -->
+    &lt;!&ndash;    <webhook-modal v-if="webhookModal" v-model="webhookModal" :meta="meta" /> &ndash;&gt;
     <WebhookSlider v-model="webhookModal" :meta="meta" />
-  </div>
+  </div> -->
 </template>
 
 <style scoped></style>
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/Reload.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/Reload.vue
new file mode 100644
index 0000000000..e2ee6f4110
--- /dev/null
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/Reload.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+import { ReloadViewDataHookInj } from '~/context'
+import MdiReloadIcon from '~icons/mdi/reload'
+const reloadTri = inject(ReloadViewDataHookInj)
+</script>
+
+<template>
+  <MdiReloadIcon class="text-grey" @click="reloadTri.trigger()" />
+</template>
+
+<style scoped></style>
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/SearchData.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/SearchData.vue
index 0ad8bf0d87..00c10e60d8 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/SearchData.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/SearchData.vue
@@ -27,9 +27,9 @@ const columns = computed(() =>
 </script>
 
 <template>
-  <a-input-search v-model:value="localValue" class="max-w-[250px]">
+  <a-input-search size="small" v-model:value="localValue" class="max-w-[250px]">
     <template #addonBefore>
-      <a-select v-model:value="localField" :options="columns" style="width: 100px" class="!text-xs" />
+      <a-select v-model:value="localField" :options="columns" style="width: 100px" class="!text-xs " size="small" />
     </template>
   </a-input-search>
 </template>
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ShareView.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ShareView.vue
new file mode 100644
index 0000000000..b7accbf9f2
--- /dev/null
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ShareView.vue
@@ -0,0 +1,18 @@
+<script lang="ts" setup>
+import MdiOpenInNew from '~icons/mdi/open-in-new'
+const { isUIAllowed } = useUIPermission()
+</script>
+
+<template>
+  <div>
+    <a-button v-t="['c:view:share']" outlined class="nc-btn-share-view nc-toolbar-btn" size="small" @click="$emit('share')">
+      <div class="flex align-center gap-1">
+        <MdiOpenInNew class="text-grey" />
+        <!-- Share View -->
+        {{ $t('activity.shareView') }}
+      </div>
+    </a-button>
+  </div>
+</template>
+
+<style scoped />
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
index ed3ef5dc36..a4871677e5 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue
@@ -29,19 +29,8 @@ watch(
 <template>
   <a-dropdown offset-y class="" :trigger="['click']">
     <v-badge :value="sorts && sorts.length" color="primary" dot overlap>
-      <a-button
-        v-t="['c:sort']"
-        size="small"
-        class="nc-sort-menu-btn px-2 nc-remove-border border-0"
-        :disabled="isLocked"
-        small
-        text
-        outlined
-        :class="{
-          'primary lighten-5 grey&#45;&#45;text text&#45;&#45;darken-3': sorts && sorts.length,
-        }"
-        v-bind="props"
-        ><div class="flex align-center gap-1 text-sm">
+      <a-button v-t="['c:sort']" size="small" class="nc-sort-menu-btn nc-toolbar-btn" :disabled="isLocked"
+        ><div class="flex align-center gap-1">
           <MdiSortIcon class="text-grey" />
           <!-- Sort -->
           <span class="text-capitalize">{{ $t('activity.sort') }}</span>
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ToggleDrawer.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ToggleDrawer.vue
new file mode 100644
index 0000000000..ce0cd887da
--- /dev/null
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ToggleDrawer.vue
@@ -0,0 +1,14 @@
+<script setup lang="ts">
+import { ReloadViewDataHookInj } from '~/context'
+import MdiDoorOpenIcon from '~icons/mdi/door-open'
+import MdiDoorClosedIcon from '~icons/mdi/door-closed'
+const navDrawerOpened = ref(false)
+
+const Icon = computed(()=> navDrawerOpened.value ? MdiDoorOpenIcon : MdiDoorClosedIcon)
+</script>
+
+<template>
+  <Icon class="text-grey" @click="navDrawerOpened = !navDrawerOpened" />
+</template>
+
+<style scoped></style>
diff --git a/packages/nc-gui-v2/components/smartsheet/Toolbar.vue b/packages/nc-gui-v2/components/smartsheet/Toolbar.vue
index 69d5ec5689..4030228f76 100644
--- a/packages/nc-gui-v2/components/smartsheet/Toolbar.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Toolbar.vue
@@ -6,7 +6,19 @@
     <SmartsheetToolbarFieldsMenu :show-system-fields="false" />
     <SmartsheetToolbarColumnFilterMenu />
     <SmartsheetToolbarSortListMenu />
+    <SmartsheetToolbarShareView />
+    <SmartsheetToolbarMoreActions />
+    <div class="flex-1" />
+    <SmartsheetToolbarLockMenu />
+    <SmartsheetToolbarReload />
+    <SmartsheetToolbarAddRow />
+    <SmartsheetToolbarDeleteTable />
+    <SmartsheetToolbarToggleDrawer />
   </div>
 </template>
 
-<style scoped></style>
+<style scoped>
+:deep(.nc-toolbar-btn) {
+  @apply border-0 !text-xs font-semibold px-2;
+}
+</style>
diff --git a/packages/nc-gui-v2/components/tabs/Smartsheet.vue b/packages/nc-gui-v2/components/tabs/Smartsheet.vue
index 7f4e678c4c..33818db95b 100644
--- a/packages/nc-gui-v2/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui-v2/components/tabs/Smartsheet.vue
@@ -47,11 +47,9 @@ watch(
             <SmartsheetGallery v-else-if="activeView.type === ViewTypes.GALLERY" />
             <SmartsheetForm v-else-if="activeView.type === ViewTypes.FORM" />
           </div>
+          <SmartsheetSidebar />
         </div>
       </template>
     </div>
-    <template v-if="meta">
-      <SmartsheetSidebar />
-    </template>
   </div>
 </template>

From 2858720637bf4e68ae52e91954be2433de4c7a67 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 26 Jul 2022 22:56:32 +0530
Subject: [PATCH 19/27] refactor(gui-v2): add dot between icons

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../smartsheet-toolbar/MoreActions.vue          | 17 ++++++++++++++---
 .../smartsheet-toolbar/SearchData.vue           |  4 ++--
 .../smartsheet-toolbar/ToggleDrawer.vue         |  2 +-
 .../nc-gui-v2/components/smartsheet/Toolbar.vue |  9 ++++++++-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
index 873b3a1348..e43d6e0e2f 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup>
 import MdiFlashIcon from '~icons/mdi/flash-outline'
 import MdiMenuDownIcon from '~icons/mdi/menu-down'
+import MdiDownloadIcon from '~icons/mdi/download-outline'
 </script>
 
 <template>
-  <v-dropdown>
+  <a-dropdown>
     <a-button v-t="['c:actions']" class="nc-actions-menu-btn nc-toolbar-btn">
       <div class="flex gap-1 align-center">
         <MdiFlashIcon class="text-grey" />
@@ -14,9 +15,19 @@ import MdiMenuDownIcon from '~icons/mdi/menu-down'
       </div>
     </a-button>
     <template #overlay>
-      <div></div>
+      <div class="p-2 bg-white">
+        <a-menu>
+          <a-menu-item>
+            <div class="text-xs flex align-center gap-2">
+              <MdiDownloadIcon />
+              <!-- Download as CSV -->
+              {{ $t('activity.downloadCSV') }}
+            </div>
+          </a-menu-item>
+        </a-menu>
+      </div>
     </template>
-  </v-dropdown>
+  </a-dropdown>
   <!--  <div>
     <v-menu open-on-hover bottom offset-y transition="slide-y-transition">
       <template #activator="{ on }">
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/SearchData.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/SearchData.vue
index 00c10e60d8..01986f736f 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/SearchData.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/SearchData.vue
@@ -27,9 +27,9 @@ const columns = computed(() =>
 </script>
 
 <template>
-  <a-input-search size="small" v-model:value="localValue" class="max-w-[250px]">
+  <a-input-search v-model:value="localValue" size="small" class="max-w-[250px]">
     <template #addonBefore>
-      <a-select v-model:value="localField" :options="columns" style="width: 100px" class="!text-xs " size="small" />
+      <a-select v-model:value="localField" :options="columns" style="width: 100px" class="!text-xs" size="small" />
     </template>
   </a-input-search>
 </template>
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ToggleDrawer.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ToggleDrawer.vue
index ce0cd887da..65b01ba736 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/ToggleDrawer.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ToggleDrawer.vue
@@ -4,7 +4,7 @@ import MdiDoorOpenIcon from '~icons/mdi/door-open'
 import MdiDoorClosedIcon from '~icons/mdi/door-closed'
 const navDrawerOpened = ref(false)
 
-const Icon = computed(()=> navDrawerOpened.value ? MdiDoorOpenIcon : MdiDoorClosedIcon)
+const Icon = computed(() => (navDrawerOpened.value ? MdiDoorOpenIcon : MdiDoorClosedIcon))
 </script>
 
 <template>
diff --git a/packages/nc-gui-v2/components/smartsheet/Toolbar.vue b/packages/nc-gui-v2/components/smartsheet/Toolbar.vue
index 4030228f76..1661bffa08 100644
--- a/packages/nc-gui-v2/components/smartsheet/Toolbar.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Toolbar.vue
@@ -10,10 +10,14 @@
     <SmartsheetToolbarMoreActions />
     <div class="flex-1" />
     <SmartsheetToolbarLockMenu />
+    <div class="dot" />
     <SmartsheetToolbarReload />
+    <div class="dot" />
     <SmartsheetToolbarAddRow />
+    <div class="dot" />
     <SmartsheetToolbarDeleteTable />
-    <SmartsheetToolbarToggleDrawer />
+    <div class="dot" />
+    <SmartsheetToolbarToggleDrawer class="mr-2" />
   </div>
 </template>
 
@@ -21,4 +25,7 @@
 :deep(.nc-toolbar-btn) {
   @apply border-0 !text-xs font-semibold px-2;
 }
+.dot {
+  @apply w-[3px] h-[3px] bg-gray-300 mx-1 rounded-full;
+}
 </style>

From 9faaf849db46999be2a90a5794abc6d1a3790cd4 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 27 Jul 2022 00:02:33 +0530
Subject: [PATCH 20/27] feat(gui-v2): add menu item styling

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui-v2/assets/style-v2.scss       |   5 +
 .../smartsheet-toolbar/LockMenu.vue           |  59 +--------
 .../smartsheet-toolbar/MoreActions.vue        | 120 +++++-------------
 .../smartsheet-toolbar/SearchData.vue         |   6 +-
 4 files changed, 42 insertions(+), 148 deletions(-)

diff --git a/packages/nc-gui-v2/assets/style-v2.scss b/packages/nc-gui-v2/assets/style-v2.scss
index 21336be98a..410781cf29 100644
--- a/packages/nc-gui-v2/assets/style-v2.scss
+++ b/packages/nc-gui-v2/assets/style-v2.scss
@@ -64,3 +64,8 @@ h1, h2, h3, h4, h5, h6, p, label, button, textarea, select {
 html {
   overflow-y: auto !important;
 }
+
+
+.nc-menu-item {
+  @apply cursor-pointer text-xs flex align-center gap-2 p-4 relative after:(content-[''] absolute top-0 left-0  w-full h-full right 0 bg-current opacity-0 transition transition-opactity duration-100) hover:(after:(opacity-5));
+}
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/LockMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/LockMenu.vue
index 1a627b96e5..beca67d159 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/LockMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/LockMenu.vue
@@ -63,7 +63,7 @@ export default {
     <template #overlay>
       <div class="min-w-[350px] max-w-[500px] shadow bg-white">
         <div>
-          <div class="nc-menu-option">
+          <div class="nc-menu-item">
             <MdiCheckIcon v-if="!vModel || vModel === LockType.Collaborative" />
             <span v-else />
 
@@ -73,7 +73,7 @@ export default {
               <div class="nc-subtitle">Collaborators with edit permissions or higher can change the view configuration.</div>
             </div>
           </div>
-          <div class="nc-menu-option">
+          <div class="nc-menu-item">
             <MdiCheckIcon v-if="vModel === LockType.Locked" />
             <span v-else />
             <div>
@@ -82,7 +82,7 @@ export default {
               <div class="nc-subtitle">No one can edit the view configuration until it is unlocked.</div>
             </div>
           </div>
-          <div class="nc-menu-option">
+          <div class="nc-menu-item">
             <MdiCheckIcon v-if="vModel === LockType.Personal" />
             <span v-else />
             <div>
@@ -97,62 +97,11 @@ export default {
       </div>
     </template>
 
-    <!--    <v-list maxc-width="350">
-          <v-list-item two-line class="pb-4" @click="changeLockType(LockType.Collaborative)">
-            <v-list-item-icon class="mr-1 align-self-center">
-              <v-icon v-if="!vModel || vModel === LockType.Collaborative" small> mdi-check-bold </v-icon>
-            </v-list-item-icon>
-            <v-list-item-content class="pb-1">
-              <v-list-item-title>
-                <v-icon small class="mt-n1" color="primary"> mdi-account-group </v-icon>
-                Collaborative view
-              </v-list-item-title>
-
-              <v-list-item-subtitle class="pt-2 pl- font-weight-light" style="white-space: normal">
-                Collaborators with edit permissions or higher can change the view configuration.
-              </v-list-item-subtitle>
-            </v-list-item-content>
-          </v-list-item>
-          <v-list-item two-line class="pb-4" @click="changeLockType(LockType.Locked)">
-            <v-list-item-icon class="mr-1 align-self-center">
-              <v-icon v-if="vModel === LockType.Locked" small> mdi-check-bold </v-icon>
-            </v-list-item-icon>
-
-            <v-list-item-content class="pb-1">
-              <v-list-item-title>
-                <v-icon small class="mt-n1" color="primary"> mdi-lock </v-icon>
-                Locked View
-              </v-list-item-title>
-
-              <v-list-item-subtitle class="pt-2 pl- font-weight-light" style="white-space: normal">
-                No one can edit the view configuration until it is unlocked.
-              </v-list-item-subtitle>
-              <span class="caption mt-3"><v-icon class="mr-1 mt-n1" x-small color="#fcb401"> mdi-star</v-icon>Locked view.</span>
-            </v-list-item-content>
-          </v-list-item>
-          <v-list-item three-line @click="changeLockType(LockType.Personal)">
-            <v-list-item-icon class="mr-1 align-self-center">
-              <v-icon v-if="vModel === LockType.Personal" small> mdi-check-bold </v-icon>
-            </v-list-item-icon>
-
-            <v-list-item-content>
-              <v-list-item-title>
-                <v-icon small class="mt-n1" color="primary"> mdi-account </v-icon>
-                Personal view
-              </v-list-item-title>
-
-              <v-list-item-subtitle class="pt-2 pl- font-weight-light" style="white-space: normal">
-                Only you can edit the view configuration. Other collaborators’ personal views are hidden by default.
-              </v-list-item-subtitle>
-              <span class="caption mt-3"><v-icon class="mr-1 mt-n1" x-small color="#fcb401"> mdi-star</v-icon>Coming soon.</span>
-            </v-list-item-content>
-          </v-list-item>
-        </v-list> -->
   </a-dropdown>
 </template>
 
 <style scoped>
-.nc-menu-option {
+.nc-menu-item {
   @apply grid grid-cols-[30px,auto] gap-2  p-4;
 }
 
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
index e43d6e0e2f..32fe40bcea 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
@@ -1,7 +1,10 @@
 <script lang="ts" setup>
-import MdiFlashIcon from '~icons/mdi/flash-outline'
-import MdiMenuDownIcon from '~icons/mdi/menu-down'
-import MdiDownloadIcon from '~icons/mdi/download-outline'
+import MdiFlashIcon from "~icons/mdi/flash-outline";
+import MdiMenuDownIcon from "~icons/mdi/menu-down";
+import MdiDownloadIcon from "~icons/mdi/download-outline";
+import MdiUploadIcon from "~icons/mdi/upload-outline";
+import MdiHookIcon from "~icons/mdi/hook";
+import MdiViewListIcon from "~icons/mdi/view-list-outline";
 </script>
 
 <template>
@@ -10,98 +13,35 @@ import MdiDownloadIcon from '~icons/mdi/download-outline'
       <div class="flex gap-1 align-center">
         <MdiFlashIcon class="text-grey" />
         <!-- More -->
-        {{ $t('general.more') }}
+        {{ $t("general.more") }}
         <MdiMenuDownIcon class="text-grey" />
       </div>
     </a-button>
     <template #overlay>
-      <div class="p-2 bg-white">
-        <a-menu>
-          <a-menu-item>
-            <div class="text-xs flex align-center gap-2">
-              <MdiDownloadIcon />
-              <!-- Download as CSV -->
-              {{ $t('activity.downloadCSV') }}
-            </div>
-          </a-menu-item>
-        </a-menu>
+      <div class=" bg-white shadow">
+        <div>
+          <div class="nc-menu-item" @click.stop>
+            <MdiDownloadIcon />
+            <!-- Download as CSV -->
+            {{ $t("activity.downloadCSV") }}
+          </div>
+          <div class="nc-menu-item"  @click.stop>
+            <MdiUploadIcon />
+            <!-- Upload CSV -->
+            {{ $t("activity.uploadCSV") }}
+          </div>
+          <div class="nc-menu-item"  @click.stop>
+            <MdiViewListIcon />
+            <!-- Shared View List -->
+            {{ $t("activity.listSharedView") }}
+          </div>
+          <div class="nc-menu-item"  @click.stop>
+            <MdiHookIcon />
+            <!-- todo: i18n -->
+            Webhook
+          </div>
+        </div>
       </div>
     </template>
   </a-dropdown>
-  <!--  <div>
-    <v-menu open-on-hover bottom offset-y transition="slide-y-transition">
-      <template #activator="{ on }">
-        <v-btn
-          v-t="['c:actions']"
-          outlined
-          class="nc-actions-menu-btn caption px-2 nc-remove-border font-weight-medium"
-          small
-          text
-          v-on="on"
-        >
-          <v-icon small color="#777"> mdi-flash-outline </v-icon>
-          &lt;!&ndash; More &ndash;&gt;
-          {{ $t('general.more') }}
-
-          <v-icon small color="#777"> mdi-menu-down </v-icon>
-        </v-btn>
-      </template>
-
-      <v-list dense>
-        <v-list-item v-t="['a:actions:download-csv']" dense @click="exportCsv">
-          <v-list-item-title>
-            <v-icon small class="mr-1"> mdi-download-outline </v-icon>
-            <span class="caption">
-              &lt;!&ndash; Download as CSV &ndash;&gt;
-              {{ $t('activity.downloadCSV') }}
-            </span>
-          </v-list-item-title>
-        </v-list-item>
-        <v-list-item v-if="_isUIAllowed('csvImport') && !isView" v-t="['a:actions:upload-csv']" dense @click="importModal = true">
-          <v-list-item-title>
-            <v-icon small class="mr-1" color=""> mdi-upload-outline </v-icon>
-            <span class="caption">
-              &lt;!&ndash; Upload CSV &ndash;&gt;
-              {{ $t('activity.uploadCSV') }}
-            </span>
-
-            <span class="caption grey&#45;&#45;text">(<x-icon small color="grey lighten-2"> mdi-alpha </x-icon> version)</span>
-          </v-list-item-title>
-        </v-list-item>
-        <v-list-item
-          v-if="_isUIAllowed('SharedViewList') && !isView"
-          v-t="['a:actions:shared-view-list']"
-          dense
-          @click="$emit('showAdditionalFeatOverlay', 'shared-views')"
-        >
-          <v-list-item-title>
-            <v-icon small class="mr-1" color=""> mdi-view-list-outline </v-icon>
-            <span class="caption">
-              &lt;!&ndash; Shared View List &ndash;&gt;
-              {{ $t('activity.listSharedView') }}
-            </span>
-          </v-list-item-title>
-        </v-list-item>
-        <v-list-item v-if="_isUIAllowed('webhook') && !isView" v-t="['c:actions:webhook']" dense @click="webhookModal = true">
-          <v-list-item-title>
-            <v-icon small class="mr-1" color=""> mdi-hook </v-icon>
-            <span class="caption"> Webhooks </span>
-          </v-list-item-title>
-        </v-list-item>
-      </v-list>
-    </v-menu>
-    <DropOrSelectFileModal v-model="importModal" accept=".csv" text="CSV" @file="onCsvFileSelection" />
-    <ColumnMappingModal
-      v-if="columnMappingModal && meta"
-      v-model="columnMappingModal"
-      :meta="meta"
-      :import-data-columns="parsedCsv.columns"
-      :parsed-csv="parsedCsv"
-      @import="importData"
-    />
-    &lt;!&ndash;    <webhook-modal v-if="webhookModal" v-model="webhookModal" :meta="meta" /> &ndash;&gt;
-    <WebhookSlider v-model="webhookModal" :meta="meta" />
-  </div> -->
 </template>
-
-<style scoped></style>
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/SearchData.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/SearchData.vue
index 01986f736f..513c2d44ee 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/SearchData.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/SearchData.vue
@@ -27,11 +27,11 @@ const columns = computed(() =>
 </script>
 
 <template>
-  <a-input-search v-model:value="localValue" size="small" class="max-w-[250px]">
+  <a-input v-model:value="localValue" size="small" class="max-w-[250px]" placeholder="Filter query">
     <template #addonBefore>
-      <a-select v-model:value="localField" :options="columns" style="width: 100px" class="!text-xs" size="small" />
+      <a-select v-model:value="localField" :options="columns" style="width: 80px" class="!text-xs" size="small" />
     </template>
-  </a-input-search>
+  </a-input>
 </template>
 
 <style scoped></style>

From ca3738e2777fe8102ff5c0013da2ed28dfe0cffc Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 27 Jul 2022 00:07:50 +0530
Subject: [PATCH 21/27] chore(gui-v2): lint

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../smartsheet-toolbar/LockMenu.vue           |  1 -
 .../smartsheet-toolbar/MoreActions.vue        | 28 +++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/LockMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/LockMenu.vue
index beca67d159..672bb3c816 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/LockMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/LockMenu.vue
@@ -96,7 +96,6 @@ export default {
         </div>
       </div>
     </template>
-
   </a-dropdown>
 </template>
 
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
index 32fe40bcea..17d4878c43 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
-import MdiFlashIcon from "~icons/mdi/flash-outline";
-import MdiMenuDownIcon from "~icons/mdi/menu-down";
-import MdiDownloadIcon from "~icons/mdi/download-outline";
-import MdiUploadIcon from "~icons/mdi/upload-outline";
-import MdiHookIcon from "~icons/mdi/hook";
-import MdiViewListIcon from "~icons/mdi/view-list-outline";
+import MdiFlashIcon from '~icons/mdi/flash-outline'
+import MdiMenuDownIcon from '~icons/mdi/menu-down'
+import MdiDownloadIcon from '~icons/mdi/download-outline'
+import MdiUploadIcon from '~icons/mdi/upload-outline'
+import MdiHookIcon from '~icons/mdi/hook'
+import MdiViewListIcon from '~icons/mdi/view-list-outline'
 </script>
 
 <template>
@@ -13,29 +13,29 @@ import MdiViewListIcon from "~icons/mdi/view-list-outline";
       <div class="flex gap-1 align-center">
         <MdiFlashIcon class="text-grey" />
         <!-- More -->
-        {{ $t("general.more") }}
+        {{ $t('general.more') }}
         <MdiMenuDownIcon class="text-grey" />
       </div>
     </a-button>
     <template #overlay>
-      <div class=" bg-white shadow">
+      <div class="bg-white shadow">
         <div>
           <div class="nc-menu-item" @click.stop>
             <MdiDownloadIcon />
             <!-- Download as CSV -->
-            {{ $t("activity.downloadCSV") }}
+            {{ $t('activity.downloadCSV') }}
           </div>
-          <div class="nc-menu-item"  @click.stop>
+          <div class="nc-menu-item" @click.stop>
             <MdiUploadIcon />
             <!-- Upload CSV -->
-            {{ $t("activity.uploadCSV") }}
+            {{ $t('activity.uploadCSV') }}
           </div>
-          <div class="nc-menu-item"  @click.stop>
+          <div class="nc-menu-item" @click.stop>
             <MdiViewListIcon />
             <!-- Shared View List -->
-            {{ $t("activity.listSharedView") }}
+            {{ $t('activity.listSharedView') }}
           </div>
-          <div class="nc-menu-item"  @click.stop>
+          <div class="nc-menu-item" @click.stop>
             <MdiHookIcon />
             <!-- todo: i18n -->
             Webhook

From 2954e8fe7747c25659e5b9a3e80a81fd13a986ba Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 27 Jul 2022 00:43:57 +0530
Subject: [PATCH 22/27] feat(gui-v2): download csv

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../smartsheet-toolbar/MoreActions.vue        | 81 ++++++++++++++++++-
 .../smartsheet-toolbar/ShareView.vue          |  2 +-
 packages/nc-gui-v2/package.json               |  1 +
 3 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
index 17d4878c43..615439ff9e 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
@@ -1,10 +1,89 @@
 <script lang="ts" setup>
+import { ExportTypes } from 'nocodb-sdk'
+import { useToast } from 'vue-toastification'
+import FileSaver from 'file-saver'
+import { useNuxtApp } from '#app'
+import useProject from '~/composables/useProject'
+import { ActiveViewInj, MetaInj } from '~/context'
+import { extractSdkResponseErrorMsg } from '~/utils/errorUtils'
 import MdiFlashIcon from '~icons/mdi/flash-outline'
 import MdiMenuDownIcon from '~icons/mdi/menu-down'
 import MdiDownloadIcon from '~icons/mdi/download-outline'
 import MdiUploadIcon from '~icons/mdi/upload-outline'
 import MdiHookIcon from '~icons/mdi/hook'
 import MdiViewListIcon from '~icons/mdi/view-list-outline'
+
+// todo : replace with inject
+const publicViewId = null
+const { project } = useProject()
+
+const { $api } = useNuxtApp()
+const toast = useToast()
+
+const meta = inject(MetaInj)
+const selectedView = inject(ActiveViewInj)
+
+const exportCsv = async () => {
+  let offset = 0
+  let c = 1
+
+  try {
+    while (!isNaN(offset) && offset > -1) {
+      let res
+      if (publicViewId) {
+        /* res = await this.$api.public.csvExport(this.publicViewId, ExportTypes.CSV, {
+          responseType: 'blob',
+          query: {
+            fields:
+              this.queryParams &&
+              this.queryParams.fieldsOrder &&
+              this.queryParams.fieldsOrder.filter(c => this.queryParams.showFields[c]),
+            offset,
+            sortArrJson: JSON.stringify(
+              this.reqPayload &&
+              this.reqPayload.sorts &&
+              this.reqPayload.sorts.map(({ fk_column_id, direction }) => ({
+                direction,
+                fk_column_id,
+              }))
+            ),
+            filterArrJson: JSON.stringify(this.reqPayload && this.reqPayload.filters),
+          },
+          headers: {
+            'xc-password': this.reqPayload && this.reqPayload.password,
+          },
+        });
+   */
+      } else {
+        res = await $api.dbViewRow.export(
+          'noco',
+          project?.value.title as string,
+          meta?.value.title as string,
+          selectedView?.value.title as string,
+          ExportTypes.CSV,
+          {
+            responseType: 'blob',
+            query: {
+              offset,
+            },
+          } as any,
+        )
+      }
+      const { data } = res
+
+      offset = +res.headers['nc-export-offset']
+      const blob = new Blob([data], { type: 'text/plain;charset=utf-8' })
+      FileSaver.saveAs(blob, `${meta?.value.title}_exported_${c++}.csv`)
+      if (offset > -1) {
+        toast.info('Downloading more files')
+      } else {
+        toast.success('Successfully exported all table data')
+      }
+    }
+  } catch (e) {
+    toast.error(extractSdkResponseErrorMsg(e))
+  }
+}
 </script>
 
 <template>
@@ -20,7 +99,7 @@ import MdiViewListIcon from '~icons/mdi/view-list-outline'
     <template #overlay>
       <div class="bg-white shadow">
         <div>
-          <div class="nc-menu-item" @click.stop>
+          <div class="nc-menu-item" @click.stop="exportCsv">
             <MdiDownloadIcon />
             <!-- Download as CSV -->
             {{ $t('activity.downloadCSV') }}
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ShareView.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ShareView.vue
index b7accbf9f2..3c7360f0b7 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/ShareView.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ShareView.vue
@@ -5,7 +5,7 @@ const { isUIAllowed } = useUIPermission()
 
 <template>
   <div>
-    <a-button v-t="['c:view:share']" outlined class="nc-btn-share-view nc-toolbar-btn" size="small" @click="$emit('share')">
+    <a-button v-t="['c:view:share']" outlined class="nc-btn-share-view nc-toolbar-btn" size="small">
       <div class="flex align-center gap-1">
         <MdiOpenInNew class="text-grey" />
         <!-- Share View -->
diff --git a/packages/nc-gui-v2/package.json b/packages/nc-gui-v2/package.json
index fa34ac69ef..b7e0724cb6 100644
--- a/packages/nc-gui-v2/package.json
+++ b/packages/nc-gui-v2/package.json
@@ -15,6 +15,7 @@
     "@vueuse/integrations": "^8.9.1",
     "ant-design-vue": "^3.1.0-rc.6",
     "dayjs": "^1.11.3",
+    "file-saver": "^2.0.5",
     "jwt-decode": "^3.1.2",
     "monaco-editor": "^0.33.0",
     "nocodb-sdk": "file:../nocodb-sdk",

From 5280d7b20d36def71454ae34953a6c2c943eaf8c Mon Sep 17 00:00:00 2001
From: Naveen MR <oof1lab@gmail.com>
Date: Wed, 27 Jul 2022 11:06:36 +0100
Subject: [PATCH 23/27] chore : setting audit table to small

---
 packages/nc-gui-v2/components/dashboard/settings/AuditTab.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui-v2/components/dashboard/settings/AuditTab.vue b/packages/nc-gui-v2/components/dashboard/settings/AuditTab.vue
index a11e763013..45a109f5fe 100644
--- a/packages/nc-gui-v2/components/dashboard/settings/AuditTab.vue
+++ b/packages/nc-gui-v2/components/dashboard/settings/AuditTab.vue
@@ -96,6 +96,6 @@ const columns = [
       />
     </div>
 
-    <a-table class="w-full" :data-source="audits ?? []" :columns="columns" :pagination="false" :loading="isLoading" />
+    <a-table class="w-full" size="small" :data-source="audits ?? []" :columns="columns" :pagination="false" :loading="isLoading" />
   </div>
 </template>

From 8abc2b1255a5e89417011780e9cd250b31d78301 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 27 Jul 2022 15:50:37 +0530
Subject: [PATCH 24/27] refactor(gui-v2): error corrections, add import option
 in tab page

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui-v2/components/cell/TextArea.vue    |   2 +-
 .../smartsheet-toolbar/FieldsMenu.vue         |   2 +-
 .../components/virtual-cell/BelongsTo.vue     |   1 +
 .../components/virtual-cell/ManyToMany.vue    |   1 +
 packages/nc-gui-v2/package-lock.json          |  43 +++++++
 packages/nc-gui-v2/package.json               |   2 +-
 .../pages/nc/[projectId]/index/index.vue      | 119 ++++++++++++++++++
 7 files changed, 167 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui-v2/components/cell/TextArea.vue b/packages/nc-gui-v2/components/cell/TextArea.vue
index c61427d171..d27590877d 100644
--- a/packages/nc-gui-v2/components/cell/TextArea.vue
+++ b/packages/nc-gui-v2/components/cell/TextArea.vue
@@ -2,7 +2,7 @@
 import { computed, inject, onMounted, ref } from '#imports'
 
 interface Props {
-  modelValue: string
+  modelValue?: string
 }
 
 const { modelValue: value } = defineProps<Props>()
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
index 1588ff57a4..4f62918a95 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
@@ -76,7 +76,7 @@ const onMove = (event) => {
 
 <template>
   <a-dropdown :trigger="['click']">
-    <v-badge :value="isAnyFieldHidden" color="primary" dot overlap v-bind="props">
+    <v-badge :value="isAnyFieldHidden" color="primary" dot overlap>
       <a-button v-t="['c:fields']" class="nc-fields-menu-btn nc-toolbar-btn" :disabled="isLocked" size="small">
         <div class="flex align-center gap-1">
           <!--          <v-icon small class="mr-1" color="#777"> mdi-eye-off-outline </v-icon> -->
diff --git a/packages/nc-gui-v2/components/virtual-cell/BelongsTo.vue b/packages/nc-gui-v2/components/virtual-cell/BelongsTo.vue
index f171e33f27..ed23d09d88 100644
--- a/packages/nc-gui-v2/components/virtual-cell/BelongsTo.vue
+++ b/packages/nc-gui-v2/components/virtual-cell/BelongsTo.vue
@@ -7,6 +7,7 @@ import useBelongsTo from '~/composables/useBelongsTo'
 const column = inject(ColumnInj)
 const value = inject('value')
 const active = false
+const localState = null
 
 const { parentMeta, loadParentMeta, primaryValueProp } = useBelongsTo(column as ColumnType)
 await loadParentMeta()
diff --git a/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue b/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue
index b0285fd7bb..e022d5a4f3 100644
--- a/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue
+++ b/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue
@@ -6,6 +6,7 @@ import useManyToMany from '~/composables/useManyToMany'
 const column = inject(ColumnInj)
 const value = inject('value')
 const active = false
+const isLocked = false
 
 const { childMeta, loadChildMeta, primaryValueProp } = useManyToMany(column as ColumnType)
 await loadChildMeta()
diff --git a/packages/nc-gui-v2/package-lock.json b/packages/nc-gui-v2/package-lock.json
index 47db1db280..c578963671 100644
--- a/packages/nc-gui-v2/package-lock.json
+++ b/packages/nc-gui-v2/package-lock.json
@@ -9,6 +9,7 @@
         "@vueuse/integrations": "^8.9.1",
         "ant-design-vue": "^3.1.0-rc.6",
         "dayjs": "^1.11.3",
+        "file-saver": "^2.0.5",
         "jwt-decode": "^3.1.2",
         "monaco-editor": "^0.33.0",
         "nocodb-sdk": "file:../nocodb-sdk",
@@ -18,6 +19,7 @@
         "unique-names-generator": "^4.7.1",
         "vue-i18n": "^9.1.10",
         "vue-toastification": "^2.0.0-rc.5",
+        "vuedraggable": "^4.1.0",
         "vuetify": "^3.0.0-alpha.13",
         "xlsx": "^0.17.3"
       },
@@ -15684,6 +15686,11 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
+    "node_modules/file-saver": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz",
+      "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
+    },
     "node_modules/file-uri-to-path": {
       "version": "1.0.0",
       "dev": true,
@@ -21953,6 +21960,22 @@
         "vue": "^3.0.0"
       }
     },
+    "node_modules/vuedraggable": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz",
+      "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==",
+      "dependencies": {
+        "sortablejs": "1.14.0"
+      },
+      "peerDependencies": {
+        "vue": "^3.0.1"
+      }
+    },
+    "node_modules/vuedraggable/node_modules/sortablejs": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz",
+      "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
+    },
     "node_modules/vuetify": {
       "version": "3.0.0-beta.5",
       "license": "MIT",
@@ -26412,6 +26435,11 @@
         "flat-cache": "^3.0.4"
       }
     },
+    "file-saver": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz",
+      "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
+    },
     "file-uri-to-path": {
       "version": "1.0.0",
       "dev": true
@@ -36450,6 +36478,21 @@
         "is-plain-object": "3.0.1"
       }
     },
+    "vuedraggable": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz",
+      "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==",
+      "requires": {
+        "sortablejs": "1.14.0"
+      },
+      "dependencies": {
+        "sortablejs": {
+          "version": "1.14.0",
+          "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz",
+          "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
+        }
+      }
+    },
     "vuetify": {
       "version": "3.0.0-beta.5",
       "requires": {}
diff --git a/packages/nc-gui-v2/package.json b/packages/nc-gui-v2/package.json
index b7e0724cb6..2ade8b06ff 100644
--- a/packages/nc-gui-v2/package.json
+++ b/packages/nc-gui-v2/package.json
@@ -25,7 +25,7 @@
     "unique-names-generator": "^4.7.1",
     "vue-i18n": "^9.1.10",
     "vue-toastification": "^2.0.0-rc.5",
-    "xlsx": "^0.17.3"
+    "xlsx": "^0.17.3",
     "vuedraggable": "^4.1.0",
     "vuetify": "^3.0.0-alpha.13"
   },
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
index 6af756e0d9..f2374f2462 100644
--- a/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
+++ b/packages/nc-gui-v2/pages/nc/[projectId]/index/index.vue
@@ -1,11 +1,38 @@
 <script setup lang="ts">
 import useTabs from '~/composables/useTabs'
 import { TabMetaInj } from '~/context'
+import useUIPermission from '~/composables/useUIPermission'
+import MdiPlusIcon from '~icons/mdi/plus'
+import MdiTableIcon from '~icons/mdi/table'
+import MdiCsvIcon from '~icons/mdi/file-document-outline'
+import MdiExcelIcon from '~icons/mdi/file-excel'
+import MdiJSONIcon from '~icons/mdi/code-json'
+import MdiAirTableIcon from '~icons/mdi/table-large'
+import MdiRequestDataSourceIcon from '~icons/mdi/open-in-new'
+import MdiAccountGroupIcon from '~icons/mdi/account-group'
 
 const { tabs, activeTabIndex, activeTab, closeTab } = useTabs()
+
+const { isUIAllowed } = useUIPermission()
+
 const tableCreateDialog = ref(false)
+const airtableImportDialog = ref(false)
+const quickImportDialog = ref(false)
+const importType = ref('')
+const currentMenu = ref<string[]>(['addORImport'])
 
 provide(TabMetaInj, activeTab)
+
+function onEdit(targetKey: number, action: string) {
+  if (action !== 'add') {
+    closeTab(targetKey)
+  }
+}
+
+function openQuickImportDialog(type: string) {
+  quickImportDialog.value = true
+  importType.value = type
+}
 </script>
 
 <template>
@@ -13,11 +40,103 @@ provide(TabMetaInj, activeTab)
     <div>
       <a-tabs v-model:activeKey="activeTabIndex" size="small" type="editable-card" @edit="closeTab">
         <a-tab-pane v-for="(tab, i) in tabs" :key="i" :tab="tab.title" />
+
+        <template #leftExtra>
+          <a-menu v-model:selectedKeys="currentMenu" mode="horizontal">
+            <a-sub-menu key="addORImport">
+              <template #title>
+                <div class="text-sm flex items-center gap-2">
+                  <MdiPlusIcon />
+                  Add / Import
+                </div>
+              </template>
+              <a-menu-item-group v-if="isUIAllowed('addTable')">
+                <a-menu-item key="add-new-table" v-t="['a:actions:create-table']" @click="tableCreateDialog = true">
+                  <span class="flex items-center gap-2">
+                    <MdiTableIcon class="text-primary" />
+                    <!-- Add new table -->
+                    {{ $t('tooltip.addTable') }}
+                  </span>
+                </a-menu-item>
+              </a-menu-item-group>
+              <a-menu-item-group title="QUICK IMPORT FROM">
+                <a-menu-item
+                  v-if="isUIAllowed('airtableImport')"
+                  key="quick-import-airtable"
+                  v-t="['a:actions:import-airtable']"
+                  @click="airtableImportDialog = true"
+                >
+                  <span class="flex items-center gap-2">
+                    <MdiAirTableIcon class="text-primary" />
+                    <!-- TODO: i18n -->
+                    Airtable
+                  </span>
+                </a-menu-item>
+                <a-menu-item
+                  v-if="isUIAllowed('csvImport')"
+                  key="quick-import-csv"
+                  v-t="['a:actions:import-csv']"
+                  @click="openQuickImportDialog('csv')"
+                >
+                  <span class="flex items-center gap-2">
+                    <MdiCsvIcon class="text-primary" />
+                    <!-- TODO: i18n -->
+                    CSV file
+                  </span>
+                </a-menu-item>
+                <a-menu-item
+                  v-if="isUIAllowed('jsonImport')"
+                  key="quick-import-json"
+                  v-t="['a:actions:import-json']"
+                  @click="openQuickImportDialog('json')"
+                >
+                  <span class="flex items-center gap-2">
+                    <MdiJSONIcon class="text-primary" />
+                    <!-- TODO: i18n -->
+                    JSON file
+                  </span>
+                </a-menu-item>
+                <a-menu-item
+                  v-if="isUIAllowed('excelImport')"
+                  key="quick-import-excel"
+                  v-t="['a:actions:import-excel']"
+                  @click="openQuickImportDialog('excel')"
+                >
+                  <span class="flex items-center gap-2">
+                    <MdiExcelIcon class="text-primary" />
+                    <!-- TODO: i18n -->
+                    Microsoft Excel
+                  </span>
+                </a-menu-item>
+              </a-menu-item-group>
+              <a-divider class="ma-0 mb-2" />
+              <a-menu-item
+                v-if="isUIAllowed('importRequest')"
+                key="add-new-table"
+                v-t="['e:datasource:import-request']"
+                class="ma-0 mt-3"
+              >
+                <a href="https://github.com/nocodb/nocodb/issues/2052" target="_blank" class="prose-sm pa-0">
+                  <span class="flex items-center gap-2">
+                    <MdiRequestDataSourceIcon class="text-primary" />
+                    <!-- TODO: i18n -->
+                    Request a data source you need?
+                  </span>
+                </a>
+              </a-menu-item>
+            </a-sub-menu>
+          </a-menu>
+        </template>
       </a-tabs>
     </div>
+
     <div class="flex-1 min-h-0">
       <NuxtPage />
     </div>
+
+    <DlgTableCreate v-if="tableCreateDialog" v-model="tableCreateDialog" />
+    <DlgQuickImport v-if="quickImportDialog" v-model="quickImportDialog" :import-type="importType" />
+    <DlgAirtableImport v-if="airtableImportDialog" v-model="airtableImportDialog" />
   </div>
 </template>
 

From 2a564f5d49e3bb0a2231eabaec43f6ce14798a0f Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Wed, 27 Jul 2022 16:18:01 +0530
Subject: [PATCH 25/27] chore: menu resize

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 packages/nc-gui-v2/components/dlg/AirtableImport.vue | 2 +-
 packages/nc-gui-v2/components/dlg/QuickImport.vue    | 2 +-
 packages/nc-gui-v2/components/dlg/TableCreate.vue    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui-v2/components/dlg/AirtableImport.vue b/packages/nc-gui-v2/components/dlg/AirtableImport.vue
index 972aa300bb..5686825adb 100644
--- a/packages/nc-gui-v2/components/dlg/AirtableImport.vue
+++ b/packages/nc-gui-v2/components/dlg/AirtableImport.vue
@@ -210,7 +210,7 @@ onBeforeUnmount(() => {
 </script>
 
 <template>
-  <a-modal v-model:visible="dialogShow" width="max(90vw, 600px)" @keydown.esc="dialogShow = false">
+  <a-modal v-model:visible="dialogShow" width="max(30vw, 600px)" @keydown.esc="dialogShow = false">
     <template #footer>
       <div v-if="step === 1">
         <a-button key="back" @click="dialogShow = false">{{ $t('general.cancel') }}</a-button>
diff --git a/packages/nc-gui-v2/components/dlg/QuickImport.vue b/packages/nc-gui-v2/components/dlg/QuickImport.vue
index a21d8b1377..979f981248 100644
--- a/packages/nc-gui-v2/components/dlg/QuickImport.vue
+++ b/packages/nc-gui-v2/components/dlg/QuickImport.vue
@@ -228,7 +228,7 @@ function getAdapter(name: string, val: any) {
 </script>
 
 <template>
-  <a-modal v-model:visible="dialogShow" width="max(90vw, 600px)" @keydown.esc="dialogShow = false">
+  <a-modal v-model:visible="dialogShow" width="max(60vw, 600px)" @keydown.esc="dialogShow = false">
     <a-typography-title class="ml-5 mt-5 mb-5" type="secondary" :level="5">{{ importMeta.header }}</a-typography-title>
     <template #footer>
       <a-button v-if="templateEditorModal" key="back" @click="templateEditorModal = false">Back</a-button>
diff --git a/packages/nc-gui-v2/components/dlg/TableCreate.vue b/packages/nc-gui-v2/components/dlg/TableCreate.vue
index e4170d5199..9466bd41f4 100644
--- a/packages/nc-gui-v2/components/dlg/TableCreate.vue
+++ b/packages/nc-gui-v2/components/dlg/TableCreate.vue
@@ -85,7 +85,7 @@ onMounted(() => {
 <template>
   <a-modal
     v-model:visible="dialogShow"
-    width="max(90vw, 600px)"
+    width="max(30vw, 600px)"
     @keydown.esc="dialogShow = false"
     @keydown.enter="$emit('create', table)"
   >

From ab44ca1ab249f10f65fb835a9a0ce7f6f0ce7c40 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 27 Jul 2022 16:32:13 +0530
Subject: [PATCH 26/27] fix(gui-v2): reload data on view change

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

diff --git a/packages/nc-gui-v2/components/smartsheet/Grid.vue b/packages/nc-gui-v2/components/smartsheet/Grid.vue
index 143695c2fa..624049a0a4 100644
--- a/packages/nc-gui-v2/components/smartsheet/Grid.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Grid.vue
@@ -50,9 +50,9 @@ onKeyStroke(['Enter'], (e) => {
 })
 
 watch(
-  [() => meta?.value?.id, () => view?.value?.id],
-  async (n: any, o: any) => {
-    if (meta?.value && view?.value) {
+  () => view?.value?.id,
+  async (n?: string, o?: string) => {
+    if (n && n !== o) {
       await loadData()
     }
   },

From 3fe4d85b7d2a286d788da044ce453b0a21910af1 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Wed, 27 Jul 2022 22:30:55 +0530
Subject: [PATCH 27/27] refactor: cy import class names

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 packages/nc-gui-v2/components/dlg/AirtableImport.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui-v2/components/dlg/AirtableImport.vue b/packages/nc-gui-v2/components/dlg/AirtableImport.vue
index 5686825adb..28c808e539 100644
--- a/packages/nc-gui-v2/components/dlg/AirtableImport.vue
+++ b/packages/nc-gui-v2/components/dlg/AirtableImport.vue
@@ -218,6 +218,7 @@ onBeforeUnmount(() => {
           key="submit"
           v-t="['c:sync-airtable:save-and-sync']"
           type="primary"
+          class="nc-btn-airtable-import"
           :disabled="disableImportButton"
           @click="saveAndSync"
           >Import
@@ -239,10 +240,10 @@ onBeforeUnmount(() => {
         </div>
         <a-form ref="form" :model="syncSource" name="quick-import-airtable-form" layout="horizontal" class="ma-0">
           <a-form-item v-bind="validateInfos['details.apiKey']">
-            <a-input-password v-model:value="syncSource.details.apiKey" placeholder="Api Key" size="large" />
+            <a-input-password v-model:value="syncSource.details.apiKey" class="nc-input-api-key" placeholder="Api Key" size="large" />
           </a-form-item>
           <a-form-item v-bind="validateInfos['details.syncSourceUrlOrId']">
-            <a-input v-model:value="syncSource.details.syncSourceUrlOrId" placeholder="Shared Base ID / URL" size="large" />
+            <a-input v-model:value="syncSource.details.syncSourceUrlOrId" class="nc-input-shared-base" placeholder="Shared Base ID / URL" size="large" />
           </a-form-item>
           <span class="prose-xl font-bold self-center my-4">Advanced Settings</span>
           <a-divider class="mt-2 mb-5" />