From 10b669b0cff5517df437948794e2a079b511ea39 Mon Sep 17 00:00:00 2001
From: Southball <6523469+southball@users.noreply.github.com>
Date: Sat, 24 Dec 2022 11:59:44 +0900
Subject: [PATCH] fix: issues with multiselect filters

---
 .../components/smartsheet/toolbar/ColumnFilter.vue | 14 ++++++++++++--
 packages/nc-gui/utils/filterUtils.ts               |  4 ++++
 .../lib/db/sql-data-mapper/lib/sql/conditionV2.ts  |  4 ++--
 .../nocodb/src/lib/meta/helpers/webhookHelpers.ts  |  8 ++++----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
index 9bb1fedc8e..8a0e41f190 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { FilterType } from 'nocodb-sdk'
+import type { ColumnType, FilterType } from 'nocodb-sdk'
 import { UITypes } from 'nocodb-sdk'
 import {
   ActiveViewInj,
@@ -100,6 +100,11 @@ 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)
 
@@ -213,7 +218,12 @@ defineExpose({
               dropdown-class-name="nc-dropdown-filter-comp-op"
               @change="filterUpdateCondition(filter, i)"
             >
-              <a-select-option v-for="compOp in comparisonOpList" :key="compOp.value" :value="compOp.value" class="">
+              <a-select-option
+                v-for="compOp in getApplicableFilters(filter.fk_column_id)"
+                :key="compOp.value"
+                :value="compOp.value"
+                class=""
+              >
                 {{ compOp.text }}
               </a-select-option>
             </a-select>
diff --git a/packages/nc-gui/utils/filterUtils.ts b/packages/nc-gui/utils/filterUtils.ts
index e14d41917d..249a26664e 100644
--- a/packages/nc-gui/utils/filterUtils.ts
+++ b/packages/nc-gui/utils/filterUtils.ts
@@ -38,18 +38,22 @@ export const comparisonOpList = [
   {
     text: 'contains all of',
     value: 'allof',
+    types: ['MultiSelect'],
   },
   {
     text: 'contains any of',
     value: 'anyof',
+    types: ['MultiSelect'],
   },
   {
     text: 'does not contain all of',
     value: 'nallof',
+    types: ['MultiSelect'],
   },
   {
     text: 'does not contain any of',
     value: 'nanyof',
+    types: ['MultiSelect'],
   },
   {
     text: '>',
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 fa687d1100..d2168538e2 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
@@ -312,7 +312,7 @@ const parseConditionV2 = async (
           case 'nanyof':
             // Condition for filter, without negation
             const condition = (builder: Knex.QueryBuilder) => {
-              const items = val.split(',');
+              const items = val.split(',').map((item) => item.trim());
               for (let i = 0; i < items.length; i++) {
                 let sql;
                 const bindings = [field, `%,${items[i]},%`];
@@ -343,7 +343,7 @@ const parseConditionV2 = async (
             ) {
               qb = qb.where(condition);
             } else {
-              qb = qb.whereNot(condition);
+              qb = qb.whereNot(condition).orWhereNull(field);
             }
             break;
           case 'gt':
diff --git a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
index 6fb3bc4397..a2849e6a51 100644
--- a/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
@@ -73,22 +73,22 @@ export async function validateCondition(filters: Filter[], data: any) {
         res = data[field] !== null;
         break;
       case 'allof':
-        res = (filter.value?.split(',') ?? []).every((item) =>
+        res = (filter.value?.split(',').map((item) => item.trim()) ?? []).every((item) =>
           (data[field]?.split(',') ?? []).includes(item)
         );
         break;
       case 'anyof':
-        res = (filter.value?.split(',') ?? []).some((item) =>
+        res = (filter.value?.split(',').map((item) => item.trim()) ?? []).some((item) =>
           (data[field]?.split(',') ?? []).includes(item)
         );
         break;
       case 'nallof':
-        res = !(filter.value?.split(',') ?? []).every((item) =>
+        res = !(filter.value?.split(',').map((item) => item.trim()) ?? []).every((item) =>
           (data[field]?.split(',') ?? []).includes(item)
         );
         break;
       case 'nanyof':
-        res = !(filter.value?.split(',') ?? []).some((item) =>
+        res = !(filter.value?.split(',').map((item) => item.trim()) ?? []).some((item) =>
           (data[field]?.split(',') ?? []).includes(item)
         );
         break;