From a426f22db01d27f581c83dad0bb4555e0ee639ef Mon Sep 17 00:00:00 2001
From: Cindy Chang <cindy.chang@dsp.im>
Date: Thu, 1 Aug 2024 15:49:03 +0800
Subject: [PATCH] sonar medium 65 left

---
 src/components/Discover/Map/Filter/Trace.vue  |  6 ++---
 src/components/Discover/Map/SidebarFilter.vue | 23 ++++++++++---------
 src/components/Navbar.vue                     | 17 --------------
 src/components/Search.vue                     |  6 +++--
 src/components/durationjs.vue                 | 18 +++++++++------
 src/module/alertModal.js                      |  2 +-
 src/views/Upload/index.vue                    |  4 +++-
 tailwind.config.js                            |  4 ++--
 8 files changed, 35 insertions(+), 45 deletions(-)

diff --git a/src/components/Discover/Map/Filter/Trace.vue b/src/components/Discover/Map/Filter/Trace.vue
index 788ba4a..9d2c97c 100644
--- a/src/components/Discover/Map/Filter/Trace.vue
+++ b/src/components/Discover/Map/Filter/Trace.vue
@@ -363,14 +363,12 @@ export default {
   @apply sticky top-0 left-0 z-10 bg-neutral-10
 }
 :deep(.p-datatable .p-datatable-thead > tr > th) {
-  @apply !border-y-0 border-neutral-500 bg-neutral-100 after:absolute after:left-0 after:w-full after:h-full after:block after:top-0 after:border-b after:border-t after:border-neutral-500
+  @apply !border-y-0 border-neutral-500 bg-neutral-100 after:absolute after:left-0 after:w-full after:h-full after:block after:top-0 after:border-b after:border-t after:border-neutral-500;
+  white-space: nowrap;
 }
 :deep(.p-datatable .p-datatable-tbody > tr > td) {
   @apply border-neutral-500 !border-t-0 text-center
 }
