From 423ff2265b015108d2b2f5afda1925716e4262b1 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 8 Jun 2023 11:45:45 +0530
Subject: [PATCH 001/208] feat: when connecting external db populate rollup for
 LTAR and hide LTAR by default

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/helpers/populateMeta.ts   | 48 +++++++++++++++++++
 packages/nocodb/src/services/bases.service.ts |  3 ++
 .../nocodb/src/services/projects.service.ts   |  3 ++
 3 files changed, 54 insertions(+)

diff --git a/packages/nocodb/src/helpers/populateMeta.ts b/packages/nocodb/src/helpers/populateMeta.ts
index 39ca7d1d2b..9e90114430 100644
--- a/packages/nocodb/src/helpers/populateMeta.ts
+++ b/packages/nocodb/src/helpers/populateMeta.ts
@@ -1,5 +1,6 @@
 import { ModelTypes, UITypes, ViewTypes } from 'nocodb-sdk';
 import { isVirtualCol, RelationTypes } from 'nocodb-sdk';
+import { GridViewColumn } from '../models';
 import Column from '../models/Column';
 import Model from '../models/Model';
 import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2';
@@ -9,6 +10,7 @@ import getTableNameAlias, { getColumnNameAlias } from '../helpers/getTableName';
 import getColumnUiType from '../helpers/getColumnUiType';
 import mapDefaultDisplayValue from '../helpers/mapDefaultDisplayValue';
 import { getUniqueColumnAliasName } from './getUniqueName';
+import type { RollupColumn } from '../models';
 import type LinkToAnotherRecordColumn from '../models/LinkToAnotherRecordColumn';
 import type Base from '../models/Base';
 import type Project from '../models/Project';
@@ -435,3 +437,49 @@ export async function populateMeta(base: Base, project: Project): Promise<any> {
 
   return info;
 }
+
+export async function populateRollupColumnAndHideLTAR(
+  base: Base,
+  project: Project,
+) {
+  for (const model of await Model.list({
+    project_id: project.id,
+    base_id: base.id,
+  })) {
+    const columns = await model.getColumns();
+    const hmAndMmLTARColumns = columns.filter(
+      (c) =>
+        c.uidt === UITypes.LinkToAnotherRecord &&
+        c.colOptions.type !== RelationTypes.BELONGS_TO &&
+        !c.system,
+    );
+
+    const views = await model.getViews();
+
+    for (const column of hmAndMmLTARColumns) {
+      const relatedModel = await column
+        .getColOptions<LinkToAnotherRecordColumn>()
+        .then((colOpt) => colOpt.getRelatedTable());
+      await relatedModel.getColumns();
+      const pkId =
+        relatedModel.primaryKey?.id || (await relatedModel.getColumns())[0]?.id;
+
+      await Column.insert<RollupColumn>({
+        uidt: 'Rollup',
+        title: getUniqueColumnAliasName(
+          await model.getColumns(),
+          `${relatedModel.title} Count`,
+        ),
+        fk_rollup_column_id: pkId,
+        fk_model_id: model.id,
+        rollup_function: 'count',
+        fk_relation_column_id: column.id,
+      });
+
+      const viewCol = await GridViewColumn.list(views[0].id).then((cols) =>
+        cols.find((c) => c.fk_column_id === column.id),
+      );
+      await GridViewColumn.update(viewCol.id, { show: false });
+    }
+  }
+}
diff --git a/packages/nocodb/src/services/bases.service.ts b/packages/nocodb/src/services/bases.service.ts
index 48bd9e6130..f68b6c01ee 100644
--- a/packages/nocodb/src/services/bases.service.ts
+++ b/packages/nocodb/src/services/bases.service.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { T } from 'nc-help';
 import { populateMeta, validatePayload } from '../helpers';
+import { populateRollupColumnAndHideLTAR } from '../helpers/populateMeta'
 import { syncBaseMigration } from '../helpers/syncMigration';
 import { Base, Project } from '../models';
 import type { BaseReqType } from 'nocodb-sdk';
@@ -69,6 +70,8 @@ export class BasesService {
 
     const info = await populateMeta(base, project);
 
+    await populateRollupColumnAndHideLTAR(base, project);
+
     T.emit('evt_api_created', info);
 
     delete base.config;
diff --git a/packages/nocodb/src/services/projects.service.ts b/packages/nocodb/src/services/projects.service.ts
index eb93634a4f..f5ace226c6 100644
--- a/packages/nocodb/src/services/projects.service.ts
+++ b/packages/nocodb/src/services/projects.service.ts
@@ -7,6 +7,7 @@ import { OrgUserRoles } from 'nocodb-sdk';
 import { populateMeta, validatePayload } from '../helpers';
 import { NcError } from '../helpers/catchError';
 import { extractPropsAndSanitize } from '../helpers/extractProps';
+import { populateRollupColumnAndHideLTAR } from '../helpers/populateMeta'
 import syncMigration from '../helpers/syncMigration';
 import { Project, ProjectUser } from '../models';
 import Noco from '../Noco';
@@ -167,6 +168,8 @@ export class ProjectsService {
     for (const base of await project.getBases()) {
       const info = await populateMeta(base, project);
 
+      await populateRollupColumnAndHideLTAR(base, project);
+
       T.emit('evt_api_created', info);
       delete base.config;
     }

From b4727b5a18bde810758b320d338f4436f736c8cd Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 8 Jun 2023 14:49:00 +0530
Subject: [PATCH 002/208] feat: on column LTAR creation - hide LTAR and add
 rollup(MM and HM)

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/helpers/columnHelpers.ts  | 40 ++++++++++++++++++-
 .../nocodb/src/services/columns.service.ts    | 23 ++++++++---
 2 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/packages/nocodb/src/helpers/columnHelpers.ts b/packages/nocodb/src/helpers/columnHelpers.ts
index 99c46ee305..c606b973dd 100644
--- a/packages/nocodb/src/helpers/columnHelpers.ts
+++ b/packages/nocodb/src/helpers/columnHelpers.ts
@@ -1,5 +1,6 @@
 import { customAlphabet } from 'nanoid';
 import { UITypes } from 'nocodb-sdk';
+import { GridViewColumn, RollupColumn } from '../models'
 import Column from '../models/Column';
 import { getUniqueColumnAliasName } from '../helpers/getUniqueName';
 import validateParams from '../helpers/validateParams';
@@ -61,7 +62,7 @@ export async function createHmAndBtColumn(
       await parent.getColumns(),
       type === 'hm' ? alias : `${child.title} List`,
     );
-    await Column.insert({
+    const col = await Column.insert({
       title,
       fk_model_id: parent.id,
       uidt: UITypes.LinkToAnotherRecord,
@@ -74,6 +75,11 @@ export async function createHmAndBtColumn(
       fk_col_name: fkColName,
       fk_index_name: fkColName,
     });
+
+    if (!isSystemCol)
+      await populateRollupForLTAR({
+        column: col,
+      });
   }
 }
 
@@ -206,3 +212,35 @@ export const generateFkName = (parent: TableType, child: TableType) => {
     .slice(0, 10)}_${randomID(15)}`;
   return constraintName;
 };
+
+
+
+export async function populateRollupForLTAR({ column }: { column: Column }) {
+  const model = await column.getModel();
+
+  const views = await model.getViews();
+
+  const relatedModel = await column
+    .getColOptions<LinkToAnotherRecordColumn>()
+    .then((colOpt) => colOpt.getRelatedTable());
+  await relatedModel.getColumns();
+  const pkId =
+    relatedModel.primaryKey?.id || (await relatedModel.getColumns())[0]?.id;
+
+  await Column.insert<RollupColumn>({
+    uidt: 'Rollup',
+    title: getUniqueColumnAliasName(
+      await model.getColumns(),
+      `${relatedModel.title} Count`,
+    ),
+    fk_rollup_column_id: pkId,
+    fk_model_id: model.id,
+    rollup_function: 'count',
+    fk_relation_column_id: column.id,
+  });
+
+  const viewCol = await GridViewColumn.list(views[0].id).then((cols) =>
+    cols.find((c) => c.fk_column_id === column.id),
+  );
+  await GridViewColumn.update(viewCol.id, { show: false });
+}
diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index 3c73a88770..487c4adae1 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -12,13 +12,13 @@ import formulaQueryBuilderv2 from '../db/formulav2/formulaQueryBuilderv2';
 import ProjectMgrv2 from '../db/sql-mgr/v2/ProjectMgrv2';
 import {
   createHmAndBtColumn,
-  generateFkName,
+  generateFkName, populateRollupForLTAR,
   randomID,
   validateLookupPayload,
   validatePayload,
   validateRequiredField,
   validateRollupPayload,
-} from '../helpers';
+} from '../helpers'
 import { NcError } from '../helpers/catchError';
 import getColumnPropsFromUIDT from '../helpers/getColumnPropsFromUIDT';
 import {
@@ -32,6 +32,7 @@ import {
   Base,
   Column,
   FormulaColumn,
+  GridViewColumn,
   KanbanView,
   Model,
 } from '../models';
@@ -39,7 +40,11 @@ import Noco from '../Noco';
 import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2';
 import { MetaTable } from '../utils/globals';
 import { MetaService } from '../meta/meta.service';
-import type { LinkToAnotherRecordColumn, Project } from '../models';
+import type {
+  LinkToAnotherRecordColumn,
+  Project,
+  RollupColumn,
+} from '../models';
 import type SqlMgrv2 from '../db/sql-mgr/v2/SqlMgrv2';
 import type {
   ColumnReqType,
@@ -1759,7 +1764,7 @@ export class ColumnsService {
         true,
       );
 
-      await Column.insert({
+      const col1 = await Column.insert({
         title: getUniqueColumnAliasName(
           await child.getColumns(),
           `${parent.title} List`,
@@ -1780,7 +1785,7 @@ export class ColumnsService {
         fk_related_model_id: parent.id,
         virtual: (param.column as LinkToAnotherColumnReqType).virtual,
       });
-      await Column.insert({
+      const col2 = await Column.insert({
         title: getUniqueColumnAliasName(
           await parent.getColumns(),
           param.column.title ?? `${child.title} List`,
@@ -1801,6 +1806,13 @@ export class ColumnsService {
         virtual: (param.column as LinkToAnotherColumnReqType).virtual,
       });
 
+      await populateRollupForLTAR({
+        column: col1,
+      })
+      await populateRollupForLTAR({
+        column: col2,
+      })
+
       // todo: create index for virtual relations as well
       // create index for foreign key in pg
       if (param.base.type === 'pg') {
@@ -1869,4 +1881,5 @@ export class ColumnsService {
       await Column.update(column.id, colBody);
     }
   }
+
 }

From 694c97693e4407c09c2a5139cd69421cc6605166 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 8 Jun 2023 22:42:07 +0530
Subject: [PATCH 003/208] feat: Link type column ( WIP )

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/smartsheet/VirtualCell.vue     |  2 +
 .../smartsheet/column/EditOrAdd.vue           |  2 +-
 .../nc-gui/components/virtual-cell/Link.vue   | 75 +++++++++++++++++++
 packages/nc-gui/utils/virtualCell.ts          |  1 +
 packages/nocodb-sdk/src/lib/Api.ts            |  8 +-
 packages/nocodb-sdk/src/lib/UITypes.ts        |  2 +
 packages/nocodb/src/db/BaseModelSqlv2.ts      | 13 ++--
 packages/nocodb/src/helpers/columnHelpers.ts  |  2 +-
 packages/nocodb/src/models/Column.ts          |  2 +
 packages/nocodb/src/schema/swagger.json       |  8 +-
 .../nocodb/src/services/columns.service.ts    | 11 ++-
 11 files changed, 106 insertions(+), 20 deletions(-)
 create mode 100644 packages/nc-gui/components/virtual-cell/Link.vue

diff --git a/packages/nc-gui/components/smartsheet/VirtualCell.vue b/packages/nc-gui/components/smartsheet/VirtualCell.vue
index 26d820b37c..b6e535cd41 100644
--- a/packages/nc-gui/components/smartsheet/VirtualCell.vue
+++ b/packages/nc-gui/components/smartsheet/VirtualCell.vue
@@ -18,6 +18,7 @@ import {
   isMm,
   isQrCode,
   isRollup,
+  isLink,
   provide,
   toRef,
 } from '#imports'
@@ -99,6 +100,7 @@ onUnmounted(() => {
       <LazyVirtualCellManyToMany v-else-if="isMm(column)" />
       <LazyVirtualCellBelongsTo v-else-if="isBt(column)" />
       <LazyVirtualCellRollup v-else-if="isRollup(column)" />
+      <LazyVirtualCellLink v-else-if="isLink(column)" />
       <LazyVirtualCellFormula v-else-if="isFormula(column)" />
       <LazyVirtualCellQrCode v-else-if="isQrCode(column)" />
       <LazyVirtualCellBarcode v-else-if="isBarcode(column)" />
diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index cce3f4b78c..8facb75ec0 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -209,7 +209,7 @@ useEventListener('keydown', (e: KeyboardEvent) => {
         <LazySmartsheetColumnDateTimeOptions v-if="formState.uidt === UITypes.DateTime" v-model:value="formState" />
         <LazySmartsheetColumnRollupOptions v-if="formState.uidt === UITypes.Rollup" v-model:value="formState" />
         <LazySmartsheetColumnLinkedToAnotherRecordOptions
-          v-if="!isEdit && formState.uidt === UITypes.LinkToAnotherRecord"
+          v-if="!isEdit && (formState.uidt === UITypes.LinkToAnotherRecord || formState.uidt === UITypes.Link)"
           v-model:value="formState"
         />
         <LazySmartsheetColumnSpecificDBTypeOptions v-if="formState.uidt === UITypes.SpecificDBType" />
diff --git a/packages/nc-gui/components/virtual-cell/Link.vue b/packages/nc-gui/components/virtual-cell/Link.vue
new file mode 100644
index 0000000000..1077a67c9a
--- /dev/null
+++ b/packages/nc-gui/components/virtual-cell/Link.vue
@@ -0,0 +1,75 @@
+<script setup lang="ts">
+import { CellValueInj, inject, useShowNotEditableWarning } from '#imports'
+import { Ref } from 'vue'
+
+const value = inject(CellValueInj)
+
+
+
+
+
+
+
+
+const column = inject(ColumnInj)!
+
+const relColumn = computed(() => {
+  return column.value?.related_column
+}
+
+
+const cellValue = inject(CellValueInj)!
+
+const row = inject(RowInj)!
+
+const reloadRowTrigger = inject(ReloadRowDataHookInj, createEventHook())
+
+const isForm = inject(IsFormInj)
+
+const readOnly = inject(ReadonlyInj, ref(false))
+
+const isLocked = inject(IsLockedInj)
+
+const isUnderLookup = inject(IsUnderLookupInj, ref(false))
+
+const listItemsDlg = ref(false)
+
+const childListDlg = ref(false)
+
+const { isUIAllowed } = useUIPermission()
+
+const { state, isNew, removeLTARRef } = useSmartsheetRowStoreOrThrow()
+
+const { relatedTableMeta, loadRelatedTableMeta, relatedTableDisplayValueProp, unlink } = useProvideLTARStore(
+  column as Ref<Required<ColumnType>>,
+  row,
+  isNew,
+  reloadRowTrigger.trigger,
+)
+
+
+</script>
+
+<template>
+  <div>
+    <span class="text-center pl-3">
+      {{ value }}
+    </span>
+
+
+
+    <LazyVirtualCellComponentsListItems v-model="listItemsDlg" :column="relColumn" />
+
+    <LazyVirtualCellComponentsListChildItems
+      v-model="childListDlg"
+      :cell-value="localCellValue"
+      :column="relColumn"
+      @attach-record="onAttachRecord"
+    />
+
+
+
+
+
+  </div>
+</template>
diff --git a/packages/nc-gui/utils/virtualCell.ts b/packages/nc-gui/utils/virtualCell.ts
index 9338df7834..b761006f2a 100644
--- a/packages/nc-gui/utils/virtualCell.ts
+++ b/packages/nc-gui/utils/virtualCell.ts
@@ -19,3 +19,4 @@ export const isFormula = (column: ColumnType) => column.uidt === UITypes.Formula
 export const isQrCode = (column: ColumnType) => column.uidt === UITypes.QrCode
 export const isBarcode = (column: ColumnType) => column.uidt === UITypes.Barcode
 export const isCount = (column: ColumnType) => column.uidt === UITypes.Count
+export const isLink = (column: ColumnType) => column.uidt === UITypes.Link
diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index 122abbfcf9..f0a6f9a05c 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -433,7 +433,8 @@ export interface ColumnType {
     | 'Time'
     | 'URL'
     | 'Year'
-    | 'QrCode';
+    | 'QrCode'
+    | 'Link';
   /** Is Unsigned? */
   un?: BoolType;
   /** Is unique? */
@@ -1468,7 +1469,7 @@ export interface LinkToAnotherColumnReqType {
   /** The type of the relationship */
   type: 'bt' | 'hm' | 'mm';
   /** Abstract type of the relationship */
-  uidt: 'LinkToAnotherRecord';
+  uidt: 'LinkToAnotherRecord' | 'Link';
   /** Is this relationship virtual? */
   virtual?: BoolType;
 }
@@ -1720,7 +1721,8 @@ export interface NormalColumnRequestType {
     | 'Time'
     | 'URL'
     | 'Year'
-    | 'QrCode';
+    | 'QrCode'
+    | 'Link';
   /** Is this column unique? */
   un?: BoolType;
   /** Is this column unique? */
diff --git a/packages/nocodb-sdk/src/lib/UITypes.ts b/packages/nocodb-sdk/src/lib/UITypes.ts
index ce9059c7a9..62b0b4dfaa 100644
--- a/packages/nocodb-sdk/src/lib/UITypes.ts
+++ b/packages/nocodb-sdk/src/lib/UITypes.ts
@@ -38,6 +38,7 @@ enum UITypes {
   Barcode = 'Barcode',
   QrCode = 'QrCode',
   Button = 'Button',
+  Link = 'Link',
 }
 
 export const numericUITypes = [
@@ -79,6 +80,7 @@ export function isVirtualCol(
     UITypes.Barcode,
     UITypes.Rollup,
     UITypes.Lookup,
+    UITypes.Link,
     // UITypes.Count,
   ].includes(<UITypes>(typeof col === 'object' ? col?.uidt : col));
 }
diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index b15aa4b355..bc47c46ac9 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -1677,10 +1677,10 @@ class BaseModelSqlv2 {
             `${alias || this.model.table_name}.${column.column_name}`,
           );
           break;
-        case 'LinkToAnotherRecord':
-        case 'Lookup':
+        case UITypes.LinkToAnotherRecord:
+        case UITypes.Lookup:
           break;
-        case 'QrCode': {
+        case UITypes.QrCode: {
           const qrCodeColumn = await column.getColOptions<QrCodeColumn>();
           const qrValueColumn = await Column.get({
             colId: qrCodeColumn.fk_qr_value_column_id,
@@ -1715,7 +1715,7 @@ class BaseModelSqlv2 {
 
           break;
         }
-        case 'Barcode': {
+        case UITypes.Barcode: {
           const barcodeColumn = await column.getColOptions<BarcodeColumn>();
           const barcodeValueColumn = await Column.get({
             colId: barcodeColumn.fk_barcode_value_column_id,
@@ -1752,7 +1752,7 @@ class BaseModelSqlv2 {
 
           break;
         }
-        case 'Formula':
+        case UITypes.Formula:
           {
             try {
               const selectQb = await this.getSelectQueryBuilderForFormula(
@@ -1776,7 +1776,8 @@ class BaseModelSqlv2 {
             }
           }
           break;
-        case 'Rollup':
+        case UITypes.Rollup:
+        case UITypes.Link:
           qb.select(
             (
               await genRollupSelectv2({
diff --git a/packages/nocodb/src/helpers/columnHelpers.ts b/packages/nocodb/src/helpers/columnHelpers.ts
index c606b973dd..d8b4e59c1e 100644
--- a/packages/nocodb/src/helpers/columnHelpers.ts
+++ b/packages/nocodb/src/helpers/columnHelpers.ts
@@ -228,7 +228,7 @@ export async function populateRollupForLTAR({ column }: { column: Column }) {
     relatedModel.primaryKey?.id || (await relatedModel.getColumns())[0]?.id;
 
   await Column.insert<RollupColumn>({
-    uidt: 'Rollup',
+    uidt: UITypes.Link,
     title: getUniqueColumnAliasName(
       await model.getColumns(),
       `${relatedModel.title} Count`,
diff --git a/packages/nocodb/src/models/Column.ts b/packages/nocodb/src/models/Column.ts
index 78ae4edc9f..06f26e8696 100644
--- a/packages/nocodb/src/models/Column.ts
+++ b/packages/nocodb/src/models/Column.ts
@@ -193,6 +193,7 @@ export default class Column<T = any> implements ColumnType {
         );
         break;
       }
+      case UITypes.Link:
       case UITypes.Rollup: {
         await RollupColumn.insert(
           {
@@ -417,6 +418,7 @@ export default class Column<T = any> implements ColumnType {
         res = await LookupColumn.read(this.id, ncMeta);
         break;
       case UITypes.Rollup:
+      case UITypes.Link:
         res = await RollupColumn.read(this.id, ncMeta);
         break;
       case UITypes.LinkToAnotherRecord:
diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json
index 84d509f0ef..6d3f7916cd 100644
--- a/packages/nocodb/src/schema/swagger.json
+++ b/packages/nocodb/src/schema/swagger.json
@@ -14887,7 +14887,8 @@
               "Time",
               "URL",
               "Year",
-              "QrCode"
+              "QrCode",
+              "Link"
             ],
             "type": "string"
           },
@@ -17424,7 +17425,7 @@
             "description": "The type of the relationship"
           },
           "uidt": {
-            "enum": ["LinkToAnotherRecord"],
+            "enum": ["LinkToAnotherRecord", "Link"],
             "type": "string",
             "description": "Abstract type of the relationship"
           },
@@ -17974,7 +17975,8 @@
               "Time",
               "URL",
               "Year",
-              "QrCode"
+              "QrCode",
+              "Link"
             ],
             "type": "string",
             "description": "UI Data Type"
diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index 487c4adae1..ad611e556e 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -12,13 +12,14 @@ import formulaQueryBuilderv2 from '../db/formulav2/formulaQueryBuilderv2';
 import ProjectMgrv2 from '../db/sql-mgr/v2/ProjectMgrv2';
 import {
   createHmAndBtColumn,
-  generateFkName, populateRollupForLTAR,
+  generateFkName,
+  populateRollupForLTAR,
   randomID,
   validateLookupPayload,
   validatePayload,
   validateRequiredField,
   validateRollupPayload,
-} from '../helpers'
+} from '../helpers';
 import { NcError } from '../helpers/catchError';
 import getColumnPropsFromUIDT from '../helpers/getColumnPropsFromUIDT';
 import {
@@ -43,7 +44,6 @@ import { MetaService } from '../meta/meta.service';
 import type {
   LinkToAnotherRecordColumn,
   Project,
-  RollupColumn,
 } from '../models';
 import type SqlMgrv2 from '../db/sql-mgr/v2/SqlMgrv2';
 import type {
@@ -1808,10 +1808,10 @@ export class ColumnsService {
 
       await populateRollupForLTAR({
         column: col1,
-      })
+      });
       await populateRollupForLTAR({
         column: col2,
-      })
+      });
 
       // todo: create index for virtual relations as well
       // create index for foreign key in pg
@@ -1881,5 +1881,4 @@ export class ColumnsService {
       await Column.update(column.id, colBody);
     }
   }
-
 }

From 0bd165b67e4db73e064460b61c7c09e38d86f236 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 9 Jun 2023 15:39:16 +0530
Subject: [PATCH 004/208] feat: make Links column similar to LTAR

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/virtual-cell/Link.vue   | 79 +++++++++++++------
 packages/nc-gui/package-lock.json             | 14 ++++
 packages/nc-gui/package.json                  |  1 +
 3 files changed, 68 insertions(+), 26 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/Link.vue b/packages/nc-gui/components/virtual-cell/Link.vue
index 1077a67c9a..d50509ec39 100644
--- a/packages/nc-gui/components/virtual-cell/Link.vue
+++ b/packages/nc-gui/components/virtual-cell/Link.vue
@@ -1,22 +1,20 @@
 <script setup lang="ts">
-import { CellValueInj, inject, useShowNotEditableWarning } from '#imports'
-import { Ref } from 'vue'
+import { computed } from '@vue/reactivity'
+import { inflect } from 'inflection'
+import type { ColumnType } from 'nocodb-sdk'
+import type { Ref } from 'vue'
+import { CellValueInj, inject } from '#imports'
+import { pluralize, singularize } from 'inflection'
 
 const value = inject(CellValueInj)
 
-
-
-
-
-
-
-
 const column = inject(ColumnInj)!
 
-const relColumn = computed(() => {
-  return column.value?.related_column
-}
+const meta = inject(MetaInj, ref())
 
+const relColumn = computed(() => {
+  return meta.value.columns.find((c: ColumnType) => c.id === column.value?.colOptions?.fk_relation_column_id)
+})
 
 const cellValue = inject(CellValueInj)!
 
@@ -41,35 +39,64 @@ const { isUIAllowed } = useUIPermission()
 const { state, isNew, removeLTARRef } = useSmartsheetRowStoreOrThrow()
 
 const { relatedTableMeta, loadRelatedTableMeta, relatedTableDisplayValueProp, unlink } = useProvideLTARStore(
-  column as Ref<Required<ColumnType>>,
+  relColumn as Ref<Required<ColumnType>>,
   row,
   isNew,
   reloadRowTrigger.trigger,
 )
 
 
-</script>
 
-<template>
-  <div>
-    <span class="text-center pl-3">
-      {{ value }}
-    </span>
 
+const relatedTableDisplayColumn = computed(
+  () =>
+    relatedTableMeta.value?.columns?.find((c: any) => c.title === relatedTableDisplayValueProp.value) as ColumnType | undefined,
+)
+
+loadRelatedTableMeta()
+
+const textVal = computed(() => {
+  if (!value.value) {
+    return 'Empty'
+  } else if (value.value === 1) {
+    return `1 ${singularize(relatedTableMeta.value?.title ?? '')}`
+  } else {
+    return `${value.value} ${pluralize(relatedTableMeta.value?.title ?? '')}`
+  }
+})
 
 
-    <LazyVirtualCellComponentsListItems v-model="listItemsDlg" :column="relColumn" />
+</script>
+
+<template>
+  <div class="flex w-full items-center">
+    <a @click.stop.prevent="childListDlg = true" class="text-center pl-3 flex-grow block"
+       :class="{'!text-gray-300': !value}">
+      {{ textVal }}
+    </a>
+
+    <div v-if="!isLocked && !isUnderLookup" class="flex justify-end gap-1 min-h-[30px] items-center">
+      <!--      <GeneralIcon-->
+      <!--        icon="expand"-->
+      <!--        class="select-none transform text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-arrow-expand"-->
+      <!--        @click.stop="childListDlg = true"-->
+      <!--      />-->
+
+      <GeneralIcon
+        v-if="!readOnly && isUIAllowed('xcDatatableEditable')"
+        icon="plus"
+        class="select-none text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-plus"
+        @click.stop="listItemsDlg = true"
+      />
+    </div>
+
+    <LazyVirtualCellComponentsListItems v-model="listItemsDlg" :column="relatedTableDisplayColumn" />
 
     <LazyVirtualCellComponentsListChildItems
       v-model="childListDlg"
       :cell-value="localCellValue"
-      :column="relColumn"
+      :column="relatedTableDisplayColumn"
       @attach-record="onAttachRecord"
     />
-
-
-
-
-
   </div>
 </template>
diff --git a/packages/nc-gui/package-lock.json b/packages/nc-gui/package-lock.json
index 35cd522cd5..5ee3af0836 100644
--- a/packages/nc-gui/package-lock.json
+++ b/packages/nc-gui/package-lock.json
@@ -23,6 +23,7 @@
         "dayjs": "^1.11.3",
         "file-saver": "^2.0.5",
         "httpsnippet": "^2.0.0",
+        "inflection": "^2.0.1",
         "jsbarcode": "^3.11.5",
         "jsep": "^1.3.6",
         "jwt-decode": "^3.1.2",
@@ -9967,6 +9968,14 @@
         "node": ">=8"
       }
     },
+    "node_modules/inflection": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/inflection/-/inflection-2.0.1.tgz",
+      "integrity": "sha512-wzkZHqpb4eGrOKBl34xy3umnYHx8Si5R1U4fwmdxLo5gdH6mEK8gclckTj/qWqy4Je0bsDYe/qazZYuO7xe3XQ==",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -25648,6 +25657,11 @@
       "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
       "dev": true
     },
+    "inflection": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/inflection/-/inflection-2.0.1.tgz",
+      "integrity": "sha512-wzkZHqpb4eGrOKBl34xy3umnYHx8Si5R1U4fwmdxLo5gdH6mEK8gclckTj/qWqy4Je0bsDYe/qazZYuO7xe3XQ=="
+    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
index 44f0905daf..cd1d5af7ef 100644
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@@ -47,6 +47,7 @@
     "dayjs": "^1.11.3",
     "file-saver": "^2.0.5",
     "httpsnippet": "^2.0.0",
+    "inflection": "^2.0.1",
     "jsbarcode": "^3.11.5",
     "jsep": "^1.3.6",
     "jwt-decode": "^3.1.2",

From 3a7c97bde7da7640c0b90d758b990c2282e89c44 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 9 Jun 2023 15:47:10 +0530
Subject: [PATCH 005/208] refactor: rename `Link` to `Links`

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/smartsheet/column/EditOrAdd.vue | 2 +-
 packages/nc-gui/utils/virtualCell.ts                       | 2 +-
 packages/nocodb-sdk/src/lib/Api.ts                         | 6 +++---
 packages/nocodb-sdk/src/lib/UITypes.ts                     | 4 ++--
 packages/nocodb/src/db/BaseModelSqlv2.ts                   | 2 +-
 packages/nocodb/src/helpers/columnHelpers.ts               | 2 +-
 packages/nocodb/src/models/Column.ts                       | 4 ++--
 packages/nocodb/src/schema/swagger.json                    | 6 +++---
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index 8facb75ec0..9f0cf0a7e6 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -209,7 +209,7 @@ useEventListener('keydown', (e: KeyboardEvent) => {
         <LazySmartsheetColumnDateTimeOptions v-if="formState.uidt === UITypes.DateTime" v-model:value="formState" />
         <LazySmartsheetColumnRollupOptions v-if="formState.uidt === UITypes.Rollup" v-model:value="formState" />
         <LazySmartsheetColumnLinkedToAnotherRecordOptions
-          v-if="!isEdit && (formState.uidt === UITypes.LinkToAnotherRecord || formState.uidt === UITypes.Link)"
+          v-if="!isEdit && (formState.uidt === UITypes.LinkToAnotherRecord || formState.uidt === UITypes.Links)"
           v-model:value="formState"
         />
         <LazySmartsheetColumnSpecificDBTypeOptions v-if="formState.uidt === UITypes.SpecificDBType" />
diff --git a/packages/nc-gui/utils/virtualCell.ts b/packages/nc-gui/utils/virtualCell.ts
index b761006f2a..4b4e633736 100644
--- a/packages/nc-gui/utils/virtualCell.ts
+++ b/packages/nc-gui/utils/virtualCell.ts
@@ -19,4 +19,4 @@ export const isFormula = (column: ColumnType) => column.uidt === UITypes.Formula
 export const isQrCode = (column: ColumnType) => column.uidt === UITypes.QrCode
 export const isBarcode = (column: ColumnType) => column.uidt === UITypes.Barcode
 export const isCount = (column: ColumnType) => column.uidt === UITypes.Count
-export const isLink = (column: ColumnType) => column.uidt === UITypes.Link
+export const isLink = (column: ColumnType) => column.uidt === UITypes.Links
diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index f0a6f9a05c..db416e39bb 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -434,7 +434,7 @@ export interface ColumnType {
     | 'URL'
     | 'Year'
     | 'QrCode'
-    | 'Link';
+    | 'Links';
   /** Is Unsigned? */
   un?: BoolType;
   /** Is unique? */
@@ -1469,7 +1469,7 @@ export interface LinkToAnotherColumnReqType {
   /** The type of the relationship */
   type: 'bt' | 'hm' | 'mm';
   /** Abstract type of the relationship */
-  uidt: 'LinkToAnotherRecord' | 'Link';
+  uidt: 'LinkToAnotherRecord' | 'Links';
   /** Is this relationship virtual? */
   virtual?: BoolType;
 }
@@ -1722,7 +1722,7 @@ export interface NormalColumnRequestType {
     | 'URL'
     | 'Year'
     | 'QrCode'
-    | 'Link';
+    | 'Links';
   /** Is this column unique? */
   un?: BoolType;
   /** Is this column unique? */
diff --git a/packages/nocodb-sdk/src/lib/UITypes.ts b/packages/nocodb-sdk/src/lib/UITypes.ts
index 62b0b4dfaa..70aa3ae706 100644
--- a/packages/nocodb-sdk/src/lib/UITypes.ts
+++ b/packages/nocodb-sdk/src/lib/UITypes.ts
@@ -38,7 +38,7 @@ enum UITypes {
   Barcode = 'Barcode',
   QrCode = 'QrCode',
   Button = 'Button',
-  Link = 'Link',
+  Links = 'Links',
 }
 
 export const numericUITypes = [
@@ -80,7 +80,7 @@ export function isVirtualCol(
     UITypes.Barcode,
     UITypes.Rollup,
     UITypes.Lookup,
-    UITypes.Link,
+    UITypes.Links,
     // UITypes.Count,
   ].includes(<UITypes>(typeof col === 'object' ? col?.uidt : col));
 }
diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index bc47c46ac9..26ec38a774 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -1777,7 +1777,7 @@ class BaseModelSqlv2 {
           }
           break;
         case UITypes.Rollup:
-        case UITypes.Link:
+        case UITypes.Links:
           qb.select(
             (
               await genRollupSelectv2({
diff --git a/packages/nocodb/src/helpers/columnHelpers.ts b/packages/nocodb/src/helpers/columnHelpers.ts
index d8b4e59c1e..4fba0830b2 100644
--- a/packages/nocodb/src/helpers/columnHelpers.ts
+++ b/packages/nocodb/src/helpers/columnHelpers.ts
@@ -228,7 +228,7 @@ export async function populateRollupForLTAR({ column }: { column: Column }) {
     relatedModel.primaryKey?.id || (await relatedModel.getColumns())[0]?.id;
 
   await Column.insert<RollupColumn>({
-    uidt: UITypes.Link,
+    uidt: UITypes.Links,
     title: getUniqueColumnAliasName(
       await model.getColumns(),
       `${relatedModel.title} Count`,
diff --git a/packages/nocodb/src/models/Column.ts b/packages/nocodb/src/models/Column.ts
index 06f26e8696..b22e55a922 100644
--- a/packages/nocodb/src/models/Column.ts
+++ b/packages/nocodb/src/models/Column.ts
@@ -193,7 +193,7 @@ export default class Column<T = any> implements ColumnType {
         );
         break;
       }
-      case UITypes.Link:
+      case UITypes.Links:
       case UITypes.Rollup: {
         await RollupColumn.insert(
           {
@@ -418,7 +418,7 @@ export default class Column<T = any> implements ColumnType {
         res = await LookupColumn.read(this.id, ncMeta);
         break;
       case UITypes.Rollup:
-      case UITypes.Link:
+      case UITypes.Links:
         res = await RollupColumn.read(this.id, ncMeta);
         break;
       case UITypes.LinkToAnotherRecord:
diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json
index 6d3f7916cd..4c31b15c24 100644
--- a/packages/nocodb/src/schema/swagger.json
+++ b/packages/nocodb/src/schema/swagger.json
@@ -14888,7 +14888,7 @@
               "URL",
               "Year",
               "QrCode",
-              "Link"
+              "Links"
             ],
             "type": "string"
           },
@@ -17425,7 +17425,7 @@
             "description": "The type of the relationship"
           },
           "uidt": {
-            "enum": ["LinkToAnotherRecord", "Link"],
+            "enum": ["LinkToAnotherRecord", "Links"],
             "type": "string",
             "description": "Abstract type of the relationship"
           },
@@ -17976,7 +17976,7 @@
               "URL",
               "Year",
               "QrCode",
-              "Link"
+              "Links"
             ],
             "type": "string",
             "description": "UI Data Type"

From 8e5615c7569a15e316640b34df5871d4cd16d096 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 9 Jun 2023 23:24:01 +0530
Subject: [PATCH 006/208] fix: make link button in child list functional

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

diff --git a/packages/nc-gui/components/virtual-cell/Link.vue b/packages/nc-gui/components/virtual-cell/Link.vue
index d50509ec39..5ed92adc5c 100644
--- a/packages/nc-gui/components/virtual-cell/Link.vue
+++ b/packages/nc-gui/components/virtual-cell/Link.vue
@@ -65,7 +65,10 @@ const textVal = computed(() => {
   }
 })
 
-
+const onAttachRecord = () => {
+  childListDlg.value = false
+  listItemsDlg.value = true
+}
 </script>
 
 <template>
@@ -94,7 +97,6 @@ const textVal = computed(() => {
 
     <LazyVirtualCellComponentsListChildItems
       v-model="childListDlg"
-      :cell-value="localCellValue"
       :column="relatedTableDisplayColumn"
       @attach-record="onAttachRecord"
     />

From b82decc4173a8494e27429125f64ebff5b8bffaf Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 10 Jun 2023 00:48:08 +0530
Subject: [PATCH 007/208] chore: remove inflection form gui

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/package-lock.json | 14 --------------
 packages/nc-gui/package.json      |  1 -
 2 files changed, 15 deletions(-)

diff --git a/packages/nc-gui/package-lock.json b/packages/nc-gui/package-lock.json
index 5ee3af0836..35cd522cd5 100644
--- a/packages/nc-gui/package-lock.json
+++ b/packages/nc-gui/package-lock.json
@@ -23,7 +23,6 @@
         "dayjs": "^1.11.3",
         "file-saver": "^2.0.5",
         "httpsnippet": "^2.0.0",
-        "inflection": "^2.0.1",
         "jsbarcode": "^3.11.5",
         "jsep": "^1.3.6",
         "jwt-decode": "^3.1.2",
@@ -9968,14 +9967,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/inflection": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/inflection/-/inflection-2.0.1.tgz",
-      "integrity": "sha512-wzkZHqpb4eGrOKBl34xy3umnYHx8Si5R1U4fwmdxLo5gdH6mEK8gclckTj/qWqy4Je0bsDYe/qazZYuO7xe3XQ==",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
     "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -25657,11 +25648,6 @@
       "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
       "dev": true
     },
-    "inflection": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/inflection/-/inflection-2.0.1.tgz",
-      "integrity": "sha512-wzkZHqpb4eGrOKBl34xy3umnYHx8Si5R1U4fwmdxLo5gdH6mEK8gclckTj/qWqy4Je0bsDYe/qazZYuO7xe3XQ=="
-    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
index cd1d5af7ef..44f0905daf 100644
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@@ -47,7 +47,6 @@
     "dayjs": "^1.11.3",
     "file-saver": "^2.0.5",
     "httpsnippet": "^2.0.0",
-    "inflection": "^2.0.1",
     "jsbarcode": "^3.11.5",
     "jsep": "^1.3.6",
     "jwt-decode": "^3.1.2",

From 8f5ac4af88231a3f551d2fe921daa296f3ce563e Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 10 Jun 2023 00:49:15 +0530
Subject: [PATCH 008/208] feat: add links option with LTAR and in edit

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../smartsheet/column/EditOrAdd.vue           |  8 +++-
 .../smartsheet/column/LinkOptions.vue         | 46 +++++++++++++++++++
 .../column/LinkedToAnotherRecordOptions.vue   |  6 +++
 packages/nocodb/src/helpers/columnHelpers.ts  | 22 +++++++--
 .../nocodb/src/services/columns.service.ts    |  3 ++
 5 files changed, 79 insertions(+), 6 deletions(-)
 create mode 100644 packages/nc-gui/components/smartsheet/column/LinkOptions.vue

diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index 9f0cf0a7e6..04ee586e35 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -58,7 +58,7 @@ const advancedDbOptions = ref(false)
 
 const columnToValidate = [UITypes.Email, UITypes.URL, UITypes.PhoneNumber]
 
-const onlyNameUpdateOnEditColumns = [UITypes.LinkToAnotherRecord, UITypes.Lookup, UITypes.Rollup]
+const onlyNameUpdateOnEditColumns = [UITypes.LinkToAnotherRecord, UITypes.Lookup, UITypes.Rollup, UITypes.Links]
 
 const geoDataToggleCondition = (t: { name: UITypes }) => {
   return betaFeatureToggleState.show ? betaFeatureToggleState.show : !t.name.includes(UITypes.GeoData)
@@ -209,7 +209,11 @@ useEventListener('keydown', (e: KeyboardEvent) => {
         <LazySmartsheetColumnDateTimeOptions v-if="formState.uidt === UITypes.DateTime" v-model:value="formState" />
         <LazySmartsheetColumnRollupOptions v-if="formState.uidt === UITypes.Rollup" v-model:value="formState" />
         <LazySmartsheetColumnLinkedToAnotherRecordOptions
-          v-if="!isEdit && (formState.uidt === UITypes.LinkToAnotherRecord || formState.uidt === UITypes.Links)"
+          v-if="!isEdit && (formState.uidt === UITypes.LinkToAnotherRecord)"
+          v-model:value="formState"
+        />
+        <LazySmartsheetColumnLinkOptions
+          v-if="formState.uidt === UITypes.Links"
           v-model:value="formState"
         />
         <LazySmartsheetColumnSpecificDBTypeOptions v-if="formState.uidt === UITypes.SpecificDBType" />
diff --git a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
new file mode 100644
index 0000000000..0e5df58ba3
--- /dev/null
+++ b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
@@ -0,0 +1,46 @@
+<script setup lang="ts">
+import { useGlobal, useVModel } from '#imports'
+
+const props = defineProps<{
+  value: any
+}>()
+
+const emit = defineEmits(['update:value'])
+
+const vModel = useVModel(props, 'value', emit)
+
+const validators = {}
+
+const { setAdditionalValidations, validateInfos } = useColumnCreateStoreOrThrow()
+
+const { appInfo } = useGlobal()
+
+const searchValue = ref<string>('')
+
+setAdditionalValidations({
+  ...validators,
+})
+
+// set default valueO
+vModel.value.meta = {
+  singular: '',
+  plural: '',
+  ...vModel.value.meta,
+}
+</script>
+
+<template>
+  <a-row class="my-2" gutter="8">
+    <a-col :span="12">
+      <a-form-item v-bind="validateInfos['meta.singular']" label="Singular Label">
+        <a-input v-model:value="vModel.meta.singular" class="!w-full nc-link-singular" />
+      </a-form-item>
+    </a-col>
+
+    <a-col :span="12">
+      <a-form-item v-bind="validateInfos['meta.plural']" label="Plural Label">
+        <a-input v-model:value="vModel.meta.plural" class="!w-full nc-link-plural" />
+      </a-form-item>
+    </a-col>
+  </a-row>
+</template>
diff --git a/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue
index 368aebec78..716d74108d 100644
--- a/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue
@@ -85,6 +85,12 @@ const filterOption = (value: string, option: { key: string }) => option.key.toLo
           </a-select-option>
         </a-select>
       </a-form-item>
+
+
+      <LazySmartsheetColumnLinkOptions
+        v-model:value="vModel"
+      />
+
     </div>
     <template v-if="!isXcdbBase">
       <div
diff --git a/packages/nocodb/src/helpers/columnHelpers.ts b/packages/nocodb/src/helpers/columnHelpers.ts
index 4fba0830b2..0908241998 100644
--- a/packages/nocodb/src/helpers/columnHelpers.ts
+++ b/packages/nocodb/src/helpers/columnHelpers.ts
@@ -1,9 +1,11 @@
 import { customAlphabet } from 'nanoid';
 import { UITypes } from 'nocodb-sdk';
-import { GridViewColumn, RollupColumn } from '../models'
+import { pluralize, singularize } from 'inflection';
+import { GridViewColumn } from '../models';
 import Column from '../models/Column';
 import { getUniqueColumnAliasName } from '../helpers/getUniqueName';
 import validateParams from '../helpers/validateParams';
+import type { RollupColumn } from '../models';
 import type {
   BoolType,
   ColumnReqType,
@@ -31,6 +33,7 @@ export async function createHmAndBtColumn(
   fkColName?: string,
   virtual: BoolType = false,
   isSystemCol = false,
+  columnMeta = null
 ) {
   // save bt column
   {
@@ -79,6 +82,7 @@ export async function createHmAndBtColumn(
     if (!isSystemCol)
       await populateRollupForLTAR({
         column: col,
+        columnMeta
       });
   }
 }
@@ -213,9 +217,13 @@ export const generateFkName = (parent: TableType, child: TableType) => {
   return constraintName;
 };
 
-
-
-export async function populateRollupForLTAR({ column }: { column: Column }) {
+export async function populateRollupForLTAR({
+  column,
+  columnMeta
+}: {
+  column: Column;
+  columnMeta: any;
+}) {
   const model = await column.getModel();
 
   const views = await model.getViews();
@@ -227,6 +235,11 @@ export async function populateRollupForLTAR({ column }: { column: Column }) {
   const pkId =
     relatedModel.primaryKey?.id || (await relatedModel.getColumns())[0]?.id;
 
+  const meta = {
+    plural: columnMeta?.plural || pluralize(relatedModel.title),
+    singular: columnMeta?.singular || singularize(relatedModel.title),
+  };
+
   await Column.insert<RollupColumn>({
     uidt: UITypes.Links,
     title: getUniqueColumnAliasName(
@@ -237,6 +250,7 @@ export async function populateRollupForLTAR({ column }: { column: Column }) {
     fk_model_id: model.id,
     rollup_function: 'count',
     fk_relation_column_id: column.id,
+    meta,
   });
 
   const viewCol = await GridViewColumn.list(views[0].id).then((cols) =>
diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index ad611e556e..840cf8d159 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -1647,6 +1647,7 @@ export class ColumnsService {
         (param.column as LinkToAnotherColumnReqType).title,
         foreignKeyName,
         (param.column as LinkToAnotherColumnReqType).virtual,
+        param.column['meta']
       );
     } else if ((param.column as LinkToAnotherColumnReqType).type === 'mm') {
       const aTn = `${param.project?.prefix ?? ''}_nc_m2m_${randomID()}`;
@@ -1808,9 +1809,11 @@ export class ColumnsService {
 
       await populateRollupForLTAR({
         column: col1,
+        columnMeta: param.column['meta']
       });
       await populateRollupForLTAR({
         column: col2,
+        columnMeta: param.column['meta']
       });
 
       // todo: create index for virtual relations as well

From 70e21a132a0248834ddfabe92e4c4fa35380f520 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 10 Jun 2023 00:51:34 +0530
Subject: [PATCH 009/208] feat: in cell show singular/plural label based on
 text

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

diff --git a/packages/nc-gui/components/virtual-cell/Link.vue b/packages/nc-gui/components/virtual-cell/Link.vue
index 5ed92adc5c..abc6ffbd62 100644
--- a/packages/nc-gui/components/virtual-cell/Link.vue
+++ b/packages/nc-gui/components/virtual-cell/Link.vue
@@ -1,10 +1,8 @@
 <script setup lang="ts">
 import { computed } from '@vue/reactivity'
-import { inflect } from 'inflection'
 import type { ColumnType } from 'nocodb-sdk'
 import type { Ref } from 'vue'
 import { CellValueInj, inject } from '#imports'
-import { pluralize, singularize } from 'inflection'
 
 const value = inject(CellValueInj)
 
@@ -59,9 +57,9 @@ const textVal = computed(() => {
   if (!value.value) {
     return 'Empty'
   } else if (value.value === 1) {
-    return `1 ${singularize(relatedTableMeta.value?.title ?? '')}`
+    return `1 ${column.value?.meta?.singular || 'Item'}`
   } else {
-    return `${value.value} ${pluralize(relatedTableMeta.value?.title ?? '')}`
+    return `${value.value} ${column.value?.meta?.plural || 'Items'}`
   }
 })
 

From 7dc8ad4aaaeb414eb38b4cb05aeea4e5f1476354 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 10 Jun 2023 01:07:27 +0530
Subject: [PATCH 010/208] feat: add the update functionality

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/models/Column.ts          | 26 +++++++++++++++++
 .../nocodb/src/services/columns.service.ts    | 28 +++++++++++--------
 2 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/packages/nocodb/src/models/Column.ts b/packages/nocodb/src/models/Column.ts
index b22e55a922..4e80d0a839 100644
--- a/packages/nocodb/src/models/Column.ts
+++ b/packages/nocodb/src/models/Column.ts
@@ -10,6 +10,7 @@ import Noco from '../Noco';
 import addFormulaErrorIfMissingColumn from '../helpers/addFormulaErrorIfMissingColumn';
 import { NcError } from '../helpers/catchError';
 import { extractProps } from '../helpers/extractProps';
+import { stringifyMetaProp } from '../utils/modelUtils';
 import FormulaColumn from './FormulaColumn';
 import LinkToAnotherRecordColumn from './LinkToAnotherRecordColumn';
 import LookupColumn from './LookupColumn';
@@ -1207,4 +1208,29 @@ export default class Column<T = any> implements ColumnType {
     }
     return fieldLengthLimit;
   }
+
+  static async updateMeta(
+    { colId, meta }: { colId: string; meta: any },
+    ncMeta = Noco.ncMeta,
+  ) {
+    // get existing cache
+    const key = `${CacheScope.COLUMN}:${colId}`;
+    const o = await NocoCache.get(key, CacheGetType.TYPE_OBJECT);
+    if (o) {
+      // update meta
+      o.meta = meta;
+      // set cache
+      await NocoCache.set(key, o);
+    }
+    // set meta
+    await ncMeta.metaUpdate(
+      null,
+      null,
+      MetaTable.COLUMNS,
+      {
+        meta: stringifyMetaProp(meta),
+      },
+      colId,
+    );
+  }
 }
diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index 840cf8d159..3a5a8df4e9 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -41,10 +41,7 @@ import Noco from '../Noco';
 import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2';
 import { MetaTable } from '../utils/globals';
 import { MetaService } from '../meta/meta.service';
-import type {
-  LinkToAnotherRecordColumn,
-  Project,
-} from '../models';
+import type { LinkToAnotherRecordColumn, Project } from '../models';
 import type SqlMgrv2 from '../db/sql-mgr/v2/SqlMgrv2';
 import type {
   ColumnReqType,
@@ -124,6 +121,7 @@ export class ColumnsService {
         UITypes.QrCode,
         UITypes.Barcode,
         UITypes.ForeignKey,
+        UITypes.Links,
       ].includes(column.uidt)
     ) {
       if (column.uidt === colBody.uidt) {
@@ -161,10 +159,18 @@ export class ColumnsService {
             ...column,
             ...colBody,
           });
-        } else if (colBody.title !== column.title) {
-          await Column.updateAlias(param.columnId, {
-            title: colBody.title,
-          });
+        } else {
+          if (colBody.title !== column.title) {
+            await Column.updateAlias(param.columnId, {
+              title: colBody.title,
+            });
+          }
+          if ('meta' in colBody && column.uidt === UITypes.Links) {
+            await Column.updateMeta({
+              colId: param.columnId,
+              meta: colBody.meta,
+            });
+          }
         }
         await this.updateRollupOrLookup(colBody, column);
       } else {
@@ -1647,7 +1653,7 @@ export class ColumnsService {
         (param.column as LinkToAnotherColumnReqType).title,
         foreignKeyName,
         (param.column as LinkToAnotherColumnReqType).virtual,
-        param.column['meta']
+        param.column['meta'],
       );
     } else if ((param.column as LinkToAnotherColumnReqType).type === 'mm') {
       const aTn = `${param.project?.prefix ?? ''}_nc_m2m_${randomID()}`;
@@ -1809,11 +1815,11 @@ export class ColumnsService {
 
       await populateRollupForLTAR({
         column: col1,
-        columnMeta: param.column['meta']
+        columnMeta: param.column['meta'],
       });
       await populateRollupForLTAR({
         column: col2,
-        columnMeta: param.column['meta']
+        columnMeta: param.column['meta'],
       });
 
       // todo: create index for virtual relations as well

From 021d448c3a978b5e6c6b02cf1cb43eb0e09d6735 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 10 Jun 2023 01:25:29 +0530
Subject: [PATCH 011/208] fix: correct the default singular/plural for
 referenced table

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/helpers/columnHelpers.ts    | 2 +-
 packages/nocodb/src/services/columns.service.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/helpers/columnHelpers.ts b/packages/nocodb/src/helpers/columnHelpers.ts
index 0908241998..0831a5adfc 100644
--- a/packages/nocodb/src/helpers/columnHelpers.ts
+++ b/packages/nocodb/src/helpers/columnHelpers.ts
@@ -222,7 +222,7 @@ export async function populateRollupForLTAR({
   columnMeta
 }: {
   column: Column;
-  columnMeta: any;
+  columnMeta?: any;
 }) {
   const model = await column.getModel();
 
diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index 3a5a8df4e9..47c9bcfbce 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -1815,7 +1815,7 @@ export class ColumnsService {
 
       await populateRollupForLTAR({
         column: col1,
-        columnMeta: param.column['meta'],
+        // columnMeta: param.column['meta'],
       });
       await populateRollupForLTAR({
         column: col2,

From 1952067bd03cdad755cf4c952bae6bfcd495063e Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 10 Jun 2023 11:21:17 +0530
Subject: [PATCH 012/208] feat: implement delete behaviour of the Links column

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/models/Column.ts            |  2 +-
 packages/nocodb/src/services/columns.service.ts | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/models/Column.ts b/packages/nocodb/src/models/Column.ts
index 4e80d0a839..026a03f1f6 100644
--- a/packages/nocodb/src/models/Column.ts
+++ b/packages/nocodb/src/models/Column.ts
@@ -655,7 +655,7 @@ export default class Column<T = any> implements ColumnType {
       }
     }
 
-    // get rollup column and delete
+    // get rollup/links column and delete
     {
       const cachedList = await NocoCache.getList(CacheScope.COL_ROLLUP, [id]);
       let { list: rollups } = cachedList;
diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index 47c9bcfbce..f2d4abebc5 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -41,7 +41,11 @@ import Noco from '../Noco';
 import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2';
 import { MetaTable } from '../utils/globals';
 import { MetaService } from '../meta/meta.service';
-import type { LinkToAnotherRecordColumn, Project } from '../models';
+import type {
+  LinkToAnotherRecordColumn,
+  Project,
+  RollupColumn,
+} from '../models';
 import type SqlMgrv2 from '../db/sql-mgr/v2/SqlMgrv2';
 import type {
   ColumnReqType,
@@ -1181,6 +1185,15 @@ export class ColumnsService {
       case UITypes.Formula:
         await Column.delete(param.columnId, ncMeta);
         break;
+      // When deleting a link column, we need to delete the relation column
+      // while deleting the LTAR column, links column will be deleted automatically
+      case UITypes.Links:
+        return await column.getColOptions<RollupColumn>().then((colOpt) =>
+          this.columnDelete({
+            ...param,
+            columnId: colOpt.fk_relation_column_id,
+          }),
+        );
       case UITypes.LinkToAnotherRecord:
         {
           const relationColOpt =

From d36d44c004048520fc93a25594d6e804f4640292 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 10 Jun 2023 13:54:04 +0530
Subject: [PATCH 013/208] refactor: use the column name with Links and treat
 LTAR as it is

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/virtual-cell/Link.vue    |  4 ----
 packages/nocodb/src/helpers/columnHelpers.ts   | 18 +++++++++++-------
 .../nocodb/src/services/columns.service.ts     |  9 ++++++++-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/Link.vue b/packages/nc-gui/components/virtual-cell/Link.vue
index abc6ffbd62..791de6e0a0 100644
--- a/packages/nc-gui/components/virtual-cell/Link.vue
+++ b/packages/nc-gui/components/virtual-cell/Link.vue
@@ -42,10 +42,6 @@ const { relatedTableMeta, loadRelatedTableMeta, relatedTableDisplayValueProp, un
   isNew,
   reloadRowTrigger.trigger,
 )
-
-
-
-
 const relatedTableDisplayColumn = computed(
   () =>
     relatedTableMeta.value?.columns?.find((c: any) => c.title === relatedTableDisplayValueProp.value) as ColumnType | undefined,
diff --git a/packages/nocodb/src/helpers/columnHelpers.ts b/packages/nocodb/src/helpers/columnHelpers.ts
index 0831a5adfc..77f42d23f1 100644
--- a/packages/nocodb/src/helpers/columnHelpers.ts
+++ b/packages/nocodb/src/helpers/columnHelpers.ts
@@ -33,13 +33,14 @@ export async function createHmAndBtColumn(
   fkColName?: string,
   virtual: BoolType = false,
   isSystemCol = false,
-  columnMeta = null
+  columnMeta = null,
+  isLinks = false,
 ) {
   // save bt column
   {
     const title = getUniqueColumnAliasName(
       await child.getColumns(),
-      type === 'bt' ? alias : `${parent.title}`,
+      type === 'bt' && !isLinks ? alias : `${parent.title}`,
     );
     await Column.insert<LinkToAnotherRecordColumn>({
       title,
@@ -63,7 +64,7 @@ export async function createHmAndBtColumn(
   {
     const title = getUniqueColumnAliasName(
       await parent.getColumns(),
-      type === 'hm' ? alias : `${child.title} List`,
+      type === 'hm' && !isLinks ? alias : `${child.title} List`,
     );
     const col = await Column.insert({
       title,
@@ -79,10 +80,11 @@ export async function createHmAndBtColumn(
       fk_index_name: fkColName,
     });
 
-    if (!isSystemCol)
+    if (!isSystemCol && isLinks)
       await populateRollupForLTAR({
         column: col,
-        columnMeta
+        columnMeta,
+        alias
       });
   }
 }
@@ -219,10 +221,12 @@ export const generateFkName = (parent: TableType, child: TableType) => {
 
 export async function populateRollupForLTAR({
   column,
-  columnMeta
+  columnMeta,
+  alias
 }: {
   column: Column;
   columnMeta?: any;
+  alias?: string;
 }) {
   const model = await column.getModel();
 
@@ -244,7 +248,7 @@ export async function populateRollupForLTAR({
     uidt: UITypes.Links,
     title: getUniqueColumnAliasName(
       await model.getColumns(),
-      `${relatedModel.title} Count`,
+      alias || `${relatedModel.title} Count`,
     ),
     fk_rollup_column_id: pkId,
     fk_model_id: model.id,
diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index f2d4abebc5..5161bf8ba7 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -937,6 +937,7 @@ export class ColumnsService {
         }
         break;
 
+      case UITypes.Links:
       case UITypes.LinkToAnotherRecord:
         await this.createLTARColumn({ ...param, base, project });
         T.emit('evt', { evt_type: 'relation:created' });
@@ -1566,6 +1567,7 @@ export class ColumnsService {
     const sqlMgr = await ProjectMgrv2.getSqlMgr({
       id: param.base.project_id,
     });
+    const isLinks = param.column.uidt === UITypes.Links;
 
     // if xcdb base then treat as virtual relation to avoid creating foreign key
     if (param.base.is_meta) {
@@ -1667,6 +1669,8 @@ export class ColumnsService {
         foreignKeyName,
         (param.column as LinkToAnotherColumnReqType).virtual,
         param.column['meta'],
+        null,
+        isLinks,
       );
     } else if ((param.column as LinkToAnotherColumnReqType).type === 'mm') {
       const aTn = `${param.project?.prefix ?? ''}_nc_m2m_${randomID()}`;
@@ -1808,7 +1812,9 @@ export class ColumnsService {
       const col2 = await Column.insert({
         title: getUniqueColumnAliasName(
           await parent.getColumns(),
-          param.column.title ?? `${child.title} List`,
+          isLinks
+            ? `${param.column.title} List`
+            : param.column.title ?? `${child.title} List`,
         ),
 
         uidt: UITypes.LinkToAnotherRecord,
@@ -1833,6 +1839,7 @@ export class ColumnsService {
       await populateRollupForLTAR({
         column: col2,
         columnMeta: param.column['meta'],
+        alias: param.column.title,
       });
 
       // todo: create index for virtual relations as well

From a6308ef3faaf02920d52f00d3312ee308ead76c6 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 10 Jun 2023 14:34:12 +0530
Subject: [PATCH 014/208] fix: create rollup(Links) based on uidt

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nocodb/src/services/columns.service.ts    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index 5161bf8ba7..489c66d4cd 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -1832,15 +1832,17 @@ export class ColumnsService {
         virtual: (param.column as LinkToAnotherColumnReqType).virtual,
       });
 
-      await populateRollupForLTAR({
-        column: col1,
-        // columnMeta: param.column['meta'],
-      });
-      await populateRollupForLTAR({
-        column: col2,
-        columnMeta: param.column['meta'],
-        alias: param.column.title,
-      });
+      if (isLinks) {
+        await populateRollupForLTAR({
+          column: col1,
+          // columnMeta: param.column['meta'],
+        });
+        await populateRollupForLTAR({
+          column: col2,
+          columnMeta: param.column['meta'],
+          alias: param.column.title,
+        });
+      }
 
       // todo: create index for virtual relations as well
       // create index for foreign key in pg

From 5937b8377b39125968d959ed5d58ec5861da5bde Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 10 Jun 2023 15:36:59 +0530
Subject: [PATCH 015/208] feat: add Links option in column create

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/smartsheet/column/EditOrAdd.vue       |  2 +-
 .../column/LinkedToAnotherRecordOptions.vue          | 12 +++++-------
 packages/nc-gui/utils/columnUtils.ts                 |  5 +++++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index 04ee586e35..049b5c3952 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -209,7 +209,7 @@ useEventListener('keydown', (e: KeyboardEvent) => {
         <LazySmartsheetColumnDateTimeOptions v-if="formState.uidt === UITypes.DateTime" v-model:value="formState" />
         <LazySmartsheetColumnRollupOptions v-if="formState.uidt === UITypes.Rollup" v-model:value="formState" />
         <LazySmartsheetColumnLinkedToAnotherRecordOptions
-          v-if="!isEdit && (formState.uidt === UITypes.LinkToAnotherRecord)"
+          v-if="!isEdit && (formState.uidt === UITypes.LinkToAnotherRecord||formState.uidt === UITypes.Links)"
           v-model:value="formState"
         />
         <LazySmartsheetColumnLinkOptions
diff --git a/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue
index 716d74108d..32633e9d91 100644
--- a/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ModelTypes, MssqlUi, SqliteUi } from 'nocodb-sdk'
+import { ModelTypes, MssqlUi, SqliteUi, UITypes } from 'nocodb-sdk'
 import { MetaInj, inject, ref, storeToRefs, useProject, useVModel } from '#imports'
 import MdiPlusIcon from '~icons/mdi/plus-circle-outline'
 import MdiMinusIcon from '~icons/mdi/minus-circle-outline'
@@ -50,6 +50,8 @@ const refTables = $computed(() => {
 })
 
 const filterOption = (value: string, option: { key: string }) => option.key.toLowerCase().includes(value.toLowerCase())
+
+const isLinks = $computed(() => vModel.value.uidt.type === UITypes.Links)
 </script>
 
 <template>
@@ -85,12 +87,6 @@ const filterOption = (value: string, option: { key: string }) => option.key.toLo
           </a-select-option>
         </a-select>
       </a-form-item>
-
-
-      <LazySmartsheetColumnLinkOptions
-        v-model:value="vModel"
-      />
-
     </div>
     <template v-if="!isXcdbBase">
       <div
@@ -103,6 +99,8 @@ const filterOption = (value: string, option: { key: string }) => option.key.toLo
       </div>
 
       <div v-if="advancedOptions" class="flex flex-col p-6 gap-4 border-2 mt-2">
+      <LazySmartsheetColumnLinkOptions v-model:value="vModel" class="-my-2" />
+
         <div class="flex flex-row space-x-2">
           <a-form-item class="flex w-1/2" :label="$t('labels.onUpdate')">
             <a-select
diff --git a/packages/nc-gui/utils/columnUtils.ts b/packages/nc-gui/utils/columnUtils.ts
index 838daf308f..e04279565f 100644
--- a/packages/nc-gui/utils/columnUtils.ts
+++ b/packages/nc-gui/utils/columnUtils.ts
@@ -5,6 +5,11 @@ import LinkVariant from '~icons/mdi/link-variant'
 import ID from '~icons/mdi/identifier'
 
 const uiTypes = [
+  {
+    name: UITypes.Links,
+    icon: iconMap.link,
+    virtual: 1,
+  },
   {
     name: UITypes.LinkToAnotherRecord,
     icon: iconMap.link,

From c47d758c46ae126a3384c9089165576b588cc769 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 10 Jun 2023 15:50:07 +0530
Subject: [PATCH 016/208] refactor: instead of LTAR on drag n drop create Links

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

diff --git a/packages/nc-gui/components/tabs/Smartsheet.vue b/packages/nc-gui/components/tabs/Smartsheet.vue
index 50166d2e2c..226fec302b 100644
--- a/packages/nc-gui/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui/components/tabs/Smartsheet.vue
@@ -115,8 +115,8 @@ const onDrop = async (event: DragEvent) => {
       })
     } else {
       grid.value?.openColumnCreate({
-        uidt: UITypes.LinkToAnotherRecord,
-        title: `${data.title}List`,
+        uidt: UITypes.Links,
+        title: `${data.title}`,
         parentId: parentMeta.id,
         childId: childMeta.id,
         parentTable: parentMeta.title,

From b66e0e42b3bb6780057478b6440dc3c083e34e61 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 10 Jun 2023 15:55:15 +0530
Subject: [PATCH 017/208] fix: correct expanded form view behaviour

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/virtual-cell/Link.vue   | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/Link.vue b/packages/nc-gui/components/virtual-cell/Link.vue
index 791de6e0a0..be521cddad 100644
--- a/packages/nc-gui/components/virtual-cell/Link.vue
+++ b/packages/nc-gui/components/virtual-cell/Link.vue
@@ -67,25 +67,21 @@ const onAttachRecord = () => {
 
 <template>
   <div class="flex w-full items-center">
-    <a @click.stop.prevent="childListDlg = true" class="text-center pl-3 flex-grow block"
-       :class="{'!text-gray-300': !value}">
-      {{ textVal }}
-    </a>
-
-    <div v-if="!isLocked && !isUnderLookup" class="flex justify-end gap-1 min-h-[30px] items-center">
-      <!--      <GeneralIcon-->
-      <!--        icon="expand"-->
-      <!--        class="select-none transform text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-arrow-expand"-->
-      <!--        @click.stop="childListDlg = true"-->
-      <!--      />-->
-
-      <GeneralIcon
-        v-if="!readOnly && isUIAllowed('xcDatatableEditable')"
-        icon="plus"
-        class="select-none text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-plus"
-        @click.stop="listItemsDlg = true"
-      />
-    </div>
+    <template v-if="!isForm">
+      <a @click.stop.prevent="childListDlg = true" class="text-center pl-3 flex-grow block"
+         :class="{'!text-gray-300': !value}">
+        {{ textVal }}
+      </a>
+
+      <div v-if="!isLocked && !isUnderLookup" class="flex justify-end gap-1 min-h-[30px] items-center">
+        <GeneralIcon
+          v-if="!readOnly && isUIAllowed('xcDatatableEditable')"
+          icon="plus"
+          class="select-none text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-plus"
+          @click.stop="listItemsDlg = true"
+        />
+      </div>
+    </template>
 
     <LazyVirtualCellComponentsListItems v-model="listItemsDlg" :column="relatedTableDisplayColumn" />
 

From 0afbcfe2eb43cae389c9d0020e61db60144d7603 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 10 Jun 2023 17:46:00 +0530
Subject: [PATCH 018/208] fix: overwrite `ColumnInj` in links to behave nested
 component in the same way as LTAR

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/virtual-cell/Link.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/Link.vue b/packages/nc-gui/components/virtual-cell/Link.vue
index be521cddad..2f1d7e3253 100644
--- a/packages/nc-gui/components/virtual-cell/Link.vue
+++ b/packages/nc-gui/components/virtual-cell/Link.vue
@@ -2,7 +2,7 @@
 import { computed } from '@vue/reactivity'
 import type { ColumnType } from 'nocodb-sdk'
 import type { Ref } from 'vue'
-import { CellValueInj, inject } from '#imports'
+import { CellValueInj, ColumnInj, inject } from '#imports'
 
 const value = inject(CellValueInj)
 
@@ -14,6 +14,8 @@ const relColumn = computed(() => {
   return meta.value.columns.find((c: ColumnType) => c.id === column.value?.colOptions?.fk_relation_column_id)
 })
 
+provide(ColumnInj, relColumn)
+
 const cellValue = inject(CellValueInj)!
 
 const row = inject(RowInj)!
@@ -34,9 +36,9 @@ const childListDlg = ref(false)
 
 const { isUIAllowed } = useUIPermission()
 
-const { state, isNew, removeLTARRef } = useSmartsheetRowStoreOrThrow()
+const { state, isNew } = useSmartsheetRowStoreOrThrow()
 
-const { relatedTableMeta, loadRelatedTableMeta, relatedTableDisplayValueProp, unlink } = useProvideLTARStore(
+const { relatedTableMeta, loadRelatedTableMeta, relatedTableDisplayValueProp } = useProvideLTARStore(
   relColumn as Ref<Required<ColumnType>>,
   row,
   isNew,
@@ -68,8 +70,7 @@ const onAttachRecord = () => {
 <template>
   <div class="flex w-full items-center">
     <template v-if="!isForm">
-      <a @click.stop.prevent="childListDlg = true" class="text-center pl-3 flex-grow block"
-         :class="{'!text-gray-300': !value}">
+      <a class="text-center pl-3 flex-grow block" :class="{ '!text-gray-300': !value }" @click.stop.prevent="childListDlg = true">
         {{ textVal }}
       </a>
 

From 8e364b83d6005c79d9c88d1fa93f2fcafd354c2a Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sun, 11 Jun 2023 14:26:22 +0530
Subject: [PATCH 019/208] refactor: on connecting exteranl db create Links

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/helpers/populateMeta.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/helpers/populateMeta.ts b/packages/nocodb/src/helpers/populateMeta.ts
index 9e90114430..6e84659c59 100644
--- a/packages/nocodb/src/helpers/populateMeta.ts
+++ b/packages/nocodb/src/helpers/populateMeta.ts
@@ -1,5 +1,6 @@
 import { ModelTypes, UITypes, ViewTypes } from 'nocodb-sdk';
 import { isVirtualCol, RelationTypes } from 'nocodb-sdk';
+import { pluralize, singularize } from 'inflection';
 import { GridViewColumn } from '../models';
 import Column from '../models/Column';
 import Model from '../models/Model';
@@ -465,15 +466,19 @@ export async function populateRollupColumnAndHideLTAR(
         relatedModel.primaryKey?.id || (await relatedModel.getColumns())[0]?.id;
 
       await Column.insert<RollupColumn>({
-        uidt: 'Rollup',
+        uidt: UITypes.Links,
         title: getUniqueColumnAliasName(
           await model.getColumns(),
-          `${relatedModel.title} Count`,
+          `${relatedModel.title}`,
         ),
         fk_rollup_column_id: pkId,
         fk_model_id: model.id,
         rollup_function: 'count',
         fk_relation_column_id: column.id,
+        meta: {
+          singular: singularize(relatedModel.title),
+          plural: pluralize(relatedModel.title),
+        },
       });
 
       const viewCol = await GridViewColumn.list(views[0].id).then((cols) =>

From 0f5197b8b6db64e05eb31a7c05d777eff77f58ea Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 13 Jun 2023 11:46:45 +0530
Subject: [PATCH 020/208] fix: avoid duplicate Links options in add column menu

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

diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index 049b5c3952..b1c90106c6 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -213,7 +213,7 @@ useEventListener('keydown', (e: KeyboardEvent) => {
           v-model:value="formState"
         />
         <LazySmartsheetColumnLinkOptions
-          v-if="formState.uidt === UITypes.Links"
+          v-if="isEdit && formState.uidt === UITypes.Links"
           v-model:value="formState"
         />
         <LazySmartsheetColumnSpecificDBTypeOptions v-if="formState.uidt === UITypes.SpecificDBType" />

From f0f70c250e924d0d65a2294e9efdb31811d60b25 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 13 Jun 2023 12:49:15 +0530
Subject: [PATCH 021/208] fix: hm relation creation

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/services/columns.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index 489c66d4cd..20b04f2c5d 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -1668,8 +1668,8 @@ export class ColumnsService {
         (param.column as LinkToAnotherColumnReqType).title,
         foreignKeyName,
         (param.column as LinkToAnotherColumnReqType).virtual,
-        param.column['meta'],
         null,
+        param.column['meta'],
         isLinks,
       );
     } else if ((param.column as LinkToAnotherColumnReqType).type === 'mm') {

From 53a79074b6a4e08a38f83694c79cd12121e748e5 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 13 Jun 2023 12:50:41 +0530
Subject: [PATCH 022/208] refactor: rename Link to Links

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/smartsheet/VirtualCell.vue           | 2 +-
 packages/nc-gui/components/virtual-cell/{Link.vue => Links.vue} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/nc-gui/components/virtual-cell/{Link.vue => Links.vue} (100%)

diff --git a/packages/nc-gui/components/smartsheet/VirtualCell.vue b/packages/nc-gui/components/smartsheet/VirtualCell.vue
index b6e535cd41..90d4e84f3f 100644
--- a/packages/nc-gui/components/smartsheet/VirtualCell.vue
+++ b/packages/nc-gui/components/smartsheet/VirtualCell.vue
@@ -100,7 +100,7 @@ onUnmounted(() => {
       <LazyVirtualCellManyToMany v-else-if="isMm(column)" />
       <LazyVirtualCellBelongsTo v-else-if="isBt(column)" />
       <LazyVirtualCellRollup v-else-if="isRollup(column)" />
-      <LazyVirtualCellLink v-else-if="isLink(column)" />
+      <LazyVirtualCellLinks v-else-if="isLink(column)" />
       <LazyVirtualCellFormula v-else-if="isFormula(column)" />
       <LazyVirtualCellQrCode v-else-if="isQrCode(column)" />
       <LazyVirtualCellBarcode v-else-if="isBarcode(column)" />
diff --git a/packages/nc-gui/components/virtual-cell/Link.vue b/packages/nc-gui/components/virtual-cell/Links.vue
similarity index 100%
rename from packages/nc-gui/components/virtual-cell/Link.vue
rename to packages/nc-gui/components/virtual-cell/Links.vue

From ec5dc21d91bd42248040b3c704e8b30af8ba26b5 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 13 Jun 2023 12:52:31 +0530
Subject: [PATCH 023/208] fix: open child list only when clicking the text

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/virtual-cell/Links.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index 2f1d7e3253..2c32d494e5 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -70,9 +70,11 @@ const onAttachRecord = () => {
 <template>
   <div class="flex w-full items-center">
     <template v-if="!isForm">
-      <a class="text-center pl-3 flex-grow block" :class="{ '!text-gray-300': !value }" @click.stop.prevent="childListDlg = true">
-        {{ textVal }}
-      </a>
+      <div class="flex-grow block">
+        <a class="text-center pl-3" :class="{ '!text-gray-300': !value }" @click.stop.prevent="childListDlg = true">
+          {{ textVal }}
+        </a>
+      </div>
 
       <div v-if="!isLocked && !isUnderLookup" class="flex justify-end gap-1 min-h-[30px] items-center">
         <GeneralIcon

From 319adf550678cf2a43035e7a7ce3cd2119d6de72 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 13 Jun 2023 13:24:51 +0530
Subject: [PATCH 024/208] fix(gui): reset add column preload data on column
 creation or cancel

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

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 3673c818a3..9491506a06 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -847,6 +847,7 @@ eventBus.on(async (event, payload) => {
 const closeAddColumnDropdown = (scrollToLastCol = false) => {
   columnOrder.value = null
   addColumnDropdown.value = false
+  preloadColumn.value = {}
   if (scrollToLastCol) {
     setTimeout(() => {
       const lastAddNewRowHeader = tableHeadEl.value?.querySelector('th:last-child')

From 8e6e82fb471c01cb1d065f828db4699d425936e9 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 13 Jun 2023 14:37:05 +0530
Subject: [PATCH 025/208] fix: treat Links column as Rollup in case sort,
 filter and formula

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/db/conditionV2.ts                     | 4 +++-
 packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts | 2 ++
 packages/nocodb/src/db/sortV2.ts                          | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/db/conditionV2.ts b/packages/nocodb/src/db/conditionV2.ts
index 4234c91a08..b25bc81a93 100644
--- a/packages/nocodb/src/db/conditionV2.ts
+++ b/packages/nocodb/src/db/conditionV2.ts
@@ -275,7 +275,7 @@ const parseConditionV2 = async (
       return (_qb) => {};
     } else if (column.uidt === UITypes.Lookup) {
       return await generateLookupCondition(column, filter, knex, aliasCount);
-    } else if (column.uidt === UITypes.Rollup && !customWhereClause) {
+    } else if ([UITypes.Rollup,UITypes.Links].includes(column.uidt ) && !customWhereClause) {
       const builder = (
         await genRollupSelectv2({
           knex,
@@ -416,6 +416,7 @@ const parseConditionV2 = async (
                   UITypes.Decimal,
                   UITypes.Rating,
                   UITypes.Rollup,
+                  UITypes.Links,
                 ].includes(column.uidt)
               ) {
                 qb = qb.where(field, val);
@@ -442,6 +443,7 @@ const parseConditionV2 = async (
                   UITypes.Number,
                   UITypes.Decimal,
                   UITypes.Rollup,
+                  UITypes.Links,
                 ].includes(column.uidt)
               ) {
                 qb = qb.where((nestedQb) => {
diff --git a/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts b/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts
index ab03115106..a7f58afa0f 100644
--- a/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts
+++ b/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts
@@ -229,6 +229,7 @@ async function _formulaQueryBuilder(
             }
 
             switch (lookupColumn.uidt) {
+              case UITypes.Links:
               case UITypes.Rollup:
                 {
                   const builder = (
@@ -415,6 +416,7 @@ async function _formulaQueryBuilder(
         };
         break;
       case UITypes.Rollup:
+      case UITypes.Links:
         aliasToColumn[col.id] = async (): Promise<any> => {
           const qb = await genRollupSelectv2({
             knex,
diff --git a/packages/nocodb/src/db/sortV2.ts b/packages/nocodb/src/db/sortV2.ts
index 7a98ed9983..651b817296 100644
--- a/packages/nocodb/src/db/sortV2.ts
+++ b/packages/nocodb/src/db/sortV2.ts
@@ -36,6 +36,7 @@ export default async function sortV2(
 
     switch (column.uidt) {
       case UITypes.Rollup:
+      case UITypes.Links:
         {
           const builder = (
             await genRollupSelectv2({
@@ -121,6 +122,7 @@ export default async function sortV2(
             }
 
             switch (lookupColumn.uidt) {
+              case UITypes.Links:
               case UITypes.Rollup:
                 {
                   const builder = (

From 50688685e6e25fe39c9a313392a87d9beb781b06 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 13 Jun 2023 16:29:14 +0530
Subject: [PATCH 026/208] refactor(gui): update default fallback text

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

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index 2c32d494e5..d477b53b94 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -55,9 +55,9 @@ const textVal = computed(() => {
   if (!value.value) {
     return 'Empty'
   } else if (value.value === 1) {
-    return `1 ${column.value?.meta?.singular || 'Item'}`
+    return `1 ${column.value?.meta?.singular || 'Link'}`
   } else {
-    return `${value.value} ${column.value?.meta?.plural || 'Items'}`
+    return `${value.value} ${column.value?.meta?.plural || 'Links'}`
   }
 })
 

From 4127ff96332d80353372e3c655a8c3812fbf6b18 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 13 Jun 2023 17:57:09 +0530
Subject: [PATCH 027/208] refactor(gui): remove pk value from list item and
 reduce item height

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../virtual-cell/components/ListChildItems.vue       |  9 +++++++--
 .../components/virtual-cell/components/ListItems.vue | 12 ++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
index da00e1b780..5e77293d23 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
@@ -143,13 +143,13 @@ const onClick = (row: Row) => {
           <a-card
             v-for="(row, i) of childrenList?.list ?? state?.[colTitle] ?? []"
             :key="i"
-            class="!my-4 hover:(!bg-gray-200/50 shadow-md)"
+            class="nc-nested-list-item !my-4 hover:(!bg-gray-200/50 shadow-md)"
             @click="onClick(row)"
           >
             <div class="flex items-center">
               <div class="flex-1 overflow-hidden min-w-0">
                 <VirtualCellComponentsItemChip :value="row[relatedTableDisplayValueProp]" :column="props.column" />
-                <span class="text-gray-400 text-[11px] ml-1">(Primary key : {{ getRelatedTableRowId(row) }})</span>
+<!--                <span class="text-gray-400 text-[11px] ml-1">(Primary key : {{ getRelatedTableRowId(row) }})</span>-->
               </div>
 
               <div v-if="!readonly" class="flex gap-2">
@@ -208,4 +208,9 @@ const onClick = (row: Row) => {
 :deep(.ant-pagination-item a) {
   line-height: 21px !important;
 }
+
+
+:deep(.nc-nested-list-item .ant-card-body){
+  @apply !p-2
+}
 </style>
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItems.vue b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
index 30a9589c78..5f4b37e021 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
@@ -225,7 +225,7 @@ watch(vModel, (nextVal) => {
             v-for="(refRow, i) in childrenExcludedList?.list ?? []"
             :key="i"
             :ref="selectedRowIndex === i ? activeRow : null"
-            class="!my-4 cursor-pointer hover:(!bg-gray-200/50 shadow-md) group"
+            class="nc-nested-list-item !my-4 cursor-pointer hover:(!bg-gray-200/50 shadow-md) group"
             :class="{ 'nc-selected-row': selectedRowIndex === i }"
             @click="linkRow(refRow)"
           >
@@ -234,9 +234,9 @@ watch(vModel, (nextVal) => {
               :column="props.column"
               :show-unlink-button="false"
             />
-            <span class="hidden group-hover:(inline) text-gray-400 text-[11px] ml-1">
-              ({{ $t('labels.primaryKey') }} : {{ getRelatedTableRowId(refRow) }})
-            </span>
+<!--            <span class="hidden group-hover:(inline) text-gray-400 text-[11px] ml-1">-->
+<!--              ({{ $t('labels.primaryKey') }} : {{ getRelatedTableRowId(refRow) }})-->
+<!--            </span>-->
           </a-card>
         </div>
 
@@ -281,4 +281,8 @@ watch(vModel, (nextVal) => {
 :deep(.nc-selected-row) {
   @apply !ring;
 }
+
+:deep(.nc-nested-list-item .ant-card-body){
+  @apply !p-2
+}
 </style>

From 0fcc5762a883eb985f25a990df9c975d3a81185e Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 14 Jun 2023 14:20:35 +0530
Subject: [PATCH 028/208] refactor: make Links as an extended version of LTAR

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/db/genRollupSelectv2.ts   |  3 +-
 packages/nocodb/src/helpers/columnHelpers.ts  | 14 +++----
 packages/nocodb/src/models/Column.ts          |  7 +++-
 .../src/models/LinkToAnotherRecordColumn.ts   |  5 +--
 packages/nocodb/src/models/LinksColumn.ts     | 39 +++++++++++++++++++
 packages/nocodb/src/models/index.ts           |  1 +
 .../nocodb/src/services/columns.service.ts    | 30 +++++++-------
 7 files changed, 70 insertions(+), 29 deletions(-)
 create mode 100644 packages/nocodb/src/models/LinksColumn.ts

diff --git a/packages/nocodb/src/db/genRollupSelectv2.ts b/packages/nocodb/src/db/genRollupSelectv2.ts
index 979b7dfd08..d39ff51fc8 100644
--- a/packages/nocodb/src/db/genRollupSelectv2.ts
+++ b/packages/nocodb/src/db/genRollupSelectv2.ts
@@ -1,4 +1,5 @@
 import { RelationTypes } from 'nocodb-sdk';
+import { LinksColumn } from '../models'
 import type { RollupColumn } from '../models';
 import type { XKnex } from '../db/CustomKnex';
 import type { LinkToAnotherRecordColumn } from '../models';
@@ -13,7 +14,7 @@ export default async function ({
 }: {
   knex: XKnex;
   alias?: string;
-  columnOptions: RollupColumn;
+  columnOptions: RollupColumn | LinksColumn;
 }): Promise<{ builder: Knex.QueryBuilder | any }> {
   const relationColumn = await columnOptions.getRelationColumn();
   const relationColumnOption: LinkToAnotherRecordColumn =
diff --git a/packages/nocodb/src/helpers/columnHelpers.ts b/packages/nocodb/src/helpers/columnHelpers.ts
index 77f42d23f1..159d79b8c2 100644
--- a/packages/nocodb/src/helpers/columnHelpers.ts
+++ b/packages/nocodb/src/helpers/columnHelpers.ts
@@ -69,7 +69,7 @@ export async function createHmAndBtColumn(
     const col = await Column.insert({
       title,
       fk_model_id: parent.id,
-      uidt: UITypes.LinkToAnotherRecord,
+      uidt: isLinks ? UITypes.Links : UITypes.LinkToAnotherRecord,
       type: 'hm',
       fk_child_column_id: childColumn.id,
       fk_parent_column_id: parent.primaryKey.id,
@@ -80,12 +80,12 @@ export async function createHmAndBtColumn(
       fk_index_name: fkColName,
     });
 
-    if (!isSystemCol && isLinks)
-      await populateRollupForLTAR({
-        column: col,
-        columnMeta,
-        alias
-      });
+    // if (!isSystemCol && isLinks)
+    //   await populateRollupForLTAR({
+    //     column: col,
+    //     columnMeta,
+    //     alias
+    //   });
   }
 }
 
diff --git a/packages/nocodb/src/models/Column.ts b/packages/nocodb/src/models/Column.ts
index 026a03f1f6..088727ce66 100644
--- a/packages/nocodb/src/models/Column.ts
+++ b/packages/nocodb/src/models/Column.ts
@@ -12,6 +12,7 @@ import { NcError } from '../helpers/catchError';
 import { extractProps } from '../helpers/extractProps';
 import { stringifyMetaProp } from '../utils/modelUtils';
 import FormulaColumn from './FormulaColumn';
+import { LinksColumn } from './index'
 import LinkToAnotherRecordColumn from './LinkToAnotherRecordColumn';
 import LookupColumn from './LookupColumn';
 import RollupColumn from './RollupColumn';
@@ -194,7 +195,6 @@ export default class Column<T = any> implements ColumnType {
         );
         break;
       }
-      case UITypes.Links:
       case UITypes.Rollup: {
         await RollupColumn.insert(
           {
@@ -208,6 +208,7 @@ export default class Column<T = any> implements ColumnType {
         );
         break;
       }
+      case UITypes.Links:
       case UITypes.LinkToAnotherRecord: {
         await LinkToAnotherRecordColumn.insert(
           {
@@ -419,12 +420,14 @@ export default class Column<T = any> implements ColumnType {
         res = await LookupColumn.read(this.id, ncMeta);
         break;
       case UITypes.Rollup:
-      case UITypes.Links:
         res = await RollupColumn.read(this.id, ncMeta);
         break;
       case UITypes.LinkToAnotherRecord:
         res = await LinkToAnotherRecordColumn.read(this.id, ncMeta);
         break;
+      case UITypes.Links:
+        res = await LinksColumn.read(this.id, ncMeta);
+        break;
       case UITypes.MultiSelect:
         res = await SelectOption.read(this.id, ncMeta);
         break;
diff --git a/packages/nocodb/src/models/LinkToAnotherRecordColumn.ts b/packages/nocodb/src/models/LinkToAnotherRecordColumn.ts
index 934781c7cd..e75ffc241b 100644
--- a/packages/nocodb/src/models/LinkToAnotherRecordColumn.ts
+++ b/packages/nocodb/src/models/LinkToAnotherRecordColumn.ts
@@ -7,7 +7,8 @@ import Column from './Column';
 import type { BoolType } from 'nocodb-sdk';
 
 export default class LinkToAnotherRecordColumn {
-  fk_column_id?: string;
+  id: string;
+  fk_column_id: string;
   fk_child_column_id?: string;
   fk_parent_column_id?: string;
   fk_mm_model_id?: string;
@@ -126,6 +127,4 @@ export default class LinkToAnotherRecordColumn {
     }
     return colData ? new LinkToAnotherRecordColumn(colData) : null;
   }
-
-  id: string;
 }
diff --git a/packages/nocodb/src/models/LinksColumn.ts b/packages/nocodb/src/models/LinksColumn.ts
new file mode 100644
index 0000000000..7e681c0b5d
--- /dev/null
+++ b/packages/nocodb/src/models/LinksColumn.ts
@@ -0,0 +1,39 @@
+import Noco from '../Noco';
+import { Column, LinkToAnotherRecordColumn } from './';
+import type { RollupColumn } from './';
+
+export default class LinksColumn
+  extends LinkToAnotherRecordColumn
+  implements RollupColumn
+{
+  rollup_function = 'count' as RollupColumn['rollup_function'];
+
+  get fk_relation_column_id() {
+    return this.fk_column_id;
+  }
+  get fk_rollup_column_id() {
+    if (this.type === 'hm') {
+      return this.fk_child_column_id;
+    } else if (this.type === 'mm') {
+      return this.fk_parent_column_id;
+    }
+  }
+
+  async getRelationColumn(ncMeta = Noco.ncMeta): Promise<Column> {
+    return await Column.get({ colId: this.fk_column_id }, ncMeta);
+  }
+
+  async getRollupColumn(ncMeta = Noco.ncMeta): Promise<Column> {
+    return await Column.get({ colId: this.fk_rollup_column_id }, ncMeta);
+  }
+
+  public static async read(columnId: string, ncMeta = Noco.ncMeta) {
+    const colData = await super.read(columnId, ncMeta);
+    return colData && new LinksColumn(colData);
+  }
+
+  public static async insert(data: Partial<LinksColumn>, ncMeta = Noco.ncMeta) {
+    const colData = await super.insert(data, ncMeta);
+    return colData && new LinksColumn(colData);
+  }
+}
diff --git a/packages/nocodb/src/models/index.ts b/packages/nocodb/src/models/index.ts
index 534c8ce025..fbbdba8333 100644
--- a/packages/nocodb/src/models/index.ts
+++ b/packages/nocodb/src/models/index.ts
@@ -34,3 +34,4 @@ export { default as SyncLogs } from './SyncLogs';
 export { default as SyncSource } from './SyncSource';
 export { default as User } from './User';
 export { default as View } from './View';
+export { default as LinksColumn } from './LinksColumn';
diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index 20b04f2c5d..52536fdf8f 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -1793,7 +1793,7 @@ export class ColumnsService {
           await child.getColumns(),
           `${parent.title} List`,
         ),
-        uidt: UITypes.LinkToAnotherRecord,
+        uidt: isLinks ? UITypes.Links : UITypes.LinkToAnotherRecord,
         type: 'mm',
 
         // ref_db_alias
@@ -1812,12 +1812,10 @@ export class ColumnsService {
       const col2 = await Column.insert({
         title: getUniqueColumnAliasName(
           await parent.getColumns(),
-          isLinks
-            ? `${param.column.title} List`
-            : param.column.title ?? `${child.title} List`,
+           param.column.title ?? `${child.title} List`,
         ),
 
-        uidt: UITypes.LinkToAnotherRecord,
+        uidt: isLinks ? UITypes.Links : UITypes.LinkToAnotherRecord,
         type: 'mm',
 
         fk_model_id: parent.id,
@@ -1832,17 +1830,17 @@ export class ColumnsService {
         virtual: (param.column as LinkToAnotherColumnReqType).virtual,
       });
 
-      if (isLinks) {
-        await populateRollupForLTAR({
-          column: col1,
-          // columnMeta: param.column['meta'],
-        });
-        await populateRollupForLTAR({
-          column: col2,
-          columnMeta: param.column['meta'],
-          alias: param.column.title,
-        });
-      }
+      // if (isLinks) {
+      //   await populateRollupForLTAR({
+      //     column: col1,
+      //     // columnMeta: param.column['meta'],
+      //   });
+      //   await populateRollupForLTAR({
+      //     column: col2,
+      //     columnMeta: param.column['meta'],
+      //     alias: param.column.title,
+      //   });
+      // }
 
       // todo: create index for virtual relations as well
       // create index for foreign key in pg

From fb8d8f1715480eb2503b2172de08a7c25c6b6bdf Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 14 Jun 2023 14:47:00 +0530
Subject: [PATCH 029/208] fix: nested - unlink/link/list api corrections

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/db/BaseModelSqlv2.ts                  | 4 ++--
 packages/nocodb/src/services/data-alias-nested.service.ts | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index 26ec38a774..146cf42966 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -3020,7 +3020,7 @@ class BaseModelSqlv2 {
     const columns = await this.model.getColumns();
     const column = columns.find((c) => c.id === colId);
 
-    if (!column || column.uidt !== UITypes.LinkToAnotherRecord)
+    if (!column || ![UITypes.LinkToAnotherRecord, UITypes.Links].includes(column.uidt))
       NcError.notFound('Column not found');
 
     const colOptions = await column.getColOptions<LinkToAnotherRecordColumn>();
@@ -3139,7 +3139,7 @@ class BaseModelSqlv2 {
     const columns = await this.model.getColumns();
     const column = columns.find((c) => c.id === colId);
 
-    if (!column || column.uidt !== UITypes.LinkToAnotherRecord)
+    if (!column || ![UITypes.LinkToAnotherRecord, UITypes.Links].includes(column.uidt))
       NcError.notFound('Column not found');
 
     const colOptions = await column.getColOptions<LinkToAnotherRecordColumn>();
diff --git a/packages/nocodb/src/services/data-alias-nested.service.ts b/packages/nocodb/src/services/data-alias-nested.service.ts
index c027c02084..1c9f4eb1fe 100644
--- a/packages/nocodb/src/services/data-alias-nested.service.ts
+++ b/packages/nocodb/src/services/data-alias-nested.service.ts
@@ -34,7 +34,10 @@ export class DataAliasNestedService {
 
     const column = await getColumnByIdOrName(param.columnName, model);
 
-    if (column.uidt !== UITypes.LinkToAnotherRecord)
+    if (
+      !column ||
+      ![UITypes.LinkToAnotherRecord, UITypes.Links].includes(column.uidt)
+    )
       NcError.badRequest('Column is not LTAR');
 
     const data = await baseModel.mmList(

From b5d8574199eccfcc5cd85fcc688ba88192b28434 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 14 Jun 2023 14:47:42 +0530
Subject: [PATCH 030/208] fix(gui): remove unnecessary codes

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/virtual-cell/Links.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index d477b53b94..fee954d0ee 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -10,12 +10,6 @@ const column = inject(ColumnInj)!
 
 const meta = inject(MetaInj, ref())
 
-const relColumn = computed(() => {
-  return meta.value.columns.find((c: ColumnType) => c.id === column.value?.colOptions?.fk_relation_column_id)
-})
-
-provide(ColumnInj, relColumn)
-
 const cellValue = inject(CellValueInj)!
 
 const row = inject(RowInj)!
@@ -39,7 +33,7 @@ const { isUIAllowed } = useUIPermission()
 const { state, isNew } = useSmartsheetRowStoreOrThrow()
 
 const { relatedTableMeta, loadRelatedTableMeta, relatedTableDisplayValueProp } = useProvideLTARStore(
-  relColumn as Ref<Required<ColumnType>>,
+  column as Ref<Required<ColumnType>>,
   row,
   isNew,
   reloadRowTrigger.trigger,

From a03c4608f6cd698ce78b95ce55d75f2e912311da Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 14 Jun 2023 15:03:38 +0530
Subject: [PATCH 031/208] fix: hmList api correction

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/services/data-alias-nested.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nocodb/src/services/data-alias-nested.service.ts b/packages/nocodb/src/services/data-alias-nested.service.ts
index 1c9f4eb1fe..86108b7613 100644
--- a/packages/nocodb/src/services/data-alias-nested.service.ts
+++ b/packages/nocodb/src/services/data-alias-nested.service.ts
@@ -206,7 +206,7 @@ export class DataAliasNestedService {
 
     const column = await getColumnByIdOrName(param.columnName, model);
 
-    if (column.uidt !== UITypes.LinkToAnotherRecord)
+    if (![UITypes.LinkToAnotherRecord, UITypes.Links].includes(column.uidt))
       NcError.badRequest('Column is not LTAR');
 
     const data = await baseModel.hmList(

From 087572944622ad6dc563887674e1a47619ca1dbe Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 14 Jun 2023 15:58:05 +0530
Subject: [PATCH 032/208] fix: column delete logic correction

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/services/columns.service.ts | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index 52536fdf8f..84f4fb2f28 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -1186,15 +1186,8 @@ export class ColumnsService {
       case UITypes.Formula:
         await Column.delete(param.columnId, ncMeta);
         break;
-      // When deleting a link column, we need to delete the relation column
-      // while deleting the LTAR column, links column will be deleted automatically
+      // Since Links is just an extended version of LTAR, we can use the same logic
       case UITypes.Links:
-        return await column.getColOptions<RollupColumn>().then((colOpt) =>
-          this.columnDelete({
-            ...param,
-            columnId: colOpt.fk_relation_column_id,
-          }),
-        );
       case UITypes.LinkToAnotherRecord:
         {
           const relationColOpt =

From 332a92ddd9cf30bb2eb22a426a240a60f1a2b59d Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 14 Jun 2023 17:43:42 +0530
Subject: [PATCH 033/208] refactor: apply all LTAR behaviour to Links

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/erd/TableNode.vue         |  4 ++--
 packages/nc-gui/components/erd/View.vue              |  6 ++----
 packages/nc-gui/components/erd/utils.ts              |  5 ++---
 packages/nc-gui/components/smartsheet/Form.vue       | 10 +++-------
 packages/nc-gui/components/smartsheet/Grid.vue       | 12 +++---------
 .../nc-gui/components/smartsheet/VirtualCell.vue     |  2 +-
 .../components/smartsheet/column/EditOrAdd.vue       |  7 ++-----
 .../components/smartsheet/column/LookupOptions.vue   |  4 ++--
 .../components/smartsheet/column/RollupOptions.vue   |  9 +++------
 .../components/smartsheet/expanded-form/index.vue    |  4 ++--
 .../nc-gui/components/smartsheet/header/Menu.vue     |  7 ++++---
 .../components/smartsheet/header/VirtualCellIcon.ts  |  1 +
 .../toolbar/FieldListAutoCompleteDropdown.vue        |  6 ++----
 packages/nc-gui/components/tabs/Smartsheet.vue       |  4 ++--
 .../virtual-cell/components/ListChildItems.vue       |  7 +++----
 .../components/virtual-cell/components/ListItems.vue | 10 +++++-----
 packages/nc-gui/composables/useColumnCreateStore.ts  |  4 ++--
 .../nc-gui/composables/useSharedFormViewStore.ts     |  6 +++---
 packages/nc-gui/composables/useSmartsheetRowStore.ts |  6 +++---
 packages/nc-gui/composables/useTable.ts              |  4 ++--
 packages/nocodb-sdk/src/index.ts                     |  1 +
 packages/nocodb-sdk/src/lib/UITypes.ts               |  8 ++++++++
 22 files changed, 58 insertions(+), 69 deletions(-)

diff --git a/packages/nc-gui/components/erd/TableNode.vue b/packages/nc-gui/components/erd/TableNode.vue
index 68f2c7d287..93e7c65d4d 100644
--- a/packages/nc-gui/components/erd/TableNode.vue
+++ b/packages/nc-gui/components/erd/TableNode.vue
@@ -2,7 +2,7 @@
 import type { NodeProps } from '@vue-flow/core'
 import { Handle, Position, useVueFlow } from '@vue-flow/core'
 import type { LinkToAnotherRecordType } from 'nocodb-sdk'
-import { UITypes, isVirtualCol } from 'nocodb-sdk'
+import { isLinksOrLTAR, isVirtualCol } from 'nocodb-sdk'
 import type { NodeData } from './utils'
 import { MetaInj, computed, provide, refAutoReset, toRef, useNuxtApp, watch } from '#imports'
 
@@ -86,7 +86,7 @@ watch(
             :class="index + 1 === data.nonPkColumns.length ? 'rounded-b-lg' : 'border-b-1'"
           >
             <div
-              v-if="col.uidt === UITypes.LinkToAnotherRecord"
+              v-if="isLinksOrLTAR(col)"
               class="flex w-full"
               :class="`nc-erd-table-node-${table.table_name}-column-${col.title?.toLowerCase().replace(' ', '_')}`"
             >
diff --git a/packages/nc-gui/components/erd/View.vue b/packages/nc-gui/components/erd/View.vue
index 2870b87a86..e38dd47020 100644
--- a/packages/nc-gui/components/erd/View.vue
+++ b/packages/nc-gui/components/erd/View.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes } from 'nocodb-sdk'
+import { UITypes, isLinksOrLTAR } from 'nocodb-sdk'
 import type { ERDConfig } from './utils'
 import { reactive, ref, storeToRefs, useMetas, useProject, watch } from '#imports'
 
@@ -42,9 +42,7 @@ const populateTables = async () => {
       (t) =>
         t.id === props.table?.id ||
         props.table?.columns?.find(
-          (column) =>
-            column.uidt === UITypes.LinkToAnotherRecord &&
-            (column.colOptions as LinkToAnotherRecordType)?.fk_related_model_id === t.id,
+          (column) => isLinksOrLTAR(column.uidt) && (column.colOptions as LinkToAnotherRecordType)?.fk_related_model_id === t.id,
         ),
     )
   } else {
diff --git a/packages/nc-gui/components/erd/utils.ts b/packages/nc-gui/components/erd/utils.ts
index a7cdb2ab2b..1a39e32a25 100644
--- a/packages/nc-gui/components/erd/utils.ts
+++ b/packages/nc-gui/components/erd/utils.ts
@@ -1,5 +1,5 @@
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes } from 'nocodb-sdk'
+import { UITypes, isLinksOrLTAR } from 'nocodb-sdk'
 import dagre from 'dagre'
 import type { Edge, EdgeMarker, Elements, Node } from '@vue-flow/core'
 import type { MaybeRef } from '@vueuse/core'
@@ -73,8 +73,7 @@ export function useErdElements(tables: MaybeRef<TableType[]>, props: MaybeRef<ER
   const relations = computed(() =>
     erdTables.value.reduce((acc, table) => {
       const meta = metasWithIdAsKey.value[table.id!]
-      const columns =
-        meta.columns?.filter((column: ColumnType) => column.uidt === UITypes.LinkToAnotherRecord && column.system !== 1) || []
+      const columns = meta.columns?.filter((column: ColumnType) => isLinksOrLTAR(column) && column.system !== 1) || []
 
       columns.forEach((column: ColumnType) => {
         const colOptions = column.colOptions as LinkToAnotherRecordType
diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 40c7402603..83af541560 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import Draggable from 'vuedraggable'
-import { RelationTypes, UITypes, ViewTypes, getSystemColumns, isVirtualCol } from 'nocodb-sdk'
+import { RelationTypes, UITypes, ViewTypes, getSystemColumns, isLinksOrLTAR, isVirtualCol } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   IsFormInj,
@@ -148,7 +148,7 @@ function isDbRequired(column: Record<string, any>) {
       // confirm it's not foreign key
       !columns.value.some(
         (c: Record<string, any>) =>
-          c.uidt === UITypes.LinkToAnotherRecord &&
+          isLinksOrLTAR(c.uidt) &&
           c?.colOptions?.type === RelationTypes.BELONGS_TO &&
           column.fk_column_id === c.colOptions.fk_child_column_id,
       )) ||
@@ -297,11 +297,7 @@ function setFormData() {
 
 function isRequired(_columnObj: Record<string, any>, required = false) {
   let columnObj = _columnObj
-  if (
-    columnObj.uidt === UITypes.LinkToAnotherRecord &&
-    columnObj.colOptions &&
-    columnObj.colOptions.type === RelationTypes.BELONGS_TO
-  ) {
+  if (isLinksOrLTAR(columnObj.uidt) && columnObj.colOptions && columnObj.colOptions.type === RelationTypes.BELONGS_TO) {
     columnObj = columns.value.find((c: Record<string, any>) => c.id === columnObj.colOptions.fk_child_column_id) as Record<
       string,
       any
diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 9491506a06..fc2fff9c84 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { nextTick } from '@vue/runtime-core'
 import type { ColumnReqType, ColumnType, GridType, PaginatedType, TableType, ViewType } from 'nocodb-sdk'
-import { UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { UITypes, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   CellUrlDisableOverlayInj,
@@ -491,12 +491,7 @@ watch(contextMenu, () => {
 const rowRefs = $ref<any[]>()
 
 async function clearCell(ctx: { row: number; col: number } | null, skipUpdate = false) {
-  if (
-    !ctx ||
-    !hasEditPermission ||
-    (fields.value[ctx.col].uidt !== UITypes.LinkToAnotherRecord && isVirtualCol(fields.value[ctx.col]))
-  )
-    return
+  if (!ctx || !hasEditPermission || (isLinksOrLTAR(fields.value[ctx.col]) && isVirtualCol(fields.value[ctx.col]))) return
 
   const rowObj = data.value[ctx.row]
   const columnObj = fields.value[ctx.col]
@@ -1133,8 +1128,7 @@ function addEmptyRow(row?: number) {
               v-if="
                 contextMenuTarget &&
                 selectedRange.isSingleCell() &&
-                (fields[contextMenuTarget.col].uidt === UITypes.LinkToAnotherRecord ||
-                  !isVirtualCol(fields[contextMenuTarget.col]))
+                (isLinksOrLTAR(fields[contextMenuTarget.col]) || !isVirtualCol(fields[contextMenuTarget.col]))
               "
               @click="clearCell(contextMenuTarget)"
             >
diff --git a/packages/nc-gui/components/smartsheet/VirtualCell.vue b/packages/nc-gui/components/smartsheet/VirtualCell.vue
index 90d4e84f3f..313f8ac3b3 100644
--- a/packages/nc-gui/components/smartsheet/VirtualCell.vue
+++ b/packages/nc-gui/components/smartsheet/VirtualCell.vue
@@ -14,11 +14,11 @@ import {
   isCount,
   isFormula,
   isHm,
+  isLink,
   isLookup,
   isMm,
   isQrCode,
   isRollup,
-  isLink,
   provide,
   toRef,
 } from '#imports'
diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index b1c90106c6..36100f7e4f 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -209,13 +209,10 @@ useEventListener('keydown', (e: KeyboardEvent) => {
         <LazySmartsheetColumnDateTimeOptions v-if="formState.uidt === UITypes.DateTime" v-model:value="formState" />
         <LazySmartsheetColumnRollupOptions v-if="formState.uidt === UITypes.Rollup" v-model:value="formState" />
         <LazySmartsheetColumnLinkedToAnotherRecordOptions
-          v-if="!isEdit && (formState.uidt === UITypes.LinkToAnotherRecord||formState.uidt === UITypes.Links)"
-          v-model:value="formState"
-        />
-        <LazySmartsheetColumnLinkOptions
-          v-if="isEdit && formState.uidt === UITypes.Links"
+          v-if="!isEdit && (formState.uidt === UITypes.LinkToAnotherRecord || formState.uidt === UITypes.Links)"
           v-model:value="formState"
         />
+        <LazySmartsheetColumnLinkOptions v-if="isEdit && formState.uidt === UITypes.Links" v-model:value="formState" />
         <LazySmartsheetColumnSpecificDBTypeOptions v-if="formState.uidt === UITypes.SpecificDBType" />
         <LazySmartsheetColumnSelectOptions
           v-if="formState.uidt === UITypes.SingleSelect || formState.uidt === UITypes.MultiSelect"
diff --git a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
index 3ef7a455b8..b4e0e64ce1 100644
--- a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onMounted } from '@vue/runtime-core'
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes, isSystemColumn } from 'nocodb-sdk'
+import { isLinksOrLTAR, isSystemColumn } from 'nocodb-sdk'
 import { getRelationName } from './utils'
 import { MetaInj, inject, ref, storeToRefs, useColumnCreateStoreOrThrow, useMetas, useProject, useVModel } from '#imports'
 
@@ -35,7 +35,7 @@ const refTables = $computed(() => {
   }
 
   const _refTables = meta.columns
-    .filter((column) => column.uidt === UITypes.LinkToAnotherRecord && !column.system && column.base_id === meta?.base_id)
+    .filter((column) => isLinksOrLTAR(column) && !column.system && column.base_id === meta?.base_id)
     .map((column) => ({
       col: column.colOptions,
       column,
diff --git a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
index 54b24069af..2fe8b4b7fc 100644
--- a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onMounted } from '@vue/runtime-core'
-import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import type { ColumnType, LinkToAnotherRecordType, TableType, UITypes } from 'nocodb-sdk'
+import { isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import { getRelationName } from './utils'
 import { MetaInj, inject, ref, storeToRefs, useColumnCreateStoreOrThrow, useMetas, useProject, useVModel } from '#imports'
 
@@ -50,10 +50,7 @@ const refTables = $computed(() => {
   const _refTables = meta.columns
     .filter(
       (c) =>
-        c.uidt === UITypes.LinkToAnotherRecord &&
-        (c.colOptions as LinkToAnotherRecordType).type !== 'bt' &&
-        !c.system &&
-        c.base_id === meta?.base_id,
+        isLinksOrLTAR(c) && (c.colOptions as LinkToAnotherRecordType).type !== 'bt' && !c.system && c.base_id === meta?.base_id,
     )
     .map((c) => ({
       col: c.colOptions,
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index f03d3eb229..409bfc1f1e 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { TableType, ViewType } from 'nocodb-sdk'
-import { UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import type { Ref } from 'vue'
 import {
   CellClickHookInj,
@@ -324,7 +324,7 @@ export default {
             <div
               v-for="(col, i) of fields"
               v-else
-              v-show="!isVirtualCol(col) || !isNew || col.uidt === UITypes.LinkToAnotherRecord"
+              v-show="!isVirtualCol(col) || !isNew || isLinksOrLTAR(col)"
               :key="col.title"
               class="mt-2 py-2"
               :class="`nc-expand-col-${col.title}`"
diff --git a/packages/nc-gui/components/smartsheet/header/Menu.vue b/packages/nc-gui/components/smartsheet/header/Menu.vue
index 2bd2acc4d2..92f53a01b1 100644
--- a/packages/nc-gui/components/smartsheet/header/Menu.vue
+++ b/packages/nc-gui/components/smartsheet/header/Menu.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { ColumnReqType, LinkToAnotherRecordType } from 'nocodb-sdk'
-import { RelationTypes, UITypes } from 'nocodb-sdk'
+import { RelationTypes, UITypes, isLinksOrLTAR } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   ColumnInj,
@@ -66,7 +66,7 @@ const deleteColumn = () =>
         await getMeta(meta?.value?.id as string, true)
 
         /** force-reload related table meta if deleted column is a LTAR and not linked to same table */
-        if (column?.value?.uidt === UITypes.LinkToAnotherRecord && column.value?.colOptions) {
+        if (isLinksOrLTAR(column?.value) && column.value?.colOptions) {
           await getMeta((column.value?.colOptions as LinkToAnotherRecordType).fk_related_model_id!, true)
 
           // reload tables if deleted column is mm and include m2m is true
@@ -181,6 +181,7 @@ const duplicateColumn = async () => {
   // construct column create payload
   switch (column?.value.uidt) {
     case UITypes.LinkToAnotherRecord:
+    case UITypes.Links:
     case UITypes.Lookup:
     case UITypes.Rollup:
     case UITypes.Formula:
@@ -315,7 +316,7 @@ const hideField = async () => {
             {{ $t('general.edit') }}
           </div>
         </a-menu-item>
-        <template v-if="column.uidt !== UITypes.LinkToAnotherRecord || column.colOptions.type !== RelationTypes.BELONGS_TO">
+        <template v-if="isLinksOrLTAR(column) || column.colOptions.type !== RelationTypes.BELONGS_TO">
           <a-divider class="!my-0" />
           <a-menu-item @click="sortByColumn('asc')">
             <div v-e="['a:field:sort', { dir: 'asc' }]" class="nc-column-insert-after nc-header-menu-item">
diff --git a/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts b/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts
index 0e596d8621..07d62ba081 100644
--- a/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts
+++ b/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts
@@ -22,6 +22,7 @@ import CountIcon from '~icons/mdi/counter'
 const renderIcon = (column: ColumnType, relationColumn?: ColumnType) => {
   switch (column.uidt) {
     case UITypes.LinkToAnotherRecord:
+    case UITypes.Links:
       switch ((column.colOptions as LinkToAnotherRecordType)?.type) {
         case RelationTypes.MANY_TO_MANY:
           return { icon: iconMap.mm, color: 'text-accent' }
diff --git a/packages/nc-gui/components/smartsheet/toolbar/FieldListAutoCompleteDropdown.vue b/packages/nc-gui/components/smartsheet/toolbar/FieldListAutoCompleteDropdown.vue
index c458559249..10a99a212a 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FieldListAutoCompleteDropdown.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FieldListAutoCompleteDropdown.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { SelectProps } from 'ant-design-vue'
 import type { ColumnType, LinkToAnotherRecordType } from 'nocodb-sdk'
-import { RelationTypes, UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { RelationTypes, UITypes, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import { ActiveViewInj, MetaInj, computed, inject, ref, resolveComponent, useViewColumns } from '#imports'
 
 const { modelValue, isSort } = defineProps<{
@@ -36,9 +36,7 @@ const options = computed<SelectProps['options']>(() =>
         return false
       } else if (isSort) {
         /** ignore hasmany and manytomany relations if it's using within sort menu */
-        return !(
-          c.uidt === UITypes.LinkToAnotherRecord && (c.colOptions as LinkToAnotherRecordType).type !== RelationTypes.BELONGS_TO
-        )
+        return !(isLinksOrLTAR(c) && (c.colOptions as LinkToAnotherRecordType).type !== RelationTypes.BELONGS_TO)
         /** ignore virtual fields which are system fields ( mm relation ) and qr code fields */
       } else {
         const isVirtualSystemField = c.colOptions && c.system
diff --git a/packages/nc-gui/components/tabs/Smartsheet.vue b/packages/nc-gui/components/tabs/Smartsheet.vue
index 226fec302b..014c98ef65 100644
--- a/packages/nc-gui/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui/components/tabs/Smartsheet.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes } from 'nocodb-sdk'
+import { UITypes, isLinksOrLTAR } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   FieldsInj,
@@ -91,7 +91,7 @@ const onDrop = async (event: DragEvent) => {
 
     // if already a link column exists, create a new Lookup column
     const relationCol = parentMeta.columns?.find((c: ColumnType) => {
-      if (c.uidt !== UITypes.LinkToAnotherRecord) return false
+      if (isLinksOrLTAR(c)) return false
 
       const ltarOptions = c.colOptions as LinkToAnotherRecordType
 
diff --git a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
index 5e77293d23..3d313a066f 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
@@ -149,7 +149,7 @@ const onClick = (row: Row) => {
             <div class="flex items-center">
               <div class="flex-1 overflow-hidden min-w-0">
                 <VirtualCellComponentsItemChip :value="row[relatedTableDisplayValueProp]" :column="props.column" />
-<!--                <span class="text-gray-400 text-[11px] ml-1">(Primary key : {{ getRelatedTableRowId(row) }})</span>-->
+                <!--                <span class="text-gray-400 text-[11px] ml-1">(Primary key : {{ getRelatedTableRowId(row) }})</span> -->
               </div>
 
               <div v-if="!readonly" class="flex gap-2">
@@ -209,8 +209,7 @@ const onClick = (row: Row) => {
   line-height: 21px !important;
 }
 
-
-:deep(.nc-nested-list-item .ant-card-body){
-  @apply !p-2
+:deep(.nc-nested-list-item .ant-card-body) {
+  @apply !p-2;
 }
 </style>
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItems.vue b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
index 5f4b37e021..5c3563e71c 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
@@ -234,9 +234,9 @@ watch(vModel, (nextVal) => {
               :column="props.column"
               :show-unlink-button="false"
             />
-<!--            <span class="hidden group-hover:(inline) text-gray-400 text-[11px] ml-1">-->
-<!--              ({{ $t('labels.primaryKey') }} : {{ getRelatedTableRowId(refRow) }})-->
-<!--            </span>-->
+            <!--            <span class="hidden group-hover:(inline) text-gray-400 text-[11px] ml-1"> -->
+            <!--              ({{ $t('labels.primaryKey') }} : {{ getRelatedTableRowId(refRow) }}) -->
+            <!--            </span> -->
           </a-card>
         </div>
 
@@ -282,7 +282,7 @@ watch(vModel, (nextVal) => {
   @apply !ring;
 }
 
-:deep(.nc-nested-list-item .ant-card-body){
-  @apply !p-2
+:deep(.nc-nested-list-item .ant-card-body) {
+  @apply !p-2;
 }
 </style>
diff --git a/packages/nc-gui/composables/useColumnCreateStore.ts b/packages/nc-gui/composables/useColumnCreateStore.ts
index af638da694..98ff4bbd14 100644
--- a/packages/nc-gui/composables/useColumnCreateStore.ts
+++ b/packages/nc-gui/composables/useColumnCreateStore.ts
@@ -1,6 +1,6 @@
 import rfdc from 'rfdc'
 import type { ColumnReqType, ColumnType, TableType } from 'nocodb-sdk'
-import { UITypes } from 'nocodb-sdk'
+import { UITypes, isLinksOrLTAR } from 'nocodb-sdk'
 import type { Ref } from 'vue'
 import type { RuleObject } from 'ant-design-vue/es/form'
 import {
@@ -252,7 +252,7 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState
           await $api.dbTableColumn.create(meta.value?.id as string, { ...formState.value, ...columnPosition })
 
           /** if LTAR column then force reload related table meta */
-          if (formState.value.uidt === UITypes.LinkToAnotherRecord && meta.value?.id !== formState.value.childId) {
+          if (isLinksOrLTAR(formState.value) && meta.value?.id !== formState.value.childId) {
             getMeta(formState.value.childId, true).then(() => {})
           }
 
diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index db93cf4b39..2ab4c2a4d7 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -11,7 +11,7 @@ import type {
   TableType,
   ViewType,
 } from 'nocodb-sdk'
-import { ErrorMessages, RelationTypes, UITypes, isVirtualCol } from 'nocodb-sdk'
+import { ErrorMessages, RelationTypes, UITypes, isLinksOrLTAR, isVirtualCol } from 'nocodb-sdk'
 import { isString } from '@vueuse/core'
 import {
   SharedViewPasswordInj,
@@ -74,7 +74,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
   const fieldRequired = (fieldName = 'Value') => helpers.withMessage(t('msg.error.fieldRequired', { value: fieldName }), required)
 
   const formColumns = computed(() =>
-    columns.value?.filter((c) => c.show).filter((col) => !isVirtualCol(col) || col.uidt === UITypes.LinkToAnotherRecord),
+    columns.value?.filter((c) => c.show).filter((col) => !isVirtualCol(col) || isLinksOrLTAR(col.uidt)),
   )
 
   const loadSharedView = async () => {
@@ -151,7 +151,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
       ) {
         obj.localState[column.title!] = { required: fieldRequired(column.label || column.title) }
       } else if (
-        column.uidt === UITypes.LinkToAnotherRecord &&
+        isLinksOrLTAR(column) &&
         column.colOptions &&
         (column.colOptions as LinkToAnotherRecordType).type === RelationTypes.BELONGS_TO
       ) {
diff --git a/packages/nc-gui/composables/useSmartsheetRowStore.ts b/packages/nc-gui/composables/useSmartsheetRowStore.ts
index bcb44aef54..b2ab6586ca 100644
--- a/packages/nc-gui/composables/useSmartsheetRowStore.ts
+++ b/packages/nc-gui/composables/useSmartsheetRowStore.ts
@@ -1,4 +1,4 @@
-import { RelationTypes, UITypes } from 'nocodb-sdk'
+import { RelationTypes, isLinksOrLTAR } from 'nocodb-sdk'
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
 import type { Ref } from 'vue'
 import type { MaybeRef } from '@vueuse/core'
@@ -96,7 +96,7 @@ const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState(
     const syncLTARRefs = async (row: Record<string, any>, { metaValue = meta.value }: { metaValue?: TableType } = {}) => {
       const id = extractPkFromRow(row, metaValue?.columns as ColumnType[])
       for (const column of metaValue?.columns ?? []) {
-        if (column.uidt !== UITypes.LinkToAnotherRecord) continue
+        if (isLinksOrLTAR(column)) continue
 
         const colOptions = column.colOptions as LinkToAnotherRecordType
 
@@ -132,7 +132,7 @@ const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState(
     // clear LTAR cell
     const clearLTARCell = async (column: ColumnType) => {
       try {
-        if (!column || column.uidt !== UITypes.LinkToAnotherRecord) return
+        if (!column || isLinksOrLTAR(column)) return
 
         const relatedTableMeta = metas.value?.[(<LinkToAnotherRecordType>column?.colOptions)?.fk_related_model_id as string]
 
diff --git a/packages/nc-gui/composables/useTable.ts b/packages/nc-gui/composables/useTable.ts
index 4596c2ff2c..8d4a85dbfc 100644
--- a/packages/nc-gui/composables/useTable.ts
+++ b/packages/nc-gui/composables/useTable.ts
@@ -1,5 +1,5 @@
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes, isSystemColumn } from 'nocodb-sdk'
+import { UITypes, isLinksOrLTAR, isSystemColumn } from 'nocodb-sdk'
 import {
   Modal,
   SYSTEM_COLUMNS,
@@ -86,7 +86,7 @@ export function useTable(onTableCreate?: (tableMeta: TableType) => void, baseId?
       async onOk() {
         try {
           const meta = (await getMeta(table.id as string, true)) as TableType
-          const relationColumns = meta?.columns?.filter((c) => c.uidt === UITypes.LinkToAnotherRecord && !isSystemColumn(c))
+          const relationColumns = meta?.columns?.filter((c) => isLinksOrLTAR(c) && !isSystemColumn(c))
 
           // Check if table has any relation columns and show notification
           // skip for xcdb base
diff --git a/packages/nocodb-sdk/src/index.ts b/packages/nocodb-sdk/src/index.ts
index 964f4c66ff..c28d6ed84a 100644
--- a/packages/nocodb-sdk/src/index.ts
+++ b/packages/nocodb-sdk/src/index.ts
@@ -12,6 +12,7 @@ export {
   numericUITypes,
   isNumericCol,
   isVirtualCol,
+  isLinksOrLTAR,
 } from './lib/UITypes';
 export { default as CustomAPI } from './lib/CustomAPI';
 export { default as TemplateGenerator } from './lib/TemplateGenerator';
diff --git a/packages/nocodb-sdk/src/lib/UITypes.ts b/packages/nocodb-sdk/src/lib/UITypes.ts
index 70aa3ae706..ebf0c52fc6 100644
--- a/packages/nocodb-sdk/src/lib/UITypes.ts
+++ b/packages/nocodb-sdk/src/lib/UITypes.ts
@@ -85,4 +85,12 @@ export function isVirtualCol(
   ].includes(<UITypes>(typeof col === 'object' ? col?.uidt : col));
 }
 
+export function isLinksOrLTAR(
+  colOrUidt: ColumnType | { uidt: UITypes | string } | UITypes | string
+) {
+  return [UITypes.LinkToAnotherRecord, UITypes.Links].includes(
+    <UITypes>(typeof colOrUidt === 'object' ? colOrUidt?.uidt : colOrUidt)
+  );
+}
+
 export default UITypes;

From ae622b0a2cb02b1cd84359020e775071f0fbac5c Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 14 Jun 2023 18:09:08 +0530
Subject: [PATCH 034/208] fix: typo correction

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

diff --git a/packages/nc-gui/components/tabs/Smartsheet.vue b/packages/nc-gui/components/tabs/Smartsheet.vue
index 014c98ef65..f248d5f04d 100644
--- a/packages/nc-gui/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui/components/tabs/Smartsheet.vue
@@ -91,7 +91,7 @@ const onDrop = async (event: DragEvent) => {
 
     // if already a link column exists, create a new Lookup column
     const relationCol = parentMeta.columns?.find((c: ColumnType) => {
-      if (isLinksOrLTAR(c)) return false
+      if (!isLinksOrLTAR(c)) return false
 
       const ltarOptions = c.colOptions as LinkToAnotherRecordType
 

From edb2ddb8305067874c6d7853cea333be92fb65ba Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 14 Jun 2023 19:00:40 +0530
Subject: [PATCH 035/208] fix: treat Links field as number

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/smartsheet/toolbar/FilterInput.vue   | 7 ++++++-
 packages/nocodb-sdk/src/lib/UITypes.ts                     | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue b/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue
index 02f5bf7ec2..ce978ee754 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { UITypes } from 'nocodb-sdk'
 import type { ColumnType } from 'nocodb-sdk'
 import { storeToRefs } from 'pinia'
 import {
@@ -80,6 +81,7 @@ const checkTypeFunctions = {
   isInt,
   isFloat,
   isTextArea,
+  isLinks: (col: ColumnType) => col.uidt === UITypes.Links,
 }
 
 type FilterType = keyof typeof checkTypeFunctions
@@ -145,6 +147,7 @@ const componentMap: Partial<Record<FilterType, any>> = $computed(() => {
     isDecimal: Decimal,
     isInt: Integer,
     isFloat: Float,
+    isLinks: Integer,
   }
 })
 
@@ -161,6 +164,7 @@ const componentProps = $computed(() => {
     case 'isPercent':
     case 'isDecimal':
     case 'isFloat':
+    case 'isLinks':
     case 'isInt': {
       return { class: 'h-32px' }
     }
@@ -176,7 +180,8 @@ const componentProps = $computed(() => {
 const hasExtraPadding = $computed(() => {
   return (
     column.value &&
-    (isInt(column.value, abstractType) ||
+    (column.value?.uidt === UITypes.Links ||
+      isInt(column.value, abstractType) ||
       isDate(column.value, abstractType) ||
       isDateTime(column.value, abstractType) ||
       isTime(column.value, abstractType) ||
diff --git a/packages/nocodb-sdk/src/lib/UITypes.ts b/packages/nocodb-sdk/src/lib/UITypes.ts
index ebf0c52fc6..40e6cb30f5 100644
--- a/packages/nocodb-sdk/src/lib/UITypes.ts
+++ b/packages/nocodb-sdk/src/lib/UITypes.ts
@@ -50,6 +50,7 @@ export const numericUITypes = [
   UITypes.Rating,
   UITypes.Rollup,
   UITypes.Year,
+  UITypes.Links,
 ];
 
 export function isNumericCol(

From 19797577fa646510db2f63634bb160b9b7fe83d9 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 14 Jun 2023 21:55:11 +0530
Subject: [PATCH 036/208] fix: typo corrections

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/smartsheet/Grid.vue        | 2 +-
 packages/nc-gui/components/smartsheet/header/Menu.vue | 2 +-
 packages/nc-gui/composables/useSmartsheetRowStore.ts  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index fc2fff9c84..de2a35c3b1 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -491,7 +491,7 @@ watch(contextMenu, () => {
 const rowRefs = $ref<any[]>()
 
 async function clearCell(ctx: { row: number; col: number } | null, skipUpdate = false) {
-  if (!ctx || !hasEditPermission || (isLinksOrLTAR(fields.value[ctx.col]) && isVirtualCol(fields.value[ctx.col]))) return
+  if (!ctx || !hasEditPermission || (!isLinksOrLTAR(fields.value[ctx.col]) && isVirtualCol(fields.value[ctx.col]))) return
 
   const rowObj = data.value[ctx.row]
   const columnObj = fields.value[ctx.col]
diff --git a/packages/nc-gui/components/smartsheet/header/Menu.vue b/packages/nc-gui/components/smartsheet/header/Menu.vue
index 92f53a01b1..83e056389b 100644
--- a/packages/nc-gui/components/smartsheet/header/Menu.vue
+++ b/packages/nc-gui/components/smartsheet/header/Menu.vue
@@ -316,7 +316,7 @@ const hideField = async () => {
             {{ $t('general.edit') }}
           </div>
         </a-menu-item>
-        <template v-if="isLinksOrLTAR(column) || column.colOptions.type !== RelationTypes.BELONGS_TO">
+        <template v-if="!isLinksOrLTAR(column) || column.colOptions.type !== RelationTypes.BELONGS_TO">
           <a-divider class="!my-0" />
           <a-menu-item @click="sortByColumn('asc')">
             <div v-e="['a:field:sort', { dir: 'asc' }]" class="nc-column-insert-after nc-header-menu-item">
diff --git a/packages/nc-gui/composables/useSmartsheetRowStore.ts b/packages/nc-gui/composables/useSmartsheetRowStore.ts
index b2ab6586ca..285b54c954 100644
--- a/packages/nc-gui/composables/useSmartsheetRowStore.ts
+++ b/packages/nc-gui/composables/useSmartsheetRowStore.ts
@@ -96,7 +96,7 @@ const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState(
     const syncLTARRefs = async (row: Record<string, any>, { metaValue = meta.value }: { metaValue?: TableType } = {}) => {
       const id = extractPkFromRow(row, metaValue?.columns as ColumnType[])
       for (const column of metaValue?.columns ?? []) {
-        if (isLinksOrLTAR(column)) continue
+        if (!isLinksOrLTAR(column)) continue
 
         const colOptions = column.colOptions as LinkToAnotherRecordType
 
@@ -132,7 +132,7 @@ const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState(
     // clear LTAR cell
     const clearLTARCell = async (column: ColumnType) => {
       try {
-        if (!column || isLinksOrLTAR(column)) return
+        if (!column || !isLinksOrLTAR(column)) return
 
         const relatedTableMeta = metas.value?.[(<LinkToAnotherRecordType>column?.colOptions)?.fk_related_model_id as string]
 

From fe9151fa1bab94090dd52c96d0856614a86bb324 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 15 Jun 2023 16:39:43 +0530
Subject: [PATCH 037/208] fix: corrections in populateMeta

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/helpers/populateMeta.ts      | 9 +++++----
 packages/nocodb/src/services/projects.service.ts | 2 --
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/nocodb/src/helpers/populateMeta.ts b/packages/nocodb/src/helpers/populateMeta.ts
index 6e84659c59..e2c0033d5c 100644
--- a/packages/nocodb/src/helpers/populateMeta.ts
+++ b/packages/nocodb/src/helpers/populateMeta.ts
@@ -1,6 +1,7 @@
 import { ModelTypes, UITypes, ViewTypes } from 'nocodb-sdk';
 import { isVirtualCol, RelationTypes } from 'nocodb-sdk';
 import { pluralize, singularize } from 'inflection';
+import { isLinksOrLTAR } from '../../../nocodb-sdk/src'
 import { GridViewColumn } from '../models';
 import Column from '../models/Column';
 import Model from '../models/Model';
@@ -124,7 +125,7 @@ export async function extractAndGenerateManyToManyRelations(
           fk_mm_parent_column_id:
             belongsToCols[1].colOptions.fk_child_column_id,
           type: RelationTypes.MANY_TO_MANY,
-          uidt: UITypes.LinkToAnotherRecord,
+          uidt: UITypes.Links,
         });
       }
       if (!isRelationAvailInB) {
@@ -142,7 +143,7 @@ export async function extractAndGenerateManyToManyRelations(
           fk_mm_parent_column_id:
             belongsToCols[0].colOptions.fk_child_column_id,
           type: RelationTypes.MANY_TO_MANY,
-          uidt: UITypes.LinkToAnotherRecord,
+          uidt: UITypes.Links,
         });
       }
 
@@ -154,7 +155,7 @@ export async function extractAndGenerateManyToManyRelations(
         const model = await colOpt.getRelatedTable();
 
         for (const col of await model.getColumns()) {
-          if (col.uidt !== UITypes.LinkToAnotherRecord) continue;
+          if (!isLinksOrLTAR(col.uidt)) continue;
 
           const colOpt1 = await col.getColOptions<LinkToAnotherRecordColumn>();
           if (!colOpt1 || colOpt1.type !== RelationTypes.HAS_MANY) continue;
@@ -256,7 +257,7 @@ export async function populateMeta(base: Base, project: Project): Promise<any> {
       const virtualColumns = [
         ...hasMany.map((hm) => {
           return {
-            uidt: UITypes.LinkToAnotherRecord,
+            uidt: UITypes.Links,
             type: 'hm',
             hm,
             title: `${hm.title} List`,
diff --git a/packages/nocodb/src/services/projects.service.ts b/packages/nocodb/src/services/projects.service.ts
index f5ace226c6..3fcaba554d 100644
--- a/packages/nocodb/src/services/projects.service.ts
+++ b/packages/nocodb/src/services/projects.service.ts
@@ -168,8 +168,6 @@ export class ProjectsService {
     for (const base of await project.getBases()) {
       const info = await populateMeta(base, project);
 
-      await populateRollupColumnAndHideLTAR(base, project);
-
       T.emit('evt_api_created', info);
       delete base.config;
     }

From 19f03b8c38270ae813724954193d16b76515ee70 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 15 Jun 2023 17:55:08 +0530
Subject: [PATCH 038/208] test: shared base

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../pages/Dashboard/common/Cell/index.ts      | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index dcab70063e..0975415f51 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -9,6 +9,7 @@ import { RatingCellPageObject } from './RatingCell';
 import { DateCellPageObject } from './DateCell';
 import { DateTimeCellPageObject } from './DateTimeCell';
 import { GeoDataCellPageObject } from './GeoDataCell';
+import { getTextExcludeIconText } from '../../../../tests/utils/general';
 
 export interface CellProps {
   index?: number;
@@ -350,13 +351,21 @@ export class CellPageObject extends BasePage {
     await expect(await vCell.locator('.nc-action-icon.nc-plus:visible')).toHaveCount(
       param.role === 'creator' || param.role === 'editor' ? 1 : 0
     );
+
     // in-cell expand (all have access)
-    await expect(await vCell.locator('.nc-action-icon.nc-arrow-expand:visible')).toHaveCount(1);
-    await vCell.click();
+    // PR(LinkDataType)
+    // await expect(await vCell.locator('.nc-action-icon.nc-arrow-expand:visible')).toHaveCount(1);
+    const linkText = await getTextExcludeIconText(vCell);
+    expect(linkText).toContain('1 Link');
+
+    // PR(LinkDataType)
+    // await vCell.click();
+
     // unlink
-    await expect(await vCell.locator('.nc-icon.unlink-icon:visible')).toHaveCount(
-      param.role === 'creator' || param.role === 'editor' ? 1 : 0
-    );
+    // PR(LinkDataType)
+    // await expect(await vCell.locator('.nc-icon.unlink-icon:visible')).toHaveCount(
+    //   param.role === 'creator' || param.role === 'editor' ? 1 : 0
+    // );
   }
 
   async copyToClipboard({ index, columnHeader }: CellProps, ...clickOptions: Parameters<Locator['click']>) {

From b20e99fdd393870f1f369dff5c13a7dbe7b036a6 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 15 Jun 2023 17:59:43 +0530
Subject: [PATCH 039/208] test: attachment

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/pages/Dashboard/common/Cell/index.ts | 6 +++---
 tests/playwright/tests/db/columnAttachments.spec.ts   | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index 0975415f51..a86f273270 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -353,16 +353,16 @@ export class CellPageObject extends BasePage {
     );
 
     // in-cell expand (all have access)
-    // PR(LinkDataType)
+    // PR8504
     // await expect(await vCell.locator('.nc-action-icon.nc-arrow-expand:visible')).toHaveCount(1);
     const linkText = await getTextExcludeIconText(vCell);
     expect(linkText).toContain('1 Link');
 
-    // PR(LinkDataType)
+    // PR8504
     // await vCell.click();
 
     // unlink
-    // PR(LinkDataType)
+    // PR8504
     // await expect(await vCell.locator('.nc-icon.unlink-icon:visible')).toHaveCount(
     //   param.role === 'creator' || param.role === 'editor' ? 1 : 0
     // );
diff --git a/tests/playwright/tests/db/columnAttachments.spec.ts b/tests/playwright/tests/db/columnAttachments.spec.ts
index 7593457cde..7856671677 100644
--- a/tests/playwright/tests/db/columnAttachments.spec.ts
+++ b/tests/playwright/tests/db/columnAttachments.spec.ts
@@ -94,7 +94,9 @@ test.describe('Attachment column', () => {
 
     await expect(columns).toBe('Country,City List,testAttach');
     await expect(cells[0]).toBe('Bahrain');
-    await expect(cells[1]).toBe('al-Manama');
+    // PR8504
+    // await expect(cells[1]).toBe('al-Manama');
+    await expect(cells[1]).toBe('1');
     await expect(cells[2].includes('5.json(http://localhost:8080/download/')).toBe(true);
   });
 

From b8ae4ad3e9edb5a3dbd9af91342cb9ac1146c1f3 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 15 Jun 2023 18:05:28 +0530
Subject: [PATCH 040/208] test: formula

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/db/columnFormula.spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/playwright/tests/db/columnFormula.spec.ts b/tests/playwright/tests/db/columnFormula.spec.ts
index 18ddb182af..602a62de03 100644
--- a/tests/playwright/tests/db/columnFormula.spec.ts
+++ b/tests/playwright/tests/db/columnFormula.spec.ts
@@ -131,8 +131,8 @@ const formulaDataByDbType = (context: NcContext) => [
     result: isPg(context) ? ['false', 'false', 'false', 'false', 'false'] : ['0', '0', '0', '0', '0'],
   },
   {
-    formula: `IF((SEARCH({Address List}, "Parkway") != 0), "2.0","WRONG")`,
-    result: ['WRONG', 'WRONG', 'WRONG', '2.0', '2.0'],
+    formula: `IF((SEARCH({City}, "Ad") != 0), "2.0","WRONG")`,
+    result: ['WRONG', 'WRONG', 'WRONG', 'WRONG', '2.0'],
   },
 
   // additional tests for formula case-insensitivity

From 34ac29b170d5a2e686fef1b42366c26ada9418bd Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 15 Jun 2023 18:15:10 +0530
Subject: [PATCH 041/208] test: link drag drop

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/db/columnLtarDragdrop.spec.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/playwright/tests/db/columnLtarDragdrop.spec.ts b/tests/playwright/tests/db/columnLtarDragdrop.spec.ts
index 527789aa2f..efd76bba28 100644
--- a/tests/playwright/tests/db/columnLtarDragdrop.spec.ts
+++ b/tests/playwright/tests/db/columnLtarDragdrop.spec.ts
@@ -64,12 +64,12 @@ test.describe('Test table', () => {
     await page.reload();
   });
 
-  test('drag drop for LTAR, lookup creation', async () => {
+  test('drag drop for Link, lookup creation', async () => {
     await dashboard.treeView.openTable({ title: 'Table0' });
     const src = await dashboard.rootPage.locator(`[data-testid="tree-view-table-draggable-handle-Table1"]`);
     const dst = await dashboard.rootPage.locator(`[data-testid="grid-row-0"]`);
 
-    // drag drop for LTAR column creation
+    // drag drop for Links column creation
     //
     await src.dragTo(dst);
     const columnAddModal = await dashboard.rootPage.locator(`.nc-dropdown-grid-add-column`);
@@ -78,14 +78,14 @@ test.describe('Test table', () => {
       const linkTable = await getTextExcludeIconText(
         await columnAddModal.locator(`.ant-form-item-control-input`).nth(3)
       );
-      expect(columnType).toContain('LinkToAnotherRecord');
+      expect(columnType).toContain('Links');
       expect(linkTable).toContain('Table1');
 
       // save
       await columnAddModal.locator(`.ant-btn-primary`).click();
 
       // verify if column is created
-      await grid.column.verify({ title: 'Table1List', isVisible: true });
+      await grid.column.verify({ title: 'Table1', isVisible: true });
     }
 
     // drag drop for lookup column creation
@@ -103,7 +103,7 @@ test.describe('Test table', () => {
 
       // validate
       expect(columnType).toContain('Lookup');
-      expect(linkField).toContain('Table1List');
+      expect(linkField.split(' ')[0]).toContain('Table1');
       expect(childColumn).toContain('Title');
 
       // save

From ec3ea3ecbff2bb0e23ed1a0b25fdc6d7780640cf Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 15 Jun 2023 19:35:16 +0530
Subject: [PATCH 042/208] test: link extended

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../nc-gui/components/virtual-cell/Links.vue  |  6 ++-
 .../pages/Dashboard/common/Cell/index.ts      | 38 +++++++++++--------
 .../db/columnRelationalExtendedTests.spec.ts  |  1 +
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index fee954d0ee..08230d01ce 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -65,7 +65,11 @@ const onAttachRecord = () => {
   <div class="flex w-full items-center">
     <template v-if="!isForm">
       <div class="flex-grow block">
-        <a class="text-center pl-3" :class="{ '!text-gray-300': !value }" @click.stop.prevent="childListDlg = true">
+        <a
+          class="text-center pl-3 nc-datatype-link"
+          :class="{ '!text-gray-300': !value }"
+          @click.stop.prevent="childListDlg = true"
+        >
           {{ textVal }}
         </a>
       </div>
diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index a86f273270..f5f39d934b 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -77,9 +77,9 @@ export class CellPageObject extends BasePage {
   }
 
   async inCellExpand({ index, columnHeader }: CellProps) {
-    await this.get({ index, columnHeader }).hover();
+    // await this.get({ index, columnHeader }).hover();
     await this.waitForResponse({
-      uiAction: () => this.get({ index, columnHeader }).locator('.nc-action-icon >> nth=0').click(),
+      uiAction: () => this.get({ index, columnHeader }).locator('.nc-datatype-link').click(),
       requestUrlPathToMatch: '/api/v1/db/data/noco/',
       httpMethodsToMatch: ['GET'],
     });
@@ -268,39 +268,47 @@ export class CellPageObject extends BasePage {
   async verifyVirtualCell({
     index,
     columnHeader,
+    type,
     count,
     value,
     verifyChildList = false,
   }: CellProps & {
     count?: number;
+    type?: 'hm' | 'bt' | 'mm';
     value: string[];
     verifyChildList?: boolean;
   }) {
-    // const count = value.length;
     const cell = await this.get({ index, columnHeader });
-    const chips = cell.locator('.chips > .chip');
+    const linkText = await cell.locator('.nc-datatype-link');
 
-    await this.get({ index, columnHeader }).scrollIntoViewIfNeeded();
+    await cell.scrollIntoViewIfNeeded();
 
-    // verify chip count & contents
-    if (count) await expect(chips).toHaveCount(count);
+    if (type === 'bt') {
+      const chips = cell.locator('.chips > .chip');
+      console.log('chips', await chips.count());
+      await expect(await chips.count()).toBe(count);
 
-    // verify only the elements that are passed in
-    for (let i = 0; i < value.length; ++i) {
-      await chips.nth(i).locator('.name').waitFor({ state: 'visible' });
-      await chips.nth(i).locator('.name').scrollIntoViewIfNeeded();
-      await expect(await chips.nth(i).locator('.name')).toHaveText(value[i]);
+      for (let i = 0; i < value.length; ++i) {
+        await chips.nth(i).locator('.name').waitFor({ state: 'visible' });
+        await chips.nth(i).locator('.name').scrollIntoViewIfNeeded();
+        await expect(await chips.nth(i).locator('.name')).toHaveText(value[i]);
+      }
+      return;
+    }
+
+    // verify chip count & contents
+    if (count) {
+      await expect(await cell.innerText()).toContain(`${count} ${count === 1 ? 'Link' : 'Links'}`);
     }
 
     if (verifyChildList) {
       // open child list
       await this.get({ index, columnHeader }).hover();
-      const arrow_expand = await this.get({ index, columnHeader }).locator('.nc-arrow-expand');
 
       // arrow expand doesn't exist for bt columns
-      if (await arrow_expand.count()) {
+      if (await linkText.count()) {
         await this.waitForResponse({
-          uiAction: () => arrow_expand.click(),
+          uiAction: () => linkText.click(),
           requestUrlPathToMatch: '/api/v1/db',
           httpMethodsToMatch: ['GET'],
         });
diff --git a/tests/playwright/tests/db/columnRelationalExtendedTests.spec.ts b/tests/playwright/tests/db/columnRelationalExtendedTests.spec.ts
index 25fb924d66..c636d41efe 100644
--- a/tests/playwright/tests/db/columnRelationalExtendedTests.spec.ts
+++ b/tests/playwright/tests/db/columnRelationalExtendedTests.spec.ts
@@ -65,6 +65,7 @@ test.describe('Relational Columns', () => {
       await dashboard.grid.cell.verifyVirtualCell({
         index: i,
         columnHeader: 'Country',
+        type: 'bt',
         count: countryList[i].length,
         value: countryList[i],
       });

From 3d22c7158d0096567174f54a21a568fe231a2656 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 15 Jun 2023 21:28:06 +0530
Subject: [PATCH 043/208] test: shared view

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../fixtures/expectedDataSqlite.txt           | 36 +++++++++----------
 .../playwright/tests/db/viewGridShare.spec.ts |  8 ++---
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/tests/playwright/fixtures/expectedDataSqlite.txt b/tests/playwright/fixtures/expectedDataSqlite.txt
index 440c160aaa..95ec7b0c4b 100644
--- a/tests/playwright/fixtures/expectedDataSqlite.txt
+++ b/tests/playwright/fixtures/expectedDataSqlite.txt
@@ -1,19 +1,19 @@
 Address,District,PostalCode,Phone,Customer List,Staff List,City
-1013 Tabuk Boulevard," ",96203," ",2,,Kanchrapara
-1168 Najafabad Parkway," ",40301," ",1,,Kabul
-1294 Firozabad Drive," ",70618," ",2,,Pingxiang
-1342 Abha Boulevard," ",10714," ",2,,Bucuresti
-1368 Maracabo Boulevard," ",32716," ",2,,South Hill
-1427 Tabuk Place," ",31342," ",2,,Cape Coral
-1519 Santiago de los Caballeros Loop," ",22025," ",2,,Mwene-Ditu
-1661 Abha Drive," ",14400," ",1,,Pudukkottai
-17 Kabul Boulevard," ",38594," ",1,,Nagareyama
-1838 Tabriz Lane," ",1195," ",1,,Dhaka
-1888 Kabul Drive," ",20936," ",1,,Ife
-1892 Nabereznyje Telny Lane," ",28396," ",2,,Tafuna
-1993 Tabuk Lane," ",64221," ",2,,Tambaram
-217 Botshabelo Place," ",49521," ",2,,Davao
-381 Kabul Way," ",87272," ",2,,Hsichuh
-44 Najafabad Way," ",61391," ",2,,Donostia-San Sebastin
-48 Maracabo Place," ",1570," ",1,,Talavera
-669 Firozabad Loop," ",92265," ",1,,al-Ayn
\ No newline at end of file
+1013 Tabuk Boulevard," ",96203," ",1,0,Kanchrapara
+1168 Najafabad Parkway," ",40301," ",1,0,Kabul
+1294 Firozabad Drive," ",70618," ",1,0,Pingxiang
+1342 Abha Boulevard," ",10714," ",1,0,Bucuresti
+1368 Maracabo Boulevard," ",32716," ",1,0,South Hill
+1427 Tabuk Place," ",31342," ",1,0,Cape Coral
+1519 Santiago de los Caballeros Loop," ",22025," ",1,0,Mwene-Ditu
+1661 Abha Drive," ",14400," ",1,0,Pudukkottai
+17 Kabul Boulevard," ",38594," ",1,0,Nagareyama
+1838 Tabriz Lane," ",1195," ",1,0,Dhaka
+1888 Kabul Drive," ",20936," ",1,0,Ife
+1892 Nabereznyje Telny Lane," ",28396," ",1,0,Tafuna
+1993 Tabuk Lane," ",64221," ",1,0,Tambaram
+217 Botshabelo Place," ",49521," ",1,0,Davao
+381 Kabul Way," ",87272," ",1,0,Hsichuh
+44 Najafabad Way," ",61391," ",1,0,Donostia-San Sebastin
+48 Maracabo Place," ",1570," ",1,0,Talavera
+669 Firozabad Loop," ",92265," ",1,0,al-Ayn
\ No newline at end of file
diff --git a/tests/playwright/tests/db/viewGridShare.spec.ts b/tests/playwright/tests/db/viewGridShare.spec.ts
index 659979caaf..487a765b60 100644
--- a/tests/playwright/tests/db/viewGridShare.spec.ts
+++ b/tests/playwright/tests/db/viewGridShare.spec.ts
@@ -279,13 +279,13 @@ const sqliteExpectedRecords2 = [
 const expectedVirtualRecords = [
   { index: 0, columnHeader: 'Customer List', count: 1, value: ['2'] },
   { index: 1, columnHeader: 'Customer List', count: 1, value: ['2'] },
-  { index: 0, columnHeader: 'City', count: 1, value: ['Kanchrapara'] },
-  { index: 1, columnHeader: 'City', count: 1, value: ['Tafuna'] },
+  { index: 0, columnHeader: 'City', count: 1, type: 'bt', value: ['Kanchrapara'] },
+  { index: 1, columnHeader: 'City', count: 1, type: 'bt', value: ['Tafuna'] },
 ];
 
 const sqliteExpectedVirtualRecords = [
   { index: 0, columnHeader: 'Customer List', count: 1, value: ['2'] },
   { index: 1, columnHeader: 'Customer List', count: 1, value: ['1'] },
-  { index: 0, columnHeader: 'City', count: 1, value: ['Davao'] },
-  { index: 1, columnHeader: 'City', count: 1, value: ['Nagareyama'] },
+  { index: 0, columnHeader: 'City', count: 1, type: 'bt', value: ['Davao'] },
+  { index: 1, columnHeader: 'City', count: 1, type: 'bt', value: ['Nagareyama'] },
 ];

From aa9e62545a20568363d4d633aacbf44d1c03dd93 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 15 Jun 2023 21:37:23 +0530
Subject: [PATCH 044/208] test: locked view

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../fixtures/expectedBaseDownloadData.txt     | 218 +++++++++---------
 .../playwright/pages/Dashboard/Grid/index.ts  |   6 -
 2 files changed, 109 insertions(+), 115 deletions(-)

diff --git a/tests/playwright/fixtures/expectedBaseDownloadData.txt b/tests/playwright/fixtures/expectedBaseDownloadData.txt
index 36d43c36ba..615f4fb5cf 100644
--- a/tests/playwright/fixtures/expectedBaseDownloadData.txt
+++ b/tests/playwright/fixtures/expectedBaseDownloadData.txt
@@ -1,110 +1,110 @@
 Country,City List
-Afghanistan,Kabul
-Algeria,"Batna, Bchar, Skikda"
-American Samoa,Tafuna
-Angola,"Benguela, Namibe"
-Anguilla,South Hill
-Argentina,"Almirante Brown, Avellaneda, Baha Blanca, Crdoba, Escobar, Ezeiza, La Plata, Merlo, Quilmes, San Miguel de Tucumn, Santa F, Tandil, Vicente Lpez"
-Armenia,Yerevan
-Australia,Woodridge
-Austria,"Graz, Linz, Salzburg"
-Azerbaijan,"Baku, Sumqayit"
-Bahrain,al-Manama
-Bangladesh,"Dhaka, Jamalpur, Tangail"
-Belarus,"Mogiljov, Molodetno"
-Bolivia,"El Alto, Sucre"
-Brazil,"Alvorada, Angra dos Reis, Anpolis, Aparecida de Goinia, Araatuba, Bag, Belm, Blumenau, Boa Vista, Braslia, Goinia, Guaruj, guas Lindas de Gois, Ibirit, Juazeiro do Norte, Juiz de Fora, Luzinia, Maring, Po, Poos de Caldas, Rio Claro, Santa Brbara dOeste, Santo Andr, So Bernardo do Campo, So Leopoldo"
-Brunei,Bandar Seri Begawan
-Bulgaria,"Ruse, Stara Zagora"
-Cambodia,"Battambang, Phnom Penh"
-Cameroon,"Bamenda, Yaound"
-Canada,"Gatineau, Halifax, Lethbridge, London, Oshawa, Richmond Hill, Vancouver"
-Chad,NDjamna
-Chile,"Antofagasta, Coquimbo, Rancagua"
-China,"Baicheng, Baiyin, Binzhou, Changzhou, Datong, Daxian, Dongying, Emeishan, Enshi, Ezhou, Fuyu, Fuzhou, Haining, Hami, Hohhot, Huaian, Jinchang, Jining, Jinzhou, Junan, Korla, Laiwu, Laohekou, Lengshuijiang, Leshan"
-Colombia,"Buenaventura, Dos Quebradas, Florencia, Pereira, Sincelejo, Sogamoso"
-"Congo, The Democratic Republic of the","Lubumbashi, Mwene-Ditu"
-Czech Republic,Olomouc
-Dominican Republic,"La Romana, San Felipe de Puerto Plata, Santiago de los Caballeros"
-Ecuador,"Loja, Portoviejo, Robamba"
-Egypt,"Bilbays, Idfu, Mit Ghamr, Qalyub, Sawhaj, Shubra al-Khayma"
-Estonia,Tartu
-Ethiopia,Addis Abeba
-Faroe Islands,Trshavn
-Finland,Oulu
-France,"Brest, Le Mans, Toulon, Toulouse"
-French Guiana,Cayenne
-French Polynesia,"Faaa, Papeete"
-Gambia,Banjul
-Germany,"Duisburg, Erlangen, Halle/Saale, Mannheim, Saarbrcken, Siegen, Witten"
-Greece,"Athenai, Patras"
-Greenland,Nuuk
-Holy See (Vatican City State),Citt del Vaticano
-Hong Kong,Kowloon and New Kowloon
-Hungary,Szkesfehrvr
-India,"Adoni, Ahmadnagar, Allappuzha (Alleppey), Ambattur, Amroha, Balurghat, Berhampore (Baharampur), Bhavnagar, Bhilwara, Bhimavaram, Bhopal, Bhusawal, Bijapur, Chandrapur, Chapra, Dhule (Dhulia), Etawah, Firozabad, Gandhinagar, Gulbarga, Haldia, Halisahar, Hoshiarpur, Hubli-Dharwad, Jaipur"
-Indonesia,"Cianjur, Ciomas, Ciparay, Gorontalo, Jakarta, Lhokseumawe, Madiun, Pangkal Pinang, Pemalang, Pontianak, Probolinggo, Purwakarta, Surakarta, Tegal"
-Iran,"Arak, Esfahan, Kermanshah, Najafabad, Qomsheh, Shahr-e Kord, Sirjan, Tabriz"
-Iraq,Mosul
-Israel,"Ashdod, Ashqelon, Bat Yam, Tel Aviv-Jaffa"
-Italy,"Alessandria, Bergamo, Brescia, Brindisi, Livorno, Syrakusa, Udine"
-Japan,"Akishima, Fukuyama, Higashiosaka, Hino, Hiroshima, Isesaki, Iwaki, Iwakuni, Iwatsuki, Izumisano, Kakamigahara, Kamakura, Kanazawa, Koriyama, Kurashiki, Kuwana, Matsue, Miyakonojo, Nagareyama, Okayama, Okinawa, Omiya, Onomichi, Otsu, Sagamihara"
-Kazakstan,"Pavlodar, Zhezqazghan"
-Kenya,"Kisumu, Nyeri"
-Kuwait,Jalib al-Shuyukh
-Latvia,"Daugavpils, Liepaja"
-Liechtenstein,Vaduz
-Lithuania,Vilnius
-Madagascar,Mahajanga
-Malawi,Lilongwe
-Malaysia,"Ipoh, Kuching, Sungai Petani"
-Mexico,"Acua, Allende, Atlixco, Carmen, Celaya, Coacalco de Berriozbal, Coatzacoalcos, Cuauhtmoc, Cuautla, Cuernavaca, El Fuerte, Guadalajara, Hidalgo, Huejutla de Reyes, Huixquilucan, Jos Azueta, Jurez, La Paz, Matamoros, Mexicali, Monclova, Nezahualcyotl, Pachuca de Soto, Salamanca, San Felipe del Progreso"
-Moldova,Chisinau
-Morocco,"Beni-Mellal, Nador, Sal"
-Mozambique,"Beira, Naala-Porto, Tete"
-Myanmar,"Monywa, Myingyan"
-Nauru,Yangor
-Nepal,Birgunj
-Netherlands,"Amersfoort, Apeldoorn, Ede, Emmen, s-Hertogenbosch"
-New Zealand,Hamilton
-Nigeria,"Benin City, Deba Habe, Effon-Alaiye, Ife, Ikerre, Ilorin, Kaduna, Ogbomosho, Ondo, Owo, Oyo, Sokoto, Zaria"
-North Korea,Pyongyang
-Oman,"Masqat, Salala"
-Pakistan,"Dadu, Mandi Bahauddin, Mardan, Okara, Shikarpur"
-Paraguay,"Asuncin, Ciudad del Este, San Lorenzo"
-Peru,"Callao, Hunuco, Lima, Sullana"
-Philippines,"Baybay, Bayugan, Bislig, Cabuyao, Cavite, Davao, Gingoog, Hagonoy, Iligan, Imus, Lapu-Lapu, Mandaluyong, Ozamis, Santa Rosa, Taguig, Talavera, Tanauan, Tanza, Tarlac, Tuguegarao"
-Poland,"Bydgoszcz, Czestochowa, Jastrzebie-Zdrj, Kalisz, Lublin, Plock, Tychy, Wroclaw"
-Puerto Rico,"Arecibo, Ponce"
-Romania,"Botosani, Bucuresti"
-Runion,Saint-Denis
-Russian Federation,"Atinsk, Balaiha, Dzerzinsk, Elista, Ivanovo, Jaroslavl, Jelets, Kaliningrad, Kamyin, Kirovo-Tepetsk, Kolpino, Korolev, Kurgan, Kursk, Lipetsk, Ljubertsy, Maikop, Moscow, Nabereznyje Telny, Niznekamsk, Novoterkassk, Pjatigorsk, Serpuhov, Smolensk, Syktyvkar"
-Saint Vincent and the Grenadines,Kingstown
-Saudi Arabia,"Abha, al-Hawiya, al-Qatif, Jedda, Tabuk"
-Senegal,Ziguinchor
-Slovakia,Bratislava
-South Africa,"Boksburg, Botshabelo, Chatsworth, Johannesburg, Kimberley, Klerksdorp, Newcastle, Paarl, Rustenburg, Soshanguve, Springs"
-South Korea,"Cheju, Kimchon, Naju, Tonghae, Uijongbu"
-Spain,"A Corua (La Corua), Donostia-San Sebastin, Gijn, Ourense (Orense), Santiago de Compostela"
-Sri Lanka,Jaffna
-Sudan,"al-Qadarif, Omdurman"
-Sweden,Malm
-Switzerland,"Basel, Bern, Lausanne"
-Taiwan,"Changhwa, Chiayi, Chungho, Fengshan, Hsichuh, Lungtan, Nantou, Tanshui, Touliu, Tsaotun"
-Tanzania,"Mwanza, Tabora, Zanzibar"
-Thailand,"Nakhon Sawan, Pak Kret, Songkhla"
-Tonga,Nukualofa
-Tunisia,Sousse
-Turkey,"Adana, Balikesir, Batman, Denizli, Eskisehir, Gaziantep, Inegl, Kilis, Ktahya, Osmaniye, Sivas, Sultanbeyli, Tarsus, Tokat, Usak"
-Turkmenistan,Ashgabat
-Tuvalu,Funafuti
-Ukraine,"Kamjanets-Podilskyi, Konotop, Mukateve, ostka, Simferopol, Sumy"
-United Arab Emirates,"Abu Dhabi, al-Ayn, Sharja"
-United Kingdom,"Bradford, Dundee, London, Southampton, Southend-on-Sea, Southport, Stockport, York"
-United States,"Akron, Arlington, Augusta-Richmond County, Aurora, Bellevue, Brockton, Cape Coral, Citrus Heights, Clarksville, Compton, Dallas, Dayton, El Monte, Fontana, Garden Grove, Garland, Grand Prairie, Greensboro, Joliet, Kansas City, Lancaster, Laredo, Lincoln, Manchester, Memphis"
-Venezuela,"Barcelona, Caracas, Cuman, Maracabo, Ocumare del Tuy, Valencia, Valle de la Pascua"
-Vietnam,"Cam Ranh, Haiphong, Hanoi, Nam Dinh, Nha Trang, Vinh"
-"Virgin Islands, U.S.",Charlotte Amalie
-Yemen,"Aden, Hodeida, Sanaa, Taizz"
-Yugoslavia,"Kragujevac, Novi Sad"
-Zambia,Kitwe
\ No newline at end of file
+Afghanistan,1
+Algeria,3
+American Samoa,1
+Angola,2
+Anguilla,1
+Argentina,13
+Armenia,1
+Australia,1
+Austria,3
+Azerbaijan,2
+Bahrain,1
+Bangladesh,3
+Belarus,2
+Bolivia,2
+Brazil,28
+Brunei,1
+Bulgaria,2
+Cambodia,2
+Cameroon,2
+Canada,7
+Chad,1
+Chile,3
+China,53
+Colombia,6
+"Congo, The Democratic Republic of the",2
+Czech Republic,1
+Dominican Republic,3
+Ecuador,3
+Egypt,6
+Estonia,1
+Ethiopia,1
+Faroe Islands,1
+Finland,1
+France,4
+French Guiana,1
+French Polynesia,2
+Gambia,1
+Germany,7
+Greece,2
+Greenland,1
+Holy See (Vatican City State),1
+Hong Kong,1
+Hungary,1
+India,60
+Indonesia,14
+Iran,8
+Iraq,1
+Israel,4
+Italy,7
+Japan,31
+Kazakstan,2
+Kenya,2
+Kuwait,1
+Latvia,2
+Liechtenstein,1
+Lithuania,1
+Madagascar,1
+Malawi,1
+Malaysia,3
+Mexico,30
+Moldova,1
+Morocco,3
+Mozambique,3
+Myanmar,2
+Nauru,1
+Nepal,1
+Netherlands,5
+New Zealand,1
+Nigeria,13
+North Korea,1
+Oman,2
+Pakistan,5
+Paraguay,3
+Peru,4
+Philippines,20
+Poland,8
+Puerto Rico,2
+Romania,2
+Runion,1
+Russian Federation,28
+Saint Vincent and the Grenadines,1
+Saudi Arabia,5
+Senegal,1
+Slovakia,1
+South Africa,11
+South Korea,5
+Spain,5
+Sri Lanka,1
+Sudan,2
+Sweden,1
+Switzerland,3
+Taiwan,10
+Tanzania,3
+Thailand,3
+Tonga,1
+Tunisia,1
+Turkey,15
+Turkmenistan,1
+Tuvalu,1
+Ukraine,6
+United Arab Emirates,3
+United Kingdom,8
+United States,35
+Venezuela,7
+Vietnam,6
+"Virgin Islands, U.S.",1
+Yemen,4
+Yugoslavia,2
+Zambia,1
\ No newline at end of file
diff --git a/tests/playwright/pages/Dashboard/Grid/index.ts b/tests/playwright/pages/Dashboard/Grid/index.ts
index 3614fcf2ee..338e355493 100644
--- a/tests/playwright/pages/Dashboard/Grid/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/index.ts
@@ -318,12 +318,6 @@ export class GridPage extends BasePage {
     await expect(
       await this.cell.get({ index: 0, columnHeader: 'City List' }).locator('.nc-action-icon.nc-plus')
     ).toBeVisible();
-
-    // expand row
-    await this.cell.get({ index: 0, columnHeader: 'City List' }).hover();
-    await expect(
-      await this.cell.get({ index: 0, columnHeader: 'City List' }).locator('.nc-action-icon.nc-arrow-expand')
-    ).toBeVisible();
   }
 
   async validateRoleAccess(param: { role: string }) {

From 25b169d4f92690ece7ef2df12da232736312fcc9 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 15 Jun 2023 22:46:52 +0530
Subject: [PATCH 045/208] refactor: on meta sync create Links

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/services/meta-diffs.service.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nocodb/src/services/meta-diffs.service.ts b/packages/nocodb/src/services/meta-diffs.service.ts
index 75f21a2229..8f9a676e57 100644
--- a/packages/nocodb/src/services/meta-diffs.service.ts
+++ b/packages/nocodb/src/services/meta-diffs.service.ts
@@ -748,7 +748,7 @@ export class MetaDiffsService {
                       `${childModel.title || childModel.table_name} List`,
                     );
                     await Column.insert<LinkToAnotherRecordColumn>({
-                      uidt: UITypes.LinkToAnotherRecord,
+                      uidt: UITypes.Links,
                       title,
                       fk_model_id: parentModel.id,
                       fk_related_model_id: childModel.id,
@@ -943,7 +943,7 @@ export class MetaDiffsService {
                     `${childModel.title || childModel.table_name} List`,
                   );
                   await Column.insert<LinkToAnotherRecordColumn>({
-                    uidt: UITypes.LinkToAnotherRecord,
+                    uidt: UITypes.Links,
                     title,
                     fk_model_id: parentModel.id,
                     fk_related_model_id: childModel.id,
@@ -1054,7 +1054,7 @@ export class MetaDiffsService {
             fk_mm_parent_column_id:
               belongsToCols[1].colOptions.fk_child_column_id,
             type: RelationTypes.MANY_TO_MANY,
-            uidt: UITypes.LinkToAnotherRecord,
+            uidt: UITypes.Links,
           });
         }
         if (!isRelationAvailInB) {
@@ -1074,7 +1074,7 @@ export class MetaDiffsService {
             fk_mm_parent_column_id:
               belongsToCols[0].colOptions.fk_child_column_id,
             type: RelationTypes.MANY_TO_MANY,
-            uidt: UITypes.LinkToAnotherRecord,
+            uidt: UITypes.Links,
           });
         }
 

From cfc4d4625138755aa6fe65bb93a7e5ac3867b314 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 15 Jun 2023 22:56:32 +0530
Subject: [PATCH 046/208] refactor: on at import create instead of LTAR create
 Links

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../jobs/jobs/at-import/at-import.processor.ts | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts b/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
index bc9a247dad..4b39e38e6e 100644
--- a/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
@@ -9,6 +9,7 @@ import utc from 'dayjs/plugin/utc';
 import tinycolor from 'tinycolor2';
 import { Process, Processor } from '@nestjs/bull';
 import { Job } from 'bull';
+import { isLinksOrLTAR } from '../../../../../../nocodb-sdk/src'
 import extractRolesObj from '../../../../utils/extractRolesObj';
 import { AttachmentsService } from '../../../../services/attachments.service';
 import { ColumnsService } from '../../../../services/columns.service';
@@ -270,7 +271,7 @@ export class AtImportProcessor {
 
     // base mapping table
     const aTblNcTypeMap = {
-      foreignKey: UITypes.LinkToAnotherRecord,
+      foreignKey: UITypes.Links,
       text: UITypes.SingleLineText,
       multilineText: UITypes.LongText,
       richText: UITypes.LongText,
@@ -785,7 +786,7 @@ export class AtImportProcessor {
               const ncTbl: any = await this.columnsService.columnAdd({
                 tableId: srcTableId,
                 column: {
-                  uidt: UITypes.LinkToAnotherRecord,
+                  uidt: UITypes.Links,
                   title: ncName.title,
                   column_name: ncName.column_name,
                   parentId: srcTableId,
@@ -867,14 +868,14 @@ export class AtImportProcessor {
                 updateMigrationSkipLog(
                   parentTblSchema?.title,
                   ncLinkMappingTable[x].nc.title,
-                  UITypes.LinkToAnotherRecord,
+                  UITypes.Links,
                   'Link error',
                 );
                 continue;
               }
 
               // hack // fix me
-              if (parentLinkColumn.uidt !== 'LinkToAnotherRecord') {
+              if (!isLinksOrLTAR(parentLinkColumn)) {
                 parentLinkColumn = parentTblSchema.columns.find(
                   (col) => col.title === ncLinkMappingTable[x].nc.title + '_2',
                 );
@@ -888,7 +889,7 @@ export class AtImportProcessor {
                 //
                 childLinkColumn = childTblSchema.columns.find(
                   (col) =>
-                    col.uidt === UITypes.LinkToAnotherRecord &&
+                    isLinksOrLTAR(col) &&
                     col.colOptions.fk_child_column_id ===
                       parentLinkColumn.colOptions.fk_child_column_id &&
                     col.colOptions.fk_parent_column_id ===
@@ -900,7 +901,7 @@ export class AtImportProcessor {
                 //
                 childLinkColumn = childTblSchema.columns.find(
                   (col) =>
-                    col.uidt === UITypes.LinkToAnotherRecord &&
+                    isLinksOrLTAR(col) &&
                     col.colOptions.fk_child_column_id ===
                       parentLinkColumn.colOptions.fk_parent_column_id &&
                     col.colOptions.fk_parent_column_id ===
@@ -1431,7 +1432,7 @@ export class AtImportProcessor {
         // always process LTAR, Lookup, and Rollup columns as we delete the key after processing
         if (
           !value &&
-          dt !== UITypes.LinkToAnotherRecord &&
+          !isLinksOrLTAR(dt) &&
           dt !== UITypes.Lookup &&
           dt !== UITypes.Rollup
         ) {
@@ -1450,6 +1451,7 @@ export class AtImportProcessor {
 
           // we will pick up LTAR once all table data's are in place
           case UITypes.LinkToAnotherRecord:
+          case UITypes.Links:
             if (storeLinks) {
               if (ncLinkDataStore[table.title][record.id] === undefined)
                 ncLinkDataStore[table.title][record.id] = {
@@ -1971,7 +1973,7 @@ export class AtImportProcessor {
 
         const ncTbl = await nc_getTableSchema(aTblSchema[idx].name);
         const linkColumn = ncTbl.columns.filter(
-          (x) => x.uidt === UITypes.LinkToAnotherRecord,
+          (x) => isLinksOrLTAR(x)
         );
         const lookup = ncTbl.columns.filter((x) => x.uidt === UITypes.Lookup);
         const rollup = ncTbl.columns.filter((x) => x.uidt === UITypes.Rollup);

From 41746d34be80c1f22720b3868ee4177321e9afb8 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 15 Jun 2023 23:37:33 +0530
Subject: [PATCH 047/208] fix: for Links column keep an alias to old list
 resolver to function Lookup as expected

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/db/BaseModelSqlv2.ts | 33 +++++++++++++++++++-----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index 146cf42966..7f369a3bdd 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -1366,16 +1366,23 @@ class BaseModelSqlv2 {
           {
             // @ts-ignore
             const colOptions: LookupColumn = await column.getColOptions();
+            const relCol = await Column.get({
+              colId: colOptions.fk_relation_column_id,
+            });
+            const relColTitle =
+              relCol.uidt === UITypes.Links
+                ? `_nc_${relCol.title}`
+                : relCol.title;
             proto.__columnAliases[column.title] = {
               path: [
-                (await Column.get({ colId: colOptions.fk_relation_column_id }))
-                  ?.title,
+                relColTitle,
                 (await Column.get({ colId: colOptions.fk_lookup_column_id }))
                   ?.title,
               ],
             };
           }
           break;
+        case UITypes.Links:
         case UITypes.LinkToAnotherRecord:
           {
             this._columns[column.title] = column;
@@ -1413,7 +1420,11 @@ class BaseModelSqlv2 {
               });
               const self: BaseModelSqlv2 = this;
 
-              proto[column.title] = async function (args): Promise<any> {
+              proto[
+                column.uidt === UITypes.Links
+                  ? `_nc_${column.title}`
+                  : column.title
+              ] = async function (args): Promise<any> {
                 (listLoader as any).args = args;
                 return listLoader.load(
                   getCompositePk(self.model.primaryKeys, this),
@@ -1459,7 +1470,11 @@ class BaseModelSqlv2 {
 
               const self: BaseModelSqlv2 = this;
               // const childColumn = await colOptions.getChildColumn();
-              proto[column.title] = async function (args): Promise<any> {
+              proto[
+                column.uidt === UITypes.Links
+                  ? `_nc_${column.title}`
+                  : column.title
+              ] = async function (args): Promise<any> {
                 (listLoader as any).args = args;
                 return await listLoader.load(
                   getCompositePk(self.model.primaryKeys, this),
@@ -3020,7 +3035,10 @@ class BaseModelSqlv2 {
     const columns = await this.model.getColumns();
     const column = columns.find((c) => c.id === colId);
 
-    if (!column || ![UITypes.LinkToAnotherRecord, UITypes.Links].includes(column.uidt))
+    if (
+      !column ||
+      ![UITypes.LinkToAnotherRecord, UITypes.Links].includes(column.uidt)
+    )
       NcError.notFound('Column not found');
 
     const colOptions = await column.getColOptions<LinkToAnotherRecordColumn>();
@@ -3139,7 +3157,10 @@ class BaseModelSqlv2 {
     const columns = await this.model.getColumns();
     const column = columns.find((c) => c.id === colId);
 
-    if (!column || ![UITypes.LinkToAnotherRecord, UITypes.Links].includes(column.uidt))
+    if (
+      !column ||
+      ![UITypes.LinkToAnotherRecord, UITypes.Links].includes(column.uidt)
+    )
       NcError.notFound('Column not found');
 
     const colOptions = await column.getColOptions<LinkToAnotherRecordColumn>();

From d652cbd82b7f5253b187429be0cd2cc83e79a8c2 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 15 Jun 2023 23:39:00 +0530
Subject: [PATCH 048/208] refactor: update the prefix

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/db/BaseModelSqlv2.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index 7f369a3bdd..077bec27ba 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -1371,7 +1371,7 @@ class BaseModelSqlv2 {
             });
             const relColTitle =
               relCol.uidt === UITypes.Links
-                ? `_nc_${relCol.title}`
+                ? `_nc_lk_${relCol.title}`
                 : relCol.title;
             proto.__columnAliases[column.title] = {
               path: [
@@ -1422,7 +1422,7 @@ class BaseModelSqlv2 {
 
               proto[
                 column.uidt === UITypes.Links
-                  ? `_nc_${column.title}`
+                  ? `_nc_lk_${column.title}`
                   : column.title
               ] = async function (args): Promise<any> {
                 (listLoader as any).args = args;
@@ -1472,7 +1472,7 @@ class BaseModelSqlv2 {
               // const childColumn = await colOptions.getChildColumn();
               proto[
                 column.uidt === UITypes.Links
-                  ? `_nc_${column.title}`
+                  ? `_nc_lk_${column.title}`
                   : column.title
               ] = async function (args): Promise<any> {
                 (listLoader as any).args = args;

From aa2d9f3d24f211b5acb29c5a673c896b370dcfcc Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 15 Jun 2023 23:56:10 +0530
Subject: [PATCH 049/208] refactor(gui): use id instead of alias to avoid
 issues with different base

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../composables/useSmartsheetRowStore.ts       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui/composables/useSmartsheetRowStore.ts b/packages/nc-gui/composables/useSmartsheetRowStore.ts
index 285b54c954..6b9973e846 100644
--- a/packages/nc-gui/composables/useSmartsheetRowStore.ts
+++ b/packages/nc-gui/composables/useSmartsheetRowStore.ts
@@ -80,11 +80,11 @@ const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState(
       try {
         await $api.dbTableRow.nestedAdd(
           NOCO,
-          project.value.title as string,
-          metaValue?.title as string,
+          project.value.id as string,
+          metaValue?.id as string,
           rowId,
           type as 'mm' | 'hm',
-          column.title as string,
+          column.id as string,
           relatedRowId,
         )
       } catch (e: any) {
@@ -143,11 +143,11 @@ const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState(
             if (!currentRow.value.row[column.title!]) return
             await $api.dbTableRow.nestedRemove(
               NOCO,
-              project.value.title as string,
-              meta.value?.title as string,
+              project.value.id as string,
+              meta.value?.id as string,
               extractPkFromRow(currentRow.value.row, meta.value?.columns as ColumnType[]),
               'bt' as any,
-              column.title as string,
+              column.id as string,
               extractPkFromRow(currentRow.value.row[column.title!], relatedTableMeta?.columns as ColumnType[]),
             )
             currentRow.value.row[column.title!] = null
@@ -155,11 +155,11 @@ const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState(
             for (const link of (currentRow.value.row[column.title!] as Record<string, any>[]) || []) {
               await $api.dbTableRow.nestedRemove(
                 NOCO,
-                project.value.title as string,
-                meta.value?.title as string,
+                project.value.id as string,
+                meta.value?.id as string,
                 extractPkFromRow(currentRow.value.row, meta.value?.columns as ColumnType[]),
                 (<LinkToAnotherRecordType>column?.colOptions).type as 'hm' | 'mm',
-                column.title as string,
+                column.id as string,
                 extractPkFromRow(link, relatedTableMeta?.columns as ColumnType[]),
               )
             }

From 4921bfacdbdb660c35c92da8b126717fd4a30d46 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 16 Jun 2023 00:09:58 +0530
Subject: [PATCH 050/208] fix: in shared meta api include Links related meta as
 well

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/services/public-metas.service.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/services/public-metas.service.ts b/packages/nocodb/src/services/public-metas.service.ts
index 59ad1ef7e5..3bed31b020 100644
--- a/packages/nocodb/src/services/public-metas.service.ts
+++ b/packages/nocodb/src/services/public-metas.service.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { ErrorMessages, RelationTypes, UITypes } from 'nocodb-sdk';
+import { isLinksOrLTAR } from '../../../nocodb-sdk/src'
 import { NcError } from '../helpers/catchError';
 import { Base, Column, Model, Project, View } from '../models';
 import type { LinkToAnotherRecordColumn, LookupColumn } from '../models';
@@ -41,7 +42,7 @@ export class PublicMetasService {
           column.pk ||
           view.model.columns.some(
             (c1) =>
-              c1.uidt === UITypes.LinkToAnotherRecord &&
+              isLinksOrLTAR(c1.uidt) &&
               (<LinkToAnotherRecordColumn>c1.colOptions).type ===
                 RelationTypes.BELONGS_TO &&
               view.columns.some((vc) => vc.fk_column_id === c1.id && vc.show) &&
@@ -77,7 +78,7 @@ export class PublicMetasService {
     col: Column<any>;
     relatedMetas: Record<string, Model>;
   }) {
-    if (UITypes.LinkToAnotherRecord === col.uidt) {
+    if (isLinksOrLTAR(col.uidt)) {
       await this.extractLTARRelatedMetas({
         ltarColOption: await col.getColOptions<LinkToAnotherRecordColumn>(),
         relatedMetas,

From def2eef84b1c7afabe36b3e6f6f9e1a4d2ed1777 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 16 Jun 2023 12:45:18 +0530
Subject: [PATCH 051/208] refactor: set default value as placeholder for
 singular and plural

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

diff --git a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
index 0e5df58ba3..6bb12006eb 100644
--- a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
@@ -33,13 +33,13 @@ vModel.value.meta = {
   <a-row class="my-2" gutter="8">
     <a-col :span="12">
       <a-form-item v-bind="validateInfos['meta.singular']" label="Singular Label">
-        <a-input v-model:value="vModel.meta.singular" class="!w-full nc-link-singular" />
+        <a-input placeholder="Link" v-model:value="vModel.meta.singular" class="!w-full nc-link-singular" />
       </a-form-item>
     </a-col>
 
     <a-col :span="12">
       <a-form-item v-bind="validateInfos['meta.plural']" label="Plural Label">
-        <a-input v-model:value="vModel.meta.plural" class="!w-full nc-link-plural" />
+        <a-input placeholder="Links" v-model:value="vModel.meta.plural" class="!w-full nc-link-plural" />
       </a-form-item>
     </a-col>
   </a-row>

From 985a35fcc60606603afd5f1499597d53b8a6332a Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 16 Jun 2023 12:52:58 +0530
Subject: [PATCH 052/208] refactor: hide Link to another record option from
 uidt

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/smartsheet/column/EditOrAdd.vue | 6 +++++-
 packages/nc-gui/utils/columnUtils.ts                       | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index 36100f7e4f..c594fb96dc 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -64,9 +64,11 @@ const geoDataToggleCondition = (t: { name: UITypes }) => {
   return betaFeatureToggleState.show ? betaFeatureToggleState.show : !t.name.includes(UITypes.GeoData)
 }
 
+const showDeprecated = $ref(false)
+
 const uiTypesOptions = computed<typeof uiTypes>(() => {
   return [
-    ...uiTypes.filter((t) => geoDataToggleCondition(t) && (!isEdit.value || !t.virtual)),
+    ...uiTypes.filter((t) => geoDataToggleCondition(t) && (!isEdit.value || !t.virtual) && (!t.deprecated || showDeprecated)),
     ...(!isEdit.value && meta?.value?.columns?.every((c) => !c.pk)
       ? [
           {
@@ -187,11 +189,13 @@ useEventListener('keydown', (e: KeyboardEvent) => {
             :disabled="isKanban"
             dropdown-class-name="nc-dropdown-column-type"
             @change="onUidtOrIdTypeChange"
+            @dblclick="showDeprecated = !showDeprecated"
           >
             <a-select-option v-for="opt of uiTypesOptions" :key="opt.name" :value="opt.name" v-bind="validateInfos.uidt">
               <div class="flex gap-1 items-center">
                 <component :is="opt.icon" class="text-grey" />
                 {{ opt.name }}
+                <span v-if="opt.deprecated" class="!text-xs !text-gray-300">(Deprecated)</span>
               </div>
             </a-select-option>
           </a-select>
diff --git a/packages/nc-gui/utils/columnUtils.ts b/packages/nc-gui/utils/columnUtils.ts
index e04279565f..5e407f3a3f 100644
--- a/packages/nc-gui/utils/columnUtils.ts
+++ b/packages/nc-gui/utils/columnUtils.ts
@@ -14,6 +14,7 @@ const uiTypes = [
     name: UITypes.LinkToAnotherRecord,
     icon: iconMap.link,
     virtual: 1,
+    deprecated: 1,
   },
   {
     name: UITypes.Lookup,

From f861144442306a20ba78e721bcafde1840e9c133 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 16 Jun 2023 15:08:37 +0530
Subject: [PATCH 053/208] fix: bug with duplicating table (WIP)

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../modules/jobs/jobs/export-import/duplicate.processor.ts  | 6 +++---
 .../src/modules/jobs/jobs/export-import/import.service.ts   | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts
index 03a49ffff6..42e54df39a 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts
@@ -2,8 +2,8 @@ import { Readable } from 'stream';
 import { Process, Processor } from '@nestjs/bull';
 import { Job } from 'bull';
 import papaparse from 'papaparse';
-import { UITypes } from 'nocodb-sdk';
 import { Logger } from '@nestjs/common';
+import { isLinksOrLTAR } from '../../../../../../nocodb-sdk/src'
 import { Base, Column, Model, Project } from '../../../../models';
 import { ProjectsService } from '../../../../services/projects.service';
 import { findWithIdentifier } from '../../../../helpers/exportImportHelpers';
@@ -137,7 +137,7 @@ export class DuplicateProcessor {
     await sourceModel.getColumns();
 
     const relatedModelIds = sourceModel.columns
-      .filter((col) => col.uidt === UITypes.LinkToAnotherRecord)
+      .filter((col) => isLinksOrLTAR(col))
       .map((col) => col.colOptions.fk_related_model_id)
       .filter((id) => id);
 
@@ -186,7 +186,7 @@ export class DuplicateProcessor {
         const bts = md.columns
           .filter(
             (c) =>
-              c.uidt === UITypes.LinkToAnotherRecord &&
+              isLinksOrLTAR(c) &&
               c.colOptions.type === 'bt' &&
               c.colOptions.fk_related_model_id === modelId,
           )
diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
index ad4b83a82b..68289259c0 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
@@ -1,6 +1,7 @@
 import { UITypes, ViewTypes } from 'nocodb-sdk';
 import { Injectable, Logger } from '@nestjs/common';
 import papaparse from 'papaparse';
+import { isLinksOrLTAR } from '../../../../../../nocodb-sdk/src'
 import {
   findWithIdentifier,
   generateUniqueName,
@@ -125,7 +126,7 @@ export class ImportService {
 
       const reducedColumnSet = modelData.columns.filter(
         (a) =>
-          a.uidt !== UITypes.LinkToAnotherRecord &&
+          !isLinksOrLTAR(a) &&
           a.uidt !== UITypes.Lookup &&
           a.uidt !== UITypes.Rollup &&
           a.uidt !== UITypes.Formula &&
@@ -166,7 +167,7 @@ export class ImportService {
       const table = tableReferences.get(modelData.id);
 
       const linkedColumnSet = modelData.columns.filter(
-        (a) => a.uidt === UITypes.LinkToAnotherRecord,
+        (a) => isLinksOrLTAR(a)
       );
 
       for (const col of linkedColumnSet) {

From 7263643c34422b215a1ef06dbc1dc0e5a5ce6b58 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 16 Jun 2023 16:02:38 +0530
Subject: [PATCH 054/208] fix: bug with duplicating table

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../src/modules/jobs/jobs/export-import/export.service.ts   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
index f72ec18d13..5e598a3180 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
@@ -1,5 +1,5 @@
 import { Readable } from 'stream';
-import { UITypes, ViewTypes } from 'nocodb-sdk';
+import { isLinksOrLTAR, UITypes, ViewTypes } from 'nocodb-sdk'
 import { unparse } from 'papaparse';
 import { Injectable, Logger } from '@nestjs/common';
 import NcConnectionMgrv2 from '../../../../utils/common/NcConnectionMgrv2';
@@ -352,13 +352,13 @@ export class ExportService {
           .map((c) => c.title)
           .join(',')
       : model.columns
-          .filter((c) => c.uidt !== UITypes.LinkToAnotherRecord)
+          .filter((c) => !isLinksOrLTAR(c))
           .map((c) => c.title)
           .join(',');
 
     const mmColumns = model.columns.filter(
       (col) =>
-        col.uidt === UITypes.LinkToAnotherRecord &&
+        isLinksOrLTAR(col) &&
         col.colOptions?.type === 'mm',
     );
 

From 181a05f90ac2c5d92ddf035b9b6ea6db94084742 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 16 Jun 2023 16:50:08 +0530
Subject: [PATCH 055/208] fix: make it as text when view is locked

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/virtual-cell/Links.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index 08230d01ce..374bb90b5c 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -59,19 +59,25 @@ const onAttachRecord = () => {
   childListDlg.value = false
   listItemsDlg.value = true
 }
+
+const openChildList = () => {
+  if(!isLocked.value)
+  childListDlg = true
+}
 </script>
 
 <template>
   <div class="flex w-full items-center">
     <template v-if="!isForm">
       <div class="flex-grow block">
-        <a
+        <component
+          :is="isLocked ? 'span' : 'a'"
           class="text-center pl-3 nc-datatype-link"
           :class="{ '!text-gray-300': !value }"
-          @click.stop.prevent="childListDlg = true"
+          @click.stop.prevent="openChildList"
         >
           {{ textVal }}
-        </a>
+        </component>
       </div>
 
       <div v-if="!isLocked && !isUnderLookup" class="flex justify-end gap-1 min-h-[30px] items-center">

From b8921515ec76aabe4ea1adde54a5d4f73fdb9dd0 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 16 Jun 2023 18:26:00 +0530
Subject: [PATCH 056/208] refactor: disable links column clear support

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

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index de2a35c3b1..5c9ef71c63 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -493,6 +493,10 @@ const rowRefs = $ref<any[]>()
 async function clearCell(ctx: { row: number; col: number } | null, skipUpdate = false) {
   if (!ctx || !hasEditPermission || (!isLinksOrLTAR(fields.value[ctx.col]) && isVirtualCol(fields.value[ctx.col]))) return
 
+  if (fields.value[ctx.col]?.uidt === UITypes.Links) {
+    return message.info('Links column clear is not supported yet')
+  }
+
   const rowObj = data.value[ctx.row]
   const columnObj = fields.value[ctx.col]
 

From 655503062cd63423da2ab18bb4b216b375228ef5 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 16 Jun 2023 19:40:56 +0530
Subject: [PATCH 057/208] fix: sort caching bug fix

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/models/Sort.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nocodb/src/models/Sort.ts b/packages/nocodb/src/models/Sort.ts
index 7436da4021..264fef315d 100644
--- a/packages/nocodb/src/models/Sort.ts
+++ b/packages/nocodb/src/models/Sort.ts
@@ -78,13 +78,13 @@ export default class Sort {
 
     const row = await ncMeta.metaInsert2(null, null, MetaTable.SORT, insertObj);
     if (sortObj.push_to_top) {
-      // todo: delete cache
       const sortList = await ncMeta.metaList2(null, null, MetaTable.SORT, {
         condition: { fk_view_id: sortObj.fk_view_id },
         orderBy: {
           order: 'asc',
         },
       });
+      await NocoCache.delAll(CacheScope.SORT, `${sortObj.fk_view_id}:*`);
       await NocoCache.setList(CacheScope.SORT, [sortObj.fk_view_id], sortList);
     } else {
       await NocoCache.appendToList(

From 111db2c394769ca1d6300bfb99e752953cd4a26a Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 16 Jun 2023 19:44:22 +0530
Subject: [PATCH 058/208] fix: include Links column under sort/filter

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../smartsheet/toolbar/FieldListAutoCompleteDropdown.vue       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/FieldListAutoCompleteDropdown.vue b/packages/nc-gui/components/smartsheet/toolbar/FieldListAutoCompleteDropdown.vue
index 10a99a212a..3b0957ddf5 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FieldListAutoCompleteDropdown.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FieldListAutoCompleteDropdown.vue
@@ -25,6 +25,9 @@ const { showSystemFields, metaColumnById } = useViewColumns(activeView, meta)
 const options = computed<SelectProps['options']>(() =>
   meta.value?.columns
     ?.filter((c: ColumnType) => {
+      if (c.uidt === UITypes.Links) {
+        return true
+      }
       if (isSystemColumn(metaColumnById?.value?.[c.id!])) {
         return (
           /** if the field is used in filter, then show it anyway */

From f595b33c9d71ef88732ec8471bcd83d223edc820 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 16 Jun 2023 22:55:00 +0530
Subject: [PATCH 059/208] feat: on dblclick/click+enter open modal

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/virtual-cell/Links.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index 374bb90b5c..5493c0dc70 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -2,7 +2,7 @@
 import { computed } from '@vue/reactivity'
 import type { ColumnType } from 'nocodb-sdk'
 import type { Ref } from 'vue'
-import { CellValueInj, ColumnInj, inject } from '#imports'
+import { CellValueInj, ColumnInj, inject, useSelectedCellKeyupListener } from '#imports'
 
 const value = inject(CellValueInj)
 
@@ -64,10 +64,19 @@ const openChildList = () => {
   if(!isLocked.value)
   childListDlg = true
 }
+
+useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEvent) => {
+  switch (e.key) {
+    case 'Enter':
+      listItemsDlg.value = true
+      e.stopPropagation()
+      break
+  }
+})
 </script>
 
 <template>
-  <div class="flex w-full items-center">
+  <div class="flex w-full items-center" @dblclick.stop="listItemsDlg = true">
     <template v-if="!isForm">
       <div class="flex-grow block">
         <component

From f6f567fc4fc4d2fd5d5729a26e1683bb3b6e8087 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 17 Jun 2023 12:51:27 +0530
Subject: [PATCH 060/208] fix: refer nocodb-sdk properly

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../src/modules/jobs/jobs/at-import/at-import.processor.ts      | 2 +-
 .../src/modules/jobs/jobs/export-import/duplicate.processor.ts  | 2 +-
 .../src/modules/jobs/jobs/export-import/import.service.ts       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts b/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
index 4b39e38e6e..fddf61c6c0 100644
--- a/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
@@ -9,7 +9,7 @@ import utc from 'dayjs/plugin/utc';
 import tinycolor from 'tinycolor2';
 import { Process, Processor } from '@nestjs/bull';
 import { Job } from 'bull';
-import { isLinksOrLTAR } from '../../../../../../nocodb-sdk/src'
+import { isLinksOrLTAR } from 'nocodb-sdk';
 import extractRolesObj from '../../../../utils/extractRolesObj';
 import { AttachmentsService } from '../../../../services/attachments.service';
 import { ColumnsService } from '../../../../services/columns.service';
diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts
index 42e54df39a..d9319c0005 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts
@@ -3,7 +3,7 @@ import { Process, Processor } from '@nestjs/bull';
 import { Job } from 'bull';
 import papaparse from 'papaparse';
 import { Logger } from '@nestjs/common';
-import { isLinksOrLTAR } from '../../../../../../nocodb-sdk/src'
+import { isLinksOrLTAR } from 'nocodb-sdk';
 import { Base, Column, Model, Project } from '../../../../models';
 import { ProjectsService } from '../../../../services/projects.service';
 import { findWithIdentifier } from '../../../../helpers/exportImportHelpers';
diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
index 68289259c0..887d6a7f31 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
@@ -1,7 +1,7 @@
 import { UITypes, ViewTypes } from 'nocodb-sdk';
 import { Injectable, Logger } from '@nestjs/common';
 import papaparse from 'papaparse';
-import { isLinksOrLTAR } from '../../../../../../nocodb-sdk/src'
+import { isLinksOrLTAR } from 'nocodb-sdk';
 import {
   findWithIdentifier,
   generateUniqueName,

From ff2e424a14de3a864d5c56581363c75aa2511415 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 17 Jun 2023 14:12:50 +0530
Subject: [PATCH 061/208] refactor: error code corrections

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/helpers/populateMeta.ts          | 2 +-
 packages/nocodb/src/services/public-metas.service.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/helpers/populateMeta.ts b/packages/nocodb/src/helpers/populateMeta.ts
index e2c0033d5c..edd03018d7 100644
--- a/packages/nocodb/src/helpers/populateMeta.ts
+++ b/packages/nocodb/src/helpers/populateMeta.ts
@@ -1,7 +1,7 @@
 import { ModelTypes, UITypes, ViewTypes } from 'nocodb-sdk';
 import { isVirtualCol, RelationTypes } from 'nocodb-sdk';
 import { pluralize, singularize } from 'inflection';
-import { isLinksOrLTAR } from '../../../nocodb-sdk/src'
+import { isLinksOrLTAR } from 'nocodb-sdk'
 import { GridViewColumn } from '../models';
 import Column from '../models/Column';
 import Model from '../models/Model';
diff --git a/packages/nocodb/src/services/public-metas.service.ts b/packages/nocodb/src/services/public-metas.service.ts
index 3bed31b020..b8dacc286d 100644
--- a/packages/nocodb/src/services/public-metas.service.ts
+++ b/packages/nocodb/src/services/public-metas.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { ErrorMessages, RelationTypes, UITypes } from 'nocodb-sdk';
-import { isLinksOrLTAR } from '../../../nocodb-sdk/src'
+import { isLinksOrLTAR } from 'nocodb-sdk'
 import { NcError } from '../helpers/catchError';
 import { Base, Column, Model, Project, View } from '../models';
 import type { LinkToAnotherRecordColumn, LookupColumn } from '../models';

From 4c60caabb4bbd36ae310b59bffb93f04a40707b5 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 17 Jun 2023 16:09:46 +0530
Subject: [PATCH 062/208] fix: on click open the child list

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

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index 5493c0dc70..bd1ff09f47 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -61,8 +61,7 @@ const onAttachRecord = () => {
 }
 
 const openChildList = () => {
-  if(!isLocked.value)
-  childListDlg = true
+  if (!isLocked.value) childListDlg.value = true
 }
 
 useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEvent) => {

From c561f28b967690fc753b0890a258f39e5a8f555a Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 17 Jun 2023 16:22:03 +0530
Subject: [PATCH 063/208] fix: on column creation populate plural/singular

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/helpers/columnHelpers.ts  | 17 +++++-----
 packages/nocodb/src/models/Column.ts          |  2 +-
 .../nocodb/src/services/columns.service.ts    | 31 +++++++------------
 3 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/packages/nocodb/src/helpers/columnHelpers.ts b/packages/nocodb/src/helpers/columnHelpers.ts
index 159d79b8c2..832732f014 100644
--- a/packages/nocodb/src/helpers/columnHelpers.ts
+++ b/packages/nocodb/src/helpers/columnHelpers.ts
@@ -66,7 +66,12 @@ export async function createHmAndBtColumn(
       await parent.getColumns(),
       type === 'hm' && !isLinks ? alias : `${child.title} List`,
     );
-    const col = await Column.insert({
+    const meta = {
+      plural: columnMeta?.plural || pluralize(child.title),
+      singular: columnMeta?.singular || singularize(child.title),
+    };
+
+    await Column.insert({
       title,
       fk_model_id: parent.id,
       uidt: isLinks ? UITypes.Links : UITypes.LinkToAnotherRecord,
@@ -78,14 +83,8 @@ export async function createHmAndBtColumn(
       system: isSystemCol,
       fk_col_name: fkColName,
       fk_index_name: fkColName,
+      meta,
     });
-
-    // if (!isSystemCol && isLinks)
-    //   await populateRollupForLTAR({
-    //     column: col,
-    //     columnMeta,
-    //     alias
-    //   });
   }
 }
 
@@ -222,7 +221,7 @@ export const generateFkName = (parent: TableType, child: TableType) => {
 export async function populateRollupForLTAR({
   column,
   columnMeta,
-  alias
+  alias,
 }: {
   column: Column;
   columnMeta?: any;
diff --git a/packages/nocodb/src/models/Column.ts b/packages/nocodb/src/models/Column.ts
index 088727ce66..b7f1eab8f4 100644
--- a/packages/nocodb/src/models/Column.ts
+++ b/packages/nocodb/src/models/Column.ts
@@ -12,7 +12,7 @@ import { NcError } from '../helpers/catchError';
 import { extractProps } from '../helpers/extractProps';
 import { stringifyMetaProp } from '../utils/modelUtils';
 import FormulaColumn from './FormulaColumn';
-import { LinksColumn } from './index'
+import { LinksColumn } from './index';
 import LinkToAnotherRecordColumn from './LinkToAnotherRecordColumn';
 import LookupColumn from './LookupColumn';
 import RollupColumn from './RollupColumn';
diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index 84f4fb2f28..c27029212e 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -8,12 +8,12 @@ import {
   UITypes,
 } from 'nocodb-sdk';
 import { T } from 'nc-help';
+import { pluralize, singularize } from 'inflection';
 import formulaQueryBuilderv2 from '../db/formulav2/formulaQueryBuilderv2';
 import ProjectMgrv2 from '../db/sql-mgr/v2/ProjectMgrv2';
 import {
   createHmAndBtColumn,
   generateFkName,
-  populateRollupForLTAR,
   randomID,
   validateLookupPayload,
   validatePayload,
@@ -33,7 +33,6 @@ import {
   Base,
   Column,
   FormulaColumn,
-  GridViewColumn,
   KanbanView,
   Model,
 } from '../models';
@@ -41,11 +40,7 @@ import Noco from '../Noco';
 import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2';
 import { MetaTable } from '../utils/globals';
 import { MetaService } from '../meta/meta.service';
-import type {
-  LinkToAnotherRecordColumn,
-  Project,
-  RollupColumn,
-} from '../models';
+import type { LinkToAnotherRecordColumn, Project } from '../models';
 import type SqlMgrv2 from '../db/sql-mgr/v2/SqlMgrv2';
 import type {
   ColumnReqType,
@@ -1801,11 +1796,15 @@ export class ColumnsService {
         fk_mm_parent_column_id: parentCol.id,
         fk_related_model_id: parent.id,
         virtual: (param.column as LinkToAnotherColumnReqType).virtual,
+        meta: {
+          plural: pluralize(parent.title),
+          singular: singularize(parent.title),
+        },
       });
       const col2 = await Column.insert({
         title: getUniqueColumnAliasName(
           await parent.getColumns(),
-           param.column.title ?? `${child.title} List`,
+          param.column.title ?? `${child.title} List`,
         ),
 
         uidt: isLinks ? UITypes.Links : UITypes.LinkToAnotherRecord,
@@ -1821,20 +1820,12 @@ export class ColumnsService {
         fk_mm_parent_column_id: childCol.id,
         fk_related_model_id: child.id,
         virtual: (param.column as LinkToAnotherColumnReqType).virtual,
+        meta: {
+          plural: param.column['meta']?.plural || pluralize(child.title),
+          singular: param.column['meta']?.singular || singularize(child.title),
+        },
       });
 
-      // if (isLinks) {
-      //   await populateRollupForLTAR({
-      //     column: col1,
-      //     // columnMeta: param.column['meta'],
-      //   });
-      //   await populateRollupForLTAR({
-      //     column: col2,
-      //     columnMeta: param.column['meta'],
-      //     alias: param.column.title,
-      //   });
-      // }
-
       // todo: create index for virtual relations as well
       // create index for foreign key in pg
       if (param.base.type === 'pg') {

From 029730aa93b8377345941d94120b7c6f9914a753 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 17 Jun 2023 16:55:32 +0530
Subject: [PATCH 064/208] fix: on self reference hide the second column
 generated

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/helpers/columnHelpers.ts    | 3 ++-
 packages/nocodb/src/services/columns.service.ts | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/nocodb/src/helpers/columnHelpers.ts b/packages/nocodb/src/helpers/columnHelpers.ts
index 832732f014..d156ae7c8a 100644
--- a/packages/nocodb/src/helpers/columnHelpers.ts
+++ b/packages/nocodb/src/helpers/columnHelpers.ts
@@ -55,7 +55,8 @@ export async function createHmAndBtColumn(
       fk_parent_column_id: parent.primaryKey.id,
       fk_related_model_id: parent.id,
       virtual,
-      system: isSystemCol,
+      // if self referencing treat it as system field to hide from ui
+      system: isSystemCol || parent.id === child.id,
       fk_col_name: fkColName,
       fk_index_name: fkColName,
     });
diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index c27029212e..f304e12b47 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -1776,7 +1776,7 @@ export class ColumnsService {
         true,
       );
 
-      const col1 = await Column.insert({
+      await Column.insert({
         title: getUniqueColumnAliasName(
           await child.getColumns(),
           `${parent.title} List`,
@@ -1800,8 +1800,10 @@ export class ColumnsService {
           plural: pluralize(parent.title),
           singular: singularize(parent.title),
         },
+        // if self referencing treat it as system field to hide from ui
+        system: parent.id === child.id,
       });
-      const col2 = await Column.insert({
+      await Column.insert({
         title: getUniqueColumnAliasName(
           await parent.getColumns(),
           param.column.title ?? `${child.title} List`,

From 71daeaf2e9a556ff88c28f5829d601af0584cfeb Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 17 Jun 2023 16:59:02 +0530
Subject: [PATCH 065/208] fix: on enter key press open child list

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

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index bd1ff09f47..ba8332a851 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -67,7 +67,7 @@ const openChildList = () => {
 useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEvent) => {
   switch (e.key) {
     case 'Enter':
-      listItemsDlg.value = true
+      childListDlg.value = true
       e.stopPropagation()
       break
   }

From 90a1748fd42f73ad8324b12faa2a10be9cf322da Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 17 Jun 2023 17:02:19 +0530
Subject: [PATCH 066/208] fix: on double click open child list and block it if
 locked

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

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index ba8332a851..dd82257fa6 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -67,6 +67,7 @@ const openChildList = () => {
 useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEvent) => {
   switch (e.key) {
     case 'Enter':
+      if (isLocked.value) return
       childListDlg.value = true
       e.stopPropagation()
       break
@@ -75,7 +76,7 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEven
 </script>
 
 <template>
-  <div class="flex w-full items-center" @dblclick.stop="listItemsDlg = true">
+  <div class="flex w-full items-center" @dblclick.stop="openChildList = true">
     <template v-if="!isForm">
       <div class="flex-grow block">
         <component

From ff321d43c18825f57388a7820ccff1ecea9a2e68 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 17 Jun 2023 17:18:24 +0530
Subject: [PATCH 067/208] fix: expand only on second click and show plus icon
 only on hover

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/virtual-cell/Links.vue  | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index dd82257fa6..95bf5947e9 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -2,7 +2,7 @@
 import { computed } from '@vue/reactivity'
 import type { ColumnType } from 'nocodb-sdk'
 import type { Ref } from 'vue'
-import { CellValueInj, ColumnInj, inject, useSelectedCellKeyupListener } from '#imports'
+import { ActiveCellInj, CellValueInj, ColumnInj, EditModeInj, MetaInj, inject, useSelectedCellKeyupListener } from '#imports'
 
 const value = inject(CellValueInj)
 
@@ -20,10 +20,14 @@ const isForm = inject(IsFormInj)
 
 const readOnly = inject(ReadonlyInj, ref(false))
 
-const isLocked = inject(IsLockedInj)
+const isLocked = inject(IsLockedInj, ref(false))
 
 const isUnderLookup = inject(IsUnderLookupInj, ref(false))
 
+const active = inject(ActiveCellInj, ref(false))
+
+const editable = inject(EditModeInj, ref(false))
+
 const listItemsDlg = ref(false)
 
 const childListDlg = ref(false)
@@ -61,7 +65,9 @@ const onAttachRecord = () => {
 }
 
 const openChildList = () => {
-  if (!isLocked.value) childListDlg.value = true
+  if (!isLocked.value && (editable.value || active.value)) {
+    childListDlg.value = true
+  }
 }
 
 useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEvent) => {
@@ -76,7 +82,7 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEven
 </script>
 
 <template>
-  <div class="flex w-full items-center" @dblclick.stop="openChildList = true">
+  <div class="flex w-full items-center nc-links-wrapper" @dblclick.stop="openChildList = true">
     <template v-if="!isForm">
       <div class="flex-grow block">
         <component
@@ -93,7 +99,7 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEven
         <GeneralIcon
           v-if="!readOnly && isUIAllowed('xcDatatableEditable')"
           icon="plus"
-          class="select-none text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-plus"
+          class="select-none !text-xxl nc-action-icon text-gray-500/50 hover:text-gray-500 nc-plus"
           @click.stop="listItemsDlg = true"
         />
       </div>
@@ -108,3 +114,13 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEven
     />
   </div>
 </template>
+
+<style scoped>
+.nc-action-icon {
+  @apply hidden cursor-pointer;
+}
+
+.nc-links-wrapper:hover .nc-action-icon {
+  @apply flex;
+}
+</style>

From ff7974a38a3952042dccfc6fa2d40b3e366711ff Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 17 Jun 2023 17:37:48 +0530
Subject: [PATCH 068/208] revert: on double click open child list and avoid it

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/virtual-cell/Links.vue | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index 95bf5947e9..b951567848 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -65,7 +65,7 @@ const onAttachRecord = () => {
 }
 
 const openChildList = () => {
-  if (!isLocked.value && (editable.value || active.value)) {
+  if (!isLocked.value) {
     childListDlg.value = true
   }
 }
@@ -114,13 +114,3 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEven
     />
   </div>
 </template>
-
-<style scoped>
-.nc-action-icon {
-  @apply hidden cursor-pointer;
-}
-
-.nc-links-wrapper:hover .nc-action-icon {
-  @apply flex;
-}
-</style>

From 21de7fecd6e94aec9095eff2f035ad24c020648f Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 17 Jun 2023 18:10:38 +0530
Subject: [PATCH 069/208] fix: on clicking cell open the expanded form

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

diff --git a/packages/nc-gui/components/virtual-cell/components/ItemChip.vue b/packages/nc-gui/components/virtual-cell/components/ItemChip.vue
index 13ada13c8c..aa0c6be6be 100644
--- a/packages/nc-gui/components/virtual-cell/components/ItemChip.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ItemChip.vue
@@ -40,7 +40,7 @@ const isLocked = inject(IsLockedInj, ref(false))
 const { open } = useExpandedFormDetached()
 
 function openExpandedForm() {
-  if (!readOnly && !isLocked.value) {
+  if (!readOnly.value && !isLocked.value) {
     open({
       isOpen: true,
       row: { row: item, rowMeta: {}, oldRow: { ...item } },

From c65ea95d8a797749b2f526ce304ba36944ffff32 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 17 Jun 2023 18:27:21 +0530
Subject: [PATCH 070/208] refactor: change label in rollup and lookup options

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/smartsheet/column/LookupOptions.vue | 2 +-
 packages/nc-gui/components/smartsheet/column/RollupOptions.vue | 2 +-
 packages/nc-gui/lang/en.json                                   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
index b4e0e64ce1..5647459141 100644
--- a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
@@ -69,7 +69,7 @@ const onRelationColChange = () => {
 <template>
   <div class="p-6 w-full flex flex-col border-2 mb-2 mt-4">
     <div class="w-full flex flex-row space-x-2">
-      <a-form-item class="flex w-1/2 pb-2" :label="$t('labels.linkToAnotherRecord')" v-bind="validateInfos.fk_relation_column_id">
+      <a-form-item class="flex w-1/2 pb-2" :label="$t('labels.links')" v-bind="validateInfos.fk_relation_column_id">
         <a-select
           v-model:value="vModel.fk_relation_column_id"
           dropdown-class-name="!w-64 nc-dropdown-relation-table"
diff --git a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
index 2fe8b4b7fc..d077fff692 100644
--- a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
@@ -89,7 +89,7 @@ const onRelationColChange = () => {
 <template>
   <div class="p-6 w-full flex flex-col border-2 mb-2 mt-4">
     <div class="w-full flex flex-row space-x-2">
-      <a-form-item class="flex w-1/2 pb-2" :label="$t('labels.linkToAnotherRecord')" v-bind="validateInfos.fk_relation_column_id">
+      <a-form-item class="flex w-1/2 pb-2" :label="$t('labels.links')" v-bind="validateInfos.fk_relation_column_id">
         <a-select
           v-model:value="vModel.fk_relation_column_id"
           dropdown-class-name="!w-64 nc-dropdown-relation-table"
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 7e2154a59d..4be39193c9 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -289,6 +289,7 @@
     "childTable": "Child table",
     "childColumn": "Child column",
     "linkToAnotherRecord": "Link to another record",
+    "links": "Links",
     "onUpdate": "On Update",
     "onDelete": "On Delete",
     "account": "Account",

From 093f8ac276ee43a0d6815d63d55a04e2b149077a Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sun, 18 Jun 2023 02:29:02 +0530
Subject: [PATCH 071/208] refactor: exclude Links in table search

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/smartsheet/toolbar/SearchData.vue      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue b/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
index 0612387bf9..6d28f8bff2 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import type { TableType } from 'nocodb-sdk'
+import { UITypes, isLinksOrLTAR } from '../../../../nocodb-sdk/src'
 import {
   ActiveViewInj,
   ReloadViewDataHookInj,
@@ -27,10 +28,12 @@ const searchDropdown = ref(null)
 onClickOutside(searchDropdown, () => (isDropdownOpen.value = false))
 
 const columns = computed(() =>
-  (meta.value as TableType)?.columns?.map((column) => ({
-    value: column.id,
-    label: column.title,
-  })),
+  (meta.value as TableType)?.columns
+    ?.filter((column) => column?.uidt !== UITypes.Links)
+    ?.map((column) => ({
+      value: column.id,
+      label: column.title,
+    })),
 )
 
 watch(

From 1e862a9172c4077e376ac59f2e516ad46cbde188 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sun, 18 Jun 2023 03:07:15 +0530
Subject: [PATCH 072/208] fix: expanded form link issue and header tooltip

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/smartsheet/VirtualCell.vue | 4 ++--
 packages/nc-gui/components/virtual-cell/Links.vue     | 8 ++++++++
 packages/nc-gui/utils/virtualCell.ts                  | 5 ++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/VirtualCell.vue b/packages/nc-gui/components/smartsheet/VirtualCell.vue
index 313f8ac3b3..f47d60632d 100644
--- a/packages/nc-gui/components/smartsheet/VirtualCell.vue
+++ b/packages/nc-gui/components/smartsheet/VirtualCell.vue
@@ -96,11 +96,11 @@ onUnmounted(() => {
     @keydown.shift.enter.exact="onNavigate(NavigateDir.PREV, $event)"
   >
     <template v-if="intersected">
-      <LazyVirtualCellHasMany v-if="isHm(column)" />
+      <LazyVirtualCellLinks v-if="isLink(column)" />
+      <LazyVirtualCellHasMany v-else-if="isHm(column)" />
       <LazyVirtualCellManyToMany v-else-if="isMm(column)" />
       <LazyVirtualCellBelongsTo v-else-if="isBt(column)" />
       <LazyVirtualCellRollup v-else-if="isRollup(column)" />
-      <LazyVirtualCellLinks v-else-if="isLink(column)" />
       <LazyVirtualCellFormula v-else-if="isFormula(column)" />
       <LazyVirtualCellQrCode v-else-if="isQrCode(column)" />
       <LazyVirtualCellBarcode v-else-if="isBarcode(column)" />
diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index b951567848..d8dc188c3c 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -79,6 +79,13 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEven
       break
   }
 })
+
+const localCellValue = computed<any[]>(() => {
+  if (isNew.value) {
+    return state?.value?.[column?.value.title as string] ?? []
+  }
+  return []
+})
 </script>
 
 <template>
@@ -111,6 +118,7 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEven
       v-model="childListDlg"
       :column="relatedTableDisplayColumn"
       @attach-record="onAttachRecord"
+      :cell-value="localCellValue"
     />
   </div>
 </template>
diff --git a/packages/nc-gui/utils/virtualCell.ts b/packages/nc-gui/utils/virtualCell.ts
index 4b4e633736..77d224655f 100644
--- a/packages/nc-gui/utils/virtualCell.ts
+++ b/packages/nc-gui/utils/virtualCell.ts
@@ -1,8 +1,7 @@
 import type { ColumnType, LinkToAnotherRecordType } from 'nocodb-sdk'
-import { RelationTypes, UITypes } from 'nocodb-sdk'
+import { RelationTypes, UITypes, isLinksOrLTAR } from 'nocodb-sdk'
 
-export const isLTAR = (uidt: string, colOptions: unknown): colOptions is LinkToAnotherRecordType =>
-  uidt === UITypes.LinkToAnotherRecord
+export const isLTAR = (uidt: string, colOptions: unknown): colOptions is LinkToAnotherRecordType => isLinksOrLTAR(uidt)
 
 export const isHm = (column: ColumnType) =>
   isLTAR(column.uidt!, column.colOptions) && column.colOptions.type === RelationTypes.HAS_MANY

From 8349a71721f6722fa1250954ecc9b8375061db07 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sun, 18 Jun 2023 03:12:38 +0530
Subject: [PATCH 073/208] fix: add link support to nested insert

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/db/BaseModelSqlv2.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index 077bec27ba..cf56ced0ad 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -18,6 +18,7 @@ import { customAlphabet } from 'nanoid';
 import DOMPurify from 'isomorphic-dompurify';
 import { v4 as uuidv4 } from 'uuid';
 import { Knex } from 'knex';
+import { isLinksOrLTAR } from '../../../nocodb-sdk/src';
 import { NcError } from '../helpers/catchError';
 import getAst from '../helpers/getAst';
 import {
@@ -2123,8 +2124,8 @@ class BaseModelSqlv2 {
       let rowId = null;
       const postInsertOps = [];
 
-      const nestedCols = (await this.model.getColumns()).filter(
-        (c) => c.uidt === UITypes.LinkToAnotherRecord,
+      const nestedCols = (await this.model.getColumns()).filter((c) =>
+        isLinksOrLTAR(c),
       );
 
       for (const col of nestedCols) {

From db45de3d06e97c76148e7b63ce5b639eaac2f721 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sun, 18 Jun 2023 03:16:52 +0530
Subject: [PATCH 074/208] fix: column delete related issues

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/services/columns.service.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index f304e12b47..473ed61b9f 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -9,6 +9,7 @@ import {
 } from 'nocodb-sdk';
 import { T } from 'nc-help';
 import { pluralize, singularize } from 'inflection';
+import { isLinksOrLTAR } from '../../../nocodb-sdk/src'
 import formulaQueryBuilderv2 from '../db/formulav2/formulaQueryBuilderv2';
 import ProjectMgrv2 from '../db/sql-mgr/v2/ProjectMgrv2';
 import {
@@ -1253,7 +1254,7 @@ export class ColumnsService {
                   .then((m) => m.getColumns(ncMeta));
 
                 for (const c of columnsInRelatedTable) {
-                  if (c.uidt !== UITypes.LinkToAnotherRecord) continue;
+                  if (!isLinksOrLTAR(c.uidt)) continue;
                   const colOpt =
                     await c.getColOptions<LinkToAnotherRecordColumn>(ncMeta);
                   if (
@@ -1274,7 +1275,7 @@ export class ColumnsService {
                 // delete bt columns in m2m table
                 await mmTable.getColumns(ncMeta);
                 for (const c of mmTable.columns) {
-                  if (c.uidt !== UITypes.LinkToAnotherRecord) continue;
+                  if (!isLinksOrLTAR(c.uidt)) continue;
                   const colOpt =
                     await c.getColOptions<LinkToAnotherRecordColumn>(ncMeta);
                   if (colOpt.type === 'bt') {
@@ -1285,7 +1286,7 @@ export class ColumnsService {
                 // delete hm columns in parent table
                 await parentTable.getColumns(ncMeta);
                 for (const c of parentTable.columns) {
-                  if (c.uidt !== UITypes.LinkToAnotherRecord) continue;
+                  if (!isLinksOrLTAR(c.uidt)) continue;
                   const colOpt =
                     await c.getColOptions<LinkToAnotherRecordColumn>(ncMeta);
                   if (colOpt.fk_related_model_id === mmTable.id) {
@@ -1296,7 +1297,7 @@ export class ColumnsService {
                 // delete hm columns in child table
                 await childTable.getColumns(ncMeta);
                 for (const c of childTable.columns) {
-                  if (c.uidt !== UITypes.LinkToAnotherRecord) continue;
+                  if (!isLinksOrLTAR(c.uidt)) continue;
                   const colOpt =
                     await c.getColOptions<LinkToAnotherRecordColumn>(ncMeta);
                   if (colOpt.fk_related_model_id === mmTable.id) {

From 5e2ec489f75fa65598f0dbf2dc3e268a103a3b35 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sun, 18 Jun 2023 03:21:53 +0530
Subject: [PATCH 075/208] fix: add animation for plus icon

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

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index d8dc188c3c..cf4e5beeac 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -106,7 +106,7 @@ const localCellValue = computed<any[]>(() => {
         <GeneralIcon
           v-if="!readOnly && isUIAllowed('xcDatatableEditable')"
           icon="plus"
-          class="select-none !text-xxl nc-action-icon text-gray-500/50 hover:text-gray-500 nc-plus"
+          class="nc-icon-transition select-none !text-xxl nc-action-icon text-gray-500/50 hover:text-gray-500 nc-plus hover:text-shadow-md"
           @click.stop="listItemsDlg = true"
         />
       </div>

From 54b4527650176141ecf3af1aeefeedf5d32d8f4b Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 19 Jun 2023 11:26:24 +0530
Subject: [PATCH 076/208] fix: on meta populate on existing db generate
 singular/plural

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/helpers/populateMeta.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/nocodb/src/helpers/populateMeta.ts b/packages/nocodb/src/helpers/populateMeta.ts
index edd03018d7..a2b9f95d7b 100644
--- a/packages/nocodb/src/helpers/populateMeta.ts
+++ b/packages/nocodb/src/helpers/populateMeta.ts
@@ -126,6 +126,10 @@ export async function extractAndGenerateManyToManyRelations(
             belongsToCols[1].colOptions.fk_child_column_id,
           type: RelationTypes.MANY_TO_MANY,
           uidt: UITypes.Links,
+          meta: {
+            plural: pluralize(modelB.title),
+            singular: singularize(modelB.title),
+          },
         });
       }
       if (!isRelationAvailInB) {
@@ -144,6 +148,10 @@ export async function extractAndGenerateManyToManyRelations(
             belongsToCols[0].colOptions.fk_child_column_id,
           type: RelationTypes.MANY_TO_MANY,
           uidt: UITypes.Links,
+          meta: {
+            plural: pluralize(modelA.title),
+            singular: singularize(modelA.title),
+          },
         });
       }
 
@@ -261,6 +269,10 @@ export async function populateMeta(base: Base, project: Project): Promise<any> {
             type: 'hm',
             hm,
             title: `${hm.title} List`,
+            meta: {
+              plural: pluralize(hm.title),
+              singular: singularize(hm.title),
+            },
           };
         }),
         ...belongsTo.map((bt) => {
@@ -348,6 +360,7 @@ export async function populateMeta(base: Base, project: Project): Promise<any> {
               order: colOrder++,
               fk_related_model_id: column.hm ? tnId : rtnId,
               system: column.system,
+              meta: column.meta,
             });
 
             // nested relations data apis

From 8b6a0a3268c062f35975d8d727fc4b286bd10ad5 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 19 Jun 2023 11:50:31 +0530
Subject: [PATCH 077/208] fix: on meta sync on existing db generate
 singular/plural

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/services/meta-diffs.service.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/nocodb/src/services/meta-diffs.service.ts b/packages/nocodb/src/services/meta-diffs.service.ts
index 8f9a676e57..dab7d6a261 100644
--- a/packages/nocodb/src/services/meta-diffs.service.ts
+++ b/packages/nocodb/src/services/meta-diffs.service.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { isVirtualCol, ModelTypes, RelationTypes, UITypes } from 'nocodb-sdk';
 import { T } from 'nc-help';
+import { pluralize, singularize } from 'inflection';
 import { Base, Column, Model, Project } from '../models';
 import ModelXcMetaFactory from '../db/sql-mgr/code/models/xc/ModelXcMetaFactory';
 import getColumnUiType from '../helpers/getColumnUiType';
@@ -757,6 +758,10 @@ export class MetaDiffsService {
                       fk_child_column_id: childCol.id,
                       virtual: false,
                       fk_index_name: change.cstn,
+                      meta: {
+                        plural: pluralize(childModel.title),
+                        singular: singularize(childModel.title),
+                      },
                     });
                   }
                 });
@@ -1055,6 +1060,10 @@ export class MetaDiffsService {
               belongsToCols[1].colOptions.fk_child_column_id,
             type: RelationTypes.MANY_TO_MANY,
             uidt: UITypes.Links,
+            meta: {
+              plural: pluralize(modelB.title),
+              singular: singularize(modelB.title),
+            },
           });
         }
         if (!isRelationAvailInB) {
@@ -1075,6 +1084,10 @@ export class MetaDiffsService {
               belongsToCols[0].colOptions.fk_child_column_id,
             type: RelationTypes.MANY_TO_MANY,
             uidt: UITypes.Links,
+            meta: {
+              plural: pluralize(modelA.title),
+              singular: singularize(modelA.title),
+            },
           });
         }
 

From 2b6eb18d6adff1dbcfd3bc5776f56f7066e6c02f Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 19 Jun 2023 12:02:00 +0530
Subject: [PATCH 078/208] fix: parse value and render

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/virtual-cell/Links.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index cf4e5beeac..7c87344f1f 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
 import { computed } from '@vue/reactivity'
 import type { ColumnType } from 'nocodb-sdk'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ActiveCellInj, CellValueInj, ColumnInj, EditModeInj, MetaInj, inject, useSelectedCellKeyupListener } from '#imports'
 
-const value = inject(CellValueInj)
+const value = inject(CellValueInj, ref(0))
 
 const column = inject(ColumnInj)!
 
@@ -50,12 +51,14 @@ const relatedTableDisplayColumn = computed(
 loadRelatedTableMeta()
 
 const textVal = computed(() => {
-  if (!value.value) {
+  const parsedValue = +value?.value || 0
+
+  if (!parsedValue) {
     return 'Empty'
-  } else if (value.value === 1) {
+  } else if (parsedValue === 1) {
     return `1 ${column.value?.meta?.singular || 'Link'}`
   } else {
-    return `${value.value} ${column.value?.meta?.plural || 'Links'}`
+    return `${parsedValue} ${column.value?.meta?.plural || 'Links'}`
   }
 })
 
@@ -117,8 +120,8 @@ const localCellValue = computed<any[]>(() => {
     <LazyVirtualCellComponentsListChildItems
       v-model="childListDlg"
       :column="relatedTableDisplayColumn"
-      @attach-record="onAttachRecord"
       :cell-value="localCellValue"
+      @attach-record="onAttachRecord"
     />
   </div>
 </template>

From 699249f846385648b894f227f2bd63932ee16dc5 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 19 Jun 2023 13:13:22 +0530
Subject: [PATCH 079/208] fix: overflow text handling

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

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index 7c87344f1f..45112d3a72 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -94,16 +94,18 @@ const localCellValue = computed<any[]>(() => {
 <template>
   <div class="flex w-full items-center nc-links-wrapper" @dblclick.stop="openChildList = true">
     <template v-if="!isForm">
-      <div class="flex-grow block">
+      <div class="block flex-shrink truncate">
         <component
+          :title="textVal"
           :is="isLocked ? 'span' : 'a'"
-          class="text-center pl-3 nc-datatype-link"
+          class="text-center pl-3 nc-datatype-link "
           :class="{ '!text-gray-300': !value }"
           @click.stop.prevent="openChildList"
         >
           {{ textVal }}
         </component>
       </div>
+      <div class="flex-grow"/>
 
       <div v-if="!isLocked && !isUnderLookup" class="flex justify-end gap-1 min-h-[30px] items-center">
         <GeneralIcon

From ae9157926f4a69bcd66a4d3b8c3012d0b8aeed36 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 19 Jun 2023 13:13:40 +0530
Subject: [PATCH 080/208] fix: double click behaviour correction

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

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index 45112d3a72..9428f6f255 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -92,7 +92,7 @@ const localCellValue = computed<any[]>(() => {
 </script>
 
 <template>
-  <div class="flex w-full items-center nc-links-wrapper" @dblclick.stop="openChildList = true">
+  <div class="flex w-full items-center nc-links-wrapper" @dblclick.stop="openChildList">
     <template v-if="!isForm">
       <div class="block flex-shrink truncate">
         <component

From 54d1277d10f1c6778a041eb4589698981583d1da Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Mon, 19 Jun 2023 13:43:06 +0530
Subject: [PATCH 081/208] test: LinkToAnotherRecord to Links

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../playwright/pages/Dashboard/Grid/Column/index.ts  |  2 +-
 .../playwright/pages/Dashboard/common/Cell/index.ts  |  2 +-
 tests/playwright/quickTests/commonTest.ts            |  4 ++--
 tests/playwright/tests/db/01-webhook.spec.ts         |  2 +-
 .../tests/db/columnLinkToAnotherRecord.spec.ts       |  6 +++---
 tests/playwright/tests/db/filters.spec.ts            |  2 +-
 tests/playwright/tests/db/megaTable.spec.ts          |  6 +++---
 tests/playwright/tests/db/metaLTAR.spec.ts           | 12 ++++++------
 tests/playwright/tests/db/undo-redo.spec.ts          |  2 +-
 tests/playwright/tests/db/viewForm.spec.ts           |  2 +-
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/Grid/Column/index.ts b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
index 3e188aed76..6db6307869 100644
--- a/tests/playwright/pages/Dashboard/Grid/Column/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
@@ -162,7 +162,7 @@ export class ColumnPageObject extends BasePage {
           .nth(0)
           .click();
         break;
-      case 'LinkToAnotherRecord':
+      case 'Links':
         await this.get()
           .locator('.nc-ltar-relation-type >> .ant-radio')
           .nth(relationType === 'Has Many' ? 0 : 1)
diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index f5f39d934b..25946cb1de 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -364,7 +364,7 @@ export class CellPageObject extends BasePage {
     // PR8504
     // await expect(await vCell.locator('.nc-action-icon.nc-arrow-expand:visible')).toHaveCount(1);
     const linkText = await getTextExcludeIconText(vCell);
-    expect(linkText).toContain('1 Link');
+    expect(linkText).toContain('1 City');
 
     // PR8504
     // await vCell.click();
diff --git a/tests/playwright/quickTests/commonTest.ts b/tests/playwright/quickTests/commonTest.ts
index 62188bee2f..8f5a003037 100644
--- a/tests/playwright/quickTests/commonTest.ts
+++ b/tests/playwright/quickTests/commonTest.ts
@@ -99,7 +99,7 @@ const quickVerify = async ({
     rating: recordsVirtualCells.Rating,
   });
 
-  // LinkToAnotherRecord
+  // Links
   await dashboard.grid.cell.verifyVirtualCell({
     index: cellIndex,
     columnHeader: 'Actor',
@@ -121,7 +121,7 @@ const quickVerify = async ({
       value: recordsVirtualCells.Computation,
     });
 
-    // LinkToAnotherRecord
+    // Links
     await dashboard.grid.cell.verifyVirtualCell({
       index: cellIndex,
       columnHeader: 'Producer',
diff --git a/tests/playwright/tests/db/01-webhook.spec.ts b/tests/playwright/tests/db/01-webhook.spec.ts
index b02130544c..dca029850c 100644
--- a/tests/playwright/tests/db/01-webhook.spec.ts
+++ b/tests/playwright/tests/db/01-webhook.spec.ts
@@ -613,7 +613,7 @@ test.describe.serial('Webhook', () => {
       countryTable = await api.dbTableColumn.create(countryTable.id, {
         column_name: 'CityList',
         title: 'CityList',
-        uidt: UITypes.LinkToAnotherRecord,
+        uidt: UITypes.Links,
         parentId: countryTable.id,
         childId: cityTable.id,
         type: 'hm',
diff --git a/tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts b/tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts
index 1be725e05d..abb3c82940 100644
--- a/tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts
+++ b/tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts
@@ -31,13 +31,13 @@ test.describe('LTAR create & update', () => {
     // Create LTAR-HM column
     await dashboard.grid.column.create({
       title: 'Link1-2hm',
-      type: 'LinkToAnotherRecord',
+      type: 'Links',
       childTable: 'Sheet2',
       relationType: 'Has Many',
     });
     await dashboard.grid.column.create({
       title: 'Link1-2mm',
-      type: 'LinkToAnotherRecord',
+      type: 'Links',
       childTable: 'Sheet2',
       relationType: 'Many To many',
     });
@@ -46,7 +46,7 @@ test.describe('LTAR create & update', () => {
     await dashboard.treeView.openTable({ title: 'Sheet2', networkResponse: false });
     await dashboard.grid.column.create({
       title: 'Link2-1hm',
-      type: 'LinkToAnotherRecord',
+      type: 'Links',
       childTable: 'Sheet1',
       relationType: 'Has Many',
     });
diff --git a/tests/playwright/tests/db/filters.spec.ts b/tests/playwright/tests/db/filters.spec.ts
index 55ec5c7e7c..1786497dfa 100644
--- a/tests/playwright/tests/db/filters.spec.ts
+++ b/tests/playwright/tests/db/filters.spec.ts
@@ -952,7 +952,7 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
         opType: filterList[i].op,
         value: filterList[i].value,
         result: { rowCount: filterList[i].rowCount },
-        dataType: 'LinkToAnotherRecord',
+        dataType: 'Links',
       });
     }
   }
diff --git a/tests/playwright/tests/db/megaTable.spec.ts b/tests/playwright/tests/db/megaTable.spec.ts
index b47c09ecf2..5ecc44bbde 100644
--- a/tests/playwright/tests/db/megaTable.spec.ts
+++ b/tests/playwright/tests/db/megaTable.spec.ts
@@ -202,9 +202,9 @@ test.describe.serial('Test table', () => {
     await api.dbTableRow.bulkCreate('noco', context.project.id, table_2.id, rows);
 
     await api.dbTableColumn.create(table_2.id, {
-      uidt: UITypes.LinkToAnotherRecord,
-      title: 'LinkToAnotherRecord',
-      column_name: 'LinkToAnotherRecord',
+      uidt: UITypes.Links,
+      title: 'Links',
+      column_name: 'Links',
       parentId: table_1.id,
       childId: table_2.id,
       type: 'hm',
diff --git a/tests/playwright/tests/db/metaLTAR.spec.ts b/tests/playwright/tests/db/metaLTAR.spec.ts
index 7205c37c33..407dfdc636 100644
--- a/tests/playwright/tests/db/metaLTAR.spec.ts
+++ b/tests/playwright/tests/db/metaLTAR.spec.ts
@@ -104,7 +104,7 @@ test.describe.serial('Test table', () => {
     // Create links
     // TableA <hm> TableB <hm> TableC
     await api.dbTableColumn.create(tables[0].id, {
-      uidt: UITypes.LinkToAnotherRecord,
+      uidt: UITypes.Links,
       title: `TableA:hm:TableB`,
       column_name: `TableA:hm:TableB`,
       parentId: tables[0].id,
@@ -112,7 +112,7 @@ test.describe.serial('Test table', () => {
       type: 'hm',
     });
     await api.dbTableColumn.create(tables[1].id, {
-      uidt: UITypes.LinkToAnotherRecord,
+      uidt: UITypes.Links,
       title: `TableB:hm:TableC`,
       column_name: `TableB:hm:TableC`,
       parentId: tables[1].id,
@@ -122,7 +122,7 @@ test.describe.serial('Test table', () => {
 
     // TableA <mm> TableD <mm> TableE
     await api.dbTableColumn.create(tables[0].id, {
-      uidt: UITypes.LinkToAnotherRecord,
+      uidt: UITypes.Links,
       title: `TableA:mm:TableD`,
       column_name: `TableA:mm:TableD`,
       parentId: tables[0].id,
@@ -130,7 +130,7 @@ test.describe.serial('Test table', () => {
       type: 'mm',
     });
     await api.dbTableColumn.create(tables[3].id, {
-      uidt: UITypes.LinkToAnotherRecord,
+      uidt: UITypes.Links,
       title: `TableD:mm:TableE`,
       column_name: `TableD:mm:TableE`,
       parentId: tables[3].id,
@@ -140,7 +140,7 @@ test.describe.serial('Test table', () => {
 
     // TableA <hm> TableA : self relation
     await api.dbTableColumn.create(tables[0].id, {
-      uidt: UITypes.LinkToAnotherRecord,
+      uidt: UITypes.Links,
       title: `TableA:hm:TableA`,
       column_name: `TableA:hm:TableA`,
       parentId: tables[0].id,
@@ -150,7 +150,7 @@ test.describe.serial('Test table', () => {
 
     // TableA <mm> TableA : self relation
     await api.dbTableColumn.create(tables[0].id, {
-      uidt: UITypes.LinkToAnotherRecord,
+      uidt: UITypes.Links,
       title: `TableA:mm:TableA`,
       column_name: `TableA:mm:TableA`,
       parentId: tables[0].id,
diff --git a/tests/playwright/tests/db/undo-redo.spec.ts b/tests/playwright/tests/db/undo-redo.spec.ts
index 52b402bf4c..c63f4033bc 100644
--- a/tests/playwright/tests/db/undo-redo.spec.ts
+++ b/tests/playwright/tests/db/undo-redo.spec.ts
@@ -527,7 +527,7 @@ test.describe('Undo Redo - LTAR', () => {
       await api.dbTableColumn.create(countryTable.id, {
         column_name: 'CityList',
         title: 'CityList',
-        uidt: UITypes.LinkToAnotherRecord,
+        uidt: UITypes.Links,
         parentId: countryTable.id,
         childId: cityTable.id,
         type: 'hm',
diff --git a/tests/playwright/tests/db/viewForm.spec.ts b/tests/playwright/tests/db/viewForm.spec.ts
index 351e7fc0d3..36e3332061 100644
--- a/tests/playwright/tests/db/viewForm.spec.ts
+++ b/tests/playwright/tests/db/viewForm.spec.ts
@@ -310,7 +310,7 @@ test.describe('Form view with LTAR', () => {
       await api.dbTableColumn.create(countryTable.id, {
         column_name: 'CityList',
         title: 'CityList',
-        uidt: UITypes.LinkToAnotherRecord,
+        uidt: UITypes.Links,
         parentId: countryTable.id,
         childId: cityTable.id,
         type: 'hm',

From 44d041ee3dea6a77c207dd5d83e624a1493a6412 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 19 Jun 2023 13:56:12 +0530
Subject: [PATCH 082/208] refactor: show column icon Lookup and Rollup

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/smartsheet/column/LookupOptions.vue       | 9 ++++++++-
 .../components/smartsheet/column/RollupOptions.vue       | 7 +++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
index 5647459141..a97d4bfc96 100644
--- a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onMounted } from '@vue/runtime-core'
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { isLinksOrLTAR, isSystemColumn } from 'nocodb-sdk'
+import { isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import { getRelationName } from './utils'
 import { MetaInj, inject, ref, storeToRefs, useColumnCreateStoreOrThrow, useMetas, useProject, useVModel } from '#imports'
 
@@ -64,6 +64,12 @@ const onRelationColChange = () => {
   vModel.value.fk_lookup_column_id = columns?.[0]?.id
   onDataTypeChange()
 }
+
+
+const cellIcon = (column: ColumnType) =>
+  h(isVirtualCol(column) ? resolveComponent('SmartsheetHeaderVirtualCellIcon') : resolveComponent('SmartsheetHeaderCellIcon'), {
+    columnMeta: column,
+  })
 </script>
 
 <template>
@@ -94,6 +100,7 @@ const onRelationColChange = () => {
           @change="onDataTypeChange"
         >
           <a-select-option v-for="(column, index) of columns" :key="index" :value="column.id">
+            <component :is="cellIcon(column)" :column-meta="column" />
             {{ column.title }}
           </a-select-option>
         </a-select>
diff --git a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
index d077fff692..ad2215ad89 100644
--- a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
@@ -84,6 +84,11 @@ const onRelationColChange = () => {
   vModel.value.fk_rollup_column_id = columns?.[0]?.id
   onDataTypeChange()
 }
+
+const cellIcon = (column: ColumnType) =>
+  h(isVirtualCol(column) ? resolveComponent('SmartsheetHeaderVirtualCellIcon') : resolveComponent('SmartsheetHeaderCellIcon'), {
+    columnMeta: column,
+  })
 </script>
 
 <template>
@@ -114,6 +119,8 @@ const onRelationColChange = () => {
           @change="onDataTypeChange"
         >
           <a-select-option v-for="(column, index) of columns" :key="index" :value="column.id">
+            <component :is="cellIcon(column)" :column-meta="column" />
+
             {{ column.title }}
           </a-select-option>
         </a-select>

From 6f7a4c3cb8a284833e527059eba7516a49f78ff5 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 19 Jun 2023 13:57:43 +0530
Subject: [PATCH 083/208] refactor: remove tag outline and reduce list item
 size

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/virtual-cell/components/ItemChip.vue      | 9 ++++-----
 .../virtual-cell/components/ListChildItems.vue           | 8 ++++++--
 .../components/virtual-cell/components/ListItems.vue     | 3 ++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/components/ItemChip.vue b/packages/nc-gui/components/virtual-cell/components/ItemChip.vue
index aa0c6be6be..a1afc98d60 100644
--- a/packages/nc-gui/components/virtual-cell/components/ItemChip.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ItemChip.vue
@@ -9,7 +9,6 @@ import {
   inject,
   isAttachment,
   ref,
-  renderValue,
   useExpandedFormDetached,
   useLTARStoreOrThrow,
 } from '#imports'
@@ -19,9 +18,10 @@ interface Props {
   item?: any
   column: any
   showUnlinkButton: boolean
+  border?: boolean
 }
 
-const { value, item, column, showUnlinkButton } = defineProps<Props>()
+const { value, item, column, showUnlinkButton, border = true } = defineProps<Props>()
 
 const emit = defineEmits(['unlink'])
 
@@ -84,9 +84,8 @@ export default {
             class="min-w-max"
             :class="{
               'px-1 rounded-full flex-1': !isAttachment(column),
-              'border-gray-200 rounded border-1': ![UITypes.Attachment, UITypes.MultiSelect, UITypes.SingleSelect].includes(
-                column.uidt,
-              ),
+              'border-gray-200 rounded border-1':
+                border && ![UITypes.Attachment, UITypes.MultiSelect, UITypes.SingleSelect].includes(column.uidt),
             }"
           >
             <LazySmartsheetCell :model-value="value" :column="column" :edit-enabled="false" :virtual="true" :read-only="true" />
diff --git a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
index 3d313a066f..7f2e195622 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
@@ -148,7 +148,11 @@ const onClick = (row: Row) => {
           >
             <div class="flex items-center">
               <div class="flex-1 overflow-hidden min-w-0">
-                <VirtualCellComponentsItemChip :value="row[relatedTableDisplayValueProp]" :column="props.column" />
+                <VirtualCellComponentsItemChip
+                  :border="false"
+                  :value="row[relatedTableDisplayValueProp]"
+                  :column="props.column"
+                />
                 <!--                <span class="text-gray-400 text-[11px] ml-1">(Primary key : {{ getRelatedTableRowId(row) }})</span> -->
               </div>
 
@@ -210,6 +214,6 @@ const onClick = (row: Row) => {
 }
 
 :deep(.nc-nested-list-item .ant-card-body) {
-  @apply !p-2;
+  @apply !px-2 !py-1;
 }
 </style>
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItems.vue b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
index 5c3563e71c..e0bf83886a 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
@@ -233,6 +233,7 @@ watch(vModel, (nextVal) => {
               :value="refRow[relatedTableDisplayValueProp]"
               :column="props.column"
               :show-unlink-button="false"
+              :border="false"
             />
             <!--            <span class="hidden group-hover:(inline) text-gray-400 text-[11px] ml-1"> -->
             <!--              ({{ $t('labels.primaryKey') }} : {{ getRelatedTableRowId(refRow) }}) -->
@@ -283,6 +284,6 @@ watch(vModel, (nextVal) => {
 }
 
 :deep(.nc-nested-list-item .ant-card-body) {
-  @apply !p-2;
+  @apply !px-2 !py-1;
 }
 </style>

From 02d41ebec881628442232c1c3defe3048222254b Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 19 Jun 2023 14:52:46 +0530
Subject: [PATCH 084/208] refactor: use the user inputted name

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/helpers/columnHelpers.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/helpers/columnHelpers.ts b/packages/nocodb/src/helpers/columnHelpers.ts
index d156ae7c8a..fbc6a65f9c 100644
--- a/packages/nocodb/src/helpers/columnHelpers.ts
+++ b/packages/nocodb/src/helpers/columnHelpers.ts
@@ -40,7 +40,7 @@ export async function createHmAndBtColumn(
   {
     const title = getUniqueColumnAliasName(
       await child.getColumns(),
-      type === 'bt' && !isLinks ? alias : `${parent.title}`,
+      (type === 'bt' && alias) || `${parent.title}`,
     );
     await Column.insert<LinkToAnotherRecordColumn>({
       title,
@@ -65,7 +65,7 @@ export async function createHmAndBtColumn(
   {
     const title = getUniqueColumnAliasName(
       await parent.getColumns(),
-      type === 'hm' && !isLinks ? alias : `${child.title} List`,
+      (type === 'hm' && alias) || `${child.title}`,
     );
     const meta = {
       plural: columnMeta?.plural || pluralize(child.title),

From dbf9cbdb90eefe31be6e2689313a3d877cf3102d Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 19 Jun 2023 15:14:41 +0530
Subject: [PATCH 085/208] refactor: reduce the child list item size, modal
 size, add transition to icons

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/assets/style.scss                        | 2 +-
 .../virtual-cell/components/ListChildItems.vue           | 9 +++++----
 .../components/virtual-cell/components/ListItems.vue     | 5 +++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss
index 25f17ff5e9..c5f36936aa 100644
--- a/packages/nc-gui/assets/style.scss
+++ b/packages/nc-gui/assets/style.scss
@@ -331,5 +331,5 @@ a {
 
 
 .nc-icon-transition {
-  @apply transform transition-transform !hover:(scale-115) !active:(scale-100)
+  @apply transform transition-transform !hover:(scale-115 text-shadow-sm) !active:(scale-100)
 }
diff --git a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
index 7f2e195622..faaed6232c 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
@@ -107,6 +107,7 @@ const onClick = (row: Row) => {
     :footer="null"
     title="Child list"
     :body-style="{ padding: 0 }"
+    width="400px"
     wrap-class-name="nc-modal-child-list"
   >
     <div class="max-h-[max(calc(100vh_-_300px)_,500px)] flex flex-col py-6">
@@ -143,7 +144,7 @@ const onClick = (row: Row) => {
           <a-card
             v-for="(row, i) of childrenList?.list ?? state?.[colTitle] ?? []"
             :key="i"
-            class="nc-nested-list-item !my-4 hover:(!bg-gray-200/50 shadow-md)"
+            class="nc-nested-list-item !my-2 hover:(!bg-gray-200/50 shadow-md)"
             @click="onClick(row)"
           >
             <div class="flex items-center">
@@ -159,14 +160,14 @@ const onClick = (row: Row) => {
               <div v-if="!readonly" class="flex gap-2">
                 <component
                   :is="iconMap.linkRemove"
-                  class="text-xs text-grey hover:(!text-red-500) cursor-pointer"
+                  class="!text-base text-grey hover:(!text-red-500) cursor-pointer nc-icon-transition"
                   data-testid="nc-child-list-icon-unlink"
                   @click.stop="unlinkRow(row)"
                 />
                 <component
                   :is="iconMap.delete"
                   v-if="!readonly && !isPublic"
-                  class="text-xs text-grey hover:(!text-red-500) cursor-pointer"
+                  class="!text-base text-grey hover:(!text-red-500) cursor-pointer nc-icon-transition"
                   data-testid="nc-child-list-icon-delete"
                   @click.stop="deleteRelatedRow(row, unlinkIfNewRow)"
                 />
@@ -214,6 +215,6 @@ const onClick = (row: Row) => {
 }
 
 :deep(.nc-nested-list-item .ant-card-body) {
-  @apply !px-2 !py-1;
+  @apply !px-1 !py-0;
 }
 </style>
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItems.vue b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
index e0bf83886a..cd58eaac15 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
@@ -197,6 +197,7 @@ watch(vModel, (nextVal) => {
     :title="$t('activity.linkRecord')"
     :body-style="{ padding: 0 }"
     wrap-class-name="nc-modal-link-record"
+    width="400px"
   >
     <div class="max-h-[max(calc(100vh_-_300px)_,500px)] flex flex-col py-6">
       <div class="flex mb-4 items-center gap-2 px-12">
@@ -225,7 +226,7 @@ watch(vModel, (nextVal) => {
             v-for="(refRow, i) in childrenExcludedList?.list ?? []"
             :key="i"
             :ref="selectedRowIndex === i ? activeRow : null"
-            class="nc-nested-list-item !my-4 cursor-pointer hover:(!bg-gray-200/50 shadow-md) group"
+            class="nc-nested-list-item !my-2 cursor-pointer hover:(!bg-gray-200/50 shadow-md) group"
             :class="{ 'nc-selected-row': selectedRowIndex === i }"
             @click="linkRow(refRow)"
           >
@@ -284,6 +285,6 @@ watch(vModel, (nextVal) => {
 }
 
 :deep(.nc-nested-list-item .ant-card-body) {
-  @apply !px-2 !py-1;
+  @apply !px-1 !py-0;
 }
 </style>

From 11f6883ddfe4b2dae5416f7ae1f7a0bb46332c43 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 19 Jun 2023 15:45:17 +0530
Subject: [PATCH 086/208] refactor: remove hm and mm support for lookup

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

diff --git a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
index a97d4bfc96..663d87594d 100644
--- a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onMounted } from '@vue/runtime-core'
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { isLinksOrLTAR, isSystemColumn, isVirtualCol, RelationTypes } from 'nocodb-sdk'
 import { getRelationName } from './utils'
 import { MetaInj, inject, ref, storeToRefs, useColumnCreateStoreOrThrow, useMetas, useProject, useVModel } from '#imports'
 
@@ -21,6 +21,8 @@ const { tables } = $(storeToRefs(useProject()))
 
 const { metas } = $(useMetas())
 
+const deprecatedEnabled = $(ref(false))
+
 setAdditionalValidations({
   fk_relation_column_id: [{ required: true, message: 'Required' }],
   fk_lookup_column_id: [{ required: true, message: 'Required' }],
@@ -35,7 +37,7 @@ const refTables = $computed(() => {
   }
 
   const _refTables = meta.columns
-    .filter((column) => isLinksOrLTAR(column) && !column.system && column.base_id === meta?.base_id)
+    .filter((column) => isLinksOrLTAR(column) && (deprecatedEnabled || column.colOptions?.type === RelationTypes.BELONGS_TO) && !column.system && column.base_id === meta?.base_id)
     .map((column) => ({
       col: column.colOptions,
       column,
@@ -80,11 +82,13 @@ const cellIcon = (column: ColumnType) =>
           v-model:value="vModel.fk_relation_column_id"
           dropdown-class-name="!w-64 nc-dropdown-relation-table"
           @change="onRelationColChange"
+          @dblclick="deprecatedEnabled = !deprecatedEnabled"
         >
           <a-select-option v-for="(table, i) of refTables" :key="i" :value="table.col.fk_column_id">
             <div class="flex flex-row space-x-0.5 h-full pb-0.5 items-center justify-between">
               <div class="font-semibold text-xs">{{ table.column.title }}</div>
               <div class="text-[0.65rem] text-gray-600">
+                <span v-if="table.col.type !== RelationTypes.BELONGS_TO" class="text-[0.65rem] text-gray-600">(Deprecated)</span>
                 {{ getRelationName(table.col.type) }} {{ table.title || table.table_name }}
               </div>
             </div>

From 536b8b22732532beea24529780c640dabdb56522 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Mon, 19 Jun 2023 14:56:12 +0530
Subject: [PATCH 087/208] test: rollup count for ltar @ webhook spec

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/db/01-webhook.spec.ts | 23 ++------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/tests/playwright/tests/db/01-webhook.spec.ts b/tests/playwright/tests/db/01-webhook.spec.ts
index dca029850c..6438939242 100644
--- a/tests/playwright/tests/db/01-webhook.spec.ts
+++ b/tests/playwright/tests/db/01-webhook.spec.ts
@@ -611,7 +611,6 @@ test.describe.serial('Webhook', () => {
 
       // create LTAR Country has-many City
       countryTable = await api.dbTableColumn.create(countryTable.id, {
-        column_name: 'CityList',
         title: 'CityList',
         uidt: UITypes.Links,
         parentId: countryTable.id,
@@ -684,16 +683,7 @@ test.describe.serial('Webhook', () => {
             CountryCode: '1',
             CityCodeRollup: '2',
             CityCodeFormula: 100,
-            CityList: [
-              {
-                Id: 1,
-                City: 'Mumbai',
-              },
-              {
-                Id: 2,
-                City: 'Pune',
-              },
-            ],
+            CityList: 2,
             CityCodeLookup: ['23', '33'],
           },
         ],
@@ -704,16 +694,7 @@ test.describe.serial('Webhook', () => {
             CountryCode: '1',
             CityCodeRollup: '2',
             CityCodeFormula: 100,
-            CityList: [
-              {
-                Id: 1,
-                City: 'Mumbai',
-              },
-              {
-                Id: 2,
-                City: 'Pune',
-              },
-            ],
+            CityList: 2,
             CityCodeLookup: ['23', '33'],
           },
         ],

From 6e3da1903bd8cbb75613d4305d05ebacf83035b8 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Mon, 19 Jun 2023 16:40:17 +0530
Subject: [PATCH 088/208] test: LTAR verification

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../playwright/pages/Dashboard/common/Cell/index.ts  |  5 ++++-
 .../tests/db/columnLinkToAnotherRecord.spec.ts       | 12 ++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index 25946cb1de..2b941cb987 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -272,15 +272,18 @@ export class CellPageObject extends BasePage {
     count,
     value,
     verifyChildList = false,
+    options,
   }: CellProps & {
     count?: number;
     type?: 'hm' | 'bt' | 'mm';
     value: string[];
     verifyChildList?: boolean;
+    options?: { singular?: string; plural?: string };
   }) {
     const cell = await this.get({ index, columnHeader });
     const linkText = await cell.locator('.nc-datatype-link');
 
+    console.log(index, columnHeader);
     await cell.scrollIntoViewIfNeeded();
 
     if (type === 'bt') {
@@ -298,7 +301,7 @@ export class CellPageObject extends BasePage {
 
     // verify chip count & contents
     if (count) {
-      await expect(await cell.innerText()).toContain(`${count} ${count === 1 ? 'Link' : 'Links'}`);
+      await expect(await cell.innerText()).toContain(`${count} ${count === 1 ? options.singular : options.plural}`);
     }
 
     if (verifyChildList) {
diff --git a/tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts b/tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts
index abb3c82940..e1fa1a374a 100644
--- a/tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts
+++ b/tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts
@@ -123,8 +123,8 @@ test.describe('LTAR create & update', () => {
 
     const expected = [
       [['1a'], ['1b'], ['1c']],
-      [['1a'], ['1b'], ['1c']],
-      [['1a'], ['1b'], ['1c']],
+      [['1 Sheet1'], ['1 Sheet1'], ['1 Sheet1']],
+      [['1 Sheet1'], ['1 Sheet1'], ['1 Sheet1']],
     ];
     const colHeaders = ['Sheet1', 'Sheet1 List', 'Link2-1hm'];
 
@@ -136,6 +136,8 @@ test.describe('LTAR create & update', () => {
           columnHeader: colHeaders[i],
           count: 1,
           value: expected[i][j],
+          type: i === 0 ? 'bt' : undefined,
+          options: { singular: 'Sheet1', plural: 'Sheet1s' },
         });
       }
     }
@@ -144,8 +146,8 @@ test.describe('LTAR create & update', () => {
     await dashboard.treeView.openTable({ title: 'Sheet1' });
 
     const expected2 = [
-      [['2a'], ['2b'], ['2c']],
-      [['2a'], ['2b'], ['2c']],
+      [['1 Sheet2'], ['1 Sheet2'], ['1 Sheet2']],
+      [['1 Sheet2'], ['1 Sheet2'], ['1 Sheet2']],
       [['2a'], ['2b'], ['2c']],
     ];
     const colHeaders2 = ['Link1-2hm', 'Link1-2mm', 'Sheet2'];
@@ -158,6 +160,8 @@ test.describe('LTAR create & update', () => {
           columnHeader: colHeaders2[i],
           count: 1,
           value: expected2[i][j],
+          type: i === 2 ? 'bt' : undefined,
+          options: { singular: 'Sheet2', plural: 'Sheet2s' },
         });
       }
     }

From ddecdf0beab8353b55867d0c79bdc921d007e8e8 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Mon, 19 Jun 2023 17:34:21 +0530
Subject: [PATCH 089/208] test: shared grid view, link count verification

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/pages/Dashboard/common/Cell/index.ts |  2 +-
 tests/playwright/tests/db/viewGridShare.spec.ts       | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index 2b941cb987..c21c756bc6 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -276,7 +276,7 @@ export class CellPageObject extends BasePage {
   }: CellProps & {
     count?: number;
     type?: 'hm' | 'bt' | 'mm';
-    value: string[];
+    value?: string[];
     verifyChildList?: boolean;
     options?: { singular?: string; plural?: string };
   }) {
diff --git a/tests/playwright/tests/db/viewGridShare.spec.ts b/tests/playwright/tests/db/viewGridShare.spec.ts
index 487a765b60..a4e02daa23 100644
--- a/tests/playwright/tests/db/viewGridShare.spec.ts
+++ b/tests/playwright/tests/db/viewGridShare.spec.ts
@@ -94,7 +94,11 @@ test.describe('Shared view', () => {
 
     // verify virtual records
     for (const record of expectedVirtualRecordsByDb) {
-      await sharedPage.grid.cell.verifyVirtualCell({ ...record, verifyChildList: true });
+      await sharedPage.grid.cell.verifyVirtualCell({
+        ...record,
+        options: { singular: 'Customer', plural: 'Customers' },
+        verifyChildList: true,
+      });
     }
 
     /**
@@ -284,8 +288,8 @@ const expectedVirtualRecords = [
 ];
 
 const sqliteExpectedVirtualRecords = [
-  { index: 0, columnHeader: 'Customer List', count: 1, value: ['2'] },
-  { index: 1, columnHeader: 'Customer List', count: 1, value: ['1'] },
+  { index: 0, columnHeader: 'Customer List', count: 1, type: 'hm' },
+  { index: 1, columnHeader: 'Customer List', count: 1, type: 'hm' },
   { index: 0, columnHeader: 'City', count: 1, type: 'bt', value: ['Davao'] },
   { index: 1, columnHeader: 'City', count: 1, type: 'bt', value: ['Nagareyama'] },
 ];

From 27e8b354c362edbe67e380a3e5166831e845fee9 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Mon, 19 Jun 2023 17:35:56 +0530
Subject: [PATCH 090/208] test: remove additional console logs

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/pages/Dashboard/common/Cell/index.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index c21c756bc6..07edb50cc7 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -283,12 +283,10 @@ export class CellPageObject extends BasePage {
     const cell = await this.get({ index, columnHeader });
     const linkText = await cell.locator('.nc-datatype-link');
 
-    console.log(index, columnHeader);
     await cell.scrollIntoViewIfNeeded();
 
     if (type === 'bt') {
       const chips = cell.locator('.chips > .chip');
-      console.log('chips', await chips.count());
       await expect(await chips.count()).toBe(count);
 
       for (let i = 0; i < value.length; ++i) {

From 77f5986b0f9ed63c2952b209791cb349a6ac7671 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Mon, 19 Jun 2023 18:06:44 +0530
Subject: [PATCH 091/208] test: undo-redo for links

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../pages/Dashboard/common/Cell/index.ts      |  5 ++-
 tests/playwright/tests/db/undo-redo.spec.ts   | 39 +++++++++++++------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index 07edb50cc7..aecaf8c01a 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -329,12 +329,13 @@ export class CellPageObject extends BasePage {
 
   async unlinkVirtualCell({ index, columnHeader }: CellProps) {
     const cell = this.get({ index, columnHeader });
-    await cell.click();
+    await cell.locator('.nc-datatype-link').click();
     await this.waitForResponse({
-      uiAction: () => cell.locator('.unlink-icon').first().click(),
+      uiAction: () => this.rootPage.locator(`[data-testid="nc-child-list-icon-unlink"]`).first().click(),
       requestUrlPathToMatch: '/api/v1/db/data/noco/',
       httpMethodsToMatch: ['GET'],
     });
+    await this.rootPage.keyboard.press('Escape');
   }
 
   async verifyRoleAccess(param: { role: string }) {
diff --git a/tests/playwright/tests/db/undo-redo.spec.ts b/tests/playwright/tests/db/undo-redo.spec.ts
index c63f4033bc..ea3be88e2b 100644
--- a/tests/playwright/tests/db/undo-redo.spec.ts
+++ b/tests/playwright/tests/db/undo-redo.spec.ts
@@ -546,18 +546,35 @@ test.describe('Undo Redo - LTAR', () => {
     // inserted values
     const expectedValues = [...values];
 
-    const currentRecords: Record<string, any> = await api.dbTableRow.list('noco', context.project.id, countryTable.id, {
-      fields: ['CityList'],
-      limit: 100,
-    });
+    try {
+      const currentRecords: Record<string, any> = await api.dbTableRow.list(
+        'noco',
+        context.project.id,
+        countryTable.id,
+        {
+          fields: ['CityList'],
+          limit: 100,
+        }
+      );
+      expect(currentRecords.list.length).toBe(4);
+      expect(currentRecords.list[0].CityList).toBe(expectedValues.length);
+    } catch (e) {
+      console.log(e);
+    }
 
-    // verify if expectedValues array includes all the values in currentRecords
-    // currentRecords [ { Id: 1, City: 'Mumbai' }, { Id: 3, City: 'Delhi' } ]
-    // expectedValues [ 'Mumbai', 'Delhi' ]
-    currentRecords.list[0].CityList.forEach((record: any) => {
-      expect(expectedValues).toContain(record.City);
-    });
-    expect(currentRecords.list[0].CityList.length).toBe(expectedValues.length);
+    if (expectedValues.length > 0) {
+      // read nested records associated with first record
+      const nestedRecords: Record<string, any> = await api.dbTableRow.nestedList(
+        'noco',
+        context.project.id,
+        countryTable.id,
+        1,
+        'hm',
+        'CityList'
+      );
+      const cities = nestedRecords.list.map((record: any) => record.City);
+      expect(cities).toEqual(expectedValues);
+    }
   }
 
   async function undo({ page, values }: { page: Page; values: string[] }) {

From f9d498a67f82af81db26444604ea21d9dca16d93 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 19 Jun 2023 18:08:02 +0530
Subject: [PATCH 092/208] fix: proper column name validation based on base type

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/composables/useColumnCreateStore.ts | 6 ++++--
 packages/nc-gui/store/project.ts                    | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/composables/useColumnCreateStore.ts b/packages/nc-gui/composables/useColumnCreateStore.ts
index 98ff4bbd14..23d5c88c33 100644
--- a/packages/nc-gui/composables/useColumnCreateStore.ts
+++ b/packages/nc-gui/composables/useColumnCreateStore.ts
@@ -31,7 +31,7 @@ interface ValidationsObj {
 const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState(
   (meta: Ref<TableType | undefined>, column: Ref<ColumnType | undefined>) => {
     const projectStore = useProject()
-    const { isMysql: isMysqlFunc, isPg: isPgFunc, isMssql: isMssqlFunc, isXcdbBase: isXcdbBaseFunc } = projectStore
+    const { isMysql: isMysqlFunc, isPg: isPgFunc, isMssql: isMssqlFunc, isXcdbBase: isXcdbBaseFunc, getBaseType } = projectStore
     const { project, sqlUis } = storeToRefs(projectStore)
 
     const { $api } = useNuxtApp()
@@ -54,6 +54,8 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState
 
     const isXcdbBase = computed(() => isXcdbBaseFunc(meta.value?.base_id ? meta.value?.base_id : Object.keys(sqlUis.value)[0]))
 
+    const baseType = computed(() => getBaseType(meta.value?.base_id ? meta.value?.base_id : Object.keys(sqlUis.value)[0]))
+
     const idType = null
 
     const additionalValidations = ref<ValidationsObj>({})
@@ -101,7 +103,7 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState
               })
             },
           },
-          fieldLengthValidator(project.value?.bases?.[0].type || ClientType.MYSQL),
+          fieldLengthValidator(baseType.value || ClientType.MYSQL),
         ],
         uidt: [
           {
diff --git a/packages/nc-gui/store/project.ts b/packages/nc-gui/store/project.ts
index 2771d428cb..cc512a5214 100644
--- a/packages/nc-gui/store/project.ts
+++ b/packages/nc-gui/store/project.ts
@@ -227,5 +227,6 @@ export const useProject = defineStore('projectStore', () => {
     isXcdbBase,
     hasEmptyOrNullFilters,
     setProject,
+    getBaseType,
   }
 })

From cbc7740a5124980afa2090c179856770df93d4a7 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 19 Jun 2023 18:39:16 +0530
Subject: [PATCH 093/208] fix: add validation for singular/plural

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../smartsheet/column/LinkOptions.vue         | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
index 6bb12006eb..5411a0f7dc 100644
--- a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
@@ -9,16 +9,33 @@ const emit = defineEmits(['update:value'])
 
 const vModel = useVModel(props, 'value', emit)
 
-const validators = {}
-
-const { setAdditionalValidations, validateInfos } = useColumnCreateStoreOrThrow()
-
-const { appInfo } = useGlobal()
-
-const searchValue = ref<string>('')
+const { validateInfos, setAdditionalValidations } = useColumnCreateStoreOrThrow()
 
 setAdditionalValidations({
-  ...validators,
+  'meta.singular': [
+    {
+      validator: (_, value: string) => {
+        return new Promise((resolve, reject) => {
+          if (value?.length > 64) {
+            return reject(new Error('The length exceeds the max 64 characters'))
+          }
+          resolve(true)
+        })
+      },
+    },
+  ],
+  'meta.plural': [
+    {
+      validator: (_, value: string) => {
+        return new Promise((resolve, reject) => {
+          if (value?.length > 64) {
+            return reject(new Error('The length exceeds the max 64 characters'))
+          }
+          resolve(true)
+        })
+      },
+    },
+  ],
 })
 
 // set default valueO
@@ -33,13 +50,13 @@ vModel.value.meta = {
   <a-row class="my-2" gutter="8">
     <a-col :span="12">
       <a-form-item v-bind="validateInfos['meta.singular']" label="Singular Label">
-        <a-input placeholder="Link" v-model:value="vModel.meta.singular" class="!w-full nc-link-singular" />
+        <a-input v-model:value="vModel.meta.singular" placeholder="Link" class="!w-full nc-link-singular" />
       </a-form-item>
     </a-col>
 
     <a-col :span="12">
       <a-form-item v-bind="validateInfos['meta.plural']" label="Plural Label">
-        <a-input placeholder="Links" v-model:value="vModel.meta.plural" class="!w-full nc-link-plural" />
+        <a-input v-model:value="vModel.meta.plural" placeholder="Links" class="!w-full nc-link-plural" />
       </a-form-item>
     </a-col>
   </a-row>

From 0c8ee976a17dbee2653244ff2a78745df33fc186 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 19 Jun 2023 18:51:41 +0530
Subject: [PATCH 094/208] fix: show advanced option and add missing import

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/smartsheet/column/LinkOptions.vue    | 2 +-
 .../smartsheet/column/LinkedToAnotherRecordOptions.vue     | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
index 5411a0f7dc..a53087b4e8 100644
--- a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useGlobal, useVModel } from '#imports'
+import { useColumnCreateStoreOrThrow, useVModel } from '#imports'
 
 const props = defineProps<{
   value: any
diff --git a/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue
index 32633e9d91..e2c3e5822e 100644
--- a/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue
@@ -51,7 +51,7 @@ const refTables = $computed(() => {
 
 const filterOption = (value: string, option: { key: string }) => option.key.toLowerCase().includes(value.toLowerCase())
 
-const isLinks = $computed(() => vModel.value.uidt.type === UITypes.Links)
+const isLinks = $computed(() => vModel.value.uidt === UITypes.Links)
 </script>
 
 <template>
@@ -88,7 +88,7 @@ const isLinks = $computed(() => vModel.value.uidt.type === UITypes.Links)
         </a-select>
       </a-form-item>
     </div>
-    <template v-if="!isXcdbBase">
+    <template v-if="!isXcdbBase || isLinks">
       <div
         class="text-xs cursor-pointer text-grey nc-more-options my-2 flex items-center gap-1 justify-end"
         @click="advancedOptions = !advancedOptions"
@@ -100,7 +100,7 @@ const isLinks = $computed(() => vModel.value.uidt.type === UITypes.Links)
 
       <div v-if="advancedOptions" class="flex flex-col p-6 gap-4 border-2 mt-2">
       <LazySmartsheetColumnLinkOptions v-model:value="vModel" class="-my-2" />
-
+<template v-if="!isXcdbBase">
         <div class="flex flex-row space-x-2">
           <a-form-item class="flex w-1/2" :label="$t('labels.onUpdate')">
             <a-select
@@ -138,6 +138,7 @@ const isLinks = $computed(() => vModel.value.uidt.type === UITypes.Links)
             </a-checkbox>
           </a-form-item>
         </div>
+</template>
       </div>
     </template>
   </div>

From eff83cad367ed6106eec738fb77163fb2b12a406 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Mon, 19 Jun 2023 19:54:53 +0530
Subject: [PATCH 095/208] test: lookup/rollup fix

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../playwright/pages/Dashboard/Grid/Column/index.ts  |  1 +
 tests/playwright/tests/db/columnLookupRollup.spec.ts | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/Grid/Column/index.ts b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
index 6db6307869..9145b42719 100644
--- a/tests/playwright/pages/Dashboard/Grid/Column/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
@@ -139,6 +139,7 @@ export class ColumnPageObject extends BasePage {
           .locator(`.ant-select-item`, {
             hasText: childColumn,
           })
+          .last()
           .click();
         break;
       case 'Rollup':
diff --git a/tests/playwright/tests/db/columnLookupRollup.spec.ts b/tests/playwright/tests/db/columnLookupRollup.spec.ts
index 236b94d5ed..c1116ca7ca 100644
--- a/tests/playwright/tests/db/columnLookupRollup.spec.ts
+++ b/tests/playwright/tests/db/columnLookupRollup.spec.ts
@@ -15,7 +15,7 @@ test.describe('Virtual columns', () => {
     // close 'Team & Auth' tab
     // await dashboard.closeTab({ title: "Team & Auth" });
 
-    const pinCode = ['4166', '77459', '41136', '8268', '33463'];
+    const countryList = ['Spain', 'Saudi Arabia', 'United Arab Emirates', 'Mexico', 'Turkey'];
     const cityCount = ['1', '3', '1', '2', '1'];
 
     await dashboard.treeView.openTable({ title: 'City' });
@@ -23,14 +23,14 @@ test.describe('Virtual columns', () => {
     await dashboard.grid.column.create({
       title: 'Lookup',
       type: 'Lookup',
-      childTable: 'Address List',
-      childColumn: 'PostalCode',
+      childTable: 'Country',
+      childColumn: 'Country',
     });
-    for (let i = 0; i < pinCode.length; i++) {
+    for (let i = 0; i < countryList.length; i++) {
       await dashboard.grid.cell.verify({
         index: i,
         columnHeader: 'Lookup',
-        value: pinCode[i],
+        value: countryList[i],
       });
     }
     await dashboard.closeTab({ title: 'City' });
@@ -44,7 +44,7 @@ test.describe('Virtual columns', () => {
       childColumn: 'CityId',
       rollupType: 'count',
     });
-    for (let i = 0; i < pinCode.length; i++) {
+    for (let i = 0; i < countryList.length; i++) {
       await dashboard.grid.cell.verify({
         index: i,
         columnHeader: 'Rollup',

From b608da3198516bb458affdf1c4b492f0aff095f3 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Mon, 19 Jun 2023 20:01:02 +0530
Subject: [PATCH 096/208] test: link tests (extended)

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../tests/db/columnRelationalExtendedTests.spec.ts          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/playwright/tests/db/columnRelationalExtendedTests.spec.ts b/tests/playwright/tests/db/columnRelationalExtendedTests.spec.ts
index c636d41efe..2495e4e6ed 100644
--- a/tests/playwright/tests/db/columnRelationalExtendedTests.spec.ts
+++ b/tests/playwright/tests/db/columnRelationalExtendedTests.spec.ts
@@ -25,7 +25,8 @@ test.describe('Relational Columns', () => {
         index: i,
         columnHeader: 'City List',
         count: cityList[i].length,
-        value: cityList[i],
+        type: 'hm',
+        options: { singular: 'City', plural: 'Cities' },
       });
     }
 
@@ -94,7 +95,8 @@ test.describe('Relational Columns', () => {
         columnHeader: 'Film List',
         // Count hardwired to avoid verifying all 19 entries
         count: 19,
-        value: filmList[i],
+        type: 'mm',
+        options: { singular: 'Film', plural: 'Films' },
       });
     }
     // click on expand icon, open child list

From 9aac16162b7f970bce9f6f1eeaef0b66dbab28bb Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Mon, 19 Jun 2023 20:23:12 +0530
Subject: [PATCH 097/208] test: lookup & rollup

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/db/filters.spec.ts | 32 +++++++++++++----------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/tests/playwright/tests/db/filters.spec.ts b/tests/playwright/tests/db/filters.spec.ts
index 1786497dfa..a361f0afcc 100644
--- a/tests/playwright/tests/db/filters.spec.ts
+++ b/tests/playwright/tests/db/filters.spec.ts
@@ -936,10 +936,12 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
 
     // add filter for CityList column
     const filterList = [
-      { op: 'is', value: 'Kabul', rowCount: 1 },
-      { op: 'is not', value: 'Kabul', rowCount: 108 },
-      { op: 'is like', value: 'bad', rowCount: 2 },
-      { op: 'is not like', value: 'bad', rowCount: 107 },
+      { op: '=', value: '5', rowCount: 5 },
+      { op: '!=', value: '5', rowCount: 104 },
+      { op: '>', value: '5', rowCount: 25 },
+      { op: '<', value: '5', rowCount: 79 },
+      { op: '>=', value: '5', rowCount: 30 },
+      { op: '<=', value: '5', rowCount: 84 },
       { op: 'is blank', value: null, rowCount: 0 },
       { op: 'is not blank', value: null, rowCount: 109 },
     ];
@@ -964,8 +966,8 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
     await dashboard.grid.column.create({
       title: 'Lookup',
       type: 'Lookup',
-      childTable: 'Address List',
-      childColumn: 'PostalCode',
+      childTable: 'Country',
+      childColumn: 'Country',
     });
 
     // Enable NULL & EMPTY filters
@@ -974,12 +976,12 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
 
     // add filter for CityList column
     const filterList = [
-      { op: 'is equal', value: '4166', rowCount: 1 },
-      { op: 'is not equal', value: '4166', rowCount: 599 },
-      { op: 'is like', value: '41', rowCount: 19 },
-      { op: 'is not like', value: '41', rowCount: 581 },
-      { op: 'is blank', value: null, rowCount: 1 },
-      { op: 'is not blank', value: null, rowCount: 599 },
+      { op: 'is equal', value: 'Spain', rowCount: 5 },
+      { op: 'is not equal', value: 'Spain', rowCount: 595 },
+      { op: 'is like', value: 'ca', rowCount: 28 },
+      { op: 'is not like', value: 'ca', rowCount: 572 },
+      { op: 'is blank', value: null, rowCount: 0 },
+      { op: 'is not blank', value: null, rowCount: 600 },
     ];
 
     await toolbar.clickFilter();
@@ -1017,6 +1019,8 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
       { op: 'is not equal', value: '4166', rowCount: 599 },
       { op: 'is like', value: '41', rowCount: 19 },
       { op: 'is not like', value: '41', rowCount: 581 },
+      { op: 'is empty', value: '41', rowCount: 581 },
+      { op: 'is not empty', value: '41', rowCount: 581 },
       { op: 'is blank', value: null, rowCount: 2 },
       { op: 'is not blank', value: null, rowCount: 598 },
     ];
@@ -1025,11 +1029,11 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
     await toolbar.filter.clickAddFilter();
     for (let i = 0; i < filterList.length; i++) {
       await verifyFilter({
-        column: 'Lookup',
+        column: 'Rollup',
         opType: filterList[i].op,
         value: filterList[i].value,
         result: { rowCount: filterList[i].rowCount },
-        dataType: 'Lookup',
+        dataType: 'Rollup',
       });
     }
   }

From fce96532a623dcd7789f63b4f482e05def5ee042 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Mon, 19 Jun 2023 21:12:13 +0530
Subject: [PATCH 098/208] test: form view update

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/db/viewForm.spec.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/playwright/tests/db/viewForm.spec.ts b/tests/playwright/tests/db/viewForm.spec.ts
index 36e3332061..ba72f86f51 100644
--- a/tests/playwright/tests/db/viewForm.spec.ts
+++ b/tests/playwright/tests/db/viewForm.spec.ts
@@ -360,7 +360,8 @@ test.describe('Form view with LTAR', () => {
       index: 3,
       columnHeader: 'CityList',
       count: 1,
-      value: ['Atlanta'],
+      type: 'hm',
+      options: { singular: 'City', plural: 'Cities' },
     });
   });
 });

From d85aab14b8d20a0618d517f3d4d0c94adc724443 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 19 Jun 2023 23:45:55 +0530
Subject: [PATCH 099/208] refactor: update drag and drop behaviour

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/tabs/Smartsheet.vue     | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/packages/nc-gui/components/tabs/Smartsheet.vue b/packages/nc-gui/components/tabs/Smartsheet.vue
index f248d5f04d..3549950afd 100644
--- a/packages/nc-gui/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui/components/tabs/Smartsheet.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes, isLinksOrLTAR } from 'nocodb-sdk'
+import { UITypes, isLinksOrLTAR, RelationTypes } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   FieldsInj,
@@ -95,24 +95,28 @@ const onDrop = async (event: DragEvent) => {
 
       const ltarOptions = c.colOptions as LinkToAnotherRecordType
 
-      if (ltarOptions.type !== 'mm') {
-        return false
-      }
-
-      if (ltarOptions.fk_related_model_id === childMeta.id) {
-        return true
-      }
-
-      return false
+      return ltarOptions.fk_related_model_id === childMeta.id
     })
     if (relationCol) {
-      const lookupCol = childMeta.columns?.find((c) => c.pv) ?? childMeta.columns?.[0]
-      grid.value?.openColumnCreate({
-        uidt: UITypes.Lookup,
-        title: `${data.title}Lookup`,
-        fk_relation_column_id: relationCol.id,
-        fk_lookup_column_id: lookupCol?.id,
-      })
+      if (relationCol.colOptions.type === RelationTypes.BELONGS_TO) {
+        const lookupCol = childMeta.columns?.find((c) => c.pv) ?? childMeta.columns?.[0]
+
+        grid.value?.openColumnCreate({
+          uidt: UITypes.Lookup,
+          title: `${relationCol.title}Lookup`,
+          fk_relation_column_id: relationCol.id,
+          fk_lookup_column_id: lookupCol?.id,
+        })
+      } else {
+        const rollupCol = childMeta.columns?.find((c) => c.pk) ?? childMeta.columns?.[0]
+        grid.value?.openColumnCreate({
+          uidt: UITypes.Rollup,
+          title: `${relationCol.title}Rollup`,
+          fk_relation_column_id: relationCol.id,
+          fk_rollup_column_id: rollupCol?.id,
+          rollup_function: 'max',
+        })
+      }
     } else {
       grid.value?.openColumnCreate({
         uidt: UITypes.Links,

From b61e8f22d1e374283bb35e29f5384ebac5921ffd Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 19 Jun 2023 23:48:49 +0530
Subject: [PATCH 100/208] refactor: child list modal width

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/virtual-cell/components/ListChildItems.vue | 1 -
 packages/nc-gui/components/virtual-cell/components/ListItems.vue | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
index faaed6232c..af77d53e23 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
@@ -107,7 +107,6 @@ const onClick = (row: Row) => {
     :footer="null"
     title="Child list"
     :body-style="{ padding: 0 }"
-    width="400px"
     wrap-class-name="nc-modal-child-list"
   >
     <div class="max-h-[max(calc(100vh_-_300px)_,500px)] flex flex-col py-6">
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItems.vue b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
index cd58eaac15..884c8be3d9 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
@@ -197,7 +197,6 @@ watch(vModel, (nextVal) => {
     :title="$t('activity.linkRecord')"
     :body-style="{ padding: 0 }"
     wrap-class-name="nc-modal-link-record"
-    width="400px"
   >
     <div class="max-h-[max(calc(100vh_-_300px)_,500px)] flex flex-col py-6">
       <div class="flex mb-4 items-center gap-2 px-12">

From ae36fe7f08cca808ed415a554c00c9923a8095ac Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 20 Jun 2023 00:01:15 +0530
Subject: [PATCH 101/208] fix: neq filter issue with Links

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/db/conditionV2.ts | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/nocodb/src/db/conditionV2.ts b/packages/nocodb/src/db/conditionV2.ts
index b25bc81a93..732f77fc1f 100644
--- a/packages/nocodb/src/db/conditionV2.ts
+++ b/packages/nocodb/src/db/conditionV2.ts
@@ -275,7 +275,10 @@ const parseConditionV2 = async (
       return (_qb) => {};
     } else if (column.uidt === UITypes.Lookup) {
       return await generateLookupCondition(column, filter, knex, aliasCount);
-    } else if ([UITypes.Rollup,UITypes.Links].includes(column.uidt ) && !customWhereClause) {
+    } else if (
+      [UITypes.Rollup, UITypes.Links].includes(column.uidt) &&
+      !customWhereClause
+    ) {
       const builder = (
         await genRollupSelectv2({
           knex,
@@ -447,9 +450,10 @@ const parseConditionV2 = async (
                 ].includes(column.uidt)
               ) {
                 qb = qb.where((nestedQb) => {
-                  nestedQb
-                    .whereNot(field, val)
-                    .orWhereNull(customWhereClause ? _val : _field);
+                  nestedQb.whereNot(field, val);
+
+                  if (column.uidt !== UITypes.Links)
+                    qb.orWhereNull(customWhereClause ? _val : _field);
                 });
               } else if (column.uidt === UITypes.Rating) {
                 // unset rating is considered as NULL
@@ -469,9 +473,10 @@ const parseConditionV2 = async (
               }
             } else {
               qb = qb.where((nestedQb) => {
-                nestedQb
-                  .whereNot(field, val)
-                  .orWhereNull(customWhereClause ? _val : _field);
+                nestedQb.whereNot(field, val);
+
+                if (column.uidt !== UITypes.Links)
+                  qb.orWhereNull(customWhereClause ? _val : _field);
               });
             }
             break;

From b8bd1982d01bb1e0257ed4c7a1312c53f9f3733a Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 20 Jun 2023 00:05:01 +0530
Subject: [PATCH 102/208] refactor: change char limit

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/smartsheet/column/LinkOptions.vue   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
index a53087b4e8..fa3a17cded 100644
--- a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
@@ -16,8 +16,8 @@ setAdditionalValidations({
     {
       validator: (_, value: string) => {
         return new Promise((resolve, reject) => {
-          if (value?.length > 64) {
-            return reject(new Error('The length exceeds the max 64 characters'))
+          if (value?.length > 59) {
+            return reject(new Error('The length exceeds the max 59 characters'))
           }
           resolve(true)
         })
@@ -28,8 +28,8 @@ setAdditionalValidations({
     {
       validator: (_, value: string) => {
         return new Promise((resolve, reject) => {
-          if (value?.length > 64) {
-            return reject(new Error('The length exceeds the max 64 characters'))
+          if (value?.length > 59) {
+            return reject(new Error('The length exceeds the max 59 characters'))
           }
           resolve(true)
         })

From 7843196b97bf1d916cd58392b31dc95ad5b1bba8 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 20 Jun 2023 00:09:07 +0530
Subject: [PATCH 103/208] refactor: shorten label

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/smartsheet/column/LookupOptions.vue | 14 +++++++++-----
 .../components/smartsheet/column/RollupOptions.vue |  3 +--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
index 663d87594d..b65d9847c7 100644
--- a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
@@ -1,8 +1,7 @@
 <script setup lang="ts">
 import { onMounted } from '@vue/runtime-core'
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { isLinksOrLTAR, isSystemColumn, isVirtualCol, RelationTypes } from 'nocodb-sdk'
-import { getRelationName } from './utils'
+import { RelationTypes, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import { MetaInj, inject, ref, storeToRefs, useColumnCreateStoreOrThrow, useMetas, useProject, useVModel } from '#imports'
 
 const props = defineProps<{
@@ -37,7 +36,13 @@ const refTables = $computed(() => {
   }
 
   const _refTables = meta.columns
-    .filter((column) => isLinksOrLTAR(column) && (deprecatedEnabled || column.colOptions?.type === RelationTypes.BELONGS_TO) && !column.system && column.base_id === meta?.base_id)
+    .filter(
+      (column) =>
+        isLinksOrLTAR(column) &&
+        (deprecatedEnabled || column.colOptions?.type === RelationTypes.BELONGS_TO) &&
+        !column.system &&
+        column.base_id === meta?.base_id,
+    )
     .map((column) => ({
       col: column.colOptions,
       column,
@@ -67,7 +72,6 @@ const onRelationColChange = () => {
   onDataTypeChange()
 }
 
-
 const cellIcon = (column: ColumnType) =>
   h(isVirtualCol(column) ? resolveComponent('SmartsheetHeaderVirtualCellIcon') : resolveComponent('SmartsheetHeaderCellIcon'), {
     columnMeta: column,
@@ -89,7 +93,7 @@ const cellIcon = (column: ColumnType) =>
               <div class="font-semibold text-xs">{{ table.column.title }}</div>
               <div class="text-[0.65rem] text-gray-600">
                 <span v-if="table.col.type !== RelationTypes.BELONGS_TO" class="text-[0.65rem] text-gray-600">(Deprecated)</span>
-                {{ getRelationName(table.col.type) }} {{ table.title || table.table_name }}
+                <span class="uppercase">{{ table.col.type }}</span> {{ table.title || table.table_name }}
               </div>
             </div>
           </a-select-option>
diff --git a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
index ad2215ad89..1db4d8dd40 100644
--- a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
@@ -2,7 +2,6 @@
 import { onMounted } from '@vue/runtime-core'
 import type { ColumnType, LinkToAnotherRecordType, TableType, UITypes } from 'nocodb-sdk'
 import { isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
-import { getRelationName } from './utils'
 import { MetaInj, inject, ref, storeToRefs, useColumnCreateStoreOrThrow, useMetas, useProject, useVModel } from '#imports'
 
 const props = defineProps<{
@@ -104,7 +103,7 @@ const cellIcon = (column: ColumnType) =>
             <div class="flex flex-row space-x-0.5 h-full pb-0.5 items-center justify-between">
               <div class="font-semibold text-xs">{{ table.column.title }}</div>
               <div class="text-[0.65rem] text-gray-600">
-                ({{ getRelationName(table.col.type) }} {{ table.title || table.table_name }})
+                (<span class="uppercase">{{ table.col.type }}</span> {{ table.title || table.table_name }})
               </div>
             </div>
           </a-select-option>

From 82658fd1aa109becebc20f455f63df0fad4c88c6 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 20 Jun 2023 00:15:02 +0530
Subject: [PATCH 104/208] refactor: central align icon and label

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/smartsheet/column/LookupOptions.vue   | 2 ++
 .../nc-gui/components/smartsheet/column/RollupOptions.vue   | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
index b65d9847c7..764f6689ee 100644
--- a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
@@ -108,8 +108,10 @@ const cellIcon = (column: ColumnType) =>
           @change="onDataTypeChange"
         >
           <a-select-option v-for="(column, index) of columns" :key="index" :value="column.id">
+            <div class="flex items-center -ml-1">
             <component :is="cellIcon(column)" :column-meta="column" />
             {{ column.title }}
+            </div>
           </a-select-option>
         </a-select>
       </a-form-item>
diff --git a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
index 1db4d8dd40..25b9aa5046 100644
--- a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
@@ -118,9 +118,11 @@ const cellIcon = (column: ColumnType) =>
           @change="onDataTypeChange"
         >
           <a-select-option v-for="(column, index) of columns" :key="index" :value="column.id">
-            <component :is="cellIcon(column)" :column-meta="column" />
+            <div class="flex items-center -ml-1">
+              <component :is="cellIcon(column)" :column-meta="column" />
 
-            {{ column.title }}
+              {{ column.title }}
+            </div>
           </a-select-option>
         </a-select>
       </a-form-item>

From 8deb43da1724bcc44a4ef9960eabfdf45b0a69a0 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 20 Jun 2023 10:47:04 +0530
Subject: [PATCH 105/208] test: metaLtar fix

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../pages/Dashboard/common/Cell/index.ts      |  2 +-
 tests/playwright/tests/db/metaLTAR.spec.ts    | 32 +++++++++----------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index aecaf8c01a..8cdbd54186 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -275,7 +275,7 @@ export class CellPageObject extends BasePage {
     options,
   }: CellProps & {
     count?: number;
-    type?: 'hm' | 'bt' | 'mm';
+    type?: string;
     value?: string[];
     verifyChildList?: boolean;
     options?: { singular?: string; plural?: string };
diff --git a/tests/playwright/tests/db/metaLTAR.spec.ts b/tests/playwright/tests/db/metaLTAR.spec.ts
index 407dfdc636..37cea168c3 100644
--- a/tests/playwright/tests/db/metaLTAR.spec.ts
+++ b/tests/playwright/tests/db/metaLTAR.spec.ts
@@ -228,27 +228,25 @@ test.describe.serial('Test table', () => {
 
     // has-many removal verification
     await dashboard.treeView.openTable({ title: 'Table1' });
-    await dashboard.grid.cell.verifyVirtualCell({ index: 0, columnHeader: 'Table0', count: 0, value: [] });
-    await dashboard.grid.cell.verifyVirtualCell({ index: 1, columnHeader: 'Table0', count: 0, value: [] });
-    await dashboard.grid.cell.verifyVirtualCell({ index: 2, columnHeader: 'Table0', count: 0, value: [] });
+    await dashboard.grid.cell.verifyVirtualCell({ index: 0, columnHeader: 'Table0', count: 0, value: [], type: 'bt' });
+    await dashboard.grid.cell.verifyVirtualCell({ index: 1, columnHeader: 'Table0', count: 0, value: [], type: 'bt' });
+    await dashboard.grid.cell.verifyVirtualCell({ index: 2, columnHeader: 'Table0', count: 0, value: [], type: 'bt' });
 
     // many-many removal verification
     await dashboard.treeView.openTable({ title: 'Table3' });
-    await dashboard.grid.cell.verifyVirtualCell({ index: 0, columnHeader: 'Table0 List', count: 0, value: [] });
-    await dashboard.grid.cell.verifyVirtualCell({ index: 1, columnHeader: 'Table0 List', count: 1, value: ['2'] });
-    await dashboard.grid.cell.verifyVirtualCell({ index: 2, columnHeader: 'Table0 List', count: 2, value: ['2', '3'] });
-    await dashboard.grid.cell.verifyVirtualCell({
-      index: 3,
+    const params = {
+      index: 0,
       columnHeader: 'Table0 List',
-      count: 3,
-      value: ['2', '3', '4'],
-    });
-    await dashboard.grid.cell.verifyVirtualCell({
-      index: 4,
-      columnHeader: 'Table0 List',
-      count: 4,
-      value: ['2', '3', '4', '5'],
-    });
+      count: 0,
+      value: [],
+      type: 'hm',
+      options: { singular: 'Table0', plural: 'Table0s' },
+    };
+    await dashboard.grid.cell.verifyVirtualCell({ ...params });
+    await dashboard.grid.cell.verifyVirtualCell({ ...params, count: 1, index: 1, value: ['2'] });
+    await dashboard.grid.cell.verifyVirtualCell({ ...params, count: 2, index: 2, value: ['2', '3'] });
+    await dashboard.grid.cell.verifyVirtualCell({ ...params, count: 3, index: 3, value: ['2', '3', '4'] });
+    await dashboard.grid.cell.verifyVirtualCell({ ...params, count: 4, index: 4, value: ['2', '3', '4', '5'] });
   });
 
   test('Delete record - bulk, over UI', async () => {

From 39a21f7bb86ad5b130430f4d265d234f547d3edc Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 20 Jun 2023 11:09:39 +0530
Subject: [PATCH 106/208] fix: typo correction

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/db/conditionV2.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/db/conditionV2.ts b/packages/nocodb/src/db/conditionV2.ts
index 732f77fc1f..fee84e6d69 100644
--- a/packages/nocodb/src/db/conditionV2.ts
+++ b/packages/nocodb/src/db/conditionV2.ts
@@ -453,7 +453,7 @@ const parseConditionV2 = async (
                   nestedQb.whereNot(field, val);
 
                   if (column.uidt !== UITypes.Links)
-                    qb.orWhereNull(customWhereClause ? _val : _field);
+                    nestedQb.orWhereNull(customWhereClause ? _val : _field);
                 });
               } else if (column.uidt === UITypes.Rating) {
                 // unset rating is considered as NULL
@@ -476,7 +476,7 @@ const parseConditionV2 = async (
                 nestedQb.whereNot(field, val);
 
                 if (column.uidt !== UITypes.Links)
-                  qb.orWhereNull(customWhereClause ? _val : _field);
+                  nestedQb.orWhereNull(customWhereClause ? _val : _field);
               });
             }
             break;

From ebfc9fd32d4112ed00d37454586a9a2b128f344c Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 20 Jun 2023 11:48:35 +0530
Subject: [PATCH 107/208] fix: enter key related issue in modal

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

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index 9428f6f255..6d17b1f30a 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -76,7 +76,7 @@ const openChildList = () => {
 useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEvent) => {
   switch (e.key) {
     case 'Enter':
-      if (isLocked.value) return
+      if (isLocked.value || listItemsDlg.value) return
       childListDlg.value = true
       e.stopPropagation()
       break

From 95a6abe8ef7ba222f3e01fc11d06f2f8faa17d3f Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 20 Jun 2023 11:48:54 +0530
Subject: [PATCH 108/208] refactor: maintain the list height

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/virtual-cell/components/ListChildItems.vue       | 2 +-
 .../nc-gui/components/virtual-cell/components/ListItems.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
index af77d53e23..00e84dcaca 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
@@ -109,7 +109,7 @@ const onClick = (row: Row) => {
     :body-style="{ padding: 0 }"
     wrap-class-name="nc-modal-child-list"
   >
-    <div class="max-h-[max(calc(100vh_-_300px)_,500px)] flex flex-col py-6">
+    <div class="h-[max(calc(100vh_-_300px)_,500px)] flex flex-col py-6">
       <div class="flex mb-4 items-center gap-2 px-12">
         <div class="flex-1" />
         <component
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItems.vue b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
index 884c8be3d9..bd9d4ba6c6 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
@@ -198,7 +198,7 @@ watch(vModel, (nextVal) => {
     :body-style="{ padding: 0 }"
     wrap-class-name="nc-modal-link-record"
   >
-    <div class="max-h-[max(calc(100vh_-_300px)_,500px)] flex flex-col py-6">
+    <div class="h-[max(calc(100vh_-_300px)_,500px)] flex flex-col py-6">
       <div class="flex mb-4 items-center gap-2 px-12">
         <a-input
           ref="filterQueryRef"

From ec7752aadc1928766b239cf8119411c88e35cf6c Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 20 Jun 2023 12:04:23 +0530
Subject: [PATCH 109/208] refactor: show header text in one line

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

diff --git a/packages/nc-gui/components/smartsheet/header/VirtualCell.vue b/packages/nc-gui/components/smartsheet/header/VirtualCell.vue
index a9d7dca749..0ee08642e5 100644
--- a/packages/nc-gui/components/smartsheet/header/VirtualCell.vue
+++ b/packages/nc-gui/components/smartsheet/header/VirtualCell.vue
@@ -121,7 +121,9 @@ const closeAddColumnDropdown = () => {
       <template #title>
         {{ tooltipMsg }}
       </template>
-      <span class="name" style="white-space: pre-line" :title="column.title"> {{ column.title }}</span>
+      <span class="name" :class="{ 'truncate': !isForm, 'whitespace-pre-line': isForm }" :title="column.title">
+        {{ column.title }}
+      </span>
     </a-tooltip>
 
     <span v-if="isVirtualColRequired(column, meta?.columns || []) || required" class="text-red-500">&nbsp;*</span>

From 9d880092eb1bb1ec6f415de1cdc2e458e9607326 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 20 Jun 2023 14:30:04 +0530
Subject: [PATCH 110/208] test: link drag drop

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/db/columnLtarDragdrop.spec.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/playwright/tests/db/columnLtarDragdrop.spec.ts b/tests/playwright/tests/db/columnLtarDragdrop.spec.ts
index efd76bba28..c7ca9242df 100644
--- a/tests/playwright/tests/db/columnLtarDragdrop.spec.ts
+++ b/tests/playwright/tests/db/columnLtarDragdrop.spec.ts
@@ -100,17 +100,21 @@ test.describe('Test table', () => {
       const childColumn = await getTextExcludeIconText(
         await columnAddModal.locator(`.ant-form-item-control-input`).nth(3)
       );
+      const aggregateFunction = await getTextExcludeIconText(
+        await columnAddModal.locator(`.ant-form-item-control-input`).nth(4)
+      );
 
       // validate
-      expect(columnType).toContain('Lookup');
+      expect(columnType).toContain('Rollup');
       expect(linkField.split(' ')[0]).toContain('Table1');
-      expect(childColumn).toContain('Title');
+      expect(childColumn).toContain('Id');
+      expect(aggregateFunction).toContain('max');
 
       // save
       await columnAddModal.locator(`.ant-btn-primary`).click();
 
       // verify if column is created
-      await grid.column.verify({ title: 'Table1Lookup', isVisible: true });
+      await grid.column.verify({ title: 'Table1Rollup', isVisible: true });
     }
   });
 });

From 257e59211ae88ef8e1ad9d5c2c1ac9bc935d0cfc Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 21 Jun 2023 14:13:13 +0530
Subject: [PATCH 111/208] refactor: exclude Links from lookup support

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/smartsheet/column/LookupOptions.vue     | 10 ++++++----
 packages/nc-gui/components/virtual-cell/Links.vue      |  9 ++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
index 764f6689ee..783ce9fbbf 100644
--- a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onMounted } from '@vue/runtime-core'
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { RelationTypes, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { RelationTypes, UITypes, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import { MetaInj, inject, ref, storeToRefs, useColumnCreateStoreOrThrow, useMetas, useProject, useVModel } from '#imports'
 
 const props = defineProps<{
@@ -57,7 +57,9 @@ const columns = $computed<ColumnType[]>(() => {
   if (!selectedTable?.id) {
     return []
   }
-  return metas[selectedTable.id].columns.filter((c: ColumnType) => !isSystemColumn(c) && c.id !== vModel.value.id)
+  return metas[selectedTable.id].columns.filter(
+    (c: ColumnType) => !isSystemColumn(c) && c.id !== vModel.value.id && c.uidt !== UITypes.Links,
+  )
 })
 
 onMounted(() => {
@@ -109,8 +111,8 @@ const cellIcon = (column: ColumnType) =>
         >
           <a-select-option v-for="(column, index) of columns" :key="index" :value="column.id">
             <div class="flex items-center -ml-1">
-            <component :is="cellIcon(column)" :column-meta="column" />
-            {{ column.title }}
+              <component :is="cellIcon(column)" :column-meta="column" />
+              {{ column.title }}
             </div>
           </a-select-option>
         </a-select>
diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index 6d17b1f30a..348d02ba4a 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -3,7 +3,7 @@ import { computed } from '@vue/reactivity'
 import type { ColumnType } from 'nocodb-sdk'
 import { ref } from 'vue'
 import type { Ref } from 'vue'
-import { ActiveCellInj, CellValueInj, ColumnInj, EditModeInj, MetaInj, inject, useSelectedCellKeyupListener } from '#imports'
+import { ActiveCellInj,IsUnderLookupInj, CellValueInj, ColumnInj, EditModeInj, MetaInj, inject, useSelectedCellKeyupListener } from '#imports'
 
 const value = inject(CellValueInj, ref(0))
 
@@ -29,6 +29,9 @@ const active = inject(ActiveCellInj, ref(false))
 
 const editable = inject(EditModeInj, ref(false))
 
+
+const isUnderLookup = inject(IsUnderLookupInj, ref(false))
+
 const listItemsDlg = ref(false)
 
 const childListDlg = ref(false)
@@ -97,8 +100,8 @@ const localCellValue = computed<any[]>(() => {
       <div class="block flex-shrink truncate">
         <component
           :title="textVal"
-          :is="isLocked ? 'span' : 'a'"
-          class="text-center pl-3 nc-datatype-link "
+          :is="isLocked || IsUnderLookupInj ? 'span' : 'a'"
+          class="text-center pl-3 nc-datatype-link"
           :class="{ '!text-gray-300': !value }"
           @click.stop.prevent="openChildList"
         >

From 89d822bfa5fbeb12b2735c3a0c34d5b4724380d3 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 21 Jun 2023 14:34:41 +0530
Subject: [PATCH 112/208] chore: update tsconfig to support FormData type which
 is part of dom

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/tests/unit/tsconfig.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/tests/unit/tsconfig.json b/packages/nocodb/tests/unit/tsconfig.json
index 1b657c9239..0685f510ab 100644
--- a/packages/nocodb/tests/unit/tsconfig.json
+++ b/packages/nocodb/tests/unit/tsconfig.json
@@ -46,7 +46,8 @@
     // "emitDecoratorMetadata": true /* Enables experimental support for emitting type metadata for decorators. */,
 
     "lib": [
-      "es2017"
+      "es2017",
+      "dom"
     ],
     "types": [
       "mocha", "node"

From 2c95b934566134feb66a96f2797b13c998fc4966 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 21 Jun 2023 18:01:32 +0530
Subject: [PATCH 113/208] fix: remove duplicate code

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/virtual-cell/Links.vue   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index 348d02ba4a..2cb61a6236 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -3,7 +3,16 @@ import { computed } from '@vue/reactivity'
 import type { ColumnType } from 'nocodb-sdk'
 import { ref } from 'vue'
 import type { Ref } from 'vue'
-import { ActiveCellInj,IsUnderLookupInj, CellValueInj, ColumnInj, EditModeInj, MetaInj, inject, useSelectedCellKeyupListener } from '#imports'
+import {
+  ActiveCellInj,
+  CellValueInj,
+  ColumnInj,
+  EditModeInj,
+  IsUnderLookupInj,
+  MetaInj,
+  inject,
+  useSelectedCellKeyupListener,
+} from '#imports'
 
 const value = inject(CellValueInj, ref(0))
 
@@ -29,9 +38,6 @@ const active = inject(ActiveCellInj, ref(false))
 
 const editable = inject(EditModeInj, ref(false))
 
-
-const isUnderLookup = inject(IsUnderLookupInj, ref(false))
-
 const listItemsDlg = ref(false)
 
 const childListDlg = ref(false)
@@ -99,8 +105,8 @@ const localCellValue = computed<any[]>(() => {
     <template v-if="!isForm">
       <div class="block flex-shrink truncate">
         <component
-          :title="textVal"
           :is="isLocked || IsUnderLookupInj ? 'span' : 'a'"
+          :title="textVal"
           class="text-center pl-3 nc-datatype-link"
           :class="{ '!text-gray-300': !value }"
           @click.stop.prevent="openChildList"
@@ -108,7 +114,7 @@ const localCellValue = computed<any[]>(() => {
           {{ textVal }}
         </component>
       </div>
-      <div class="flex-grow"/>
+      <div class="flex-grow" />
 
       <div v-if="!isLocked && !isUnderLookup" class="flex justify-end gap-1 min-h-[30px] items-center">
         <GeneralIcon

From 0ddd4983c5100dc9afaa9c9a27bae8048367325a Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 21 Jun 2023 18:02:49 +0530
Subject: [PATCH 114/208] fix: condition correction

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

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index 2cb61a6236..07e411b08c 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -105,7 +105,7 @@ const localCellValue = computed<any[]>(() => {
     <template v-if="!isForm">
       <div class="block flex-shrink truncate">
         <component
-          :is="isLocked || IsUnderLookupInj ? 'span' : 'a'"
+          :is="isLocked || !IsUnderLookupInj ? 'span' : 'a'"
           :title="textVal"
           class="text-center pl-3 nc-datatype-link"
           :class="{ '!text-gray-300': !value }"

From cb749a4d56fd691ad2d1b89990f9817c997c3525 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 21 Jun 2023 18:14:43 +0530
Subject: [PATCH 115/208] fix: condition correction

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

diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index 07e411b08c..cf4aca47d6 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -105,7 +105,7 @@ const localCellValue = computed<any[]>(() => {
     <template v-if="!isForm">
       <div class="block flex-shrink truncate">
         <component
-          :is="isLocked || !IsUnderLookupInj ? 'span' : 'a'"
+          :is="isLocked || isUnderLookup ? 'span' : 'a'"
           :title="textVal"
           class="text-center pl-3 nc-datatype-link"
           :class="{ '!text-gray-300': !value }"

From e8ab7d2d063c54d9a3487fa7414ac7b596d2419b Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 21 Jun 2023 18:23:19 +0530
Subject: [PATCH 116/208] fix: make chip component readonly in Listitem

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/virtual-cell/components/ItemChip.vue   | 5 +++--
 .../nc-gui/components/virtual-cell/components/ListItems.vue  | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/components/ItemChip.vue b/packages/nc-gui/components/virtual-cell/components/ItemChip.vue
index a1afc98d60..232271dfaa 100644
--- a/packages/nc-gui/components/virtual-cell/components/ItemChip.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ItemChip.vue
@@ -19,9 +19,10 @@ interface Props {
   column: any
   showUnlinkButton: boolean
   border?: boolean
+  readonly?: boolean
 }
 
-const { value, item, column, showUnlinkButton, border = true } = defineProps<Props>()
+const { value, item, column, showUnlinkButton, border = true, readonly: readonlyProp } = defineProps<Props>()
 
 const emit = defineEmits(['unlink'])
 
@@ -40,7 +41,7 @@ const isLocked = inject(IsLockedInj, ref(false))
 const { open } = useExpandedFormDetached()
 
 function openExpandedForm() {
-  if (!readOnly.value && !isLocked.value) {
+  if (!readOnly.value && !isLocked.value && !readonlyProp) {
     open({
       isOpen: true,
       row: { row: item, rowMeta: {}, oldRow: { ...item } },
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItems.vue b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
index bd9d4ba6c6..20966329a5 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
@@ -234,6 +234,7 @@ watch(vModel, (nextVal) => {
               :column="props.column"
               :show-unlink-button="false"
               :border="false"
+              readonly
             />
             <!--            <span class="hidden group-hover:(inline) text-gray-400 text-[11px] ml-1"> -->
             <!--              ({{ $t('labels.primaryKey') }} : {{ getRelatedTableRowId(refRow) }}) -->

From 8d8ed60c8826a07f62db9e5281502e8c0b020cd3 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 21 Jun 2023 18:25:50 +0530
Subject: [PATCH 117/208] fix: show Links column in ERD

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/erd/View.vue | 2 +-
 packages/nc-gui/components/erd/utils.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/erd/View.vue b/packages/nc-gui/components/erd/View.vue
index e38dd47020..eef3e6d169 100644
--- a/packages/nc-gui/components/erd/View.vue
+++ b/packages/nc-gui/components/erd/View.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes, isLinksOrLTAR } from 'nocodb-sdk'
+import { isLinksOrLTAR } from 'nocodb-sdk'
 import type { ERDConfig } from './utils'
 import { reactive, ref, storeToRefs, useMetas, useProject, watch } from '#imports'
 
diff --git a/packages/nc-gui/components/erd/utils.ts b/packages/nc-gui/components/erd/utils.ts
index 1a39e32a25..a6a60ddfc0 100644
--- a/packages/nc-gui/components/erd/utils.ts
+++ b/packages/nc-gui/components/erd/utils.ts
@@ -174,7 +174,7 @@ export function useErdElements(tables: MaybeRef<TableType[]>, props: MaybeRef<ER
 
       const columns =
         metasWithIdAsKey.value[table.id].columns?.filter(
-          (col) => config.showAllColumns || (!config.showAllColumns && col.uidt === UITypes.LinkToAnotherRecord),
+          (col) => config.showAllColumns || (!config.showAllColumns && isLinksOrLTAR(col)),
         ) || []
 
       const pkAndFkColumns = columns.filter(() => config.showPkAndFk).filter((col) => col.pk || col.uidt === UITypes.ForeignKey)

From f4800710c224091b756639789f6f60b4daf7069d Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 22 Jun 2023 11:02:02 +0530
Subject: [PATCH 118/208] refactor:  always create lookup on dnd if Link exist

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/tabs/Smartsheet.vue     | 28 ++++++-------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/packages/nc-gui/components/tabs/Smartsheet.vue b/packages/nc-gui/components/tabs/Smartsheet.vue
index 3549950afd..4add7738e3 100644
--- a/packages/nc-gui/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui/components/tabs/Smartsheet.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes, isLinksOrLTAR, RelationTypes } from 'nocodb-sdk'
+import { UITypes, isLinksOrLTAR } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   FieldsInj,
@@ -98,25 +98,13 @@ const onDrop = async (event: DragEvent) => {
       return ltarOptions.fk_related_model_id === childMeta.id
     })
     if (relationCol) {
-      if (relationCol.colOptions.type === RelationTypes.BELONGS_TO) {
-        const lookupCol = childMeta.columns?.find((c) => c.pv) ?? childMeta.columns?.[0]
-
-        grid.value?.openColumnCreate({
-          uidt: UITypes.Lookup,
-          title: `${relationCol.title}Lookup`,
-          fk_relation_column_id: relationCol.id,
-          fk_lookup_column_id: lookupCol?.id,
-        })
-      } else {
-        const rollupCol = childMeta.columns?.find((c) => c.pk) ?? childMeta.columns?.[0]
-        grid.value?.openColumnCreate({
-          uidt: UITypes.Rollup,
-          title: `${relationCol.title}Rollup`,
-          fk_relation_column_id: relationCol.id,
-          fk_rollup_column_id: rollupCol?.id,
-          rollup_function: 'max',
-        })
-      }
+      const lookupCol = childMeta.columns?.find((c) => c.pv) ?? childMeta.columns?.[0]
+      grid.value?.openColumnCreate({
+        uidt: UITypes.Lookup,
+        title: `${relationCol.title}Lookup`,
+        fk_relation_column_id: relationCol.id,
+        fk_lookup_column_id: lookupCol?.id,
+      })
     } else {
       grid.value?.openColumnCreate({
         uidt: UITypes.Links,

From d91a0cadc6cae68d70c0407a26891cc0550550ab Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 22 Jun 2023 11:03:21 +0530
Subject: [PATCH 119/208] refactor: allow hm & mm lookup creation

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/smartsheet/column/LookupOptions.vue    | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
index 783ce9fbbf..bd9eb90809 100644
--- a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
@@ -20,8 +20,6 @@ const { tables } = $(storeToRefs(useProject()))
 
 const { metas } = $(useMetas())
 
-const deprecatedEnabled = $(ref(false))
-
 setAdditionalValidations({
   fk_relation_column_id: [{ required: true, message: 'Required' }],
   fk_lookup_column_id: [{ required: true, message: 'Required' }],
@@ -36,13 +34,7 @@ const refTables = $computed(() => {
   }
 
   const _refTables = meta.columns
-    .filter(
-      (column) =>
-        isLinksOrLTAR(column) &&
-        (deprecatedEnabled || column.colOptions?.type === RelationTypes.BELONGS_TO) &&
-        !column.system &&
-        column.base_id === meta?.base_id,
-    )
+    .filter((column) => isLinksOrLTAR(column) && !column.system && column.base_id === meta?.base_id)
     .map((column) => ({
       col: column.colOptions,
       column,
@@ -88,7 +80,6 @@ const cellIcon = (column: ColumnType) =>
           v-model:value="vModel.fk_relation_column_id"
           dropdown-class-name="!w-64 nc-dropdown-relation-table"
           @change="onRelationColChange"
-          @dblclick="deprecatedEnabled = !deprecatedEnabled"
         >
           <a-select-option v-for="(table, i) of refTables" :key="i" :value="table.col.fk_column_id">
             <div class="flex flex-row space-x-0.5 h-full pb-0.5 items-center justify-between">

From 04a2723c38355886f9097c7244f86fc473aa9e09 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 22 Jun 2023 13:01:18 +0530
Subject: [PATCH 120/208] test: Links instead of LinkToAnotherRecord

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 packages/nocodb/tests/unit/factory/column.ts | 54 ++++++++++----------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/packages/nocodb/tests/unit/factory/column.ts b/packages/nocodb/tests/unit/factory/column.ts
index 1b9617f7b9..ab3cbe04df 100644
--- a/packages/nocodb/tests/unit/factory/column.ts
+++ b/packages/nocodb/tests/unit/factory/column.ts
@@ -1,13 +1,13 @@
 import { UITypes } from 'nocodb-sdk';
 import request from 'supertest';
-import Column from '../../../src/models/Column';
-import FormViewColumn from '../../../src/models/FormViewColumn';
-import GalleryViewColumn from '../../../src/models/GalleryViewColumn';
-import GridViewColumn from '../../../src/models/GridViewColumn';
 import Model from '../../../src/models/Model';
-import Project from '../../../src/models/Project';
-import View from '../../../src/models/View';
-import { isSqlite, isPg } from '../init/db';
+import { isPg, isSqlite } from '../init/db';
+import type Column from '../../../src/models/Column';
+import type FormViewColumn from '../../../src/models/FormViewColumn';
+import type GalleryViewColumn from '../../../src/models/GalleryViewColumn';
+import type GridViewColumn from '../../../src/models/GridViewColumn';
+import type Project from '../../../src/models/Project';
+import type View from '../../../src/models/View';
 
 const defaultColumns = function (context) {
   return [
@@ -55,7 +55,7 @@ const createColumn = async (context, table, columnAttr) => {
     });
 
   const column: Column = (await table.getColumns()).find(
-    (column) => column.title === columnAttr.title
+    (column) => column.title === columnAttr.title,
   );
   return column;
 };
@@ -76,7 +76,7 @@ const createRollupColumn = async (
     table: Model;
     relatedTableName: string;
     relatedTableColumnTitle: string;
-  }
+  },
 ) => {
   const childBases = await project.getBases();
   const childTable = await Model.getByIdOrName({
@@ -86,13 +86,14 @@ const createRollupColumn = async (
   });
   const childTableColumns = await childTable.getColumns();
   const childTableColumn = await childTableColumns.find(
-    (column) => column.title === relatedTableColumnTitle
+    (column) => column.title === relatedTableColumnTitle,
   );
 
   const ltarColumn = (await table.getColumns()).find(
     (column) =>
-      column.uidt === UITypes.LinkToAnotherRecord &&
-      column.colOptions?.fk_related_model_id === childTable.id
+      (column.uidt === UITypes.Links ||
+        column.uidt === UITypes.LinkToAnotherRecord) &&
+      column.colOptions?.fk_related_model_id === childTable.id,
   );
 
   const rollupColumn = await createColumn(context, table, {
@@ -122,7 +123,7 @@ const createLookupColumn = async (
     table: Model;
     relatedTableName: string;
     relatedTableColumnTitle: string;
-  }
+  },
 ) => {
   const childBases = await project.getBases();
   const childTable = await Model.getByIdOrName({
@@ -132,19 +133,20 @@ const createLookupColumn = async (
   });
   const childTableColumns = await childTable.getColumns();
   const childTableColumn = await childTableColumns.find(
-    (column) => column.title === relatedTableColumnTitle
+    (column) => column.title === relatedTableColumnTitle,
   );
 
   if (!childTableColumn) {
     throw new Error(
-      `Could not find column ${relatedTableColumnTitle} in ${relatedTableName}`
+      `Could not find column ${relatedTableColumnTitle} in ${relatedTableName}`,
     );
   }
 
   const ltarColumn = (await table.getColumns()).find(
     (column) =>
-      column.uidt === UITypes.LinkToAnotherRecord &&
-      column.colOptions?.fk_related_model_id === childTable.id
+      (column.uidt === UITypes.Links ||
+        column.uidt === UITypes.LinkToAnotherRecord) &&
+      column.colOptions?.fk_related_model_id === childTable.id,
   );
   const lookupColumn = await createColumn(context, table, {
     title: title,
@@ -168,15 +170,15 @@ const createQrCodeColumn = async (
     title: string;
     table: Model;
     referencedQrValueTableColumnTitle: string;
-  }
+  },
 ) => {
   const referencedQrValueTableColumnId = await table
     .getColumns()
     .then(
       (cols) =>
         cols.find(
-          (column) => column.title == referencedQrValueTableColumnTitle
-        )['id']
+          (column) => column.title == referencedQrValueTableColumnTitle,
+        )['id'],
     );
 
   const qrCodeColumn = await createColumn(context, table, {
@@ -198,15 +200,15 @@ const createBarcodeColumn = async (
     title: string;
     table: Model;
     referencedBarcodeValueTableColumnTitle: string;
-  }
+  },
 ) => {
   const referencedBarcodeValueTableColumnId = await table
     .getColumns()
     .then(
       (cols) =>
         cols.find(
-          (column) => column.title == referencedBarcodeValueTableColumnTitle
-        )['id']
+          (column) => column.title == referencedBarcodeValueTableColumnTitle,
+        )['id'],
     );
 
   const barcodeColumn = await createColumn(context, table, {
@@ -230,12 +232,12 @@ const createLtarColumn = async (
     parentTable: Model;
     childTable: Model;
     type: string;
-  }
+  },
 ) => {
   const ltarColumn = await createColumn(context, parentTable, {
     title: title,
     column_name: title,
-    uidt: UITypes.LinkToAnotherRecord,
+    uidt: UITypes.Links,
     parentId: parentTable.id,
     childId: childTable.id,
     type: type,
@@ -246,7 +248,7 @@ const createLtarColumn = async (
 
 const updateViewColumn = async (
   context,
-  { view, column, attr }: { column: Column; view: View; attr: any }
+  { view, column, attr }: { column: Column; view: View; attr: any },
 ) => {
   const res = await request(context.app)
     .patch(`/api/v1/db/meta/views/${view.id}/columns/${column.id}`)

From 5fa2852d3078de326a26fe405c8213b22279433f Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 22 Jun 2023 15:54:12 +0530
Subject: [PATCH 121/208] test: LTAR info as link count

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 packages/nocodb/tests/unit/rest/tests/tableRow.test.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts b/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
index 230b2031bc..f08df9589f 100644
--- a/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
@@ -2195,8 +2195,9 @@ function tableTest() {
       column: ltarColumn,
       type: 'hm',
     });
-    const childRow = row['Ltar'][0];
 
+    // read rows of related table
+    const childRow = (await listRow({ project, table: relatedTable }))[0];
     const response = await request(context.app)
       .delete(
         `/api/v1/db/data/noco/${project.id}/${table.id}/${row['Id']}/hm/${ltarColumn.id}/${childRow['Id']}`,
@@ -2206,7 +2207,8 @@ function tableTest() {
 
     const updatedRow = await getRow(context, { project, table, id: row['Id'] });
 
-    if (updatedRow['Ltar'].length !== 0) {
+    // LTAR now returns rollup count
+    if (updatedRow['Ltar'] !== 0) {
       throw new Error('Was not deleted');
     }
 

From 29fced3a829df3a9c2bf9e39c153e7cf2d4a5f69 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 22 Jun 2023 16:04:01 +0530
Subject: [PATCH 122/208] fix: handle Links column properly while generating
 AST

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/helpers/getAst.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/nocodb/src/helpers/getAst.ts b/packages/nocodb/src/helpers/getAst.ts
index ee5a9209b5..6093a29d9b 100644
--- a/packages/nocodb/src/helpers/getAst.ts
+++ b/packages/nocodb/src/helpers/getAst.ts
@@ -89,11 +89,12 @@ const getAst = async ({
         value = ast;
 
         // todo: include field relative to the relation => pk / fk
+      } else if (col.uidt === UITypes.Links) {
+        value = 1;
       } else {
-        value = (Array.isArray(fields) ? fields : fields.split(',')).reduce(
-          (o, f) => ({ ...o, [f]: 1 }),
-          {},
-        );
+        value = (
+          Array.isArray(nestedFields) ? nestedFields : nestedFields.split(',')
+        ).reduce((o, f) => ({ ...o, [f]: 1 }), {});
       }
     } else if (col.uidt === UITypes.LinkToAnotherRecord) {
       const model = await col

From d571f65df2ec28b63e2211e0a5c07d9c93dd8e9a Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 22 Jun 2023 16:34:15 +0530
Subject: [PATCH 123/208] test: unlink handling for bt

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../pages/Dashboard/common/Cell/index.ts      | 25 +++++++++++++------
 .../db/columnLinkToAnotherRecord.spec.ts      |  2 +-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index 8cdbd54186..9f509d4013 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -329,13 +329,24 @@ export class CellPageObject extends BasePage {
 
   async unlinkVirtualCell({ index, columnHeader }: CellProps) {
     const cell = this.get({ index, columnHeader });
-    await cell.locator('.nc-datatype-link').click();
-    await this.waitForResponse({
-      uiAction: () => this.rootPage.locator(`[data-testid="nc-child-list-icon-unlink"]`).first().click(),
-      requestUrlPathToMatch: '/api/v1/db/data/noco/',
-      httpMethodsToMatch: ['GET'],
-    });
-    await this.rootPage.keyboard.press('Escape');
+    const isLink = await cell.locator('.nc-datatype-link').count();
+
+    // Count will be 0 for BT columns
+    if (!isLink) {
+      await cell.click();
+      await cell.locator('.nc-icon.unlink-icon').click();
+    }
+
+    // For HM/MM columns
+    else {
+      await cell.locator('.nc-datatype-link').click();
+      await this.waitForResponse({
+        uiAction: () => this.rootPage.locator(`[data-testid="nc-child-list-icon-unlink"]`).first().click(),
+        requestUrlPathToMatch: '/api/v1/db/data/noco/',
+        httpMethodsToMatch: ['GET'],
+      });
+      await this.rootPage.keyboard.press('Escape');
+    }
   }
 
   async verifyRoleAccess(param: { role: string }) {
diff --git a/tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts b/tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts
index e1fa1a374a..8d9ca7bc38 100644
--- a/tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts
+++ b/tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts
@@ -166,7 +166,7 @@ test.describe('LTAR create & update', () => {
       }
     }
 
-    // verify LTAR cell values
+    // Unlink LTAR cells
     for (let i = 0; i < expected2.length; i++) {
       for (let j = 0; j < expected2[i].length; j++) {
         await dashboard.grid.cell.unlinkVirtualCell({

From 9dfe1728497bfbf4ee8d07e5c8712fdb554c8ae7 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 22 Jun 2023 16:51:03 +0530
Subject: [PATCH 124/208] test: lookup instead of rollup for drag drop

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../playwright/tests/db/columnLtarDragdrop.spec.ts | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/tests/playwright/tests/db/columnLtarDragdrop.spec.ts b/tests/playwright/tests/db/columnLtarDragdrop.spec.ts
index c7ca9242df..77fd71e070 100644
--- a/tests/playwright/tests/db/columnLtarDragdrop.spec.ts
+++ b/tests/playwright/tests/db/columnLtarDragdrop.spec.ts
@@ -69,7 +69,7 @@ test.describe('Test table', () => {
     const src = await dashboard.rootPage.locator(`[data-testid="tree-view-table-draggable-handle-Table1"]`);
     const dst = await dashboard.rootPage.locator(`[data-testid="grid-row-0"]`);
 
-    // drag drop for Links column creation
+    // drag drop for LTAR column creation
     //
     await src.dragTo(dst);
     const columnAddModal = await dashboard.rootPage.locator(`.nc-dropdown-grid-add-column`);
@@ -100,21 +100,17 @@ test.describe('Test table', () => {
       const childColumn = await getTextExcludeIconText(
         await columnAddModal.locator(`.ant-form-item-control-input`).nth(3)
       );
-      const aggregateFunction = await getTextExcludeIconText(
-        await columnAddModal.locator(`.ant-form-item-control-input`).nth(4)
-      );
 
       // validate
-      expect(columnType).toContain('Rollup');
-      expect(linkField.split(' ')[0]).toContain('Table1');
-      expect(childColumn).toContain('Id');
-      expect(aggregateFunction).toContain('max');
+      expect(columnType).toContain('Lookup');
+      expect(linkField).toContain('Table1');
+      expect(childColumn).toContain('Title');
 
       // save
       await columnAddModal.locator(`.ant-btn-primary`).click();
 
       // verify if column is created
-      await grid.column.verify({ title: 'Table1Rollup', isVisible: true });
+      await grid.column.verify({ title: 'Table1Lookup', isVisible: true });
     }
   });
 });

From c6fa4ceb671785cc624336537d56dcc47ccee6da Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 22 Jun 2023 16:57:05 +0530
Subject: [PATCH 125/208] refactor: remove deprecated text

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

diff --git a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
index bd9eb90809..4b9dbff125 100644
--- a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
@@ -85,7 +85,6 @@ const cellIcon = (column: ColumnType) =>
             <div class="flex flex-row space-x-0.5 h-full pb-0.5 items-center justify-between">
               <div class="font-semibold text-xs">{{ table.column.title }}</div>
               <div class="text-[0.65rem] text-gray-600">
-                <span v-if="table.col.type !== RelationTypes.BELONGS_TO" class="text-[0.65rem] text-gray-600">(Deprecated)</span>
                 <span class="uppercase">{{ table.col.type }}</span> {{ table.title || table.table_name }}
               </div>
             </div>

From 09fe6b73cf938de589e3a5650c84b85640a7e80a Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 22 Jun 2023 17:15:54 +0530
Subject: [PATCH 126/208] fix: while deleting table delete Links column in
 related table as well

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/services/tables.service.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nocodb/src/services/tables.service.ts b/packages/nocodb/src/services/tables.service.ts
index b656efe362..a2b6c22bd9 100644
--- a/packages/nocodb/src/services/tables.service.ts
+++ b/packages/nocodb/src/services/tables.service.ts
@@ -2,11 +2,11 @@ import { Injectable } from '@nestjs/common';
 import DOMPurify from 'isomorphic-dompurify';
 import {
   AuditOperationSubTypes,
-  AuditOperationTypes,
+  AuditOperationTypes, isLinksOrLTAR,
   isVirtualCol,
   ModelTypes,
   UITypes,
-} from 'nocodb-sdk';
+} from 'nocodb-sdk'
 import { T } from 'nc-help';
 import ProjectMgrv2 from '../db/sql-mgr/v2/ProjectMgrv2';
 import { NcError } from '../helpers/catchError';
@@ -157,7 +157,7 @@ export class TablesService {
     const base = project.bases.find((b) => b.id === table.base_id);
 
     const relationColumns = table.columns.filter(
-      (c) => c.uidt === UITypes.LinkToAnotherRecord,
+      (c) => isLinksOrLTAR(c),
     );
 
     if (relationColumns?.length && !base.is_meta) {

From 41e1f1dffef91fb56a7588cec782d1154cefebbe Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 22 Jun 2023 17:27:23 +0530
Subject: [PATCH 127/208] refactor: Lookup and rollup options improvements

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../smartsheet/column/LookupOptions.vue         | 15 ++++++++++-----
 .../smartsheet/column/RollupOptions.vue         | 17 ++++++++++++-----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
index 4b9dbff125..df6768bc4c 100644
--- a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
@@ -82,9 +82,10 @@ const cellIcon = (column: ColumnType) =>
           @change="onRelationColChange"
         >
           <a-select-option v-for="(table, i) of refTables" :key="i" :value="table.col.fk_column_id">
-            <div class="flex flex-row space-x-0.5 h-full pb-0.5 items-center justify-between">
-              <div class="font-semibold text-xs">{{ table.column.title }}</div>
-              <div class="text-[0.65rem] text-gray-600">
+            <div class="flex flex-row h-full pb-0.5 items-center max-w-full">
+              <div class="font-semibold text-xs flex-shrink flex-grow-0 truncate">{{ table.column.title }}</div>
+              <div class="flex-grow"></div>
+              <div class="text-[0.65rem] text-gray-600 nc-relation-details">
                 <span class="uppercase">{{ table.col.type }}</span> {{ table.title || table.table_name }}
               </div>
             </div>
@@ -100,7 +101,7 @@ const cellIcon = (column: ColumnType) =>
           @change="onDataTypeChange"
         >
           <a-select-option v-for="(column, index) of columns" :key="index" :value="column.id">
-            <div class="flex items-center -ml-1">
+            <div class="flex items-center -ml-1 font-semibold text-xs">
               <component :is="cellIcon(column)" :column-meta="column" />
               {{ column.title }}
             </div>
@@ -111,4 +112,8 @@ const cellIcon = (column: ColumnType) =>
   </div>
 </template>
 
-<style scoped></style>
+<style scoped>
+:deep(.ant-select-selector .ant-select-selection-item .nc-relation-details) {
+  @apply hidden;
+}
+</style>
diff --git a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
index 25b9aa5046..2bd407abf2 100644
--- a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
@@ -100,10 +100,11 @@ const cellIcon = (column: ColumnType) =>
           @change="onRelationColChange"
         >
           <a-select-option v-for="(table, i) of refTables" :key="i" :value="table.col.fk_column_id">
-            <div class="flex flex-row space-x-0.5 h-full pb-0.5 items-center justify-between">
-              <div class="font-semibold text-xs">{{ table.column.title }}</div>
-              <div class="text-[0.65rem] text-gray-600">
-                (<span class="uppercase">{{ table.col.type }}</span> {{ table.title || table.table_name }})
+            <div class="flex flex-row h-full pb-0.5 items-center max-w-full">
+              <div class="font-semibold text-xs flex-shrink flex-grow-0 truncate">{{ table.column.title }}</div>
+              <div class="flex-grow"></div>
+              <div class="text-[0.65rem] text-gray-600 nc-relation-details">
+                <span class="uppercase">{{ table.col.type }}</span> {{ table.title || table.table_name }}
               </div>
             </div>
           </a-select-option>
@@ -118,7 +119,7 @@ const cellIcon = (column: ColumnType) =>
           @change="onDataTypeChange"
         >
           <a-select-option v-for="(column, index) of columns" :key="index" :value="column.id">
-            <div class="flex items-center -ml-1">
+            <div class="flex items-center -ml-1 font-semibold text-xs">
               <component :is="cellIcon(column)" :column-meta="column" />
 
               {{ column.title }}
@@ -141,3 +142,9 @@ const cellIcon = (column: ColumnType) =>
     </a-form-item>
   </div>
 </template>
+
+<style scoped>
+:deep(.ant-select-selector .ant-select-selection-item .nc-relation-details) {
+  @apply hidden;
+}
+</style>

From aaa56732fbdfbda656fdd4a5a269470fc24a6649 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 22 Jun 2023 17:43:18 +0530
Subject: [PATCH 128/208] test: project duplicate, ignore nc___

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/utils/objectCompareUtil.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/playwright/tests/utils/objectCompareUtil.ts b/tests/playwright/tests/utils/objectCompareUtil.ts
index e6eb072499..3c80511ec6 100644
--- a/tests/playwright/tests/utils/objectCompareUtil.ts
+++ b/tests/playwright/tests/utils/objectCompareUtil.ts
@@ -51,7 +51,8 @@ export function deepCompare(
   for (const key of keys1) {
     if (
       (ignoredFields !== undefined && ignoredFields.has(key)) ||
-      key.endsWith(' List') /* temp hack to avoid fields like */
+      key.endsWith(' List') /* temp hack to avoid fields like */ ||
+      key.includes('___')
     ) {
       // console.log(`${keyId} ignored in comparison`)
     } else {

From 6abcbc572d0f0f9a1a105b7ba16678d9eea363c3 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 22 Jun 2023 19:19:54 +0530
Subject: [PATCH 129/208] test: ltar to link corrections

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../nocodb/tests/unit/rest/tests/tableRow.test.ts | 15 +--------------
 .../nocodb/tests/unit/rest/tests/viewRow.test.ts  | 14 +-------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts b/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
index f08df9589f..b16c7b7ffe 100644
--- a/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
@@ -1295,20 +1295,7 @@ function tableTest() {
       .expect(200);
 
     const record = response.body;
-    expect(record['Film List']).length(19);
-    expect(record['Film List'][0]).to.have.all.keys(
-      'Title',
-      'ReleaseYear',
-      'Language',
-    );
-
-    // for SQLite Sakila, Language is null
-    if (isPg(context)) {
-      expect(record['Film List'][0]['Language']).to.have.all.keys(
-        'Name',
-        'LanguageId',
-      );
-    }
+    expect(record['Film List']).to.equal(19);
   });
 
   it('Update table row', async function () {
diff --git a/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts b/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
index f0d474f95d..46364486be 100644
--- a/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
@@ -701,19 +701,7 @@ function viewRowTests() {
       throw new Error('Wrong filter');
     }
 
-    const nestedRentalResponse = Object.keys(
-      ascResponse.body.list[0]['Rental List'][0],
-    );
-
-    if (
-      !(
-        nestedRentalResponse.includes('ReturnDate') &&
-        nestedRentalResponse.includes('RentalDate') &&
-        nestedRentalResponse.length === 2
-      )
-    ) {
-      throw new Error('Wrong nested fields');
-    }
+    expect(ascResponse.body.list[0]['Rental List']).to.equal(12);
   };
 
   it('Get nested sorted filtered table with nested fields data list with a rollup column in customer table view grid', async () => {

From 58b5811d8cf36c0a0eb3e8937af466ac4562a771 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 22 Jun 2023 19:53:30 +0530
Subject: [PATCH 130/208] test: mysql correction

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/fixtures/expectedData.txt            | 6 +++---
 tests/playwright/pages/Dashboard/common/Cell/index.ts | 3 +++
 tests/playwright/tests/db/viewGridShare.spec.ts       | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/playwright/fixtures/expectedData.txt b/tests/playwright/fixtures/expectedData.txt
index 05639b8ad4..bc0963b7db 100644
--- a/tests/playwright/fixtures/expectedData.txt
+++ b/tests/playwright/fixtures/expectedData.txt
@@ -1,4 +1,4 @@
 Address,District,PostalCode,Phone,Location,Customer List,Staff List,City
-1661 Abha Drive,Tamil Nadu,14400,270456873752,"{""x"":78.8214191,""y"":10.3812871}",1,,Pudukkottai
-1993 Tabuk Lane,Tamil Nadu,64221,648482415405,"{""x"":80.1270701,""y"":12.9246028}",2,,Tambaram
-381 Kabul Way,Taipei,87272,55477302294,"{""x"":0,""y"":0}",2,,Hsichuh
\ No newline at end of file
+1661 Abha Drive,Tamil Nadu,14400,270456873752,"{""x"":78.8214191,""y"":10.3812871}",1,0,Pudukkottai
+1993 Tabuk Lane,Tamil Nadu,64221,648482415405,"{""x"":80.1270701,""y"":12.9246028}",1,0,Tambaram
+381 Kabul Way,Taipei,87272,55477302294,"{""x"":0,""y"":0}",1,0,Hsichuh
\ No newline at end of file
diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index 9f509d4013..1677021b05 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -285,6 +285,9 @@ export class CellPageObject extends BasePage {
 
     await cell.scrollIntoViewIfNeeded();
 
+    // lazy load- give enough time for cell to load
+    await this.rootPage.waitForTimeout(1000);
+
     if (type === 'bt') {
       const chips = cell.locator('.chips > .chip');
       await expect(await chips.count()).toBe(count);
diff --git a/tests/playwright/tests/db/viewGridShare.spec.ts b/tests/playwright/tests/db/viewGridShare.spec.ts
index a4e02daa23..e6070a106a 100644
--- a/tests/playwright/tests/db/viewGridShare.spec.ts
+++ b/tests/playwright/tests/db/viewGridShare.spec.ts
@@ -281,8 +281,8 @@ const sqliteExpectedRecords2 = [
 ];
 
 const expectedVirtualRecords = [
-  { index: 0, columnHeader: 'Customer List', count: 1, value: ['2'] },
-  { index: 1, columnHeader: 'Customer List', count: 1, value: ['2'] },
+  { index: 0, columnHeader: 'Customer List', count: 1, type: 'hm' },
+  { index: 1, columnHeader: 'Customer List', count: 1, type: 'hm' },
   { index: 0, columnHeader: 'City', count: 1, type: 'bt', value: ['Kanchrapara'] },
   { index: 1, columnHeader: 'City', count: 1, type: 'bt', value: ['Tafuna'] },
 ];

From d87ba330903e79448558fdae3b4b4d448d7581ed Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 22 Jun 2023 19:58:26 +0530
Subject: [PATCH 131/208] test: base download data for PG

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../fixtures/expectedBaseDownloadDataPg.txt   | 218 +++++++++---------
 1 file changed, 109 insertions(+), 109 deletions(-)

diff --git a/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt b/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt
index 36d43c36ba..1c38d82466 100644
--- a/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt
+++ b/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt
@@ -1,110 +1,110 @@
 Country,City List
-Afghanistan,Kabul
-Algeria,"Batna, Bchar, Skikda"
-American Samoa,Tafuna
-Angola,"Benguela, Namibe"
-Anguilla,South Hill
-Argentina,"Almirante Brown, Avellaneda, Baha Blanca, Crdoba, Escobar, Ezeiza, La Plata, Merlo, Quilmes, San Miguel de Tucumn, Santa F, Tandil, Vicente Lpez"
-Armenia,Yerevan
-Australia,Woodridge
-Austria,"Graz, Linz, Salzburg"
-Azerbaijan,"Baku, Sumqayit"
-Bahrain,al-Manama
-Bangladesh,"Dhaka, Jamalpur, Tangail"
-Belarus,"Mogiljov, Molodetno"
-Bolivia,"El Alto, Sucre"
-Brazil,"Alvorada, Angra dos Reis, Anpolis, Aparecida de Goinia, Araatuba, Bag, Belm, Blumenau, Boa Vista, Braslia, Goinia, Guaruj, guas Lindas de Gois, Ibirit, Juazeiro do Norte, Juiz de Fora, Luzinia, Maring, Po, Poos de Caldas, Rio Claro, Santa Brbara dOeste, Santo Andr, So Bernardo do Campo, So Leopoldo"
-Brunei,Bandar Seri Begawan
-Bulgaria,"Ruse, Stara Zagora"
-Cambodia,"Battambang, Phnom Penh"
-Cameroon,"Bamenda, Yaound"
-Canada,"Gatineau, Halifax, Lethbridge, London, Oshawa, Richmond Hill, Vancouver"
-Chad,NDjamna
-Chile,"Antofagasta, Coquimbo, Rancagua"
-China,"Baicheng, Baiyin, Binzhou, Changzhou, Datong, Daxian, Dongying, Emeishan, Enshi, Ezhou, Fuyu, Fuzhou, Haining, Hami, Hohhot, Huaian, Jinchang, Jining, Jinzhou, Junan, Korla, Laiwu, Laohekou, Lengshuijiang, Leshan"
-Colombia,"Buenaventura, Dos Quebradas, Florencia, Pereira, Sincelejo, Sogamoso"
-"Congo, The Democratic Republic of the","Lubumbashi, Mwene-Ditu"
-Czech Republic,Olomouc
-Dominican Republic,"La Romana, San Felipe de Puerto Plata, Santiago de los Caballeros"
-Ecuador,"Loja, Portoviejo, Robamba"
-Egypt,"Bilbays, Idfu, Mit Ghamr, Qalyub, Sawhaj, Shubra al-Khayma"
-Estonia,Tartu
-Ethiopia,Addis Abeba
-Faroe Islands,Trshavn
-Finland,Oulu
-France,"Brest, Le Mans, Toulon, Toulouse"
-French Guiana,Cayenne
-French Polynesia,"Faaa, Papeete"
-Gambia,Banjul
-Germany,"Duisburg, Erlangen, Halle/Saale, Mannheim, Saarbrcken, Siegen, Witten"
-Greece,"Athenai, Patras"
-Greenland,Nuuk
-Holy See (Vatican City State),Citt del Vaticano
-Hong Kong,Kowloon and New Kowloon
-Hungary,Szkesfehrvr
-India,"Adoni, Ahmadnagar, Allappuzha (Alleppey), Ambattur, Amroha, Balurghat, Berhampore (Baharampur), Bhavnagar, Bhilwara, Bhimavaram, Bhopal, Bhusawal, Bijapur, Chandrapur, Chapra, Dhule (Dhulia), Etawah, Firozabad, Gandhinagar, Gulbarga, Haldia, Halisahar, Hoshiarpur, Hubli-Dharwad, Jaipur"
-Indonesia,"Cianjur, Ciomas, Ciparay, Gorontalo, Jakarta, Lhokseumawe, Madiun, Pangkal Pinang, Pemalang, Pontianak, Probolinggo, Purwakarta, Surakarta, Tegal"
-Iran,"Arak, Esfahan, Kermanshah, Najafabad, Qomsheh, Shahr-e Kord, Sirjan, Tabriz"
-Iraq,Mosul
-Israel,"Ashdod, Ashqelon, Bat Yam, Tel Aviv-Jaffa"
-Italy,"Alessandria, Bergamo, Brescia, Brindisi, Livorno, Syrakusa, Udine"
-Japan,"Akishima, Fukuyama, Higashiosaka, Hino, Hiroshima, Isesaki, Iwaki, Iwakuni, Iwatsuki, Izumisano, Kakamigahara, Kamakura, Kanazawa, Koriyama, Kurashiki, Kuwana, Matsue, Miyakonojo, Nagareyama, Okayama, Okinawa, Omiya, Onomichi, Otsu, Sagamihara"
-Kazakstan,"Pavlodar, Zhezqazghan"
-Kenya,"Kisumu, Nyeri"
-Kuwait,Jalib al-Shuyukh
-Latvia,"Daugavpils, Liepaja"
-Liechtenstein,Vaduz
-Lithuania,Vilnius
-Madagascar,Mahajanga
-Malawi,Lilongwe
-Malaysia,"Ipoh, Kuching, Sungai Petani"
-Mexico,"Acua, Allende, Atlixco, Carmen, Celaya, Coacalco de Berriozbal, Coatzacoalcos, Cuauhtmoc, Cuautla, Cuernavaca, El Fuerte, Guadalajara, Hidalgo, Huejutla de Reyes, Huixquilucan, Jos Azueta, Jurez, La Paz, Matamoros, Mexicali, Monclova, Nezahualcyotl, Pachuca de Soto, Salamanca, San Felipe del Progreso"
-Moldova,Chisinau
-Morocco,"Beni-Mellal, Nador, Sal"
-Mozambique,"Beira, Naala-Porto, Tete"
-Myanmar,"Monywa, Myingyan"
-Nauru,Yangor
-Nepal,Birgunj
-Netherlands,"Amersfoort, Apeldoorn, Ede, Emmen, s-Hertogenbosch"
-New Zealand,Hamilton
-Nigeria,"Benin City, Deba Habe, Effon-Alaiye, Ife, Ikerre, Ilorin, Kaduna, Ogbomosho, Ondo, Owo, Oyo, Sokoto, Zaria"
-North Korea,Pyongyang
-Oman,"Masqat, Salala"
-Pakistan,"Dadu, Mandi Bahauddin, Mardan, Okara, Shikarpur"
-Paraguay,"Asuncin, Ciudad del Este, San Lorenzo"
-Peru,"Callao, Hunuco, Lima, Sullana"
-Philippines,"Baybay, Bayugan, Bislig, Cabuyao, Cavite, Davao, Gingoog, Hagonoy, Iligan, Imus, Lapu-Lapu, Mandaluyong, Ozamis, Santa Rosa, Taguig, Talavera, Tanauan, Tanza, Tarlac, Tuguegarao"
-Poland,"Bydgoszcz, Czestochowa, Jastrzebie-Zdrj, Kalisz, Lublin, Plock, Tychy, Wroclaw"
-Puerto Rico,"Arecibo, Ponce"
-Romania,"Botosani, Bucuresti"
-Runion,Saint-Denis
-Russian Federation,"Atinsk, Balaiha, Dzerzinsk, Elista, Ivanovo, Jaroslavl, Jelets, Kaliningrad, Kamyin, Kirovo-Tepetsk, Kolpino, Korolev, Kurgan, Kursk, Lipetsk, Ljubertsy, Maikop, Moscow, Nabereznyje Telny, Niznekamsk, Novoterkassk, Pjatigorsk, Serpuhov, Smolensk, Syktyvkar"
-Saint Vincent and the Grenadines,Kingstown
-Saudi Arabia,"Abha, al-Hawiya, al-Qatif, Jedda, Tabuk"
-Senegal,Ziguinchor
-Slovakia,Bratislava
-South Africa,"Boksburg, Botshabelo, Chatsworth, Johannesburg, Kimberley, Klerksdorp, Newcastle, Paarl, Rustenburg, Soshanguve, Springs"
-South Korea,"Cheju, Kimchon, Naju, Tonghae, Uijongbu"
-Spain,"A Corua (La Corua), Donostia-San Sebastin, Gijn, Ourense (Orense), Santiago de Compostela"
-Sri Lanka,Jaffna
-Sudan,"al-Qadarif, Omdurman"
-Sweden,Malm
-Switzerland,"Basel, Bern, Lausanne"
-Taiwan,"Changhwa, Chiayi, Chungho, Fengshan, Hsichuh, Lungtan, Nantou, Tanshui, Touliu, Tsaotun"
-Tanzania,"Mwanza, Tabora, Zanzibar"
-Thailand,"Nakhon Sawan, Pak Kret, Songkhla"
-Tonga,Nukualofa
-Tunisia,Sousse
-Turkey,"Adana, Balikesir, Batman, Denizli, Eskisehir, Gaziantep, Inegl, Kilis, Ktahya, Osmaniye, Sivas, Sultanbeyli, Tarsus, Tokat, Usak"
-Turkmenistan,Ashgabat
-Tuvalu,Funafuti
-Ukraine,"Kamjanets-Podilskyi, Konotop, Mukateve, ostka, Simferopol, Sumy"
-United Arab Emirates,"Abu Dhabi, al-Ayn, Sharja"
-United Kingdom,"Bradford, Dundee, London, Southampton, Southend-on-Sea, Southport, Stockport, York"
-United States,"Akron, Arlington, Augusta-Richmond County, Aurora, Bellevue, Brockton, Cape Coral, Citrus Heights, Clarksville, Compton, Dallas, Dayton, El Monte, Fontana, Garden Grove, Garland, Grand Prairie, Greensboro, Joliet, Kansas City, Lancaster, Laredo, Lincoln, Manchester, Memphis"
-Venezuela,"Barcelona, Caracas, Cuman, Maracabo, Ocumare del Tuy, Valencia, Valle de la Pascua"
-Vietnam,"Cam Ranh, Haiphong, Hanoi, Nam Dinh, Nha Trang, Vinh"
-"Virgin Islands, U.S.",Charlotte Amalie
-Yemen,"Aden, Hodeida, Sanaa, Taizz"
-Yugoslavia,"Kragujevac, Novi Sad"
-Zambia,Kitwe
\ No newline at end of file
+Afghanistan,1,
+Algeria,3,
+American Samoa,1,
+Angola,2,
+Anguilla,1,
+Argentina,13,
+Armenia,1,
+Australia,1,
+Austria,3,
+Azerbaijan,2,
+Bahrain,1,
+Bangladesh,3,
+Belarus,2,
+Bolivia,2,
+Brazil,28,
+Brunei,1,
+Bulgaria,2,
+Cambodia,2,
+Cameroon,2,
+Canada,7,
+Chad,1,
+Chile,3,
+China,53,
+Colombia,6,
+\"Congo, The Democratic Republic of the\,2,
+Czech Republic,1,
+Dominican Republic,3,
+Ecuador,3,
+Egypt,6,
+Estonia,1,
+Ethiopia,1,
+Faroe Islands,1,
+Finland,1,
+France,4,
+French Guiana,1,
+French Polynesia,2,
+Gambia,1,
+Germany,7,
+Greece,2,
+Greenland,1,
+Holy See (Vatican City State),1,
+Hong Kong,1,
+Hungary,1,
+India,60,
+Indonesia,14,
+Iran,8,
+Iraq,1,
+Israel,4,
+Italy,7,
+Japan,31,
+Kazakstan,2,
+Kenya,2,
+Kuwait,1,
+Latvia,2,
+Liechtenstein,1,
+Lithuania,1,
+Madagascar,1,
+Malawi,1,
+Malaysia,3,
+Mexico,30,
+Moldova,1,
+Morocco,3,
+Mozambique,3,
+Myanmar,2,
+Nauru,1,
+Nepal,1,
+Netherlands,5,
+New Zealand,1,
+Nigeria,13,
+North Korea,1,
+Oman,2,
+Pakistan,5,
+Paraguay,3,
+Peru,4,
+Philippines,20,
+Poland,8,
+Puerto Rico,2,
+Romania,2,
+Runion,1,
+Russian Federation,28,
+Saint Vincent and the Grenadines,1,
+Saudi Arabia,5,
+Senegal,1,
+Slovakia,1,
+South Africa,11,
+South Korea,5,
+Spain,5,
+Sri Lanka,1,
+Sudan,2,
+Sweden,1,
+Switzerland,3,
+Taiwan,10,
+Tanzania,3,
+Thailand,3,
+Tonga,1,
+Tunisia,1,
+Turkey,15,
+Turkmenistan,1,
+Tuvalu,1,
+Ukraine,6,
+United Arab Emirates,3,
+United Kingdom,8,
+United States,35,
+Venezuela,7,
+Vietnam,6,
+\"Virgin Islands, U.S.\,1,
+Yemen,4,
+Yugoslavia,2,
+Zambia,1,
\ No newline at end of file

From 8b5e963a49b59ee673c766b8ce88332ba066a2d7 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 22 Jun 2023 20:15:04 +0530
Subject: [PATCH 132/208] test: webhook ltar info as rollup count

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/db/01-webhook.spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/playwright/tests/db/01-webhook.spec.ts b/tests/playwright/tests/db/01-webhook.spec.ts
index 6438939242..b35f39a93c 100644
--- a/tests/playwright/tests/db/01-webhook.spec.ts
+++ b/tests/playwright/tests/db/01-webhook.spec.ts
@@ -683,7 +683,7 @@ test.describe.serial('Webhook', () => {
             CountryCode: '1',
             CityCodeRollup: '2',
             CityCodeFormula: 100,
-            CityList: 2,
+            CityList: '2',
             CityCodeLookup: ['23', '33'],
           },
         ],
@@ -694,7 +694,7 @@ test.describe.serial('Webhook', () => {
             CountryCode: '1',
             CityCodeRollup: '2',
             CityCodeFormula: 100,
-            CityList: 2,
+            CityList: '2',
             CityCodeLookup: ['23', '33'],
           },
         ],

From 371dd3037e60ad15a2e691f381a71cfb973a0235 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 22 Jun 2023 20:24:14 +0530
Subject: [PATCH 133/208] test: disable is blank/not blank for ltar rollup

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/db/filters.spec.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/playwright/tests/db/filters.spec.ts b/tests/playwright/tests/db/filters.spec.ts
index a361f0afcc..4eb5063d21 100644
--- a/tests/playwright/tests/db/filters.spec.ts
+++ b/tests/playwright/tests/db/filters.spec.ts
@@ -942,8 +942,6 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
       { op: '<', value: '5', rowCount: 79 },
       { op: '>=', value: '5', rowCount: 30 },
       { op: '<=', value: '5', rowCount: 84 },
-      { op: 'is blank', value: null, rowCount: 0 },
-      { op: 'is not blank', value: null, rowCount: 109 },
     ];
 
     await toolbar.clickFilter();

From 8b34b9900321b0e9f218d5b7f5448d4b6273eacf Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 22 Jun 2023 20:25:25 +0530
Subject: [PATCH 134/208] fix: exclude Rollup and Links column from blank
 filter

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/utils/filterUtils.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/utils/filterUtils.ts b/packages/nc-gui/utils/filterUtils.ts
index dbf4e875bf..9ca3ac8869 100644
--- a/packages/nc-gui/utils/filterUtils.ts
+++ b/packages/nc-gui/utils/filterUtils.ts
@@ -1,4 +1,4 @@
-import { UITypes, isNumericCol, numericUITypes } from 'nocodb-sdk'
+import { isNumericCol, numericUITypes, UITypes } from 'nocodb-sdk'
 
 const getEqText = (fieldUiType: UITypes) => {
   if (isNumericCol(fieldUiType) || fieldUiType === UITypes.Time) {
@@ -261,13 +261,13 @@ export const comparisonOpList = (
     text: 'is blank',
     value: 'blank',
     ignoreVal: true,
-    excludedTypes: [UITypes.Checkbox],
+    excludedTypes: [UITypes.Checkbox, UITypes.Links, UITypes.Rollup],
   },
   {
     text: 'is not blank',
     value: 'notblank',
     ignoreVal: true,
-    excludedTypes: [UITypes.Checkbox],
+    excludedTypes: [UITypes.Checkbox, UITypes.Links, UITypes.Rollup],
   },
 ]
 

From af51637542cdc420e293169a6190e8b1852f2f8f Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 22 Jun 2023 21:11:50 +0530
Subject: [PATCH 135/208] test: rollup pg corrections

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../tests/unit/rest/tests/tableRow.test.ts    | 46 ++-----------------
 .../tests/unit/rest/tests/viewRow.test.ts     | 30 ------------
 2 files changed, 5 insertions(+), 71 deletions(-)

diff --git a/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts b/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
index b16c7b7ffe..33fda3402e 100644
--- a/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
@@ -427,10 +427,6 @@ function tableTest() {
       relatedTableColumnTitle: 'FirstName',
     });
 
-    const paymentListColumn = (await rentalTable.getColumns()).find(
-      (c) => c.title === 'Payment List',
-    );
-
     const nestedFilter = {
       is_group: true,
       status: 'create',
@@ -443,12 +439,6 @@ function tableTest() {
           comparison_op: 'like',
           value: '%a%',
         },
-        {
-          fk_column_id: paymentListColumn?.id,
-          status: 'create',
-          logical_op: 'and',
-          comparison_op: 'notblank',
-        },
       ],
     };
 
@@ -513,10 +503,6 @@ function tableTest() {
       relatedTableColumnTitle: 'FirstName',
     });
 
-    const paymentListColumn = (await rentalTable.getColumns()).find(
-      (c) => c.title === 'Payment List',
-    );
-
     const returnDateColumn = (await rentalTable.getColumns()).find(
       (c) => c.title === 'ReturnDate',
     );
@@ -533,12 +519,6 @@ function tableTest() {
           comparison_op: 'like',
           value: '%a%',
         },
-        {
-          fk_column_id: paymentListColumn?.id,
-          status: 'create',
-          logical_op: 'and',
-          comparison_op: 'notblank',
-        },
         {
           is_group: true,
           status: 'create',
@@ -786,10 +766,6 @@ function tableTest() {
       relatedTableColumnTitle: 'RentalDate',
     });
 
-    const paymentListColumn = (await customerTable.getColumns()).find(
-      (c) => c.title === 'Payment List',
-    );
-
     const activeColumn = (await customerTable.getColumns()).find(
       (c) => c.title === 'Active',
     );
@@ -818,12 +794,6 @@ function tableTest() {
             comparison_op: 'lte',
             value: 30,
           },
-          {
-            fk_column_id: paymentListColumn?.id,
-            status: 'create',
-            logical_op: 'and',
-            comparison_op: 'notblank',
-          },
           {
             is_group: true,
             status: 'create',
@@ -1097,10 +1067,6 @@ function tableTest() {
       relatedTableColumnTitle: 'RentalDate',
     });
 
-    const paymentListColumn = (await customerTable.getColumns()).find(
-      (c) => c.title === 'Payment List',
-    );
-
     const activeColumn = (await customerTable.getColumns()).find(
       (c) => c.title === 'Active',
     );
@@ -1131,12 +1097,6 @@ function tableTest() {
             comparison_op: 'lte',
             value: 30,
           },
-          {
-            fk_column_id: paymentListColumn?.id,
-            status: 'create',
-            logical_op: 'and',
-            comparison_op: 'notblank',
-          },
           {
             is_group: true,
             status: 'create',
@@ -1295,7 +1255,11 @@ function tableTest() {
       .expect(200);
 
     const record = response.body;
-    expect(record['Film List']).to.equal(19);
+    if (isPg(context)) {
+      expect(record['Film List']).to.equal('19');
+    } else {
+      expect(record['Film List']).to.equal(19);
+    }
   });
 
   it('Update table row', async function () {
diff --git a/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts b/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
index 46364486be..11dd4bd947 100644
--- a/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
@@ -521,10 +521,6 @@ function viewRowTests() {
       relatedTableColumnTitle: 'FirstName',
     });
 
-    const paymentListColumn = (await rentalTable.getColumns()).find(
-      (c) => c.title === 'Payment List',
-    );
-
     const nestedFilter = {
       is_group: true,
       status: 'create',
@@ -537,12 +533,6 @@ function viewRowTests() {
           comparison_op: 'like',
           value: '%a%',
         },
-        {
-          fk_column_id: paymentListColumn?.id,
-          status: 'create',
-          logical_op: 'and',
-          comparison_op: 'notblank',
-        },
       ],
     };
 
@@ -622,10 +612,6 @@ function viewRowTests() {
       relatedTableColumnTitle: 'RentalDate',
     });
 
-    const paymentListColumn = (await customerTable.getColumns()).find(
-      (c) => c.title === 'Payment List',
-    );
-
     const activeColumn = (await customerTable.getColumns()).find(
       (c) => c.title === 'Active',
     );
@@ -654,12 +640,6 @@ function viewRowTests() {
             comparison_op: 'lte',
             value: 30,
           },
-          {
-            fk_column_id: paymentListColumn?.id,
-            status: 'create',
-            logical_op: 'and',
-            comparison_op: 'notblank',
-          },
           {
             is_group: true,
             status: 'create',
@@ -879,10 +859,6 @@ function viewRowTests() {
       attr: { show: true },
     });
 
-    const paymentListColumn = (await customerTable.getColumns()).find(
-      (c) => c.title === 'Payment List',
-    );
-
     const activeColumn = (await customerTable.getColumns()).find(
       (c) => c.title === 'Active',
     );
@@ -911,12 +887,6 @@ function viewRowTests() {
             comparison_op: 'lte',
             value: 30,
           },
-          {
-            fk_column_id: paymentListColumn?.id,
-            status: 'create',
-            logical_op: 'and',
-            comparison_op: 'notblank',
-          },
           {
             is_group: true,
             status: 'create',

From 4c565b8621d9f05d97a65e75eae52aca307a1d2a Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 22 Jun 2023 21:42:41 +0530
Subject: [PATCH 136/208] test: pg corrections for UT

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 packages/nocodb/tests/unit/rest/tests/tableRow.test.ts | 2 +-
 packages/nocodb/tests/unit/rest/tests/viewRow.test.ts  | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts b/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
index 33fda3402e..d63a8131e0 100644
--- a/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
@@ -2159,7 +2159,7 @@ function tableTest() {
     const updatedRow = await getRow(context, { project, table, id: row['Id'] });
 
     // LTAR now returns rollup count
-    if (updatedRow['Ltar'] !== 0) {
+    if (!(updatedRow['Ltar'] === 0 || updatedRow['Ltar'] === '0')) {
       throw new Error('Was not deleted');
     }
 
diff --git a/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts b/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
index 11dd4bd947..2bfe1bada6 100644
--- a/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
@@ -19,6 +19,7 @@ import {
   getOneRow,
   getRow,
 } from '../../factory/row';
+import { isPg } from '../../init/db';
 import type { ColumnType } from 'nocodb-sdk';
 import type View from '../../../../src/models/View';
 import type Model from '../../../../src/models/Model';
@@ -681,7 +682,11 @@ function viewRowTests() {
       throw new Error('Wrong filter');
     }
 
-    expect(ascResponse.body.list[0]['Rental List']).to.equal(12);
+    if (isPg(context)) {
+      expect(ascResponse.body.list[0]['Rental List']).to.equal('12');
+    } else {
+      expect(ascResponse.body.list[0]['Rental List']).to.equal(12);
+    }
   };
 
   it('Get nested sorted filtered table with nested fields data list with a rollup column in customer table view grid', async () => {

From 9e6391dc2313b08d8c9ec1f874378dac1f95c33f Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 22 Jun 2023 21:50:40 +0530
Subject: [PATCH 137/208] test: rollup count as interger in mysql/sqlite

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/db/01-webhook.spec.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/playwright/tests/db/01-webhook.spec.ts b/tests/playwright/tests/db/01-webhook.spec.ts
index b35f39a93c..26e90a9ff2 100644
--- a/tests/playwright/tests/db/01-webhook.spec.ts
+++ b/tests/playwright/tests/db/01-webhook.spec.ts
@@ -714,6 +714,10 @@ test.describe.serial('Webhook', () => {
       expectedData.data.previous_rows[0].CityCodeLookup = [23, 33];
       // @ts-ignore
       expectedData.data.rows[0].CityCodeLookup = [23, 33];
+      // @ts-ignore
+      expectedData.data.previous_rows[0].CityList = 2;
+      // @ts-ignore
+      expectedData.data.rows[0].CityList = 2;
 
       if (isMysql(context)) {
         // @ts-ignore

From 195320a31fdeeaad909d19782544ee0a605f6eb0 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 22 Jun 2023 21:54:56 +0530
Subject: [PATCH 138/208] test: expected download data for PG

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../fixtures/expectedBaseDownloadDataPg.txt   | 220 +++++++++---------
 1 file changed, 110 insertions(+), 110 deletions(-)

diff --git a/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt b/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt
index 1c38d82466..f95316c5ee 100644
--- a/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt
+++ b/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt
@@ -1,110 +1,110 @@
-Country,City List
-Afghanistan,1,
-Algeria,3,
-American Samoa,1,
-Angola,2,
-Anguilla,1,
-Argentina,13,
-Armenia,1,
-Australia,1,
-Austria,3,
-Azerbaijan,2,
-Bahrain,1,
-Bangladesh,3,
-Belarus,2,
-Bolivia,2,
-Brazil,28,
-Brunei,1,
-Bulgaria,2,
-Cambodia,2,
-Cameroon,2,
-Canada,7,
-Chad,1,
-Chile,3,
-China,53,
-Colombia,6,
-\"Congo, The Democratic Republic of the\,2,
-Czech Republic,1,
-Dominican Republic,3,
-Ecuador,3,
-Egypt,6,
-Estonia,1,
-Ethiopia,1,
-Faroe Islands,1,
-Finland,1,
-France,4,
-French Guiana,1,
-French Polynesia,2,
-Gambia,1,
-Germany,7,
-Greece,2,
-Greenland,1,
-Holy See (Vatican City State),1,
-Hong Kong,1,
-Hungary,1,
-India,60,
-Indonesia,14,
-Iran,8,
-Iraq,1,
-Israel,4,
-Italy,7,
-Japan,31,
-Kazakstan,2,
-Kenya,2,
-Kuwait,1,
-Latvia,2,
-Liechtenstein,1,
-Lithuania,1,
-Madagascar,1,
-Malawi,1,
-Malaysia,3,
-Mexico,30,
-Moldova,1,
-Morocco,3,
-Mozambique,3,
-Myanmar,2,
-Nauru,1,
-Nepal,1,
-Netherlands,5,
-New Zealand,1,
-Nigeria,13,
-North Korea,1,
-Oman,2,
-Pakistan,5,
-Paraguay,3,
-Peru,4,
-Philippines,20,
-Poland,8,
-Puerto Rico,2,
-Romania,2,
-Runion,1,
-Russian Federation,28,
-Saint Vincent and the Grenadines,1,
-Saudi Arabia,5,
-Senegal,1,
-Slovakia,1,
-South Africa,11,
-South Korea,5,
-Spain,5,
-Sri Lanka,1,
-Sudan,2,
-Sweden,1,
-Switzerland,3,
-Taiwan,10,
-Tanzania,3,
-Thailand,3,
-Tonga,1,
-Tunisia,1,
-Turkey,15,
-Turkmenistan,1,
-Tuvalu,1,
-Ukraine,6,
-United Arab Emirates,3,
-United Kingdom,8,
-United States,35,
-Venezuela,7,
-Vietnam,6,
-\"Virgin Islands, U.S.\,1,
-Yemen,4,
-Yugoslavia,2,
-Zambia,1,
\ No newline at end of file
+Country,City Lis
+Afghanistan,1
+Algeria,3
+American Samoa,1
+Angola,2
+Anguilla,1
+Argentina,13
+Armenia,1
+Australia,1
+Austria,3
+Azerbaijan,2
+Bahrain,1
+Bangladesh,3
+Belarus,2
+Bolivia,2
+Brazil,28
+Brunei,1
+Bulgaria,2
+Cambodia,2
+Cameroon,2
+Canada,7
+Chad,1
+Chile,3
+China,53
+Colombia,6
+"Congo, The Democratic Republic of the",2
+Czech Republic,1
+Dominican Republic,3
+Ecuador,3
+Egypt,6
+Estonia,1
+Ethiopia,1
+Faroe Islands,1
+Finland,1
+France,4
+French Guiana,1
+French Polynesia,2
+Gambia,1
+Germany,7
+Greece,2
+Greenland,1
+Holy See (Vatican City State),1
+Hong Kong,1
+Hungary,1
+India,60
+Indonesia,14
+Iran,8
+Iraq,1
+Israel,4
+Italy,7
+Japan,31
+Kazakstan,2
+Kenya,2
+Kuwait,1
+Latvia,2
+Liechtenstein,1
+Lithuania,1
+Madagascar,1
+Malawi,1
+Malaysia,3
+Mexico,30
+Moldova,1
+Morocco,3
+Mozambique,3
+Myanmar,2
+Nauru,1
+Nepal,1
+Netherlands,5
+New Zealand,1
+Nigeria,13
+North Korea,1
+Oman,2
+Pakistan,5
+Paraguay,3
+Peru,4
+Philippines,20
+Poland,8
+Puerto Rico,2
+Romania,2
+Runion,1
+Russian Federation,28
+Saint Vincent and the Grenadines,1
+Saudi Arabia,5
+Senegal,1
+Slovakia,1
+South Africa,11
+South Korea,5
+Spain,5
+Sri Lanka,1
+Sudan,2
+Sweden,1
+Switzerland,3
+Taiwan,10
+Tanzania,3
+Thailand,3
+Tonga,1
+Tunisia,1
+Turkey,15
+Turkmenistan,1
+Tuvalu,1
+Ukraine,6
+United Arab Emirates,3
+United Kingdom,8
+United States,35
+Venezuela,7
+Vietnam,6
+"Virgin Islands, U.S.",1
+Yemen,4
+Yugoslavia,2
+Zambia,1
\ No newline at end of file

From 0813d7f75aa73d145ff9dc6d689c4798481e1368 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 22 Jun 2023 21:56:24 +0530
Subject: [PATCH 139/208] test: expected download data for PG (2)

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/fixtures/expectedBaseDownloadDataPg.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt b/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt
index f95316c5ee..615f4fb5cf 100644
--- a/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt
+++ b/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt
@@ -1,4 +1,4 @@
-Country,City Lis
+Country,City List
 Afghanistan,1
 Algeria,3
 American Samoa,1

From 699ff5ada3629095f0f804279fd9c277c9c0d46e Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 22 Jun 2023 22:20:42 +0530
Subject: [PATCH 140/208] test: string to integer for numbers in PG

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/db/undo-redo.spec.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/playwright/tests/db/undo-redo.spec.ts b/tests/playwright/tests/db/undo-redo.spec.ts
index ea3be88e2b..690ef07c4d 100644
--- a/tests/playwright/tests/db/undo-redo.spec.ts
+++ b/tests/playwright/tests/db/undo-redo.spec.ts
@@ -557,7 +557,7 @@ test.describe('Undo Redo - LTAR', () => {
         }
       );
       expect(currentRecords.list.length).toBe(4);
-      expect(currentRecords.list[0].CityList).toBe(expectedValues.length);
+      expect(+currentRecords.list[0].CityList).toBe(expectedValues.length);
     } catch (e) {
       console.log(e);
     }
@@ -573,7 +573,10 @@ test.describe('Undo Redo - LTAR', () => {
         'CityList'
       );
       const cities = nestedRecords.list.map((record: any) => record.City);
-      expect(cities).toEqual(expectedValues);
+
+      for (let i = 0; i < expectedValues.length; i++) {
+        expect(cities.includes(expectedValues[i])).toBeTruthy();
+      }
     }
   }
 

From 586ec48872a849d2e04165d5ebc7743b59760f7a Mon Sep 17 00:00:00 2001
From: starbirdtech383 <starbirdtech@gmail.com>
Date: Thu, 22 Jun 2023 22:33:56 +0530
Subject: [PATCH 141/208] test fix for object compare

---
 .../tests/db/projectOperations.spec.ts        | 41 +++++++-------
 .../tests/db/tableOperations.spec.ts          | 54 +++++++++----------
 .../tests/utils/objectCompareUtil.ts          |  5 +-
 3 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/tests/playwright/tests/db/projectOperations.spec.ts b/tests/playwright/tests/db/projectOperations.spec.ts
index 942ce6e61b..4f29838e32 100644
--- a/tests/playwright/tests/db/projectOperations.spec.ts
+++ b/tests/playwright/tests/db/projectOperations.spec.ts
@@ -81,7 +81,7 @@ test.describe('Project operations', () => {
     await projectPage.deleteProject({ title: 'project-rename', withoutPrefix: true });
   });
 
-  test('project_duplicate', async () => {
+  test.only('project_duplicate', async () => {
     // if project already exists, delete it to avoid test failures due to residual data
     const testProjectName = 'project-to-imexp';
     const dupeProjectName: string = testProjectName + ' copy';
@@ -126,30 +126,31 @@ test.describe('Project operations', () => {
         'updated_at',
       ]);
       const ignoredKeys: Set<string> = new Set([
-        '.project.is_meta.id',
-        '.project.is_meta.title',
-        '.project.tables.0.table.id',
-        '.project.tables.0.table.id.base_id',
+        '.project.id',
+        '.project.title',
+        '.project.tables.0.id',
+        '.project.tables.0.base_id',
 
         // below are potential bugs
-        '.project.is_meta.title.status',
-        '.project.tables.0.table.shares.views.0.view._ptn.ptype.tn',
-        '.project.tables.0.table.shares.views.0.view._ptn.ptype.tn._tn',
-        '.project.tables.0.table.shares.views.0.view._ptn.ptype.tn._tn.table_meta.title',
-        '.project.tables.0.1.table.shares.views.0.view._ptn.ptype.tn',
-        '.project.tables.0.1.table.shares.views.0.view._ptn.ptype.tn._tn',
-        '.project.tables.0.1.table.shares.views.0.view._ptn.ptype.tn._tn.table_meta.title',
-        '.project.tables.0.1.2.table.shares.views.0.view._ptn.ptype.tn',
-        '.project.tables.0.1.2.table.shares.views.0.view._ptn.ptype.tn._tn',
-        '.project.tables.0.1.2.table.shares.views.0.view._ptn.ptype.tn._tn.table_meta.title',
-        '.project.tables.bases.0.alias.config',
-        '.project.tables.bases.users.0.1.email.invite_token.main_roles.roles',
-        '.project.tables.bases.users.0.1.2.email.invite_token.main_roles.roles',
-        '.project.tables.bases.users.0.1.2.3.email.invite_token.main_roles.roles',
+        '.project.status',
+        '.tables.0.views.0.view.tn',
+        '.tables.0.views.0.view.tn._tn',
+        '.tables.0.views.0.view.title',
+        '.tables.0.views.0.view._tn',
+        '.tables.1.views.0.view.title',
+        '.tables.1.views.0.view.tn',
+        '.tables.1.views.0.view._tn',
+        '.tables.1.views.0.view.tn._tn',
+        '.tables.2.views.0.view.tn',
+        '.tables.2.views.0.view._tn',
+        '.tables.2.views.0.view.title',
+        '.bases.0.config',
+        '.users.1.roles',
+        '.users.2.roles',
       ]);
       const orginalProjectInfo: ProjectInfo = arr[0];
       const duplicateProjectInfo: ProjectInfo = arr[1];
-      expect(deepCompare(orginalProjectInfo, duplicateProjectInfo, ignoredFields, ignoredKeys)).toBeTruthy();
+      expect(deepCompare(orginalProjectInfo, duplicateProjectInfo, ignoredFields, ignoredKeys, '', false)).toBeTruthy();
     });
 
     // cleanup test-data
diff --git a/tests/playwright/tests/db/tableOperations.spec.ts b/tests/playwright/tests/db/tableOperations.spec.ts
index 8151b00279..016990687e 100644
--- a/tests/playwright/tests/db/tableOperations.spec.ts
+++ b/tests/playwright/tests/db/tableOperations.spec.ts
@@ -56,7 +56,7 @@ test.describe('Table Operations', () => {
     await dashboard.treeView.verifyTabIcon({ title: 'Address', icon: 'american-football' });
   });
 
-  test('duplicate_table', async () => {
+  test.only('duplicate_table', async () => {
     const orginalTableName = 'Actor';
     const dupTableName = 'Actor copy';
     // verify table icon customization
@@ -79,20 +79,13 @@ test.describe('Table Operations', () => {
         orginalTable,
         duplicateTable,
         undefined,
-        new Set([
-          '.id',
-          '.id.base_id.project_id.table_name',
-          '.id.base_id.project_id.table_name.title',
-          '.id.base_id.project_id.table_name.title.type.meta.schema.enabled.mm.tags.pinned.deleted.order',
-          '.id.base_id.project_id.table_name.title.type.meta.schema.enabled.mm.tags.pinned.deleted.order.created_at',
-          '.id.base_id.project_id.table_name.title.type.meta.schema.enabled.mm.tags.pinned.deleted.order.created_at.updated_at',
-        ])
+        new Set(['.id', '.table_name', '.title', '.order', '.created_at', '.updated_at'])
       )
     ).toBeTruthy();
     // check individual field values where values does not match as per design
   });
 
-  test('duplicate_table_with_no_data_views', async () => {
+  test.only('duplicate_table_with_no_data_views', async () => {
     const orginalTableName = 'Actor';
     const dupTableName = 'Actor copy';
     // verify table icon customization
@@ -120,28 +113,29 @@ test.describe('Table Operations', () => {
         new Set(['created_at']),
         new Set([
           '.table.id',
-          '.table.id.base_id.project_id.table_name',
-          '.table.id.base_id.project_id.table_name.title',
-          '.table.id.base_id.project_id.table_name.title.type.meta.schema.enabled.mm.tags.pinned.deleted.order',
-          '.table.id.base_id.project_id.table_name.title.type.meta.schema.enabled.mm.tags.pinned.deleted.order.created_at',
-          '.table.id.base_id.project_id.table_name.title.type.meta.schema.enabled.mm.tags.pinned.deleted.order.created_at.updated_at',
-          '.table.shares.views.0.view.filters.sorts.firstPageData',
-          '.table.shares.views.webhooks.firstPageData.list.pageInfo.totalRows',
-          '.table.shares.views.0.view.ptn',
-          '.table.id.base_id.project_id.table_name.title.type.meta.schema.enabled.mm.tags.pinned.deleted.order.updated_at',
-          '.table.shares.views.0.view.ptn._ptn',
-          '.table.shares.views.0.view.ptn._ptn.ptype.tn',
-          '.table.shares.views.0.view.ptn._ptn.ptype.tn._tn',
-          '.table.shares.views.0.view.ptn._ptn.ptype.tn._tn.table_meta.id',
-          '.table.shares.views.0.view.ptn._ptn.ptype.tn._tn.table_meta.id.base_id.project_id.fk_model_id',
-          '.table.shares.views.0.view.ptn._ptn.ptype.tn._tn.table_meta.id.base_id.project_id.fk_model_id.title',
-          '.table.shares.views.0.view.ptn._ptn.ptype.tn._tn.table_meta.id.base_id.project_id.fk_model_id.title.type.is_default.show_system_fields.lock_type.uuid.password.show.order.updated_at',
-          '.table.shares.views.0.view.ptn._ptn.ptype.tn._tn.table_meta.id.base_id.project_id.fk_model_id.title.type.is_default.show_system_fields.lock_type.uuid.password.show.order.updated_at.meta.description.view.fk_view_id',
-          '.table.shares.views.0.view.ptn._ptn.ptype.tn._tn.table_meta.id.base_id.project_id.fk_model_id.title.type.is_default.show_system_fields.lock_type.uuid.password.show.order.updated_at.meta.description.view.fk_view_id.base_id.project_id.uuid.updated_at',
-          '.table.shares.views.webhooks.firstPageData.list.pageInfo.totalRows.page.pageSize.isFirstPage.isLastPage',
+          '.table.table_name',
+          '.table.title',
+          '.table.order',
+          '.table.created_at',
+          '.table.updated_at',
+          '.views.0.view.ptn',
+          '.views.0.view._ptn',
+          '.views.0.view.ptn._ptn',
+          '.views.0.view.ptn._ptn.ptype.tn',
+          '.views.0.view.tn',
+          '.views.0.view._tn',
+          '.views.0.view.id',
+          '.views.0.view.view.fk_view_id',
+          '.views.0.view.view.updated_at',
+          '.views.0.view.fk_model_id',
+          '.views.0.view.title',
+          '.views.0.view.updated_at',
+          '.views.0.view.fk_view_id',
 
           // Mismatch length key:
-          '.table.shares.views.webhooks.firstPageData.list',
+          '.firstPageData.list',
+          '.firstPageData.pageInfo',
+          '.views.0.firstPageData',
         ])
       )
     ).toBeTruthy();
diff --git a/tests/playwright/tests/utils/objectCompareUtil.ts b/tests/playwright/tests/utils/objectCompareUtil.ts
index 3c80511ec6..44a01969c8 100644
--- a/tests/playwright/tests/utils/objectCompareUtil.ts
+++ b/tests/playwright/tests/utils/objectCompareUtil.ts
@@ -20,9 +20,10 @@ export function deepCompare(
   obj2: any,
   ignoredFields?: Set<string>,
   ignoredKeys?: Set<string>,
-  keyId = '',
+  rootKeyId = '',
   breakAtFirstMismatch = true
 ): boolean {
+  let keyId = rootKeyId;
   if (ignoredKeys !== undefined && ignoredKeys.has(keyId)) {
     return true;
   }
@@ -56,7 +57,7 @@ export function deepCompare(
     ) {
       // console.log(`${keyId} ignored in comparison`)
     } else {
-      keyId = keyId + '.' + key;
+      keyId = rootKeyId + '.' + key;
       if (!deepCompare(obj1[key], obj2[key], ignoredFields, ignoredKeys, keyId, breakAtFirstMismatch)) {
         return !breakAtFirstMismatch;
         // return false;

From 8367793c33795c705edc922287e2e44243fe68bb Mon Sep 17 00:00:00 2001
From: starbirdtech383 <starbirdtech@gmail.com>
Date: Thu, 22 Jun 2023 22:35:51 +0530
Subject: [PATCH 142/208] playwright tests : remove only from few tests
 accidentally added

---
 tests/playwright/tests/db/projectOperations.spec.ts | 2 +-
 tests/playwright/tests/db/tableOperations.spec.ts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/playwright/tests/db/projectOperations.spec.ts b/tests/playwright/tests/db/projectOperations.spec.ts
index 4f29838e32..03054b5f49 100644
--- a/tests/playwright/tests/db/projectOperations.spec.ts
+++ b/tests/playwright/tests/db/projectOperations.spec.ts
@@ -81,7 +81,7 @@ test.describe('Project operations', () => {
     await projectPage.deleteProject({ title: 'project-rename', withoutPrefix: true });
   });
 
-  test.only('project_duplicate', async () => {
+  test('project_duplicate', async () => {
     // if project already exists, delete it to avoid test failures due to residual data
     const testProjectName = 'project-to-imexp';
     const dupeProjectName: string = testProjectName + ' copy';
diff --git a/tests/playwright/tests/db/tableOperations.spec.ts b/tests/playwright/tests/db/tableOperations.spec.ts
index 016990687e..21b72c62ff 100644
--- a/tests/playwright/tests/db/tableOperations.spec.ts
+++ b/tests/playwright/tests/db/tableOperations.spec.ts
@@ -56,7 +56,7 @@ test.describe('Table Operations', () => {
     await dashboard.treeView.verifyTabIcon({ title: 'Address', icon: 'american-football' });
   });
 
-  test.only('duplicate_table', async () => {
+  test('duplicate_table', async () => {
     const orginalTableName = 'Actor';
     const dupTableName = 'Actor copy';
     // verify table icon customization
@@ -85,7 +85,7 @@ test.describe('Table Operations', () => {
     // check individual field values where values does not match as per design
   });
 
-  test.only('duplicate_table_with_no_data_views', async () => {
+  test('duplicate_table_with_no_data_views', async () => {
     const orginalTableName = 'Actor';
     const dupTableName = 'Actor copy';
     // verify table icon customization

From b59160fabd7c09f9b7776199f47ea5b1c868f324 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 23 Jun 2023 00:35:10 +0530
Subject: [PATCH 143/208] fix: import statement corrections

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/smartsheet/toolbar/SearchData.vue | 2 +-
 packages/nocodb/src/db/BaseModelSqlv2.ts                     | 2 +-
 packages/nocodb/src/services/columns.service.ts              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue b/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
index 6d28f8bff2..16c08fc2ca 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { TableType } from 'nocodb-sdk'
-import { UITypes, isLinksOrLTAR } from '../../../../nocodb-sdk/src'
+import { UITypes } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   ReloadViewDataHookInj,
diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index cf56ced0ad..aa0b85aa3b 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -8,6 +8,7 @@ import { nocoExecute } from 'nc-help';
 import {
   AuditOperationSubTypes,
   AuditOperationTypes,
+  isLinksOrLTAR,
   isSystemColumn,
   isVirtualCol,
   RelationTypes,
@@ -18,7 +19,6 @@ import { customAlphabet } from 'nanoid';
 import DOMPurify from 'isomorphic-dompurify';
 import { v4 as uuidv4 } from 'uuid';
 import { Knex } from 'knex';
-import { isLinksOrLTAR } from '../../../nocodb-sdk/src';
 import { NcError } from '../helpers/catchError';
 import getAst from '../helpers/getAst';
 import {
diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index 473ed61b9f..65b3cc4be0 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
 import {
   AuditOperationSubTypes,
   AuditOperationTypes,
+  isLinksOrLTAR,
   isVirtualCol,
   substituteColumnAliasWithIdInFormula,
   substituteColumnIdWithAliasInFormula,
@@ -9,7 +10,6 @@ import {
 } from 'nocodb-sdk';
 import { T } from 'nc-help';
 import { pluralize, singularize } from 'inflection';
-import { isLinksOrLTAR } from '../../../nocodb-sdk/src'
 import formulaQueryBuilderv2 from '../db/formulav2/formulaQueryBuilderv2';
 import ProjectMgrv2 from '../db/sql-mgr/v2/ProjectMgrv2';
 import {

From 6c4257111977169b53c5c77c15365c057e340458 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 23 Jun 2023 11:28:05 +0530
Subject: [PATCH 144/208] chore: gui lint and cleanup

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/smartsheet/Pagination.vue      |  2 +
 .../column/LinkedToAnotherRecordOptions.vue   | 80 +++++++++----------
 .../smartsheet/column/LookupOptions.vue       |  2 +-
 .../nc-gui/components/tabs/Smartsheet.vue     |  9 ++-
 .../nc-gui/components/virtual-cell/Links.vue  | 19 +----
 .../components/ListChildItems.vue             |  3 -
 .../virtual-cell/components/ListItems.vue     |  5 --
 .../composables/useColumnCreateStore.ts       |  2 +-
 .../composables/useMultiSelect/index.ts       |  4 -
 packages/nc-gui/utils/filterUtils.ts          |  2 +-
 10 files changed, 53 insertions(+), 75 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Pagination.vue b/packages/nc-gui/components/smartsheet/Pagination.vue
index eac7b65582..6c2906a8c2 100644
--- a/packages/nc-gui/components/smartsheet/Pagination.vue
+++ b/packages/nc-gui/components/smartsheet/Pagination.vue
@@ -5,6 +5,8 @@ const props = defineProps<{
   alignCountOnRight?: boolean
 }>()
 
+const { alignCountOnRight } = props
+
 const paginatedData = inject(PaginationDataInj)!
 
 const changePage = inject(ChangePageInj)!
diff --git a/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue
index e2c3e5822e..fc0bb0f564 100644
--- a/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue
@@ -99,46 +99,46 @@ const isLinks = $computed(() => vModel.value.uidt === UITypes.Links)
       </div>
 
       <div v-if="advancedOptions" class="flex flex-col p-6 gap-4 border-2 mt-2">
-      <LazySmartsheetColumnLinkOptions v-model:value="vModel" class="-my-2" />
-<template v-if="!isXcdbBase">
-        <div class="flex flex-row space-x-2">
-          <a-form-item class="flex w-1/2" :label="$t('labels.onUpdate')">
-            <a-select
-              v-model:value="vModel.onUpdate"
-              :disabled="vModel.virtual"
-              name="onUpdate"
-              dropdown-class-name="nc-dropdown-on-update"
-              @change="onDataTypeChange"
-            >
-              <a-select-option v-for="(option, i) of onUpdateDeleteOptions" :key="i" :value="option">
-                {{ option }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-
-          <a-form-item class="flex w-1/2" :label="$t('labels.onDelete')">
-            <a-select
-              v-model:value="vModel.onDelete"
-              :disabled="vModel.virtual"
-              name="onDelete"
-              dropdown-class-name="nc-dropdown-on-delete"
-              @change="onDataTypeChange"
-            >
-              <a-select-option v-for="(option, i) of onUpdateDeleteOptions" :key="i" :value="option">
-                {{ option }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </div>
-
-        <div class="flex flex-row">
-          <a-form-item>
-            <a-checkbox v-model:checked="vModel.virtual" :disabled="appInfo.isCloud" name="virtual" @change="onDataTypeChange"
-              >Virtual Relation
-            </a-checkbox>
-          </a-form-item>
-        </div>
-</template>
+        <LazySmartsheetColumnLinkOptions v-model:value="vModel" class="-my-2" />
+        <template v-if="!isXcdbBase">
+          <div class="flex flex-row space-x-2">
+            <a-form-item class="flex w-1/2" :label="$t('labels.onUpdate')">
+              <a-select
+                v-model:value="vModel.onUpdate"
+                :disabled="vModel.virtual"
+                name="onUpdate"
+                dropdown-class-name="nc-dropdown-on-update"
+                @change="onDataTypeChange"
+              >
+                <a-select-option v-for="(option, i) of onUpdateDeleteOptions" :key="i" :value="option">
+                  {{ option }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+
+            <a-form-item class="flex w-1/2" :label="$t('labels.onDelete')">
+              <a-select
+                v-model:value="vModel.onDelete"
+                :disabled="vModel.virtual"
+                name="onDelete"
+                dropdown-class-name="nc-dropdown-on-delete"
+                @change="onDataTypeChange"
+              >
+                <a-select-option v-for="(option, i) of onUpdateDeleteOptions" :key="i" :value="option">
+                  {{ option }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </div>
+
+          <div class="flex flex-row">
+            <a-form-item>
+              <a-checkbox v-model:checked="vModel.virtual" :disabled="appInfo.isCloud" name="virtual" @change="onDataTypeChange"
+                >Virtual Relation
+              </a-checkbox>
+            </a-form-item>
+          </div>
+        </template>
       </div>
     </template>
   </div>
diff --git a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
index df6768bc4c..804cfbd82d 100644
--- a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onMounted } from '@vue/runtime-core'
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { RelationTypes, UITypes, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { UITypes, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import { MetaInj, inject, ref, storeToRefs, useColumnCreateStoreOrThrow, useMetas, useProject, useVModel } from '#imports'
 
 const props = defineProps<{
diff --git a/packages/nc-gui/components/tabs/Smartsheet.vue b/packages/nc-gui/components/tabs/Smartsheet.vue
index 4add7738e3..92ae7ee75a 100644
--- a/packages/nc-gui/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui/components/tabs/Smartsheet.vue
@@ -71,8 +71,13 @@ const grid = ref()
 const onDrop = async (event: DragEvent) => {
   event.preventDefault()
   try {
-    // Access the dropped data
-    const data = JSON.parse(event.dataTransfer?.getData('text/json')!)
+    // extract the data from the event's data transfer object
+    const textData = event.dataTransfer?.getData('text/json')
+
+    if (!textData) return
+
+    // parse the data
+    const data = JSON.parse(textData)
     // Do something with the received data
 
     // if dragged item is not from the same base, return
diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index cf4aca47d6..f7ba26a394 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -3,25 +3,12 @@ import { computed } from '@vue/reactivity'
 import type { ColumnType } from 'nocodb-sdk'
 import { ref } from 'vue'
 import type { Ref } from 'vue'
-import {
-  ActiveCellInj,
-  CellValueInj,
-  ColumnInj,
-  EditModeInj,
-  IsUnderLookupInj,
-  MetaInj,
-  inject,
-  useSelectedCellKeyupListener,
-} from '#imports'
+import { ActiveCellInj, CellValueInj, ColumnInj, IsUnderLookupInj, inject, useSelectedCellKeyupListener } from '#imports'
 
 const value = inject(CellValueInj, ref(0))
 
 const column = inject(ColumnInj)!
 
-const meta = inject(MetaInj, ref())
-
-const cellValue = inject(CellValueInj)!
-
 const row = inject(RowInj)!
 
 const reloadRowTrigger = inject(ReloadRowDataHookInj, createEventHook())
@@ -34,10 +21,6 @@ const isLocked = inject(IsLockedInj, ref(false))
 
 const isUnderLookup = inject(IsUnderLookupInj, ref(false))
 
-const active = inject(ActiveCellInj, ref(false))
-
-const editable = inject(EditModeInj, ref(false))
-
 const listItemsDlg = ref(false)
 
 const childListDlg = ref(false)
diff --git a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
index 00e84dcaca..55c7d59901 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
@@ -13,7 +13,6 @@ import {
   iconMap,
   inject,
   ref,
-  renderValue,
   useLTARStoreOrThrow,
   useSmartsheetRowStoreOrThrow,
   useVModel,
@@ -40,7 +39,6 @@ const {
   childrenListPagination,
   relatedTableDisplayValueProp,
   unlink,
-  getRelatedTableRowId,
   relatedTableMeta,
 } = useLTARStoreOrThrow()
 
@@ -153,7 +151,6 @@ const onClick = (row: Row) => {
                   :value="row[relatedTableDisplayValueProp]"
                   :column="props.column"
                 />
-                <!--                <span class="text-gray-400 text-[11px] ml-1">(Primary key : {{ getRelatedTableRowId(row) }})</span> -->
               </div>
 
               <div v-if="!readonly" class="flex gap-2">
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItems.vue b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
index 20966329a5..466d1e9f02 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
@@ -12,7 +12,6 @@ import {
   inject,
   isDrawerExist,
   ref,
-  renderValue,
   useLTARStoreOrThrow,
   useSelectedCellKeyupListener,
   useSmartsheetRowStoreOrThrow,
@@ -35,7 +34,6 @@ const {
   childrenExcludedListPagination,
   relatedTableDisplayValueProp,
   link,
-  getRelatedTableRowId,
   relatedTableMeta,
   meta,
   row,
@@ -236,9 +234,6 @@ watch(vModel, (nextVal) => {
               :border="false"
               readonly
             />
-            <!--            <span class="hidden group-hover:(inline) text-gray-400 text-[11px] ml-1"> -->
-            <!--              ({{ $t('labels.primaryKey') }} : {{ getRelatedTableRowId(refRow) }}) -->
-            <!--            </span> -->
           </a-card>
         </div>
 
diff --git a/packages/nc-gui/composables/useColumnCreateStore.ts b/packages/nc-gui/composables/useColumnCreateStore.ts
index 23d5c88c33..8faac76729 100644
--- a/packages/nc-gui/composables/useColumnCreateStore.ts
+++ b/packages/nc-gui/composables/useColumnCreateStore.ts
@@ -32,7 +32,7 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState
   (meta: Ref<TableType | undefined>, column: Ref<ColumnType | undefined>) => {
     const projectStore = useProject()
     const { isMysql: isMysqlFunc, isPg: isPgFunc, isMssql: isMssqlFunc, isXcdbBase: isXcdbBaseFunc, getBaseType } = projectStore
-    const { project, sqlUis } = storeToRefs(projectStore)
+    const { sqlUis } = storeToRefs(projectStore)
 
     const { $api } = useNuxtApp()
 
diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index 2f546073c8..45a3e44078 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -26,7 +26,6 @@ import {
   useI18n,
   useMetas,
   useProject,
-  useUIPermission,
 } from '#imports'
 
 const MAIN_MOUSE_PRESSED = 0
@@ -75,9 +74,6 @@ export function useMultiSelect(
     () => !(activeCell.row === null || activeCell.col === null || isNaN(activeCell.row) || isNaN(activeCell.col)),
   )
 
-  const { isUIAllowed } = useUIPermission()
-  const hasEditPermission = $computed(() => isUIAllowed('xcDatatableEditable'))
-
   function makeActive(row: number, col: number) {
     if (activeCell.row === row && activeCell.col === col) {
       return
diff --git a/packages/nc-gui/utils/filterUtils.ts b/packages/nc-gui/utils/filterUtils.ts
index 9ca3ac8869..b1a9d4b982 100644
--- a/packages/nc-gui/utils/filterUtils.ts
+++ b/packages/nc-gui/utils/filterUtils.ts
@@ -1,4 +1,4 @@
-import { isNumericCol, numericUITypes, UITypes } from 'nocodb-sdk'
+import { UITypes, isNumericCol, numericUITypes } from 'nocodb-sdk'
 
 const getEqText = (fieldUiType: UITypes) => {
   if (isNumericCol(fieldUiType) || fieldUiType === UITypes.Time) {

From f608c4fcf1219cccbc09aef6b1f358924731b066 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 23 Jun 2023 11:41:35 +0530
Subject: [PATCH 145/208] chore: lint

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/db/genRollupSelectv2.ts     |  2 +-
 packages/nocodb/src/helpers/populateMeta.ts     |  2 +-
 packages/nocodb/src/models/Column.ts            |  2 +-
 packages/nocodb/src/models/View.ts              |  1 -
 .../jobs/jobs/at-import/at-import.processor.ts  |  4 +---
 .../jobs/jobs/export-import/export.service.ts   |  6 ++----
 .../jobs/jobs/export-import/import.service.ts   |  4 +---
 packages/nocodb/src/services/bases.service.ts   |  2 +-
 .../nocodb/src/services/projects.service.ts     |  1 -
 .../nocodb/src/services/public-metas.service.ts |  2 +-
 packages/nocodb/src/services/tables.service.ts  | 17 +++++------------
 11 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/packages/nocodb/src/db/genRollupSelectv2.ts b/packages/nocodb/src/db/genRollupSelectv2.ts
index d39ff51fc8..decf600942 100644
--- a/packages/nocodb/src/db/genRollupSelectv2.ts
+++ b/packages/nocodb/src/db/genRollupSelectv2.ts
@@ -1,5 +1,5 @@
 import { RelationTypes } from 'nocodb-sdk';
-import { LinksColumn } from '../models'
+import type { LinksColumn } from '../models';
 import type { RollupColumn } from '../models';
 import type { XKnex } from '../db/CustomKnex';
 import type { LinkToAnotherRecordColumn } from '../models';
diff --git a/packages/nocodb/src/helpers/populateMeta.ts b/packages/nocodb/src/helpers/populateMeta.ts
index a2b9f95d7b..d4d3e437ea 100644
--- a/packages/nocodb/src/helpers/populateMeta.ts
+++ b/packages/nocodb/src/helpers/populateMeta.ts
@@ -1,7 +1,7 @@
 import { ModelTypes, UITypes, ViewTypes } from 'nocodb-sdk';
 import { isVirtualCol, RelationTypes } from 'nocodb-sdk';
 import { pluralize, singularize } from 'inflection';
-import { isLinksOrLTAR } from 'nocodb-sdk'
+import { isLinksOrLTAR } from 'nocodb-sdk';
 import { GridViewColumn } from '../models';
 import Column from '../models/Column';
 import Model from '../models/Model';
diff --git a/packages/nocodb/src/models/Column.ts b/packages/nocodb/src/models/Column.ts
index b7f1eab8f4..758458a4b3 100644
--- a/packages/nocodb/src/models/Column.ts
+++ b/packages/nocodb/src/models/Column.ts
@@ -12,7 +12,6 @@ import { NcError } from '../helpers/catchError';
 import { extractProps } from '../helpers/extractProps';
 import { stringifyMetaProp } from '../utils/modelUtils';
 import FormulaColumn from './FormulaColumn';
-import { LinksColumn } from './index';
 import LinkToAnotherRecordColumn from './LinkToAnotherRecordColumn';
 import LookupColumn from './LookupColumn';
 import RollupColumn from './RollupColumn';
@@ -23,6 +22,7 @@ import Sort from './Sort';
 import Filter from './Filter';
 import QrCodeColumn from './QrCodeColumn';
 import BarcodeColumn from './BarcodeColumn';
+import { LinksColumn } from './index';
 import type { ColumnReqType, ColumnType } from 'nocodb-sdk';
 
 export default class Column<T = any> implements ColumnType {
diff --git a/packages/nocodb/src/models/View.ts b/packages/nocodb/src/models/View.ts
index 9a4fd88f2f..3135666e86 100644
--- a/packages/nocodb/src/models/View.ts
+++ b/packages/nocodb/src/models/View.ts
@@ -1,4 +1,3 @@
-import { title } from 'process';
 import { isSystemColumn, UITypes, ViewTypes } from 'nocodb-sdk';
 import Noco from '../Noco';
 import {
diff --git a/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts b/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
index fddf61c6c0..d83f34668a 100644
--- a/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
@@ -1972,9 +1972,7 @@ export class AtImportProcessor {
         migrationStatsObj.aTbl.rollup = aTblRollup.length;
 
         const ncTbl = await nc_getTableSchema(aTblSchema[idx].name);
-        const linkColumn = ncTbl.columns.filter(
-          (x) => isLinksOrLTAR(x)
-        );
+        const linkColumn = ncTbl.columns.filter((x) => isLinksOrLTAR(x));
         const lookup = ncTbl.columns.filter((x) => x.uidt === UITypes.Lookup);
         const rollup = ncTbl.columns.filter((x) => x.uidt === UITypes.Rollup);
 
diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
index 5e598a3180..a37e1bed6b 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
@@ -1,5 +1,5 @@
 import { Readable } from 'stream';
-import { isLinksOrLTAR, UITypes, ViewTypes } from 'nocodb-sdk'
+import { isLinksOrLTAR, UITypes, ViewTypes } from 'nocodb-sdk';
 import { unparse } from 'papaparse';
 import { Injectable, Logger } from '@nestjs/common';
 import NcConnectionMgrv2 from '../../../../utils/common/NcConnectionMgrv2';
@@ -357,9 +357,7 @@ export class ExportService {
           .join(',');
 
     const mmColumns = model.columns.filter(
-      (col) =>
-        isLinksOrLTAR(col) &&
-        col.colOptions?.type === 'mm',
+      (col) => isLinksOrLTAR(col) && col.colOptions?.type === 'mm',
     );
 
     const hasLink = mmColumns.length > 0;
diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
index 887d6a7f31..25ff538589 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
@@ -166,9 +166,7 @@ export class ImportService {
       const modelData = data.model;
       const table = tableReferences.get(modelData.id);
 
-      const linkedColumnSet = modelData.columns.filter(
-        (a) => isLinksOrLTAR(a)
-      );
+      const linkedColumnSet = modelData.columns.filter((a) => isLinksOrLTAR(a));
 
       for (const col of linkedColumnSet) {
         if (col.colOptions) {
diff --git a/packages/nocodb/src/services/bases.service.ts b/packages/nocodb/src/services/bases.service.ts
index f68b6c01ee..9268f6718c 100644
--- a/packages/nocodb/src/services/bases.service.ts
+++ b/packages/nocodb/src/services/bases.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { T } from 'nc-help';
 import { populateMeta, validatePayload } from '../helpers';
-import { populateRollupColumnAndHideLTAR } from '../helpers/populateMeta'
+import { populateRollupColumnAndHideLTAR } from '../helpers/populateMeta';
 import { syncBaseMigration } from '../helpers/syncMigration';
 import { Base, Project } from '../models';
 import type { BaseReqType } from 'nocodb-sdk';
diff --git a/packages/nocodb/src/services/projects.service.ts b/packages/nocodb/src/services/projects.service.ts
index 3fcaba554d..eb93634a4f 100644
--- a/packages/nocodb/src/services/projects.service.ts
+++ b/packages/nocodb/src/services/projects.service.ts
@@ -7,7 +7,6 @@ import { OrgUserRoles } from 'nocodb-sdk';
 import { populateMeta, validatePayload } from '../helpers';
 import { NcError } from '../helpers/catchError';
 import { extractPropsAndSanitize } from '../helpers/extractProps';
-import { populateRollupColumnAndHideLTAR } from '../helpers/populateMeta'
 import syncMigration from '../helpers/syncMigration';
 import { Project, ProjectUser } from '../models';
 import Noco from '../Noco';
diff --git a/packages/nocodb/src/services/public-metas.service.ts b/packages/nocodb/src/services/public-metas.service.ts
index b8dacc286d..71cff386ac 100644
--- a/packages/nocodb/src/services/public-metas.service.ts
+++ b/packages/nocodb/src/services/public-metas.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { ErrorMessages, RelationTypes, UITypes } from 'nocodb-sdk';
-import { isLinksOrLTAR } from 'nocodb-sdk'
+import { isLinksOrLTAR } from 'nocodb-sdk';
 import { NcError } from '../helpers/catchError';
 import { Base, Column, Model, Project, View } from '../models';
 import type { LinkToAnotherRecordColumn, LookupColumn } from '../models';
diff --git a/packages/nocodb/src/services/tables.service.ts b/packages/nocodb/src/services/tables.service.ts
index a2b6c22bd9..5e2af65221 100644
--- a/packages/nocodb/src/services/tables.service.ts
+++ b/packages/nocodb/src/services/tables.service.ts
@@ -2,11 +2,12 @@ import { Injectable } from '@nestjs/common';
 import DOMPurify from 'isomorphic-dompurify';
 import {
   AuditOperationSubTypes,
-  AuditOperationTypes, isLinksOrLTAR,
+  AuditOperationTypes,
+  isLinksOrLTAR,
   isVirtualCol,
   ModelTypes,
   UITypes,
-} from 'nocodb-sdk'
+} from 'nocodb-sdk';
 import { T } from 'nc-help';
 import ProjectMgrv2 from '../db/sql-mgr/v2/ProjectMgrv2';
 import { NcError } from '../helpers/catchError';
@@ -14,13 +15,7 @@ import getColumnPropsFromUIDT from '../helpers/getColumnPropsFromUIDT';
 import getColumnUiType from '../helpers/getColumnUiType';
 import getTableNameAlias, { getColumnNameAlias } from '../helpers/getTableName';
 import mapDefaultDisplayValue from '../helpers/mapDefaultDisplayValue';
-import {
-  Audit,
-  Column,
-  Model,
-  ModelRoleVisibility,
-  Project,
-} from '../models';
+import { Audit, Column, Model, ModelRoleVisibility, Project } from '../models';
 import Noco from '../Noco';
 import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2';
 import { validatePayload } from '../helpers';
@@ -156,9 +151,7 @@ export class TablesService {
     const project = await Project.getWithInfo(table.project_id);
     const base = project.bases.find((b) => b.id === table.base_id);
 
-    const relationColumns = table.columns.filter(
-      (c) => isLinksOrLTAR(c),
-    );
+    const relationColumns = table.columns.filter((c) => isLinksOrLTAR(c));
 
     if (relationColumns?.length && !base.is_meta) {
       const referredTables = await Promise.all(

From 424f3a288f1046a519d39ebdb81a3d263a6cafbd Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 23 Jun 2023 17:15:14 +0530
Subject: [PATCH 146/208] refactor: typo correction

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

diff --git a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
index fa3a17cded..565d059fef 100644
--- a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
@@ -38,7 +38,7 @@ setAdditionalValidations({
   ],
 })
 
-// set default valueO
+// set default value
 vModel.value.meta = {
   singular: '',
   plural: '',

From 2012b1c3ca2b05a75900b22f11069369e386314a Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 23 Jun 2023 21:59:45 +0530
Subject: [PATCH 147/208] fix: avoid attachment overflow and showing scrollbar

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

diff --git a/packages/nc-gui/components/cell/attachment/index.vue b/packages/nc-gui/components/cell/attachment/index.vue
index 9a4f2659c3..463e806333 100644
--- a/packages/nc-gui/components/cell/attachment/index.vue
+++ b/packages/nc-gui/components/cell/attachment/index.vue
@@ -192,7 +192,11 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e) => {
             </template>
             <div v-if="isImage(item.title, item.mimetype ?? item.type)">
               <div class="nc-attachment flex items-center justify-center" @click.stop="selectedImage = item">
-                <LazyCellAttachmentImage :alt="item.title || `#${i}`" :srcs="getPossibleAttachmentSrc(item)" />
+                <LazyCellAttachmentImage
+                  class="max-h-full max-w-full"
+                  :alt="item.title || `#${i}`"
+                  :srcs="getPossibleAttachmentSrc(item)"
+                />
               </div>
             </div>
             <div v-else class="nc-attachment flex items-center justify-center" @click="openAttachment(item)">

From c0756eab30cc95ad722d7655927ae297a493f3a7 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 23 Jun 2023 22:07:07 +0530
Subject: [PATCH 148/208] fix: hide system fields from search field filter

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/smartsheet/toolbar/SearchData.vue    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue b/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
index 0612387bf9..9a84f81f14 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import { isSystemColumn } from 'nocodb-sdk'
 import type { TableType } from 'nocodb-sdk'
 import {
   ActiveViewInj,
@@ -27,10 +28,14 @@ const searchDropdown = ref(null)
 onClickOutside(searchDropdown, () => (isDropdownOpen.value = false))
 
 const columns = computed(() =>
-  (meta.value as TableType)?.columns?.map((column) => ({
-    value: column.id,
-    label: column.title,
-  })),
+  (meta.value as TableType)?.columns
+    ?.filter((c) => {
+      return !isSystemColumn(c)
+    })
+    .map((column) => ({
+      value: column.id,
+      label: column.title,
+    })),
 )
 
 watch(

From 21c1f20e56dc1c8b50d477286db2521179bde1a6 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 23 Jun 2023 22:20:49 +0530
Subject: [PATCH 149/208] refactor: show icon for search column options

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/smartsheet/header/Icon.vue | 11 +++++++++++
 .../components/smartsheet/toolbar/SearchData.vue      | 11 +++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 packages/nc-gui/components/smartsheet/header/Icon.vue

diff --git a/packages/nc-gui/components/smartsheet/header/Icon.vue b/packages/nc-gui/components/smartsheet/header/Icon.vue
new file mode 100644
index 0000000000..ff56b943ea
--- /dev/null
+++ b/packages/nc-gui/components/smartsheet/header/Icon.vue
@@ -0,0 +1,11 @@
+<script lang="ts" setup>
+import { ColumnType, isVirtualCol } from 'nocodb-sdk'
+
+const { column } = defineProps<{ column: ColumnType }>()
+
+</script>
+
+<template>
+  <SmartsheetHeaderVirtualCellIcon v-if="isVirtualCol(column)" :column-meta="column" />
+  <SmartsheetHeaderCellIcon v-else :column-meta="column" />
+</template>
diff --git a/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue b/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
index 9a84f81f14..da24d397f4 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
@@ -35,6 +35,7 @@ const columns = computed(() =>
     .map((column) => ({
       value: column.id,
       label: column.title,
+      column,
     })),
 )
 
@@ -70,10 +71,16 @@ function onPressEnter() {
         :open="isDropdownOpen"
         size="small"
         :dropdown-match-select-width="false"
-        :options="columns"
         dropdown-class-name="!py-0 !rounded nc-dropdown-toolbar-search-field-option"
         class="!absolute top-0 left-0 w-full h-full z-10 !text-xs opacity-0"
-      />
+      >
+        <a-select-option v-for="op of columns" :key="op.value" :value="op.value">
+          <div class="flex items-center -ml-1 gap-2">
+            <SmartsheetHeaderIcon class="" :column="op.column" />
+            {{ op.label }}
+          </div>
+        </a-select-option>
+      </a-select>
     </div>
 
     <a-input

From 8290478d1d2d31e2ad9be187c8957625f888eb8a Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 24 Jun 2023 12:15:23 +0530
Subject: [PATCH 150/208] refactor: limit display value in message to 20chars

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/composables/useExpandedFormStore.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/composables/useExpandedFormStore.ts b/packages/nc-gui/composables/useExpandedFormStore.ts
index 43a60991cc..1d39f265a1 100644
--- a/packages/nc-gui/composables/useExpandedFormStore.ts
+++ b/packages/nc-gui/composables/useExpandedFormStore.ts
@@ -267,7 +267,11 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
         addOrEditStackRow(row.value, isNewRow)
       }
 
-      message.success(`${displayValue.value || 'Row'} updated successfully.`)
+      // trim the display value if greater than 20chars
+      const trimmedDisplayValue =
+        displayValue.value && displayValue.value?.length > 20 ? `${displayValue.value?.substring(0, 20)}...` : displayValue.value
+
+      message.success(`${trimmedDisplayValue || 'Row'} updated successfully.`)
 
       changedColumns.value = new Set()
     } catch (e: any) {

From 844b461cbfd8bc18f956a9027cf7052a6411c803 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 24 Jun 2023 16:45:24 +0530
Subject: [PATCH 151/208] refactor: attachment column item size

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/cell/attachment/index.vue       | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/cell/attachment/index.vue b/packages/nc-gui/components/cell/attachment/index.vue
index 463e806333..af4f0aefcb 100644
--- a/packages/nc-gui/components/cell/attachment/index.vue
+++ b/packages/nc-gui/components/cell/attachment/index.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { onKeyDown } from '@vueuse/core'
+import { RowHeightInj } from '~/context'
 import { useProvideAttachmentCell } from './utils'
 import { useSortable } from './sort'
 import {
@@ -129,6 +130,10 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e) => {
     }
   }
 })
+
+
+const rowHeight = inject(RowHeightInj, ref(1.8))
+
 </script>
 
 <template>
@@ -153,7 +158,7 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e) => {
     <div
       v-if="!isReadonly"
       :class="{ 'mx-auto px-4': !visibleItems.length }"
-      class="group cursor-pointer flex gap-1 items-center active:(ring ring-accent ring-opacity-100) rounded border-1 p-1 shadow-sm hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
+      class="group cursor-pointer flex gap-1 items-center active:(ring ring-accent ring-opacity-100) rounded border-1 shadow-sm hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
       data-testid="attachment-cell-file-picker-button"
       @click.stop="open"
     >
@@ -162,7 +167,7 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e) => {
       <a-tooltip v-else placement="bottom">
         <template #title> Click or drop a file into cell</template>
 
-        <div class="flex items-center gap-2">
+        <div class="flex items-center gap-1">
           <MaterialSymbolsAttachFile
             class="transform dark:(!text-white) group-hover:(!text-accent scale-120) text-gray-500 text-[0.75rem]"
           />
@@ -183,7 +188,10 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e) => {
       <div
         ref="sortableRef"
         :class="{ dragging }"
-        class="flex cursor-pointer justify-center items-center flex-wrap gap-2 p-1 scrollbar-thin-dull max-h-[150px] overflow-auto"
+        class="flex cursor-pointer justify-center items-center flex-wrap gap-2 py-1.5 scrollbar-thin-dull overflow-hidden mt-0 items-start"
+        :style="{
+          maxHeight: `max(${(rowHeight || 1) * 1.8}rem, 41px)`,
+        }"
       >
         <template v-for="(item, i) of visibleItems" :key="item.url || item.title">
           <a-tooltip placement="bottom">
@@ -193,7 +201,7 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e) => {
             <div v-if="isImage(item.title, item.mimetype ?? item.type)">
               <div class="nc-attachment flex items-center justify-center" @click.stop="selectedImage = item">
                 <LazyCellAttachmentImage
-                  class="max-h-full max-w-full"
+                  class="max-h-[1.8rem] max-w-[1.8rem]"
                   :alt="item.title || `#${i}`"
                   :srcs="getPossibleAttachmentSrc(item)"
                 />
@@ -233,7 +241,7 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e) => {
 .nc-cell {
   .nc-attachment-cell {
     .nc-attachment {
-      @apply w-[50px] h-[50px] min-h-[50px] min-w-[50px] ring-1 ring-gray-300 rounded;
+      @apply w-[1.8rem] h-[1.8rem] min-h-[1.8rem] min-w-[1.8rem] ring-1 ring-gray-300 rounded;
     }
 
     .ghost,

From 359ea6873af5487153ddcc04216908aa146d303e Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 27 Jun 2023 10:41:27 +0530
Subject: [PATCH 152/208] docs: updates associdated with Links type

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../content/en/setup-and-usages/Links.md      | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 packages/noco-docs/content/en/setup-and-usages/Links.md

diff --git a/packages/noco-docs/content/en/setup-and-usages/Links.md b/packages/noco-docs/content/en/setup-and-usages/Links.md
new file mode 100644
index 0000000000..2650c65e9f
--- /dev/null
+++ b/packages/noco-docs/content/en/setup-and-usages/Links.md
@@ -0,0 +1,91 @@
+---
+title: "Links"
+description: "Understanding Link Columns!"
+position: 540
+category: "Product"
+menuTitle: "Links"
+---
+
+### Relationship types:
+
+- One to one
+  - A Table record in first table is related to only one record of second table.
+  - Example: Country has a capital city
+- One to many
+  - A Table record in first table is related to more than one record of second table. But second table record maps to only one entry of first table
+  - NocoDB refers to this category of relationship as **has many**
+  - For every **has many** relation defined, NocoDB augments **belongs to** relationship column in the other table automatically
+  - Example: Country **has many** Cities. (other way mapping > City **belongs to** Country )
+- Many to many
+  - A Table record in first table is related to more than one record of second table; second table record can also map to more than on record of first table.
+  - NocoDB refers to this category of relationship as **many to many**
+  - For every **many to many** relation defined between tables, NocoDB augments **many to many** relationship column in the other table automatically
+  - Example: Film **has many** Actors. Actor **has many** Films (works on many films)
+
+Further details of relationship types can be found [here](https://afteracademy.com/blog/what-are-the-different-types-of-relationships-in-dbms)
+
+From Release v0.110.0, table records can be connected through relationships using the **Links** column type. 
+It is important to note that, earlier supported column type **LinkToAnotherRecord** for creating relations is considered deprecated. While the old datatype is still supported for backward compatibility, it is no longer possible to create new fields of that type.
+
+The main distinction between these two column types lies in how the contents are displayed within the cell when links are established between two tables. With the **LinkToAnotherRecord** column type, the cell displays the **Primary value** of the related records. On the other hand, the **Links** column type only shows the **count** of related records.
+The decision to switch over to new column type was made to ensure better performance and scalability of the application, more so when the records & the number of records in the related table is large.
+  
+Child list to display the related records can be accessed by clicking on the link count displayed on the cell. 
+Except for the column type, the following procedures remain same as before 
+- create, update & delete a relationship column, 
+- link & unlink a record, 
+- create a lookup and rollup columns 
+
+Workflow details are captured below.
+
+## Adding a relationship
+
+<img width="1016" alt="image" src="https://user-images.githubusercontent.com/35857179/189105583-20014dd9-e5a6-4f27-b03c-97fad9096b5f.png">
+
+### 1. Create column
+
+Click on '+' button at end of column headers
+
+### 2. Update column name
+
+Input name in the text box provided
+
+### 3. Select column type
+
+Select Column type as "Links" from the drop-down menu
+
+### 4. Choose relationship type
+
+- 'Has Many' corresponds to the 'One-to-many' relationships
+- 'Many To Many' corresponds to the 'Many-to-many' relationships
+
+### 5. Select child table from drop down menu
+
+### 6. Click on 'Save'
+
+A new column will get created in both the parent table & child table
+
+## Updating linked records
+
+### 1. Open link record tab
+
+Click on the '+' icon in corresponding row - cell
+<img width="750" alt="image" src="https://user-images.githubusercontent.com/35857179/189106326-90e46156-798d-4a01-a4eb-4e991ce94c03.png">
+
+### 2. Select from the option displayed
+
+Use 'Filter box' to narrow down on search items
+You can opt to insert a new record as well, using "+ New Record" button
+<img width="1014" alt="image" src="https://user-images.githubusercontent.com/35857179/189106494-4b49a200-a44f-41ae-8b54-93b18d867a04.png">
+
+### 3. Column mapping showing "Has Many" relationship
+
+Sheet1 'has many' Sheet2
+
+<img width="756" alt="image" src="https://user-images.githubusercontent.com/35857179/189106702-3b8d7a50-08f4-4a04-b2cb-16db0cf667b3.png">
+
+### 4. Column mapping for "Belongs to" relationship [Automatically updated]
+
+Sheet2 'belongs to' Sheet1
+
+<img width="574" alt="image" src="https://user-images.githubusercontent.com/35857179/189106731-59e5bc3c-bcc5-4796-b5b2-d9b5418bfe2b.png">
\ No newline at end of file

From d6b1ed2e68117dae13ce504990e39fd24da942e5 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 27 Jun 2023 11:25:07 +0530
Subject: [PATCH 153/208] Docs: Update and rename Links.md to links.md

---
 .../setup-and-usages/{Links.md => links.md}   | 79 ++++++++++++-------
 1 file changed, 49 insertions(+), 30 deletions(-)
 rename packages/noco-docs/content/en/setup-and-usages/{Links.md => links.md} (58%)

diff --git a/packages/noco-docs/content/en/setup-and-usages/Links.md b/packages/noco-docs/content/en/setup-and-usages/links.md
similarity index 58%
rename from packages/noco-docs/content/en/setup-and-usages/Links.md
rename to packages/noco-docs/content/en/setup-and-usages/links.md
index 2650c65e9f..36c042479d 100644
--- a/packages/noco-docs/content/en/setup-and-usages/Links.md
+++ b/packages/noco-docs/content/en/setup-and-usages/links.md
@@ -32,60 +32,79 @@ The decision to switch over to new column type was made to ensure better perform
   
 Child list to display the related records can be accessed by clicking on the link count displayed on the cell. 
 Except for the column type, the following procedures remain same as before 
-- create, update & delete a relationship column, 
-- link & unlink a record, 
-- create a lookup and rollup columns 
+- Create, update & delete a relationship column, 
+- Link & unlink a record, 
+- Create a lookup and rollup columns 
 
 Workflow details are captured below.
 
 ## Adding a relationship
+  
+![Screenshot 2023-06-27 at 11 03 20 AM](https://github.com/nocodb/nocodb/assets/86527202/b3762fc8-4bba-42ef-8415-41428840ee0e)
 
-<img width="1016" alt="image" src="https://user-images.githubusercontent.com/35857179/189105583-20014dd9-e5a6-4f27-b03c-97fad9096b5f.png">
-
-### 1. Create column
-
-Click on '+' button at end of column headers
-
-### 2. Update column name
-
-Input name in the text box provided
 
-### 3. Select column type
+1. Create column
+   Click on '+' button at end of column headers
 
-Select Column type as "Links" from the drop-down menu
+2. Update column name
+   Input name in the text box provided
 
-### 4. Choose relationship type
+3. Select column type
+   Select Column type as "Links" from the drop-down menu
 
+4. Choose relationship type
 - 'Has Many' corresponds to the 'One-to-many' relationships
 - 'Many To Many' corresponds to the 'Many-to-many' relationships
 
-### 5. Select child table from drop down menu
+5. Select child table from drop down menu
 
-### 6. Click on 'Save'
+6. Click on 'Save'
+   A new column will get created in both the parent table & child table
 
-A new column will get created in both the parent table & child table
-
-## Updating linked records
+## Linking records
 
 ### 1. Open link record tab
 
 Click on the '+' icon in corresponding row - cell
-<img width="750" alt="image" src="https://user-images.githubusercontent.com/35857179/189106326-90e46156-798d-4a01-a4eb-4e991ce94c03.png">
+![Screenshot 2023-06-27 at 11 06 52 AM](https://github.com/nocodb/nocodb/assets/86527202/96a90a6d-544e-4e43-b6d1-fe1aef784257)
 
 ### 2. Select from the option displayed
 
-Use 'Filter box' to narrow down on search items
-You can opt to insert a new record as well, using "+ New Record" button
-<img width="1014" alt="image" src="https://user-images.githubusercontent.com/35857179/189106494-4b49a200-a44f-41ae-8b54-93b18d867a04.png">
+Use 'Filter box' to narrow down on search items.    
+You can opt to insert a new record as well, using "+ New Record" button.  
+You can use `ALT + Click` to insert multiple options together.  
+  
+![Screenshot 2023-06-27 at 11 08 40 AM](https://github.com/nocodb/nocodb/assets/86527202/68246783-8d01-488b-8926-644fca8fa164)
+
+### 3. Column display for "Has Many" relationship
+
+Country 'has many' City
+
+![Screenshot 2023-06-27 at 11 11 50 AM](https://github.com/nocodb/nocodb/assets/86527202/b5bb62b7-37ad-480e-8bf2-d666b775b07a)
+
+
+### 4. Column display for "Belongs to" relationship [Automatically updated]
+
+City 'belongs to' Country.  
+Note: Primary value is still used as cell display value for "Belongs to" as it can have only one associated record.
+
+![Screenshot 2023-06-27 at 11 12 27 AM](https://github.com/nocodb/nocodb/assets/86527202/54e9ee75-4af5-49f6-8cd9-275dc53a8915)
+
+
+## Unlinking records
+
+1. Click on link count to open Child modal
+2. Click on Unlink icon against required item
+
+![Screenshot 2023-06-27 at 11 22 00 AM](https://github.com/nocodb/nocodb/assets/86527202/dad3cbc7-289d-45a7-9c49-a72264ed36b1)
+
+
 
-### 3. Column mapping showing "Has Many" relationship
 
-Sheet1 'has many' Sheet2
 
-<img width="756" alt="image" src="https://user-images.githubusercontent.com/35857179/189106702-3b8d7a50-08f4-4a04-b2cb-16db0cf667b3.png">
+## Link label reconfiguration
 
-### 4. Column mapping for "Belongs to" relationship [Automatically updated]
+Use column edit menu for **Links** to reconfigure display label
 
-Sheet2 'belongs to' Sheet1
+![Screenshot 2023-06-27 at 11 16 19 AM](https://github.com/nocodb/nocodb/assets/86527202/1aabdd8c-7102-4917-b0c0-b72e1187b0b7)
 
-<img width="574" alt="image" src="https://user-images.githubusercontent.com/35857179/189106731-59e5bc3c-bcc5-4796-b5b2-d9b5418bfe2b.png">
\ No newline at end of file

From 040e9e98692ca9d23ba5da493099e2a1ac50dd46 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 27 Jun 2023 11:27:03 +0530
Subject: [PATCH 154/208] Update lookup.md

---
 packages/noco-docs/content/en/setup-and-usages/lookup.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/noco-docs/content/en/setup-and-usages/lookup.md b/packages/noco-docs/content/en/setup-and-usages/lookup.md
index 52075da925..f62740c0d2 100644
--- a/packages/noco-docs/content/en/setup-and-usages/lookup.md
+++ b/packages/noco-docs/content/en/setup-and-usages/lookup.md
@@ -11,7 +11,7 @@ menuTitle: "Lookup"
 ### Example organization structure
   
 Consider an organization with
-- 5 departments (company departments), each department has a team name & associated team code. Each `Team` **has many** `Employees` - relationship has been defined using `LinkToAnotherRecord` column
+- 5 departments (company departments), each department has a team name & associated team code. Each `Team` **has many** `Employees` - relationship has been defined using `LinkToAnotherRecord` or `Links`column
 - 5 employees working at different departments
   
   

From 3913e124a75302e9753821278ce13f0e520a18a1 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 27 Jun 2023 11:35:39 +0530
Subject: [PATCH 155/208] Update links.md

Remove general information about one-one
---
 packages/noco-docs/content/en/setup-and-usages/links.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/noco-docs/content/en/setup-and-usages/links.md b/packages/noco-docs/content/en/setup-and-usages/links.md
index 36c042479d..5bd16d7537 100644
--- a/packages/noco-docs/content/en/setup-and-usages/links.md
+++ b/packages/noco-docs/content/en/setup-and-usages/links.md
@@ -6,15 +6,12 @@ category: "Product"
 menuTitle: "Links"
 ---
 
-### Relationship types:
+### Supported relationship types:
 
-- One to one
-  - A Table record in first table is related to only one record of second table.
-  - Example: Country has a capital city
 - One to many
   - A Table record in first table is related to more than one record of second table. But second table record maps to only one entry of first table
   - NocoDB refers to this category of relationship as **has many**
-  - For every **has many** relation defined, NocoDB augments **belongs to** relationship column in the other table automatically
+  - For every **has many** relation defined, NocoDB augments **belongs to** relationship column in the adjacent table automatically
   - Example: Country **has many** Cities. (other way mapping > City **belongs to** Country )
 - Many to many
   - A Table record in first table is related to more than one record of second table; second table record can also map to more than on record of first table.

From c2d028ec798167b70573d742d2f0eb2980278b85 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Wed, 14 Jun 2023 18:59:00 +0300
Subject: [PATCH 156/208] feat: vertical fill using handle

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../nc-gui/components/smartsheet/Grid.vue     | 103 ++++++++-
 .../components/smartsheet/TableDataCell.vue   |   2 +
 .../composables/useMultiSelect/index.ts       | 217 ++++++++++++++----
 3 files changed, 277 insertions(+), 45 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 659fe932e8..24bba4ec2f 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -2,6 +2,7 @@
 import { nextTick } from '@vue/runtime-core'
 import type { ColumnReqType, ColumnType, GridType, PaginatedType, TableType, ViewType } from 'nocodb-sdk'
 import { UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import type { UseElementBoundingReturn } from '@vueuse/core'
 import {
   ActiveViewInj,
   CellUrlDisableOverlayInj,
@@ -109,6 +110,7 @@ const expandedFormRowState = ref<Record<string, any>>()
 const gridWrapper = ref<HTMLElement>()
 const tableHeadEl = ref<HTMLElement>()
 const tableBodyEl = ref<HTMLElement>()
+const fillHandle = ref<HTMLElement>()
 
 const isAddingColumnAllowed = $computed(() => !readOnly.value && !isLocked.value && isUIAllowed('add-column') && !isSqlView.value)
 
@@ -207,6 +209,7 @@ const {
   resetSelectedRange,
   makeActive,
   selectedRange,
+  isCellInFillRange,
 } = useMultiSelect(
   meta,
   fields,
@@ -348,6 +351,7 @@ const {
     await updateOrSaveRow(rowObj, ctx.updatedColumnTitle || columnObj.title)
   },
   bulkUpdateRows,
+  fillHandle,
 )
 
 function scrollToCell(row?: number | null, col?: number | null) {
@@ -650,9 +654,9 @@ useEventListener(document, 'keyup', async (e: KeyboardEvent) => {
   }
 })
 
-/** On clicking outside of table reset active cell  */
 const smartTable = ref(null)
 
+/** On clicking outside of table reset active cell  */
 onClickOutside(tableBodyEl, (e) => {
   // do nothing if context menu was open
   if (contextMenu.value) return
@@ -666,7 +670,7 @@ onClickOutside(tableBodyEl, (e) => {
   // ignore unselecting if clicked inside or on the picker(Date, Time, DateTime, Year)
   // or single/multi select options
   const activePickerOrDropdownEl = document.querySelector(
-    '.nc-picker-datetime.active,.nc-dropdown-single-select-cell.active,.nc-dropdown-multi-select-cell.active,.nc-picker-date.active,.nc-picker-year.active,.nc-picker-time.active',
+    '.nc-picker-datetime.active,.nc-dropdown-single-select-cell.active,.nc-dropdown-multi-select-cell.active,.nc-picker-date.active,.nc-picker-year.active,.nc-picker-time.active,.nc-fill-handle',
   )
   if (
     e.target &&
@@ -881,10 +885,51 @@ function addEmptyRow(row?: number) {
   nextTick().then(() => {
     clearSelectedRange()
     makeActive(row ?? data.value.length - 1, 0)
+    selectedRange.startRange({ row: activeCell.row!, col: activeCell.col! })
     scrollToCell?.()
   })
   return rowObj
 }
+
+const tableRect = useElementBounding(smartTable)
+const { height: tableHeight, width: tableWidth } = tableRect
+
+const { x: gridX, y: gridY } = useScroll(gridWrapper)
+
+const fillHandleTop = ref()
+const fillHandleLeft = ref()
+
+const cellRefs = ref<{ el: HTMLElement }[]>([])
+let cellRect: UseElementBoundingReturn | null = null
+
+const refreshFillHandle = () => {
+  const cellRef = cellRefs.value.find(
+    (cell) =>
+      cell.el.dataset.rowIndex === String(selectedRange.end.row) && cell.el.dataset.colIndex === String(selectedRange.end.col),
+  )
+  if (cellRef) {
+    cellRect = useElementBounding(cellRef.el)
+    if (!cellRect || !tableRect) return
+    if (selectedRange.end.col === 0) {
+      fillHandleTop.value = cellRect.top.value - tableRect.top.value + cellRect.height.value - 4.5 + gridY.value
+      fillHandleLeft.value = cellRect.left.value - tableRect.left.value + cellRect.width.value - 4.5
+      return
+    }
+    fillHandleTop.value = cellRect.top.value - tableRect.top.value + cellRect.height.value - 4.5 + gridY.value
+    fillHandleLeft.value = cellRect.left.value - tableRect.left.value + cellRect.width.value - 4.5 + gridX.value
+  }
+}
+
+watch(
+  () => `${selectedRange.end.row}-${selectedRange.end.col}`,
+  (n, o) => {
+    if (n !== o) {
+      if (gridWrapper.value) {
+        refreshFillHandle()
+      }
+    }
+  },
+)
 </script>
 
 <template>
@@ -895,7 +940,17 @@ function addEmptyRow(row?: number) {
       </div>
     </general-overlay>
 
-    <div ref="gridWrapper" class="nc-grid-wrapper min-h-0 flex-1 scrollbar-thin-dull">
+    <div
+      ref="gridWrapper"
+      class="nc-grid-wrapper min-h-0 flex-1 scrollbar-thin-dull"
+      :class="{
+        relative:
+          !readOnly &&
+          !isLocked &&
+          (!selectedRange.isEmpty() || (activeCell.row !== null && activeCell.col !== null)) &&
+          ((!selectedRange.isEmpty() && selectedRange.end.col !== 0) || (selectedRange.isEmpty() && activeCell.col !== 0)),
+      }"
+    >
       <a-dropdown
         v-model:visible="contextMenu"
         :trigger="isSqlView ? [] : ['contextmenu']"
@@ -1041,6 +1096,7 @@ function addEmptyRow(row?: number) {
                   <SmartsheetTableDataCell
                     v-for="(columnObj, colIndex) of fields"
                     :key="columnObj.id"
+                    ref="cellRefs"
                     class="cell relative nc-grid-cell"
                     :class="{
                       'cursor-pointer': hasEditPermission,
@@ -1048,11 +1104,14 @@ function addEmptyRow(row?: number) {
                       'nc-required-cell': isColumnRequiredAndNull(columnObj, row.row),
                       'align-middle': !rowHeight || rowHeight === 1,
                       'align-top': rowHeight && rowHeight !== 1,
+                      'filling': isCellInFillRange(rowIndex, colIndex),
                     }"
                     :data-testid="`cell-${columnObj.title}-${rowIndex}`"
                     :data-key="rowIndex + columnObj.id"
                     :data-col="columnObj.id"
                     :data-title="columnObj.title"
+                    :data-row-index="rowIndex"
+                    :data-col-index="colIndex"
                     @mousedown="handleMouseDown($event, rowIndex, colIndex)"
                     @mouseover="handleMouseOver($event, rowIndex, colIndex)"
                     @click="handleCellClick($event, rowIndex, colIndex)"
@@ -1184,6 +1243,28 @@ function addEmptyRow(row?: number) {
           </a-menu>
         </template>
       </a-dropdown>
+      <div
+        class="table-overlay absolute top-0 left-0 pointer-events-none overflow-hidden"
+        :style="{ height: `${tableHeight}px`, width: `${tableWidth}px` }"
+      >
+        <!-- Fill Handle -->
+        <div
+          v-show="
+            !readOnly &&
+            !isLocked &&
+            !editEnabled &&
+            (!selectedRange.isEmpty() || (activeCell.row !== null && activeCell.col !== null))
+          "
+          ref="fillHandle"
+          class="nc-fill-handle absolute w-[8px] h-[8px] rounded-full bg-red-500 !pointer-events-auto"
+          :class="
+            (!selectedRange.isEmpty() && selectedRange.end.col !== 0) || (selectedRange.isEmpty() && activeCell.col !== 0)
+              ? 'z-3'
+              : 'z-4'
+          "
+          :style="{ top: `${fillHandleTop}px`, left: `${fillHandleLeft}px`, cursor: 'crosshair' }"
+        />
+      </div>
     </div>
 
     <div
@@ -1293,6 +1374,22 @@ function addEmptyRow(row?: number) {
     @apply border-1 border-solid text-primary border-current bg-primary bg-opacity-5;
   }
 
+  td.filling::after {
+    content: '';
+    position: absolute;
+    z-index: 3;
+    height: calc(100% + 2px);
+    width: calc(100% + 2px);
+    left: -1px;
+    top: -1px;
+    pointer-events: none;
+  }
+
+  // todo: replace with css variable
+  td.filling::after {
+    @apply border-1 border-solid text-accent border-current;
+  }
+
   //td.active::before {
   //  content: '';
   //  z-index:4;
diff --git a/packages/nc-gui/components/smartsheet/TableDataCell.vue b/packages/nc-gui/components/smartsheet/TableDataCell.vue
index a78d4751ff..859fd01d93 100644
--- a/packages/nc-gui/components/smartsheet/TableDataCell.vue
+++ b/packages/nc-gui/components/smartsheet/TableDataCell.vue
@@ -8,6 +8,8 @@ const cellClickHook = createEventHook()
 provide(CellClickHookInj, cellClickHook)
 
 provide(CurrentCellInj, el)
+
+defineExpose({ el })
 </script>
 
 <template>
diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index 2f546073c8..ad4babefae 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -48,6 +48,7 @@ export function useMultiSelect(
   keyEventHandler?: Function,
   syncCellData?: Function,
   bulkUpdateRows?: Function,
+  fillHandle?: MaybeRef<HTMLElement | undefined>,
 ) {
   const meta = ref(_meta)
 
@@ -65,8 +66,12 @@ export function useMultiSelect(
 
   let isMouseDown = $ref(false)
 
+  let fillMode = $ref(false)
+
   const selectedRange = reactive(new CellRange())
 
+  const fillRange = reactive(new CellRange())
+
   const activeCell = reactive<Nullable<Cell>>({ row: null, col: null })
 
   const columnLength = $computed(() => unref(fields)?.length)
@@ -159,23 +164,33 @@ export function useMultiSelect(
     return textToCopy
   }
 
-  const copyTable = async (rows: Row[], cols: ColumnType[]) => {
-    let copyHTML = '<table>'
-    let copyPlainText = ''
+  const serializeRange = (rows: Row[], cols: ColumnType[]) => {
+    let html = '<table>'
+    let text = ''
+    const json: string[][] = []
 
     rows.forEach((row, i) => {
       let copyRow = '<tr>'
+      const jsonRow: string[] = []
       cols.forEach((col, i) => {
         const value = valueToCopy(row, col)
         copyRow += `<td>${value}</td>`
-        copyPlainText = `${copyPlainText}${value}${cols.length - 1 !== i ? '\t' : ''}`
+        text = `${text}${value}${cols.length - 1 !== i ? '\t' : ''}`
+        jsonRow.push(col.uidt === UITypes.LongText ? value.replace(/^"/, '').replace(/"$/, '').replace(/""/g, '"') : value)
       })
-      copyHTML += `${copyRow}</tr>`
+      html += `${copyRow}</tr>`
       if (rows.length - 1 !== i) {
-        copyPlainText = `${copyPlainText}\n`
+        text = `${text}\n`
       }
+      json.push(jsonRow)
     })
-    copyHTML += '</table>'
+    html += '</table>'
+
+    return { html, text, json }
+  }
+
+  const copyTable = async (rows: Row[], cols: ColumnType[]) => {
+    const { html: copyHTML, text: copyPlainText } = serializeRange(rows, cols)
 
     const blobHTML = new Blob([copyHTML], { type: 'text/html' })
     const blobPlainText = new Blob([copyPlainText], { type: 'text/plain' })
@@ -229,7 +244,65 @@ export function useMultiSelect(
     )
   }
 
+  function isCellInFillRange(row: number, col: number) {
+    if (fillRange.start === null || fillRange.end === null) {
+      return false
+    }
+
+    if (
+      col >= selectedRange.start.col &&
+      col <= selectedRange.end.col &&
+      row >= selectedRange.start.row &&
+      row <= selectedRange.end.row
+    ) {
+      return false
+    }
+
+    return col >= fillRange.start.col && col <= fillRange.end.col && row >= fillRange.start.row && row <= fillRange.end.row
+  }
+
+  const isPasteable = (row?: Row, col?: ColumnType, showInfo = false) => {
+    if (!row || !col) {
+      if (showInfo) {
+        message.info('Please select a cell to paste')
+      }
+      return false
+    }
+
+    // skip pasting virtual columns (including LTAR columns for now) and system columns
+    if (isVirtualCol(col) || isSystemColumn(col)) {
+      if (showInfo) {
+        message.info(t('msg.info.pasteNotSupported'))
+      }
+      return false
+    }
+
+    // skip pasting auto increment columns
+    if (col.ai) {
+      if (showInfo) {
+        message.info(t('msg.info.autoIncFieldNotEditable'))
+      }
+      return false
+    }
+
+    // skip pasting primary key columns
+    if (col.pk && !row.rowMeta.new) {
+      if (showInfo) {
+        message.info(t('msg.info.editingPKnotSupported'))
+      }
+      return false
+    }
+
+    return true
+  }
+
   function handleMouseOver(event: MouseEvent, row: number, col: number) {
+    if (fillMode) {
+      fillRange.endRange({ row, col: selectedRange.end.col })
+      scrollToCell?.(row, col)
+      return
+    }
+
     if (!isMouseDown) {
       return
     }
@@ -290,6 +363,82 @@ export function useMultiSelect(
   }
 
   const handleMouseUp = (_event: MouseEvent) => {
+    if (fillMode) {
+      fillMode = false
+
+      if (fillRange._start === null || fillRange._end === null) return
+
+      if (selectedRange.start !== null && selectedRange.end !== null) {
+        const cprows = unref(data).slice(selectedRange.start.row, selectedRange.end.row + 1) // slice the selected rows for copy
+        const cpcols = unref(fields).slice(selectedRange.start.col, selectedRange.end.col + 1) // slice the selected cols for copy
+
+        const rawMatrix = serializeRange(cprows, cpcols).json
+
+        const fillDirection = fillRange._start.row <= fillRange._end.row ? 1 : -1
+
+        let fillIndex = fillDirection === 1 ? 0 : rawMatrix.length - 1
+
+        const rowsToPaste: Row[] = []
+        const propsToPaste: string[] = []
+
+        for (
+          let row = fillRange._start.row;
+          fillDirection === 1 ? row <= fillRange._end.row : row >= fillRange._end.row;
+          row += fillDirection
+        ) {
+          if (isCellSelected(row, selectedRange.start.col)) {
+            continue
+          }
+
+          const rowObj = unref(data)[row]
+
+          let pasteIndex = 0
+
+          for (let col = fillRange.start.col; col <= fillRange.end.col; col++) {
+            const colObj = unref(fields)[col]
+
+            if (!isPasteable(rowObj, colObj)) {
+              pasteIndex++
+              continue
+            }
+
+            propsToPaste.push(colObj.title!)
+
+            const pasteValue = convertCellData(
+              {
+                value: rawMatrix[fillIndex][pasteIndex],
+                to: colObj.uidt as UITypes,
+                column: colObj,
+                appInfo: unref(appInfo),
+              },
+              isMysql(meta.value?.base_id),
+              true,
+            )
+
+            if (pasteValue !== undefined) {
+              rowObj.row[colObj.title!] = pasteValue
+              rowsToPaste.push(rowObj)
+            }
+
+            pasteIndex++
+          }
+
+          if (fillDirection === 1) {
+            fillIndex = fillIndex < rawMatrix.length - 1 ? fillIndex + 1 : 0
+          } else {
+            fillIndex = fillIndex >= 1 ? fillIndex - 1 : rawMatrix.length - 1
+          }
+        }
+
+        bulkUpdateRows?.(rowsToPaste, propsToPaste).then(() => {
+          fillRange.clear()
+        })
+      } else {
+        fillRange.clear()
+      }
+      return
+    }
+
     if (isMouseDown) {
       isMouseDown = false
       // timeout is needed, because we want to set cell as active AFTER all the child's click handler's called
@@ -530,41 +679,6 @@ export function useMultiSelect(
 
   const clearSelectedRange = selectedRange.clear.bind(selectedRange)
 
-  const isPasteable = (row?: Row, col?: ColumnType, showInfo = false) => {
-    if (!row || !col) {
-      if (showInfo) {
-        message.info('Please select a cell to paste')
-      }
-      return false
-    }
-
-    // skip pasting virtual columns (including LTAR columns for now) and system columns
-    if (isVirtualCol(col) || isSystemColumn(col)) {
-      if (showInfo) {
-        message.info(t('msg.info.pasteNotSupported'))
-      }
-      return false
-    }
-
-    // skip pasting auto increment columns
-    if (col.ai) {
-      if (showInfo) {
-        message.info(t('msg.info.autoIncFieldNotEditable'))
-      }
-      return false
-    }
-
-    // skip pasting primary key columns
-    if (col.pk && !row.rowMeta.new) {
-      if (showInfo) {
-        message.info(t('msg.info.editingPKnotSupported'))
-      }
-      return false
-    }
-
-    return true
-  }
-
   const handlePaste = async (e: ClipboardEvent) => {
     if (isDrawerOrModalExist()) {
       return
@@ -751,10 +865,27 @@ export function useMultiSelect(
     }
   }
 
+  function fillHandleMouseDown(event: MouseEvent) {
+    if (event?.button !== MAIN_MOUSE_PRESSED) {
+      return
+    }
+
+    fillMode = true
+
+    if (selectedRange._start && selectedRange._end) {
+      fillRange.startRange({ row: selectedRange._start?.row, col: selectedRange.start.col })
+      fillRange.endRange({ row: selectedRange._end?.row, col: selectedRange.end.col })
+    }
+
+    event.preventDefault()
+  }
+
   useEventListener(document, 'keydown', handleKeyDown)
   useEventListener(document, 'mouseup', handleMouseUp)
   useEventListener(document, 'paste', handlePaste)
 
+  useEventListener(fillHandle, 'mousedown', fillHandleMouseDown)
+
   return {
     isCellActive,
     handleMouseDown,
@@ -767,5 +898,7 @@ export function useMultiSelect(
     resetSelectedRange,
     selectedRange,
     makeActive,
+    fillHandleMouseDown,
+    isCellInFillRange,
   }
 }

From 4dfb182d7f5ccd6d5f0dd60b8550a827ffbd57a0 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Fri, 16 Jun 2023 00:43:07 +0300
Subject: [PATCH 157/208] feat: use refs for mouse states

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../composables/useMultiSelect/index.ts       | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index ad4babefae..e7ce30f66a 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -64,9 +64,9 @@ export function useMultiSelect(
 
   const editEnabled = ref(_editEnabled)
 
-  let isMouseDown = $ref(false)
+  const isMouseDown = ref(false)
 
-  let fillMode = $ref(false)
+  const isFillMode = ref(false)
 
   const selectedRange = reactive(new CellRange())
 
@@ -297,13 +297,13 @@ export function useMultiSelect(
   }
 
   function handleMouseOver(event: MouseEvent, row: number, col: number) {
-    if (fillMode) {
+    if (isFillMode.value) {
       fillRange.endRange({ row, col: selectedRange.end.col })
       scrollToCell?.(row, col)
       return
     }
 
-    if (!isMouseDown) {
+    if (!isMouseDown.value) {
       return
     }
 
@@ -325,7 +325,7 @@ export function useMultiSelect(
     }
 
     // if edit is enabled, don't start the selection (some cells shrink after edit mode, which causes the selection to expand if flag is set)
-    if (!editEnabled.value) isMouseDown = true
+    if (!editEnabled.value) isMouseDown.value = true
 
     contextMenu.value = false
 
@@ -363,8 +363,8 @@ export function useMultiSelect(
   }
 
   const handleMouseUp = (_event: MouseEvent) => {
-    if (fillMode) {
-      fillMode = false
+    if (isFillMode.value) {
+      isFillMode.value = false
 
       if (fillRange._start === null || fillRange._end === null) return
 
@@ -439,8 +439,8 @@ export function useMultiSelect(
       return
     }
 
-    if (isMouseDown) {
-      isMouseDown = false
+    if (isMouseDown.value) {
+      isMouseDown.value = false
       // timeout is needed, because we want to set cell as active AFTER all the child's click handler's called
       // this is needed e.g. for date field edit, where two clicks had to be done - one to select cell, and another one to open date dropdown
       setTimeout(() => {
@@ -870,7 +870,7 @@ export function useMultiSelect(
       return
     }
 
-    fillMode = true
+    isFillMode.value = true
 
     if (selectedRange._start && selectedRange._end) {
       fillRange.startRange({ row: selectedRange._start?.row, col: selectedRange.start.col })
@@ -900,5 +900,6 @@ export function useMultiSelect(
     makeActive,
     fillHandleMouseDown,
     isCellInFillRange,
+    isMouseDown,
   }
 }

From 7cb548106fca782faf0490adf8e72a50282201f8 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Fri, 16 Jun 2023 00:46:23 +0300
Subject: [PATCH 158/208] refactor: filling range style

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 24bba4ec2f..647dc6e881 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -1387,7 +1387,7 @@ watch(
 
   // todo: replace with css variable
   td.filling::after {
-    @apply border-1 border-solid text-accent border-current;
+    @apply border-1 border-dashed text-primary border-current bg-gray-100 bg-opacity-50;
   }
 
   //td.active::before {

From f05c453728009bf6f3939f0d4753d194f6778a97 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Fri, 16 Jun 2023 00:52:55 +0300
Subject: [PATCH 159/208] refactor: fill handle size

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

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 647dc6e881..c78af55d2e 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -911,12 +911,12 @@ const refreshFillHandle = () => {
     cellRect = useElementBounding(cellRef.el)
     if (!cellRect || !tableRect) return
     if (selectedRange.end.col === 0) {
-      fillHandleTop.value = cellRect.top.value - tableRect.top.value + cellRect.height.value - 4.5 + gridY.value
-      fillHandleLeft.value = cellRect.left.value - tableRect.left.value + cellRect.width.value - 4.5
+      fillHandleTop.value = cellRect.top.value - tableRect.top.value + cellRect.height.value + gridY.value
+      fillHandleLeft.value = cellRect.left.value - tableRect.left.value + cellRect.width.value
       return
     }
-    fillHandleTop.value = cellRect.top.value - tableRect.top.value + cellRect.height.value - 4.5 + gridY.value
-    fillHandleLeft.value = cellRect.left.value - tableRect.left.value + cellRect.width.value - 4.5 + gridX.value
+    fillHandleTop.value = cellRect.top.value - tableRect.top.value + cellRect.height.value + gridY.value
+    fillHandleLeft.value = cellRect.left.value - tableRect.left.value + cellRect.width.value + gridX.value
   }
 }
 
@@ -1256,7 +1256,7 @@ watch(
             (!selectedRange.isEmpty() || (activeCell.row !== null && activeCell.col !== null))
           "
           ref="fillHandle"
-          class="nc-fill-handle absolute w-[8px] h-[8px] rounded-full bg-red-500 !pointer-events-auto"
+          class="nc-fill-handle"
           :class="
             (!selectedRange.isEmpty() && selectedRange.end.col !== 0) || (selectedRange.isEmpty() && activeCell.col !== 0)
               ? 'z-3'
@@ -1489,4 +1489,14 @@ tbody tr:hover {
 .nc-required-cell {
   box-shadow: inset 0 0 2px #f00;
 }
+
+.nc-fill-handle {
+  @apply w-[6px] h-[6px] absolute rounded-full bg-red-500 !pointer-events-auto mt-[-4px] ml-[-4px];
+}
+
+.nc-fill-handle:hover,
+.nc-fill-handle:active,
+.nc-fill-handle:focus {
+  @apply w-[8px] h-[8px] mt-[-5px] ml-[-5px];
+}
 </style>

From f860c909dd0f8a59f58a135216aec144848e738c Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Wed, 21 Jun 2023 19:23:54 +0300
Subject: [PATCH 160/208] fix: avoid filling new rows

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

diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index e7ce30f66a..2b1e5f30f8 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -298,6 +298,11 @@ export function useMultiSelect(
 
   function handleMouseOver(event: MouseEvent, row: number, col: number) {
     if (isFillMode.value) {
+      const rw = unref(data)[row]
+
+      // fill is not supported for new rows yet
+      if (rw.rowMeta.new) return
+
       fillRange.endRange({ row, col: selectedRange.end.col })
       scrollToCell?.(row, col)
       return

From c1b5e76a4306cc8f1d1e712af0dd6d6171c462dd Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Sat, 24 Jun 2023 09:00:52 +0300
Subject: [PATCH 161/208] fix: snap fill handle

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

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index c78af55d2e..a73fc6806e 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -2,7 +2,6 @@
 import { nextTick } from '@vue/runtime-core'
 import type { ColumnReqType, ColumnType, GridType, PaginatedType, TableType, ViewType } from 'nocodb-sdk'
 import { UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
-import type { UseElementBoundingReturn } from '@vueuse/core'
 import {
   ActiveViewInj,
   CellUrlDisableOverlayInj,
@@ -112,6 +111,8 @@ const tableHeadEl = ref<HTMLElement>()
 const tableBodyEl = ref<HTMLElement>()
 const fillHandle = ref<HTMLElement>()
 
+const gridRect = useElementBounding(gridWrapper)
+
 const isAddingColumnAllowed = $computed(() => !readOnly.value && !isLocked.value && isUIAllowed('add-column') && !isSqlView.value)
 
 const isAddingEmptyRowAllowed = $computed(() => !isView && !isLocked.value && hasEditPermission && !isSqlView.value)
@@ -891,16 +892,19 @@ function addEmptyRow(row?: number) {
   return rowObj
 }
 
-const tableRect = useElementBounding(smartTable)
-const { height: tableHeight, width: tableWidth } = tableRect
-
-const { x: gridX, y: gridY } = useScroll(gridWrapper)
-
 const fillHandleTop = ref()
 const fillHandleLeft = ref()
 
 const cellRefs = ref<{ el: HTMLElement }[]>([])
-let cellRect: UseElementBoundingReturn | null = null
+
+const showFillHandle = computed(
+  () =>
+    !readOnly.value &&
+    !isLocked.value &&
+    !editEnabled &&
+    (!selectedRange.isEmpty() || (activeCell.row !== null && activeCell.col !== null)) &&
+    !data.value[selectedRange.end.row ?? activeCell.row]?.rowMeta?.new,
+)
 
 const refreshFillHandle = () => {
   const cellRef = cellRefs.value.find(
@@ -908,28 +912,22 @@ const refreshFillHandle = () => {
       cell.el.dataset.rowIndex === String(selectedRange.end.row) && cell.el.dataset.colIndex === String(selectedRange.end.col),
   )
   if (cellRef) {
-    cellRect = useElementBounding(cellRef.el)
-    if (!cellRect || !tableRect) return
-    if (selectedRange.end.col === 0) {
-      fillHandleTop.value = cellRect.top.value - tableRect.top.value + cellRect.height.value + gridY.value
-      fillHandleLeft.value = cellRect.left.value - tableRect.left.value + cellRect.width.value
-      return
-    }
-    fillHandleTop.value = cellRect.top.value - tableRect.top.value + cellRect.height.value + gridY.value
-    fillHandleLeft.value = cellRect.left.value - tableRect.left.value + cellRect.width.value + gridX.value
+    const cellRect = useElementBounding(cellRef.el)
+    if (!cellRect || !gridWrapper.value) return
+    fillHandleTop.value = cellRect.top.value + cellRect.height.value - gridRect.top.value + gridWrapper.value.scrollTop
+    fillHandleLeft.value = cellRect.left.value + cellRect.width.value - gridRect.left.value + gridWrapper.value.scrollLeft
   }
 }
 
-watch(
-  () => `${selectedRange.end.row}-${selectedRange.end.col}`,
-  (n, o) => {
-    if (n !== o) {
-      if (gridWrapper.value) {
-        refreshFillHandle()
-      }
-    }
-  },
-)
+watch([() => selectedRange.end.row, () => selectedRange.end.col], (n, o) => {
+  if (n !== o) {
+    refreshFillHandle()
+  }
+})
+
+useEventListener(gridWrapper, 'scroll', () => {
+  refreshFillHandle()
+})
 </script>
 
 <template>
@@ -940,233 +938,233 @@ watch(
       </div>
     </general-overlay>
 
-    <div
-      ref="gridWrapper"
-      class="nc-grid-wrapper min-h-0 flex-1 scrollbar-thin-dull"
-      :class="{
-        relative:
-          !readOnly &&
-          !isLocked &&
-          (!selectedRange.isEmpty() || (activeCell.row !== null && activeCell.col !== null)) &&
-          ((!selectedRange.isEmpty() && selectedRange.end.col !== 0) || (selectedRange.isEmpty() && activeCell.col !== 0)),
-      }"
-    >
+    <div ref="gridWrapper" class="nc-grid-wrapper min-h-0 flex-1 scrollbar-thin-dull relative">
       <a-dropdown
         v-model:visible="contextMenu"
         :trigger="isSqlView ? [] : ['contextmenu']"
         overlay-class-name="nc-dropdown-grid-context-menu"
       >
-        <table
-          ref="smartTable"
-          class="xc-row-table nc-grid backgroundColorDefault !h-auto bg-white"
-          @contextmenu="showContextMenu"
-        >
-          <thead ref="tableHeadEl">
-            <tr class="nc-grid-header">
-              <th class="w-[85px] min-w-[85px]" 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
-                      :class="{ hidden: !selectedAllRecords, flex: selectedAllRecords }"
-                      class="nc-check-all w-full items-center"
-                    >
-                      <a-checkbox v-model:checked="selectedAllRecords" />
+        <div class="table-overlay">
+          <table
+            ref="smartTable"
+            class="xc-row-table nc-grid backgroundColorDefault !h-auto bg-white"
+            @contextmenu="showContextMenu"
+          >
+            <thead ref="tableHeadEl">
+              <tr class="nc-grid-header">
+                <th class="w-[85px] min-w-[85px]" 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
+                        :class="{ hidden: !selectedAllRecords, flex: selectedAllRecords }"
+                        class="nc-check-all w-full items-center"
+                      >
+                        <a-checkbox v-model:checked="selectedAllRecords" />
 
-                      <span class="flex-1" />
-                    </div>
-                  </template>
-                  <template v-else>
-                    <div class="text-gray-500">#</div>
-                  </template>
-                </div>
-              </th>
-              <th
-                v-for="col in fields"
-                :key="col.title"
-                v-xc-ver-resize
-                :data-col="col.id"
-                :data-title="col.title"
-                @xcresize="onresize(col.id, $event)"
-                @xcresizing="onXcResizing(col.title, $event)"
-                @xcresized="resizingCol = null"
-              >
-                <div class="w-full h-full bg-gray-100 flex items-center">
-                  <LazySmartsheetHeaderVirtualCell v-if="isVirtualCol(col)" :column="col" :hide-menu="readOnly" />
-
-                  <LazySmartsheetHeaderCell v-else :column="col" :hide-menu="readOnly" />
-                </div>
-              </th>
-              <th
-                v-if="isAddingColumnAllowed"
-                v-e="['c:column:add']"
-                class="cursor-pointer"
-                @click.stop="addColumnDropdown = true"
-              >
-                <a-dropdown
-                  v-model:visible="addColumnDropdown"
-                  :trigger="['click']"
-                  overlay-class-name="nc-dropdown-grid-add-column"
-                >
-                  <div class="h-full w-[60px] flex items-center justify-center">
-                    <component :is="iconMap.plus" class="text-sm nc-column-add" />
+                        <span class="flex-1" />
+                      </div>
+                    </template>
+                    <template v-else>
+                      <div class="text-gray-500">#</div>
+                    </template>
                   </div>
+                </th>
+                <th
+                  v-for="col in fields"
+                  :key="col.title"
+                  v-xc-ver-resize
+                  :data-col="col.id"
+                  :data-title="col.title"
+                  @xcresize="onresize(col.id, $event)"
+                  @xcresizing="onXcResizing(col.title, $event)"
+                  @xcresized="resizingCol = null"
+                >
+                  <div class="w-full h-full bg-gray-100 flex items-center">
+                    <LazySmartsheetHeaderVirtualCell v-if="isVirtualCol(col)" :column="col" :hide-menu="readOnly" />
 
-                  <template #overlay>
-                    <SmartsheetColumnEditOrAddProvider
-                      v-if="addColumnDropdown"
-                      :preload="preloadColumn"
-                      :column-position="columnOrder"
-                      @submit="closeAddColumnDropdown(true)"
-                      @cancel="closeAddColumnDropdown()"
-                      @click.stop
-                      @keydown.stop
-                    />
-                  </template>
-                </a-dropdown>
-              </th>
-            </tr>
-          </thead>
-          <tbody ref="tableBodyEl">
-            <LazySmartsheetRow v-for="(row, rowIndex) of data" ref="rowRefs" :key="rowIndex" :row="row">
-              <template #default="{ state }">
-                <tr
-                  class="nc-grid-row"
-                  :style="{ height: rowHeight ? `${rowHeight * 1.8}rem` : `1.8rem` }"
-                  :data-testid="`grid-row-${rowIndex}`"
+                    <LazySmartsheetHeaderCell v-else :column="col" :hide-menu="readOnly" />
+                  </div>
+                </th>
+                <th
+                  v-if="isAddingColumnAllowed"
+                  v-e="['c:column:add']"
+                  class="cursor-pointer"
+                  @click.stop="addColumnDropdown = true"
                 >
-                  <td
-                    key="row-index"
-                    class="caption nc-grid-cell pl-5 pr-1"
-                    :data-testid="`cell-Id-${rowIndex}`"
-                    @contextmenu="contextMenuTarget = null"
+                  <a-dropdown
+                    v-model:visible="addColumnDropdown"
+                    :trigger="['click']"
+                    overlay-class-name="nc-dropdown-grid-add-column"
                   >
-                    <div class="items-center flex gap-1 min-w-[60px]">
-                      <div
-                        v-if="!readOnly || !isLocked"
-                        class="nc-row-no text-xs text-gray-500"
-                        :class="{ toggle: !readOnly, hidden: row.rowMeta.selected }"
-                      >
-                        {{ ((paginationData.page ?? 1) - 1) * (paginationData.pageSize ?? 25) + rowIndex + 1 }}
-                      </div>
-                      <div
-                        v-if="!readOnly"
-                        :class="{ hidden: !row.rowMeta.selected, flex: row.rowMeta.selected }"
-                        class="nc-row-expand-and-checkbox"
-                      >
-                        <a-checkbox v-model:checked="row.rowMeta.selected" />
-                      </div>
-                      <span class="flex-1" />
+                    <div class="h-full w-[60px] flex items-center justify-center">
+                      <component :is="iconMap.plus" class="text-sm nc-column-add" />
+                    </div>
 
-                      <div
-                        v-if="!readOnly || hasRole('commenter', true) || hasRole('viewer', true)"
-                        class="nc-expand"
-                        :data-testid="`nc-expand-${rowIndex}`"
-                        :class="{ 'nc-comment': row.rowMeta?.commentCount }"
-                      >
-                        <a-spin
-                          v-if="row.rowMeta.saving"
-                          class="!flex items-center"
-                          :data-testid="`row-save-spinner-${rowIndex}`"
-                        />
-                        <template v-else>
-                          <span
-                            v-if="row.rowMeta?.commentCount"
-                            class="py-1 px-3 rounded-full text-xs cursor-pointer select-none transform hover:(scale-110)"
-                            :style="{ backgroundColor: enumColor.light[row.rowMeta.commentCount % enumColor.light.length] }"
-                            @click="expandForm(row, state)"
-                          >
-                            {{ row.rowMeta.commentCount }}
-                          </span>
-                          <div
-                            v-else
-                            class="cursor-pointer flex items-center border-1 active:ring rounded p-1 hover:(bg-primary bg-opacity-10)"
-                          >
-                            <component
-                              :is="iconMap.expand"
-                              v-e="['c:row-expand']"
-                              class="select-none transform hover:(text-accent scale-120) nc-row-expand"
+                    <template #overlay>
+                      <SmartsheetColumnEditOrAddProvider
+                        v-if="addColumnDropdown"
+                        :preload="preloadColumn"
+                        :column-position="columnOrder"
+                        @submit="closeAddColumnDropdown(true)"
+                        @cancel="closeAddColumnDropdown()"
+                        @click.stop
+                        @keydown.stop
+                      />
+                    </template>
+                  </a-dropdown>
+                </th>
+              </tr>
+            </thead>
+            <tbody ref="tableBodyEl">
+              <LazySmartsheetRow v-for="(row, rowIndex) of data" ref="rowRefs" :key="rowIndex" :row="row">
+                <template #default="{ state }">
+                  <tr
+                    class="nc-grid-row"
+                    :style="{ height: rowHeight ? `${rowHeight * 1.8}rem` : `1.8rem` }"
+                    :data-testid="`grid-row-${rowIndex}`"
+                  >
+                    <td key="row-index" class="caption nc-grid-cell pl-5 pr-1" :data-testid="`cell-Id-${rowIndex}`">
+                      <div class="items-center flex gap-1 min-w-[60px]">
+                        <div
+                          v-if="!readOnly || !isLocked"
+                          class="nc-row-no text-xs text-gray-500"
+                          :class="{ toggle: !readOnly, hidden: row.rowMeta.selected }"
+                        >
+                          {{ ((paginationData.page ?? 1) - 1) * (paginationData.pageSize ?? 25) + rowIndex + 1 }}
+                        </div>
+                        <div
+                          v-if="!readOnly"
+                          :class="{ hidden: !row.rowMeta.selected, flex: row.rowMeta.selected }"
+                          class="nc-row-expand-and-checkbox"
+                        >
+                          <a-checkbox v-model:checked="row.rowMeta.selected" />
+                        </div>
+                        <span class="flex-1" />
+
+                        <div
+                          v-if="!readOnly || hasRole('commenter', true) || hasRole('viewer', true)"
+                          class="nc-expand"
+                          :data-testid="`nc-expand-${rowIndex}`"
+                          :class="{ 'nc-comment': row.rowMeta?.commentCount }"
+                        >
+                          <a-spin
+                            v-if="row.rowMeta.saving"
+                            class="!flex items-center"
+                            :data-testid="`row-save-spinner-${rowIndex}`"
+                          />
+                          <template v-else>
+                            <span
+                              v-if="row.rowMeta?.commentCount"
+                              class="py-1 px-3 rounded-full text-xs cursor-pointer select-none transform hover:(scale-110)"
+                              :style="{ backgroundColor: enumColor.light[row.rowMeta.commentCount % enumColor.light.length] }"
                               @click="expandForm(row, state)"
-                            />
-                          </div>
-                        </template>
+                            >
+                              {{ row.rowMeta.commentCount }}
+                            </span>
+                            <div
+                              v-else
+                              class="cursor-pointer flex items-center border-1 active:ring rounded p-1 hover:(bg-primary bg-opacity-10)"
+                            >
+                              <component
+                                :is="iconMap.expand"
+                                v-e="['c:row-expand']"
+                                class="select-none transform hover:(text-accent scale-120) nc-row-expand"
+                                @click="expandForm(row, state)"
+                              />
+                            </div>
+                          </template>
+                        </div>
                       </div>
-                    </div>
-                  </td>
-                  <SmartsheetTableDataCell
-                    v-for="(columnObj, colIndex) of fields"
-                    :key="columnObj.id"
-                    ref="cellRefs"
-                    class="cell relative nc-grid-cell"
-                    :class="{
-                      'cursor-pointer': hasEditPermission,
-                      'active': hasEditPermission && isCellSelected(rowIndex, colIndex),
-                      'nc-required-cell': isColumnRequiredAndNull(columnObj, row.row),
-                      'align-middle': !rowHeight || rowHeight === 1,
-                      'align-top': rowHeight && rowHeight !== 1,
-                      'filling': isCellInFillRange(rowIndex, colIndex),
-                    }"
-                    :data-testid="`cell-${columnObj.title}-${rowIndex}`"
-                    :data-key="rowIndex + columnObj.id"
-                    :data-col="columnObj.id"
-                    :data-title="columnObj.title"
-                    :data-row-index="rowIndex"
-                    :data-col-index="colIndex"
-                    @mousedown="handleMouseDown($event, rowIndex, colIndex)"
-                    @mouseover="handleMouseOver($event, rowIndex, colIndex)"
-                    @click="handleCellClick($event, rowIndex, colIndex)"
-                    @dblclick="makeEditable(row, columnObj)"
-                    @contextmenu="showContextMenu($event, { row: rowIndex, col: colIndex })"
-                  >
-                    <div v-if="!switchingTab" class="w-full h-full">
-                      <LazySmartsheetVirtualCell
-                        v-if="isVirtualCol(columnObj)"
-                        v-model="row.row[columnObj.title]"
-                        :column="columnObj"
-                        :active="activeCell.col === colIndex && activeCell.row === rowIndex"
-                        :row="row"
-                        :read-only="readOnly"
-                        @navigate="onNavigate"
-                        @save="updateOrSaveRow(row, '', state)"
-                      />
+                    </td>
+                    <SmartsheetTableDataCell
+                      v-for="(columnObj, colIndex) of fields"
+                      :key="columnObj.id"
+                      ref="cellRefs"
+                      class="cell relative nc-grid-cell"
+                      :class="{
+                        'cursor-pointer': hasEditPermission,
+                        'active': hasEditPermission && isCellSelected(rowIndex, colIndex),
+                        'nc-required-cell': isColumnRequiredAndNull(columnObj, row.row),
+                        'align-middle': !rowHeight || rowHeight === 1,
+                        'align-top': rowHeight && rowHeight !== 1,
+                        'filling': isCellInFillRange(rowIndex, colIndex),
+                      }"
+                      :data-testid="`cell-${columnObj.title}-${rowIndex}`"
+                      :data-key="rowIndex + columnObj.id"
+                      :data-col="columnObj.id"
+                      :data-title="columnObj.title"
+                      :data-row-index="rowIndex"
+                      :data-col-index="colIndex"
+                      @mousedown="handleMouseDown($event, rowIndex, colIndex)"
+                      @mouseover="handleMouseOver($event, rowIndex, colIndex)"
+                      @click="handleCellClick($event, rowIndex, colIndex)"
+                      @dblclick="makeEditable(row, columnObj)"
+                      @contextmenu="showContextMenu($event, { row: rowIndex, col: colIndex })"
+                    >
+                      <div v-if="!switchingTab" class="w-full h-full">
+                        <LazySmartsheetVirtualCell
+                          v-if="isVirtualCol(columnObj)"
+                          v-model="row.row[columnObj.title]"
+                          :column="columnObj"
+                          :active="activeCell.col === colIndex && activeCell.row === rowIndex"
+                          :row="row"
+                          :read-only="readOnly"
+                          @navigate="onNavigate"
+                          @save="updateOrSaveRow(row, '', state)"
+                        />
 
-                      <LazySmartsheetCell
-                        v-else
-                        v-model="row.row[columnObj.title]"
-                        :column="columnObj"
-                        :edit-enabled="
-                          !!hasEditPermission && !!editEnabled && activeCell.col === colIndex && activeCell.row === rowIndex
-                        "
-                        :row-index="rowIndex"
-                        :active="activeCell.col === colIndex && activeCell.row === rowIndex"
-                        :read-only="readOnly"
-                        @update:edit-enabled="editEnabled = $event"
-                        @save="updateOrSaveRow(row, columnObj.title, state)"
-                        @navigate="onNavigate"
-                        @cancel="editEnabled = false"
-                      />
-                    </div>
-                  </SmartsheetTableDataCell>
-                </tr>
-              </template>
-            </LazySmartsheetRow>
-
-            <tr
-              v-if="isAddingEmptyRowAllowed"
-              v-e="['c:row:add:grid-bottom']"
-              class="cursor-pointer"
-              @mouseup.stop
-              @click="addEmptyRow()"
-            >
-              <td class="text-left pointer nc-grid-add-new-cell sticky left-0 !z-5 !border-r-0">
-                <div class="px-2 w-full flex items-center text-gray-500">
-                  <component :is="iconMap.plus" class="text-pint-500 text-xs ml-2 text-primary" />
-                </div>
-              </td>
-              <td :colspan="visibleColLength"></td>
-            </tr>
-          </tbody>
-        </table>
+                        <LazySmartsheetCell
+                          v-else
+                          v-model="row.row[columnObj.title]"
+                          :column="columnObj"
+                          :edit-enabled="
+                            !!hasEditPermission && !!editEnabled && activeCell.col === colIndex && activeCell.row === rowIndex
+                          "
+                          :row-index="rowIndex"
+                          :active="activeCell.col === colIndex && activeCell.row === rowIndex"
+                          :read-only="readOnly"
+                          @update:edit-enabled="editEnabled = $event"
+                          @save="updateOrSaveRow(row, columnObj.title, state)"
+                          @navigate="onNavigate"
+                          @cancel="editEnabled = false"
+                        />
+                      </div>
+                    </SmartsheetTableDataCell>
+                  </tr>
+                </template>
+              </LazySmartsheetRow>
+
+              <tr
+                v-if="isAddingEmptyRowAllowed"
+                v-e="['c:row:add:grid-bottom']"
+                class="cursor-pointer relative z-3"
+                @mouseup.stop
+                @click="addEmptyRow()"
+              >
+                <td class="text-left pointer nc-grid-add-new-cell sticky left-0 !z-5 !border-r-0">
+                  <div class="px-2 w-full flex items-center text-gray-500">
+                    <component :is="iconMap.plus" class="text-pint-500 text-xs ml-2 text-primary" />
+                  </div>
+                </td>
+                <td :colspan="visibleColLength"></td>
+              </tr>
+            </tbody>
+          </table>
+
+          <!-- Fill Handle -->
+          <div
+            v-show="showFillHandle"
+            ref="fillHandle"
+            class="nc-fill-handle"
+            :class="
+              (!selectedRange.isEmpty() && selectedRange.end.col !== 0) || (selectedRange.isEmpty() && activeCell.col !== 0)
+                ? 'z-3'
+                : 'z-4'
+            "
+            :style="{ top: `${fillHandleTop}px`, left: `${fillHandleLeft}px`, cursor: 'crosshair' }"
+          />
+        </div>
 
         <template v-if="!isLocked && hasEditPermission" #overlay>
           <a-menu class="shadow !rounded !py-0" @click="contextMenu = false">
@@ -1243,28 +1241,6 @@ watch(
           </a-menu>
         </template>
       </a-dropdown>
-      <div
-        class="table-overlay absolute top-0 left-0 pointer-events-none overflow-hidden"
-        :style="{ height: `${tableHeight}px`, width: `${tableWidth}px` }"
-      >
-        <!-- Fill Handle -->
-        <div
-          v-show="
-            !readOnly &&
-            !isLocked &&
-            !editEnabled &&
-            (!selectedRange.isEmpty() || (activeCell.row !== null && activeCell.col !== null))
-          "
-          ref="fillHandle"
-          class="nc-fill-handle"
-          :class="
-            (!selectedRange.isEmpty() && selectedRange.end.col !== 0) || (selectedRange.isEmpty() && activeCell.col !== 0)
-              ? 'z-3'
-              : 'z-4'
-          "
-          :style="{ top: `${fillHandleTop}px`, left: `${fillHandleLeft}px`, cursor: 'crosshair' }"
-        />
-      </div>
     </div>
 
     <div

From 9c0daaffe519a2c391b184623e657f280e03207c Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Tue, 27 Jun 2023 13:21:26 +0300
Subject: [PATCH 162/208] fix: click outside bug

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nc-gui/components/smartsheet/Grid.vue      | 6 +++++-
 packages/nc-gui/composables/useMultiSelect/index.ts | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index a73fc6806e..973eb9c8a0 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -211,6 +211,7 @@ const {
   makeActive,
   selectedRange,
   isCellInFillRange,
+  isFillMode,
 } = useMultiSelect(
   meta,
   fields,
@@ -668,10 +669,13 @@ onClickOutside(tableBodyEl, (e) => {
 
   if (editEnabled && (isVirtualCol(activeCol) || activeCol.uidt === UITypes.JSON)) return
 
+  // skip if fill mode is active
+  if (isFillMode.value) return
+
   // ignore unselecting if clicked inside or on the picker(Date, Time, DateTime, Year)
   // or single/multi select options
   const activePickerOrDropdownEl = document.querySelector(
-    '.nc-picker-datetime.active,.nc-dropdown-single-select-cell.active,.nc-dropdown-multi-select-cell.active,.nc-picker-date.active,.nc-picker-year.active,.nc-picker-time.active,.nc-fill-handle',
+    '.nc-picker-datetime.active,.nc-dropdown-single-select-cell.active,.nc-dropdown-multi-select-cell.active,.nc-picker-date.active,.nc-picker-year.active,.nc-picker-time.active',
   )
   if (
     e.target &&
diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index 2b1e5f30f8..c878dbf630 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -903,8 +903,8 @@ export function useMultiSelect(
     resetSelectedRange,
     selectedRange,
     makeActive,
-    fillHandleMouseDown,
     isCellInFillRange,
     isMouseDown,
+    isFillMode,
   }
 }

From 3a41d54d5dbc5b559718e2f3f2be67bc0d5586ea Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Tue, 27 Jun 2023 18:00:44 +0300
Subject: [PATCH 163/208] fix: refresh fill handle on active cell change

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

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 973eb9c8a0..018f533d88 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -907,13 +907,14 @@ const showFillHandle = computed(
     !isLocked.value &&
     !editEnabled &&
     (!selectedRange.isEmpty() || (activeCell.row !== null && activeCell.col !== null)) &&
-    !data.value[selectedRange.end.row ?? activeCell.row]?.rowMeta?.new,
+    !data.value[(isNaN(selectedRange.end.row) ? activeCell.row : selectedRange.end.row) ?? -1]?.rowMeta?.new,
 )
 
 const refreshFillHandle = () => {
   const cellRef = cellRefs.value.find(
     (cell) =>
-      cell.el.dataset.rowIndex === String(selectedRange.end.row) && cell.el.dataset.colIndex === String(selectedRange.end.col),
+      cell.el.dataset.rowIndex === String(isNaN(selectedRange.end.row) ? activeCell.row : selectedRange.end.row) &&
+      cell.el.dataset.colIndex === String(isNaN(selectedRange.end.col) ? activeCell.col : selectedRange.end.col),
   )
   if (cellRef) {
     const cellRect = useElementBounding(cellRef.el)
@@ -923,11 +924,14 @@ const refreshFillHandle = () => {
   }
 }
 
-watch([() => selectedRange.end.row, () => selectedRange.end.col], (n, o) => {
-  if (n !== o) {
-    refreshFillHandle()
-  }
-})
+watch(
+  [() => selectedRange.end.row, () => selectedRange.end.col, () => activeCell.row, () => activeCell.col],
+  ([sr, sc, ar, ac], [osr, osc, oar, oac]) => {
+    if (sr !== osr || sc !== osc || ar !== oar || ac !== oac) {
+      refreshFillHandle()
+    }
+  },
+)
 
 useEventListener(gridWrapper, 'scroll', () => {
   refreshFillHandle()

From 7ae97d551fb920060c36392e2e5128893b45d7aa Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Tue, 27 Jun 2023 18:02:48 +0300
Subject: [PATCH 164/208] feat: avoid click outside event on scrollbar click

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

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 018f533d88..d1b2c0af8d 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -99,6 +99,8 @@ const contextMenu = computed({
 })
 const contextMenuClosing = ref(false)
 
+const scrolling = ref(false)
+
 const bulkUpdateDlg = ref(false)
 
 const routeQuery = $computed(() => route.query as Record<string, string>)
@@ -660,6 +662,11 @@ const smartTable = ref(null)
 
 /** On clicking outside of table reset active cell  */
 onClickOutside(tableBodyEl, (e) => {
+  // do nothing if mousedown on the scrollbar (scrolling)
+  if (scrolling.value) {
+    return
+  }
+
   // do nothing if context menu was open
   if (contextMenu.value) return
 
@@ -936,6 +943,19 @@ watch(
 useEventListener(gridWrapper, 'scroll', () => {
   refreshFillHandle()
 })
+
+useEventListener(document, 'mousedown', (e) => {
+  if (e.offsetX > (e.target as HTMLElement)?.clientWidth || e.offsetY > (e.target as HTMLElement)?.clientHeight) {
+    scrolling.value = true
+  }
+})
+
+useEventListener(document, 'mouseup', () => {
+  // wait for click event to finish before setting scrolling to false
+  setTimeout(() => {
+    scrolling.value = false
+  }, 100)
+})
 </script>
 
 <template>

From e4536124d87f52b2c4d12812c6298adc28a9058e Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Tue, 27 Jun 2023 19:14:56 +0300
Subject: [PATCH 165/208] feat: select after filling

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../nc-gui/components/smartsheet/Grid.vue     |  8 ++++++++
 .../composables/useMultiSelect/index.ts       | 20 +++++++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index d1b2c0af8d..82c8cd8c00 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -1113,6 +1113,10 @@ useEventListener(document, 'mouseup', () => {
                       :class="{
                         'cursor-pointer': hasEditPermission,
                         'active': hasEditPermission && isCellSelected(rowIndex, colIndex),
+                        'active-cell':
+                          hasEditPermission &&
+                          ((activeCell.row === rowIndex && activeCell.col === colIndex) ||
+                            (selectedRange._start?.row === rowIndex && selectedRange._start?.col === colIndex)),
                         'nc-required-cell': isColumnRequiredAndNull(columnObj, row.row),
                         'align-middle': !rowHeight || rowHeight === 1,
                         'align-top': rowHeight && rowHeight !== 1,
@@ -1375,6 +1379,10 @@ useEventListener(document, 'mouseup', () => {
 
   // todo: replace with css variable
   td.active::after {
+    @apply text-primary border-current bg-primary bg-opacity-5;
+  }
+
+  td.active-cell::after {
     @apply border-1 border-solid text-primary border-current bg-primary bg-opacity-5;
   }
 
diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index c878dbf630..942396cc98 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -232,7 +232,7 @@ export function useMultiSelect(
       return true
     }
 
-    if (selectedRange.start === null || selectedRange.end === null) {
+    if (selectedRange._start === null || selectedRange._end === null) {
       return false
     }
 
@@ -245,7 +245,7 @@ export function useMultiSelect(
   }
 
   function isCellInFillRange(row: number, col: number) {
-    if (fillRange.start === null || fillRange.end === null) {
+    if (fillRange._start === null || fillRange._end === null) {
       return false
     }
 
@@ -300,10 +300,12 @@ export function useMultiSelect(
     if (isFillMode.value) {
       const rw = unref(data)[row]
 
+      if (!selectedRange._start || !selectedRange._end) return
+
       // fill is not supported for new rows yet
       if (rw.rowMeta.new) return
 
-      fillRange.endRange({ row, col: selectedRange.end.col })
+      fillRange.endRange({ row, col: selectedRange._end.col })
       scrollToCell?.(row, col)
       return
     }
@@ -373,7 +375,9 @@ export function useMultiSelect(
 
       if (fillRange._start === null || fillRange._end === null) return
 
-      if (selectedRange.start !== null && selectedRange.end !== null) {
+      if (selectedRange._start !== null && selectedRange._end !== null) {
+        const tempActiveCell = { row: selectedRange._start.row, col: selectedRange._start.col }
+
         const cprows = unref(data).slice(selectedRange.start.row, selectedRange.end.row + 1) // slice the selected rows for copy
         const cpcols = unref(fields).slice(selectedRange.start.col, selectedRange.end.col + 1) // slice the selected cols for copy
 
@@ -436,6 +440,10 @@ export function useMultiSelect(
         }
 
         bulkUpdateRows?.(rowsToPaste, propsToPaste).then(() => {
+          if (fillRange._start === null || fillRange._end === null) return
+          selectedRange.startRange(tempActiveCell)
+          selectedRange.endRange(fillRange._end)
+          makeActive(tempActiveCell.row, tempActiveCell.col)
           fillRange.clear()
         })
       } else {
@@ -878,8 +886,8 @@ export function useMultiSelect(
     isFillMode.value = true
 
     if (selectedRange._start && selectedRange._end) {
-      fillRange.startRange({ row: selectedRange._start?.row, col: selectedRange.start.col })
-      fillRange.endRange({ row: selectedRange._end?.row, col: selectedRange.end.col })
+      fillRange.startRange({ row: selectedRange._start?.row, col: selectedRange._start.col })
+      fillRange.endRange({ row: selectedRange._end?.row, col: selectedRange._end.col })
     }
 
     event.preventDefault()

From cb06938c3657680c5df1a9593ddd2c8caa791491 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 15 Jun 2023 14:51:07 +0530
Subject: [PATCH 166/208] test: attachment cell

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/pages/Dashboard/common/Cell/AttachmentCell.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/playwright/pages/Dashboard/common/Cell/AttachmentCell.ts b/tests/playwright/pages/Dashboard/common/Cell/AttachmentCell.ts
index bb0b8ccb1c..6f2a73d29b 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/AttachmentCell.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/AttachmentCell.ts
@@ -23,6 +23,7 @@ export class AttachmentCellPageObject extends BasePage {
   //
   async addFile({ index, columnHeader, filePath }: { index?: number; columnHeader: string; filePath: string[] }) {
     await this.get({ index, columnHeader }).scrollIntoViewIfNeeded();
+    await this.get({ index, columnHeader }).click({ position: { x: 1, y: 1 } });
     const attachFileAction = this.get({ index, columnHeader })
       .locator('[data-testid="attachment-cell-file-picker-button"]')
       .click();

From b48b3e332e65cc4d5da346097ee799ebae8d64c3 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Wed, 28 Jun 2023 12:55:06 +0530
Subject: [PATCH 167/208] test: fill handle (wip)

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../pages/Dashboard/common/Cell/RatingCell.ts |   1 +
 .../tests/db/verticalFillHandle.spec.ts       | 305 ++++++++++++++++++
 2 files changed, 306 insertions(+)
 create mode 100644 tests/playwright/tests/db/verticalFillHandle.spec.ts

diff --git a/tests/playwright/pages/Dashboard/common/Cell/RatingCell.ts b/tests/playwright/pages/Dashboard/common/Cell/RatingCell.ts
index 0b9b059b13..be0e3af7af 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/RatingCell.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/RatingCell.ts
@@ -15,6 +15,7 @@ export class RatingCellPageObject extends BasePage {
   }
 
   async select({ index, columnHeader, rating }: { index?: number; columnHeader: string; rating: number }) {
+    await this.get({ index, columnHeader }).scrollIntoViewIfNeeded();
     await this.waitForResponse({
       uiAction: () => this.get({ index, columnHeader }).locator('.ant-rate-star > div').nth(rating).click(),
       httpMethodsToMatch: ['POST', 'PATCH'],
diff --git a/tests/playwright/tests/db/verticalFillHandle.spec.ts b/tests/playwright/tests/db/verticalFillHandle.spec.ts
new file mode 100644
index 0000000000..9fdc1d9a9b
--- /dev/null
+++ b/tests/playwright/tests/db/verticalFillHandle.spec.ts
@@ -0,0 +1,305 @@
+import { expect, test } from '@playwright/test';
+import setup from '../../setup';
+import { DashboardPage } from '../../pages/Dashboard';
+import { Api } from 'nocodb-sdk';
+import { createDemoTable } from '../../setup/demoTable';
+import { BulkUpdatePage } from '../../pages/Dashboard/BulkUpdate';
+
+let dashboard: DashboardPage;
+async function dragDrop({ firstColumn, lastColumn }: { firstColumn: string; lastColumn: string }) {
+  await dashboard.grid.cell.get({ index: 0, columnHeader: firstColumn }).click();
+  await dashboard.rootPage.keyboard.press(
+    (await dashboard.grid.isMacOs()) ? 'Meta+Shift+ArrowRight' : 'Control+Shift+ArrowRight'
+  );
+
+  // get fill handle locator
+  const src = await dashboard.rootPage.locator(`.nc-fill-handle`);
+  const dst = await dashboard.grid.cell.get({ index: 3, columnHeader: lastColumn });
+
+  // drag and drop
+  await src.dragTo(dst);
+}
+
+test.describe.skip('Bulk update', () => {
+  let context: any;
+  let api: Api<any>;
+  let table;
+
+  test.beforeEach(async ({ page }) => {
+    context = await setup({ page, isEmptyProject: true });
+    dashboard = new DashboardPage(page, context.project);
+
+    api = new Api({
+      baseURL: `http://localhost:8080/`,
+      headers: {
+        'xc-auth': context.token,
+      },
+    });
+
+    table = await createDemoTable({ context, type: 'textBased', recordCnt: 10 });
+    await page.reload();
+
+    await dashboard.treeView.openTable({ title: 'textBased' });
+  });
+
+  test('Text based', async () => {
+    const fields = [
+      { title: 'SingleLineText', value: 'Afghanistan', type: 'text' },
+      { title: 'Email', value: 'jbutt@gmail.com', type: 'text' },
+      { title: 'PhoneNumber', value: '1-541-754-3010', type: 'text' },
+      { title: 'URL', value: 'https://www.google.com', type: 'text' },
+      { title: 'MultiLineText', value: 'Aberdeen, United Kingdom', type: 'longText' },
+    ];
+
+    await dragDrop({ firstColumn: 'SingleLineText', lastColumn: 'URL' });
+
+    // verify data on grid (verifying just two rows)
+    for (let i = 0; i < fields.length; i++) {
+      for (let j = 0; j < 4; j++) {
+        await dashboard.grid.cell.verify({ index: j, columnHeader: fields[i].title, value: fields[i].value });
+      }
+    }
+
+    // verify api response
+    const updatedRecords = (await api.dbTableRow.list('noco', context.project.id, table.id, { limit: 4 })).list;
+    for (let i = 0; i < updatedRecords.length; i++) {
+      for (let j = 0; j < fields.length; j++) {
+        expect(updatedRecords[i][fields[j].title]).toEqual(fields[j].value);
+      }
+    }
+  });
+});
+
+test.describe.skip('Bulk update', () => {
+  let context: any;
+  let api: Api<any>;
+  let table;
+
+  test.beforeEach(async ({ page }) => {
+    context = await setup({ page, isEmptyProject: true });
+    dashboard = new DashboardPage(page, context.project);
+
+    api = new Api({
+      baseURL: `http://localhost:8080/`,
+      headers: {
+        'xc-auth': context.token,
+      },
+    });
+
+    table = await createDemoTable({ context, type: 'numberBased', recordCnt: 10 });
+    await page.reload();
+
+    await dashboard.treeView.openTable({ title: 'numberBased' });
+  });
+
+  test('Number based', async () => {
+    const fields = [
+      { title: 'Number', value: '33', type: 'text' },
+      { title: 'Decimal', value: '33.3', type: 'text' },
+      { title: 'Currency', value: '33.30', type: 'text' },
+      { title: 'Percent', value: '33', type: 'text' },
+      { title: 'Duration', value: '00:01', type: 'text' },
+      { title: 'Rating', value: '3', type: 'rating' },
+      { title: 'Year', value: '2023', type: 'year' },
+      // { title: 'Time', value: '10:10', type: 'time' },
+    ];
+
+    // set rating for first record
+    await dashboard.grid.cell.rating.select({ index: 0, columnHeader: 'Rating', rating: 2 });
+
+    await dragDrop({ firstColumn: 'Number', lastColumn: 'Year' });
+
+    // verify data on grid
+    for (let i = 0; i < fields.length; i++) {
+      for (let j = 0; j < 4; j++) {
+        if (fields[i].type === 'rating') {
+          await dashboard.grid.cell.rating.verify({
+            index: j,
+            columnHeader: fields[i].title,
+            rating: +fields[i].value,
+          });
+        } else if (fields[i].type === 'year') {
+          await dashboard.grid.cell.year.verify({ index: j, columnHeader: fields[i].title, value: +fields[i].value });
+        } else if (fields[i].type === 'time') {
+          await dashboard.grid.cell.time.verify({ index: j, columnHeader: fields[i].title, value: fields[i].value });
+        } else {
+          await dashboard.grid.cell.verify({ index: j, columnHeader: fields[i].title, value: fields[i].value });
+        }
+      }
+    }
+
+    // verify api response
+    // duration in seconds
+    const APIResponse = [33, 33.3, 33.3, 33, 60, 3, 2023, '10:10:00'];
+    const updatedRecords = (await api.dbTableRow.list('noco', context.project.id, table.id, { limit: 4 })).list;
+    for (let i = 0; i < updatedRecords.length; i++) {
+      for (let j = 0; j < fields.length; j++) {
+        if (fields[j].title === 'Time') {
+          expect(updatedRecords[i][fields[j].title]).toContain(APIResponse[j]);
+        } else {
+          expect(+updatedRecords[i][fields[j].title]).toEqual(APIResponse[j]);
+        }
+      }
+    }
+  });
+});
+
+test.describe.skip('Bulk update', () => {
+  let context: any;
+  let api: Api<any>;
+  let table;
+
+  test.beforeEach(async ({ page }) => {
+    context = await setup({ page, isEmptyProject: true });
+    dashboard = new DashboardPage(page, context.project);
+
+    api = new Api({
+      baseURL: `http://localhost:8080/`,
+      headers: {
+        'xc-auth': context.token,
+      },
+    });
+
+    table = await createDemoTable({ context, type: 'selectBased', recordCnt: 10 });
+    await page.reload();
+
+    await dashboard.treeView.openTable({ title: 'selectBased' });
+  });
+
+  test('Select based', async () => {
+    const fields = [
+      { title: 'SingleSelect', value: 'jan', type: 'singleSelect' },
+      { title: 'MultiSelect', value: 'jan,feb,mar', type: 'multiSelect' },
+    ];
+
+    await dragDrop({ firstColumn: 'SingleSelect', lastColumn: 'MultiSelect' });
+
+    // verify data on grid
+    const displayOptions = ['jan', 'feb', 'mar'];
+    for (let i = 0; i < fields.length; i++) {
+      for (let j = 0; j < 4; j++) {
+        if (fields[i].type === 'singleSelect') {
+          await dashboard.grid.cell.selectOption.verify({
+            index: j,
+            columnHeader: fields[i].title,
+            option: fields[i].value,
+          });
+        } else {
+          await dashboard.grid.cell.selectOption.verifyOptions({
+            index: j,
+            columnHeader: fields[i].title,
+            options: displayOptions,
+          });
+        }
+      }
+    }
+
+    // verify api response
+    const updatedRecords = (await api.dbTableRow.list('noco', context.project.id, table.id, { limit: 4 })).list;
+    for (let i = 0; i < updatedRecords.length; i++) {
+      for (let j = 0; j < fields.length; j++) {
+        expect(updatedRecords[i][fields[j].title]).toContain(fields[j].value);
+      }
+    }
+  });
+});
+
+test.describe.skip('Bulk update', () => {
+  let context: any;
+  let api: Api<any>;
+  let table;
+
+  test.beforeEach(async ({ page }) => {
+    context = await setup({ page, isEmptyProject: true });
+    dashboard = new DashboardPage(page, context.project);
+
+    api = new Api({
+      baseURL: `http://localhost:8080/`,
+      headers: {
+        'xc-auth': context.token,
+      },
+    });
+
+    table = await createDemoTable({ context, type: 'miscellaneous', recordCnt: 50 });
+    await page.reload();
+
+    await dashboard.treeView.openTable({ title: 'miscellaneous' });
+  });
+
+  test('Miscellaneous (Checkbox, attachment)', async () => {
+    const fields = [
+      { title: 'Checkbox', value: 'true', type: 'checkbox' },
+      { title: 'Attachment', value: `${process.cwd()}/fixtures/sampleFiles/1.json`, type: 'attachment' },
+    ];
+
+    // verify data on grid
+    for (let i = 0; i < fields.length; i++) {
+      if (fields[i].type === 'checkbox') {
+        await dashboard.grid.cell.checkbox.verifyChecked({
+          index: 5,
+          columnHeader: fields[i].title,
+        });
+      } else {
+        await dashboard.grid.cell.attachment.verifyFileCount({
+          index: 5,
+          columnHeader: fields[i].title,
+          count: 1,
+        });
+      }
+    }
+
+    // verify api response
+    const updatedRecords = (await api.dbTableRow.list('noco', context.project.id, table.id, { limit: 50 })).list;
+    for (let i = 0; i < updatedRecords.length; i++) {
+      for (let j = 0; j < fields.length; j++) {
+        expect(+updatedRecords[i]['Checkbox']).toBe(1);
+        expect(updatedRecords[i]['Attachment'][0].title).toBe('1.json');
+        expect(updatedRecords[i]['Attachment'][0].mimetype).toBe('application/json');
+      }
+    }
+  });
+});
+
+test.describe.skip('Bulk update', () => {
+  let context: any;
+  let api: Api<any>;
+  let table;
+
+  test.beforeEach(async ({ page }) => {
+    context = await setup({ page, isEmptyProject: true });
+    dashboard = new DashboardPage(page, context.project);
+
+    api = new Api({
+      baseURL: `http://localhost:8080/`,
+      headers: {
+        'xc-auth': context.token,
+      },
+    });
+
+    table = await createDemoTable({ context, type: 'dateTimeBased', recordCnt: 50 });
+    await page.reload();
+
+    await dashboard.treeView.openTable({ title: 'dateTimeBased' });
+  });
+
+  test('Date Time Based', async () => {
+    const fields = [{ title: 'Date', value: '2024-08-04', type: 'date' }];
+
+    // verify data on grid
+    for (let i = 0; i < fields.length; i++) {
+      await dashboard.grid.cell.date.verify({
+        index: 5,
+        columnHeader: fields[i].title,
+        date: fields[i].value,
+      });
+    }
+
+    // verify api response
+    const updatedRecords = (await api.dbTableRow.list('noco', context.project.id, table.id, { limit: 50 })).list;
+    for (let i = 0; i < updatedRecords.length; i++) {
+      for (let j = 0; j < fields.length; j++) {
+        expect(updatedRecords[i]['Date']).toBe(fields[j].value);
+      }
+    }
+  });
+});

From 98cca2d377eaeb2b4a2ecfdcf00b80790f83a5f7 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Wed, 28 Jun 2023 15:37:04 +0530
Subject: [PATCH 168/208] test: code realign (WIP)

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../tests/db/verticalFillHandle.spec.ts       | 126 +++++-------------
 1 file changed, 32 insertions(+), 94 deletions(-)

diff --git a/tests/playwright/tests/db/verticalFillHandle.spec.ts b/tests/playwright/tests/db/verticalFillHandle.spec.ts
index 9fdc1d9a9b..96d135bef1 100644
--- a/tests/playwright/tests/db/verticalFillHandle.spec.ts
+++ b/tests/playwright/tests/db/verticalFillHandle.spec.ts
@@ -6,6 +6,9 @@ import { createDemoTable } from '../../setup/demoTable';
 import { BulkUpdatePage } from '../../pages/Dashboard/BulkUpdate';
 
 let dashboard: DashboardPage;
+let context: any;
+let api: Api<any>;
+let table;
 async function dragDrop({ firstColumn, lastColumn }: { firstColumn: string; lastColumn: string }) {
   await dashboard.grid.cell.get({ index: 0, columnHeader: firstColumn }).click();
   await dashboard.rootPage.keyboard.press(
@@ -19,27 +22,26 @@ async function dragDrop({ firstColumn, lastColumn }: { firstColumn: string; last
   // drag and drop
   await src.dragTo(dst);
 }
+async function beforeEachInit({ page, tableType }: { page: any; tableType: string }) {
+  context = await setup({ page, isEmptyProject: true });
+  dashboard = new DashboardPage(page, context.project);
+
+  api = new Api({
+    baseURL: `http://localhost:8080/`,
+    headers: {
+      'xc-auth': context.token,
+    },
+  });
 
-test.describe.skip('Bulk update', () => {
-  let context: any;
-  let api: Api<any>;
-  let table;
-
-  test.beforeEach(async ({ page }) => {
-    context = await setup({ page, isEmptyProject: true });
-    dashboard = new DashboardPage(page, context.project);
-
-    api = new Api({
-      baseURL: `http://localhost:8080/`,
-      headers: {
-        'xc-auth': context.token,
-      },
-    });
+  table = await createDemoTable({ context, type: tableType, recordCnt: 10 });
+  await page.reload();
 
-    table = await createDemoTable({ context, type: 'textBased', recordCnt: 10 });
-    await page.reload();
+  await dashboard.treeView.openTable({ title: tableType });
+}
 
-    await dashboard.treeView.openTable({ title: 'textBased' });
+test.describe('Fill Handle', () => {
+  test.beforeEach(async ({ page }) => {
+    await beforeEachInit({ page, tableType: 'textBased' });
   });
 
   test('Text based', async () => {
@@ -70,26 +72,9 @@ test.describe.skip('Bulk update', () => {
   });
 });
 
-test.describe.skip('Bulk update', () => {
-  let context: any;
-  let api: Api<any>;
-  let table;
-
+test.describe('Fill Handle', () => {
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page, isEmptyProject: true });
-    dashboard = new DashboardPage(page, context.project);
-
-    api = new Api({
-      baseURL: `http://localhost:8080/`,
-      headers: {
-        'xc-auth': context.token,
-      },
-    });
-
-    table = await createDemoTable({ context, type: 'numberBased', recordCnt: 10 });
-    await page.reload();
-
-    await dashboard.treeView.openTable({ title: 'numberBased' });
+    await beforeEachInit({ page, tableType: 'numberBased' });
   });
 
   test('Number based', async () => {
@@ -144,26 +129,9 @@ test.describe.skip('Bulk update', () => {
   });
 });
 
-test.describe.skip('Bulk update', () => {
-  let context: any;
-  let api: Api<any>;
-  let table;
-
+test.describe('Fill Handle', () => {
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page, isEmptyProject: true });
-    dashboard = new DashboardPage(page, context.project);
-
-    api = new Api({
-      baseURL: `http://localhost:8080/`,
-      headers: {
-        'xc-auth': context.token,
-      },
-    });
-
-    table = await createDemoTable({ context, type: 'selectBased', recordCnt: 10 });
-    await page.reload();
-
-    await dashboard.treeView.openTable({ title: 'selectBased' });
+    await beforeEachInit({ page, tableType: 'selectBased' });
   });
 
   test('Select based', async () => {
@@ -204,26 +172,9 @@ test.describe.skip('Bulk update', () => {
   });
 });
 
-test.describe.skip('Bulk update', () => {
-  let context: any;
-  let api: Api<any>;
-  let table;
-
+test.describe.only('Fill Handle', () => {
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page, isEmptyProject: true });
-    dashboard = new DashboardPage(page, context.project);
-
-    api = new Api({
-      baseURL: `http://localhost:8080/`,
-      headers: {
-        'xc-auth': context.token,
-      },
-    });
-
-    table = await createDemoTable({ context, type: 'miscellaneous', recordCnt: 50 });
-    await page.reload();
-
-    await dashboard.treeView.openTable({ title: 'miscellaneous' });
+    await beforeEachInit({ page, tableType: 'miscellaneous' });
   });
 
   test('Miscellaneous (Checkbox, attachment)', async () => {
@@ -232,6 +183,8 @@ test.describe.skip('Bulk update', () => {
       { title: 'Attachment', value: `${process.cwd()}/fixtures/sampleFiles/1.json`, type: 'attachment' },
     ];
 
+    await dragDrop({ firstColumn: 'Checkbox', lastColumn: 'Attachment' });
+
     // verify data on grid
     for (let i = 0; i < fields.length; i++) {
       if (fields[i].type === 'checkbox') {
@@ -260,31 +213,16 @@ test.describe.skip('Bulk update', () => {
   });
 });
 
-test.describe.skip('Bulk update', () => {
-  let context: any;
-  let api: Api<any>;
-  let table;
-
+test.describe('Fill Handle', () => {
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page, isEmptyProject: true });
-    dashboard = new DashboardPage(page, context.project);
-
-    api = new Api({
-      baseURL: `http://localhost:8080/`,
-      headers: {
-        'xc-auth': context.token,
-      },
-    });
-
-    table = await createDemoTable({ context, type: 'dateTimeBased', recordCnt: 50 });
-    await page.reload();
-
-    await dashboard.treeView.openTable({ title: 'dateTimeBased' });
+    await beforeEachInit({ page, tableType: 'dateTimeBased' });
   });
 
   test('Date Time Based', async () => {
     const fields = [{ title: 'Date', value: '2024-08-04', type: 'date' }];
 
+    await dragDrop({ firstColumn: 'Date', lastColumn: 'Date' });
+
     // verify data on grid
     for (let i = 0; i < fields.length; i++) {
       await dashboard.grid.cell.date.verify({

From 1b88821545143a3479e186e6eb38d96928cbb9b3 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Wed, 28 Jun 2023 19:06:42 +0530
Subject: [PATCH 169/208] test: fill handle for date, checkbox, attachments

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../tests/db/verticalFillHandle.spec.ts       | 52 ++++++++++++-------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/tests/playwright/tests/db/verticalFillHandle.spec.ts b/tests/playwright/tests/db/verticalFillHandle.spec.ts
index 96d135bef1..30aacfb203 100644
--- a/tests/playwright/tests/db/verticalFillHandle.spec.ts
+++ b/tests/playwright/tests/db/verticalFillHandle.spec.ts
@@ -129,7 +129,7 @@ test.describe('Fill Handle', () => {
   });
 });
 
-test.describe('Fill Handle', () => {
+test.describe.skip('Fill Handle', () => {
   test.beforeEach(async ({ page }) => {
     await beforeEachInit({ page, tableType: 'selectBased' });
   });
@@ -172,7 +172,7 @@ test.describe('Fill Handle', () => {
   });
 });
 
-test.describe.only('Fill Handle', () => {
+test.describe('Fill Handle', () => {
   test.beforeEach(async ({ page }) => {
     await beforeEachInit({ page, tableType: 'miscellaneous' });
   });
@@ -183,26 +183,35 @@ test.describe.only('Fill Handle', () => {
       { title: 'Attachment', value: `${process.cwd()}/fixtures/sampleFiles/1.json`, type: 'attachment' },
     ];
 
+    await dashboard.grid.cell.checkbox.click({ index: 0, columnHeader: 'Checkbox' });
+    const filepath = [`${process.cwd()}/fixtures/sampleFiles/1.json`];
+    await dashboard.grid.cell.attachment.addFile({
+      index: 0,
+      columnHeader: 'Attachment',
+      filePath: filepath,
+    });
     await dragDrop({ firstColumn: 'Checkbox', lastColumn: 'Attachment' });
 
     // verify data on grid
     for (let i = 0; i < fields.length; i++) {
-      if (fields[i].type === 'checkbox') {
-        await dashboard.grid.cell.checkbox.verifyChecked({
-          index: 5,
-          columnHeader: fields[i].title,
-        });
-      } else {
-        await dashboard.grid.cell.attachment.verifyFileCount({
-          index: 5,
-          columnHeader: fields[i].title,
-          count: 1,
-        });
+      for (let j = 0; j < 4; j++) {
+        if (fields[i].type === 'checkbox') {
+          await dashboard.grid.cell.checkbox.verifyChecked({
+            index: j,
+            columnHeader: fields[i].title,
+          });
+        } else {
+          await dashboard.grid.cell.attachment.verifyFileCount({
+            index: j,
+            columnHeader: fields[i].title,
+            count: 1,
+          });
+        }
       }
     }
 
     // verify api response
-    const updatedRecords = (await api.dbTableRow.list('noco', context.project.id, table.id, { limit: 50 })).list;
+    const updatedRecords = (await api.dbTableRow.list('noco', context.project.id, table.id, { limit: 4 })).list;
     for (let i = 0; i < updatedRecords.length; i++) {
       for (let j = 0; j < fields.length; j++) {
         expect(+updatedRecords[i]['Checkbox']).toBe(1);
@@ -219,17 +228,20 @@ test.describe('Fill Handle', () => {
   });
 
   test('Date Time Based', async () => {
-    const fields = [{ title: 'Date', value: '2024-08-04', type: 'date' }];
+    const row0_date = await api.dbTableRow.read('noco', context.project.id, table.id, 1);
+    const fields = [{ title: 'Date', value: row0_date['Date'], type: 'date' }];
 
     await dragDrop({ firstColumn: 'Date', lastColumn: 'Date' });
 
     // verify data on grid
     for (let i = 0; i < fields.length; i++) {
-      await dashboard.grid.cell.date.verify({
-        index: 5,
-        columnHeader: fields[i].title,
-        date: fields[i].value,
-      });
+      for (let j = 0; j < 4; j++) {
+        await dashboard.grid.cell.date.verify({
+          index: j,
+          columnHeader: fields[i].title,
+          date: fields[i].value,
+        });
+      }
     }
 
     // verify api response

From 4ed73fd79503adabbe0cf4659b2ed555491fd307 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 28 Jun 2023 19:39:44 +0530
Subject: [PATCH 170/208] chore: update sdk path

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/package-lock.json     | 52 +++++++++++----------------
 packages/nc-gui/package.json          |  2 +-
 packages/nocodb-sdk/package-lock.json |  4 +--
 packages/nocodb/package-lock.json     | 30 +++++++++-------
 packages/nocodb/package.json          |  4 +--
 5 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/packages/nc-gui/package-lock.json b/packages/nc-gui/package-lock.json
index 28cfe44d31..5dc0d7dad2 100644
--- a/packages/nc-gui/package-lock.json
+++ b/packages/nc-gui/package-lock.json
@@ -30,7 +30,7 @@
         "leaflet.markercluster": "^1.5.3",
         "locale-codes": "^1.3.1",
         "monaco-editor": "^0.33.0",
-        "nocodb-sdk": "0.109.3",
+        "nocodb-sdk": "file:../nocodb-sdk",
         "papaparse": "^5.3.2",
         "pinia": "^2.0.33",
         "qrcode": "^1.5.1",
@@ -111,7 +111,6 @@
     },
     "../nocodb-sdk": {
       "version": "0.109.3",
-      "extraneous": true,
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "axios": "^0.21.1",
@@ -8720,6 +8719,7 @@
       "version": "1.15.1",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
       "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
+      "devOptional": true,
       "funding": [
         {
           "type": "individual",
@@ -12238,21 +12238,8 @@
       }
     },
     "node_modules/nocodb-sdk": {
-      "version": "0.109.3",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.109.3.tgz",
-      "integrity": "sha512-B7s1dyTdsH0u1J/t2ZS7O5glitXnLXwT4A9lNO6349aPyBXIb1S7TTkmG0WzNylp+0mgNbLrCuVT3L3TFS9IfQ==",
-      "dependencies": {
-        "axios": "^0.21.1",
-        "jsep": "^1.3.6"
-      }
-    },
-    "node_modules/nocodb-sdk/node_modules/axios": {
-      "version": "0.21.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
-      "dependencies": {
-        "follow-redirects": "^1.14.0"
-      }
+      "resolved": "../nocodb-sdk",
+      "link": true
     },
     "node_modules/node-abi": {
       "version": "3.23.0",
@@ -24729,7 +24716,8 @@
     "follow-redirects": {
       "version": "1.15.1",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
-      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
+      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
+      "devOptional": true
     },
     "form-data": {
       "version": "4.0.0",
@@ -27279,22 +27267,22 @@
       }
     },
     "nocodb-sdk": {
-      "version": "0.109.3",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.109.3.tgz",
-      "integrity": "sha512-B7s1dyTdsH0u1J/t2ZS7O5glitXnLXwT4A9lNO6349aPyBXIb1S7TTkmG0WzNylp+0mgNbLrCuVT3L3TFS9IfQ==",
+      "version": "file:../nocodb-sdk",
       "requires": {
+        "@typescript-eslint/eslint-plugin": "^4.0.1",
+        "@typescript-eslint/parser": "^4.0.1",
         "axios": "^0.21.1",
-        "jsep": "^1.3.6"
-      },
-      "dependencies": {
-        "axios": {
-          "version": "0.21.4",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-          "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
-          "requires": {
-            "follow-redirects": "^1.14.0"
-          }
-        }
+        "cspell": "^4.1.0",
+        "eslint": "^7.8.0",
+        "eslint-config-prettier": "^6.11.0",
+        "eslint-plugin-eslint-comments": "^3.2.0",
+        "eslint-plugin-functional": "^3.0.2",
+        "eslint-plugin-import": "^2.22.0",
+        "eslint-plugin-prettier": "^4.0.0",
+        "jsep": "^1.3.6",
+        "npm-run-all": "^4.1.5",
+        "prettier": "^2.1.1",
+        "typescript": "^4.0.2"
       }
     },
     "node-abi": {
diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
index 0265e81dd6..44f0905daf 100644
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@@ -54,7 +54,7 @@
     "leaflet.markercluster": "^1.5.3",
     "locale-codes": "^1.3.1",
     "monaco-editor": "^0.33.0",
-    "nocodb-sdk": "0.109.3",
+    "nocodb-sdk": "file:../nocodb-sdk",
     "papaparse": "^5.3.2",
     "pinia": "^2.0.33",
     "qrcode": "^1.5.1",
diff --git a/packages/nocodb-sdk/package-lock.json b/packages/nocodb-sdk/package-lock.json
index 4404fa6937..aafb4c217a 100644
--- a/packages/nocodb-sdk/package-lock.json
+++ b/packages/nocodb-sdk/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "nocodb-sdk",
-  "version": "0.109.2",
+  "version": "0.109.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "nocodb-sdk",
-      "version": "0.109.2",
+      "version": "0.109.3",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "axios": "^0.21.1",
diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json
index 825369f521..4a5539bc01 100644
--- a/packages/nocodb/package-lock.json
+++ b/packages/nocodb/package-lock.json
@@ -83,7 +83,7 @@
         "nc-lib-gui": "0.109.3",
         "nc-plugin": "^0.1.3",
         "ncp": "^2.0.0",
-        "nocodb-sdk": "0.109.3",
+        "nocodb-sdk": "file:../nocodb-sdk",
         "nodemailer": "^6.4.10",
         "object-hash": "^3.0.0",
         "object-sizeof": "^2.6.1",
@@ -192,7 +192,6 @@
     },
     "../nocodb-sdk": {
       "version": "0.109.3",
-      "extraneous": true,
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "axios": "^0.21.1",
@@ -13208,13 +13207,8 @@
       }
     },
     "node_modules/nocodb-sdk": {
-      "version": "0.109.3",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.109.3.tgz",
-      "integrity": "sha512-B7s1dyTdsH0u1J/t2ZS7O5glitXnLXwT4A9lNO6349aPyBXIb1S7TTkmG0WzNylp+0mgNbLrCuVT3L3TFS9IfQ==",
-      "dependencies": {
-        "axios": "^0.21.1",
-        "jsep": "^1.3.6"
-      }
+      "resolved": "../nocodb-sdk",
+      "link": true
     },
     "node_modules/node-abort-controller": {
       "version": "3.1.1",
@@ -28517,12 +28511,22 @@
       "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg=="
     },
     "nocodb-sdk": {
-      "version": "0.109.3",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.109.3.tgz",
-      "integrity": "sha512-B7s1dyTdsH0u1J/t2ZS7O5glitXnLXwT4A9lNO6349aPyBXIb1S7TTkmG0WzNylp+0mgNbLrCuVT3L3TFS9IfQ==",
+      "version": "file:../nocodb-sdk",
       "requires": {
+        "@typescript-eslint/eslint-plugin": "^4.0.1",
+        "@typescript-eslint/parser": "^4.0.1",
         "axios": "^0.21.1",
-        "jsep": "^1.3.6"
+        "cspell": "^4.1.0",
+        "eslint": "^7.8.0",
+        "eslint-config-prettier": "^6.11.0",
+        "eslint-plugin-eslint-comments": "^3.2.0",
+        "eslint-plugin-functional": "^3.0.2",
+        "eslint-plugin-import": "^2.22.0",
+        "eslint-plugin-prettier": "^4.0.0",
+        "jsep": "^1.3.6",
+        "npm-run-all": "^4.1.5",
+        "prettier": "^2.1.1",
+        "typescript": "^4.0.2"
       }
     },
     "node-abort-controller": {
diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
index 2f722f8e40..54553509bf 100644
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@@ -118,7 +118,7 @@
     "nc-lib-gui": "0.109.3",
     "nc-plugin": "^0.1.3",
     "ncp": "^2.0.0",
-    "nocodb-sdk": "0.109.3",
+    "nocodb-sdk": "file:../nocodb-sdk",
     "nodemailer": "^6.4.10",
     "object-hash": "^3.0.0",
     "object-sizeof": "^2.6.1",
@@ -206,4 +206,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
\ No newline at end of file
+}

From b1b47ea3a4646ca63210271c55af016d826533a3 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Wed, 28 Jun 2023 21:02:00 +0530
Subject: [PATCH 171/208] test: dateBased fill handle

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/db/verticalFillHandle.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/playwright/tests/db/verticalFillHandle.spec.ts b/tests/playwright/tests/db/verticalFillHandle.spec.ts
index 30aacfb203..95eef14543 100644
--- a/tests/playwright/tests/db/verticalFillHandle.spec.ts
+++ b/tests/playwright/tests/db/verticalFillHandle.spec.ts
@@ -245,7 +245,7 @@ test.describe('Fill Handle', () => {
     }
 
     // verify api response
-    const updatedRecords = (await api.dbTableRow.list('noco', context.project.id, table.id, { limit: 50 })).list;
+    const updatedRecords = (await api.dbTableRow.list('noco', context.project.id, table.id, { limit: 4 })).list;
     for (let i = 0; i < updatedRecords.length; i++) {
       for (let j = 0; j < fields.length; j++) {
         expect(updatedRecords[i]['Date']).toBe(fields[j].value);

From cde228ffdb4751f81e97f31b79fd31a81384bc33 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Wed, 28 Jun 2023 21:11:53 +0530
Subject: [PATCH 172/208] test: select based fill handle

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../pages/Dashboard/common/Cell/SelectOptionCell.ts           | 4 +++-
 tests/playwright/tests/db/verticalFillHandle.spec.ts          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/common/Cell/SelectOptionCell.ts b/tests/playwright/pages/Dashboard/common/Cell/SelectOptionCell.ts
index f4dc982ed1..d564a2d70e 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/SelectOptionCell.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/SelectOptionCell.ts
@@ -115,7 +115,9 @@ export class SelectOptionCellPageObject extends BasePage {
     const selectCell = this.get({ index, columnHeader });
 
     // check if cell active
-    if (!(await selectCell.getAttribute('class')).includes('active')) {
+    // drag based non-primary cell will have 'active' attribute
+    // primary cell with blue border will have 'active-cell' attribute
+    if (!(await selectCell.getAttribute('class')).includes('active-cell')) {
       await selectCell.click();
     }
 
diff --git a/tests/playwright/tests/db/verticalFillHandle.spec.ts b/tests/playwright/tests/db/verticalFillHandle.spec.ts
index 95eef14543..6109cb6660 100644
--- a/tests/playwright/tests/db/verticalFillHandle.spec.ts
+++ b/tests/playwright/tests/db/verticalFillHandle.spec.ts
@@ -129,7 +129,7 @@ test.describe('Fill Handle', () => {
   });
 });
 
-test.describe.skip('Fill Handle', () => {
+test.describe('Fill Handle', () => {
   test.beforeEach(async ({ page }) => {
     await beforeEachInit({ page, tableType: 'selectBased' });
   });

From 8a2a3846e408f4265dbb59101dbd8e71a7811f1b Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 29 Jun 2023 10:16:02 +0300
Subject: [PATCH 173/208] fix: clear selection if row deleted is included

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../nc-gui/components/smartsheet/Grid.vue     |  9 +++++++++
 .../composables/useMultiSelect/cellRange.ts   | 18 +++++++++++++++++
 .../composables/useMultiSelect/index.ts       | 20 +++----------------
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 82c8cd8c00..5dab01c4f1 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -879,6 +879,15 @@ const closeAddColumnDropdown = (scrollToLastCol = false) => {
 const confirmDeleteRow = (row: number) => {
   try {
     deleteRow(row)
+
+    if (selectedRange.isRowInRange(row)) {
+      clearSelectedRange()
+    }
+
+    if (activeCell.row === row) {
+      activeCell.row = null
+      activeCell.col = null
+    }
   } catch (e: any) {
     message.error(e.message)
   }
diff --git a/packages/nc-gui/composables/useMultiSelect/cellRange.ts b/packages/nc-gui/composables/useMultiSelect/cellRange.ts
index b56e415df4..4d7b060fc5 100644
--- a/packages/nc-gui/composables/useMultiSelect/cellRange.ts
+++ b/packages/nc-gui/composables/useMultiSelect/cellRange.ts
@@ -24,6 +24,24 @@ export class CellRange {
     return !this.isEmpty() && this._start?.row === this._end?.row
   }
 
+  isCellInRange(cell: Cell) {
+    return (
+      !this.isEmpty() &&
+      cell.row >= this.start.row &&
+      cell.row <= this.end.row &&
+      cell.col >= this.start.col &&
+      cell.col <= this.end.col
+    )
+  }
+
+  isRowInRange(row: number) {
+    return !this.isEmpty() && row >= this.start.row && row <= this.end.row
+  }
+
+  isColInRange(col: number) {
+    return !this.isEmpty() && col >= this.start.col && col <= this.end.col
+  }
+
   get start(): Cell {
     return {
       row: Math.min(this._start?.row ?? NaN, this._end?.row ?? NaN),
diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index 942396cc98..08ae5a1869 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -232,16 +232,7 @@ export function useMultiSelect(
       return true
     }
 
-    if (selectedRange._start === null || selectedRange._end === null) {
-      return false
-    }
-
-    return (
-      col >= selectedRange.start.col &&
-      col <= selectedRange.end.col &&
-      row >= selectedRange.start.row &&
-      row <= selectedRange.end.row
-    )
+    return selectedRange.isCellInRange({ row, col })
   }
 
   function isCellInFillRange(row: number, col: number) {
@@ -249,16 +240,11 @@ export function useMultiSelect(
       return false
     }
 
-    if (
-      col >= selectedRange.start.col &&
-      col <= selectedRange.end.col &&
-      row >= selectedRange.start.row &&
-      row <= selectedRange.end.row
-    ) {
+    if (selectedRange.isCellInRange({ row, col })) {
       return false
     }
 
-    return col >= fillRange.start.col && col <= fillRange.end.col && row >= fillRange.start.row && row <= fillRange.end.row
+    return fillRange.isCellInRange({ row, col })
   }
 
   const isPasteable = (row?: Row, col?: ColumnType, showInfo = false) => {

From e127dfbfd2b050931e5fba9b480f47317272a067 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 29 Jun 2023 11:23:11 +0300
Subject: [PATCH 174/208] fix: time copy issue

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

diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index 08ae5a1869..9f356a491a 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -144,6 +144,12 @@ export function useMultiSelect(
         d = dayjs(textToCopy, isMySQL ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD HH:mm:ssZ')
       }
 
+      // we check time validity before formatting because ['HH:mm', 'HH:mm:ss'] are not valid dayjs formats
+      if (columnObj.uidt === UITypes.Time && !dayjs(textToCopy).isValid()) {
+        // return empty string for invalid time
+        return ''
+      }
+
       // users can change the datetime format in UI
       // `textToCopy` would be always in YYYY-MM-DD HH:mm:ss(Z / +xx:yy) format
       // therefore, here we reformat to the correct datetime format based on the meta
@@ -151,8 +157,8 @@ export function useMultiSelect(
         columnObj.uidt === UITypes.DateTime ? constructDateTimeFormat(columnObj) : constructTimeFormat(columnObj),
       )
 
-      if (!dayjs(textToCopy).isValid()) {
-        // return empty string for invalid datetime / time
+      if (columnObj.uidt === UITypes.DateTime && !dayjs(textToCopy).isValid()) {
+        // return empty string for invalid datetime
         return ''
       }
     }

From 1bfa60a4dcb388fb1895826eb84da84c01582f1e Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 29 Jun 2023 14:55:22 +0530
Subject: [PATCH 175/208] test: fix fill handle for time

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/db/verticalFillHandle.spec.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/playwright/tests/db/verticalFillHandle.spec.ts b/tests/playwright/tests/db/verticalFillHandle.spec.ts
index 6109cb6660..90f57721f9 100644
--- a/tests/playwright/tests/db/verticalFillHandle.spec.ts
+++ b/tests/playwright/tests/db/verticalFillHandle.spec.ts
@@ -86,13 +86,13 @@ test.describe('Fill Handle', () => {
       { title: 'Duration', value: '00:01', type: 'text' },
       { title: 'Rating', value: '3', type: 'rating' },
       { title: 'Year', value: '2023', type: 'year' },
-      // { title: 'Time', value: '10:10', type: 'time' },
+      { title: 'Time', value: '02:02', type: 'time' },
     ];
 
     // set rating for first record
     await dashboard.grid.cell.rating.select({ index: 0, columnHeader: 'Rating', rating: 2 });
 
-    await dragDrop({ firstColumn: 'Number', lastColumn: 'Year' });
+    await dragDrop({ firstColumn: 'Number', lastColumn: 'Time' });
 
     // verify data on grid
     for (let i = 0; i < fields.length; i++) {
@@ -115,7 +115,7 @@ test.describe('Fill Handle', () => {
 
     // verify api response
     // duration in seconds
-    const APIResponse = [33, 33.3, 33.3, 33, 60, 3, 2023, '10:10:00'];
+    const APIResponse = [33, 33.3, 33.3, 33, 60, 3, 2023, '02:02:00'];
     const updatedRecords = (await api.dbTableRow.list('noco', context.project.id, table.id, { limit: 4 })).list;
     for (let i = 0; i < updatedRecords.length; i++) {
       for (let j = 0; j < fields.length; j++) {

From 8c1732a0867c70166bbef804e13f0122ce419b38 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 29 Jun 2023 13:38:41 +0300
Subject: [PATCH 176/208] fix: disable edit mode on closing picker

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nc-gui/components/cell/DatePicker.vue     | 2 ++
 packages/nc-gui/components/cell/DateTimePicker.vue | 2 ++
 packages/nc-gui/components/cell/TimePicker.vue     | 2 ++
 packages/nc-gui/components/cell/YearPicker.vue     | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/packages/nc-gui/components/cell/DatePicker.vue b/packages/nc-gui/components/cell/DatePicker.vue
index 019eb1e586..5cde5ec01f 100644
--- a/packages/nc-gui/components/cell/DatePicker.vue
+++ b/packages/nc-gui/components/cell/DatePicker.vue
@@ -70,6 +70,8 @@ watch(
   (next) => {
     if (next) {
       onClickOutside(document.querySelector(`.${randomClass}`)! as HTMLDivElement, () => (open.value = false))
+    } else {
+      editable.value = false
     }
   },
   { flush: 'post' },
diff --git a/packages/nc-gui/components/cell/DateTimePicker.vue b/packages/nc-gui/components/cell/DateTimePicker.vue
index 82362faa69..397ceda16f 100644
--- a/packages/nc-gui/components/cell/DateTimePicker.vue
+++ b/packages/nc-gui/components/cell/DateTimePicker.vue
@@ -122,6 +122,8 @@ watch(
   (next) => {
     if (next) {
       onClickOutside(document.querySelector(`.${randomClass}`)! as HTMLDivElement, () => (open.value = false))
+    } else {
+      editable.value = false
     }
   },
   { flush: 'post' },
diff --git a/packages/nc-gui/components/cell/TimePicker.vue b/packages/nc-gui/components/cell/TimePicker.vue
index 205b2bed6b..3ea3e8b5a2 100644
--- a/packages/nc-gui/components/cell/TimePicker.vue
+++ b/packages/nc-gui/components/cell/TimePicker.vue
@@ -69,6 +69,8 @@ watch(
   (next) => {
     if (next) {
       onClickOutside(document.querySelector(`.${randomClass}`)! as HTMLDivElement, () => (open.value = false))
+    } else {
+      editable.value = false
     }
   },
   { flush: 'post' },
diff --git a/packages/nc-gui/components/cell/YearPicker.vue b/packages/nc-gui/components/cell/YearPicker.vue
index 3d9f795b40..58312273a6 100644
--- a/packages/nc-gui/components/cell/YearPicker.vue
+++ b/packages/nc-gui/components/cell/YearPicker.vue
@@ -55,6 +55,8 @@ watch(
   (next) => {
     if (next) {
       onClickOutside(document.querySelector(`.${randomClass}`)! as HTMLDivElement, () => (open.value = false))
+    } else {
+      editable.value = false
     }
   },
   { flush: 'post' },

From 081cde520b42c9331c2f1c59990661969b65ff01 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 29 Jun 2023 15:41:15 +0300
Subject: [PATCH 177/208] fix: copy time for mysql and pg

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../composables/useMultiSelect/index.ts       | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index 9f356a491a..b74d7ceede 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -60,7 +60,7 @@ export function useMultiSelect(
 
   const { appInfo } = useGlobal()
 
-  const { isMysql } = useProject()
+  const { isMysql, isPg } = useProject()
 
   const editEnabled = ref(_editEnabled)
 
@@ -128,7 +128,7 @@ export function useMultiSelect(
       })
     }
 
-    if (columnObj.uidt === UITypes.DateTime || columnObj.uidt === UITypes.Time) {
+    if (columnObj.uidt === UITypes.DateTime) {
       // remove `"`
       // e.g. "2023-05-12T08:03:53.000Z" -> 2023-05-12T08:03:53.000Z
       textToCopy = textToCopy.replace(/["']/g, '')
@@ -144,25 +144,36 @@ export function useMultiSelect(
         d = dayjs(textToCopy, isMySQL ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD HH:mm:ssZ')
       }
 
-      // we check time validity before formatting because ['HH:mm', 'HH:mm:ss'] are not valid dayjs formats
-      if (columnObj.uidt === UITypes.Time && !dayjs(textToCopy).isValid()) {
-        // return empty string for invalid time
-        return ''
-      }
-
       // users can change the datetime format in UI
       // `textToCopy` would be always in YYYY-MM-DD HH:mm:ss(Z / +xx:yy) format
       // therefore, here we reformat to the correct datetime format based on the meta
-      textToCopy = d.format(
-        columnObj.uidt === UITypes.DateTime ? constructDateTimeFormat(columnObj) : constructTimeFormat(columnObj),
-      )
+      textToCopy = d.format(constructDateTimeFormat(columnObj))
 
-      if (columnObj.uidt === UITypes.DateTime && !dayjs(textToCopy).isValid()) {
+      if (!dayjs(textToCopy).isValid()) {
         // return empty string for invalid datetime
         return ''
       }
     }
 
+    if (columnObj.uidt === UITypes.Time) {
+      // remove `"`
+      // e.g. "2023-05-12T08:03:53.000Z" -> 2023-05-12T08:03:53.000Z
+      textToCopy = textToCopy.replace(/["']/g, '')
+
+      const isMySQL = isMysql(columnObj.base_id)
+      const isPostgres = isPg(columnObj.base_id)
+
+      // MySQL and Postgres store time in HH:mm:ss format so we need to feed custom parse format
+      const d = isMySQL || isPostgres ? dayjs(textToCopy, 'HH:mm:ss') : dayjs(textToCopy)
+
+      if (!d.isValid()) {
+        // return empty string for invalid time
+        return ''
+      }
+
+      textToCopy = d.format(constructTimeFormat(columnObj))
+    }
+
     if (columnObj.uidt === UITypes.LongText) {
       textToCopy = `"${textToCopy.replace(/\"/g, '""')}"`
     }

From 2007e83617accdcf758f2b97024b7a81f636081a Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 29 Jun 2023 16:45:01 +0300
Subject: [PATCH 178/208] fix: prevent undo while editing

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nc-gui/components/cell/Currency.vue | 2 ++
 packages/nc-gui/components/cell/Decimal.vue  | 2 ++
 packages/nc-gui/components/cell/Duration.vue | 2 ++
 packages/nc-gui/components/cell/Email.vue    | 2 ++
 packages/nc-gui/components/cell/Float.vue    | 2 ++
 packages/nc-gui/components/cell/Integer.vue  | 9 +++++++++
 packages/nc-gui/components/cell/Percent.vue  | 2 ++
 packages/nc-gui/components/cell/Text.vue     | 2 ++
 packages/nc-gui/components/cell/TextArea.vue | 2 ++
 packages/nc-gui/components/cell/Url.vue      | 2 ++
 10 files changed, 27 insertions(+)

diff --git a/packages/nc-gui/components/cell/Currency.vue b/packages/nc-gui/components/cell/Currency.vue
index 09c605ead3..51aa023d4a 100644
--- a/packages/nc-gui/components/cell/Currency.vue
+++ b/packages/nc-gui/components/cell/Currency.vue
@@ -83,6 +83,8 @@ onMounted(() => {
     @keydown.right.stop
     @keydown.up.stop
     @keydown.delete.stop
+    @keydown.ctrl.z.stop
+    @keydown.meta.z.stop
     @selectstart.capture.stop
     @mousedown.stop
     @contextmenu.stop
diff --git a/packages/nc-gui/components/cell/Decimal.vue b/packages/nc-gui/components/cell/Decimal.vue
index 11392f6d08..562a4ac858 100644
--- a/packages/nc-gui/components/cell/Decimal.vue
+++ b/packages/nc-gui/components/cell/Decimal.vue
@@ -55,6 +55,8 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && (el as HTMLInputEle
     @keydown.right.stop
     @keydown.up.stop
     @keydown.delete.stop
+    @keydown.ctrl.z.stop
+    @keydown.meta.z.stop
     @selectstart.capture.stop
     @mousedown.stop
   />
diff --git a/packages/nc-gui/components/cell/Duration.vue b/packages/nc-gui/components/cell/Duration.vue
index 9e5566848b..f9c9f80eb1 100644
--- a/packages/nc-gui/components/cell/Duration.vue
+++ b/packages/nc-gui/components/cell/Duration.vue
@@ -96,6 +96,8 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && (el as HTMLInputEle
       @keydown.right.stop
       @keydown.up.stop
       @keydown.delete.stop
+      @keydown.ctrl.z.stop
+      @keydown.meta.z.stop
       @selectstart.capture.stop
       @mousedown.stop
     />
diff --git a/packages/nc-gui/components/cell/Email.vue b/packages/nc-gui/components/cell/Email.vue
index 2564c7958b..b15b6d4e52 100644
--- a/packages/nc-gui/components/cell/Email.vue
+++ b/packages/nc-gui/components/cell/Email.vue
@@ -64,6 +64,8 @@ watch(
     @keydown.right.stop
     @keydown.up.stop
     @keydown.delete.stop
+    @keydown.ctrl.z.stop
+    @keydown.meta.z.stop
     @selectstart.capture.stop
     @mousedown.stop
   />
diff --git a/packages/nc-gui/components/cell/Float.vue b/packages/nc-gui/components/cell/Float.vue
index feba9beba0..f6a12934cb 100644
--- a/packages/nc-gui/components/cell/Float.vue
+++ b/packages/nc-gui/components/cell/Float.vue
@@ -55,6 +55,8 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && (el as HTMLInputEle
     @keydown.right.stop
     @keydown.up.stop
     @keydown.delete.stop
+    @keydown.ctrl.z.stop
+    @keydown.meta.z.stop
     @selectstart.capture.stop
     @mousedown.stop
   />
diff --git a/packages/nc-gui/components/cell/Integer.vue b/packages/nc-gui/components/cell/Integer.vue
index 6129431271..0800c09823 100644
--- a/packages/nc-gui/components/cell/Integer.vue
+++ b/packages/nc-gui/components/cell/Integer.vue
@@ -41,6 +41,15 @@ const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
 const focus: VNodeRef = (el) => !isExpandedFormOpen.value && (el as HTMLInputElement)?.focus()
 
 function onKeyDown(evt: KeyboardEvent) {
+  const cmdOrCtrl = isMac() ? evt.metaKey : evt.ctrlKey
+  if (cmdOrCtrl && !evt.altKey) {
+    switch (evt.keyCode) {
+      case 90: {
+        evt.stopPropagation()
+        break
+      }
+    }
+  }
   return evt.key === '.' && evt.preventDefault()
 }
 </script>
diff --git a/packages/nc-gui/components/cell/Percent.vue b/packages/nc-gui/components/cell/Percent.vue
index b357a3714d..42face46a6 100644
--- a/packages/nc-gui/components/cell/Percent.vue
+++ b/packages/nc-gui/components/cell/Percent.vue
@@ -46,6 +46,8 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && (el as HTMLInputEle
     @keydown.right.stop
     @keydown.up.stop
     @keydown.delete.stop
+    @keydown.ctrl.z.stop
+    @keydown.meta.z.stop
     @selectstart.capture.stop
     @mousedown.stop
   />
diff --git a/packages/nc-gui/components/cell/Text.vue b/packages/nc-gui/components/cell/Text.vue
index 95c1ad35b0..1d4e11ad05 100644
--- a/packages/nc-gui/components/cell/Text.vue
+++ b/packages/nc-gui/components/cell/Text.vue
@@ -38,6 +38,8 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && (el as HTMLInputEle
     @keydown.right.stop
     @keydown.up.stop
     @keydown.delete.stop
+    @keydown.ctrl.z.stop
+    @keydown.meta.z.stop
     @selectstart.capture.stop
     @mousedown.stop
   />
diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index d8e6a07e78..6b7d2b1406 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -37,6 +37,8 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && (el as HTMLTextArea
     @keydown.right.stop
     @keydown.up.stop
     @keydown.delete.stop
+    @keydown.ctrl.z.stop
+    @keydown.meta.z.stop
     @selectstart.capture.stop
     @mousedown.stop
   />
diff --git a/packages/nc-gui/components/cell/Url.vue b/packages/nc-gui/components/cell/Url.vue
index 032d5d2797..0c1a207627 100644
--- a/packages/nc-gui/components/cell/Url.vue
+++ b/packages/nc-gui/components/cell/Url.vue
@@ -93,6 +93,8 @@ watch(
       @keydown.right.stop
       @keydown.up.stop
       @keydown.delete.stop
+      @keydown.ctrl.z.stop
+      @keydown.meta.z.stop
       @selectstart.capture.stop
       @mousedown.stop
     />

From a069474200b02c7d480c5059f6d945b815d5ab79 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Fri, 30 Jun 2023 10:53:55 +0300
Subject: [PATCH 179/208] fix: copy time after paste

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

diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index b74d7ceede..39a717737c 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -163,8 +163,19 @@ export function useMultiSelect(
       const isMySQL = isMysql(columnObj.base_id)
       const isPostgres = isPg(columnObj.base_id)
 
-      // MySQL and Postgres store time in HH:mm:ss format so we need to feed custom parse format
-      const d = isMySQL || isPostgres ? dayjs(textToCopy, 'HH:mm:ss') : dayjs(textToCopy)
+      let d = dayjs(textToCopy)
+
+      if (!d.isValid()) {
+        // insert a datetime value, copy the value without refreshing
+        // e.g. textToCopy = 2023-05-12T03:49:25.000Z
+        // feed custom parse format
+        d = dayjs(textToCopy, isMySQL ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD HH:mm:ssZ')
+      }
+
+      if (!d.isValid()) {
+        // MySQL and Postgres store time in HH:mm:ss format so we need to feed custom parse format
+        d = isMySQL || isPostgres ? dayjs(textToCopy, 'HH:mm:ss') : dayjs(textToCopy)
+      }
 
       if (!d.isValid()) {
         // return empty string for invalid time

From 8f55a6c6579445381883118b1747f6afc8915ee9 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Fri, 30 Jun 2023 11:57:58 +0300
Subject: [PATCH 180/208] test: fix mysql time data

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 tests/playwright/setup/xcdb-records.ts | 41 ++++++++++++++++++--------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/tests/playwright/setup/xcdb-records.ts b/tests/playwright/setup/xcdb-records.ts
index 75df0bb2fa..279592ac79 100644
--- a/tests/playwright/setup/xcdb-records.ts
+++ b/tests/playwright/setup/xcdb-records.ts
@@ -48,19 +48,34 @@ const rowMixedValue = (column: ColumnType, index: number, db?: string) => {
   const numbers = [33, null, 456, 333, 267, 34, 8754, 3234, 44, 33, null];
   const decimals = [33.3, 456.34, 333.3, null, 267.5674, 34.0, 8754.0, 3234.547, 44.2647, 33.98, null];
   const duration = [60, 120, 180, 3600, 3660, 3720, null, 3780, 60, 120, null];
-  const time = [
-    `1999-01-01 02:02:00${timezoneOffset}`,
-    `1999-01-01 20:20:20${timezoneOffset}`,
-    `1999-01-01 04:04:00${timezoneOffset}`,
-    `1999-01-01 02:02:00${timezoneOffset}`,
-    `1999-01-01 20:20:20${timezoneOffset}`,
-    `1999-01-01 18:18:18${timezoneOffset}`,
-    null,
-    `1999-01-01 02:02:00${timezoneOffset}`,
-    `1999-01-01 20:20:20${timezoneOffset}`,
-    `1999-01-01 18:18:18${timezoneOffset}`,
-    null,
-  ];
+  const time =
+    db === 'mysql'
+      ? [
+          `02:02:00`,
+          `20:20:20`,
+          `04:04:00`,
+          `02:02:00`,
+          `20:20:20`,
+          `18:18:18`,
+          null,
+          `02:02:00`,
+          `20:20:20`,
+          `18:18:18`,
+          null,
+        ]
+      : [
+          `1999-01-01 02:02:00${timezoneOffset}`,
+          `1999-01-01 20:20:20${timezoneOffset}`,
+          `1999-01-01 04:04:00${timezoneOffset}`,
+          `1999-01-01 02:02:00${timezoneOffset}`,
+          `1999-01-01 20:20:20${timezoneOffset}`,
+          `1999-01-01 18:18:18${timezoneOffset}`,
+          null,
+          `1999-01-01 02:02:00${timezoneOffset}`,
+          `1999-01-01 20:20:20${timezoneOffset}`,
+          `1999-01-01 18:18:18${timezoneOffset}`,
+          null,
+        ];
   const rating = [0, 1, 2, 3, null, 0, 4, 5, 0, 1, null];
   const years = [2023, null, 1956, 2023, 1967, 2024, 1954, 1924, 2044, 1923, null];
 

From 7aceae951ed20789c4a960a934954ed326ae48ab Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Fri, 30 Jun 2023 16:28:15 +0530
Subject: [PATCH 181/208] test: hardwire time on first cell

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../pages/Dashboard/common/Cell/TimeCell.ts   | 32 +++++++++++++++
 tests/playwright/setup/xcdb-records.ts        | 41 ++++++-------------
 .../tests/db/verticalFillHandle.spec.ts       |  3 ++
 3 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/common/Cell/TimeCell.ts b/tests/playwright/pages/Dashboard/common/Cell/TimeCell.ts
index 737d7b3d8d..897fd91a67 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/TimeCell.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/TimeCell.ts
@@ -20,4 +20,36 @@ export class TimeCellPageObject extends BasePage {
     await cell.locator(`input[title="${value}"]`).waitFor({ state: 'visible' });
     await expect(cell.locator(`[title="${value}"]`)).toBeVisible();
   }
+
+  async selectTime({
+    // hour: 0 - 23
+    // minute: 0 - 59
+    // second: 0 - 59
+    hour,
+    minute,
+  }: {
+    hour: number;
+    minute: number;
+  }) {
+    const timePanel = await this.rootPage.locator('.ant-picker-time-panel-column');
+    await timePanel.nth(0).locator('.ant-picker-time-panel-cell').nth(hour).click();
+    await timePanel.nth(1).locator('.ant-picker-time-panel-cell').nth(minute).click();
+    if (hour < 12) {
+      await timePanel.nth(2).locator('.ant-picker-time-panel-cell').nth(0).click();
+    } else {
+      await timePanel.nth(2).locator('.ant-picker-time-panel-cell').nth(1).click();
+    }
+  }
+
+  async save() {
+    await this.rootPage.locator('button:has-text("Ok"):visible').click();
+  }
+
+  async set({ index, columnHeader, value }: { index: number; columnHeader: string; value: string }) {
+    const [hour, minute, _second] = value.split(':');
+    await this.get({ index, columnHeader }).click();
+    await this.get({ index, columnHeader }).click();
+    await this.selectTime({ hour: +hour, minute: +minute });
+    await this.save();
+  }
 }
diff --git a/tests/playwright/setup/xcdb-records.ts b/tests/playwright/setup/xcdb-records.ts
index 279592ac79..75df0bb2fa 100644
--- a/tests/playwright/setup/xcdb-records.ts
+++ b/tests/playwright/setup/xcdb-records.ts
@@ -48,34 +48,19 @@ const rowMixedValue = (column: ColumnType, index: number, db?: string) => {
   const numbers = [33, null, 456, 333, 267, 34, 8754, 3234, 44, 33, null];
   const decimals = [33.3, 456.34, 333.3, null, 267.5674, 34.0, 8754.0, 3234.547, 44.2647, 33.98, null];
   const duration = [60, 120, 180, 3600, 3660, 3720, null, 3780, 60, 120, null];
-  const time =
-    db === 'mysql'
-      ? [
-          `02:02:00`,
-          `20:20:20`,
-          `04:04:00`,
-          `02:02:00`,
-          `20:20:20`,
-          `18:18:18`,
-          null,
-          `02:02:00`,
-          `20:20:20`,
-          `18:18:18`,
-          null,
-        ]
-      : [
-          `1999-01-01 02:02:00${timezoneOffset}`,
-          `1999-01-01 20:20:20${timezoneOffset}`,
-          `1999-01-01 04:04:00${timezoneOffset}`,
-          `1999-01-01 02:02:00${timezoneOffset}`,
-          `1999-01-01 20:20:20${timezoneOffset}`,
-          `1999-01-01 18:18:18${timezoneOffset}`,
-          null,
-          `1999-01-01 02:02:00${timezoneOffset}`,
-          `1999-01-01 20:20:20${timezoneOffset}`,
-          `1999-01-01 18:18:18${timezoneOffset}`,
-          null,
-        ];
+  const time = [
+    `1999-01-01 02:02:00${timezoneOffset}`,
+    `1999-01-01 20:20:20${timezoneOffset}`,
+    `1999-01-01 04:04:00${timezoneOffset}`,
+    `1999-01-01 02:02:00${timezoneOffset}`,
+    `1999-01-01 20:20:20${timezoneOffset}`,
+    `1999-01-01 18:18:18${timezoneOffset}`,
+    null,
+    `1999-01-01 02:02:00${timezoneOffset}`,
+    `1999-01-01 20:20:20${timezoneOffset}`,
+    `1999-01-01 18:18:18${timezoneOffset}`,
+    null,
+  ];
   const rating = [0, 1, 2, 3, null, 0, 4, 5, 0, 1, null];
   const years = [2023, null, 1956, 2023, 1967, 2024, 1954, 1924, 2044, 1923, null];
 
diff --git a/tests/playwright/tests/db/verticalFillHandle.spec.ts b/tests/playwright/tests/db/verticalFillHandle.spec.ts
index 90f57721f9..7d62ea3784 100644
--- a/tests/playwright/tests/db/verticalFillHandle.spec.ts
+++ b/tests/playwright/tests/db/verticalFillHandle.spec.ts
@@ -89,6 +89,9 @@ test.describe('Fill Handle', () => {
       { title: 'Time', value: '02:02', type: 'time' },
     ];
 
+    // kludge: insert time from browser until mysql issue with timezone is fixed
+    await dashboard.grid.cell.time.set({ index: 0, columnHeader: 'Time', value: '02:02' });
+
     // set rating for first record
     await dashboard.grid.cell.rating.select({ index: 0, columnHeader: 'Rating', rating: 2 });
 

From 61302e43cfb92bc14894df8c56f4a21ce83e4c55 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 30 Jun 2023 22:09:15 +0530
Subject: [PATCH 182/208] refactor: avoid having extra space in bottom of the
 list

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/virtual-cell/components/ListChildItems.vue       | 2 +-
 .../nc-gui/components/virtual-cell/components/ListItems.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
index 55c7d59901..bd9b608a95 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
@@ -107,7 +107,7 @@ const onClick = (row: Row) => {
     :body-style="{ padding: 0 }"
     wrap-class-name="nc-modal-child-list"
   >
-    <div class="h-[max(calc(100vh_-_300px)_,500px)] flex flex-col py-6">
+    <div class="h-[min(max(calc(100vh_-_300px)_,350px),540px)] flex flex-col py-6">
       <div class="flex mb-4 items-center gap-2 px-12">
         <div class="flex-1" />
         <component
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItems.vue b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
index 466d1e9f02..290d43de87 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
@@ -196,7 +196,7 @@ watch(vModel, (nextVal) => {
     :body-style="{ padding: 0 }"
     wrap-class-name="nc-modal-link-record"
   >
-    <div class="h-[max(calc(100vh_-_300px)_,500px)] flex flex-col py-6">
+    <div class="h-[min(max(calc(100vh_-_300px)_,350px),540px)] flex flex-col py-6">
       <div class="flex mb-4 items-center gap-2 px-12">
         <a-input
           ref="filterQueryRef"

From 214c5feeb406e4d03a275f8385e17129a4ac2343 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 30 Jun 2023 22:31:27 +0530
Subject: [PATCH 183/208] fix: on link in row, immediately remove item from
 list to avoid adding same item twice

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/virtual-cell/components/ListItems.vue    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/virtual-cell/components/ListItems.vue b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
index 290d43de87..64a633af20 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
@@ -50,6 +50,7 @@ const selectedRowIndex = ref(0)
 const isAltKeyDown = ref(false)
 
 const linkRow = async (row: Record<string, any>) => {
+  childrenExcludedList.value?.list?.splice(selectedRowIndex.value, 1)
   if (isNew.value) {
     addLTARRef(row, column?.value as ColumnType)
     saveRow!()
@@ -57,7 +58,7 @@ const linkRow = async (row: Record<string, any>) => {
     await link(row)
   }
   if (isAltKeyDown.value) {
-    loadChildrenExcludedList()
+    if (!isNew.value) loadChildrenExcludedList()
   } else {
     vModel.value = false
   }

From 1e79467ac50772dc641a95995c054806c1e21e59 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 30 Jun 2023 22:55:31 +0530
Subject: [PATCH 184/208] fix: use pluralised name of ref table as column name

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/dlg/AirtableImport.vue  | 1 +
 packages/nocodb/src/helpers/columnHelpers.ts       | 2 +-
 packages/nocodb/src/helpers/populateMeta.ts        | 6 +++---
 packages/nocodb/src/services/columns.service.ts    | 4 ++--
 packages/nocodb/src/services/meta-diffs.service.ts | 8 ++++----
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/nc-gui/components/dlg/AirtableImport.vue b/packages/nc-gui/components/dlg/AirtableImport.vue
index cdb87ef5cd..1f9a95b86b 100644
--- a/packages/nc-gui/components/dlg/AirtableImport.vue
+++ b/packages/nc-gui/components/dlg/AirtableImport.vue
@@ -1,3 +1,4 @@
+
 <script setup lang="ts">
 import type { Card as AntCard } from 'ant-design-vue'
 import {
diff --git a/packages/nocodb/src/helpers/columnHelpers.ts b/packages/nocodb/src/helpers/columnHelpers.ts
index fbc6a65f9c..4e229574bb 100644
--- a/packages/nocodb/src/helpers/columnHelpers.ts
+++ b/packages/nocodb/src/helpers/columnHelpers.ts
@@ -65,7 +65,7 @@ export async function createHmAndBtColumn(
   {
     const title = getUniqueColumnAliasName(
       await parent.getColumns(),
-      (type === 'hm' && alias) || `${child.title}`,
+      (type === 'hm' && alias) || pluralize(child.title),
     );
     const meta = {
       plural: columnMeta?.plural || pluralize(child.title),
diff --git a/packages/nocodb/src/helpers/populateMeta.ts b/packages/nocodb/src/helpers/populateMeta.ts
index d4d3e437ea..7a7db0bcd6 100644
--- a/packages/nocodb/src/helpers/populateMeta.ts
+++ b/packages/nocodb/src/helpers/populateMeta.ts
@@ -114,7 +114,7 @@ export async function extractAndGenerateManyToManyRelations(
         await Column.insert<LinkToAnotherRecordColumn>({
           title: getUniqueColumnAliasName(
             modelA.columns,
-            `${modelB.title} List`,
+            pluralize(modelB.title),
           ),
           fk_model_id: modelA.id,
           fk_related_model_id: modelB.id,
@@ -136,7 +136,7 @@ export async function extractAndGenerateManyToManyRelations(
         await Column.insert<LinkToAnotherRecordColumn>({
           title: getUniqueColumnAliasName(
             modelB.columns,
-            `${modelA.title} List`,
+            pluralize(modelA.title),
           ),
           fk_model_id: modelB.id,
           fk_related_model_id: modelA.id,
@@ -268,7 +268,7 @@ export async function populateMeta(base: Base, project: Project): Promise<any> {
             uidt: UITypes.Links,
             type: 'hm',
             hm,
-            title: `${hm.title} List`,
+            title: pluralize(hm.title),
             meta: {
               plural: pluralize(hm.title),
               singular: singularize(hm.title),
diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index 65b3cc4be0..ef463b9868 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -1780,7 +1780,7 @@ export class ColumnsService {
       await Column.insert({
         title: getUniqueColumnAliasName(
           await child.getColumns(),
-          `${parent.title} List`,
+          pluralize(parent.title),
         ),
         uidt: isLinks ? UITypes.Links : UITypes.LinkToAnotherRecord,
         type: 'mm',
@@ -1807,7 +1807,7 @@ export class ColumnsService {
       await Column.insert({
         title: getUniqueColumnAliasName(
           await parent.getColumns(),
-          param.column.title ?? `${child.title} List`,
+          param.column.title ?? pluralize(child.title),
         ),
 
         uidt: isLinks ? UITypes.Links : UITypes.LinkToAnotherRecord,
diff --git a/packages/nocodb/src/services/meta-diffs.service.ts b/packages/nocodb/src/services/meta-diffs.service.ts
index dab7d6a261..e676ce57e4 100644
--- a/packages/nocodb/src/services/meta-diffs.service.ts
+++ b/packages/nocodb/src/services/meta-diffs.service.ts
@@ -746,7 +746,7 @@ export class MetaDiffsService {
                   } else if (change.relationType === RelationTypes.HAS_MANY) {
                     const title = getUniqueColumnAliasName(
                       childModel.columns,
-                      `${childModel.title || childModel.table_name} List`,
+                      pluralize(childModel.title || childModel.table_name),
                     );
                     await Column.insert<LinkToAnotherRecordColumn>({
                       uidt: UITypes.Links,
@@ -945,7 +945,7 @@ export class MetaDiffsService {
                 } else if (change.relationType === RelationTypes.HAS_MANY) {
                   const title = getUniqueColumnAliasName(
                     childModel.columns,
-                    `${childModel.title || childModel.table_name} List`,
+                    pluralize(childModel.title || childModel.table_name),
                   );
                   await Column.insert<LinkToAnotherRecordColumn>({
                     uidt: UITypes.Links,
@@ -1046,7 +1046,7 @@ export class MetaDiffsService {
           await Column.insert<LinkToAnotherRecordColumn>({
             title: getUniqueColumnAliasName(
               modelA.columns,
-              `${modelB.title} List`,
+              pluralize(modelB.title),
             ),
             fk_model_id: modelA.id,
             fk_related_model_id: modelB.id,
@@ -1070,7 +1070,7 @@ export class MetaDiffsService {
           await Column.insert<LinkToAnotherRecordColumn>({
             title: getUniqueColumnAliasName(
               modelB.columns,
-              `${modelA.title} List`,
+              pluralize(modelA.title),
             ),
             fk_model_id: modelB.id,
             fk_related_model_id: modelA.id,

From 6032caf1e428cc69b11c58f69456da2c89c2b385 Mon Sep 17 00:00:00 2001
From: revyte <github@revyte.de>
Date: Fri, 30 Jun 2023 20:56:56 +0200
Subject: [PATCH 185/208] Update README.md

Missing "OutFile" to save the binaries.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 54cc834d69..a545c8a23e 100644
--- a/README.md
+++ b/README.md
@@ -156,14 +156,14 @@ curl http://get.nocodb.com/linux-arm64 -o nocodb -L && chmod +x nocodb && ./noco
 ##### Windows (x64)
 
 ```bash
-iwr http://get.nocodb.com/win-x64.exe
+iwr http://get.nocodb.com/win-x64.exe -o Noco-win-x64.exe
 .\Noco-win-x64.exe
 ```
 
 ##### Windows (arm64)
 
 ```bash
-iwr http://get.nocodb.com/win-arm64.exe
+iwr http://get.nocodb.com/win-arm64.exe -o Noco-win-arm64.exe
 .\Noco-win-arm64.exe
 ```
 

From d3e05592febfbe0e506c1520f9dea1550513e8f8 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Sat, 1 Jul 2023 09:51:59 +0530
Subject: [PATCH 186/208] chore: test suite reorg

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../db/{ => columns}/columnAttachments.spec.ts   | 10 +++++-----
 .../tests/db/{ => columns}/columnBarcode.spec.ts |  6 +++---
 .../db/{ => columns}/columnCheckbox.spec.ts      |  6 +++---
 .../db/{ => columns}/columnDateTime.spec.ts      |  4 ++--
 .../db/{ => columns}/columnDuration.spec.ts      |  4 ++--
 .../tests/db/{ => columns}/columnFormula.spec.ts |  6 +++---
 .../tests/db/{ => columns}/columnGeoData.spec.ts |  6 +++---
 .../columnLinkToAnotherRecord.spec.ts            |  4 ++--
 .../db/{ => columns}/columnLookupRollup.spec.ts  |  4 ++--
 .../db/{ => columns}/columnLtarDragdrop.spec.ts  |  8 ++++----
 .../{ => columns}/columnMenuOperations.spec.ts   |  4 ++--
 .../db/{ => columns}/columnMultiSelect.spec.ts   |  8 ++++----
 .../tests/db/{ => columns}/columnQrCode.spec.ts  |  6 +++---
 .../tests/db/{ => columns}/columnRating.spec.ts  |  6 +++---
 .../columnRelationalExtendedTests.spec.ts        |  4 ++--
 .../db/{ => columns}/columnSingleSelect.spec.ts  |  8 ++++----
 .../tests/db/{ => features}/baseShare.spec.ts    | 12 ++++++------
 .../tests/db/{ => features}/erd.spec.ts          | 14 +++++++-------
 .../db/{ => features}/expandedFormUrl.spec.ts    | 10 +++++-----
 .../tests/db/{ => features}/filters.spec.ts      | 12 ++++++------
 .../db/{ => features}/findRowByScanner.spec.ts   |  8 ++++----
 .../tests/db/{ => features}/import.spec.ts       | 10 +++++-----
 .../db/{ => features}/keyboardShortcuts.spec.ts  |  6 +++---
 .../tests/db/{ => features}/language.spec.ts     |  6 +++---
 .../tests/db/{ => features}/metaLTAR.spec.ts     | 11 +++++------
 .../tests/db/{ => features}/metaSync.spec.ts     |  8 ++++----
 .../tests/db/{ => features}/mobileMode.spec.ts   |  8 ++++----
 .../tests/db/{ => features}/pagination.spec.ts   |  4 ++--
 .../tests/db/{ => features}/swagger.spec.ts      |  6 +++---
 .../tests/db/{ => features}/timezone.spec.ts     | 12 ++++++------
 .../tests/db/{ => features}/undo-redo.spec.ts    | 12 ++++++------
 .../tests/db/{ => features}/updateBulk.ts        | 12 ++++++------
 .../db/{ => features}/verticalFillHandle.spec.ts |  8 ++++----
 .../webhook.spec.ts}                             | 12 ++++++------
 .../tests/db/{ => general}/cellSelection.spec.ts |  6 +++---
 .../tests/db/{ => general}/megaTable.spec.ts     |  2 +-
 .../db/{ => general}/projectOperations.spec.ts   | 16 ++++++++--------
 .../{ => general}/tableColumnOperation.spec.ts   |  6 +++---
 .../db/{ => general}/tableOperations.spec.ts     | 10 +++++-----
 .../db/{ => general}/toolbarOperations.spec.ts   |  6 +++---
 .../tests/db/{ => general}/viewMenu.spec.ts      |  6 +++---
 .../tests/db/{ => general}/views.spec.ts         |  6 +++---
 .../{ => users&Accounts}/accountLicense.spec.ts  |  8 ++++----
 .../accountTokenManagement.spec.ts               |  6 +++---
 .../accountUserManagement.spec.ts                | 12 ++++++------
 .../accountUserSettings.spec.ts                  | 10 +++++-----
 .../authChangePassword.spec.ts                   | 16 ++++++++--------
 .../db/{ => users&Accounts}/rolesCreate.spec.ts  | 12 ++++++------
 .../db/{ => users&Accounts}/rolesPreview.spec.ts |  8 ++++----
 .../{ => users&Accounts}/rolesSuperUser.spec.ts  |  4 ++--
 .../tests/db/{ => views}/viewForm.spec.ts        | 12 ++++++------
 .../db/{ => views}/viewFormShareSurvey.spec.ts   |  6 +++---
 .../tests/db/{ => views}/viewGridShare.spec.ts   |  6 +++---
 .../tests/db/{ => views}/viewKanban.spec.ts      |  8 ++++----
 .../tests/db/{ => views}/viewMap.spec.ts         |  6 +++---
 55 files changed, 218 insertions(+), 219 deletions(-)
 rename tests/playwright/tests/db/{ => columns}/columnAttachments.spec.ts (96%)
 rename tests/playwright/tests/db/{ => columns}/columnBarcode.spec.ts (99%)
 rename tests/playwright/tests/db/{ => columns}/columnCheckbox.spec.ts (96%)
 rename tests/playwright/tests/db/{ => columns}/columnDateTime.spec.ts (96%)
 rename tests/playwright/tests/db/{ => columns}/columnDuration.spec.ts (97%)
 rename tests/playwright/tests/db/{ => columns}/columnFormula.spec.ts (97%)
 rename tests/playwright/tests/db/{ => columns}/columnGeoData.spec.ts (92%)
 rename tests/playwright/tests/db/{ => columns}/columnLinkToAnotherRecord.spec.ts (98%)
 rename tests/playwright/tests/db/{ => columns}/columnLookupRollup.spec.ts (94%)
 rename tests/playwright/tests/db/{ => columns}/columnLtarDragdrop.spec.ts (94%)
 rename tests/playwright/tests/db/{ => columns}/columnMenuOperations.spec.ts (96%)
 rename tests/playwright/tests/db/{ => columns}/columnMultiSelect.spec.ts (97%)
 rename tests/playwright/tests/db/{ => columns}/columnQrCode.spec.ts (99%)
 rename tests/playwright/tests/db/{ => columns}/columnRating.spec.ts (95%)
 rename tests/playwright/tests/db/{ => columns}/columnRelationalExtendedTests.spec.ts (97%)
 rename tests/playwright/tests/db/{ => columns}/columnSingleSelect.spec.ts (96%)
 rename tests/playwright/tests/db/{ => features}/baseShare.spec.ts (90%)
 rename tests/playwright/tests/db/{ => features}/erd.spec.ts (96%)
 rename tests/playwright/tests/db/{ => features}/expandedFormUrl.spec.ts (95%)
 rename tests/playwright/tests/db/{ => features}/filters.spec.ts (99%)
 rename tests/playwright/tests/db/{ => features}/findRowByScanner.spec.ts (79%)
 rename tests/playwright/tests/db/{ => features}/import.spec.ts (86%)
 rename tests/playwright/tests/db/{ => features}/keyboardShortcuts.spec.ts (98%)
 rename tests/playwright/tests/db/{ => features}/language.spec.ts (89%)
 rename tests/playwright/tests/db/{ => features}/metaLTAR.spec.ts (97%)
 rename tests/playwright/tests/db/{ => features}/metaSync.spec.ts (97%)
 rename tests/playwright/tests/db/{ => features}/mobileMode.spec.ts (90%)
 rename tests/playwright/tests/db/{ => features}/pagination.spec.ts (89%)
 rename tests/playwright/tests/db/{ => features}/swagger.spec.ts (90%)
 rename tests/playwright/tests/db/{ => features}/timezone.spec.ts (99%)
 rename tests/playwright/tests/db/{ => features}/undo-redo.spec.ts (98%)
 rename tests/playwright/tests/db/{ => features}/updateBulk.ts (96%)
 rename tests/playwright/tests/db/{ => features}/verticalFillHandle.spec.ts (97%)
 rename tests/playwright/tests/db/{01-webhook.spec.ts => features/webhook.spec.ts} (98%)
 rename tests/playwright/tests/db/{ => general}/cellSelection.spec.ts (96%)
 rename tests/playwright/tests/db/{ => general}/megaTable.spec.ts (99%)
 rename tests/playwright/tests/db/{ => general}/projectOperations.spec.ts (91%)
 rename tests/playwright/tests/db/{ => general}/tableColumnOperation.spec.ts (93%)
 rename tests/playwright/tests/db/{ => general}/tableOperations.spec.ts (94%)
 rename tests/playwright/tests/db/{ => general}/toolbarOperations.spec.ts (94%)
 rename tests/playwright/tests/db/{ => general}/viewMenu.spec.ts (94%)
 rename tests/playwright/tests/db/{ => general}/views.spec.ts (96%)
 rename tests/playwright/tests/db/{ => users&Accounts}/accountLicense.spec.ts (80%)
 rename tests/playwright/tests/db/{ => users&Accounts}/accountTokenManagement.spec.ts (82%)
 rename tests/playwright/tests/db/{ => users&Accounts}/accountUserManagement.spec.ts (86%)
 rename tests/playwright/tests/db/{ => users&Accounts}/accountUserSettings.spec.ts (86%)
 rename tests/playwright/tests/db/{ => users&Accounts}/authChangePassword.spec.ts (83%)
 rename tests/playwright/tests/db/{ => users&Accounts}/rolesCreate.spec.ts (92%)
 rename tests/playwright/tests/db/{ => users&Accounts}/rolesPreview.spec.ts (92%)
 rename tests/playwright/tests/db/{ => users&Accounts}/rolesSuperUser.spec.ts (95%)
 rename tests/playwright/tests/db/{ => views}/viewForm.spec.ts (97%)
 rename tests/playwright/tests/db/{ => views}/viewFormShareSurvey.spec.ts (93%)
 rename tests/playwright/tests/db/{ => views}/viewGridShare.spec.ts (98%)
 rename tests/playwright/tests/db/{ => views}/viewKanban.spec.ts (97%)
 rename tests/playwright/tests/db/{ => views}/viewMap.spec.ts (93%)

diff --git a/tests/playwright/tests/db/columnAttachments.spec.ts b/tests/playwright/tests/db/columns/columnAttachments.spec.ts
similarity index 96%
rename from tests/playwright/tests/db/columnAttachments.spec.ts
rename to tests/playwright/tests/db/columns/columnAttachments.spec.ts
index 7593457cde..69ea59dea5 100644
--- a/tests/playwright/tests/db/columnAttachments.spec.ts
+++ b/tests/playwright/tests/db/columns/columnAttachments.spec.ts
@@ -1,9 +1,9 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { SharedFormPage } from '../../pages/SharedForm';
-import setup from '../../setup';
-import { AccountPage } from '../../pages/Account';
-import { AccountLicensePage } from '../../pages/Account/License';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { SharedFormPage } from '../../../pages/SharedForm';
+import setup from '../../../setup';
+import { AccountPage } from '../../../pages/Account';
+import { AccountLicensePage } from '../../../pages/Account/License';
 
 test.describe('Attachment column', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/columnBarcode.spec.ts b/tests/playwright/tests/db/columns/columnBarcode.spec.ts
similarity index 99%
rename from tests/playwright/tests/db/columnBarcode.spec.ts
rename to tests/playwright/tests/db/columns/columnBarcode.spec.ts
index 783ce1eae5..8f20c53548 100644
--- a/tests/playwright/tests/db/columnBarcode.spec.ts
+++ b/tests/playwright/tests/db/columns/columnBarcode.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { GridPage } from '../../pages/Dashboard/Grid';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { GridPage } from '../../../pages/Dashboard/Grid';
 
 interface ExpectedBarcodeData {
   referencedValue: string;
diff --git a/tests/playwright/tests/db/columnCheckbox.spec.ts b/tests/playwright/tests/db/columns/columnCheckbox.spec.ts
similarity index 96%
rename from tests/playwright/tests/db/columnCheckbox.spec.ts
rename to tests/playwright/tests/db/columns/columnCheckbox.spec.ts
index b0e1d94c50..b652ce4c1b 100644
--- a/tests/playwright/tests/db/columnCheckbox.spec.ts
+++ b/tests/playwright/tests/db/columns/columnCheckbox.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
 import { UITypes } from 'nocodb-sdk';
 import { Api } from 'nocodb-sdk';
 let api: Api<any>;
diff --git a/tests/playwright/tests/db/columnDateTime.spec.ts b/tests/playwright/tests/db/columns/columnDateTime.spec.ts
similarity index 96%
rename from tests/playwright/tests/db/columnDateTime.spec.ts
rename to tests/playwright/tests/db/columns/columnDateTime.spec.ts
index 7647dea6b3..2428e5d295 100644
--- a/tests/playwright/tests/db/columnDateTime.spec.ts
+++ b/tests/playwright/tests/db/columns/columnDateTime.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 
 const dateTimeData = [
   {
diff --git a/tests/playwright/tests/db/columnDuration.spec.ts b/tests/playwright/tests/db/columns/columnDuration.spec.ts
similarity index 97%
rename from tests/playwright/tests/db/columnDuration.spec.ts
rename to tests/playwright/tests/db/columns/columnDuration.spec.ts
index 6998c55062..37acd515f4 100644
--- a/tests/playwright/tests/db/columnDuration.spec.ts
+++ b/tests/playwright/tests/db/columns/columnDuration.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 
 // Storing one additional dummy value "10" at end of every input array
 // this will trigger update to previously committed data
diff --git a/tests/playwright/tests/db/columnFormula.spec.ts b/tests/playwright/tests/db/columns/columnFormula.spec.ts
similarity index 97%
rename from tests/playwright/tests/db/columnFormula.spec.ts
rename to tests/playwright/tests/db/columns/columnFormula.spec.ts
index 18ddb182af..1754328694 100644
--- a/tests/playwright/tests/db/columnFormula.spec.ts
+++ b/tests/playwright/tests/db/columns/columnFormula.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup, { NcContext } from '../../setup';
-import { isPg, isSqlite } from '../../setup/db';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup, { NcContext } from '../../../setup';
+import { isPg, isSqlite } from '../../../setup/db';
 
 // Add formula to be verified here & store expected results for 5 rows
 // Column data from City table (Sakila DB)
diff --git a/tests/playwright/tests/db/columnGeoData.spec.ts b/tests/playwright/tests/db/columns/columnGeoData.spec.ts
similarity index 92%
rename from tests/playwright/tests/db/columnGeoData.spec.ts
rename to tests/playwright/tests/db/columns/columnGeoData.spec.ts
index 29e35ce5e7..5ea8982b35 100644
--- a/tests/playwright/tests/db/columnGeoData.spec.ts
+++ b/tests/playwright/tests/db/columns/columnGeoData.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { GridPage } from '../../pages/Dashboard/Grid';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { GridPage } from '../../../pages/Dashboard/Grid';
 
 test.describe('Geo Data column', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts b/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
similarity index 98%
rename from tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts
rename to tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
index 1be725e05d..3487138d3c 100644
--- a/tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts
+++ b/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 
 test.describe('LTAR create & update', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/columnLookupRollup.spec.ts b/tests/playwright/tests/db/columns/columnLookupRollup.spec.ts
similarity index 94%
rename from tests/playwright/tests/db/columnLookupRollup.spec.ts
rename to tests/playwright/tests/db/columns/columnLookupRollup.spec.ts
index 236b94d5ed..d78f10724a 100644
--- a/tests/playwright/tests/db/columnLookupRollup.spec.ts
+++ b/tests/playwright/tests/db/columns/columnLookupRollup.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 
 test.describe('Virtual columns', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/columnLtarDragdrop.spec.ts b/tests/playwright/tests/db/columns/columnLtarDragdrop.spec.ts
similarity index 94%
rename from tests/playwright/tests/db/columnLtarDragdrop.spec.ts
rename to tests/playwright/tests/db/columns/columnLtarDragdrop.spec.ts
index 527789aa2f..06cd602333 100644
--- a/tests/playwright/tests/db/columnLtarDragdrop.spec.ts
+++ b/tests/playwright/tests/db/columns/columnLtarDragdrop.spec.ts
@@ -1,9 +1,9 @@
 import { expect, Locator, test } from '@playwright/test';
-import setup from '../../setup';
+import setup from '../../../setup';
 import { Api, UITypes } from 'nocodb-sdk';
-import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import { getTextExcludeIconText } from '../utils/general';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import { getTextExcludeIconText } from '../../utils/general';
 let api: Api<any>;
 const recordCount = 10;
 
diff --git a/tests/playwright/tests/db/columnMenuOperations.spec.ts b/tests/playwright/tests/db/columns/columnMenuOperations.spec.ts
similarity index 96%
rename from tests/playwright/tests/db/columnMenuOperations.spec.ts
rename to tests/playwright/tests/db/columns/columnMenuOperations.spec.ts
index fc2c16149a..09bf3df5c4 100644
--- a/tests/playwright/tests/db/columnMenuOperations.spec.ts
+++ b/tests/playwright/tests/db/columns/columnMenuOperations.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 
 const columns = [
   {
diff --git a/tests/playwright/tests/db/columnMultiSelect.spec.ts b/tests/playwright/tests/db/columns/columnMultiSelect.spec.ts
similarity index 97%
rename from tests/playwright/tests/db/columnMultiSelect.spec.ts
rename to tests/playwright/tests/db/columns/columnMultiSelect.spec.ts
index 029830a155..583b5dd241 100644
--- a/tests/playwright/tests/db/columnMultiSelect.spec.ts
+++ b/tests/playwright/tests/db/columns/columnMultiSelect.spec.ts
@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../../setup';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import setup from '../../../setup';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
 
 test.describe('Multi select', () => {
   let dashboard: DashboardPage, grid: GridPage;
diff --git a/tests/playwright/tests/db/columnQrCode.spec.ts b/tests/playwright/tests/db/columns/columnQrCode.spec.ts
similarity index 99%
rename from tests/playwright/tests/db/columnQrCode.spec.ts
rename to tests/playwright/tests/db/columns/columnQrCode.spec.ts
index 603601c686..0b8ace1575 100644
--- a/tests/playwright/tests/db/columnQrCode.spec.ts
+++ b/tests/playwright/tests/db/columns/columnQrCode.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { GridPage } from '../../pages/Dashboard/Grid';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { GridPage } from '../../../pages/Dashboard/Grid';
 
 type ExpectedQrCodeData = {
   referencedValue: string;
diff --git a/tests/playwright/tests/db/columnRating.spec.ts b/tests/playwright/tests/db/columns/columnRating.spec.ts
similarity index 95%
rename from tests/playwright/tests/db/columnRating.spec.ts
rename to tests/playwright/tests/db/columns/columnRating.spec.ts
index d11916fdee..cbed0b6d0a 100644
--- a/tests/playwright/tests/db/columnRating.spec.ts
+++ b/tests/playwright/tests/db/columns/columnRating.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
 
 test.describe('Rating - cell, filter, sort', () => {
   let dashboard: DashboardPage, toolbar: ToolbarPage;
diff --git a/tests/playwright/tests/db/columnRelationalExtendedTests.spec.ts b/tests/playwright/tests/db/columns/columnRelationalExtendedTests.spec.ts
similarity index 97%
rename from tests/playwright/tests/db/columnRelationalExtendedTests.spec.ts
rename to tests/playwright/tests/db/columns/columnRelationalExtendedTests.spec.ts
index 25fb924d66..60e71ef8de 100644
--- a/tests/playwright/tests/db/columnRelationalExtendedTests.spec.ts
+++ b/tests/playwright/tests/db/columns/columnRelationalExtendedTests.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 
 test.describe('Relational Columns', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/columnSingleSelect.spec.ts b/tests/playwright/tests/db/columns/columnSingleSelect.spec.ts
similarity index 96%
rename from tests/playwright/tests/db/columnSingleSelect.spec.ts
rename to tests/playwright/tests/db/columns/columnSingleSelect.spec.ts
index 9e5302f5fc..6b276a11c6 100644
--- a/tests/playwright/tests/db/columnSingleSelect.spec.ts
+++ b/tests/playwright/tests/db/columns/columnSingleSelect.spec.ts
@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../../setup';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import setup from '../../../setup';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
 
 test.describe('Single select', () => {
   let dashboard: DashboardPage, grid: GridPage;
diff --git a/tests/playwright/tests/db/baseShare.spec.ts b/tests/playwright/tests/db/features/baseShare.spec.ts
similarity index 90%
rename from tests/playwright/tests/db/baseShare.spec.ts
rename to tests/playwright/tests/db/features/baseShare.spec.ts
index e9d83a5be1..a63e80d2aa 100644
--- a/tests/playwright/tests/db/baseShare.spec.ts
+++ b/tests/playwright/tests/db/features/baseShare.spec.ts
@@ -1,10 +1,10 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import { LoginPage } from '../../pages/LoginPage';
-import { ProjectsPage } from '../../pages/ProjectsPage';
-import { getDefaultPwd } from '../utils/general';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import { LoginPage } from '../../../pages/LoginPage';
+import { ProjectsPage } from '../../../pages/ProjectsPage';
+import { getDefaultPwd } from '../../utils/general';
 
 test.describe('Shared base', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/erd.spec.ts b/tests/playwright/tests/db/features/erd.spec.ts
similarity index 96%
rename from tests/playwright/tests/db/erd.spec.ts
rename to tests/playwright/tests/db/features/erd.spec.ts
index 698847010c..f0dbef7044 100644
--- a/tests/playwright/tests/db/erd.spec.ts
+++ b/tests/playwright/tests/db/features/erd.spec.ts
@@ -5,13 +5,13 @@ import {
   pgSakilaSqlViews,
   pgSakilaTables,
   sqliteSakilaSqlViews,
-} from '../utils/sakila';
-import { DashboardPage } from '../../pages/Dashboard';
-import { SettingsSubTab, SettingTab } from '../../pages/Dashboard/Settings';
-import setup from '../../setup';
-import { isMysql, isPg, isSqlite } from '../../setup/db';
-import { SettingsErdPage } from '../../pages/Dashboard/Settings/Erd';
-import { defaultBaseName } from '../../constants';
+} from '../../utils/sakila';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { SettingsSubTab, SettingTab } from '../../../pages/Dashboard/Settings';
+import setup from '../../../setup';
+import { isMysql, isPg, isSqlite } from '../../../setup/db';
+import { SettingsErdPage } from '../../../pages/Dashboard/Settings/Erd';
+import { defaultBaseName } from '../../../constants';
 
 test.describe('Erd', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/expandedFormUrl.spec.ts b/tests/playwright/tests/db/features/expandedFormUrl.spec.ts
similarity index 95%
rename from tests/playwright/tests/db/expandedFormUrl.spec.ts
rename to tests/playwright/tests/db/features/expandedFormUrl.spec.ts
index 78b7b28bf0..7f78db0498 100644
--- a/tests/playwright/tests/db/expandedFormUrl.spec.ts
+++ b/tests/playwright/tests/db/features/expandedFormUrl.spec.ts
@@ -1,9 +1,9 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { GalleryPage } from '../../pages/Dashboard/Gallery';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../../setup';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GalleryPage } from '../../../pages/Dashboard/Gallery';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import setup from '../../../setup';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
 
 test.describe('Expanded form URL', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/filters.spec.ts b/tests/playwright/tests/db/features/filters.spec.ts
similarity index 99%
rename from tests/playwright/tests/db/filters.spec.ts
rename to tests/playwright/tests/db/features/filters.spec.ts
index 162cfda00e..ec706fcd51 100644
--- a/tests/playwright/tests/db/filters.spec.ts
+++ b/tests/playwright/tests/db/features/filters.spec.ts
@@ -1,13 +1,13 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
 import { UITypes } from 'nocodb-sdk';
 import { Api } from 'nocodb-sdk';
-import { rowMixedValue } from '../../setup/xcdb-records';
+import { rowMixedValue } from '../../../setup/xcdb-records';
 import dayjs from 'dayjs';
-import { createDemoTable } from '../../setup/demoTable';
-import { isPg } from '../../setup/db';
+import { createDemoTable } from '../../../setup/demoTable';
+import { isPg } from '../../../setup/db';
 
 let dashboard: DashboardPage, toolbar: ToolbarPage;
 let context: any;
diff --git a/tests/playwright/tests/db/findRowByScanner.spec.ts b/tests/playwright/tests/db/features/findRowByScanner.spec.ts
similarity index 79%
rename from tests/playwright/tests/db/findRowByScanner.spec.ts
rename to tests/playwright/tests/db/features/findRowByScanner.spec.ts
index 167412c99e..1d676755cc 100644
--- a/tests/playwright/tests/db/findRowByScanner.spec.ts
+++ b/tests/playwright/tests/db/features/findRowByScanner.spec.ts
@@ -1,8 +1,8 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import { FormPage } from '../../pages/Dashboard/Form';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import { FormPage } from '../../../pages/Dashboard/Form';
+import setup from '../../../setup';
 
 // Skip for now as it is not working in CI atm
 test.describe.skip('Find row by scanner', () => {
diff --git a/tests/playwright/tests/db/import.spec.ts b/tests/playwright/tests/db/features/import.spec.ts
similarity index 86%
rename from tests/playwright/tests/db/import.spec.ts
rename to tests/playwright/tests/db/features/import.spec.ts
index 9a8167d004..d57a819b67 100644
--- a/tests/playwright/tests/db/import.spec.ts
+++ b/tests/playwright/tests/db/features/import.spec.ts
@@ -1,9 +1,9 @@
 import { test } from '@playwright/test';
-import { airtableApiBase, airtableApiKey } from '../../constants';
-import { DashboardPage } from '../../pages/Dashboard';
-import { quickVerify } from '../../quickTests/commonTest';
-import setup from '../../setup';
-import { isPg, isSqlite } from '../../setup/db';
+import { airtableApiBase, airtableApiKey } from '../../../constants';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { quickVerify } from '../../../quickTests/commonTest';
+import setup from '../../../setup';
+import { isPg, isSqlite } from '../../../setup/db';
 
 test.describe('Import', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/keyboardShortcuts.spec.ts b/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts
similarity index 98%
rename from tests/playwright/tests/db/keyboardShortcuts.spec.ts
rename to tests/playwright/tests/db/features/keyboardShortcuts.spec.ts
index 43b29ae1ad..06ca67800a 100644
--- a/tests/playwright/tests/db/keyboardShortcuts.spec.ts
+++ b/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import setup from '../../../setup';
 import { Api, UITypes } from 'nocodb-sdk';
 
 let api: Api<any>;
diff --git a/tests/playwright/tests/db/language.spec.ts b/tests/playwright/tests/db/features/language.spec.ts
similarity index 89%
rename from tests/playwright/tests/db/language.spec.ts
rename to tests/playwright/tests/db/features/language.spec.ts
index d78b049e16..ffa0a0b1c3 100644
--- a/tests/playwright/tests/db/language.spec.ts
+++ b/tests/playwright/tests/db/features/language.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { ProjectsPage } from '../../pages/ProjectsPage';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { ProjectsPage } from '../../../pages/ProjectsPage';
+import setup from '../../../setup';
 
 const langMenu = [
   'help-translate',
diff --git a/tests/playwright/tests/db/metaLTAR.spec.ts b/tests/playwright/tests/db/features/metaLTAR.spec.ts
similarity index 97%
rename from tests/playwright/tests/db/metaLTAR.spec.ts
rename to tests/playwright/tests/db/features/metaLTAR.spec.ts
index 7205c37c33..590e4e35d2 100644
--- a/tests/playwright/tests/db/metaLTAR.spec.ts
+++ b/tests/playwright/tests/db/features/metaLTAR.spec.ts
@@ -20,13 +20,12 @@
  */
 
 import { test } from '@playwright/test';
-import setup from '../../setup';
+import setup from '../../../setup';
 import { Api, UITypes } from 'nocodb-sdk';
-import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import { createXcdb, deleteXcdb } from '../../setup/xcdbProject';
-import { ProjectsPage } from '../../pages/ProjectsPage';
-import { isSqlite } from '../../setup/db';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import { createXcdb, deleteXcdb } from '../../../setup/xcdbProject';
+import { ProjectsPage } from '../../../pages/ProjectsPage';
 let api: Api<any>;
 const recordCount = 10;
 
diff --git a/tests/playwright/tests/db/metaSync.spec.ts b/tests/playwright/tests/db/features/metaSync.spec.ts
similarity index 97%
rename from tests/playwright/tests/db/metaSync.spec.ts
rename to tests/playwright/tests/db/features/metaSync.spec.ts
index a0f3f9ee55..a9f84ec630 100644
--- a/tests/playwright/tests/db/metaSync.spec.ts
+++ b/tests/playwright/tests/db/features/metaSync.spec.ts
@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { SettingsPage, SettingTab } from '../../pages/Dashboard/Settings';
-import setup, { NcContext } from '../../setup';
-import { isMysql, isPg, isSqlite, mysqlExec, pgExec, sqliteExec } from '../../setup/db';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { SettingsPage, SettingTab } from '../../../pages/Dashboard/Settings';
+import setup, { NcContext } from '../../../setup';
+import { isMysql, isPg, isSqlite, mysqlExec, pgExec, sqliteExec } from '../../../setup/db';
 
 test.describe('Meta sync', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/mobileMode.spec.ts b/tests/playwright/tests/db/features/mobileMode.spec.ts
similarity index 90%
rename from tests/playwright/tests/db/mobileMode.spec.ts
rename to tests/playwright/tests/db/features/mobileMode.spec.ts
index 997c3b958a..d5a2806b44 100644
--- a/tests/playwright/tests/db/mobileMode.spec.ts
+++ b/tests/playwright/tests/db/features/mobileMode.spec.ts
@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import { FormPage } from '../../pages/Dashboard/Form';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import { FormPage } from '../../../pages/Dashboard/Form';
+import setup from '../../../setup';
 
 test.describe('Mobile Mode', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/pagination.spec.ts b/tests/playwright/tests/db/features/pagination.spec.ts
similarity index 89%
rename from tests/playwright/tests/db/pagination.spec.ts
rename to tests/playwright/tests/db/features/pagination.spec.ts
index 45b7040c88..9342245b2f 100644
--- a/tests/playwright/tests/db/pagination.spec.ts
+++ b/tests/playwright/tests/db/features/pagination.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 
 test.describe('Grid pagination', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/swagger.spec.ts b/tests/playwright/tests/db/features/swagger.spec.ts
similarity index 90%
rename from tests/playwright/tests/db/swagger.spec.ts
rename to tests/playwright/tests/db/features/swagger.spec.ts
index 05b51f7568..714f02f57a 100644
--- a/tests/playwright/tests/db/swagger.spec.ts
+++ b/tests/playwright/tests/db/features/swagger.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import setup from '../../../setup';
 
 test.describe('Table Column Operations', () => {
   let grid: GridPage, dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/timezone.spec.ts b/tests/playwright/tests/db/features/timezone.spec.ts
similarity index 99%
rename from tests/playwright/tests/db/timezone.spec.ts
rename to tests/playwright/tests/db/features/timezone.spec.ts
index 562914cec3..7946b825c8 100644
--- a/tests/playwright/tests/db/timezone.spec.ts
+++ b/tests/playwright/tests/db/features/timezone.spec.ts
@@ -1,12 +1,12 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 import { knex } from 'knex';
 import { Api, UITypes } from 'nocodb-sdk';
-import { ProjectsPage } from '../../pages/ProjectsPage';
-import { isMysql, isPg, isSqlite } from '../../setup/db';
-import { getKnexConfig } from '../utils/config';
-import { getBrowserTimezoneOffset } from '../utils/general';
+import { ProjectsPage } from '../../../pages/ProjectsPage';
+import { isMysql, isPg, isSqlite } from '../../../setup/db';
+import { getKnexConfig } from '../../utils/config';
+import { getBrowserTimezoneOffset } from '../../utils/general';
 let api: Api<any>, records: any[];
 
 const columns = [
diff --git a/tests/playwright/tests/db/undo-redo.spec.ts b/tests/playwright/tests/db/features/undo-redo.spec.ts
similarity index 98%
rename from tests/playwright/tests/db/undo-redo.spec.ts
rename to tests/playwright/tests/db/features/undo-redo.spec.ts
index 52b402bf4c..4d50603749 100644
--- a/tests/playwright/tests/db/undo-redo.spec.ts
+++ b/tests/playwright/tests/db/features/undo-redo.spec.ts
@@ -1,11 +1,11 @@
 import { expect, Page, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 import { Api, UITypes } from 'nocodb-sdk';
-import { rowMixedValue } from '../../setup/xcdb-records';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import { isSqlite } from '../../setup/db';
+import { rowMixedValue } from '../../../setup/xcdb-records';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import { isSqlite } from '../../../setup/db';
 
 let dashboard: DashboardPage,
   grid: GridPage,
diff --git a/tests/playwright/tests/db/updateBulk.ts b/tests/playwright/tests/db/features/updateBulk.ts
similarity index 96%
rename from tests/playwright/tests/db/updateBulk.ts
rename to tests/playwright/tests/db/features/updateBulk.ts
index f1482f6fc3..ccebe38132 100644
--- a/tests/playwright/tests/db/updateBulk.ts
+++ b/tests/playwright/tests/db/features/updateBulk.ts
@@ -1,11 +1,11 @@
 import { expect, test } from '@playwright/test';
-import setup from '../../setup';
-import { DashboardPage } from '../../pages/Dashboard';
+import setup from '../../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
 import { Api } from 'nocodb-sdk';
-import { createDemoTable } from '../../setup/demoTable';
-import { BulkUpdatePage } from '../../pages/Dashboard/BulkUpdate';
-import { AccountLicensePage } from '../../pages/Account/License';
-import { AccountPage } from '../../pages/Account';
+import { createDemoTable } from '../../../setup/demoTable';
+import { BulkUpdatePage } from '../../../pages/Dashboard/BulkUpdate';
+import { AccountLicensePage } from '../../../pages/Account/License';
+import { AccountPage } from '../../../pages/Account';
 
 let bulkUpdateForm: BulkUpdatePage;
 let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/verticalFillHandle.spec.ts b/tests/playwright/tests/db/features/verticalFillHandle.spec.ts
similarity index 97%
rename from tests/playwright/tests/db/verticalFillHandle.spec.ts
rename to tests/playwright/tests/db/features/verticalFillHandle.spec.ts
index 7d62ea3784..f898622017 100644
--- a/tests/playwright/tests/db/verticalFillHandle.spec.ts
+++ b/tests/playwright/tests/db/features/verticalFillHandle.spec.ts
@@ -1,9 +1,9 @@
 import { expect, test } from '@playwright/test';
-import setup from '../../setup';
-import { DashboardPage } from '../../pages/Dashboard';
+import setup from '../../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
 import { Api } from 'nocodb-sdk';
-import { createDemoTable } from '../../setup/demoTable';
-import { BulkUpdatePage } from '../../pages/Dashboard/BulkUpdate';
+import { createDemoTable } from '../../../setup/demoTable';
+import { BulkUpdatePage } from '../../../pages/Dashboard/BulkUpdate';
 
 let dashboard: DashboardPage;
 let context: any;
diff --git a/tests/playwright/tests/db/01-webhook.spec.ts b/tests/playwright/tests/db/features/webhook.spec.ts
similarity index 98%
rename from tests/playwright/tests/db/01-webhook.spec.ts
rename to tests/playwright/tests/db/features/webhook.spec.ts
index b02130544c..5952b1e31e 100644
--- a/tests/playwright/tests/db/01-webhook.spec.ts
+++ b/tests/playwright/tests/db/features/webhook.spec.ts
@@ -1,11 +1,11 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import makeServer from '../../setup/server';
-import { WebhookFormPage } from '../../pages/Dashboard/WebhookForm';
-import { isSubset } from '../utils/general';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import makeServer from '../../../setup/server';
+import { WebhookFormPage } from '../../../pages/Dashboard/WebhookForm';
+import { isSubset } from '../../utils/general';
 import { Api, UITypes } from 'nocodb-sdk';
-import { isMysql, isPg, isSqlite } from '../../setup/db';
+import { isMysql, isPg, isSqlite } from '../../../setup/db';
 
 const hookPath = 'http://localhost:9090/hook';
 let api: Api<any>;
diff --git a/tests/playwright/tests/db/cellSelection.spec.ts b/tests/playwright/tests/db/general/cellSelection.spec.ts
similarity index 96%
rename from tests/playwright/tests/db/cellSelection.spec.ts
rename to tests/playwright/tests/db/general/cellSelection.spec.ts
index dde273b676..42a59589a7 100644
--- a/tests/playwright/tests/db/cellSelection.spec.ts
+++ b/tests/playwright/tests/db/general/cellSelection.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import setup from '../../../setup';
 
 test.describe('Verify cell selection', () => {
   let dashboard: DashboardPage, grid: GridPage;
diff --git a/tests/playwright/tests/db/megaTable.spec.ts b/tests/playwright/tests/db/general/megaTable.spec.ts
similarity index 99%
rename from tests/playwright/tests/db/megaTable.spec.ts
rename to tests/playwright/tests/db/general/megaTable.spec.ts
index b47c09ecf2..8b92b2533f 100644
--- a/tests/playwright/tests/db/megaTable.spec.ts
+++ b/tests/playwright/tests/db/general/megaTable.spec.ts
@@ -1,5 +1,5 @@
 import { test } from '@playwright/test';
-import setup from '../../setup';
+import setup from '../../../setup';
 import { UITypes } from 'nocodb-sdk';
 import { Api } from 'nocodb-sdk';
 let api: Api<any>;
diff --git a/tests/playwright/tests/db/projectOperations.spec.ts b/tests/playwright/tests/db/general/projectOperations.spec.ts
similarity index 91%
rename from tests/playwright/tests/db/projectOperations.spec.ts
rename to tests/playwright/tests/db/general/projectOperations.spec.ts
index e1e9acb99d..a8e1deb10b 100644
--- a/tests/playwright/tests/db/projectOperations.spec.ts
+++ b/tests/playwright/tests/db/general/projectOperations.spec.ts
@@ -1,13 +1,13 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { airtableApiBase, airtableApiKey } from '../../constants';
-import { quickVerify } from '../../quickTests/commonTest';
-import setup from '../../setup';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import { ProjectsPage } from '../../pages/ProjectsPage';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { airtableApiBase, airtableApiKey } from '../../../constants';
+import { quickVerify } from '../../../quickTests/commonTest';
+import setup from '../../../setup';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import { ProjectsPage } from '../../../pages/ProjectsPage';
 import { Api } from 'nocodb-sdk';
-import { ProjectInfo, ProjectInfoApiUtil } from '../utils/projectInfoApiUtil';
-import { deepCompare } from '../utils/objectCompareUtil';
+import { ProjectInfo, ProjectInfoApiUtil } from '../../utils/projectInfoApiUtil';
+import { deepCompare } from '../../utils/objectCompareUtil';
 
 test.describe('Project operations', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/tableColumnOperation.spec.ts b/tests/playwright/tests/db/general/tableColumnOperation.spec.ts
similarity index 93%
rename from tests/playwright/tests/db/tableColumnOperation.spec.ts
rename to tests/playwright/tests/db/general/tableColumnOperation.spec.ts
index 39fdc99de5..fc615db0df 100644
--- a/tests/playwright/tests/db/tableColumnOperation.spec.ts
+++ b/tests/playwright/tests/db/general/tableColumnOperation.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { GridPage } from '../../../pages/Dashboard/Grid';
+import setup from '../../../setup';
 
 test.describe('Table Column Operations', () => {
   let grid: GridPage, dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/tableOperations.spec.ts b/tests/playwright/tests/db/general/tableOperations.spec.ts
similarity index 94%
rename from tests/playwright/tests/db/tableOperations.spec.ts
rename to tests/playwright/tests/db/general/tableOperations.spec.ts
index 21b72c62ff..6b47564c4e 100644
--- a/tests/playwright/tests/db/tableOperations.spec.ts
+++ b/tests/playwright/tests/db/general/tableOperations.spec.ts
@@ -1,10 +1,10 @@
 import { expect, test } from '@playwright/test';
 import { Api, TableListType, TableType } from 'nocodb-sdk';
-import { DashboardPage } from '../../pages/Dashboard';
-import { SettingsPage, SettingTab } from '../../pages/Dashboard/Settings';
-import { deepCompare } from '../utils/objectCompareUtil';
-import setup from '../../setup';
-import { ProjectInfoApiUtil, TableInfo } from '../utils/projectInfoApiUtil';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { SettingsPage, SettingTab } from '../../../pages/Dashboard/Settings';
+import { deepCompare } from '../../utils/objectCompareUtil';
+import setup from '../../../setup';
+import { ProjectInfoApiUtil, TableInfo } from '../../utils/projectInfoApiUtil';
 
 test.describe('Table Operations', () => {
   let dashboard: DashboardPage, settings: SettingsPage;
diff --git a/tests/playwright/tests/db/toolbarOperations.spec.ts b/tests/playwright/tests/db/general/toolbarOperations.spec.ts
similarity index 94%
rename from tests/playwright/tests/db/toolbarOperations.spec.ts
rename to tests/playwright/tests/db/general/toolbarOperations.spec.ts
index 0aed159cd4..87f09652e9 100644
--- a/tests/playwright/tests/db/toolbarOperations.spec.ts
+++ b/tests/playwright/tests/db/general/toolbarOperations.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import setup from '../../../setup';
 
 test.describe('Toolbar operations (GRID)', () => {
   let dashboard: DashboardPage, toolbar: ToolbarPage;
diff --git a/tests/playwright/tests/db/viewMenu.spec.ts b/tests/playwright/tests/db/general/viewMenu.spec.ts
similarity index 94%
rename from tests/playwright/tests/db/viewMenu.spec.ts
rename to tests/playwright/tests/db/general/viewMenu.spec.ts
index 5a9f93471e..ab95392cf7 100644
--- a/tests/playwright/tests/db/viewMenu.spec.ts
+++ b/tests/playwright/tests/db/general/viewMenu.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { isPg } from '../../setup/db';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { isPg } from '../../../setup/db';
 
 test.describe('Grid view locked', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/views.spec.ts b/tests/playwright/tests/db/general/views.spec.ts
similarity index 96%
rename from tests/playwright/tests/db/views.spec.ts
rename to tests/playwright/tests/db/general/views.spec.ts
index 2ee1add7b9..56fce6970f 100644
--- a/tests/playwright/tests/db/views.spec.ts
+++ b/tests/playwright/tests/db/general/views.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import setup from '../../../setup';
 
 test.describe('Views CRUD Operations', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/accountLicense.spec.ts b/tests/playwright/tests/db/users&Accounts/accountLicense.spec.ts
similarity index 80%
rename from tests/playwright/tests/db/accountLicense.spec.ts
rename to tests/playwright/tests/db/users&Accounts/accountLicense.spec.ts
index ec3ab37502..52957dd825 100644
--- a/tests/playwright/tests/db/accountLicense.spec.ts
+++ b/tests/playwright/tests/db/users&Accounts/accountLicense.spec.ts
@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { AccountPage } from '../../pages/Account';
-import setup from '../../setup';
-import { AccountLicensePage } from '../../pages/Account/License';
-import { DashboardPage } from '../../pages/Dashboard';
+import { AccountPage } from '../../../pages/Account';
+import setup from '../../../setup';
+import { AccountLicensePage } from '../../../pages/Account/License';
+import { DashboardPage } from '../../../pages/Dashboard';
 
 test.describe('Enterprise License', () => {
   // @ts-ignore
diff --git a/tests/playwright/tests/db/accountTokenManagement.spec.ts b/tests/playwright/tests/db/users&Accounts/accountTokenManagement.spec.ts
similarity index 82%
rename from tests/playwright/tests/db/accountTokenManagement.spec.ts
rename to tests/playwright/tests/db/users&Accounts/accountTokenManagement.spec.ts
index 1cd9ace2eb..89bc82f108 100644
--- a/tests/playwright/tests/db/accountTokenManagement.spec.ts
+++ b/tests/playwright/tests/db/users&Accounts/accountTokenManagement.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { AccountPage } from '../../pages/Account';
-import { AccountTokenPage } from '../../pages/Account/Token';
-import setup from '../../setup';
+import { AccountPage } from '../../../pages/Account';
+import { AccountTokenPage } from '../../../pages/Account/Token';
+import setup from '../../../setup';
 
 test.describe('User roles', () => {
   let accountTokenPage: AccountTokenPage;
diff --git a/tests/playwright/tests/db/accountUserManagement.spec.ts b/tests/playwright/tests/db/users&Accounts/accountUserManagement.spec.ts
similarity index 86%
rename from tests/playwright/tests/db/accountUserManagement.spec.ts
rename to tests/playwright/tests/db/users&Accounts/accountUserManagement.spec.ts
index 45b4a3c3da..5778fabd02 100644
--- a/tests/playwright/tests/db/accountUserManagement.spec.ts
+++ b/tests/playwright/tests/db/users&Accounts/accountUserManagement.spec.ts
@@ -1,10 +1,10 @@
 import { test } from '@playwright/test';
-import { AccountPage } from '../../pages/Account';
-import { AccountUsersPage } from '../../pages/Account/Users';
-import { ProjectsPage } from '../../pages/ProjectsPage';
-import { SignupPage } from '../../pages/SignupPage';
-import setup from '../../setup';
-import { getDefaultPwd } from '../utils/general';
+import { AccountPage } from '../../../pages/Account';
+import { AccountUsersPage } from '../../../pages/Account/Users';
+import { ProjectsPage } from '../../../pages/ProjectsPage';
+import { SignupPage } from '../../../pages/SignupPage';
+import setup from '../../../setup';
+import { getDefaultPwd } from '../../utils/general';
 
 const roleDb = [
   { email: 'creator@nocodb.com', role: 'Organization Level Creator', url: '' },
diff --git a/tests/playwright/tests/db/accountUserSettings.spec.ts b/tests/playwright/tests/db/users&Accounts/accountUserSettings.spec.ts
similarity index 86%
rename from tests/playwright/tests/db/accountUserSettings.spec.ts
rename to tests/playwright/tests/db/users&Accounts/accountUserSettings.spec.ts
index dd4904cd66..1cc5bac4c8 100644
--- a/tests/playwright/tests/db/accountUserSettings.spec.ts
+++ b/tests/playwright/tests/db/users&Accounts/accountUserSettings.spec.ts
@@ -1,9 +1,9 @@
 import { test } from '@playwright/test';
-import { AccountPage } from '../../pages/Account';
-import { AccountSettingsPage } from '../../pages/Account/Settings';
-import { SignupPage } from '../../pages/SignupPage';
-import setup from '../../setup';
-import { getDefaultPwd } from '../utils/general';
+import { AccountPage } from '../../../pages/Account';
+import { AccountSettingsPage } from '../../../pages/Account/Settings';
+import { SignupPage } from '../../../pages/SignupPage';
+import setup from '../../../setup';
+import { getDefaultPwd } from '../../utils/general';
 
 test.describe('App settings', () => {
   let accountSettingsPage: AccountSettingsPage;
diff --git a/tests/playwright/tests/db/authChangePassword.spec.ts b/tests/playwright/tests/db/users&Accounts/authChangePassword.spec.ts
similarity index 83%
rename from tests/playwright/tests/db/authChangePassword.spec.ts
rename to tests/playwright/tests/db/users&Accounts/authChangePassword.spec.ts
index 82ec5be74f..f7f81245ae 100644
--- a/tests/playwright/tests/db/authChangePassword.spec.ts
+++ b/tests/playwright/tests/db/users&Accounts/authChangePassword.spec.ts
@@ -1,12 +1,12 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { LoginPage } from '../../pages/LoginPage';
-import { SettingsPage, SettingTab } from '../../pages/Dashboard/Settings';
-import { SignupPage } from '../../pages/SignupPage';
-import { ProjectsPage } from '../../pages/ProjectsPage';
-import { AccountPage } from '../../pages/Account';
-import { getDefaultPwd } from '../utils/general';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { LoginPage } from '../../../pages/LoginPage';
+import { SettingsPage, SettingTab } from '../../../pages/Dashboard/Settings';
+import { SignupPage } from '../../../pages/SignupPage';
+import { ProjectsPage } from '../../../pages/ProjectsPage';
+import { AccountPage } from '../../../pages/Account';
+import { getDefaultPwd } from '../../utils/general';
 
 test.describe('Auth', () => {
   let context: any;
diff --git a/tests/playwright/tests/db/rolesCreate.spec.ts b/tests/playwright/tests/db/users&Accounts/rolesCreate.spec.ts
similarity index 92%
rename from tests/playwright/tests/db/rolesCreate.spec.ts
rename to tests/playwright/tests/db/users&Accounts/rolesCreate.spec.ts
index 672b77e4fa..e4c7f13902 100644
--- a/tests/playwright/tests/db/rolesCreate.spec.ts
+++ b/tests/playwright/tests/db/users&Accounts/rolesCreate.spec.ts
@@ -1,10 +1,10 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { SettingsPage, SettingTab } from '../../pages/Dashboard/Settings';
-import { SignupPage } from '../../pages/SignupPage';
-import { ProjectsPage } from '../../pages/ProjectsPage';
-import { getDefaultPwd } from '../utils/general';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { SettingsPage, SettingTab } from '../../../pages/Dashboard/Settings';
+import { SignupPage } from '../../../pages/SignupPage';
+import { ProjectsPage } from '../../../pages/ProjectsPage';
+import { getDefaultPwd } from '../../utils/general';
 
 const roleDb = [
   { email: 'creator@nocodb.com', role: 'creator', url: '' },
diff --git a/tests/playwright/tests/db/rolesPreview.spec.ts b/tests/playwright/tests/db/users&Accounts/rolesPreview.spec.ts
similarity index 92%
rename from tests/playwright/tests/db/rolesPreview.spec.ts
rename to tests/playwright/tests/db/users&Accounts/rolesPreview.spec.ts
index 16a9349767..8c29ea288b 100644
--- a/tests/playwright/tests/db/rolesPreview.spec.ts
+++ b/tests/playwright/tests/db/users&Accounts/rolesPreview.spec.ts
@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import { SettingsPage, SettingTab } from '../../pages/Dashboard/Settings';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import { SettingsPage, SettingTab } from '../../../pages/Dashboard/Settings';
 
 const roles = ['Editor', 'Commenter', 'Viewer'];
 
diff --git a/tests/playwright/tests/db/rolesSuperUser.spec.ts b/tests/playwright/tests/db/users&Accounts/rolesSuperUser.spec.ts
similarity index 95%
rename from tests/playwright/tests/db/rolesSuperUser.spec.ts
rename to tests/playwright/tests/db/users&Accounts/rolesSuperUser.spec.ts
index f5fd01aeab..078720272b 100644
--- a/tests/playwright/tests/db/rolesSuperUser.spec.ts
+++ b/tests/playwright/tests/db/users&Accounts/rolesSuperUser.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
 
 test.describe('Super user', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/viewForm.spec.ts b/tests/playwright/tests/db/views/viewForm.spec.ts
similarity index 97%
rename from tests/playwright/tests/db/viewForm.spec.ts
rename to tests/playwright/tests/db/views/viewForm.spec.ts
index 351e7fc0d3..5547997db4 100644
--- a/tests/playwright/tests/db/viewForm.spec.ts
+++ b/tests/playwright/tests/db/views/viewForm.spec.ts
@@ -1,10 +1,10 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { FormPage } from '../../pages/Dashboard/Form';
-import { SharedFormPage } from '../../pages/SharedForm';
-import { AccountPage } from '../../pages/Account';
-import { AccountAppStorePage } from '../../pages/Account/AppStore';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { FormPage } from '../../../pages/Dashboard/Form';
+import { SharedFormPage } from '../../../pages/SharedForm';
+import { AccountPage } from '../../../pages/Account';
+import { AccountAppStorePage } from '../../../pages/Account/AppStore';
 import { Api, UITypes } from 'nocodb-sdk';
 let api: Api<any>;
 
diff --git a/tests/playwright/tests/db/viewFormShareSurvey.spec.ts b/tests/playwright/tests/db/views/viewFormShareSurvey.spec.ts
similarity index 93%
rename from tests/playwright/tests/db/viewFormShareSurvey.spec.ts
rename to tests/playwright/tests/db/views/viewFormShareSurvey.spec.ts
index b05528155d..c77528459c 100644
--- a/tests/playwright/tests/db/viewFormShareSurvey.spec.ts
+++ b/tests/playwright/tests/db/views/viewFormShareSurvey.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { SurveyFormPage } from '../../pages/Dashboard/SurveyForm';
-import setup from '../../setup';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { SurveyFormPage } from '../../../pages/Dashboard/SurveyForm';
+import setup from '../../../setup';
 
 test.describe('Share form', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/viewGridShare.spec.ts b/tests/playwright/tests/db/views/viewGridShare.spec.ts
similarity index 98%
rename from tests/playwright/tests/db/viewGridShare.spec.ts
rename to tests/playwright/tests/db/views/viewGridShare.spec.ts
index 659979caaf..f904db429f 100644
--- a/tests/playwright/tests/db/viewGridShare.spec.ts
+++ b/tests/playwright/tests/db/views/viewGridShare.spec.ts
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../../setup';
-import { isMysql, isPg, isSqlite } from '../../setup/db';
+import { DashboardPage } from '../../../pages/Dashboard';
+import setup from '../../../setup';
+import { isMysql, isPg, isSqlite } from '../../../setup/db';
 
 test.describe('Shared view', () => {
   let dashboard: DashboardPage;
diff --git a/tests/playwright/tests/db/viewKanban.spec.ts b/tests/playwright/tests/db/views/viewKanban.spec.ts
similarity index 97%
rename from tests/playwright/tests/db/viewKanban.spec.ts
rename to tests/playwright/tests/db/views/viewKanban.spec.ts
index 6231f9636e..c4de4cbd4c 100644
--- a/tests/playwright/tests/db/viewKanban.spec.ts
+++ b/tests/playwright/tests/db/views/viewKanban.spec.ts
@@ -1,9 +1,9 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
 
-import setup from '../../setup';
-import { isPg, isSqlite } from '../../setup/db';
+import setup from '../../../setup';
+import { isPg, isSqlite } from '../../../setup/db';
 
 const filmRatings = ['G', 'PG', 'PG-13', 'R', 'NC-17'];
 
diff --git a/tests/playwright/tests/db/viewMap.spec.ts b/tests/playwright/tests/db/views/viewMap.spec.ts
similarity index 93%
rename from tests/playwright/tests/db/viewMap.spec.ts
rename to tests/playwright/tests/db/views/viewMap.spec.ts
index d2ca547f17..23f957fe8d 100644
--- a/tests/playwright/tests/db/viewMap.spec.ts
+++ b/tests/playwright/tests/db/views/viewMap.spec.ts
@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../../pages/Dashboard';
-import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
+import { DashboardPage } from '../../../pages/Dashboard';
+import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
 
-import setup from '../../setup';
+import setup from '../../../setup';
 
 test.describe('Map View', () => {
   let dashboard: DashboardPage, toolbar: ToolbarPage;

From 6521c700b891b339939b092f5dd084f643fd155e Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Sat, 1 Jul 2023 10:52:43 +0530
Subject: [PATCH 187/208] test: update hardwired path in language spec

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/db/features/language.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/playwright/tests/db/features/language.spec.ts b/tests/playwright/tests/db/features/language.spec.ts
index ffa0a0b1c3..b1dc55a035 100644
--- a/tests/playwright/tests/db/features/language.spec.ts
+++ b/tests/playwright/tests/db/features/language.spec.ts
@@ -58,7 +58,7 @@ test.describe('Common', () => {
     // Index is the order in which menu options appear
     for (let i = 1; i < langMenu.length; i++) {
       // scripts/playwright/tests/language.spec.ts
-      const json = require(`../../../../packages/nc-gui/lang/${langMenu[i]}`);
+      const json = require(`../../../../../packages/nc-gui/lang/${langMenu[i]}`);
       await projectsPage.openLanguageMenu();
       await projectsPage.selectLanguage({ index: i });
       await projectsPage.verifyLanguage({ json });

From 26fcdde9ea81449c13c603ecb6a847ee44951a53 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Sat, 1 Jul 2023 12:08:14 +0530
Subject: [PATCH 188/208] fix: attach button align center

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 packages/nc-gui/components/cell/attachment/index.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/cell/attachment/index.vue b/packages/nc-gui/components/cell/attachment/index.vue
index af4f0aefcb..69a298927b 100644
--- a/packages/nc-gui/components/cell/attachment/index.vue
+++ b/packages/nc-gui/components/cell/attachment/index.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { onKeyDown } from '@vueuse/core'
-import { RowHeightInj } from '~/context'
 import { useProvideAttachmentCell } from './utils'
 import { useSortable } from './sort'
+import { RowHeightInj } from '~/context'
 import {
   ActiveCellInj,
   CurrentCellInj,
@@ -131,14 +131,15 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e) => {
   }
 })
 
-
 const rowHeight = inject(RowHeightInj, ref(1.8))
-
 </script>
 
 <template>
   <div
     ref="attachmentCellRef"
+    :style="{
+      height: isForm ? undefined : `max(${(rowHeight || 1) * 1.8}rem, 41px)`,
+    }"
     class="nc-attachment-cell relative flex-1 color-transition flex items-center justify-between gap-1"
   >
     <LazyCellAttachmentCarousel />
@@ -158,7 +159,7 @@ const rowHeight = inject(RowHeightInj, ref(1.8))
     <div
       v-if="!isReadonly"
       :class="{ 'mx-auto px-4': !visibleItems.length }"
-      class="group cursor-pointer flex gap-1 items-center active:(ring ring-accent ring-opacity-100) rounded border-1 shadow-sm hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
+      class="group cursor-pointer py-1 flex gap-1 items-center active:(ring ring-accent ring-opacity-100) rounded border-1 shadow-sm hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
       data-testid="attachment-cell-file-picker-button"
       @click.stop="open"
     >
@@ -190,7 +191,7 @@ const rowHeight = inject(RowHeightInj, ref(1.8))
         :class="{ dragging }"
         class="flex cursor-pointer justify-center items-center flex-wrap gap-2 py-1.5 scrollbar-thin-dull overflow-hidden mt-0 items-start"
         :style="{
-          maxHeight: `max(${(rowHeight || 1) * 1.8}rem, 41px)`,
+          maxHeight: isForm ? undefined : `max(${(rowHeight || 1) * 1.8}rem, 41px)`,
         }"
       >
         <template v-for="(item, i) of visibleItems" :key="item.url || item.title">

From c2906b6222eb7ce335c602f2edb030ac30402439 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Sat, 1 Jul 2023 14:11:51 +0300
Subject: [PATCH 189/208] fix: clear selection if add row cancelled

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nc-gui/components/smartsheet/Grid.vue | 15 ++++++++++++++-
 packages/nc-gui/composables/useViewData.ts     |  2 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index fc8c4f98a3..a03b8b9635 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -942,6 +942,19 @@ const refreshFillHandle = () => {
   }
 }
 
+const addRowExpandOnClose = (row: Row) => {
+  if (!skipRowRemovalOnCancel.value) {
+    const removed = removeRowIfNew(row)
+
+    if (removed) {
+      clearSelectedRange()
+
+      activeCell.row = null
+      activeCell.col = null
+    }
+  }
+}
+
 watch(
   [() => selectedRange.end.row, () => selectedRange.end.col, () => activeCell.row, () => activeCell.col],
   ([sr, sc, ar, ac], [osr, osc, oar, oac]) => {
@@ -1311,7 +1324,7 @@ useEventListener(document, 'mouseup', () => {
         :state="expandedFormRowState"
         :meta="meta"
         :view="view"
-        @update:model-value="!skipRowRemovalOnCancel && removeRowIfNew(expandedFormRow)"
+        @update:model-value="addRowExpandOnClose(expandedFormRow)"
       />
     </Suspense>
 
diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts
index 4a996fd75e..a95e0e25bf 100644
--- a/packages/nc-gui/composables/useViewData.ts
+++ b/packages/nc-gui/composables/useViewData.ts
@@ -938,7 +938,9 @@ export function useViewData(
 
     if (index > -1 && row.rowMeta.new) {
       formattedData.value.splice(index, 1)
+      return true
     }
+    return false
   }
 
   // get current expanded row index

From 5264ed07d3fa9360d504d19c7d72758457afabaf Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:40:51 +0530
Subject: [PATCH 190/208] test: change in m2m column names

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../fixtures/expectedBaseDownloadData.txt     |  2 +-
 .../fixtures/expectedBaseDownloadDataPg.txt   |  2 +-
 .../playwright/pages/Dashboard/Grid/index.ts  | 12 ++++-----
 .../pages/Dashboard/common/Cell/index.ts      |  2 +-
 .../db/columns/columnAttachments.spec.ts      |  2 +-
 .../tests/db/columns/columnBarcode.spec.ts    |  2 +-
 .../tests/db/columns/columnFormula.spec.ts    |  2 +-
 .../columns/columnLinkToAnotherRecord.spec.ts | 26 +++++++++----------
 .../db/columns/columnLookupRollup.spec.ts     |  2 +-
 .../db/columns/columnMenuOperations.spec.ts   |  6 ++---
 .../tests/db/columns/columnQrCode.spec.ts     |  2 +-
 .../columnRelationalExtendedTests.spec.ts     |  8 +++---
 .../tests/db/features/expandedFormUrl.spec.ts |  4 +--
 .../tests/db/features/filters.spec.ts         |  4 +--
 .../db/features/keyboardShortcuts.spec.ts     |  2 +-
 .../tests/db/features/metaLTAR.spec.ts        |  8 +++---
 .../tests/db/features/mobileMode.spec.ts      |  4 +--
 .../tests/db/general/cellSelection.spec.ts    |  8 +++---
 .../tests/db/views/viewForm.spec.ts           | 18 ++++++-------
 .../db/views/viewFormShareSurvey.spec.ts      |  2 +-
 .../tests/db/views/viewGridShare.spec.ts      | 16 ++++++------
 21 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/tests/playwright/fixtures/expectedBaseDownloadData.txt b/tests/playwright/fixtures/expectedBaseDownloadData.txt
index 615f4fb5cf..553f1f240b 100644
--- a/tests/playwright/fixtures/expectedBaseDownloadData.txt
+++ b/tests/playwright/fixtures/expectedBaseDownloadData.txt
@@ -1,4 +1,4 @@
-Country,City List
+Country,Cities
 Afghanistan,1
 Algeria,3
 American Samoa,1
diff --git a/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt b/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt
index 615f4fb5cf..553f1f240b 100644
--- a/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt
+++ b/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt
@@ -1,4 +1,4 @@
-Country,City List
+Country,Cities
 Afghanistan,1
 Algeria,3
 American Samoa,1
diff --git a/tests/playwright/pages/Dashboard/Grid/index.ts b/tests/playwright/pages/Dashboard/Grid/index.ts
index 2c09edb144..192faf5bd6 100644
--- a/tests/playwright/pages/Dashboard/Grid/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/index.ts
@@ -296,15 +296,15 @@ export class GridPage extends BasePage {
     await expect(await this.rootPage.locator('text=Insert New Row')).not.toBeVisible();
 
     // in cell-add
-    await this.cell.get({ index: 0, columnHeader: 'City List' }).hover();
+    await this.cell.get({ index: 0, columnHeader: 'Cities' }).hover();
     await expect(
-      await this.cell.get({ index: 0, columnHeader: 'City List' }).locator('.nc-action-icon.nc-plus')
+      await this.cell.get({ index: 0, columnHeader: 'Cities' }).locator('.nc-action-icon.nc-plus')
     ).not.toBeVisible();
 
     // expand row
-    await this.cell.get({ index: 0, columnHeader: 'City List' }).hover();
+    await this.cell.get({ index: 0, columnHeader: 'Cities' }).hover();
     await expect(
-      await this.cell.get({ index: 0, columnHeader: 'City List' }).locator('.nc-action-icon >> nth=0')
+      await this.cell.get({ index: 0, columnHeader: 'Cities' }).locator('.nc-action-icon >> nth=0')
     ).not.toBeVisible();
   }
 
@@ -327,9 +327,9 @@ export class GridPage extends BasePage {
     await expect(await this.rootPage.locator('text=Insert New Row')).toBeVisible();
 
     // in cell-add
-    await this.cell.get({ index: 0, columnHeader: 'City List' }).hover();
+    await this.cell.get({ index: 0, columnHeader: 'Cities' }).hover();
     await expect(
-      await this.cell.get({ index: 0, columnHeader: 'City List' }).locator('.nc-action-icon.nc-plus')
+      await this.cell.get({ index: 0, columnHeader: 'Cities' }).locator('.nc-action-icon.nc-plus')
     ).toBeVisible();
   }
 
diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index 68a93b1c58..473d03f017 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -375,7 +375,7 @@ export class CellPageObject extends BasePage {
     );
 
     // virtual cell
-    const vCell = await this.get({ index: 0, columnHeader: 'City List' });
+    const vCell = await this.get({ index: 0, columnHeader: 'Cities' });
     await vCell.hover();
     // in-cell add
     await expect(await vCell.locator('.nc-action-icon.nc-plus:visible')).toHaveCount(
diff --git a/tests/playwright/tests/db/columns/columnAttachments.spec.ts b/tests/playwright/tests/db/columns/columnAttachments.spec.ts
index 905b220847..6719c8382c 100644
--- a/tests/playwright/tests/db/columns/columnAttachments.spec.ts
+++ b/tests/playwright/tests/db/columns/columnAttachments.spec.ts
@@ -92,7 +92,7 @@ test.describe('Attachment column', () => {
     const rows = csvArray.slice(1);
     const cells = rows[10].split(',');
 
-    await expect(columns).toBe('Country,City List,testAttach');
+    await expect(columns).toBe('Country,Cities,testAttach');
     await expect(cells[0]).toBe('Bahrain');
     // PR8504
     // await expect(cells[1]).toBe('al-Manama');
diff --git a/tests/playwright/tests/db/columns/columnBarcode.spec.ts b/tests/playwright/tests/db/columns/columnBarcode.spec.ts
index 8f20c53548..35af321f17 100644
--- a/tests/playwright/tests/db/columns/columnBarcode.spec.ts
+++ b/tests/playwright/tests/db/columns/columnBarcode.spec.ts
@@ -67,7 +67,7 @@ test.describe('Virtual Columns', () => {
       // and compare the base64 encoded codes/src attributes for the first 3 rows.
       // Column data from City table (Sakila DB)
       /**
-       * City                   LastUpdate              Address List                Country
+       * City                   LastUpdate              Addresses                Country
        * A Corua (La Corua)     2006-02-15 04:45:25     939 Probolinggo Loop        Spain
        * Abha                   2006-02-15 04:45:25     733 Mandaluyong Place       Saudi Arabia
        * Abu Dhabi              2006-02-15 04:45:25     535 Ahmadnagar Manor        United Arab Emirates
diff --git a/tests/playwright/tests/db/columns/columnFormula.spec.ts b/tests/playwright/tests/db/columns/columnFormula.spec.ts
index 50b2bde7a7..9d936bedb7 100644
--- a/tests/playwright/tests/db/columns/columnFormula.spec.ts
+++ b/tests/playwright/tests/db/columns/columnFormula.spec.ts
@@ -6,7 +6,7 @@ import { isPg, isSqlite } from '../../../setup/db';
 // Add formula to be verified here & store expected results for 5 rows
 // Column data from City table (Sakila DB)
 /**
- * City                   LastUpdate              Address List                Country
+ * City                   LastUpdate              Addresses                Country
  * A Corua (La Corua)     2006-02-15 04:45:25     939 Probolinggo Loop        Spain
  * Abha                   2006-02-15 04:45:25     733 Mandaluyong Place       Saudi Arabia
  * Abu Dhabi              2006-02-15 04:45:25     535 Ahmadnagar Manor        United Arab Emirates
diff --git a/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts b/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
index 2d2986e9e9..ddb46f8687 100644
--- a/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
+++ b/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
@@ -67,7 +67,7 @@ test.describe('LTAR create & update', () => {
       type: 'belongsTo',
     });
     await dashboard.expandedForm.fillField({
-      columnTitle: 'Sheet1 List',
+      columnTitle: 'Sheet1s',
       value: '1a',
       type: 'manyToMany',
     });
@@ -84,7 +84,7 @@ test.describe('LTAR create & update', () => {
     await dashboard.linkRecord.select('1b');
     await dashboard.grid.cell.inCellAdd({
       index: 1,
-      columnHeader: 'Sheet1 List',
+      columnHeader: 'Sheet1s',
     });
     await dashboard.linkRecord.select('1b');
     await dashboard.grid.cell.inCellAdd({
@@ -102,7 +102,7 @@ test.describe('LTAR create & update', () => {
       type: 'belongsTo',
     });
     await dashboard.expandedForm.fillField({
-      columnTitle: 'Sheet1 List',
+      columnTitle: 'Sheet1s',
       value: '1c',
       type: 'manyToMany',
     });
@@ -126,7 +126,7 @@ test.describe('LTAR create & update', () => {
       [['1 Sheet1'], ['1 Sheet1'], ['1 Sheet1']],
       [['1 Sheet1'], ['1 Sheet1'], ['1 Sheet1']],
     ];
-    const colHeaders = ['Sheet1', 'Sheet1 List', 'Link2-1hm'];
+    const colHeaders = ['Sheet1', 'Sheet1s', 'Link2-1hm'];
 
     // verify LTAR cell values
     for (let i = 0; i < expected.length; i++) {
@@ -192,7 +192,7 @@ test.describe('LTAR create & update', () => {
       Country: string;
       formula?: string;
       SLT?: string;
-      'City List': string[];
+      Cities: string[];
     };
   }) {
     await dashboard.grid.cell.verify({
@@ -209,9 +209,9 @@ test.describe('LTAR create & update', () => {
     }
     await dashboard.grid.cell.verifyVirtualCell({
       index: param.index,
-      columnHeader: 'City List',
-      count: param.value['City List'].length,
-      value: param.value['City List'],
+      columnHeader: 'Cities',
+      count: param.value['Cities'].length,
+      value: param.value['Cities'],
     });
     if (param.value.SLT) {
       await dashboard.grid.cell.verify({
@@ -241,14 +241,14 @@ test.describe('LTAR create & update', () => {
       index: 0,
       value: {
         Country: 'Afghanistan',
-        'City List': ['Kabul'],
+        Cities: ['Kabul'],
       },
     });
     await verifyRow({
       index: 1,
       value: {
         Country: 'Algeria',
-        'City List': ['Batna', 'Bchar', 'Skikda'],
+        Cities: ['Batna', 'Bchar', 'Skikda'],
       },
     });
 
@@ -274,7 +274,7 @@ test.describe('LTAR create & update', () => {
       index: 0,
       value: {
         Country: 'Afghanistan',
-        'City List': ['Kabul'],
+        Cities: ['Kabul'],
         SLT: 'test',
         formula: 'Afghanistan test',
       },
@@ -290,7 +290,7 @@ test.describe('LTAR create & update', () => {
       index: 0,
       value: {
         Country: 'Afghanistan2',
-        'City List': ['Kabul'],
+        Cities: ['Kabul'],
         SLT: 'test',
         formula: 'Afghanistan2 test',
       },
@@ -305,7 +305,7 @@ test.describe('LTAR create & update', () => {
       index: 0,
       value: {
         Country: 'Afghanistan2',
-        'City List': ['Kabul'],
+        Cities: ['Kabul'],
         SLT: '',
         formula: 'Afghanistan2',
       },
diff --git a/tests/playwright/tests/db/columns/columnLookupRollup.spec.ts b/tests/playwright/tests/db/columns/columnLookupRollup.spec.ts
index 91bdaf14ba..4d21c69b1e 100644
--- a/tests/playwright/tests/db/columns/columnLookupRollup.spec.ts
+++ b/tests/playwright/tests/db/columns/columnLookupRollup.spec.ts
@@ -40,7 +40,7 @@ test.describe('Virtual columns', () => {
     await dashboard.grid.column.create({
       title: 'Rollup',
       type: 'Rollup',
-      childTable: 'City List',
+      childTable: 'Cities',
       childColumn: 'CityId',
       rollupType: 'count',
     });
diff --git a/tests/playwright/tests/db/columns/columnMenuOperations.spec.ts b/tests/playwright/tests/db/columns/columnMenuOperations.spec.ts
index 09bf3df5c4..514b416ba8 100644
--- a/tests/playwright/tests/db/columns/columnMenuOperations.spec.ts
+++ b/tests/playwright/tests/db/columns/columnMenuOperations.spec.ts
@@ -79,7 +79,7 @@ test.describe('Column menu operations', () => {
     await dashboard.grid.column.create({
       title: 'InsertAfterColumn1',
       type: 'SingleLineText',
-      insertAfterColumnTitle: 'Actor List',
+      insertAfterColumnTitle: 'Actors',
     });
 
     await dashboard.closeTab({ title: 'Film' });
@@ -98,7 +98,7 @@ test.describe('Column menu operations', () => {
     await dashboard.grid.column.create({
       title: 'InsertBeforeColumn1',
       type: 'SingleLineText',
-      insertBeforeColumnTitle: 'Actor List',
+      insertBeforeColumnTitle: 'Actors',
     });
 
     await dashboard.closeTab({ title: 'Film' });
@@ -113,7 +113,7 @@ test.describe('Column menu operations', () => {
     });
 
     await dashboard.grid.column.hideColumn({
-      title: 'Actor List',
+      title: 'Actors',
     });
 
     await dashboard.closeTab({ title: 'Film' });
diff --git a/tests/playwright/tests/db/columns/columnQrCode.spec.ts b/tests/playwright/tests/db/columns/columnQrCode.spec.ts
index 0b8ace1575..0861f19720 100644
--- a/tests/playwright/tests/db/columns/columnQrCode.spec.ts
+++ b/tests/playwright/tests/db/columns/columnQrCode.spec.ts
@@ -34,7 +34,7 @@ test.describe('Virtual Columns', () => {
       // and compare the base64 encoded codes/src attributes for the first 3 rows.
       // Column data from City table (Sakila DB)
       /**
-       * City                   LastUpdate              Address List                Country
+       * City                   LastUpdate              Addresses                Country
        * A Corua (La Corua)     2006-02-15 04:45:25     939 Probolinggo Loop        Spain
        * Abha                   2006-02-15 04:45:25     733 Mandaluyong Place       Saudi Arabia
        * Abu Dhabi              2006-02-15 04:45:25     535 Ahmadnagar Manor        United Arab Emirates
diff --git a/tests/playwright/tests/db/columns/columnRelationalExtendedTests.spec.ts b/tests/playwright/tests/db/columns/columnRelationalExtendedTests.spec.ts
index ade9d384d9..285567300d 100644
--- a/tests/playwright/tests/db/columns/columnRelationalExtendedTests.spec.ts
+++ b/tests/playwright/tests/db/columns/columnRelationalExtendedTests.spec.ts
@@ -23,7 +23,7 @@ test.describe('Relational Columns', () => {
     for (let i = 0; i < cityList.length; i++) {
       await dashboard.grid.cell.verifyVirtualCell({
         index: i,
-        columnHeader: 'City List',
+        columnHeader: 'Cities',
         count: cityList[i].length,
         type: 'hm',
         options: { singular: 'City', plural: 'Cities' },
@@ -33,7 +33,7 @@ test.describe('Relational Columns', () => {
     // click on expand icon, open child list
     await dashboard.grid.cell.inCellExpand({
       index: 0,
-      columnHeader: 'City List',
+      columnHeader: 'Cities',
     });
     await dashboard.childList.verify({
       cardTitle: ['Kabul'],
@@ -92,7 +92,7 @@ test.describe('Relational Columns', () => {
     for (let i = 0; i < filmList.length; i++) {
       await dashboard.grid.cell.verifyVirtualCell({
         index: i,
-        columnHeader: 'Film List',
+        columnHeader: 'Films',
         // Count hardwired to avoid verifying all 19 entries
         count: 19,
         type: 'mm',
@@ -102,7 +102,7 @@ test.describe('Relational Columns', () => {
     // click on expand icon, open child list
     await dashboard.grid.cell.inCellExpand({
       index: 0,
-      columnHeader: 'Film List',
+      columnHeader: 'Films',
     });
     await dashboard.childList.verify({
       cardTitle: filmList[0],
diff --git a/tests/playwright/tests/db/features/expandedFormUrl.spec.ts b/tests/playwright/tests/db/features/expandedFormUrl.spec.ts
index 7f78db0498..741e9f6db6 100644
--- a/tests/playwright/tests/db/features/expandedFormUrl.spec.ts
+++ b/tests/playwright/tests/db/features/expandedFormUrl.spec.ts
@@ -66,7 +66,7 @@ test.describe('Expanded form URL', () => {
         title: 'CountryExpand',
       });
       await viewObj.toolbar.clickFields();
-      await viewObj.toolbar.fields.click({ title: 'City List' });
+      await viewObj.toolbar.fields.click({ title: 'Cities' });
     }
 
     // expand row & verify URL
@@ -104,7 +104,7 @@ test.describe('Expanded form URL', () => {
       url: 'rowId=1',
     });
     await dashboard.expandedForm.openChildCard({
-      column: 'City List',
+      column: 'Cities',
       title: 'Kabul',
     });
     await dashboard.rootPage.waitForTimeout(1000);
diff --git a/tests/playwright/tests/db/features/filters.spec.ts b/tests/playwright/tests/db/features/filters.spec.ts
index 554078b45f..816ba1dbc1 100644
--- a/tests/playwright/tests/db/features/filters.spec.ts
+++ b/tests/playwright/tests/db/features/filters.spec.ts
@@ -949,7 +949,7 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
     await toolbar.filter.clickAddFilter();
     for (let i = 0; i < filterList.length; i++) {
       await verifyFilter({
-        column: 'City List',
+        column: 'Cities',
         opType: filterList[i].op,
         value: filterList[i].value,
         result: { rowCount: filterList[i].rowCount },
@@ -1003,7 +1003,7 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
     await dashboard.grid.column.create({
       title: 'Rollup',
       type: 'Rollup',
-      childTable: 'Address List',
+      childTable: 'Addresses',
       childColumn: 'PostalCode',
       rollupType: 'Sum',
     });
diff --git a/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts b/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts
index 06ca67800a..86d92c50f4 100644
--- a/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts
+++ b/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts
@@ -71,7 +71,7 @@ test.describe('Verify shortcuts', () => {
     await grid.cell.click({ index: 0, columnHeader: 'Country' });
     await page.waitForTimeout(1500);
     await page.keyboard.press((await grid.isMacOs()) ? 'Meta+ArrowRight' : 'Control+ArrowRight');
-    await grid.cell.verifyCellActiveSelected({ index: 0, columnHeader: 'City List' });
+    await grid.cell.verifyCellActiveSelected({ index: 0, columnHeader: 'Cities' });
 
     // Cmd + Right arrow
     await page.keyboard.press((await grid.isMacOs()) ? 'Meta+ArrowLeft' : 'Control+ArrowLeft');
diff --git a/tests/playwright/tests/db/features/metaLTAR.spec.ts b/tests/playwright/tests/db/features/metaLTAR.spec.ts
index 1eaa2a93eb..fd0b98b3b2 100644
--- a/tests/playwright/tests/db/features/metaLTAR.spec.ts
+++ b/tests/playwright/tests/db/features/metaLTAR.spec.ts
@@ -235,7 +235,7 @@ test.describe.serial('Test table', () => {
     await dashboard.treeView.openTable({ title: 'Table3' });
     const params = {
       index: 0,
-      columnHeader: 'Table0 List',
+      columnHeader: 'Table0s',
       count: 0,
       value: [],
       type: 'hm',
@@ -283,7 +283,7 @@ test.describe.serial('Test table', () => {
 
     // verify
     await dashboard.treeView.openTable({ title: 'Table3' });
-    await dashboard.grid.column.verify({ title: 'Table0 List', isVisible: false });
+    await dashboard.grid.column.verify({ title: 'Table0s', isVisible: false });
     await dashboard.grid.column.verify({ title: 'TableD:mm:TableE', isVisible: true });
 
     ///////////////////////////////////////////////////////////////////////////////////////////////
@@ -303,7 +303,7 @@ test.describe.serial('Test table', () => {
     await dashboard.grid.column.delete({ title: 'TableA:mm:TableA' });
 
     // verify
-    await dashboard.grid.column.verify({ title: 'Table0 List', isVisible: false });
+    await dashboard.grid.column.verify({ title: 'Table0s', isVisible: false });
     await dashboard.grid.column.verify({ title: 'TableA:mm:TableA', isVisible: false });
   });
 
@@ -316,6 +316,6 @@ test.describe.serial('Test table', () => {
     await dashboard.grid.column.verify({ title: 'Table0', isVisible: false });
 
     await dashboard.treeView.openTable({ title: 'Table3' });
-    await dashboard.grid.column.verify({ title: 'Table0 List', isVisible: false });
+    await dashboard.grid.column.verify({ title: 'Table0s', isVisible: false });
   });
 });
diff --git a/tests/playwright/tests/db/features/mobileMode.spec.ts b/tests/playwright/tests/db/features/mobileMode.spec.ts
index d5a2806b44..0c5449098b 100644
--- a/tests/playwright/tests/db/features/mobileMode.spec.ts
+++ b/tests/playwright/tests/db/features/mobileMode.spec.ts
@@ -45,7 +45,7 @@ test.describe('Mobile Mode', () => {
 
     // verify form-view fields order
     await form.verifyFormViewFieldsOrder({
-      fields: ['Country', 'LastUpdate', 'City List'],
+      fields: ['Country', 'LastUpdate', 'Cities'],
     });
 
     // reorder & verify
@@ -54,7 +54,7 @@ test.describe('Mobile Mode', () => {
       destinationField: 'Country',
     });
     await form.verifyFormViewFieldsOrder({
-      fields: ['LastUpdate', 'Country', 'City List'],
+      fields: ['LastUpdate', 'Country', 'Cities'],
     });
 
     await dashboard.treeView.openTable({ mobileMode: true, title: 'test-table-for-mobile-mode' });
diff --git a/tests/playwright/tests/db/general/cellSelection.spec.ts b/tests/playwright/tests/db/general/cellSelection.spec.ts
index 42a59589a7..d079a8a597 100644
--- a/tests/playwright/tests/db/general/cellSelection.spec.ts
+++ b/tests/playwright/tests/db/general/cellSelection.spec.ts
@@ -50,7 +50,7 @@ test.describe('Verify cell selection', () => {
     await dashboard.treeView.openTable({ title: 'Country' });
     await grid.selectRange({
       start: { index: 0, columnHeader: 'Country' },
-      end: { index: 2, columnHeader: 'City List' },
+      end: { index: 2, columnHeader: 'Cities' },
     });
     expect(await grid.selectedCount()).toBe(9);
     await grid.cell.get({ index: 0, columnHeader: 'Country' }).click();
@@ -62,7 +62,7 @@ test.describe('Verify cell selection', () => {
     await dashboard.treeView.openTable({ title: 'Country' });
     await grid.selectRange({
       start: { index: 0, columnHeader: 'Country' },
-      end: { index: 2, columnHeader: 'City List' },
+      end: { index: 2, columnHeader: 'Cities' },
     });
     expect(await grid.selectedCount()).toBe(9);
     await grid.cell.get({ index: 5, columnHeader: 'Country' }).click();
@@ -74,7 +74,7 @@ test.describe('Verify cell selection', () => {
     await dashboard.treeView.openTable({ title: 'Country' });
     await dashboard.grid.toolbar.fields.toggleShowSystemFields();
     await grid.selectRange({
-      start: { index: 2, columnHeader: 'City List' },
+      start: { index: 2, columnHeader: 'Cities' },
       end: { index: 0, columnHeader: 'Country' },
     });
     expect(await grid.selectedCount()).toBe(12);
@@ -88,7 +88,7 @@ test.describe('Verify cell selection', () => {
     await dashboard.treeView.openTable({ title: 'Country' });
     await grid.selectRange({
       start: { index: 0, columnHeader: 'Country' },
-      end: { index: 2, columnHeader: 'City List' },
+      end: { index: 2, columnHeader: 'Cities' },
     });
     await page.keyboard.press('ArrowRight');
     expect(await grid.selectedCount()).toBe(1);
diff --git a/tests/playwright/tests/db/views/viewForm.spec.ts b/tests/playwright/tests/db/views/viewForm.spec.ts
index bde0e4bf09..c08afee839 100644
--- a/tests/playwright/tests/db/views/viewForm.spec.ts
+++ b/tests/playwright/tests/db/views/viewForm.spec.ts
@@ -34,7 +34,7 @@ test.describe('Form view', () => {
 
     // verify form-view fields order
     await form.verifyFormViewFieldsOrder({
-      fields: ['Country', 'LastUpdate', 'City List'],
+      fields: ['Country', 'LastUpdate', 'Cities'],
     });
 
     // reorder & verify
@@ -43,31 +43,31 @@ test.describe('Form view', () => {
       destinationField: 'Country',
     });
     await form.verifyFormViewFieldsOrder({
-      fields: ['LastUpdate', 'Country', 'City List'],
+      fields: ['LastUpdate', 'Country', 'Cities'],
     });
 
     // remove & verify (drag-drop)
-    await form.removeField({ field: 'City List', mode: 'dragDrop' });
+    await form.removeField({ field: 'Cities', mode: 'dragDrop' });
     await form.verifyFormViewFieldsOrder({
       fields: ['LastUpdate', 'Country'],
     });
 
     // add & verify (drag-drop)
-    await form.addField({ field: 'City List', mode: 'dragDrop' });
+    await form.addField({ field: 'Cities', mode: 'dragDrop' });
     await form.verifyFormViewFieldsOrder({
-      fields: ['LastUpdate', 'Country', 'City List'],
+      fields: ['LastUpdate', 'Country', 'Cities'],
     });
 
     // remove & verify (hide field button)
-    await form.removeField({ field: 'City List', mode: 'hideField' });
+    await form.removeField({ field: 'Cities', mode: 'hideField' });
     await form.verifyFormViewFieldsOrder({
       fields: ['LastUpdate', 'Country'],
     });
 
     // add & verify (hide field button)
-    await form.addField({ field: 'City List', mode: 'clickField' });
+    await form.addField({ field: 'Cities', mode: 'clickField' });
     await form.verifyFormViewFieldsOrder({
-      fields: ['LastUpdate', 'Country', 'City List'],
+      fields: ['LastUpdate', 'Country', 'Cities'],
     });
 
     // remove-all & verify
@@ -81,7 +81,7 @@ test.describe('Form view', () => {
     await form.addAllFields();
     await dashboard.rootPage.waitForTimeout(2000);
     await form.verifyFormViewFieldsOrder({
-      fields: ['LastUpdate', 'Country', 'City List'],
+      fields: ['LastUpdate', 'Country', 'Cities'],
     });
   });
 
diff --git a/tests/playwright/tests/db/views/viewFormShareSurvey.spec.ts b/tests/playwright/tests/db/views/viewFormShareSurvey.spec.ts
index c77528459c..084e7ba927 100644
--- a/tests/playwright/tests/db/views/viewFormShareSurvey.spec.ts
+++ b/tests/playwright/tests/db/views/viewFormShareSurvey.spec.ts
@@ -65,7 +65,7 @@ test.describe('Share form', () => {
     await surveyForm.validate({
       heading: 'Country Title',
       subHeading: 'Country Form Subtitle',
-      fieldLabel: 'City List',
+      fieldLabel: 'Cities',
       footer: '3 / 3',
     });
     await surveyForm.submitButton.click();
diff --git a/tests/playwright/tests/db/views/viewGridShare.spec.ts b/tests/playwright/tests/db/views/viewGridShare.spec.ts
index 6ff002c6ab..444fe853d6 100644
--- a/tests/playwright/tests/db/views/viewGridShare.spec.ts
+++ b/tests/playwright/tests/db/views/viewGridShare.spec.ts
@@ -32,7 +32,7 @@ test.describe('Shared view', () => {
 
     // hide column
     await dashboard.grid.toolbar.fields.toggle({ title: 'Address2' });
-    await dashboard.grid.toolbar.fields.toggle({ title: 'Store List' });
+    await dashboard.grid.toolbar.fields.toggle({ title: 'Stores' });
 
     // sort
     await dashboard.grid.toolbar.sort.add({
@@ -73,9 +73,9 @@ test.describe('Shared view', () => {
       { title: 'PostalCode', isVisible: true },
       { title: 'Phone', isVisible: true },
       { title: 'LastUpdate', isVisible: true },
-      { title: 'Customer List', isVisible: true },
-      { title: 'Staff List', isVisible: true },
-      { title: 'Store List', isVisible: false },
+      { title: 'Customers', isVisible: true },
+      { title: 'Staffs', isVisible: true },
+      { title: 'Stores', isVisible: false },
       { title: 'City', isVisible: true },
     ];
     for (const column of expectedColumns) {
@@ -281,15 +281,15 @@ const sqliteExpectedRecords2 = [
 ];
 
 const expectedVirtualRecords = [
-  { index: 0, columnHeader: 'Customer List', count: 1, type: 'hm' },
-  { index: 1, columnHeader: 'Customer List', count: 1, type: 'hm' },
+  { index: 0, columnHeader: 'Customers', count: 1, type: 'hm' },
+  { index: 1, columnHeader: 'Customers', count: 1, type: 'hm' },
   { index: 0, columnHeader: 'City', count: 1, type: 'bt', value: ['Kanchrapara'] },
   { index: 1, columnHeader: 'City', count: 1, type: 'bt', value: ['Tafuna'] },
 ];
 
 const sqliteExpectedVirtualRecords = [
-  { index: 0, columnHeader: 'Customer List', count: 1, type: 'hm' },
-  { index: 1, columnHeader: 'Customer List', count: 1, type: 'hm' },
+  { index: 0, columnHeader: 'Customers', count: 1, type: 'hm' },
+  { index: 1, columnHeader: 'Customers', count: 1, type: 'hm' },
   { index: 0, columnHeader: 'City', count: 1, type: 'bt', value: ['Davao'] },
   { index: 1, columnHeader: 'City', count: 1, type: 'bt', value: ['Nagareyama'] },
 ];

From a5b8cc26f48b0951252f2864b39c8f74cd88bb5c Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Sat, 1 Jul 2023 23:08:59 +0530
Subject: [PATCH 191/208] fix: merge conflict

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../nc-gui/components/smartsheet/toolbar/SearchData.vue   | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue b/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
index 88d6183074..e370a8bfc7 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
-import { isSystemColumn } from 'nocodb-sdk'
+import { UITypes, isSystemColumn } from 'nocodb-sdk'
 import type { TableType } from 'nocodb-sdk'
-import { UITypes } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   ReloadViewDataHookInj,
@@ -30,10 +29,7 @@ onClickOutside(searchDropdown, () => (isDropdownOpen.value = false))
 
 const columns = computed(() =>
   (meta.value as TableType)?.columns
-    ?.filter((c) => {
-      return !isSystemColumn(c)
-    })
-    ?.filter((column) => column?.uidt !== UITypes.Links)
+    ?.filter((column) => !isSystemColumn(column) && column?.uidt !== UITypes.Links)
     ?.map((column) => ({
       value: column.id,
       label: column.title,

From 2c1b92bf484010daa7d3089fad399df756216d5a Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Sat, 1 Jul 2023 23:27:44 +0530
Subject: [PATCH 192/208] test: ut fix for ltar column name change

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../tests/unit/rest/tests/tableRow.test.ts    | 56 +++++++++----------
 .../tests/unit/rest/tests/viewRow.test.ts     | 10 ++--
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts b/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
index d63a8131e0..3bf90a46d6 100644
--- a/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
@@ -611,7 +611,7 @@ function tableTest() {
     });
 
     const paymentListColumn = (await customerTable.getColumns()).find(
-      (c) => c.title === 'Payment List',
+      (c) => c.title === 'Payments',
     );
 
     const activeColumn = (await customerTable.getColumns()).find(
@@ -771,7 +771,7 @@ function tableTest() {
     );
 
     const nestedFields = {
-      'Rental List': { fields: ['RentalDate', 'ReturnDate'] },
+      Rentals: { fields: ['RentalDate', 'ReturnDate'] },
     };
 
     const nestedFilter = [
@@ -837,7 +837,7 @@ function tableTest() {
     }
 
     const nestedRentalResponse = Object.keys(
-      ascResponse.body.list[0]['Rental List'],
+      ascResponse.body.list[0]['Rentals'],
     );
     if (
       nestedRentalResponse.includes('ReturnDate') &&
@@ -1072,7 +1072,7 @@ function tableTest() {
     );
 
     const nestedFields = {
-      'Rental List': {
+      Rentals: {
         f: 'RentalDate,ReturnDate',
       },
     };
@@ -1132,7 +1132,7 @@ function tableTest() {
       throw new Error('Wrong filter');
     }
 
-    const nestedRentalResponse = Object.keys(ascResponse.body['Rental List']);
+    const nestedRentalResponse = Object.keys(ascResponse.body['Rentals']);
     if (
       nestedRentalResponse.includes('RentalId') &&
       nestedRentalResponse.includes('RentalDate') &&
@@ -1250,15 +1250,15 @@ function tableTest() {
       )
       .set('xc-auth', context.token)
       .query({
-        'nested[Film List][fields]': 'Title,ReleaseYear,Language',
+        'nested[Films][fields]': 'Title,ReleaseYear,Language',
       })
       .expect(200);
 
     const record = response.body;
     if (isPg(context)) {
-      expect(record['Film List']).to.equal('19');
+      expect(record['Films']).to.equal('19');
     } else {
-      expect(record['Film List']).to.equal(19);
+      expect(record['Films']).to.equal(19);
     }
   });
 
@@ -1634,7 +1634,7 @@ function tableTest() {
   it('Nested row list hm', async () => {
     const rowId = 1;
     const rentalListColumn = (await customerTable.getColumns()).find(
-      (column) => column.title === 'Rental List',
+      (column) => column.title === 'Rentals',
     )!;
     const response = await request(context.app)
       .get(
@@ -1653,7 +1653,7 @@ function tableTest() {
   it('Nested row list hm with limit and offset', async () => {
     const rowId = 1;
     const rentalListColumn = (await customerTable.getColumns()).find(
-      (column) => column.title === 'Rental List',
+      (column) => column.title === 'Rentals',
     )!;
     const response = await request(context.app)
       .get(
@@ -1679,7 +1679,7 @@ function tableTest() {
   it('Row list hm with invalid table id', async () => {
     const rowId = 1;
     const rentalListColumn = (await customerTable.getColumns()).find(
-      (column) => column.title === 'Rental List',
+      (column) => column.title === 'Rentals',
     )!;
     const response = await request(context.app)
       .get(
@@ -1703,7 +1703,7 @@ function tableTest() {
   //   const visibleColumns = [firstNameColumn];
 
   //   const rentalListColumn = (await customerTable.getColumns()).find(
-  //     (column) => column.title === 'Rental List'
+  //     (column) => column.title === 'Rentals'
   //   )!;
   //   const response = await request(context.app)
   //     .get(`/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${rentalListColumn.id}`)
@@ -1731,7 +1731,7 @@ function tableTest() {
     });
     const filmTable = await getTable({ project: sakilaProject, name: 'film' });
     const filmListColumn = (await actorTable.getColumns()).find(
-      (column) => column.title === 'Film List',
+      (column) => column.title === 'Films',
     )!;
     const response = await request(context.app)
       .get(
@@ -1755,7 +1755,7 @@ function tableTest() {
     });
     const filmTable = await getTable({ project: sakilaProject, name: 'film' });
     const filmListColumn = (await actorTable.getColumns()).find(
-      (column) => column.title === 'Film List',
+      (column) => column.title === 'Films',
     )!;
     const response = await request(context.app)
       .get(
@@ -1786,7 +1786,7 @@ function tableTest() {
       name: 'actor',
     });
     const filmListColumn = (await actorTable.getColumns()).find(
-      (column) => column.title === 'Film List',
+      (column) => column.title === 'Films',
     )!;
     const response = await request(context.app)
       .get(
@@ -1804,7 +1804,7 @@ function tableTest() {
   it('Create hm relation with invalid table id', async () => {
     const rowId = 1;
     const rentalListColumn = (await customerTable.getColumns()).find(
-      (column) => column.title === 'Rental List',
+      (column) => column.title === 'Rentals',
     )!;
     const refId = 1;
     const response = await request(context.app)
@@ -1861,7 +1861,7 @@ function tableTest() {
   // it.only('Create list mm existing ref row id', async () => {
   //   const rowId = 1;
   //   const rentalListColumn = (await customerTable.getColumns()).find(
-  //     (column) => column.title === 'Rental List'
+  //     (column) => column.title === 'Rentals'
   //   )!;
   //   const refId = 1;
 
@@ -1879,7 +1879,7 @@ function tableTest() {
   it('Create list hm', async () => {
     const rowId = 1;
     const rentalListColumn = (await customerTable.getColumns()).find(
-      (column) => column.title === 'Rental List',
+      (column) => column.title === 'Rentals',
     )!;
     const refId = 1;
 
@@ -1966,7 +1966,7 @@ function tableTest() {
       name: 'actor',
     });
     const filmListColumn = (await actorTable.getColumns()).find(
-      (column) => column.title === 'Film List',
+      (column) => column.title === 'Films',
     )!;
     const refId = 1;
 
@@ -1988,7 +1988,7 @@ function tableTest() {
       name: 'actor',
     });
     const filmListColumn = (await actorTable.getColumns()).find(
-      (column) => column.title === 'Film List',
+      (column) => column.title === 'Films',
     )!;
     const refId = 2;
 
@@ -2057,7 +2057,7 @@ function tableTest() {
       name: 'actor',
     });
     const filmListColumn = (await actorTable.getColumns()).find(
-      (column) => column.title === 'Film List',
+      (column) => column.title === 'Films',
     )!;
     const refId = 1;
 
@@ -2097,7 +2097,7 @@ function tableTest() {
 
     const rowId = 1;
     const rentalListColumn = (await customerTable.getColumns()).find(
-      (column) => column.title === 'Rental List',
+      (column) => column.title === 'Rentals',
     )!;
     const refId = 76;
 
@@ -2173,7 +2173,7 @@ function tableTest() {
   it('Exclude list hm', async () => {
     const rowId = 1;
     const rentalListColumn = (await customerTable.getColumns()).find(
-      (column) => column.title === 'Rental List',
+      (column) => column.title === 'Rentals',
     )!;
 
     const response = await request(context.app)
@@ -2192,7 +2192,7 @@ function tableTest() {
   it('Exclude list hm with limit and offset', async () => {
     const rowId = 1;
     const rentalListColumn = (await customerTable.getColumns()).find(
-      (column) => column.title === 'Rental List',
+      (column) => column.title === 'Rentals',
     )!;
 
     const response = await request(context.app)
@@ -2224,7 +2224,7 @@ function tableTest() {
       name: 'actor',
     });
     const filmListColumn = (await actorTable.getColumns()).find(
-      (column) => column.title === 'Film List',
+      (column) => column.title === 'Films',
     )!;
 
     const response = await request(context.app)
@@ -2247,7 +2247,7 @@ function tableTest() {
       name: 'actor',
     });
     const filmListColumn = (await actorTable.getColumns()).find(
-      (column) => column.title === 'Film List',
+      (column) => column.title === 'Films',
     )!;
 
     const response = await request(context.app)
@@ -2321,7 +2321,7 @@ function tableTest() {
   it('Create nested hm relation with invalid table id', async () => {
     const rowId = 1;
     const rentalListColumn = (await customerTable.getColumns()).find(
-      (column) => column.title === 'Rental List',
+      (column) => column.title === 'Rentals',
     )!;
     const refId = 1;
     const response = await request(context.app)
@@ -2344,7 +2344,7 @@ function tableTest() {
       name: 'actor',
     });
     const filmListColumn = (await actorTable.getColumns()).find(
-      (column) => column.title === 'Film List',
+      (column) => column.title === 'Films',
     )!;
     const response = await request(context.app)
       .post(
diff --git a/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts b/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
index 2bfe1bada6..546c978c07 100644
--- a/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
@@ -618,7 +618,7 @@ function viewRowTests() {
     );
 
     const nestedFields = {
-      'Rental List': { fields: ['RentalDate', 'ReturnDate'] },
+      Rentals: { fields: ['RentalDate', 'ReturnDate'] },
     };
 
     const nestedFilter = [
@@ -683,9 +683,9 @@ function viewRowTests() {
     }
 
     if (isPg(context)) {
-      expect(ascResponse.body.list[0]['Rental List']).to.equal('12');
+      expect(ascResponse.body.list[0]['Rentals']).to.equal('12');
     } else {
-      expect(ascResponse.body.list[0]['Rental List']).to.equal(12);
+      expect(ascResponse.body.list[0]['Rentals']).to.equal(12);
     }
   };
 
@@ -869,7 +869,7 @@ function viewRowTests() {
     );
 
     const nestedFields = {
-      'Rental List': { f: 'RentalDate,ReturnDate' },
+      Rentals: { f: 'RentalDate,ReturnDate' },
     };
 
     const nestedFilter = [
@@ -927,7 +927,7 @@ function viewRowTests() {
       throw new Error('Wrong filter');
     }
 
-    const nestedRentalResponse = Object.keys(ascResponse.body['Rental List']);
+    const nestedRentalResponse = Object.keys(ascResponse.body['Rentals']);
     if (
       nestedRentalResponse.includes('RentalId') &&
       nestedRentalResponse.includes('RentalDate') &&

From d65f941267023466cb3db77d51c5f678b42b779d Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Sat, 1 Jul 2023 23:39:36 +0530
Subject: [PATCH 193/208] test: fix csv download verification

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/fixtures/expectedDataSqlite.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/playwright/fixtures/expectedDataSqlite.txt b/tests/playwright/fixtures/expectedDataSqlite.txt
index 95ec7b0c4b..a25d455a96 100644
--- a/tests/playwright/fixtures/expectedDataSqlite.txt
+++ b/tests/playwright/fixtures/expectedDataSqlite.txt
@@ -1,4 +1,4 @@
-Address,District,PostalCode,Phone,Customer List,Staff List,City
+Address,District,PostalCode,Phone,Customers,Staffs,City
 1013 Tabuk Boulevard," ",96203," ",1,0,Kanchrapara
 1168 Najafabad Parkway," ",40301," ",1,0,Kabul
 1294 Firozabad Drive," ",70618," ",1,0,Pingxiang

From b873a903cd388bbe51473334a3d74fd41b5ab3d8 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Sun, 2 Jul 2023 00:07:51 +0530
Subject: [PATCH 194/208] test: fix csv download verification (2)

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/fixtures/expectedData.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/playwright/fixtures/expectedData.txt b/tests/playwright/fixtures/expectedData.txt
index bc0963b7db..92deed0873 100644
--- a/tests/playwright/fixtures/expectedData.txt
+++ b/tests/playwright/fixtures/expectedData.txt
@@ -1,4 +1,4 @@
-Address,District,PostalCode,Phone,Location,Customer List,Staff List,City
+Address,District,PostalCode,Phone,Location,Customers,Staffs,City
 1661 Abha Drive,Tamil Nadu,14400,270456873752,"{""x"":78.8214191,""y"":10.3812871}",1,0,Pudukkottai
 1993 Tabuk Lane,Tamil Nadu,64221,648482415405,"{""x"":80.1270701,""y"":12.9246028}",1,0,Tambaram
 381 Kabul Way,Taipei,87272,55477302294,"{""x"":0,""y"":0}",1,0,Hsichuh
\ No newline at end of file

From f37573a88d61dea9de262deff857b1638f6c8645 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Sun, 2 Jul 2023 10:38:40 +0530
Subject: [PATCH 195/208] test: enable timezone spec

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../playwright/tests/db/features/timezone.spec.ts  | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/tests/playwright/tests/db/features/timezone.spec.ts b/tests/playwright/tests/db/features/timezone.spec.ts
index 7946b825c8..1bdb57c2d7 100644
--- a/tests/playwright/tests/db/features/timezone.spec.ts
+++ b/tests/playwright/tests/db/features/timezone.spec.ts
@@ -107,7 +107,6 @@ test.describe.serial('Timezone-XCDB : Japan/Tokyo', () => {
   test.beforeEach(async ({ page }) => {
     context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
-    if (!isSqlite(context)) return;
 
     try {
       const { project, table } = await timezoneSuite(context.token, 'xcdb0');
@@ -140,8 +139,6 @@ test.describe.serial('Timezone-XCDB : Japan/Tokyo', () => {
    *  Display value is converted to Asia/Tokyo
    */
   test('API insert, verify display value', async () => {
-    if (!isSqlite(context)) return;
-
     await dashboard.clickHome();
     const projectsPage = new ProjectsPage(dashboard.rootPage);
     await projectsPage.openProject({ title: 'xcdb0', withoutPrefix: true });
@@ -179,8 +176,6 @@ test.describe.serial('Timezone-XCDB : Japan/Tokyo', () => {
    */
 
   test('API Insert, verify API read response', async () => {
-    if (!isSqlite(context)) return;
-
     const dateInserted = new Date(`2021-01-01 00:00:00${getBrowserTimezoneOffset()}`);
     // translate dateInserted to UTC in YYYY-MM-DD HH:mm format
     const dateInsertedInUTC = dateInserted.toISOString().replace('T', ' ').replace('Z', '');
@@ -282,9 +277,6 @@ test.describe.serial('Timezone-XCDB : Asia/Hong-kong', () => {
     context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
 
-    // Apply only for sqlite, as currently- root DB for all instances is SQLite
-    if (!isSqlite(context)) return;
-
     const { project } = await timezoneSuite(context.token, 'xcdb2', true);
     context.project = project;
 
@@ -323,8 +315,6 @@ test.describe.serial('Timezone-XCDB : Asia/Hong-kong', () => {
    *
    */
   test('Cell insert', async () => {
-    if (!isSqlite(context)) return;
-
     // Verify stored value in database is UTC
     records = await api.dbTableRow.list('noco', context.project.id, 'dateTimeTable', { limit: 10 });
 
@@ -352,8 +342,6 @@ test.describe.serial('Timezone-XCDB : Asia/Hong-kong', () => {
    *
    */
   test('Expanded record insert', async () => {
-    if (!isSqlite(context)) return;
-
     await dashboard.grid.openExpandedRow({ index: 0 });
     await dashboard.expandedForm.fillField({
       columnTitle: 'DateTime',
@@ -387,8 +375,6 @@ test.describe.serial('Timezone-XCDB : Asia/Hong-kong', () => {
    *
    */
   test('Copy paste', async () => {
-    if (!isSqlite(context)) return;
-
     await dashboard.grid.addNewRow({ index: 1, columnHeader: 'Title', value: 'Copy paste test' });
 
     await dashboard.rootPage.reload();

From 4d284d214787800239848ba2e3ef621784d197ed Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Sun, 2 Jul 2023 12:59:52 +0530
Subject: [PATCH 196/208] test: erd rename for link name change

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 tests/playwright/tests/db/features/erd.spec.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/playwright/tests/db/features/erd.spec.ts b/tests/playwright/tests/db/features/erd.spec.ts
index f0dbef7044..7b956998fd 100644
--- a/tests/playwright/tests/db/features/erd.spec.ts
+++ b/tests/playwright/tests/db/features/erd.spec.ts
@@ -188,33 +188,33 @@ test.describe('Erd', () => {
     // Verify tables with default config
     await erd.verifyColumns({
       tableName: `country`,
-      columns: ['country_id', 'country', 'last_update', 'city_list'],
+      columns: ['country_id', 'country', 'last_update', 'cities'],
     });
 
     await erd.verifyColumns({
       tableName: `city`,
-      columns: ['city_id', 'city', 'country_id', 'last_update', 'country', 'address_list'],
+      columns: ['city_id', 'city', 'country_id', 'last_update', 'country', 'addresses'],
     });
 
     // Verify with PK/FK disabled
     await erd.clickShowPkAndFk();
     await erd.verifyColumns({
       tableName: `country`,
-      columns: ['country', 'last_update', 'city_list'],
+      columns: ['country', 'last_update', 'cities'],
     });
 
     await erd.verifyColumns({
       tableName: `city`,
-      columns: ['city', 'last_update', 'country', 'address_list'],
+      columns: ['city', 'last_update', 'country', 'addresses'],
     });
 
     // Verify with all columns disabled
     await erd.clickShowColumnNames();
-    await erd.verifyColumns({ tableName: `country`, columns: ['city_list'] });
+    await erd.verifyColumns({ tableName: `country`, columns: ['cities'] });
 
     await erd.verifyColumns({
       tableName: `city`,
-      columns: ['country', 'address_list'],
+      columns: ['country', 'addresses'],
     });
 
     // Enable All columns
@@ -311,7 +311,7 @@ test.describe('Erd', () => {
   });
 });
 
-const actorTableColumn = ['actor_id', 'first_name', 'last_name', 'last_update', 'film_list'];
+const actorTableColumn = ['actor_id', 'first_name', 'last_name', 'last_update', 'films'];
 
 const mysqlPaymentTableColumns = [
   'payment_id',
@@ -338,9 +338,9 @@ const pgPaymentTableColumns = [
   'staff',
 ];
 
-const actorLTARColumns = ['filmactor_list', 'film_list'];
+const actorLTARColumns = ['filmactors', 'films'];
 
-const actorNonPkFkColumns = ['first_name', 'last_name', 'last_update', 'film_list', 'filmactor_list'];
+const actorNonPkFkColumns = ['first_name', 'last_name', 'last_update', 'films', 'filmactors'];
 
 const paymentLTARColumns = ['customer', 'rental', 'staff'];
 

From 30ed3b4ed089cb69e6b6b51aaccc15db66d1ee49 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 4 Jul 2023 17:32:01 +0530
Subject: [PATCH 197/208] fix: metaDiff - include Links column as well

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nocodb/src/services/meta-diffs.service.ts | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/nocodb/src/services/meta-diffs.service.ts b/packages/nocodb/src/services/meta-diffs.service.ts
index e676ce57e4..13999f351a 100644
--- a/packages/nocodb/src/services/meta-diffs.service.ts
+++ b/packages/nocodb/src/services/meta-diffs.service.ts
@@ -1,5 +1,11 @@
 import { Injectable } from '@nestjs/common';
-import { isVirtualCol, ModelTypes, RelationTypes, UITypes } from 'nocodb-sdk';
+import {
+  isLinksOrLTAR,
+  isVirtualCol,
+  ModelTypes,
+  RelationTypes,
+  UITypes,
+} from 'nocodb-sdk';
 import { T } from 'nc-help';
 import { pluralize, singularize } from 'inflection';
 import { Base, Column, Model, Project } from '../models';
@@ -10,7 +16,7 @@ import { getUniqueColumnAliasName } from '../helpers/getUniqueName';
 import mapDefaultDisplayValue from '../helpers/mapDefaultDisplayValue';
 import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2';
 import NcHelp from '../utils/NcHelp';
-import type { LinkToAnotherRecordColumn } from '../models';
+import type { LinksColumn, LinkToAnotherRecordColumn } from '../models';
 
 // todo:move enum and types
 export enum MetaDiffType {
@@ -223,12 +229,13 @@ export class MetaDiffsService {
         if (
           [
             UITypes.LinkToAnotherRecord,
+            UITypes.Links,
             UITypes.Rollup,
             UITypes.Lookup,
             UITypes.Formula,
           ].includes(column.uidt)
         ) {
-          if (column.uidt === UITypes.LinkToAnotherRecord) {
+          if (isLinksOrLTAR(column.uidt)) {
             virtualRelationColumns.push(column);
           }
 
@@ -508,6 +515,7 @@ export class MetaDiffsService {
             UITypes.Rollup,
             UITypes.Lookup,
             UITypes.Formula,
+            UITypes.Links,
           ].includes(column.uidt)
         ) {
           continue;
@@ -947,7 +955,7 @@ export class MetaDiffsService {
                     childModel.columns,
                     pluralize(childModel.title || childModel.table_name),
                   );
-                  await Column.insert<LinkToAnotherRecordColumn>({
+                  await Column.insert<LinksColumn>({
                     uidt: UITypes.Links,
                     title,
                     fk_model_id: parentModel.id,
@@ -984,7 +992,7 @@ export class MetaDiffsService {
     const colChildOpt =
       await belongsToCol.getColOptions<LinkToAnotherRecordColumn>();
     for (const col of await model.getColumns()) {
-      if (col.uidt === UITypes.LinkToAnotherRecord) {
+      if (isLinksOrLTAR(col.uidt)) {
         const colOpt = await col.getColOptions<LinkToAnotherRecordColumn>();
         if (
           colOpt &&
@@ -1043,7 +1051,7 @@ export class MetaDiffsService {
         );
 
         if (!isRelationAvailInA) {
-          await Column.insert<LinkToAnotherRecordColumn>({
+          await Column.insert<LinksColumn>({
             title: getUniqueColumnAliasName(
               modelA.columns,
               pluralize(modelB.title),
@@ -1067,7 +1075,7 @@ export class MetaDiffsService {
           });
         }
         if (!isRelationAvailInB) {
-          await Column.insert<LinkToAnotherRecordColumn>({
+          await Column.insert<LinksColumn>({
             title: getUniqueColumnAliasName(
               modelB.columns,
               pluralize(modelA.title),
@@ -1099,7 +1107,7 @@ export class MetaDiffsService {
           const model = await colOpt.getRelatedTable();
 
           for (const col of await model.getColumns()) {
-            if (col.uidt !== UITypes.LinkToAnotherRecord) continue;
+            if (!isLinksOrLTAR(col.uidt)) continue;
 
             const colOpt1 =
               await col.getColOptions<LinkToAnotherRecordColumn>();

From 59bd53ee199f22583abc30423eb84adccd42f13f Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 4 Jul 2023 18:08:37 +0530
Subject: [PATCH 198/208] fix: column delete bug fix

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/models/Column.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/models/Column.ts b/packages/nocodb/src/models/Column.ts
index 5736b47414..6030e61021 100644
--- a/packages/nocodb/src/models/Column.ts
+++ b/packages/nocodb/src/models/Column.ts
@@ -1,4 +1,4 @@
-import { AllowedColumnTypesForQrAndBarcodes, UITypes } from 'nocodb-sdk';
+import { AllowedColumnTypesForQrAndBarcodes, isLinksOrLTAR, UITypes } from 'nocodb-sdk'
 import NocoCache from '../cache/NocoCache';
 import {
   CacheDelDirection,
@@ -705,7 +705,7 @@ export default class Column<T = any> implements ColumnType {
     }
 
     //  if relation column check lookup and rollup and delete
-    if (col.uidt === UITypes.LinkToAnotherRecord) {
+    if (isLinksOrLTAR(col.uidt)) {
       {
         // get lookup columns using relation and delete
         const cachedList = await NocoCache.getList(CacheScope.COL_LOOKUP, [id]);
@@ -784,6 +784,7 @@ export default class Column<T = any> implements ColumnType {
         cacheScopeName = CacheScope.COL_LOOKUP;
         break;
       case UITypes.LinkToAnotherRecord:
+      case UITypes.Links:
         colOptionTableName = MetaTable.COL_RELATIONS;
         cacheScopeName = CacheScope.COL_RELATION;
         break;

From 4249f3ac02ff846608ab82194e06b09985eccd50 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 4 Jul 2023 20:44:39 +0530
Subject: [PATCH 199/208] Revert "Feat: Links column type"

---
 packages/nc-gui/assets/style.scss             |   2 +-
 .../nc-gui/components/dlg/AirtableImport.vue  |   1 -
 packages/nc-gui/components/erd/TableNode.vue  |   4 +-
 packages/nc-gui/components/erd/View.vue       |   6 +-
 packages/nc-gui/components/erd/utils.ts       |   7 +-
 .../nc-gui/components/smartsheet/Form.vue     |  10 +-
 .../nc-gui/components/smartsheet/Grid.vue     |  17 +-
 .../components/smartsheet/Pagination.vue      |   2 -
 .../components/smartsheet/VirtualCell.vue     |   4 +-
 .../smartsheet/column/EditOrAdd.vue           |  11 +-
 .../smartsheet/column/LinkOptions.vue         |  63 -----
 .../column/LinkedToAnotherRecordOptions.vue   |  83 ++++---
 .../smartsheet/column/LookupOptions.vue       |  36 +--
 .../smartsheet/column/RollupOptions.vue       |  38 ++-
 .../smartsheet/expanded-form/index.vue        |   4 +-
 .../components/smartsheet/header/Menu.vue     |   7 +-
 .../smartsheet/header/VirtualCell.vue         |   4 +-
 .../smartsheet/header/VirtualCellIcon.ts      |   1 -
 .../toolbar/FieldListAutoCompleteDropdown.vue |   9 +-
 .../smartsheet/toolbar/FilterInput.vue        |   7 +-
 .../smartsheet/toolbar/SearchData.vue         |   8 +-
 .../nc-gui/components/tabs/Smartsheet.vue     |  29 +--
 .../nc-gui/components/virtual-cell/Links.vue  | 121 ----------
 .../virtual-cell/components/ItemChip.vue      |  12 +-
 .../components/ListChildItems.vue             |  21 +-
 .../virtual-cell/components/ListItems.vue     |  18 +-
 .../composables/useColumnCreateStore.ts       |  12 +-
 .../composables/useMultiSelect/index.ts       |   4 +
 .../composables/useSharedFormViewStore.ts     |   6 +-
 .../composables/useSmartsheetRowStore.ts      |  24 +-
 packages/nc-gui/composables/useTable.ts       |   4 +-
 packages/nc-gui/lang/en.json                  |   1 -
 packages/nc-gui/store/project.ts              |   1 -
 packages/nc-gui/utils/columnUtils.ts          |   6 -
 packages/nc-gui/utils/filterUtils.ts          |   4 +-
 packages/nc-gui/utils/virtualCell.ts          |   6 +-
 .../content/en/setup-and-usages/links.md      | 107 ---------
 .../content/en/setup-and-usages/lookup.md     |   2 +-
 packages/nocodb-sdk/src/index.ts              |   1 -
 packages/nocodb-sdk/src/lib/Api.ts            |   8 +-
 packages/nocodb-sdk/src/lib/UITypes.ts        |  11 -
 packages/nocodb/src/db/BaseModelSqlv2.ts      |  51 ++--
 packages/nocodb/src/db/conditionV2.ts         |  21 +-
 .../src/db/formulav2/formulaQueryBuilderv2.ts |   2 -
 packages/nocodb/src/db/genRollupSelectv2.ts   |   3 +-
 packages/nocodb/src/db/sortV2.ts              |   2 -
 packages/nocodb/src/helpers/columnHelpers.ts  |  64 +----
 packages/nocodb/src/helpers/getAst.ts         |   9 +-
 packages/nocodb/src/helpers/populateMeta.ts   |  81 +------
 packages/nocodb/src/models/Column.ts          |  38 +--
 .../src/models/LinkToAnotherRecordColumn.ts   |   5 +-
 packages/nocodb/src/models/LinksColumn.ts     |  39 ----
 packages/nocodb/src/models/Sort.ts            |   2 +-
 packages/nocodb/src/models/View.ts            |   1 +
 packages/nocodb/src/models/index.ts           |   1 -
 .../jobs/at-import/at-import.processor.ts     |  20 +-
 .../jobs/export-import/duplicate.processor.ts |   6 +-
 .../jobs/jobs/export-import/export.service.ts |   8 +-
 .../jobs/jobs/export-import/import.service.ts |   7 +-
 packages/nocodb/src/schema/swagger.json       |   8 +-
 packages/nocodb/src/services/bases.service.ts |   3 -
 .../nocodb/src/services/columns.service.ts    |  52 +----
 .../src/services/data-alias-nested.service.ts |   7 +-
 .../nocodb/src/services/meta-diffs.service.ts |  53 ++---
 .../src/services/public-metas.service.ts      |   5 +-
 .../nocodb/src/services/tables.service.ts     |  13 +-
 packages/nocodb/tests/unit/factory/column.ts  |  54 +++--
 .../tests/unit/rest/tests/tableRow.test.ts    | 113 ++++++---
 .../tests/unit/rest/tests/viewRow.test.ts     |  53 ++++-
 packages/nocodb/tests/unit/tsconfig.json      |   3 +-
 .../fixtures/expectedBaseDownloadData.txt     | 220 +++++++++---------
 .../fixtures/expectedBaseDownloadDataPg.txt   | 220 +++++++++---------
 tests/playwright/fixtures/expectedData.txt    |   8 +-
 .../fixtures/expectedDataSqlite.txt           |  38 +--
 .../pages/Dashboard/Grid/Column/index.ts      |   3 +-
 .../playwright/pages/Dashboard/Grid/index.ts  |  18 +-
 .../pages/Dashboard/common/Cell/index.ts      |  91 +++-----
 tests/playwright/quickTests/commonTest.ts     |   4 +-
 .../db/columns/columnAttachments.spec.ts      |   6 +-
 .../tests/db/columns/columnBarcode.spec.ts    |   2 +-
 .../tests/db/columns/columnFormula.spec.ts    |   6 +-
 .../columns/columnLinkToAnotherRecord.spec.ts |  46 ++--
 .../db/columns/columnLookupRollup.spec.ts     |  14 +-
 .../db/columns/columnLtarDragdrop.spec.ts     |   8 +-
 .../db/columns/columnMenuOperations.spec.ts   |   6 +-
 .../tests/db/columns/columnQrCode.spec.ts     |   2 +-
 .../columnRelationalExtendedTests.spec.ts     |  15 +-
 .../playwright/tests/db/features/erd.spec.ts  |  18 +-
 .../tests/db/features/expandedFormUrl.spec.ts |   4 +-
 .../tests/db/features/filters.spec.ts         |  40 ++--
 .../db/features/keyboardShortcuts.spec.ts     |   2 +-
 .../tests/db/features/metaLTAR.spec.ts        |  52 +++--
 .../tests/db/features/mobileMode.spec.ts      |   4 +-
 .../tests/db/features/undo-redo.spec.ts       |  44 +---
 .../tests/db/features/webhook.spec.ts         |  29 ++-
 .../tests/db/general/cellSelection.spec.ts    |   8 +-
 .../tests/db/general/megaTable.spec.ts        |   6 +-
 .../tests/db/views/viewForm.spec.ts           |  23 +-
 .../db/views/viewFormShareSurvey.spec.ts      |   2 +-
 .../tests/db/views/viewGridShare.spec.ts      |  30 ++-
 100 files changed, 909 insertions(+), 1506 deletions(-)
 delete mode 100644 packages/nc-gui/components/smartsheet/column/LinkOptions.vue
 delete mode 100644 packages/nc-gui/components/virtual-cell/Links.vue
 delete mode 100644 packages/noco-docs/content/en/setup-and-usages/links.md
 delete mode 100644 packages/nocodb/src/models/LinksColumn.ts

diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss
index c5f36936aa..25f17ff5e9 100644
--- a/packages/nc-gui/assets/style.scss
+++ b/packages/nc-gui/assets/style.scss
@@ -331,5 +331,5 @@ a {
 
 
 .nc-icon-transition {
-  @apply transform transition-transform !hover:(scale-115 text-shadow-sm) !active:(scale-100)
+  @apply transform transition-transform !hover:(scale-115) !active:(scale-100)
 }
diff --git a/packages/nc-gui/components/dlg/AirtableImport.vue b/packages/nc-gui/components/dlg/AirtableImport.vue
index 1f9a95b86b..cdb87ef5cd 100644
--- a/packages/nc-gui/components/dlg/AirtableImport.vue
+++ b/packages/nc-gui/components/dlg/AirtableImport.vue
@@ -1,4 +1,3 @@
-
 <script setup lang="ts">
 import type { Card as AntCard } from 'ant-design-vue'
 import {
diff --git a/packages/nc-gui/components/erd/TableNode.vue b/packages/nc-gui/components/erd/TableNode.vue
index 93e7c65d4d..68f2c7d287 100644
--- a/packages/nc-gui/components/erd/TableNode.vue
+++ b/packages/nc-gui/components/erd/TableNode.vue
@@ -2,7 +2,7 @@
 import type { NodeProps } from '@vue-flow/core'
 import { Handle, Position, useVueFlow } from '@vue-flow/core'
 import type { LinkToAnotherRecordType } from 'nocodb-sdk'
-import { isLinksOrLTAR, isVirtualCol } from 'nocodb-sdk'
+import { UITypes, isVirtualCol } from 'nocodb-sdk'
 import type { NodeData } from './utils'
 import { MetaInj, computed, provide, refAutoReset, toRef, useNuxtApp, watch } from '#imports'
 
@@ -86,7 +86,7 @@ watch(
             :class="index + 1 === data.nonPkColumns.length ? 'rounded-b-lg' : 'border-b-1'"
           >
             <div
-              v-if="isLinksOrLTAR(col)"
+              v-if="col.uidt === UITypes.LinkToAnotherRecord"
               class="flex w-full"
               :class="`nc-erd-table-node-${table.table_name}-column-${col.title?.toLowerCase().replace(' ', '_')}`"
             >
diff --git a/packages/nc-gui/components/erd/View.vue b/packages/nc-gui/components/erd/View.vue
index eef3e6d169..2870b87a86 100644
--- a/packages/nc-gui/components/erd/View.vue
+++ b/packages/nc-gui/components/erd/View.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { isLinksOrLTAR } from 'nocodb-sdk'
+import { UITypes } from 'nocodb-sdk'
 import type { ERDConfig } from './utils'
 import { reactive, ref, storeToRefs, useMetas, useProject, watch } from '#imports'
 
@@ -42,7 +42,9 @@ const populateTables = async () => {
       (t) =>
         t.id === props.table?.id ||
         props.table?.columns?.find(
-          (column) => isLinksOrLTAR(column.uidt) && (column.colOptions as LinkToAnotherRecordType)?.fk_related_model_id === t.id,
+          (column) =>
+            column.uidt === UITypes.LinkToAnotherRecord &&
+            (column.colOptions as LinkToAnotherRecordType)?.fk_related_model_id === t.id,
         ),
     )
   } else {
diff --git a/packages/nc-gui/components/erd/utils.ts b/packages/nc-gui/components/erd/utils.ts
index a6a60ddfc0..a7cdb2ab2b 100644
--- a/packages/nc-gui/components/erd/utils.ts
+++ b/packages/nc-gui/components/erd/utils.ts
@@ -1,5 +1,5 @@
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes, isLinksOrLTAR } from 'nocodb-sdk'
+import { UITypes } from 'nocodb-sdk'
 import dagre from 'dagre'
 import type { Edge, EdgeMarker, Elements, Node } from '@vue-flow/core'
 import type { MaybeRef } from '@vueuse/core'
@@ -73,7 +73,8 @@ export function useErdElements(tables: MaybeRef<TableType[]>, props: MaybeRef<ER
   const relations = computed(() =>
     erdTables.value.reduce((acc, table) => {
       const meta = metasWithIdAsKey.value[table.id!]
-      const columns = meta.columns?.filter((column: ColumnType) => isLinksOrLTAR(column) && column.system !== 1) || []
+      const columns =
+        meta.columns?.filter((column: ColumnType) => column.uidt === UITypes.LinkToAnotherRecord && column.system !== 1) || []
 
       columns.forEach((column: ColumnType) => {
         const colOptions = column.colOptions as LinkToAnotherRecordType
@@ -174,7 +175,7 @@ export function useErdElements(tables: MaybeRef<TableType[]>, props: MaybeRef<ER
 
       const columns =
         metasWithIdAsKey.value[table.id].columns?.filter(
-          (col) => config.showAllColumns || (!config.showAllColumns && isLinksOrLTAR(col)),
+          (col) => config.showAllColumns || (!config.showAllColumns && col.uidt === UITypes.LinkToAnotherRecord),
         ) || []
 
       const pkAndFkColumns = columns.filter(() => config.showPkAndFk).filter((col) => col.pk || col.uidt === UITypes.ForeignKey)
diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 83af541560..40c7402603 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import Draggable from 'vuedraggable'
-import { RelationTypes, UITypes, ViewTypes, getSystemColumns, isLinksOrLTAR, isVirtualCol } from 'nocodb-sdk'
+import { RelationTypes, UITypes, ViewTypes, getSystemColumns, isVirtualCol } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   IsFormInj,
@@ -148,7 +148,7 @@ function isDbRequired(column: Record<string, any>) {
       // confirm it's not foreign key
       !columns.value.some(
         (c: Record<string, any>) =>
-          isLinksOrLTAR(c.uidt) &&
+          c.uidt === UITypes.LinkToAnotherRecord &&
           c?.colOptions?.type === RelationTypes.BELONGS_TO &&
           column.fk_column_id === c.colOptions.fk_child_column_id,
       )) ||
@@ -297,7 +297,11 @@ function setFormData() {
 
 function isRequired(_columnObj: Record<string, any>, required = false) {
   let columnObj = _columnObj
-  if (isLinksOrLTAR(columnObj.uidt) && columnObj.colOptions && columnObj.colOptions.type === RelationTypes.BELONGS_TO) {
+  if (
+    columnObj.uidt === UITypes.LinkToAnotherRecord &&
+    columnObj.colOptions &&
+    columnObj.colOptions.type === RelationTypes.BELONGS_TO
+  ) {
     columnObj = columns.value.find((c: Record<string, any>) => c.id === columnObj.colOptions.fk_child_column_id) as Record<
       string,
       any
diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 3384ff9c48..a03b8b9635 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { nextTick } from '@vue/runtime-core'
 import type { ColumnReqType, ColumnType, GridType, PaginatedType, TableType, ViewType } from 'nocodb-sdk'
-import { UITypes, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   CellUrlDisableOverlayInj,
@@ -504,11 +504,12 @@ watch(contextMenu, () => {
 const rowRefs = $ref<any[]>()
 
 async function clearCell(ctx: { row: number; col: number } | null, skipUpdate = false) {
-  if (!ctx || !hasEditPermission || (!isLinksOrLTAR(fields.value[ctx.col]) && isVirtualCol(fields.value[ctx.col]))) return
-
-  if (fields.value[ctx.col]?.uidt === UITypes.Links) {
-    return message.info('Links column clear is not supported yet')
-  }
+  if (
+    !ctx ||
+    !hasEditPermission ||
+    (fields.value[ctx.col].uidt !== UITypes.LinkToAnotherRecord && isVirtualCol(fields.value[ctx.col]))
+  )
+    return
 
   const rowObj = data.value[ctx.row]
   const columnObj = fields.value[ctx.col]
@@ -867,7 +868,6 @@ eventBus.on(async (event, payload) => {
 const closeAddColumnDropdown = (scrollToLastCol = false) => {
   columnOrder.value = null
   addColumnDropdown.value = false
-  preloadColumn.value = {}
   if (scrollToLastCol) {
     setTimeout(() => {
       const lastAddNewRowHeader = tableHeadEl.value?.querySelector('th:last-child')
@@ -1268,7 +1268,8 @@ useEventListener(document, 'mouseup', () => {
               v-if="
                 contextMenuTarget &&
                 selectedRange.isSingleCell() &&
-                (isLinksOrLTAR(fields[contextMenuTarget.col]) || !isVirtualCol(fields[contextMenuTarget.col]))
+                (fields[contextMenuTarget.col].uidt === UITypes.LinkToAnotherRecord ||
+                  !isVirtualCol(fields[contextMenuTarget.col]))
               "
               @click="clearCell(contextMenuTarget)"
             >
diff --git a/packages/nc-gui/components/smartsheet/Pagination.vue b/packages/nc-gui/components/smartsheet/Pagination.vue
index 6c2906a8c2..eac7b65582 100644
--- a/packages/nc-gui/components/smartsheet/Pagination.vue
+++ b/packages/nc-gui/components/smartsheet/Pagination.vue
@@ -5,8 +5,6 @@ const props = defineProps<{
   alignCountOnRight?: boolean
 }>()
 
-const { alignCountOnRight } = props
-
 const paginatedData = inject(PaginationDataInj)!
 
 const changePage = inject(ChangePageInj)!
diff --git a/packages/nc-gui/components/smartsheet/VirtualCell.vue b/packages/nc-gui/components/smartsheet/VirtualCell.vue
index f47d60632d..26d820b37c 100644
--- a/packages/nc-gui/components/smartsheet/VirtualCell.vue
+++ b/packages/nc-gui/components/smartsheet/VirtualCell.vue
@@ -14,7 +14,6 @@ import {
   isCount,
   isFormula,
   isHm,
-  isLink,
   isLookup,
   isMm,
   isQrCode,
@@ -96,8 +95,7 @@ onUnmounted(() => {
     @keydown.shift.enter.exact="onNavigate(NavigateDir.PREV, $event)"
   >
     <template v-if="intersected">
-      <LazyVirtualCellLinks v-if="isLink(column)" />
-      <LazyVirtualCellHasMany v-else-if="isHm(column)" />
+      <LazyVirtualCellHasMany v-if="isHm(column)" />
       <LazyVirtualCellManyToMany v-else-if="isMm(column)" />
       <LazyVirtualCellBelongsTo v-else-if="isBt(column)" />
       <LazyVirtualCellRollup v-else-if="isRollup(column)" />
diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index c594fb96dc..cce3f4b78c 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -58,17 +58,15 @@ const advancedDbOptions = ref(false)
 
 const columnToValidate = [UITypes.Email, UITypes.URL, UITypes.PhoneNumber]
 
-const onlyNameUpdateOnEditColumns = [UITypes.LinkToAnotherRecord, UITypes.Lookup, UITypes.Rollup, UITypes.Links]
+const onlyNameUpdateOnEditColumns = [UITypes.LinkToAnotherRecord, UITypes.Lookup, UITypes.Rollup]
 
 const geoDataToggleCondition = (t: { name: UITypes }) => {
   return betaFeatureToggleState.show ? betaFeatureToggleState.show : !t.name.includes(UITypes.GeoData)
 }
 
-const showDeprecated = $ref(false)
-
 const uiTypesOptions = computed<typeof uiTypes>(() => {
   return [
-    ...uiTypes.filter((t) => geoDataToggleCondition(t) && (!isEdit.value || !t.virtual) && (!t.deprecated || showDeprecated)),
+    ...uiTypes.filter((t) => geoDataToggleCondition(t) && (!isEdit.value || !t.virtual)),
     ...(!isEdit.value && meta?.value?.columns?.every((c) => !c.pk)
       ? [
           {
@@ -189,13 +187,11 @@ useEventListener('keydown', (e: KeyboardEvent) => {
             :disabled="isKanban"
             dropdown-class-name="nc-dropdown-column-type"
             @change="onUidtOrIdTypeChange"
-            @dblclick="showDeprecated = !showDeprecated"
           >
             <a-select-option v-for="opt of uiTypesOptions" :key="opt.name" :value="opt.name" v-bind="validateInfos.uidt">
               <div class="flex gap-1 items-center">
                 <component :is="opt.icon" class="text-grey" />
                 {{ opt.name }}
-                <span v-if="opt.deprecated" class="!text-xs !text-gray-300">(Deprecated)</span>
               </div>
             </a-select-option>
           </a-select>
@@ -213,10 +209,9 @@ useEventListener('keydown', (e: KeyboardEvent) => {
         <LazySmartsheetColumnDateTimeOptions v-if="formState.uidt === UITypes.DateTime" v-model:value="formState" />
         <LazySmartsheetColumnRollupOptions v-if="formState.uidt === UITypes.Rollup" v-model:value="formState" />
         <LazySmartsheetColumnLinkedToAnotherRecordOptions
-          v-if="!isEdit && (formState.uidt === UITypes.LinkToAnotherRecord || formState.uidt === UITypes.Links)"
+          v-if="!isEdit && formState.uidt === UITypes.LinkToAnotherRecord"
           v-model:value="formState"
         />
-        <LazySmartsheetColumnLinkOptions v-if="isEdit && formState.uidt === UITypes.Links" v-model:value="formState" />
         <LazySmartsheetColumnSpecificDBTypeOptions v-if="formState.uidt === UITypes.SpecificDBType" />
         <LazySmartsheetColumnSelectOptions
           v-if="formState.uidt === UITypes.SingleSelect || formState.uidt === UITypes.MultiSelect"
diff --git a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
deleted file mode 100644
index 565d059fef..0000000000
--- a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<script setup lang="ts">
-import { useColumnCreateStoreOrThrow, useVModel } from '#imports'
-
-const props = defineProps<{
-  value: any
-}>()
-
-const emit = defineEmits(['update:value'])
-
-const vModel = useVModel(props, 'value', emit)
-
-const { validateInfos, setAdditionalValidations } = useColumnCreateStoreOrThrow()
-
-setAdditionalValidations({
-  'meta.singular': [
-    {
-      validator: (_, value: string) => {
-        return new Promise((resolve, reject) => {
-          if (value?.length > 59) {
-            return reject(new Error('The length exceeds the max 59 characters'))
-          }
-          resolve(true)
-        })
-      },
-    },
-  ],
-  'meta.plural': [
-    {
-      validator: (_, value: string) => {
-        return new Promise((resolve, reject) => {
-          if (value?.length > 59) {
-            return reject(new Error('The length exceeds the max 59 characters'))
-          }
-          resolve(true)
-        })
-      },
-    },
-  ],
-})
-
-// set default value
-vModel.value.meta = {
-  singular: '',
-  plural: '',
-  ...vModel.value.meta,
-}
-</script>
-
-<template>
-  <a-row class="my-2" gutter="8">
-    <a-col :span="12">
-      <a-form-item v-bind="validateInfos['meta.singular']" label="Singular Label">
-        <a-input v-model:value="vModel.meta.singular" placeholder="Link" class="!w-full nc-link-singular" />
-      </a-form-item>
-    </a-col>
-
-    <a-col :span="12">
-      <a-form-item v-bind="validateInfos['meta.plural']" label="Plural Label">
-        <a-input v-model:value="vModel.meta.plural" placeholder="Links" class="!w-full nc-link-plural" />
-      </a-form-item>
-    </a-col>
-  </a-row>
-</template>
diff --git a/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue
index fc0bb0f564..368aebec78 100644
--- a/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ModelTypes, MssqlUi, SqliteUi, UITypes } from 'nocodb-sdk'
+import { ModelTypes, MssqlUi, SqliteUi } from 'nocodb-sdk'
 import { MetaInj, inject, ref, storeToRefs, useProject, useVModel } from '#imports'
 import MdiPlusIcon from '~icons/mdi/plus-circle-outline'
 import MdiMinusIcon from '~icons/mdi/minus-circle-outline'
@@ -50,8 +50,6 @@ const refTables = $computed(() => {
 })
 
 const filterOption = (value: string, option: { key: string }) => option.key.toLowerCase().includes(value.toLowerCase())
-
-const isLinks = $computed(() => vModel.value.uidt === UITypes.Links)
 </script>
 
 <template>
@@ -88,7 +86,7 @@ const isLinks = $computed(() => vModel.value.uidt === UITypes.Links)
         </a-select>
       </a-form-item>
     </div>
-    <template v-if="!isXcdbBase || isLinks">
+    <template v-if="!isXcdbBase">
       <div
         class="text-xs cursor-pointer text-grey nc-more-options my-2 flex items-center gap-1 justify-end"
         @click="advancedOptions = !advancedOptions"
@@ -99,46 +97,43 @@ const isLinks = $computed(() => vModel.value.uidt === UITypes.Links)
       </div>
 
       <div v-if="advancedOptions" class="flex flex-col p-6 gap-4 border-2 mt-2">
-        <LazySmartsheetColumnLinkOptions v-model:value="vModel" class="-my-2" />
-        <template v-if="!isXcdbBase">
-          <div class="flex flex-row space-x-2">
-            <a-form-item class="flex w-1/2" :label="$t('labels.onUpdate')">
-              <a-select
-                v-model:value="vModel.onUpdate"
-                :disabled="vModel.virtual"
-                name="onUpdate"
-                dropdown-class-name="nc-dropdown-on-update"
-                @change="onDataTypeChange"
-              >
-                <a-select-option v-for="(option, i) of onUpdateDeleteOptions" :key="i" :value="option">
-                  {{ option }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-
-            <a-form-item class="flex w-1/2" :label="$t('labels.onDelete')">
-              <a-select
-                v-model:value="vModel.onDelete"
-                :disabled="vModel.virtual"
-                name="onDelete"
-                dropdown-class-name="nc-dropdown-on-delete"
-                @change="onDataTypeChange"
-              >
-                <a-select-option v-for="(option, i) of onUpdateDeleteOptions" :key="i" :value="option">
-                  {{ option }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </div>
-
-          <div class="flex flex-row">
-            <a-form-item>
-              <a-checkbox v-model:checked="vModel.virtual" :disabled="appInfo.isCloud" name="virtual" @change="onDataTypeChange"
-                >Virtual Relation
-              </a-checkbox>
-            </a-form-item>
-          </div>
-        </template>
+        <div class="flex flex-row space-x-2">
+          <a-form-item class="flex w-1/2" :label="$t('labels.onUpdate')">
+            <a-select
+              v-model:value="vModel.onUpdate"
+              :disabled="vModel.virtual"
+              name="onUpdate"
+              dropdown-class-name="nc-dropdown-on-update"
+              @change="onDataTypeChange"
+            >
+              <a-select-option v-for="(option, i) of onUpdateDeleteOptions" :key="i" :value="option">
+                {{ option }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+
+          <a-form-item class="flex w-1/2" :label="$t('labels.onDelete')">
+            <a-select
+              v-model:value="vModel.onDelete"
+              :disabled="vModel.virtual"
+              name="onDelete"
+              dropdown-class-name="nc-dropdown-on-delete"
+              @change="onDataTypeChange"
+            >
+              <a-select-option v-for="(option, i) of onUpdateDeleteOptions" :key="i" :value="option">
+                {{ option }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </div>
+
+        <div class="flex flex-row">
+          <a-form-item>
+            <a-checkbox v-model:checked="vModel.virtual" :disabled="appInfo.isCloud" name="virtual" @change="onDataTypeChange"
+              >Virtual Relation
+            </a-checkbox>
+          </a-form-item>
+        </div>
       </div>
     </template>
   </div>
diff --git a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
index 804cfbd82d..3ef7a455b8 100644
--- a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import { onMounted } from '@vue/runtime-core'
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { UITypes, isSystemColumn } from 'nocodb-sdk'
+import { getRelationName } from './utils'
 import { MetaInj, inject, ref, storeToRefs, useColumnCreateStoreOrThrow, useMetas, useProject, useVModel } from '#imports'
 
 const props = defineProps<{
@@ -34,7 +35,7 @@ const refTables = $computed(() => {
   }
 
   const _refTables = meta.columns
-    .filter((column) => isLinksOrLTAR(column) && !column.system && column.base_id === meta?.base_id)
+    .filter((column) => column.uidt === UITypes.LinkToAnotherRecord && !column.system && column.base_id === meta?.base_id)
     .map((column) => ({
       col: column.colOptions,
       column,
@@ -49,9 +50,7 @@ const columns = $computed<ColumnType[]>(() => {
   if (!selectedTable?.id) {
     return []
   }
-  return metas[selectedTable.id].columns.filter(
-    (c: ColumnType) => !isSystemColumn(c) && c.id !== vModel.value.id && c.uidt !== UITypes.Links,
-  )
+  return metas[selectedTable.id].columns.filter((c: ColumnType) => !isSystemColumn(c) && c.id !== vModel.value.id)
 })
 
 onMounted(() => {
@@ -65,28 +64,22 @@ const onRelationColChange = () => {
   vModel.value.fk_lookup_column_id = columns?.[0]?.id
   onDataTypeChange()
 }
-
-const cellIcon = (column: ColumnType) =>
-  h(isVirtualCol(column) ? resolveComponent('SmartsheetHeaderVirtualCellIcon') : resolveComponent('SmartsheetHeaderCellIcon'), {
-    columnMeta: column,
-  })
 </script>
 
 <template>
   <div class="p-6 w-full flex flex-col border-2 mb-2 mt-4">
     <div class="w-full flex flex-row space-x-2">
-      <a-form-item class="flex w-1/2 pb-2" :label="$t('labels.links')" v-bind="validateInfos.fk_relation_column_id">
+      <a-form-item class="flex w-1/2 pb-2" :label="$t('labels.linkToAnotherRecord')" v-bind="validateInfos.fk_relation_column_id">
         <a-select
           v-model:value="vModel.fk_relation_column_id"
           dropdown-class-name="!w-64 nc-dropdown-relation-table"
           @change="onRelationColChange"
         >
           <a-select-option v-for="(table, i) of refTables" :key="i" :value="table.col.fk_column_id">
-            <div class="flex flex-row h-full pb-0.5 items-center max-w-full">
-              <div class="font-semibold text-xs flex-shrink flex-grow-0 truncate">{{ table.column.title }}</div>
-              <div class="flex-grow"></div>
-              <div class="text-[0.65rem] text-gray-600 nc-relation-details">
-                <span class="uppercase">{{ table.col.type }}</span> {{ table.title || table.table_name }}
+            <div class="flex flex-row space-x-0.5 h-full pb-0.5 items-center justify-between">
+              <div class="font-semibold text-xs">{{ table.column.title }}</div>
+              <div class="text-[0.65rem] text-gray-600">
+                {{ getRelationName(table.col.type) }} {{ table.title || table.table_name }}
               </div>
             </div>
           </a-select-option>
@@ -101,10 +94,7 @@ const cellIcon = (column: ColumnType) =>
           @change="onDataTypeChange"
         >
           <a-select-option v-for="(column, index) of columns" :key="index" :value="column.id">
-            <div class="flex items-center -ml-1 font-semibold text-xs">
-              <component :is="cellIcon(column)" :column-meta="column" />
-              {{ column.title }}
-            </div>
+            {{ column.title }}
           </a-select-option>
         </a-select>
       </a-form-item>
@@ -112,8 +102,4 @@ const cellIcon = (column: ColumnType) =>
   </div>
 </template>
 
-<style scoped>
-:deep(.ant-select-selector .ant-select-selection-item .nc-relation-details) {
-  @apply hidden;
-}
-</style>
+<style scoped></style>
diff --git a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
index 2bd407abf2..54b24069af 100644
--- a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import { onMounted } from '@vue/runtime-core'
-import type { ColumnType, LinkToAnotherRecordType, TableType, UITypes } from 'nocodb-sdk'
-import { isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
+import { UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { getRelationName } from './utils'
 import { MetaInj, inject, ref, storeToRefs, useColumnCreateStoreOrThrow, useMetas, useProject, useVModel } from '#imports'
 
 const props = defineProps<{
@@ -49,7 +50,10 @@ const refTables = $computed(() => {
   const _refTables = meta.columns
     .filter(
       (c) =>
-        isLinksOrLTAR(c) && (c.colOptions as LinkToAnotherRecordType).type !== 'bt' && !c.system && c.base_id === meta?.base_id,
+        c.uidt === UITypes.LinkToAnotherRecord &&
+        (c.colOptions as LinkToAnotherRecordType).type !== 'bt' &&
+        !c.system &&
+        c.base_id === meta?.base_id,
     )
     .map((c) => ({
       col: c.colOptions,
@@ -83,28 +87,22 @@ const onRelationColChange = () => {
   vModel.value.fk_rollup_column_id = columns?.[0]?.id
   onDataTypeChange()
 }
-
-const cellIcon = (column: ColumnType) =>
-  h(isVirtualCol(column) ? resolveComponent('SmartsheetHeaderVirtualCellIcon') : resolveComponent('SmartsheetHeaderCellIcon'), {
-    columnMeta: column,
-  })
 </script>
 
 <template>
   <div class="p-6 w-full flex flex-col border-2 mb-2 mt-4">
     <div class="w-full flex flex-row space-x-2">
-      <a-form-item class="flex w-1/2 pb-2" :label="$t('labels.links')" v-bind="validateInfos.fk_relation_column_id">
+      <a-form-item class="flex w-1/2 pb-2" :label="$t('labels.linkToAnotherRecord')" v-bind="validateInfos.fk_relation_column_id">
         <a-select
           v-model:value="vModel.fk_relation_column_id"
           dropdown-class-name="!w-64 nc-dropdown-relation-table"
           @change="onRelationColChange"
         >
           <a-select-option v-for="(table, i) of refTables" :key="i" :value="table.col.fk_column_id">
-            <div class="flex flex-row h-full pb-0.5 items-center max-w-full">
-              <div class="font-semibold text-xs flex-shrink flex-grow-0 truncate">{{ table.column.title }}</div>
-              <div class="flex-grow"></div>
-              <div class="text-[0.65rem] text-gray-600 nc-relation-details">
-                <span class="uppercase">{{ table.col.type }}</span> {{ table.title || table.table_name }}
+            <div class="flex flex-row space-x-0.5 h-full pb-0.5 items-center justify-between">
+              <div class="font-semibold text-xs">{{ table.column.title }}</div>
+              <div class="text-[0.65rem] text-gray-600">
+                ({{ getRelationName(table.col.type) }} {{ table.title || table.table_name }})
               </div>
             </div>
           </a-select-option>
@@ -119,11 +117,7 @@ const cellIcon = (column: ColumnType) =>
           @change="onDataTypeChange"
         >
           <a-select-option v-for="(column, index) of columns" :key="index" :value="column.id">
-            <div class="flex items-center -ml-1 font-semibold text-xs">
-              <component :is="cellIcon(column)" :column-meta="column" />
-
-              {{ column.title }}
-            </div>
+            {{ column.title }}
           </a-select-option>
         </a-select>
       </a-form-item>
@@ -142,9 +136,3 @@ const cellIcon = (column: ColumnType) =>
     </a-form-item>
   </div>
 </template>
-
-<style scoped>
-:deep(.ant-select-selector .ant-select-selection-item .nc-relation-details) {
-  @apply hidden;
-}
-</style>
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index 409bfc1f1e..f03d3eb229 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { TableType, ViewType } from 'nocodb-sdk'
-import { isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import type { Ref } from 'vue'
 import {
   CellClickHookInj,
@@ -324,7 +324,7 @@ export default {
             <div
               v-for="(col, i) of fields"
               v-else
-              v-show="!isVirtualCol(col) || !isNew || isLinksOrLTAR(col)"
+              v-show="!isVirtualCol(col) || !isNew || col.uidt === UITypes.LinkToAnotherRecord"
               :key="col.title"
               class="mt-2 py-2"
               :class="`nc-expand-col-${col.title}`"
diff --git a/packages/nc-gui/components/smartsheet/header/Menu.vue b/packages/nc-gui/components/smartsheet/header/Menu.vue
index 83e056389b..2bd2acc4d2 100644
--- a/packages/nc-gui/components/smartsheet/header/Menu.vue
+++ b/packages/nc-gui/components/smartsheet/header/Menu.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { ColumnReqType, LinkToAnotherRecordType } from 'nocodb-sdk'
-import { RelationTypes, UITypes, isLinksOrLTAR } from 'nocodb-sdk'
+import { RelationTypes, UITypes } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   ColumnInj,
@@ -66,7 +66,7 @@ const deleteColumn = () =>
         await getMeta(meta?.value?.id as string, true)
 
         /** force-reload related table meta if deleted column is a LTAR and not linked to same table */
-        if (isLinksOrLTAR(column?.value) && column.value?.colOptions) {
+        if (column?.value?.uidt === UITypes.LinkToAnotherRecord && column.value?.colOptions) {
           await getMeta((column.value?.colOptions as LinkToAnotherRecordType).fk_related_model_id!, true)
 
           // reload tables if deleted column is mm and include m2m is true
@@ -181,7 +181,6 @@ const duplicateColumn = async () => {
   // construct column create payload
   switch (column?.value.uidt) {
     case UITypes.LinkToAnotherRecord:
-    case UITypes.Links:
     case UITypes.Lookup:
     case UITypes.Rollup:
     case UITypes.Formula:
@@ -316,7 +315,7 @@ const hideField = async () => {
             {{ $t('general.edit') }}
           </div>
         </a-menu-item>
-        <template v-if="!isLinksOrLTAR(column) || column.colOptions.type !== RelationTypes.BELONGS_TO">
+        <template v-if="column.uidt !== UITypes.LinkToAnotherRecord || column.colOptions.type !== RelationTypes.BELONGS_TO">
           <a-divider class="!my-0" />
           <a-menu-item @click="sortByColumn('asc')">
             <div v-e="['a:field:sort', { dir: 'asc' }]" class="nc-column-insert-after nc-header-menu-item">
diff --git a/packages/nc-gui/components/smartsheet/header/VirtualCell.vue b/packages/nc-gui/components/smartsheet/header/VirtualCell.vue
index 0ee08642e5..a9d7dca749 100644
--- a/packages/nc-gui/components/smartsheet/header/VirtualCell.vue
+++ b/packages/nc-gui/components/smartsheet/header/VirtualCell.vue
@@ -121,9 +121,7 @@ const closeAddColumnDropdown = () => {
       <template #title>
         {{ tooltipMsg }}
       </template>
-      <span class="name" :class="{ 'truncate': !isForm, 'whitespace-pre-line': isForm }" :title="column.title">
-        {{ column.title }}
-      </span>
+      <span class="name" style="white-space: pre-line" :title="column.title"> {{ column.title }}</span>
     </a-tooltip>
 
     <span v-if="isVirtualColRequired(column, meta?.columns || []) || required" class="text-red-500">&nbsp;*</span>
diff --git a/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts b/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts
index 07d62ba081..0e596d8621 100644
--- a/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts
+++ b/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts
@@ -22,7 +22,6 @@ import CountIcon from '~icons/mdi/counter'
 const renderIcon = (column: ColumnType, relationColumn?: ColumnType) => {
   switch (column.uidt) {
     case UITypes.LinkToAnotherRecord:
-    case UITypes.Links:
       switch ((column.colOptions as LinkToAnotherRecordType)?.type) {
         case RelationTypes.MANY_TO_MANY:
           return { icon: iconMap.mm, color: 'text-accent' }
diff --git a/packages/nc-gui/components/smartsheet/toolbar/FieldListAutoCompleteDropdown.vue b/packages/nc-gui/components/smartsheet/toolbar/FieldListAutoCompleteDropdown.vue
index 3b0957ddf5..c458559249 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FieldListAutoCompleteDropdown.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FieldListAutoCompleteDropdown.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { SelectProps } from 'ant-design-vue'
 import type { ColumnType, LinkToAnotherRecordType } from 'nocodb-sdk'
-import { RelationTypes, UITypes, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { RelationTypes, UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import { ActiveViewInj, MetaInj, computed, inject, ref, resolveComponent, useViewColumns } from '#imports'
 
 const { modelValue, isSort } = defineProps<{
@@ -25,9 +25,6 @@ const { showSystemFields, metaColumnById } = useViewColumns(activeView, meta)
 const options = computed<SelectProps['options']>(() =>
   meta.value?.columns
     ?.filter((c: ColumnType) => {
-      if (c.uidt === UITypes.Links) {
-        return true
-      }
       if (isSystemColumn(metaColumnById?.value?.[c.id!])) {
         return (
           /** if the field is used in filter, then show it anyway */
@@ -39,7 +36,9 @@ const options = computed<SelectProps['options']>(() =>
         return false
       } else if (isSort) {
         /** ignore hasmany and manytomany relations if it's using within sort menu */
-        return !(isLinksOrLTAR(c) && (c.colOptions as LinkToAnotherRecordType).type !== RelationTypes.BELONGS_TO)
+        return !(
+          c.uidt === UITypes.LinkToAnotherRecord && (c.colOptions as LinkToAnotherRecordType).type !== RelationTypes.BELONGS_TO
+        )
         /** ignore virtual fields which are system fields ( mm relation ) and qr code fields */
       } else {
         const isVirtualSystemField = c.colOptions && c.system
diff --git a/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue b/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue
index ce978ee754..02f5bf7ec2 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { UITypes } from 'nocodb-sdk'
 import type { ColumnType } from 'nocodb-sdk'
 import { storeToRefs } from 'pinia'
 import {
@@ -81,7 +80,6 @@ const checkTypeFunctions = {
   isInt,
   isFloat,
   isTextArea,
-  isLinks: (col: ColumnType) => col.uidt === UITypes.Links,
 }
 
 type FilterType = keyof typeof checkTypeFunctions
@@ -147,7 +145,6 @@ const componentMap: Partial<Record<FilterType, any>> = $computed(() => {
     isDecimal: Decimal,
     isInt: Integer,
     isFloat: Float,
-    isLinks: Integer,
   }
 })
 
@@ -164,7 +161,6 @@ const componentProps = $computed(() => {
     case 'isPercent':
     case 'isDecimal':
     case 'isFloat':
-    case 'isLinks':
     case 'isInt': {
       return { class: 'h-32px' }
     }
@@ -180,8 +176,7 @@ const componentProps = $computed(() => {
 const hasExtraPadding = $computed(() => {
   return (
     column.value &&
-    (column.value?.uidt === UITypes.Links ||
-      isInt(column.value, abstractType) ||
+    (isInt(column.value, abstractType) ||
       isDate(column.value, abstractType) ||
       isDateTime(column.value, abstractType) ||
       isTime(column.value, abstractType) ||
diff --git a/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue b/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
index e370a8bfc7..da24d397f4 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { UITypes, isSystemColumn } from 'nocodb-sdk'
+import { isSystemColumn } from 'nocodb-sdk'
 import type { TableType } from 'nocodb-sdk'
 import {
   ActiveViewInj,
@@ -29,8 +29,10 @@ onClickOutside(searchDropdown, () => (isDropdownOpen.value = false))
 
 const columns = computed(() =>
   (meta.value as TableType)?.columns
-    ?.filter((column) => !isSystemColumn(column) && column?.uidt !== UITypes.Links)
-    ?.map((column) => ({
+    ?.filter((c) => {
+      return !isSystemColumn(c)
+    })
+    .map((column) => ({
       value: column.id,
       label: column.title,
       column,
diff --git a/packages/nc-gui/components/tabs/Smartsheet.vue b/packages/nc-gui/components/tabs/Smartsheet.vue
index 92ae7ee75a..50166d2e2c 100644
--- a/packages/nc-gui/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui/components/tabs/Smartsheet.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes, isLinksOrLTAR } from 'nocodb-sdk'
+import { UITypes } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   FieldsInj,
@@ -71,13 +71,8 @@ const grid = ref()
 const onDrop = async (event: DragEvent) => {
   event.preventDefault()
   try {
-    // extract the data from the event's data transfer object
-    const textData = event.dataTransfer?.getData('text/json')
-
-    if (!textData) return
-
-    // parse the data
-    const data = JSON.parse(textData)
+    // Access the dropped data
+    const data = JSON.parse(event.dataTransfer?.getData('text/json')!)
     // Do something with the received data
 
     // if dragged item is not from the same base, return
@@ -96,24 +91,32 @@ const onDrop = async (event: DragEvent) => {
 
     // if already a link column exists, create a new Lookup column
     const relationCol = parentMeta.columns?.find((c: ColumnType) => {
-      if (!isLinksOrLTAR(c)) return false
+      if (c.uidt !== UITypes.LinkToAnotherRecord) return false
 
       const ltarOptions = c.colOptions as LinkToAnotherRecordType
 
-      return ltarOptions.fk_related_model_id === childMeta.id
+      if (ltarOptions.type !== 'mm') {
+        return false
+      }
+
+      if (ltarOptions.fk_related_model_id === childMeta.id) {
+        return true
+      }
+
+      return false
     })
     if (relationCol) {
       const lookupCol = childMeta.columns?.find((c) => c.pv) ?? childMeta.columns?.[0]
       grid.value?.openColumnCreate({
         uidt: UITypes.Lookup,
-        title: `${relationCol.title}Lookup`,
+        title: `${data.title}Lookup`,
         fk_relation_column_id: relationCol.id,
         fk_lookup_column_id: lookupCol?.id,
       })
     } else {
       grid.value?.openColumnCreate({
-        uidt: UITypes.Links,
-        title: `${data.title}`,
+        uidt: UITypes.LinkToAnotherRecord,
+        title: `${data.title}List`,
         parentId: parentMeta.id,
         childId: childMeta.id,
         parentTable: parentMeta.title,
diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
deleted file mode 100644
index f7ba26a394..0000000000
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<script setup lang="ts">
-import { computed } from '@vue/reactivity'
-import type { ColumnType } from 'nocodb-sdk'
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-import { ActiveCellInj, CellValueInj, ColumnInj, IsUnderLookupInj, inject, useSelectedCellKeyupListener } from '#imports'
-
-const value = inject(CellValueInj, ref(0))
-
-const column = inject(ColumnInj)!
-
-const row = inject(RowInj)!
-
-const reloadRowTrigger = inject(ReloadRowDataHookInj, createEventHook())
-
-const isForm = inject(IsFormInj)
-
-const readOnly = inject(ReadonlyInj, ref(false))
-
-const isLocked = inject(IsLockedInj, ref(false))
-
-const isUnderLookup = inject(IsUnderLookupInj, ref(false))
-
-const listItemsDlg = ref(false)
-
-const childListDlg = ref(false)
-
-const { isUIAllowed } = useUIPermission()
-
-const { state, isNew } = useSmartsheetRowStoreOrThrow()
-
-const { relatedTableMeta, loadRelatedTableMeta, relatedTableDisplayValueProp } = useProvideLTARStore(
-  column as Ref<Required<ColumnType>>,
-  row,
-  isNew,
-  reloadRowTrigger.trigger,
-)
-const relatedTableDisplayColumn = computed(
-  () =>
-    relatedTableMeta.value?.columns?.find((c: any) => c.title === relatedTableDisplayValueProp.value) as ColumnType | undefined,
-)
-
-loadRelatedTableMeta()
-
-const textVal = computed(() => {
-  const parsedValue = +value?.value || 0
-
-  if (!parsedValue) {
-    return 'Empty'
-  } else if (parsedValue === 1) {
-    return `1 ${column.value?.meta?.singular || 'Link'}`
-  } else {
-    return `${parsedValue} ${column.value?.meta?.plural || 'Links'}`
-  }
-})
-
-const onAttachRecord = () => {
-  childListDlg.value = false
-  listItemsDlg.value = true
-}
-
-const openChildList = () => {
-  if (!isLocked.value) {
-    childListDlg.value = true
-  }
-}
-
-useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEvent) => {
-  switch (e.key) {
-    case 'Enter':
-      if (isLocked.value || listItemsDlg.value) return
-      childListDlg.value = true
-      e.stopPropagation()
-      break
-  }
-})
-
-const localCellValue = computed<any[]>(() => {
-  if (isNew.value) {
-    return state?.value?.[column?.value.title as string] ?? []
-  }
-  return []
-})
-</script>
-
-<template>
-  <div class="flex w-full items-center nc-links-wrapper" @dblclick.stop="openChildList">
-    <template v-if="!isForm">
-      <div class="block flex-shrink truncate">
-        <component
-          :is="isLocked || isUnderLookup ? 'span' : 'a'"
-          :title="textVal"
-          class="text-center pl-3 nc-datatype-link"
-          :class="{ '!text-gray-300': !value }"
-          @click.stop.prevent="openChildList"
-        >
-          {{ textVal }}
-        </component>
-      </div>
-      <div class="flex-grow" />
-
-      <div v-if="!isLocked && !isUnderLookup" class="flex justify-end gap-1 min-h-[30px] items-center">
-        <GeneralIcon
-          v-if="!readOnly && isUIAllowed('xcDatatableEditable')"
-          icon="plus"
-          class="nc-icon-transition select-none !text-xxl nc-action-icon text-gray-500/50 hover:text-gray-500 nc-plus hover:text-shadow-md"
-          @click.stop="listItemsDlg = true"
-        />
-      </div>
-    </template>
-
-    <LazyVirtualCellComponentsListItems v-model="listItemsDlg" :column="relatedTableDisplayColumn" />
-
-    <LazyVirtualCellComponentsListChildItems
-      v-model="childListDlg"
-      :column="relatedTableDisplayColumn"
-      :cell-value="localCellValue"
-      @attach-record="onAttachRecord"
-    />
-  </div>
-</template>
diff --git a/packages/nc-gui/components/virtual-cell/components/ItemChip.vue b/packages/nc-gui/components/virtual-cell/components/ItemChip.vue
index 232271dfaa..13ada13c8c 100644
--- a/packages/nc-gui/components/virtual-cell/components/ItemChip.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ItemChip.vue
@@ -9,6 +9,7 @@ import {
   inject,
   isAttachment,
   ref,
+  renderValue,
   useExpandedFormDetached,
   useLTARStoreOrThrow,
 } from '#imports'
@@ -18,11 +19,9 @@ interface Props {
   item?: any
   column: any
   showUnlinkButton: boolean
-  border?: boolean
-  readonly?: boolean
 }
 
-const { value, item, column, showUnlinkButton, border = true, readonly: readonlyProp } = defineProps<Props>()
+const { value, item, column, showUnlinkButton } = defineProps<Props>()
 
 const emit = defineEmits(['unlink'])
 
@@ -41,7 +40,7 @@ const isLocked = inject(IsLockedInj, ref(false))
 const { open } = useExpandedFormDetached()
 
 function openExpandedForm() {
-  if (!readOnly.value && !isLocked.value && !readonlyProp) {
+  if (!readOnly && !isLocked.value) {
     open({
       isOpen: true,
       row: { row: item, rowMeta: {}, oldRow: { ...item } },
@@ -85,8 +84,9 @@ export default {
             class="min-w-max"
             :class="{
               'px-1 rounded-full flex-1': !isAttachment(column),
-              'border-gray-200 rounded border-1':
-                border && ![UITypes.Attachment, UITypes.MultiSelect, UITypes.SingleSelect].includes(column.uidt),
+              'border-gray-200 rounded border-1': ![UITypes.Attachment, UITypes.MultiSelect, UITypes.SingleSelect].includes(
+                column.uidt,
+              ),
             }"
           >
             <LazySmartsheetCell :model-value="value" :column="column" :edit-enabled="false" :virtual="true" :read-only="true" />
diff --git a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
index bd9b608a95..da00e1b780 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
@@ -13,6 +13,7 @@ import {
   iconMap,
   inject,
   ref,
+  renderValue,
   useLTARStoreOrThrow,
   useSmartsheetRowStoreOrThrow,
   useVModel,
@@ -39,6 +40,7 @@ const {
   childrenListPagination,
   relatedTableDisplayValueProp,
   unlink,
+  getRelatedTableRowId,
   relatedTableMeta,
 } = useLTARStoreOrThrow()
 
@@ -107,7 +109,7 @@ const onClick = (row: Row) => {
     :body-style="{ padding: 0 }"
     wrap-class-name="nc-modal-child-list"
   >
-    <div class="h-[min(max(calc(100vh_-_300px)_,350px),540px)] flex flex-col py-6">
+    <div class="max-h-[max(calc(100vh_-_300px)_,500px)] flex flex-col py-6">
       <div class="flex mb-4 items-center gap-2 px-12">
         <div class="flex-1" />
         <component
@@ -141,29 +143,26 @@ const onClick = (row: Row) => {
           <a-card
             v-for="(row, i) of childrenList?.list ?? state?.[colTitle] ?? []"
             :key="i"
-            class="nc-nested-list-item !my-2 hover:(!bg-gray-200/50 shadow-md)"
+            class="!my-4 hover:(!bg-gray-200/50 shadow-md)"
             @click="onClick(row)"
           >
             <div class="flex items-center">
               <div class="flex-1 overflow-hidden min-w-0">
-                <VirtualCellComponentsItemChip
-                  :border="false"
-                  :value="row[relatedTableDisplayValueProp]"
-                  :column="props.column"
-                />
+                <VirtualCellComponentsItemChip :value="row[relatedTableDisplayValueProp]" :column="props.column" />
+                <span class="text-gray-400 text-[11px] ml-1">(Primary key : {{ getRelatedTableRowId(row) }})</span>
               </div>
 
               <div v-if="!readonly" class="flex gap-2">
                 <component
                   :is="iconMap.linkRemove"
-                  class="!text-base text-grey hover:(!text-red-500) cursor-pointer nc-icon-transition"
+                  class="text-xs text-grey hover:(!text-red-500) cursor-pointer"
                   data-testid="nc-child-list-icon-unlink"
                   @click.stop="unlinkRow(row)"
                 />
                 <component
                   :is="iconMap.delete"
                   v-if="!readonly && !isPublic"
-                  class="!text-base text-grey hover:(!text-red-500) cursor-pointer nc-icon-transition"
+                  class="text-xs text-grey hover:(!text-red-500) cursor-pointer"
                   data-testid="nc-child-list-icon-delete"
                   @click.stop="deleteRelatedRow(row, unlinkIfNewRow)"
                 />
@@ -209,8 +208,4 @@ const onClick = (row: Row) => {
 :deep(.ant-pagination-item a) {
   line-height: 21px !important;
 }
-
-:deep(.nc-nested-list-item .ant-card-body) {
-  @apply !px-1 !py-0;
-}
 </style>
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItems.vue b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
index 64a633af20..30a9589c78 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItems.vue
@@ -12,6 +12,7 @@ import {
   inject,
   isDrawerExist,
   ref,
+  renderValue,
   useLTARStoreOrThrow,
   useSelectedCellKeyupListener,
   useSmartsheetRowStoreOrThrow,
@@ -34,6 +35,7 @@ const {
   childrenExcludedListPagination,
   relatedTableDisplayValueProp,
   link,
+  getRelatedTableRowId,
   relatedTableMeta,
   meta,
   row,
@@ -50,7 +52,6 @@ const selectedRowIndex = ref(0)
 const isAltKeyDown = ref(false)
 
 const linkRow = async (row: Record<string, any>) => {
-  childrenExcludedList.value?.list?.splice(selectedRowIndex.value, 1)
   if (isNew.value) {
     addLTARRef(row, column?.value as ColumnType)
     saveRow!()
@@ -58,7 +59,7 @@ const linkRow = async (row: Record<string, any>) => {
     await link(row)
   }
   if (isAltKeyDown.value) {
-    if (!isNew.value) loadChildrenExcludedList()
+    loadChildrenExcludedList()
   } else {
     vModel.value = false
   }
@@ -197,7 +198,7 @@ watch(vModel, (nextVal) => {
     :body-style="{ padding: 0 }"
     wrap-class-name="nc-modal-link-record"
   >
-    <div class="h-[min(max(calc(100vh_-_300px)_,350px),540px)] flex flex-col py-6">
+    <div class="max-h-[max(calc(100vh_-_300px)_,500px)] flex flex-col py-6">
       <div class="flex mb-4 items-center gap-2 px-12">
         <a-input
           ref="filterQueryRef"
@@ -224,7 +225,7 @@ watch(vModel, (nextVal) => {
             v-for="(refRow, i) in childrenExcludedList?.list ?? []"
             :key="i"
             :ref="selectedRowIndex === i ? activeRow : null"
-            class="nc-nested-list-item !my-2 cursor-pointer hover:(!bg-gray-200/50 shadow-md) group"
+            class="!my-4 cursor-pointer hover:(!bg-gray-200/50 shadow-md) group"
             :class="{ 'nc-selected-row': selectedRowIndex === i }"
             @click="linkRow(refRow)"
           >
@@ -232,9 +233,10 @@ watch(vModel, (nextVal) => {
               :value="refRow[relatedTableDisplayValueProp]"
               :column="props.column"
               :show-unlink-button="false"
-              :border="false"
-              readonly
             />
+            <span class="hidden group-hover:(inline) text-gray-400 text-[11px] ml-1">
+              ({{ $t('labels.primaryKey') }} : {{ getRelatedTableRowId(refRow) }})
+            </span>
           </a-card>
         </div>
 
@@ -279,8 +281,4 @@ watch(vModel, (nextVal) => {
 :deep(.nc-selected-row) {
   @apply !ring;
 }
-
-:deep(.nc-nested-list-item .ant-card-body) {
-  @apply !px-1 !py-0;
-}
 </style>
diff --git a/packages/nc-gui/composables/useColumnCreateStore.ts b/packages/nc-gui/composables/useColumnCreateStore.ts
index 8faac76729..af638da694 100644
--- a/packages/nc-gui/composables/useColumnCreateStore.ts
+++ b/packages/nc-gui/composables/useColumnCreateStore.ts
@@ -1,6 +1,6 @@
 import rfdc from 'rfdc'
 import type { ColumnReqType, ColumnType, TableType } from 'nocodb-sdk'
-import { UITypes, isLinksOrLTAR } from 'nocodb-sdk'
+import { UITypes } from 'nocodb-sdk'
 import type { Ref } from 'vue'
 import type { RuleObject } from 'ant-design-vue/es/form'
 import {
@@ -31,8 +31,8 @@ interface ValidationsObj {
 const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState(
   (meta: Ref<TableType | undefined>, column: Ref<ColumnType | undefined>) => {
     const projectStore = useProject()
-    const { isMysql: isMysqlFunc, isPg: isPgFunc, isMssql: isMssqlFunc, isXcdbBase: isXcdbBaseFunc, getBaseType } = projectStore
-    const { sqlUis } = storeToRefs(projectStore)
+    const { isMysql: isMysqlFunc, isPg: isPgFunc, isMssql: isMssqlFunc, isXcdbBase: isXcdbBaseFunc } = projectStore
+    const { project, sqlUis } = storeToRefs(projectStore)
 
     const { $api } = useNuxtApp()
 
@@ -54,8 +54,6 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState
 
     const isXcdbBase = computed(() => isXcdbBaseFunc(meta.value?.base_id ? meta.value?.base_id : Object.keys(sqlUis.value)[0]))
 
-    const baseType = computed(() => getBaseType(meta.value?.base_id ? meta.value?.base_id : Object.keys(sqlUis.value)[0]))
-
     const idType = null
 
     const additionalValidations = ref<ValidationsObj>({})
@@ -103,7 +101,7 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState
               })
             },
           },
-          fieldLengthValidator(baseType.value || ClientType.MYSQL),
+          fieldLengthValidator(project.value?.bases?.[0].type || ClientType.MYSQL),
         ],
         uidt: [
           {
@@ -254,7 +252,7 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState
           await $api.dbTableColumn.create(meta.value?.id as string, { ...formState.value, ...columnPosition })
 
           /** if LTAR column then force reload related table meta */
-          if (isLinksOrLTAR(formState.value) && meta.value?.id !== formState.value.childId) {
+          if (formState.value.uidt === UITypes.LinkToAnotherRecord && meta.value?.id !== formState.value.childId) {
             getMeta(formState.value.childId, true).then(() => {})
           }
 
diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index f48204ffd7..39a717737c 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -26,6 +26,7 @@ import {
   useI18n,
   useMetas,
   useProject,
+  useUIPermission,
 } from '#imports'
 
 const MAIN_MOUSE_PRESSED = 0
@@ -79,6 +80,9 @@ export function useMultiSelect(
     () => !(activeCell.row === null || activeCell.col === null || isNaN(activeCell.row) || isNaN(activeCell.col)),
   )
 
+  const { isUIAllowed } = useUIPermission()
+  const hasEditPermission = $computed(() => isUIAllowed('xcDatatableEditable'))
+
   function makeActive(row: number, col: number) {
     if (activeCell.row === row && activeCell.col === col) {
       return
diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index 2ab4c2a4d7..db93cf4b39 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -11,7 +11,7 @@ import type {
   TableType,
   ViewType,
 } from 'nocodb-sdk'
-import { ErrorMessages, RelationTypes, UITypes, isLinksOrLTAR, isVirtualCol } from 'nocodb-sdk'
+import { ErrorMessages, RelationTypes, UITypes, isVirtualCol } from 'nocodb-sdk'
 import { isString } from '@vueuse/core'
 import {
   SharedViewPasswordInj,
@@ -74,7 +74,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
   const fieldRequired = (fieldName = 'Value') => helpers.withMessage(t('msg.error.fieldRequired', { value: fieldName }), required)
 
   const formColumns = computed(() =>
-    columns.value?.filter((c) => c.show).filter((col) => !isVirtualCol(col) || isLinksOrLTAR(col.uidt)),
+    columns.value?.filter((c) => c.show).filter((col) => !isVirtualCol(col) || col.uidt === UITypes.LinkToAnotherRecord),
   )
 
   const loadSharedView = async () => {
@@ -151,7 +151,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
       ) {
         obj.localState[column.title!] = { required: fieldRequired(column.label || column.title) }
       } else if (
-        isLinksOrLTAR(column) &&
+        column.uidt === UITypes.LinkToAnotherRecord &&
         column.colOptions &&
         (column.colOptions as LinkToAnotherRecordType).type === RelationTypes.BELONGS_TO
       ) {
diff --git a/packages/nc-gui/composables/useSmartsheetRowStore.ts b/packages/nc-gui/composables/useSmartsheetRowStore.ts
index 6b9973e846..bcb44aef54 100644
--- a/packages/nc-gui/composables/useSmartsheetRowStore.ts
+++ b/packages/nc-gui/composables/useSmartsheetRowStore.ts
@@ -1,4 +1,4 @@
-import { RelationTypes, isLinksOrLTAR } from 'nocodb-sdk'
+import { RelationTypes, UITypes } from 'nocodb-sdk'
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
 import type { Ref } from 'vue'
 import type { MaybeRef } from '@vueuse/core'
@@ -80,11 +80,11 @@ const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState(
       try {
         await $api.dbTableRow.nestedAdd(
           NOCO,
-          project.value.id as string,
-          metaValue?.id as string,
+          project.value.title as string,
+          metaValue?.title as string,
           rowId,
           type as 'mm' | 'hm',
-          column.id as string,
+          column.title as string,
           relatedRowId,
         )
       } catch (e: any) {
@@ -96,7 +96,7 @@ const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState(
     const syncLTARRefs = async (row: Record<string, any>, { metaValue = meta.value }: { metaValue?: TableType } = {}) => {
       const id = extractPkFromRow(row, metaValue?.columns as ColumnType[])
       for (const column of metaValue?.columns ?? []) {
-        if (!isLinksOrLTAR(column)) continue
+        if (column.uidt !== UITypes.LinkToAnotherRecord) continue
 
         const colOptions = column.colOptions as LinkToAnotherRecordType
 
@@ -132,7 +132,7 @@ const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState(
     // clear LTAR cell
     const clearLTARCell = async (column: ColumnType) => {
       try {
-        if (!column || !isLinksOrLTAR(column)) return
+        if (!column || column.uidt !== UITypes.LinkToAnotherRecord) return
 
         const relatedTableMeta = metas.value?.[(<LinkToAnotherRecordType>column?.colOptions)?.fk_related_model_id as string]
 
@@ -143,11 +143,11 @@ const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState(
             if (!currentRow.value.row[column.title!]) return
             await $api.dbTableRow.nestedRemove(
               NOCO,
-              project.value.id as string,
-              meta.value?.id as string,
+              project.value.title as string,
+              meta.value?.title as string,
               extractPkFromRow(currentRow.value.row, meta.value?.columns as ColumnType[]),
               'bt' as any,
-              column.id as string,
+              column.title as string,
               extractPkFromRow(currentRow.value.row[column.title!], relatedTableMeta?.columns as ColumnType[]),
             )
             currentRow.value.row[column.title!] = null
@@ -155,11 +155,11 @@ const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState(
             for (const link of (currentRow.value.row[column.title!] as Record<string, any>[]) || []) {
               await $api.dbTableRow.nestedRemove(
                 NOCO,
-                project.value.id as string,
-                meta.value?.id as string,
+                project.value.title as string,
+                meta.value?.title as string,
                 extractPkFromRow(currentRow.value.row, meta.value?.columns as ColumnType[]),
                 (<LinkToAnotherRecordType>column?.colOptions).type as 'hm' | 'mm',
-                column.id as string,
+                column.title as string,
                 extractPkFromRow(link, relatedTableMeta?.columns as ColumnType[]),
               )
             }
diff --git a/packages/nc-gui/composables/useTable.ts b/packages/nc-gui/composables/useTable.ts
index 8d4a85dbfc..4596c2ff2c 100644
--- a/packages/nc-gui/composables/useTable.ts
+++ b/packages/nc-gui/composables/useTable.ts
@@ -1,5 +1,5 @@
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes, isLinksOrLTAR, isSystemColumn } from 'nocodb-sdk'
+import { UITypes, isSystemColumn } from 'nocodb-sdk'
 import {
   Modal,
   SYSTEM_COLUMNS,
@@ -86,7 +86,7 @@ export function useTable(onTableCreate?: (tableMeta: TableType) => void, baseId?
       async onOk() {
         try {
           const meta = (await getMeta(table.id as string, true)) as TableType
-          const relationColumns = meta?.columns?.filter((c) => isLinksOrLTAR(c) && !isSystemColumn(c))
+          const relationColumns = meta?.columns?.filter((c) => c.uidt === UITypes.LinkToAnotherRecord && !isSystemColumn(c))
 
           // Check if table has any relation columns and show notification
           // skip for xcdb base
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 4be39193c9..7e2154a59d 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -289,7 +289,6 @@
     "childTable": "Child table",
     "childColumn": "Child column",
     "linkToAnotherRecord": "Link to another record",
-    "links": "Links",
     "onUpdate": "On Update",
     "onDelete": "On Delete",
     "account": "Account",
diff --git a/packages/nc-gui/store/project.ts b/packages/nc-gui/store/project.ts
index cc512a5214..2771d428cb 100644
--- a/packages/nc-gui/store/project.ts
+++ b/packages/nc-gui/store/project.ts
@@ -227,6 +227,5 @@ export const useProject = defineStore('projectStore', () => {
     isXcdbBase,
     hasEmptyOrNullFilters,
     setProject,
-    getBaseType,
   }
 })
diff --git a/packages/nc-gui/utils/columnUtils.ts b/packages/nc-gui/utils/columnUtils.ts
index 5e407f3a3f..838daf308f 100644
--- a/packages/nc-gui/utils/columnUtils.ts
+++ b/packages/nc-gui/utils/columnUtils.ts
@@ -5,16 +5,10 @@ import LinkVariant from '~icons/mdi/link-variant'
 import ID from '~icons/mdi/identifier'
 
 const uiTypes = [
-  {
-    name: UITypes.Links,
-    icon: iconMap.link,
-    virtual: 1,
-  },
   {
     name: UITypes.LinkToAnotherRecord,
     icon: iconMap.link,
     virtual: 1,
-    deprecated: 1,
   },
   {
     name: UITypes.Lookup,
diff --git a/packages/nc-gui/utils/filterUtils.ts b/packages/nc-gui/utils/filterUtils.ts
index b1a9d4b982..dbf4e875bf 100644
--- a/packages/nc-gui/utils/filterUtils.ts
+++ b/packages/nc-gui/utils/filterUtils.ts
@@ -261,13 +261,13 @@ export const comparisonOpList = (
     text: 'is blank',
     value: 'blank',
     ignoreVal: true,
-    excludedTypes: [UITypes.Checkbox, UITypes.Links, UITypes.Rollup],
+    excludedTypes: [UITypes.Checkbox],
   },
   {
     text: 'is not blank',
     value: 'notblank',
     ignoreVal: true,
-    excludedTypes: [UITypes.Checkbox, UITypes.Links, UITypes.Rollup],
+    excludedTypes: [UITypes.Checkbox],
   },
 ]
 
diff --git a/packages/nc-gui/utils/virtualCell.ts b/packages/nc-gui/utils/virtualCell.ts
index 77d224655f..9338df7834 100644
--- a/packages/nc-gui/utils/virtualCell.ts
+++ b/packages/nc-gui/utils/virtualCell.ts
@@ -1,7 +1,8 @@
 import type { ColumnType, LinkToAnotherRecordType } from 'nocodb-sdk'
-import { RelationTypes, UITypes, isLinksOrLTAR } from 'nocodb-sdk'
+import { RelationTypes, UITypes } from 'nocodb-sdk'
 
-export const isLTAR = (uidt: string, colOptions: unknown): colOptions is LinkToAnotherRecordType => isLinksOrLTAR(uidt)
+export const isLTAR = (uidt: string, colOptions: unknown): colOptions is LinkToAnotherRecordType =>
+  uidt === UITypes.LinkToAnotherRecord
 
 export const isHm = (column: ColumnType) =>
   isLTAR(column.uidt!, column.colOptions) && column.colOptions.type === RelationTypes.HAS_MANY
@@ -18,4 +19,3 @@ export const isFormula = (column: ColumnType) => column.uidt === UITypes.Formula
 export const isQrCode = (column: ColumnType) => column.uidt === UITypes.QrCode
 export const isBarcode = (column: ColumnType) => column.uidt === UITypes.Barcode
 export const isCount = (column: ColumnType) => column.uidt === UITypes.Count
-export const isLink = (column: ColumnType) => column.uidt === UITypes.Links
diff --git a/packages/noco-docs/content/en/setup-and-usages/links.md b/packages/noco-docs/content/en/setup-and-usages/links.md
deleted file mode 100644
index 5bd16d7537..0000000000
--- a/packages/noco-docs/content/en/setup-and-usages/links.md
+++ /dev/null
@@ -1,107 +0,0 @@
----
-title: "Links"
-description: "Understanding Link Columns!"
-position: 540
-category: "Product"
-menuTitle: "Links"
----
-
-### Supported relationship types:
-
-- One to many
-  - A Table record in first table is related to more than one record of second table. But second table record maps to only one entry of first table
-  - NocoDB refers to this category of relationship as **has many**
-  - For every **has many** relation defined, NocoDB augments **belongs to** relationship column in the adjacent table automatically
-  - Example: Country **has many** Cities. (other way mapping > City **belongs to** Country )
-- Many to many
-  - A Table record in first table is related to more than one record of second table; second table record can also map to more than on record of first table.
-  - NocoDB refers to this category of relationship as **many to many**
-  - For every **many to many** relation defined between tables, NocoDB augments **many to many** relationship column in the other table automatically
-  - Example: Film **has many** Actors. Actor **has many** Films (works on many films)
-
-Further details of relationship types can be found [here](https://afteracademy.com/blog/what-are-the-different-types-of-relationships-in-dbms)
-
-From Release v0.110.0, table records can be connected through relationships using the **Links** column type. 
-It is important to note that, earlier supported column type **LinkToAnotherRecord** for creating relations is considered deprecated. While the old datatype is still supported for backward compatibility, it is no longer possible to create new fields of that type.
-
-The main distinction between these two column types lies in how the contents are displayed within the cell when links are established between two tables. With the **LinkToAnotherRecord** column type, the cell displays the **Primary value** of the related records. On the other hand, the **Links** column type only shows the **count** of related records.
-The decision to switch over to new column type was made to ensure better performance and scalability of the application, more so when the records & the number of records in the related table is large.
-  
-Child list to display the related records can be accessed by clicking on the link count displayed on the cell. 
-Except for the column type, the following procedures remain same as before 
-- Create, update & delete a relationship column, 
-- Link & unlink a record, 
-- Create a lookup and rollup columns 
-
-Workflow details are captured below.
-
-## Adding a relationship
-  
-![Screenshot 2023-06-27 at 11 03 20 AM](https://github.com/nocodb/nocodb/assets/86527202/b3762fc8-4bba-42ef-8415-41428840ee0e)
-
-
-1. Create column
-   Click on '+' button at end of column headers
-
-2. Update column name
-   Input name in the text box provided
-
-3. Select column type
-   Select Column type as "Links" from the drop-down menu
-
-4. Choose relationship type
-- 'Has Many' corresponds to the 'One-to-many' relationships
-- 'Many To Many' corresponds to the 'Many-to-many' relationships
-
-5. Select child table from drop down menu
-
-6. Click on 'Save'
-   A new column will get created in both the parent table & child table
-
-## Linking records
-
-### 1. Open link record tab
-
-Click on the '+' icon in corresponding row - cell
-![Screenshot 2023-06-27 at 11 06 52 AM](https://github.com/nocodb/nocodb/assets/86527202/96a90a6d-544e-4e43-b6d1-fe1aef784257)
-
-### 2. Select from the option displayed
-
-Use 'Filter box' to narrow down on search items.    
-You can opt to insert a new record as well, using "+ New Record" button.  
-You can use `ALT + Click` to insert multiple options together.  
-  
-![Screenshot 2023-06-27 at 11 08 40 AM](https://github.com/nocodb/nocodb/assets/86527202/68246783-8d01-488b-8926-644fca8fa164)
-
-### 3. Column display for "Has Many" relationship
-
-Country 'has many' City
-
-![Screenshot 2023-06-27 at 11 11 50 AM](https://github.com/nocodb/nocodb/assets/86527202/b5bb62b7-37ad-480e-8bf2-d666b775b07a)
-
-
-### 4. Column display for "Belongs to" relationship [Automatically updated]
-
-City 'belongs to' Country.  
-Note: Primary value is still used as cell display value for "Belongs to" as it can have only one associated record.
-
-![Screenshot 2023-06-27 at 11 12 27 AM](https://github.com/nocodb/nocodb/assets/86527202/54e9ee75-4af5-49f6-8cd9-275dc53a8915)
-
-
-## Unlinking records
-
-1. Click on link count to open Child modal
-2. Click on Unlink icon against required item
-
-![Screenshot 2023-06-27 at 11 22 00 AM](https://github.com/nocodb/nocodb/assets/86527202/dad3cbc7-289d-45a7-9c49-a72264ed36b1)
-
-
-
-
-
-## Link label reconfiguration
-
-Use column edit menu for **Links** to reconfigure display label
-
-![Screenshot 2023-06-27 at 11 16 19 AM](https://github.com/nocodb/nocodb/assets/86527202/1aabdd8c-7102-4917-b0c0-b72e1187b0b7)
-
diff --git a/packages/noco-docs/content/en/setup-and-usages/lookup.md b/packages/noco-docs/content/en/setup-and-usages/lookup.md
index f62740c0d2..52075da925 100644
--- a/packages/noco-docs/content/en/setup-and-usages/lookup.md
+++ b/packages/noco-docs/content/en/setup-and-usages/lookup.md
@@ -11,7 +11,7 @@ menuTitle: "Lookup"
 ### Example organization structure
   
 Consider an organization with
-- 5 departments (company departments), each department has a team name & associated team code. Each `Team` **has many** `Employees` - relationship has been defined using `LinkToAnotherRecord` or `Links`column
+- 5 departments (company departments), each department has a team name & associated team code. Each `Team` **has many** `Employees` - relationship has been defined using `LinkToAnotherRecord` column
 - 5 employees working at different departments
   
   
diff --git a/packages/nocodb-sdk/src/index.ts b/packages/nocodb-sdk/src/index.ts
index c28d6ed84a..964f4c66ff 100644
--- a/packages/nocodb-sdk/src/index.ts
+++ b/packages/nocodb-sdk/src/index.ts
@@ -12,7 +12,6 @@ export {
   numericUITypes,
   isNumericCol,
   isVirtualCol,
-  isLinksOrLTAR,
 } from './lib/UITypes';
 export { default as CustomAPI } from './lib/CustomAPI';
 export { default as TemplateGenerator } from './lib/TemplateGenerator';
diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index 38a8b94747..b35b8e5267 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -433,8 +433,7 @@ export interface ColumnType {
     | 'Time'
     | 'URL'
     | 'Year'
-    | 'QrCode'
-    | 'Links';
+    | 'QrCode';
   /** Is Unsigned? */
   un?: BoolType;
   /** Is unique? */
@@ -1469,7 +1468,7 @@ export interface LinkToAnotherColumnReqType {
   /** The type of the relationship */
   type: 'bt' | 'hm' | 'mm';
   /** Abstract type of the relationship */
-  uidt: 'LinkToAnotherRecord' | 'Links';
+  uidt: 'LinkToAnotherRecord';
   /** Is this relationship virtual? */
   virtual?: BoolType;
 }
@@ -1721,8 +1720,7 @@ export interface NormalColumnRequestType {
     | 'Time'
     | 'URL'
     | 'Year'
-    | 'QrCode'
-    | 'Links';
+    | 'QrCode';
   /** Is this column unique? */
   un?: BoolType;
   /** Is this column unique? */
diff --git a/packages/nocodb-sdk/src/lib/UITypes.ts b/packages/nocodb-sdk/src/lib/UITypes.ts
index 40e6cb30f5..ce9059c7a9 100644
--- a/packages/nocodb-sdk/src/lib/UITypes.ts
+++ b/packages/nocodb-sdk/src/lib/UITypes.ts
@@ -38,7 +38,6 @@ enum UITypes {
   Barcode = 'Barcode',
   QrCode = 'QrCode',
   Button = 'Button',
-  Links = 'Links',
 }
 
 export const numericUITypes = [
@@ -50,7 +49,6 @@ export const numericUITypes = [
   UITypes.Rating,
   UITypes.Rollup,
   UITypes.Year,
-  UITypes.Links,
 ];
 
 export function isNumericCol(
@@ -81,17 +79,8 @@ export function isVirtualCol(
     UITypes.Barcode,
     UITypes.Rollup,
     UITypes.Lookup,
-    UITypes.Links,
     // UITypes.Count,
   ].includes(<UITypes>(typeof col === 'object' ? col?.uidt : col));
 }
 
-export function isLinksOrLTAR(
-  colOrUidt: ColumnType | { uidt: UITypes | string } | UITypes | string
-) {
-  return [UITypes.LinkToAnotherRecord, UITypes.Links].includes(
-    <UITypes>(typeof colOrUidt === 'object' ? colOrUidt?.uidt : colOrUidt)
-  );
-}
-
 export default UITypes;
diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index 05f8f7e5bc..efbdc09f4b 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -8,7 +8,6 @@ import { nocoExecute } from 'nc-help';
 import {
   AuditOperationSubTypes,
   AuditOperationTypes,
-  isLinksOrLTAR,
   isSystemColumn,
   isVirtualCol,
   RelationTypes,
@@ -1367,23 +1366,16 @@ class BaseModelSqlv2 {
           {
             // @ts-ignore
             const colOptions: LookupColumn = await column.getColOptions();
-            const relCol = await Column.get({
-              colId: colOptions.fk_relation_column_id,
-            });
-            const relColTitle =
-              relCol.uidt === UITypes.Links
-                ? `_nc_lk_${relCol.title}`
-                : relCol.title;
             proto.__columnAliases[column.title] = {
               path: [
-                relColTitle,
+                (await Column.get({ colId: colOptions.fk_relation_column_id }))
+                  ?.title,
                 (await Column.get({ colId: colOptions.fk_lookup_column_id }))
                   ?.title,
               ],
             };
           }
           break;
-        case UITypes.Links:
         case UITypes.LinkToAnotherRecord:
           {
             this._columns[column.title] = column;
@@ -1421,11 +1413,7 @@ class BaseModelSqlv2 {
               });
               const self: BaseModelSqlv2 = this;
 
-              proto[
-                column.uidt === UITypes.Links
-                  ? `_nc_lk_${column.title}`
-                  : column.title
-              ] = async function (args): Promise<any> {
+              proto[column.title] = async function (args): Promise<any> {
                 (listLoader as any).args = args;
                 return listLoader.load(
                   getCompositePk(self.model.primaryKeys, this),
@@ -1471,11 +1459,7 @@ class BaseModelSqlv2 {
 
               const self: BaseModelSqlv2 = this;
               // const childColumn = await colOptions.getChildColumn();
-              proto[
-                column.uidt === UITypes.Links
-                  ? `_nc_lk_${column.title}`
-                  : column.title
-              ] = async function (args): Promise<any> {
+              proto[column.title] = async function (args): Promise<any> {
                 (listLoader as any).args = args;
                 return await listLoader.load(
                   getCompositePk(self.model.primaryKeys, this),
@@ -1693,10 +1677,10 @@ class BaseModelSqlv2 {
             `${alias || this.model.table_name}.${column.column_name}`,
           );
           break;
-        case UITypes.LinkToAnotherRecord:
-        case UITypes.Lookup:
+        case 'LinkToAnotherRecord':
+        case 'Lookup':
           break;
-        case UITypes.QrCode: {
+        case 'QrCode': {
           const qrCodeColumn = await column.getColOptions<QrCodeColumn>();
           const qrValueColumn = await Column.get({
             colId: qrCodeColumn.fk_qr_value_column_id,
@@ -1731,7 +1715,7 @@ class BaseModelSqlv2 {
 
           break;
         }
-        case UITypes.Barcode: {
+        case 'Barcode': {
           const barcodeColumn = await column.getColOptions<BarcodeColumn>();
           const barcodeValueColumn = await Column.get({
             colId: barcodeColumn.fk_barcode_value_column_id,
@@ -1768,7 +1752,7 @@ class BaseModelSqlv2 {
 
           break;
         }
-        case UITypes.Formula:
+        case 'Formula':
           {
             try {
               const selectQb = await this.getSelectQueryBuilderForFormula(
@@ -1792,8 +1776,7 @@ class BaseModelSqlv2 {
             }
           }
           break;
-        case UITypes.Rollup:
-        case UITypes.Links:
+        case 'Rollup':
           qb.select(
             (
               await genRollupSelectv2({
@@ -2124,8 +2107,8 @@ class BaseModelSqlv2 {
       let rowId = null;
       const postInsertOps = [];
 
-      const nestedCols = (await this.model.getColumns()).filter((c) =>
-        isLinksOrLTAR(c),
+      const nestedCols = (await this.model.getColumns()).filter(
+        (c) => c.uidt === UITypes.LinkToAnotherRecord,
       );
 
       for (const col of nestedCols) {
@@ -3159,10 +3142,7 @@ class BaseModelSqlv2 {
     const columns = await this.model.getColumns();
     const column = columns.find((c) => c.id === colId);
 
-    if (
-      !column ||
-      ![UITypes.LinkToAnotherRecord, UITypes.Links].includes(column.uidt)
-    )
+    if (!column || column.uidt !== UITypes.LinkToAnotherRecord)
       NcError.notFound('Column not found');
 
     const colOptions = await column.getColOptions<LinkToAnotherRecordColumn>();
@@ -3281,10 +3261,7 @@ class BaseModelSqlv2 {
     const columns = await this.model.getColumns();
     const column = columns.find((c) => c.id === colId);
 
-    if (
-      !column ||
-      ![UITypes.LinkToAnotherRecord, UITypes.Links].includes(column.uidt)
-    )
+    if (!column || column.uidt !== UITypes.LinkToAnotherRecord)
       NcError.notFound('Column not found');
 
     const colOptions = await column.getColOptions<LinkToAnotherRecordColumn>();
diff --git a/packages/nocodb/src/db/conditionV2.ts b/packages/nocodb/src/db/conditionV2.ts
index fee84e6d69..4234c91a08 100644
--- a/packages/nocodb/src/db/conditionV2.ts
+++ b/packages/nocodb/src/db/conditionV2.ts
@@ -275,10 +275,7 @@ const parseConditionV2 = async (
       return (_qb) => {};
     } else if (column.uidt === UITypes.Lookup) {
       return await generateLookupCondition(column, filter, knex, aliasCount);
-    } else if (
-      [UITypes.Rollup, UITypes.Links].includes(column.uidt) &&
-      !customWhereClause
-    ) {
+    } else if (column.uidt === UITypes.Rollup && !customWhereClause) {
       const builder = (
         await genRollupSelectv2({
           knex,
@@ -419,7 +416,6 @@ const parseConditionV2 = async (
                   UITypes.Decimal,
                   UITypes.Rating,
                   UITypes.Rollup,
-                  UITypes.Links,
                 ].includes(column.uidt)
               ) {
                 qb = qb.where(field, val);
@@ -446,14 +442,12 @@ const parseConditionV2 = async (
                   UITypes.Number,
                   UITypes.Decimal,
                   UITypes.Rollup,
-                  UITypes.Links,
                 ].includes(column.uidt)
               ) {
                 qb = qb.where((nestedQb) => {
-                  nestedQb.whereNot(field, val);
-
-                  if (column.uidt !== UITypes.Links)
-                    nestedQb.orWhereNull(customWhereClause ? _val : _field);
+                  nestedQb
+                    .whereNot(field, val)
+                    .orWhereNull(customWhereClause ? _val : _field);
                 });
               } else if (column.uidt === UITypes.Rating) {
                 // unset rating is considered as NULL
@@ -473,10 +467,9 @@ const parseConditionV2 = async (
               }
             } else {
               qb = qb.where((nestedQb) => {
-                nestedQb.whereNot(field, val);
-
-                if (column.uidt !== UITypes.Links)
-                  nestedQb.orWhereNull(customWhereClause ? _val : _field);
+                nestedQb
+                  .whereNot(field, val)
+                  .orWhereNull(customWhereClause ? _val : _field);
               });
             }
             break;
diff --git a/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts b/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts
index a7f58afa0f..ab03115106 100644
--- a/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts
+++ b/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts
@@ -229,7 +229,6 @@ async function _formulaQueryBuilder(
             }
 
             switch (lookupColumn.uidt) {
-              case UITypes.Links:
               case UITypes.Rollup:
                 {
                   const builder = (
@@ -416,7 +415,6 @@ async function _formulaQueryBuilder(
         };
         break;
       case UITypes.Rollup:
-      case UITypes.Links:
         aliasToColumn[col.id] = async (): Promise<any> => {
           const qb = await genRollupSelectv2({
             knex,
diff --git a/packages/nocodb/src/db/genRollupSelectv2.ts b/packages/nocodb/src/db/genRollupSelectv2.ts
index decf600942..979b7dfd08 100644
--- a/packages/nocodb/src/db/genRollupSelectv2.ts
+++ b/packages/nocodb/src/db/genRollupSelectv2.ts
@@ -1,5 +1,4 @@
 import { RelationTypes } from 'nocodb-sdk';
-import type { LinksColumn } from '../models';
 import type { RollupColumn } from '../models';
 import type { XKnex } from '../db/CustomKnex';
 import type { LinkToAnotherRecordColumn } from '../models';
@@ -14,7 +13,7 @@ export default async function ({
 }: {
   knex: XKnex;
   alias?: string;
-  columnOptions: RollupColumn | LinksColumn;
+  columnOptions: RollupColumn;
 }): Promise<{ builder: Knex.QueryBuilder | any }> {
   const relationColumn = await columnOptions.getRelationColumn();
   const relationColumnOption: LinkToAnotherRecordColumn =
diff --git a/packages/nocodb/src/db/sortV2.ts b/packages/nocodb/src/db/sortV2.ts
index 651b817296..7a98ed9983 100644
--- a/packages/nocodb/src/db/sortV2.ts
+++ b/packages/nocodb/src/db/sortV2.ts
@@ -36,7 +36,6 @@ export default async function sortV2(
 
     switch (column.uidt) {
       case UITypes.Rollup:
-      case UITypes.Links:
         {
           const builder = (
             await genRollupSelectv2({
@@ -122,7 +121,6 @@ export default async function sortV2(
             }
 
             switch (lookupColumn.uidt) {
-              case UITypes.Links:
               case UITypes.Rollup:
                 {
                   const builder = (
diff --git a/packages/nocodb/src/helpers/columnHelpers.ts b/packages/nocodb/src/helpers/columnHelpers.ts
index 4e229574bb..99c46ee305 100644
--- a/packages/nocodb/src/helpers/columnHelpers.ts
+++ b/packages/nocodb/src/helpers/columnHelpers.ts
@@ -1,11 +1,8 @@
 import { customAlphabet } from 'nanoid';
 import { UITypes } from 'nocodb-sdk';
-import { pluralize, singularize } from 'inflection';
-import { GridViewColumn } from '../models';
 import Column from '../models/Column';
 import { getUniqueColumnAliasName } from '../helpers/getUniqueName';
 import validateParams from '../helpers/validateParams';
-import type { RollupColumn } from '../models';
 import type {
   BoolType,
   ColumnReqType,
@@ -33,14 +30,12 @@ export async function createHmAndBtColumn(
   fkColName?: string,
   virtual: BoolType = false,
   isSystemCol = false,
-  columnMeta = null,
-  isLinks = false,
 ) {
   // save bt column
   {
     const title = getUniqueColumnAliasName(
       await child.getColumns(),
-      (type === 'bt' && alias) || `${parent.title}`,
+      type === 'bt' ? alias : `${parent.title}`,
     );
     await Column.insert<LinkToAnotherRecordColumn>({
       title,
@@ -55,8 +50,7 @@ export async function createHmAndBtColumn(
       fk_parent_column_id: parent.primaryKey.id,
       fk_related_model_id: parent.id,
       virtual,
-      // if self referencing treat it as system field to hide from ui
-      system: isSystemCol || parent.id === child.id,
+      system: isSystemCol,
       fk_col_name: fkColName,
       fk_index_name: fkColName,
     });
@@ -65,17 +59,12 @@ export async function createHmAndBtColumn(
   {
     const title = getUniqueColumnAliasName(
       await parent.getColumns(),
-      (type === 'hm' && alias) || pluralize(child.title),
+      type === 'hm' ? alias : `${child.title} List`,
     );
-    const meta = {
-      plural: columnMeta?.plural || pluralize(child.title),
-      singular: columnMeta?.singular || singularize(child.title),
-    };
-
     await Column.insert({
       title,
       fk_model_id: parent.id,
-      uidt: isLinks ? UITypes.Links : UITypes.LinkToAnotherRecord,
+      uidt: UITypes.LinkToAnotherRecord,
       type: 'hm',
       fk_child_column_id: childColumn.id,
       fk_parent_column_id: parent.primaryKey.id,
@@ -84,7 +73,6 @@ export async function createHmAndBtColumn(
       system: isSystemCol,
       fk_col_name: fkColName,
       fk_index_name: fkColName,
-      meta,
     });
   }
 }
@@ -218,47 +206,3 @@ export const generateFkName = (parent: TableType, child: TableType) => {
     .slice(0, 10)}_${randomID(15)}`;
   return constraintName;
 };
-
-export async function populateRollupForLTAR({
-  column,
-  columnMeta,
-  alias,
-}: {
-  column: Column;
-  columnMeta?: any;
-  alias?: string;
-}) {
-  const model = await column.getModel();
-
-  const views = await model.getViews();
-
-  const relatedModel = await column
-    .getColOptions<LinkToAnotherRecordColumn>()
-    .then((colOpt) => colOpt.getRelatedTable());
-  await relatedModel.getColumns();
-  const pkId =
-    relatedModel.primaryKey?.id || (await relatedModel.getColumns())[0]?.id;
-
-  const meta = {
-    plural: columnMeta?.plural || pluralize(relatedModel.title),
-    singular: columnMeta?.singular || singularize(relatedModel.title),
-  };
-
-  await Column.insert<RollupColumn>({
-    uidt: UITypes.Links,
-    title: getUniqueColumnAliasName(
-      await model.getColumns(),
-      alias || `${relatedModel.title} Count`,
-    ),
-    fk_rollup_column_id: pkId,
-    fk_model_id: model.id,
-    rollup_function: 'count',
-    fk_relation_column_id: column.id,
-    meta,
-  });
-
-  const viewCol = await GridViewColumn.list(views[0].id).then((cols) =>
-    cols.find((c) => c.fk_column_id === column.id),
-  );
-  await GridViewColumn.update(viewCol.id, { show: false });
-}
diff --git a/packages/nocodb/src/helpers/getAst.ts b/packages/nocodb/src/helpers/getAst.ts
index 6093a29d9b..ee5a9209b5 100644
--- a/packages/nocodb/src/helpers/getAst.ts
+++ b/packages/nocodb/src/helpers/getAst.ts
@@ -89,12 +89,11 @@ const getAst = async ({
         value = ast;
 
         // todo: include field relative to the relation => pk / fk
-      } else if (col.uidt === UITypes.Links) {
-        value = 1;
       } else {
-        value = (
-          Array.isArray(nestedFields) ? nestedFields : nestedFields.split(',')
-        ).reduce((o, f) => ({ ...o, [f]: 1 }), {});
+        value = (Array.isArray(fields) ? fields : fields.split(',')).reduce(
+          (o, f) => ({ ...o, [f]: 1 }),
+          {},
+        );
       }
     } else if (col.uidt === UITypes.LinkToAnotherRecord) {
       const model = await col
diff --git a/packages/nocodb/src/helpers/populateMeta.ts b/packages/nocodb/src/helpers/populateMeta.ts
index 7a7db0bcd6..39ca7d1d2b 100644
--- a/packages/nocodb/src/helpers/populateMeta.ts
+++ b/packages/nocodb/src/helpers/populateMeta.ts
@@ -1,8 +1,5 @@
 import { ModelTypes, UITypes, ViewTypes } from 'nocodb-sdk';
 import { isVirtualCol, RelationTypes } from 'nocodb-sdk';
-import { pluralize, singularize } from 'inflection';
-import { isLinksOrLTAR } from 'nocodb-sdk';
-import { GridViewColumn } from '../models';
 import Column from '../models/Column';
 import Model from '../models/Model';
 import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2';
@@ -12,7 +9,6 @@ import getTableNameAlias, { getColumnNameAlias } from '../helpers/getTableName';
 import getColumnUiType from '../helpers/getColumnUiType';
 import mapDefaultDisplayValue from '../helpers/mapDefaultDisplayValue';
 import { getUniqueColumnAliasName } from './getUniqueName';
-import type { RollupColumn } from '../models';
 import type LinkToAnotherRecordColumn from '../models/LinkToAnotherRecordColumn';
 import type Base from '../models/Base';
 import type Project from '../models/Project';
@@ -114,7 +110,7 @@ export async function extractAndGenerateManyToManyRelations(
         await Column.insert<LinkToAnotherRecordColumn>({
           title: getUniqueColumnAliasName(
             modelA.columns,
-            pluralize(modelB.title),
+            `${modelB.title} List`,
           ),
           fk_model_id: modelA.id,
           fk_related_model_id: modelB.id,
@@ -125,18 +121,14 @@ export async function extractAndGenerateManyToManyRelations(
           fk_mm_parent_column_id:
             belongsToCols[1].colOptions.fk_child_column_id,
           type: RelationTypes.MANY_TO_MANY,
-          uidt: UITypes.Links,
-          meta: {
-            plural: pluralize(modelB.title),
-            singular: singularize(modelB.title),
-          },
+          uidt: UITypes.LinkToAnotherRecord,
         });
       }
       if (!isRelationAvailInB) {
         await Column.insert<LinkToAnotherRecordColumn>({
           title: getUniqueColumnAliasName(
             modelB.columns,
-            pluralize(modelA.title),
+            `${modelA.title} List`,
           ),
           fk_model_id: modelB.id,
           fk_related_model_id: modelA.id,
@@ -147,11 +139,7 @@ export async function extractAndGenerateManyToManyRelations(
           fk_mm_parent_column_id:
             belongsToCols[0].colOptions.fk_child_column_id,
           type: RelationTypes.MANY_TO_MANY,
-          uidt: UITypes.Links,
-          meta: {
-            plural: pluralize(modelA.title),
-            singular: singularize(modelA.title),
-          },
+          uidt: UITypes.LinkToAnotherRecord,
         });
       }
 
@@ -163,7 +151,7 @@ export async function extractAndGenerateManyToManyRelations(
         const model = await colOpt.getRelatedTable();
 
         for (const col of await model.getColumns()) {
-          if (!isLinksOrLTAR(col.uidt)) continue;
+          if (col.uidt !== UITypes.LinkToAnotherRecord) continue;
 
           const colOpt1 = await col.getColOptions<LinkToAnotherRecordColumn>();
           if (!colOpt1 || colOpt1.type !== RelationTypes.HAS_MANY) continue;
@@ -265,14 +253,10 @@ export async function populateMeta(base: Base, project: Project): Promise<any> {
       const virtualColumns = [
         ...hasMany.map((hm) => {
           return {
-            uidt: UITypes.Links,
+            uidt: UITypes.LinkToAnotherRecord,
             type: 'hm',
             hm,
-            title: pluralize(hm.title),
-            meta: {
-              plural: pluralize(hm.title),
-              singular: singularize(hm.title),
-            },
+            title: `${hm.title} List`,
           };
         }),
         ...belongsTo.map((bt) => {
@@ -360,7 +344,6 @@ export async function populateMeta(base: Base, project: Project): Promise<any> {
               order: colOrder++,
               fk_related_model_id: column.hm ? tnId : rtnId,
               system: column.system,
-              meta: column.meta,
             });
 
             // nested relations data apis
@@ -452,53 +435,3 @@ export async function populateMeta(base: Base, project: Project): Promise<any> {
 
   return info;
 }
-
-export async function populateRollupColumnAndHideLTAR(
-  base: Base,
-  project: Project,
-) {
-  for (const model of await Model.list({
-    project_id: project.id,
-    base_id: base.id,
-  })) {
-    const columns = await model.getColumns();
-    const hmAndMmLTARColumns = columns.filter(
-      (c) =>
-        c.uidt === UITypes.LinkToAnotherRecord &&
-        c.colOptions.type !== RelationTypes.BELONGS_TO &&
-        !c.system,
-    );
-
-    const views = await model.getViews();
-
-    for (const column of hmAndMmLTARColumns) {
-      const relatedModel = await column
-        .getColOptions<LinkToAnotherRecordColumn>()
-        .then((colOpt) => colOpt.getRelatedTable());
-      await relatedModel.getColumns();
-      const pkId =
-        relatedModel.primaryKey?.id || (await relatedModel.getColumns())[0]?.id;
-
-      await Column.insert<RollupColumn>({
-        uidt: UITypes.Links,
-        title: getUniqueColumnAliasName(
-          await model.getColumns(),
-          `${relatedModel.title}`,
-        ),
-        fk_rollup_column_id: pkId,
-        fk_model_id: model.id,
-        rollup_function: 'count',
-        fk_relation_column_id: column.id,
-        meta: {
-          singular: singularize(relatedModel.title),
-          plural: pluralize(relatedModel.title),
-        },
-      });
-
-      const viewCol = await GridViewColumn.list(views[0].id).then((cols) =>
-        cols.find((c) => c.fk_column_id === column.id),
-      );
-      await GridViewColumn.update(viewCol.id, { show: false });
-    }
-  }
-}
diff --git a/packages/nocodb/src/models/Column.ts b/packages/nocodb/src/models/Column.ts
index 6030e61021..1695d1b4db 100644
--- a/packages/nocodb/src/models/Column.ts
+++ b/packages/nocodb/src/models/Column.ts
@@ -1,4 +1,4 @@
-import { AllowedColumnTypesForQrAndBarcodes, isLinksOrLTAR, UITypes } from 'nocodb-sdk'
+import { AllowedColumnTypesForQrAndBarcodes, UITypes } from 'nocodb-sdk';
 import NocoCache from '../cache/NocoCache';
 import {
   CacheDelDirection,
@@ -10,7 +10,6 @@ import Noco from '../Noco';
 import addFormulaErrorIfMissingColumn from '../helpers/addFormulaErrorIfMissingColumn';
 import { NcError } from '../helpers/catchError';
 import { extractProps } from '../helpers/extractProps';
-import { stringifyMetaProp } from '../utils/modelUtils';
 import FormulaColumn from './FormulaColumn';
 import LinkToAnotherRecordColumn from './LinkToAnotherRecordColumn';
 import LookupColumn from './LookupColumn';
@@ -22,7 +21,6 @@ import Sort from './Sort';
 import Filter from './Filter';
 import QrCodeColumn from './QrCodeColumn';
 import BarcodeColumn from './BarcodeColumn';
-import { LinksColumn } from './index';
 import type { ColumnReqType, ColumnType } from 'nocodb-sdk';
 
 export default class Column<T = any> implements ColumnType {
@@ -208,7 +206,6 @@ export default class Column<T = any> implements ColumnType {
         );
         break;
       }
-      case UITypes.Links:
       case UITypes.LinkToAnotherRecord: {
         await LinkToAnotherRecordColumn.insert(
           {
@@ -425,9 +422,6 @@ export default class Column<T = any> implements ColumnType {
       case UITypes.LinkToAnotherRecord:
         res = await LinkToAnotherRecordColumn.read(this.id, ncMeta);
         break;
-      case UITypes.Links:
-        res = await LinksColumn.read(this.id, ncMeta);
-        break;
       case UITypes.MultiSelect:
         res = await SelectOption.read(this.id, ncMeta);
         break;
@@ -658,7 +652,7 @@ export default class Column<T = any> implements ColumnType {
       }
     }
 
-    // get rollup/links column and delete
+    // get rollup column and delete
     {
       const cachedList = await NocoCache.getList(CacheScope.COL_ROLLUP, [id]);
       let { list: rollups } = cachedList;
@@ -705,7 +699,7 @@ export default class Column<T = any> implements ColumnType {
     }
 
     //  if relation column check lookup and rollup and delete
-    if (isLinksOrLTAR(col.uidt)) {
+    if (col.uidt === UITypes.LinkToAnotherRecord) {
       {
         // get lookup columns using relation and delete
         const cachedList = await NocoCache.getList(CacheScope.COL_LOOKUP, [id]);
@@ -784,7 +778,6 @@ export default class Column<T = any> implements ColumnType {
         cacheScopeName = CacheScope.COL_LOOKUP;
         break;
       case UITypes.LinkToAnotherRecord:
-      case UITypes.Links:
         colOptionTableName = MetaTable.COL_RELATIONS;
         cacheScopeName = CacheScope.COL_RELATION;
         break;
@@ -1213,29 +1206,4 @@ export default class Column<T = any> implements ColumnType {
     }
     return fieldLengthLimit;
   }
-
-  static async updateMeta(
-    { colId, meta }: { colId: string; meta: any },
-    ncMeta = Noco.ncMeta,
-  ) {
-    // get existing cache
-    const key = `${CacheScope.COLUMN}:${colId}`;
-    const o = await NocoCache.get(key, CacheGetType.TYPE_OBJECT);
-    if (o) {
-      // update meta
-      o.meta = meta;
-      // set cache
-      await NocoCache.set(key, o);
-    }
-    // set meta
-    await ncMeta.metaUpdate(
-      null,
-      null,
-      MetaTable.COLUMNS,
-      {
-        meta: stringifyMetaProp(meta),
-      },
-      colId,
-    );
-  }
 }
diff --git a/packages/nocodb/src/models/LinkToAnotherRecordColumn.ts b/packages/nocodb/src/models/LinkToAnotherRecordColumn.ts
index e75ffc241b..934781c7cd 100644
--- a/packages/nocodb/src/models/LinkToAnotherRecordColumn.ts
+++ b/packages/nocodb/src/models/LinkToAnotherRecordColumn.ts
@@ -7,8 +7,7 @@ import Column from './Column';
 import type { BoolType } from 'nocodb-sdk';
 
 export default class LinkToAnotherRecordColumn {
-  id: string;
-  fk_column_id: string;
+  fk_column_id?: string;
   fk_child_column_id?: string;
   fk_parent_column_id?: string;
   fk_mm_model_id?: string;
@@ -127,4 +126,6 @@ export default class LinkToAnotherRecordColumn {
     }
     return colData ? new LinkToAnotherRecordColumn(colData) : null;
   }
+
+  id: string;
 }
diff --git a/packages/nocodb/src/models/LinksColumn.ts b/packages/nocodb/src/models/LinksColumn.ts
deleted file mode 100644
index 7e681c0b5d..0000000000
--- a/packages/nocodb/src/models/LinksColumn.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import Noco from '../Noco';
-import { Column, LinkToAnotherRecordColumn } from './';
-import type { RollupColumn } from './';
-
-export default class LinksColumn
-  extends LinkToAnotherRecordColumn
-  implements RollupColumn
-{
-  rollup_function = 'count' as RollupColumn['rollup_function'];
-
-  get fk_relation_column_id() {
-    return this.fk_column_id;
-  }
-  get fk_rollup_column_id() {
-    if (this.type === 'hm') {
-      return this.fk_child_column_id;
-    } else if (this.type === 'mm') {
-      return this.fk_parent_column_id;
-    }
-  }
-
-  async getRelationColumn(ncMeta = Noco.ncMeta): Promise<Column> {
-    return await Column.get({ colId: this.fk_column_id }, ncMeta);
-  }
-
-  async getRollupColumn(ncMeta = Noco.ncMeta): Promise<Column> {
-    return await Column.get({ colId: this.fk_rollup_column_id }, ncMeta);
-  }
-
-  public static async read(columnId: string, ncMeta = Noco.ncMeta) {
-    const colData = await super.read(columnId, ncMeta);
-    return colData && new LinksColumn(colData);
-  }
-
-  public static async insert(data: Partial<LinksColumn>, ncMeta = Noco.ncMeta) {
-    const colData = await super.insert(data, ncMeta);
-    return colData && new LinksColumn(colData);
-  }
-}
diff --git a/packages/nocodb/src/models/Sort.ts b/packages/nocodb/src/models/Sort.ts
index 264fef315d..7436da4021 100644
--- a/packages/nocodb/src/models/Sort.ts
+++ b/packages/nocodb/src/models/Sort.ts
@@ -78,13 +78,13 @@ export default class Sort {
 
     const row = await ncMeta.metaInsert2(null, null, MetaTable.SORT, insertObj);
     if (sortObj.push_to_top) {
+      // todo: delete cache
       const sortList = await ncMeta.metaList2(null, null, MetaTable.SORT, {
         condition: { fk_view_id: sortObj.fk_view_id },
         orderBy: {
           order: 'asc',
         },
       });
-      await NocoCache.delAll(CacheScope.SORT, `${sortObj.fk_view_id}:*`);
       await NocoCache.setList(CacheScope.SORT, [sortObj.fk_view_id], sortList);
     } else {
       await NocoCache.appendToList(
diff --git a/packages/nocodb/src/models/View.ts b/packages/nocodb/src/models/View.ts
index 3135666e86..9a4fd88f2f 100644
--- a/packages/nocodb/src/models/View.ts
+++ b/packages/nocodb/src/models/View.ts
@@ -1,3 +1,4 @@
+import { title } from 'process';
 import { isSystemColumn, UITypes, ViewTypes } from 'nocodb-sdk';
 import Noco from '../Noco';
 import {
diff --git a/packages/nocodb/src/models/index.ts b/packages/nocodb/src/models/index.ts
index fbbdba8333..534c8ce025 100644
--- a/packages/nocodb/src/models/index.ts
+++ b/packages/nocodb/src/models/index.ts
@@ -34,4 +34,3 @@ export { default as SyncLogs } from './SyncLogs';
 export { default as SyncSource } from './SyncSource';
 export { default as User } from './User';
 export { default as View } from './View';
-export { default as LinksColumn } from './LinksColumn';
diff --git a/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts b/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
index d83f34668a..bc9a247dad 100644
--- a/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
@@ -9,7 +9,6 @@ import utc from 'dayjs/plugin/utc';
 import tinycolor from 'tinycolor2';
 import { Process, Processor } from '@nestjs/bull';
 import { Job } from 'bull';
-import { isLinksOrLTAR } from 'nocodb-sdk';
 import extractRolesObj from '../../../../utils/extractRolesObj';
 import { AttachmentsService } from '../../../../services/attachments.service';
 import { ColumnsService } from '../../../../services/columns.service';
@@ -271,7 +270,7 @@ export class AtImportProcessor {
 
     // base mapping table
     const aTblNcTypeMap = {
-      foreignKey: UITypes.Links,
+      foreignKey: UITypes.LinkToAnotherRecord,
       text: UITypes.SingleLineText,
       multilineText: UITypes.LongText,
       richText: UITypes.LongText,
@@ -786,7 +785,7 @@ export class AtImportProcessor {
               const ncTbl: any = await this.columnsService.columnAdd({
                 tableId: srcTableId,
                 column: {
-                  uidt: UITypes.Links,
+                  uidt: UITypes.LinkToAnotherRecord,
                   title: ncName.title,
                   column_name: ncName.column_name,
                   parentId: srcTableId,
@@ -868,14 +867,14 @@ export class AtImportProcessor {
                 updateMigrationSkipLog(
                   parentTblSchema?.title,
                   ncLinkMappingTable[x].nc.title,
-                  UITypes.Links,
+                  UITypes.LinkToAnotherRecord,
                   'Link error',
                 );
                 continue;
               }
 
               // hack // fix me
-              if (!isLinksOrLTAR(parentLinkColumn)) {
+              if (parentLinkColumn.uidt !== 'LinkToAnotherRecord') {
                 parentLinkColumn = parentTblSchema.columns.find(
                   (col) => col.title === ncLinkMappingTable[x].nc.title + '_2',
                 );
@@ -889,7 +888,7 @@ export class AtImportProcessor {
                 //
                 childLinkColumn = childTblSchema.columns.find(
                   (col) =>
-                    isLinksOrLTAR(col) &&
+                    col.uidt === UITypes.LinkToAnotherRecord &&
                     col.colOptions.fk_child_column_id ===
                       parentLinkColumn.colOptions.fk_child_column_id &&
                     col.colOptions.fk_parent_column_id ===
@@ -901,7 +900,7 @@ export class AtImportProcessor {
                 //
                 childLinkColumn = childTblSchema.columns.find(
                   (col) =>
-                    isLinksOrLTAR(col) &&
+                    col.uidt === UITypes.LinkToAnotherRecord &&
                     col.colOptions.fk_child_column_id ===
                       parentLinkColumn.colOptions.fk_parent_column_id &&
                     col.colOptions.fk_parent_column_id ===
@@ -1432,7 +1431,7 @@ export class AtImportProcessor {
         // always process LTAR, Lookup, and Rollup columns as we delete the key after processing
         if (
           !value &&
-          !isLinksOrLTAR(dt) &&
+          dt !== UITypes.LinkToAnotherRecord &&
           dt !== UITypes.Lookup &&
           dt !== UITypes.Rollup
         ) {
@@ -1451,7 +1450,6 @@ export class AtImportProcessor {
 
           // we will pick up LTAR once all table data's are in place
           case UITypes.LinkToAnotherRecord:
-          case UITypes.Links:
             if (storeLinks) {
               if (ncLinkDataStore[table.title][record.id] === undefined)
                 ncLinkDataStore[table.title][record.id] = {
@@ -1972,7 +1970,9 @@ export class AtImportProcessor {
         migrationStatsObj.aTbl.rollup = aTblRollup.length;
 
         const ncTbl = await nc_getTableSchema(aTblSchema[idx].name);
-        const linkColumn = ncTbl.columns.filter((x) => isLinksOrLTAR(x));
+        const linkColumn = ncTbl.columns.filter(
+          (x) => x.uidt === UITypes.LinkToAnotherRecord,
+        );
         const lookup = ncTbl.columns.filter((x) => x.uidt === UITypes.Lookup);
         const rollup = ncTbl.columns.filter((x) => x.uidt === UITypes.Rollup);
 
diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts
index d9319c0005..03a49ffff6 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts
@@ -2,8 +2,8 @@ import { Readable } from 'stream';
 import { Process, Processor } from '@nestjs/bull';
 import { Job } from 'bull';
 import papaparse from 'papaparse';
+import { UITypes } from 'nocodb-sdk';
 import { Logger } from '@nestjs/common';
-import { isLinksOrLTAR } from 'nocodb-sdk';
 import { Base, Column, Model, Project } from '../../../../models';
 import { ProjectsService } from '../../../../services/projects.service';
 import { findWithIdentifier } from '../../../../helpers/exportImportHelpers';
@@ -137,7 +137,7 @@ export class DuplicateProcessor {
     await sourceModel.getColumns();
 
     const relatedModelIds = sourceModel.columns
-      .filter((col) => isLinksOrLTAR(col))
+      .filter((col) => col.uidt === UITypes.LinkToAnotherRecord)
       .map((col) => col.colOptions.fk_related_model_id)
       .filter((id) => id);
 
@@ -186,7 +186,7 @@ export class DuplicateProcessor {
         const bts = md.columns
           .filter(
             (c) =>
-              isLinksOrLTAR(c) &&
+              c.uidt === UITypes.LinkToAnotherRecord &&
               c.colOptions.type === 'bt' &&
               c.colOptions.fk_related_model_id === modelId,
           )
diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
index a37e1bed6b..f72ec18d13 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
@@ -1,5 +1,5 @@
 import { Readable } from 'stream';
-import { isLinksOrLTAR, UITypes, ViewTypes } from 'nocodb-sdk';
+import { UITypes, ViewTypes } from 'nocodb-sdk';
 import { unparse } from 'papaparse';
 import { Injectable, Logger } from '@nestjs/common';
 import NcConnectionMgrv2 from '../../../../utils/common/NcConnectionMgrv2';
@@ -352,12 +352,14 @@ export class ExportService {
           .map((c) => c.title)
           .join(',')
       : model.columns
-          .filter((c) => !isLinksOrLTAR(c))
+          .filter((c) => c.uidt !== UITypes.LinkToAnotherRecord)
           .map((c) => c.title)
           .join(',');
 
     const mmColumns = model.columns.filter(
-      (col) => isLinksOrLTAR(col) && col.colOptions?.type === 'mm',
+      (col) =>
+        col.uidt === UITypes.LinkToAnotherRecord &&
+        col.colOptions?.type === 'mm',
     );
 
     const hasLink = mmColumns.length > 0;
diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
index 25ff538589..ad4b83a82b 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
@@ -1,7 +1,6 @@
 import { UITypes, ViewTypes } from 'nocodb-sdk';
 import { Injectable, Logger } from '@nestjs/common';
 import papaparse from 'papaparse';
-import { isLinksOrLTAR } from 'nocodb-sdk';
 import {
   findWithIdentifier,
   generateUniqueName,
@@ -126,7 +125,7 @@ export class ImportService {
 
       const reducedColumnSet = modelData.columns.filter(
         (a) =>
-          !isLinksOrLTAR(a) &&
+          a.uidt !== UITypes.LinkToAnotherRecord &&
           a.uidt !== UITypes.Lookup &&
           a.uidt !== UITypes.Rollup &&
           a.uidt !== UITypes.Formula &&
@@ -166,7 +165,9 @@ export class ImportService {
       const modelData = data.model;
       const table = tableReferences.get(modelData.id);
 
-      const linkedColumnSet = modelData.columns.filter((a) => isLinksOrLTAR(a));
+      const linkedColumnSet = modelData.columns.filter(
+        (a) => a.uidt === UITypes.LinkToAnotherRecord,
+      );
 
       for (const col of linkedColumnSet) {
         if (col.colOptions) {
diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json
index c932eaaedb..5be2b7ddb3 100644
--- a/packages/nocodb/src/schema/swagger.json
+++ b/packages/nocodb/src/schema/swagger.json
@@ -14894,8 +14894,7 @@
               "Time",
               "URL",
               "Year",
-              "QrCode",
-              "Links"
+              "QrCode"
             ],
             "type": "string"
           },
@@ -17432,7 +17431,7 @@
             "description": "The type of the relationship"
           },
           "uidt": {
-            "enum": ["LinkToAnotherRecord", "Links"],
+            "enum": ["LinkToAnotherRecord"],
             "type": "string",
             "description": "Abstract type of the relationship"
           },
@@ -17982,8 +17981,7 @@
               "Time",
               "URL",
               "Year",
-              "QrCode",
-              "Links"
+              "QrCode"
             ],
             "type": "string",
             "description": "UI Data Type"
diff --git a/packages/nocodb/src/services/bases.service.ts b/packages/nocodb/src/services/bases.service.ts
index 9268f6718c..48bd9e6130 100644
--- a/packages/nocodb/src/services/bases.service.ts
+++ b/packages/nocodb/src/services/bases.service.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { T } from 'nc-help';
 import { populateMeta, validatePayload } from '../helpers';
-import { populateRollupColumnAndHideLTAR } from '../helpers/populateMeta';
 import { syncBaseMigration } from '../helpers/syncMigration';
 import { Base, Project } from '../models';
 import type { BaseReqType } from 'nocodb-sdk';
@@ -70,8 +69,6 @@ export class BasesService {
 
     const info = await populateMeta(base, project);
 
-    await populateRollupColumnAndHideLTAR(base, project);
-
     T.emit('evt_api_created', info);
 
     delete base.config;
diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index ef463b9868..3c73a88770 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -2,14 +2,12 @@ import { Injectable } from '@nestjs/common';
 import {
   AuditOperationSubTypes,
   AuditOperationTypes,
-  isLinksOrLTAR,
   isVirtualCol,
   substituteColumnAliasWithIdInFormula,
   substituteColumnIdWithAliasInFormula,
   UITypes,
 } from 'nocodb-sdk';
 import { T } from 'nc-help';
-import { pluralize, singularize } from 'inflection';
 import formulaQueryBuilderv2 from '../db/formulav2/formulaQueryBuilderv2';
 import ProjectMgrv2 from '../db/sql-mgr/v2/ProjectMgrv2';
 import {
@@ -121,7 +119,6 @@ export class ColumnsService {
         UITypes.QrCode,
         UITypes.Barcode,
         UITypes.ForeignKey,
-        UITypes.Links,
       ].includes(column.uidt)
     ) {
       if (column.uidt === colBody.uidt) {
@@ -159,18 +156,10 @@ export class ColumnsService {
             ...column,
             ...colBody,
           });
-        } else {
-          if (colBody.title !== column.title) {
-            await Column.updateAlias(param.columnId, {
-              title: colBody.title,
-            });
-          }
-          if ('meta' in colBody && column.uidt === UITypes.Links) {
-            await Column.updateMeta({
-              colId: param.columnId,
-              meta: colBody.meta,
-            });
-          }
+        } else if (colBody.title !== column.title) {
+          await Column.updateAlias(param.columnId, {
+            title: colBody.title,
+          });
         }
         await this.updateRollupOrLookup(colBody, column);
       } else {
@@ -933,7 +922,6 @@ export class ColumnsService {
         }
         break;
 
-      case UITypes.Links:
       case UITypes.LinkToAnotherRecord:
         await this.createLTARColumn({ ...param, base, project });
         T.emit('evt', { evt_type: 'relation:created' });
@@ -1182,8 +1170,6 @@ export class ColumnsService {
       case UITypes.Formula:
         await Column.delete(param.columnId, ncMeta);
         break;
-      // Since Links is just an extended version of LTAR, we can use the same logic
-      case UITypes.Links:
       case UITypes.LinkToAnotherRecord:
         {
           const relationColOpt =
@@ -1254,7 +1240,7 @@ export class ColumnsService {
                   .then((m) => m.getColumns(ncMeta));
 
                 for (const c of columnsInRelatedTable) {
-                  if (!isLinksOrLTAR(c.uidt)) continue;
+                  if (c.uidt !== UITypes.LinkToAnotherRecord) continue;
                   const colOpt =
                     await c.getColOptions<LinkToAnotherRecordColumn>(ncMeta);
                   if (
@@ -1275,7 +1261,7 @@ export class ColumnsService {
                 // delete bt columns in m2m table
                 await mmTable.getColumns(ncMeta);
                 for (const c of mmTable.columns) {
-                  if (!isLinksOrLTAR(c.uidt)) continue;
+                  if (c.uidt !== UITypes.LinkToAnotherRecord) continue;
                   const colOpt =
                     await c.getColOptions<LinkToAnotherRecordColumn>(ncMeta);
                   if (colOpt.type === 'bt') {
@@ -1286,7 +1272,7 @@ export class ColumnsService {
                 // delete hm columns in parent table
                 await parentTable.getColumns(ncMeta);
                 for (const c of parentTable.columns) {
-                  if (!isLinksOrLTAR(c.uidt)) continue;
+                  if (c.uidt !== UITypes.LinkToAnotherRecord) continue;
                   const colOpt =
                     await c.getColOptions<LinkToAnotherRecordColumn>(ncMeta);
                   if (colOpt.fk_related_model_id === mmTable.id) {
@@ -1297,7 +1283,7 @@ export class ColumnsService {
                 // delete hm columns in child table
                 await childTable.getColumns(ncMeta);
                 for (const c of childTable.columns) {
-                  if (!isLinksOrLTAR(c.uidt)) continue;
+                  if (c.uidt !== UITypes.LinkToAnotherRecord) continue;
                   const colOpt =
                     await c.getColOptions<LinkToAnotherRecordColumn>(ncMeta);
                   if (colOpt.fk_related_model_id === mmTable.id) {
@@ -1556,7 +1542,6 @@ export class ColumnsService {
     const sqlMgr = await ProjectMgrv2.getSqlMgr({
       id: param.base.project_id,
     });
-    const isLinks = param.column.uidt === UITypes.Links;
 
     // if xcdb base then treat as virtual relation to avoid creating foreign key
     if (param.base.is_meta) {
@@ -1657,9 +1642,6 @@ export class ColumnsService {
         (param.column as LinkToAnotherColumnReqType).title,
         foreignKeyName,
         (param.column as LinkToAnotherColumnReqType).virtual,
-        null,
-        param.column['meta'],
-        isLinks,
       );
     } else if ((param.column as LinkToAnotherColumnReqType).type === 'mm') {
       const aTn = `${param.project?.prefix ?? ''}_nc_m2m_${randomID()}`;
@@ -1780,9 +1762,9 @@ export class ColumnsService {
       await Column.insert({
         title: getUniqueColumnAliasName(
           await child.getColumns(),
-          pluralize(parent.title),
+          `${parent.title} List`,
         ),
-        uidt: isLinks ? UITypes.Links : UITypes.LinkToAnotherRecord,
+        uidt: UITypes.LinkToAnotherRecord,
         type: 'mm',
 
         // ref_db_alias
@@ -1797,20 +1779,14 @@ export class ColumnsService {
         fk_mm_parent_column_id: parentCol.id,
         fk_related_model_id: parent.id,
         virtual: (param.column as LinkToAnotherColumnReqType).virtual,
-        meta: {
-          plural: pluralize(parent.title),
-          singular: singularize(parent.title),
-        },
-        // if self referencing treat it as system field to hide from ui
-        system: parent.id === child.id,
       });
       await Column.insert({
         title: getUniqueColumnAliasName(
           await parent.getColumns(),
-          param.column.title ?? pluralize(child.title),
+          param.column.title ?? `${child.title} List`,
         ),
 
-        uidt: isLinks ? UITypes.Links : UITypes.LinkToAnotherRecord,
+        uidt: UITypes.LinkToAnotherRecord,
         type: 'mm',
 
         fk_model_id: parent.id,
@@ -1823,10 +1799,6 @@ export class ColumnsService {
         fk_mm_parent_column_id: childCol.id,
         fk_related_model_id: child.id,
         virtual: (param.column as LinkToAnotherColumnReqType).virtual,
-        meta: {
-          plural: param.column['meta']?.plural || pluralize(child.title),
-          singular: param.column['meta']?.singular || singularize(child.title),
-        },
       });
 
       // todo: create index for virtual relations as well
diff --git a/packages/nocodb/src/services/data-alias-nested.service.ts b/packages/nocodb/src/services/data-alias-nested.service.ts
index 86108b7613..c027c02084 100644
--- a/packages/nocodb/src/services/data-alias-nested.service.ts
+++ b/packages/nocodb/src/services/data-alias-nested.service.ts
@@ -34,10 +34,7 @@ export class DataAliasNestedService {
 
     const column = await getColumnByIdOrName(param.columnName, model);
 
-    if (
-      !column ||
-      ![UITypes.LinkToAnotherRecord, UITypes.Links].includes(column.uidt)
-    )
+    if (column.uidt !== UITypes.LinkToAnotherRecord)
       NcError.badRequest('Column is not LTAR');
 
     const data = await baseModel.mmList(
@@ -206,7 +203,7 @@ export class DataAliasNestedService {
 
     const column = await getColumnByIdOrName(param.columnName, model);
 
-    if (![UITypes.LinkToAnotherRecord, UITypes.Links].includes(column.uidt))
+    if (column.uidt !== UITypes.LinkToAnotherRecord)
       NcError.badRequest('Column is not LTAR');
 
     const data = await baseModel.hmList(
diff --git a/packages/nocodb/src/services/meta-diffs.service.ts b/packages/nocodb/src/services/meta-diffs.service.ts
index 13999f351a..75f21a2229 100644
--- a/packages/nocodb/src/services/meta-diffs.service.ts
+++ b/packages/nocodb/src/services/meta-diffs.service.ts
@@ -1,13 +1,6 @@
 import { Injectable } from '@nestjs/common';
-import {
-  isLinksOrLTAR,
-  isVirtualCol,
-  ModelTypes,
-  RelationTypes,
-  UITypes,
-} from 'nocodb-sdk';
+import { isVirtualCol, ModelTypes, RelationTypes, UITypes } from 'nocodb-sdk';
 import { T } from 'nc-help';
-import { pluralize, singularize } from 'inflection';
 import { Base, Column, Model, Project } from '../models';
 import ModelXcMetaFactory from '../db/sql-mgr/code/models/xc/ModelXcMetaFactory';
 import getColumnUiType from '../helpers/getColumnUiType';
@@ -16,7 +9,7 @@ import { getUniqueColumnAliasName } from '../helpers/getUniqueName';
 import mapDefaultDisplayValue from '../helpers/mapDefaultDisplayValue';
 import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2';
 import NcHelp from '../utils/NcHelp';
-import type { LinksColumn, LinkToAnotherRecordColumn } from '../models';
+import type { LinkToAnotherRecordColumn } from '../models';
 
 // todo:move enum and types
 export enum MetaDiffType {
@@ -229,13 +222,12 @@ export class MetaDiffsService {
         if (
           [
             UITypes.LinkToAnotherRecord,
-            UITypes.Links,
             UITypes.Rollup,
             UITypes.Lookup,
             UITypes.Formula,
           ].includes(column.uidt)
         ) {
-          if (isLinksOrLTAR(column.uidt)) {
+          if (column.uidt === UITypes.LinkToAnotherRecord) {
             virtualRelationColumns.push(column);
           }
 
@@ -515,7 +507,6 @@ export class MetaDiffsService {
             UITypes.Rollup,
             UITypes.Lookup,
             UITypes.Formula,
-            UITypes.Links,
           ].includes(column.uidt)
         ) {
           continue;
@@ -754,10 +745,10 @@ export class MetaDiffsService {
                   } else if (change.relationType === RelationTypes.HAS_MANY) {
                     const title = getUniqueColumnAliasName(
                       childModel.columns,
-                      pluralize(childModel.title || childModel.table_name),
+                      `${childModel.title || childModel.table_name} List`,
                     );
                     await Column.insert<LinkToAnotherRecordColumn>({
-                      uidt: UITypes.Links,
+                      uidt: UITypes.LinkToAnotherRecord,
                       title,
                       fk_model_id: parentModel.id,
                       fk_related_model_id: childModel.id,
@@ -766,10 +757,6 @@ export class MetaDiffsService {
                       fk_child_column_id: childCol.id,
                       virtual: false,
                       fk_index_name: change.cstn,
-                      meta: {
-                        plural: pluralize(childModel.title),
-                        singular: singularize(childModel.title),
-                      },
                     });
                   }
                 });
@@ -953,10 +940,10 @@ export class MetaDiffsService {
                 } else if (change.relationType === RelationTypes.HAS_MANY) {
                   const title = getUniqueColumnAliasName(
                     childModel.columns,
-                    pluralize(childModel.title || childModel.table_name),
+                    `${childModel.title || childModel.table_name} List`,
                   );
-                  await Column.insert<LinksColumn>({
-                    uidt: UITypes.Links,
+                  await Column.insert<LinkToAnotherRecordColumn>({
+                    uidt: UITypes.LinkToAnotherRecord,
                     title,
                     fk_model_id: parentModel.id,
                     fk_related_model_id: childModel.id,
@@ -992,7 +979,7 @@ export class MetaDiffsService {
     const colChildOpt =
       await belongsToCol.getColOptions<LinkToAnotherRecordColumn>();
     for (const col of await model.getColumns()) {
-      if (isLinksOrLTAR(col.uidt)) {
+      if (col.uidt === UITypes.LinkToAnotherRecord) {
         const colOpt = await col.getColOptions<LinkToAnotherRecordColumn>();
         if (
           colOpt &&
@@ -1051,10 +1038,10 @@ export class MetaDiffsService {
         );
 
         if (!isRelationAvailInA) {
-          await Column.insert<LinksColumn>({
+          await Column.insert<LinkToAnotherRecordColumn>({
             title: getUniqueColumnAliasName(
               modelA.columns,
-              pluralize(modelB.title),
+              `${modelB.title} List`,
             ),
             fk_model_id: modelA.id,
             fk_related_model_id: modelB.id,
@@ -1067,18 +1054,14 @@ export class MetaDiffsService {
             fk_mm_parent_column_id:
               belongsToCols[1].colOptions.fk_child_column_id,
             type: RelationTypes.MANY_TO_MANY,
-            uidt: UITypes.Links,
-            meta: {
-              plural: pluralize(modelB.title),
-              singular: singularize(modelB.title),
-            },
+            uidt: UITypes.LinkToAnotherRecord,
           });
         }
         if (!isRelationAvailInB) {
-          await Column.insert<LinksColumn>({
+          await Column.insert<LinkToAnotherRecordColumn>({
             title: getUniqueColumnAliasName(
               modelB.columns,
-              pluralize(modelA.title),
+              `${modelA.title} List`,
             ),
             fk_model_id: modelB.id,
             fk_related_model_id: modelA.id,
@@ -1091,11 +1074,7 @@ export class MetaDiffsService {
             fk_mm_parent_column_id:
               belongsToCols[0].colOptions.fk_child_column_id,
             type: RelationTypes.MANY_TO_MANY,
-            uidt: UITypes.Links,
-            meta: {
-              plural: pluralize(modelA.title),
-              singular: singularize(modelA.title),
-            },
+            uidt: UITypes.LinkToAnotherRecord,
           });
         }
 
@@ -1107,7 +1086,7 @@ export class MetaDiffsService {
           const model = await colOpt.getRelatedTable();
 
           for (const col of await model.getColumns()) {
-            if (!isLinksOrLTAR(col.uidt)) continue;
+            if (col.uidt !== UITypes.LinkToAnotherRecord) continue;
 
             const colOpt1 =
               await col.getColOptions<LinkToAnotherRecordColumn>();
diff --git a/packages/nocodb/src/services/public-metas.service.ts b/packages/nocodb/src/services/public-metas.service.ts
index 71cff386ac..59ad1ef7e5 100644
--- a/packages/nocodb/src/services/public-metas.service.ts
+++ b/packages/nocodb/src/services/public-metas.service.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@nestjs/common';
 import { ErrorMessages, RelationTypes, UITypes } from 'nocodb-sdk';
-import { isLinksOrLTAR } from 'nocodb-sdk';
 import { NcError } from '../helpers/catchError';
 import { Base, Column, Model, Project, View } from '../models';
 import type { LinkToAnotherRecordColumn, LookupColumn } from '../models';
@@ -42,7 +41,7 @@ export class PublicMetasService {
           column.pk ||
           view.model.columns.some(
             (c1) =>
-              isLinksOrLTAR(c1.uidt) &&
+              c1.uidt === UITypes.LinkToAnotherRecord &&
               (<LinkToAnotherRecordColumn>c1.colOptions).type ===
                 RelationTypes.BELONGS_TO &&
               view.columns.some((vc) => vc.fk_column_id === c1.id && vc.show) &&
@@ -78,7 +77,7 @@ export class PublicMetasService {
     col: Column<any>;
     relatedMetas: Record<string, Model>;
   }) {
-    if (isLinksOrLTAR(col.uidt)) {
+    if (UITypes.LinkToAnotherRecord === col.uidt) {
       await this.extractLTARRelatedMetas({
         ltarColOption: await col.getColOptions<LinkToAnotherRecordColumn>(),
         relatedMetas,
diff --git a/packages/nocodb/src/services/tables.service.ts b/packages/nocodb/src/services/tables.service.ts
index 5e2af65221..b656efe362 100644
--- a/packages/nocodb/src/services/tables.service.ts
+++ b/packages/nocodb/src/services/tables.service.ts
@@ -3,7 +3,6 @@ import DOMPurify from 'isomorphic-dompurify';
 import {
   AuditOperationSubTypes,
   AuditOperationTypes,
-  isLinksOrLTAR,
   isVirtualCol,
   ModelTypes,
   UITypes,
@@ -15,7 +14,13 @@ import getColumnPropsFromUIDT from '../helpers/getColumnPropsFromUIDT';
 import getColumnUiType from '../helpers/getColumnUiType';
 import getTableNameAlias, { getColumnNameAlias } from '../helpers/getTableName';
 import mapDefaultDisplayValue from '../helpers/mapDefaultDisplayValue';
-import { Audit, Column, Model, ModelRoleVisibility, Project } from '../models';
+import {
+  Audit,
+  Column,
+  Model,
+  ModelRoleVisibility,
+  Project,
+} from '../models';
 import Noco from '../Noco';
 import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2';
 import { validatePayload } from '../helpers';
@@ -151,7 +156,9 @@ export class TablesService {
     const project = await Project.getWithInfo(table.project_id);
     const base = project.bases.find((b) => b.id === table.base_id);
 
-    const relationColumns = table.columns.filter((c) => isLinksOrLTAR(c));
+    const relationColumns = table.columns.filter(
+      (c) => c.uidt === UITypes.LinkToAnotherRecord,
+    );
 
     if (relationColumns?.length && !base.is_meta) {
       const referredTables = await Promise.all(
diff --git a/packages/nocodb/tests/unit/factory/column.ts b/packages/nocodb/tests/unit/factory/column.ts
index ab3cbe04df..1b9617f7b9 100644
--- a/packages/nocodb/tests/unit/factory/column.ts
+++ b/packages/nocodb/tests/unit/factory/column.ts
@@ -1,13 +1,13 @@
 import { UITypes } from 'nocodb-sdk';
 import request from 'supertest';
+import Column from '../../../src/models/Column';
+import FormViewColumn from '../../../src/models/FormViewColumn';
+import GalleryViewColumn from '../../../src/models/GalleryViewColumn';
+import GridViewColumn from '../../../src/models/GridViewColumn';
 import Model from '../../../src/models/Model';
-import { isPg, isSqlite } from '../init/db';
-import type Column from '../../../src/models/Column';
-import type FormViewColumn from '../../../src/models/FormViewColumn';
-import type GalleryViewColumn from '../../../src/models/GalleryViewColumn';
-import type GridViewColumn from '../../../src/models/GridViewColumn';
-import type Project from '../../../src/models/Project';
-import type View from '../../../src/models/View';
+import Project from '../../../src/models/Project';
+import View from '../../../src/models/View';
+import { isSqlite, isPg } from '../init/db';
 
 const defaultColumns = function (context) {
   return [
@@ -55,7 +55,7 @@ const createColumn = async (context, table, columnAttr) => {
     });
 
   const column: Column = (await table.getColumns()).find(
-    (column) => column.title === columnAttr.title,
+    (column) => column.title === columnAttr.title
   );
   return column;
 };
@@ -76,7 +76,7 @@ const createRollupColumn = async (
     table: Model;
     relatedTableName: string;
     relatedTableColumnTitle: string;
-  },
+  }
 ) => {
   const childBases = await project.getBases();
   const childTable = await Model.getByIdOrName({
@@ -86,14 +86,13 @@ const createRollupColumn = async (
   });
   const childTableColumns = await childTable.getColumns();
   const childTableColumn = await childTableColumns.find(
-    (column) => column.title === relatedTableColumnTitle,
+    (column) => column.title === relatedTableColumnTitle
   );
 
   const ltarColumn = (await table.getColumns()).find(
     (column) =>
-      (column.uidt === UITypes.Links ||
-        column.uidt === UITypes.LinkToAnotherRecord) &&
-      column.colOptions?.fk_related_model_id === childTable.id,
+      column.uidt === UITypes.LinkToAnotherRecord &&
+      column.colOptions?.fk_related_model_id === childTable.id
   );
 
   const rollupColumn = await createColumn(context, table, {
@@ -123,7 +122,7 @@ const createLookupColumn = async (
     table: Model;
     relatedTableName: string;
     relatedTableColumnTitle: string;
-  },
+  }
 ) => {
   const childBases = await project.getBases();
   const childTable = await Model.getByIdOrName({
@@ -133,20 +132,19 @@ const createLookupColumn = async (
   });
   const childTableColumns = await childTable.getColumns();
   const childTableColumn = await childTableColumns.find(
-    (column) => column.title === relatedTableColumnTitle,
+    (column) => column.title === relatedTableColumnTitle
   );
 
   if (!childTableColumn) {
     throw new Error(
-      `Could not find column ${relatedTableColumnTitle} in ${relatedTableName}`,
+      `Could not find column ${relatedTableColumnTitle} in ${relatedTableName}`
     );
   }
 
   const ltarColumn = (await table.getColumns()).find(
     (column) =>
-      (column.uidt === UITypes.Links ||
-        column.uidt === UITypes.LinkToAnotherRecord) &&
-      column.colOptions?.fk_related_model_id === childTable.id,
+      column.uidt === UITypes.LinkToAnotherRecord &&
+      column.colOptions?.fk_related_model_id === childTable.id
   );
   const lookupColumn = await createColumn(context, table, {
     title: title,
@@ -170,15 +168,15 @@ const createQrCodeColumn = async (
     title: string;
     table: Model;
     referencedQrValueTableColumnTitle: string;
-  },
+  }
 ) => {
   const referencedQrValueTableColumnId = await table
     .getColumns()
     .then(
       (cols) =>
         cols.find(
-          (column) => column.title == referencedQrValueTableColumnTitle,
-        )['id'],
+          (column) => column.title == referencedQrValueTableColumnTitle
+        )['id']
     );
 
   const qrCodeColumn = await createColumn(context, table, {
@@ -200,15 +198,15 @@ const createBarcodeColumn = async (
     title: string;
     table: Model;
     referencedBarcodeValueTableColumnTitle: string;
-  },
+  }
 ) => {
   const referencedBarcodeValueTableColumnId = await table
     .getColumns()
     .then(
       (cols) =>
         cols.find(
-          (column) => column.title == referencedBarcodeValueTableColumnTitle,
-        )['id'],
+          (column) => column.title == referencedBarcodeValueTableColumnTitle
+        )['id']
     );
 
   const barcodeColumn = await createColumn(context, table, {
@@ -232,12 +230,12 @@ const createLtarColumn = async (
     parentTable: Model;
     childTable: Model;
     type: string;
-  },
+  }
 ) => {
   const ltarColumn = await createColumn(context, parentTable, {
     title: title,
     column_name: title,
-    uidt: UITypes.Links,
+    uidt: UITypes.LinkToAnotherRecord,
     parentId: parentTable.id,
     childId: childTable.id,
     type: type,
@@ -248,7 +246,7 @@ const createLtarColumn = async (
 
 const updateViewColumn = async (
   context,
-  { view, column, attr }: { column: Column; view: View; attr: any },
+  { view, column, attr }: { column: Column; view: View; attr: any }
 ) => {
   const res = await request(context.app)
     .patch(`/api/v1/db/meta/views/${view.id}/columns/${column.id}`)
diff --git a/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts b/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
index 3bf90a46d6..230b2031bc 100644
--- a/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/tableRow.test.ts
@@ -427,6 +427,10 @@ function tableTest() {
       relatedTableColumnTitle: 'FirstName',
     });
 
+    const paymentListColumn = (await rentalTable.getColumns()).find(
+      (c) => c.title === 'Payment List',
+    );
+
     const nestedFilter = {
       is_group: true,
       status: 'create',
@@ -439,6 +443,12 @@ function tableTest() {
           comparison_op: 'like',
           value: '%a%',
         },
+        {
+          fk_column_id: paymentListColumn?.id,
+          status: 'create',
+          logical_op: 'and',
+          comparison_op: 'notblank',
+        },
       ],
     };
 
@@ -503,6 +513,10 @@ function tableTest() {
       relatedTableColumnTitle: 'FirstName',
     });
 
+    const paymentListColumn = (await rentalTable.getColumns()).find(
+      (c) => c.title === 'Payment List',
+    );
+
     const returnDateColumn = (await rentalTable.getColumns()).find(
       (c) => c.title === 'ReturnDate',
     );
@@ -519,6 +533,12 @@ function tableTest() {
           comparison_op: 'like',
           value: '%a%',
         },
+        {
+          fk_column_id: paymentListColumn?.id,
+          status: 'create',
+          logical_op: 'and',
+          comparison_op: 'notblank',
+        },
         {
           is_group: true,
           status: 'create',
@@ -611,7 +631,7 @@ function tableTest() {
     });
 
     const paymentListColumn = (await customerTable.getColumns()).find(
-      (c) => c.title === 'Payments',
+      (c) => c.title === 'Payment List',
     );
 
     const activeColumn = (await customerTable.getColumns()).find(
@@ -766,12 +786,16 @@ function tableTest() {
       relatedTableColumnTitle: 'RentalDate',
     });
 
+    const paymentListColumn = (await customerTable.getColumns()).find(
+      (c) => c.title === 'Payment List',
+    );
+
     const activeColumn = (await customerTable.getColumns()).find(
       (c) => c.title === 'Active',
     );
 
     const nestedFields = {
-      Rentals: { fields: ['RentalDate', 'ReturnDate'] },
+      'Rental List': { fields: ['RentalDate', 'ReturnDate'] },
     };
 
     const nestedFilter = [
@@ -794,6 +818,12 @@ function tableTest() {
             comparison_op: 'lte',
             value: 30,
           },
+          {
+            fk_column_id: paymentListColumn?.id,
+            status: 'create',
+            logical_op: 'and',
+            comparison_op: 'notblank',
+          },
           {
             is_group: true,
             status: 'create',
@@ -837,7 +867,7 @@ function tableTest() {
     }
 
     const nestedRentalResponse = Object.keys(
-      ascResponse.body.list[0]['Rentals'],
+      ascResponse.body.list[0]['Rental List'],
     );
     if (
       nestedRentalResponse.includes('ReturnDate') &&
@@ -1067,12 +1097,16 @@ function tableTest() {
       relatedTableColumnTitle: 'RentalDate',
     });
 
+    const paymentListColumn = (await customerTable.getColumns()).find(
+      (c) => c.title === 'Payment List',
+    );
+
     const activeColumn = (await customerTable.getColumns()).find(
       (c) => c.title === 'Active',
     );
 
     const nestedFields = {
-      Rentals: {
+      'Rental List': {
         f: 'RentalDate,ReturnDate',
       },
     };
@@ -1097,6 +1131,12 @@ function tableTest() {
             comparison_op: 'lte',
             value: 30,
           },
+          {
+            fk_column_id: paymentListColumn?.id,
+            status: 'create',
+            logical_op: 'and',
+            comparison_op: 'notblank',
+          },
           {
             is_group: true,
             status: 'create',
@@ -1132,7 +1172,7 @@ function tableTest() {
       throw new Error('Wrong filter');
     }
 
-    const nestedRentalResponse = Object.keys(ascResponse.body['Rentals']);
+    const nestedRentalResponse = Object.keys(ascResponse.body['Rental List']);
     if (
       nestedRentalResponse.includes('RentalId') &&
       nestedRentalResponse.includes('RentalDate') &&
@@ -1250,15 +1290,24 @@ function tableTest() {
       )
       .set('xc-auth', context.token)
       .query({
-        'nested[Films][fields]': 'Title,ReleaseYear,Language',
+        'nested[Film List][fields]': 'Title,ReleaseYear,Language',
       })
       .expect(200);
 
     const record = response.body;
+    expect(record['Film List']).length(19);
+    expect(record['Film List'][0]).to.have.all.keys(
+      'Title',
+      'ReleaseYear',
+      'Language',
+    );
+
+    // for SQLite Sakila, Language is null
     if (isPg(context)) {
-      expect(record['Films']).to.equal('19');
-    } else {
-      expect(record['Films']).to.equal(19);
+      expect(record['Film List'][0]['Language']).to.have.all.keys(
+        'Name',
+        'LanguageId',
+      );
     }
   });
 
@@ -1634,7 +1683,7 @@ function tableTest() {
   it('Nested row list hm', async () => {
     const rowId = 1;
     const rentalListColumn = (await customerTable.getColumns()).find(
-      (column) => column.title === 'Rentals',
+      (column) => column.title === 'Rental List',
     )!;
     const response = await request(context.app)
       .get(
@@ -1653,7 +1702,7 @@ function tableTest() {
   it('Nested row list hm with limit and offset', async () => {
     const rowId = 1;
     const rentalListColumn = (await customerTable.getColumns()).find(
-      (column) => column.title === 'Rentals',
+      (column) => column.title === 'Rental List',
     )!;
     const response = await request(context.app)
       .get(
@@ -1679,7 +1728,7 @@ function tableTest() {
   it('Row list hm with invalid table id', async () => {
     const rowId = 1;
     const rentalListColumn = (await customerTable.getColumns()).find(
-      (column) => column.title === 'Rentals',
+      (column) => column.title === 'Rental List',
     )!;
     const response = await request(context.app)
       .get(
@@ -1703,7 +1752,7 @@ function tableTest() {
   //   const visibleColumns = [firstNameColumn];
 
   //   const rentalListColumn = (await customerTable.getColumns()).find(
-  //     (column) => column.title === 'Rentals'
+  //     (column) => column.title === 'Rental List'
   //   )!;
   //   const response = await request(context.app)
   //     .get(`/api/v1/db/data/noco/${sakilaProject.id}/${customerTable.id}/${rowId}/hm/${rentalListColumn.id}`)
@@ -1731,7 +1780,7 @@ function tableTest() {
     });
     const filmTable = await getTable({ project: sakilaProject, name: 'film' });
     const filmListColumn = (await actorTable.getColumns()).find(
-      (column) => column.title === 'Films',
+      (column) => column.title === 'Film List',
     )!;
     const response = await request(context.app)
       .get(
@@ -1755,7 +1804,7 @@ function tableTest() {
     });
     const filmTable = await getTable({ project: sakilaProject, name: 'film' });
     const filmListColumn = (await actorTable.getColumns()).find(
-      (column) => column.title === 'Films',
+      (column) => column.title === 'Film List',
     )!;
     const response = await request(context.app)
       .get(
@@ -1786,7 +1835,7 @@ function tableTest() {
       name: 'actor',
     });
     const filmListColumn = (await actorTable.getColumns()).find(
-      (column) => column.title === 'Films',
+      (column) => column.title === 'Film List',
     )!;
     const response = await request(context.app)
       .get(
@@ -1804,7 +1853,7 @@ function tableTest() {
   it('Create hm relation with invalid table id', async () => {
     const rowId = 1;
     const rentalListColumn = (await customerTable.getColumns()).find(
-      (column) => column.title === 'Rentals',
+      (column) => column.title === 'Rental List',
     )!;
     const refId = 1;
     const response = await request(context.app)
@@ -1861,7 +1910,7 @@ function tableTest() {
   // it.only('Create list mm existing ref row id', async () => {
   //   const rowId = 1;
   //   const rentalListColumn = (await customerTable.getColumns()).find(
-  //     (column) => column.title === 'Rentals'
+  //     (column) => column.title === 'Rental List'
   //   )!;
   //   const refId = 1;
 
@@ -1879,7 +1928,7 @@ function tableTest() {
   it('Create list hm', async () => {
     const rowId = 1;
     const rentalListColumn = (await customerTable.getColumns()).find(
-      (column) => column.title === 'Rentals',
+      (column) => column.title === 'Rental List',
     )!;
     const refId = 1;
 
@@ -1966,7 +2015,7 @@ function tableTest() {
       name: 'actor',
     });
     const filmListColumn = (await actorTable.getColumns()).find(
-      (column) => column.title === 'Films',
+      (column) => column.title === 'Film List',
     )!;
     const refId = 1;
 
@@ -1988,7 +2037,7 @@ function tableTest() {
       name: 'actor',
     });
     const filmListColumn = (await actorTable.getColumns()).find(
-      (column) => column.title === 'Films',
+      (column) => column.title === 'Film List',
     )!;
     const refId = 2;
 
@@ -2057,7 +2106,7 @@ function tableTest() {
       name: 'actor',
     });
     const filmListColumn = (await actorTable.getColumns()).find(
-      (column) => column.title === 'Films',
+      (column) => column.title === 'Film List',
     )!;
     const refId = 1;
 
@@ -2097,7 +2146,7 @@ function tableTest() {
 
     const rowId = 1;
     const rentalListColumn = (await customerTable.getColumns()).find(
-      (column) => column.title === 'Rentals',
+      (column) => column.title === 'Rental List',
     )!;
     const refId = 76;
 
@@ -2146,9 +2195,8 @@ function tableTest() {
       column: ltarColumn,
       type: 'hm',
     });
+    const childRow = row['Ltar'][0];
 
-    // read rows of related table
-    const childRow = (await listRow({ project, table: relatedTable }))[0];
     const response = await request(context.app)
       .delete(
         `/api/v1/db/data/noco/${project.id}/${table.id}/${row['Id']}/hm/${ltarColumn.id}/${childRow['Id']}`,
@@ -2158,8 +2206,7 @@ function tableTest() {
 
     const updatedRow = await getRow(context, { project, table, id: row['Id'] });
 
-    // LTAR now returns rollup count
-    if (!(updatedRow['Ltar'] === 0 || updatedRow['Ltar'] === '0')) {
+    if (updatedRow['Ltar'].length !== 0) {
       throw new Error('Was not deleted');
     }
 
@@ -2173,7 +2220,7 @@ function tableTest() {
   it('Exclude list hm', async () => {
     const rowId = 1;
     const rentalListColumn = (await customerTable.getColumns()).find(
-      (column) => column.title === 'Rentals',
+      (column) => column.title === 'Rental List',
     )!;
 
     const response = await request(context.app)
@@ -2192,7 +2239,7 @@ function tableTest() {
   it('Exclude list hm with limit and offset', async () => {
     const rowId = 1;
     const rentalListColumn = (await customerTable.getColumns()).find(
-      (column) => column.title === 'Rentals',
+      (column) => column.title === 'Rental List',
     )!;
 
     const response = await request(context.app)
@@ -2224,7 +2271,7 @@ function tableTest() {
       name: 'actor',
     });
     const filmListColumn = (await actorTable.getColumns()).find(
-      (column) => column.title === 'Films',
+      (column) => column.title === 'Film List',
     )!;
 
     const response = await request(context.app)
@@ -2247,7 +2294,7 @@ function tableTest() {
       name: 'actor',
     });
     const filmListColumn = (await actorTable.getColumns()).find(
-      (column) => column.title === 'Films',
+      (column) => column.title === 'Film List',
     )!;
 
     const response = await request(context.app)
@@ -2321,7 +2368,7 @@ function tableTest() {
   it('Create nested hm relation with invalid table id', async () => {
     const rowId = 1;
     const rentalListColumn = (await customerTable.getColumns()).find(
-      (column) => column.title === 'Rentals',
+      (column) => column.title === 'Rental List',
     )!;
     const refId = 1;
     const response = await request(context.app)
@@ -2344,7 +2391,7 @@ function tableTest() {
       name: 'actor',
     });
     const filmListColumn = (await actorTable.getColumns()).find(
-      (column) => column.title === 'Films',
+      (column) => column.title === 'Film List',
     )!;
     const response = await request(context.app)
       .post(
diff --git a/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts b/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
index 546c978c07..f0d474f95d 100644
--- a/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/viewRow.test.ts
@@ -19,7 +19,6 @@ import {
   getOneRow,
   getRow,
 } from '../../factory/row';
-import { isPg } from '../../init/db';
 import type { ColumnType } from 'nocodb-sdk';
 import type View from '../../../../src/models/View';
 import type Model from '../../../../src/models/Model';
@@ -522,6 +521,10 @@ function viewRowTests() {
       relatedTableColumnTitle: 'FirstName',
     });
 
+    const paymentListColumn = (await rentalTable.getColumns()).find(
+      (c) => c.title === 'Payment List',
+    );
+
     const nestedFilter = {
       is_group: true,
       status: 'create',
@@ -534,6 +537,12 @@ function viewRowTests() {
           comparison_op: 'like',
           value: '%a%',
         },
+        {
+          fk_column_id: paymentListColumn?.id,
+          status: 'create',
+          logical_op: 'and',
+          comparison_op: 'notblank',
+        },
       ],
     };
 
@@ -613,12 +622,16 @@ function viewRowTests() {
       relatedTableColumnTitle: 'RentalDate',
     });
 
+    const paymentListColumn = (await customerTable.getColumns()).find(
+      (c) => c.title === 'Payment List',
+    );
+
     const activeColumn = (await customerTable.getColumns()).find(
       (c) => c.title === 'Active',
     );
 
     const nestedFields = {
-      Rentals: { fields: ['RentalDate', 'ReturnDate'] },
+      'Rental List': { fields: ['RentalDate', 'ReturnDate'] },
     };
 
     const nestedFilter = [
@@ -641,6 +654,12 @@ function viewRowTests() {
             comparison_op: 'lte',
             value: 30,
           },
+          {
+            fk_column_id: paymentListColumn?.id,
+            status: 'create',
+            logical_op: 'and',
+            comparison_op: 'notblank',
+          },
           {
             is_group: true,
             status: 'create',
@@ -682,10 +701,18 @@ function viewRowTests() {
       throw new Error('Wrong filter');
     }
 
-    if (isPg(context)) {
-      expect(ascResponse.body.list[0]['Rentals']).to.equal('12');
-    } else {
-      expect(ascResponse.body.list[0]['Rentals']).to.equal(12);
+    const nestedRentalResponse = Object.keys(
+      ascResponse.body.list[0]['Rental List'][0],
+    );
+
+    if (
+      !(
+        nestedRentalResponse.includes('ReturnDate') &&
+        nestedRentalResponse.includes('RentalDate') &&
+        nestedRentalResponse.length === 2
+      )
+    ) {
+      throw new Error('Wrong nested fields');
     }
   };
 
@@ -864,12 +891,16 @@ function viewRowTests() {
       attr: { show: true },
     });
 
+    const paymentListColumn = (await customerTable.getColumns()).find(
+      (c) => c.title === 'Payment List',
+    );
+
     const activeColumn = (await customerTable.getColumns()).find(
       (c) => c.title === 'Active',
     );
 
     const nestedFields = {
-      Rentals: { f: 'RentalDate,ReturnDate' },
+      'Rental List': { f: 'RentalDate,ReturnDate' },
     };
 
     const nestedFilter = [
@@ -892,6 +923,12 @@ function viewRowTests() {
             comparison_op: 'lte',
             value: 30,
           },
+          {
+            fk_column_id: paymentListColumn?.id,
+            status: 'create',
+            logical_op: 'and',
+            comparison_op: 'notblank',
+          },
           {
             is_group: true,
             status: 'create',
@@ -927,7 +964,7 @@ function viewRowTests() {
       throw new Error('Wrong filter');
     }
 
-    const nestedRentalResponse = Object.keys(ascResponse.body['Rentals']);
+    const nestedRentalResponse = Object.keys(ascResponse.body['Rental List']);
     if (
       nestedRentalResponse.includes('RentalId') &&
       nestedRentalResponse.includes('RentalDate') &&
diff --git a/packages/nocodb/tests/unit/tsconfig.json b/packages/nocodb/tests/unit/tsconfig.json
index 0685f510ab..1b657c9239 100644
--- a/packages/nocodb/tests/unit/tsconfig.json
+++ b/packages/nocodb/tests/unit/tsconfig.json
@@ -46,8 +46,7 @@
     // "emitDecoratorMetadata": true /* Enables experimental support for emitting type metadata for decorators. */,
 
     "lib": [
-      "es2017",
-      "dom"
+      "es2017"
     ],
     "types": [
       "mocha", "node"
diff --git a/tests/playwright/fixtures/expectedBaseDownloadData.txt b/tests/playwright/fixtures/expectedBaseDownloadData.txt
index 553f1f240b..36d43c36ba 100644
--- a/tests/playwright/fixtures/expectedBaseDownloadData.txt
+++ b/tests/playwright/fixtures/expectedBaseDownloadData.txt
@@ -1,110 +1,110 @@
-Country,Cities
-Afghanistan,1
-Algeria,3
-American Samoa,1
-Angola,2
-Anguilla,1
-Argentina,13
-Armenia,1
-Australia,1
-Austria,3
-Azerbaijan,2
-Bahrain,1
-Bangladesh,3
-Belarus,2
-Bolivia,2
-Brazil,28
-Brunei,1
-Bulgaria,2
-Cambodia,2
-Cameroon,2
-Canada,7
-Chad,1
-Chile,3
-China,53
-Colombia,6
-"Congo, The Democratic Republic of the",2
-Czech Republic,1
-Dominican Republic,3
-Ecuador,3
-Egypt,6
-Estonia,1
-Ethiopia,1
-Faroe Islands,1
-Finland,1
-France,4
-French Guiana,1
-French Polynesia,2
-Gambia,1
-Germany,7
-Greece,2
-Greenland,1
-Holy See (Vatican City State),1
-Hong Kong,1
-Hungary,1
-India,60
-Indonesia,14
-Iran,8
-Iraq,1
-Israel,4
-Italy,7
-Japan,31
-Kazakstan,2
-Kenya,2
-Kuwait,1
-Latvia,2
-Liechtenstein,1
-Lithuania,1
-Madagascar,1
-Malawi,1
-Malaysia,3
-Mexico,30
-Moldova,1
-Morocco,3
-Mozambique,3
-Myanmar,2
-Nauru,1
-Nepal,1
-Netherlands,5
-New Zealand,1
-Nigeria,13
-North Korea,1
-Oman,2
-Pakistan,5
-Paraguay,3
-Peru,4
-Philippines,20
-Poland,8
-Puerto Rico,2
-Romania,2
-Runion,1
-Russian Federation,28
-Saint Vincent and the Grenadines,1
-Saudi Arabia,5
-Senegal,1
-Slovakia,1
-South Africa,11
-South Korea,5
-Spain,5
-Sri Lanka,1
-Sudan,2
-Sweden,1
-Switzerland,3
-Taiwan,10
-Tanzania,3
-Thailand,3
-Tonga,1
-Tunisia,1
-Turkey,15
-Turkmenistan,1
-Tuvalu,1
-Ukraine,6
-United Arab Emirates,3
-United Kingdom,8
-United States,35
-Venezuela,7
-Vietnam,6
-"Virgin Islands, U.S.",1
-Yemen,4
-Yugoslavia,2
-Zambia,1
\ No newline at end of file
+Country,City List
+Afghanistan,Kabul
+Algeria,"Batna, Bchar, Skikda"
+American Samoa,Tafuna
+Angola,"Benguela, Namibe"
+Anguilla,South Hill
+Argentina,"Almirante Brown, Avellaneda, Baha Blanca, Crdoba, Escobar, Ezeiza, La Plata, Merlo, Quilmes, San Miguel de Tucumn, Santa F, Tandil, Vicente Lpez"
+Armenia,Yerevan
+Australia,Woodridge
+Austria,"Graz, Linz, Salzburg"
+Azerbaijan,"Baku, Sumqayit"
+Bahrain,al-Manama
+Bangladesh,"Dhaka, Jamalpur, Tangail"
+Belarus,"Mogiljov, Molodetno"
+Bolivia,"El Alto, Sucre"
+Brazil,"Alvorada, Angra dos Reis, Anpolis, Aparecida de Goinia, Araatuba, Bag, Belm, Blumenau, Boa Vista, Braslia, Goinia, Guaruj, guas Lindas de Gois, Ibirit, Juazeiro do Norte, Juiz de Fora, Luzinia, Maring, Po, Poos de Caldas, Rio Claro, Santa Brbara dOeste, Santo Andr, So Bernardo do Campo, So Leopoldo"
+Brunei,Bandar Seri Begawan
+Bulgaria,"Ruse, Stara Zagora"
+Cambodia,"Battambang, Phnom Penh"
+Cameroon,"Bamenda, Yaound"
+Canada,"Gatineau, Halifax, Lethbridge, London, Oshawa, Richmond Hill, Vancouver"
+Chad,NDjamna
+Chile,"Antofagasta, Coquimbo, Rancagua"
+China,"Baicheng, Baiyin, Binzhou, Changzhou, Datong, Daxian, Dongying, Emeishan, Enshi, Ezhou, Fuyu, Fuzhou, Haining, Hami, Hohhot, Huaian, Jinchang, Jining, Jinzhou, Junan, Korla, Laiwu, Laohekou, Lengshuijiang, Leshan"
+Colombia,"Buenaventura, Dos Quebradas, Florencia, Pereira, Sincelejo, Sogamoso"
+"Congo, The Democratic Republic of the","Lubumbashi, Mwene-Ditu"
+Czech Republic,Olomouc
+Dominican Republic,"La Romana, San Felipe de Puerto Plata, Santiago de los Caballeros"
+Ecuador,"Loja, Portoviejo, Robamba"
+Egypt,"Bilbays, Idfu, Mit Ghamr, Qalyub, Sawhaj, Shubra al-Khayma"
+Estonia,Tartu
+Ethiopia,Addis Abeba
+Faroe Islands,Trshavn
+Finland,Oulu
+France,"Brest, Le Mans, Toulon, Toulouse"
+French Guiana,Cayenne
+French Polynesia,"Faaa, Papeete"
+Gambia,Banjul
+Germany,"Duisburg, Erlangen, Halle/Saale, Mannheim, Saarbrcken, Siegen, Witten"
+Greece,"Athenai, Patras"
+Greenland,Nuuk
+Holy See (Vatican City State),Citt del Vaticano
+Hong Kong,Kowloon and New Kowloon
+Hungary,Szkesfehrvr
+India,"Adoni, Ahmadnagar, Allappuzha (Alleppey), Ambattur, Amroha, Balurghat, Berhampore (Baharampur), Bhavnagar, Bhilwara, Bhimavaram, Bhopal, Bhusawal, Bijapur, Chandrapur, Chapra, Dhule (Dhulia), Etawah, Firozabad, Gandhinagar, Gulbarga, Haldia, Halisahar, Hoshiarpur, Hubli-Dharwad, Jaipur"
+Indonesia,"Cianjur, Ciomas, Ciparay, Gorontalo, Jakarta, Lhokseumawe, Madiun, Pangkal Pinang, Pemalang, Pontianak, Probolinggo, Purwakarta, Surakarta, Tegal"
+Iran,"Arak, Esfahan, Kermanshah, Najafabad, Qomsheh, Shahr-e Kord, Sirjan, Tabriz"
+Iraq,Mosul
+Israel,"Ashdod, Ashqelon, Bat Yam, Tel Aviv-Jaffa"
+Italy,"Alessandria, Bergamo, Brescia, Brindisi, Livorno, Syrakusa, Udine"
+Japan,"Akishima, Fukuyama, Higashiosaka, Hino, Hiroshima, Isesaki, Iwaki, Iwakuni, Iwatsuki, Izumisano, Kakamigahara, Kamakura, Kanazawa, Koriyama, Kurashiki, Kuwana, Matsue, Miyakonojo, Nagareyama, Okayama, Okinawa, Omiya, Onomichi, Otsu, Sagamihara"
+Kazakstan,"Pavlodar, Zhezqazghan"
+Kenya,"Kisumu, Nyeri"
+Kuwait,Jalib al-Shuyukh
+Latvia,"Daugavpils, Liepaja"
+Liechtenstein,Vaduz
+Lithuania,Vilnius
+Madagascar,Mahajanga
+Malawi,Lilongwe
+Malaysia,"Ipoh, Kuching, Sungai Petani"
+Mexico,"Acua, Allende, Atlixco, Carmen, Celaya, Coacalco de Berriozbal, Coatzacoalcos, Cuauhtmoc, Cuautla, Cuernavaca, El Fuerte, Guadalajara, Hidalgo, Huejutla de Reyes, Huixquilucan, Jos Azueta, Jurez, La Paz, Matamoros, Mexicali, Monclova, Nezahualcyotl, Pachuca de Soto, Salamanca, San Felipe del Progreso"
+Moldova,Chisinau
+Morocco,"Beni-Mellal, Nador, Sal"
+Mozambique,"Beira, Naala-Porto, Tete"
+Myanmar,"Monywa, Myingyan"
+Nauru,Yangor
+Nepal,Birgunj
+Netherlands,"Amersfoort, Apeldoorn, Ede, Emmen, s-Hertogenbosch"
+New Zealand,Hamilton
+Nigeria,"Benin City, Deba Habe, Effon-Alaiye, Ife, Ikerre, Ilorin, Kaduna, Ogbomosho, Ondo, Owo, Oyo, Sokoto, Zaria"
+North Korea,Pyongyang
+Oman,"Masqat, Salala"
+Pakistan,"Dadu, Mandi Bahauddin, Mardan, Okara, Shikarpur"
+Paraguay,"Asuncin, Ciudad del Este, San Lorenzo"
+Peru,"Callao, Hunuco, Lima, Sullana"
+Philippines,"Baybay, Bayugan, Bislig, Cabuyao, Cavite, Davao, Gingoog, Hagonoy, Iligan, Imus, Lapu-Lapu, Mandaluyong, Ozamis, Santa Rosa, Taguig, Talavera, Tanauan, Tanza, Tarlac, Tuguegarao"
+Poland,"Bydgoszcz, Czestochowa, Jastrzebie-Zdrj, Kalisz, Lublin, Plock, Tychy, Wroclaw"
+Puerto Rico,"Arecibo, Ponce"
+Romania,"Botosani, Bucuresti"
+Runion,Saint-Denis
+Russian Federation,"Atinsk, Balaiha, Dzerzinsk, Elista, Ivanovo, Jaroslavl, Jelets, Kaliningrad, Kamyin, Kirovo-Tepetsk, Kolpino, Korolev, Kurgan, Kursk, Lipetsk, Ljubertsy, Maikop, Moscow, Nabereznyje Telny, Niznekamsk, Novoterkassk, Pjatigorsk, Serpuhov, Smolensk, Syktyvkar"
+Saint Vincent and the Grenadines,Kingstown
+Saudi Arabia,"Abha, al-Hawiya, al-Qatif, Jedda, Tabuk"
+Senegal,Ziguinchor
+Slovakia,Bratislava
+South Africa,"Boksburg, Botshabelo, Chatsworth, Johannesburg, Kimberley, Klerksdorp, Newcastle, Paarl, Rustenburg, Soshanguve, Springs"
+South Korea,"Cheju, Kimchon, Naju, Tonghae, Uijongbu"
+Spain,"A Corua (La Corua), Donostia-San Sebastin, Gijn, Ourense (Orense), Santiago de Compostela"
+Sri Lanka,Jaffna
+Sudan,"al-Qadarif, Omdurman"
+Sweden,Malm
+Switzerland,"Basel, Bern, Lausanne"
+Taiwan,"Changhwa, Chiayi, Chungho, Fengshan, Hsichuh, Lungtan, Nantou, Tanshui, Touliu, Tsaotun"
+Tanzania,"Mwanza, Tabora, Zanzibar"
+Thailand,"Nakhon Sawan, Pak Kret, Songkhla"
+Tonga,Nukualofa
+Tunisia,Sousse
+Turkey,"Adana, Balikesir, Batman, Denizli, Eskisehir, Gaziantep, Inegl, Kilis, Ktahya, Osmaniye, Sivas, Sultanbeyli, Tarsus, Tokat, Usak"
+Turkmenistan,Ashgabat
+Tuvalu,Funafuti
+Ukraine,"Kamjanets-Podilskyi, Konotop, Mukateve, ostka, Simferopol, Sumy"
+United Arab Emirates,"Abu Dhabi, al-Ayn, Sharja"
+United Kingdom,"Bradford, Dundee, London, Southampton, Southend-on-Sea, Southport, Stockport, York"
+United States,"Akron, Arlington, Augusta-Richmond County, Aurora, Bellevue, Brockton, Cape Coral, Citrus Heights, Clarksville, Compton, Dallas, Dayton, El Monte, Fontana, Garden Grove, Garland, Grand Prairie, Greensboro, Joliet, Kansas City, Lancaster, Laredo, Lincoln, Manchester, Memphis"
+Venezuela,"Barcelona, Caracas, Cuman, Maracabo, Ocumare del Tuy, Valencia, Valle de la Pascua"
+Vietnam,"Cam Ranh, Haiphong, Hanoi, Nam Dinh, Nha Trang, Vinh"
+"Virgin Islands, U.S.",Charlotte Amalie
+Yemen,"Aden, Hodeida, Sanaa, Taizz"
+Yugoslavia,"Kragujevac, Novi Sad"
+Zambia,Kitwe
\ No newline at end of file
diff --git a/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt b/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt
index 553f1f240b..36d43c36ba 100644
--- a/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt
+++ b/tests/playwright/fixtures/expectedBaseDownloadDataPg.txt
@@ -1,110 +1,110 @@
-Country,Cities
-Afghanistan,1
-Algeria,3
-American Samoa,1
-Angola,2
-Anguilla,1
-Argentina,13
-Armenia,1
-Australia,1
-Austria,3
-Azerbaijan,2
-Bahrain,1
-Bangladesh,3
-Belarus,2
-Bolivia,2
-Brazil,28
-Brunei,1
-Bulgaria,2
-Cambodia,2
-Cameroon,2
-Canada,7
-Chad,1
-Chile,3
-China,53
-Colombia,6
-"Congo, The Democratic Republic of the",2
-Czech Republic,1
-Dominican Republic,3
-Ecuador,3
-Egypt,6
-Estonia,1
-Ethiopia,1
-Faroe Islands,1
-Finland,1
-France,4
-French Guiana,1
-French Polynesia,2
-Gambia,1
-Germany,7
-Greece,2
-Greenland,1
-Holy See (Vatican City State),1
-Hong Kong,1
-Hungary,1
-India,60
-Indonesia,14
-Iran,8
-Iraq,1
-Israel,4
-Italy,7
-Japan,31
-Kazakstan,2
-Kenya,2
-Kuwait,1
-Latvia,2
-Liechtenstein,1
-Lithuania,1
-Madagascar,1
-Malawi,1
-Malaysia,3
-Mexico,30
-Moldova,1
-Morocco,3
-Mozambique,3
-Myanmar,2
-Nauru,1
-Nepal,1
-Netherlands,5
-New Zealand,1
-Nigeria,13
-North Korea,1
-Oman,2
-Pakistan,5
-Paraguay,3
-Peru,4
-Philippines,20
-Poland,8
-Puerto Rico,2
-Romania,2
-Runion,1
-Russian Federation,28
-Saint Vincent and the Grenadines,1
-Saudi Arabia,5
-Senegal,1
-Slovakia,1
-South Africa,11
-South Korea,5
-Spain,5
-Sri Lanka,1
-Sudan,2
-Sweden,1
-Switzerland,3
-Taiwan,10
-Tanzania,3
-Thailand,3
-Tonga,1
-Tunisia,1
-Turkey,15
-Turkmenistan,1
-Tuvalu,1
-Ukraine,6
-United Arab Emirates,3
-United Kingdom,8
-United States,35
-Venezuela,7
-Vietnam,6
-"Virgin Islands, U.S.",1
-Yemen,4
-Yugoslavia,2
-Zambia,1
\ No newline at end of file
+Country,City List
+Afghanistan,Kabul
+Algeria,"Batna, Bchar, Skikda"
+American Samoa,Tafuna
+Angola,"Benguela, Namibe"
+Anguilla,South Hill
+Argentina,"Almirante Brown, Avellaneda, Baha Blanca, Crdoba, Escobar, Ezeiza, La Plata, Merlo, Quilmes, San Miguel de Tucumn, Santa F, Tandil, Vicente Lpez"
+Armenia,Yerevan
+Australia,Woodridge
+Austria,"Graz, Linz, Salzburg"
+Azerbaijan,"Baku, Sumqayit"
+Bahrain,al-Manama
+Bangladesh,"Dhaka, Jamalpur, Tangail"
+Belarus,"Mogiljov, Molodetno"
+Bolivia,"El Alto, Sucre"
+Brazil,"Alvorada, Angra dos Reis, Anpolis, Aparecida de Goinia, Araatuba, Bag, Belm, Blumenau, Boa Vista, Braslia, Goinia, Guaruj, guas Lindas de Gois, Ibirit, Juazeiro do Norte, Juiz de Fora, Luzinia, Maring, Po, Poos de Caldas, Rio Claro, Santa Brbara dOeste, Santo Andr, So Bernardo do Campo, So Leopoldo"
+Brunei,Bandar Seri Begawan
+Bulgaria,"Ruse, Stara Zagora"
+Cambodia,"Battambang, Phnom Penh"
+Cameroon,"Bamenda, Yaound"
+Canada,"Gatineau, Halifax, Lethbridge, London, Oshawa, Richmond Hill, Vancouver"
+Chad,NDjamna
+Chile,"Antofagasta, Coquimbo, Rancagua"
+China,"Baicheng, Baiyin, Binzhou, Changzhou, Datong, Daxian, Dongying, Emeishan, Enshi, Ezhou, Fuyu, Fuzhou, Haining, Hami, Hohhot, Huaian, Jinchang, Jining, Jinzhou, Junan, Korla, Laiwu, Laohekou, Lengshuijiang, Leshan"
+Colombia,"Buenaventura, Dos Quebradas, Florencia, Pereira, Sincelejo, Sogamoso"
+"Congo, The Democratic Republic of the","Lubumbashi, Mwene-Ditu"
+Czech Republic,Olomouc
+Dominican Republic,"La Romana, San Felipe de Puerto Plata, Santiago de los Caballeros"
+Ecuador,"Loja, Portoviejo, Robamba"
+Egypt,"Bilbays, Idfu, Mit Ghamr, Qalyub, Sawhaj, Shubra al-Khayma"
+Estonia,Tartu
+Ethiopia,Addis Abeba
+Faroe Islands,Trshavn
+Finland,Oulu
+France,"Brest, Le Mans, Toulon, Toulouse"
+French Guiana,Cayenne
+French Polynesia,"Faaa, Papeete"
+Gambia,Banjul
+Germany,"Duisburg, Erlangen, Halle/Saale, Mannheim, Saarbrcken, Siegen, Witten"
+Greece,"Athenai, Patras"
+Greenland,Nuuk
+Holy See (Vatican City State),Citt del Vaticano
+Hong Kong,Kowloon and New Kowloon
+Hungary,Szkesfehrvr
+India,"Adoni, Ahmadnagar, Allappuzha (Alleppey), Ambattur, Amroha, Balurghat, Berhampore (Baharampur), Bhavnagar, Bhilwara, Bhimavaram, Bhopal, Bhusawal, Bijapur, Chandrapur, Chapra, Dhule (Dhulia), Etawah, Firozabad, Gandhinagar, Gulbarga, Haldia, Halisahar, Hoshiarpur, Hubli-Dharwad, Jaipur"
+Indonesia,"Cianjur, Ciomas, Ciparay, Gorontalo, Jakarta, Lhokseumawe, Madiun, Pangkal Pinang, Pemalang, Pontianak, Probolinggo, Purwakarta, Surakarta, Tegal"
+Iran,"Arak, Esfahan, Kermanshah, Najafabad, Qomsheh, Shahr-e Kord, Sirjan, Tabriz"
+Iraq,Mosul
+Israel,"Ashdod, Ashqelon, Bat Yam, Tel Aviv-Jaffa"
+Italy,"Alessandria, Bergamo, Brescia, Brindisi, Livorno, Syrakusa, Udine"
+Japan,"Akishima, Fukuyama, Higashiosaka, Hino, Hiroshima, Isesaki, Iwaki, Iwakuni, Iwatsuki, Izumisano, Kakamigahara, Kamakura, Kanazawa, Koriyama, Kurashiki, Kuwana, Matsue, Miyakonojo, Nagareyama, Okayama, Okinawa, Omiya, Onomichi, Otsu, Sagamihara"
+Kazakstan,"Pavlodar, Zhezqazghan"
+Kenya,"Kisumu, Nyeri"
+Kuwait,Jalib al-Shuyukh
+Latvia,"Daugavpils, Liepaja"
+Liechtenstein,Vaduz
+Lithuania,Vilnius
+Madagascar,Mahajanga
+Malawi,Lilongwe
+Malaysia,"Ipoh, Kuching, Sungai Petani"
+Mexico,"Acua, Allende, Atlixco, Carmen, Celaya, Coacalco de Berriozbal, Coatzacoalcos, Cuauhtmoc, Cuautla, Cuernavaca, El Fuerte, Guadalajara, Hidalgo, Huejutla de Reyes, Huixquilucan, Jos Azueta, Jurez, La Paz, Matamoros, Mexicali, Monclova, Nezahualcyotl, Pachuca de Soto, Salamanca, San Felipe del Progreso"
+Moldova,Chisinau
+Morocco,"Beni-Mellal, Nador, Sal"
+Mozambique,"Beira, Naala-Porto, Tete"
+Myanmar,"Monywa, Myingyan"
+Nauru,Yangor
+Nepal,Birgunj
+Netherlands,"Amersfoort, Apeldoorn, Ede, Emmen, s-Hertogenbosch"
+New Zealand,Hamilton
+Nigeria,"Benin City, Deba Habe, Effon-Alaiye, Ife, Ikerre, Ilorin, Kaduna, Ogbomosho, Ondo, Owo, Oyo, Sokoto, Zaria"
+North Korea,Pyongyang
+Oman,"Masqat, Salala"
+Pakistan,"Dadu, Mandi Bahauddin, Mardan, Okara, Shikarpur"
+Paraguay,"Asuncin, Ciudad del Este, San Lorenzo"
+Peru,"Callao, Hunuco, Lima, Sullana"
+Philippines,"Baybay, Bayugan, Bislig, Cabuyao, Cavite, Davao, Gingoog, Hagonoy, Iligan, Imus, Lapu-Lapu, Mandaluyong, Ozamis, Santa Rosa, Taguig, Talavera, Tanauan, Tanza, Tarlac, Tuguegarao"
+Poland,"Bydgoszcz, Czestochowa, Jastrzebie-Zdrj, Kalisz, Lublin, Plock, Tychy, Wroclaw"
+Puerto Rico,"Arecibo, Ponce"
+Romania,"Botosani, Bucuresti"
+Runion,Saint-Denis
+Russian Federation,"Atinsk, Balaiha, Dzerzinsk, Elista, Ivanovo, Jaroslavl, Jelets, Kaliningrad, Kamyin, Kirovo-Tepetsk, Kolpino, Korolev, Kurgan, Kursk, Lipetsk, Ljubertsy, Maikop, Moscow, Nabereznyje Telny, Niznekamsk, Novoterkassk, Pjatigorsk, Serpuhov, Smolensk, Syktyvkar"
+Saint Vincent and the Grenadines,Kingstown
+Saudi Arabia,"Abha, al-Hawiya, al-Qatif, Jedda, Tabuk"
+Senegal,Ziguinchor
+Slovakia,Bratislava
+South Africa,"Boksburg, Botshabelo, Chatsworth, Johannesburg, Kimberley, Klerksdorp, Newcastle, Paarl, Rustenburg, Soshanguve, Springs"
+South Korea,"Cheju, Kimchon, Naju, Tonghae, Uijongbu"
+Spain,"A Corua (La Corua), Donostia-San Sebastin, Gijn, Ourense (Orense), Santiago de Compostela"
+Sri Lanka,Jaffna
+Sudan,"al-Qadarif, Omdurman"
+Sweden,Malm
+Switzerland,"Basel, Bern, Lausanne"
+Taiwan,"Changhwa, Chiayi, Chungho, Fengshan, Hsichuh, Lungtan, Nantou, Tanshui, Touliu, Tsaotun"
+Tanzania,"Mwanza, Tabora, Zanzibar"
+Thailand,"Nakhon Sawan, Pak Kret, Songkhla"
+Tonga,Nukualofa
+Tunisia,Sousse
+Turkey,"Adana, Balikesir, Batman, Denizli, Eskisehir, Gaziantep, Inegl, Kilis, Ktahya, Osmaniye, Sivas, Sultanbeyli, Tarsus, Tokat, Usak"
+Turkmenistan,Ashgabat
+Tuvalu,Funafuti
+Ukraine,"Kamjanets-Podilskyi, Konotop, Mukateve, ostka, Simferopol, Sumy"
+United Arab Emirates,"Abu Dhabi, al-Ayn, Sharja"
+United Kingdom,"Bradford, Dundee, London, Southampton, Southend-on-Sea, Southport, Stockport, York"
+United States,"Akron, Arlington, Augusta-Richmond County, Aurora, Bellevue, Brockton, Cape Coral, Citrus Heights, Clarksville, Compton, Dallas, Dayton, El Monte, Fontana, Garden Grove, Garland, Grand Prairie, Greensboro, Joliet, Kansas City, Lancaster, Laredo, Lincoln, Manchester, Memphis"
+Venezuela,"Barcelona, Caracas, Cuman, Maracabo, Ocumare del Tuy, Valencia, Valle de la Pascua"
+Vietnam,"Cam Ranh, Haiphong, Hanoi, Nam Dinh, Nha Trang, Vinh"
+"Virgin Islands, U.S.",Charlotte Amalie
+Yemen,"Aden, Hodeida, Sanaa, Taizz"
+Yugoslavia,"Kragujevac, Novi Sad"
+Zambia,Kitwe
\ No newline at end of file
diff --git a/tests/playwright/fixtures/expectedData.txt b/tests/playwright/fixtures/expectedData.txt
index 92deed0873..05639b8ad4 100644
--- a/tests/playwright/fixtures/expectedData.txt
+++ b/tests/playwright/fixtures/expectedData.txt
@@ -1,4 +1,4 @@
-Address,District,PostalCode,Phone,Location,Customers,Staffs,City
-1661 Abha Drive,Tamil Nadu,14400,270456873752,"{""x"":78.8214191,""y"":10.3812871}",1,0,Pudukkottai
-1993 Tabuk Lane,Tamil Nadu,64221,648482415405,"{""x"":80.1270701,""y"":12.9246028}",1,0,Tambaram
-381 Kabul Way,Taipei,87272,55477302294,"{""x"":0,""y"":0}",1,0,Hsichuh
\ No newline at end of file
+Address,District,PostalCode,Phone,Location,Customer List,Staff List,City
+1661 Abha Drive,Tamil Nadu,14400,270456873752,"{""x"":78.8214191,""y"":10.3812871}",1,,Pudukkottai
+1993 Tabuk Lane,Tamil Nadu,64221,648482415405,"{""x"":80.1270701,""y"":12.9246028}",2,,Tambaram
+381 Kabul Way,Taipei,87272,55477302294,"{""x"":0,""y"":0}",2,,Hsichuh
\ No newline at end of file
diff --git a/tests/playwright/fixtures/expectedDataSqlite.txt b/tests/playwright/fixtures/expectedDataSqlite.txt
index a25d455a96..440c160aaa 100644
--- a/tests/playwright/fixtures/expectedDataSqlite.txt
+++ b/tests/playwright/fixtures/expectedDataSqlite.txt
@@ -1,19 +1,19 @@
-Address,District,PostalCode,Phone,Customers,Staffs,City
-1013 Tabuk Boulevard," ",96203," ",1,0,Kanchrapara
-1168 Najafabad Parkway," ",40301," ",1,0,Kabul
-1294 Firozabad Drive," ",70618," ",1,0,Pingxiang
-1342 Abha Boulevard," ",10714," ",1,0,Bucuresti
-1368 Maracabo Boulevard," ",32716," ",1,0,South Hill
-1427 Tabuk Place," ",31342," ",1,0,Cape Coral
-1519 Santiago de los Caballeros Loop," ",22025," ",1,0,Mwene-Ditu
-1661 Abha Drive," ",14400," ",1,0,Pudukkottai
-17 Kabul Boulevard," ",38594," ",1,0,Nagareyama
-1838 Tabriz Lane," ",1195," ",1,0,Dhaka
-1888 Kabul Drive," ",20936," ",1,0,Ife
-1892 Nabereznyje Telny Lane," ",28396," ",1,0,Tafuna
-1993 Tabuk Lane," ",64221," ",1,0,Tambaram
-217 Botshabelo Place," ",49521," ",1,0,Davao
-381 Kabul Way," ",87272," ",1,0,Hsichuh
-44 Najafabad Way," ",61391," ",1,0,Donostia-San Sebastin
-48 Maracabo Place," ",1570," ",1,0,Talavera
-669 Firozabad Loop," ",92265," ",1,0,al-Ayn
\ No newline at end of file
+Address,District,PostalCode,Phone,Customer List,Staff List,City
+1013 Tabuk Boulevard," ",96203," ",2,,Kanchrapara
+1168 Najafabad Parkway," ",40301," ",1,,Kabul
+1294 Firozabad Drive," ",70618," ",2,,Pingxiang
+1342 Abha Boulevard," ",10714," ",2,,Bucuresti
+1368 Maracabo Boulevard," ",32716," ",2,,South Hill
+1427 Tabuk Place," ",31342," ",2,,Cape Coral
+1519 Santiago de los Caballeros Loop," ",22025," ",2,,Mwene-Ditu
+1661 Abha Drive," ",14400," ",1,,Pudukkottai
+17 Kabul Boulevard," ",38594," ",1,,Nagareyama
+1838 Tabriz Lane," ",1195," ",1,,Dhaka
+1888 Kabul Drive," ",20936," ",1,,Ife
+1892 Nabereznyje Telny Lane," ",28396," ",2,,Tafuna
+1993 Tabuk Lane," ",64221," ",2,,Tambaram
+217 Botshabelo Place," ",49521," ",2,,Davao
+381 Kabul Way," ",87272," ",2,,Hsichuh
+44 Najafabad Way," ",61391," ",2,,Donostia-San Sebastin
+48 Maracabo Place," ",1570," ",1,,Talavera
+669 Firozabad Loop," ",92265," ",1,,al-Ayn
\ No newline at end of file
diff --git a/tests/playwright/pages/Dashboard/Grid/Column/index.ts b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
index 9145b42719..3e188aed76 100644
--- a/tests/playwright/pages/Dashboard/Grid/Column/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
@@ -139,7 +139,6 @@ export class ColumnPageObject extends BasePage {
           .locator(`.ant-select-item`, {
             hasText: childColumn,
           })
-          .last()
           .click();
         break;
       case 'Rollup':
@@ -163,7 +162,7 @@ export class ColumnPageObject extends BasePage {
           .nth(0)
           .click();
         break;
-      case 'Links':
+      case 'LinkToAnotherRecord':
         await this.get()
           .locator('.nc-ltar-relation-type >> .ant-radio')
           .nth(relationType === 'Has Many' ? 0 : 1)
diff --git a/tests/playwright/pages/Dashboard/Grid/index.ts b/tests/playwright/pages/Dashboard/Grid/index.ts
index 192faf5bd6..9663395132 100644
--- a/tests/playwright/pages/Dashboard/Grid/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/index.ts
@@ -296,15 +296,15 @@ export class GridPage extends BasePage {
     await expect(await this.rootPage.locator('text=Insert New Row')).not.toBeVisible();
 
     // in cell-add
-    await this.cell.get({ index: 0, columnHeader: 'Cities' }).hover();
+    await this.cell.get({ index: 0, columnHeader: 'City List' }).hover();
     await expect(
-      await this.cell.get({ index: 0, columnHeader: 'Cities' }).locator('.nc-action-icon.nc-plus')
+      await this.cell.get({ index: 0, columnHeader: 'City List' }).locator('.nc-action-icon.nc-plus')
     ).not.toBeVisible();
 
     // expand row
-    await this.cell.get({ index: 0, columnHeader: 'Cities' }).hover();
+    await this.cell.get({ index: 0, columnHeader: 'City List' }).hover();
     await expect(
-      await this.cell.get({ index: 0, columnHeader: 'Cities' }).locator('.nc-action-icon >> nth=0')
+      await this.cell.get({ index: 0, columnHeader: 'City List' }).locator('.nc-action-icon >> nth=0')
     ).not.toBeVisible();
   }
 
@@ -327,9 +327,15 @@ export class GridPage extends BasePage {
     await expect(await this.rootPage.locator('text=Insert New Row')).toBeVisible();
 
     // in cell-add
-    await this.cell.get({ index: 0, columnHeader: 'Cities' }).hover();
+    await this.cell.get({ index: 0, columnHeader: 'City List' }).hover();
     await expect(
-      await this.cell.get({ index: 0, columnHeader: 'Cities' }).locator('.nc-action-icon.nc-plus')
+      await this.cell.get({ index: 0, columnHeader: 'City List' }).locator('.nc-action-icon.nc-plus')
+    ).toBeVisible();
+
+    // expand row
+    await this.cell.get({ index: 0, columnHeader: 'City List' }).hover();
+    await expect(
+      await this.cell.get({ index: 0, columnHeader: 'City List' }).locator('.nc-action-icon.nc-arrow-expand')
     ).toBeVisible();
   }
 
diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index 473d03f017..02399664c7 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -9,7 +9,6 @@ import { RatingCellPageObject } from './RatingCell';
 import { DateCellPageObject } from './DateCell';
 import { DateTimeCellPageObject } from './DateTimeCell';
 import { GeoDataCellPageObject } from './GeoDataCell';
-import { getTextExcludeIconText } from '../../../../tests/utils/general';
 import { YearCellPageObject } from './YearCell';
 import { TimeCellPageObject } from './TimeCell';
 
@@ -83,9 +82,9 @@ export class CellPageObject extends BasePage {
   }
 
   async inCellExpand({ index, columnHeader }: CellProps) {
-    // await this.get({ index, columnHeader }).hover();
+    await this.get({ index, columnHeader }).hover();
     await this.waitForResponse({
-      uiAction: () => this.get({ index, columnHeader }).locator('.nc-datatype-link').click(),
+      uiAction: () => this.get({ index, columnHeader }).locator('.nc-action-icon >> nth=0').click(),
       requestUrlPathToMatch: '/api/v1/db/data/noco/',
       httpMethodsToMatch: ['GET'],
     });
@@ -274,51 +273,41 @@ export class CellPageObject extends BasePage {
   async verifyVirtualCell({
     index,
     columnHeader,
-    type,
     count,
     value,
     verifyChildList = false,
-    options,
   }: CellProps & {
     count?: number;
-    type?: string;
-    value?: string[];
+    value: string[];
     verifyChildList?: boolean;
-    options?: { singular?: string; plural?: string };
   }) {
+    // const count = value.length;
     const cell = await this.get({ index, columnHeader });
-    const linkText = await cell.locator('.nc-datatype-link');
-
-    await cell.scrollIntoViewIfNeeded();
-
-    // lazy load- give enough time for cell to load
-    await this.rootPage.waitForTimeout(1000);
+    const chips = cell.locator('.chips > .chip');
 
-    if (type === 'bt') {
-      const chips = cell.locator('.chips > .chip');
-      await expect(await chips.count()).toBe(count);
-
-      for (let i = 0; i < value.length; ++i) {
-        await chips.nth(i).locator('.name').waitFor({ state: 'visible' });
-        await chips.nth(i).locator('.name').scrollIntoViewIfNeeded();
-        await expect(await chips.nth(i).locator('.name')).toHaveText(value[i]);
-      }
-      return;
-    }
+    await this.get({ index, columnHeader }).scrollIntoViewIfNeeded();
 
     // verify chip count & contents
-    if (count) {
-      await expect(await cell.innerText()).toContain(`${count} ${count === 1 ? options.singular : options.plural}`);
+    if (count) await expect(chips).toHaveCount(count);
+
+    // verify only the elements that are passed in
+    for (let i = 0; i < value.length; ++i) {
+      await chips.nth(i).locator('.name').waitFor({ state: 'visible' });
+      await chips.nth(i).locator('.name').scrollIntoViewIfNeeded();
+      await chips.nth(i).locator('.name').waitFor({ state: 'visible' });
+      const chipText = await chips.nth(i).locator('.name').textContent();
+      expect(value).toContain(chipText);
     }
 
     if (verifyChildList) {
       // open child list
       await this.get({ index, columnHeader }).hover();
+      const arrow_expand = await this.get({ index, columnHeader }).locator('.nc-arrow-expand');
 
       // arrow expand doesn't exist for bt columns
-      if (await linkText.count()) {
+      if (await arrow_expand.count()) {
         await this.waitForResponse({
-          uiAction: () => linkText.click(),
+          uiAction: () => arrow_expand.click(),
           requestUrlPathToMatch: '/api/v1/db',
           httpMethodsToMatch: ['GET'],
         });
@@ -338,24 +327,12 @@ export class CellPageObject extends BasePage {
 
   async unlinkVirtualCell({ index, columnHeader }: CellProps) {
     const cell = this.get({ index, columnHeader });
-    const isLink = await cell.locator('.nc-datatype-link').count();
-
-    // Count will be 0 for BT columns
-    if (!isLink) {
-      await cell.click();
-      await cell.locator('.nc-icon.unlink-icon').click();
-    }
-
-    // For HM/MM columns
-    else {
-      await cell.locator('.nc-datatype-link').click();
-      await this.waitForResponse({
-        uiAction: () => this.rootPage.locator(`[data-testid="nc-child-list-icon-unlink"]`).first().click(),
-        requestUrlPathToMatch: '/api/v1/db/data/noco/',
-        httpMethodsToMatch: ['GET'],
-      });
-      await this.rootPage.keyboard.press('Escape');
-    }
+    await cell.click();
+    await this.waitForResponse({
+      uiAction: () => cell.locator('.unlink-icon').first().click(),
+      requestUrlPathToMatch: '/api/v1/db/data/noco/',
+      httpMethodsToMatch: ['GET'],
+    });
   }
 
   async verifyRoleAccess(param: { role: string }) {
@@ -375,27 +352,19 @@ export class CellPageObject extends BasePage {
     );
 
     // virtual cell
-    const vCell = await this.get({ index: 0, columnHeader: 'Cities' });
+    const vCell = await this.get({ index: 0, columnHeader: 'City List' });
     await vCell.hover();
     // in-cell add
     await expect(await vCell.locator('.nc-action-icon.nc-plus:visible')).toHaveCount(
       param.role === 'creator' || param.role === 'editor' ? 1 : 0
     );
-
     // in-cell expand (all have access)
-    // PR8504
-    // await expect(await vCell.locator('.nc-action-icon.nc-arrow-expand:visible')).toHaveCount(1);
-    const linkText = await getTextExcludeIconText(vCell);
-    expect(linkText).toContain('1 City');
-
-    // PR8504
-    // await vCell.click();
-
+    await expect(await vCell.locator('.nc-action-icon.nc-arrow-expand:visible')).toHaveCount(1);
+    await vCell.click();
     // unlink
-    // PR8504
-    // await expect(await vCell.locator('.nc-icon.unlink-icon:visible')).toHaveCount(
-    //   param.role === 'creator' || param.role === 'editor' ? 1 : 0
-    // );
+    await expect(await vCell.locator('.nc-icon.unlink-icon:visible')).toHaveCount(
+      param.role === 'creator' || param.role === 'editor' ? 1 : 0
+    );
   }
 
   async copyToClipboard({ index, columnHeader }: CellProps, ...clickOptions: Parameters<Locator['click']>) {
diff --git a/tests/playwright/quickTests/commonTest.ts b/tests/playwright/quickTests/commonTest.ts
index 8f5a003037..62188bee2f 100644
--- a/tests/playwright/quickTests/commonTest.ts
+++ b/tests/playwright/quickTests/commonTest.ts
@@ -99,7 +99,7 @@ const quickVerify = async ({
     rating: recordsVirtualCells.Rating,
   });
 
-  // Links
+  // LinkToAnotherRecord
   await dashboard.grid.cell.verifyVirtualCell({
     index: cellIndex,
     columnHeader: 'Actor',
@@ -121,7 +121,7 @@ const quickVerify = async ({
       value: recordsVirtualCells.Computation,
     });
 
-    // Links
+    // LinkToAnotherRecord
     await dashboard.grid.cell.verifyVirtualCell({
       index: cellIndex,
       columnHeader: 'Producer',
diff --git a/tests/playwright/tests/db/columns/columnAttachments.spec.ts b/tests/playwright/tests/db/columns/columnAttachments.spec.ts
index 6719c8382c..69ea59dea5 100644
--- a/tests/playwright/tests/db/columns/columnAttachments.spec.ts
+++ b/tests/playwright/tests/db/columns/columnAttachments.spec.ts
@@ -92,11 +92,9 @@ test.describe('Attachment column', () => {
     const rows = csvArray.slice(1);
     const cells = rows[10].split(',');
 
-    await expect(columns).toBe('Country,Cities,testAttach');
+    await expect(columns).toBe('Country,City List,testAttach');
     await expect(cells[0]).toBe('Bahrain');
-    // PR8504
-    // await expect(cells[1]).toBe('al-Manama');
-    await expect(cells[1]).toBe('1');
+    await expect(cells[1]).toBe('al-Manama');
     await expect(cells[2].includes('5.json(http://localhost:8080/download/')).toBe(true);
   });
 
diff --git a/tests/playwright/tests/db/columns/columnBarcode.spec.ts b/tests/playwright/tests/db/columns/columnBarcode.spec.ts
index 35af321f17..8f20c53548 100644
--- a/tests/playwright/tests/db/columns/columnBarcode.spec.ts
+++ b/tests/playwright/tests/db/columns/columnBarcode.spec.ts
@@ -67,7 +67,7 @@ test.describe('Virtual Columns', () => {
       // and compare the base64 encoded codes/src attributes for the first 3 rows.
       // Column data from City table (Sakila DB)
       /**
-       * City                   LastUpdate              Addresses                Country
+       * City                   LastUpdate              Address List                Country
        * A Corua (La Corua)     2006-02-15 04:45:25     939 Probolinggo Loop        Spain
        * Abha                   2006-02-15 04:45:25     733 Mandaluyong Place       Saudi Arabia
        * Abu Dhabi              2006-02-15 04:45:25     535 Ahmadnagar Manor        United Arab Emirates
diff --git a/tests/playwright/tests/db/columns/columnFormula.spec.ts b/tests/playwright/tests/db/columns/columnFormula.spec.ts
index 9d936bedb7..1754328694 100644
--- a/tests/playwright/tests/db/columns/columnFormula.spec.ts
+++ b/tests/playwright/tests/db/columns/columnFormula.spec.ts
@@ -6,7 +6,7 @@ import { isPg, isSqlite } from '../../../setup/db';
 // Add formula to be verified here & store expected results for 5 rows
 // Column data from City table (Sakila DB)
 /**
- * City                   LastUpdate              Addresses                Country
+ * City                   LastUpdate              Address List                Country
  * A Corua (La Corua)     2006-02-15 04:45:25     939 Probolinggo Loop        Spain
  * Abha                   2006-02-15 04:45:25     733 Mandaluyong Place       Saudi Arabia
  * Abu Dhabi              2006-02-15 04:45:25     535 Ahmadnagar Manor        United Arab Emirates
@@ -131,8 +131,8 @@ const formulaDataByDbType = (context: NcContext) => [
     result: isPg(context) ? ['false', 'false', 'false', 'false', 'false'] : ['0', '0', '0', '0', '0'],
   },
   {
-    formula: `IF((SEARCH({City}, "Ad") != 0), "2.0","WRONG")`,
-    result: ['WRONG', 'WRONG', 'WRONG', 'WRONG', '2.0'],
+    formula: `IF((SEARCH({Address List}, "Parkway") != 0), "2.0","WRONG")`,
+    result: ['WRONG', 'WRONG', 'WRONG', '2.0', '2.0'],
   },
 
   // additional tests for formula case-insensitivity
diff --git a/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts b/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
index ddb46f8687..3487138d3c 100644
--- a/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
+++ b/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
@@ -31,13 +31,13 @@ test.describe('LTAR create & update', () => {
     // Create LTAR-HM column
     await dashboard.grid.column.create({
       title: 'Link1-2hm',
-      type: 'Links',
+      type: 'LinkToAnotherRecord',
       childTable: 'Sheet2',
       relationType: 'Has Many',
     });
     await dashboard.grid.column.create({
       title: 'Link1-2mm',
-      type: 'Links',
+      type: 'LinkToAnotherRecord',
       childTable: 'Sheet2',
       relationType: 'Many To many',
     });
@@ -46,7 +46,7 @@ test.describe('LTAR create & update', () => {
     await dashboard.treeView.openTable({ title: 'Sheet2', networkResponse: false });
     await dashboard.grid.column.create({
       title: 'Link2-1hm',
-      type: 'Links',
+      type: 'LinkToAnotherRecord',
       childTable: 'Sheet1',
       relationType: 'Has Many',
     });
@@ -67,7 +67,7 @@ test.describe('LTAR create & update', () => {
       type: 'belongsTo',
     });
     await dashboard.expandedForm.fillField({
-      columnTitle: 'Sheet1s',
+      columnTitle: 'Sheet1 List',
       value: '1a',
       type: 'manyToMany',
     });
@@ -84,7 +84,7 @@ test.describe('LTAR create & update', () => {
     await dashboard.linkRecord.select('1b');
     await dashboard.grid.cell.inCellAdd({
       index: 1,
-      columnHeader: 'Sheet1s',
+      columnHeader: 'Sheet1 List',
     });
     await dashboard.linkRecord.select('1b');
     await dashboard.grid.cell.inCellAdd({
@@ -102,7 +102,7 @@ test.describe('LTAR create & update', () => {
       type: 'belongsTo',
     });
     await dashboard.expandedForm.fillField({
-      columnTitle: 'Sheet1s',
+      columnTitle: 'Sheet1 List',
       value: '1c',
       type: 'manyToMany',
     });
@@ -123,10 +123,10 @@ test.describe('LTAR create & update', () => {
 
     const expected = [
       [['1a'], ['1b'], ['1c']],
-      [['1 Sheet1'], ['1 Sheet1'], ['1 Sheet1']],
-      [['1 Sheet1'], ['1 Sheet1'], ['1 Sheet1']],
+      [['1a'], ['1b'], ['1c']],
+      [['1a'], ['1b'], ['1c']],
     ];
-    const colHeaders = ['Sheet1', 'Sheet1s', 'Link2-1hm'];
+    const colHeaders = ['Sheet1', 'Sheet1 List', 'Link2-1hm'];
 
     // verify LTAR cell values
     for (let i = 0; i < expected.length; i++) {
@@ -136,8 +136,6 @@ test.describe('LTAR create & update', () => {
           columnHeader: colHeaders[i],
           count: 1,
           value: expected[i][j],
-          type: i === 0 ? 'bt' : undefined,
-          options: { singular: 'Sheet1', plural: 'Sheet1s' },
         });
       }
     }
@@ -146,8 +144,8 @@ test.describe('LTAR create & update', () => {
     await dashboard.treeView.openTable({ title: 'Sheet1' });
 
     const expected2 = [
-      [['1 Sheet2'], ['1 Sheet2'], ['1 Sheet2']],
-      [['1 Sheet2'], ['1 Sheet2'], ['1 Sheet2']],
+      [['2a'], ['2b'], ['2c']],
+      [['2a'], ['2b'], ['2c']],
       [['2a'], ['2b'], ['2c']],
     ];
     const colHeaders2 = ['Link1-2hm', 'Link1-2mm', 'Sheet2'];
@@ -160,13 +158,11 @@ test.describe('LTAR create & update', () => {
           columnHeader: colHeaders2[i],
           count: 1,
           value: expected2[i][j],
-          type: i === 2 ? 'bt' : undefined,
-          options: { singular: 'Sheet2', plural: 'Sheet2s' },
         });
       }
     }
 
-    // Unlink LTAR cells
+    // verify LTAR cell values
     for (let i = 0; i < expected2.length; i++) {
       for (let j = 0; j < expected2[i].length; j++) {
         await dashboard.grid.cell.unlinkVirtualCell({
@@ -192,7 +188,7 @@ test.describe('LTAR create & update', () => {
       Country: string;
       formula?: string;
       SLT?: string;
-      Cities: string[];
+      'City List': string[];
     };
   }) {
     await dashboard.grid.cell.verify({
@@ -209,9 +205,9 @@ test.describe('LTAR create & update', () => {
     }
     await dashboard.grid.cell.verifyVirtualCell({
       index: param.index,
-      columnHeader: 'Cities',
-      count: param.value['Cities'].length,
-      value: param.value['Cities'],
+      columnHeader: 'City List',
+      count: param.value['City List'].length,
+      value: param.value['City List'],
     });
     if (param.value.SLT) {
       await dashboard.grid.cell.verify({
@@ -241,14 +237,14 @@ test.describe('LTAR create & update', () => {
       index: 0,
       value: {
         Country: 'Afghanistan',
-        Cities: ['Kabul'],
+        'City List': ['Kabul'],
       },
     });
     await verifyRow({
       index: 1,
       value: {
         Country: 'Algeria',
-        Cities: ['Batna', 'Bchar', 'Skikda'],
+        'City List': ['Batna', 'Bchar', 'Skikda'],
       },
     });
 
@@ -274,7 +270,7 @@ test.describe('LTAR create & update', () => {
       index: 0,
       value: {
         Country: 'Afghanistan',
-        Cities: ['Kabul'],
+        'City List': ['Kabul'],
         SLT: 'test',
         formula: 'Afghanistan test',
       },
@@ -290,7 +286,7 @@ test.describe('LTAR create & update', () => {
       index: 0,
       value: {
         Country: 'Afghanistan2',
-        Cities: ['Kabul'],
+        'City List': ['Kabul'],
         SLT: 'test',
         formula: 'Afghanistan2 test',
       },
@@ -305,7 +301,7 @@ test.describe('LTAR create & update', () => {
       index: 0,
       value: {
         Country: 'Afghanistan2',
-        Cities: ['Kabul'],
+        'City List': ['Kabul'],
         SLT: '',
         formula: 'Afghanistan2',
       },
diff --git a/tests/playwright/tests/db/columns/columnLookupRollup.spec.ts b/tests/playwright/tests/db/columns/columnLookupRollup.spec.ts
index 4d21c69b1e..d78f10724a 100644
--- a/tests/playwright/tests/db/columns/columnLookupRollup.spec.ts
+++ b/tests/playwright/tests/db/columns/columnLookupRollup.spec.ts
@@ -15,7 +15,7 @@ test.describe('Virtual columns', () => {
     // close 'Team & Auth' tab
     // await dashboard.closeTab({ title: "Team & Auth" });
 
-    const countryList = ['Spain', 'Saudi Arabia', 'United Arab Emirates', 'Mexico', 'Turkey'];
+    const pinCode = ['4166', '77459', '41136', '8268', '33463'];
     const cityCount = ['1', '3', '1', '2', '1'];
 
     await dashboard.treeView.openTable({ title: 'City' });
@@ -23,14 +23,14 @@ test.describe('Virtual columns', () => {
     await dashboard.grid.column.create({
       title: 'Lookup',
       type: 'Lookup',
-      childTable: 'Country',
-      childColumn: 'Country',
+      childTable: 'Address List',
+      childColumn: 'PostalCode',
     });
-    for (let i = 0; i < countryList.length; i++) {
+    for (let i = 0; i < pinCode.length; i++) {
       await dashboard.grid.cell.verify({
         index: i,
         columnHeader: 'Lookup',
-        value: countryList[i],
+        value: pinCode[i],
       });
     }
     await dashboard.closeTab({ title: 'City' });
@@ -40,11 +40,11 @@ test.describe('Virtual columns', () => {
     await dashboard.grid.column.create({
       title: 'Rollup',
       type: 'Rollup',
-      childTable: 'Cities',
+      childTable: 'City List',
       childColumn: 'CityId',
       rollupType: 'count',
     });
-    for (let i = 0; i < countryList.length; i++) {
+    for (let i = 0; i < pinCode.length; i++) {
       await dashboard.grid.cell.verify({
         index: i,
         columnHeader: 'Rollup',
diff --git a/tests/playwright/tests/db/columns/columnLtarDragdrop.spec.ts b/tests/playwright/tests/db/columns/columnLtarDragdrop.spec.ts
index 376bd1d324..06cd602333 100644
--- a/tests/playwright/tests/db/columns/columnLtarDragdrop.spec.ts
+++ b/tests/playwright/tests/db/columns/columnLtarDragdrop.spec.ts
@@ -64,7 +64,7 @@ test.describe('Test table', () => {
     await page.reload();
   });
 
-  test('drag drop for Link, lookup creation', async () => {
+  test('drag drop for LTAR, lookup creation', async () => {
     await dashboard.treeView.openTable({ title: 'Table0' });
     const src = await dashboard.rootPage.locator(`[data-testid="tree-view-table-draggable-handle-Table1"]`);
     const dst = await dashboard.rootPage.locator(`[data-testid="grid-row-0"]`);
@@ -78,14 +78,14 @@ test.describe('Test table', () => {
       const linkTable = await getTextExcludeIconText(
         await columnAddModal.locator(`.ant-form-item-control-input`).nth(3)
       );
-      expect(columnType).toContain('Links');
+      expect(columnType).toContain('LinkToAnotherRecord');
       expect(linkTable).toContain('Table1');
 
       // save
       await columnAddModal.locator(`.ant-btn-primary`).click();
 
       // verify if column is created
-      await grid.column.verify({ title: 'Table1', isVisible: true });
+      await grid.column.verify({ title: 'Table1List', isVisible: true });
     }
 
     // drag drop for lookup column creation
@@ -103,7 +103,7 @@ test.describe('Test table', () => {
 
       // validate
       expect(columnType).toContain('Lookup');
-      expect(linkField).toContain('Table1');
+      expect(linkField).toContain('Table1List');
       expect(childColumn).toContain('Title');
 
       // save
diff --git a/tests/playwright/tests/db/columns/columnMenuOperations.spec.ts b/tests/playwright/tests/db/columns/columnMenuOperations.spec.ts
index 514b416ba8..09bf3df5c4 100644
--- a/tests/playwright/tests/db/columns/columnMenuOperations.spec.ts
+++ b/tests/playwright/tests/db/columns/columnMenuOperations.spec.ts
@@ -79,7 +79,7 @@ test.describe('Column menu operations', () => {
     await dashboard.grid.column.create({
       title: 'InsertAfterColumn1',
       type: 'SingleLineText',
-      insertAfterColumnTitle: 'Actors',
+      insertAfterColumnTitle: 'Actor List',
     });
 
     await dashboard.closeTab({ title: 'Film' });
@@ -98,7 +98,7 @@ test.describe('Column menu operations', () => {
     await dashboard.grid.column.create({
       title: 'InsertBeforeColumn1',
       type: 'SingleLineText',
-      insertBeforeColumnTitle: 'Actors',
+      insertBeforeColumnTitle: 'Actor List',
     });
 
     await dashboard.closeTab({ title: 'Film' });
@@ -113,7 +113,7 @@ test.describe('Column menu operations', () => {
     });
 
     await dashboard.grid.column.hideColumn({
-      title: 'Actors',
+      title: 'Actor List',
     });
 
     await dashboard.closeTab({ title: 'Film' });
diff --git a/tests/playwright/tests/db/columns/columnQrCode.spec.ts b/tests/playwright/tests/db/columns/columnQrCode.spec.ts
index 0861f19720..0b8ace1575 100644
--- a/tests/playwright/tests/db/columns/columnQrCode.spec.ts
+++ b/tests/playwright/tests/db/columns/columnQrCode.spec.ts
@@ -34,7 +34,7 @@ test.describe('Virtual Columns', () => {
       // and compare the base64 encoded codes/src attributes for the first 3 rows.
       // Column data from City table (Sakila DB)
       /**
-       * City                   LastUpdate              Addresses                Country
+       * City                   LastUpdate              Address List                Country
        * A Corua (La Corua)     2006-02-15 04:45:25     939 Probolinggo Loop        Spain
        * Abha                   2006-02-15 04:45:25     733 Mandaluyong Place       Saudi Arabia
        * Abu Dhabi              2006-02-15 04:45:25     535 Ahmadnagar Manor        United Arab Emirates
diff --git a/tests/playwright/tests/db/columns/columnRelationalExtendedTests.spec.ts b/tests/playwright/tests/db/columns/columnRelationalExtendedTests.spec.ts
index 285567300d..60e71ef8de 100644
--- a/tests/playwright/tests/db/columns/columnRelationalExtendedTests.spec.ts
+++ b/tests/playwright/tests/db/columns/columnRelationalExtendedTests.spec.ts
@@ -23,17 +23,16 @@ test.describe('Relational Columns', () => {
     for (let i = 0; i < cityList.length; i++) {
       await dashboard.grid.cell.verifyVirtualCell({
         index: i,
-        columnHeader: 'Cities',
+        columnHeader: 'City List',
         count: cityList[i].length,
-        type: 'hm',
-        options: { singular: 'City', plural: 'Cities' },
+        value: cityList[i],
       });
     }
 
     // click on expand icon, open child list
     await dashboard.grid.cell.inCellExpand({
       index: 0,
-      columnHeader: 'Cities',
+      columnHeader: 'City List',
     });
     await dashboard.childList.verify({
       cardTitle: ['Kabul'],
@@ -66,7 +65,6 @@ test.describe('Relational Columns', () => {
       await dashboard.grid.cell.verifyVirtualCell({
         index: i,
         columnHeader: 'Country',
-        type: 'bt',
         count: countryList[i].length,
         value: countryList[i],
       });
@@ -92,17 +90,16 @@ test.describe('Relational Columns', () => {
     for (let i = 0; i < filmList.length; i++) {
       await dashboard.grid.cell.verifyVirtualCell({
         index: i,
-        columnHeader: 'Films',
+        columnHeader: 'Film List',
         // Count hardwired to avoid verifying all 19 entries
         count: 19,
-        type: 'mm',
-        options: { singular: 'Film', plural: 'Films' },
+        value: filmList[i],
       });
     }
     // click on expand icon, open child list
     await dashboard.grid.cell.inCellExpand({
       index: 0,
-      columnHeader: 'Films',
+      columnHeader: 'Film List',
     });
     await dashboard.childList.verify({
       cardTitle: filmList[0],
diff --git a/tests/playwright/tests/db/features/erd.spec.ts b/tests/playwright/tests/db/features/erd.spec.ts
index 7b956998fd..f0dbef7044 100644
--- a/tests/playwright/tests/db/features/erd.spec.ts
+++ b/tests/playwright/tests/db/features/erd.spec.ts
@@ -188,33 +188,33 @@ test.describe('Erd', () => {
     // Verify tables with default config
     await erd.verifyColumns({
       tableName: `country`,
-      columns: ['country_id', 'country', 'last_update', 'cities'],
+      columns: ['country_id', 'country', 'last_update', 'city_list'],
     });
 
     await erd.verifyColumns({
       tableName: `city`,
-      columns: ['city_id', 'city', 'country_id', 'last_update', 'country', 'addresses'],
+      columns: ['city_id', 'city', 'country_id', 'last_update', 'country', 'address_list'],
     });
 
     // Verify with PK/FK disabled
     await erd.clickShowPkAndFk();
     await erd.verifyColumns({
       tableName: `country`,
-      columns: ['country', 'last_update', 'cities'],
+      columns: ['country', 'last_update', 'city_list'],
     });
 
     await erd.verifyColumns({
       tableName: `city`,
-      columns: ['city', 'last_update', 'country', 'addresses'],
+      columns: ['city', 'last_update', 'country', 'address_list'],
     });
 
     // Verify with all columns disabled
     await erd.clickShowColumnNames();
-    await erd.verifyColumns({ tableName: `country`, columns: ['cities'] });
+    await erd.verifyColumns({ tableName: `country`, columns: ['city_list'] });
 
     await erd.verifyColumns({
       tableName: `city`,
-      columns: ['country', 'addresses'],
+      columns: ['country', 'address_list'],
     });
 
     // Enable All columns
@@ -311,7 +311,7 @@ test.describe('Erd', () => {
   });
 });
 
-const actorTableColumn = ['actor_id', 'first_name', 'last_name', 'last_update', 'films'];
+const actorTableColumn = ['actor_id', 'first_name', 'last_name', 'last_update', 'film_list'];
 
 const mysqlPaymentTableColumns = [
   'payment_id',
@@ -338,9 +338,9 @@ const pgPaymentTableColumns = [
   'staff',
 ];
 
-const actorLTARColumns = ['filmactors', 'films'];
+const actorLTARColumns = ['filmactor_list', 'film_list'];
 
-const actorNonPkFkColumns = ['first_name', 'last_name', 'last_update', 'films', 'filmactors'];
+const actorNonPkFkColumns = ['first_name', 'last_name', 'last_update', 'film_list', 'filmactor_list'];
 
 const paymentLTARColumns = ['customer', 'rental', 'staff'];
 
diff --git a/tests/playwright/tests/db/features/expandedFormUrl.spec.ts b/tests/playwright/tests/db/features/expandedFormUrl.spec.ts
index 741e9f6db6..7f78db0498 100644
--- a/tests/playwright/tests/db/features/expandedFormUrl.spec.ts
+++ b/tests/playwright/tests/db/features/expandedFormUrl.spec.ts
@@ -66,7 +66,7 @@ test.describe('Expanded form URL', () => {
         title: 'CountryExpand',
       });
       await viewObj.toolbar.clickFields();
-      await viewObj.toolbar.fields.click({ title: 'Cities' });
+      await viewObj.toolbar.fields.click({ title: 'City List' });
     }
 
     // expand row & verify URL
@@ -104,7 +104,7 @@ test.describe('Expanded form URL', () => {
       url: 'rowId=1',
     });
     await dashboard.expandedForm.openChildCard({
-      column: 'Cities',
+      column: 'City List',
       title: 'Kabul',
     });
     await dashboard.rootPage.waitForTimeout(1000);
diff --git a/tests/playwright/tests/db/features/filters.spec.ts b/tests/playwright/tests/db/features/filters.spec.ts
index 816ba1dbc1..ec706fcd51 100644
--- a/tests/playwright/tests/db/features/filters.spec.ts
+++ b/tests/playwright/tests/db/features/filters.spec.ts
@@ -937,23 +937,23 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
 
     // add filter for CityList column
     const filterList = [
-      { op: '=', value: '5', rowCount: 5 },
-      { op: '!=', value: '5', rowCount: 104 },
-      { op: '>', value: '5', rowCount: 25 },
-      { op: '<', value: '5', rowCount: 79 },
-      { op: '>=', value: '5', rowCount: 30 },
-      { op: '<=', value: '5', rowCount: 84 },
+      { op: 'is', value: 'Kabul', rowCount: 1 },
+      { op: 'is not', value: 'Kabul', rowCount: 108 },
+      { op: 'is like', value: 'bad', rowCount: 2 },
+      { op: 'is not like', value: 'bad', rowCount: 107 },
+      { op: 'is blank', value: null, rowCount: 0 },
+      { op: 'is not blank', value: null, rowCount: 109 },
     ];
 
     await toolbar.clickFilter();
     await toolbar.filter.clickAddFilter();
     for (let i = 0; i < filterList.length; i++) {
       await verifyFilter({
-        column: 'Cities',
+        column: 'City List',
         opType: filterList[i].op,
         value: filterList[i].value,
         result: { rowCount: filterList[i].rowCount },
-        dataType: 'Links',
+        dataType: 'LinkToAnotherRecord',
       });
     }
   }
@@ -965,8 +965,8 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
     await dashboard.grid.column.create({
       title: 'Lookup',
       type: 'Lookup',
-      childTable: 'Country',
-      childColumn: 'Country',
+      childTable: 'Address List',
+      childColumn: 'PostalCode',
     });
 
     // Enable NULL & EMPTY filters
@@ -975,12 +975,12 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
 
     // add filter for CityList column
     const filterList = [
-      { op: 'is equal', value: 'Spain', rowCount: 5 },
-      { op: 'is not equal', value: 'Spain', rowCount: 595 },
-      { op: 'is like', value: 'ca', rowCount: 28 },
-      { op: 'is not like', value: 'ca', rowCount: 572 },
-      { op: 'is blank', value: null, rowCount: 0 },
-      { op: 'is not blank', value: null, rowCount: 600 },
+      { op: 'is equal', value: '4166', rowCount: 1 },
+      { op: 'is not equal', value: '4166', rowCount: 599 },
+      { op: 'is like', value: '41', rowCount: 19 },
+      { op: 'is not like', value: '41', rowCount: 581 },
+      { op: 'is blank', value: null, rowCount: 1 },
+      { op: 'is not blank', value: null, rowCount: 599 },
     ];
 
     await toolbar.clickFilter();
@@ -1003,7 +1003,7 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
     await dashboard.grid.column.create({
       title: 'Rollup',
       type: 'Rollup',
-      childTable: 'Addresses',
+      childTable: 'Address List',
       childColumn: 'PostalCode',
       rollupType: 'Sum',
     });
@@ -1018,8 +1018,6 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
       { op: 'is not equal', value: '4166', rowCount: 599 },
       { op: 'is like', value: '41', rowCount: 19 },
       { op: 'is not like', value: '41', rowCount: 581 },
-      { op: 'is empty', value: '41', rowCount: 581 },
-      { op: 'is not empty', value: '41', rowCount: 581 },
       { op: 'is blank', value: null, rowCount: 2 },
       { op: 'is not blank', value: null, rowCount: 598 },
     ];
@@ -1028,11 +1026,11 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
     await toolbar.filter.clickAddFilter();
     for (let i = 0; i < filterList.length; i++) {
       await verifyFilter({
-        column: 'Rollup',
+        column: 'Lookup',
         opType: filterList[i].op,
         value: filterList[i].value,
         result: { rowCount: filterList[i].rowCount },
-        dataType: 'Rollup',
+        dataType: 'Lookup',
       });
     }
   }
diff --git a/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts b/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts
index 86d92c50f4..06ca67800a 100644
--- a/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts
+++ b/tests/playwright/tests/db/features/keyboardShortcuts.spec.ts
@@ -71,7 +71,7 @@ test.describe('Verify shortcuts', () => {
     await grid.cell.click({ index: 0, columnHeader: 'Country' });
     await page.waitForTimeout(1500);
     await page.keyboard.press((await grid.isMacOs()) ? 'Meta+ArrowRight' : 'Control+ArrowRight');
-    await grid.cell.verifyCellActiveSelected({ index: 0, columnHeader: 'Cities' });
+    await grid.cell.verifyCellActiveSelected({ index: 0, columnHeader: 'City List' });
 
     // Cmd + Right arrow
     await page.keyboard.press((await grid.isMacOs()) ? 'Meta+ArrowLeft' : 'Control+ArrowLeft');
diff --git a/tests/playwright/tests/db/features/metaLTAR.spec.ts b/tests/playwright/tests/db/features/metaLTAR.spec.ts
index fd0b98b3b2..590e4e35d2 100644
--- a/tests/playwright/tests/db/features/metaLTAR.spec.ts
+++ b/tests/playwright/tests/db/features/metaLTAR.spec.ts
@@ -103,7 +103,7 @@ test.describe.serial('Test table', () => {
     // Create links
     // TableA <hm> TableB <hm> TableC
     await api.dbTableColumn.create(tables[0].id, {
-      uidt: UITypes.Links,
+      uidt: UITypes.LinkToAnotherRecord,
       title: `TableA:hm:TableB`,
       column_name: `TableA:hm:TableB`,
       parentId: tables[0].id,
@@ -111,7 +111,7 @@ test.describe.serial('Test table', () => {
       type: 'hm',
     });
     await api.dbTableColumn.create(tables[1].id, {
-      uidt: UITypes.Links,
+      uidt: UITypes.LinkToAnotherRecord,
       title: `TableB:hm:TableC`,
       column_name: `TableB:hm:TableC`,
       parentId: tables[1].id,
@@ -121,7 +121,7 @@ test.describe.serial('Test table', () => {
 
     // TableA <mm> TableD <mm> TableE
     await api.dbTableColumn.create(tables[0].id, {
-      uidt: UITypes.Links,
+      uidt: UITypes.LinkToAnotherRecord,
       title: `TableA:mm:TableD`,
       column_name: `TableA:mm:TableD`,
       parentId: tables[0].id,
@@ -129,7 +129,7 @@ test.describe.serial('Test table', () => {
       type: 'mm',
     });
     await api.dbTableColumn.create(tables[3].id, {
-      uidt: UITypes.Links,
+      uidt: UITypes.LinkToAnotherRecord,
       title: `TableD:mm:TableE`,
       column_name: `TableD:mm:TableE`,
       parentId: tables[3].id,
@@ -139,7 +139,7 @@ test.describe.serial('Test table', () => {
 
     // TableA <hm> TableA : self relation
     await api.dbTableColumn.create(tables[0].id, {
-      uidt: UITypes.Links,
+      uidt: UITypes.LinkToAnotherRecord,
       title: `TableA:hm:TableA`,
       column_name: `TableA:hm:TableA`,
       parentId: tables[0].id,
@@ -149,7 +149,7 @@ test.describe.serial('Test table', () => {
 
     // TableA <mm> TableA : self relation
     await api.dbTableColumn.create(tables[0].id, {
-      uidt: UITypes.Links,
+      uidt: UITypes.LinkToAnotherRecord,
       title: `TableA:mm:TableA`,
       column_name: `TableA:mm:TableA`,
       parentId: tables[0].id,
@@ -227,25 +227,27 @@ test.describe.serial('Test table', () => {
 
     // has-many removal verification
     await dashboard.treeView.openTable({ title: 'Table1' });
-    await dashboard.grid.cell.verifyVirtualCell({ index: 0, columnHeader: 'Table0', count: 0, value: [], type: 'bt' });
-    await dashboard.grid.cell.verifyVirtualCell({ index: 1, columnHeader: 'Table0', count: 0, value: [], type: 'bt' });
-    await dashboard.grid.cell.verifyVirtualCell({ index: 2, columnHeader: 'Table0', count: 0, value: [], type: 'bt' });
+    await dashboard.grid.cell.verifyVirtualCell({ index: 0, columnHeader: 'Table0', count: 0, value: [] });
+    await dashboard.grid.cell.verifyVirtualCell({ index: 1, columnHeader: 'Table0', count: 0, value: [] });
+    await dashboard.grid.cell.verifyVirtualCell({ index: 2, columnHeader: 'Table0', count: 0, value: [] });
 
     // many-many removal verification
     await dashboard.treeView.openTable({ title: 'Table3' });
-    const params = {
-      index: 0,
-      columnHeader: 'Table0s',
-      count: 0,
-      value: [],
-      type: 'hm',
-      options: { singular: 'Table0', plural: 'Table0s' },
-    };
-    await dashboard.grid.cell.verifyVirtualCell({ ...params });
-    await dashboard.grid.cell.verifyVirtualCell({ ...params, count: 1, index: 1, value: ['2'] });
-    await dashboard.grid.cell.verifyVirtualCell({ ...params, count: 2, index: 2, value: ['2', '3'] });
-    await dashboard.grid.cell.verifyVirtualCell({ ...params, count: 3, index: 3, value: ['2', '3', '4'] });
-    await dashboard.grid.cell.verifyVirtualCell({ ...params, count: 4, index: 4, value: ['2', '3', '4', '5'] });
+    await dashboard.grid.cell.verifyVirtualCell({ index: 0, columnHeader: 'Table0 List', count: 0, value: [] });
+    await dashboard.grid.cell.verifyVirtualCell({ index: 1, columnHeader: 'Table0 List', count: 1, value: ['2'] });
+    await dashboard.grid.cell.verifyVirtualCell({ index: 2, columnHeader: 'Table0 List', count: 2, value: ['2', '3'] });
+    await dashboard.grid.cell.verifyVirtualCell({
+      index: 3,
+      columnHeader: 'Table0 List',
+      count: 3,
+      value: ['2', '3', '4'],
+    });
+    await dashboard.grid.cell.verifyVirtualCell({
+      index: 4,
+      columnHeader: 'Table0 List',
+      count: 4,
+      value: ['2', '3', '4', '5'],
+    });
   });
 
   test('Delete record - bulk, over UI', async () => {
@@ -283,7 +285,7 @@ test.describe.serial('Test table', () => {
 
     // verify
     await dashboard.treeView.openTable({ title: 'Table3' });
-    await dashboard.grid.column.verify({ title: 'Table0s', isVisible: false });
+    await dashboard.grid.column.verify({ title: 'Table0 List', isVisible: false });
     await dashboard.grid.column.verify({ title: 'TableD:mm:TableE', isVisible: true });
 
     ///////////////////////////////////////////////////////////////////////////////////////////////
@@ -303,7 +305,7 @@ test.describe.serial('Test table', () => {
     await dashboard.grid.column.delete({ title: 'TableA:mm:TableA' });
 
     // verify
-    await dashboard.grid.column.verify({ title: 'Table0s', isVisible: false });
+    await dashboard.grid.column.verify({ title: 'Table0 List', isVisible: false });
     await dashboard.grid.column.verify({ title: 'TableA:mm:TableA', isVisible: false });
   });
 
@@ -316,6 +318,6 @@ test.describe.serial('Test table', () => {
     await dashboard.grid.column.verify({ title: 'Table0', isVisible: false });
 
     await dashboard.treeView.openTable({ title: 'Table3' });
-    await dashboard.grid.column.verify({ title: 'Table0s', isVisible: false });
+    await dashboard.grid.column.verify({ title: 'Table0 List', isVisible: false });
   });
 });
diff --git a/tests/playwright/tests/db/features/mobileMode.spec.ts b/tests/playwright/tests/db/features/mobileMode.spec.ts
index 0c5449098b..d5a2806b44 100644
--- a/tests/playwright/tests/db/features/mobileMode.spec.ts
+++ b/tests/playwright/tests/db/features/mobileMode.spec.ts
@@ -45,7 +45,7 @@ test.describe('Mobile Mode', () => {
 
     // verify form-view fields order
     await form.verifyFormViewFieldsOrder({
-      fields: ['Country', 'LastUpdate', 'Cities'],
+      fields: ['Country', 'LastUpdate', 'City List'],
     });
 
     // reorder & verify
@@ -54,7 +54,7 @@ test.describe('Mobile Mode', () => {
       destinationField: 'Country',
     });
     await form.verifyFormViewFieldsOrder({
-      fields: ['LastUpdate', 'Country', 'Cities'],
+      fields: ['LastUpdate', 'Country', 'City List'],
     });
 
     await dashboard.treeView.openTable({ mobileMode: true, title: 'test-table-for-mobile-mode' });
diff --git a/tests/playwright/tests/db/features/undo-redo.spec.ts b/tests/playwright/tests/db/features/undo-redo.spec.ts
index ef1cb4a617..4d50603749 100644
--- a/tests/playwright/tests/db/features/undo-redo.spec.ts
+++ b/tests/playwright/tests/db/features/undo-redo.spec.ts
@@ -527,7 +527,7 @@ test.describe('Undo Redo - LTAR', () => {
       await api.dbTableColumn.create(countryTable.id, {
         column_name: 'CityList',
         title: 'CityList',
-        uidt: UITypes.Links,
+        uidt: UITypes.LinkToAnotherRecord,
         parentId: countryTable.id,
         childId: cityTable.id,
         type: 'hm',
@@ -546,38 +546,18 @@ test.describe('Undo Redo - LTAR', () => {
     // inserted values
     const expectedValues = [...values];
 
-    try {
-      const currentRecords: Record<string, any> = await api.dbTableRow.list(
-        'noco',
-        context.project.id,
-        countryTable.id,
-        {
-          fields: ['CityList'],
-          limit: 100,
-        }
-      );
-      expect(currentRecords.list.length).toBe(4);
-      expect(+currentRecords.list[0].CityList).toBe(expectedValues.length);
-    } catch (e) {
-      console.log(e);
-    }
-
-    if (expectedValues.length > 0) {
-      // read nested records associated with first record
-      const nestedRecords: Record<string, any> = await api.dbTableRow.nestedList(
-        'noco',
-        context.project.id,
-        countryTable.id,
-        1,
-        'hm',
-        'CityList'
-      );
-      const cities = nestedRecords.list.map((record: any) => record.City);
+    const currentRecords: Record<string, any> = await api.dbTableRow.list('noco', context.project.id, countryTable.id, {
+      fields: ['CityList'],
+      limit: 100,
+    });
 
-      for (let i = 0; i < expectedValues.length; i++) {
-        expect(cities.includes(expectedValues[i])).toBeTruthy();
-      }
-    }
+    // verify if expectedValues array includes all the values in currentRecords
+    // currentRecords [ { Id: 1, City: 'Mumbai' }, { Id: 3, City: 'Delhi' } ]
+    // expectedValues [ 'Mumbai', 'Delhi' ]
+    currentRecords.list[0].CityList.forEach((record: any) => {
+      expect(expectedValues).toContain(record.City);
+    });
+    expect(currentRecords.list[0].CityList.length).toBe(expectedValues.length);
   }
 
   async function undo({ page, values }: { page: Page; values: string[] }) {
diff --git a/tests/playwright/tests/db/features/webhook.spec.ts b/tests/playwright/tests/db/features/webhook.spec.ts
index e672f27eda..5952b1e31e 100644
--- a/tests/playwright/tests/db/features/webhook.spec.ts
+++ b/tests/playwright/tests/db/features/webhook.spec.ts
@@ -611,8 +611,9 @@ test.describe.serial('Webhook', () => {
 
       // create LTAR Country has-many City
       countryTable = await api.dbTableColumn.create(countryTable.id, {
+        column_name: 'CityList',
         title: 'CityList',
-        uidt: UITypes.Links,
+        uidt: UITypes.LinkToAnotherRecord,
         parentId: countryTable.id,
         childId: cityTable.id,
         type: 'hm',
@@ -683,7 +684,16 @@ test.describe.serial('Webhook', () => {
             CountryCode: '1',
             CityCodeRollup: '2',
             CityCodeFormula: 100,
-            CityList: '2',
+            CityList: [
+              {
+                Id: 1,
+                City: 'Mumbai',
+              },
+              {
+                Id: 2,
+                City: 'Pune',
+              },
+            ],
             CityCodeLookup: ['23', '33'],
           },
         ],
@@ -694,7 +704,16 @@ test.describe.serial('Webhook', () => {
             CountryCode: '1',
             CityCodeRollup: '2',
             CityCodeFormula: 100,
-            CityList: '2',
+            CityList: [
+              {
+                Id: 1,
+                City: 'Mumbai',
+              },
+              {
+                Id: 2,
+                City: 'Pune',
+              },
+            ],
             CityCodeLookup: ['23', '33'],
           },
         ],
@@ -714,10 +733,6 @@ test.describe.serial('Webhook', () => {
       expectedData.data.previous_rows[0].CityCodeLookup = [23, 33];
       // @ts-ignore
       expectedData.data.rows[0].CityCodeLookup = [23, 33];
-      // @ts-ignore
-      expectedData.data.previous_rows[0].CityList = 2;
-      // @ts-ignore
-      expectedData.data.rows[0].CityList = 2;
 
       if (isMysql(context)) {
         // @ts-ignore
diff --git a/tests/playwright/tests/db/general/cellSelection.spec.ts b/tests/playwright/tests/db/general/cellSelection.spec.ts
index d079a8a597..42a59589a7 100644
--- a/tests/playwright/tests/db/general/cellSelection.spec.ts
+++ b/tests/playwright/tests/db/general/cellSelection.spec.ts
@@ -50,7 +50,7 @@ test.describe('Verify cell selection', () => {
     await dashboard.treeView.openTable({ title: 'Country' });
     await grid.selectRange({
       start: { index: 0, columnHeader: 'Country' },
-      end: { index: 2, columnHeader: 'Cities' },
+      end: { index: 2, columnHeader: 'City List' },
     });
     expect(await grid.selectedCount()).toBe(9);
     await grid.cell.get({ index: 0, columnHeader: 'Country' }).click();
@@ -62,7 +62,7 @@ test.describe('Verify cell selection', () => {
     await dashboard.treeView.openTable({ title: 'Country' });
     await grid.selectRange({
       start: { index: 0, columnHeader: 'Country' },
-      end: { index: 2, columnHeader: 'Cities' },
+      end: { index: 2, columnHeader: 'City List' },
     });
     expect(await grid.selectedCount()).toBe(9);
     await grid.cell.get({ index: 5, columnHeader: 'Country' }).click();
@@ -74,7 +74,7 @@ test.describe('Verify cell selection', () => {
     await dashboard.treeView.openTable({ title: 'Country' });
     await dashboard.grid.toolbar.fields.toggleShowSystemFields();
     await grid.selectRange({
-      start: { index: 2, columnHeader: 'Cities' },
+      start: { index: 2, columnHeader: 'City List' },
       end: { index: 0, columnHeader: 'Country' },
     });
     expect(await grid.selectedCount()).toBe(12);
@@ -88,7 +88,7 @@ test.describe('Verify cell selection', () => {
     await dashboard.treeView.openTable({ title: 'Country' });
     await grid.selectRange({
       start: { index: 0, columnHeader: 'Country' },
-      end: { index: 2, columnHeader: 'Cities' },
+      end: { index: 2, columnHeader: 'City List' },
     });
     await page.keyboard.press('ArrowRight');
     expect(await grid.selectedCount()).toBe(1);
diff --git a/tests/playwright/tests/db/general/megaTable.spec.ts b/tests/playwright/tests/db/general/megaTable.spec.ts
index 4ed4480338..8b92b2533f 100644
--- a/tests/playwright/tests/db/general/megaTable.spec.ts
+++ b/tests/playwright/tests/db/general/megaTable.spec.ts
@@ -202,9 +202,9 @@ test.describe.serial('Test table', () => {
     await api.dbTableRow.bulkCreate('noco', context.project.id, table_2.id, rows);
 
     await api.dbTableColumn.create(table_2.id, {
-      uidt: UITypes.Links,
-      title: 'Links',
-      column_name: 'Links',
+      uidt: UITypes.LinkToAnotherRecord,
+      title: 'LinkToAnotherRecord',
+      column_name: 'LinkToAnotherRecord',
       parentId: table_1.id,
       childId: table_2.id,
       type: 'hm',
diff --git a/tests/playwright/tests/db/views/viewForm.spec.ts b/tests/playwright/tests/db/views/viewForm.spec.ts
index c08afee839..5547997db4 100644
--- a/tests/playwright/tests/db/views/viewForm.spec.ts
+++ b/tests/playwright/tests/db/views/viewForm.spec.ts
@@ -34,7 +34,7 @@ test.describe('Form view', () => {
 
     // verify form-view fields order
     await form.verifyFormViewFieldsOrder({
-      fields: ['Country', 'LastUpdate', 'Cities'],
+      fields: ['Country', 'LastUpdate', 'City List'],
     });
 
     // reorder & verify
@@ -43,31 +43,31 @@ test.describe('Form view', () => {
       destinationField: 'Country',
     });
     await form.verifyFormViewFieldsOrder({
-      fields: ['LastUpdate', 'Country', 'Cities'],
+      fields: ['LastUpdate', 'Country', 'City List'],
     });
 
     // remove & verify (drag-drop)
-    await form.removeField({ field: 'Cities', mode: 'dragDrop' });
+    await form.removeField({ field: 'City List', mode: 'dragDrop' });
     await form.verifyFormViewFieldsOrder({
       fields: ['LastUpdate', 'Country'],
     });
 
     // add & verify (drag-drop)
-    await form.addField({ field: 'Cities', mode: 'dragDrop' });
+    await form.addField({ field: 'City List', mode: 'dragDrop' });
     await form.verifyFormViewFieldsOrder({
-      fields: ['LastUpdate', 'Country', 'Cities'],
+      fields: ['LastUpdate', 'Country', 'City List'],
     });
 
     // remove & verify (hide field button)
-    await form.removeField({ field: 'Cities', mode: 'hideField' });
+    await form.removeField({ field: 'City List', mode: 'hideField' });
     await form.verifyFormViewFieldsOrder({
       fields: ['LastUpdate', 'Country'],
     });
 
     // add & verify (hide field button)
-    await form.addField({ field: 'Cities', mode: 'clickField' });
+    await form.addField({ field: 'City List', mode: 'clickField' });
     await form.verifyFormViewFieldsOrder({
-      fields: ['LastUpdate', 'Country', 'Cities'],
+      fields: ['LastUpdate', 'Country', 'City List'],
     });
 
     // remove-all & verify
@@ -81,7 +81,7 @@ test.describe('Form view', () => {
     await form.addAllFields();
     await dashboard.rootPage.waitForTimeout(2000);
     await form.verifyFormViewFieldsOrder({
-      fields: ['LastUpdate', 'Country', 'Cities'],
+      fields: ['LastUpdate', 'Country', 'City List'],
     });
   });
 
@@ -310,7 +310,7 @@ test.describe('Form view with LTAR', () => {
       await api.dbTableColumn.create(countryTable.id, {
         column_name: 'CityList',
         title: 'CityList',
-        uidt: UITypes.Links,
+        uidt: UITypes.LinkToAnotherRecord,
         parentId: countryTable.id,
         childId: cityTable.id,
         type: 'hm',
@@ -360,8 +360,7 @@ test.describe('Form view with LTAR', () => {
       index: 3,
       columnHeader: 'CityList',
       count: 1,
-      type: 'hm',
-      options: { singular: 'City', plural: 'Cities' },
+      value: ['Atlanta'],
     });
   });
 });
diff --git a/tests/playwright/tests/db/views/viewFormShareSurvey.spec.ts b/tests/playwright/tests/db/views/viewFormShareSurvey.spec.ts
index 084e7ba927..c77528459c 100644
--- a/tests/playwright/tests/db/views/viewFormShareSurvey.spec.ts
+++ b/tests/playwright/tests/db/views/viewFormShareSurvey.spec.ts
@@ -65,7 +65,7 @@ test.describe('Share form', () => {
     await surveyForm.validate({
       heading: 'Country Title',
       subHeading: 'Country Form Subtitle',
-      fieldLabel: 'Cities',
+      fieldLabel: 'City List',
       footer: '3 / 3',
     });
     await surveyForm.submitButton.click();
diff --git a/tests/playwright/tests/db/views/viewGridShare.spec.ts b/tests/playwright/tests/db/views/viewGridShare.spec.ts
index 444fe853d6..f904db429f 100644
--- a/tests/playwright/tests/db/views/viewGridShare.spec.ts
+++ b/tests/playwright/tests/db/views/viewGridShare.spec.ts
@@ -32,7 +32,7 @@ test.describe('Shared view', () => {
 
     // hide column
     await dashboard.grid.toolbar.fields.toggle({ title: 'Address2' });
-    await dashboard.grid.toolbar.fields.toggle({ title: 'Stores' });
+    await dashboard.grid.toolbar.fields.toggle({ title: 'Store List' });
 
     // sort
     await dashboard.grid.toolbar.sort.add({
@@ -73,9 +73,9 @@ test.describe('Shared view', () => {
       { title: 'PostalCode', isVisible: true },
       { title: 'Phone', isVisible: true },
       { title: 'LastUpdate', isVisible: true },
-      { title: 'Customers', isVisible: true },
-      { title: 'Staffs', isVisible: true },
-      { title: 'Stores', isVisible: false },
+      { title: 'Customer List', isVisible: true },
+      { title: 'Staff List', isVisible: true },
+      { title: 'Store List', isVisible: false },
       { title: 'City', isVisible: true },
     ];
     for (const column of expectedColumns) {
@@ -94,11 +94,7 @@ test.describe('Shared view', () => {
 
     // verify virtual records
     for (const record of expectedVirtualRecordsByDb) {
-      await sharedPage.grid.cell.verifyVirtualCell({
-        ...record,
-        options: { singular: 'Customer', plural: 'Customers' },
-        verifyChildList: true,
-      });
+      await sharedPage.grid.cell.verifyVirtualCell({ ...record, verifyChildList: true });
     }
 
     /**
@@ -281,15 +277,15 @@ const sqliteExpectedRecords2 = [
 ];
 
 const expectedVirtualRecords = [
-  { index: 0, columnHeader: 'Customers', count: 1, type: 'hm' },
-  { index: 1, columnHeader: 'Customers', count: 1, type: 'hm' },
-  { index: 0, columnHeader: 'City', count: 1, type: 'bt', value: ['Kanchrapara'] },
-  { index: 1, columnHeader: 'City', count: 1, type: 'bt', value: ['Tafuna'] },
+  { index: 0, columnHeader: 'Customer List', count: 1, value: ['2'] },
+  { index: 1, columnHeader: 'Customer List', count: 1, value: ['2'] },
+  { index: 0, columnHeader: 'City', count: 1, value: ['Kanchrapara'] },
+  { index: 1, columnHeader: 'City', count: 1, value: ['Tafuna'] },
 ];
 
 const sqliteExpectedVirtualRecords = [
-  { index: 0, columnHeader: 'Customers', count: 1, type: 'hm' },
-  { index: 1, columnHeader: 'Customers', count: 1, type: 'hm' },
-  { index: 0, columnHeader: 'City', count: 1, type: 'bt', value: ['Davao'] },
-  { index: 1, columnHeader: 'City', count: 1, type: 'bt', value: ['Nagareyama'] },
+  { index: 0, columnHeader: 'Customer List', count: 1, value: ['2'] },
+  { index: 1, columnHeader: 'Customer List', count: 1, value: ['1'] },
+  { index: 0, columnHeader: 'City', count: 1, value: ['Davao'] },
+  { index: 1, columnHeader: 'City', count: 1, value: ['Nagareyama'] },
 ];

From c2bb751de7d709eba15c643074ea19cfb66ffcf5 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 5 Jul 2023 16:59:54 +0530
Subject: [PATCH 200/208] fix: use `useCopy` composable

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

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
index 2a60c28eeb..2a1c1cb390 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
@@ -5,6 +5,7 @@ import {
   ReloadRowDataHookInj,
   iconMap,
   isMac,
+  useCopy,
   useExpandedFormStoreOrThrow,
   useSmartsheetRowStoreOrThrow,
   useSmartsheetStoreOrThrow,
@@ -46,7 +47,7 @@ const iconColor = '#1890ff'
 
 const { dashboardUrl } = useDashboard()
 
-const { copy } = useClipboard()
+const { copy } = useCopy()
 
 const copyRecordUrl = () => {
   copy(

From 74a6cbb1631b8c1a46312133ab1078e20b500071 Mon Sep 17 00:00:00 2001
From: VictorMinemu <victor@minemu.es>
Date: Thu, 6 Jul 2023 14:03:53 +0200
Subject: [PATCH 201/208] Fixed bug when trying to open a row with a binary
 encoded uuid as PK

---
 packages/nocodb/src/db/BaseModelSqlv2.ts | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index efbdc09f4b..8e71364f97 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -3966,7 +3966,21 @@ function _wherePk(primaryKeys: Column[], id) {
   const ids = (id + '').split('___');
   const where = {};
   for (let i = 0; i < primaryKeys.length; ++i) {
-    where[primaryKeys[i].column_name] = ids[i];
+    //Check if the id is a UUID and the column is binary(16)
+    const idAsUUID =
+      primaryKeys[i].ct === 'binary(16)' &&
+      ((ids[i] + '').length === 36 || (ids[i] + '').length === 32)
+        ? (ids[i] + '').length === 32
+          ? (ids[i] + '').replace(
+              /(.{8})(.{4})(.{4})(.{4})(.{12})/,
+              '$1-$2-$3-$4-$5',
+            )
+          : ids[i] + ''
+        : null;
+
+    where[primaryKeys[i].column_name] = idAsUUID
+      ? Buffer.from(idAsUUID.replace(/-/g, ''), 'hex')
+      : ids[i];
   }
   return where;
 }

From cb328f7b52975ca65eb49788bb7ac589642b079d Mon Sep 17 00:00:00 2001
From: VictorMinemu <victor@minemu.es>
Date: Thu, 6 Jul 2023 19:34:21 +0200
Subject: [PATCH 202/208] Fix: Solved equal date filter with timestamp columns.

---
 packages/nocodb/src/db/conditionV2.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/nocodb/src/db/conditionV2.ts b/packages/nocodb/src/db/conditionV2.ts
index 4234c91a08..ec0ce16d81 100644
--- a/packages/nocodb/src/db/conditionV2.ts
+++ b/packages/nocodb/src/db/conditionV2.ts
@@ -419,6 +419,8 @@ const parseConditionV2 = async (
                 ].includes(column.uidt)
               ) {
                 qb = qb.where(field, val);
+              } else if (column.ct == 'timestamp') {
+                qb = qb.whereRaw('DATE(??) = DATE(?)', [field, val]);
               } else {
                 // mysql is case-insensitive for strings, turn to case-sensitive
                 qb = qb.whereRaw('BINARY ?? = ?', [field, val]);

From 57e677242f843895fc75104ee7f068353024bb2d Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 10 Jul 2023 17:18:41 +0530
Subject: [PATCH 203/208] feat: identify removed/added pk columns

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nocodb/src/services/meta-diffs.service.ts | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/packages/nocodb/src/services/meta-diffs.service.ts b/packages/nocodb/src/services/meta-diffs.service.ts
index 75f21a2229..da7fdf669e 100644
--- a/packages/nocodb/src/services/meta-diffs.service.ts
+++ b/packages/nocodb/src/services/meta-diffs.service.ts
@@ -17,6 +17,7 @@ export enum MetaDiffType {
   TABLE_REMOVE = 'TABLE_REMOVE',
   TABLE_COLUMN_ADD = 'TABLE_COLUMN_ADD',
   TABLE_COLUMN_TYPE_CHANGE = 'TABLE_COLUMN_TYPE_CHANGE',
+  TABLE_COLUMN_PK_CHANGED = 'TABLE_COLUMN_PK_CHANGED',
   TABLE_COLUMN_REMOVE = 'TABLE_COLUMN_REMOVE',
   VIEW_NEW = 'VIEW_NEW',
   VIEW_REMOVE = 'VIEW_REMOVE',
@@ -103,6 +104,16 @@ type MetaDiffChange = {
       relationType: RelationTypes;
       cstn?: string;
     }
+  | {
+      type: MetaDiffType.TABLE_COLUMN_PK_CHANGED;
+      tn?: string;
+      model?: Model;
+      id?: string;
+      cn: string;
+      column: Column;
+      colId?: string;
+      status: 'removed' | 'added';
+    }
 );
 
 @Injectable()
@@ -217,6 +228,18 @@ export class MetaDiffsService {
             column: oldCol,
           });
         }
+        if (!!oldCol.pk !== !!column.pk) {
+          tableProp.detectedChanges.push({
+            type: MetaDiffType.TABLE_COLUMN_PK_CHANGED,
+            msg: column.pk
+              ? `Column ${column.cn} is new primary key`
+              : `Column ${column.cn} is no longer primary key`,
+            cn: oldCol.column_name,
+            id: oldMeta.id,
+            column: oldCol,
+            status: column.pk ? 'added' : 'removed',
+          });
+        }
       }
       for (const column of oldMeta.columns) {
         if (
@@ -688,6 +711,13 @@ export class MetaDiffsService {
                 await Column.update(change.column.id, column);
               }
               break;
+            case MetaDiffType.TABLE_COLUMN_PK_CHANGED:
+              {
+                const column = change.column;
+                column.pk = change.status === 'added';
+                await Column.update(change.column.id, column);
+              }
+              break;
             case MetaDiffType.TABLE_COLUMN_REMOVE:
             case MetaDiffType.VIEW_COLUMN_REMOVE:
               await change.column.delete();

From 8e3f6cb6edbf36c56cc6c4ffe5744ad77aef9a92 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 10 Jul 2023 18:00:23 +0530
Subject: [PATCH 204/208] feat: compare all boolean props

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nocodb/src/services/meta-diffs.service.ts | 52 ++++++++++++++-----
 1 file changed, 39 insertions(+), 13 deletions(-)

diff --git a/packages/nocodb/src/services/meta-diffs.service.ts b/packages/nocodb/src/services/meta-diffs.service.ts
index da7fdf669e..9d1818b7b9 100644
--- a/packages/nocodb/src/services/meta-diffs.service.ts
+++ b/packages/nocodb/src/services/meta-diffs.service.ts
@@ -17,7 +17,7 @@ export enum MetaDiffType {
   TABLE_REMOVE = 'TABLE_REMOVE',
   TABLE_COLUMN_ADD = 'TABLE_COLUMN_ADD',
   TABLE_COLUMN_TYPE_CHANGE = 'TABLE_COLUMN_TYPE_CHANGE',
-  TABLE_COLUMN_PK_CHANGED = 'TABLE_COLUMN_PK_CHANGED',
+  TABLE_COLUMN_PROPS_CHANGED = 'TABLE_COLUMN_PROPS_CHANGED',
   TABLE_COLUMN_REMOVE = 'TABLE_COLUMN_REMOVE',
   VIEW_NEW = 'VIEW_NEW',
   VIEW_REMOVE = 'VIEW_REMOVE',
@@ -105,14 +105,13 @@ type MetaDiffChange = {
       cstn?: string;
     }
   | {
-      type: MetaDiffType.TABLE_COLUMN_PK_CHANGED;
+      type: MetaDiffType.TABLE_COLUMN_PROPS_CHANGED;
       tn?: string;
       model?: Model;
       id?: string;
       cn: string;
       column: Column;
       colId?: string;
-      status: 'removed' | 'added';
     }
 );
 
@@ -228,16 +227,18 @@ export class MetaDiffsService {
             column: oldCol,
           });
         }
-        if (!!oldCol.pk !== !!column.pk) {
+        if (
+          !!oldCol.pk !== !!column.pk ||
+          !!oldCol.rqd !== !!column.rqd ||
+          !!oldCol.un !== !!column.un ||
+          !!oldCol.ai !== !!column.ai
+        ) {
           tableProp.detectedChanges.push({
-            type: MetaDiffType.TABLE_COLUMN_PK_CHANGED,
-            msg: column.pk
-              ? `Column ${column.cn} is new primary key`
-              : `Column ${column.cn} is no longer primary key`,
+            type: MetaDiffType.TABLE_COLUMN_PROPS_CHANGED,
+            msg: `Column properties changed (${column.cn})`,
             cn: oldCol.column_name,
             id: oldMeta.id,
             column: oldCol,
-            status: column.pk ? 'added' : 'removed',
           });
         }
       }
@@ -711,11 +712,20 @@ export class MetaDiffsService {
                 await Column.update(change.column.id, column);
               }
               break;
-            case MetaDiffType.TABLE_COLUMN_PK_CHANGED:
+            case MetaDiffType.TABLE_COLUMN_PROPS_CHANGED:
               {
-                const column = change.column;
-                column.pk = change.status === 'added';
-                await Column.update(change.column.id, column);
+                const columns = (
+                  await sqlClient.columnList({ tn: table_name })
+                )?.data?.list?.map((c) => ({ ...c, column_name: c.cn }));
+                const colMeta = columns.find((c) => c.cn === change.cn);
+                if (!colMeta) break;
+                const { pk, ai, rqd, un } = colMeta;
+                await Column.update(change.column.id, {
+                  pk,
+                  ai,
+                  rqd,
+                  un,
+                });
               }
               break;
             case MetaDiffType.TABLE_COLUMN_REMOVE:
@@ -914,6 +924,22 @@ export class MetaDiffsService {
               await Column.update(change.column.id, column);
             }
             break;
+          case MetaDiffType.TABLE_COLUMN_PROPS_CHANGED:
+            {
+              const columns = (
+                await sqlClient.columnList({ tn: table_name })
+              )?.data?.list?.map((c) => ({ ...c, column_name: c.cn }));
+              const colMeta = columns.find((c) => c.cn === change.cn);
+              if (!colMeta) break;
+              const { pk, ai, rqd, un } = colMeta;
+              await Column.update(change.column.id, {
+                pk,
+                ai,
+                rqd,
+                un,
+              });
+            }
+            break;
           case MetaDiffType.TABLE_COLUMN_REMOVE:
           case MetaDiffType.VIEW_COLUMN_REMOVE:
             await change.column.delete();

From f4e6874ac6f621c34f326964e60a5af4adedce47 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 10 Jul 2023 18:21:20 +0530
Subject: [PATCH 205/208] fix: reset column list cache after column update

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/models/Column.ts | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/packages/nocodb/src/models/Column.ts b/packages/nocodb/src/models/Column.ts
index 1695d1b4db..bbaebabe2c 100644
--- a/packages/nocodb/src/models/Column.ts
+++ b/packages/nocodb/src/models/Column.ts
@@ -1075,6 +1075,30 @@ export default class Column<T = any> implements ColumnType {
       // set cache
       await NocoCache.set(key, o);
     }
+
+    // get model column list from cache
+    const columnListFromCache = await NocoCache.getList(CacheScope.COLUMN, [
+      oldCol.fk_model_id,
+    ]);
+
+    // update column list in cache if cache exists
+    if (!columnListFromCache.list?.length) {
+      const updatedColumnList = columnListFromCache.list.map((column: any) => {
+        if (column.id === colId) {
+          return {
+            ...column,
+            ...updateObj,
+          };
+        }
+        return column;
+      });
+      await NocoCache.setList(
+        CacheScope.COLUMN,
+        [oldCol.fk_model_id],
+        updatedColumnList,
+      );
+    }
+
     // set meta
     await ncMeta.metaUpdate(
       null,

From 80fefbdcfb2f0ecff17be6b1289bfa077450e75a Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 5 Jul 2023 12:46:16 +0530
Subject: [PATCH 206/208] fix: rather than resetting token version to null set
 it with a new value to avoid unexpected behaviour

---
 packages/nocodb/src/services/users/users.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nocodb/src/services/users/users.service.ts b/packages/nocodb/src/services/users/users.service.ts
index 6fd621d2f3..813d4e1485 100644
--- a/packages/nocodb/src/services/users/users.service.ts
+++ b/packages/nocodb/src/services/users/users.service.ts
@@ -503,7 +503,7 @@ export class UsersService {
       if (user?.id) {
         await User.update(user.id, {
           refresh_token: null,
-          token_version: null,
+          token_version: randomTokenString(),
         });
       }
       return { msg: 'Signed out successfully' };

From 233debeb8d8b7b9c3b8d8edd90f1b4fa477a7d65 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 11 Jul 2023 11:13:19 +0530
Subject: [PATCH 207/208] refactor: include unique prop

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/services/meta-diffs.service.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/nocodb/src/services/meta-diffs.service.ts b/packages/nocodb/src/services/meta-diffs.service.ts
index 9d1818b7b9..6f7991a7b8 100644
--- a/packages/nocodb/src/services/meta-diffs.service.ts
+++ b/packages/nocodb/src/services/meta-diffs.service.ts
@@ -231,7 +231,8 @@ export class MetaDiffsService {
           !!oldCol.pk !== !!column.pk ||
           !!oldCol.rqd !== !!column.rqd ||
           !!oldCol.un !== !!column.un ||
-          !!oldCol.ai !== !!column.ai
+          !!oldCol.ai !== !!column.ai ||
+          !!oldCol.unique !== !!column.unique
         ) {
           tableProp.detectedChanges.push({
             type: MetaDiffType.TABLE_COLUMN_PROPS_CHANGED,
@@ -719,12 +720,13 @@ export class MetaDiffsService {
                 )?.data?.list?.map((c) => ({ ...c, column_name: c.cn }));
                 const colMeta = columns.find((c) => c.cn === change.cn);
                 if (!colMeta) break;
-                const { pk, ai, rqd, un } = colMeta;
+                const { pk, ai, rqd, un, unique } = colMeta;
                 await Column.update(change.column.id, {
                   pk,
                   ai,
                   rqd,
                   un,
+                  unique,
                 });
               }
               break;
@@ -931,12 +933,13 @@ export class MetaDiffsService {
               )?.data?.list?.map((c) => ({ ...c, column_name: c.cn }));
               const colMeta = columns.find((c) => c.cn === change.cn);
               if (!colMeta) break;
-              const { pk, ai, rqd, un } = colMeta;
+              const { pk, ai, rqd, un, unique } = colMeta;
               await Column.update(change.column.id, {
                 pk,
                 ai,
                 rqd,
                 un,
+                unique,
               });
             }
             break;

From cc99ccb4fdca88426a1a81bc3ffd7b772414f5b3 Mon Sep 17 00:00:00 2001
From: VictorMinemu <victor@minemu.es>
Date: Tue, 11 Jul 2023 11:14:26 +0200
Subject: [PATCH 208/208] Changes requested by review team.

---
 packages/nocodb/src/db/BaseModelSqlv2.ts | 24 ++++++++++++++----------
 packages/nocodb/src/db/conditionV2.ts    |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index 8e71364f97..f39079c2fd 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -3966,17 +3966,21 @@ function _wherePk(primaryKeys: Column[], id) {
   const ids = (id + '').split('___');
   const where = {};
   for (let i = 0; i < primaryKeys.length; ++i) {
-    //Check if the id is a UUID and the column is binary(16)
-    const idAsUUID =
+    //Cast the id to string.
+    const idAsString = ids[i] + '';
+    // Check if the id is a UUID and the column is binary(16)
+    const isUUIDBinary16 =
       primaryKeys[i].ct === 'binary(16)' &&
-      ((ids[i] + '').length === 36 || (ids[i] + '').length === 32)
-        ? (ids[i] + '').length === 32
-          ? (ids[i] + '').replace(
-              /(.{8})(.{4})(.{4})(.{4})(.{12})/,
-              '$1-$2-$3-$4-$5',
-            )
-          : ids[i] + ''
-        : null;
+      (idAsString.length === 36 || idAsString.length === 32);
+    // If the id is a UUID and the column is binary(16), convert the id to a Buffer. Otherwise, return null to indicate that the id is not a UUID.
+    const idAsUUID = isUUIDBinary16
+      ? idAsString.length === 32
+        ? idAsString.replace(
+            /(.{8})(.{4})(.{4})(.{4})(.{12})/,
+            '$1-$2-$3-$4-$5',
+          )
+        : idAsString
+      : null;
 
     where[primaryKeys[i].column_name] = idAsUUID
       ? Buffer.from(idAsUUID.replace(/-/g, ''), 'hex')
diff --git a/packages/nocodb/src/db/conditionV2.ts b/packages/nocodb/src/db/conditionV2.ts
index ec0ce16d81..e1ec246e7c 100644
--- a/packages/nocodb/src/db/conditionV2.ts
+++ b/packages/nocodb/src/db/conditionV2.ts
@@ -419,7 +419,7 @@ const parseConditionV2 = async (
                 ].includes(column.uidt)
               ) {
                 qb = qb.where(field, val);
-              } else if (column.ct == 'timestamp') {
+              } else if (column.ct === 'timestamp') {
                 qb = qb.whereRaw('DATE(??) = DATE(?)', [field, val]);
               } else {
                 // mysql is case-insensitive for strings, turn to case-sensitive