From 88e648c5a97213b9ef08e6f4fbb8ac1f36126598 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 16 Jan 2023 15:14:41 +0530
Subject: [PATCH 01/18] fix(gui): avoid opening expanded form in shared view

re #4580

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 304daa4b8e..1d93d9eeca 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -201,7 +201,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) {
+        if (activeCell.row != null && !editEnabled && hasEditPermission?.value) {
           e.preventDefault()
           clearSelectedRange()
           const row = data.value[activeCell.row]

From 96040220a3b07e40f44ed3005bc88656af3c2f77 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 16 Jan 2023 15:56:48 +0530
Subject: [PATCH 02/18] fix(gui): make add icon visible in dark mode and show
 it all the time in shared form view

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../pages/[projectType]/form/[viewId]/index/index.vue     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/pages/[projectType]/form/[viewId]/index/index.vue b/packages/nc-gui/pages/[projectType]/form/[viewId]/index/index.vue
index 3902c279a5..9cfca9bab8 100644
--- a/packages/nc-gui/pages/[projectType]/form/[viewId]/index/index.vue
+++ b/packages/nc-gui/pages/[projectType]/form/[viewId]/index/index.vue
@@ -85,7 +85,7 @@ function isRequired(_columnObj: Record<string, any>, required = false) {
                     <LazySmartsheetVirtualCell
                       v-if="isVirtualCol(field)"
                       :model-value="null"
-                      class="mt-0 nc-input"
+                      class="mt-0 nc-input nc-cell"
                       :data-testid="`nc-form-input-cell-${field.label || field.title}`"
                       :class="`nc-form-input-${field.title?.replaceAll(' ', '')}`"
                       :column="field"
@@ -133,3 +133,9 @@ function isRequired(_columnObj: Record<string, any>, required = false) {
     </div>
   </div>
 </template>
+
+<style lang="scss" scoped>
+:deep(.nc-cell .nc-action-icon) {
+  @apply !text-white-500 !bg-white/50 !rounded-full !p-1 !text-xs !w-7 !h-7 !flex !items-center !justify-center !cursor-pointer !hover:!bg-white-600 !hover:!text-white-600 !transition;
+}
+</style>

From ee8621b82cc85bf3e84312ce913a1a3014276e65 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 17 Jan 2023 11:08:39 +0530
Subject: [PATCH 03/18] fix(gui): update refresh-token api url

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/composables/useApi/interceptors.ts | 4 ++--
 packages/nc-gui/composables/useGlobal/actions.ts   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/composables/useApi/interceptors.ts b/packages/nc-gui/composables/useApi/interceptors.ts
index e65cb25edb..22e2c139ff 100644
--- a/packages/nc-gui/composables/useApi/interceptors.ts
+++ b/packages/nc-gui/composables/useApi/interceptors.ts
@@ -38,7 +38,7 @@ export function addAxiosInterceptors(api: Api<any>) {
       }
 
       // Logout user if token refresh didn't work or user is disabled
-      if (error.config.url === '/auth/refresh-token') {
+      if (error.config.url === '/auth/token/refresh') {
         state.signOut()
 
         return Promise.reject(error)
@@ -46,7 +46,7 @@ export function addAxiosInterceptors(api: Api<any>) {
 
       // Try request again with new token
       return api.instance
-        .post('/auth/refresh-token', null, {
+        .post('/auth/token/refresh', null, {
           withCredentials: true,
         })
         .then((token) => {
diff --git a/packages/nc-gui/composables/useGlobal/actions.ts b/packages/nc-gui/composables/useGlobal/actions.ts
index 0e1e265de2..09a1803f68 100644
--- a/packages/nc-gui/composables/useGlobal/actions.ts
+++ b/packages/nc-gui/composables/useGlobal/actions.ts
@@ -29,7 +29,7 @@ export function useGlobalActions(state: State): Actions {
     const t = nuxtApp.vueApp.i18n.global.t
 
     nuxtApp.$api.instance
-      .post('/auth/refresh-token', null, {
+      .post('/auth/token/refresh', null, {
         withCredentials: true,
       })
       .then((response) => {

From ab1e60a97c6d5c688dacbd23bca40cb8f20c4ac3 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 17 Jan 2023 14:50:24 +0530
Subject: [PATCH 04/18] fix(gui): skip if related view/hook/column of a filter
 is not found

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nocodb/src/lib/version-upgrader/ncFilterUpgrader.ts   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader.ts
index 1515f88b8b..6c250bd04c 100644
--- a/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader.ts
+++ b/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader.ts
@@ -21,7 +21,13 @@ export default async function ({ ncMeta }: NcUpgraderCtx) {
     } else {
       continue;
     }
-    if (filter.project_id != model.project_id) {
+
+    // skip if related model is not found
+    if (!model) {
+      continue;
+    }
+
+    if (filter.project_id !== model.project_id) {
       await ncMeta.metaUpdate(
         null,
         null,

From cc95ca634f3ddfd5ce45beb51f077c429fb86f04 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 17 Jan 2023 14:51:33 +0530
Subject: [PATCH 05/18] fix(gui): typo correction

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 1d93d9eeca..92b0092225 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -201,7 +201,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?.value) {
+        if (activeCell.row != null && !editEnabled && hasEditPermission) {
           e.preventDefault()
           clearSelectedRange()
           const row = data.value[activeCell.row]

From c2c6bf5c1cce3e3e01898ee410b1056bbeaee20a Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 17 Jan 2023 15:17:09 +0530
Subject: [PATCH 06/18] refactor(gui): hide appstore from project settings
 modal

re #4852

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/dashboard/settings/Modal.vue      | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/settings/Modal.vue b/packages/nc-gui/components/dashboard/settings/Modal.vue
index 5f563dc0b9..a67233cabd 100644
--- a/packages/nc-gui/components/dashboard/settings/Modal.vue
+++ b/packages/nc-gui/components/dashboard/settings/Modal.vue
@@ -1,10 +1,8 @@
 <script setup lang="ts">
 import type { FunctionalComponent, SVGAttributes } from 'vue'
-import AppStore from './AppStore.vue'
 import DataSources from './DataSources.vue'
 import Misc from './Misc.vue'
 import { DataSourcesSubTab, useI18n, useNuxtApp, useUIPermission, useVModel, watch } from '#imports'
-import StoreFrontOutline from '~icons/mdi/storefront-outline'
 import TeamFillIcon from '~icons/ri/team-fill'
 import MultipleTableIcon from '~icons/mdi/table-multiple'
 import NotebookOutline from '~icons/mdi/notebook-outline'
@@ -81,20 +79,6 @@ const tabsInfo: TabGroup = {
       $e('c:settings:team-auth')
     },
   },
-  appStore: {
-    // App Store
-    title: t('title.appStore'),
-    icon: StoreFrontOutline,
-    subTabs: {
-      new: {
-        title: 'Apps',
-        body: AppStore,
-      },
-    },
-    onClick: () => {
-      $e('c:settings:appstore')
-    },
-  },
   dataSources: {
     // Data Sources
     title: 'Data Sources',

From 9792a3a0add494dd8d9b21c031ea616591f9b921 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 17 Jan 2023 17:23:00 +0530
Subject: [PATCH 07/18] feat(gui): add checked and notchecked option in filter

re #2014
---
 .../smartsheet/toolbar/ColumnFilter.vue       | 16 ++++----------
 packages/nc-gui/utils/filterUtils.ts          | 21 ++++++++++++++++++-
 .../db/sql-data-mapper/lib/sql/conditionV2.ts | 19 ++++++++++++++++-
 .../src/lib/meta/helpers/webhookHelpers.ts    |  6 ++++++
 packages/nocodb/src/lib/models/Filter.ts      |  2 ++
 packages/nocodb/src/lib/utils/projectAcl.ts   |  1 +
 6 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
index 1876242da9..f66e894553 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
@@ -100,11 +100,6 @@ watch(
   },
 )
 
-const getApplicableFilters = (id?: string) => {
-  const colType = (meta.value?.columnsById as Record<string, ColumnType>)?.[id ?? '']?.uidt
-  return comparisonOpList.filter((op) => !op.types || op.types.includes(colType))
-}
-
 const applyChanges = async (hookId?: string, _nested = false) => {
   await sync(hookId, _nested)
 
@@ -218,18 +213,15 @@ defineExpose({
               dropdown-class-name="nc-dropdown-filter-comp-op"
               @change="filterUpdateCondition(filter, i)"
             >
-              <a-select-option
-                v-for="compOp in getApplicableFilters(filter.fk_column_id)"
-                :key="compOp.value"
-                :value="compOp.value"
-                class=""
-              >
+              <template v-for="compOp in comparisonOpList" :key="compOp.value">
+              <a-select-option  :value="compOp.value" v-if=" !compOp.allowedTypes || (filter.fk_column_id && compOp.allowedTypes.includes(types[filter.fk_column_id]))" >
                 {{ compOp.text }}
               </a-select-option>
+              </template>
             </a-select>
 
             <span
-              v-if="filter.comparison_op && ['null', 'notnull', 'empty', 'notempty'].includes(filter.comparison_op)"
+              v-if="filter.comparison_op && ['null', 'notnull','checked', 'notchecked', 'empty', 'notempty'].includes(filter.comparison_op)"
               :key="`span${i}`"
             />
 
diff --git a/packages/nc-gui/utils/filterUtils.ts b/packages/nc-gui/utils/filterUtils.ts
index 249a26664e..867b0cb5a4 100644
--- a/packages/nc-gui/utils/filterUtils.ts
+++ b/packages/nc-gui/utils/filterUtils.ts
@@ -1,4 +1,11 @@
-export const comparisonOpList = [
+import { UITypes } from 'nocodb-sdk'
+
+export const comparisonOpList: {
+  text: string
+  value: string
+  ignoreVal?: boolean
+  allowedTypes?: string[]
+}[] = [
   {
     text: 'is equal',
     value: 'eq',
@@ -35,6 +42,18 @@ export const comparisonOpList = [
     value: 'notnull',
     ignoreVal: true,
   },
+  {
+    text: 'is checked',
+    value: 'checked',
+    ignoreVal: true,
+    allowedTypes: ['boolean'],
+  },
+  {
+    text: 'is not checked',
+    value: 'notchecked',
+    ignoreVal: true,
+    allowedTypes: ['boolean'],
+  },
   {
     text: 'contains all of',
     value: 'allof',
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 6363e79f3a..8c44151310 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
@@ -9,7 +9,6 @@ import RollupColumn from '../../../../models/RollupColumn';
 import formulaQueryBuilderv2 from './formulav2/formulaQueryBuilderv2';
 import FormulaColumn from '../../../../models/FormulaColumn';
 import { RelationTypes, UITypes } from 'nocodb-sdk';
-// import LookupColumn from '../../../models/LookupColumn';
 import { sanitize } from './helpers/sanitize';
 
 export default async function conditionV2(
@@ -368,6 +367,10 @@ const parseConditionV2 = async (
               qb = qb.where(customWhereClause || field, '');
             else if (filter.value === 'notempty')
               qb = qb.whereNot(customWhereClause || field, '');
+            else if (filter.value === 'true')
+              qb = qb.where(customWhereClause || field, true);
+            else if (filter.value === 'false')
+              qb = qb.where(customWhereClause || field, false);
             break;
           case 'isnot':
             if (filter.value === 'null')
@@ -378,6 +381,10 @@ const parseConditionV2 = async (
               qb = qb.whereNot(customWhereClause || field, '');
             else if (filter.value === 'notempty')
               qb = qb.where(customWhereClause || field, '');
+            else if (filter.value === 'true')
+              qb = qb.whereNot(customWhereClause || field, true);
+            else if (filter.value === 'false')
+              qb = qb.whereNot(customWhereClause || field, false);
             break;
           case 'lt':
             qb = qb.where(field, customWhereClause ? '>' : '<', val);
@@ -405,6 +412,16 @@ const parseConditionV2 = async (
           case 'notnull':
             qb = qb.whereNotNull(customWhereClause || field);
             break;
+          case 'checked':
+            qb = qb.where(customWhereClause || field, true);
+            break;
+          case 'notchecked':
+            qb = qb.where((grpdQb) => {
+              grpdQb
+                .whereNull(customWhereClause || field)
+                .orWhere(customWhereClause || field, false);
+            });
+            break;
           case 'btw':
             qb = qb.whereBetween(field, val.split(','));
             break;
diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index a2849e6a51..c41997e5c3 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -66,6 +66,12 @@ export async function validateCondition(filters: Filter[], data: any) {
           data[field] === undefined
         );
         break;
+      case 'checked':
+        res = !!data[field];
+        break;
+      case 'notchecked':
+        res = !data[field];
+        break;
       case 'null':
         res = res = data[field] === null;
         break;
diff --git a/packages/nocodb/src/lib/models/Filter.ts b/packages/nocodb/src/lib/models/Filter.ts
index ea82c0fb42..d6683d82f1 100644
--- a/packages/nocodb/src/lib/models/Filter.ts
+++ b/packages/nocodb/src/lib/models/Filter.ts
@@ -32,6 +32,8 @@ export default class Filter {
     | 'notempty'
     | 'null'
     | 'notnull'
+    | 'checked'
+    | 'notchecked'
     | 'allof'
     | 'anyof'
     | 'nallof'
diff --git a/packages/nocodb/src/lib/utils/projectAcl.ts b/packages/nocodb/src/lib/utils/projectAcl.ts
index b9c1317313..2ca914d7d6 100644
--- a/packages/nocodb/src/lib/utils/projectAcl.ts
+++ b/packages/nocodb/src/lib/utils/projectAcl.ts
@@ -17,6 +17,7 @@ export default {
       pluginRead: true,
       pluginUpdate: true,
       isPluginActive: true,
+      projectDelete: true,
     },
   },
   guest: {},

From 1d11ba28613919aa59f9a24b7fb5d58c3a3b7707 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 17 Jan 2023 17:59:54 +0530
Subject: [PATCH 08/18] feat(gui): hide unnecessary options from filter
 comparison dropdown based on type

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../smartsheet/toolbar/ColumnFilter.vue       | 47 ++++++++++---------
 packages/nc-gui/utils/filterUtils.ts          | 43 ++++++++++-------
 2 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
index f66e894553..8d970eaf8f 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import type { ColumnType, FilterType } from 'nocodb-sdk'
-import { UITypes } from 'nocodb-sdk'
+import type { FilterType } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   MetaInj,
@@ -70,15 +69,7 @@ const types = computed(() => {
   }
 
   return meta.value?.columns?.reduce((obj: any, col: any) => {
-    switch (col.uidt) {
-      case UITypes.Number:
-      case UITypes.Decimal:
-        obj[col.title] = obj[col.column_name] = 'number'
-        break
-      case UITypes.Checkbox:
-        obj[col.title] = obj[col.column_name] = 'boolean'
-        break
-    }
+    obj[col.id] = col.uidt
     return obj
   }, {})
 })
@@ -112,6 +103,21 @@ const applyChanges = async (hookId?: string, _nested = false) => {
   }
 }
 
+const isComparisonOpAllowed = (filter: FilterType, compOp: typeof comparisonOpList[number]) => {
+  // show current selected value in list even if not allowed
+  if (filter.comparison_op === compOp.value) return true
+
+  // include allowed values only if selected column type matches
+  if (compOp.includedTypes) {
+    return filter.fk_column_id && compOp.includedTypes.includes(types.value[filter.fk_column_id])
+  }
+  // include not allowed values only if selected column type not matches
+  else if (compOp.excludedTypes) {
+    return filter.fk_column_id && !compOp.excludedTypes.includes(types.value[filter.fk_column_id])
+  }
+  return true
+}
+
 defineExpose({
   applyChanges,
   parentId,
@@ -214,25 +220,20 @@ defineExpose({
               @change="filterUpdateCondition(filter, i)"
             >
               <template v-for="compOp in comparisonOpList" :key="compOp.value">
-              <a-select-option  :value="compOp.value" v-if=" !compOp.allowedTypes || (filter.fk_column_id && compOp.allowedTypes.includes(types[filter.fk_column_id]))" >
-                {{ compOp.text }}
-              </a-select-option>
+                <a-select-option v-if="isComparisonOpAllowed(filter, compOp)" :value="compOp.value">
+                  {{ compOp.text }}
+                </a-select-option>
               </template>
             </a-select>
 
             <span
-              v-if="filter.comparison_op && ['null', 'notnull','checked', 'notchecked', 'empty', 'notempty'].includes(filter.comparison_op)"
+              v-if="
+                filter.comparison_op &&
+                ['null', 'notnull', 'checked', 'notchecked', 'empty', 'notempty'].includes(filter.comparison_op)
+              "
               :key="`span${i}`"
             />
 
-            <a-checkbox
-              v-else-if="filter.field && types[filter.field] === 'boolean'"
-              v-model:checked="filter.value"
-              dense
-              :disabled="filter.readOnly"
-              @change="saveOrUpdate(filter, i)"
-            />
-
             <a-input
               v-else
               :key="`${i}_7`"
diff --git a/packages/nc-gui/utils/filterUtils.ts b/packages/nc-gui/utils/filterUtils.ts
index 867b0cb5a4..bdb7e376e2 100644
--- a/packages/nc-gui/utils/filterUtils.ts
+++ b/packages/nc-gui/utils/filterUtils.ts
@@ -4,8 +4,21 @@ export const comparisonOpList: {
   text: string
   value: string
   ignoreVal?: boolean
-  allowedTypes?: string[]
+  includedTypes?: UITypes[]
+  excludedTypes?: UITypes[]
 }[] = [
+  {
+    text: 'is checked',
+    value: 'checked',
+    ignoreVal: true,
+    includedTypes: [UITypes.Checkbox],
+  },
+  {
+    text: 'is not checked',
+    value: 'notchecked',
+    ignoreVal: true,
+    includedTypes: [UITypes.Checkbox],
+  },
   {
     text: 'is equal',
     value: 'eq',
@@ -17,20 +30,24 @@ export const comparisonOpList: {
   {
     text: 'is like',
     value: 'like',
+    excludedTypes: [UITypes.Checkbox],
   },
   {
     text: 'is not like',
     value: 'nlike',
+    excludedTypes: [UITypes.Checkbox],
   },
   {
     text: 'is empty',
     value: 'empty',
     ignoreVal: true,
+    excludedTypes: [UITypes.Checkbox],
   },
   {
     text: 'is not empty',
     value: 'notempty',
     ignoreVal: true,
+    excludedTypes: [UITypes.Checkbox],
   },
   {
     text: 'is null',
@@ -42,52 +59,44 @@ export const comparisonOpList: {
     value: 'notnull',
     ignoreVal: true,
   },
-  {
-    text: 'is checked',
-    value: 'checked',
-    ignoreVal: true,
-    allowedTypes: ['boolean'],
-  },
-  {
-    text: 'is not checked',
-    value: 'notchecked',
-    ignoreVal: true,
-    allowedTypes: ['boolean'],
-  },
   {
     text: 'contains all of',
     value: 'allof',
-    types: ['MultiSelect'],
+    includedTypes: [UITypes.MultiSelect],
   },
   {
     text: 'contains any of',
     value: 'anyof',
-    types: ['MultiSelect'],
+    includedTypes: [UITypes.MultiSelect],
   },
   {
     text: 'does not contain all of',
     value: 'nallof',
-    types: ['MultiSelect'],
+    includedTypes: [UITypes.MultiSelect],
   },
   {
     text: 'does not contain any of',
     value: 'nanyof',
-    types: ['MultiSelect'],
+    includedTypes: [UITypes.MultiSelect],
   },
   {
     text: '>',
     value: 'gt',
+    excludedTypes: [UITypes.Checkbox],
   },
   {
     text: '<',
     value: 'lt',
+    excludedTypes: [UITypes.Checkbox],
   },
   {
     text: '>=',
     value: 'gte',
+    excludedTypes: [UITypes.Checkbox],
   },
   {
     text: '<=',
     value: 'lte',
+    excludedTypes: [UITypes.Checkbox],
   },
 ]

From 29ff2cd0dbf097ef85dc910a0ffe6d0073d35811 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 17 Jan 2023 18:29:37 +0530
Subject: [PATCH 09/18] fix(gui): inject readonly property to cell

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

diff --git a/packages/nc-gui/components/cell/Checkbox.vue b/packages/nc-gui/components/cell/Checkbox.vue
index 6b1bd0e50c..dfffdec862 100644
--- a/packages/nc-gui/components/cell/Checkbox.vue
+++ b/packages/nc-gui/components/cell/Checkbox.vue
@@ -65,7 +65,7 @@ useSelectedCellKeyupListener(active, (e) => {
   <div
     class="flex cursor-pointer"
     :class="{
-      'justify-center': !isForm && !readOnly,
+      'justify-center': !isForm,
       'w-full': isForm,
       'nc-cell-hover-show': !vModel && !readOnly,
       'opacity-0': readOnly && !vModel,
diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 92b0092225..d69e7db815 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -806,6 +806,7 @@ const closeAddColumnDropdown = () => {
                         :active="activeCell.col === colIndex && activeCell.row === rowIndex"
                         :row="row"
                         @navigate="onNavigate"
+                        :read-only="readOnly"
                       />
 
                       <LazySmartsheetCell
@@ -821,6 +822,7 @@ const closeAddColumnDropdown = () => {
                         @save="updateOrSaveRow(row, columnObj.title, state)"
                         @navigate="onNavigate"
                         @cancel="editEnabled = false"
+                        :read-only="readOnly"
                       />
                     </div>
                   </SmartsheetTableDataCell>

From 75cab2eaf9cfaadc246b1b1f3386b3b370f2a486 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 17 Jan 2023 21:06:42 +0530
Subject: [PATCH 10/18] test: app-store removed from project settings

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../Settings => Account}/AppStore.ts          | 30 ++++++++++------
 tests/playwright/pages/Account/index.ts       |  3 ++
 .../pages/Dashboard/Settings/index.ts         |  4 ---
 tests/playwright/tests/viewForm.spec.ts       | 35 ++++++++++++-------
 4 files changed, 46 insertions(+), 26 deletions(-)
 rename tests/playwright/pages/{Dashboard/Settings => Account}/AppStore.ts (63%)

diff --git a/tests/playwright/pages/Dashboard/Settings/AppStore.ts b/tests/playwright/pages/Account/AppStore.ts
similarity index 63%
rename from tests/playwright/pages/Dashboard/Settings/AppStore.ts
rename to tests/playwright/pages/Account/AppStore.ts
index 13a27088fd..c617df54a5 100644
--- a/tests/playwright/pages/Dashboard/Settings/AppStore.ts
+++ b/tests/playwright/pages/Account/AppStore.ts
@@ -1,21 +1,31 @@
 import { expect } from '@playwright/test';
-import { SettingsPage } from '.';
-import BasePage from '../../Base';
+import BasePage from '../Base';
+import { AccountPage } from './index';
 
-export class AppStoreSettingsPage extends BasePage {
-  private readonly settings: SettingsPage;
+export class AccountAppStorePage extends BasePage {
+  private accountPage: AccountPage;
 
-  constructor(settings: SettingsPage) {
-    super(settings.rootPage);
-    this.settings = settings;
+  constructor(accountPage: AccountPage) {
+    super(accountPage.rootPage);
+    this.accountPage = accountPage;
+  }
+
+  async goto() {
+    await this.rootPage.goto('/#/account/apps', { waitUntil: 'networkidle' });
+  }
+
+  async waitUntilContentLoads() {
+    return this.rootPage.waitForResponse(
+      resp => resp.url().includes('api/v1/db/meta/plugins') && resp.status() === 200
+    );
   }
 
   get() {
-    return this.settings.get().locator(`[data-testid="nc-settings-subtab-appStore"]`);
+    return this.accountPage.get().locator(`[data-testid="nc-settings-subtab-appStore"]`);
   }
 
   async install({ name }: { name: string }) {
-    const card = await this.settings.get().locator(`.nc-app-store-card-${name}`);
+    const card = await this.accountPage.get().locator(`.nc-app-store-card-${name}`);
     await card.click();
 
     // todo: Hack to solve the issue when if the test installing a plugin fails, the next test will fail because the plugin is already installed
@@ -48,7 +58,7 @@ export class AppStoreSettingsPage extends BasePage {
   }
 
   async uninstall(param: { name: string }) {
-    const card = this.settings.get().locator(`.nc-app-store-card-${param.name}`);
+    const card = this.accountPage.get().locator(`.nc-app-store-card-${param.name}`);
 
     // await card.scrollIntoViewIfNeeded();
     await card.click();
diff --git a/tests/playwright/pages/Account/index.ts b/tests/playwright/pages/Account/index.ts
index 34c321160d..504bae9823 100644
--- a/tests/playwright/pages/Account/index.ts
+++ b/tests/playwright/pages/Account/index.ts
@@ -3,17 +3,20 @@ import BasePage from '../Base';
 import { AccountSettingsPage } from './Settings';
 import { AccountTokenPage } from './Token';
 import { AccountUsersPage } from './Users';
+import { AccountAppStorePage } from './AppStore';
 
 export class AccountPage extends BasePage {
   readonly settings: AccountSettingsPage;
   readonly token: AccountTokenPage;
   readonly users: AccountUsersPage;
+  readonly appStore: AccountAppStorePage;
 
   constructor(page: Page) {
     super(page);
     this.settings = new AccountSettingsPage(this);
     this.token = new AccountTokenPage(this);
     this.users = new AccountUsersPage(this);
+    this.appStore = new AccountAppStorePage(this);
   }
 
   get() {
diff --git a/tests/playwright/pages/Dashboard/Settings/index.ts b/tests/playwright/pages/Dashboard/Settings/index.ts
index c46f55396f..448f78550d 100644
--- a/tests/playwright/pages/Dashboard/Settings/index.ts
+++ b/tests/playwright/pages/Dashboard/Settings/index.ts
@@ -1,14 +1,12 @@
 import { DashboardPage } from '..';
 import BasePage from '../../Base';
 import { AuditSettingsPage } from './Audit';
-import { AppStoreSettingsPage } from './AppStore';
 import { MiscSettingsPage } from './Miscellaneous';
 import { TeamsPage } from './Teams';
 import { DataSourcesPage } from './DataSources';
 
 export enum SettingTab {
   TeamAuth = 'teamAndAuth',
-  AppStore = 'appStore',
   DataSources = 'dataSources',
   Audit = 'audit',
   ProjectSettings = 'projectSettings',
@@ -22,7 +20,6 @@ export enum SettingsSubTab {
 
 export class SettingsPage extends BasePage {
   readonly audit: AuditSettingsPage;
-  readonly appStore: AppStoreSettingsPage;
   readonly miscellaneous: MiscSettingsPage;
   readonly dataSources: DataSourcesPage;
   readonly teams: TeamsPage;
@@ -30,7 +27,6 @@ export class SettingsPage extends BasePage {
   constructor(dashboard: DashboardPage) {
     super(dashboard.rootPage);
     this.audit = new AuditSettingsPage(this);
-    this.appStore = new AppStoreSettingsPage(this);
     this.miscellaneous = new MiscSettingsPage(this);
     this.dataSources = new DataSourcesPage(this);
     this.teams = new TeamsPage(this);
diff --git a/tests/playwright/tests/viewForm.spec.ts b/tests/playwright/tests/viewForm.spec.ts
index 734f73bfc0..1685f7c886 100644
--- a/tests/playwright/tests/viewForm.spec.ts
+++ b/tests/playwright/tests/viewForm.spec.ts
@@ -1,20 +1,25 @@
 import { test } from '@playwright/test';
 import { DashboardPage } from '../pages/Dashboard';
-import { SettingTab } from '../pages/Dashboard/Settings';
 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';
 
 // todo: Move most of the ui actions to page object and await on the api response
 test.describe('Form view', () => {
   let dashboard: DashboardPage;
   let form: FormPage;
+  let accountAppStorePage: AccountAppStorePage;
+  let accountPage: AccountPage;
   let context: any;
 
   test.beforeEach(async ({ page }) => {
     context = await setup({ page });
     dashboard = new DashboardPage(page, context.project);
     form = dashboard.form;
+    accountPage = new AccountPage(page);
+    accountAppStorePage = accountPage.appStore;
   });
 
   test('Field re-order operations', async () => {
@@ -78,7 +83,7 @@ test.describe('Form view', () => {
     });
   });
 
-  test('Form elements validation', async () => {
+  test('Form elements validation', async ({ page }) => {
     // close 'Team & Auth' tab
     await dashboard.closeTab({ title: 'Team & Auth' });
     await dashboard.treeView.openTable({ title: 'Country' });
@@ -168,12 +173,16 @@ test.describe('Form view', () => {
     await dashboard.verifyToast({
       message: 'Please activate SMTP plugin in App store for enabling email notification',
     });
+    const url = dashboard.rootPage.url();
 
     // activate SMTP plugin
-    await dashboard.gotoSettings();
-    await dashboard.settings.selectTab({ tab: SettingTab.AppStore });
-    await dashboard.settings.appStore.install({ name: 'SMTP' });
-    await dashboard.settings.appStore.configureSMTP({
+    await accountAppStorePage.goto();
+    await accountAppStorePage.rootPage.reload({ waitUntil: 'networkidle' });
+    await accountAppStorePage.waitUntilContentLoads();
+
+    // install SMTP
+    await accountAppStorePage.install({ name: 'SMTP' });
+    await accountAppStorePage.configureSMTP({
       email: 'a@b.com',
       host: 'smtp.gmail.com',
       port: '587',
@@ -181,7 +190,9 @@ test.describe('Form view', () => {
     await dashboard.verifyToast({
       message: 'Successfully installed and email notification will use SMTP configuration',
     });
-    await dashboard.settings.close();
+
+    // revisit form view
+    await page.goto(url);
 
     // enable 'email-me' option
     await dashboard.viewSidebar.openView({ title: 'CountryForm' });
@@ -192,15 +203,15 @@ test.describe('Form view', () => {
       showBlankForm: false,
     });
 
-    // reset SMTP
-    await dashboard.gotoSettings();
-    await dashboard.settings.selectTab({ tab: SettingTab.AppStore });
-    await dashboard.settings.appStore.uninstall({ name: 'SMTP' });
+    // Uninstall SMTP
+    await accountAppStorePage.goto();
+    await accountAppStorePage.rootPage.reload({ waitUntil: 'networkidle' });
+    await accountAppStorePage.waitUntilContentLoads();
+    await accountAppStorePage.uninstall({ name: 'SMTP' });
 
     await dashboard.verifyToast({
       message: 'Plugin uninstalled successfully',
     });
-    await dashboard.settings.close();
   });
 
   test('Form share, verify attachment file', async () => {

From 901a45806d7d6221401f9d1a87a4f8c0796cb096 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Wed, 18 Jan 2023 15:47:17 +0530
Subject: [PATCH 11/18] test: checkbox column verification

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../pages/Dashboard/common/Toolbar/Filter.ts  |  21 +--
 tests/playwright/tests/columnCheckbox.spec.ts | 120 ++++++++++++++++++
 2 files changed, 132 insertions(+), 9 deletions(-)
 create mode 100644 tests/playwright/tests/columnCheckbox.spec.ts

diff --git a/tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts b/tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts
index 6c7a8b70c4..2ea25dd403 100644
--- a/tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts
+++ b/tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts
@@ -37,7 +37,7 @@ export class ToolbarFilterPage extends BasePage {
   }: {
     columnTitle: string;
     opType: string;
-    value: string;
+    value?: string;
     isLocallySaved: boolean;
   }) {
     await this.get().locator(`button:has-text("Add Filter")`).first().click();
@@ -70,14 +70,17 @@ export class ToolbarFilterPage extends BasePage {
       await this.toolbar.parent.dashboard.waitForLoaderToDisappear();
     }
 
-    const fillFilter = this.rootPage.locator('.nc-filter-value-select').last().fill(value);
-    await this.waitForResponse({
-      uiAction: fillFilter,
-      httpMethodsToMatch: ['GET'],
-      requestUrlPathToMatch: isLocallySaved ? `/api/v1/db/public/` : `/api/v1/db/data/noco/`,
-    });
-    await this.toolbar.parent.dashboard.waitForLoaderToDisappear();
-    await this.toolbar.parent.waitLoading();
+    // if value field was provided, fill it
+    if (value) {
+      const fillFilter = this.rootPage.locator('.nc-filter-value-select').last().fill(value);
+      await this.waitForResponse({
+        uiAction: fillFilter,
+        httpMethodsToMatch: ['GET'],
+        requestUrlPathToMatch: isLocallySaved ? `/api/v1/db/public/` : `/api/v1/db/data/noco/`,
+      });
+      await this.toolbar.parent.dashboard.waitForLoaderToDisappear();
+      await this.toolbar.parent.waitLoading();
+    }
   }
 
   async resetFilter() {
diff --git a/tests/playwright/tests/columnCheckbox.spec.ts b/tests/playwright/tests/columnCheckbox.spec.ts
new file mode 100644
index 0000000000..d0dddee394
--- /dev/null
+++ b/tests/playwright/tests/columnCheckbox.spec.ts
@@ -0,0 +1,120 @@
+import { test } from '@playwright/test';
+import { DashboardPage } from '../pages/Dashboard';
+import setup from '../setup';
+import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
+
+test.describe('Checkbox - cell, filter, sort', () => {
+  let dashboard: DashboardPage, toolbar: ToolbarPage;
+  let context: any;
+
+  // 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.addNew({
+      columnTitle: 'checkbox',
+      opType: param.opType,
+      value: param.value,
+      isLocallySaved: false,
+    });
+    await toolbar.clickFilter();
+
+    // verify filtered rows
+    await validateRowArray(param.result);
+    // Reset filter
+    await toolbar.filter.resetFilter();
+  }
+
+  test.beforeEach(async ({ page }) => {
+    context = await setup({ page });
+    dashboard = new DashboardPage(page, context.project);
+    toolbar = dashboard.grid.toolbar;
+  });
+
+  test('Checkbox', async () => {
+    // close 'Team & Auth' tab
+    await dashboard.closeTab({ title: 'Team & Auth' });
+
+    await dashboard.treeView.createTable({ title: 'Sheet1' });
+
+    await dashboard.grid.addNewRow({ index: 0, value: '1a' });
+    await dashboard.grid.addNewRow({ index: 1, value: '1b' });
+    await dashboard.grid.addNewRow({ index: 2, value: '1c' });
+    await dashboard.grid.addNewRow({ index: 3, value: '1d' });
+    await dashboard.grid.addNewRow({ index: 4, value: '1e' });
+    await dashboard.grid.addNewRow({ index: 5, value: '1f' });
+
+    // Create Checkbox column
+    await dashboard.grid.column.create({
+      title: 'checkbox',
+      type: 'Checkbox',
+    });
+
+    // In cell insert
+    await dashboard.grid.cell.checkbox.click({ index: 0, columnHeader: 'checkbox' });
+    await dashboard.grid.cell.checkbox.click({ index: 1, columnHeader: 'checkbox' });
+    await dashboard.grid.cell.checkbox.click({ index: 2, columnHeader: 'checkbox' });
+    await dashboard.grid.cell.checkbox.click({ index: 5, columnHeader: 'checkbox' });
+    await dashboard.grid.cell.checkbox.click({ index: 1, columnHeader: 'checkbox' });
+
+    // verify checkbox state
+    await dashboard.grid.cell.checkbox.verifyChecked({ index: 0, columnHeader: 'checkbox' });
+    await dashboard.grid.cell.checkbox.verifyChecked({ index: 2, columnHeader: 'checkbox' });
+    await dashboard.grid.cell.checkbox.verifyChecked({ index: 5, columnHeader: 'checkbox' });
+    await dashboard.grid.cell.checkbox.verifyUnchecked({ index: 1, columnHeader: 'checkbox' });
+    await dashboard.grid.cell.checkbox.verifyUnchecked({ index: 3, columnHeader: 'checkbox' });
+    await dashboard.grid.cell.checkbox.verifyUnchecked({ index: 4, columnHeader: 'checkbox' });
+
+    // column values
+    // 1a : true
+    // 1b : false
+    // 1c : true
+    // 1d : null
+    // 1e : null
+    // 1f : true
+
+    // Filter column
+    await verifyFilter({ opType: 'is checked', result: ['1a', '1c', '1f'] });
+    await verifyFilter({ opType: 'is not checked', result: ['1b', '1d', '1e'] });
+    await verifyFilter({ opType: 'is equal', value: '0', result: ['1b'] });
+    await verifyFilter({ opType: 'is not equal', value: '1', result: ['1b', '1d', '1e'] });
+    await verifyFilter({ opType: 'is null', result: ['1d', '1e'] });
+    await verifyFilter({ opType: 'is not null', result: ['1a', '1b', '1c', '1f'] });
+
+    // Sort column
+    await toolbar.sort.addSort({
+      columnTitle: 'checkbox',
+      isAscending: true,
+      isLocallySaved: false,
+    });
+    await validateRowArray(['1d', '1e', '1b', '1a', '1c', '1f']);
+    await toolbar.sort.resetSort();
+
+    // sort descending & validate
+    await toolbar.sort.addSort({
+      columnTitle: 'checkbox',
+      isAscending: false,
+      isLocallySaved: false,
+    });
+    await validateRowArray(['1a', '1c', '1f', '1b', '1d', '1e']);
+    await toolbar.sort.resetSort();
+
+    // wait for 10 seconds
+    await dashboard.rootPage.waitForTimeout(10000);
+
+    // TBD: Add more tests
+    // Expanded form insert
+    // Expanded record insert
+    // Expanded form insert
+  });
+});

From 46d670f08939a5b6c050b6ea7a7396feeb6e20c2 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 18 Jan 2023 15:22:36 +0530
Subject: [PATCH 12/18] feat(gui): navigation option to switch between rows in
 expanded form

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components.d.ts               |  1 +
 .../nc-gui/components/smartsheet/Grid.vue     | 50 ++++++++++++++++++-
 .../smartsheet/expanded-form/Header.vue       |  2 -
 .../smartsheet/expanded-form/index.vue        | 16 +++++-
 4 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts
index f411158fb1..a07986cb7f 100644
--- a/packages/nc-gui/components.d.ts
+++ b/packages/nc-gui/components.d.ts
@@ -138,6 +138,7 @@ declare module '@vue/runtime-core' {
     MdiChevronDown: typeof import('~icons/mdi/chevron-down')['default']
     MdiChevronLeft: typeof import('~icons/mdi/chevron-left')['default']
     MdiChevronRight: typeof import('~icons/mdi/chevron-right')['default']
+    MdiChevronUp: typeof import('~icons/mdi/chevron-up')['default']
     MdiClose: typeof import('~icons/mdi/close')['default']
     MdiCloseBox: typeof import('~icons/mdi/close-box')['default']
     MdiCloseCircle: typeof import('~icons/mdi/close-circle')['default']
diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index d69e7db815..45bd864ecd 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -638,6 +638,50 @@ const closeAddColumnDropdown = () => {
   columnOrder.value = null
   addColumnDropdown.value = false
 }
+
+enum NavDir {
+  NEXT,
+  PREV,
+}
+
+const navigateToSiblingRow = async (dir: NavDir) => {
+  // get current expanded row index
+  const expandedRowIndex = data.value.findIndex(
+    (row) => routeQuery.rowId === extractPkFromRow(row.row, meta.value?.columns as ColumnType[]),
+  )
+
+  // calculate next row index based on direction
+  let siblingRowIndex = expandedRowIndex + (dir === NavDir.NEXT ? 1 : -1)
+
+  const currentPage = paginationData?.value?.page || 1
+
+  // if next row index is less than 0, go to previous page and point to last element
+  if (siblingRowIndex < 0) {
+    // if first page, do nothing
+    if (currentPage === 1) return
+
+    await changePage(currentPage - 1)
+    siblingRowIndex = data.value.length - 1
+
+    // if next row index is greater than total rows in current view
+    // then load next page of data and set next row index to 0
+  } else if (siblingRowIndex >= data.value.length) {
+    siblingRowIndex = 0
+    await changePage(currentPage + 1)
+  }
+
+  // extract the row id of the sibling row
+  const rowId = extractPkFromRow(data.value[siblingRowIndex].row, meta.value?.columns as ColumnType[])
+
+  if (rowId) {
+    router.push({
+      query: {
+        ...routeQuery,
+        rowId,
+      },
+    })
+  }
+}
 </script>
 
 <template>
@@ -805,8 +849,8 @@ const closeAddColumnDropdown = () => {
                         :column="columnObj"
                         :active="activeCell.col === colIndex && activeCell.row === rowIndex"
                         :row="row"
-                        @navigate="onNavigate"
                         :read-only="readOnly"
+                        @navigate="onNavigate"
                       />
 
                       <LazySmartsheetCell
@@ -818,11 +862,11 @@ const closeAddColumnDropdown = () => {
                         "
                         :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"
-                        :read-only="readOnly"
                       />
                     </div>
                   </SmartsheetTableDataCell>
@@ -918,6 +962,8 @@ const closeAddColumnDropdown = () => {
         :meta="meta"
         :row-id="routeQuery.rowId"
         :view="view"
+        @next="navigateToSiblingRow(NavDir.NEXT)"
+        @prev="navigateToSiblingRow(NavDir.PREV)"
       />
     </Suspense>
   </div>
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
index c2379e4bc5..792b31a428 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
@@ -155,5 +155,3 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
     </a-dropdown-button>
   </div>
 </template>
-
-<style scoped></style>
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index 2f1b27ac46..266cc0e183 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -149,7 +149,10 @@ export default {
   >
     <SmartsheetExpandedFormHeader :view="props.view" @cancel="onClose" />
 
-    <div class="!bg-gray-100 rounded flex-1">
+    <div class="!bg-gray-100 rounded flex-1 relative">
+      <MdiChevronRight class="cursor-pointer nc-next-arrow" @click="$emit('next')" />
+      <MdiChevronLeft class="cursor-pointer nc-prev-arrow" @click="$emit('prev')" />
+
       <div class="flex h-full nc-form-wrapper items-stretch min-h-[max(70vh,100%)]">
         <div class="flex-1 overflow-auto scrollbar-thin-dull nc-form-fields-container">
           <div class="w-[500px] mx-auto">
@@ -216,4 +219,15 @@ export default {
   max-height: max(calc(100vh - 65px), 600px);
   height: max-content !important;
 }
+
+.nc-prev-arrow,
+.nc-next-arrow {
+  @apply absolute opacity-70 rounded-full transition-transform transition-background transition-opacity transform bg-white hover:(bg-gray-200) active:(scale-125 opacity-100) text-xl;
+}
+.nc-prev-arrow {
+  @apply left-4 top-4;
+}
+.nc-next-arrow {
+  @apply right-4 top-4;
+}
 </style>

From 928346e619bd155e09b3a77c04f9ab07b7f3feca Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 18 Jan 2023 20:09:10 +0530
Subject: [PATCH 13/18] fix(api): include null values in `neq` filter

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 8c44151310..2d53cbc80d 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
@@ -277,7 +277,11 @@ const parseConditionV2 = async (
             break;
           case 'neq':
           case 'not':
-            qb = qb.whereNot(field, val);
+            qb = qb.where((nestedQb) => {
+              nestedQb
+                .whereNot(field, val)
+                .orWhereNotNull(customWhereClause ? _val : _field);
+            });
             break;
           case 'like':
             if (column.uidt === UITypes.Formula) {

From 90bfa2dec2223e6c2a8dad7b38b7ca8c17bc282f Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 19 Jan 2023 11:44:18 +0530
Subject: [PATCH 14/18] feat(gui): improve row navigation option in expanded
 form

- Add tooltip
- Show warning if out of bound
- Hide option from nested
- Implement it in Gallery view

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nc-gui/components/smartsheet/Gallery.vue  |  5 ++
 .../nc-gui/components/smartsheet/Grid.vue     | 51 ++----------------
 .../smartsheet/expanded-form/index.vue        | 19 +++++--
 packages/nc-gui/composables/useSharedView.ts  | 12 +----
 packages/nc-gui/composables/useViewData.ts    | 52 +++++++++++++++++++
 packages/nc-gui/lang/en.json                  |  7 ++-
 packages/nc-gui/lib/enums.ts                  |  5 ++
 7 files changed, 89 insertions(+), 62 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Gallery.vue b/packages/nc-gui/components/smartsheet/Gallery.vue
index cc00c0b43c..dfa2899f6b 100644
--- a/packages/nc-gui/components/smartsheet/Gallery.vue
+++ b/packages/nc-gui/components/smartsheet/Gallery.vue
@@ -13,6 +13,7 @@ import {
   ReloadRowDataHookInj,
   ReloadViewDataHookInj,
   ReloadViewMetaHookInj,
+  RowNavDir,
   computed,
   createEventHook,
   extractPkFromRow,
@@ -48,6 +49,7 @@ const {
   galleryData,
   changePage,
   addEmptyRow,
+  navigateToSiblingRow,
 } = useViewData(meta, view)
 
 provide(IsFormInj, ref(false))
@@ -270,6 +272,9 @@ watch(view, async (nextView) => {
         :meta="meta"
         :row-id="route.query.rowId"
         :view="view"
+        show-next-prev-icons
+        @next="navigateToSiblingRow(RowNavDir.NEXT)"
+        @prev="navigateToSiblingRow(RowNavDir.PREV)"
       />
     </Suspense>
   </div>
diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 45bd864ecd..66b33fd6d1 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -17,6 +17,7 @@ import {
   ReadonlyInj,
   ReloadRowDataHookInj,
   ReloadViewDataHookInj,
+  RowNavDir,
   SmartsheetStoreEvents,
   computed,
   createEventHook,
@@ -117,6 +118,7 @@ const {
   deleteSelectedRows,
   selectedAllRecords,
   removeRowIfNew,
+  navigateToSiblingRow,
 } = useViewData(meta, view, xWhere)
 
 const { getMeta } = useMetas()
@@ -638,50 +640,6 @@ const closeAddColumnDropdown = () => {
   columnOrder.value = null
   addColumnDropdown.value = false
 }
-
-enum NavDir {
-  NEXT,
-  PREV,
-}
-
-const navigateToSiblingRow = async (dir: NavDir) => {
-  // get current expanded row index
-  const expandedRowIndex = data.value.findIndex(
-    (row) => routeQuery.rowId === extractPkFromRow(row.row, meta.value?.columns as ColumnType[]),
-  )
-
-  // calculate next row index based on direction
-  let siblingRowIndex = expandedRowIndex + (dir === NavDir.NEXT ? 1 : -1)
-
-  const currentPage = paginationData?.value?.page || 1
-
-  // if next row index is less than 0, go to previous page and point to last element
-  if (siblingRowIndex < 0) {
-    // if first page, do nothing
-    if (currentPage === 1) return
-
-    await changePage(currentPage - 1)
-    siblingRowIndex = data.value.length - 1
-
-    // if next row index is greater than total rows in current view
-    // then load next page of data and set next row index to 0
-  } else if (siblingRowIndex >= data.value.length) {
-    siblingRowIndex = 0
-    await changePage(currentPage + 1)
-  }
-
-  // extract the row id of the sibling row
-  const rowId = extractPkFromRow(data.value[siblingRowIndex].row, meta.value?.columns as ColumnType[])
-
-  if (rowId) {
-    router.push({
-      query: {
-        ...routeQuery,
-        rowId,
-      },
-    })
-  }
-}
 </script>
 
 <template>
@@ -962,8 +920,9 @@ const navigateToSiblingRow = async (dir: NavDir) => {
         :meta="meta"
         :row-id="routeQuery.rowId"
         :view="view"
-        @next="navigateToSiblingRow(NavDir.NEXT)"
-        @prev="navigateToSiblingRow(NavDir.PREV)"
+        show-next-prev-icons
+        @next="navigateToSiblingRow(RowNavDir.NEXT)"
+        @prev="navigateToSiblingRow(RowNavDir.PREV)"
       />
     </Suspense>
   </div>
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index 266cc0e183..b2ae23ec5b 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -32,11 +32,12 @@ interface Props {
   useMetaFields?: boolean
   rowId?: string
   view?: ViewType
+  showNextPrevIcons?: boolean
 }
 
 const props = defineProps<Props>()
 
-const emits = defineEmits(['update:modelValue', 'cancel'])
+const emits = defineEmits(['update:modelValue', 'cancel', 'next', 'prev'])
 
 const row = ref(props.row)
 
@@ -150,8 +151,20 @@ export default {
     <SmartsheetExpandedFormHeader :view="props.view" @cancel="onClose" />
 
     <div class="!bg-gray-100 rounded flex-1 relative">
-      <MdiChevronRight class="cursor-pointer nc-next-arrow" @click="$emit('next')" />
-      <MdiChevronLeft class="cursor-pointer nc-prev-arrow" @click="$emit('prev')" />
+      <template v-if="props.showNextPrevIcons">
+        <a-tooltip placement="bottom">
+          <template #title>
+            {{ $t('labels.nextRow') }}
+          </template>
+          <MdiChevronRight class="cursor-pointer nc-next-arrow" @click="$emit('next')" />
+        </a-tooltip>
+        <a-tooltip placement="bottom">
+          <template #title>
+            {{ $t('labels.prevRow') }}
+          </template>
+          <MdiChevronLeft class="cursor-pointer nc-prev-arrow" @click="$emit('prev')" />
+        </a-tooltip>
+      </template>
 
       <div class="flex h-full nc-form-wrapper items-stretch min-h-[max(70vh,100%)]">
         <div class="flex-1 overflow-auto scrollbar-thin-dull nc-form-fields-container">
diff --git a/packages/nc-gui/composables/useSharedView.ts b/packages/nc-gui/composables/useSharedView.ts
index 6cf0ecfb1f..b5b888be22 100644
--- a/packages/nc-gui/composables/useSharedView.ts
+++ b/packages/nc-gui/composables/useSharedView.ts
@@ -1,14 +1,4 @@
-import type {
-  Api,
-  ExportTypes,
-  FilterType,
-  KanbanType,
-  PaginatedType,
-  RequestParams,
-  SortType,
-  TableType,
-  ViewType,
-} from 'nocodb-sdk'
+import type { ExportTypes, FilterType, KanbanType, PaginatedType, RequestParams, SortType, TableType, ViewType } from 'nocodb-sdk'
 import { UITypes } from 'nocodb-sdk'
 import { computed, useGlobal, useMetas, useNuxtApp, useState } from '#imports'
 
diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts
index 96e8d45ede..b14a75fb58 100644
--- a/packages/nc-gui/composables/useViewData.ts
+++ b/packages/nc-gui/composables/useViewData.ts
@@ -4,6 +4,7 @@ import type { ComputedRef, Ref } from 'vue'
 import {
   IsPublicInj,
   NOCO,
+  RowNavDir,
   computed,
   extractPkFromRow,
   extractSdkResponseErrorMsg,
@@ -18,6 +19,8 @@ import {
   useMetas,
   useNuxtApp,
   useProject,
+  useRoute,
+  useRouter,
   useSharedView,
   useSmartsheetStoreOrThrow,
   useUIPermission,
@@ -44,6 +47,10 @@ export function useViewData(
 
   const { api, isLoading, error } = useApi()
 
+  const router = useRouter()
+
+  const route = useRoute()
+
   const { appInfo } = $(useGlobal())
 
   const { getMeta } = useMetas()
@@ -74,6 +81,8 @@ export function useViewData(
 
   const { isUIAllowed } = useUIPermission()
 
+  const routeQuery = $computed(() => route.query as Record<string, string>)
+
   const paginationData = computed({
     get: () => (isPublic.value ? sharedPaginationData.value : _paginationData.value),
     set: (value) => {
@@ -469,6 +478,48 @@ export function useViewData(
     }
   }
 
+  const navigateToSiblingRow = async (dir: RowNavDir) => {
+    // get current expanded row index
+    const expandedRowIndex = formattedData.value.findIndex(
+      (row: Row) => routeQuery.rowId === extractPkFromRow(row.row, meta.value?.columns as ColumnType[]),
+    )
+
+    // calculate next row index based on direction
+    let siblingRowIndex = expandedRowIndex + (dir === RowNavDir.NEXT ? 1 : -1)
+
+    const currentPage = paginationData?.value?.page || 1
+
+    // if next row index is less than 0, go to previous page and point to last element
+    if (siblingRowIndex < 0) {
+      // if first page, do nothing
+      if (currentPage === 1) return message.info(t('msg.info.noMoreRecords'))
+
+      await changePage(currentPage - 1)
+      siblingRowIndex = formattedData.value.length - 1
+
+      // if next row index is greater than total rows in current view
+      // then load next page of formattedData and set next row index to 0
+    } else if (siblingRowIndex >= formattedData.value.length) {
+      console.log(paginationData?.value)
+      if (paginationData?.value?.isLastPage) return message.info(t('msg.info.noMoreRecords'))
+
+      await changePage(currentPage + 1)
+      siblingRowIndex = 0
+    }
+
+    // extract the row id of the sibling row
+    const rowId = extractPkFromRow(formattedData.value[siblingRowIndex].row, meta.value?.columns as ColumnType[])
+
+    if (rowId) {
+      router.push({
+        query: {
+          ...routeQuery,
+          rowId,
+        },
+      })
+    }
+  }
+
   return {
     error,
     isLoading,
@@ -496,5 +547,6 @@ export function useViewData(
     loadAggCommentsCount,
     removeLastEmptyRow,
     removeRowIfNew,
+    navigateToSiblingRow,
   }
 }
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 37f484a7f4..41c21090a1 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -312,7 +312,9 @@
     "signInWithGoogle": "Sign in with Google",
     "agreeToTos": "By signing up, you agree to the Terms of Service",
     "welcomeToNc": "Welcome to NocoDB!",
-    "inviteOnlySignup": "Allow signup only using invite url"
+    "inviteOnlySignup": "Allow signup only using invite url",
+    "nextRow": "Next Row",
+    "prevRow": "Previous Row"
   },
   "activity": {
     "createProject": "Create Project",
@@ -629,7 +631,8 @@
       "showM2mTables": "Show M2M Tables",
       "deleteKanbanStackConfirmation": "Deleting this stack will also remove the select option `{stackToBeDeleted}` from the `{groupingField}`. The records will move to the uncategorized stack.",
       "computedFieldEditWarning": "Computed field: contents are read-only. Use column edit menu to reconfigure",
-      "computedFieldDeleteWarning": "Computed field: contents are read-only. Unable to clear content."
+      "computedFieldDeleteWarning": "Computed field: contents are read-only. Unable to clear content.",
+      "noMoreRecords": "No more records"
     },
     "error": {
       "searchProject": "Your search for {search} found no results",
diff --git a/packages/nc-gui/lib/enums.ts b/packages/nc-gui/lib/enums.ts
index e5d60396ec..b92b57bb94 100644
--- a/packages/nc-gui/lib/enums.ts
+++ b/packages/nc-gui/lib/enums.ts
@@ -98,3 +98,8 @@ export enum DataSourcesSubTab {
   Misc = 'Misc',
   Edit = 'Edit',
 }
+
+export enum RowNavDir {
+  NEXT,
+  PREV,
+}

From eadbdab2898990d46cb363241047b995be8afc12 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 19 Jan 2023 12:11:37 +0530
Subject: [PATCH 15/18] refactor(gui): code cleanup

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/smartsheet/Gallery.vue          | 6 +++---
 packages/nc-gui/components/smartsheet/Grid.vue             | 5 ++---
 .../nc-gui/components/smartsheet/toolbar/ColumnFilter.vue  | 4 ++--
 packages/nc-gui/composables/useViewData.ts                 | 7 +++----
 packages/nc-gui/lib/enums.ts                               | 5 -----
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Gallery.vue b/packages/nc-gui/components/smartsheet/Gallery.vue
index dfa2899f6b..0128997248 100644
--- a/packages/nc-gui/components/smartsheet/Gallery.vue
+++ b/packages/nc-gui/components/smartsheet/Gallery.vue
@@ -8,12 +8,12 @@ import {
   IsGalleryInj,
   IsGridInj,
   MetaInj,
+  NavigateDir,
   OpenNewRecordFormHookInj,
   PaginationDataInj,
   ReloadRowDataHookInj,
   ReloadViewDataHookInj,
   ReloadViewMetaHookInj,
-  RowNavDir,
   computed,
   createEventHook,
   extractPkFromRow,
@@ -273,8 +273,8 @@ watch(view, async (nextView) => {
         :row-id="route.query.rowId"
         :view="view"
         show-next-prev-icons
-        @next="navigateToSiblingRow(RowNavDir.NEXT)"
-        @prev="navigateToSiblingRow(RowNavDir.PREV)"
+        @next="navigateToSiblingRow(NavigateDir.NEXT)"
+        @prev="navigateToSiblingRow(NavigateDir.PREV)"
       />
     </Suspense>
   </div>
diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 66b33fd6d1..049ea163a8 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -17,7 +17,6 @@ import {
   ReadonlyInj,
   ReloadRowDataHookInj,
   ReloadViewDataHookInj,
-  RowNavDir,
   SmartsheetStoreEvents,
   computed,
   createEventHook,
@@ -921,8 +920,8 @@ const closeAddColumnDropdown = () => {
         :row-id="routeQuery.rowId"
         :view="view"
         show-next-prev-icons
-        @next="navigateToSiblingRow(RowNavDir.NEXT)"
-        @prev="navigateToSiblingRow(RowNavDir.PREV)"
+        @next="navigateToSiblingRow(NavigateDir.NEXT)"
+        @prev="navigateToSiblingRow(NavigateDir.PREV)"
       />
     </Suspense>
   </div>
diff --git a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
index 8d970eaf8f..c8c32f5c51 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
@@ -192,7 +192,7 @@ defineExpose({
               @click.stop
               @change="filterUpdateCondition(filter, i)"
             >
-              <a-select-option v-for="op in logicalOps" :key="op.value" :value="op.value">
+              <a-select-option v-for="op of logicalOps" :key="op.value" :value="op.value">
                 {{ op.text }}
               </a-select-option>
             </a-select>
@@ -219,7 +219,7 @@ defineExpose({
               dropdown-class-name="nc-dropdown-filter-comp-op"
               @change="filterUpdateCondition(filter, i)"
             >
-              <template v-for="compOp in comparisonOpList" :key="compOp.value">
+              <template v-for="compOp of comparisonOpList" :key="compOp.value">
                 <a-select-option v-if="isComparisonOpAllowed(filter, compOp)" :value="compOp.value">
                   {{ compOp.text }}
                 </a-select-option>
diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts
index b14a75fb58..591170bd3a 100644
--- a/packages/nc-gui/composables/useViewData.ts
+++ b/packages/nc-gui/composables/useViewData.ts
@@ -4,7 +4,7 @@ import type { ComputedRef, Ref } from 'vue'
 import {
   IsPublicInj,
   NOCO,
-  RowNavDir,
+  NavigateDir,
   computed,
   extractPkFromRow,
   extractSdkResponseErrorMsg,
@@ -478,14 +478,14 @@ export function useViewData(
     }
   }
 
-  const navigateToSiblingRow = async (dir: RowNavDir) => {
+  const navigateToSiblingRow = async (dir: NavigateDir) => {
     // get current expanded row index
     const expandedRowIndex = formattedData.value.findIndex(
       (row: Row) => routeQuery.rowId === extractPkFromRow(row.row, meta.value?.columns as ColumnType[]),
     )
 
     // calculate next row index based on direction
-    let siblingRowIndex = expandedRowIndex + (dir === RowNavDir.NEXT ? 1 : -1)
+    let siblingRowIndex = expandedRowIndex + (dir === NavigateDir.NEXT ? 1 : -1)
 
     const currentPage = paginationData?.value?.page || 1
 
@@ -500,7 +500,6 @@ export function useViewData(
       // if next row index is greater than total rows in current view
       // then load next page of formattedData and set next row index to 0
     } else if (siblingRowIndex >= formattedData.value.length) {
-      console.log(paginationData?.value)
       if (paginationData?.value?.isLastPage) return message.info(t('msg.info.noMoreRecords'))
 
       await changePage(currentPage + 1)
diff --git a/packages/nc-gui/lib/enums.ts b/packages/nc-gui/lib/enums.ts
index b92b57bb94..e5d60396ec 100644
--- a/packages/nc-gui/lib/enums.ts
+++ b/packages/nc-gui/lib/enums.ts
@@ -98,8 +98,3 @@ export enum DataSourcesSubTab {
   Misc = 'Misc',
   Edit = 'Edit',
 }
-
-export enum RowNavDir {
-  NEXT,
-  PREV,
-}

From 6b86c7c1cd999eb4ede850cf23a28a3eda96a4e3 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 19 Jan 2023 13:00:00 +0530
Subject: [PATCH 16/18] fix(api): neq query correction

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/smartsheet/expanded-form/index.vue   | 2 +-
 .../nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index b2ae23ec5b..9c36d693a8 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -142,7 +142,7 @@ export default {
   <a-drawer
     v-model:visible="isExpanded"
     :footer="null"
-    width="min(90vw,1000px)"
+    width="min(90vw,800px)"
     :body-style="{ 'padding': 0, 'display': 'flex', 'flex-direction': 'column' }"
     :closable="false"
     class="nc-drawer-expanded-form"
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 2d53cbc80d..6d8cd9bebc 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
@@ -280,7 +280,7 @@ const parseConditionV2 = async (
             qb = qb.where((nestedQb) => {
               nestedQb
                 .whereNot(field, val)
-                .orWhereNotNull(customWhereClause ? _val : _field);
+                .orWhereNull(customWhereClause ? _val : _field);
             });
             break;
           case 'like':

From 3206ee45ba9c271d6694d434d437b83cab19347b Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 19 Jan 2023 14:54:42 +0530
Subject: [PATCH 17/18] test: checkbox - kludge to handle PG null in sort

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

diff --git a/tests/playwright/tests/columnCheckbox.spec.ts b/tests/playwright/tests/columnCheckbox.spec.ts
index d0dddee394..6c453a792c 100644
--- a/tests/playwright/tests/columnCheckbox.spec.ts
+++ b/tests/playwright/tests/columnCheckbox.spec.ts
@@ -2,7 +2,7 @@ import { test } from '@playwright/test';
 import { DashboardPage } from '../pages/Dashboard';
 import setup from '../setup';
 import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
-
+import { isPg, isSqlite } from '../setup/db';
 test.describe('Checkbox - cell, filter, sort', () => {
   let dashboard: DashboardPage, toolbar: ToolbarPage;
   let context: any;
@@ -97,7 +97,11 @@ test.describe('Checkbox - cell, filter, sort', () => {
       isAscending: true,
       isLocallySaved: false,
     });
-    await validateRowArray(['1d', '1e', '1b', '1a', '1c', '1f']);
+    if (isPg(context.db)) {
+      await validateRowArray(['1b', '1a', '1c', '1f', '1d', '1e']);
+    } else {
+      await validateRowArray(['1d', '1e', '1b', '1a', '1c', '1f']);
+    }
     await toolbar.sort.resetSort();
 
     // sort descending & validate
@@ -106,7 +110,11 @@ test.describe('Checkbox - cell, filter, sort', () => {
       isAscending: false,
       isLocallySaved: false,
     });
-    await validateRowArray(['1a', '1c', '1f', '1b', '1d', '1e']);
+    if (isPg(context.db)) {
+      await validateRowArray(['1d', '1e', '1a', '1c', '1f', '1b']);
+    } else {
+      await validateRowArray(['1a', '1c', '1f', '1b', '1d', '1e']);
+    }
     await toolbar.sort.resetSort();
 
     // wait for 10 seconds

From 32a74982a4887a8d0dfbaec194bb37068d239407 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Thu, 19 Jan 2023 15:22:19 +0530
Subject: [PATCH 18/18] test: typo correction

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

diff --git a/tests/playwright/tests/columnCheckbox.spec.ts b/tests/playwright/tests/columnCheckbox.spec.ts
index 6c453a792c..a59ee32083 100644
--- a/tests/playwright/tests/columnCheckbox.spec.ts
+++ b/tests/playwright/tests/columnCheckbox.spec.ts
@@ -2,7 +2,8 @@ import { test } from '@playwright/test';
 import { DashboardPage } from '../pages/Dashboard';
 import setup from '../setup';
 import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
-import { isPg, isSqlite } from '../setup/db';
+import { isPg } from '../setup/db';
+
 test.describe('Checkbox - cell, filter, sort', () => {
   let dashboard: DashboardPage, toolbar: ToolbarPage;
   let context: any;
@@ -97,7 +98,7 @@ test.describe('Checkbox - cell, filter, sort', () => {
       isAscending: true,
       isLocallySaved: false,
     });
-    if (isPg(context.db)) {
+    if (isPg(context)) {
       await validateRowArray(['1b', '1a', '1c', '1f', '1d', '1e']);
     } else {
       await validateRowArray(['1d', '1e', '1b', '1a', '1c', '1f']);
@@ -110,7 +111,7 @@ test.describe('Checkbox - cell, filter, sort', () => {
       isAscending: false,
       isLocallySaved: false,
     });
-    if (isPg(context.db)) {
+    if (isPg(context)) {
       await validateRowArray(['1d', '1e', '1a', '1c', '1f', '1b']);
     } else {
       await validateRowArray(['1a', '1c', '1f', '1b', '1d', '1e']);