fix: add ProcessRelation to entity types (#194)

src/hooks/useMetricsProcessor.ts

@@ -73,35 +73,9 @@ export function useQueryProcessor(config: any) {
         topN: c.topN || 10,
         order: c.sortOrder || "DES",
       };
-    } else if ([MetricQueryTypes.ReadRecords].includes(metricType)) {
-      variables.push(`$condition${index}: RecordCondition!`);
-      conditions[`condition${index}`] = {
-        name,
-        parentEntity: {
-          scope: config.catalog,
-          normal: selectorStore.currentService
-            ? selectorStore.currentService.normal
-            : true,
-          serviceName: ["All"].includes(dashboardStore.entity)
-            ? null
-            : selectorStore.currentService.value,
-        },
-        topN: c.topN || 10,
-        order: c.sortOrder || "DES",
-      };
     } else {
-      if (metricType === MetricQueryTypes.ReadLabeledMetricsValues) {
+      const entity = {
-        const labels = (c.labelsIndex || "")
+        scope: config.catalog,
-          .split(",")
-          .map((item: string) => item.replace(/^\s*|\s*$/g, ""));
-        variables.push(`$labels${index}: [String!]!`);
-        conditions[`labels${index}`] = labels;
-      }
-      variables.push(`$condition${index}: MetricsCondition!`);
-      conditions[`condition${index}`] = {
-        name,
-        entity: {
-          scope: dashboardStore.entity,
         serviceName:
           dashboardStore.entity === "All"
             ? undefined
@@ -137,15 +111,36 @@ export function useQueryProcessor(config: any) {
           : undefined,
         destEndpointName:
           dashboardStore.entity === "EndpointRelation"
-              ? selectorStore.currentDestPod &&
+            ? selectorStore.currentDestPod && selectorStore.currentDestPod.value
-                selectorStore.currentDestPod.value
             : undefined,
         destProcessName: dashboardStore.entity.includes("ProcessRelation")
           ? selectorStore.currentDestProcess &&
             selectorStore.currentDestProcess.value
           : undefined,
-        },
       };
+      if ([MetricQueryTypes.ReadRecords].includes(metricType)) {
+        variables.push(`$condition${index}: RecordCondition!`);
+        conditions[`condition${index}`] = {
+          name,
+          parentEntity: entity,
+          topN: c.topN || 10,
+          order: c.sortOrder || "DES",
+        };
+      } else {
+        entity.scope = dashboardStore.entity;
+        if (metricType === MetricQueryTypes.ReadLabeledMetricsValues) {
+          const labels = (c.labelsIndex || "")
+            .split(",")
+            .map((item: string) => item.replace(/^\s*|\s*$/g, ""));
+          variables.push(`$labels${index}: [String!]!`);
+          conditions[`labels${index}`] = labels;
+        }
+        variables.push(`$condition${index}: MetricsCondition!`);
+        conditions[`condition${index}`] = {
+          name,
+          entity,
+        };
+      }
     }
     if (metricType === MetricQueryTypes.ReadLabeledMetricsValues) {
       return `${name}${index}: ${metricType}(condition: $condition${index}, labels: $labels${index}, duration: $duration)${RespFields[metricType]}`;

src/layout/components/SideBar.vue

@@ -107,7 +107,7 @@ if (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent)) {
 } else {
   appStore.setIsMobile(false);
 }
-const isCollapse = ref(true);
+const isCollapse = ref(false);
 const controlMenu = () => {
   isCollapse.value = !isCollapse.value;
 };

src/views/dashboard/data.ts

@@ -145,6 +145,7 @@ export enum MetricCatalog {
   SERVICE_RELATION = "ServiceRelation",
   SERVICE_INSTANCE_RELATION = "ServiceInstanceRelation",
   ENDPOINT_RELATION = "EndpointRelation",
+  PROCESS_RELATION = "ProcessRelation",
 }
 export const EntityType = [
   { value: "Service", label: "Service", key: 1 },

src/views/dashboard/graphs/TopList.vue

@@ -43,7 +43,11 @@ limitations under the License. -->
       </div>
       <el-progress
         :stroke-width="6"
-        :percentage="(i.value / maxValue) * 100"
+        :percentage="
+          isNaN(Number(i.value) / maxValue)
+            ? 0
+            : (Number(i.value) / maxValue) * 100
+        "
         :color="TextColors[config.color || 'purple']"
         :show-text="false"
       />

src/views/dashboard/related/network-profiling/components/NewTask.vue

@@ -69,8 +69,8 @@ const activeNames = ref([0]);
 const conditionsList = ref<NetworkProfilingRequest[]>([
   {
     uriRegex: "",
-    when4xx: InitTaskField.Whenxx[0].value,
+    when4xx: InitTaskField.Whenxx[1].value,
-    when5xx: InitTaskField.Whenxx[1].value,
+    when5xx: InitTaskField.Whenxx[0].value,
     minDuration: NaN,
   },
 ]);