Skip to content

Main graph fixes #6169

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

Merged
RobertJoonas merged 2 commits into from
Mar 17, 2026
Merged

Main graph fixes #6169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91c1be0
fix graph crashing
RobertJoonas Mar 17, 2026
7d46ec3
do not attempt to link to __blank__ period
RobertJoonas Mar 17, 2026
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
55 changes: 30 additions & 25 deletions assets/js/dashboard/stats/graph/graph-tooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,18 @@ const buildTooltipData = function (
true
)

const value = graphData.plot[data.dataIndex]
const value = data && graphData.plot?.[data.dataIndex]

const formatter = MetricFormatterShort[metric]
const comparisonValue = graphData.comparison_plot?.[comparisonData.dataIndex]
const comparisonValue =
comparisonData && graphData.comparison_plot?.[comparisonData.dataIndex]
const comparisonDifference =
label &&
comparisonData &&
value &&
calculatePercentageDifference(comparisonValue, value)

const formattedValue = formatter(value)
const formattedValue = value && formatter(value)
const formattedComparisonValue = comparisonData && formatter(comparisonValue)

return {
Expand Down Expand Up @@ -151,6 +153,11 @@ export default function GraphTooltip(graphData, metric, dashboardState, theme) {
tooltipModel
)

if (!tooltipData.label) {
tooltipEl.style.display = 'none'
return
}

tooltipRoot.render(
<aside className="text-gray-100 flex flex-col gap-1.5">
<div className="flex justify-between items-center">
Expand All @@ -167,32 +174,30 @@ export default function GraphTooltip(graphData, metric, dashboardState, theme) {
) : null}
</div>

{tooltipData.label ? (
<div className="flex flex-col">
<div className="flex flex-col">
<div className="flex flex-row justify-between items-center text-sm">
<span className="flex items-center mr-4">
<div
className="size-2 mr-2 rounded-full"
style={{ backgroundColor: 'rgba(101,116,205)' }}
></div>
<span>{tooltipData.label}</span>
</span>
<span className="font-bold">{tooltipData.formattedValue}</span>
</div>

{tooltipData.comparisonLabel ? (
<div className="flex flex-row justify-between items-center text-sm">
<span className="flex items-center mr-4">
<div
className="size-2 mr-2 rounded-full"
style={{ backgroundColor: 'rgba(101,116,205)' }}
></div>
<span>{tooltipData.label}</span>
<div className="size-2 mr-2 rounded-full bg-gray-500"></div>
<span>{tooltipData.comparisonLabel}</span>
</span>
<span className="font-bold">
{tooltipData.formattedComparisonValue}
</span>
<span className="font-bold">{tooltipData.formattedValue}</span>
</div>

{tooltipData.comparisonLabel ? (
<div className="flex flex-row justify-between items-center text-sm">
<span className="flex items-center mr-4">
<div className="size-2 mr-2 rounded-full bg-gray-500"></div>
<span>{tooltipData.comparisonLabel}</span>
</span>
<span className="font-bold">
{tooltipData.formattedComparisonValue}
</span>
</div>
) : null}
</div>
) : null}
) : null}
</div>

{['month', 'day'].includes(graphData.interval) && (
<>
Expand Down
8 changes: 5 additions & 3 deletions assets/js/dashboard/stats/graph/line-graph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,11 @@ class LineGraph extends React.Component {
const element = this.chart.getElementsAtEventForMode(e, 'index', {
intersect: false
})[0]
const date =
this.props.graphData.labels[element.index] ||
this.props.graphData.comparison_labels[element.index]
const date = this.props.graphData.labels[element.index]

if (date === '__blank__') {
return
}

if (this.props.graphData.interval === 'month') {
this.props.navigate({
Expand Down
Loading