From 536eef73e47aa4a216777a6d62b863b4ef349027 Mon Sep 17 00:00:00 2001 From: Kiet Ho Date: Mon, 17 Aug 2026 14:41:59 -0700 Subject: [PATCH] feat(desktop): split Usage tab into token + machine-resources sections with a pill toggle --- .../commandPalette/CommandPaletteHost.tsx | 8 +- .../modules/resources/commands.tsx | 8 +- .../ui/ResourcesFrame/ResourcesFrame.tsx | 248 -------- .../commandPalette/ui/ResourcesFrame/index.ts | 1 - .../persisted-key-registry.test-data.ts | 4 + .../DashboardSidebarHeader.tsx | 8 +- .../WorkspaceResourceSection.tsx | 104 +--- .../utils/workspaceGrouping.ts | 99 ++++ .../UsageResourcesPage/UsageResourcesPage.tsx | 558 ++++++++++++++++++ .../ResourceSparkline/ResourceSparkline.tsx | 92 +++ .../components/ResourceSparkline/index.ts | 1 + .../hooks/useResourceSampleBuffer/index.ts | 4 + .../useResourceSampleBuffer.ts | 45 ++ .../components/UsageResourcesPage/index.ts | 1 + .../UsageSectionToggle/UsageSectionToggle.tsx | 36 ++ .../components/UsageSectionToggle/index.ts | 1 + .../usage/components/UsageView/UsageView.tsx | 1 - .../hooks/useRecordUsageSection/index.ts | 1 + .../useRecordUsageSection.ts | 17 + .../_dashboard/usage/layout.tsx | 25 + .../_dashboard/usage/model/$modelKey/page.tsx | 18 +- .../_authenticated/_dashboard/usage/page.tsx | 12 +- .../_dashboard/usage/resources/page.tsx | 15 + .../usage/utils/usageLastSection/index.ts | 6 + .../usageLastSection/usageLastSection.ts | 28 + .../usage/workspace/$workspaceName/page.tsx | 18 +- .../_dashboard/usage/workspaces/page.tsx | 12 +- 27 files changed, 974 insertions(+), 397 deletions(-) delete mode 100644 apps/desktop/src/renderer/commandPalette/ui/ResourcesFrame/ResourcesFrame.tsx delete mode 100644 apps/desktop/src/renderer/commandPalette/ui/ResourcesFrame/index.ts create mode 100644 apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/utils/workspaceGrouping.ts create mode 100644 apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/UsageResourcesPage.tsx create mode 100644 apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/components/ResourceSparkline/ResourceSparkline.tsx create mode 100644 apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/components/ResourceSparkline/index.ts create mode 100644 apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/hooks/useResourceSampleBuffer/index.ts create mode 100644 apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/hooks/useResourceSampleBuffer/useResourceSampleBuffer.ts create mode 100644 apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/index.ts create mode 100644 apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageSectionToggle/UsageSectionToggle.tsx create mode 100644 apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageSectionToggle/index.ts create mode 100644 apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/hooks/useRecordUsageSection/index.ts create mode 100644 apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/hooks/useRecordUsageSection/useRecordUsageSection.ts create mode 100644 apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/layout.tsx create mode 100644 apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/resources/page.tsx create mode 100644 apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/utils/usageLastSection/index.ts create mode 100644 apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/utils/usageLastSection/usageLastSection.ts diff --git a/apps/desktop/src/renderer/commandPalette/CommandPaletteHost.tsx b/apps/desktop/src/renderer/commandPalette/CommandPaletteHost.tsx index a339295d2f1..30617ca6207 100644 --- a/apps/desktop/src/renderer/commandPalette/CommandPaletteHost.tsx +++ b/apps/desktop/src/renderer/commandPalette/CommandPaletteHost.tsx @@ -1,10 +1,10 @@ +import { useNavigate } from "@tanstack/react-router"; import { type ReactNode, useEffect } from "react"; import { useHotkey } from "renderer/hotkeys"; import { electronTrpc } from "renderer/lib/electron-trpc"; import { CommandContextProvider } from "./core/ContextProvider"; import { useFrameStackStore } from "./core/frames"; import { registerAllModules } from "./modules"; -import { checkResourcesCommand } from "./modules/resources/commands"; import { CommandPalette } from "./ui/CommandPalette/CommandPalette"; import { DeleteWorkspaceMount } from "./ui/DeleteWorkspaceMount/DeleteWorkspaceMount"; import { FolderImportMount } from "./ui/FolderImportMount/FolderImportMount"; @@ -33,13 +33,13 @@ export function CommandPaletteHost({ children }: { children?: ReactNode }) { function CommandPaletteTrigger() { const setOpen = useFrameStackStore((s) => s.setOpen); const reset = useFrameStackStore((s) => s.reset); - const pushFrame = useFrameStackStore((s) => s.pushFrame); + const navigate = useNavigate(); useHotkey("OPEN_COMMAND_PALETTE", () => setOpen(true)); const openResources = () => { - setOpen(true); + setOpen(false); reset(); - pushFrame(checkResourcesCommand); + void navigate({ to: "/usage/resources" }); }; // Keeps CHECK_RESOURCES on the renderer's own hotkey binding (rather than a diff --git a/apps/desktop/src/renderer/commandPalette/modules/resources/commands.tsx b/apps/desktop/src/renderer/commandPalette/modules/resources/commands.tsx index c5746dc3706..e8728c870b3 100644 --- a/apps/desktop/src/renderer/commandPalette/modules/resources/commands.tsx +++ b/apps/desktop/src/renderer/commandPalette/modules/resources/commands.tsx @@ -1,10 +1,10 @@ import { HiOutlineCpuChip } from "react-icons/hi2"; import type { Command } from "../../core/types"; -import { ResourcesFrame } from "../../ui/ResourcesFrame"; /** - * Provided by the actions module (ordering within the Actions section); - * also pushed directly by the CHECK_RESOURCES hotkey. + * Provided by the actions module (ordering within the Actions section); the + * CHECK_RESOURCES hotkey and the native "Resources" menu item navigate to the + * same page. */ export const checkResourcesCommand: Command = { id: "resources.check", @@ -23,5 +23,5 @@ export const checkResourcesCommand: Command = { "activity", "processes", ], - renderFrame: () => , + run: (context) => context.navigate("/usage/resources"), }; diff --git a/apps/desktop/src/renderer/commandPalette/ui/ResourcesFrame/ResourcesFrame.tsx b/apps/desktop/src/renderer/commandPalette/ui/ResourcesFrame/ResourcesFrame.tsx deleted file mode 100644 index 4b694cbe3fa..00000000000 --- a/apps/desktop/src/renderer/commandPalette/ui/ResourcesFrame/ResourcesFrame.tsx +++ /dev/null @@ -1,248 +0,0 @@ -import { - CommandEmpty, - CommandGroup, - CommandItem, - CommandList, -} from "@superset/ui/command"; -import { cn } from "@superset/ui/utils"; -import { Fragment, useEffect, useMemo, useRef, useState } from "react"; -import { HiOutlineChevronDown, HiOutlineChevronRight } from "react-icons/hi2"; -import { useIsV2CloudEnabled } from "renderer/hooks/useIsV2CloudEnabled"; -import { ResourceMetricsSummary } from "renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/components/ResourceMetricsSummary"; -import { UsageSeverityBadge } from "renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/components/UsageSeverityBadge"; -import { useResourceNavigation } from "renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/hooks/useResourceNavigation"; -import { useResourceSnapshot } from "renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/hooks/useResourceSnapshot"; -import type { WorkspaceMetrics } from "renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/types"; -import { - formatCpu, - formatMemory, -} from "renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/utils/formatters"; -import { getUsageSeverity } from "renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/utils/resourceSeverity"; -import { useFrameStackStore } from "../../core/frames"; -import { useCommandPaletteQuery } from "../CommandPalette/CommandPalette"; - -const ROW_CLASS = "gap-2 !py-2.5 text-sm"; -const METRIC_COLS = - "flex shrink-0 items-center tabular-nums tracking-tight justify-end"; -const CPU_COL = "w-14 text-right"; -const MEM_COL = "w-16 text-right"; -const WORKSPACE_ID_ATTR = "data-resources-workspace-id"; - -interface ResourceRow { - workspace: WorkspaceMetrics; - sessions: WorkspaceMetrics["sessions"]; - /** Expanded because the query matched one of its terminals. */ - forceExpanded: boolean; -} - -export function ResourcesFrame() { - const rawQuery = useCommandPaletteQuery(); - const query = rawQuery.trim().toLowerCase(); - const isV2 = useIsV2CloudEnabled(); - const surface = isV2 ? "v2" : "v1"; - const setOpen = useFrameStackStore((s) => s.setOpen); - - const { snapshot } = useResourceSnapshot(surface); - const { getPaneName, navigateToWorkspace, navigateToPane } = - useResourceNavigation({ surface, onNavigate: () => setOpen(false) }); - - const [expandedIds, setExpandedIds] = useState>( - new Set(), - ); - - const queryRef = useRef(query); - useEffect(() => { - queryRef.current = query; - }, [query]); - - // cmdk keeps focus in the search input, so ←/→ never reach the list items. - // While the query is empty (arrows have no caret to move), toggle the - // highlighted workspace instead. - useEffect(() => { - const handleKeyDown = (event: KeyboardEvent) => { - if (event.key !== "ArrowRight" && event.key !== "ArrowLeft") return; - if (queryRef.current) return; - const selected = document.querySelector( - '[cmdk-item][data-selected="true"]', - ); - const workspaceId = selected?.getAttribute(WORKSPACE_ID_ATTR); - if (!workspaceId) return; - event.preventDefault(); - event.stopPropagation(); - setExpandedIds((previous) => { - const next = new Set(previous); - if (event.key === "ArrowRight") { - next.add(workspaceId); - } else { - next.delete(workspaceId); - } - return next; - }); - }; - document.addEventListener("keydown", handleKeyDown, true); - return () => document.removeEventListener("keydown", handleKeyDown, true); - }, []); - - const rows = useMemo(() => { - if (!snapshot) return []; - const sorted = [...snapshot.workspaces].sort((a, b) => b.memory - a.memory); - if (!query) { - return sorted.map((workspace) => ({ - workspace, - sessions: workspace.sessions, - forceExpanded: false, - })); - } - return sorted.flatMap((workspace) => { - const workspaceMatches = - workspace.workspaceName.toLowerCase().includes(query) || - workspace.projectName.toLowerCase().includes(query); - const matchingSessions = workspace.sessions.filter((session) => - getPaneName(session).toLowerCase().includes(query), - ); - if (!workspaceMatches && matchingSessions.length === 0) return []; - return [ - { - workspace, - sessions: workspaceMatches ? workspace.sessions : matchingSessions, - forceExpanded: matchingSessions.length > 0, - }, - ]; - }); - }, [snapshot, query, getPaneName]); - - const totals = { - cpu: snapshot?.totalCpu ?? 0, - memory: snapshot?.totalMemory ?? 0, - }; - - const toggleWorkspace = (workspaceId: string) => { - setExpandedIds((previous) => { - const next = new Set(previous); - if (next.has(workspaceId)) { - next.delete(workspaceId); - } else { - next.add(workspaceId); - } - return next; - }); - }; - - return ( - <> - {snapshot && ( -
- -
- )} - - - {snapshot ? "No matching workspaces." : "Measuring resource usage…"} - - {rows.length > 0 && ( - - {rows.map(({ workspace, sessions, forceExpanded }) => { - const isExpanded = - forceExpanded || expandedIds.has(workspace.workspaceId); - const hasSessions = sessions.length > 0; - - return ( - - navigateToWorkspace(workspace.workspaceId)} - className={ROW_CLASS} - > - {hasSessions ? ( - - ) : ( - - )} - - {workspace.workspaceName} - - - {workspace.projectName} - - - - - {formatCpu(workspace.cpu)} - - - {formatMemory(workspace.memory)} - - - - - {isExpanded && - sessions.map((session) => ( - - navigateToPane(workspace.workspaceId, session.paneId) - } - className={cn(ROW_CLASS, "!py-2")} - > - - - - {getPaneName(session)} - - - - - {formatCpu(session.cpu)} - - - {formatMemory(session.memory)} - - - - ))} - - ); - })} - - )} - -
- → expand - ← collapse - ↵ open workspace / jump to terminal -
- - ); -} diff --git a/apps/desktop/src/renderer/commandPalette/ui/ResourcesFrame/index.ts b/apps/desktop/src/renderer/commandPalette/ui/ResourcesFrame/index.ts deleted file mode 100644 index 1cda1091118..00000000000 --- a/apps/desktop/src/renderer/commandPalette/ui/ResourcesFrame/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { ResourcesFrame } from "./ResourcesFrame"; diff --git a/apps/desktop/src/renderer/lib/persisted-keys/persisted-key-registry.test-data.ts b/apps/desktop/src/renderer/lib/persisted-keys/persisted-key-registry.test-data.ts index 8c82ab6d586..d2a1ea65381 100644 --- a/apps/desktop/src/renderer/lib/persisted-keys/persisted-key-registry.test-data.ts +++ b/apps/desktop/src/renderer/lib/persisted-keys/persisted-key-registry.test-data.ts @@ -115,6 +115,10 @@ export const PERSISTED_KEY_REGISTRY: ReadonlyArray< ["desktop-notice-dismissals-v1", "v2-setup-card-dismissals-v1"], ], ["src/renderer/stores/workspace-agents-row.ts", ["workspace-agents-row"]], + [ + "src/renderer/routes/_authenticated/_dashboard/usage/utils/usageLastSection/usageLastSection.ts", + ["usage-last-section-v1"], + ], ["src/renderer/stores/inline-workspace-ports.ts", ["inline-workspace-ports"]], ["src/renderer/hotkeys/stores/hotkeyOverridesStore.ts", ["hotkey-overrides"]], [ diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarHeader/DashboardSidebarHeader.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarHeader/DashboardSidebarHeader.tsx index 688ec732da7..45e7c1c9384 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarHeader/DashboardSidebarHeader.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarHeader/DashboardSidebarHeader.tsx @@ -37,6 +37,10 @@ import { tasksSearchFromFilters, useTasksFilterStore, } from "renderer/routes/_authenticated/_dashboard/tasks/stores/tasks-filter-state"; +import { + getUsageLastSection, + usageSectionPath, +} from "renderer/routes/_authenticated/_dashboard/usage/utils/usageLastSection"; import { useHostWorkspaces } from "renderer/routes/_authenticated/providers/HostWorkspacesProvider"; import { STROKE_WIDTH_THICK } from "renderer/screens/main/components/WorkspaceSidebar/constants"; import { @@ -166,7 +170,9 @@ export function DashboardSidebarHeader({ }; const handleUsageClick = () => { - navigate({ to: "/usage" }); + // Reopen whichever Usage section (token / machine resources) was + // visited last. + navigate({ to: usageSectionPath(getUsageLastSection()) }); }; const handlePullRequestsClick = () => { diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/components/WorkspaceResourceSection/WorkspaceResourceSection.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/components/WorkspaceResourceSection/WorkspaceResourceSection.tsx index 61e624dd0bd..233f5cd8681 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/components/WorkspaceResourceSection/WorkspaceResourceSection.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/components/WorkspaceResourceSection/WorkspaceResourceSection.tsx @@ -3,20 +3,18 @@ import { HiOutlineChevronDown, HiOutlineChevronRight } from "react-icons/hi2"; import type { SortOption, WorkspaceMetrics } from "../../types"; import { formatCpu, formatMemory } from "../../utils/formatters"; import { getUsageSeverity } from "../../utils/resourceSeverity"; +import { + groupWorkspacesByProject, + type ProjectResourceGroup, + sortProjectGroups, + sortWorkspaces, +} from "../../utils/workspaceGrouping"; import { UsageSeverityBadge } from "../UsageSeverityBadge"; const METRIC_COLS = "flex items-center shrink-0 tabular-nums tracking-tight"; const CPU_COL = "w-12 text-right"; const MEM_COL = "w-16 text-right"; -interface ProjectResourceGroup { - projectId: string; - projectName: string; - cpu: number; - memory: number; - workspaces: WorkspaceMetrics[]; -} - interface WorkspaceResourceSectionProps { workspaces: WorkspaceMetrics[]; sortOption: SortOption; @@ -31,96 +29,6 @@ interface WorkspaceResourceSectionProps { getPaneName: (session: WorkspaceMetrics["sessions"][number]) => string; } -function groupWorkspacesByProject( - workspaces: WorkspaceMetrics[], -): ProjectResourceGroup[] { - const projectMap = new Map(); - - for (const workspace of workspaces) { - const projectId = workspace.projectId || "unknown"; - const projectName = workspace.projectName || "Unknown Project"; - let group = projectMap.get(projectId); - if (!group) { - group = { - projectId, - projectName, - cpu: 0, - memory: 0, - workspaces: [], - }; - projectMap.set(projectId, group); - } - - group.cpu += workspace.cpu; - group.memory += workspace.memory; - group.workspaces.push(workspace); - } - - return [...projectMap.values()]; -} - -function sortWorkspaces( - workspaces: WorkspaceMetrics[], - sortOption: SortOption, - sidebarWorkspaceOrder: string[], -): WorkspaceMetrics[] { - const sorted = [...workspaces]; - switch (sortOption) { - case "memory": - sorted.sort((a, b) => b.memory - a.memory); - break; - case "cpu": - sorted.sort((a, b) => b.cpu - a.cpu); - break; - case "name": - sorted.sort((a, b) => a.workspaceName.localeCompare(b.workspaceName)); - break; - case "sidebar": { - const orderMap = new Map( - sidebarWorkspaceOrder.map((id, index) => [id, index]), - ); - sorted.sort( - (a, b) => - (orderMap.get(a.workspaceId) ?? Number.MAX_SAFE_INTEGER) - - (orderMap.get(b.workspaceId) ?? Number.MAX_SAFE_INTEGER), - ); - break; - } - } - return sorted; -} - -function sortProjectGroups( - groups: ProjectResourceGroup[], - sortOption: SortOption, - sidebarProjectOrder: string[], -): ProjectResourceGroup[] { - const sorted = [...groups]; - switch (sortOption) { - case "memory": - sorted.sort((a, b) => b.memory - a.memory); - break; - case "cpu": - sorted.sort((a, b) => b.cpu - a.cpu); - break; - case "name": - sorted.sort((a, b) => a.projectName.localeCompare(b.projectName)); - break; - case "sidebar": { - const orderMap = new Map( - sidebarProjectOrder.map((id, index) => [id, index]), - ); - sorted.sort( - (a, b) => - (orderMap.get(a.projectId) ?? Number.MAX_SAFE_INTEGER) - - (orderMap.get(b.projectId) ?? Number.MAX_SAFE_INTEGER), - ); - break; - } - } - return sorted; -} - function getProjectTotals(projects: ProjectResourceGroup[]) { return projects.reduce( (acc, project) => ({ diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/utils/workspaceGrouping.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/utils/workspaceGrouping.ts new file mode 100644 index 00000000000..bb974082169 --- /dev/null +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/utils/workspaceGrouping.ts @@ -0,0 +1,99 @@ +import type { SortOption, WorkspaceMetrics } from "../types"; + +export interface ProjectResourceGroup { + projectId: string; + projectName: string; + cpu: number; + memory: number; + workspaces: WorkspaceMetrics[]; +} + +export function groupWorkspacesByProject( + workspaces: WorkspaceMetrics[], +): ProjectResourceGroup[] { + const projectMap = new Map(); + + for (const workspace of workspaces) { + const projectId = workspace.projectId || "unknown"; + const projectName = workspace.projectName || "Unknown Project"; + let group = projectMap.get(projectId); + if (!group) { + group = { + projectId, + projectName, + cpu: 0, + memory: 0, + workspaces: [], + }; + projectMap.set(projectId, group); + } + + group.cpu += workspace.cpu; + group.memory += workspace.memory; + group.workspaces.push(workspace); + } + + return [...projectMap.values()]; +} + +export function sortWorkspaces( + workspaces: WorkspaceMetrics[], + sortOption: SortOption, + sidebarWorkspaceOrder: string[], +): WorkspaceMetrics[] { + const sorted = [...workspaces]; + switch (sortOption) { + case "memory": + sorted.sort((a, b) => b.memory - a.memory); + break; + case "cpu": + sorted.sort((a, b) => b.cpu - a.cpu); + break; + case "name": + sorted.sort((a, b) => a.workspaceName.localeCompare(b.workspaceName)); + break; + case "sidebar": { + const orderMap = new Map( + sidebarWorkspaceOrder.map((id, index) => [id, index]), + ); + sorted.sort( + (a, b) => + (orderMap.get(a.workspaceId) ?? Number.MAX_SAFE_INTEGER) - + (orderMap.get(b.workspaceId) ?? Number.MAX_SAFE_INTEGER), + ); + break; + } + } + return sorted; +} + +export function sortProjectGroups( + groups: ProjectResourceGroup[], + sortOption: SortOption, + sidebarProjectOrder: string[], +): ProjectResourceGroup[] { + const sorted = [...groups]; + switch (sortOption) { + case "memory": + sorted.sort((a, b) => b.memory - a.memory); + break; + case "cpu": + sorted.sort((a, b) => b.cpu - a.cpu); + break; + case "name": + sorted.sort((a, b) => a.projectName.localeCompare(b.projectName)); + break; + case "sidebar": { + const orderMap = new Map( + sidebarProjectOrder.map((id, index) => [id, index]), + ); + sorted.sort( + (a, b) => + (orderMap.get(a.projectId) ?? Number.MAX_SAFE_INTEGER) - + (orderMap.get(b.projectId) ?? Number.MAX_SAFE_INTEGER), + ); + break; + } + } + return sorted; +} diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/UsageResourcesPage.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/UsageResourcesPage.tsx new file mode 100644 index 00000000000..336b0003556 --- /dev/null +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/UsageResourcesPage.tsx @@ -0,0 +1,558 @@ +import { Button } from "@superset/ui/button"; +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuRadioGroup, + DropdownMenuRadioItem, + DropdownMenuTrigger, +} from "@superset/ui/dropdown-menu"; +import { cn } from "@superset/ui/utils"; +import { useState } from "react"; +import { + HiOutlineBarsArrowDown, + HiOutlineChevronDown, + HiOutlineChevronRight, +} from "react-icons/hi2"; +import { LuRefreshCw } from "react-icons/lu"; +import { useIsV2CloudEnabled } from "renderer/hooks/useIsV2CloudEnabled"; +import { UsageSeverityBadge } from "renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/components/UsageSeverityBadge"; +import { useResourceNavigation } from "renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/hooks/useResourceNavigation"; +import { useResourceSnapshot } from "renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/hooks/useResourceSnapshot"; +import type { + ResourceMetricsSnapshot, + SortOption, +} from "renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/types"; +import { + formatCpu, + formatMemory, + formatPercent, +} from "renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/utils/formatters"; +import { + getTrackedHostMemorySeverity, + getUsageSeverity, +} from "renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/utils/resourceSeverity"; +import { + groupWorkspacesByProject, + sortProjectGroups, + sortWorkspaces, +} from "renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/utils/workspaceGrouping"; +import { ResourceSparkline } from "./components/ResourceSparkline"; +import { useResourceSampleBuffer } from "./hooks/useResourceSampleBuffer"; + +const SORT_LABELS: Record = { + memory: "Memory", + cpu: "CPU", + name: "Name", + sidebar: "Sidebar order", +}; + +const CPU_COL = "w-20 shrink-0 text-right tabular-nums tracking-tight"; +const MEM_COL = "w-24 shrink-0 text-right tabular-nums tracking-tight"; +const BAR_COL = "hidden w-32 shrink-0 md:block"; + +function Stat({ label, value }: { label: string; value: string }) { + return ( +
+ + {label} + + {value} +
+ ); +} + +/** Horizontal bar showing `value` as a share of the tracked total. */ +function MemoryShareBar({ value, max }: { value: number; max: number }) { + const percent = max > 0 ? Math.min(100, (value / max) * 100) : 0; + return ( +
+
0 ? Math.max(percent, 2) : 0}%` }} + /> +
+ ); +} + +function MetricCells({ + cpu, + memory, + trackedMemory, + muted, +}: { + cpu: number; + memory: number; + trackedMemory: number; + muted?: boolean; +}) { + return ( + <> + + {formatCpu(cpu)} + + + {formatMemory(memory)} + + + + + + ); +} + +function MemoryLegendItem({ + colorClass, + label, + value, +}: { + colorClass: string; + label: string; + value: string; +}) { + return ( + + + {label} + {value} + + ); +} + +function SystemOverview({ snapshot }: { snapshot: ResourceMetricsSnapshot }) { + const { host } = snapshot; + const trackedSharePercent = + host.totalMemory > 0 ? (snapshot.totalMemory / host.totalMemory) * 100 : 0; + const shareSeverity = getTrackedHostMemorySeverity(trackedSharePercent); + const trackedBarColorClass = + shareSeverity === "high" + ? "bg-red-500/80" + : shareSeverity === "elevated" + ? "bg-amber-500/80" + : "bg-foreground/60"; + + // Composition of physical RAM: Superset's tracked processes, everything + // else on the machine, and free — segments of one bar (hosting-dashboard + // disk-bar pattern) instead of a lone share fill. + const otherUsedMemory = Math.max(0, host.usedMemory - snapshot.totalMemory); + const freeMemory = Math.max(0, host.totalMemory - host.usedMemory); + const percentOfTotal = (value: number) => + host.totalMemory > 0 + ? Math.min(100, Math.max(0, (value / host.totalMemory) * 100)) + : 0; + + return ( +
+
+ + + + + + +
+
+
+
+
+
+ + + +
+
+ ); +} + +function toggleSetMember(previous: Set, member: string): Set { + const next = new Set(previous); + if (next.has(member)) { + next.delete(member); + } else { + next.add(member); + } + return next; +} + +export function UsageResourcesPage() { + const isV2 = useIsV2CloudEnabled(); + const surface = isV2 ? "v2" : "v1"; + const [sortOption, setSortOption] = useState("memory"); + const [collapsedProjects, setCollapsedProjects] = useState>( + new Set(), + ); + const [collapsedWorkspaces, setCollapsedWorkspaces] = useState>( + new Set(), + ); + + const { + snapshot, + refetch, + isFetching, + sidebarProjectOrder, + sidebarWorkspaceOrder, + } = useResourceSnapshot(surface); + + const { getPaneName, navigateToWorkspace, navigateToPane } = + useResourceNavigation({ surface, onNavigate: () => {} }); + + const samples = useResourceSampleBuffer(snapshot); + + const trackedMemory = snapshot?.totalMemory ?? 0; + const totalUsage = { + cpu: snapshot?.totalCpu ?? 0, + memory: snapshot?.totalMemory ?? 0, + }; + + const projectGroups = snapshot + ? sortProjectGroups( + groupWorkspacesByProject(snapshot.workspaces), + sortOption, + sidebarProjectOrder, + ).map((group) => ({ + ...group, + workspaces: sortWorkspaces( + group.workspaces, + sortOption, + sidebarWorkspaceOrder, + ), + })) + : []; + const projectTotals = projectGroups.reduce( + (acc, project) => ({ + cpu: acc.cpu + project.cpu, + memory: acc.memory + project.memory, + }), + { cpu: 0, memory: 0 }, + ); + + return ( +
+
+ + + Live · local machine · every 2 s + + + + + + + setSortOption(value as SortOption)} + > + + Memory + + CPU + Name + + Sidebar order + + + + + +
+ + {!snapshot ? ( +
+ Measuring resource usage… +
+ ) : ( + <> + + +
+ sample.cpu} + formatValue={formatCpu} + /> + sample.memory} + formatValue={formatMemory} + /> +
+ +
+
+ Process + CPU + Memory + + Memory share + +
+ + {/* Superset app processes */} +
+
+ + Superset app + + +
+ +
+ {( + [ + { label: "Main", values: snapshot.app.main }, + { label: "Renderer", values: snapshot.app.renderer }, + { label: "Other", values: snapshot.app.other }, + ] as const + ) + .filter( + ({ label, values }) => + label !== "Other" || values.cpu > 0 || values.memory > 0, + ) + .map(({ label, values }) => ( +
+
+ + {label} + + +
+ +
+ ))} + + {/* Workspaces, grouped by project */} + {projectGroups.map((project) => { + const isProjectCollapsed = collapsedProjects.has( + project.projectId, + ); + return ( +
+ + + {!isProjectCollapsed && + project.workspaces.map((workspace) => { + const isCollapsed = collapsedWorkspaces.has( + workspace.workspaceId, + ); + const hasSessions = workspace.sessions.length > 0; + + return ( +
+
+ {hasSessions ? ( + + ) : ( + + )} + +
+ + {!isCollapsed && + workspace.sessions.map((session) => ( + + ))} +
+ ); + })} +
+ ); + })} + + {projectGroups.length === 0 && ( +
+ No active terminal sessions +
+ )} +
+ + )} +
+ ); +} diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/components/ResourceSparkline/ResourceSparkline.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/components/ResourceSparkline/ResourceSparkline.tsx new file mode 100644 index 00000000000..030747164fd --- /dev/null +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/components/ResourceSparkline/ResourceSparkline.tsx @@ -0,0 +1,92 @@ +import { + ChartContainer, + ChartTooltip, + ChartTooltipContent, +} from "@superset/ui/chart"; +import { useMemo } from "react"; +import { Area, AreaChart, XAxis, YAxis } from "recharts"; +import type { ResourceSample } from "../../hooks/useResourceSampleBuffer"; + +function formatTime(at: number): string { + return new Date(at).toLocaleTimeString(undefined, { + hour: "2-digit", + minute: "2-digit", + second: "2-digit", + }); +} + +interface ResourceSparklineProps { + label: string; + /** Formatted current value shown in the card header. */ + current: string; + /** CSS color for the area stroke/fill. */ + color: string; + samples: ResourceSample[]; + getValue: (sample: ResourceSample) => number; + formatValue: (value: number) => string; +} + +/** Small live area chart over the rolling sample buffer (~5 min window). */ +export function ResourceSparkline({ + label, + current, + color, + samples, + getValue, + formatValue, +}: ResourceSparklineProps) { + const data = useMemo( + () => samples.map((sample) => ({ at: sample.at, value: getValue(sample) })), + [samples, getValue], + ); + + return ( +
+
+ {label} + {current} +
+ {data.length < 2 ? ( +
+ Collecting… +
+ ) : ( + + + + + formatTime(Number(value))} + formatter={(value) => ( + + {formatValue(Number(value))} + + )} + /> + } + /> + + + + )} +
+ ); +} diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/components/ResourceSparkline/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/components/ResourceSparkline/index.ts new file mode 100644 index 00000000000..877b39a07f5 --- /dev/null +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/components/ResourceSparkline/index.ts @@ -0,0 +1 @@ +export { ResourceSparkline } from "./ResourceSparkline"; diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/hooks/useResourceSampleBuffer/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/hooks/useResourceSampleBuffer/index.ts new file mode 100644 index 00000000000..0339a65aa8f --- /dev/null +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/hooks/useResourceSampleBuffer/index.ts @@ -0,0 +1,4 @@ +export { + type ResourceSample, + useResourceSampleBuffer, +} from "./useResourceSampleBuffer"; diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/hooks/useResourceSampleBuffer/useResourceSampleBuffer.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/hooks/useResourceSampleBuffer/useResourceSampleBuffer.ts new file mode 100644 index 00000000000..fd0e7bec47c --- /dev/null +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/hooks/useResourceSampleBuffer/useResourceSampleBuffer.ts @@ -0,0 +1,45 @@ +import { useEffect, useRef, useState } from "react"; +import type { ResourceMetricsSnapshot } from "renderer/routes/_authenticated/_dashboard/components/TopBar/components/ResourceConsumption/types"; + +export interface ResourceSample { + at: number; + cpu: number; + memory: number; +} + +// ~5 min of history at the 2 s poll interval. +const MAX_SAMPLES = 150; + +/** + * Rolling in-memory buffer of snapshot totals, one entry per poll. Lives only + * while the page is mounted — history restarts on revisit, which matches the + * live-monitor framing (and costs nothing while the page is closed). + */ +export function useResourceSampleBuffer( + snapshot: ResourceMetricsSnapshot | null, +): ResourceSample[] { + const [samples, setSamples] = useState([]); + const lastCollectedAtRef = useRef(0); + + useEffect(() => { + if (!snapshot || snapshot.collectedAt === lastCollectedAtRef.current) { + return; + } + lastCollectedAtRef.current = snapshot.collectedAt; + setSamples((previous) => { + const next = [ + ...previous, + { + at: snapshot.collectedAt, + cpu: snapshot.totalCpu, + memory: snapshot.totalMemory, + }, + ]; + return next.length > MAX_SAMPLES + ? next.slice(next.length - MAX_SAMPLES) + : next; + }); + }, [snapshot]); + + return samples; +} diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/index.ts new file mode 100644 index 00000000000..c0c0d9e363e --- /dev/null +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageResourcesPage/index.ts @@ -0,0 +1 @@ +export { UsageResourcesPage } from "./UsageResourcesPage"; diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageSectionToggle/UsageSectionToggle.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageSectionToggle/UsageSectionToggle.tsx new file mode 100644 index 00000000000..f8e484efb04 --- /dev/null +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageSectionToggle/UsageSectionToggle.tsx @@ -0,0 +1,36 @@ +import { cn } from "@superset/ui/utils"; +import { Link, useMatchRoute } from "@tanstack/react-router"; + +function pillClass(isActive: boolean) { + return cn( + "rounded-full px-4 py-1.5 text-sm font-medium transition-colors", + isActive + ? "bg-accent text-accent-foreground" + : "bg-muted/40 text-muted-foreground hover:bg-muted/70 hover:text-foreground", + ); +} + +/** Pill toggle between the Usage sections (workspaces-header style). */ +export function UsageSectionToggle() { + const matchRoute = useMatchRoute(); + const onResources = matchRoute({ to: "/usage/resources" }) !== false; + + return ( + + ); +} diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageSectionToggle/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageSectionToggle/index.ts new file mode 100644 index 00000000000..22f6840cd15 --- /dev/null +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageSectionToggle/index.ts @@ -0,0 +1 @@ +export { UsageSectionToggle } from "./UsageSectionToggle"; diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageView/UsageView.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageView/UsageView.tsx index 6eead04377e..3205662eda5 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageView/UsageView.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/components/UsageView/UsageView.tsx @@ -110,7 +110,6 @@ export function UsageView({ hostUrl }: { hostUrl: string | null }) { return (
-

Usage

Official quota · refreshes every 5 min diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/hooks/useRecordUsageSection/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/hooks/useRecordUsageSection/index.ts new file mode 100644 index 00000000000..e2b0fe9362c --- /dev/null +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/hooks/useRecordUsageSection/index.ts @@ -0,0 +1 @@ +export { useRecordUsageSection } from "./useRecordUsageSection"; diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/hooks/useRecordUsageSection/useRecordUsageSection.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/hooks/useRecordUsageSection/useRecordUsageSection.ts new file mode 100644 index 00000000000..c2a774705eb --- /dev/null +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/hooks/useRecordUsageSection/useRecordUsageSection.ts @@ -0,0 +1,17 @@ +import { useEffect } from "react"; +import { + setUsageLastSection, + type UsageSection, +} from "../../utils/usageLastSection"; + +/** + * Records the section a mounted usage route belongs to, so the dashboard + * sidebar's Usage entry reopens it. Mount-scoped on purpose: only a route + * that actually rendered can write, so navigating away (or router exit + * renders) can never overwrite the remembered section. + */ +export function useRecordUsageSection(section: UsageSection): void { + useEffect(() => { + setUsageLastSection(section); + }, [section]); +} diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/layout.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/layout.tsx new file mode 100644 index 00000000000..b475cb06aa3 --- /dev/null +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/layout.tsx @@ -0,0 +1,25 @@ +import { createFileRoute, Outlet, useLocation } from "@tanstack/react-router"; +import { useScrollReset } from "renderer/routes/_authenticated/settings/hooks/useScrollReset"; +import { UsageSectionToggle } from "./components/UsageSectionToggle"; + +export const Route = createFileRoute("/_authenticated/_dashboard/usage")({ + component: UsageLayout, +}); + +function UsageLayout() { + const { pathname } = useLocation(); + const contentRef = useScrollReset(pathname); + + return ( +
+ {/* Window-drag leaf standing in for the hidden TopBar. */} +
+
+ +
+
+ +
+
+ ); +} diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/model/$modelKey/page.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/model/$modelKey/page.tsx index 5f847b926aa..dd12e730b34 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/model/$modelKey/page.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/model/$modelKey/page.tsx @@ -1,6 +1,7 @@ import { createFileRoute } from "@tanstack/react-router"; import { useLocalHostService } from "renderer/routes/_authenticated/providers/LocalHostServiceProvider/LocalHostServiceProvider"; import { UsageDrilldownPage } from "../../components/UsageDrilldownPage"; +import { useRecordUsageSection } from "../../hooks/useRecordUsageSection"; export const Route = createFileRoute( "/_authenticated/_dashboard/usage/model/$modelKey/", @@ -11,18 +12,13 @@ export const Route = createFileRoute( function ModelUsagePage() { const { modelKey } = Route.useParams(); const { activeHostUrl } = useLocalHostService(); + useRecordUsageSection("token"); return ( -
- {/* Window-drag leaf standing in for the hidden TopBar. */} -
-
- -
-
+ ); } diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/page.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/page.tsx index b34d2aa119b..0eed7c80d07 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/page.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/page.tsx @@ -1,6 +1,7 @@ import { createFileRoute } from "@tanstack/react-router"; import { useLocalHostService } from "renderer/routes/_authenticated/providers/LocalHostServiceProvider/LocalHostServiceProvider"; import { UsageView } from "./components/UsageView"; +import { useRecordUsageSection } from "./hooks/useRecordUsageSection"; export const Route = createFileRoute("/_authenticated/_dashboard/usage/")({ component: UsagePage, @@ -8,14 +9,7 @@ export const Route = createFileRoute("/_authenticated/_dashboard/usage/")({ function UsagePage() { const { activeHostUrl } = useLocalHostService(); + useRecordUsageSection("token"); - return ( -
- {/* Window-drag leaf standing in for the hidden TopBar. */} -
-
- -
-
- ); + return ; } diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/resources/page.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/resources/page.tsx new file mode 100644 index 00000000000..7cf8784820c --- /dev/null +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/resources/page.tsx @@ -0,0 +1,15 @@ +import { createFileRoute } from "@tanstack/react-router"; +import { UsageResourcesPage } from "../components/UsageResourcesPage"; +import { useRecordUsageSection } from "../hooks/useRecordUsageSection"; + +export const Route = createFileRoute( + "/_authenticated/_dashboard/usage/resources/", +)({ + component: ResourcesPage, +}); + +function ResourcesPage() { + useRecordUsageSection("resources"); + + return ; +} diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/utils/usageLastSection/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/utils/usageLastSection/index.ts new file mode 100644 index 00000000000..115fb3e5da8 --- /dev/null +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/utils/usageLastSection/index.ts @@ -0,0 +1,6 @@ +export { + getUsageLastSection, + setUsageLastSection, + type UsageSection, + usageSectionPath, +} from "./usageLastSection"; diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/utils/usageLastSection/usageLastSection.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/utils/usageLastSection/usageLastSection.ts new file mode 100644 index 00000000000..122570795ea --- /dev/null +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/utils/usageLastSection/usageLastSection.ts @@ -0,0 +1,28 @@ +const STORAGE_KEY = "usage-last-section-v1"; + +export type UsageSection = "token" | "resources"; + +/** Fixed-size singleton: which Usage sidebar section was open last. */ +export function getUsageLastSection(): UsageSection { + try { + return localStorage.getItem(STORAGE_KEY) === "resources" + ? "resources" + : "token"; + } catch { + return "token"; + } +} + +export function setUsageLastSection(section: UsageSection): void { + try { + localStorage.setItem(STORAGE_KEY, section); + } catch { + // Storage unavailable/full — remembering the section is best-effort. + } +} + +export function usageSectionPath( + section: UsageSection, +): "/usage" | "/usage/resources" { + return section === "resources" ? "/usage/resources" : "/usage"; +} diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/workspace/$workspaceName/page.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/workspace/$workspaceName/page.tsx index 89e70b3d7f5..983a1fdd460 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/workspace/$workspaceName/page.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/workspace/$workspaceName/page.tsx @@ -1,6 +1,7 @@ import { createFileRoute } from "@tanstack/react-router"; import { useLocalHostService } from "renderer/routes/_authenticated/providers/LocalHostServiceProvider/LocalHostServiceProvider"; import { UsageDrilldownPage } from "../../components/UsageDrilldownPage"; +import { useRecordUsageSection } from "../../hooks/useRecordUsageSection"; export const Route = createFileRoute( "/_authenticated/_dashboard/usage/workspace/$workspaceName/", @@ -11,18 +12,13 @@ export const Route = createFileRoute( function WorkspaceUsagePage() { const { workspaceName } = Route.useParams(); const { activeHostUrl } = useLocalHostService(); + useRecordUsageSection("token"); return ( -
- {/* Window-drag leaf standing in for the hidden TopBar. */} -
-
- -
-
+ ); } diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/workspaces/page.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/workspaces/page.tsx index c81fa67e264..db8ac7b429d 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/workspaces/page.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/usage/workspaces/page.tsx @@ -1,6 +1,7 @@ import { createFileRoute } from "@tanstack/react-router"; import { useLocalHostService } from "renderer/routes/_authenticated/providers/LocalHostServiceProvider/LocalHostServiceProvider"; import { UsageWorkspacesPage } from "../components/UsageWorkspacesPage"; +import { useRecordUsageSection } from "../hooks/useRecordUsageSection"; export const Route = createFileRoute( "/_authenticated/_dashboard/usage/workspaces/", @@ -10,14 +11,7 @@ export const Route = createFileRoute( function WorkspacesUsagePage() { const { activeHostUrl } = useLocalHostService(); + useRecordUsageSection("token"); - return ( -
- {/* Window-drag leaf standing in for the hidden TopBar. */} -
-
- -
-
- ); + return ; }