refactor(webui): add shared badges to form kit

- add a reusable shared Badge primitive alongside the existing form controls\n- use it for the import auto-filter count pills and remove the route-local badge styles\n- tighten option button spacing so embedded badges read cleanly
pull/686/head
Antti Kettunen 1 week ago
parent d066aba03d
commit d32d88ea0e
No known key found for this signature in database
GPG Key ID: C6B2A3D250359BD7

@ -379,6 +379,9 @@
}
.optionButton {
display: inline-flex;
align-items: center;
gap: 8px;
border: 1px solid rgba(255, 255, 255, 0.1);
border-radius: 999px;
background: rgba(255, 255, 255, 0.05);
@ -388,7 +391,7 @@
font-size: 13px;
font-weight: 600;
min-width: 80px;
padding: 10px 14px;
padding: 8px 16px;
transition:
transform 0.18s ease,
border-color 0.18s ease,
@ -416,6 +419,51 @@
0 10px 24px rgba(0, 0, 0, 0.14);
}
.badge {
display: inline-flex;
align-items: center;
justify-content: center;
min-width: 2ch;
padding: 1px 7px;
border: 1px solid transparent;
border-radius: 999px;
font-size: 0.74rem;
font-weight: 700;
line-height: 1.2;
white-space: nowrap;
vertical-align: middle;
}
.badgeNeutral {
color: rgba(255, 255, 255, 0.45);
background: rgba(255, 255, 255, 0.05);
border-color: rgba(255, 255, 255, 0.08);
}
.badgeInfo {
color: rgb(var(--accent-light-rgb));
background: rgba(var(--accent-rgb), 0.12);
border-color: rgba(var(--accent-light-rgb), 0.12);
}
.badgeSuccess {
color: #4ade80;
background: rgba(74, 222, 128, 0.12);
border-color: rgba(74, 222, 128, 0.12);
}
.badgeWarning {
color: #fbbf24;
background: rgba(251, 191, 36, 0.12);
border-color: rgba(251, 191, 36, 0.12);
}
.badgeDanger {
color: #f87171;
background: rgba(248, 113, 113, 0.12);
border-color: rgba(248, 113, 113, 0.12);
}
.button {
display: inline-flex;
align-items: center;

@ -3,6 +3,7 @@ import { useState } from 'react';
import { describe, expect, it } from 'vitest';
import {
Badge,
Button,
Checkbox,
FormActions,
@ -114,6 +115,8 @@ function FormDemo() {
/>
</FormField>
<Badge tone="warning">12</Badge>
<FormError message="Validation failed" />
<FormActions>
@ -166,6 +169,7 @@ describe('form primitives', () => {
fireEvent.click(highPriority);
expect(highPriority).toHaveAttribute('aria-pressed', 'true');
expect(screen.getByText('12')).toHaveAttribute('data-tone', 'warning');
expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Save' })).toHaveAttribute(
'data-variant',

@ -261,6 +261,39 @@ export const OptionButton = forwardRef<HTMLButtonElement, OptionButtonProps>(fun
);
});
type BaseBadgeProps = ComponentPropsWithoutRef<'span'>;
export type BadgeTone = 'neutral' | 'info' | 'success' | 'warning' | 'danger';
export type BadgeProps = Omit<BaseBadgeProps, 'className'> & {
className?: string;
tone?: BadgeTone;
};
export const Badge = forwardRef<HTMLSpanElement, BadgeProps>(function Badge(
{ className, tone = 'neutral', ...props },
ref,
) {
return (
<span
ref={ref}
className={clsx(
styles.badge,
{
[styles.badgeNeutral]: tone === 'neutral',
[styles.badgeInfo]: tone === 'info',
[styles.badgeSuccess]: tone === 'success',
[styles.badgeWarning]: tone === 'warning',
[styles.badgeDanger]: tone === 'danger',
},
className,
)}
data-tone={tone}
{...props}
/>
);
});
type BaseButtonProps = ComponentPropsWithoutRef<typeof BaseButton>;
export type ButtonProps = Omit<BaseButtonProps, 'className'> & {

@ -1,5 +1,6 @@
export {
Button,
Badge,
FormActions,
FormError,
FormField,

@ -301,9 +301,8 @@ describe('import route', () => {
it('renders auto-import results from route search state', async () => {
renderImportRoute(['/import/auto?autoFilter=pending']);
expect(await screen.findByText('1 review')).toBeInTheDocument();
expect(await screen.findByRole('button', { name: /^Needs Review\s*1$/ })).toBeInTheDocument();
expect(screen.getAllByText('Album A').length).toBeGreaterThan(0);
expect(screen.getByText('Needs Review')).toBeInTheDocument();
expect(getFetchUrls().some((url) => url.includes('/api/import/staging/groups'))).toBe(false);
expect(getFetchUrls().some((url) => url.includes('/api/import/staging/suggestions'))).toBe(
false,

@ -1,7 +1,15 @@
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { useEffect, useState } from 'react';
import { Button, OptionButton, OptionButtonGroup, RangeInput, Select, Switch } from '@/components/form/form';
import {
Badge,
Button,
OptionButton,
OptionButtonGroup,
RangeInput,
Select,
Switch,
} from '@/components/form/form';
import type {
ImportAutoFilter,
@ -250,31 +258,13 @@ export function AutoImportPanel({
{allResults.length > 0 ? (
<>
<div className={styles.autoImportStats} id="auto-import-stats">
<span className={styles.autoImportStat} id="auto-import-stat-imported">
{counts.imported} imported
</span>
<span
className={`${styles.autoImportStat} ${styles.autoImportStatReview}`}
id="auto-import-stat-review"
>
{counts.review} review
</span>
<span
className={`${styles.autoImportStat} ${styles.autoImportStatFailed}`}
id="auto-import-stat-failed"
>
{counts.failed} failed
</span>
</div>
<OptionButtonGroup className={styles.autoImportFilters}>
{(['all', 'pending', 'imported', 'failed'] as const).map((filter) => (
<OptionButton
key={filter}
selected={autoFilter === filter}
onClick={() => onFilterChange(filter)}
>
{filter === 'pending' ? 'Needs Review' : titleCase(filter)}
<OptionButton key={filter} selected={autoFilter === filter} onClick={() => onFilterChange(filter)}>
<span>{getAutoImportFilterLabel(filter)}</span>
<Badge tone={getAutoImportFilterTone(filter)}>
{getAutoImportFilterCount(filter, counts, allResults.length)}
</Badge>
</OptionButton>
))}
<div className={styles.importPageFlexSpacer} />
@ -555,6 +545,49 @@ function getAutoImportConfidenceClass(status: string): string {
return classes[status] ?? '';
}
function getAutoImportFilterLabel(filter: ImportAutoFilter): string {
switch (filter) {
case 'all':
return 'All';
case 'pending':
return 'Needs Review';
case 'imported':
return 'Imported';
case 'failed':
return 'Failed';
}
}
function getAutoImportFilterCount(
filter: ImportAutoFilter,
counts: ReturnType<typeof getAutoImportCounts>,
totalCount: number,
): number {
switch (filter) {
case 'all':
return totalCount;
case 'pending':
return counts.review;
case 'imported':
return counts.imported;
case 'failed':
return counts.failed;
}
}
function getAutoImportFilterTone(filter: ImportAutoFilter): 'neutral' | 'warning' | 'success' | 'danger' {
switch (filter) {
case 'pending':
return 'warning';
case 'imported':
return 'success';
case 'failed':
return 'danger';
case 'all':
return 'neutral';
}
}
function getMethodLabel(method: string | null | undefined): string {
const labels: Record<string, string> = {
tags: 'Tags',
@ -565,10 +598,6 @@ function getMethodLabel(method: string | null | undefined): string {
return method ? labels[method] || method : '';
}
function titleCase(value: string): string {
return `${value.charAt(0).toUpperCase()}${value.slice(1)}`;
}
async function confirmAction({
title,
message,

@ -1122,27 +1122,6 @@
animation: adlPulse 1.5s ease-in-out infinite;
}
/* Stats summary */
.autoImportStats {
display: flex;
gap: 16px;
padding: 8px 0;
margin-bottom: 4px;
}
.autoImportStat {
font-size: 12px;
color: rgba(255, 255, 255, 0.5);
font-weight: 500;
}
.autoImportStatReview {
color: #fbbf24;
}
.autoImportStatFailed {
color: #f87171;
}
/* Filter pills */
.autoImportFilters {
padding: 6px 0;

Loading…
Cancel
Save