From 2230d05508995eda5c05511677c16981cbf488a7 Mon Sep 17 00:00:00 2001
From: Fine0830 <fanxue0830@gmail.com>
Date: Mon, 21 Nov 2022 14:28:37 +0800
Subject: [PATCH] fix: optimize metrics related trace (#188)

---
 src/locales/lang/en.ts                                |  2 +-
 src/locales/lang/es.ts                                |  2 +-
 src/locales/lang/zh.ts                                |  2 +-
 .../configuration/widget/RelatedTraceOptions.vue      |  2 +-
 src/views/dashboard/related/trace/Header.vue          | 11 +++++++++--
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index 7609aa06..aeab2faf 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -161,7 +161,7 @@ const msg = {
   apisix: "APISIX",
   viewTrace: "View Related Traces",
   relatedTraceOptions: "Related Trace Options",
-  setLatencyDuration: "Set Latency Range",
+  setLatencyDuration: "Latency Related Metrics",
   queryOrder: "Query Order",
   latency: "Latency",
   metricValues: "Metric Values",
diff --git a/src/locales/lang/es.ts b/src/locales/lang/es.ts
index cb743e6e..cdaafb3e 100644
--- a/src/locales/lang/es.ts
+++ b/src/locales/lang/es.ts
@@ -169,7 +169,7 @@ const msg = {
   secondTip: "Seleccione Segundo",
   viewTrace: "Ver trazas relacionadas",
   relatedTraceOptions: "Opciones de seguimiento relacionadas",
-  setLatencyDuration: "Establecer el rango de retardo",
+  setLatencyDuration: "Índice de correlación retardada",
   enableRelatedTrace: "Activar trazas relacionadas",
   queryConditions: "Condiciones de consulta",
   maxTraceDuration: "Duración máxima",
diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index aacde22f..bc961401 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -158,7 +158,7 @@ const msg = {
   apisix: "APISIX",
   viewTrace: "查看相关Trace",
   relatedTraceOptions: "相关的Trace选项",
-  setLatencyDuration: "设置延时范围",
+  setLatencyDuration: "延迟相关指标",
   queryOrder: "查询顺序",
   latency: "延迟",
   metricValues: "指标值",
diff --git a/src/views/dashboard/configuration/widget/RelatedTraceOptions.vue b/src/views/dashboard/configuration/widget/RelatedTraceOptions.vue
index e516f329..0905e741 100644
--- a/src/views/dashboard/configuration/widget/RelatedTraceOptions.vue
+++ b/src/views/dashboard/configuration/widget/RelatedTraceOptions.vue
@@ -67,7 +67,7 @@ const dashboardStore = useDashboardStore();
 const traceOpt = dashboardStore.selectedGrid.relatedTrace || {};
 const status = ref<string>(traceOpt.status || Status[0].value);
 const queryOrder = ref<string>(traceOpt.queryOrder || QueryOrders[0].value);
-const latency = ref<boolean>(traceOpt.setLatencyDuration || false);
+const latency = ref<boolean>(traceOpt.latency || false);
 const enableRelate = ref<boolean>(traceOpt.enableRelate || false);
 
 function updateConfig(param: { [key: string]: unknown }) {
diff --git a/src/views/dashboard/related/trace/Header.vue b/src/views/dashboard/related/trace/Header.vue
index ac735b2d..8782c7c1 100644
--- a/src/views/dashboard/related/trace/Header.vue
+++ b/src/views/dashboard/related/trace/Header.vue
@@ -127,7 +127,10 @@ init();
 
 async function init() {
   for (const d of Object.keys(filters)) {
-    if (filters[d] && ["status", "queryOrder", "latency"].includes(d)) {
+    if (
+      ["status", "queryOrder"].includes(d) ||
+      (filters[d] && d === "latency")
+    ) {
       items.value.push({ label: d, value: FiltersKeys[d] });
     }
   }
@@ -212,7 +215,11 @@ function setCondition() {
     serviceInstanceId: state.instance || undefined,
   };
   for (const k of items.value) {
-    if (k.label === conditions.value && FiltersKeys[k.label]) {
+    if (
+      k.label === conditions.value &&
+      FiltersKeys[k.label] &&
+      filters[k.label]
+    ) {
       params[k.value] = filters[k.label];
     }
   }