github/skywalking-booster-ui
2
0
Fork 1
mirror of https://github.com/apache/skywalking-booster-ui.git synced 2025-05-12 15:49:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: remove node layer

Browse Source
This commit is contained in:
Fine 2024-01-30 14:59:49 +08:00
parent 3c282d021b
commit 3e1a0a7413
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/store/modules/topology.ts
View File

@ -87,12 +87,9 @@ export const topologyStore = defineStore({
}, },
setTopology(data: { nodes: Node[]; calls: Call[] }) { setTopology(data: { nodes: Node[]; calls: Call[] }) {
const obj = {} as Recordable; const obj = {} as Recordable;
const services = useSelectorStore().services;
const nodes = (data.nodes || []).reduce((prev: Node[], next: Node) => { const nodes = (data.nodes || []).reduce((prev: Node[], next: Node) => {
if (!obj[next.id]) { if (!obj[next.id]) {
obj[next.id] = true; obj[next.id] = true;
const s = services.filter((d: any) => d.id === next.id)[0] || {};
next.layer = s.layers ? s.layers[0] : null;
prev.push(next); prev.push(next);
} }
return prev; return prev;
@ -658,7 +655,7 @@ export const topologyStore = defineStore({
return metrics; return metrics;
}, },
async queryHierarchyNodeExpressions(expressions: string[], layer: string) { async queryHierarchyNodeExpressions(expressions: string[], layer: string) {
const nodes = this.hierarchyServiceNodes.filter((n: Node) => n.layer === layer); const nodes = this.hierarchyServiceNodes.filter((n: HierarchyNode) => n.layer === layer);
if (!nodes.length) { if (!nodes.length) {
this.setHierarchyNodeMetricValue({}, layer); this.setHierarchyNodeMetricValue({}, layer);
return; return;
@ -671,7 +668,7 @@ export const topologyStore = defineStore({
this.setHierarchyNodeMetricValue(metrics, layer); this.setHierarchyNodeMetricValue(metrics, layer);
}, },
async queryHierarchyInstanceNodeExpressions(expressions: string[], layer: string) { async queryHierarchyInstanceNodeExpressions(expressions: string[], layer: string) {
const nodes = this.hierarchyInstanceNodes.filter((n: Node) => n.layer === layer); const nodes = this.hierarchyInstanceNodes.filter((n: HierarchyNode) => n.layer === layer);
if (!expressions.length) { if (!expressions.length) {
this.setHierarchyInstanceNodeMetricValue({}, layer); this.setHierarchyInstanceNodeMetricValue({}, layer);

1
src/types/topology.d.ts vendored
View File

@ -43,7 +43,6 @@ export interface Node {
name: string; name: string;
type: string; type: string;
isReal: boolean; isReal: boolean;
layer?: string;
layers: string[]; layers: string[];
serviceName?: string; serviceName?: string;
height?: number; height?: number;

4
src/views/dashboard/related/topology/service/ServiceMap.vue
View File

@ -411,7 +411,7 @@ limitations under the License. -->
topologyStore.setLink(null); topologyStore.setLink(null);
operationsPos.x = event.offsetX; operationsPos.x = event.offsetX;
operationsPos.y = event.offsetY; operationsPos.y = event.offsetY;
if (d.layer === String(dashboardStore.layerId)) { if (d.layers.includes(dashboardStore.layerId)) {
setNodeTools(settings.value.nodeDashboard); setNodeTools(settings.value.nodeDashboard);
return; return;
} }
@ -419,7 +419,7 @@ limitations under the License. -->
} }
function handleLinkClick(event: MouseEvent, d: Call) { function handleLinkClick(event: MouseEvent, d: Call) {
event.stopPropagation(); event.stopPropagation();
if (d.sourceObj.layer !== dashboardStore.layerId || d.targetObj.layer !== dashboardStore.layerId) { if (!d.sourceObj.layers.includes(dashboardStore.layerId) || !d.targetObj.layers.includes(dashboardStore.layerId)) {
return; return;
} }
topologyStore.setNode(null); topologyStore.setNode(null);