From a1f2c45160f82fc8dbf01d588e57d8ae548b3736 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Tue, 26 Dec 2023 17:18:36 +0700
Subject: [PATCH 01/17] refactor: update release workflow and version gen

---
 .github/workflows/release.yaml                | 167 ++++++++----------
 .../src/controllers/versionController.ts      |   2 +-
 Services/server/src/ver.json                  |   5 -
 Services/server/src/version.json              |   4 +
 4 files changed, 83 insertions(+), 95 deletions(-)
 delete mode 100644 Services/server/src/ver.json
 create mode 100644 Services/server/src/version.json

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 99d9c43..a952b65 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -1,89 +1,78 @@
-name: release
-run-name: release ${{ github.actor }} 
-on:
-  # push:
-  #   tags:
-  #     - 'v[0-9]+.[0-9]+.[0-9]+'
-  #   tags-ignore:
-  #     - '2.*'
-  # Allow run workflow manually from Action tab
-  workflow_dispatch:
-    inputs:
-      IMAGE_VER:
-        description: "version for build image"
-        type: string
-env:
-  REGISTRY: docker.frappet.com
-  IMAGE_NAME: edm/core
-  DEPLOY_HOST: frappet.com
-  COMPOSE_PATH: /home/chamomind/docker/edm
-jobs:
-  # act workflow_dispatch --reuse -W .github/workflows/release.yaml --input IMAGE_VER=v0.2.4-dev -s DOCKER_USER=robot\$edm+edm -s DOCKER_PASS=jJCfpfU7jfJrvb5BRbVr6Z9HbWNQWR69 -s SSH_KEY="$(< ~/.ssh/chamomind-ehr)"
-  # act --reuse --workflows .github/workflows/release.yaml --job release  --input IMAGE_VER=v0.2.4-dev -s DOCKER_USER=robot\$edm+edm -s DOCKER_PASS=jJCfpfU7jfJrvb5BRbVr6Z9HbWNQWR69 -s SSH_KEY="$(< ~/.ssh/chamomind-ehr)"
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code # checkout only cms is possible but I checkout all
-        uses: actions/checkout@v3
-      - name: Gen Version
-        id: gen_ver
-        run: |
-          if [[ $GITHUB_REF == 'refs/tags/'* ]]; then
-            IMAGE_VER='${GITHUB_REF/refs\/tags\//}'
-          else
-            IMAGE_VER=${{ github.event.inputs.IMAGE_VER }}
-          fi
-          if [[ $IMAGE_VER == '' ]]; then
-            IMAGE_VER='beta'
-          fi
-          echo "{\"version\":\"$IMAGE_VER\", \"builddate\":\"$(date +"%Y-%m-%d_%T")\",\"ref_name\":\"$GITHUB_REF\" }" > ./Services/server/src/ver.json
-          cat ./Services/server/src/ver.json
-          echo '::set-output name=image_ver::'$IMAGE_VER
-      - name: Debug act
-        if: ${{ env.ACT }}
-        run: |
-          echo $GITHUB_REF
-          echo ${{ steps.gen_ver.outputs.image_ver }}
-          cat ./Services/server/src/ver.json
-          echo ${{secrets.DOCKER_USER}} 
-          echo ${{secrets.DOCKER_PASS}}
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2        
-      - name: Login in to registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{env.REGISTRY}}
-          username: ${{secrets.DOCKER_USER}}
-          password: ${{secrets.DOCKER_PASS}}
-      - name: Build and push docker image
-        uses: docker/build-push-action@v3
-        with: 
-          context: ./Services
-          platforms: linux/amd64
-          push: true
-          tags: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{ steps.gen_ver.outputs.image_ver }},${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest
-      # this stop solve mysterious build fail next stop ?!
-      - name: Debug act
-        if: ${{ env.ACT }}
-        run: |
-          echo $GITHUB_REF
-          echo ${{ steps.gen_ver.outputs.image_ver }}
-          cat ./Services/server/src/ver.json
-          echo ${{secrets.DOCKER_USER}} 
-          echo ${{secrets.DOCKER_PASS}}
-
-      - name: Remote Deployment
-        uses: appleboy/ssh-action@v1.0.0
-        # uses: appleboy/ssh-action@v0.1.8
-        with:
-          host: ${{env.DEPLOY_HOST}}
-          username: chamomind
-          key: ${{ secrets.SSH_KEY }}
-          port: 10100
-          script: |
-            cd "${{env.COMPOSE_PATH}}"
-            docker compose pull
-            docker compose up -d
-            echo "${{ steps.gen_ver.outputs.image_ver }}"> success
-            
-
+name: release
+
+run-name: release ${{ github.actor }}
+
+on:
+  workflow_dispatch:
+    inputs:
+      IMAGE_VER:
+        description: image version
+        type: string
+
+env:
+  REGISTRY: docker.frappet.com
+  IMAGE_NAME: edm/core
+  DEPLOY_HOST: frappet.com
+  COMPOSE_PATH: /home/chamomind/docker/edm
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+      - name: Gen Version
+        id: gen_ver
+        run: |
+          if [[ $GITHUB_REF == 'refs/tags/'* ]]; then
+            IMAGE_VER="${GITHUB_REF##*/}"
+          else
+            IMAGE_VER=${{ github.event.inputs.IMAGE_VER }}
+          fi
+          if [[ $IMAGE_VER == '' ]]; then
+            IMAGE_VER='dev'
+          fi
+          echo "{\"version\":\"$IMAGE_VER\", \"date\":\"$(date +"%Y-%m-%d_%T")\",\"ref\":\"$GITHUB_REF\" }" > ./Services/server/src/version.json
+          echo '::set-output name=image_ver::'$IMAGE_VER
+          cat ./Services/server/src/version.json
+      - name: Debug act
+        if: ${{ env.ACT }}
+        run: |
+          echo $GITHUB_REF
+          echo ${{ steps.gen_ver.outputs.image_ver }}
+          cat ./Services/server/src/ver.json
+          echo ${{ secrets.DOCKER_USER }}
+          echo ${{ secrets.DOCKER_PASS }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login in to registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASS }}
+      - name: Build and push docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: ./Services
+          platforms: linux/amd64
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.gen_ver.outputs.image_ver }},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+      - name: Debug act
+        if: ${{ env.ACT }}
+        run: |
+          cat ./Services/server/src/ver.json
+          echo ${{ secrets.DOCKER_USER }}
+          echo ${{ secrets.DOCKER_PASS }}
+      - name: Remote Deployment
+        uses: appleboy/ssh-action@v1.0.0
+        with:
+          host: ${{ env.DEPLOY_HOST }}
+          key: ${{ secrets.SSH_KEY }}
+          username: chamomind
+          port: 10100
+          script: |
+            cd "${{ env.COMPOSE_PATH }}"
+            docker compose pull
+            docker compose up -d
+            echo "${{ steps.gen_ver.outputs.image_ver }}"> success
diff --git a/Services/server/src/controllers/versionController.ts b/Services/server/src/controllers/versionController.ts
index c732c1f..0c95215 100644
--- a/Services/server/src/controllers/versionController.ts
+++ b/Services/server/src/controllers/versionController.ts
@@ -1,5 +1,5 @@
 import { Controller, Get, Route, Tags } from "tsoa";
