From 4bcbc1ca8e33e6e7595ebdffa8e4412118538c9c Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 23 Nov 2022 18:17:47 +0800
Subject: [PATCH 1/3] feat(nc-gui): useFieldQuery

---
 packages/nc-gui/composables/useFieldQuery.ts | 34 ++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 packages/nc-gui/composables/useFieldQuery.ts

diff --git a/packages/nc-gui/composables/useFieldQuery.ts b/packages/nc-gui/composables/useFieldQuery.ts
new file mode 100644
index 0000000000..b18f488ce5
--- /dev/null
+++ b/packages/nc-gui/composables/useFieldQuery.ts
@@ -0,0 +1,34 @@
+import type { Ref } from 'vue'
+import type { ViewType } from 'nocodb-sdk'
+import { useState } from '#imports'
+
+export function useFieldQuery(view: Ref<ViewType | undefined>) {
+  // initial search object
+  const emptyFieldQueryObj = {
+    field: '',
+    query: '',
+  }
+
+  // mapping view id (key) to corresponding emptyFieldQueryObj (value)
+  const searchMap = useState<Record<string, { field: string; query: string }>>('field-query-search-map', () => ({}))
+
+  // the fieldQueryObj under the current view
+  const search = useState<{ field: string; query: string }>('field-query-search', () => emptyFieldQueryObj)
+
+  // map current view id to emptyFieldQueryObj
+  if (view?.value?.id) {
+    searchMap.value[view!.value!.id] = search.value
+  }
+
+  // retrieve the fieldQueryObj of the given view id
+  // if it is not found in `searchMap`, init with emptyFieldQueryObj
+  const loadFieldQuery = (view: Ref<ViewType | undefined>) => {
+    if (!view.value?.id) return
+    if (!(view!.value!.id in searchMap.value)) {
+      searchMap.value[view!.value!.id!] = emptyFieldQueryObj
+    }
+    search.value = searchMap.value[view!.value!.id!]
+  }
+
+  return { search, loadFieldQuery }
+}

From ce009649fba5bfa603cc7c33f2d3b8bd9d77693b Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 23 Nov 2022 18:18:03 +0800
Subject: [PATCH 2/3] feat(nc-gui): load field query when view is changed

---
 .../smartsheet/toolbar/SearchData.vue         | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue b/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
index f77f72b7de..7d0440a3e5 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
@@ -1,9 +1,22 @@
 <script lang="ts" setup>
-import { ReloadViewDataHookInj, computed, inject, onClickOutside, ref, useSmartsheetStoreOrThrow } from '#imports'
+import {
+  ActiveViewInj,
+  ReloadViewDataHookInj,
+  computed,
+  inject,
+  onClickOutside,
+  ref,
+  useFieldQuery,
+  useSmartsheetStoreOrThrow,
+} from '#imports'
 
 const reloadData = inject(ReloadViewDataHookInj)!
 
-const { search, meta } = useSmartsheetStoreOrThrow()
+const { meta } = useSmartsheetStoreOrThrow()
+
+const activeView = inject(ActiveViewInj, ref())
+
+const { search, loadFieldQuery } = useFieldQuery(activeView)
 
 const isDropdownOpen = ref(false)
 
@@ -18,6 +31,16 @@ const columns = computed(() =>
   })),
 )
 
+watch(
+  () => activeView.value?.id,
+  (n, o) => {
+    if (n !== o) {
+      loadFieldQuery(activeView)
+    }
+  },
+  { immediate: true },
+)
+
 function onPressEnter() {
   reloadData.trigger()
 }

From 9b57a00d710bcabedef9ceb08deebc7136901498 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 23 Nov 2022 18:18:21 +0800
Subject: [PATCH 3/3] feat(nc-gui): move search to useFieldQuery

---
 .../nc-gui/composables/useSmartsheetStore.ts  | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/packages/nc-gui/composables/useSmartsheetStore.ts b/packages/nc-gui/composables/useSmartsheetStore.ts
index 76d203d176..86d7590307 100644
--- a/packages/nc-gui/composables/useSmartsheetStore.ts
+++ b/packages/nc-gui/composables/useSmartsheetStore.ts
@@ -1,7 +1,7 @@
 import { ViewTypes } from 'nocodb-sdk'
 import type { FilterType, KanbanType, SortType, TableType, ViewType } from 'nocodb-sdk'
 import type { Ref } from 'vue'
-import { computed, reactive, ref, unref, useInjectionState, useNuxtApp, useProject } from '#imports'
+import { computed, ref, unref, useFieldQuery, useInjectionState, useNuxtApp, useProject } from '#imports'
 
 const [useProvideSmartsheetStore, useSmartsheetStore] = useInjectionState(
   (
@@ -17,12 +17,7 @@ const [useProvideSmartsheetStore, useSmartsheetStore] = useInjectionState(
 
     const cellRefs = ref<HTMLTableDataCellElement[]>([])
 
-    // state
-    // todo: move to grid view store
-    const search = reactive({
-      field: '',
-      query: '',
-    })
+    const { search } = useFieldQuery(view)
 
     // getters
     const isLocked = computed(() => view.value?.lock_type === 'locked')
@@ -35,21 +30,20 @@ const [useProvideSmartsheetStore, useSmartsheetStore] = useInjectionState(
     const xWhere = computed(() => {
       let where
       const col =
-        (meta.value as TableType)?.columns?.find(({ id }) => id === search.field) ||
+        (meta.value as TableType)?.columns?.find(({ id }) => id === search.value.field) ||
         (meta.value as TableType)?.columns?.find((v) => v.pv)
       if (!col) return
 
-      if (!search.query.trim()) return
+      if (!search.value.query.trim()) return
       if (['text', 'string'].includes(sqlUi.value.getAbstractType(col)) && col.dt !== 'bigint') {
-        where = `(${col.title},like,%${search.query.trim()}%)`
+        where = `(${col.title},like,%${search.value.query.trim()}%)`
       } else {
-        where = `(${col.title},eq,${search.query.trim()})`
+        where = `(${col.title},eq,${search.value.query.trim()})`
       }
       return where
     })
 
     const isSqlView = computed(() => (meta.value as TableType)?.type === 'view')
-
     const sorts = ref<SortType[]>(unref(initialSorts) ?? [])
     const nestedFilters = ref<FilterType[]>(unref(initialFilters) ?? [])
 
@@ -58,7 +52,6 @@ const [useProvideSmartsheetStore, useSmartsheetStore] = useInjectionState(
       meta,
       isLocked,
       $api,
-      search,
       xWhere,
       isPkAvail,
       isForm,