From deb7c7cad756f2c154429022f8b4ad60ce4aa7c9 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 14 Feb 2023 12:36:30 +0800
Subject: [PATCH] feat(nc-gui): make showNullAndEmptyInFilter project-based

---
 .../components/dashboard/settings/Misc.vue       | 16 ++++++++++++++--
 packages/nc-gui/composables/useViewFilters.ts    |  6 +++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/settings/Misc.vue b/packages/nc-gui/components/dashboard/settings/Misc.vue
index eee43c8d00..12edb33514 100644
--- a/packages/nc-gui/components/dashboard/settings/Misc.vue
+++ b/packages/nc-gui/components/dashboard/settings/Misc.vue
@@ -1,12 +1,14 @@
 <script setup lang="ts">
 import { useGlobal, useProject, watch } from '#imports'
 
-const { includeM2M, showNull, showNullAndEmptyInFilter } = useGlobal()
+const { includeM2M, showNull } = useGlobal()
 
-const { loadTables, hasEmptyOrNullFilters } = useProject()
+const { project, updateProject, projectMeta, loadTables, hasEmptyOrNullFilters } = useProject()
 
 watch(includeM2M, async () => await loadTables())
 
+const showNullAndEmptyInFilter = ref(projectMeta.value.showNullAndEmptyInFilter)
+
 async function showNullAndEmptyInFilterOnChange(evt: any) {
   // users cannot hide null & empty option if there is existing null / empty filters
   if (!evt.target.checked) {
@@ -15,6 +17,16 @@ async function showNullAndEmptyInFilterOnChange(evt: any) {
       message.warning('Null / Empty filters exist. Please remove them first.')
     }
   }
+  const newProjectMeta = {
+    ...projectMeta.value,
+    showNullAndEmptyInFilter: showNullAndEmptyInFilter.value,
+  }
+  // update local state
+  project.value.meta = newProjectMeta
+  // update db
+  await updateProject({
+    meta: newProjectMeta,
+  })
 }
 </script>
 
diff --git a/packages/nc-gui/composables/useViewFilters.ts b/packages/nc-gui/composables/useViewFilters.ts
index d95e360a92..c225290a3c 100644
--- a/packages/nc-gui/composables/useViewFilters.ts
+++ b/packages/nc-gui/composables/useViewFilters.ts
@@ -11,9 +11,9 @@ import {
   message,
   ref,
   useDebounceFn,
-  useGlobal,
   useMetas,
   useNuxtApp,
+  useProject,
   useUIPermission,
   watch,
 } from '#imports'
@@ -34,7 +34,7 @@ export function useViewFilters(
 
   const { nestedFilters } = useSmartsheetStoreOrThrow()
 
-  const { showNullAndEmptyInFilter } = useGlobal()
+  const { projectMeta } = useProject()
 
   const isPublic = inject(IsPublicInj, ref(false))
 
@@ -110,7 +110,7 @@ export function useViewFilters(
   ) => {
     if (['empty', 'notempty', 'null', 'notnull'].includes(compOp.value)) {
       // for these 4 comparisonOp, show them based on `showNullAndEmptyInFilter` in Project Settings
-      return showNullAndEmptyInFilter.value
+      return projectMeta.value.showNullAndEmptyInFilter
     } else if (compOp.includedTypes) {
       // include allowed values only if selected column type matches
       return filter.fk_column_id && compOp.includedTypes.includes(types.value[filter.fk_column_id])