fix: show session usage window on board usage button

This commit is contained in:
DhanushSantosh
2026-01-23 17:49:53 +05:30
parent 860d6836b9
commit 7bc7918cc6
3 changed files with 25 additions and 33 deletions

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 27 KiB

View File

@@ -1,4 +1,4 @@
import { useId, type ComponentType, type SVGProps } from 'react';
import type { ComponentType, ImgHTMLAttributes, SVGProps } from 'react';
import { cn } from '@/lib/utils';
import type { AgentModel, ModelProvider } from '@automaker/types';
import { getProviderFromModel } from '@/lib/utils';
@@ -166,16 +166,14 @@ export function CursorIcon(props: Omit<ProviderIconProps, 'provider'>) {
return <ProviderIcon provider={PROVIDER_ICON_KEYS.cursor} {...props} />;
}
const GEMINI_GRADIENT_STOPS = [
{ offset: '0%', color: '#4285F4' },
{ offset: '33%', color: '#EA4335' },
{ offset: '66%', color: '#FBBC04' },
{ offset: '100%', color: '#34A853' },
] as const;
const GEMINI_ICON_URL = new URL('../../assets/icons/gemini-icon.svg', import.meta.url).toString();
const GEMINI_ICON_ALT = 'Gemini';
export function GeminiIcon({ title, className, ...props }: Omit<ProviderIconProps, 'provider'>) {
const definition = PROVIDER_ICON_DEFINITIONS[PROVIDER_ICON_KEYS.gemini];
const gradientId = useId();
type GeminiIconProps = Omit<ImgHTMLAttributes<HTMLImageElement>, 'src'> & {
title?: string;
};
export function GeminiIcon({ title, className, ...props }: GeminiIconProps) {
const {
role,
'aria-label': ariaLabel,
@@ -184,30 +182,19 @@ export function GeminiIcon({ title, className, ...props }: Omit<ProviderIconProp
...rest
} = props;
const hasAccessibleLabel = Boolean(title || ariaLabel || ariaLabelledby);
const fallbackAlt = hasAccessibleLabel ? (title ?? ariaLabel ?? GEMINI_ICON_ALT) : '';
return (
<svg
viewBox={definition.viewBox}
<img
src={GEMINI_ICON_URL}
className={cn('inline-block', className)}
role={role ?? (hasAccessibleLabel ? 'img' : 'presentation')}
aria-hidden={ariaHidden ?? !hasAccessibleLabel}
focusable="false"
aria-label={ariaLabel}
aria-labelledby={ariaLabelledby}
alt={fallbackAlt}
{...rest}
>
{title && <title>{title}</title>}
<defs>
<linearGradient id={gradientId} x1="0%" y1="0%" x2="100%" y2="100%">
{GEMINI_GRADIENT_STOPS.map((stop) => (
<stop
key={stop.offset}
offset={stop.offset}
style={{ stopColor: stop.color, stopOpacity: 1 }}
/>
))}
</linearGradient>
</defs>
<path d={definition.path} fill={`url(#${gradientId})`} fillRule={definition.fillRule} />
</svg>
/>
);
}

View File

@@ -27,6 +27,8 @@ type UsageError = {
// Fixed refresh interval (45 seconds)
const REFRESH_INTERVAL_SECONDS = 45;
const CLAUDE_SESSION_WINDOW_HOURS = 5;
const CLAUDE_SESSION_WINDOW_BADGE = `${CLAUDE_SESSION_WINDOW_HOURS}h`;
// Helper to format reset time for Codex
function formatCodexResetTime(unixTimestamp: number): string {
@@ -226,9 +228,7 @@ export function UsagePopover() {
};
// Calculate max percentage for header button
const claudeMaxPercentage = claudeUsage
? Math.max(claudeUsage.sessionPercentage || 0, claudeUsage.weeklyPercentage || 0)
: 0;
const claudeSessionPercentage = claudeUsage?.sessionPercentage || 0;
const codexMaxPercentage = codexUsage?.rateLimits
? Math.max(
@@ -237,7 +237,6 @@ export function UsagePopover() {
)
: 0;
const maxPercentage = Math.max(claudeMaxPercentage, codexMaxPercentage);
const isStale = activeTab === 'claude' ? isClaudeStale : isCodexStale;
const getProgressBarColor = (percentage: number) => {
@@ -251,7 +250,7 @@ export function UsagePopover() {
if (activeTab === 'claude') {
return {
icon: AnthropicIcon,
percentage: claudeMaxPercentage,
percentage: claudeSessionPercentage,
isStale: isClaudeStale,
};
}
@@ -270,6 +269,11 @@ export function UsagePopover() {
<Button variant="ghost" size="sm" className="h-9 gap-2 bg-secondary border border-border px-3">
{(claudeUsage || codexUsage) && <ProviderIcon className={cn('w-4 h-4', statusColor)} />}
<span className="text-sm font-medium">Usage</span>
{activeTab === 'claude' && (
<span className="text-[10px] font-medium text-muted-foreground">
{CLAUDE_SESSION_WINDOW_BADGE}
</span>
)}
{(claudeUsage || codexUsage) && (
<div
className={cn(