From 405dd7f992f152574d33ff45047feeed029de5dd Mon Sep 17 00:00:00 2001
From: Cindy Chang <cindy.chang@dsp.im>
Date: Thu, 1 Aug 2024 15:13:05 +0800
Subject: [PATCH] sonar

---
 src/components/Discover/Map/SidebarFilter.vue | 83 ++++++++++---------
 src/components/Header.vue                     |  6 +-
 2 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/src/components/Discover/Map/SidebarFilter.vue b/src/components/Discover/Map/SidebarFilter.vue
index de025d3..6318ff7 100644
--- a/src/components/Discover/Map/SidebarFilter.vue
+++ b/src/components/Discover/Map/SidebarFilter.vue
@@ -396,60 +396,39 @@ export default {
         'occurred-around' : 'active in'
       };
 
-      switch(e.type){
+      switch(e.type) { //sonar-qube
         case "contains-task":
-          label = `${includeStr}, ${e.task}`;
-          type = "Sequence";
-          break;
         case "starts-with":
-          label = `${includeStr}, start with ${e.task}`;
-          type = "Sequence";
-          break;
         case "ends-with":
-          label = `${includeStr}, end with ${e.task}`;
-          type = "Sequence";
-          break;
-        case "start-end":
-          label = `${includeStr}, start with ${e.starts_with}, end with ${e.ends_with}`;
-          type = "Sequence";
-          break;
         case "directly-follows":
-          label = `${includeStr}, directly follows, ${e.task_seq.join(' -> ')}`;
-          type = "Sequence";
-          break;
         case "eventually-follows":
-          label = `${includeStr}, eventually follows, ${e.task_seq.join(' -> ')}`;
-          type = "Sequence";
-          break;
+            label = `${includeStr}, ${getTaskLabel(e)}`;
+            type = "Sequence";
+            break;
+        case "start-end":
+            label = `${includeStr}, start with ${e.starts_with}, end with ${e.ends_with}`;
+            type = "Sequence";
+            break;
         case "trace-freq":
-          label = `${includeStr}, from #${e.lower} to #${e.upper}`;
-          type = "Trace";
-          break;
+            label = `${includeStr}, from #${e.lower} to #${e.upper}`;
+            type = "Trace";
+            break;
         case 'string-attr':
-          label = `${includeStr}, ${e.key}, ${e.value}`;
-          type = "Attributes";
-          break;
         case 'boolean-attr':
-          label = `${includeStr}, ${e.key}, ${this.selectAttribute?.label}`;
-          type = "Attributes";
-          break;
         case 'int-attr':
         case 'float-attr':
-          label = `${includeStr}, ${e.key}, from ${e.min} to ${e.max}`;
-          type = "Attributes";
-          break;
         case 'date-attr':
-          label = `${includeStr}, ${e.key}, from ${getMoment(e.min).format('YYYY-MM-DD HH:mm')} to ${getMoment(e.max).format('YYYY-MM-DD HH:mm')}`;
-          type = "Attributes";
-          break;
+            label = `${includeStr}, ${getAttributeLabel(e)}`;
+            type = "Attributes";
+            break;
         case "occurred-in":
         case "started-in":
         case "completed-in":
         case "occurred-around":
-          label = `${containmentMap[e.type]}, ${includeStr}, from ${getMoment(e.start).format("YYYY-MM-DD HH:mm")} to ${getMoment(e.end).format("YYYY-MM-DD HH:mm")} `
-          type = "Timeframe"
-          break;
-      };
+            label = `${containmentMap[e.type]}, ${includeStr}, from ${getMoment(e.start).format("YYYY-MM-DD HH:mm")} to ${getMoment(e.end).format("YYYY-MM-DD HH:mm")} `;
+            type = "Timeframe"
+            break;
+    };    
       return {
         type,
         label,
@@ -701,7 +680,33 @@ export default {
     handleTimeframesSelection() {
       return this.selectTimeFrame.length === 0;
     },
+    getTaskLabel(e) {
+      switch (e.type) {
+          case "contains-task":
+              return `${e.task}`;
+          case "starts-with":
+              return `start with ${e.task}`;
+          case "ends-with":
+              return `end with ${e.task}`;
+          case "directly-follows":
+          case "eventually-follows":
+              return `${e.type.replace('-', ' ')}, ${e.task_seq.join(' -> ')}`;
+      }
     },
+    getAttributeLabel(e) {
+      switch (e.type) {
+          case 'string-attr':
+              return `${e.key}, ${e.value}`;
+          case 'boolean-attr':
+              return `${e.key}, ${this.selectAttribute?.label}`;
+          case 'int-attr':
+          case 'float-attr':
+              return `${e.key}, from ${e.min} to ${e.max}`;
+          case 'date-attr':
+              return `${e.key}, from ${getMoment(e.min).format('YYYY-MM-DD HH:mm')} to ${getMoment(e.max).format('YYYY-MM-DD HH:mm')}`;
+      }
+    },
+  },
 }
 </script>
 
diff --git a/src/components/Header.vue b/src/components/Header.vue
index 3ef676a..69283de 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -75,7 +75,11 @@ export default {
     },
   },
   mounted() {
-    this.$route.name === 'Login' || this.$route.name === 'NotFound404' ? this.showMember = false : this.showMember = true;
+    if (this.$route.name === 'Login' || this.$route.name === 'NotFound404') {
+      this.showMember = false
+    } else {
+      this.showMember = true;
+    }
   }
 }