From bc456b0875fa1363629e61aa5ff71518ae871944 Mon Sep 17 00:00:00 2001
From: Fine <fanxue0830@gmail.com>
Date: Tue, 26 Nov 2024 18:02:21 +0800
Subject: [PATCH] update task list

---
 src/locales/lang/en.ts                        |  1 +
 src/locales/lang/es.ts                        |  1 +
 src/locales/lang/zh.ts                        |  1 +
 .../related/async-profiling/Header.vue        | 55 +------------------
 .../async-profiling/components/TaskList.vue   | 55 ++++++++++---------
 5 files changed, 36 insertions(+), 77 deletions(-)

diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index ed89f05b..ca54cf19 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -393,5 +393,6 @@ const msg = {
   errorInstances: "Error Instances",
   successInstances: "Success Instances",
   profilingEvents: "Async Profiling Events",
+  execArgs: "Exec Args",
 };
 export default msg;
diff --git a/src/locales/lang/es.ts b/src/locales/lang/es.ts
index 8fd5f82a..26cd958b 100644
--- a/src/locales/lang/es.ts
+++ b/src/locales/lang/es.ts
@@ -393,5 +393,6 @@ const msg = {
   errorInstances: "Error Instances",
   successInstances: "Success Instances",
   profilingEvents: "Async Profiling Events",
+  execArgs: "Exec Args",
 };
 export default msg;
diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index 961c3094..981ef4ce 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -391,5 +391,6 @@ const msg = {
   errorInstances: "错误的实例",
   successInstances: "成功的实例",
   profilingEvents: "异步分析事件",
+  execArgs: "String任务扩展",
 };
 export default msg;
diff --git a/src/views/dashboard/related/async-profiling/Header.vue b/src/views/dashboard/related/async-profiling/Header.vue
index b6aa687d..59ef448c 100644
--- a/src/views/dashboard/related/async-profiling/Header.vue
+++ b/src/views/dashboard/related/async-profiling/Header.vue
@@ -15,7 +15,7 @@ limitations under the License. -->
 <template>
   <div class="flex-h header">
     <div class="title">Async Profiling</div>
-    <el-button class="new-btn ml-10" size="small" @click="createTask">
+    <el-button class="mr-20" size="small" @click="() => (newTask = true)">
       {{ t("newTask") }}
     </el-button>
   </div>
@@ -24,74 +24,25 @@ limitations under the License. -->
   </el-dialog>
 </template>
 <script lang="ts" setup>
-  import { ref, watch } from "vue";
+  import { ref } from "vue";
   import { useI18n } from "vue-i18n";
-  import { useAsyncProfilingStore } from "@/store/modules/async-profiling";
-  import { useSelectorStore } from "@/store/modules/selectors";
-  import { ElMessage } from "element-plus";
-  import { useDashboardStore } from "@/store/modules/dashboard";
-  import { useAppStoreWithOut } from "@/store/modules/app";
-  import { EntityType } from "../../data";
   import NewTask from "./components/NewTask.vue";
 
-  /*global defineProps */
-  const props = defineProps({
-    needQuery: { type: Boolean, default: true },
-  });
-  const asyncProfilingStore = useAsyncProfilingStore();
-  const appStore = useAppStoreWithOut();
-  const selectorStore = useSelectorStore();
-  const dashboardStore = useDashboardStore();
   const { t } = useI18n();
   const newTask = ref<boolean>(false);
-
-  if (props.needQuery) {
-    searchTasks();
-  }
-
-  async function searchTasks() {
-    const res = await asyncProfilingStore.getTaskList({
-      serviceId: selectorStore.currentService.id,
-    });
-    if (res.errors) {
-      ElMessage.error(res.errors);
-    }
-  }
-
-  function createTask() {
-    newTask.value = true;
-  }
-
-  watch(
-    () => selectorStore.currentService,
-    () => {
-      searchTasks();
-    },
-  );
-  watch(
-    () => appStore.durationTime,
-    () => {
-      if (dashboardStore.entity === EntityType[1].value) {
-        searchTasks();
-      }
-    },
-  );
 </script>
 <style lang="scss" scoped>
   .header {
     padding: 10px;
     font-size: $font-size-smaller;
     border-bottom: 1px solid $border-color;
+    justify-content: space-between;
   }
 
   .name {
     width: 270px;
   }
 
-  .new-btn {
-    float: right;
-  }
-
   .title {
     font-weight: bold;
     line-height: 24px;
diff --git a/src/views/dashboard/related/async-profiling/components/TaskList.vue b/src/views/dashboard/related/async-profiling/components/TaskList.vue
index 9912bbb4..dee64288 100644
--- a/src/views/dashboard/related/async-profiling/components/TaskList.vue
+++ b/src/views/dashboard/related/async-profiling/components/TaskList.vue
@@ -26,13 +26,11 @@ limitations under the License. -->
             v-for="(i, index) in asyncProfilingStore.taskList"
             @click="changeTask(i)"
             :key="index"
+            :class="{
+              selected: asyncProfilingStore.selectedTask && asyncProfilingStore.selectedTask.id === i.id,
+            }"
           >
-            <td
-              class="profile-td"
-              :class="{
-                selected: asyncProfilingStore.currentTask && asyncProfilingStore.currentTask.id === i.id,
-              }"
-            >
+            <td class="profile-td">
               <div class="ell">
                 <span>{{ i.endpointName }}</span>
                 <a class="profile-btn r" @click="viewTaskDetail($event, i)">
@@ -54,12 +52,12 @@ limitations under the License. -->
     </div>
   </div>
   <el-dialog v-model="showDetail" :destroy-on-close="true" fullscreen @closed="showDetail = false">
