From 01d111ca06e2b036856c471a5ac8f1ae3f382422 Mon Sep 17 00:00:00 2001
From: Pranav C <61551451+pranavxc@users.noreply.github.com>
Date: Wed, 23 Jun 2021 20:21:39 +0530
Subject: [PATCH] fix(gui): Filter correction

added missing filter in where (not null)

fix #295

Signed-off-by: Pranav C <61551451+pranavxc@users.noreply.github.com>
---
 .../project/spreadsheet/components/columnFilter.vue    | 10 +++++++---
 .../project/spreadsheet/mixins/spreadsheet.js          |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue b/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue
index 16e8c04c4d..81c3d5c248 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/columnFilter.vue
@@ -82,8 +82,9 @@
             <span class="caption font-weight-regular">{{ item }}</span>
           </template>
         </v-select>
-
-        <v-text-field solo flat :key="i + '_7'" @click.stop hide-details dense class="caption" v-model="filter.value"
+        <span v-if="['is null', 'is not null'].includes(filter.op)"></span>
+        <v-text-field v-else solo flat :key="i + '_7'" @click.stop hide-details dense class="caption"
+                      v-model="filter.value"
                       :disabled="filter.readOnly"></v-text-field>
 
       </template>
@@ -109,7 +110,10 @@ export default {
   props: ['fieldList', 'value'],
   data: () => ({
     filters: [],
-    opList: ['is equal', 'is not equal', 'is like', 'is not like', 'is empty', 'is not empty', 'is null', 'is not null',
+    opList: [
+      'is equal', 'is not equal', 'is like', 'is not like',
+      // 'is empty', 'is not empty',
+      'is null', 'is not null',
       '>',
       '<',
       '>=',
diff --git a/packages/nc-gui/components/project/spreadsheet/mixins/spreadsheet.js b/packages/nc-gui/components/project/spreadsheet/mixins/spreadsheet.js
index 65591da239..4509a28c17 100644
--- a/packages/nc-gui/components/project/spreadsheet/mixins/spreadsheet.js
+++ b/packages/nc-gui/components/project/spreadsheet/mixins/spreadsheet.js
@@ -204,6 +204,8 @@ export default {
               return condition + `~not(${filt.field},in,)`;
             case 'is null':
               return condition + `(${filt.field},is,null)`;
+            case 'is not null':
+              return condition + `~not(${filt.field},is,null)`;
             case '<':
               return condition + `(${filt.field},lt,${filt.value})`;
             case '<=':