Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .Jules/palette.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## 2024-06-22 - Overview Stats ν† κΈ€ λ²„νŠΌ ν‚€λ³΄λ“œ μ ‘κ·Όμ„± κ°œμ„ 
**Learning:** `overview-stats` μ»΄ν¬λ„ŒνŠΈμ˜ μ„€λͺ… ν…μŠ€νŠΈλ₯Ό νŽΌμΉ˜κ±°λ‚˜ μ ‘λŠ” `<button>` μš”μ†Œμ— ν‚€λ³΄λ“œ 포컀슀 μŠ€νƒ€μΌμ΄ λˆ„λ½λ˜μ–΄ μžˆμ–΄, ν‚€λ³΄λ“œ λ‚΄λΉ„κ²Œμ΄μ…˜ μ‚¬μš©μžμ—κ²Œ ν˜„μž¬ 포컀슀 μœ„μΉ˜λ₯Ό λͺ…ν™•νžˆ 보여주지 λͺ»ν–ˆμŠ΅λ‹ˆλ‹€. `hover` μŠ€νƒ€μΌμ€ μžˆμ—ˆμœΌλ‚˜ `focus-visible` μ²˜λ¦¬κ°€ μ—†μ–΄ μ ‘κ·Όμ„± 결함이 μžˆμ—ˆμŠ΅λ‹ˆλ‹€.
**Action:** Tailwind CSS의 `focus-visible` κ΄€λ ¨ μœ ν‹Έλ¦¬ν‹° 클래슀(`focus-visible:outline-none`, `focus-visible:ring-2`, `focus-visible:ring-ring`, `rounded-sm`)λ₯Ό μΆ”κ°€ν•˜μ—¬ νƒ­(Tab) ν‚€ 이동 μ‹œ 포컀슀 링이 보이도둝 μˆ˜μ •ν–ˆμŠ΅λ‹ˆλ‹€. μ•žμœΌλ‘œ λŒ€ν™”ν˜• μ»΄ν¬λ„ŒνŠΈλ₯Ό 섀계할 λ•ŒλŠ” 항상 ν‚€λ³΄λ“œ μ ‘κ·Όμ„±(focus states)을 염두에 두고 μž‘μ—…ν•΄μ•Ό ν•©λ‹ˆλ‹€.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Changelog

## [Unreleased]

### 🎨 λ³€κ²½ 사항 (UX / μ ‘κ·Όμ„±)

