From 8a66987f5fae91ad51b9d5af52436560737b4cc1 Mon Sep 17 00:00:00 2001
From: Peter Olu <pemeraldy@gmail.com>
Date: Wed, 4 May 2022 13:45:29 +0100
Subject: [PATCH] overhaul cleanups

---
 src/views/dashboard/controls/Trace.vue        |  4 ----
 src/views/dashboard/panel/Tool.vue            | 22 ++++++-------------
 src/views/dashboard/related/trace/Detail.vue  |  4 +---
 src/views/dashboard/related/trace/Filter.vue  | 14 ------------
 .../dashboard/related/trace/TraceList.vue     |  4 +---
 5 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/src/views/dashboard/controls/Trace.vue b/src/views/dashboard/controls/Trace.vue
index 51b70763..bf8c976d 100644
--- a/src/views/dashboard/controls/Trace.vue
+++ b/src/views/dashboard/controls/Trace.vue
@@ -29,9 +29,6 @@ limitations under the License. -->
         <span>{{ t("delete") }}</span>
       </div>
     </el-popover>
-    <!-- filter was here -->
-    <!-- <div class="header">
-    </div> -->
     <div class="trace flex-h">
       <TraceList @show:trace="showTraceDetails" v-if="traceListActive" />
       <TraceDetail
@@ -43,7 +40,6 @@ limitations under the License. -->
 </template>
 <script lang="ts" setup>
 import type { PropType, ref } from "vue";
-// import Filter from "../related/trace/Filter.vue";
 import TraceList from "../related/trace/TraceList.vue";
 import TraceDetail from "../related/trace/Detail.vue";
 import { useI18n } from "vue-i18n";
diff --git a/src/views/dashboard/panel/Tool.vue b/src/views/dashboard/panel/Tool.vue
index 71e440c4..01ee217a 100644
--- a/src/views/dashboard/panel/Tool.vue
+++ b/src/views/dashboard/panel/Tool.vue
@@ -32,10 +32,9 @@ limitations under the License. -->
               <Icon size="sm" iconName="playlist_add" />
             </el-button>
           </el-tooltip>
-          <!-- <span class="label">$Service</span> -->
           <Selector
             v-if="selectedSelector === '$service'"
-            style="margin-left: 20px;"
+            style="margin-left: 20px"
             v-model="states.currentService"
             :options="selectorStore.services"
             size="small"
@@ -56,7 +55,7 @@ limitations under the License. -->
         </div>
         <div class="selectors-item" v-if="key === 3 || key === 4">
           <el-tooltip
-          v-if="!selectedSelector.length || selectedSelector === '$endpoint'"
+            v-if="!selectedSelector.length || selectedSelector === '$endpoint'"
             class="box-item"
             effect="dark"
             content="Endpoint"
@@ -70,16 +69,9 @@ limitations under the License. -->
               <Icon size="sm" iconName="view" />
             </el-button>
           </el-tooltip>
-          <!-- <span class="label">
-            {{
-              ["EndpointRelation", "Endpoint"].includes(dashboardStore.entity)
-                ? "$Endpoint"
-                : "$ServiceInstance"
-            }}
-          </span> -->
           <Selector
             v-if="selectedSelector === '$endpoint'"
-            style="margin-left: 20px;"
+            style="margin-left: 20px"
             v-model="states.currentPod"
             :options="selectorStore.pods"
             size="small"
@@ -434,7 +426,7 @@ async function getServices() {
 }
 
 async function changeService(service: any) {
-    selectedSelector.value = ""
+  selectedSelector.value = "";
   if (service[0]) {
     states.currentService = service[0].value;
     selectorStore.setCurrentService(service[0]);
@@ -454,7 +446,7 @@ function changeDestService(service: any) {
 }
 
 function changePods(pod: any) {
-  selectedSelector.value = ""
+  selectedSelector.value = "";
   if (pod[0]) {
     selectorStore.setCurrentPod(pod[0]);
   } else {
@@ -758,10 +750,10 @@ watch(
   width: 300px;
 }
 
-.tool-btn{
+.tool-btn {
   height: 18px;
 }
-.el-input__wrapper{
+.el-input__wrapper {
   height: 18px !important;
 }
 </style>
diff --git a/src/views/dashboard/related/trace/Detail.vue b/src/views/dashboard/related/trace/Detail.vue
index e6fb5d8b..59a2058a 100644
--- a/src/views/dashboard/related/trace/Detail.vue
+++ b/src/views/dashboard/related/trace/Detail.vue
@@ -181,9 +181,7 @@ export default defineComponent({
     const pageSize = 10;
     const dateFormat = (date: number, pattern = "YYYY-MM-DD HH:mm:ss") =>
       dayjs(date).format(pattern);
-    const showTraceLogs = ref<boolean>(false);
-
-    // const emit = defineEmits(["show:list"])
+    const showTraceLogs = ref<boolean>(false);    
 
     function showTraceList() {
       ctx.emit("show:list");
diff --git a/src/views/dashboard/related/trace/Filter.vue b/src/views/dashboard/related/trace/Filter.vue
index 4cf63785..f12b0344 100644
--- a/src/views/dashboard/related/trace/Filter.vue
+++ b/src/views/dashboard/related/trace/Filter.vue
@@ -158,7 +158,6 @@ limitations under the License. -->
         type="primary"
         @click="searchTraces"
       >
-        <!-- {{ t("search") }} -->
         <Icon iconSize="sm" iconName="search" />
       </el-button>
       <el-button
@@ -192,7 +191,6 @@ const selectorStore = useSelectorStore();
 const dashboardStore = useDashboardStore();
 
 const activeFilter = ref<string>("");
-// const showAllBtns = ref<boolean>(true);
 function setFilter(filter: string) {
   activeFilter.value = filter;
 }
@@ -363,7 +361,6 @@ watch(
   padding: 0 10px;
   display: flex;
   flex-wrap: wrap;
-  // flex-direction: column;
   align-items: center;
   .filter {
     margin: 0;
@@ -374,14 +371,3 @@ watch(
 }
 </style>
 
-//
-<div class="flex-h">
-//      <div class="filter">
-//       <span class="grey mr-5">{{ t("timeRange") }}:</span>
-//       <TimePicker
-//         :value="dateTime"
-//         position="bottom"
-//         format="YYYY-MM-DD HH:mm"
-//         @input="changeTimeRange"
-//       />
-//     </div>
diff --git a/src/views/dashboard/related/trace/TraceList.vue b/src/views/dashboard/related/trace/TraceList.vue
index 8c30cb53..c0a24f13 100644
--- a/src/views/dashboard/related/trace/TraceList.vue
+++ b/src/views/dashboard/related/trace/TraceList.vue
@@ -166,12 +166,10 @@ async function queryTraces() {
 }
 
 .trace-t {
-  width: 100%;
-  // width: 420px;
+  width: 100%;  
 }
 
 .list {
-  // width: 400px;
   width: 100%;
 }