jobs keyed (73 -> 21)
The three job detail panes and the jobs page. Status labels share one jobs.status.* group across all three panes rather than three copies of "Running". statusBadge in two of the panes is a module-level helper, not a component, so it takes `t` as a parameter -- the alternative is calling a hook outside a component body. ScriptJobDetail's version built "Failed (exit N)" by string concatenation; that is a key with a parameter now.
This commit is contained in:
@@ -4,6 +4,9 @@ import { Loader2, CheckCircle2, XCircle, Ban, Clock, ArrowLeft, Square } from 'l
|
||||
import { useClient } from 'hooks/useClient';
|
||||
import { toast } from 'sonner';
|
||||
import { PhaseBar, type DownloadProgress } from './DownloadJobDetail';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type TFn = ReturnType<typeof useTranslation>['t'];
|
||||
|
||||
type ScriptJob = {
|
||||
id: string;
|
||||
@@ -27,36 +30,46 @@ const isTerminal = (s: string) => s === 'completed' || s === 'failed' || s === '
|
||||
const isDownloadProgress = (p: unknown): p is DownloadProgress =>
|
||||
!!p && typeof p === 'object' && 'meta' in p && 'dl' in p;
|
||||
|
||||
const statusBadge = (status: string, exitCode: number | null) => {
|
||||
// Takes `t` because it is a module-level helper, not a component.
|
||||
const statusBadge = (status: string, exitCode: number | null, t: TFn) => {
|
||||
switch (status) {
|
||||
case 'running':
|
||||
return {
|
||||
icon: <Loader2 className="h-4 w-4 animate-spin" />,
|
||||
label: 'Running',
|
||||
label: t('jobs.status.running'),
|
||||
cls: 'text-amber-600 dark:text-amber-500',
|
||||
};
|
||||
case 'pending':
|
||||
return { icon: <Clock className="h-4 w-4" />, label: 'Queued', cls: 'text-blue-600 dark:text-blue-400' };
|
||||
return {
|
||||
icon: <Clock className="h-4 w-4" />,
|
||||
label: t('jobs.status.queued'),
|
||||
cls: 'text-blue-600 dark:text-blue-400',
|
||||
};
|
||||
case 'completed':
|
||||
return { icon: <CheckCircle2 className="h-4 w-4" />, label: 'Completed', cls: 'text-duck-teal' };
|
||||
return { icon: <CheckCircle2 className="h-4 w-4" />, label: t('jobs.status.completed'), cls: 'text-duck-teal' };
|
||||
case 'failed':
|
||||
return {
|
||||
icon: <XCircle className="h-4 w-4" />,
|
||||
label: `Failed${exitCode != null ? ` (exit ${exitCode})` : ''}`,
|
||||
label: exitCode != null ? t('jobs.failedWithCode', { code: exitCode }) : t('jobs.status.failed'),
|
||||
cls: 'text-red-600 dark:text-red-400',
|
||||
};
|
||||
case 'stopped':
|
||||
return { icon: <Ban className="h-4 w-4" />, label: 'Stopped', cls: 'text-duck-dark/50 dark:text-foreground/50' };
|
||||
return {
|
||||
icon: <Ban className="h-4 w-4" />,
|
||||
label: t('jobs.status.stopped'),
|
||||
cls: 'text-duck-dark/50 dark:text-foreground/50',
|
||||
};
|
||||
default:
|
||||
return {
|
||||
icon: <XCircle className="h-4 w-4" />,
|
||||
label: 'Interrupted',
|
||||
label: t('jobs.status.interrupted'),
|
||||
cls: 'text-orange-600 dark:text-orange-400',
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
export const ScriptJobDetail = () => {
|
||||
const { t } = useTranslation();
|
||||
const { id } = useParams<{ id: string }>();
|
||||
const client = useClient();
|
||||
|
||||
@@ -137,9 +150,9 @@ export const ScriptJobDetail = () => {
|
||||
if (!id) return;
|
||||
try {
|
||||
await client.post(`/jobs/${id}/stop`, {});
|
||||
toast.success('Stop requested');
|
||||
toast.success(t('jobs.stopRequested'));
|
||||
} catch {
|
||||
toast.error('Failed to stop');
|
||||
toast.error(t('jobs.stopFailed'));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -153,15 +166,15 @@ export const ScriptJobDetail = () => {
|
||||
if (!job) {
|
||||
return (
|
||||
<div className="flex-1 flex flex-col items-center justify-center gap-3 text-duck-dark/60 dark:text-foreground/60">
|
||||
<span>Job not found.</span>
|
||||
<span>{t('jobs.notFound')}</span>
|
||||
<Link to="/jobs" className="text-duck-teal hover:underline">
|
||||
Back to jobs
|
||||
{t('jobs.backToJobs')}
|
||||
</Link>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
const badge = statusBadge(job.status, job.exitCode);
|
||||
const badge = statusBadge(job.status, job.exitCode, t);
|
||||
const running = !isTerminal(job.status);
|
||||
|
||||
return (
|
||||
@@ -185,7 +198,7 @@ export const ScriptJobDetail = () => {
|
||||
onClick={stop}
|
||||
className="flex items-center gap-1.5 px-3 py-1.5 text-xs rounded-md bg-red-500/10 text-red-600 dark:text-red-400 hover:bg-red-500/20 cursor-pointer transition-colors"
|
||||
>
|
||||
<Square className="h-3 w-3" /> Stop
|
||||
<Square className="h-3 w-3" /> {t('jobs.stop')}
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
@@ -193,14 +206,14 @@ export const ScriptJobDetail = () => {
|
||||
{isDownloadProgress(job.progress) && (
|
||||
<div className="px-5 py-4 border-b border-duck-dark/10 flex flex-col gap-4">
|
||||
<PhaseBar
|
||||
label="Titles"
|
||||
label={t('jobs.titles')}
|
||||
c={job.progress.meta}
|
||||
active={job.progress.phase === 'metadata'}
|
||||
savedLabel="found"
|
||||
failedLabel="skipped"
|
||||
/>
|
||||
<PhaseBar
|
||||
label="Download"
|
||||
label={t('jobs.download')}
|
||||
c={job.progress.dl}
|
||||
active={job.progress.phase === 'download'}
|
||||
savedLabel="saved"
|
||||
|
||||
Reference in New Issue
Block a user