-import version from "../ver.json";
+import version from "../version.json";
 
 @Route("version")
 export class VersionController extends Controller {
diff --git a/Services/server/src/ver.json b/Services/server/src/ver.json
deleted file mode 100644
index 45b1a38..0000000
--- a/Services/server/src/ver.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "version": "dev",
-  "builddate": "2020-01-01_00:00:00"
-}
-
diff --git a/Services/server/src/version.json b/Services/server/src/version.json
new file mode 100644
index 0000000..c0cff98
--- /dev/null
+++ b/Services/server/src/version.json
@@ -0,0 +1,4 @@
+{
+  "version": "v0.0.0-dev",
+  "date": "2023-01-01_00:00:00"
+}

From bea1643105ae3c3ec1b78cd8b3f5a0165c997902 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Wed, 10 Jan 2024 17:03:25 +0700
Subject: [PATCH 02/17] fix: wrong file path

---
 .github/workflows/release.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a952b65..1fb2a89 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -40,7 +40,7 @@ jobs:
         run: |
           echo $GITHUB_REF
           echo ${{ steps.gen_ver.outputs.image_ver }}
-          cat ./Services/server/src/ver.json
+          cat ./Services/server/src/version.json
           echo ${{ secrets.DOCKER_USER }}
           echo ${{ secrets.DOCKER_PASS }}
       - name: Set up Docker Buildx
@@ -61,7 +61,7 @@ jobs:
       - name: Debug act
         if: ${{ env.ACT }}
         run: |
-          cat ./Services/server/src/ver.json
+          cat ./Services/server/src/version.json
           echo ${{ secrets.DOCKER_USER }}
           echo ${{ secrets.DOCKER_PASS }}
       - name: Remote Deployment

From d20f9f202efc88c8681a4d06d7fcaad058fde1d8 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Wed, 10 Jan 2024 17:36:10 +0700
Subject: [PATCH 03/17] fix: user cannot view folder size

---
 Services/server/src/controllers/storageController.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Services/server/src/controllers/storageController.ts b/Services/server/src/controllers/storageController.ts
