From 1cca7d45a062eba11e5f13acba5d351e81086603 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Fri, 15 Dec 2023 16:16:43 +0700
Subject: [PATCH] feat: search in current position

---
 Services/client/src/components/PageLayout.vue      |  9 ++++++++-
 .../src/modules/01_user/components/SearchBar.vue   | 14 ++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Services/client/src/components/PageLayout.vue b/Services/client/src/components/PageLayout.vue
index dc5ed29..8dcad38 100644
--- a/Services/client/src/components/PageLayout.vue
+++ b/Services/client/src/components/PageLayout.vue
@@ -105,7 +105,14 @@ const folderFormComponent = ref<InstanceType<typeof FolderFormWrapper>>()
                 >
                   <q-icon name="arrow_back" size="1rem" color="primary" />
                 </q-btn>
-                <span v-if="isSearch">ผลการค้นหา</span>
+                <span v-if="isSearch">
+                  ผลการค้นหา
+                  <span class="text-grey text-body2 q-ml-md">{{
+                    mode === 'admin' &&
+                    currentInfo.path !== '/' &&
+                    currentInfo.path.split('/').join(' / ')
+                  }}</span>
+                </span>
                 <q-breadcrumbs
                   v-if="!isSearch"
                   active-color="grey"
diff --git a/Services/client/src/modules/01_user/components/SearchBar.vue b/Services/client/src/modules/01_user/components/SearchBar.vue
index ec71232..cfb936f 100644
--- a/Services/client/src/modules/01_user/components/SearchBar.vue
+++ b/Services/client/src/modules/01_user/components/SearchBar.vue
@@ -10,8 +10,11 @@ import { useLoader } from '@/stores/loader'
 import { useFileInfoStore } from '@/stores/file-info-data'
 
 import AdvancedSearch from '@/modules/01_user/components/AdvancedSearch.vue'
+import useStorage from '@/stores/storage'
 
 const loaderStore = useLoader()
+const storageStore = useStorage()
+const { currentInfo } = storeToRefs(storageStore)
 const { isFilePreview } = storeToRefs(useFileInfoStore())
 const {
   isExact,
@@ -29,8 +32,9 @@ const optionsField = [
   { label: 'เนื้อหาในไฟล์ (content)', value: 'attachment.content' },
 ]
 const submitSearchData = ref<{
-  AND: { field: string; value: string; exact: boolean }[]
-  OR: { field: string; value: string; exact: boolean }[]
+  AND: { field: string; value: string; exact?: boolean }[]
+  OR: { field: string; value: string; exact?: boolean }[]
+  exact?: boolean
 }>({
   AND: [],
   OR: [],
@@ -61,6 +65,12 @@ async function submitSearch() {
         value: mime.getType(searchData.value.value) || '',
         exact: true,
       })
+      if (currentInfo.value.path !== '/') {
+        submitSearchData.value.AND.push({
+          field: 'path',
+          value: currentInfo.value.path,
+        })
+      }
     } else {
       submitSearchData.value.OR.push({
         field: searchData.value.field,