PBI-56 + ST-1275: PLAN_READY → GRILLING re-grill + SKIPPED status rendering (#147)
* fix(ST-1272): allow PLAN_READY → GRILLING re-grill transition
actions/ideas.ts already lists PLAN_READY in GRILL_TRIGGERABLE_FROM,
but lib/idea-status.ts ALLOWED_TRANSITIONS was missing the
PLAN_READY → GRILLING edge. As a result, clicking Grill on a PLAN_READY
idea returned 422 "Status-transitie ongeldig" while the UI button was
enabled. Mirrors the existing PLANNED → GRILLING re-grill behaviour.
- lib/idea-status.ts: PLAN_READY allows GRILLING in addition to
PLANNING/PLANNED
- __tests__/lib/idea-status.test.ts: explicit assert for
PLAN_READY → GRILLING and PLAN_READY added to the regrill loop
covering every GRILL_TRIGGERABLE_FROM status
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* feat(ST-1275): render SKIPPED job status in chart-colors and insights
Closing the gap left when ClaudeJobStatus.SKIPPED was added to the schema:
the badge map and case-mapper already covered it, but the chart palette,
the per-day insights aggregator and the stacked-bar chart did not. SKIPPED
jobs (e.g. cmovkur8 manually flipped during the no-op-exit hotfix) now
render with a muted style consistent with cancelled.
- lib/chart-colors.ts: JOB_STATUS_COLORS gains a 'skipped' entry
(var(--muted-foreground), same intensity as cancelled — neither rood/orange)
- lib/insights/agent-throughput.ts: DayCount + STATUSES + perDay zero-fill
now include 'skipped'; the SQL terminal_7d filter already counted SKIPPED
- app/(app)/insights/components/agent-throughput.tsx: STACKED_STATUSES and
the empty-state guard include 'skipped'
- __tests__: chart-colors keys list, job-status round-trip ('all 7 statuses')
and the insights non-zero filter all account for SKIPPED
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
e8562d4018
commit
d750676f5e
8 changed files with 15 additions and 8 deletions
|
|
@ -34,7 +34,7 @@ describe('chart-colors', () => {
|
||||||
|
|
||||||
it('JOB_STATUS_COLORS has all ClaudeJobStatus keys and non-empty values', () => {
|
it('JOB_STATUS_COLORS has all ClaudeJobStatus keys and non-empty values', () => {
|
||||||
const keys: (keyof typeof JOB_STATUS_COLORS)[] = [
|
const keys: (keyof typeof JOB_STATUS_COLORS)[] = [
|
||||||
'queued', 'claimed', 'running', 'done', 'failed', 'cancelled',
|
'queued', 'claimed', 'running', 'done', 'failed', 'cancelled', 'skipped',
|
||||||
]
|
]
|
||||||
for (const key of keys) {
|
for (const key of keys) {
|
||||||
expect(JOB_STATUS_COLORS[key]).toBeTruthy()
|
expect(JOB_STATUS_COLORS[key]).toBeTruthy()
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,7 @@ describe('canTransition', () => {
|
||||||
it('allows re-grill from GRILLED and PLAN_READY-ish states', () => {
|
it('allows re-grill from GRILLED and PLAN_READY-ish states', () => {
|
||||||
expect(canTransition('GRILLED', 'GRILLING')).toBe(true)
|
expect(canTransition('GRILLED', 'GRILLING')).toBe(true)
|
||||||
expect(canTransition('PLAN_FAILED', 'PLANNING')).toBe(true)
|
expect(canTransition('PLAN_FAILED', 'PLANNING')).toBe(true)
|
||||||
|
expect(canTransition('PLAN_READY', 'GRILLING')).toBe(true)
|
||||||
})
|
})
|
||||||
|
|
||||||
it('allows fail-side transitions', () => {
|
it('allows fail-side transitions', () => {
|
||||||
|
|
@ -60,8 +61,8 @@ describe('canTransition', () => {
|
||||||
})
|
})
|
||||||
|
|
||||||
it('canTransition to GRILLING from all statuses that allow re-grill', () => {
|
it('canTransition to GRILLING from all statuses that allow re-grill', () => {
|
||||||
// DRAFT, GRILLED, GRILL_FAILED, PLANNED are in GRILL_TRIGGERABLE_FROM and support the transition.
|
// GRILL_TRIGGERABLE_FROM in actions/ideas.ts — alle statussen die re-grill ondersteunen.
|
||||||
const regrill = ['DRAFT', 'GRILLED', 'GRILL_FAILED', 'PLANNED'] as const
|
const regrill = ['DRAFT', 'GRILLED', 'GRILL_FAILED', 'PLAN_READY', 'PLANNED'] as const
|
||||||
for (const status of regrill) {
|
for (const status of regrill) {
|
||||||
expect(canTransition(status, 'GRILLING')).toBe(true)
|
expect(canTransition(status, 'GRILLING')).toBe(true)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@ describe('getJobsPerDay', () => {
|
||||||
|
|
||||||
// All days should have zero counts except the three we seeded
|
// All days should have zero counts except the three we seeded
|
||||||
const nonZero = result.perDay.filter(
|
const nonZero = result.perDay.filter(
|
||||||
d => d.done + d.failed + d.queued + d.claimed + d.running + d.cancelled > 0,
|
d => d.done + d.failed + d.queued + d.claimed + d.running + d.cancelled + d.skipped > 0,
|
||||||
)
|
)
|
||||||
expect(nonZero).toHaveLength(3)
|
expect(nonZero).toHaveLength(3)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,13 +27,14 @@ describe('job-status mappers', () => {
|
||||||
expect(jobStatusFromApi('QUEUED')).toBe('QUEUED')
|
expect(jobStatusFromApi('QUEUED')).toBe('QUEUED')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('maps all 6 DB statuses to API', () => {
|
it('maps all 7 DB statuses to API', () => {
|
||||||
expect(jobStatusToApi('QUEUED')).toBe('queued')
|
expect(jobStatusToApi('QUEUED')).toBe('queued')
|
||||||
expect(jobStatusToApi('CLAIMED')).toBe('claimed')
|
expect(jobStatusToApi('CLAIMED')).toBe('claimed')
|
||||||
expect(jobStatusToApi('RUNNING')).toBe('running')
|
expect(jobStatusToApi('RUNNING')).toBe('running')
|
||||||
expect(jobStatusToApi('DONE')).toBe('done')
|
expect(jobStatusToApi('DONE')).toBe('done')
|
||||||
expect(jobStatusToApi('FAILED')).toBe('failed')
|
expect(jobStatusToApi('FAILED')).toBe('failed')
|
||||||
expect(jobStatusToApi('CANCELLED')).toBe('cancelled')
|
expect(jobStatusToApi('CANCELLED')).toBe('cancelled')
|
||||||
|
expect(jobStatusToApi('SKIPPED')).toBe('skipped')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('ACTIVE_JOB_STATUSES contains exactly QUEUED, CLAIMED, RUNNING', () => {
|
it('ACTIVE_JOB_STATUSES contains exactly QUEUED, CLAIMED, RUNNING', () => {
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ function formatDuration(seconds: number | null): string {
|
||||||
return m > 0 ? `${m}m ${s}s` : `${s}s`
|
return m > 0 ? `${m}m ${s}s` : `${s}s`
|
||||||
}
|
}
|
||||||
|
|
||||||
const STACKED_STATUSES = ['queued', 'claimed', 'running', 'done', 'failed', 'cancelled'] as const
|
const STACKED_STATUSES = ['queued', 'claimed', 'running', 'done', 'failed', 'cancelled', 'skipped'] as const
|
||||||
|
|
||||||
export function AgentThroughputCard({ data, productList, currentProductId }: Props) {
|
export function AgentThroughputCard({ data, productList, currentProductId }: Props) {
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
@ -44,7 +44,7 @@ export function AgentThroughputCard({ data, productList, currentProductId }: Pro
|
||||||
const { perDay, kpi } = data
|
const { perDay, kpi } = data
|
||||||
|
|
||||||
const isEmpty = perDay.every(
|
const isEmpty = perDay.every(
|
||||||
d => d.done + d.failed + d.queued + d.claimed + d.running + d.cancelled === 0,
|
d => d.done + d.failed + d.queued + d.claimed + d.running + d.cancelled + d.skipped === 0,
|
||||||
)
|
)
|
||||||
|
|
||||||
function handleProductChange(value: string | null) {
|
function handleProductChange(value: string | null) {
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,7 @@ export const JOB_STATUS_COLORS = {
|
||||||
done: 'var(--status-done)',
|
done: 'var(--status-done)',
|
||||||
failed: 'var(--priority-critical)',
|
failed: 'var(--priority-critical)',
|
||||||
cancelled: 'var(--muted-foreground)',
|
cancelled: 'var(--muted-foreground)',
|
||||||
|
skipped: 'var(--muted-foreground)',
|
||||||
} as const
|
} as const
|
||||||
|
|
||||||
export const SERIES_COLORS = [
|
export const SERIES_COLORS = [
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@ const ALLOWED_TRANSITIONS: Record<IdeaStatus, ReadonlyArray<IdeaStatus>> = {
|
||||||
GRILLED: ['GRILLING', 'PLANNING'],
|
GRILLED: ['GRILLING', 'PLANNING'],
|
||||||
PLANNING: ['PLAN_READY', 'PLAN_FAILED'],
|
PLANNING: ['PLAN_READY', 'PLAN_FAILED'],
|
||||||
PLAN_FAILED: ['PLANNING', 'GRILLED'],
|
PLAN_FAILED: ['PLANNING', 'GRILLED'],
|
||||||
PLAN_READY: ['PLANNING', 'PLANNED'],
|
PLAN_READY: ['PLANNING', 'PLANNED', 'GRILLING'], // GRILLING via startGrillJobAction (re-grill)
|
||||||
PLANNED: ['PLAN_READY', 'GRILLING'], // PLAN_READY via relinkIdeaPlanAction; GRILLING via startGrillJobAction
|
PLANNED: ['PLAN_READY', 'GRILLING'], // PLAN_READY via relinkIdeaPlanAction; GRILLING via startGrillJobAction
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ export interface DayCount {
|
||||||
done: number
|
done: number
|
||||||
failed: number
|
failed: number
|
||||||
cancelled: number
|
cancelled: number
|
||||||
|
skipped: number
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ThroughputKpi {
|
export interface ThroughputKpi {
|
||||||
|
|
@ -21,6 +22,8 @@ export interface JobsPerDayResult {
|
||||||
kpi: ThroughputKpi
|
kpi: ThroughputKpi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const STATUSES = ['queued', 'claimed', 'running', 'done', 'failed', 'cancelled', 'skipped'] as const
|
||||||
|
|
||||||
type RawDayRow = { day: Date; status: string; count: bigint }
|
type RawDayRow = { day: Date; status: string; count: bigint }
|
||||||
type RawKpiRow = { today_count: bigint; done_7d: bigint; terminal_7d: bigint; avg_seconds: number | null }
|
type RawKpiRow = { today_count: bigint; done_7d: bigint; terminal_7d: bigint; avg_seconds: number | null }
|
||||||
|
|
||||||
|
|
@ -98,6 +101,7 @@ export async function getJobsPerDay(
|
||||||
done: statusMap.get('done') ?? 0,
|
done: statusMap.get('done') ?? 0,
|
||||||
failed: statusMap.get('failed') ?? 0,
|
failed: statusMap.get('failed') ?? 0,
|
||||||
cancelled: statusMap.get('cancelled') ?? 0,
|
cancelled: statusMap.get('cancelled') ?? 0,
|
||||||
|
skipped: statusMap.get('skipped') ?? 0,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue