mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-09-07 01:56:53 +00:00
feat(web/default): unified UI overhaul — Base UI migration, theme presets, rankings dashboard, and table toolbar refactor (#4633)
* 🎨 feat(web/default): add shadcn-style theme presets, radius prefs, and fix selection badges Integrate the qn-platform–style OKLCH color system into the default frontend while keeping the existing blue-tinted dark tokens for the default theme. Add [data-theme-preset] palettes for seven named presets plus the default zinc-like scale, define [data-theme-radius] overrides so user radius beats preset --radius, and align the Tailwind @custom-variant dark helper with .dark usage. Introduce ThemeCustomizationProvider to own preset and radius state, persist choices in cookies (theme-preset, theme-radius), and sync data-theme-preset / data-theme-radius on <html>. Wrap the tree in main.tsx. Extend ConfigDrawer with theme preset swatches (scoped data-theme-preset) and radius previews wired to context; refactor swatch/card markup so selected CircleCheck badges sit outside clipped rows (remove outer overflow-hidden that hid the centered checkmark). Add i18n keys for preset names, radius, and accessibility labels across en, zh, fr, ja, ru, vi. * 🎨 fix(web): align segmented controls with theme radius tokens - Replace hard-coded inner pill radii (rounded-[5px]) on dashboard chart toolbars with radius-md so the active state follows --radius when users change Radius in Theme Settings. - Use nested radii consistent with TabsList/TabsTrigger: outer rounded-lg (var(--radius)) and inner rounded-md (calc(var(--radius) - 2px)) so the track and active thumb stay concentric at small scales (e.g. 0.3rem) instead of a squared “focus” block inside a rounded shell. - Apply the same pattern to pricing SegmentedControl and the segmented groups in consumption-distribution-chart, model-charts, and user-charts. Verified: bun run typecheck (web/default) * ✨ feat(pricing): enrich model details with uptime sparkline and API documentation Add a compact 30-day uptime sparkline (OpenRouter-style bars + aggregate %) with per-day tooltips, surface it in a status row under quick stats and in the per-group performance table, and extend mock data so uptime series are stable and optionally scoped by group. Introduce an API tab with Shiki-highlighted code samples (cURL, Python, TypeScript, JavaScript), endpoint-type switching, authentication guidance, a supported-parameters table, and mock per-group RPM/TPM/RPD limits. Infer vendor, tokenizer, license, and data-retention hints for a provider & data privacy card on the Overview tab (capabilities/modalities stay with model identity; rate limits stay with the API tab). Update i18n for all new user-facing strings across en, zh, fr, ja, ru, and vi. * 🏆 feat(rankings): add comprehensive rankings dashboard Add a mock-data powered rankings experience with period tabs, model, app, and vendor leaderboards, market share and history charts, movers, new releases, and per-category sections while backend analytics are pending. Link ranked models to pricing details and ranked vendors to filtered pricing results, and include localized copy for all supported frontend locales. * fix(theme): correct theme preset selection state - update Base UI Radio selectors to use data-checked/data-unchecked states. - fix unchecked theme options still showing selected indicators. - isolate the default theme preview tokens to prevent preset changes from leaking into it. * fix(setup): correct usage mode radio state - use Base UI data-checked/data-unchecked states for RadioGroup styling. - hide radio indicators when options are unchecked to avoid setup page display issues. - drive usage mode card and icon selection styles from Base UI state. * fix(auth): submit sign-in and sign-up forms * 🎨 refactor: Align default theme with shadcn Base Nova and prune legacy customization Migrate shadcn UI to Base UI primitives via CLI (`base-nova` / `components.json`) and reinstall full component registry with `--overwrite`, including Hugeicons-backed widgets and newly added registry components. - Remove custom multi-preset/theme-radius system (`ThemeCustomizationProvider`, cookies, preset UI from config drawer); rely on official semantic CSS tokens + light/dark only. - Replace `theme.css` with shadcn’s documented neutral `:root`/`.dark` palette and `@theme inline` mappings (plus skeleton token vars for existing shimmer usage). - Update global styles for Base UI: collapsible animation uses `--collapsible-panel-height`; clarify scroll-lock override comment. Application compatibility: - Keep minimal shims where app code diverged from official APIs (popover collision props, combobox legacy `options` callers, Spinner prop typing). - Switch interactive styling from Radix-era `data-state` / `--radix-*` selectors to Base UI semantics (`data-open`, `data-popup-open`, `data-panel-open`, `--anchor-width`, etc.) Tooling / docs / build: - Rename Rsbuild vendor chunk grouping to `@base-ui` + transitive `@radix-ui`. - Refresh AGENTS.md / CLAUDE.md / classic→default sync skill for Base UI stack. - Bump `package.json` / lockfile for shadcn-postinstall deps (Hugeicons, chart stack, themes, etc.) Verified: `bun run typecheck` passes. Note: `bun run lint` still reports pre-existing hooks rule violations elsewhere; not addressed in this change. * 🎨 chore(web/default): unify table toolbar, relocate usage stats, refine filters - Refactor DataTableToolbar to a single wrapping flex row with a right-aligned action cluster (Reset / Search / View / Expand) for a cleaner Ant Design Pro–style filter bar; remove the dedicated stats row and the toolbar `stats` prop. - Move Common Logs summary badges (Usage / RPM / TPM) and the sensitive- data visibility toggle into the page header via CommonLogsHeaderActions and SectionPageLayout.Actions so the toolbar stays focused on filters. - Slim CommonLogsFilterBar props (no stats / preActions eye control). - Improve CompactDateTimeRangePicker: show minute-precision labels on the trigger (seconds omitted; aligns with datetime-local inputs); widen the trigger on sm+ breakpoints so the full range is visible without truncation; apply the same width in task logs filters. - Simplify DataTableViewOptions: text-only “View” trigger, no sliders icon. - Earlier layout tweak: extra top padding on SectionPageLayout scroll content so control focus rings are not clipped by overflow. * feat(web/default): Base UI migration and component foundation Migrate from Radix UI to Base UI, rewrite core UI primitives, update dependencies (recharts, date-fns, next-themes), add shadcn agent skill documentation, and refresh AI element components. This is the foundational work from the v2/localmain lineage that was not covered by the individual feature commits above. --------- Co-authored-by: t0ng7u <dev@aiass.cc> Co-authored-by: QuentinHsu <xuquentinyang@gmail.com>
This commit is contained in:
Calcium-Ion
co-authored by
t0ng7u
QuentinHsu
t0ng7u
QuentinHsu
parent
dac55f0fde
commit
8b2b03d276
@@ -69,7 +69,7 @@ function DetailRow(props: {
|
||||
</span>
|
||||
<span
|
||||
className={cn(
|
||||
'min-w-0 max-w-full text-xs break-all sm:break-words',
|
||||
'max-w-full min-w-0 text-xs break-all sm:break-words',
|
||||
props.mono && 'font-mono',
|
||||
props.muted && 'text-muted-foreground'
|
||||
)}
|
||||
@@ -491,7 +491,7 @@ export function DetailsDialog(props: DetailsDialogProps) {
|
||||
</DialogHeader>
|
||||
|
||||
<ScrollArea className='max-h-[70vh] min-w-0 overflow-hidden pr-2 max-sm:max-h-[calc(100dvh-7rem)] sm:pr-4'>
|
||||
<div className='w-full min-w-0 max-w-full space-y-2.5 overflow-hidden py-1 sm:space-y-3'>
|
||||
<div className='w-full max-w-full min-w-0 space-y-2.5 overflow-hidden py-1 sm:space-y-3'>
|
||||
{/* Overview section - key identifiers */}
|
||||
<div className='min-w-0 space-y-1'>
|
||||
{props.log.request_id && (
|
||||
|
||||
@@ -1,60 +0,0 @@
|
||||
/**
|
||||
* Reusable components for filter dialogs
|
||||
*/
|
||||
import { Input } from '@/components/ui/input'
|
||||
import { Label } from '@/components/ui/label'
|
||||
|
||||
// ============================================================================
|
||||
// Filter Input Component
|
||||
// ============================================================================
|
||||
|
||||
interface FilterInputProps {
|
||||
id: string
|
||||
label: string
|
||||
placeholder: string
|
||||
value: string
|
||||
onChange: (value: string) => void
|
||||
}
|
||||
|
||||
export function FilterInput({
|
||||
id,
|
||||
label,
|
||||
placeholder,
|
||||
value,
|
||||
onChange,
|
||||
}: FilterInputProps) {
|
||||
return (
|
||||
<div className='grid gap-2'>
|
||||
<Label htmlFor={id}>{label}</Label>
|
||||
<Input
|
||||
id={id}
|
||||
placeholder={placeholder}
|
||||
value={value}
|
||||
onChange={(e) => onChange(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// Section Divider Component
|
||||
// ============================================================================
|
||||
|
||||
interface SectionDividerProps {
|
||||
label: string
|
||||
}
|
||||
|
||||
export function SectionDivider({ label }: SectionDividerProps) {
|
||||
return (
|
||||
<div className='relative'>
|
||||
<div className='absolute inset-0 flex items-center'>
|
||||
<span className='w-full border-t' />
|
||||
</div>
|
||||
<div className='relative flex justify-center text-xs uppercase'>
|
||||
<span className='bg-background text-muted-foreground px-2'>
|
||||
{label}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
-371
@@ -1,371 +0,0 @@
|
||||
import { useState, useEffect, useCallback, useMemo } from 'react'
|
||||
import { useQuery } from '@tanstack/react-query'
|
||||
import { useNavigate, getRouteApi } from '@tanstack/react-router'
|
||||
import { Search, RotateCcw, Calendar } from 'lucide-react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
import { getNormalizedDateRange } from '@/lib/time'
|
||||
import { cn } from '@/lib/utils'
|
||||
import { useIsAdmin } from '@/hooks/use-admin'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { ComboboxInput } from '@/components/ui/combobox-input'
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
DialogDescription,
|
||||
DialogFooter,
|
||||
DialogHeader,
|
||||
DialogTitle,
|
||||
} from '@/components/ui/dialog'
|
||||
import { Label } from '@/components/ui/label'
|
||||
import { ScrollArea } from '@/components/ui/scroll-area'
|
||||
import { DateTimePicker } from '@/components/datetime-picker'
|
||||
import { getApiKeys } from '@/features/keys/api'
|
||||
import { TIME_RANGE_PRESETS } from '../../constants'
|
||||
import { buildSearchParams, getLogCategoryLabel } from '../../lib/filter'
|
||||
import { getDefaultTimeRange } from '../../lib/utils'
|
||||
import type {
|
||||
LogCategory,
|
||||
LogFilters,
|
||||
CommonLogFilters,
|
||||
DrawingLogFilters,
|
||||
TaskLogFilters,
|
||||
} from '../../types'
|
||||
import { FilterInput, SectionDivider } from './filter-components'
|
||||
|
||||
const route = getRouteApi('/_authenticated/usage-logs/$section')
|
||||
|
||||
interface UsageLogsFilterDialogProps {
|
||||
open?: boolean
|
||||
onOpenChange?: (open: boolean) => void
|
||||
onFilterChange?: (filters: LogFilters) => void
|
||||
logCategory: LogCategory
|
||||
}
|
||||
|
||||
export function UsageLogsFilterDialog({
|
||||
open: controlledOpen,
|
||||
onOpenChange: controlledOnOpenChange,
|
||||
onFilterChange,
|
||||
logCategory,
|
||||
}: UsageLogsFilterDialogProps) {
|
||||
const { t } = useTranslation()
|
||||
const navigate = useNavigate()
|
||||
const searchParams = route.useSearch()
|
||||
const isAdmin = useIsAdmin()
|
||||
const [internalOpen, setInternalOpen] = useState(false)
|
||||
|
||||
const open = controlledOpen ?? internalOpen
|
||||
const setOpen = controlledOnOpenChange ?? setInternalOpen
|
||||
|
||||
const [filters, setFilters] = useState<LogFilters>(() => {
|
||||
const { start, end } = getDefaultTimeRange()
|
||||
return { startTime: start, endTime: end }
|
||||
})
|
||||
const [selectedRange, setSelectedRange] = useState<number | null>(null)
|
||||
|
||||
const { data: tokensData } = useQuery({
|
||||
queryKey: ['api-keys', 'filter', open, logCategory],
|
||||
queryFn: () => getApiKeys({ p: 1, size: 200 }),
|
||||
enabled: open && logCategory === 'common',
|
||||
})
|
||||
|
||||
const tokenNameOptions = useMemo(() => {
|
||||
const items = tokensData?.data?.items ?? []
|
||||
const seen = new Set<string>()
|
||||
return items
|
||||
.filter((item) => {
|
||||
if (seen.has(item.name)) return false
|
||||
seen.add(item.name)
|
||||
return true
|
||||
})
|
||||
.map((item) => ({ value: item.name, label: item.name }))
|
||||
}, [tokensData?.data?.items])
|
||||
|
||||
// Sync filters from URL
|
||||
useEffect(() => {
|
||||
const urlFilters: Partial<LogFilters> = {}
|
||||
|
||||
if (searchParams.startTime)
|
||||
urlFilters.startTime = new Date(searchParams.startTime)
|
||||
if (searchParams.endTime)
|
||||
urlFilters.endTime = new Date(searchParams.endTime)
|
||||
if (searchParams.channel) urlFilters.channel = String(searchParams.channel)
|
||||
|
||||
if (logCategory === 'common') {
|
||||
if (searchParams.model)
|
||||
(urlFilters as CommonLogFilters).model = searchParams.model
|
||||
if (searchParams.token)
|
||||
(urlFilters as CommonLogFilters).token = searchParams.token
|
||||
if (searchParams.group)
|
||||
(urlFilters as CommonLogFilters).group = searchParams.group
|
||||
if (searchParams.username)
|
||||
(urlFilters as CommonLogFilters).username = searchParams.username
|
||||
if (searchParams.requestId)
|
||||
(urlFilters as CommonLogFilters).requestId = searchParams.requestId
|
||||
} else if (logCategory === 'drawing') {
|
||||
if (searchParams.filter)
|
||||
(urlFilters as DrawingLogFilters).mjId = searchParams.filter
|
||||
} else if (logCategory === 'task') {
|
||||
if (searchParams.filter)
|
||||
(urlFilters as TaskLogFilters).taskId = searchParams.filter
|
||||
}
|
||||
|
||||
if (Object.keys(urlFilters).length > 0) {
|
||||
// eslint-disable-next-line react-hooks/set-state-in-effect
|
||||
setFilters((prev: LogFilters) => ({ ...prev, ...urlFilters }))
|
||||
setSelectedRange(null)
|
||||
}
|
||||
}, [
|
||||
logCategory,
|
||||
searchParams.startTime,
|
||||
searchParams.endTime,
|
||||
searchParams.channel,
|
||||
searchParams.model,
|
||||
searchParams.token,
|
||||
searchParams.group,
|
||||
searchParams.username,
|
||||
searchParams.requestId,
|
||||
searchParams.filter,
|
||||
])
|
||||
|
||||
const handleChange = useCallback(
|
||||
(field: string, value: Date | string | undefined) => {
|
||||
setFilters((prev: LogFilters) => ({ ...prev, [field]: value }))
|
||||
if (field === 'startTime' || field === 'endTime') {
|
||||
setSelectedRange(null)
|
||||
}
|
||||
},
|
||||
[]
|
||||
)
|
||||
|
||||
const handleQuickRange = useCallback((days: number) => {
|
||||
const { start, end } = getNormalizedDateRange(days)
|
||||
setFilters((prev: LogFilters) => ({
|
||||
...prev,
|
||||
startTime: start,
|
||||
endTime: end,
|
||||
}))
|
||||
setSelectedRange(days)
|
||||
}, [])
|
||||
|
||||
const navigateWithFilters = useCallback(
|
||||
(searchUpdate: Record<string, unknown>) => {
|
||||
navigate({
|
||||
to: '/usage-logs/$section',
|
||||
params: { section: logCategory },
|
||||
search: (prev: Record<string, unknown>) => ({
|
||||
...prev,
|
||||
...searchUpdate,
|
||||
}),
|
||||
})
|
||||
},
|
||||
[navigate, logCategory]
|
||||
)
|
||||
|
||||
const handleApply = useCallback(() => {
|
||||
const filterParams = buildSearchParams(filters, logCategory)
|
||||
navigateWithFilters(filterParams)
|
||||
onFilterChange?.(filters)
|
||||
setOpen(false)
|
||||
}, [filters, logCategory, navigateWithFilters, onFilterChange, setOpen])
|
||||
|
||||
const handleReset = useCallback(() => {
|
||||
const { start, end } = getDefaultTimeRange()
|
||||
const resetFilters: LogFilters = { startTime: start, endTime: end }
|
||||
|
||||
setFilters(resetFilters)
|
||||
setSelectedRange(null)
|
||||
|
||||
navigate({
|
||||
to: '/usage-logs/$section',
|
||||
params: { section: logCategory },
|
||||
search: {
|
||||
page: 1,
|
||||
startTime: start.getTime(),
|
||||
endTime: end.getTime(),
|
||||
},
|
||||
})
|
||||
|
||||
onFilterChange?.(resetFilters)
|
||||
setOpen(false)
|
||||
}, [navigate, logCategory, onFilterChange, setOpen])
|
||||
|
||||
// Render category-specific filters
|
||||
const renderCategoryFilters = () => {
|
||||
switch (logCategory) {
|
||||
case 'common': {
|
||||
const commonFilters = filters as CommonLogFilters
|
||||
return (
|
||||
<>
|
||||
<FilterInput
|
||||
id='model'
|
||||
label={t('Model Name')}
|
||||
placeholder={t('e.g., gpt-4, claude-3')}
|
||||
value={commonFilters.model || ''}
|
||||
onChange={(value) => handleChange('model', value)}
|
||||
/>
|
||||
<div className='grid gap-2'>
|
||||
<Label htmlFor='token'>{t('Token Name')}</Label>
|
||||
<ComboboxInput
|
||||
id='token'
|
||||
options={tokenNameOptions}
|
||||
value={commonFilters.token || ''}
|
||||
onValueChange={(v) => handleChange('token', v)}
|
||||
placeholder={t('Filter by token name')}
|
||||
emptyText={t('No token found.')}
|
||||
/>
|
||||
</div>
|
||||
<FilterInput
|
||||
id='group'
|
||||
label={t('Group')}
|
||||
placeholder={t('Filter by group')}
|
||||
value={commonFilters.group || ''}
|
||||
onChange={(value) => handleChange('group', value)}
|
||||
/>
|
||||
{isAdmin && (
|
||||
<FilterInput
|
||||
id='username'
|
||||
label={t('Username')}
|
||||
placeholder={t('Filter by username')}
|
||||
value={commonFilters.username || ''}
|
||||
onChange={(value) => handleChange('username', value)}
|
||||
/>
|
||||
)}
|
||||
<FilterInput
|
||||
id='requestId'
|
||||
label={t('Request ID')}
|
||||
placeholder={t('Filter by request ID')}
|
||||
value={commonFilters.requestId || ''}
|
||||
onChange={(value) => handleChange('requestId', value)}
|
||||
/>
|
||||
</>
|
||||
)
|
||||
}
|
||||
case 'drawing': {
|
||||
const drawingFilters = filters as DrawingLogFilters
|
||||
return (
|
||||
<FilterInput
|
||||
id='mjId'
|
||||
label={t('Task ID')}
|
||||
placeholder={t('Filter by task ID')}
|
||||
value={drawingFilters.mjId || ''}
|
||||
onChange={(value) => handleChange('mjId', value)}
|
||||
/>
|
||||
)
|
||||
}
|
||||
case 'task': {
|
||||
const taskFilters = filters as TaskLogFilters
|
||||
return (
|
||||
<FilterInput
|
||||
id='taskId'
|
||||
label={t('Task ID')}
|
||||
placeholder={t('Filter by task ID')}
|
||||
value={taskFilters.taskId || ''}
|
||||
onChange={(value) => handleChange('taskId', value)}
|
||||
/>
|
||||
)
|
||||
}
|
||||
default:
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<Dialog open={open} onOpenChange={setOpen}>
|
||||
<DialogContent className='flex max-h-[calc(100dvh-2rem)] flex-col max-sm:h-dvh max-sm:w-screen max-sm:max-w-none max-sm:rounded-none max-sm:p-4 sm:max-w-lg'>
|
||||
<DialogHeader>
|
||||
<DialogTitle>
|
||||
{t('Filter')} {t(getLogCategoryLabel(logCategory))} {t('Logs')}
|
||||
</DialogTitle>
|
||||
<DialogDescription>
|
||||
{t('Set filters to narrow down your log search results.')}
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
|
||||
<ScrollArea className='min-h-0 flex-1 pr-3 sm:max-h-[60vh] sm:pr-4'>
|
||||
<div className='grid gap-3 py-3 sm:gap-4 sm:py-4'>
|
||||
{/* Quick time range selection */}
|
||||
<div className='grid gap-2'>
|
||||
<Label className='flex items-center gap-2'>
|
||||
<Calendar className='h-4 w-4' />
|
||||
{t('Quick Range')}
|
||||
</Label>
|
||||
<div className='grid grid-cols-2 gap-2 sm:flex'>
|
||||
{TIME_RANGE_PRESETS.map((range) => (
|
||||
<Button
|
||||
key={range.days}
|
||||
type='button'
|
||||
size='sm'
|
||||
variant={
|
||||
selectedRange === range.days ? 'default' : 'outline'
|
||||
}
|
||||
onClick={() => handleQuickRange(range.days)}
|
||||
className={cn(
|
||||
'flex-1',
|
||||
selectedRange === range.days &&
|
||||
'ring-ring ring-2 ring-offset-2'
|
||||
)}
|
||||
>
|
||||
{t(range.label)}
|
||||
</Button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<SectionDivider label={t('Custom Time Range')} />
|
||||
|
||||
{/* Custom time range */}
|
||||
<div className='grid gap-3 sm:gap-4'>
|
||||
<div className='grid gap-2'>
|
||||
<Label htmlFor='start_time'>{t('Start Time')}</Label>
|
||||
<DateTimePicker
|
||||
value={filters.startTime}
|
||||
onChange={(date) =>
|
||||
handleChange('startTime', date || undefined)
|
||||
}
|
||||
placeholder={t('Select start time')}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className='grid gap-2'>
|
||||
<Label htmlFor='end_time'>{t('End Time')}</Label>
|
||||
<DateTimePicker
|
||||
value={filters.endTime}
|
||||
onChange={(date) =>
|
||||
handleChange('endTime', date || undefined)
|
||||
}
|
||||
placeholder={t('Select end time')}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<SectionDivider label={t('Filters')} />
|
||||
|
||||
{renderCategoryFilters()}
|
||||
|
||||
{/* Channel filter (admin only, all log types) */}
|
||||
{isAdmin && (
|
||||
<FilterInput
|
||||
id='channel'
|
||||
label={t('Channel ID')}
|
||||
placeholder={t('Filter by channel ID')}
|
||||
value={filters.channel || ''}
|
||||
onChange={(value) => handleChange('channel', value)}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
</ScrollArea>
|
||||
|
||||
<DialogFooter className='grid grid-cols-2 gap-2 sm:flex'>
|
||||
<Button onClick={handleReset} variant='outline' type='button'>
|
||||
<RotateCcw className='mr-2 h-4 w-4' />
|
||||
{t('Reset')}
|
||||
</Button>
|
||||
<Button onClick={handleApply} type='submit'>
|
||||
<Search className='mr-2 h-4 w-4' />
|
||||
{t('Apply Filters')}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
)
|
||||
}
|
||||
Reference in New Issue
Block a user