From a58bc435783e36a5dfadd313bf0f4d785739849b Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sun, 21 Aug 2022 16:25:46 +0530
Subject: [PATCH 1/8] fix(gui-v2): avoid unnecessary emit in delete table

- event already emitting inside the useTable composable

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui-v2/components/dashboard/TreeView.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui-v2/components/dashboard/TreeView.vue b/packages/nc-gui-v2/components/dashboard/TreeView.vue
index abd56a7179..86cd447516 100644
--- a/packages/nc-gui-v2/components/dashboard/TreeView.vue
+++ b/packages/nc-gui-v2/components/dashboard/TreeView.vue
@@ -352,7 +352,7 @@ function openTableCreateDialog() {
                           </div>
                         </a-menu-item>
 
-                        <a-menu-item v-if="isUIAllowed('table-delete')" @click="() => $e('c:table:delete') && deleteTable(table)">
+                        <a-menu-item v-if="isUIAllowed('table-delete')" @click="deleteTable(table)">
                           <div class="nc-project-menu-item">
                             {{ $t('general.delete') }}
                           </div>
@@ -386,10 +386,7 @@ function openTableCreateDialog() {
               </div>
             </a-menu-item>
 
-            <a-menu-item
-              v-if="isUIAllowed('table-delete')"
-              @click="() => $e('c:table:delete') && deleteTable(contextMenuTarget.value)"
-            >
+            <a-menu-item v-if="isUIAllowed('table-delete')" @click="deleteTable(contextMenuTarget.value)">
               <div class="nc-project-menu-item">
                 {{ $t('general.delete') }}
               </div>

From 4a6883094e977f26c2409844fe8408cfb928ba9d Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sun, 21 Aug 2022 17:22:54 +0530
Subject: [PATCH 2/8] fix(gui-v2): show comments only for saved records

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/smartsheet/expanded-form/Header.vue         | 2 +-
 .../components/smartsheet/expanded-form/index.vue          | 5 +++--
 .../components/virtual-cell/components/ItemChip.vue        | 2 +-
 packages/nc-gui-v2/composables/useExpandedFormStore.ts     | 7 ++++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet/expanded-form/Header.vue b/packages/nc-gui-v2/components/smartsheet/expanded-form/Header.vue
index f9b26809ca..54623aebcf 100644
--- a/packages/nc-gui-v2/components/smartsheet/expanded-form/Header.vue
+++ b/packages/nc-gui-v2/components/smartsheet/expanded-form/Header.vue
@@ -57,7 +57,7 @@ const iconColor = '#1890ff'
 
     <component
       :is="drawerToggleIcon"
-      v-if="isUIAllowed('rowComments')"
+      v-if="isUIAllowed('rowComments') && !isNew"
       class="cursor-pointer select-none nc-toggle-comments"
       @click="commentsDrawer = !commentsDrawer"
     />
diff --git a/packages/nc-gui-v2/components/smartsheet/expanded-form/index.vue b/packages/nc-gui-v2/components/smartsheet/expanded-form/index.vue
index 1f9ee273f3..ac40c76e63 100644
--- a/packages/nc-gui-v2/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui-v2/components/smartsheet/expanded-form/index.vue
@@ -53,7 +53,7 @@ const fields = computedInject(FieldsInj, (_fields) => {
 
 provide(MetaInj, meta)
 
-const { commentsDrawer, changedColumns, state: rowState } = useProvideExpandedFormStore(meta, row)
+const { commentsDrawer, changedColumns, state: rowState, isNew } = useProvideExpandedFormStore(meta, row)
 
 const { $api } = useNuxtApp()
 
@@ -113,6 +113,7 @@ export default {
           <div class="w-[500px] mx-auto">
             <div v-for="col of fields" :key="col.title" class="mt-2 py-2" :class="`nc-expand-col-${col.title}`">
               <SmartsheetHeaderVirtualCell v-if="isVirtualCol(col)" :column="col" />
+
               <SmartsheetHeaderCell v-else :column="col" />
 
               <div class="!bg-white rounded px-1 min-h-[35px] flex items-center mt-2">
@@ -130,7 +131,7 @@ export default {
           </div>
         </div>
 
-        <div class="nc-comments-drawer min-w-0 min-h-full max-h-full" :class="{ active: commentsDrawer }">
+        <div v-if="!isNew" class="nc-comments-drawer min-w-0 min-h-full max-h-full" :class="{ active: commentsDrawer }">
           <div class="h-full">
             <Comments v-if="commentsDrawer" />
           </div>
diff --git a/packages/nc-gui-v2/components/virtual-cell/components/ItemChip.vue b/packages/nc-gui-v2/components/virtual-cell/components/ItemChip.vue
index 58ca5f6cb6..4cb81f0865 100644
--- a/packages/nc-gui-v2/components/virtual-cell/components/ItemChip.vue
+++ b/packages/nc-gui-v2/components/virtual-cell/components/ItemChip.vue
@@ -58,7 +58,7 @@ export default {
       <ExpandedForm
         v-if="!readOnly && !isLocked && expandedFormDlg"
         v-model="expandedFormDlg"
-        :row="{ row: item }"
+        :row="{ row: item, rowMeta: {}, oldRow: { ...item } }"
         :meta="relatedTableMeta"
         load-row
         use-meta-fields
diff --git a/packages/nc-gui-v2/composables/useExpandedFormStore.ts b/packages/nc-gui-v2/composables/useExpandedFormStore.ts
index 9132809a50..eefa9c87ef 100644
--- a/packages/nc-gui-v2/composables/useExpandedFormStore.ts
+++ b/packages/nc-gui-v2/composables/useExpandedFormStore.ts
@@ -121,7 +121,7 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
         return obj
       }, {} as Record<string, any>)
 
-      if (row.value.rowMeta.new) {
+      if (row.value.rowMeta?.new) {
         data = await $api.dbTableRow.create('noco', project.value.title as string, meta.value.title, updateOrInsertObj)
 
         /* todo:
@@ -133,11 +133,12 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
                 }
               }
             } */
-        row.value = {
+
+        Object.assign(row.value, {
           row: data,
           rowMeta: {},
           oldRow: { ...data },
-        }
+        })
 
         /// todo:
         // await this.reload();

From 2a503a95c6548ad8ac2ca9a2dd5da9fcc2e84cc9 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sun, 21 Aug 2022 17:24:57 +0530
Subject: [PATCH 3/8] fix(gui-v2): remove underline for pagination

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

diff --git a/packages/nc-gui-v2/components/smartsheet/Pagination.vue b/packages/nc-gui-v2/components/smartsheet/Pagination.vue
index a4f6244a6f..e895a9a3da 100644
--- a/packages/nc-gui-v2/components/smartsheet/Pagination.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Pagination.vue
@@ -49,12 +49,14 @@ const page = computed({
 
 <style scoped>
 :deep(.ant-pagination-item a) {
-  @apply text-sm !leading-[21px];
+  @apply text-sm !leading-[21px] !no-underline;
 }
+
 :deep(.ant-pagination-item:not(.ant-pagination-item-active) a) {
   line-height: 21px !important;
-  @apply text-sm text-gray-500;
+  @apply text-sm !text-gray-500 ;
 }
+
 :deep(.ant-pagination-item-link) {
   @apply text-gray-500;
 }

From 0e58cb03ecffe61c20c46e940dd4205bb6e00abd Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sun, 21 Aug 2022 17:27:27 +0530
Subject: [PATCH 4/8] fix(gui-v2): hide system columns in nested expand form

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui-v2/components/smartsheet/expanded-form/index.vue   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet/expanded-form/index.vue b/packages/nc-gui-v2/components/smartsheet/expanded-form/index.vue
index ac40c76e63..4661d8d931 100644
--- a/packages/nc-gui-v2/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui-v2/components/smartsheet/expanded-form/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { ColumnType, TableType, ViewType } from 'nocodb-sdk'
-import { isVirtualCol } from 'nocodb-sdk'
+import { isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import type { Ref } from 'vue'
 import Cell from '../Cell.vue'
 import VirtualCell from '../VirtualCell.vue'
@@ -46,7 +46,7 @@ const meta = toRef(props, 'meta')
 
 const fields = computedInject(FieldsInj, (_fields) => {
   if (props.useMetaFields) {
-    return meta.value.columns ?? []
+    return (meta.value.columns ?? []).filter((col) => !isSystemColumn(col))
   }
   return _fields?.value ?? []
 })

From 9501f9b54e170450d83b70de3b258b4ddb982324 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sun, 21 Aug 2022 17:49:07 +0530
Subject: [PATCH 5/8] enhancement(gui-v2): bring icon in fields menu

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../smartsheet-toolbar/FieldsMenu.vue         | 20 +++++++++++++++++--
 .../components/smartsheet/Pagination.vue      |  2 +-
 .../nc-gui-v2/composables/useViewColumns.ts   |  1 +
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
index 2070043b7a..36cfbf6417 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import type { ColumnType } from 'nocodb-sdk'
+import { isVirtualCol } from 'nocodb-sdk'
 import Draggable from 'vuedraggable'
 import {
   ActiveViewInj,
@@ -14,6 +16,8 @@ import {
   useViewColumns,
   watch,
 } from '#imports'
+import CellIcon from '~/components/smartsheet-header/CellIcon.vue'
+import VirtualCellIcon from '~/components/smartsheet-header/VirtualCellIcon.vue'
 
 const meta = inject(MetaInj)!
 
@@ -39,6 +43,7 @@ const {
   showAll,
   hideAll,
   saveOrUpdate,
+  metaColumnById,
 } = useViewColumns(activeView, meta, () => reloadDataHook.trigger())
 
 watch(
@@ -76,6 +81,11 @@ const onMove = (event: { moved: { newIndex: number } }) => {
 
   $e('a:fields:reorder')
 }
+
+const getIcon = (c: ColumnType) =>
+  h(isVirtualCol(c) ? VirtualCellIcon : CellIcon, {
+    columnMeta: c,
+  })
 </script>
 
 <template>
@@ -103,9 +113,12 @@ const onMove = (event: { moved: { newIndex: number } }) => {
         <div class="nc-fields-list py-1">
           <Draggable v-model="fields" item-key="id" @change="onMove($event)">
             <template #item="{ element: field, index: index }">
-              <div v-show="filteredFieldList.includes(field)" :key="field.id" class="px-2 py-1 flex" @click.stop>
+              <div v-show="filteredFieldList.includes(field)" :key="field.id" class="px-2 py-1 flex items-center" @click.stop>
                 <a-checkbox v-model:checked="field.show" class="shrink" @change="saveOrUpdate(field, index)">
-                  <span class="">{{ field.title }}</span>
+                  <div class="flex items-center">
+                    <component :is="getIcon(metaColumnById[field.fk_column_id])" />
+                    <span>{{ field.title }}</span>
+                  </div>
                 </a-checkbox>
                 <div class="flex-1" />
                 <MdiDrag class="cursor-move" />
@@ -140,4 +153,7 @@ const onMove = (event: { moved: { newIndex: number } }) => {
 :deep(.ant-checkbox-inner) {
   @apply transform scale-60;
 }
+:deep(.ant-checkbox) {
+  @apply top-auto;
+}
 </style>
diff --git a/packages/nc-gui-v2/components/smartsheet/Pagination.vue b/packages/nc-gui-v2/components/smartsheet/Pagination.vue
index e895a9a3da..f219f8dbbb 100644
--- a/packages/nc-gui-v2/components/smartsheet/Pagination.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Pagination.vue
@@ -54,7 +54,7 @@ const page = computed({
 
 :deep(.ant-pagination-item:not(.ant-pagination-item-active) a) {
   line-height: 21px !important;
-  @apply text-sm !text-gray-500 ;
+  @apply text-sm !text-gray-500;
 }
 
 :deep(.ant-pagination-item-link) {
diff --git a/packages/nc-gui-v2/composables/useViewColumns.ts b/packages/nc-gui-v2/composables/useViewColumns.ts
index fe5f718de6..efd70ca7fe 100644
--- a/packages/nc-gui-v2/composables/useViewColumns.ts
+++ b/packages/nc-gui-v2/composables/useViewColumns.ts
@@ -204,5 +204,6 @@ export function useViewColumns(view: Ref<ViewType> | undefined, meta: ComputedRe
     saveOrUpdate,
     sortedAndFilteredFields,
     showSystemFields,
+    metaColumnById,
   }
 }

From 0e1c268a0de4083cacb76b8e9f06c25d071740ab Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sun, 21 Aug 2022 22:09:56 +0530
Subject: [PATCH 6/8] enhancement(gui-v2): navigate to home page from project
 list

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui-v2/pages/[projectType]/[projectId]/index.vue   | 8 ++++----
 packages/nc-gui-v2/pages/index/index.vue                  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui-v2/pages/[projectType]/[projectId]/index.vue b/packages/nc-gui-v2/pages/[projectType]/[projectId]/index.vue
index 24ce45d62a..6b1d779ad4 100644
--- a/packages/nc-gui-v2/pages/[projectType]/[projectId]/index.vue
+++ b/packages/nc-gui-v2/pages/[projectType]/[projectId]/index.vue
@@ -85,10 +85,6 @@ onKeyStroke(
 
 clearTabs()
 
-if (!route.params.type && isUIAllowed('teamAndAuth')) {
-  addTab({ type: TabType.AUTH, title: 'Team & Auth' })
-}
-
 function toggleDialog(value?: boolean, key?: string) {
   dialogOpen.value = value ?? !dialogOpen.value
   openDialogKey.value = key
@@ -98,6 +94,10 @@ await loadProject()
 
 await loadTables()
 
+if (!route.params.type && isUIAllowed('teamAndAuth')) {
+  addTab({ type: TabType.AUTH, title: 'Team & Auth' })
+}
+
 const copyProjectInfo = async () => {
   try {
     await loadProjectMetaInfo()
diff --git a/packages/nc-gui-v2/pages/index/index.vue b/packages/nc-gui-v2/pages/index/index.vue
index a2383bcaf6..9d95950fb0 100644
--- a/packages/nc-gui-v2/pages/index/index.vue
+++ b/packages/nc-gui-v2/pages/index/index.vue
@@ -153,7 +153,7 @@ onMounted(() => {
                   onClick: () => {
                     $e('a:project:open')
 
-                    navigateTo(`/nc/${record.id}/auth`)
+                    navigateTo(`/nc/${record.id}`)
                   },
                   class: ['group'],
                 })

From 33364ad914fe6e87e649afe8b9865157cd4808b8 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Sun, 21 Aug 2022 22:12:28 +0530
Subject: [PATCH 7/8] refactor: tooltip for toggle comments

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../smartsheet/expanded-form/Header.vue       | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet/expanded-form/Header.vue b/packages/nc-gui-v2/components/smartsheet/expanded-form/Header.vue
index 54623aebcf..9fc8063eea 100644
--- a/packages/nc-gui-v2/components/smartsheet/expanded-form/Header.vue
+++ b/packages/nc-gui-v2/components/smartsheet/expanded-form/Header.vue
@@ -52,15 +52,23 @@ const iconColor = '#1890ff'
     </h5>
 
     <div class="flex-1" />
-
-    <mdi-reload class="cursor-pointer select-none" />
-
-    <component
-      :is="drawerToggleIcon"
-      v-if="isUIAllowed('rowComments') && !isNew"
-      class="cursor-pointer select-none nc-toggle-comments"
-      @click="commentsDrawer = !commentsDrawer"
-    />
+    <a-tooltip placement="bottom">
+      <template #title>
+        <div class="text-center w-full">Reload</div>
+      </template>
+      <mdi-reload class="cursor-pointer select-none" />
+    </a-tooltip>
+    <a-tooltip placement="bottom">
+      <template #title>
+        <div class="text-center w-full">Toggle comments draw</div>
+      </template>
+      <component
+        :is="drawerToggleIcon"
+        v-if="isUIAllowed('rowComments') && !isNew"
+        class="cursor-pointer select-none nc-toggle-comments"
+        @click="commentsDrawer = !commentsDrawer"
+      />
+    </a-tooltip>
 
     <a-button class="!text" @click="emit('cancel')">
       <!-- Cancel -->

From 55335300c43f46d39ea67a2c68746d1a61fb0ea2 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Sun, 21 Aug 2022 22:34:46 +0530
Subject: [PATCH 8/8] fix: isUIAllwoed check for add new table btn

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

diff --git a/packages/nc-gui-v2/components/dashboard/TreeView.vue b/packages/nc-gui-v2/components/dashboard/TreeView.vue
index 86cd447516..f425b53d2e 100644
--- a/packages/nc-gui-v2/components/dashboard/TreeView.vue
+++ b/packages/nc-gui-v2/components/dashboard/TreeView.vue
@@ -232,6 +232,7 @@ function openTableCreateDialog() {
         <div class="flex-1">
           <div
             class="group flex items-center gap-2 pl-5 pr-3 py-2 text-primary/70 hover:(text-primary/100) cursor-pointer select-none"
+            v-if="isUIAllowed('table-create')"
             @click="openTableCreateDialog"
           >
             <MdiPlus />