-:deep(.p-datatable .p-datatable-thead > tr > th) {
-  white-space: nowrap;
-}
 :deep(.p-datatable.p-datatable-gridlines .p-datatable-tbody > tr > td) {
   min-width: 72px;
   max-width: 184px;
diff --git a/src/components/Discover/Map/SidebarFilter.vue b/src/components/Discover/Map/SidebarFilter.vue
index 6318ff7..618a02f 100644
--- a/src/components/Discover/Map/SidebarFilter.vue
+++ b/src/components/Discover/Map/SidebarFilter.vue
@@ -576,16 +576,17 @@ export default {
               break
           }
           break;
-        case 'Trace': // Filter Type 選 Trace 的行為
-          const lowerIndex = this.$refs.filterTraceView.selectArea[0];
-          const upperIndex = this.$refs.filterTraceView.selectArea[1]-1;
-          data = {
-            type: 'trace-freq',
-            lower: this.allMapDataStore.traces[lowerIndex].id,
-            upper: this.allMapDataStore.traces[upperIndex].id,
-            is_exclude: isExclude,
-          };
-          break;
+        case 'Trace': { // Filter Type 選 Trace 的行為
+            const lowerIndex = this.$refs.filterTraceView.selectArea[0];
+            const upperIndex = this.$refs.filterTraceView.selectArea[1]-1;
+            data = {
+              type: 'trace-freq',
+              lower: this.allMapDataStore.traces[lowerIndex].id,
+              upper: this.allMapDataStore.traces[upperIndex].id,
+              is_exclude: isExclude,
+            };
+            break;
+          }
         case 'Timeframes': // Filter Type 選 Timeframes 的行為
           data = {
             type: containmentMap[sele[6]],
@@ -643,7 +644,7 @@ export default {
         case 'Start & End':
           return this.handleStartEndSelection(sele[2]);
         case 'Sequence':
-          return !(this.listSeq.length >= 2);
+          return this.listSeq.length < 2;
         default:
           return true;
       }
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index 4e70599..c53f0e4 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -24,22 +24,6 @@
         </div>
         <!-- Files Page: Search and Upload -->
         <div class="flex justify-end items-center" v-if="navViewName === 'FILES'">
-          <!-- <form role="search">
-            <label for="searchFiles" class="mr-4 relative">
-              <input type="search" id="searchFiles" placeholder="Search" class="px-5 py-2 w-72 rounded-full text-sm align-middle duration-300 border border-neutral-500 hover:border-neutral-300 focus:outline-none focus:ring focus:border-neutral-300">
-              <span class="absolute top-2 bottom-1.5 right-0.5 flex justify-center items-center gap-2">
-                <IconSetting class="w-6 h-6 cursor-pointer"></IconSetting>
-                <span class="w-px h-6 block after:border after:border-neutral-300 after:content-['']"></span>
-                <button class="pr-2">
-                  <IconSearch class="w-6 h-6"></IconSearch>
-                </button>
-              </span>
-            </label>
-          </form> -->
-          <!-- <label class="btn btn-sm btn-neutral cursor-pointer">
-            <input id="uploadFiles" class="hidden" type="file">
-            Upload
-          </label> -->
           <div id="import_btn" class="btn btn-sm btn-neutral cursor-pointer" @click="uploadModal = true">
             Import
             <UploadModal :visible="uploadModal" @closeModal="uploadModal = $event"></UploadModal>
@@ -54,7 +38,6 @@
           :disabled="disabledSave" @click="saveModal">
             Save
           </button>
-          <!-- <button class="btn btn-sm btn-neutral">Download</button> -->
         </div>
         <AcctMenu/>
       </div>
diff --git a/src/components/Search.vue b/src/components/Search.vue
index 28fa343..75c553d 100644
--- a/src/components/Search.vue
+++ b/src/components/Search.vue
@@ -1,7 +1,9 @@
 <template>
   <form role="search">
-    <label for="searchFiles" class="mr-4 relative">
-      <input type="search" id="searchFiles" placeholder="Search Activity" class="px-5 py-2 w-52 rounded-full text-sm align-middle duration-300 border bg-neutral-100 border-neutral-300 hover:border-neutral-500 focus:outline-none focus:ring focus:border-neutral-500">
+    <label for="searchFiles" class="mr-4 relative" htmlFor="searchFiles">
+      <input type="search" id="searchFiles" placeholder="Search Activity" class="px-5 py-2 w-52 rounded-full text-sm align-middle 
+        duration-300 border bg-neutral-100 border-neutral-300 hover:border-neutral-500 focus:outline-none focus:ring 
+        focus:border-neutral-500">
       <span class="absolute top-2 bottom-0.5 right-0.5 flex justify-center items-center gap-2">
         <IconSetting class="w-6 h-6 cursor-pointer"></IconSetting>
         <span class="w-px h-6 block after:border after:border-neutral-300 after:content-['']"></span>
diff --git a/src/components/durationjs.vue b/src/components/durationjs.vue
index 75264b4..3a9d46c 100644
--- a/src/components/durationjs.vue
+++ b/src/components/durationjs.vue
@@ -123,7 +123,6 @@ export default {
           this[unit] = newValues[unit].val;
           const input = document.querySelector(`[data-tunit="${unit}"]`);
           if (input) {
-            // input.value = newValues[unit].val.toString().padStart(2, '0'); // 前綴要補 0
             input.value = newValues[unit].val.toString();
           }
         }
@@ -144,14 +143,18 @@ export default {
     max: {
       handler: function(newValue, oldValue) {
         this.maxTotal = newValue;
-        this.size === 'max' && newValue !== oldValue ? this.createData() : null;
+        if(this.size === 'max' && newValue !== oldValue) {
+          this.createData();
+        };
       },
       immediate: true,
     },
     min: {
       handler: function(newValue, oldValue) {
         this.minTotal = newValue;
-        this.size === 'min' && newValue !== oldValue ? this.createData() : null;
+        if( this.size === 'min' && newValue !== oldValue){
+          this.createData();
+        }
       },
       immediate: true,
     },
@@ -192,10 +195,11 @@ export default {
       let baseInputValue = event.target.value;
       let decoratedInputValue;
       // 讓前綴數字自動補 0
-      isNaN(event.target.value) ?
-      event.target.value = '00' :
-      // event.target.value = event.target.value.toString().padStart(2, '0'); // 前綴要補 0
-      event.target.value = event.target.value.toString();
+      if(isNaN(event.target.value)){
+        event.target.value = '00';
+      } else {
+        event.target.value = event.target.value.toString();
+      }
       decoratedInputValue = event.target.value.toString();
 
       // 手 key 數值大於最大值時，要等於最大值
diff --git a/src/module/alertModal.js b/src/module/alertModal.js
index 8c6f73f..02a9bcf 100644
--- a/src/module/alertModal.js
+++ b/src/module/alertModal.js
@@ -404,7 +404,7 @@ export async function renameModal(rename, type, id, baseName) {
   // 改名成功
   if(isConfirmed) await rename(type, id, value);
   // 清空欄位
-  fileName = '';
+  // fileName = '';
 }
 /**
  * Delete File
diff --git a/src/views/Upload/index.vue b/src/views/Upload/index.vue
index 67323d9..35193a0 100644
--- a/src/views/Upload/index.vue
+++ b/src/views/Upload/index.vue
@@ -210,7 +210,9 @@ export default {
           if(!code || code === 'case_attributes') return;
           nameOccurrences[name]++;
           // 重複的選項只出現一次
-          nameOccurrences[name] === 2 ? noSortedRepeatedData.push(item) : false;
+          if(nameOccurrences[name] === 2){
+            noSortedRepeatedData.push(item)
+          }
           // 要按照選單的順序排序
           this.repeatedData = this.columnType.filter(column => noSortedRepeatedData.includes(column));
         }else {
diff --git a/tailwind.config.js b/tailwind.config.js
index a659878..4754d01 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -59,8 +59,8 @@ module.exports = {
         },
         'fadeout': {
           '0%': { opacity: '1' },
-          '0%': { opacity: '0.5' },
-          '0%': { opacity: '0' },
+          '50%': { opacity: '0.5' },
+          '100%': { opacity: '0' },
         },
         'edit': {
           '0%, 100%': { transform: 'rotate(0deg)' },