Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vis: tree display: rework activity animation #1584

Merged
merged 2 commits into from
Mar 31, 2024
Merged

vis: tree display: rework activity animation #1584

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19fc0e7
vis: tree display: rework activity animation
dyc3 Mar 31, 2024
0dba082
format
dyc3 Mar 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 34 additions & 14 deletions packages/ott-vis-panel/src/components/TreeDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useRef, useState } from "react";
import React, { useCallback, useEffect, useRef, useState } from "react";
import * as d3 from "d3";
import type { Monolith, SystemState } from "ott-vis/types";
import { dedupeMonoliths } from "aggregate";
Expand Down Expand Up @@ -245,6 +245,19 @@ const TreeDisplay: React.FC<TreeDisplayProps> = ({

const [chartTransform, setChartTransform] = useState("translate(0, 0)");

const getRadius = useCallback(
(group: string): number => {
if (group === "client") {
return clientNodeRadius;
} else if (group === "balancer") {
return balancerNodeRadius;
} else {
return baseNodeRadius;
}
},
[baseNodeRadius, balancerNodeRadius, clientNodeRadius]
);

useEffect(() => {
if (svgRef.current) {
// because d3-hierarchy doesn't support trees with multiple parents, we need to do manual layouts for balancers and monoliths, but we can use the built-in tree layout for monolith down to clients
Expand Down Expand Up @@ -536,13 +549,7 @@ const TreeDisplay: React.FC<TreeDisplayProps> = ({
.transition(tr)
.attr("cx", (d: any) => d.x)
.attr("cy", (d: any) => d.y)
.attr("r", d => {
if (d.data.group === "client") {
return clientNodeRadius;
} else {
return baseNodeRadius;
}
});
.attr("r", d => getRadius(d.data.group));

const monolithTexts = monolith
.selectAll(".monolith-text")
Expand Down Expand Up @@ -635,6 +642,7 @@ const TreeDisplay: React.FC<TreeDisplayProps> = ({
balancerNodeRadius,
clientNodeRadius,
balancerGroupStyle,
getRadius,
]);

// run this only once after the first render
Expand All @@ -650,17 +658,29 @@ const TreeDisplay: React.FC<TreeDisplayProps> = ({
const eventBus = useEventBus();
useEffect(() => {
const sub = eventBus.subscribe(event => {
d3.select(`[data-nodeid="${event.node_id}"]`)
.transition("highlight")
.duration(100)
.attrTween("stroke", () => d3.interpolateRgb("#f00", "#fff"))
.attrTween("stroke-width", () => t => d3.interpolateNumber(4, 1.5)(t).toString());
const node = d3.select(`[data-nodeid="${event.node_id}"]`);
if (node.empty()) {
return;
}
const data = node.data()[0] as d3.HierarchyNode<TreeNode>;
const endRadius = data ? getRadius(data.data.group) : 20;
const radiusCurrent = parseFloat(node.attr("r"));
const newRadius = Math.max(Math.min(radiusCurrent + 5, 40), endRadius);
node.transition("highlight")
.duration(333)
.ease(d3.easeCubicOut)
.attrTween("stroke", () => d3.interpolateRgb("#0f0", "#fff"))
.attrTween("stroke-width", () => t => d3.interpolateNumber(4, 1.5)(t).toString())
.attrTween(
"r",
() => t => d3.interpolateNumber(newRadius, endRadius)(t).toString()
);
});

return () => {
sub.unsubscribe();
};
}, [eventBus]);
}, [eventBus, getRadius]);

return (
<svg
Expand Down
Loading