fix: set selector parameters for metrics, optimize the process topology (#147)

src/views/dashboard/panel/Tool.vue

@@ -288,36 +288,6 @@ async function setSourceSelector() {
   states.currentService = selectorStore.currentService.value;
   const e = String(params.entity).split("Relation")[0];
   await fetchPods(e, selectorStore.currentService.id, true);
-  if (!(selectorStore.pods.length && selectorStore.pods[0])) {
-    selectorStore.setCurrentPod(null);
-    states.currentPod = "";
-    states.currentProcess = "";
-    return;
-  }
-  const pod = params.podId || selectorStore.pods[0].id;
-  const currentPod = selectorStore.pods.find(
-    (d: { id: string }) => d.id === pod
-  );
-  if (!currentPod) {
-    selectorStore.setCurrentProcess(null);
-    states.currentProcess = "";
-    return;
-  }
-  selectorStore.setCurrentPod(currentPod);
-  states.currentPod = currentPod.label;
-  if (!(selectorStore.processes.length && selectorStore.processes[0])) {
-    selectorStore.setCurrentProcess(null);
-    states.currentProcess = "";
-    return;
-  }
-  const process = params.processId || selectorStore.processes[0].id;
-  const currentProcess = selectorStore.processes.find(
-    (d: { id: string }) => d.id === process
-  );
-  if (currentProcess) {
-    selectorStore.setCurrentProcess(currentProcess);
-    states.currentProcess = currentProcess.label;
-  }
 }
 
 async function setDestSelector() {
@@ -328,33 +298,6 @@ async function setDestSelector() {
     selectorStore.currentDestService.id,
     true
   );
-  if (!(selectorStore.destPods.length && selectorStore.destPods[0])) {
-    selectorStore.setCurrentDestPod(null);
-    states.currentDestPod = "";
-    return;
-  }
-  const destPod = params.destPodId || selectorStore.destPods[0].id;
-  const currentDestPod = selectorStore.destPods.find(
-    (d: { id: string }) => d.id === destPod
-  );
-  if (!currentDestPod) {
-    states.currentDestProcess = "";
-    selectorStore.setCurrentProcess(null);
-    return;
-  }
-  selectorStore.setCurrentDestPod(currentDestPod);
-  states.currentDestPod = currentDestPod.label;
-  const destProcess = params.destProcessId || selectorStore.destProcesses[0].id;
-  const currentDestProcess = selectorStore.destProcesses.find(
-    (d: { id: string }) => d.id === destProcess
-  );
-  if (!currentDestProcess) {
-    states.currentDestProcess = "";
-    selectorStore.setCurrentProcess(null);
-    return;
-  }
-  selectorStore.setCurrentProcess(currentDestProcess);
-  states.currentDestProcess = currentDestProcess.label;
 }
 
 async function getServices() {
@@ -482,10 +425,12 @@ function changeDestPods(pod: Option[]) {
 
 function changeDestProcess(pod: Option[]) {
   selectorStore.setCurrentDestProcess(pod[0] || null);
+  states.currentDestProcess = pod[0].label || "";
 }
 
 function changeProcess(pod: Option[]) {
   selectorStore.setCurrentProcess(pod[0] || null);
+  states.currentProcess = pod[0].label || "";
 }
 
 function changeMode() {
@@ -612,35 +557,13 @@ async function fetchPods(
     case EntityType[2].value:
       resp = await selectorStore.getEndpoints({ serviceId, ...param });
       if (setPod) {
-        let p;
+        updateCurrentPod();
-        if (states.currentPod) {
-          p = selectorStore.pods.find(
-            (d: { label: unknown }) => d.label === states.currentPod
-          );
-        } else {
-          p = selectorStore.pods.find(
-            (d: unknown, index: number) => index === 0
-          );
-        }
-        selectorStore.setCurrentPod(p || null);
-        states.currentPod = selectorStore.currentPod.label;
       }
       break;
     case EntityType[3].value:
       resp = await selectorStore.getServiceInstances({ serviceId });
       if (setPod) {
-        let p;
+        updateCurrentPod();
-        if (states.currentPod) {
-          p = selectorStore.pods.find(
-            (d: { label: string }) => d.label === states.currentPod
-          );
-        } else {
-          p = selectorStore.pods.find(
-            (d: { label: string }, index: number) => index === 0
-          );
-        }
-        selectorStore.setCurrentPod(p || null);
-        states.currentPod = selectorStore.currentPod.label;
       }
       break;
     case EntityType[6].value:
@@ -650,18 +573,7 @@ async function fetchPods(
         ...param,
       });
       if (setPod) {
-        let p;
+        updateCurrentDestPod();
-        if (states.currentDestPod) {
-          p = selectorStore.destPods.find(
-            (d: { label: string }) => d.label === states.currentDestPod
-          );
-        } else {
-          p = selectorStore.destPods.find(
-            (d: { label: string }, index: number) => index === 0
-          );
-        }
-        selectorStore.setCurrentDestPod(p || null);
-        states.currentDestPod = selectorStore.currentDestPod.label;
       }
       break;
     case EntityType[5].value:
@@ -670,18 +582,7 @@ async function fetchPods(
         isRelation: true,
       });
       if (setPod) {
-        let p;
+        updateCurrentDestPod();
-        if (states.currentDestPod) {
-          p = selectorStore.destPods.find(
-            (d: { label: string }) => d.label === states.currentDestPod
-          );
-        } else {
-          p = selectorStore.destPods.find(
-            (d: { label: string }, index: number) => index === 0
-          );
-        }
-        selectorStore.setCurrentDestPod(p || null);
-        states.currentDestPod = selectorStore.currentDestPod.label;
       }
       break;
     case EntityType[7].value:
@@ -705,18 +606,14 @@ async function fetchProcess(setPod: boolean) {
     instanceId: selectorStore.currentPod.id,
   });
   if (setPod) {
-    let m;
+    const process = params.processId || selectorStore.processes[0].id;
-    if (states.currentProcess) {
+    const currentProcess = selectorStore.processes.find(
-      m = selectorStore.processes.find(
+      (d: { id: string }) => d.id === process
-        (d: { label: string }) => d.label === states.currentProcess
+    );
-      );
+    if (currentProcess) {
-    } else {
+      selectorStore.setCurrentProcess(currentProcess);
-      m = selectorStore.processes.find(
+      states.currentProcess = currentProcess.label;
-        (d: { label: string }, index: number) => index === 0
-      );
     }
-    selectorStore.setCurrentProcess(m || null);
-    states.currentProcess = m && m.label;
   }
   return resp;
 }
@@ -726,21 +623,58 @@ async function fetchDestProcess(setPod: boolean) {
     isRelation: true,
   });
   if (setPod) {
-    let m;
+    const destProcess =
-    if (states.currentDestProcess) {
+      params.destProcessId || selectorStore.destProcesses[0].id;
-      m = selectorStore.destProcesses.find(
+    const currentDestProcess = selectorStore.destProcesses.find(
-        (d: { label: string }) => d.label === states.currentDestProcess
+      (d: { id: string }) => d.id === destProcess
-      );
+    );
-    } else {
+    if (!currentDestProcess) {
-      m = selectorStore.destProcesses.find(
+      states.currentDestProcess = "";
-        (d: { label: string }, index: number) => index === 1
+      selectorStore.setCurrentDestProcess(null);
-      );
+      return;
     }
-    selectorStore.setCurrentDestProcess(m || null);
+    selectorStore.setCurrentDestProcess(currentDestProcess);
-    states.currentDestProcess = m && m.label;
+    states.currentDestProcess = currentDestProcess.label;
   }
   return resp;
 }
+
+function updateCurrentDestPod() {
+  if (!(selectorStore.destPods.length && selectorStore.destPods[0])) {
+    selectorStore.setCurrentDestPod(null);
+    states.currentDestPod = "";
+    return;
+  }
+  const destPod = params.destPodId || selectorStore.destPods[0].id;
+  const currentDestPod = selectorStore.destPods.find(
+    (d: { id: string }) => d.id === destPod
+  );
+  if (!currentDestPod) {
+    states.currentDestPod = "";
+    selectorStore.setCurrentDestPod(null);
+    return;
+  }
+  selectorStore.setCurrentDestPod(currentDestPod);
+  states.currentDestPod = currentDestPod.label;
+}
+function updateCurrentPod() {
+  if (!(selectorStore.pods.length && selectorStore.pods[0])) {
+    selectorStore.setCurrentPod(null);
+    states.currentPod = "";
+    return;
+  }
+  const pod = params.podId || selectorStore.pods[0].id;
+  const currentPod = selectorStore.pods.find(
+    (d: { id: string }) => d.id === pod
+  );
+  if (!currentPod) {
+    selectorStore.setCurrentPod(null);
+    states.currentPod = "";
+    return;
+  }
+  selectorStore.setCurrentPod(currentPod);
+  states.currentPod = currentPod.label;
+}
 function getTools() {
   switch (params.entity) {
     case EntityType[1].value:

src/views/dashboard/related/network-profiling/components/Graph/linkProcess.ts

@@ -25,18 +25,18 @@ export const linkElement = (graph: any) => {
     .attr("stroke", "#97B0F8")
     .attr("d", (d: Call) => {
       const controlPos = computeControlPoint(
-        [d.source.x, d.source.y],
+        [d.source.x, d.source.y - 5],
-        [d.target.x, d.target.y],
+        [d.target.x, d.target.y - 5],
         0.5
       );
       if (d.lowerArc) {
-        controlPos[1] = -controlPos[1];
+        controlPos[1] = -controlPos[1] - 10;
       }
       return (
         "M" +
         d.source.x +
         " " +
-        d.source.y +
+        (d.source.y - 5) +
         " " +
         "Q" +
         controlPos[0] +
@@ -45,7 +45,7 @@ export const linkElement = (graph: any) => {
         " " +
         d.target.x +
         " " +
-        d.target.y
+        (d.target.y - 5)
       );
     });
   return linkEnter;
@@ -53,7 +53,7 @@ export const linkElement = (graph: any) => {
 export const anchorElement = (graph: any, funcs: any, tip: any) => {
   const linkEnter = graph
     .append("g")
-    .attr("style", "cursor: move;")
+    .attr("class", "topo-line-anchor")
     .on("mouseover", function (event: unknown, d: unknown) {
       tip.html(funcs.tipHtml).show(d, this);
     })
@@ -63,44 +63,17 @@ export const anchorElement = (graph: any, funcs: any, tip: any) => {
     .on("click", (event: unknown, d: unknown) => {
       funcs.handleLinkClick(event, d);
     });
-  linkEnter
-    .append("text")
-    .attr("fill", "#444")
-    .attr("text-anchor", "middle")
-    .attr("x", (d: Call) => {
-      const p = getMidpoint(d);
-      return p[0] + 10;
-    })
-    .attr("y", (d: Call) => {
-      const p = getMidpoint(d);
-      return p[1] + 3;
-    })
-    .text((d: Call) => {
-      const types = [...d.sourceComponents, ...d.targetComponents];
-      if (types.includes("tcp")) {
-        return "TCP";
-      }
-      if (types.includes("https")) {
-        return "HTTPS";
-      }
-      if (types.includes("http")) {
-        return "HTTP";
-      }
-      if (types.includes("tls")) {
-        return "TLS";
-      }
-    });
   linkEnter
     .append("image")
     .attr("width", 15)
     .attr("height", 15)
     .attr("x", (d: Call) => {
       const p = getMidpoint(d);
-      return p[0] - 16;
+      return p[0] - 8;
     })
     .attr("y", (d: Call) => {
       const p = getMidpoint(d);
-      return p[1] - 9;
+      return p[1] - 13;
     })
     .attr("xlink:href", (d: Call) => {
       const types = [...d.sourceComponents, ...d.targetComponents];

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

@@ -315,9 +315,21 @@ function drawTopology(nodeArr: any[]) {
     {
       handleLinkClick: handleLinkClick,
       tipHtml: (data: Call) => {
+        const types = [...data.sourceComponents, ...data.targetComponents];
+        let l = "TCP";
+        if (types.includes("https")) {
+          l = "HTTPS";
+        }
+        if (types.includes("http")) {
+          l = "HTTP";
+        }
+        if (types.includes("tls")) {
+          l = "TLS";
+        }
         const html = `<div><span class="grey">${t(
           "detectPoint"
-        )}:</span>${data.detectPoints.join(" | ")}</div>`;
+        )}: </span>${data.detectPoints.join(" | ")}</div>
+        <div><span class="grey">Type: </span>${l}</div>`;
         return html;
       },
     },
@@ -441,6 +453,10 @@ watch(
   cursor: move;
 }
 
+.topo-line-anchor {
+  cursor: pointer;
+}
+
 .switch-icon-edit {
   cursor: pointer;
   transition: all 0.5ms linear;