Skip to content

fix(analytics): calculate and format hero deltas for the selected range #1116

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
castrojo wants to merge 1 commit into
base: v4
Choose a base branch
from
+17 −14
Open

fix(analytics): calculate and format hero deltas for the selected range #1116

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
31 changes: 17 additions & 14 deletions src/components/analytics/CountmeAnalyticsCharts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,21 +134,24 @@ export default function CountmeAnalyticsCharts(): React.JSX.Element {
return weeks;
}, [weeks, heroRange]);

// Delta calculation for Bluefin fleet
const firstWeek = weeks[0] || ({} as CountmeWeek);
// Delta calculation for Bluefin fleet, baselined to the first week of the
// currently selected hero range (not the entire history).
const firstHeroWeek = heroFilteredWeeks[0] || ({} as CountmeWeek);
const initialTotalBluefin =
(Number(firstWeek.bluefin) || 0) +
(Number(firstWeek["bluefin-lts"]) || 0) +
(Number(firstWeek.dakota) || 0) +
(Number(firstWeek.utah) || 0) || currentTotalBluefin;
(Number(firstHeroWeek.bluefin) || 0) +
(Number(firstHeroWeek["bluefin-lts"]) || 0) +
(Number(firstHeroWeek.dakota) || 0) +
(Number(firstHeroWeek.utah) || 0) || currentTotalBluefin;

const bluefinDeltaPct =
const bluefinDeltaPctValue =
initialTotalBluefin > 0
? (
((currentTotalBluefin - initialTotalBluefin) / initialTotalBluefin) *
100
).toFixed(1)
: "0.0";
? ((currentTotalBluefin - initialTotalBluefin) / initialTotalBluefin) *
100
: 0;

const bluefinDeltaPct = bluefinDeltaPctValue.toFixed(1);
const bluefinDeltaPctSigned =
bluefinDeltaPctValue >= 0 ? `+${bluefinDeltaPct}` : bluefinDeltaPct;

// Filtered weeks for comparative time-series charts
const filteredWeeks = useMemo(() => {
Expand Down Expand Up @@ -440,7 +443,7 @@ export default function CountmeAnalyticsCharts(): React.JSX.Element {
</div>
<div className={styles.heroMeta}>
<span style={{ fontWeight: 700, color: "#39d2c0" }}>
+{bluefinDeltaPct}% overall
{bluefinDeltaPctSigned}% overall
</span>
<span>latest week ({latestWeek.week})</span>
</div>
Expand Down Expand Up @@ -486,7 +489,7 @@ export default function CountmeAnalyticsCharts(): React.JSX.Element {
<EChart
option={heroChartOption}
title="Bluefin Systems"
summary={`Project Bluefin weekly active systems: currently ${currentTotalBluefin.toLocaleString()} systems as of week ${latestWeek.week}, up ${bluefinDeltaPct}% across ${weeks.length} tracked weeks.`}
summary={`Project Bluefin weekly active systems: currently ${currentTotalBluefin.toLocaleString()} systems as of week ${latestWeek.week}, ${bluefinDeltaPctValue >= 0 ? "up" : "down"} ${Math.abs(bluefinDeltaPctValue).toFixed(1)}% across ${heroFilteredWeeks.length} tracked weeks.`}
points={realHeroPoints}
minPoints={2}
height={320}
Expand Down