From 02854a9e41584e2990553a130fd0a04ad67e8f5f Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 19 Jan 2023 10:49:50 +0530
Subject: [PATCH 01/27] fix(api): mssql - alter column query correction

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts b/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts
index 27feafb56b..962ae5eca8 100644
--- a/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts
+++ b/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts
@@ -2631,7 +2631,7 @@ class MssqlClient extends KnexClient {
 
       if (n.dtxp !== o.dtxp && !['text'].includes(n.dt)) {
         query += this.genQuery(
-          `\nALTER TABLE ?? ALTER COLUMN ?? ${n.dt}(${n.dtxp});\n`,
+          `\nALTER TABLE ?? ALTER COLUMN ?? ${n.dt}${!getDefaultLengthIsDisabled(n.dt) && n.dtxp ? `(${n.dtxp})` : ''};\n`,
           [this.getTnPath(t), n.cn],
           shouldSanitize
         );
@@ -2797,9 +2797,6 @@ function getDefaultLengthIsDisabled(type) {
     // case 'sysname':
     case 'bigint':
     case 'bit':
-    case 'date':
-    case 'datetime':
-    case 'datetime2':
     case 'datetimeoffset':
     case 'decimal':
     case 'float':
@@ -2824,6 +2821,9 @@ function getDefaultLengthIsDisabled(type) {
       return true;
       break;
     default:
+    case 'date':
+    case 'datetime':
+    case 'datetime2':
     case 'varchar':
       return false;
       break;

From 16d686593f36064ee6ae4e7afc5911edc2625706 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 19 Jan 2023 13:30:41 +0530
Subject: [PATCH 02/27] chore(action): bring back executable build in nightly
 dev release

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .github/workflows/release-nightly-dev.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release-nightly-dev.yml b/.github/workflows/release-nightly-dev.yml
index 30bd16e41e..e4a66f71ce 100644
--- a/.github/workflows/release-nightly-dev.yml
+++ b/.github/workflows/release-nightly-dev.yml
@@ -54,13 +54,13 @@ jobs:
       NPM_TOKEN: "${{ secrets.NPM_TOKEN }}"
 
   # Build executables and publish to GitHub
-  # release-executables:
-  #   needs: [set-tag, release-npm]
-  #   uses: ./.github/workflows/release-timely-executables.yml
-  #   with:
-  #     tag: ${{ needs.set-tag.outputs.current_version }}-${{ needs.set-tag.outputs.nightly_build_tag }}
-  #   secrets:
-  #     NC_GITHUB_TOKEN: "${{ secrets.NC_GITHUB_TOKEN }}"
+  release-executables:
+    needs: [set-tag, release-npm]
+    uses: ./.github/workflows/release-timely-executables.yml
+    with:
+      tag: ${{ needs.set-tag.outputs.current_version }}-${{ needs.set-tag.outputs.nightly_build_tag }}
+    secrets:
+      NC_GITHUB_TOKEN: "${{ secrets.NC_GITHUB_TOKEN }}"
 
   # Build docker image and push to docker hub
   release-docker:

From 0839d3d171f0598baf43af851344a509e26e405e Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 19 Jan 2023 15:11:08 +0530
Subject: [PATCH 03/27] fix(api): mssql - column alter query correction

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts  | 116 ------------------
 .../db/sql-client/lib/mssql/MssqlClient.ts    |  45 +------
 2 files changed, 4 insertions(+), 157 deletions(-)

diff --git a/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
index c958eae2ba..7762be3c4a 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
@@ -163,122 +163,6 @@ export class MssqlUi {
     };
   }
 
-  // static getDefaultLengthForDatatype(type) {
-  //   switch (type) {
-  //     case "int":
-  //       return 11;
-  //       break;
-  //     case "tinyint":
-  //       return 1;
-  //       break;
-  //     case "smallint":
-  //       return 5;
-  //       break;
-  //
-  //     case "mediumint":
-  //       return 9;
-  //       break;
-  //     case "bigint":
-  //       return 20;
-  //       break;
-  //     case "bit":
-  //       return 64;
-  //       break;
-  //     case "boolean":
-  //       return '';
-  //       break;
-  //     case "float":
-  //       return 12;
-  //       break;
-  //     case "decimal":
-  //       return 10;
-  //       break;
-  //     case "double":
-  //       return 22;
-  //       break;
-  //     case "serial":
-  //       return 20;
-  //       break;
-  //     case "date":
-  //       return '';
-  //       break;
-  //     case "datetime":
-  //     case "timestamp":
-  //       return 6;
-  //       break;
-  //     case "time":
-  //       return '';
-  //       break;
-  //     case "year":
-  //       return '';
-  //       break;
-  //     case "char":
-  //       return 255;
-  //       break;
-  //     case "varchar":
-  //       return 45;
-  //       break;
-  //     case "nchar":
-  //       return 255;
-  //       break;
-  //     case "text":
-  //       return '';
-  //       break;
-  //     case "tinytext":
-  //       return '';
-  //       break;
-  //     case "mediumtext":
-  //       return '';
-  //       break;
-  //     case "longtext":
-  //       return ''
-  //       break;
-  //     case "binary":
-  //       return 255;
-  //       break;
-  //     case "varbinary":
-  //       return 65500;
-  //       break;
-  //     case "blob":
-  //       return '';
-  //       break;
-  //     case "tinyblob":
-  //       return '';
-  //       break;
-  //     case "mediumblob":
-  //       return '';
-  //       break;
-  //     case "longblob":
-  //       return '';
-  //       break;
-  //     case "enum":
-  //       return '\'a\',\'b\'';
-  //       break;
-  //     case "set":
-  //       return '\'a\',\'b\'';
-  //       break;
-  //     case "geometry":
-  //       return '';
-  //     case "point":
-  //       return '';
-  //     case "linestring":
-  //       return '';
-  //     case "polygon":
-  //       return '';
-  //     case "multipoint":
-  //       return '';
-  //     case "multilinestring":
-  //       return '';
-  //     case "multipolygon":
-  //       return '';
-  //     case "json":
-  //       return ''
-  //       break;
-  //
-  //   }
-  //
-  // }
-
   static getDefaultLengthForDatatype(type) {
     switch (type) {
       case 'bigint':
diff --git a/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts b/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts
index 962ae5eca8..0f84e04461 100644
--- a/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts
+++ b/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts
@@ -2629,43 +2629,14 @@ class MssqlClient extends KnexClient {
         );
       }
 
-      if (n.dtxp !== o.dtxp && !['text'].includes(n.dt)) {
+      if (n.dtxp !== o.dtxp || n.dt !== o.dt || n.rqd !== o.rqd) {
         query += this.genQuery(
-          `\nALTER TABLE ?? ALTER COLUMN ?? ${n.dt}${!getDefaultLengthIsDisabled(n.dt) && n.dtxp ? `(${n.dtxp})` : ''};\n`,
+          `\nALTER TABLE ?? ALTER COLUMN ?? ${n.dt}${
+            !getDefaultLengthIsDisabled(n.dt) && n.dtxp ? `(${n.dtxp})` : ''
+          }`,
           [this.getTnPath(t), n.cn],
           shouldSanitize
         );
-      } else if (n.dt !== o.dt) {
-        query += this.genQuery(
-          `\nALTER TABLE ?? ALTER COLUMN ?? TYPE ${n.dt};\n`,
-          [this.getTnPath(t), n.cn],
-          shouldSanitize
-        );
-      }
-
-      if (n.rqd !== o.rqd) {
-        query += this.genQuery(
-          `\nALTER TABLE ?? ALTER COLUMN ??  ${n.dt}`,
-          [this.getTnPath(t), n.cn],
-          shouldSanitize
-        );
-        if (
-          ![
-            'int',
-            'bigint',
-            'bit',
-            'real',
-            'float',
-            'decimal',
-            'money',
-            'smallint',
-            'tinyint',
-            'geometry',
-            'datetime',
-            'text',
-          ].includes(n.dt)
-        )
-          query += n.dtxp && n.dtxp != -1 ? `(${n.dtxp})` : '';
         query += n.rqd ? ` NOT NULL;\n` : ` NULL;\n`;
       }
 
@@ -2787,14 +2758,6 @@ function getDefaultValue(n) {
 
 function getDefaultLengthIsDisabled(type) {
   switch (type) {
-    // case 'binary':
-    // case 'char':
-    // case 'sql_variant':
-    // case 'nvarchar':
-    // case 'nchar':
-    // case 'ntext':
-    // case 'varbinary':
-    // case 'sysname':
     case 'bigint':
     case 'bit':
     case 'datetimeoffset':

From 9e968465bc7ba59a909b20353833015d3b0734ca Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 19 Jan 2023 16:37:34 +0530
Subject: [PATCH 04/27] fix(api): mssql - enable toggling scale and precision

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts  | 28 +++++++++-------
 .../db/sql-client/lib/mssql/MssqlClient.ts    | 33 +++++++++----------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
index 7762be3c4a..0e2b54a644 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
@@ -190,7 +190,7 @@ export class MssqlUi {
         return '';
 
       case 'decimal':
-        return '';
+        return '10';
 
       case 'float':
         return '';
@@ -278,9 +278,14 @@ export class MssqlUi {
   static getDefaultLengthIsDisabled(type) {
     switch (type) {
       case 'nvarchar':
+      case 'numeric':
+      case 'decimal':
+      case 'float':
+      case 'bigint':
+      case 'int':
+      case 'tinyint':
         return false;
 
-      case 'bigint':
       case 'binary':
       case 'bit':
       case 'char':
@@ -288,17 +293,13 @@ export class MssqlUi {
       case 'datetime':
       case 'datetime2':
       case 'datetimeoffset':
-      case 'decimal':
-      case 'float':
       case 'geography':
       case 'geometry':
       case 'heirarchyid':
       case 'image':
-      case 'int':
       case 'money':
       case 'nchar':
       case 'ntext':
-      case 'numeric':
       case 'real':
       case 'json':
       case 'smalldatetime':
@@ -309,7 +310,6 @@ export class MssqlUi {
       case 'text':
       case 'time':
       case 'timestamp':
-      case 'tinyint':
       case 'uniqueidentifier':
       case 'varbinary':
       case 'xml':
@@ -462,10 +462,10 @@ export class MssqlUi {
         return '';
 
       case 'decimal':
-        return '';
+        return '2';
 
       case 'float':
-        return '';
+        return '2';
 
       case 'geography':
         return '';
@@ -492,7 +492,7 @@ export class MssqlUi {
         return '';
 
       case 'numeric':
-        return '';
+        return '2';
 
       case 'nvarchar':
         return '';
@@ -598,8 +598,12 @@ export class MssqlUi {
     // }
   }
 
-  static showScale(_columnObj) {
-    return false;
+  static showScale(columnObj) {
+    return (
+      columnObj.dt === 'float' ||
+      columnObj.dt === 'decimal' ||
+      columnObj.dt === 'numeric'
+    );
   }
 
   static removeUnsigned(columns) {
diff --git a/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts b/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts
index 0f84e04461..294b902d0a 100644
--- a/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts
+++ b/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts
@@ -2580,11 +2580,15 @@ class MssqlClient extends KnexClient {
 
     const defaultValue = getDefaultValue(n);
     const shouldSanitize = true;
+    const scaleAndPrecision =
+      !getDefaultLengthIsDisabled(n.dt) && n.dtxp
+        ? `(${n.dtxp}${n.dtxs ? `,${n.dtxs}` : ''})`
+        : '';
 
     if (change === 0) {
       query = existingQuery ? ',' : '';
       query += this.genQuery(`?? ${n.dt}`, [n.cn], shouldSanitize);
-      query += !getDefaultLengthIsDisabled(n.dt) && n.dtxp ? `(${n.dtxp})` : '';
+      query += scaleAndPrecision;
       query += n.rqd ? ' NOT NULL' : ' NULL';
       query += n.ai ? ' IDENTITY(1,1)' : ' ';
       query += defaultValue
@@ -2599,7 +2603,7 @@ class MssqlClient extends KnexClient {
       }
     } else if (change === 1) {
       query += this.genQuery(` ADD ?? ${n.dt}`, [n.cn], shouldSanitize);
-      query += !getDefaultLengthIsDisabled(n.dt) && n.dtxp ? `(${n.dtxp})` : '';
+      query += scaleAndPrecision;
       query += n.rqd ? ' NOT NULL' : ' NULL';
       query += n.ai ? ' IDENTITY(1,1)' : ' ';
       query += defaultValue
@@ -2629,11 +2633,9 @@ class MssqlClient extends KnexClient {
         );
       }
 
-      if (n.dtxp !== o.dtxp || n.dt !== o.dt || n.rqd !== o.rqd) {
+      if (n.dtxp !== o.dtxp ||n.dtxs !== o.dtxs || n.dt !== o.dt || n.rqd !== o.rqd) {
         query += this.genQuery(
-          `\nALTER TABLE ?? ALTER COLUMN ?? ${n.dt}${
-            !getDefaultLengthIsDisabled(n.dt) && n.dtxp ? `(${n.dtxp})` : ''
-          }`,
+          `\nALTER TABLE ?? ALTER COLUMN ?? ${n.dt}${scaleAndPrecision}`,
           [this.getTnPath(t), n.cn],
           shouldSanitize
         );
@@ -2758,35 +2760,32 @@ function getDefaultValue(n) {
 
 function getDefaultLengthIsDisabled(type) {
   switch (type) {
-    case 'bigint':
-    case 'bit':
     case 'datetimeoffset':
-    case 'decimal':
-    case 'float':
     case 'geography':
     case 'geometry':
     case 'heirarchyid':
     case 'image':
-    case 'int':
     case 'money':
-    case 'numeric':
     case 'real':
     case 'json':
     case 'smalldatetime':
-    case 'smallint':
     case 'smallmoney':
     case 'text':
     case 'time':
     case 'timestamp':
-    case 'tinyint':
     case 'uniqueidentifier':
     case 'xml':
       return true;
       break;
     default:
-    case 'date':
-    case 'datetime':
-    case 'datetime2':
+    case 'int':
+    case 'tinyint':
+    case 'bigint':
+    case 'bit':
+    case 'decimal':
+    case 'float':
+    case 'numeric':
+    case 'smallint':
     case 'varchar':
       return false;
       break;

From 918d0890615deb69033be1f4811d9252c27ef309 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 19 Jan 2023 16:47:05 +0530
Subject: [PATCH 05/27] fix(api): hide length and scale for int and float types

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts  | 15 +++++----------
 .../db/sql-client/lib/mssql/MssqlClient.ts    | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
index 0e2b54a644..ba54975770 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
@@ -280,12 +280,11 @@ export class MssqlUi {
       case 'nvarchar':
       case 'numeric':
       case 'decimal':
+        return false;
+      case 'tinyint':
       case 'float':
-      case 'bigint':
       case 'int':
-      case 'tinyint':
-        return false;
-
+      case 'bigint':
       case 'binary':
       case 'bit':
       case 'char':
@@ -465,7 +464,7 @@ export class MssqlUi {
         return '2';
 
       case 'float':
-        return '2';
+        return '';
 
       case 'geography':
         return '';
@@ -599,11 +598,7 @@ export class MssqlUi {
   }
 
   static showScale(columnObj) {
-    return (
-      columnObj.dt === 'float' ||
-      columnObj.dt === 'decimal' ||
-      columnObj.dt === 'numeric'
-    );
+    return columnObj.dt === 'decimal' || columnObj.dt === 'numeric';
   }
 
   static removeUnsigned(columns) {
diff --git a/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts b/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts
index 294b902d0a..c7f59aafc1 100644
--- a/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts
+++ b/packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts
@@ -2633,7 +2633,12 @@ class MssqlClient extends KnexClient {
         );
       }
 
-      if (n.dtxp !== o.dtxp ||n.dtxs !== o.dtxs || n.dt !== o.dt || n.rqd !== o.rqd) {
+      if (
+        n.dtxp !== o.dtxp ||
+        n.dtxs !== o.dtxs ||
+        n.dt !== o.dt ||
+        n.rqd !== o.rqd
+      ) {
         query += this.genQuery(
           `\nALTER TABLE ?? ALTER COLUMN ?? ${n.dt}${scaleAndPrecision}`,
           [this.getTnPath(t), n.cn],
@@ -2773,19 +2778,19 @@ function getDefaultLengthIsDisabled(type) {
     case 'text':
     case 'time':
     case 'timestamp':
+    case 'int':
+    case 'tinyint':
+    case 'bigint':
+    case 'bit':
+    case 'smallint':
+    case 'float':
     case 'uniqueidentifier':
     case 'xml':
       return true;
       break;
     default:
-    case 'int':
-    case 'tinyint':
-    case 'bigint':
-    case 'bit':
     case 'decimal':
-    case 'float':
     case 'numeric':
-    case 'smallint':
     case 'varchar':
       return false;
       break;

From 7b08819fde09f1c6d9a26e440ba0fff2bfdca309 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 19 Jan 2023 19:02:44 +0530
Subject: [PATCH 06/27] fix: convert input arg to string if a different type
 passed

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

diff --git a/packages/nc-gui/utils/urlUtils.ts b/packages/nc-gui/utils/urlUtils.ts
index d9d807d446..2f0a071849 100644
--- a/packages/nc-gui/utils/urlUtils.ts
+++ b/packages/nc-gui/utils/urlUtils.ts
@@ -20,7 +20,7 @@ export const replaceUrlsWithLink = (text: string): boolean | string => {
 }
 
 export const isValidURL = (str: string) => {
-  return isURL(str)
+  return isURL(`${str}`)
 }
 
 export const openLink = (path: string, baseURL?: string, target = '_blank') => {

From 5298c8e34039a10fe816588c422f769c9d2908b7 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 20 Jan 2023 14:34:43 +0530
Subject: [PATCH 07/27] fix(gui): convert value to string to avoid database
 error

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

diff --git a/packages/nc-gui/utils/parsers/ExcelTemplateAdapter.ts b/packages/nc-gui/utils/parsers/ExcelTemplateAdapter.ts
index d3d60b5359..f0628d7558 100644
--- a/packages/nc-gui/utils/parsers/ExcelTemplateAdapter.ts
+++ b/packages/nc-gui/utils/parsers/ExcelTemplateAdapter.ts
@@ -257,6 +257,8 @@ export default class ExcelTemplateAdapter extends TemplateGenerator {
                       })
                       const cellObj = ws[cellId]
                       rowData[table.columns[i].column_name] = (cellObj && cellObj.w) || row[i]
+                    } else if (table.columns[i].uidt === UITypes.SingleLineText || table.columns[i].uidt === UITypes.LongText) {
+                      rowData[table.columns[i].column_name] = `${row[i]}`
                     } else {
                       // TODO: do parsing if necessary based on type
                       rowData[table.columns[i].column_name] = row[i]

From f1be5c3ea624f7157e3d84f35ade2cb463f7be2f Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 21 Jan 2023 12:01:22 +0530
Subject: [PATCH 08/27] fix(gui): retain null/undefined as null while parsing
 for string type

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/utils/parsers/ExcelTemplateAdapter.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/utils/parsers/ExcelTemplateAdapter.ts b/packages/nc-gui/utils/parsers/ExcelTemplateAdapter.ts
index f0628d7558..9e2b087aa2 100644
--- a/packages/nc-gui/utils/parsers/ExcelTemplateAdapter.ts
+++ b/packages/nc-gui/utils/parsers/ExcelTemplateAdapter.ts
@@ -258,7 +258,7 @@ export default class ExcelTemplateAdapter extends TemplateGenerator {
                       const cellObj = ws[cellId]
                       rowData[table.columns[i].column_name] = (cellObj && cellObj.w) || row[i]
                     } else if (table.columns[i].uidt === UITypes.SingleLineText || table.columns[i].uidt === UITypes.LongText) {
-                      rowData[table.columns[i].column_name] = `${row[i]}`
+                      rowData[table.columns[i].column_name] = row[i] === null || row[i] === undefined ? null : `${row[i]}`
                     } else {
                       // TODO: do parsing if necessary based on type
                       rowData[table.columns[i].column_name] = row[i]

From ade937a64b69bb590b417fed8c6cf5291d55647c Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Sat, 21 Jan 2023 23:41:54 +0300
Subject: [PATCH 09/27] fix: filtering options for select columns

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nc-gui/utils/filterUtils.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui/utils/filterUtils.ts b/packages/nc-gui/utils/filterUtils.ts
index 5f6ab8c414..f48c16d82e 100644
--- a/packages/nc-gui/utils/filterUtils.ts
+++ b/packages/nc-gui/utils/filterUtils.ts
@@ -41,13 +41,13 @@ export const comparisonOpList: {
     text: 'is empty',
     value: 'empty',
     ignoreVal: true,
-    excludedTypes: [UITypes.Checkbox, UITypes.Rating],
+    excludedTypes: [UITypes.Checkbox, UITypes.Rating, UITypes.MultiSelect, UITypes.SingleSelect],
   },
   {
     text: 'is not empty',
     value: 'notempty',
     ignoreVal: true,
-    excludedTypes: [UITypes.Checkbox, UITypes.Rating],
+    excludedTypes: [UITypes.Checkbox, UITypes.Rating, UITypes.MultiSelect, UITypes.SingleSelect],
   },
   {
     text: 'is null',
@@ -67,7 +67,7 @@ export const comparisonOpList: {
   {
     text: 'contains any of',
     value: 'anyof',
-    includedTypes: [UITypes.MultiSelect],
+    includedTypes: [UITypes.MultiSelect, UITypes.SingleSelect],
   },
   {
     text: 'does not contain all of',
@@ -77,26 +77,26 @@ export const comparisonOpList: {
   {
     text: 'does not contain any of',
     value: 'nanyof',
-    includedTypes: [UITypes.MultiSelect],
+    includedTypes: [UITypes.MultiSelect, UITypes.SingleSelect],
   },
   {
     text: '>',
     value: 'gt',
-    excludedTypes: [UITypes.Checkbox],
+    excludedTypes: [UITypes.Checkbox, UITypes.MultiSelect, UITypes.SingleSelect],
   },
   {
     text: '<',
     value: 'lt',
-    excludedTypes: [UITypes.Checkbox],
+    excludedTypes: [UITypes.Checkbox, UITypes.MultiSelect, UITypes.SingleSelect],
   },
   {
     text: '>=',
     value: 'gte',
-    excludedTypes: [UITypes.Checkbox],
+    excludedTypes: [UITypes.Checkbox, UITypes.MultiSelect, UITypes.SingleSelect],
   },
   {
     text: '<=',
     value: 'lte',
-    excludedTypes: [UITypes.Checkbox],
+    excludedTypes: [UITypes.Checkbox, UITypes.MultiSelect, UITypes.SingleSelect],
   },
 ]

From ca85d2ab4190d690521636cea293b9088c1a7919 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Mon, 23 Jan 2023 14:41:06 +0530
Subject: [PATCH 10/27] test: single select filter, sort

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

diff --git a/tests/playwright/tests/columnSingleSelect.spec.ts b/tests/playwright/tests/columnSingleSelect.spec.ts
index 03710b9075..59ff195c28 100644
--- a/tests/playwright/tests/columnSingleSelect.spec.ts
+++ b/tests/playwright/tests/columnSingleSelect.spec.ts
@@ -2,6 +2,7 @@ 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';
 
 test.describe('Single select', () => {
   let dashboard: DashboardPage, grid: GridPage;
@@ -93,3 +94,95 @@ test.describe('Single select', () => {
     await grid.column.delete({ title: 'SingleSelect' });
   });
 });
+
+test.describe('Single select - filter & sort', () => {
+  // Row values
+  // no values (row ❶)
+  // only Foo (row ❷)
+  // only Bar (row ❸)
+  // only Baz (row ❹)
+
+  //   Example filters:
+  //
+  // where tags contains any of [Foo, Bar]
+  //   result: rows 2,3
+  // where tags does not contain any of [Foo, Bar]
+  //   result: rows 1,4
+
+  let dashboard: DashboardPage, grid: GridPage, toolbar: ToolbarPage;
+  let context: any;
+
+  test.beforeEach(async ({ page }) => {
+    context = await setup({ page });
+    dashboard = new DashboardPage(page, context.project);
+    toolbar = dashboard.grid.toolbar;
+    grid = dashboard.grid;
+
+    await dashboard.treeView.createTable({ title: 'sheet1' });
+
+    await grid.column.create({ title: 'SingleSelect', type: 'SingleSelect' });
+    await grid.column.selectOption.addOptions({
+      columnTitle: 'SingleSelect',
+      options: ['foo', 'bar', 'baz'],
+    });
+    await grid.addNewRow({ index: 0, value: '1' });
+    await grid.addNewRow({ index: 1, value: '2' });
+    await grid.addNewRow({ index: 2, value: '3' });
+    await grid.addNewRow({ index: 3, value: '4' });
+
+    await grid.cell.selectOption.select({ index: 1, columnHeader: 'SingleSelect', option: 'foo', multiSelect: false });
+    await grid.cell.selectOption.select({ index: 2, columnHeader: 'SingleSelect', option: 'bar', multiSelect: false });
+    await grid.cell.selectOption.select({ index: 3, columnHeader: 'SingleSelect', option: 'baz', multiSelect: false });
+  });
+
+  // define validateRowArray function
+  async function validateRowArray(value: string[]) {
+    const length = value.length;
+    for (let i = 0; i < length; i++) {
+      await dashboard.grid.cell.verify({
+        index: i,
+        columnHeader: 'Title',
+        value: value[i],
+      });
+    }
+  }
+
+  async function verifyFilter(param: { opType: string; value?: string; result: string[] }) {
+    await toolbar.clickFilter();
+    await toolbar.filter.add({
+      columnTitle: 'SingleSelect',
+      opType: param.opType,
+      value: param.value,
+      isLocallySaved: false,
+    });
+    await toolbar.clickFilter();
+
+    // verify filtered rows
+    await validateRowArray(param.result);
+    // Reset filter
+    await toolbar.filter.reset();
+  }
+
+  test('Select and clear options and rename options', async () => {
+    await verifyFilter({ opType: 'contains any of', value: 'foo,bar', result: ['2', '3'] });
+    await verifyFilter({ opType: 'does not contain any of', value: 'foo,bar', result: ['1', '4'] });
+
+    // Sort column
+    await toolbar.sort.add({
+      columnTitle: 'SingleSelect',
+      isAscending: true,
+      isLocallySaved: false,
+    });
+    await validateRowArray(['1', '3', '4', '2']);
+    await toolbar.sort.reset();
+
+    // sort descending & validate
+    await toolbar.sort.add({
+      columnTitle: 'SingleSelect',
+      isAscending: false,
+      isLocallySaved: false,
+    });
+    await validateRowArray(['2', '4', '3', '1']);
+    await toolbar.sort.reset();
+  });
+});

From 88add83cf1ea4e979210e71c3aafd187700c7130 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Mon, 23 Jan 2023 17:26:41 +0300
Subject: [PATCH 11/27] fix: show empty filtering for select options

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

diff --git a/packages/nc-gui/utils/filterUtils.ts b/packages/nc-gui/utils/filterUtils.ts
index f48c16d82e..f3454b0bc9 100644
--- a/packages/nc-gui/utils/filterUtils.ts
+++ b/packages/nc-gui/utils/filterUtils.ts
@@ -41,13 +41,13 @@ export const comparisonOpList: {
     text: 'is empty',
     value: 'empty',
     ignoreVal: true,
-    excludedTypes: [UITypes.Checkbox, UITypes.Rating, UITypes.MultiSelect, UITypes.SingleSelect],
+    excludedTypes: [UITypes.Checkbox, UITypes.Rating],
   },
   {
     text: 'is not empty',
     value: 'notempty',
     ignoreVal: true,
-    excludedTypes: [UITypes.Checkbox, UITypes.Rating, UITypes.MultiSelect, UITypes.SingleSelect],
+    excludedTypes: [UITypes.Checkbox, UITypes.Rating],
   },
   {
     text: 'is null',

From 6f73dc2cd4cede7e86ce4d30ca533a8c8ee9aa21 Mon Sep 17 00:00:00 2001
From: Naveen MR <oof1lab@gmail.com>
Date: Mon, 23 Jan 2023 15:24:35 +0000
Subject: [PATCH 12/27] docs : mention where PR build can be found

---
 .../content/en/engineering/builds-and-releases.md    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/noco-docs/content/en/engineering/builds-and-releases.md b/packages/noco-docs/content/en/engineering/builds-and-releases.md
index 9bce250f1c..4e24edba6e 100644
--- a/packages/noco-docs/content/en/engineering/builds-and-releases.md
+++ b/packages/noco-docs/content/en/engineering/builds-and-releases.md
@@ -11,7 +11,7 @@ There are 3 kinds of docker builds in NocoDB
 
 - Release builds [nocodb/nocodb](https://hub.docker.com/r/nocodb/nocodb) : built during NocoDB release. 
 - Daily builds [nocodb/nocodb-daily](https://hub.docker.com/r/nocodb/nocodb-daily) : built every 6 hours from Develop branch.
-- Daily builds [nocodb/nocodb-timely](https://hub.docker.com/r/nocodb/nocodb-timely): built for every PR.
+- Timely builds [nocodb/nocodb-timely](https://hub.docker.com/r/nocodb/nocodb-timely): built for every PR and manually triggered PRs.
 
 Below is an overview of how to make these builds and what happens behind the scenes.
 
@@ -118,7 +118,12 @@ Once the deployment is finished, there would be some new changes being pushed to
 ## Timely builds
 
 ### What are timely builds ?
-NocoDB creates docker and binaries for each PR!
+NocoDB has github actions which creates docker and binaries for each PR! And these can be found as a **comment on the last commit** of the PR.  
+
+Example shown below
+- Go to a PR and click on the comment.
+
+- Click on the link to copy the docker image and run it locally.
 
 This is to
 - reduce pull request cycle time
@@ -135,7 +140,7 @@ The docker images will be built and pushed to Docker Hub (See [nocodb/nocodb-tim
 
 ![image](https://user-images.githubusercontent.com/35857179/175012097-240dab05-da93-4c4e-87c1-1c36fb1350bd.png)
 
-## Executables or Binariess
+## Executables or Binaries
 
 Similarly, we provide a timely build for executables for non-docker users. The source code will be built, packaged as binary files, and pushed to Github (See [nocodb/nocodb-timely](https://github.com/nocodb/nocodb-timely/releases) for the full list).
 
@@ -157,4 +162,3 @@ NocoDB creates Docker and Binaries for each PR.
 This is to
 - reduce pull request cycle time
 - allow issue reporters / reviewers to verify the fix without setting up their local machines
-

From 90159005a6a04b188c31a4ae6ac612b74acc659f Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Mon, 23 Jan 2023 15:47:42 +0000
Subject: [PATCH 13/27] Update builds-and-releases.md

---
 .../noco-docs/content/en/engineering/builds-and-releases.md    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/noco-docs/content/en/engineering/builds-and-releases.md b/packages/noco-docs/content/en/engineering/builds-and-releases.md
index 4e24edba6e..b5da9ceac4 100644
--- a/packages/noco-docs/content/en/engineering/builds-and-releases.md
+++ b/packages/noco-docs/content/en/engineering/builds-and-releases.md
@@ -122,8 +122,11 @@ NocoDB has github actions which creates docker and binaries for each PR! And the
 
 Example shown below
 - Go to a PR and click on the comment.
+<img width="1111" alt="Screenshot 2023-01-23 at 15 46 36" src="https://user-images.githubusercontent.com/5435402/214083736-80062398-3712-430f-9865-86b110090c91.png">
 
 - Click on the link to copy the docker image and run it locally.
+<img width="1231" alt="Screenshot 2023-01-23 at 15 46 55" src="https://user-images.githubusercontent.com/5435402/214083755-945d9485-2b9e-4739-8408-068bdf4a84b7.png">
+
 
 This is to
 - reduce pull request cycle time

From 77b6d44bd24e8963e952a940227aa929bff3a1c4 Mon Sep 17 00:00:00 2001
From: Naveen MR <oof1lab@gmail.com>
Date: Mon, 23 Jan 2023 15:51:11 +0000
Subject: [PATCH 14/27] docs : CE vs EE

---
 packages/noco-docs/content/en/FAQs.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/noco-docs/content/en/FAQs.md b/packages/noco-docs/content/en/FAQs.md
index 7b033ac23b..cce8e070fa 100644
--- a/packages/noco-docs/content/en/FAQs.md
+++ b/packages/noco-docs/content/en/FAQs.md
@@ -45,7 +45,7 @@ PackageVersion: **0.97.0**
 ```
 
 ## What is available in free version ?
-
+- [Detailed comparison of NocoDB's generous CE compared to others is here](https://github.com/orgs/nocodb/projects/13).
 - NocoDB has just one version that is free & open source.
 - In it you will notice advanced features are all available for free.
     - ACL
@@ -66,7 +66,6 @@ Auth Token is a JWT Token generated based on the logged-in user. By default, the
 API Token is a Nano ID with a length of 40. If you are passing API Token, make sure that the header is called `xc-token`.
 
 ## Do you plan to have Enterprise Edition ?
-
 For features that make sense for enterprises like below - yes 
 - SSO, SLA, Organisation wide reports and analytics, 
 - Advanced Audit or ACL,  

From 48f58d730d5360e1eb1d8139794e09e6c6a95dfd Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 24 Jan 2023 11:58:49 +0530
Subject: [PATCH 15/27] fix(gui): skip keydown event handler if active cell
 value is `NaN`

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/composables/useMultiSelect/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index 37a350379c..d596e82e84 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -171,7 +171,7 @@ export function useMultiSelect(
       return true
     }
 
-    if (activeCell.row === null || activeCell.col === null) {
+    if (activeCell.row === null || activeCell.col === null || isNaN(activeCell.row) || isNaN(activeCell.col)) {
       return
     }
 

From a9fec148950eb65aa30917d2d5c57e527e3db110 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 24 Jan 2023 12:17:42 +0530
Subject: [PATCH 16/27] fix(gui): skip expand row behaviour if active row value
 is NaN or null

Signed-off-by: Pranav C <pranavxc@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 09a9dd5b36..3a0992c513 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -202,7 +202,7 @@ const { isCellSelected, activeCell, handleMouseDown, handleMouseOver, handleCell
       const cmdOrCtrl = isMac() ? e.metaKey : e.ctrlKey
       const altOrOptionKey = e.altKey
       if (e.key === ' ') {
-        if (activeCell.row != null && !editEnabled && hasEditPermission) {
+        if (activeCell.row != null && !isNaN(activeCell.row) && !editEnabled && hasEditPermission) {
           e.preventDefault()
           clearSelectedRange()
           const row = data.value[activeCell.row]

From 77ec4c17da1db29a90a47efd9f4daab7ea362010 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 24 Jan 2023 12:41:14 +0530
Subject: [PATCH 17/27] fix(gui): skip ctrl+arrow navigation if active cell is
 null/NaN

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

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 3a0992c513..000b41f034 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -156,8 +156,8 @@ const getContainerScrollForElement = (
     relativePos.right + (offset?.right || 0) > 0
       ? container.scrollLeft + relativePos.right + (offset?.right || 0)
       : relativePos.left - (offset?.left || 0) < 0
-        ? container.scrollLeft + relativePos.left - (offset?.left || 0)
-        : container.scrollLeft
+      ? container.scrollLeft + relativePos.left - (offset?.left || 0)
+      : container.scrollLeft
 
   /*
    * If the element is below the container, scroll down (positive)
@@ -167,8 +167,8 @@ const getContainerScrollForElement = (
     relativePos.bottom + (offset?.bottom || 0) > 0
       ? container.scrollTop + relativePos.bottom + (offset?.bottom || 0)
       : relativePos.top - (offset?.top || 0) < 0
-        ? container.scrollTop + relativePos.top - (offset?.top || 0)
-        : container.scrollTop
+      ? container.scrollTop + relativePos.top - (offset?.top || 0)
+      : container.scrollTop
 
   return scroll
 }
@@ -226,6 +226,8 @@ const { isCellSelected, activeCell, handleMouseDown, handleMouseOver, handleCell
       }
 
       if (cmdOrCtrl) {
+        if (activeCell.row === null || isNaN(activeCell.row) || activeCell.col === null || isNaN(activeCell.col)) return
+
         switch (e.key) {
           case 'ArrowUp':
             e.preventDefault()
@@ -672,105 +674,104 @@ const closeAddColumnDropdown = () => {
           @contextmenu="showContextMenu"
         >
           <thead ref="tableHead">
-          <tr class="nc-grid-header border-1 bg-gray-100 sticky top[-1px]">
-            <th data-testid="grid-id-column">
-              <div class="w-full h-full bg-gray-100 flex min-w-[70px] pl-5 pr-1 items-center"
-                   data-testid="nc-check-all">
-                <template v-if="!readOnly">
-                  <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" />
+            <tr class="nc-grid-header border-1 bg-gray-100 sticky top[-1px]">
+              <th data-testid="grid-id-column">
+                <div class="w-full h-full bg-gray-100 flex min-w-[70px] pl-5 pr-1 items-center" data-testid="nc-check-all">
+                  <template v-if="!readOnly">
+                    <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" />
 
-                <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"
+                      <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="h-full w-[60px] flex items-center justify-center">
-                  <MdiPlus class="text-sm nc-column-add" />
+                <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">
+                    <MdiPlus class="text-sm nc-column-add" />
+                  </div>
 
-                <template #overlay>
-                  <SmartsheetColumnEditOrAddProvider
-                    v-if="addColumnDropdown"
-                    :column-position="columnOrder"
-                    @submit="closeAddColumnDropdown"
-                    @cancel="closeAddColumnDropdown"
-                    @click.stop
-                    @keydown.stop
-                  />
-                </template>
-              </a-dropdown>
-            </th>
-          </tr>
+                  <template #overlay>
+                    <SmartsheetColumnEditOrAddProvider
+                      v-if="addColumnDropdown"
+                      :column-position="columnOrder"
+                      @submit="closeAddColumnDropdown"
+                      @cancel="closeAddColumnDropdown"
+                      @click.stop
+                      @keydown.stop
+                    />
+                  </template>
+                </a-dropdown>
+              </th>
+            </tr>
           </thead>
           <tbody ref="tbodyEl">
-          <LazySmartsheetRow v-for="(row, rowIndex) of data" ref="rowRefs" :key="rowIndex" :row="row">
-            <template #default="{ state }">
-              <tr class="nc-grid-row" :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-[55px]">
-                    <div
-                      v-if="!readOnly || !isLocked"
-                      class="nc-row-no text-xs text-gray-500"
-                      :class="{ toggle: !readOnly, hidden: row.rowMeta.selected }"
-                    >
-                      {{ 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>
+            <LazySmartsheetRow v-for="(row, rowIndex) of data" ref="rowRefs" :key="rowIndex" :row="row">
+              <template #default="{ state }">
+                <tr class="nc-grid-row" :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-[55px]">
+                      <div
+                        v-if="!readOnly || !isLocked"
+                        class="nc-row-no text-xs text-gray-500"
+                        :class="{ toggle: !readOnly, hidden: row.rowMeta.selected }"
+                      >
+                        {{ 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)"
@@ -779,86 +780,86 @@ const closeAddColumnDropdown = () => {
                           >
                             {{ 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)"
-                        >
-                          <MdiArrowExpand
-                            v-e="['c:row-expand']"
-                            class="select-none transform hover:(text-accent scale-120) nc-row-expand"
-                            @click="expandForm(row, state)"
-                          />
-                        </div>
-                      </template>
+                          <div
+                            v-else
+                            class="cursor-pointer flex items-center border-1 active:ring rounded p-1 hover:(bg-primary bg-opacity-10)"
+                          >
+                            <MdiArrowExpand
+                              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"
-                  class="cell relative cursor-pointer nc-grid-cell"
-                  :class="{
+                  </td>
+                  <SmartsheetTableDataCell
+                    v-for="(columnObj, colIndex) of fields"
+                    :key="columnObj.id"
+                    class="cell relative cursor-pointer nc-grid-cell"
+                    :class="{
                       'active': hasEditPermission && isCellSelected(rowIndex, colIndex),
                       'nc-required-cell': isColumnRequiredAndNull(columnObj, row.row),
                     }"
-                  :data-testid="`cell-${columnObj.title}-${rowIndex}`"
-                  :data-key="rowIndex + columnObj.id"
-                  :data-col="columnObj.id"
-                  :data-title="columnObj.title"
-                  @mousedown="handleMouseDown($event, rowIndex, colIndex)"
-                  @mouseover="handleMouseOver(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"
-                    />
+                    :data-testid="`cell-${columnObj.title}-${rowIndex}`"
+                    :data-key="rowIndex + columnObj.id"
+                    :data-col="columnObj.id"
+                    :data-title="columnObj.title"
+                    @mousedown="handleMouseDown($event, rowIndex, colIndex)"
+                    @mouseover="handleMouseOver(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"
+                      />
 
-                    <LazySmartsheetCell
-                      v-else
-                      v-model="row.row[columnObj.title]"
-                      :column="columnObj"
-                      :edit-enabled="
+                      <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">
-            <td
-              v-e="['c:row:add:grid-bottom']"
-              :colspan="visibleColLength + 1"
-              class="text-left pointer nc-grid-add-new-cell cursor-pointer"
-              @click="addEmptyRow()"
-            >
-              <div class="px-2 w-full flex items-center text-gray-500">
-                <MdiPlus class="text-pint-500 text-xs ml-2 text-primary" />
+                        :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">
+              <td
+                v-e="['c:row:add:grid-bottom']"
+                :colspan="visibleColLength + 1"
+                class="text-left pointer nc-grid-add-new-cell cursor-pointer"
+                @click="addEmptyRow()"
+              >
+                <div class="px-2 w-full flex items-center text-gray-500">
+                  <MdiPlus class="text-pint-500 text-xs ml-2 text-primary" />
 
-                <span class="ml-1">
+                  <span class="ml-1">
                     {{ $t('activity.addRow') }}
                   </span>
-              </div>
-            </td>
-          </tr>
+                </div>
+              </td>
+            </tr>
           </tbody>
         </table>
 
@@ -897,8 +898,7 @@ const closeAddColumnDropdown = () => {
               </div>
             </a-menu-item>
 
-            <a-menu-item v-if="contextMenuTarget" data-testid="context-menu-item-copy"
-                         @click="copyValue(contextMenuTarget)">
+            <a-menu-item v-if="contextMenuTarget" data-testid="context-menu-item-copy" @click="copyValue(contextMenuTarget)">
               <div v-e="['a:row:copy']" class="nc-project-menu-item">
                 <!-- Copy -->
                 {{ $t('general.copy') }}

From 196e4a5b61571b5a90357a680ba1e11843c2185d Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 24 Jan 2023 12:52:24 +0530
Subject: [PATCH 18/27] fix(gui): reload app info after setting license

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/account/License.vue   |  5 ++++-
 packages/nc-gui/composables/useGlobal/actions.ts | 11 ++++++++++-
 packages/nc-gui/composables/useGlobal/types.ts   |  1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/account/License.vue b/packages/nc-gui/components/account/License.vue
index a9160edf78..29cd19839b 100644
--- a/packages/nc-gui/components/account/License.vue
+++ b/packages/nc-gui/components/account/License.vue
@@ -1,12 +1,14 @@
 <script lang="ts" setup>
 import { useNuxtApp } from '#app'
 import { message } from 'ant-design-vue'
-import { extractSdkResponseErrorMsg, useApi } from '#imports'
+import { extractSdkResponseErrorMsg, useApi,useGlobal } from '#imports'
 
 const { api, isLoading } = useApi()
 
 const {$e} = useNuxtApp()
 
+const {loadAppInfo} = useGlobal()
+
 let key = $ref('')
 
 const loadLicense = async () => {
@@ -22,6 +24,7 @@ const setLicense = async () => {
   try {
     await api.orgLicense.set({ key: key })
     message.success('License key updated')
+    await loadAppInfo();
   } catch (e) {
     message.error(await extractSdkResponseErrorMsg(e))
   }
diff --git a/packages/nc-gui/composables/useGlobal/actions.ts b/packages/nc-gui/composables/useGlobal/actions.ts
index 09a1803f68..3dcddc296a 100644
--- a/packages/nc-gui/composables/useGlobal/actions.ts
+++ b/packages/nc-gui/composables/useGlobal/actions.ts
@@ -43,5 +43,14 @@ export function useGlobalActions(state: State): Actions {
       })
   }
 
-  return { signIn, signOut, refreshToken }
+  const loadAppInfo = async () => {
+    try {
+      const nuxtApp = useNuxtApp()
+      state.appInfo.value = await nuxtApp.$api.utils.appInfo()
+    } catch (e) {
+      console.error(e)
+    }
+  }
+
+  return { signIn, signOut, refreshToken, loadAppInfo }
 }
diff --git a/packages/nc-gui/composables/useGlobal/types.ts b/packages/nc-gui/composables/useGlobal/types.ts
index 8b4730c9f2..c495dc34f8 100644
--- a/packages/nc-gui/composables/useGlobal/types.ts
+++ b/packages/nc-gui/composables/useGlobal/types.ts
@@ -61,6 +61,7 @@ export interface Actions {
   signOut: () => void
   signIn: (token: string) => void
   refreshToken: () => void
+  loadAppInfo: () => void
 }
 
 export type ReadonlyState = Readonly<Pick<State, 'token' | 'user'>> & Omit<State, 'token' | 'user'>

From 5006f7295d2553b080de18ac7d0224965e03a559 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 24 Jan 2023 12:54:57 +0530
Subject: [PATCH 19/27] fix(gui): sidemenu item key correction

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

diff --git a/packages/nc-gui/pages/account/index.vue b/packages/nc-gui/pages/account/index.vue
index 61cb1caebd..39ec108112 100644
--- a/packages/nc-gui/pages/account/index.vue
+++ b/packages/nc-gui/pages/account/index.vue
@@ -81,7 +81,7 @@ const openKeys = ref([/^\/account\/users/.test($route.fullPath) && 'users'])
             </a-menu-item>
             <a-menu-item
               v-if="isUIAllowed('license')"
-              key="apps"
+              key="license"
               class="group active:(!ring-0) hover:(!bg-primary !bg-opacity-25)"
               @click="navigateTo('/account/license')"
             >

From 33340b5f7462da06507a81ba233496c81d849d7d Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Tue, 24 Jan 2023 10:29:09 +0300
Subject: [PATCH 20/27] fix: remove relations in a logical order from meta on
 base delete

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nocodb/src/lib/models/Base.ts | 51 +++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/models/Base.ts b/packages/nocodb/src/lib/models/Base.ts
index 51afee3866..74af303a6f 100644
--- a/packages/nocodb/src/lib/models/Base.ts
+++ b/packages/nocodb/src/lib/models/Base.ts
@@ -7,7 +7,7 @@ import {
   MetaTable,
 } from '../utils/globals';
 import Model from './Model';
-import { BaseType } from 'nocodb-sdk';
+import { BaseType, UITypes } from 'nocodb-sdk';
 import NocoCache from '../cache/NocoCache';
 import CryptoJS from 'crypto-js';
 import { extractProps } from '../meta/helpers/extractProps';
@@ -277,6 +277,55 @@ export default class Base implements BaseType {
       },
       ncMeta
     );
+
+    const relColumns = [];
+    const relRank = {
+      [UITypes.Lookup]: 1,
+      [UITypes.Rollup]: 2,
+      [UITypes.ForeignKey]: 3,
+      [UITypes.LinkToAnotherRecord]: 4,
+    }
+
+    for (const model of models) {
+      for (const col of await model.getColumns(ncMeta)) {
+        let colOptionTableName = null;
+        let cacheScopeName = null;
+        switch (col.uidt) {
+          case UITypes.Rollup:
+            colOptionTableName = MetaTable.COL_ROLLUP;
+            cacheScopeName = CacheScope.COL_ROLLUP;
+            break;
+          case UITypes.Lookup:
+            colOptionTableName = MetaTable.COL_LOOKUP;
+            cacheScopeName = CacheScope.COL_LOOKUP;
+            break;
+          case UITypes.ForeignKey:
+          case UITypes.LinkToAnotherRecord:
+            colOptionTableName = MetaTable.COL_RELATIONS;
+            cacheScopeName = CacheScope.COL_RELATION;
+            break;
+        }
+        if (colOptionTableName && cacheScopeName) {
+          relColumns.push({ col, colOptionTableName, cacheScopeName });
+        }
+      }
+    }
+
+    relColumns.sort((a, b) => {
+      return relRank[a.col.uidt] - relRank[b.col.uidt];
+    });
+
+    for (const relCol of relColumns) {
+      await ncMeta.metaDelete(null, null, relCol.colOptionTableName, {
+        fk_column_id: relCol.col.id,
+      });
+      await NocoCache.deepDel(
+        relCol.cacheScopeName,
+        `${relCol.cacheScopeName}:${relCol.col.id}`,
+        CacheDelDirection.CHILD_TO_PARENT
+      );
+    }
+
     for (const model of models) {
       await model.delete(ncMeta, true);
     }

From 53408f7d708eb283097717bcc344f30ffe351dca Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 24 Jan 2023 14:18:44 +0530
Subject: [PATCH 21/27] refactor(gui): use a computed property to compute cell
 active/not

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/smartsheet/Grid.vue     | 212 +++++++++---------
 .../composables/useMultiSelect/index.ts       |   7 +-
 2 files changed, 116 insertions(+), 103 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 000b41f034..77311eaed3 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -173,130 +173,138 @@ const getContainerScrollForElement = (
   return scroll
 }
 
-const { isCellSelected, activeCell, handleMouseDown, handleMouseOver, handleCellClick, clearSelectedRange, copyValue } =
-  useMultiSelect(
-    meta,
-    fields,
-    data,
-    $$(editEnabled),
-    isPkAvail,
-    clearCell,
-    makeEditable,
-    scrollToCell,
-    (e: KeyboardEvent) => {
-      // ignore navigating if picker(Date, Time, DateTime, Year)
-      // or single/multi select options is open
-      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',
-      )
-      if (activePickerOrDropdownEl) {
+const {
+  isCellSelected,
+  activeCell,
+  handleMouseDown,
+  handleMouseOver,
+  handleCellClick,
+  clearSelectedRange,
+  copyValue,
+  isCellActive,
+} = useMultiSelect(
+  meta,
+  fields,
+  data,
+  $$(editEnabled),
+  isPkAvail,
+  clearCell,
+  makeEditable,
+  scrollToCell,
+  (e: KeyboardEvent) => {
+    // ignore navigating if picker(Date, Time, DateTime, Year)
+    // or single/multi select options is open
+    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',
+    )
+    if (activePickerOrDropdownEl) {
+      e.preventDefault()
+      return true
+    }
+
+    // skip keyboard event handling if there is a drawer / modal
+    if (isDrawerOrModalExist()) {
+      return true
+    }
+
+    const cmdOrCtrl = isMac() ? e.metaKey : e.ctrlKey
+    const altOrOptionKey = e.altKey
+    if (e.key === ' ') {
+      if (isCellActive.value && !editEnabled && hasEditPermission) {
         e.preventDefault()
+        clearSelectedRange()
+        const row = data.value[activeCell.row]
+        expandForm(row)
         return true
       }
-
-      // skip keyboard event handling if there is a drawer / modal
-      if (isDrawerOrModalExist()) {
+    } else if (e.key === 'Escape') {
+      if (editEnabled) {
+        editEnabled = false
+        return true
+      }
+    } else if (e.key === 'Enter') {
+      if (e.shiftKey) {
+        // add a line break for types like LongText / JSON
+        return true
+      }
+      if (editEnabled) {
+        editEnabled = false
         return true
       }
+    }
+
+    if (cmdOrCtrl) {
+      if (!isCellActive.value) return
 
-      const cmdOrCtrl = isMac() ? e.metaKey : e.ctrlKey
-      const altOrOptionKey = e.altKey
-      if (e.key === ' ') {
-        if (activeCell.row != null && !isNaN(activeCell.row) && !editEnabled && hasEditPermission) {
+      switch (e.key) {
+        case 'ArrowUp':
           e.preventDefault()
           clearSelectedRange()
-          const row = data.value[activeCell.row]
-          expandForm(row)
+          activeCell.row = 0
+          activeCell.col = activeCell.col ?? 0
+          scrollToCell?.()
+          editEnabled = false
           return true
-        }
-      } else if (e.key === 'Escape') {
-        if (editEnabled) {
+        case 'ArrowDown':
+          e.preventDefault()
+          clearSelectedRange()
+          activeCell.row = data.value.length - 1
+          activeCell.col = activeCell.col ?? 0
+          scrollToCell?.()
           editEnabled = false
           return true
-        }
-      } else if (e.key === 'Enter') {
-        if (e.shiftKey) {
-          // add a line break for types like LongText / JSON
+        case 'ArrowRight':
+          e.preventDefault()
+          clearSelectedRange()
+          activeCell.row = activeCell.row ?? 0
+          activeCell.col = fields.value?.length - 1
+          scrollToCell?.()
+          editEnabled = false
           return true
-        }
-        if (editEnabled) {
+        case 'ArrowLeft':
+          e.preventDefault()
+          clearSelectedRange()
+          activeCell.row = activeCell.row ?? 0
+          activeCell.col = 0
+          scrollToCell?.()
           editEnabled = false
           return true
-        }
-      }
-
-      if (cmdOrCtrl) {
-        if (activeCell.row === null || isNaN(activeCell.row) || activeCell.col === null || isNaN(activeCell.col)) return
-
-        switch (e.key) {
-          case 'ArrowUp':
-            e.preventDefault()
-            clearSelectedRange()
-            activeCell.row = 0
-            activeCell.col = activeCell.col ?? 0
-            scrollToCell?.()
-            editEnabled = false
-            return true
-          case 'ArrowDown':
-            e.preventDefault()
-            clearSelectedRange()
-            activeCell.row = data.value.length - 1
-            activeCell.col = activeCell.col ?? 0
-            scrollToCell?.()
-            editEnabled = false
-            return true
-          case 'ArrowRight':
-            e.preventDefault()
-            clearSelectedRange()
-            activeCell.row = activeCell.row ?? 0
-            activeCell.col = fields.value?.length - 1
-            scrollToCell?.()
-            editEnabled = false
-            return true
-          case 'ArrowLeft':
-            e.preventDefault()
-            clearSelectedRange()
-            activeCell.row = activeCell.row ?? 0
-            activeCell.col = 0
-            scrollToCell?.()
-            editEnabled = false
-            return true
-        }
       }
+    }
 
-      if (altOrOptionKey) {
-        switch (e.keyCode) {
-          case 82: {
-            // ALT + R
-            if (isAddingEmptyRowAllowed) {
-              $e('c:shortcut', { key: 'ALT + R' })
-              addEmptyRow()
-            }
-            break
+    if (altOrOptionKey) {
+      switch (e.keyCode) {
+        case 82: {
+          // ALT + R
+          if (isAddingEmptyRowAllowed) {
+            $e('c:shortcut', { key: 'ALT + R' })
+            addEmptyRow()
           }
-          case 67: {
-            // ALT + C
-            if (isAddingColumnAllowed) {
-              $e('c:shortcut', { key: 'ALT + C' })
-              addColumnDropdown.value = true
-            }
-            break
+          break
+        }
+        case 67: {
+          // ALT + C
+          if (isAddingColumnAllowed) {
+            $e('c:shortcut', { key: 'ALT + C' })
+            addColumnDropdown.value = true
           }
+          break
         }
       }
-    },
-    async (ctx: { row: number; col?: number; updatedColumnTitle?: string }) => {
-      const rowObj = data.value[ctx.row]
-      const columnObj = ctx.col !== undefined ? fields.value[ctx.col] : null
+    }
+  },
+  async (ctx: { row: number; col?: number; updatedColumnTitle?: string }) => {
+    const rowObj = data.value[ctx.row]
+    const columnObj = ctx.col !== undefined ? fields.value[ctx.col] : null
 
-      if (!ctx.updatedColumnTitle && isVirtualCol(columnObj)) {
-        return
-      }
+    if (!ctx.updatedColumnTitle && isVirtualCol(columnObj)) {
+      return
+    }
 
-      // update/save cell value
-      await updateOrSaveRow(rowObj, ctx.updatedColumnTitle || columnObj.title)
-    },
-  )
+    // update/save cell value
+    await updateOrSaveRow(rowObj, ctx.updatedColumnTitle || columnObj.title)
+  },
+)
 
 function scrollToCell(row?: number | null, col?: number | null) {
   row = row ?? activeCell.row
diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index d596e82e84..5d7c4c7239 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -61,6 +61,10 @@ export function useMultiSelect(
 
   const columnLength = $computed(() => unref(fields)?.length)
 
+  const isCellActive = computed(
+    () => !(activeCell.row === null || activeCell.col === null || isNaN(activeCell.row) || isNaN(activeCell.col)),
+  )
+
   function makeActive(row: number, col: number) {
     if (activeCell.row === row && activeCell.col === col) {
       return
@@ -171,7 +175,7 @@ export function useMultiSelect(
       return true
     }
 
-    if (activeCell.row === null || activeCell.col === null || isNaN(activeCell.row) || isNaN(activeCell.col)) {
+    if (!isCellActive.value) {
       return
     }
 
@@ -367,6 +371,7 @@ export function useMultiSelect(
   useEventListener(document, 'mouseup', handleMouseUp)
 
   return {
+    isCellActive,
     handleMouseDown,
     handleMouseOver,
     clearSelectedRange,

From 9fc494d7d567b7c22115c363dc22264605972e18 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 24 Jan 2023 14:25:15 +0530
Subject: [PATCH 22/27] chore(gui): code formatting

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

diff --git a/packages/nc-gui/components/account/License.vue b/packages/nc-gui/components/account/License.vue
index 29cd19839b..e718e0e649 100644
--- a/packages/nc-gui/components/account/License.vue
+++ b/packages/nc-gui/components/account/License.vue
@@ -5,9 +5,9 @@ import { extractSdkResponseErrorMsg, useApi,useGlobal } from '#imports'
 
 const { api, isLoading } = useApi()
 
-const {$e} = useNuxtApp()
+const { $e } = useNuxtApp()
 
-const {loadAppInfo} = useGlobal()
+const { loadAppInfo } = useGlobal()
 
 let key = $ref('')
 

From 26af8b4b96d8cbb9a59de59edac0cac8153dbe8f Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 24 Jan 2023 14:57:20 +0530
Subject: [PATCH 23/27] fix(api): include money type for currency

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
index ba54975770..67c4e79cc4 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
@@ -1142,6 +1142,7 @@ export class MssqlUi {
           'real',
           'smallint',
           'tinyint',
+          'money',
         ];
 
       case 'Percent':

From e1c4849c0ecc5a422bdb1c4cd23055dff62f54ef Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 24 Jan 2023 15:06:59 +0530
Subject: [PATCH 24/27] refactor: return number for default length value

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

diff --git a/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
index 67c4e79cc4..74451c3374 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
@@ -190,7 +190,7 @@ export class MssqlUi {
         return '';
 
       case 'decimal':
-        return '10';
+        return 10;
 
       case 'float':
         return '';

From b5068334b5417793e00a3eca670e960e700bc38c Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 24 Jan 2023 14:55:21 +0530
Subject: [PATCH 25/27] fix(api): in not like result include null values as
 well

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../db/sql-data-mapper/lib/sql/conditionV2.ts | 75 ++++++++++---------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts
index 13b25412ae..54ad7faaea 100644
--- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts
+++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts
@@ -303,50 +303,55 @@ const parseConditionV2 = async (
             } else {
               val = val.startsWith('%') || val.endsWith('%') ? val : `%${val}%`;
             }
-            if (qb?.client?.config?.client === 'pg') {
-              qb = qb.whereRaw('??::text not ilike ?', [field, val]);
-            } else {
-              qb = qb.whereNot(field, 'like', val);
-            }
+            qb.where((nestedQb) => {
+              if (qb?.client?.config?.client === 'pg') {
+                nestedQb.whereRaw('??::text not ilike ?', [field, val]);
+              } else {
+                nestedQb.whereNot(field, 'like', val);
+              }
+              nestedQb.orWhereNull(field);
+            });
             break;
           case 'allof':
           case 'anyof':
           case 'nallof':
           case 'nanyof':
-            // Condition for filter, without negation
-            const condition = (builder: Knex.QueryBuilder) => {
-              const items = val.split(',').map((item) => item.trim());
-              for (let i = 0; i < items.length; i++) {
-                let sql;
-                const bindings = [field, `%,${items[i]},%`];
-                if (qb?.client?.config?.client === 'pg') {
-                  sql = "(',' || ??::text || ',') ilike ?";
-                } else if (qb?.client?.config?.client === 'sqlite3') {
-                  sql = "(',' || ?? || ',') like ?";
-                } else {
-                  sql = "CONCAT(',', ??, ',') like ?";
-                }
-                if (i === 0) {
-                  builder = builder.whereRaw(sql, bindings);
-                } else {
-                  if (
-                    filter.comparison_op === 'allof' ||
-                    filter.comparison_op === 'nallof'
-                  ) {
-                    builder = builder.andWhereRaw(sql, bindings);
+            {
+              // Condition for filter, without negation
+              const condition = (builder: Knex.QueryBuilder) => {
+                const items = val.split(',').map((item) => item.trim());
+                for (let i = 0; i < items.length; i++) {
+                  let sql;
+                  const bindings = [field, `%,${items[i]},%`];
+                  if (qb?.client?.config?.client === 'pg') {
+                    sql = "(',' || ??::text || ',') ilike ?";
+                  } else if (qb?.client?.config?.client === 'sqlite3') {
+                    sql = "(',' || ?? || ',') like ?";
+                  } else {
+                    sql = "CONCAT(',', ??, ',') like ?";
+                  }
+                  if (i === 0) {
+                    builder = builder.whereRaw(sql, bindings);
                   } else {
-                    builder = builder.orWhereRaw(sql, bindings);
+                    if (
+                      filter.comparison_op === 'allof' ||
+                      filter.comparison_op === 'nallof'
+                    ) {
+                      builder = builder.andWhereRaw(sql, bindings);
+                    } else {
+                      builder = builder.orWhereRaw(sql, bindings);
+                    }
                   }
                 }
+              };
+              if (
+                filter.comparison_op === 'allof' ||
+                filter.comparison_op === 'anyof'
+              ) {
+                qb = qb.where(condition);
+              } else {
+                qb = qb.whereNot(condition).orWhereNull(field);
               }
-            };
-            if (
-              filter.comparison_op === 'allof' ||
-              filter.comparison_op === 'anyof'
-            ) {
-              qb = qb.where(condition);
-            } else {
-              qb = qb.whereNot(condition).orWhereNull(field);
             }
             break;
           case 'gt':

From 1ccc9a8375aef42a5e78796c295ceb4ecb59e039 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 24 Jan 2023 16:19:06 +0530
Subject: [PATCH 26/27] fix: exclude isEmpty & isNotEmpty filter options for
 number based datatypes

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 packages/nc-gui/utils/filterUtils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/utils/filterUtils.ts b/packages/nc-gui/utils/filterUtils.ts
index f3454b0bc9..53822a76d0 100644
--- a/packages/nc-gui/utils/filterUtils.ts
+++ b/packages/nc-gui/utils/filterUtils.ts
@@ -41,13 +41,13 @@ export const comparisonOpList: {
     text: 'is empty',
     value: 'empty',
     ignoreVal: true,
-    excludedTypes: [UITypes.Checkbox, UITypes.Rating],
+    excludedTypes: [UITypes.Checkbox, UITypes.Rating, UITypes.Number, UITypes.Decimal, UITypes.Percent, UITypes.Currency],
   },
   {
     text: 'is not empty',
     value: 'notempty',
     ignoreVal: true,
-    excludedTypes: [UITypes.Checkbox, UITypes.Rating],
+    excludedTypes: [UITypes.Checkbox, UITypes.Rating, UITypes.Number, UITypes.Decimal, UITypes.Percent, UITypes.Currency],
   },
   {
     text: 'is null',

From 69d75f74e81f628336a720fdf241f4b97e506357 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Tue, 24 Jan 2023 16:31:50 +0530
Subject: [PATCH 27/27] fix(nc-gui): Cleanup

---
 .../components/tabs/auth/UserManagement.vue   |  2 -
 .../auth/user-management/FeedbackForm.vue     | 36 ----------------
 .../nc-gui/composables/useGlobal/state.ts     |  5 ---
 .../nc-gui/composables/useGlobal/types.ts     |  8 ----
 packages/nc-gui/plugins/feedbackForm.ts       | 41 -------------------
 packages/nocodb/src/lib/meta/api/utilApis.ts  |  8 ----
 6 files changed, 100 deletions(-)
 delete mode 100644 packages/nc-gui/components/tabs/auth/user-management/FeedbackForm.vue
 delete mode 100644 packages/nc-gui/plugins/feedbackForm.ts

diff --git a/packages/nc-gui/components/tabs/auth/UserManagement.vue b/packages/nc-gui/components/tabs/auth/UserManagement.vue
index 71d92ed282..3321944e41 100644
--- a/packages/nc-gui/components/tabs/auth/UserManagement.vue
+++ b/packages/nc-gui/components/tabs/auth/UserManagement.vue
@@ -360,8 +360,6 @@ const isSuperAdmin = (user: { main_roles?: string }) => {
         show-less-items
         @change="loadUsers"
       />
-
-      <LazyTabsAuthUserManagementFeedbackForm />
     </div>
   </div>
 </template>
diff --git a/packages/nc-gui/components/tabs/auth/user-management/FeedbackForm.vue b/packages/nc-gui/components/tabs/auth/user-management/FeedbackForm.vue
deleted file mode 100644
index e9031f4406..0000000000
--- a/packages/nc-gui/components/tabs/auth/user-management/FeedbackForm.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<script setup lang="ts">
-import { ref, useGlobal } from '#imports'
-
-const { feedbackForm } = useGlobal()
-
-const showForm = ref(false)
-
-// todo: why this timeout?
-setTimeout(() => (showForm.value = true), 60000)
-</script>
-
-<template>
-  <div v-if="showForm && feedbackForm && !feedbackForm.isHidden" class="nc-feedback-form-wrapper mt-6">
-    <MaterialSymbolsCloseRounded class="nc-close-icon" @click="feedbackForm.isHidden = true" />
-
-    <iframe :src="feedbackForm.url" width="100%" height="500" frameborder="0" marginheight="0" marginwidth="0">Loading… </iframe>
-  </div>
-  <div v-else />
-</template>
-
-<style scoped lang="scss">
-.nc-feedback-form-wrapper {
-  width: 100%;
-  position: relative;
-
-  iframe {
-    margin: 0 auto;
-  }
-
-  .nc-close-icon {
-    position: absolute;
-    top: 5px;
-    right: 10px;
-  }
-}
-</style>
diff --git a/packages/nc-gui/composables/useGlobal/state.ts b/packages/nc-gui/composables/useGlobal/state.ts
index abd75a133f..c036002117 100644
--- a/packages/nc-gui/composables/useGlobal/state.ts
+++ b/packages/nc-gui/composables/useGlobal/state.ts
@@ -59,11 +59,6 @@ export function useGlobalState(storageKey = 'nocodb-gui-v2'): State {
     token: null,
     lang: preferredLanguage,
     darkMode: prefersDarkMode,
-    feedbackForm: {
-      url: 'https://docs.google.com/forms/d/e/1FAIpQLSeTlAfZjszgr53lArz3NvUEnJGOT9JtG9NAU5d0oQwunDS2Pw/viewform?embedded=true',
-      createdAt: new Date('2020-01-01T00:00:00.000Z').toISOString(),
-      isHidden: false,
-    },
     filterAutoSave: true,
     previewAs: null,
     includeM2M: false,
diff --git a/packages/nc-gui/composables/useGlobal/types.ts b/packages/nc-gui/composables/useGlobal/types.ts
index c495dc34f8..ce9975e519 100644
--- a/packages/nc-gui/composables/useGlobal/types.ts
+++ b/packages/nc-gui/composables/useGlobal/types.ts
@@ -4,13 +4,6 @@ import type { JwtPayload } from 'jwt-decode'
 import type { Language, ProjectRole, User } from '~/lib'
 import type { useCounter } from '#imports'
 
-export interface FeedbackForm {
-  url: string
-  createdAt: string
-  isHidden: boolean
-  lastFormPollDate?: string
-}
-
 export interface AppInfo {
   ncSiteUrl: string
   authType: 'jwt' | 'none'
@@ -32,7 +25,6 @@ export interface StoredState {
   token: string | null
   lang: keyof typeof Language
   darkMode: boolean
-  feedbackForm: FeedbackForm
   filterAutoSave: boolean
   previewAs: ProjectRole | null
   includeM2M: boolean
diff --git a/packages/nc-gui/plugins/feedbackForm.ts b/packages/nc-gui/plugins/feedbackForm.ts
deleted file mode 100644
index 5c6e58955f..0000000000
--- a/packages/nc-gui/plugins/feedbackForm.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import dayjs from 'dayjs'
-import { defineNuxtPlugin, useGlobal, useNuxtApp } from '#imports'
-
-const handleFeedbackForm = async () => {
-  let { feedbackForm: currentFeedbackForm } = $(useGlobal())
-
-  if (!currentFeedbackForm) return
-
-  const { $api } = useNuxtApp()
-
-  const isFirstTimePolling = !currentFeedbackForm.lastFormPollDate
-
-  const now = dayjs()
-
-  const lastFormPolledDate = dayjs(currentFeedbackForm.lastFormPollDate)
-
-  if (isFirstTimePolling || dayjs.duration(now.diff(lastFormPolledDate)).days() > 0) {
-    $api.instance
-      .get('/api/v1/feedback_form')
-      .then((response) => {
-        try {
-          const { data: feedbackForm } = response
-          if (!feedbackForm.error) {
-            const isFetchedFormDuplicate = currentFeedbackForm.url === feedbackForm.url
-
-            currentFeedbackForm = {
-              url: feedbackForm.url,
-              lastFormPollDate: now.toISOString(),
-              createdAt: feedbackForm.created_at,
-              isHidden: isFetchedFormDuplicate ? currentFeedbackForm.isHidden : false,
-            }
-          }
-        } catch (e) {}
-      })
-      .catch(() => {})
-  }
-}
-
-export default defineNuxtPlugin(() => {
-  handleFeedbackForm()
-})
diff --git a/packages/nocodb/src/lib/meta/api/utilApis.ts b/packages/nocodb/src/lib/meta/api/utilApis.ts
index 6b7acef4eb..7db15d7243 100644
--- a/packages/nocodb/src/lib/meta/api/utilApis.ts
+++ b/packages/nocodb/src/lib/meta/api/utilApis.ts
@@ -16,7 +16,6 @@ import NcConfigFactory, {
 import User from '../../models/User';
 import catchError from '../helpers/catchError';
 import axios from 'axios';
-import { feedbackForm } from 'nc-help';
 
 const versionCache = {
   releaseVersion: null,
@@ -94,12 +93,6 @@ export async function versionInfo(_req: Request, res: Response) {
   res.json(response);
 }
 
-export function feedbackFormGet(_req: Request, res: Response) {
-  feedbackForm()
-    .then((form) => res.json(form))
-    .catch((e) => res.json({ error: e.message }));
-}
-
 export async function appHealth(_: Request, res: Response) {
   res.json({
     message: 'OK',
@@ -379,7 +372,6 @@ export default (router) => {
   router.post('/api/v1/db/meta/axiosRequestMake', catchError(axiosRequestMake));
   router.get('/api/v1/version', catchError(versionInfo));
   router.get('/api/v1/health', catchError(appHealth));
-  router.get('/api/v1/feedback_form', catchError(feedbackFormGet));
   router.post('/api/v1/url_to_config', catchError(urlToDbConfig));
   router.get(
     '/api/v1/aggregated-meta-info',