-    <div class="profile-detail flex-v" v-if="asyncProfilingStore.currentTask">
+    <div class="profile-detail flex-v" v-if="asyncProfilingStore.selectedTask">
       <div>
         <h5 class="mb-10">{{ t("task") }}.</h5>
         <div class="mb-10 clear item">
           <span class="g-sm-4 grey">{{ t("id") }}:</span>
-          <span class="g-sm-8 wba">{{ asyncProfilingStore.currentTask.id }}</span>
+          <span class="g-sm-8 wba">{{ asyncProfilingStore.selectedTask.id }}</span>
         </div>
         <div class="mb-10 clear item">
           <span class="g-sm-4 grey">{{ t("service") }}:</span>
@@ -67,25 +65,25 @@ limitations under the License. -->
         </div>
         <div class="mb-10 clear item">
           <span class="g-sm-4 grey">{{ t("serviceInstanceIds") }}:</span>
-          <span class="g-sm-8 wba">{{ asyncProfilingStore.currentTask.serviceInstanceIds.join(", ") }}</span>
+          <span class="g-sm-8 wba">{{ asyncProfilingStore.selectedTask.serviceInstanceIds.join(", ") }}</span>
         </div>
         <div class="mb-10 clear item">
           <span class="g-sm-4 grey">{{ t("execArgs") }}:</span>
-          <span class="g-sm-8 wba">{{ asyncProfilingStore.currentTask.execArgs }}</span>
+          <span class="g-sm-8 wba">{{ asyncProfilingStore.selectedTask.execArgs }}</span>
         </div>
         <div class="mb-10 clear item">
           <span class="g-sm-4 grey">{{ t("duration") }}:</span>
-          <span class="g-sm-8 wba">{{ asyncProfilingStore.currentTask.duration }}</span>
+          <span class="g-sm-8 wba">{{ asyncProfilingStore.selectedTask.duration }}</span>
         </div>
         <div class="mb-10 clear item">
           <span class="g-sm-4 grey">{{ t("events") }}:</span>
-          <span class="g-sm-8 wba"> {{ asyncProfilingStore.currentTask.events.join(", ") }} </span>
+          <span class="g-sm-8 wba"> {{ asyncProfilingStore.selectedTask.events.join(", ") }} </span>
         </div>
       </div>
       <div>
         <h5
           class="mb-10 mt-10"
-          v-show="asyncProfilingStore.currentTask.logs && asyncProfilingStore.currentTask.logs.length"
+          v-show="asyncProfilingStore.selectedTask.logs && asyncProfilingStore.selectedTask.logs.length"
         >
           {{ t("logs") }}.
         </h5>
@@ -132,7 +130,7 @@ limitations under the License. -->
   </el-dialog>
 </template>
 <script lang="ts" setup>
-  import { ref } from "vue";
+  import { ref, onMounted, watch } from "vue";
   import { useI18n } from "vue-i18n";
   import { useSelectorStore } from "@/store/modules/selectors";
   import { useAsyncProfilingStore } from "@/store/modules/async-profiling";
@@ -146,12 +144,13 @@ limitations under the License. -->
   const selectorStore = useSelectorStore();
   const showDetail = ref<boolean>(false);
   const service = ref<string>("");
-  const selectedTask = ref<TaskListItem | Record<string, never>>({});
   const instanceLogs = ref<TaskLog | any>({});
   const errorInstances = ref<Instance[]>([]);
   const successInstances = ref<Instance[]>([]);
 
-  fetchTasks();
+  onMounted(() => {
+    fetchTasks();
+  });
 
   async function fetchTasks() {
     const res = await asyncProfilingStore.getTaskList({
@@ -163,14 +162,13 @@ limitations under the License. -->
   }
 
   async function changeTask(item: TaskListItem) {
-    asyncProfilingStore.setCurrentSegment({});
-    asyncProfilingStore.setCurrentTask(item);
+    asyncProfilingStore.setSelectedTask(item);
   }
 
   async function viewTaskDetail(e: Event, item: TaskListItem) {
     e.stopPropagation();
     showDetail.value = true;
-    asyncProfilingStore.setCurrentTask(item);
+    asyncProfilingStore.setSelectedTask(item);
     service.value = (selectorStore.services.filter((s: any) => s.id === item.serviceId)[0] || {}).label;
     const res = await asyncProfilingStore.getTaskLogs({ taskID: item.id });
 
@@ -199,14 +197,22 @@ limitations under the License. -->
         instanceLogs.value[d.instanceName] = [{ operationType: d.operationType, operationTime: d.operationTime }];
       }
     }
-    asyncProfilingStore.setCurrentTask(item);
+    asyncProfilingStore.setSelectedTask(item);
   }
+
+  watch(
+    () => selectorStore.currentService,
+    () => {
+      fetchTasks();
+    },
+  );
 </script>
 <style lang="scss" scoped>
   .profile-task-list {
     width: 300px;
-    height: calc((100% - 60px) / 2);
+    height: 100%;
     overflow: auto;
+    border-right: 1px solid var(--sw-trace-list-border);
   }
 
   .item span {
@@ -216,10 +222,10 @@ limitations under the License. -->
   .profile-td {
     padding: 5px 10px;
     border-bottom: 1px solid var(--sw-trace-list-border);
+  }
 
-    &.selected {
-      background-color: var(--sw-list-selected);
-    }
+  .selected {
+    background-color: var(--sw-list-selected);
   }
 
   .no-data {
@@ -230,7 +236,6 @@ limitations under the License. -->
   .profile-t-wrapper {
     overflow: auto;
     flex-grow: 1;
-    border-right: 1px solid var(--sw-trace-list-border);
   }
 
   .profile-t {