From b583afaef6d6067597ec254574418b2f1cb3de69 Mon Sep 17 00:00:00 2001
From: Qiuxia Fan <fine0830@outlook.com>
Date: Mon, 21 Mar 2022 15:28:06 +0800
Subject: [PATCH] address pr

---
 src/locales/lang/en.ts                           |  1 +
 src/locales/lang/zh.ts                           |  1 +
 src/router/infrastructure.ts                     |  2 +-
 .../configuration/widget/MetricOptions.vue       | 16 ++--------------
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index b95b487d..a955a01c 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -118,6 +118,7 @@ const msg = {
   skyWalkingServer: "Sky Walking Server",
   functions: "Functions",
   browser: "Browser",
+  linux: "Linux",
   hourTip: "Select Hour",
   minuteTip: "Select Minute",
   secondTip: "Select Second",
diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index 87f697f1..62bc7bf4 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -117,6 +117,7 @@ const msg = {
   satellite: "Satellite",
   skyWalkingServer: "Sky Walking服务",
   functions: "Functions",
+  linux: "Linux",
   browser: "浏览器",
   hourTip: "选择小时",
   minuteTip: "选择分钟",
diff --git a/src/router/infrastructure.ts b/src/router/infrastructure.ts
index db6304f2..2450e82a 100644
--- a/src/router/infrastructure.ts
+++ b/src/router/infrastructure.ts
@@ -25,7 +25,7 @@ export const routesInfra: Array<RouteRecordRaw> = [
       title: "infrastructure",
       icon: "scatter_plot",
       exact: true,
-      hasGroup: false,
+      hasGroup: true,
     },
     redirect: "/infrastructure",
     component: Layout,
diff --git a/src/views/dashboard/configuration/widget/MetricOptions.vue b/src/views/dashboard/configuration/widget/MetricOptions.vue
index e542dd40..d41a402b 100644
--- a/src/views/dashboard/configuration/widget/MetricOptions.vue
+++ b/src/views/dashboard/configuration/widget/MetricOptions.vue
@@ -90,12 +90,10 @@ import { useDashboardStore } from "@/store/modules/dashboard";
 import {
   MetricTypes,
   ListChartTypes,
-  MetricCatalog,
   DefaultGraphConfig,
   EntityType,
   ChartTypes,
   PodsChartTypes,
-  ListEntity,
   MetricsType,
 } from "../../data";
 import { ElMessage } from "element-plus";
@@ -135,13 +133,8 @@ states.visTypes = setVisTypes();
 setDashboards();
 setMetricType();
 
-async function setMetricType(catalog?: string) {
+async function setMetricType() {
   const { graph } = dashboardStore.selectedGrid;
-  if (states.isList) {
-    catalog = catalog || ListEntity[graph.type];
-  } else {
-    catalog = catalog || dashboardStore.entity;
-  }
   const json = await dashboardStore.fetchMetricList();
   if (json.errors) {
     ElMessage.error(json.errors);
@@ -249,12 +242,7 @@ function changeChartType(item: Option) {
     states.metrics = [""];
     states.metricTypes = [""];
   }
-  const catalog: { [key: string]: string } = {
-    InstanceList: EntityType[3].value,
-    EndpointList: EntityType[2].value,
-    ServiceList: EntityType[0].value,
-  };
-  setMetricType(catalog[graph.type]);
+  setMetricType();
   setDashboards();
   states.dashboardName = "";
 }