Skip to content

Commit 0b87076

Browse files
fix(web): sort usage models by token count
1 parent f035a0f commit 0b87076

2 files changed

Lines changed: 83 additions & 5 deletions

File tree

‎apps/web/src/components/usage/UsagePage.test.tsx‎

Lines changed: 72 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import { beforeEach, describe, expect, it, vi } from "vite-plus/test";
55

66
const testState = vi.hoisted(() => ({
77
useUsage: vi.fn(),
8+
metric: "cost" as "cost" | "tokens",
9+
breakdown: "time" as "model" | "time",
810
}));
911

1012
vi.mock("react", async (importOriginal) => {
@@ -24,9 +26,11 @@ vi.mock("react", async (importOriginal) => {
2426
untilTime: "2026-08-11T12:37:00.000Z",
2527
},
2628
}
27-
: initial === "model"
28-
? "time"
29-
: initial,
29+
: initial === "cost"
30+
? testState.metric
31+
: initial === "model"
32+
? testState.breakdown
33+
: initial,
3034
vi.fn(),
3135
]),
3236
};
@@ -72,10 +76,40 @@ const providerTotals = (codex: number, claude: number) =>
7276
["claude", { costUsd: claude, totalTokens: claude * 1_000 }],
7377
] as const);
7478

79+
const modelTotals = Object.freeze([
80+
{
81+
model: "expensive-model",
82+
provider: "claude" as const,
83+
costUsd: 10,
84+
totalTokens: 100,
85+
records: 1,
86+
costShare: 10 / 16,
87+
},
88+
{
89+
model: "token-heavy-model",
90+
provider: "codex" as const,
91+
costUsd: 5,
92+
totalTokens: 1_000,
93+
records: 1,
94+
costShare: 5 / 16,
95+
},
96+
{
97+
model: "token-heavy-cheaper-model",
98+
provider: "codex" as const,
99+
costUsd: 1,
100+
totalTokens: 1_000,
101+
records: 1,
102+
costShare: 1 / 16,
103+
},
104+
]);
105+
75106
beforeEach(() => {
107+
testState.metric = "cost";
108+
testState.breakdown = "time";
76109
testState.useUsage.mockReturnValue({
77110
merged: {
78111
...mergeUsage([], USAGE_CONTRACT_VERSION),
112+
models: modelTotals,
79113
hourly: [
80114
{
81115
day: "2026-08-10",
@@ -110,4 +144,39 @@ describe("UsagePage hourly breakdown", () => {
110144
expect(body).toContain("$13.00");
111145
expect(body.indexOf("$11.00")).toBeLessThan(body.indexOf("$13.00"));
112146
});
147+
148+
it("keeps chronological ordering when the token metric is selected", () => {
149+
testState.metric = "tokens";
150+
151+
const markup = renderToStaticMarkup(<UsagePage />);
152+
const body = markup.match(/<tbody>(.*?)<\/tbody>/)?.[1] ?? "";
153+
154+
expect(body).toMatch(/\$11\.00.*\$13\.00/);
155+
});
156+
});
157+
158+
describe("UsagePage model breakdown", () => {
159+
it("sorts models by cost when the cost metric is selected", () => {
160+
testState.breakdown = "model";
161+
162+
const markup = renderToStaticMarkup(<UsagePage />);
163+
const body = markup.match(/<tbody>(.*?)<\/tbody>/)?.[1] ?? "";
164+
165+
expect(body).toMatch(/expensive-model.*token-heavy-model.*token-heavy-cheaper-model/);
166+
});
167+
168+
it("sorts models by token usage when the token metric is selected", () => {
169+
testState.metric = "tokens";
170+
testState.breakdown = "model";
171+
172+
const markup = renderToStaticMarkup(<UsagePage />);
173+
const body = markup.match(/<tbody>(.*?)<\/tbody>/)?.[1] ?? "";
174+
175+
expect(body).toMatch(/token-heavy-model.*token-heavy-cheaper-model.*expensive-model/);
176+
expect(modelTotals.map((model) => model.model)).toEqual([
177+
"expensive-model",
178+
"token-heavy-model",
179+
"token-heavy-cheaper-model",
180+
]);
181+
});
113182
});

‎apps/web/src/components/usage/UsagePage.tsx‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,15 @@ export function UsagePage() {
7474
() => (isPast24Hours ? merged.hourly : merged.daily).toReversed(),
7575
[isPast24Hours, merged.daily, merged.hourly],
7676
);
77+
const breakdownModels = useMemo(
78+
() =>
79+
breakdown === "model" && metric === "tokens"
80+
? merged.models.toSorted(
81+
(left, right) => right.totalTokens - left.totalTokens || right.costUsd - left.costUsd,
82+
)
83+
: merged.models,
84+
[breakdown, merged.models, metric],
85+
);
7786
const activeProviders = useMemo(() => providersWithUsage(merged.providers), [merged.providers]);
7887
const timeValueColumnWidth = `${60 / (activeProviders.length + 2)}%`;
7988

@@ -350,14 +359,14 @@ export function UsagePage() {
350359
</tr>
351360
</thead>
352361
<tbody>
353-
{merged.models.length === 0 ? (
362+
{breakdownModels.length === 0 ? (
354363
<tr>
355364
<td colSpan={4} className="py-6 text-center text-muted-foreground">
356365
No activity in this window.
357366
</td>
358367
</tr>
359368
) : (
360-
merged.models.map((model) => (
369+
breakdownModels.map((model) => (
361370
<tr
362371
key={`${model.provider}:${model.model}`}
363372
className="border-b border-border/50 transition-colors hover:bg-muted/50"

0 commit comments

Comments
 (0)