Merge branch 'phatt' into development

Services/client/src/modules/01_user/components/AdvancedSearch.vue

@@ -17,19 +17,6 @@ const optionsOp = [
 ]
 const props = defineProps<{
   submitSearch: Function
-  submitSearchData: {
-    AND: {
-      field: string
-      value: string
-      exact?: boolean
-    }[]
-    OR: {
-      field: string
-      value: string
-      exact?: boolean
-    }[]
-    exact?: boolean
-  }
 }>()
 
 function addAdvSearchData() {

Services/client/src/modules/01_user/components/FileDownload.vue

@@ -145,6 +145,15 @@ async function downloadSubmit(path: string | undefined) {
             </div>
           </div>
           <q-separator />
+          <div class="row">
+            <div class="col-12 col-md-3">
+              <span>ผู้เขียน</span>
+            </div>
+            <div class="col-grow">
+              <span class="text-grey">{{ fileInfo?.author }}</span>
+            </div>
+          </div>
+          <q-separator />
           <div class="row">
             <div class="col-12 col-md-3">
               <span>กลุ่ม/หมวดหมู่</span>

Services/client/src/modules/01_user/components/SearchBar.vue

@@ -31,9 +31,18 @@ const optionsField = [
   { label: 'หมวดหมู่ (category)', value: 'category' },
   { label: 'เนื้อหาในไฟล์ (content)', value: 'attachment.content' },
 ]
-const submitSearchData = ref<
+const submitSearchData = ref<{
-  InstanceType<typeof AdvancedSearch>['submitSearchData']
+  AND: {
->({
+    field: string
+    value: string
+    exact?: boolean
+  }[]
+  OR: {
+    field: string
+    value: string
+    exact?: boolean
+  }[]
+}>({
   AND: [],
   OR: [],
 })
@@ -211,7 +220,6 @@ watch(
           <div class="col-grow">
             <advanced-search
               :submitSearch="submitSearch"
-              :submit-search-data="submitSearchData"
             />
           </div>
           <div v-if="isAdvSearchCall === false">

Services/client/src/stores/storage.ts

@@ -26,6 +26,8 @@ export interface StorageFile {
   fileType: string
   title: string
   description: string
+  author: string,
+  metadata: Record<string, unknown>
   category: string[]
   keyword: string[]
   updatedAt: string
@@ -439,9 +441,9 @@ const useStorage = defineStore('storageStore', () => {
         },
         to: file?.name
           ? {
-              file: file.name,
+            file: file.name,
-              path: arr,
+            path: arr,
-            }
+          }
           : undefined,
         upload: !!file,
       },