Skip to content

ui: make Metrics page charts responsive to viewport width #170977

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

Open
virajchogle wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ui: make Metrics page charts responsive to viewport width #170977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions pkg/ui/workspaces/cluster-ui/src/graphs/visualization/visualizations.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
@import "src/core/index.module";

.visualization {
width: fit-content;
// Fill the flex/grid slot so the chart inside can resize down on
// narrow viewports.
width: 100%;
position: relative;
background-color: #fff;
color: $headings-color;
Expand All @@ -26,8 +28,7 @@
display: flex;
justify-content: center;
align-items: center;
// These are the dimensions of the linegraph.
min-width: 947px;
// Reserve vertical space for the spinner so layout doesn't shift on load.
min-height: 300px;
}

Expand Down
22 changes: 22 additions & 0 deletions pkg/ui/workspaces/db-console/src/views/cluster/components/linegraph/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,26 @@ export function InternalLineGraph({
};
}, []);

// Resize uPlot when its container changes size. The !!data dependency
// attaches the observer once data arrives and Visualization renders
// children (until then, the el ref is unattached).
useEffect(() => {
const container = el.current;
if (!container || typeof ResizeObserver === "undefined") {
return;
}
const observer = new ResizeObserver(entries => {
const u = uRef.current;
if (!u) return;
const width = entries[0]?.contentRect.width;
if (width && width > 0) {
u.setSize({ width, height: 300 });
}
});
observer.observe(container);
return () => observer.disconnect();
}, [!!data]);

// Update chart when data, time info, or display dependencies change.
// prevDataRef is still needed because the effect uses previous data to
// compute prior series keys (deciding whether to setData() on the
Expand Down Expand Up @@ -341,13 +361,15 @@ export function InternalLineGraph({
// Updates existing plot with new points.
uRef.current.setData(uPlotData);
} else {
const initialWidth = el.current?.clientWidth || 947;
const options = configureUPlotLineChart(
metricElements,
axisElement,
data,
setNewTimeRange,
() => xAxisDomainRef.current,
() => yAxisDomainRef.current,
initialWidth,
);

if (uRef.current) {
Expand Down
5 changes: 4 additions & 1 deletion pkg/ui/workspaces/db-console/src/views/cluster/util/graphs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,9 @@ export function configureUPlotLineChart(
setMetricsFixedWindow: (startMillis: number, endMillis: number) => void,
getLatestXAxisDomain: () => AxisDomain,
getLatestYAxisDomain: () => AxisDomain,
// Pass the container's current width; subsequent resizes should be
// driven via uPlot.setSize().
initialWidth?: number,
): uPlot.Options {
const formattedRaw = formatMetricData(metrics, data);
// Copy palette over since we mutate it in the `series` function
Expand All @@ -224,7 +227,7 @@ export function configureUPlotLineChart(
// Please see https://github.com/leeoniya/uPlot/tree/master/docs for
// information on how to construct this object.
return {
width: 947,
width: initialWidth ?? 947,
height: 300,
cursor: {
lock: true,
Expand Down
Loading