diff --git a/src/views/dashboard/related/topology/utils/legend.ts b/src/views/dashboard/related/topology/utils/legend.ts index b3550af9..101420af 100644 --- a/src/views/dashboard/related/topology/utils/legend.ts +++ b/src/views/dashboard/related/topology/utils/legend.ts @@ -42,7 +42,7 @@ export default function topoLegend( .map((d: any) => `${d.name} ${d.condition} ${d.value}`) .join(" and "); return item === "CUBEERROR" - ? config + ? config && config.length ? `Unhealthy (${str})` : "Unhealthy" : "Healthy"; diff --git a/src/views/dashboard/related/topology/utils/nodeElement.ts b/src/views/dashboard/related/topology/utils/nodeElement.ts index 6a9fbe1d..5c761ccd 100644 --- a/src/views/dashboard/related/topology/utils/nodeElement.ts +++ b/src/views/dashboard/related/topology/utils/nodeElement.ts @@ -55,11 +55,10 @@ export default (d3: any, graph: any, funcs: any, tip: any, legend: any) => { } let c = true; for (const l of legend) { - const val = l.name.includes("_sla") ? d[l.name] / 100 : d[l.name]; if (l.condition === "<") { - c = c && val < Number(l.value); + c = c && d[l.name] < Number(l.value); } else { - c = c && val > Number(l.value); + c = c && d[l.name] > Number(l.value); } } return c && d.isReal ? icons.CUBEERROR : icons.CUBE;