From 8cfc3da83c07179aa5ea0e0ba627c83971c8fdcd Mon Sep 17 00:00:00 2001 From: Michael Suchacz <203725896+ibetitsmike@users.noreply.github.com> Date: Mon, 14 Sep 2026 08:53:28 +0000 Subject: [PATCH] fix(site): simplify context labels and remove unrelated mocks --- .../components/ContextUsageIndicator.tsx | 26 ++++++++++++------- site/src/testHelpers/handlers.ts | 12 --------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/site/src/pages/AgentsPage/components/ContextUsageIndicator.tsx b/site/src/pages/AgentsPage/components/ContextUsageIndicator.tsx index eb6b5e1d326..3e8ce1834ed 100644 --- a/site/src/pages/AgentsPage/components/ContextUsageIndicator.tsx +++ b/site/src/pages/AgentsPage/components/ContextUsageIndicator.tsx @@ -384,19 +384,27 @@ export const ContextUsageIndicator: FC<{ hasResourceIssues ? "Some context resources failed to load." : "", ].filter((note) => note !== ""); const statusNote = statusNotes.length > 0 ? ` ${statusNotes.join(" ")}` : ""; - const ariaLabel = hasPercent - ? `${usage?.estimated ? "Estimated context usage" : "Context usage"} ${percentLabel}. ${formatTokenCount(usedTokens)} of ${formatTokenCount(contextLimitTokens)} tokens used.${statusNote}` - : statusNote !== "" - ? `Context usage.${statusNote}` + let ariaLabel = "Context usage"; + if (hasPercent) { + const label = usage?.estimated + ? "Estimated context usage" : "Context usage"; + ariaLabel = `${label} ${percentLabel}. ${formatTokenCount(usedTokens)} of ${formatTokenCount(contextLimitTokens)} tokens used.${statusNote}`; + } else if (statusNote !== "") { + ariaLabel = `Context usage.${statusNote}`; + } + + let usageLabel = "Context usage will appear after sending a message."; + if (hasPercent) { + const prefix = usage?.estimated ? "Estimated: " : ""; + usageLabel = `${prefix}${percentLabel} - ${formatTokenCountCompact(usedTokens)} / ${formatTokenCountCompact(contextLimitTokens)} context used`; + } else if (hasReportedUsage) { + usageLabel = "Context usage unavailable"; + } const panelContent = (
- {hasPercent - ? `${usage?.estimated ? "Estimated: " : ""}${percentLabel} - ${formatTokenCountCompact(usedTokens)} / ${formatTokenCountCompact(contextLimitTokens)} context used` - : hasReportedUsage - ? "Context usage unavailable" - : "Context usage will appear after sending a message."} + {usageLabel} {hasPercent && usage?.estimated && (
Based on the compacted summary only, excluding other prompt content diff --git a/site/src/testHelpers/handlers.ts b/site/src/testHelpers/handlers.ts index 0cab3d4d002..a3bec9f85e4 100644 --- a/site/src/testHelpers/handlers.ts +++ b/site/src/testHelpers/handlers.ts @@ -4,8 +4,6 @@ import { HttpResponse, http } from "msw"; import type { CreateUserSecretRequest, CreateWorkspaceBuildRequest, - ListInboxNotificationsResponse, - Preset, UpdateUserSecretRequest, UserSecret, } from "#/api/typesGenerated"; @@ -14,13 +12,6 @@ import * as M from "./entities"; import { MockGroup, MockWorkspaceQuota } from "./entities"; export const handlers = [ - http.get("/api/v2/notifications/inbox", () => { - return HttpResponse.json({ - notifications: [], - unread_count: 0, - }); - }), - http.get("/api/v2/templates/:templateId/daus", () => { return HttpResponse.json(M.MockTemplateDAUResponse); }), @@ -139,9 +130,6 @@ export const handlers = [ http.get("/api/v2/templateversions/:templateVersionId", () => { return HttpResponse.json(M.MockTemplateVersion); }), - http.get("/api/v2/templateversions/:templateVersionId/presets", () => { - return HttpResponse.json([]); - }), http.get("/api/v2/templateversions/:templateVersionId/resources", () => { return HttpResponse.json([ M.MockWorkspaceResource,