- μ›Ή λŒ€μ‹œλ³΄λ“œμ˜ 각쒅 λ‘œκ·Έμ•„μ›ƒ λ²„νŠΌ(`org-sidebar.tsx`, `org-header.tsx`, `no-organization-state.tsx`)에 슀크린 λ¦¬λ”μš© `aria-label="Log out of your account"` (λ˜λŠ” `Sign out of your account`) 속성을 μΆ”κ°€ν•˜μ—¬ 접근성을 κ°œμ„ ν–ˆμŠ΅λ‹ˆλ‹€.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
SessionFilesTab,
} from '@/components/dashboard/session-files'
import { useSessionDetail } from '@/hooks/use-dashboard-sessions'
import { messagesToTimeline, formatSlashCommandText } from '@/lib/timeline-events'
import { messagesToTimeline, buildTimelineGroups, formatSlashCommandText } from '@/lib/timeline-events'
import { extractSessionFiles } from '@/lib/session-files'
import {
formatTokens,
Expand Down Expand Up @@ -46,6 +46,7 @@ export default function OrgSessionDetailPage({
() => (data ? messagesToTimeline(data.messages) : []),
[data],
)
const groups = useMemo(() => buildTimelineGroups(events), [events])
const files = useMemo(() => extractSessionFiles(events), [events])
const [selectedIdx, setSelectedIdx] = useState<number | null>(0)
const safeIdx =
Expand Down Expand Up @@ -221,6 +222,7 @@ export default function OrgSessionDetailPage({
<div className="px-4 pt-3 pb-2">
<SessionActivityRibbon
events={events}
groups={groups}
selectedIdx={safeIdx}
onSelect={setSelectedIdx}
sessionStartedAt={data.startedAt}
Expand All @@ -232,6 +234,7 @@ export default function OrgSessionDetailPage({
<div className="border-r border-border min-h-0 overflow-hidden">
<EventList
events={events}
groups={groups}
selectedIdx={safeIdx ?? -1}
onSelect={setSelectedIdx}
sessionStartedAt={data.startedAt}
Expand Down
60 changes: 39 additions & 21 deletions packages/web/src/components/dashboard/event-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ import { List, type RowComponentProps } from "react-window";
import { User, Bot, Wrench, ChevronRight } from "lucide-react";
import {
formatSlashCommandText,
buildTimelineGroups,
type TimelineEvent,
type TimelineGroup,
} from "@/lib/timeline-events";
import { cn } from "@/lib/utils";

type EventListProps = {
events: TimelineEvent[];
groups: TimelineGroup[];
selectedIdx: number;
onSelect: (idx: number) => void;
sessionStartedAt: string;
Expand All @@ -22,6 +23,7 @@ type FlatRow =
kind: "event";
key: string;
event: TimelineEvent;
timestampMs: number;
idx: number;
indented: boolean;
labelOverride?: string;
Expand All @@ -32,36 +34,41 @@ type FlatRow =
toolName: string;
count: number;
firstEvent: TimelineEvent;
timestampMs: number;
groupFirstIdx: number;
isExpanded: boolean;
};

const ROW_HEIGHT = 36;

function formatElapsed(timestamp: string, sessionStartedAt: string): string {
const t = new Date(timestamp).getTime();
const start = new Date(sessionStartedAt).getTime();
if (Number.isNaN(t) || Number.isNaN(start)) return "";
const diffSec = Math.max(0, Math.floor((t - start) / 1000));
function formatElapsedMs(
timestampMs: number,
sessionStartedAtMs: number,
): string {
if (Number.isNaN(timestampMs) || Number.isNaN(sessionStartedAtMs)) return "";
const diffSec = Math.max(
0,
Math.floor((timestampMs - sessionStartedAtMs) / 1000),
);
const h = Math.floor(diffSec / 3600);
const m = Math.floor((diffSec % 3600) / 60);
const s = diffSec % 60;
return `${h}:${String(m).padStart(2, "0")}:${String(s).padStart(2, "0")}`;
}

function buildFlatRows(
events: TimelineEvent[],
groups: TimelineGroup[],
expandedGroups: Set<number>,
selectedIdx: number,
): FlatRow[] {
const groups = buildTimelineGroups(events);
const rows: FlatRow[] = [];
for (const group of groups) {
if (group.kind === "single") {
rows.push({
kind: "event",
key: `s-${group.idx}`,
event: group.event,
timestampMs: new Date(group.event.timestamp).getTime(),
idx: group.idx,
indented: false,
});
Expand All @@ -73,6 +80,7 @@ function buildFlatRows(
kind: "event",
key: `gs-${idx}`,
event,
timestampMs: new Date(event.timestamp).getTime(),
idx,
indented: false,
labelOverride: "Tool",
Expand All @@ -89,6 +97,7 @@ function buildFlatRows(
toolName: group.toolName,
count: group.items.length,
firstEvent: group.items[0].event,
timestampMs: new Date(group.items[0].event.timestamp).getTime(),
groupFirstIdx: firstIdx,
isExpanded,
});
Expand All @@ -98,6 +107,7 @@ function buildFlatRows(
kind: "event",
key: `gc-${idx}`,
event,
timestampMs: new Date(event.timestamp).getTime(),
idx,
indented: true,
labelOverride: "Tool",
Expand All @@ -123,7 +133,8 @@ function getSinglePreview(event: TimelineEvent): string {
return normalized.slice(0, 80);
}
if (event.isSkillCall && event.skillName) return `Skill: ${event.skillName}`;
if (event.isAgentCall && event.agentType) return `Subagent: ${event.agentType}`;
if (event.isAgentCall && event.agentType)
return `Subagent: ${event.agentType}`;
return event.toolName;
}

Expand Down Expand Up @@ -204,7 +215,7 @@ function RowView({
type RowProps = {
rows: FlatRow[];
selectedIdx: number;
sessionStartedAt: string;
sessionStartedAtMs: number;
onSelect: (idx: number) => void;
onToggleGroup: (firstIdx: number) => void;
};
Expand All @@ -214,7 +225,7 @@ function Row({
style,
rows,
selectedIdx,
sessionStartedAt,
sessionStartedAtMs,
onSelect,
onToggleGroup,
}: RowComponentProps<RowProps>) {
Expand All @@ -227,7 +238,7 @@ function Row({
<RowView
label="Tool"
preview={`${row.toolName} x${row.count}`}
time={formatElapsed(row.firstEvent.timestamp, sessionStartedAt)}
time={formatElapsedMs(row.timestampMs, sessionStartedAtMs)}
icon={getIcon(row.firstEvent)}
isSelected={false}
onClick={() => onToggleGroup(row.groupFirstIdx)}
Expand All @@ -238,18 +249,19 @@ function Row({
}

const label = row.labelOverride ?? getSingleLabel(row.event);
const preview = row.labelOverride === "Tool"
? row.event.kind === "tool"
? row.event.toolName
: getSinglePreview(row.event)
: getSinglePreview(row.event);
const preview =
row.labelOverride === "Tool"
? row.event.kind === "tool"
? row.event.toolName
: getSinglePreview(row.event)
: getSinglePreview(row.event);

return (
<div style={style} role="listitem">
<RowView
label={label}
preview={preview}
time={formatElapsed(row.event.timestamp, sessionStartedAt)}
time={formatElapsedMs(row.timestampMs, sessionStartedAtMs)}
icon={getIcon(row.event)}
isSelected={row.idx === selectedIdx}
onClick={() => onSelect(row.idx)}
Expand All @@ -261,15 +273,21 @@ function Row({

export function EventList({
events,
groups,
selectedIdx,
onSelect,
sessionStartedAt,
expandedGroups,
onToggleGroup,
}: EventListProps) {
const sessionStartedAtMs = useMemo(
() => new Date(sessionStartedAt).getTime(),
[sessionStartedAt],
);

const rows = useMemo(
() => buildFlatRows(events, expandedGroups, selectedIdx),
[events, expandedGroups, selectedIdx],
() => buildFlatRows(groups, expandedGroups, selectedIdx),
[groups, expandedGroups, selectedIdx],
);

if (events.length === 0) {
Expand All @@ -288,7 +306,7 @@ export function EventList({
rowProps={{
rows,
selectedIdx,
sessionStartedAt,
sessionStartedAtMs,
onSelect,
onToggleGroup,
}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export function NoOrganizationState({
<button
onClick={() => signOut({ callbackUrl: '/login' })}
className="text-sm text-destructive hover:underline"
aria-label="Log out of your account"
>
Log out
</button>
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/components/dashboard/overview-stats.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export function OverviewStats({
id="overview-stats-explanation-toggle"
aria-expanded={expanded}
aria-controls="overview-stats-explanation"
className="mt-4 flex items-center gap-2 text-xs text-muted-foreground hover:text-foreground transition-colors"
className="mt-4 flex items-center gap-2 text-xs text-muted-foreground hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring transition-colors rounded-sm"
>
<span
aria-hidden="true"
Expand Down
27 changes: 16 additions & 11 deletions packages/web/src/components/dashboard/reports/weekly-flow-chart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
Legend,
type TooltipProps,
} from 'recharts'
import { useMemo } from 'react'
import { parseISO } from 'date-fns'
import { formatTokens } from '@/lib/format'
import type { DailySeriesPoint } from '@/types/reports'
Expand Down Expand Up @@ -57,18 +58,22 @@ function sumTokens(p: DailySeriesPoint): number {
}

export function WeeklyFlowChart({ thisWeek, prevWeek }: WeeklyFlowChartProps) {
// μš”μΌ κΈ°μ€€μœΌλ‘œ 병합 (μ›”~일 7개 슬둯)
const dayNames = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
const data: ChartRow[] = dayNames.map((day) => ({ day, thisWeekTokens: 0, prevWeekTokens: 0 }))
const data = useMemo(() => {
// μš”μΌ κΈ°μ€€μœΌλ‘œ 병합 (μ›”~일 7개 슬둯)
const dayNames = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
const result: ChartRow[] = dayNames.map((day) => ({ day, thisWeekTokens: 0, prevWeekTokens: 0 }))

for (const p of thisWeek) {
const idx = dayIndex(p.date)
if (idx >= 0) data[idx].thisWeekTokens += sumTokens(p)
}
for (const p of prevWeek) {
const idx = dayIndex(p.date)
if (idx >= 0) data[idx].prevWeekTokens += sumTokens(p)
}
for (const p of thisWeek) {
const idx = dayIndex(p.date)
if (idx >= 0) result[idx].thisWeekTokens += sumTokens(p)
}
for (const p of prevWeek) {
const idx = dayIndex(p.date)
if (idx >= 0) result[idx].prevWeekTokens += sumTokens(p)
}

return result
}, [thisWeek, prevWeek])

return (
<ResponsiveContainer width="100%" height={260}>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
'use client'

import { useMemo, useState, useRef } from 'react'
import { useState, useRef } from 'react'
import {
formatSlashCommandText,
buildTimelineGroups,
type TimelineEvent,
type TimelineGroup,
} from '@/lib/timeline-events'
import { formatTokens, formatCost, formatRelativeTime } from '@/lib/format'
import { segmentVisuals } from './session-ribbon-visuals'

type Props = {
events: TimelineEvent[]
groups: TimelineGroup[]
selectedIdx: number | null
onSelect: (idx: number) => void
sessionStartedAt: string
Expand Down Expand Up @@ -147,6 +148,7 @@ function MergedTooltipBody({

export function SessionActivityRibbon({
events,
groups,
selectedIdx,
onSelect,
sessionStartedAt,
Expand All @@ -156,8 +158,6 @@ export function SessionActivityRibbon({
const [hover, setHover] = useState<HoverState | null>(null)
const containerRef = useRef<HTMLDivElement>(null)

const groups = useMemo(() => buildTimelineGroups(events), [events])

if (events.length === 0) return null

const trackMouse = (e: React.MouseEvent) => {
Expand Down
21 changes: 12 additions & 9 deletions packages/web/src/components/dashboard/token-usage-chart.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use client'

import { useMemo } from 'react'
import { AreaChart, Area, XAxis, YAxis, CartesianGrid, Tooltip, ResponsiveContainer, TooltipProps } from 'recharts'
import { formatTokens, formatCost } from '@/lib/format'
import type { UsageSeries } from '@argos/shared'
Expand Down Expand Up @@ -43,15 +44,17 @@ function CustomTooltip({ active, payload, label }: TooltipProps<number, string>)
}

export function TokenUsageChart({ data }: TokenUsageChartProps) {
const chartData = data.map(d => {
const date = new Date(d.date)
return {
date: format(date, 'MMM d'),
fullDate: format(date, 'MMM d, yyyy'),
input: d.inputTokens,
output: d.outputTokens,
}
})
const chartData = useMemo(() => {
return data.map(d => {
const date = new Date(d.date)
return {
date: format(date, 'MMM d'),
fullDate: format(date, 'MMM d, yyyy'),
input: d.inputTokens,
output: d.outputTokens,
}
})
}, [data])

return (
<ResponsiveContainer width="100%" height={300}>
Expand Down
1 change: 1 addition & 0 deletions packages/web/src/components/layout/org-header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export function OrgHeader({ orgName }: { orgName?: string }) {
<Button
variant="outline"
onClick={() => signOut({ callbackUrl: '/login' })}
aria-label="Sign out of your account"
>
Sign out
</Button>
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/components/layout/org-sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ export function OrgSidebar() {
<button
onClick={handleLogout}
className="w-full px-3 py-2 text-sm font-medium text-destructive hover:bg-destructive/10 rounded-md transition-colors"
aria-label="Log out of your account"
>
Log Out
</button>
Expand All @@ -150,6 +151,7 @@ export function OrgSidebar() {
<button
onClick={handleLogout}
className="px-3 py-1 text-sm text-destructive hover:bg-destructive/10 rounded-md transition-colors"
aria-label="Log out of your account"
>
Logout
</button>
Expand Down
Loading