Skip to content

fix(dashboard): show remaining totals in usage donuts #303

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
Daltonganger wants to merge 1 commit into
base: main
Choose a base branch
from
+47 −2
Open

fix(dashboard): show remaining totals in usage donuts #303

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
4 changes: 2 additions & 2 deletions frontend/src/features/dashboard/components/dashboard-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ export function DashboardPage() {
<UsageDonuts
primaryItems={view.primaryUsageItems}
secondaryItems={view.secondaryUsageItems}
primaryTotal={overview?.summary.primaryWindow.capacityCredits ?? 0}
secondaryTotal={overview?.summary.secondaryWindow?.capacityCredits ?? 0}
primaryTotal={view.primaryUsageTotal}
secondaryTotal={view.secondaryUsageTotal}
safeLinePrimary={view.safeLinePrimary}
safeLineSecondary={view.safeLineSecondary}
/>
Expand Down
41 changes: 41 additions & 0 deletions frontend/src/features/dashboard/utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ import { describe, expect, it } from "vitest";

import {
applySecondaryConstraint,
buildDashboardView,
buildDepletionView,
buildRemainingItems,
} from "@/features/dashboard/utils";
import type { RemainingItem } from "@/features/dashboard/utils";
import type { AccountSummary, Depletion } from "@/features/dashboard/schemas";
import { createDashboardOverview, createDefaultRequestLogs } from "@/test/mocks/factories";
import { formatCompactAccountId } from "@/utils/account-identifiers";

function account(overrides: Partial<AccountSummary> & Pick<AccountSummary, "accountId" | "email">): AccountSummary {
Expand Down Expand Up @@ -248,3 +250,42 @@ describe("buildRemainingItems", () => {
expect(items[2].isEmail).toBe(true);
});
});

describe("buildDashboardView", () => {
it("uses aggregate remaining credits for donut totals", () => {
const overview = createDashboardOverview({
summary: {
primaryWindow: {
remainingPercent: 63.5,
capacityCredits: 1125,
remainingCredits: 790.5,
resetAt: null,
windowMinutes: 300,
},
secondaryWindow: {
remainingPercent: 55.2,
capacityCredits: 37800,
remainingCredits: 28350,
resetAt: null,
windowMinutes: 10080,
},
cost: {
currency: "USD",
totalUsd7d: 1.82,
},
metrics: {
requests7d: 228,
tokensSecondaryWindow: 45000,
cachedTokensSecondaryWindow: 8200,
errorRate7d: 0.028,
topError: "rate_limit_exceeded",
},
},
});

const view = buildDashboardView(overview, createDefaultRequestLogs(), false);

expect(view.primaryUsageTotal).toBe(790.5);
expect(view.secondaryUsageTotal).toBe(28350);
});
});
4 changes: 4 additions & 0 deletions frontend/src/features/dashboard/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ export type DashboardView = {
stats: DashboardStat[];
primaryUsageItems: RemainingItem[];
secondaryUsageItems: RemainingItem[];
primaryUsageTotal: number;
secondaryUsageTotal: number;
requestLogs: RequestLog[];
safeLinePrimary: SafeLineView | null;
safeLineSecondary: SafeLineView | null;
Expand Down Expand Up @@ -223,6 +225,8 @@ export function buildDashboardView(
? applySecondaryConstraint(rawPrimaryItems, secondaryUsageItems)
: rawPrimaryItems,
secondaryUsageItems,
primaryUsageTotal: overview.summary.primaryWindow.remainingCredits,
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot Apr 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Derive primary donut total from constrained items

When the weekly window is tighter than the 5h window, applySecondaryConstraint reduces primaryUsageItems, but primaryUsageTotal still uses the unconstrained overview.summary.primaryWindow.remainingCredits. In that case the donut center ("Remaining") and consumed = total - usedSum become inconsistent with the displayed slices, so the chart overstates usable 5h remaining and introduces a synthetic consumed segment. Compute the total from the constrained primary items (or an equivalently constrained aggregate) so totals and slices stay aligned.

Useful? React with 👍 / 👎.

secondaryUsageTotal: overview.summary.secondaryWindow?.remainingCredits ?? 0,
requestLogs,
safeLinePrimary: buildDepletionView(overview.depletionPrimary),
safeLineSecondary: buildDepletionView(overview.depletionSecondary),
Expand Down
Loading