fix metric config

src/views/dashboard/Edit.vue

@@ -65,6 +65,13 @@ async function setTemplate() {
 
   dashboardStore.setLayout(layout.children || []);
   appStore.setPageTitle(layout.name);
+  if (!dashboardStore.currentDashboard) {
+    dashboardStore.setCurrentDashboard({
+      layer: p.layerId,
+      entity: p.layerId,
+      name: p.name,
+    });
+  }
 }
 function handleClick(e: any) {
   e.stopPropagation();

src/views/dashboard/configuration/Widget.vue

@@ -53,7 +53,7 @@ limitations under the License. -->
           <WidgetOptions />
         </el-collapse-item>
         <el-collapse-item :title="t('standardOptions')" name="4">
-          <StandardOptions @update="getSource" />
+          <StandardOptions @update="getSource" @loading="setLoading" />
         </el-collapse-item>
       </el-collapse>
     </div>

src/views/dashboard/configuration/widget/MetricOptions.vue

@@ -13,11 +13,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. -->
 <template>
-  <div v-if="states.isTable && dashboardList.length" class="ds-name">
+  <div v-if="states.isList && states.dashboardList.length" class="ds-name">
     <div>{{ t("dashboards") }}</div>
     <Selector
       :value="states.dashboardName"
-      :options="dashboardList"
+      :options="states.dashboardList"
       size="small"
       placeholder="Please select a dashboard name"
       @change="changeDashboard"
@@ -43,13 +43,13 @@ limitations under the License. -->
       :options="states.metricTypeList[index]"
       size="small"
       :disabled="
-        dashboardStore.selectedGrid.graph.type && !states.isTable && index !== 0
+        dashboardStore.selectedGrid.graph.type && !states.isList && index !== 0
       "
       @change="changeMetricType(index, $event)"
       class="selectors"
     />
     <span
-      v-show="states.isTable || states.metricTypes[0] === 'readMetricsValues'"
+      v-show="states.isList || states.metricTypes[0] === 'readMetricsValues'"
     >
       <Icon
         class="cp mr-5"
@@ -89,13 +89,13 @@ import { Option } from "@/types/app";
 import { useDashboardStore } from "@/store/modules/dashboard";
 import {
   MetricTypes,
-  TableChartTypes,
+  ListChartTypes,
   MetricCatalog,
   DefaultGraphConfig,
   EntityType,
   ChartTypes,
   PodsChartTypes,
-  TableEntity,
+  ListEntity,
 } from "../../data";
 import { ElMessage } from "element-plus";
 import Icon from "@/components/Icon.vue";
@@ -113,46 +113,31 @@ const states = reactive<{
   metricTypes: string[];
   metricTypeList: Option[][];
   visTypes: Option[];
-  isTable: boolean;
+  isList: boolean;
   metricList: (Option & { type: string })[];
   dashboardName: string;
+  dashboardList: (DashboardItem & { label: string; value: string })[];
 }>({
   metrics: metrics && metrics.length ? metrics : [""],
   metricTypes: metricTypes && metricTypes.length ? metricTypes : [""],
   metricTypeList: [],
   visTypes: [],
-  isTable: false,
+  isList: false,
   metricList: [],
   dashboardName: graph.dashboardName,
+  dashboardList: [],
 });
-const list = JSON.parse(sessionStorage.getItem("dashboards") || "[]");
-const dashboardList = list.reduce(
-  (
-    prev: (DashboardItem & { label: string; value: string })[],
-    d: DashboardItem
-  ) => {
-    if (
-      d.entity === dashboardStore.entity &&
-      d.layer === dashboardStore.layerId
-    ) {
-      prev.push({
-        ...d,
-        value: d.name,
-        label: d.name,
-      });
-    }
-    return prev;
-  },
-  []
-);
 
-states.isTable = TableChartTypes.includes(graph.type);
+states.isList = ListChartTypes.includes(graph.type);
 states.visTypes = setVisTypes();
+
+setDashboards();
 setMetricType();
 
 async function setMetricType(catalog?: string) {
-  if (states.isTable) {
+  const { graph } = dashboardStore.selectedGrid;
-    catalog = catalog || TableEntity[graph.type];
+  if (states.isList) {
+    catalog = catalog || ListEntity[graph.type];
   } else {
     catalog = catalog || dashboardStore.entity;
   }
@@ -166,20 +151,63 @@ async function setMetricType(catalog?: string) {
   );
   const metrics: any = states.metricList.filter(
     (d: { value: string; type: string }) => {
-      const metric = states.metrics.filter((m: string) => m === d.value)[0];
+      const index = states.metrics.findIndex((m: string) => m === d.value);
-      if (metric) {
+      if (index > -1) {
         return d;
       }
     }
   );
+
+  if (metrics.length) {
+    states.metrics = metrics.map((d: { value: string }) => d.value);
+  } else {
+    states.metrics = [""];
+    states.metricTypes = [""];
+  }
+  dashboardStore.selectWidget({
+    ...dashboardStore.selectedGrid,
+    metrics,
+    metricTypes,
+  });
   for (const metric of metrics) {
-    states.metricTypeList.push(MetricTypes[metric.type]);
+    if (states.metrics.includes(metric)) {
+      states.metricTypeList.push(MetricTypes[metric.type]);
+    }
   }
   if (states.metrics && states.metrics[0]) {
     queryMetrics();
+  } else {
+    emit("update", {});
   }
 }
 
+function setDashboards() {
+  const { graph } = dashboardStore.selectedGrid;
+  const list = JSON.parse(sessionStorage.getItem("dashboards") || "[]");
+  states.dashboardList = list.reduce(
+    (
+      prev: (DashboardItem & { label: string; value: string })[],
+      d: DashboardItem
+    ) => {
+      if (d.layer === dashboardStore.layerId) {
+        if (
+          (d.entity === EntityType[0].value && graph.type === "ServiceList") ||
+          (d.entity === EntityType[2].value && graph.type === "EndpointList") ||
+          (d.entity === EntityType[3].value && graph.type === "InstanceList")
+        ) {
+          prev.push({
+            ...d,
+            value: d.name,
+            label: d.name,
+          });
+        }
+      }
+      return prev;
+    },
+    []
+  );
+}
+
 function setVisTypes() {
   let graphs = [];
   if (dashboardStore.entity === EntityType[0].value) {
@@ -190,7 +218,7 @@ function setVisTypes() {
     );
   } else {
     graphs = ChartTypes.filter(
-      (d: Option) => !TableChartTypes.includes(d.value)
+      (d: Option) => !ListChartTypes.includes(d.value)
     );
   }
 
@@ -199,10 +227,9 @@ function setVisTypes() {
 
 function changeChartType(item: Option) {
   const graph = DefaultGraphConfig[item.value];
-  states.isTable = TableChartTypes.includes(graph.type);
   dashboardStore.selectWidget({ ...dashboardStore.selectedGrid, graph });
-  states.isTable = TableChartTypes.includes(graph.type);
+  states.isList = ListChartTypes.includes(graph.type);
-  if (states.isTable) {
+  if (states.isList) {
     dashboardStore.selectWidget({
       ...dashboardStore.selectedGrid,
       metrics: [""],
@@ -216,11 +243,9 @@ function changeChartType(item: Option) {
     EndpointList: EntityType[2].value,
     ServiceList: EntityType[0].value,
   };
-  if (catalog[graph.type]) {
+  setMetricType(catalog[graph.type]);
-    setMetricType(catalog[graph.type]);
+  setDashboards();
-  } else {
+  states.dashboardName = "";
-    setMetricType();
-  }
 }
 
 function changeMetrics(
@@ -236,6 +261,7 @@ function changeMetrics(
     });
     return;
   }
+  console.log(arr);
   states.metrics[index] = arr[0].value;
   const typeOfMetrics = arr[0].type;
 
@@ -245,7 +271,7 @@ function changeMetrics(
     ...dashboardStore.selectedGrid,
     ...{ metricTypes: states.metricTypes, metrics: states.metrics },
   });
-  if (states.isTable) {
+  if (states.isList) {
     return;
   }
   queryMetrics();
@@ -256,7 +282,7 @@ function changeMetricType(index: number, opt: Option[] | any) {
     states.metricList.filter(
       (d: Option) => states.metrics[index] === d.value
     )[0] || {};
-  if (states.isTable) {
+  if (states.isList) {
     states.metricTypes[index] = opt[0].value;
     states.metricTypeList[index] = (MetricTypes as any)[metric.type];
   } else {
@@ -274,7 +300,7 @@ function changeMetricType(index: number, opt: Option[] | any) {
     ...dashboardStore.selectedGrid,
     ...{ metricTypes: states.metricTypes },
   });
-  if (states.isTable) {
+  if (states.isList) {
     return;
   }
   queryMetrics();
@@ -311,7 +337,7 @@ function changeDashboard(opt: any) {
 }
 function addMetric() {
   states.metrics.push("");
-  if (!states.isTable) {
+  if (!states.isList) {
     states.metricTypes.push(states.metricTypes[0]);
     states.metricTypeList.push(states.metricTypeList[0]);
     return;

src/views/dashboard/controls/Widget.vue

@@ -76,7 +76,7 @@ import { useSelectorStore } from "@/store/modules/selectors";
 import graphs from "../graphs";
 import { useI18n } from "vue-i18n";
 import { useQueryProcessor, useSourceProcessor } from "@/hooks/useProcessor";
-import { EntityType, TableChartTypes } from "../data";
+import { EntityType, ListChartTypes } from "../data";
 
 const props = {
   data: {
@@ -147,7 +147,7 @@ export default defineComponent({
         if (props.data.i !== dashboardStore.selectedGrid.i) {
           return;
         }
-        if (TableChartTypes.includes(dashboardStore.selectedGrid.graph.type)) {
+        if (ListChartTypes.includes(dashboardStore.selectedGrid.graph.type)) {
           return;
         }
         queryMetrics();

src/views/dashboard/data.ts

@@ -17,7 +17,7 @@
 
 export const PodsChartTypes = ["EndpointList", "InstanceList"];
 
-export const TableChartTypes = ["EndpointList", "InstanceList", "ServiceList"];
+export const ListChartTypes = ["EndpointList", "InstanceList", "ServiceList"];
 
 export const ChartTypes = [
   { label: "Bar", value: "Bar" },
@@ -152,7 +152,7 @@ export const EntityType = [
   },
   { value: "EndpointRelation", label: "Endpoint Relation", key: 4 },
 ];
-export const TableEntity: any = {
+export const ListEntity: any = {
   InstanceList: EntityType[3].value,
   EndpointList: EntityType[2].value,
   ServiceList: EntityType[0].value,

src/views/dashboard/graphs/Table.vue

@@ -21,13 +21,13 @@ limitations under the License. -->
         :style="`width: ${nameWidth + initWidth}px`"
       >
         <div class="name" :style="`width: ${nameWidth}px`">
-          {{ config.tableHeaderCol1 || t("name") }}
+          {{ config.graph.tableHeaderCol1 || t("name") }}
           <i class="r cp" ref="draggerName">
             <Icon iconName="settings_ethernet" size="middle" />
           </i>
         </div>
         <div class="value-col" v-if="showTableValues">
-          {{ config.tableHeaderCol2 || t("value") }}
+          {{ config.graph.tableHeaderCol2 || t("value") }}
         </div>
       </div>
       <div
@@ -38,7 +38,11 @@ limitations under the License. -->
       >
         <div :style="`width: ${nameWidth}px`">{{ key }}</div>
         <div class="value-col" v-if="showTableValues">
-          {{ data[key][data[key].length - 1 || 0] }}
+          {{
+            config.metricTypes[0] === "readMetricsValue"
+              ? data[key]
+              : data[key][data[key].length - 1 || 0]
+          }}
         </div>
       </div>
     </div>
@@ -56,32 +60,32 @@ const props = defineProps({
   },
   config: {
     type: Object as PropType<{
-      showTableValues: boolean;
+      graph: {
-      tableHeaderCol2: string;
+        showTableValues: boolean;
-      tableHeaderCol1: string;
+        tableHeaderCol2: string;
+        tableHeaderCol1: string;
+      };
+      metricTypes: string[];
     }>,
     default: () => ({ showTableValues: true }),
   },
 });
+
 /*global Nullable*/
 const { t } = useI18n();
 const chartTable = ref<Nullable<HTMLElement>>(null);
 const initWidth = ref<number>(0);
 const nameWidth = ref<number>(0);
 const draggerName = ref<Nullable<HTMLElement>>(null);
-const showTableValues = ref<boolean>(
+const showTableValues = ref<boolean>(props.config.graph.showTableValues);
-  props.config.showTableValues === undefined
-    ? true
-    : props.config.showTableValues
-);
 onMounted(() => {
   if (!chartTable.value) {
     return;
   }
-  const width = props.config.showTableValues
+  const width = props.config.graph.showTableValues
     ? chartTable.value.offsetWidth / 2
     : chartTable.value.offsetWidth;
-  initWidth.value = props.config.showTableValues
+  initWidth.value = props.config.graph.showTableValues
     ? chartTable.value.offsetWidth / 2
     : 0;
   nameWidth.value = width - 5;
@@ -102,8 +106,12 @@ onMounted(() => {
   };
 });
 const dataKeys = computed(() => {
+  if (props.config.metricTypes[0] === "readMetricsValue") {
+    const keys = Object.keys(props.data || {});
+    return keys;
+  }
   const keys = Object.keys(props.data || {}).filter(
-    (i: any) => Array.isArray(props.data[i]) && props.data[i].length
+    (i: string) => Array.isArray(props.data[i]) && props.data[i].length
   );
   return keys;
 });