index de13e54..b024a30 100644
--- a/Services/server/src/controllers/storageController.ts
+++ b/Services/server/src/controllers/storageController.ts
@@ -430,7 +430,7 @@ export class StorageController extends Controller {
    */
   @Post("folder/size")
   @Tags("Storage Folder")
-  @Security("bearerAuth", ["management-role", "admin"])
+  @Security("bearerAuth")
   @SuccessResponse(HttpStatusCode.OK, "สำเร็จ")
   @Example({
     size: 10240,

From f819910479f9f5042f8082f8bb850d8df26418ac Mon Sep 17 00:00:00 2001
From: oat <oatkub402@gmail.com>
Date: Wed, 10 Jan 2024 17:37:25 +0700
Subject: [PATCH 04/17] =?UTF-8?q?chore:=20=E0=B8=88=E0=B8=B1=E0=B8=94?=
 =?UTF-8?q?=E0=B8=8A=E0=B8=B4=E0=B8=94=E0=B8=8B=E0=B9=89=E0=B8=B2=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B1=E0=B8=9A=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=E0=B9=80=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=82=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=87=E0=B8=9C=E0=B8=A5=E0=B8=87=E0=B8=B2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/src/components/FileSearched.vue    | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/Services/client/src/components/FileSearched.vue b/Services/client/src/components/FileSearched.vue
index 5ce89ac..64efb29 100644
--- a/Services/client/src/components/FileSearched.vue
+++ b/Services/client/src/components/FileSearched.vue
@@ -54,12 +54,20 @@ const columns: QTableProps['columns'] = [
   },
   {
     name: 'title',
-    align: 'center',
+    align: 'left',
     label: 'ชื่อเรื่อง',
     field: 'title',
     style: 'width: 200px',
     sortable: true,
   },
+  {
+    name: 'author',
+    align: 'left',
+    label: 'เจ้าของผลงาน',
+    field: 'author',
+    style: 'width: 200px',
+    sortable: true,
+  },
   {
     name: 'fileType',
     align: 'center',
@@ -75,6 +83,7 @@ const columns: QTableProps['columns'] = [
     field: '',
     style: 'width: 20px',
   },
+
 ]
 const socket = io(import.meta.env.VITE_API_HOST)
 
@@ -262,17 +271,29 @@ onMounted(() => {
           <file-icon
             size="list"
             :fileMimeType="
-              nameData.row.fileType ? nameData.row.fileType : 'unknow'
+              nameData.row.fileType ? nameData.row.fileType : 'unknown'
+            "
+            :fileName="
+              nameData.row.fileName ? nameData.row.fileName : 'unknown'
             "
-            :fileName="nameData.row.fileName ? nameData.row.fileName : 'unknow'"
           />
           {{ nameData.row.fileName }}
         </q-td>
       </template>
+      <template v-slot:body-cell-title="data">
+        <q-td style="width: 50%" @click="() => getFileInfo(data.row)">
+          {{ data.row.metadata.subject ?? data.row.title }}
+        </q-td>
+      </template>
+      <template v-slot:body-cell-author="author">
+        <q-td style="width: 50%" @click="() => getFileInfo(author.row)">
+          {{ author.row.metadata.author ?? '-' }}
+        </q-td>
+      </template>
 
       <template v-slot:body-cell-fileType="typeData">
         <q-td>
-          <div class="justify-center">
+          <div>
             {{ getType(typeData.row.fileType, typeData.row.fileName) }}
           </div>
         </q-td>

From 04f33808d529f8797ec50fb339f5369817be3594 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Wed, 10 Jan 2024 17:48:33 +0700
Subject: [PATCH 05/17] feat: add author field

---
 Services/client/src/components/FileForm.vue   | 32 ++++++++++++++++---
 .../client/src/components/FileFormWrapper.vue | 12 +++++--
 Services/client/src/stores/storage.ts         |  9 +++---
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/Services/client/src/components/FileForm.vue b/Services/client/src/components/FileForm.vue
index 2dfee63..c9f545c 100644
--- a/Services/client/src/components/FileForm.vue
+++ b/Services/client/src/components/FileForm.vue
@@ -19,6 +19,7 @@ const props = withDefaults(
     description?: string
     keyword?: string[]
     category?: string[]
+    author?: string
   }>(),
   {
     open: false,
@@ -34,6 +35,7 @@ const emit = defineEmits([
   'update:description',
   'update:keyword',
   'update:category',
+  'update:author',
   'filechange',
   'reset',
   'submit',
@@ -56,6 +58,7 @@ function reset() {
   emit('update:description', '')
   emit('update:keyword', '')
   emit('update:category', '')
+  emit('update:author', '')
   emit('reset')
 }
 
@@ -67,6 +70,7 @@ function submit() {
     description: props.description ?? '',
     keyword: props.keyword,
     category: props.category,
+    author: props.author,
   })
 }
 
@@ -165,7 +169,9 @@ const file = ref<File | undefined>()
                 : ''
           "
           id="inputFile"
-          :rules="[(v) => (v !== undefined || mode === 'edit' ) || ('โปรดอัปโหลดไฟล์')]"
+          :rules="[
+            (v) => v !== undefined || mode === 'edit' || 'โปรดอัปโหลดไฟล์',
+          ]"
         >
           <template v-slot:prepend>
             <q-icon name="attach_file" />
@@ -181,7 +187,10 @@ const file = ref<File | undefined>()
           class="q-my-sm"
           placeholder="กรอกชื่อเรื่อง"
           :model-value="title"
-          :rules="[(v) => (v != undefined && v.length > 3) || 'ชื่อต้องยาวกว่า 3 ตัวอักษร']"
+          :rules="[
+            (v) =>
+              (v != undefined && v.length > 3) || 'ชื่อต้องยาวกว่า 3 ตัวอักษร',
+          ]"
           @update:model-value="(v) => $emit('update:title', v)"
           id="inputTitle"
         />
@@ -217,7 +226,6 @@ const file = ref<File | undefined>()
             @new-value="createCategory"
             :options="filterDataCategory"
             @filter="filterCategory"
-            style="width: 250px"
             @update:model-value="(v) => $emit('update:category', v)"
             data-testid="filterDataCategory"
           >
@@ -237,7 +245,6 @@ const file = ref<File | undefined>()
             multiple
             hide-dropdown-icon
             input-debounce="0"
-            style="width: 250px"
             :model-value="props.keyword"
             @update:model-value="(v) => $emit('update:keyword', v)"
             @new-value="createKeyword"
@@ -247,6 +254,23 @@ const file = ref<File | undefined>()
         </div>
       </section>
 
+      <section class="q-mb-md">
+        <span class="text-weight-bold">เจ้าของผลงาน</span>
+        <q-input
+          outlined
+          dense
+          class="q-my-sm"
+          placeholder="เจ้าของผลงาน"
+          :model-value="author"
+          :rules="[
+            (v) =>
+              (v != undefined && v.length > 3) || 'ชื่อต้องยาวกว่า 3 ตัวอักษร',
+          ]"
+          @update:model-value="(v) => $emit('update:author', v)"
+          id="inputAuthor"
+        />
+      </section>
+
       <section :style="{ display: 'flex', gap: '.5rem' }">
         <q-btn
           label="บันทึก"
diff --git a/Services/client/src/components/FileFormWrapper.vue b/Services/client/src/components/FileFormWrapper.vue
index 28f6384..2dadcf9 100644
--- a/Services/client/src/components/FileFormWrapper.vue
+++ b/Services/client/src/components/FileFormWrapper.vue
@@ -17,6 +17,7 @@ const fileFormData = ref<{
   description?: string
   keyword?: string[]
   category?: string[]
+  author?: string
 }>({})
 const fileFormType = ref<'edit' | 'create'>('create')
 const fileFormError = ref<{ fileExist?: boolean; fileName2Long?: boolean }>({})
@@ -68,7 +69,7 @@ function checkFileExist(name: string, except?: string) {
 }
 
 function checkFileName2Long(name: string, except?: string) {
-  return Boolean(name.length > 85)
+  return name !== except && Boolean(name.length > 85)
 }
 
 async function submitFileForm(
@@ -79,6 +80,7 @@ async function submitFileForm(
     description: string
     keyword: string[]
     category: string[]
+    author: string
   },
   force = false,
 ) {
@@ -101,6 +103,7 @@ async function submitFileForm(
       description: value.description,
       keyword: value.keyword,
       category: value.category,
+      author: value.author,
     })
   } else {
     await updateFile(
@@ -110,6 +113,7 @@ async function submitFileForm(
         description: value.description,
         keyword: value.keyword,
         category: value.category,
+        author: value.author,
       },
       value.file,
     )
@@ -132,11 +136,15 @@ async function submitFileForm(
     v-model:description="fileFormData.description"
     v-model:keyword="fileFormData.keyword"
     v-model:category="fileFormData.category"
+    v-model:author="fileFormData.author"
     @reset="() => (fileFormError = {})"
     @filechange="
       (name: string) => {
         ;(fileFormError.fileExist = checkFileExist(name, fileNameLabel)),
-          (fileFormError.fileName2Long = checkFileName2Long(name, fileNameLabel))
+          (fileFormError.fileName2Long = checkFileName2Long(
+            name,
+            fileNameLabel,
+          ))
       }
     "
     @submit="submitFileForm"
diff --git a/Services/client/src/stores/storage.ts b/Services/client/src/stores/storage.ts
index f5a0b8f..be7b9e5 100644
--- a/Services/client/src/stores/storage.ts
+++ b/Services/client/src/stores/storage.ts
@@ -26,7 +26,7 @@ export interface StorageFile {
   fileType: string
   title: string
   description: string
-  author: string,
+  author: string
   metadata: Record<string, unknown>
   category: string[]
   keyword: string[]
@@ -393,6 +393,7 @@ const useStorage = defineStore('storageStore', () => {
     description?: string
     category?: string[]
     keyword?: string[]
+    author?: string
   }
   async function createFile(
     file: File,
@@ -441,9 +442,9 @@ const useStorage = defineStore('storageStore', () => {
         },
         to: file?.name
           ? {
-            file: file.name,
-            path: arr,
-          }
+              file: file.name,
+              path: arr,
+            }
           : undefined,
         upload: !!file,
       },

From 2dab20238d2db7aefe872fcb08cc33fee8733944 Mon Sep 17 00:00:00 2001
From: puri-ph4tt <puriphat001@gmail.com>
Date: Wed, 10 Jan 2024 17:53:09 +0700
Subject: [PATCH 06/17] =?UTF-8?q?update:=20=E0=B8=A5=E0=B8=9A.=E0=B8=99?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A1=E0=B8=AA=E0=B8=81=E0=B8=B8=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Services/client/src/stores/file-info-data.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Services/client/src/stores/file-info-data.ts b/Services/client/src/stores/file-info-data.ts
index 285fda4..d13bc2f 100644
--- a/Services/client/src/stores/file-info-data.ts
+++ b/Services/client/src/stores/file-info-data.ts
@@ -67,7 +67,7 @@ export const useFileInfoStore = defineStore('info', () => {
 
     const extension = mime.getExtension(mimeType)
 
-    if (extension) return '.' + extension
+    if (extension) return extension
     if (fileName && fileName.includes('.')) {
       return fileName.substring(fileName.lastIndexOf('.'))
     }

From 592a6296e932b62e931cc247e89f3a0a9ed90011 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Wed, 10 Jan 2024 18:03:28 +0700
Subject: [PATCH 07/17] fix: add missing update field

---
 Services/client/src/components/FileFormWrapper.vue | 2 ++
 Services/client/src/components/FileItem.vue        | 1 +
 Services/client/src/components/FileSearched.vue    | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Services/client/src/components/FileFormWrapper.vue b/Services/client/src/components/FileFormWrapper.vue
index 2dadcf9..86198c9 100644
--- a/Services/client/src/components/FileFormWrapper.vue
+++ b/Services/client/src/components/FileFormWrapper.vue
@@ -37,6 +37,7 @@ function triggerFileEdit(
     description: string
     keyword: string[]
     category: string[]
+    author: string
   },
   pathname: string,
   file?: string,
@@ -49,6 +50,7 @@ function triggerFileEdit(
     description: value.description,
     keyword: value.keyword,
     category: value.category,
+    author: value.author,
   }
   fileNameLabel.value = file
 }
diff --git a/Services/client/src/components/FileItem.vue b/Services/client/src/components/FileItem.vue
index 1182942..aa7fef2 100644
--- a/Services/client/src/components/FileItem.vue
+++ b/Services/client/src/components/FileItem.vue
@@ -246,6 +246,7 @@ function triggerFileDelete(pathname: string) {
                     description: value.description,
                     keyword: value.keyword,
                     category: value.category,
+                    author: value.author,
                   },
                   value.pathname,
                   value.fileName,
diff --git a/Services/client/src/components/FileSearched.vue b/Services/client/src/components/FileSearched.vue
index 64efb29..d4dfe5f 100644
--- a/Services/client/src/components/FileSearched.vue
+++ b/Services/client/src/components/FileSearched.vue
@@ -83,7 +83,6 @@ const columns: QTableProps['columns'] = [
     field: '',
     style: 'width: 20px',
   },
-
 ]
 const socket = io(import.meta.env.VITE_API_HOST)
 
@@ -232,6 +231,7 @@ onMounted(() => {
                       description: value.description,
                       keyword: value.keyword,
                       category: value.category,
+                      author: value.author,
                     },
                     value.pathname,
                     value.fileName,

From 57ce0fc956e9a2fd7b1ae9b221848bfb0722bb04 Mon Sep 17 00:00:00 2001
From: oat <oatkub402@gmail.com>
Date: Wed, 10 Jan 2024 18:05:16 +0700
Subject: [PATCH 08/17] =?UTF-8?q?update:=20=E0=B9=81=E0=B8=81=E0=B9=89?=
 =?UTF-8?q?=E0=B8=8A=E0=B8=B4=E0=B8=94=E0=B8=8B=E0=B9=89=E0=B8=B2=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Services/client/src/components/ListView.vue | 25 ++++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/Services/client/src/components/ListView.vue b/Services/client/src/components/ListView.vue
index 2834495..91c15ad 100644
--- a/Services/client/src/components/ListView.vue
+++ b/Services/client/src/components/ListView.vue
@@ -90,14 +90,14 @@ const colFolder = [
   {
     name: 'createdBy',
     label: 'สร้างโดย',
-    align: 'center',
+    align: 'left',
     field: 'createdBy',
     sortable: true,
   },
   {
     name: 'createdAt',
     label: 'วันที่สร้าง',
-    align: 'center',
+    align: 'left',
     field: 'createdAt',
     sortable: true,
   },
@@ -120,14 +120,22 @@ const colFile = [
   {
     name: 'title',
     label: 'ชื่อเรื่อง',
-    align: 'center',
+    align: 'left',
     field: 'title',
     sortable: true,
   },
+  {
+    name: 'author',
+    align: 'left',
+    label: 'เจ้าของผลงาน',
+    field: 'author',
+    style: 'width: 200px',
+    sortable: true,
+  },
   {
     name: 'fileType',
     label: 'ประเภทของไฟล์',
-    align: 'center',
+    align: 'left',
     field: 'fileType',
     sortable: true,
   },
@@ -197,14 +205,14 @@ const onRowClick = ((_, row) => {
           </q-td>
         </template>
         <template v-slot:body-cell-createdBy="data">
-          <q-td class="text-center">
+          <q-td>
             <span class="sort-icon-offset-margin">
               {{ data.row.createdBy }}
             </span>
           </q-td>
         </template>
         <template v-slot:body-cell-createdAt="data">
-          <q-td class="text-center">
+          <q-td>
             <span class="sort-icon-offset-margin">
               {{ getFormatDate(data.row.createdAt) }}
             </span>
@@ -306,12 +314,13 @@ const onRowClick = ((_, row) => {
           </q-td>
         </template>
         <template v-slot:body-cell-title="data">
-          <q-td class="text-center">
+          <q-td>
             <span class="sort-icon-offset-margin">{{ data.row.title }}</span>
           </q-td>
         </template>
+        
         <template v-slot:body-cell-fileType="data">
-          <q-td class="text-center">
+          <q-td>
             <span class="sort-icon-offset-margin">
               {{ getType(data.row.fileType, data.row.fileName) }}
             </span>

From f3582433f5410b4335ba98bf16151368e719c136 Mon Sep 17 00:00:00 2001
From: puri-ph4tt <puriphat001@gmail.com>
Date: Wed, 10 Jan 2024 18:07:15 +0700
Subject: [PATCH 09/17] =?UTF-8?q?update:=20=E0=B8=84=E0=B9=89=E0=B8=99?=
 =?UTF-8?q?=E0=B8=AB=E0=B8=B2=E0=B9=80=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=82?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=87,=20=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=B9=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../01_user/components/FileDownload.vue       |  6 ++--
 .../modules/01_user/components/SearchBar.vue  | 30 ++++++++++++++++---
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/Services/client/src/modules/01_user/components/FileDownload.vue b/Services/client/src/modules/01_user/components/FileDownload.vue
index dfa2bca..cee6f16 100644
--- a/Services/client/src/modules/01_user/components/FileDownload.vue
+++ b/Services/client/src/modules/01_user/components/FileDownload.vue
@@ -132,7 +132,7 @@ async function downloadSubmit(path: string | undefined) {
               <span>ชื่อเรื่อง</span>
             </div>
             <div class="col-grow">
-              <span class="text-grey">{{ fileInfo?.title }}</span>
+              <span class="text-grey">{{ fileInfo?.metadata.subject ?? fileInfo?.title }}</span>
             </div>
           </div>
           <q-separator />
@@ -147,10 +147,10 @@ async function downloadSubmit(path: string | undefined) {
           <q-separator />
           <div class="row">
             <div class="col-12 col-md-3">
-              <span>ผู้เขียน</span>
+              <span>เจ้าของผลงาน</span>
             </div>
             <div class="col-grow">
-              <span class="text-grey">{{ fileInfo?.author }}</span>
+              <span class="text-grey">{{ fileInfo?.metadata.author ?? fileInfo?.author }}</span>
             </div>
           </div>
           <q-separator />
diff --git a/Services/client/src/modules/01_user/components/SearchBar.vue b/Services/client/src/modules/01_user/components/SearchBar.vue
index e1c9df2..aa38ed7 100644
--- a/Services/client/src/modules/01_user/components/SearchBar.vue
+++ b/Services/client/src/modules/01_user/components/SearchBar.vue
@@ -30,6 +30,7 @@ const optionsField = [
   { label: 'คำสำคัญ (keyword)', value: 'keyword' },
   { label: 'หมวดหมู่ (category)', value: 'category' },
   { label: 'เนื้อหาในไฟล์ (content)', value: 'attachment.content' },
+  { label: 'เจ้าของผลงาน (author)', value: 'author' },
 ]
 const submitSearchData = ref<{
   AND: {
@@ -67,6 +68,16 @@ async function submitSearch() {
         value: searchData.value.value,
         exact: true,
       })
+      submitSearchData.value.OR.push({
+        field: 'metadata.author',
+        value: searchData.value.value,
+        exact: true,
+      })
+      submitSearchData.value.OR.push({
+        field: 'metadata.subject',
+        value: searchData.value.value,
+        exact: true,
+      })
       submitSearchData.value.OR.push({
         field: 'fileType',
         value: mime.getType(searchData.value.value) || '',
@@ -79,6 +90,20 @@ async function submitSearch() {
         })
       }
     } else {
+      if (searchData.value.field == 'title') {
+        submitSearchData.value.OR.push({
+          field: 'metadata.subject',
+          value: searchData.value.value,
+          exact: isExact.value,
+        })
+      }
+      if (searchData.value.field == 'author') {
+        submitSearchData.value.OR.push({
+          field: 'metadata.author',
+          value: searchData.value.value,
+          exact: isExact.value,
+        })
+      }
       submitSearchData.value.OR.push({
         field: searchData.value.field,
         value: searchData.value.value,
@@ -125,7 +150,6 @@ async function submitSearch() {
         `${import.meta.env.VITE_API_ENDPOINT}/search`,
         submitSearchData.value,
       )
-
       getFoundFile(res.data)
       isSearch.value = true
     } catch (error) {
@@ -218,9 +242,7 @@ watch(
       <div class="col">
         <div class="row items-center justify-between q-gutter-y-md q-pt-sm">
           <div class="col-grow">
-            <advanced-search
-              :submitSearch="submitSearch"
-            />
+            <advanced-search :submitSearch="submitSearch" />
           </div>
           <div v-if="isAdvSearchCall === false">
             <q-btn

From e9d9b60abbe28d7b2a786c71d7a51885555a32fd Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Thu, 11 Jan 2024 09:29:47 +0700
Subject: [PATCH 10/17] fix: path should not display when search in user

---
 Services/client/src/components/PageLayout.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Services/client/src/components/PageLayout.vue b/Services/client/src/components/PageLayout.vue
index 8dcad38..27d0645 100644
--- a/Services/client/src/components/PageLayout.vue
+++ b/Services/client/src/components/PageLayout.vue
@@ -108,9 +108,9 @@ const folderFormComponent = ref<InstanceType<typeof FolderFormWrapper>>()
                 <span v-if="isSearch">
                   ผลการค้นหา
                   <span class="text-grey text-body2 q-ml-md">{{
-                    mode === 'admin' &&
-                    currentInfo.path !== '/' &&
-                    currentInfo.path.split('/').join(' / ')
+                    mode === 'admin' && currentInfo.path !== '/'
+                      ? currentInfo.path.split('/').join(' / ')
+                      : ''
                   }}</span>
                 </span>
                 <q-breadcrumbs

From 65aa1a6d152d547cdc90b268bac00fc28c14d3d2 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Thu, 11 Jan 2024 09:34:19 +0700
Subject: [PATCH 11/17] update: show subject with fallback to title

---
 Services/client/src/components/ListView.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Services/client/src/components/ListView.vue b/Services/client/src/components/ListView.vue
index 91c15ad..6df82bb 100644
--- a/Services/client/src/components/ListView.vue
+++ b/Services/client/src/components/ListView.vue
@@ -315,10 +315,12 @@ const onRowClick = ((_, row) => {
         </template>
         <template v-slot:body-cell-title="data">
           <q-td>
-            <span class="sort-icon-offset-margin">{{ data.row.title }}</span>
+            <span class="sort-icon-offset-margin">{{
+              data.row.metadata.subject ?? data.row.metadata.title
+            }}</span>
           </q-td>
         </template>
-        
+
         <template v-slot:body-cell-fileType="data">
           <q-td>
             <span class="sort-icon-offset-margin">

From 0c35ab48adf8d4df82f9986bbb1a44825a5932c8 Mon Sep 17 00:00:00 2001
From: puri-ph4tt <puriphat001@gmail.com>
Date: Thu, 11 Jan 2024 09:59:25 +0700
Subject: [PATCH 12/17] =?UTF-8?q?update:=20=E0=B9=80=E0=B8=9E=E0=B8=B4?=
 =?UTF-8?q?=E0=B9=88=E0=B8=A1=E0=B9=80=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=82?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=87=E0=B8=9C=E0=B8=A5=E0=B8=87=E0=B8=B2=E0=B8=99?=
 =?UTF-8?q?=E0=B9=83=E0=B8=99=E0=B8=84=E0=B9=89=E0=B8=99=E0=B8=AB=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=82=E0=B8=B1=E0=B9=89=E0=B8=99=E0=B8=AA=E0=B8=B9=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../01_user/components/AdvancedSearch.vue     |  8 +------
 .../modules/01_user/components/SearchBar.vue  | 24 ++++++++++++-------
 Services/client/src/stores/searched-data.ts   |  8 +++++++
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/Services/client/src/modules/01_user/components/AdvancedSearch.vue b/Services/client/src/modules/01_user/components/AdvancedSearch.vue
index 0021992..6128d95 100644
--- a/Services/client/src/modules/01_user/components/AdvancedSearch.vue
+++ b/Services/client/src/modules/01_user/components/AdvancedSearch.vue
@@ -3,14 +3,8 @@ import { storeToRefs } from 'pinia'
 
 import { useSearchDataStore } from '@/stores/searched-data'
 
-const { isAdvSearchCall, advSearchDataRow, advSearchDataField } =
+const { isAdvSearchCall, advSearchDataRow, advSearchDataField, optionsField } =
   storeToRefs(useSearchDataStore())
-const optionsField = [
-  { label: 'ชื่อเรื่อง (title)', value: 'title' },
-  { label: 'คำสำคัญ (keyword)', value: 'keyword' },
-  { label: 'หมวดหมู่ (category)', value: 'category' },
-  { label: 'เนื้อหาในไฟล์ (content)', value: 'attachment.content' },
-]
 const optionsOp = [
   { label: 'และ', value: 'AND' },
   { label: 'หรือ', value: 'OR' },
diff --git a/Services/client/src/modules/01_user/components/SearchBar.vue b/Services/client/src/modules/01_user/components/SearchBar.vue
index aa38ed7..694477e 100644
--- a/Services/client/src/modules/01_user/components/SearchBar.vue
+++ b/Services/client/src/modules/01_user/components/SearchBar.vue
@@ -22,16 +22,10 @@ const {
   isAdvSearchCall,
   searchData,
   advSearchDataField,
+  optionsField,
   advSearchDataRow,
 } = storeToRefs(useSearchDataStore())
 const { getFoundFile } = useSearchDataStore()
-const optionsField = [
-  { label: 'ชื่อเรื่อง (title)', value: 'title' },
-  { label: 'คำสำคัญ (keyword)', value: 'keyword' },
-  { label: 'หมวดหมู่ (category)', value: 'category' },
-  { label: 'เนื้อหาในไฟล์ (content)', value: 'attachment.content' },
-  { label: 'เจ้าของผลงาน (author)', value: 'author' },
-]
 const submitSearchData = ref<{
   AND: {
     field: string
@@ -56,7 +50,7 @@ async function submitSearch() {
   if (searchData.value.value.trim() !== '') {
     submitSearchData.value = { AND: [], OR: [] }
     if (props.mode === 'admin') {
-      optionsField.forEach((option) => {
+      optionsField.value.forEach((option) => {
         submitSearchData.value.OR.push({
           field: option.value,
           value: searchData.value.value,
@@ -117,6 +111,20 @@ async function submitSearch() {
           (d: { field: string; value: string; op: string; exact: boolean }) => {
             if (d.field && d.value.trim() !== '') {
               const op = d.op === 'AND' ? 'AND' : 'OR'
+              if (d.field == 'title') {
+                submitSearchData.value[op].push({
+                  field: 'metadata.subject',
+                  value: d.value,
+                  exact: d.exact,
+                })
+              }
+              if (d.field == 'author') {
+                submitSearchData.value[op].push({
+                  field: 'metadata.author',
+                  value: d.value,
+                  exact: d.exact,
+                })
+              }
               submitSearchData.value[op].push({
                 field: d.field,
                 value: d.value,
diff --git a/Services/client/src/stores/searched-data.ts b/Services/client/src/stores/searched-data.ts
index 125fb32..c62b330 100644
--- a/Services/client/src/stores/searched-data.ts
+++ b/Services/client/src/stores/searched-data.ts
@@ -36,6 +36,13 @@ export const useSearchDataStore = defineStore('searched', () => {
       exact: false,
     },
   ])
+  const optionsField = ref([
+    { label: 'ชื่อเรื่อง (title)', value: 'title' },
+    { label: 'คำสำคัญ (keyword)', value: 'keyword' },
+    { label: 'หมวดหมู่ (category)', value: 'category' },
+    { label: 'เนื้อหาในไฟล์ (content)', value: 'attachment.content' },
+    { label: 'เจ้าของผลงาน (author)', value: 'author' },
+  ])
   const advSearchDataField = ref<AdvancedSearchFields>({
     keyword: [],
     description: '',
@@ -52,6 +59,7 @@ export const useSearchDataStore = defineStore('searched', () => {
     isAdvSearchCall,
     searchData,
     advSearchDataRow,
+    optionsField,
     advSearchDataField,
     getFoundFile,
   }

From f17047aab7aa804d44985607cb7a17adee78108c Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Thu, 11 Jan 2024 10:03:10 +0700
Subject: [PATCH 13/17] update: add more field

---
 Services/client/src/components/ListView.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Services/client/src/components/ListView.vue b/Services/client/src/components/ListView.vue
index 6df82bb..2810752 100644
--- a/Services/client/src/components/ListView.vue
+++ b/Services/client/src/components/ListView.vue
@@ -316,11 +316,17 @@ const onRowClick = ((_, row) => {
         <template v-slot:body-cell-title="data">
           <q-td>
             <span class="sort-icon-offset-margin">{{
-              data.row.metadata.subject ?? data.row.metadata.title
+              data.row.metadata.subject ?? data.row.title
             }}</span>
           </q-td>
         </template>
-
+        <template v-slot:body-cell-author="data">
+          <q-td>
+            <span class="sort-icon-offset-margin">
+              {{ data.row.metadata.author ?? data.row.author }}
+            </span>
+          </q-td>
+        </template>
         <template v-slot:body-cell-fileType="data">
           <q-td>
             <span class="sort-icon-offset-margin">

From 84a8fea5ab9256e9812666a4833f86be56e5dc93 Mon Sep 17 00:00:00 2001
From: puri-ph4tt <puriphat001@gmail.com>
Date: Thu, 11 Jan 2024 10:07:25 +0700
Subject: [PATCH 14/17] =?UTF-8?q?update:=20=E0=B9=81=E0=B8=AA=E0=B8=94?=
 =?UTF-8?q?=E0=B8=87=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B9=80=E0=B8=88?=
 =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=9C=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99=20list=20=E0=B8=95=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=99=E0=B8=84=E0=B9=89=E0=B8=99=E0=B8=AB=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Services/client/src/components/FileSearched.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Services/client/src/components/FileSearched.vue b/Services/client/src/components/FileSearched.vue
index d4dfe5f..7de1387 100644
--- a/Services/client/src/components/FileSearched.vue
+++ b/Services/client/src/components/FileSearched.vue
@@ -287,7 +287,7 @@ onMounted(() => {
       </template>
       <template v-slot:body-cell-author="author">
         <q-td style="width: 50%" @click="() => getFileInfo(author.row)">
-          {{ author.row.metadata.author ?? '-' }}
+          {{ author.row.metadata.author ?? author.row.author }}
         </q-td>
       </template>
 

From 5bda7d8b1ab0212296a495d89716502ec55ec40e Mon Sep 17 00:00:00 2001
From: net <tnp_sj149-3@hotmail.co.th>
Date: Thu, 11 Jan 2024 10:48:02 +0700
Subject: [PATCH 15/17] =?UTF-8?q?update:=20=E0=B9=80=E0=B8=9E=E0=B8=B4?=
 =?UTF-8?q?=E0=B9=88=E0=B8=A1=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=94=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B0?=
 =?UTF-8?q?=E0=B9=80=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94=20info?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Services/client/src/components/ListView.vue | 32 +++++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/Services/client/src/components/ListView.vue b/Services/client/src/components/ListView.vue
index 2810752..c86ab98 100644
--- a/Services/client/src/components/ListView.vue
+++ b/Services/client/src/components/ListView.vue
@@ -35,7 +35,6 @@ const props = defineProps<{
 
 const deleteState = ref<boolean>(false)
 const open = ref<boolean>(false)
-
 const deletePath = ref<string>('')
 const deleteTarget = ref<'deleteFolder' | 'deleteFile'>()
 const deleteMap = { deleteFolder, deleteFile }
@@ -348,7 +347,24 @@ const onRowClick = ((_, row) => {
                 self="center right"
                 :offset="[5, 1]"
               >
-                {{ getSize(data.row.fileSize) }}
+                <div class="flex" style="flex-direction: column">
+                  <span> ชื่อไฟล์ {{ data.row.fileName }}</span>
+                  <span
+                    >ชื่อเรื่อง
+                    {{
+                      data.row.metadata.subject ?? data.row.subject.title
+                    }}</span
+                  >
+                  <span
+                    >เจ้าของผลงาน
+                    {{ data.row.metadata.author ?? data.row.author }}</span
+                  >
+                  <span>ขนาดไฟล์ {{ getSize(data.row.fileSize) }}</span>
+                  <span
+                    >ประเภทไฟล์
+                    {{ getType(data.row.fileType, data.row.fileName) }}</span
+                  >
+                </div>
               </q-tooltip>
             </div>
             <div v-if="props.mode === 'admin'">
@@ -390,11 +406,21 @@ const onRowClick = ((_, row) => {
   justify-content: center;
   align-items: center;
 }
-
+.justify-center {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 .sort-icon-offset-margin {
   margin-right: 18px;
 }
+.q-item-label {
+  text-align: left;
+}
 
+.underline {
+  text-decoration: underline;
+}
 .cursor {
   cursor: pointer;
 }

From 128eb2db5621e79d853eb2e635059ed5c6503d3d Mon Sep 17 00:00:00 2001
From: net <tnp_sj149-3@hotmail.co.th>
Date: Thu, 11 Jan 2024 10:52:26 +0700
Subject: [PATCH 16/17] =?UTF-8?q?fix:=20=E0=B9=83=E0=B8=AA=E0=B9=88?=
 =?UTF-8?q?=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=82=E0=B9=89=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=9C=E0=B8=B4=E0=B8=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Services/client/src/components/ListView.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Services/client/src/components/ListView.vue b/Services/client/src/components/ListView.vue
index c86ab98..967272a 100644
--- a/Services/client/src/components/ListView.vue
+++ b/Services/client/src/components/ListView.vue
@@ -351,9 +351,7 @@ const onRowClick = ((_, row) => {
                   <span> ชื่อไฟล์ {{ data.row.fileName }}</span>
                   <span
                     >ชื่อเรื่อง
-                    {{
-                      data.row.metadata.subject ?? data.row.subject.title
-                    }}</span
+                    {{ data.row.metadata.subject ?? data.row.subject }}</span
                   >
                   <span
                     >เจ้าของผลงาน

From 7ef9384717bcc9681e581b692e05c760a78729db Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Thu, 11 Jan 2024 10:59:13 +0700
Subject: [PATCH 17/17] update: tooltip

---
 .../client/src/components/FileSearched.vue    | 32 +++++++++++---
 Services/client/src/components/ListView.vue   | 43 ++++++++++---------
 2 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/Services/client/src/components/FileSearched.vue b/Services/client/src/components/FileSearched.vue
index 7de1387..36a2f72 100644
--- a/Services/client/src/components/FileSearched.vue
+++ b/Services/client/src/components/FileSearched.vue
@@ -29,6 +29,9 @@ const { getFileInfo, getSize, getType } = useFileInfoStore()
 const storageStore = useStorage()
 const { deleteFile } = storageStore
 
+const fileInfoStore = useFileInfoStore()
+const { getFormatDate } = fileInfoStore
+
 const fileFormComponent = ref<InstanceType<typeof FileFormWrapper>>()
 
 const keywordList = ref<string[]>([])
@@ -303,12 +306,29 @@ onMounted(() => {
         <q-td class="justify-center">
           <div>
             <q-icon class="q-ma-sm" name="o_info" size="2em" color="primary" />
-            <q-tooltip
-              anchor="center left"
-              self="center right"
-              :offset="[5, 1]"
-            >
-              {{ getSize(actionData.row.fileSize) }}
+            <q-tooltip anchor="center left" self="center right">
+              <div class="flex" style="flex-direction: column; font-size: 120%">
+                <span>ชื่อไฟล์: {{ actionData.row.fileName }}</span>
+                <span>
+                  ชื่อเรื่อง:
+                  {{ actionData.row.metadata.subject ?? actionData.row.title }}
+                </span>
+                <span>
+                  เจ้าของผลงาน:
+                  {{ actionData.row.metadata.author ?? actionData.row.author }}
+                </span>
+                <span>ขนาด: {{ getSize(actionData.row.fileSize) }}</span>
+                <span>
+                  ประเภทของไฟล์:
+                  {{
+                    getType(actionData.row.fileType, actionData.row.fileName)
+                  }}
+                </span>
+                <span>
+                  วันที่อัปโหลด:
+                  {{ getFormatDate(actionData.row.createdAt) }}
+                </span>
+              </div>
             </q-tooltip>
           </div>
           <div v-if="props.action">
diff --git a/Services/client/src/components/ListView.vue b/Services/client/src/components/ListView.vue
index 967272a..f76619c 100644
--- a/Services/client/src/components/ListView.vue
+++ b/Services/client/src/components/ListView.vue
@@ -342,26 +342,29 @@ const onRowClick = ((_, row) => {
                 size="2em"
                 color="primary"
               />
-              <q-tooltip
-                anchor="center left"
-                self="center right"
-                :offset="[5, 1]"
-              >
-                <div class="flex" style="flex-direction: column">
-                  <span> ชื่อไฟล์ {{ data.row.fileName }}</span>
-                  <span
-                    >ชื่อเรื่อง
-                    {{ data.row.metadata.subject ?? data.row.subject }}</span
-                  >
-                  <span
-                    >เจ้าของผลงาน
-                    {{ data.row.metadata.author ?? data.row.author }}</span
-                  >
-                  <span>ขนาดไฟล์ {{ getSize(data.row.fileSize) }}</span>
-                  <span
-                    >ประเภทไฟล์
-                    {{ getType(data.row.fileType, data.row.fileName) }}</span
-                  >
+              <q-tooltip anchor="center left" self="center right">
+                <div
+                  class="flex"
+                  style="flex-direction: column; font-size: 120%"
+                >
+                  <span>ชื่อไฟล์: {{ data.row.fileName }}</span>
+                  <span>
+                    ชื่อเรื่อง:
+                    {{ data.row.metadata.subject ?? data.row.title }}
+                  </span>
+                  <span>
+                    เจ้าของผลงาน:
+                    {{ data.row.metadata.author ?? data.row.author }}
+                  </span>
+                  <span>ขนาด: {{ getSize(data.row.fileSize) }}</span>
+                  <span>
+                    ประเภทของไฟล์:
+                    {{ getType(data.row.fileType, data.row.fileName) }}
+                  </span>
+                  <span>
+                    วันที่อัปโหลด:
+                    {{ getFormatDate(data.row.createdAt) }}
+                  </span>
                 </div>
               </q-tooltip>
             </div>