Peach: Local-first video metadata scraper and media manager.
feat(tasks): 让父任务卡控制整批后继
longmeidao4fb34deedf1a
diff --git a/frontend/src/react/activity/activity-page.tsx b/frontend/src/react/activity/activity-page.tsxindex d0b345886..2805b4b28 100644--- a/frontend/src/react/activity/activity-page.tsx+++ b/frontend/src/react/activity/activity-page.tsx@@ -56,9 +56,11 @@ const CONTROL_LABELS: Record<TaskControlState, string> = {};function StatusBadge({ run }: { run: TaskRunPayload }) {- const control = isActive(run) ? run.control?.state : undefined;- if (control && control !== 'running') {- return <Chip color="neutral"><span data-copy-key={`tasks.control.state.${control}`}>{CONTROL_LABELS[control]}</span></Chip>;+ const control = run.control?.state;+ if (control && (control !== 'running' || !isActive(run))) {+ return <Chip color={control === 'running' ? 'blue' : 'neutral'}>+ <span data-copy-key={`tasks.control.state.${control}`}>{CONTROL_LABELS[control]}</span>+ </Chip>;}const partial = run.status === 'failed' && run.task_key === 'library-processing'&& run.result_summary?.outcome === 'partial';@@ -88,7 +90,7 @@ function FollowupList({ rows }: { rows: TaskRunPayload[] }) {{detail? <span className="min-w-0 break-words text-caption-1-regular text-text-secondary">{detail}</span>: null}- {isActive(row) && row.control?.actions.length+ {row.control?.actions.length? <div className="w-full min-w-0"><TaskControls run={row} /></div> : null}{/* 排队中的那些还没有结果:空的「技术详情」展开只有一对花括号。 */}{Object.keys(row.result_summary || {}).length@@ -260,7 +262,7 @@ function WorkingRun(`${momentText(oldest.started_at || oldest.finished_at)} 开始`].filter(Boolean).join(' · ');return (<RunCard run={run} meta={meta} followups={followups} followupTotal={total}- badge={<Chip color="blue">进行中</Chip>}>+ badge={run.control ? <StatusBadge run={run} /> : <Chip color="blue">进行中</Chip>}><div className="flex flex-col gap-1.5"><Progress label={`${run.task_label}进度`} value={settled} max={total} /><p className="text-caption-1-regular text-text-secondary">@@ -355,6 +357,11 @@ export function ActivityPage() {};const folds = foldRoutine(finished, (run) => isRoutine(run)&& (quietChildren(run) || DISPATCHERS.has(run.task_key)));+ // 各父任务的控制范围独立:合成一张卡会让较早那批的后继没有对应操作入口。+ const workingGroups = [+ ...foldByKind(working.filter((run) => !run.control)),+ ...working.filter((run) => run.control).map((run) => ({ run, runs: [run] })),+ ].sort((left, right) => right.run.id - left.run.id);const newest = latestOfKind(allRuns);const quiet = !running.length && !working.length && !skipped.length && !finished.length;return (@@ -375,7 +382,7 @@ export function ActivityPage() {? <RunList live>{running.map((run) => (<RunningRun key={run.id} run={run} followups={byParent.get(run.id)} />))}- {foldByKind(working).map(({ run, runs }) => (+ {workingGroups.map(({ run, runs }) => (<WorkingRun key={run.id} runs={runs} followups={childrenOf(runs)} counts={counts} />))}</RunList>: <Note tone="neutral">没有任务在跑。</Note>}diff --git a/frontend/src/react/activity/task-controls.tsx b/frontend/src/react/activity/task-controls.tsxindex c1ce619b8..997a2cdef 100644--- a/frontend/src/react/activity/task-controls.tsx+++ b/frontend/src/react/activity/task-controls.tsx@@ -11,7 +11,8 @@ export function TaskControls({ run }: { run: TaskRunPayload }) {const client = useQueryClient();const request = useAction();const actions = run.control?.actions || [];- if (!isActive(run) || !actions.length) return null;+ const followups = !isActive(run);+ if (!actions.length) return null;const submit = (action: TaskControlAction) => {void request.run(action, (signal) => controlTask(run.id, action, signal), () => {@@ -21,12 +22,15 @@ export function TaskControls({ run }: { run: TaskRunPayload }) {return (<div className="flex min-w-0 flex-col gap-2" data-task-controls={run.id}>- <div role="group" aria-label={`${run.task_label}任务控制`} className="flex flex-wrap items-center gap-2">+ <div role="group" aria-label={`${run.task_label}${followups ? '后续任务' : '任务'}控制`}+ className="flex flex-wrap items-center gap-2">{actions.map((action) => <Button key={action} type="button" variant="secondary" size="small"{...busyProps(request.busy === action)} aria-disabled={Boolean(request.busy) || undefined}onClick={() => submit(action)}- data-copy-key={`tasks.control.action.${action}`}>- {action === 'pause' ? '暂停' : action === 'resume' ? '继续' : '取消'}+ data-copy-key={`tasks.control.action.${followups ? 'followups.' : ''}${action}`}>+ {followups+ ? action === 'pause' ? '暂停后续任务' : action === 'resume' ? '继续后续任务' : '取消后续任务'+ : action === 'pause' ? '暂停' : action === 'resume' ? '继续' : '取消'}</Button>)}</div>{request.error ? <Note tone="error">{request.error}</Note> : null}diff --git a/frontend/test/react/activity.test.tsx b/frontend/test/react/activity.test.tsxindex 74fdbde5c..9bb0afe54 100644--- a/frontend/test/react/activity.test.tsx+++ b/frontend/test/react/activity.test.tsx@@ -305,10 +305,10 @@ it('任务控制失败保留原状态和原因,可以在原位重试', async (expect(attempts).toBe(2);});-it('后继任务使用自身任务号控制,已结束任务没有控制按钮', async () => {+it('后继任务使用自身任务号控制,服务端未提供能力的父任务没有控制按钮', async () => {const child = followup(1, { id: 90, status: 'pending', finished_at: null,control: { state: 'paused', actions: ['resume', 'cancel'] } });- const ended = run({ status: 'succeeded', control: { state: 'running', actions: ['pause', 'cancel'] } });+ const ended = run({ status: 'succeeded' });const posts: string[] = [];stubFetch(async (input, init) => {if (init?.method === 'POST') posts.push(input);@@ -323,6 +323,59 @@ it('后继任务使用自身任务号控制,已结束任务没有控制按钮'expect(posts).toEqual(['/api/tasks/90/control']);});+it('父任务结束后仍可控制整批后继,未展示的后继也属于同一操作范围', async () => {+ const posts: [string, unknown][] = [];+ let parent = run({ status: 'succeeded',+ control: { state: 'running', actions: ['pause', 'cancel'] } });+ const child = followup(1, { status: 'pending', finished_at: null });+ stubFetch(async (input, init) => {+ if (init?.method === 'POST') {+ const body = JSON.parse(String(init.body));+ posts.push([input, body]);+ parent = { ...parent, control: body.action === 'pause'+ ? { state: 'paused', actions: ['resume', 'cancel'] }+ : body.action === 'resume' ? { state: 'running', actions: ['pause', 'cancel'] }+ : { state: 'cancelling', actions: [] } };+ }+ return { ok: true, status: 200, json: async () => payload({ running: [child], finished: [parent],+ followup_counts: { '1': { pending: 1000 } } }) };+ });+ await prefetchTasks(new AbortController().signal);+ const host = await mount(page());+ expect(host.querySelector('#run-1')?.textContent).toContain('列出其中 1 项');+ await click(buttonNamed('暂停后续任务', host));+ await vi.waitFor(() => expect(buttonNamed('继续后续任务', host)).not.toBeNull());+ expect(host.querySelector('#run-1')?.textContent).toContain('已暂停');+ await click(buttonNamed('继续后续任务', host));+ await vi.waitFor(() => expect(buttonNamed('暂停后续任务', host)).not.toBeNull());+ await click(buttonNamed('取消后续任务', host));+ await vi.waitFor(() => expect(host.querySelector('#run-1')?.textContent).toContain('正在取消'));+ expect(posts).toEqual([+ ['/api/tasks/1/control', { action: 'pause' }],+ ['/api/tasks/1/control', { action: 'resume' }],+ ['/api/tasks/1/control', { action: 'cancel' }],+ ]);+});++it('同类父任务有独立控制范围时分别显示,按钮只提交对应的父任务号', async () => {+ const first = run({ id: 1, status: 'succeeded',+ control: { state: 'paused', actions: ['resume', 'cancel'] } });+ const second = run({ id: 2, status: 'succeeded',+ control: { state: 'running', actions: ['pause', 'cancel'] } });+ const children = [followup(1, { id: 90, status: 'pending' }), followup(2, { id: 91, status: 'pending' })];+ const posts: string[] = [];+ stubFetch(async (input, init) => {+ if (init?.method === 'POST') posts.push(input);+ return { ok: true, status: 200, json: async () => payload({ running: children, finished: [second, first] }) };+ });+ await prefetchTasks(new AbortController().signal);+ const host = await mount(page());+ expect(host.querySelectorAll('[data-task-key="follow-check"]')).toHaveLength(2);+ await click(buttonNamed('继续后续任务', host.querySelector('#run-1')!));+ await click(buttonNamed('暂停后续任务', host.querySelector('#run-2')!));+ expect(posts).toEqual(['/api/tasks/1/control', '/api/tasks/2/control']);+});+it('服务端未给出控制能力时不按任务种类自行增加按钮', async () => {const { host } = await open(payload({ running: [run()] }));expect(host.querySelector('[data-task-controls]')).toBeNull();