From 18e6927a14f6cd9c3b4688059b224643fd8b877e Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Tue, 7 Feb 2023 15:42:28 +0300
Subject: [PATCH 01/22] feat: grid border css

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nc-gui/components/smartsheet/Grid.vue | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 9ae398dc51..c1e7df3049 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -714,7 +714,7 @@ const closeAddColumnDropdown = () => {
           @contextmenu="showContextMenu"
         >
           <thead ref="tableHead">
-            <tr class="nc-grid-header border-1 bg-gray-100 sticky top[-1px] !z-4">
+            <tr class="nc-grid-header">
               <th data-testid="grid-id-column">
                 <div class="w-full h-full bg-gray-100 flex min-w-[70px] pl-5 pr-1 items-center" data-testid="nc-check-all">
                   <template v-if="!readOnly">
@@ -993,6 +993,7 @@ const closeAddColumnDropdown = () => {
 
   td,
   th {
+    @apply border-gray-200 border-solid border-b border-r;
     min-height: 41px !important;
     height: 41px !important;
     position: relative;
@@ -1003,11 +1004,9 @@ const closeAddColumnDropdown = () => {
     @apply flex px-1 h-auto;
   }
 
-  table,
-  td,
-  th {
-    @apply !border-1;
-    border-collapse: collapse;
+  table {
+    border-collapse: separate;
+    border-spacing: 0;
   }
 
   td {
@@ -1027,7 +1026,7 @@ const closeAddColumnDropdown = () => {
 
   // todo: replace with css variable
   td.active::after {
-    @apply border-2 border-solid text-primary border-current bg-primary bg-opacity-5;
+    @apply border-1 border-solid text-primary border-current bg-primary bg-opacity-5;
   }
 
   //td.active::before {
@@ -1081,7 +1080,7 @@ const closeAddColumnDropdown = () => {
   position: sticky;
   top: -1px;
 
-  @apply z-1;
+  @apply z-10 bg-gray-100;
 
   &:hover {
     .nc-no-label {

From fcb0c406500703448adf5b9251db04bd0b78da39 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Tue, 7 Feb 2023 17:27:30 +0300
Subject: [PATCH 02/22] feat: make first grid column sticky

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../nc-gui/components/smartsheet/Grid.vue     | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index c1e7df3049..350af0237e 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -1034,6 +1034,34 @@ const closeAddColumnDropdown = () => {
   //  z-index:4;
   //  @apply absolute !w-[10px] !h-[10px] !right-[-5px] !bottom-[-5px] bg-primary;
   //}
+
+  thead th:nth-child(1) {
+    position: sticky !important;
+    left: 0;
+    z-index: 5;
+  }
+
+  tbody td:nth-child(1) {
+    position: sticky !important;
+    left: 0;
+    z-index: 4;
+    background: white;
+  }
+
+  thead th:nth-child(2) {
+    position: sticky !important;
+    left: 80px;
+    z-index: 5;
+    @apply border-r-2 border-r-gray-300;
+  }
+
+  tbody td:nth-child(2) {
+    position: sticky !important;
+    left: 80px;
+    z-index: 4;
+    background: white;
+    @apply shadow-lg border-r-2 border-r-gray-300;
+  }
 }
 
 :deep {

From 03db6b26b538f887198e41f88b7c9e6bfa023b25 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Wed, 8 Feb 2023 21:22:12 +0300
Subject: [PATCH 03/22] feat: force primary value column as sticky

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nc-gui/components.d.ts               |  1 +
 .../components/smartsheet/header/Menu.vue     |  2 +
 .../smartsheet/toolbar/FieldsMenu.vue         | 28 +++++-
 packages/nc-gui/composables/useViewColumns.ts |  5 +-
 packages/nocodb/src/lib/models/Model.ts       | 12 +++
 packages/nocodb/src/lib/models/View.ts        | 99 +++++++++++++++++++
 6 files changed, 145 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts
index 18efdf47a7..99bc5645f2 100644
--- a/packages/nc-gui/components.d.ts
+++ b/packages/nc-gui/components.d.ts
@@ -232,6 +232,7 @@ declare module '@vue/runtime-core' {
     MdiTable: typeof import('~icons/mdi/table')['default']
     MdiTableColumnPlusAfter: typeof import('~icons/mdi/table-column-plus-after')['default']
     MdiTableColumnPlusBefore: typeof import('~icons/mdi/table-column-plus-before')['default']
+    MdiTableKey: typeof import('~icons/mdi/table-key')['default']
     MdiTableLarge: typeof import('~icons/mdi/table-large')['default']
     MdiText: typeof import('~icons/mdi/text')['default']
     MdiThumbUp: typeof import('~icons/mdi/thumb-up')['default']
diff --git a/packages/nc-gui/components/smartsheet/header/Menu.vue b/packages/nc-gui/components/smartsheet/header/Menu.vue
index b1fbd20a6a..8552d67bf3 100644
--- a/packages/nc-gui/components/smartsheet/header/Menu.vue
+++ b/packages/nc-gui/components/smartsheet/header/Menu.vue
@@ -74,6 +74,8 @@ const setAsPrimaryValue = async () => {
 
     await getMeta(meta?.value?.id as string, true)
 
+    eventBus.emit(SmartsheetStoreEvents.FIELD_RELOAD)
+
     // Successfully updated as primary column
     message.success(t('msg.success.primaryColumnUpdated'))
 
diff --git a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
index bb06fb9659..9f7819ac2f 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
@@ -188,7 +188,7 @@ useMenuCloseOnEsc(open)
           <Draggable v-model="fields" item-key="id" @change="onMove($event)">
             <template #item="{ element: field, index: index }">
               <div
-                v-show="filteredFieldList.includes(field)"
+                v-if="filteredFieldList.slice(1).includes(field)"
                 :key="field.id"
                 class="px-2 py-1 flex items-center"
                 :data-testid="`nc-fields-menu-${field.title}`"
@@ -212,6 +212,32 @@ useMenuCloseOnEsc(open)
                 <MdiDrag class="cursor-move" />
               </div>
             </template>
+            <template #header>
+              <div
+                v-if="filteredFieldList[0]"
+                v-show="filteredFieldList[0]"
+                :key="`pv-${filteredFieldList[0].id}`"
+                class="px-2 py-1 flex items-center"
+                :data-testid="`nc-fields-menu-${filteredFieldList[0].title}`"
+                @click.stop
+              >
+                <a-tooltip placement="bottom">
+                  <template #title>
+                    <span class="text-sm">Primary Value</span>
+                  </template>
+
+                  <MdiTableKey class="text-xs" />
+                </a-tooltip>
+
+                <div class="flex items-center px-[8px]">
+                  <component :is="getIcon(metaColumnById[filteredFieldList[0].fk_column_id as string])" />
+
+                  <span>{{ filteredFieldList[0].title }}</span>
+                </div>
+
+                <div class="flex-1" />
+              </div>
+            </template>
           </Draggable>
         </div>
 
diff --git a/packages/nc-gui/composables/useViewColumns.ts b/packages/nc-gui/composables/useViewColumns.ts
index 0922527003..19765ee6ba 100644
--- a/packages/nc-gui/composables/useViewColumns.ts
+++ b/packages/nc-gui/composables/useViewColumns.ts
@@ -173,6 +173,8 @@ export function useViewColumns(
   const filteredFieldList = computed(() => {
     return (
       fields.value?.filter((field: Field) => {
+        if (metaColumnById?.value?.[field.fk_column_id!].pv) return true
+
         // hide system columns if not enabled
         if (!showSystemFields.value && isSystemColumn(metaColumnById?.value?.[field.fk_column_id!])) {
           return false
@@ -195,7 +197,8 @@ export function useViewColumns(
           !showSystemFields.value &&
           metaColumnById.value &&
           metaColumnById?.value?.[field.fk_column_id!] &&
-          isSystemColumn(metaColumnById.value?.[field.fk_column_id!])
+          isSystemColumn(metaColumnById.value?.[field.fk_column_id!]) &&
+          !metaColumnById.value?.[field.fk_column_id!].pv
         ) {
           return false
         }
diff --git a/packages/nocodb/src/lib/models/Model.ts b/packages/nocodb/src/lib/models/Model.ts
index a77e10f409..2860a5e3cf 100644
--- a/packages/nocodb/src/lib/models/Model.ts
+++ b/packages/nocodb/src/lib/models/Model.ts
@@ -606,6 +606,18 @@ export default class Model implements TableType {
       newPvCol.id
     );
 
+    const grid_views_with_column = await ncMeta.metaList2(null, null, MetaTable.GRID_VIEW_COLUMNS, {
+      condition: {
+        fk_column_id: newPvCol.id,
+      }
+    })
+
+    if (grid_views_with_column.length) {
+      for (const gv of grid_views_with_column) {
+        await View.fixPVColumnForView(gv.fk_view_id, ncMeta);
+      }
+    }
+
     return true;
   }
 
diff --git a/packages/nocodb/src/lib/models/View.ts b/packages/nocodb/src/lib/models/View.ts
index b50afcf698..a270fd5450 100644
--- a/packages/nocodb/src/lib/models/View.ts
+++ b/packages/nocodb/src/lib/models/View.ts
@@ -630,6 +630,18 @@ export default class View implements ViewType {
         break;
     }
     const updateObj = extractProps(colData, ['order', 'show']);
+
+    const primary_value_column = await ncMeta.metaGet2(null, null, MetaTable.COLUMNS, {
+      fk_model_id: view.fk_model_id,
+      pv: true,
+    });
+
+    // keep primary_value_column always visible and first
+    if (primary_value_column && primary_value_column.id === colId) {
+      updateObj.order = 1;
+      updateObj.show = true;
+    }
+
     // get existing cache
     const key = `${cacheScope}:${colId}`;
     let o = await NocoCache.get(key, CacheGetType.TYPE_OBJECT);
@@ -1078,6 +1090,17 @@ export default class View implements ViewType {
     const view = await this.get(viewId);
     const table = this.extractViewColumnsTableName(view);
     const scope = this.extractViewColumnsTableNameScope(view);
+
+    const primary_value_column = await ncMeta.metaGet2(null, null, MetaTable.COLUMNS, {
+      fk_model_id: view.fk_model_id,
+      pv: true,
+    })
+
+    // keep primary_value_column always visible
+    if (primary_value_column) {
+      ignoreColdIds.push(primary_value_column.id)
+    }
+
     // get existing cache
     const dataList = await NocoCache.getList(scope, [viewId]);
     if (dataList?.length) {
@@ -1135,4 +1158,80 @@ export default class View implements ViewType {
     sharedViews = sharedViews.filter((v) => v.uuid !== null);
     return sharedViews?.map((v) => new View(v));
   }
+
+  static async fixPVColumnForView(viewId, ncMeta = Noco.ncMeta) {
+    // get a list of view columns sorted by order
+    const view_columns = await ncMeta.metaList2(null, null, MetaTable.GRID_VIEW_COLUMNS, {
+      condition: {
+        fk_view_id: viewId,
+      },
+      orderBy: {
+        order: 'asc',
+      },
+    });
+    const view_columns_meta = []
+
+    // get column meta for each view column
+    for (const col of view_columns) {
+      const col_meta = await ncMeta.metaGet2(null, null, MetaTable.COLUMNS, col.fk_column_id);
+      view_columns_meta.push(col_meta);
+    }
+
+    const primary_value_column_meta = view_columns_meta.find((col) => col.pv);
+
+    if (primary_value_column_meta) {
+      const primary_value_column = view_columns.find((col) => col.fk_column_id === primary_value_column_meta.id);
+      const primary_value_column_index = view_columns.findIndex((col) => col.fk_column_id === primary_value_column_meta.id);
+      // if primary_value_column is not visible, make it visible
+      if (!primary_value_column.show) {
+        await ncMeta.metaUpdate(
+          null,
+          null,
+          MetaTable.GRID_VIEW_COLUMNS,
+          { show: true },
+          primary_value_column.id,
+        );
+        await NocoCache.set(
+          `${CacheScope.GRID_VIEW_COLUMN}:${primary_value_column.id}`,
+          primary_value_column
+        );
+      }
+
+      if (primary_value_column.order < 2) {
+        // if primary_value_column is in first order do nothing
+        return;
+      } else {
+        // if primary_value_column not in first order, move it to the start of array
+        if (primary_value_column_index !== 0) {
+          const temp_pv = view_columns.splice(primary_value_column_index, 1);
+          view_columns.unshift(...temp_pv);
+        }
+
+        // update order of all columns in view to match the order in array
+        for (let i = 0; i < view_columns.length; i++) {
+          await ncMeta.metaUpdate(
+            null,
+            null,
+            MetaTable.GRID_VIEW_COLUMNS,
+            { order: i + 1 },
+            view_columns[i].id
+          );
+          await NocoCache.set(
+            `${CacheScope.GRID_VIEW_COLUMN}:${view_columns[i].id}`,
+            view_columns[i]
+          );
+        }
+      }
+    }
+
+    const views = await ncMeta.metaList2(null, null, MetaTable.GRID_VIEW_COLUMNS, {
+      condition: {
+        fk_view_id: viewId,
+      },
+      orderBy: {
+        order: 'asc',
+      },
+    });
+    await NocoCache.setList(CacheScope.GRID_VIEW_COLUMN, [viewId], views);
+  }
 }

From 8db2c53d27ff1cc40c147b742dc93f551dd7fcf7 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Wed, 8 Feb 2023 21:08:05 +0300
Subject: [PATCH 04/22] feat: sticky column upgrader

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nocodb/src/lib/Noco.ts               |  2 +-
 .../src/lib/version-upgrader/NcUpgrader.ts    |  2 +
 .../ncStickyColumnUpgrader.ts                 | 72 +++++++++++++++++++
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 packages/nocodb/src/lib/version-upgrader/ncStickyColumnUpgrader.ts

diff --git a/packages/nocodb/src/lib/Noco.ts b/packages/nocodb/src/lib/Noco.ts
index bd2fed4b61..d144579e41 100644
--- a/packages/nocodb/src/lib/Noco.ts
+++ b/packages/nocodb/src/lib/Noco.ts
@@ -105,7 +105,7 @@ export default class Noco {
   constructor() {
     process.env.PORT = process.env.PORT || '8080';
     // todo: move
-    process.env.NC_VERSION = '0104002';
+    process.env.NC_VERSION = '0104003';
 
     // if env variable NC_MINIMAL_DBS is set, then disable project creation with external sources
     if (process.env.NC_MINIMAL_DBS) {
diff --git a/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts
index 06890a86c3..1fea08ebed 100644
--- a/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts
+++ b/packages/nocodb/src/lib/version-upgrader/NcUpgrader.ts
@@ -11,6 +11,7 @@ import ncProjectRolesUpgrader from './ncProjectRolesUpgrader';
 import ncFilterUpgrader from './ncFilterUpgrader';
 import ncAttachmentUpgrader from './ncAttachmentUpgrader';
 import ncAttachmentUpgrader_0104002 from './ncAttachmentUpgrader_0104002';
+import ncStickyColumnUpgrader from './ncStickyColumnUpgrader';
 
 const log = debug('nc:version-upgrader');
 import boxen from 'boxen';
@@ -41,6 +42,7 @@ export default class NcUpgrader {
         { name: '0100002', handler: ncFilterUpgrader },
         { name: '0101002', handler: ncAttachmentUpgrader },
         { name: '0104002', handler: ncAttachmentUpgrader_0104002 },
+        { name: '0104003', handler: ncStickyColumnUpgrader },
       ];
       if (!(await ctx.ncMeta.knexConnection?.schema?.hasTable?.('nc_store'))) {
         return;
diff --git a/packages/nocodb/src/lib/version-upgrader/ncStickyColumnUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/ncStickyColumnUpgrader.ts
new file mode 100644
index 0000000000..7168c27fe9
--- /dev/null
+++ b/packages/nocodb/src/lib/version-upgrader/ncStickyColumnUpgrader.ts
@@ -0,0 +1,72 @@
+import { NcUpgraderCtx } from './NcUpgrader';
+import { MetaTable } from '../utils/globals';
+
+// before 0.104.3, primary value column can be in any position in table
+// with this upgrade we introduced sticky primary column feature
+// this upgrader will make primary value column first column in grid views
+
+export default async function ({ ncMeta }: NcUpgraderCtx) {
+  const grid_columns = await ncMeta.metaList2(null, null, MetaTable.GRID_VIEW_COLUMNS);
+  const grid_views = [...new Set(grid_columns.map((col) => col.fk_view_id))]
+
+  for (const view_id of grid_views) {
+    // get a list of view columns sorted by order
+    const view_columns = await ncMeta.metaList2(null, null, MetaTable.GRID_VIEW_COLUMNS, {
+      condition: {
+        fk_view_id: view_id,
+      },
+      orderBy: {
+        order: 'asc',
+      },
+    });
+    const view_columns_meta = []
+
+    // get column meta for each view column
+    for (const col of view_columns) {
+      const col_meta = await ncMeta.metaGet(null, null, MetaTable.COLUMNS, { id: col.fk_column_id });
+      view_columns_meta.push(col_meta);
+    }
+
+    const primary_value_column_meta = view_columns_meta.find((col) => col.pv);
+
+    if (primary_value_column_meta) {
+      const primary_value_column = view_columns.find((col) => col.fk_column_id === primary_value_column_meta.id);
+      const primary_value_column_index = view_columns.findIndex((col) => col.fk_column_id === primary_value_column_meta.id);
+      const view_orders = view_columns.map((col) => col.order);
+      const view_min_order = Math.min(...view_orders);
+
+      // if primary_value_column is not visible, make it visible
+      if (!primary_value_column.show) {
+        await ncMeta.metaUpdate(
+          null,
+          null,
+          MetaTable.GRID_VIEW_COLUMNS,
+          { show: true },
+          primary_value_column.id,
+        );
+      }
+
+      if (primary_value_column.order ===  view_min_order && view_orders.filter((o) => o === view_min_order).length === 1) {
+        // if primary_value_column is in first order do nothing
+        continue;
+      } else {
+        // if primary_value_column not in first order, move it to the start of array
+        if (primary_value_column_index !== 0) {
+          const temp_pv = view_columns.splice(primary_value_column_index, 1);
+          view_columns.unshift(...temp_pv);
+        }
+
+        // update order of all columns in view to match the order in array
+        for (let i = 0; i < view_columns.length; i++) {
+          await ncMeta.metaUpdate(
+            null,
+            null,
+            MetaTable.GRID_VIEW_COLUMNS,
+            { order: i + 1 },
+            view_columns[i].id
+          );
+        }
+      }
+    }
+  }
+}

From 275ba16c456a2416935cd1413f28b4fbc4f49eec Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Wed, 8 Feb 2023 21:36:55 +0300
Subject: [PATCH 05/22] fix: hide set as primary value option from primary
 value column

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nc-gui/components/smartsheet/header/Menu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/header/Menu.vue b/packages/nc-gui/components/smartsheet/header/Menu.vue
index 8552d67bf3..3b1d2068c7 100644
--- a/packages/nc-gui/components/smartsheet/header/Menu.vue
+++ b/packages/nc-gui/components/smartsheet/header/Menu.vue
@@ -279,7 +279,7 @@ const hideField = async () => {
         </a-menu-item>
         <a-divider class="!my-0" />
 
-        <a-menu-item v-if="!virtual" @click="setAsPrimaryValue">
+        <a-menu-item v-if="!virtual && !column?.pv" @click="setAsPrimaryValue">
           <div class="nc-column-set-primary nc-header-menu-item">
             <MdiStar class="text-primary" />
 

From 8f3f166b2549064fe0ea3dd1ab6138c6daea9d14 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Wed, 8 Feb 2023 22:16:14 +0300
Subject: [PATCH 06/22] fix: fields menu for view types other than grid

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
index 9f7819ac2f..88e9407efe 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
@@ -188,7 +188,7 @@ useMenuCloseOnEsc(open)
           <Draggable v-model="fields" item-key="id" @change="onMove($event)">
             <template #item="{ element: field, index: index }">
               <div
-                v-if="filteredFieldList.slice(1).includes(field)"
+                v-if="filteredFieldList.slice(activeView?.type === ViewTypes.GRID ? 1 : 0).includes(field)"
                 :key="field.id"
                 class="px-2 py-1 flex items-center"
                 :data-testid="`nc-fields-menu-${field.title}`"
@@ -212,7 +212,7 @@ useMenuCloseOnEsc(open)
                 <MdiDrag class="cursor-move" />
               </div>
             </template>
-            <template #header>
+            <template v-if="activeView?.type === ViewTypes.GRID" #header>
               <div
                 v-if="filteredFieldList[0]"
                 v-show="filteredFieldList[0]"

From 15bc281ecb17886c9cd1b6a5805e37b908a82358 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Wed, 8 Feb 2023 22:22:25 +0300
Subject: [PATCH 07/22] fix: hide all for views types other than grid

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nocodb/src/lib/models/View.ts | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/nocodb/src/lib/models/View.ts b/packages/nocodb/src/lib/models/View.ts
index a270fd5450..e802384252 100644
--- a/packages/nocodb/src/lib/models/View.ts
+++ b/packages/nocodb/src/lib/models/View.ts
@@ -1091,14 +1091,16 @@ export default class View implements ViewType {
     const table = this.extractViewColumnsTableName(view);
     const scope = this.extractViewColumnsTableNameScope(view);
 
-    const primary_value_column = await ncMeta.metaGet2(null, null, MetaTable.COLUMNS, {
-      fk_model_id: view.fk_model_id,
-      pv: true,
-    })
-
-    // keep primary_value_column always visible
-    if (primary_value_column) {
-      ignoreColdIds.push(primary_value_column.id)
+    if (view.type === ViewTypes.GRID) {
+      const primary_value_column = await ncMeta.metaGet2(null, null, MetaTable.COLUMNS, {
+        fk_model_id: view.fk_model_id,
+        pv: true,
+      })
+
+      // keep primary_value_column always visible
+      if (primary_value_column) {
+        ignoreColdIds.push(primary_value_column.id)
+      }
     }
 
     // get existing cache

From a689628b14b26235249bd61452b9a96da9a0c02c Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Wed, 8 Feb 2023 22:26:44 +0300
Subject: [PATCH 08/22] test: fix import test for sticky column change

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 tests/playwright/pages/Dashboard/common/Toolbar/Fields.ts | 4 ++--
 tests/playwright/quickTests/commonTest.ts                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/common/Toolbar/Fields.ts b/tests/playwright/pages/Dashboard/common/Toolbar/Fields.ts
index 02bb384731..08c8bfc1ed 100644
--- a/tests/playwright/pages/Dashboard/common/Toolbar/Fields.ts
+++ b/tests/playwright/pages/Dashboard/common/Toolbar/Fields.ts
@@ -31,12 +31,12 @@ export class ToolbarFieldsPage extends BasePage {
     await this.toolbar.clickFields();
   }
 
-  async verify({ title, checked }: { title: string; checked: boolean }) {
+  async verify({ title, checked }: { title: string; checked?: boolean }) {
     const checkbox = this.get().locator(`[data-testid="nc-fields-menu-${title}"]`).locator('input[type="checkbox"]');
 
     if (checked) {
       await expect(checkbox).toBeChecked();
-    } else {
+    } else if (checked === false) {
       await expect(checkbox).not.toBeChecked();
     }
   }
diff --git a/tests/playwright/quickTests/commonTest.ts b/tests/playwright/quickTests/commonTest.ts
index 3d5d0dc6bf..1a5c30673c 100644
--- a/tests/playwright/quickTests/commonTest.ts
+++ b/tests/playwright/quickTests/commonTest.ts
@@ -208,7 +208,7 @@ const quickVerify = async ({
 
   // Verify Fields
   await dashboard.grid.toolbar.clickFields();
-  await dashboard.grid.toolbar.fields.verify({ title: 'Name', checked: true });
+  await dashboard.grid.toolbar.fields.verify({ title: 'Name' });
   await dashboard.grid.toolbar.fields.verify({ title: 'Notes', checked: true });
   await dashboard.grid.toolbar.fields.verify({ title: 'Attachments', checked: false });
   await dashboard.grid.toolbar.fields.verify({ title: 'Status', checked: true });

From 1c690adfb14121163bda63b6ef87b726ae9ed07c Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Wed, 8 Feb 2023 22:40:39 +0300
Subject: [PATCH 09/22] test: close sort menu after verifying

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 tests/playwright/pages/Dashboard/Grid/Column/index.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/playwright/pages/Dashboard/Grid/Column/index.ts b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
index 064b2093b5..33bf0d822c 100644
--- a/tests/playwright/pages/Dashboard/Grid/Column/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
@@ -386,5 +386,8 @@ export class ColumnPageObject extends BasePage {
       )
       .first()
       .isVisible();
+    
+    // close sort menu
+    await this.grid.toolbar.clickSort();
   }
 }

From 328c547c7fc25a9842190285c82553dd7dec147c Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 9 Feb 2023 04:04:55 +0300
Subject: [PATCH 10/22] refactor: move populateMeta to helpers

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nocodb/src/lib/meta/api/baseApis.ts  | 263 +-----------------
 .../nocodb/src/lib/meta/api/helpers/index.ts  |   3 +
 .../src/lib/meta/api/helpers/populateMeta.ts  | 263 ++++++++++++++++++
 .../nocodb/src/lib/meta/api/projectApis.ts    | 263 +-----------------
 4 files changed, 270 insertions(+), 522 deletions(-)
 create mode 100644 packages/nocodb/src/lib/meta/api/helpers/index.ts
 create mode 100644 packages/nocodb/src/lib/meta/api/helpers/populateMeta.ts

diff --git a/packages/nocodb/src/lib/meta/api/baseApis.ts b/packages/nocodb/src/lib/meta/api/baseApis.ts
index 07e3a23692..9b81d8e06b 100644
--- a/packages/nocodb/src/lib/meta/api/baseApis.ts
+++ b/packages/nocodb/src/lib/meta/api/baseApis.ts
@@ -1,22 +1,13 @@
 import { Request, Response } from 'express';
 import Project from '../../models/Project';
-import { BaseListType, ModelTypes, UITypes } from 'nocodb-sdk';
+import { BaseListType } from 'nocodb-sdk';
 import { PagedResponseImpl } from '../helpers/PagedResponse';
 import { syncBaseMigration } from '../helpers/syncMigration';
-import { IGNORE_TABLES } from '../../utils/common/BaseApiBuilder';
-import Column from '../../models/Column';
-import Model from '../../models/Model';
-import NcHelp from '../../utils/NcHelp';
 import Base from '../../models/Base';
-import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2';
-import getTableNameAlias, { getColumnNameAlias } from '../helpers/getTableName';
-import LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn';
 import ncMetaAclMw from '../helpers/ncMetaAclMw';
 import { Tele } from 'nc-help';
-import getColumnUiType from '../helpers/getColumnUiType';
-import mapDefaultPrimaryValue from '../helpers/mapDefaultPrimaryValue';
-import { extractAndGenerateManyToManyRelations } from './metaDiffApis';
 import { metaApiMetrics } from '../helpers/apiMetrics';
+import { populateMeta } from './helpers';
 
 export async function baseGet(
   req: Request<any, any, any>,
@@ -107,256 +98,6 @@ async function baseCreate(req: Request<any, any>, res) {
   res.json(base);
 }
 
-async function populateMeta(base: Base, project: Project): Promise<any> {
-  const info = {
-    type: 'rest',
-    apiCount: 0,
-    tablesCount: 0,
-    relationsCount: 0,
-    viewsCount: 0,
-    client: base?.getConnectionConfig()?.client,
-    timeTaken: 0,
-  };
-
-  const t = process.hrtime();
-  const sqlClient = await NcConnectionMgrv2.getSqlClient(base);
-  let order = 1;
-  const models2: { [tableName: string]: Model } = {};
-
-  const virtualColumnsInsert = [];
-
-  /* Get all relations */
-  const relations = (await sqlClient.relationListAll())?.data?.list;
-
-  info.relationsCount = relations.length;
-
-  let tables = (await sqlClient.tableList())?.data?.list
-    ?.filter(({ tn }) => !IGNORE_TABLES.includes(tn))
-    ?.map((t) => {
-      t.order = ++order;
-      t.title = getTableNameAlias(t.tn, project.prefix, base);
-      t.table_name = t.tn;
-      return t;
-    });
-
-  /* filter based on prefix */
-  if (base.is_meta && project?.prefix) {
-    tables = tables.filter((t) => {
-      return t?.tn?.startsWith(project?.prefix);
-    });
-  }
-
-  info.tablesCount = tables.length;
-
-  tables.forEach((t) => {
-    t.title = getTableNameAlias(t.tn, project.prefix, base);
-  });
-
-  relations.forEach((r) => {
-    r.title = getTableNameAlias(r.tn, project.prefix, base);
-    r.rtitle = getTableNameAlias(r.rtn, project.prefix, base);
-  });
-
-  // await this.syncRelations();
-
-  const tableMetasInsert = tables.map((table) => {
-    return async () => {
-      /* filter relation where this table is present */
-      const tableRelations = relations.filter(
-        (r) => r.tn === table.tn || r.rtn === table.tn
-      );
-
-      const columns: Array<
-        Omit<Column, 'column_name' | 'title'> & {
-          cn: string;
-          system?: boolean;
-        }
-      > = (await sqlClient.columnList({ tn: table.tn }))?.data?.list;
-
-      const hasMany =
-        table.type === 'view'
-          ? []
-          : tableRelations.filter((r) => r.rtn === table.tn);
-      const belongsTo =
-        table.type === 'view'
-          ? []
-          : tableRelations.filter((r) => r.tn === table.tn);
-
-      mapDefaultPrimaryValue(columns);
-
-      // add vitual columns
-      const virtualColumns = [
-        ...hasMany.map((hm) => {
-          return {
-            uidt: UITypes.LinkToAnotherRecord,
-            type: 'hm',
-            hm,
-            title: `${hm.title} List`,
-          };
-        }),
-        ...belongsTo.map((bt) => {
-          // find and mark foreign key column
-          const fkColumn = columns.find((c) => c.cn === bt.cn);
-          if (fkColumn) {
-            fkColumn.uidt = UITypes.ForeignKey;
-            fkColumn.system = true;
-          }
-
-          return {
-            uidt: UITypes.LinkToAnotherRecord,
-            type: 'bt',
-            bt,
-            title: `${bt.rtitle}`,
-          };
-        }),
-      ];
-
-      // await Model.insert(project.id, base.id, meta);
-
-      /* create nc_models and its rows if it doesn't exists  */
-      models2[table.table_name] = await Model.insert(project.id, base.id, {
-        table_name: table.tn || table.table_name,
-        title: table.title,
-        type: table.type || 'table',
-        order: table.order,
-      });
-
-      // table crud apis
-      info.apiCount += 5;
-
-      let colOrder = 1;
-
-      for (const column of columns) {
-        await Column.insert({
-          uidt: column.uidt || getColumnUiType(base, column),
-          fk_model_id: models2[table.tn].id,
-          ...column,
-          title: getColumnNameAlias(column.cn, base),
-          column_name: column.cn,
-          order: colOrder++,
-        });
-      }
-      virtualColumnsInsert.push(async () => {
-        const columnNames = {};
-        for (const column of virtualColumns) {
-          // generate unique name if there is any duplicate column name
-          let c = 0;
-          while (`${column.title}${c || ''}` in columnNames) {
-            c++;
-          }
-          column.title = `${column.title}${c || ''}`;
-          columnNames[column.title] = true;
-
-          const rel = column.hm || column.bt;
-
-          const rel_column_id = (await models2?.[rel.tn]?.getColumns())?.find(
-            (c) => c.column_name === rel.cn
-          )?.id;
-
-          const tnId = models2?.[rel.tn]?.id;
-
-          const ref_rel_column_id = (
-            await models2?.[rel.rtn]?.getColumns()
-          )?.find((c) => c.column_name === rel.rcn)?.id;
-
-          const rtnId = models2?.[rel.rtn]?.id;
-
-          try {
-            await Column.insert<LinkToAnotherRecordColumn>({
-              project_id: project.id,
-              db_alias: base.id,
-              fk_model_id: models2[table.tn].id,
-              cn: column.cn,
-              title: column.title,
-              uidt: column.uidt,
-              type: column.hm ? 'hm' : column.mm ? 'mm' : 'bt',
-              // column_id,
-              fk_child_column_id: rel_column_id,
-              fk_parent_column_id: ref_rel_column_id,
-              fk_index_name: rel.fkn,
-              ur: rel.ur,
-              dr: rel.dr,
-              order: colOrder++,
-              fk_related_model_id: column.hm ? tnId : rtnId,
-              system: column.system,
-            });
-
-            // nested relations data apis
-            info.apiCount += 5;
-          } catch (e) {
-            console.log(e);
-          }
-        }
-      });
-    };
-  });
-
-  /* handle xc_tables update in parallel */
-  await NcHelp.executeOperations(tableMetasInsert, base.type);
-  await NcHelp.executeOperations(virtualColumnsInsert, base.type);
-  await extractAndGenerateManyToManyRelations(Object.values(models2));
-
-  let views: Array<{ order: number; table_name: string; title: string }> = (
-    await sqlClient.viewList()
-  )?.data?.list
-    // ?.filter(({ tn }) => !IGNORE_TABLES.includes(tn))
-    ?.map((v) => {
-      v.order = ++order;
-      v.table_name = v.view_name;
-      v.title = getTableNameAlias(v.view_name, project.prefix, base);
-      return v;
-    });
-
-  /* filter based on prefix */
-  if (base.is_meta && project?.prefix) {
-    views = tables.filter((t) => {
-      return t?.tn?.startsWith(project?.prefix);
-    });
-  }
-
-  info.viewsCount = views.length;
-
-  const viewMetasInsert = views.map((table) => {
-    return async () => {
-      const columns = (await sqlClient.columnList({ tn: table.table_name }))
-        ?.data?.list;
-
-      /* create nc_models and its rows if it doesn't exists  */
-      models2[table.table_name] = await Model.insert(project.id, base.id, {
-        table_name: table.table_name,
-        title: getTableNameAlias(table.table_name, project.prefix, base),
-        // todo: sanitize
-        type: ModelTypes.VIEW,
-        order: table.order,
-      });
-
-      let colOrder = 1;
-
-      // view apis
-      info.apiCount += 2;
-
-      for (const column of columns) {
-        await Column.insert({
-          fk_model_id: models2[table.table_name].id,
-          ...column,
-          title: getColumnNameAlias(column.cn, base),
-          order: colOrder++,
-          uidt: getColumnUiType(base, column),
-        });
-      }
-    };
-  });
-
-  await NcHelp.executeOperations(viewMetasInsert, base.type);
-
-  const t1 = process.hrtime(t);
-  const t2 = t1[0] + t1[1] / 1000000000;
-
-  (info as any).timeTaken = t2.toFixed(1);
-
-  return info;
-}
-
 export default (router) => {
   router.get(
     '/api/v1/db/meta/projects/:projectId/bases/:baseId',
diff --git a/packages/nocodb/src/lib/meta/api/helpers/index.ts b/packages/nocodb/src/lib/meta/api/helpers/index.ts
new file mode 100644
index 0000000000..5d989cc52f
--- /dev/null
+++ b/packages/nocodb/src/lib/meta/api/helpers/index.ts
@@ -0,0 +1,3 @@
+import { populateMeta } from "./populateMeta";
+
+export { populateMeta }
diff --git a/packages/nocodb/src/lib/meta/api/helpers/populateMeta.ts b/packages/nocodb/src/lib/meta/api/helpers/populateMeta.ts
new file mode 100644
index 0000000000..d9879cc7d2
--- /dev/null
+++ b/packages/nocodb/src/lib/meta/api/helpers/populateMeta.ts
@@ -0,0 +1,263 @@
+import Project from '../../../models/Project';
+import Column from '../../../models/Column';
+import Model from '../../../models/Model';
+import NcHelp from '../../../utils/NcHelp';
+import Base from '../../../models/Base';
+import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2';
+import getTableNameAlias, { getColumnNameAlias } from '../../helpers/getTableName';
+import LinkToAnotherRecordColumn from '../../../models/LinkToAnotherRecordColumn';
+import getColumnUiType from '../../helpers/getColumnUiType';
+import mapDefaultPrimaryValue from '../../helpers/mapDefaultPrimaryValue';
+import { extractAndGenerateManyToManyRelations } from '../metaDiffApis';
+import { ModelTypes, UITypes } from 'nocodb-sdk';
+import { IGNORE_TABLES } from '../../../utils/common/BaseApiBuilder';
+
+export async function populateMeta(base: Base, project: Project): Promise<any> {
+  const info = {
+    type: 'rest',
+    apiCount: 0,
+    tablesCount: 0,
+    relationsCount: 0,
+    viewsCount: 0,
+    client: base?.getConnectionConfig()?.client,
+    timeTaken: 0,
+  };
+
+  const t = process.hrtime();
+  const sqlClient = NcConnectionMgrv2.getSqlClient(base);
+  let order = 1;
+  const models2: { [tableName: string]: Model } = {};
+
+  const virtualColumnsInsert = [];
+
+  /* Get all relations */
+  const relations = (await sqlClient.relationListAll())?.data?.list;
+
+  info.relationsCount = relations.length;
+
+  let tables = (await sqlClient.tableList())?.data?.list
+    ?.filter(({ tn }) => !IGNORE_TABLES.includes(tn))
+    ?.map((t) => {
+      t.order = ++order;
+      t.title = getTableNameAlias(t.tn, project.prefix, base);
+      t.table_name = t.tn;
+      return t;
+    });
+
+  /* filter based on prefix */
+  if (base.is_meta && project?.prefix) {
+    tables = tables.filter((t) => {
+      return t?.tn?.startsWith(project?.prefix);
+    });
+  }
+
+  info.tablesCount = tables.length;
+
+  tables.forEach((t) => {
+    t.title = getTableNameAlias(t.tn, project.prefix, base);
+  });
+
+  relations.forEach((r) => {
+    r.title = getTableNameAlias(r.tn, project.prefix, base);
+    r.rtitle = getTableNameAlias(r.rtn, project.prefix, base);
+  });
+
+  // await this.syncRelations();
+
+  const tableMetasInsert = tables.map((table) => {
+    return async () => {
+      /* filter relation where this table is present */
+      const tableRelations = relations.filter(
+        (r) => r.tn === table.tn || r.rtn === table.tn
+      );
+
+      const columns: Array<
+        Omit<Column, 'column_name' | 'title'> & {
+          cn: string;
+          system?: boolean;
+        }
+      > = (await sqlClient.columnList({ tn: table.tn }))?.data?.list;
+
+      const hasMany =
+        table.type === 'view'
+          ? []
+          : tableRelations.filter((r) => r.rtn === table.tn);
+      const belongsTo =
+        table.type === 'view'
+          ? []
+          : tableRelations.filter((r) => r.tn === table.tn);
+
+      mapDefaultPrimaryValue(columns);
+
+      // add vitual columns
+      const virtualColumns = [
+        ...hasMany.map((hm) => {
+          return {
+            uidt: UITypes.LinkToAnotherRecord,
+            type: 'hm',
+            hm,
+            title: `${hm.title} List`,
+          };
+        }),
+        ...belongsTo.map((bt) => {
+          // find and mark foreign key column
+          const fkColumn = columns.find((c) => c.cn === bt.cn);
+          if (fkColumn) {
+            fkColumn.uidt = UITypes.ForeignKey;
+            fkColumn.system = true;
+          }
+
+          return {
+            uidt: UITypes.LinkToAnotherRecord,
+            type: 'bt',
+            bt,
+            title: `${bt.rtitle}`,
+          };
+        }),
+      ];
+
+      // await Model.insert(project.id, base.id, meta);
+
+      /* create nc_models and its rows if it doesn't exists  */
+      models2[table.table_name] = await Model.insert(project.id, base.id, {
+        table_name: table.tn || table.table_name,
+        title: table.title,
+        type: table.type || 'table',
+        order: table.order,
+      });
+
+      // table crud apis
+      info.apiCount += 5;
+
+      let colOrder = 1;
+
+      for (const column of columns) {
+        await Column.insert({
+          uidt: column.uidt || getColumnUiType(base, column),
+          fk_model_id: models2[table.tn].id,
+          ...column,
+          title: getColumnNameAlias(column.cn, base),
+          column_name: column.cn,
+          order: colOrder++,
+        });
+      }
+      virtualColumnsInsert.push(async () => {
+        const columnNames = {};
+        for (const column of virtualColumns) {
+          // generate unique name if there is any duplicate column name
+          let c = 0;
+          while (`${column.title}${c || ''}` in columnNames) {
+            c++;
+          }
+          column.title = `${column.title}${c || ''}`;
+          columnNames[column.title] = true;
+
+          const rel = column.hm || column.bt;
+
+          const rel_column_id = (await models2?.[rel.tn]?.getColumns())?.find(
+            (c) => c.column_name === rel.cn
+          )?.id;
+
+          const tnId = models2?.[rel.tn]?.id;
+
+          const ref_rel_column_id = (
+            await models2?.[rel.rtn]?.getColumns()
+          )?.find((c) => c.column_name === rel.rcn)?.id;
+
+          const rtnId = models2?.[rel.rtn]?.id;
+
+          try {
+            await Column.insert<LinkToAnotherRecordColumn>({
+              project_id: project.id,
+              db_alias: base.id,
+              fk_model_id: models2[table.tn].id,
+              cn: column.cn,
+              title: column.title,
+              uidt: column.uidt,
+              type: column.hm ? 'hm' : column.mm ? 'mm' : 'bt',
+              // column_id,
+              fk_child_column_id: rel_column_id,
+              fk_parent_column_id: ref_rel_column_id,
+              fk_index_name: rel.fkn,
+              ur: rel.ur,
+              dr: rel.dr,
+              order: colOrder++,
+              fk_related_model_id: column.hm ? tnId : rtnId,
+              system: column.system,
+            });
+
+            // nested relations data apis
+            info.apiCount += 5;
+          } catch (e) {
+            console.log(e);
+          }
+        }
+      });
+    };
+  });
+
+  /* handle xc_tables update in parallel */
+  await NcHelp.executeOperations(tableMetasInsert, base.type);
+  await NcHelp.executeOperations(virtualColumnsInsert, base.type);
+  await extractAndGenerateManyToManyRelations(Object.values(models2));
+
+  let views: Array<{ order: number; table_name: string; title: string }> = (
+    await sqlClient.viewList()
+  )?.data?.list
+    // ?.filter(({ tn }) => !IGNORE_TABLES.includes(tn))
+    ?.map((v) => {
+      v.order = ++order;
+      v.table_name = v.view_name;
+      v.title = getTableNameAlias(v.view_name, project.prefix, base);
+      return v;
+    });
+
+  /* filter based on prefix */
+  if (base.is_meta && project?.prefix) {
+    views = tables.filter((t) => {
+      return t?.tn?.startsWith(project?.prefix);
+    });
+  }
+
+  info.viewsCount = views.length;
+
+  const viewMetasInsert = views.map((table) => {
+    return async () => {
+      const columns = (await sqlClient.columnList({ tn: table.table_name }))
+        ?.data?.list;
+
+      /* create nc_models and its rows if it doesn't exists  */
+      models2[table.table_name] = await Model.insert(project.id, base.id, {
+        table_name: table.table_name,
+        title: getTableNameAlias(table.table_name, project.prefix, base),
+        // todo: sanitize
+        type: ModelTypes.VIEW,
+        order: table.order,
+      });
+
+      let colOrder = 1;
+
+      // view apis
+      info.apiCount += 2;
+
+      for (const column of columns) {
+        await Column.insert({
+          fk_model_id: models2[table.table_name].id,
+          ...column,
+          title: getColumnNameAlias(column.cn, base),
+          order: colOrder++,
+          uidt: getColumnUiType(base, column),
+        });
+      }
+    };
+  });
+
+  await NcHelp.executeOperations(viewMetasInsert, base.type);
+
+  const t1 = process.hrtime(t);
+  const t2 = t1[0] + t1[1] / 1000000000;
+
+  (info as any).timeTaken = t2.toFixed(1);
+
+  return info;
+}
diff --git a/packages/nocodb/src/lib/meta/api/projectApis.ts b/packages/nocodb/src/lib/meta/api/projectApis.ts
index 33f1928ff5..8806fc41ac 100644
--- a/packages/nocodb/src/lib/meta/api/projectApis.ts
+++ b/packages/nocodb/src/lib/meta/api/projectApis.ts
@@ -1,33 +1,24 @@
 import { Request, Response } from 'express';
 import { OrgUserRoles, ProjectType } from 'nocodb-sdk';
 import Project from '../../models/Project';
-import { ModelTypes, ProjectListType, UITypes } from 'nocodb-sdk';
+import { ProjectListType } from 'nocodb-sdk';
 import DOMPurify from 'isomorphic-dompurify';
 import { packageVersion } from '../../utils/packageVersion';
 import { Tele } from 'nc-help';
 import { PagedResponseImpl } from '../helpers/PagedResponse';
 import syncMigration from '../helpers/syncMigration';
-import { IGNORE_TABLES } from '../../utils/common/BaseApiBuilder';
-import Column from '../../models/Column';
-import Model from '../../models/Model';
-import NcHelp from '../../utils/NcHelp';
-import Base from '../../models/Base';
 import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2';
-import getTableNameAlias, { getColumnNameAlias } from '../helpers/getTableName';
-import LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn';
 import ncMetaAclMw from '../helpers/ncMetaAclMw';
 import ProjectUser from '../../models/ProjectUser';
 import { customAlphabet } from 'nanoid';
 import Noco from '../../Noco';
 import isDocker from 'is-docker';
 import { NcError } from '../helpers/catchError';
-import getColumnUiType from '../helpers/getColumnUiType';
-import mapDefaultPrimaryValue from '../helpers/mapDefaultPrimaryValue';
-import { extractAndGenerateManyToManyRelations } from './metaDiffApis';
 import { metaApiMetrics } from '../helpers/apiMetrics';
 import { extractPropsAndSanitize } from '../helpers/extractProps';
 import NcConfigFactory from '../../utils/NcConfigFactory';
 import { promisify } from 'util';
+import { populateMeta } from './helpers';
 
 const nanoid = customAlphabet('1234567890abcdefghijklmnopqrstuvwxyz_', 4);
 
@@ -202,256 +193,6 @@ async function projectCreate(req: Request<any, any>, res) {
   res.json(project);
 }
 
-async function populateMeta(base: Base, project: Project): Promise<any> {
-  const info = {
-    type: 'rest',
-    apiCount: 0,
-    tablesCount: 0,
-    relationsCount: 0,
-    viewsCount: 0,
-    client: base?.getConnectionConfig()?.client,
-    timeTaken: 0,
-  };
-
-  const t = process.hrtime();
-  const sqlClient = await NcConnectionMgrv2.getSqlClient(base);
-  let order = 1;
-  const models2: { [tableName: string]: Model } = {};
-
-  const virtualColumnsInsert = [];
-
-  /* Get all relations */
-  const relations = (await sqlClient.relationListAll())?.data?.list;
-
-  info.relationsCount = relations.length;
-
-  let tables = (await sqlClient.tableList())?.data?.list
-    ?.filter(({ tn }) => !IGNORE_TABLES.includes(tn))
-    ?.map((t) => {
-      t.order = ++order;
-      t.title = getTableNameAlias(t.tn, project.prefix, base);
-      t.table_name = t.tn;
-      return t;
-    });
-
-  /* filter based on prefix */
-  if (project?.prefix) {
-    tables = tables.filter((t) => {
-      return t?.tn?.startsWith(project?.prefix);
-    });
-  }
-
-  info.tablesCount = tables.length;
-
-  tables.forEach((t) => {
-    t.title = getTableNameAlias(t.tn, project.prefix, base);
-  });
-
-  relations.forEach((r) => {
-    r.title = getTableNameAlias(r.tn, project.prefix, base);
-    r.rtitle = getTableNameAlias(r.rtn, project.prefix, base);
-  });
-
-  // await this.syncRelations();
-
-  const tableMetasInsert = tables.map((table) => {
-    return async () => {
-      /* filter relation where this table is present */
-      const tableRelations = relations.filter(
-        (r) => r.tn === table.tn || r.rtn === table.tn
-      );
-
-      const columns: Array<
-        Omit<Column, 'column_name' | 'title'> & {
-          cn: string;
-          system?: boolean;
-        }
-      > = (await sqlClient.columnList({ tn: table.tn }))?.data?.list;
-
-      const hasMany =
-        table.type === 'view'
-          ? []
-          : tableRelations.filter((r) => r.rtn === table.tn);
-      const belongsTo =
-        table.type === 'view'
-          ? []
-          : tableRelations.filter((r) => r.tn === table.tn);
-
-      mapDefaultPrimaryValue(columns);
-
-      // add vitual columns
-      const virtualColumns = [
-        ...hasMany.map((hm) => {
-          return {
-            uidt: UITypes.LinkToAnotherRecord,
-            type: 'hm',
-            hm,
-            title: `${hm.title} List`,
-          };
-        }),
-        ...belongsTo.map((bt) => {
-          // find and mark foreign key column
-          const fkColumn = columns.find((c) => c.cn === bt.cn);
-          if (fkColumn) {
-            fkColumn.uidt = UITypes.ForeignKey;
-            fkColumn.system = true;
-          }
-
-          return {
-            uidt: UITypes.LinkToAnotherRecord,
-            type: 'bt',
-            bt,
-            title: `${bt.rtitle}`,
-          };
-        }),
-      ];
-
-      // await Model.insert(project.id, base.id, meta);
-
-      /* create nc_models and its rows if it doesn't exists  */
-      models2[table.table_name] = await Model.insert(project.id, base.id, {
-        table_name: table.tn || table.table_name,
-        title: table.title,
-        type: table.type || 'table',
-        order: table.order,
-      });
-
-      // table crud apis
-      info.apiCount += 5;
-
-      let colOrder = 1;
-
-      for (const column of columns) {
-        await Column.insert({
-          uidt: column.uidt || getColumnUiType(base, column),
-          fk_model_id: models2[table.tn].id,
-          ...column,
-          title: getColumnNameAlias(column.cn, base),
-          column_name: column.cn,
-          order: colOrder++,
-        });
-      }
-      virtualColumnsInsert.push(async () => {
-        const columnNames = {};
-        for (const column of virtualColumns) {
-          // generate unique name if there is any duplicate column name
-          let c = 0;
-          while (`${column.title}${c || ''}` in columnNames) {
-            c++;
-          }
-          column.title = `${column.title}${c || ''}`;
-          columnNames[column.title] = true;
-
-          const rel = column.hm || column.bt;
-
-          const rel_column_id = (await models2?.[rel.tn]?.getColumns())?.find(
-            (c) => c.column_name === rel.cn
-          )?.id;
-
-          const tnId = models2?.[rel.tn]?.id;
-
-          const ref_rel_column_id = (
-            await models2?.[rel.rtn]?.getColumns()
-          )?.find((c) => c.column_name === rel.rcn)?.id;
-
-          const rtnId = models2?.[rel.rtn]?.id;
-
-          try {
-            await Column.insert<LinkToAnotherRecordColumn>({
-              project_id: project.id,
-              db_alias: base.id,
-              fk_model_id: models2[table.tn].id,
-              cn: column.cn,
-              title: column.title,
-              uidt: column.uidt,
-              type: column.hm ? 'hm' : column.mm ? 'mm' : 'bt',
-              // column_id,
-              fk_child_column_id: rel_column_id,
-              fk_parent_column_id: ref_rel_column_id,
-              fk_index_name: rel.fkn,
-              ur: rel.ur,
-              dr: rel.dr,
-              order: colOrder++,
-              fk_related_model_id: column.hm ? tnId : rtnId,
-              system: column.system,
-            });
-
-            // nested relations data apis
-            info.apiCount += 5;
-          } catch (e) {
-            console.log(e);
-          }
-        }
-      });
-    };
-  });
-
-  /* handle xc_tables update in parallel */
-  await NcHelp.executeOperations(tableMetasInsert, base.type);
-  await NcHelp.executeOperations(virtualColumnsInsert, base.type);
-  await extractAndGenerateManyToManyRelations(Object.values(models2));
-
-  let views: Array<{ order: number; table_name: string; title: string }> = (
-    await sqlClient.viewList()
-  )?.data?.list
-    // ?.filter(({ tn }) => !IGNORE_TABLES.includes(tn))
-    ?.map((v) => {
-      v.order = ++order;
-      v.table_name = v.view_name;
-      v.title = getTableNameAlias(v.view_name, project.prefix, base);
-      return v;
-    });
-
-  /* filter based on prefix */
-  if (project?.prefix) {
-    views = tables.filter((t) => {
-      return t?.tn?.startsWith(project?.prefix);
-    });
-  }
-
-  info.viewsCount = views.length;
-
-  const viewMetasInsert = views.map((table) => {
-    return async () => {
-      const columns = (await sqlClient.columnList({ tn: table.table_name }))
-        ?.data?.list;
-
-      /* create nc_models and its rows if it doesn't exists  */
-      models2[table.table_name] = await Model.insert(project.id, base.id, {
-        table_name: table.table_name,
-        title: getTableNameAlias(table.table_name, project.prefix, base),
-        // todo: sanitize
-        type: ModelTypes.VIEW,
-        order: table.order,
-      });
-
-      let colOrder = 1;
-
-      // view apis
-      info.apiCount += 2;
-
-      for (const column of columns) {
-        await Column.insert({
-          fk_model_id: models2[table.table_name].id,
-          ...column,
-          title: getColumnNameAlias(column.cn, base),
-          order: colOrder++,
-          uidt: getColumnUiType(base, column),
-        });
-      }
-    };
-  });
-
-  await NcHelp.executeOperations(viewMetasInsert, base.type);
-
-  const t1 = process.hrtime(t);
-  const t2 = t1[0] + t1[1] / 1000000000;
-
-  (info as any).timeTaken = t2.toFixed(1);
-
-  return info;
-}
-
 export async function projectInfoGet(_req, res) {
   res.json({
     Node: process.version,

From 7edf9a5944e28cf327ba7fa36184b85d12dc6ce2 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 9 Feb 2023 04:28:46 +0300
Subject: [PATCH 11/22] fix: primary value column for populated meta

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../src/lib/meta/api/helpers/populateMeta.ts    | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/api/helpers/populateMeta.ts b/packages/nocodb/src/lib/meta/api/helpers/populateMeta.ts
index d9879cc7d2..3c28af50e5 100644
--- a/packages/nocodb/src/lib/meta/api/helpers/populateMeta.ts
+++ b/packages/nocodb/src/lib/meta/api/helpers/populateMeta.ts
@@ -3,13 +3,14 @@ import Column from '../../../models/Column';
 import Model from '../../../models/Model';
 import NcHelp from '../../../utils/NcHelp';
 import Base from '../../../models/Base';
+import View from '../../../models/View';
 import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2';
 import getTableNameAlias, { getColumnNameAlias } from '../../helpers/getTableName';
 import LinkToAnotherRecordColumn from '../../../models/LinkToAnotherRecordColumn';
 import getColumnUiType from '../../helpers/getColumnUiType';
 import mapDefaultPrimaryValue from '../../helpers/mapDefaultPrimaryValue';
 import { extractAndGenerateManyToManyRelations } from '../metaDiffApis';
-import { ModelTypes, UITypes } from 'nocodb-sdk';
+import { ModelTypes, UITypes, ViewTypes } from 'nocodb-sdk';
 import { IGNORE_TABLES } from '../../../utils/common/BaseApiBuilder';
 
 export async function populateMeta(base: Base, project: Project): Promise<any> {
@@ -24,7 +25,7 @@ export async function populateMeta(base: Base, project: Project): Promise<any> {
   };
 
   const t = process.hrtime();
-  const sqlClient = NcConnectionMgrv2.getSqlClient(base);
+  const sqlClient = await NcConnectionMgrv2.getSqlClient(base);
   let order = 1;
   const models2: { [tableName: string]: Model } = {};
 
@@ -254,6 +255,18 @@ export async function populateMeta(base: Base, project: Project): Promise<any> {
 
   await NcHelp.executeOperations(viewMetasInsert, base.type);
 
+  // fix pv column for created grid views
+  const models = await Model.list({ project_id: project.id, base_id: base.id });
+
+  for (const model of models) {
+    const views = await model.getViews()
+    for (const view of views) {
+      if (view.type === ViewTypes.GRID) {
+        await View.fixPVColumnForView(view.id);
+      }
+    }
+  }
+
   const t1 = process.hrtime(t);
   const t2 = t1[0] + t1[1] / 1000000000;
 

From fc1984ef9011b194a72d2024e490b7769ca8776d Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 9 Feb 2023 04:44:48 +0300
Subject: [PATCH 12/22] fix: small css fix for sticky column

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nc-gui/components/smartsheet/Grid.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 350af0237e..e556faaf02 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -715,8 +715,8 @@ const closeAddColumnDropdown = () => {
         >
           <thead ref="tableHead">
             <tr class="nc-grid-header">
-              <th data-testid="grid-id-column">
-                <div class="w-full h-full bg-gray-100 flex min-w-[70px] pl-5 pr-1 items-center" data-testid="nc-check-all">
+              <th class="w-[80px]" data-testid="grid-id-column">
+                <div class="w-full h-full bg-gray-100 flex pl-5 pr-1 items-center" data-testid="nc-check-all">
                   <template v-if="!readOnly">
                     <div class="nc-no-label text-gray-500" :class="{ hidden: selectedAllRecords }">#</div>
                     <div
@@ -999,6 +999,10 @@ const closeAddColumnDropdown = () => {
     position: relative;
   }
 
+  th {
+    @apply bg-gray-100;
+  }
+
   td:not(:first-child) > div {
     overflow: hidden;
     @apply flex px-1 h-auto;

From dc997ada56e4445f970ca23faa97c5c5e3363c3c Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 9 Feb 2023 04:52:21 +0300
Subject: [PATCH 13/22] fix: add optional chaining to field pv

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nc-gui/composables/useViewColumns.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/composables/useViewColumns.ts b/packages/nc-gui/composables/useViewColumns.ts
index 19765ee6ba..7d97ddff71 100644
--- a/packages/nc-gui/composables/useViewColumns.ts
+++ b/packages/nc-gui/composables/useViewColumns.ts
@@ -173,7 +173,7 @@ export function useViewColumns(
   const filteredFieldList = computed(() => {
     return (
       fields.value?.filter((field: Field) => {
-        if (metaColumnById?.value?.[field.fk_column_id!].pv) return true
+        if (metaColumnById?.value?.[field.fk_column_id!]?.pv) return true
 
         // hide system columns if not enabled
         if (!showSystemFields.value && isSystemColumn(metaColumnById?.value?.[field.fk_column_id!])) {
@@ -198,7 +198,7 @@ export function useViewColumns(
           metaColumnById.value &&
           metaColumnById?.value?.[field.fk_column_id!] &&
           isSystemColumn(metaColumnById.value?.[field.fk_column_id!]) &&
-          !metaColumnById.value?.[field.fk_column_id!].pv
+          !metaColumnById.value?.[field.fk_column_id!]?.pv
         ) {
           return false
         }

From 49c23e4d215b8d86937af2336361bcabf028b535 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 9 Feb 2023 05:07:24 +0300
Subject: [PATCH 14/22] test: modify cell selection test for sticky changes

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 tests/playwright/tests/cellSelection.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/playwright/tests/cellSelection.spec.ts b/tests/playwright/tests/cellSelection.spec.ts
index 9ef20b7fb9..f15c6fb277 100644
--- a/tests/playwright/tests/cellSelection.spec.ts
+++ b/tests/playwright/tests/cellSelection.spec.ts
@@ -83,7 +83,7 @@ test.describe('Verify cell selection', () => {
     await dashboard.grid.toolbar.fields.toggleShowSystemFields();
     await grid.selectRange({
       start: { index: 2, columnHeader: 'City List' },
-      end: { index: 0, columnHeader: 'CountryId' },
+      end: { index: 0, columnHeader: 'Country' },
     });
 
     expect(await grid.selectedCount()).toBe(12);

From 242f568c7d6cddfc1f07da5da07c279548090cc1 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 9 Feb 2023 15:44:51 +0300
Subject: [PATCH 15/22] fix: insert before cause primary value to move

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nocodb/src/lib/models/GridViewColumn.ts | 2 ++
 packages/nocodb/src/lib/models/View.ts           | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/models/GridViewColumn.ts b/packages/nocodb/src/lib/models/GridViewColumn.ts
index 4d0215e9d3..de7c4da5dd 100644
--- a/packages/nocodb/src/lib/models/GridViewColumn.ts
+++ b/packages/nocodb/src/lib/models/GridViewColumn.ts
@@ -108,6 +108,8 @@ export default class GridViewColumn implements GridColumnType {
         [column.fk_view_id],
         `${CacheScope.GRID_VIEW_COLUMN}:${id}`
       );
+    
+    await View.fixPVColumnForView(column.fk_view_id, ncMeta);
 
     return this.get(id, ncMeta);
   }
diff --git a/packages/nocodb/src/lib/models/View.ts b/packages/nocodb/src/lib/models/View.ts
index e802384252..b0a0241251 100644
--- a/packages/nocodb/src/lib/models/View.ts
+++ b/packages/nocodb/src/lib/models/View.ts
@@ -1184,6 +1184,9 @@ export default class View implements ViewType {
     if (primary_value_column_meta) {
       const primary_value_column = view_columns.find((col) => col.fk_column_id === primary_value_column_meta.id);
       const primary_value_column_index = view_columns.findIndex((col) => col.fk_column_id === primary_value_column_meta.id);
+      const view_orders = view_columns.map((col) => col.order);
+      const view_min_order = Math.min(...view_orders);
+
       // if primary_value_column is not visible, make it visible
       if (!primary_value_column.show) {
         await ncMeta.metaUpdate(
@@ -1199,7 +1202,7 @@ export default class View implements ViewType {
         );
       }
 
-      if (primary_value_column.order < 2) {
+      if (primary_value_column.order === view_min_order && view_orders.filter((o) => o === view_min_order).length === 1) {
         // if primary_value_column is in first order do nothing
         return;
       } else {

From 669882636e53fe83089bc42cea9a34e5ecb98ffe Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 9 Feb 2023 16:10:09 +0300
Subject: [PATCH 16/22] fix: disable hide for primary value column

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nocodb/src/lib/models/View.ts | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/packages/nocodb/src/lib/models/View.ts b/packages/nocodb/src/lib/models/View.ts
index b0a0241251..a7a9df4534 100644
--- a/packages/nocodb/src/lib/models/View.ts
+++ b/packages/nocodb/src/lib/models/View.ts
@@ -631,15 +631,22 @@ export default class View implements ViewType {
     }
     const updateObj = extractProps(colData, ['order', 'show']);
 
-    const primary_value_column = await ncMeta.metaGet2(null, null, MetaTable.COLUMNS, {
-      fk_model_id: view.fk_model_id,
-      pv: true,
-    });
+    // keep primary_value_column always visible and first in grid view
+    if (view.type === ViewTypes.GRID) {
+      const primary_value_column_meta = await ncMeta.metaGet2(null, null, MetaTable.COLUMNS, {
+        fk_model_id: view.fk_model_id,
+        pv: true,
+      });
 
-    // keep primary_value_column always visible and first
-    if (primary_value_column && primary_value_column.id === colId) {
-      updateObj.order = 1;
-      updateObj.show = true;
+      const primary_value_column = await ncMeta.metaGet2(null, null, MetaTable.GRID_VIEW_COLUMNS, {
+        fk_view_id: view.id,
+        fk_column_id: primary_value_column_meta.id,
+      });
+      
+      if (primary_value_column && primary_value_column.id === colId) {
+        updateObj.order = 1;
+        updateObj.show = true;
+      }
     }
 
     // get existing cache

From 33285716a1add564c976674f5eaf8e3b425b84fa Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 9 Feb 2023 16:14:46 +0300
Subject: [PATCH 17/22] fix: primary value column menu operations

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nc-gui/components/smartsheet/header/Menu.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/header/Menu.vue b/packages/nc-gui/components/smartsheet/header/Menu.vue
index 3b1d2068c7..62e019b0d2 100644
--- a/packages/nc-gui/components/smartsheet/header/Menu.vue
+++ b/packages/nc-gui/components/smartsheet/header/Menu.vue
@@ -156,6 +156,7 @@ const duplicateColumn = async () => {
 
     await $api.dbTableColumn.create(meta!.value!.id!, {
       ...columnCreatePayload,
+      pv: false,
       column_order: {
         order: newColumnOrder,
         view_id: view.value?.id as string,
@@ -243,7 +244,7 @@ const hideField = async () => {
           </a-menu-item>
         </template>
         <a-divider class="!my-0" />
-        <a-menu-item @click="hideField">
+        <a-menu-item v-if="!column?.pv" @click="hideField">
           <div v-e="['a:field:hide']" class="nc-column-insert-before nc-header-menu-item">
             <MdiEyeOffOutline class="text-primary" />
             <!-- Hide Field -->
@@ -270,7 +271,7 @@ const hideField = async () => {
             {{ t('general.insertAfter') }}
           </div>
         </a-menu-item>
-        <a-menu-item @click="addColumn(true)">
+        <a-menu-item v-if="!column?.pv" @click="addColumn(true)">
           <div v-e="['a:field:insert:before']" class="nc-column-insert-before nc-header-menu-item">
             <MdiTableColumnPlusBefore class="text-primary" />
             <!-- Insert Before -->
@@ -289,7 +290,7 @@ const hideField = async () => {
           </div>
         </a-menu-item>
 
-        <a-menu-item @click="deleteColumn">
+        <a-menu-item v-if="!column?.pv" @click="deleteColumn">
           <div class="nc-column-delete nc-header-menu-item">
             <MdiDeleteOutline class="text-error" />
             <!-- Delete -->

From 0d35c21ea6998c326fe4f002ab0bcaec6c1ba224 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Fri, 10 Feb 2023 11:30:27 +0300
Subject: [PATCH 18/22] test: primary value insert before and hide tests

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../pages/Dashboard/Grid/Column/index.ts        | 17 +++++++++++++++--
 .../tests/columnMenuOperations.spec.ts          |  2 ++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/Grid/Column/index.ts b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
index 33bf0d822c..3e2948c1bc 100644
--- a/tests/playwright/pages/Dashboard/Grid/Column/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
@@ -44,6 +44,7 @@ export class ColumnPageObject extends BasePage {
     timeFormat = '',
     insertAfterColumnTitle,
     insertBeforeColumnTitle,
+    isPrimaryValue = false,
   }: {
     title: string;
     type?: string;
@@ -60,9 +61,16 @@ export class ColumnPageObject extends BasePage {
     timeFormat?: string;
     insertBeforeColumnTitle?: string;
     insertAfterColumnTitle?: string;
+    isPrimaryValue?: boolean;
   }) {
     if (insertBeforeColumnTitle) {
       await this.grid.get().locator(`th[data-title="${insertBeforeColumnTitle}"] .nc-ui-dt-dropdown`).click();
+
+      if (isPrimaryValue) {
+        await expect(this.rootPage.locator('li[role="menuitem"]:has-text("Insert Before")')).toHaveCount(0);
+        return;
+      }
+
       await this.rootPage.locator('li[role="menuitem"]:has-text("Insert Before"):visible').click();
     } else if (insertAfterColumnTitle) {
       await this.grid.get().locator(`th[data-title="${insertAfterColumnTitle}"] .nc-ui-dt-dropdown`).click();
@@ -313,9 +321,14 @@ export class ColumnPageObject extends BasePage {
     await this.grid.get().locator(`th[data-title="${expectedTitle}"]`).isVisible();
   }
 
-  async hideColumn({ title }: { title: string }) {
+  async hideColumn({ title, isPrimaryValue = false }: { title: string; isPrimaryValue?: boolean }) {
     await this.grid.get().locator(`th[data-title="${title}"] .nc-ui-dt-dropdown`).click();
 
+    if (isPrimaryValue) {
+      await expect(this.rootPage.locator('li[role="menuitem"]:has-text("Hide Field")')).toHaveCount(0);
+      return;
+    }
+
     await this.waitForResponse({
       uiAction: this.rootPage.locator('li[role="menuitem"]:has-text("Hide Field"):visible').click(),
       requestUrlPathToMatch: 'api/v1/db/meta/views',
@@ -386,7 +399,7 @@ export class ColumnPageObject extends BasePage {
       )
       .first()
       .isVisible();
-    
+
     // close sort menu
     await this.grid.toolbar.clickSort();
   }
diff --git a/tests/playwright/tests/columnMenuOperations.spec.ts b/tests/playwright/tests/columnMenuOperations.spec.ts
index 8217fd6964..e2c78eb9af 100644
--- a/tests/playwright/tests/columnMenuOperations.spec.ts
+++ b/tests/playwright/tests/columnMenuOperations.spec.ts
@@ -91,6 +91,7 @@ test.describe('Column menu operations', () => {
       title: 'InsertBeforeColumn',
       type: 'SingleLineText',
       insertBeforeColumnTitle: 'Title',
+      isPrimaryValue: true,
     });
 
     await dashboard.grid.column.create({
@@ -107,6 +108,7 @@ test.describe('Column menu operations', () => {
 
     await dashboard.grid.column.hideColumn({
       title: 'Title',
+      isPrimaryValue: true,
     });
 
     await dashboard.grid.column.hideColumn({

From 3086471157869b73dd2d793bb331edfad4bbcba3 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Fri, 10 Feb 2023 12:51:17 +0300
Subject: [PATCH 19/22] test: modify meta sync test for sticky changes

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 tests/playwright/tests/metaSync.spec.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/playwright/tests/metaSync.spec.ts b/tests/playwright/tests/metaSync.spec.ts
index 2011508ca5..f845c384d3 100644
--- a/tests/playwright/tests/metaSync.spec.ts
+++ b/tests/playwright/tests/metaSync.spec.ts
@@ -252,18 +252,18 @@ test.describe('Meta sync', () => {
     await dashboard.treeView.openTable({ title: 'Table1' });
 
     await dashboard.grid.toolbar.clickFields();
-    await dashboard.grid.toolbar.fields.click({ title: 'Col1' });
+    await dashboard.grid.toolbar.fields.click({ title: 'Col2' });
     await dashboard.grid.toolbar.clickFields();
 
     await dashboard.grid.toolbar.sort.add({
-      columnTitle: 'Col1',
+      columnTitle: 'Col2',
       isAscending: false,
       isLocallySaved: false,
     });
 
     await dashboard.grid.toolbar.clickFilter();
     await dashboard.grid.toolbar.filter.add({
-      columnTitle: 'Col1',
+      columnTitle: 'Col2',
       opType: '>=',
       value: '5',
       isLocallySaved: false,

From 3274f6aed3b23c787f70a442c943102fa666c362 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Fri, 10 Feb 2023 13:03:15 +0300
Subject: [PATCH 20/22] fix: primary_value_column on changing system fields
 visibility

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nc-gui/composables/useViewColumns.ts |  5 ++++-
 packages/nocodb/src/lib/models/View.ts        | 11 ++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/composables/useViewColumns.ts b/packages/nc-gui/composables/useViewColumns.ts
index 7d97ddff71..2d186b2f31 100644
--- a/packages/nc-gui/composables/useViewColumns.ts
+++ b/packages/nc-gui/composables/useViewColumns.ts
@@ -162,7 +162,10 @@ export function useViewColumns(
             .update(view.value.id, {
               show_system_fields: v,
             })
-            .finally(() => reloadData?.())
+            .finally(() => {
+              loadViewColumns()
+              reloadData?.()
+            })
         }
         view.value.show_system_fields = v
       }
diff --git a/packages/nocodb/src/lib/models/View.ts b/packages/nocodb/src/lib/models/View.ts
index a7a9df4534..e516c13e7d 100644
--- a/packages/nocodb/src/lib/models/View.ts
+++ b/packages/nocodb/src/lib/models/View.ts
@@ -898,7 +898,16 @@ export default class View implements ViewType {
 
     // set meta
     await ncMeta.metaUpdate(null, null, MetaTable.VIEWS, updateObj, viewId);
-    return this.get(viewId);
+
+    const view = await this.get(viewId);
+
+    if (view.type === ViewTypes.GRID) {
+      if ('show_system_fields' in updateObj) {
+        await View.fixPVColumnForView(viewId, ncMeta);
+      }
+    }
+
+    return view;
   }
 
   // @ts-ignore

From 5196c5464f7236b4cb4ff3337828fe0279d93fec Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Sun, 12 Feb 2023 11:58:11 +0300
Subject: [PATCH 21/22] fix: fields menu show primary value field as header

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../components/smartsheet/toolbar/FieldsMenu.vue  | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
index 88e9407efe..8567956e6f 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
@@ -68,6 +68,12 @@ watch(
 
 const numberOfHiddenFields = computed(() => filteredFieldList.value?.filter((field) => !field.show)?.length)
 
+const gridPrimaryValueField = computed(() => {
+  if (activeView.value?.type !== ViewTypes.GRID) return null
+  const pvCol = Object.values(metaColumnById.value)?.find((col) => col?.pv)
+  return filteredFieldList.value?.find((field) => field.fk_column_id === pvCol?.id)
+})
+
 const onMove = (_event: { moved: { newIndex: number } }) => {
   // todo : sync with server
   if (!fields.value) return
@@ -188,7 +194,7 @@ useMenuCloseOnEsc(open)
           <Draggable v-model="fields" item-key="id" @change="onMove($event)">
             <template #item="{ element: field, index: index }">
               <div
-                v-if="filteredFieldList.slice(activeView?.type === ViewTypes.GRID ? 1 : 0).includes(field)"
+                v-if="filteredFieldList.filter((el) => el !== gridPrimaryValueField).includes(field)"
                 :key="field.id"
                 class="px-2 py-1 flex items-center"
                 :data-testid="`nc-fields-menu-${field.title}`"
@@ -214,11 +220,10 @@ useMenuCloseOnEsc(open)
             </template>
             <template v-if="activeView?.type === ViewTypes.GRID" #header>
               <div
-                v-if="filteredFieldList[0]"
-                v-show="filteredFieldList[0]"
-                :key="`pv-${filteredFieldList[0].id}`"
+                v-if="gridPrimaryValueField"
+                :key="`pv-${gridPrimaryValueField.id}`"
                 class="px-2 py-1 flex items-center"
-                :data-testid="`nc-fields-menu-${filteredFieldList[0].title}`"
+                :data-testid="`nc-fields-menu-${gridPrimaryValueField.title}`"
                 @click.stop
               >
                 <a-tooltip placement="bottom">

From dac29fba0e649d670e62d2c2ed1f81fc427cd375 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Mon, 13 Feb 2023 11:59:38 +0300
Subject: [PATCH 22/22] fix: header overlap when no record present in grid

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nc-gui/components/smartsheet/Grid.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index e556faaf02..d33ffa5507 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -715,7 +715,7 @@ const closeAddColumnDropdown = () => {
         >
           <thead ref="tableHead">
             <tr class="nc-grid-header">
-              <th class="w-[80px]" data-testid="grid-id-column">
+              <th class="w-[80px] min-w-[80px]" data-testid="grid-id-column">
                 <div class="w-full h-full bg-gray-100 flex pl-5 pr-1 items-center" data-testid="nc-check-all">
                   <template v-if="!readOnly">
                     <div class="nc-no-label text-gray-500" :class="{ hidden: selectedAllRecords }">#</div>