From 4803f4377ce62ebe3981bb223b008353b46fd5f8 Mon Sep 17 00:00:00 2001 From: Fine Date: Tue, 29 Nov 2022 13:33:19 +0800 Subject: [PATCH] update related traces config --- src/locales/lang/en.ts | 3 ++- src/locales/lang/es.ts | 3 ++- src/locales/lang/zh.ts | 3 ++- .../configuration/widget/RelatedTraceOptions.vue | 13 +++++++++++-- src/views/dashboard/related/trace/Header.vue | 6 ++++-- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index d6cde5e5..0510d819 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -162,7 +162,8 @@ const msg = { viewTrace: "View Related Traces", relatedTraceOptions: "Related Trace Options", setLatencyDuration: "Latency Related Metrics", - queryOrder: "Query Order", + queryOrder: "Query By Duration", + setOrder: "Query Order", latency: "Latency", metricValues: "Metric Values", queryConditions: "Query Conditions", diff --git a/src/locales/lang/es.ts b/src/locales/lang/es.ts index f1b87697..d8bc29c6 100644 --- a/src/locales/lang/es.ts +++ b/src/locales/lang/es.ts @@ -159,7 +159,8 @@ const msg = { postgreSQL: "PostgreSQL", endpointTips: "Aquí, la tabla muestra hasta 20 punto final.", apisix: "APISIX", - queryOrder: "Orden de consulta", + queryOrder: "Consulta por duración", + setOrder: "Orden de consulta", latency: "Retraso", metricValues: "Valor métrico", legendValues: "Valor de la leyenda", diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts index 9c990b8c..1d1c0301 100644 --- a/src/locales/lang/zh.ts +++ b/src/locales/lang/zh.ts @@ -159,7 +159,8 @@ const msg = { viewTrace: "查看相关Trace", relatedTraceOptions: "相关的Trace选项", setLatencyDuration: "延迟相关指标", - queryOrder: "查询顺序", + queryOrder: "按持续时间查询", + setOrder: "查询顺序", latency: "延迟", metricValues: "指标值", enableRelatedTrace: "启用相关Trace", diff --git a/src/views/dashboard/configuration/widget/RelatedTraceOptions.vue b/src/views/dashboard/configuration/widget/RelatedTraceOptions.vue index ca30da05..7db90f19 100644 --- a/src/views/dashboard/configuration/widget/RelatedTraceOptions.vue +++ b/src/views/dashboard/configuration/widget/RelatedTraceOptions.vue @@ -46,7 +46,7 @@ limitations under the License. --> />
- {{ t("queryOrder") }} + {{ t("setOrder") }} import { ref } from "vue"; import { useI18n } from "vue-i18n"; import { useDashboardStore } from "@/store/modules/dashboard"; -import { Status, QueryOrders, RefIdTypes } from "../../data"; +import { RefIdTypes } from "../../data"; +const QueryOrders = [ + { label: "None", value: "BY_START_TIME" }, + { label: "Duration", value: "BY_DURATION" }, +]; +const Status = [ + { label: "None", value: "ALL" }, + { label: "Success", value: "SUCCESS" }, + { label: "Error", value: "ERROR" }, +]; const { t } = useI18n(); const dashboardStore = useDashboardStore(); const { graph, relatedTrace } = dashboardStore.selectedGrid; diff --git a/src/views/dashboard/related/trace/Header.vue b/src/views/dashboard/related/trace/Header.vue index 9d03d6c7..2cdd71bf 100644 --- a/src/views/dashboard/related/trace/Header.vue +++ b/src/views/dashboard/related/trace/Header.vue @@ -138,8 +138,10 @@ init(); async function init() { for (const d of Object.keys(filters)) { if ( - ["queryOrder"].includes(d) || - (d === "status" && filters[d] && filters[d] !== "ALL") || + (d === "queryOrder" && + filters[d] && + filters[d] === QueryOrders[1].value) || + (d === "status" && filters[d] && filters[d] !== Status[0].value) || (filters[d] && d === "latency") ) { items.value.push({ label: d, value: FiltersKeys[d] });