Sprint: rerun jobs (#176)
* feat(PBI-jobs): voeg isDemo-prop door aan JobsBoard en JobDetailPane Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat(PBI-jobs): voeg 'Opnieuw starten'-knop toe aan JobDetailPane Toont een restart-knop voor jobs met status FAILED, CANCELLED of SKIPPED. Gebruikt useTransition voor loading-state en DemoTooltip voor demo-modus. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * test(PBI-jobs): voeg component-test toe voor JobDetailPane restart-knop Test: knop zichtbaar voor FAILED, verborgen voor DONE, aanroep met juist id, disabled in demo-modus. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * docs(PBI-jobs): voeg F-14 restart-acceptatiecriteria toe aan functional.md Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
71319e629d
commit
6756450131
5 changed files with 135 additions and 4 deletions
75
__tests__/components/jobs/job-detail-pane.test.tsx
Normal file
75
__tests__/components/jobs/job-detail-pane.test.tsx
Normal file
|
|
@ -0,0 +1,75 @@
|
||||||
|
// @vitest-environment jsdom
|
||||||
|
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||||
|
import { render, screen, fireEvent } from '@testing-library/react'
|
||||||
|
import '@testing-library/jest-dom'
|
||||||
|
import type { JobWithRelations } from '@/actions/jobs-page'
|
||||||
|
|
||||||
|
vi.mock('@/actions/claude-jobs', () => ({
|
||||||
|
restartClaudeJobAction: vi.fn(),
|
||||||
|
}))
|
||||||
|
|
||||||
|
vi.mock('sonner', () => ({ toast: { error: vi.fn() } }))
|
||||||
|
|
||||||
|
import { restartClaudeJobAction } from '@/actions/claude-jobs'
|
||||||
|
import JobDetailPane from '@/components/jobs/job-detail-pane'
|
||||||
|
|
||||||
|
const mockAction = restartClaudeJobAction as ReturnType<typeof vi.fn>
|
||||||
|
|
||||||
|
function makeJob(status: JobWithRelations['status']): JobWithRelations {
|
||||||
|
return {
|
||||||
|
id: 'job-1',
|
||||||
|
kind: 'TASK_IMPLEMENTATION',
|
||||||
|
status,
|
||||||
|
taskCode: 'T-1',
|
||||||
|
taskTitle: 'Test taak',
|
||||||
|
ideaCode: null,
|
||||||
|
ideaTitle: null,
|
||||||
|
sprintGoal: null,
|
||||||
|
sprintCode: null,
|
||||||
|
productName: 'Scrum4Me',
|
||||||
|
modelId: null,
|
||||||
|
inputTokens: null,
|
||||||
|
outputTokens: null,
|
||||||
|
cacheReadTokens: null,
|
||||||
|
cacheWriteTokens: null,
|
||||||
|
costUsd: null,
|
||||||
|
branch: null,
|
||||||
|
prUrl: null,
|
||||||
|
error: null,
|
||||||
|
summary: null,
|
||||||
|
description: null,
|
||||||
|
verifyResult: null,
|
||||||
|
startedAt: null,
|
||||||
|
finishedAt: null,
|
||||||
|
createdAt: new Date('2026-01-01'),
|
||||||
|
sprintRunId: null,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
vi.clearAllMocks()
|
||||||
|
mockAction.mockResolvedValue({ success: true })
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('JobDetailPane restart button', () => {
|
||||||
|
it('toont de knop voor FAILED-jobs', () => {
|
||||||
|
render(<JobDetailPane job={makeJob('FAILED')} isDemo={false} />)
|
||||||
|
expect(screen.getByRole('button', { name: /opnieuw starten/i })).toBeInTheDocument()
|
||||||
|
})
|
||||||
|
|
||||||
|
it('toont de knop niet voor DONE-jobs', () => {
|
||||||
|
render(<JobDetailPane job={makeJob('DONE')} isDemo={false} />)
|
||||||
|
expect(screen.queryByRole('button', { name: /opnieuw starten/i })).not.toBeInTheDocument()
|
||||||
|
})
|
||||||
|
|
||||||
|
it('roept restartClaudeJobAction aan met het juiste id bij klik', () => {
|
||||||
|
render(<JobDetailPane job={makeJob('FAILED')} isDemo={false} />)
|
||||||
|
fireEvent.click(screen.getByRole('button', { name: /opnieuw starten/i }))
|
||||||
|
expect(mockAction).toHaveBeenCalledWith('job-1')
|
||||||
|
})
|
||||||
|
|
||||||
|
it('knop is disabled in demo-modus', () => {
|
||||||
|
render(<JobDetailPane job={makeJob('FAILED')} isDemo={true} />)
|
||||||
|
expect(screen.getByRole('button', { name: /opnieuw starten/i })).toBeDisabled()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
@ -18,7 +18,7 @@ export default async function JobsPage() {
|
||||||
<h1 className="text-lg font-semibold">Jobs</h1>
|
<h1 className="text-lg font-semibold">Jobs</h1>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex-1 overflow-hidden">
|
<div className="flex-1 overflow-hidden">
|
||||||
<JobsBoard initialActiveJobs={data.activeJobs} initialDoneJobs={data.doneJobs} />
|
<JobsBoard initialActiveJobs={data.activeJobs} initialDoneJobs={data.doneJobs} isDemo={session.isDemo ?? false} />
|
||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,16 @@
|
||||||
'use client'
|
'use client'
|
||||||
|
|
||||||
|
import { useTransition } from 'react'
|
||||||
|
import { toast } from 'sonner'
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
import { JOB_STATUS_LABELS, JOB_STATUS_COLORS } from '@/components/shared/job-status'
|
import { JOB_STATUS_LABELS, JOB_STATUS_COLORS } from '@/components/shared/job-status'
|
||||||
import { jobStatusToApi } from '@/lib/job-status'
|
import { jobStatusToApi } from '@/lib/job-status'
|
||||||
import type { JobWithRelations } from '@/actions/jobs-page'
|
import type { JobWithRelations } from '@/actions/jobs-page'
|
||||||
|
import { Button } from '@/components/ui/button'
|
||||||
|
import { DemoTooltip } from '@/components/shared/demo-tooltip'
|
||||||
|
import { restartClaudeJobAction } from '@/actions/claude-jobs'
|
||||||
|
|
||||||
|
const RESTARTABLE_API_STATUSES = new Set(['failed', 'cancelled', 'skipped'])
|
||||||
|
|
||||||
interface FieldRowProps {
|
interface FieldRowProps {
|
||||||
label: string
|
label: string
|
||||||
|
|
@ -42,9 +49,12 @@ function subjectLabel(job: JobWithRelations): { label: string; value: string } |
|
||||||
|
|
||||||
interface JobDetailPaneProps {
|
interface JobDetailPaneProps {
|
||||||
job: JobWithRelations | null
|
job: JobWithRelations | null
|
||||||
|
isDemo: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function JobDetailPane({ job }: JobDetailPaneProps) {
|
export default function JobDetailPane({ job, isDemo }: JobDetailPaneProps) {
|
||||||
|
const [isPending, startTransition] = useTransition()
|
||||||
|
|
||||||
if (!job) {
|
if (!job) {
|
||||||
return (
|
return (
|
||||||
<div className="flex items-center justify-center h-full text-sm text-muted-foreground">
|
<div className="flex items-center justify-center h-full text-sm text-muted-foreground">
|
||||||
|
|
@ -55,6 +65,14 @@ export default function JobDetailPane({ job }: JobDetailPaneProps) {
|
||||||
|
|
||||||
const apiStatus = jobStatusToApi(job.status)
|
const apiStatus = jobStatusToApi(job.status)
|
||||||
const subject = subjectLabel(job)
|
const subject = subjectLabel(job)
|
||||||
|
const canRestart = RESTARTABLE_API_STATUSES.has(apiStatus)
|
||||||
|
|
||||||
|
function handleRestart() {
|
||||||
|
startTransition(async () => {
|
||||||
|
const result = await restartClaudeJobAction(job!.id)
|
||||||
|
if ('error' in result) toast.error(result.error)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="overflow-y-auto h-full p-4">
|
<div className="overflow-y-auto h-full p-4">
|
||||||
|
|
@ -110,6 +128,19 @@ export default function JobDetailPane({ job }: JobDetailPaneProps) {
|
||||||
<p className="text-xs text-muted-foreground italic">Geen beschrijving.</p>
|
<p className="text-xs text-muted-foreground italic">Geen beschrijving.</p>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
{canRestart && (
|
||||||
|
<div className="pt-3 mt-3 border-t border-border/50">
|
||||||
|
<DemoTooltip show={isDemo}>
|
||||||
|
<Button
|
||||||
|
size="sm"
|
||||||
|
onClick={handleRestart}
|
||||||
|
disabled={isPending || isDemo}
|
||||||
|
>
|
||||||
|
{isPending ? 'Opnieuw starten…' : 'Opnieuw starten'}
|
||||||
|
</Button>
|
||||||
|
</DemoTooltip>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@ import type { JobWithRelations } from '@/actions/jobs-page'
|
||||||
interface JobsBoardProps {
|
interface JobsBoardProps {
|
||||||
initialActiveJobs: JobWithRelations[]
|
initialActiveJobs: JobWithRelations[]
|
||||||
initialDoneJobs: JobWithRelations[]
|
initialDoneJobs: JobWithRelations[]
|
||||||
|
isDemo: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
type View = 'detail' | 'usage'
|
type View = 'detail' | 'usage'
|
||||||
|
|
@ -32,7 +33,7 @@ const DONE_STATUS_OPTIONS: Array<{ value: ClaudeJobStatusApi; label: string }> =
|
||||||
{ value: 'skipped', label: 'Overgeslagen' },
|
{ value: 'skipped', label: 'Overgeslagen' },
|
||||||
]
|
]
|
||||||
|
|
||||||
export default function JobsBoard({ initialActiveJobs, initialDoneJobs }: JobsBoardProps) {
|
export default function JobsBoard({ initialActiveJobs, initialDoneJobs, isDemo }: JobsBoardProps) {
|
||||||
const { activeJobs, doneJobs, selectedJobId, initJobs, setSelectedJobId } = useJobsStore()
|
const { activeJobs, doneJobs, selectedJobId, initJobs, setSelectedJobId } = useJobsStore()
|
||||||
const [view, setView] = useState<View>('detail')
|
const [view, setView] = useState<View>('detail')
|
||||||
useJobsRealtime()
|
useJobsRealtime()
|
||||||
|
|
@ -77,7 +78,7 @@ export default function JobsBoard({ initialActiveJobs, initialDoneJobs }: JobsBo
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex-1 overflow-y-auto">
|
<div className="flex-1 overflow-y-auto">
|
||||||
{view === 'detail' ? <JobDetailPane job={selectedJob} /> : <JobUsagePane job={selectedJob} />}
|
{view === 'detail' ? <JobDetailPane job={selectedJob} isDemo={isDemo} /> : <JobUsagePane job={selectedJob} />}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -522,6 +522,30 @@ De app is deployable op Vercel + Neon PostgreSQL en lokaal draaibaar met een Neo
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
### F-14: Job-queue inzicht en beheer (`/jobs`)
|
||||||
|
|
||||||
|
**Prioriteit:** v1 — Operationele controle
|
||||||
|
**Persona:** Lars
|
||||||
|
|
||||||
|
**Omschrijving:**
|
||||||
|
De `/jobs`-pagina geeft een overzicht van alle `ClaudeJob`-records voor het actieve product. Vanuit de `JobDetailPane` kan de gebruiker een mislukte, geannuleerde of overgeslagen job opnieuw in de wachtrij zetten.
|
||||||
|
|
||||||
|
**Acceptatiecriteria:**
|
||||||
|
|
||||||
|
#### Mislukte job opnieuw starten
|
||||||
|
|
||||||
|
- [ ] Een `ClaudeJob` in status `FAILED`, `CANCELLED` of `SKIPPED` toont een "Opnieuw starten"-knop in de `JobDetailPane`.
|
||||||
|
- [ ] De knop reset de bestaande job (geen nieuwe job aanmaken): `status → QUEUED`, `retry_count + 1`, alle run-velden gecleared.
|
||||||
|
- [ ] Bij `SPRINT_IMPLEMENTATION`-jobs worden alle bijbehorende `SprintTaskExecution`-rows in dezelfde transactie teruggezet naar `PENDING`.
|
||||||
|
- [ ] Tijdens de server-action is de knop disabled (loading-state). De UI updatet via SSE zonder handmatige refresh.
|
||||||
|
- [ ] Demo-sessies zien een `DemoTooltip` op de knop en kunnen niet restarten (drie-laagse policy: knop disabled + server action `session.isDemo`-check + HTTP 403).
|
||||||
|
|
||||||
|
**Randgevallen:**
|
||||||
|
- Job is ondertussen al door een andere actie opnieuw gestart (race condition) → server-action controleert de huidige status vóór de update; als de status niet meer `FAILED/CANCELLED/SKIPPED` is, retourneert de action een foutmelding.
|
||||||
|
- Demo-token probeert via directe API-aanroep te restarten → 403 Forbidden.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Navigatiestructuur
|
## Navigatiestructuur
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue