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:
@@ -22,6 +22,7 @@ import { Card } from '@/components/Card';
|
||||
import { ScriptJobDetail } from './ScriptJobDetail';
|
||||
import { DownloadJobDetail } from './DownloadJobDetail';
|
||||
import { PipelineJobDetail } from './JobDetail';
|
||||
import { useTranslation } from '@/lib/i18n';
|
||||
|
||||
type JobSummary = {
|
||||
id: string;
|
||||
@@ -99,6 +100,7 @@ const useJobsData = () => {
|
||||
|
||||
type JobRowProps = { job: JobSummary; onAction: (ev: MouseEvent, job: JobSummary) => void };
|
||||
const JobRow = ({ job, onAction }: JobRowProps) => {
|
||||
const { t } = useTranslation();
|
||||
const { id: activeId } = useParams<{ id: string }>();
|
||||
const isRunning = job.status === 'running';
|
||||
const target = basename(job.target);
|
||||
@@ -126,7 +128,7 @@ const JobRow = ({ job, onAction }: JobRowProps) => {
|
||||
</Link>
|
||||
<button
|
||||
onClick={(ev) => onAction(ev, job)}
|
||||
title={isRunning ? 'Stop' : 'Delete'}
|
||||
title={isRunning ? t('jobs.stop') : 'Delete'}
|
||||
className="shrink-0 mr-2 p-1.5 rounded-md text-duck-dark/40 hover:text-red-500 hover:bg-red-500/10 md:opacity-0 group-hover:opacity-100 transition-opacity cursor-pointer"
|
||||
>
|
||||
{isRunning ? <Square className="h-4 w-4" /> : <Trash2 className="h-4 w-4" />}
|
||||
@@ -144,6 +146,7 @@ const PanelHeader = ({ children }: { children: ReactNode }) => (
|
||||
// real event is wired to it. Sends { type: 'test' }, which reaches every configured channel — Discord
|
||||
// today, APNs and FCM once their credentials exist. Delete this once a real producer replaces it.
|
||||
const TestNotificationButton = () => {
|
||||
const { t } = useTranslation();
|
||||
const client = useClient();
|
||||
const [sending, setSending] = useState(false);
|
||||
|
||||
@@ -157,12 +160,12 @@ const TestNotificationButton = () => {
|
||||
);
|
||||
const results = res?.results ?? [];
|
||||
if (results.length === 0) {
|
||||
toast.warning('No channels configured');
|
||||
toast.warning(t('jobs.noChannels'));
|
||||
} else {
|
||||
toast.success(results.map((r) => `${r.channel}: ${r.sent} sent`).join(', '));
|
||||
}
|
||||
} catch {
|
||||
toast.error('Failed to send notification');
|
||||
toast.error(t('jobs.notifyFailed'));
|
||||
} finally {
|
||||
setSending(false);
|
||||
}
|
||||
@@ -172,7 +175,7 @@ const TestNotificationButton = () => {
|
||||
<button
|
||||
onClick={send}
|
||||
disabled={sending}
|
||||
title="Send a test notification to every configured channel"
|
||||
title={t('jobs.testNotification')}
|
||||
className="ml-auto shrink-0 flex items-center gap-1 text-xs font-medium text-duck-dark/50 hover:text-duck-teal cursor-pointer disabled:opacity-40"
|
||||
>
|
||||
<Bell className="h-3.5 w-3.5" />
|
||||
@@ -182,6 +185,7 @@ const TestNotificationButton = () => {
|
||||
};
|
||||
|
||||
const ActiveJobsPanel = () => {
|
||||
const { t } = useTranslation();
|
||||
const { jobs, isLoading, act } = useJobsData();
|
||||
const active = [
|
||||
...jobs.filter((j) => j.status === 'running'),
|
||||
@@ -191,15 +195,17 @@ const ActiveJobsPanel = () => {
|
||||
<div className="h-full p-2">
|
||||
<Card className="h-full flex flex-col overflow-hidden">
|
||||
<PanelHeader>
|
||||
<h2 className="text-sm font-semibold text-duck-dark">Running & Queued</h2>
|
||||
<h2 className="text-sm font-semibold text-duck-dark">{t('jobs.runningQueued')}</h2>
|
||||
{active.length > 0 && <span className="text-xs text-duck-dark/40">{active.length}</span>}
|
||||
<TestNotificationButton />
|
||||
</PanelHeader>
|
||||
<div className="flex-1 overflow-y-auto">
|
||||
{isLoading ? (
|
||||
<div className="flex items-center justify-center h-full text-duck-dark/30 text-xs">Loading…</div>
|
||||
<div className="flex items-center justify-center h-full text-duck-dark/30 text-xs">{t('jobs.loading')}</div>
|
||||
) : active.length === 0 ? (
|
||||
<div className="flex items-center justify-center h-full text-duck-dark/30 text-xs">Nothing running</div>
|
||||
<div className="flex items-center justify-center h-full text-duck-dark/30 text-xs">
|
||||
{t('jobs.nothingRunning')}
|
||||
</div>
|
||||
) : (
|
||||
active.map((job) => <JobRow key={job.id} job={job} onAction={act} />)
|
||||
)}
|
||||
@@ -211,6 +217,7 @@ const ActiveJobsPanel = () => {
|
||||
|
||||
// Bottom-left panel: finished / failed / stopped, newest first, searchable.
|
||||
const HistoryJobsPanel = () => {
|
||||
const { t } = useTranslation();
|
||||
const { jobs, isLoading, act, clearHistory } = useJobsData();
|
||||
const [search, setSearch] = useState('');
|
||||
const history = jobs
|
||||
@@ -224,12 +231,12 @@ const HistoryJobsPanel = () => {
|
||||
<div className="h-full p-2">
|
||||
<Card className="h-full flex flex-col overflow-hidden">
|
||||
<PanelHeader>
|
||||
<h2 className="text-sm font-semibold text-duck-dark shrink-0">History</h2>
|
||||
<h2 className="text-sm font-semibold text-duck-dark shrink-0">{t('jobs.history')}</h2>
|
||||
<div className="relative flex-1">
|
||||
<Search className="absolute left-2.5 top-1/2 -translate-y-1/2 h-3.5 w-3.5 text-duck-dark/40" />
|
||||
<input
|
||||
type="text"
|
||||
placeholder="Search…"
|
||||
placeholder={t('jobs.search')}
|
||||
value={search}
|
||||
onChange={(ev) => setSearch(ev.target.value)}
|
||||
className="w-full pl-8 pr-3 py-1 text-sm rounded-md border border-duck-dark/15 bg-background/60 text-duck-dark placeholder:text-duck-dark/30 focus:outline-none focus:ring-1 focus:ring-duck-teal/40"
|
||||
@@ -238,16 +245,16 @@ const HistoryJobsPanel = () => {
|
||||
{history.length > 0 && (
|
||||
<button
|
||||
onClick={clearHistory}
|
||||
title="Delete all finished jobs"
|
||||
title={t('jobs.deleteFinished')}
|
||||
className="shrink-0 text-xs font-medium text-duck-dark/50 hover:text-red-500 cursor-pointer"
|
||||
>
|
||||
Clear all
|
||||
{t('jobs.clearAll')}
|
||||
</button>
|
||||
)}
|
||||
</PanelHeader>
|
||||
<div className="flex-1 overflow-y-auto">
|
||||
{isLoading ? (
|
||||
<div className="flex items-center justify-center h-full text-duck-dark/30 text-xs">Loading…</div>
|
||||
<div className="flex items-center justify-center h-full text-duck-dark/30 text-xs">{t('jobs.loading')}</div>
|
||||
) : history.length === 0 ? (
|
||||
<div className="flex items-center justify-center h-full text-duck-dark/30 text-xs">
|
||||
{search ? 'No matches' : 'No finished jobs'}
|
||||
@@ -263,6 +270,7 @@ const HistoryJobsPanel = () => {
|
||||
|
||||
// ── Right panel: the selected job's detail, by mode (script terminal / pipeline steps) ──
|
||||
const JobDetailPanel = () => {
|
||||
const { t } = useTranslation();
|
||||
const { id } = useParams<{ id: string }>();
|
||||
const client = useClient();
|
||||
const [mode, setMode] = useState<string | null>(null);
|
||||
@@ -284,7 +292,7 @@ const JobDetailPanel = () => {
|
||||
<div className="h-full p-2">
|
||||
<Card className="h-full flex flex-col items-center justify-center gap-2 text-duck-dark/30">
|
||||
<Inbox className="h-8 w-8" />
|
||||
<span className="text-sm">Select a job</span>
|
||||
<span className="text-sm">{t('jobs.selectJob')}</span>
|
||||
</Card>
|
||||
</div>
|
||||
);
|
||||
@@ -301,7 +309,7 @@ const JobDetailPanel = () => {
|
||||
if (mode === 'notfound') {
|
||||
return (
|
||||
<div className="h-full p-2">
|
||||
<Card className="h-full flex items-center justify-center text-duck-dark/50 text-sm">Job not found.</Card>
|
||||
<Card className="h-full flex items-center justify-center text-duck-dark/50 text-sm">{t('jobs.notFound')}</Card>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user