Complete NextSteps roadmap: planning engine UI, calendar cluster, flexible wishes
Works through every numbered item in NextSteps260913.md section 3, plus the three known verification issues in section 4.1. Surface what the backend already computed: - 3.1 render surplus_advice in PlanResults, mirroring the shortfall remedies - 3.2 surface VacationBalance.is_assumed so assumed statutory years are visible - 3.3 age-4 expiry given the proposed plan, via a new Age4Projection reusing the existing _age4_projections arithmetic (Dashboard stat verified, not rebuilt) Calendar cluster (one pass over the holiday data): - new GET /api/calendar/days exposing roda dagar, klamdagar and day overrides, paginated four years at a time - 3.4 shade roda dagar/klamdagar, with R/K badges so colour is not the only signal - 3.6 click-to-override behind an explicit mode toggle, leaving drag multi-select intact - 3.7 click month/year to advance - 3.8 per-year red-days list in Settings, statutory days plus overrides i18n: - 3.5 five backend-generated Swedish surfaces converted to message_key + data, following the tips_service pattern; old string fields replaced, not kept Flexible wishes (3.9): - PLANNING_ENGINE_SPEC section 10: window_mode, candidate search, cost function, deterministic tie-break, two-pass ordering, test matrix rows 15-24 - backend: entity, migration 006, _FULL_SCHEMA sync, repository, allocator - frontend: season-preset toggle in WishEditor, unplaced outcome rendering Fixes (4.1): - pin typecheck to the local tsc rather than npx resolving a newer TypeScript - ignore generated coverage/ and dist/ in the ESLint flat config - fix the flaky usePlanApply test properly, with waitFor rather than a retry Tests: backend 361 -> 404, frontend 540 -> 704. Coverage 89.47% -> 96.52% lines. Not yet verified in a browser. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RXMhc9nT6sNz1SL4j8dznL
This commit is contained in:
@@ -88,4 +88,291 @@ describe('usePlannedDays', () => {
|
||||
expect(api.deletePlannedDay).toHaveBeenCalledWith('pd1')
|
||||
expect(api.getPlannedDays).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('handles fetch error and sets error state', async () => {
|
||||
const errorMessage = 'Network error'
|
||||
vi.mocked(api.getPlannedDays).mockRejectedValue(new Error(errorMessage))
|
||||
|
||||
const { result } = renderHook(() => usePlannedDays('child1'))
|
||||
|
||||
await act(async () => {
|
||||
await new Promise(resolve => setTimeout(resolve, 0))
|
||||
})
|
||||
|
||||
expect(result.current.error).toBe(errorMessage)
|
||||
expect(result.current.data).toBeNull()
|
||||
expect(result.current.isLoading).toBe(false)
|
||||
})
|
||||
|
||||
it('handles fetch error with non-Error object', async () => {
|
||||
vi.mocked(api.getPlannedDays).mockRejectedValue('Unknown error')
|
||||
|
||||
const { result } = renderHook(() => usePlannedDays('child1'))
|
||||
|
||||
await act(async () => {
|
||||
await new Promise(resolve => setTimeout(resolve, 0))
|
||||
})
|
||||
|
||||
expect(result.current.error).toBe('Failed to fetch planned days')
|
||||
expect(result.current.data).toBeNull()
|
||||
})
|
||||
|
||||
it('updates planned day and refreshes', async () => {
|
||||
const mockUpdated = {
|
||||
id: '1',
|
||||
workspaceId: 'ws1',
|
||||
childId: 'child1',
|
||||
parentPersonalDataUuid: 'parent1',
|
||||
date: '2026-06-16',
|
||||
dayType: 'lagsta' as const,
|
||||
isDubbeldag: false,
|
||||
createdAt: new Date().toISOString(),
|
||||
updatedAt: new Date().toISOString(),
|
||||
}
|
||||
|
||||
vi.mocked(api.updatePlannedDay).mockResolvedValue(mockUpdated as any)
|
||||
vi.mocked(api.getPlannedDays).mockResolvedValue([mockUpdated])
|
||||
|
||||
const { result } = renderHook(() => usePlannedDays('child1'))
|
||||
|
||||
await act(async () => {
|
||||
await result.current.update('1', { day_type: 'lagsta' })
|
||||
})
|
||||
|
||||
expect(api.updatePlannedDay).toHaveBeenCalledWith('1', { day_type: 'lagsta' })
|
||||
expect(api.getPlannedDays).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('updates data after successful add', async () => {
|
||||
const initialData = [
|
||||
{
|
||||
id: '1',
|
||||
workspaceId: 'ws1',
|
||||
childId: 'child1',
|
||||
parentPersonalDataUuid: 'parent1',
|
||||
date: '2026-06-15',
|
||||
dayType: 'vacation' as const,
|
||||
isDubbeldag: false,
|
||||
createdAt: new Date().toISOString(),
|
||||
updatedAt: new Date().toISOString(),
|
||||
},
|
||||
]
|
||||
|
||||
const newData = {
|
||||
id: '2',
|
||||
workspaceId: 'ws1',
|
||||
childId: 'child1',
|
||||
parentPersonalDataUuid: 'parent1',
|
||||
date: '2026-06-16',
|
||||
dayType: 'vacation' as const,
|
||||
isDubbeldag: false,
|
||||
createdAt: new Date().toISOString(),
|
||||
updatedAt: new Date().toISOString(),
|
||||
}
|
||||
|
||||
vi.mocked(api.getPlannedDays).mockResolvedValueOnce(initialData as any)
|
||||
vi.mocked(api.createPlannedDay).mockResolvedValue(newData as any)
|
||||
vi.mocked(api.getPlannedDays).mockResolvedValueOnce([...initialData, newData] as any)
|
||||
|
||||
const { result } = renderHook(() => usePlannedDays('child1'))
|
||||
|
||||
await act(async () => {
|
||||
await new Promise(resolve => setTimeout(resolve, 0))
|
||||
})
|
||||
|
||||
expect(result.current.data).toEqual(initialData)
|
||||
|
||||
await act(async () => {
|
||||
await result.current.add({ workspace_id: 'ws1', child_id: 'child1', date: '2026-06-16', day_type: 'vacation', parent_personal_data_uuid: 'parent1' })
|
||||
})
|
||||
|
||||
expect(result.current.data).toEqual([...initialData, newData])
|
||||
})
|
||||
|
||||
it('updates data after successful remove', async () => {
|
||||
const initialData = [
|
||||
{
|
||||
id: '1',
|
||||
workspaceId: 'ws1',
|
||||
childId: 'child1',
|
||||
parentPersonalDataUuid: 'parent1',
|
||||
date: '2026-06-15',
|
||||
dayType: 'vacation' as const,
|
||||
isDubbeldag: false,
|
||||
createdAt: new Date().toISOString(),
|
||||
updatedAt: new Date().toISOString(),
|
||||
},
|
||||
{
|
||||
id: '2',
|
||||
workspaceId: 'ws1',
|
||||
childId: 'child1',
|
||||
parentPersonalDataUuid: 'parent1',
|
||||
date: '2026-06-16',
|
||||
dayType: 'vacation' as const,
|
||||
isDubbeldag: false,
|
||||
createdAt: new Date().toISOString(),
|
||||
updatedAt: new Date().toISOString(),
|
||||
},
|
||||
]
|
||||
|
||||
vi.mocked(api.getPlannedDays).mockResolvedValueOnce(initialData as any)
|
||||
vi.mocked(api.deletePlannedDay).mockResolvedValue(undefined)
|
||||
vi.mocked(api.getPlannedDays).mockResolvedValueOnce([initialData[0]] as any)
|
||||
|
||||
const { result } = renderHook(() => usePlannedDays('child1'))
|
||||
|
||||
await act(async () => {
|
||||
await new Promise(resolve => setTimeout(resolve, 0))
|
||||
})
|
||||
|
||||
expect(result.current.data).toEqual(initialData)
|
||||
|
||||
await act(async () => {
|
||||
await result.current.remove('2')
|
||||
})
|
||||
|
||||
expect(result.current.data).toEqual([initialData[0]])
|
||||
})
|
||||
|
||||
it('refreshes data explicitly', async () => {
|
||||
const mockData = [
|
||||
{
|
||||
id: '1',
|
||||
workspaceId: 'ws1',
|
||||
childId: 'child1',
|
||||
parentPersonalDataUuid: 'parent1',
|
||||
date: '2026-06-15',
|
||||
dayType: 'vacation' as const,
|
||||
isDubbeldag: false,
|
||||
createdAt: new Date().toISOString(),
|
||||
updatedAt: new Date().toISOString(),
|
||||
},
|
||||
]
|
||||
|
||||
vi.mocked(api.getPlannedDays).mockResolvedValue(mockData as any)
|
||||
|
||||
const { result } = renderHook(() => usePlannedDays('child1'))
|
||||
|
||||
await act(async () => {
|
||||
await new Promise(resolve => setTimeout(resolve, 0))
|
||||
})
|
||||
|
||||
expect(api.getPlannedDays).toHaveBeenCalledWith('child1')
|
||||
const callCount = vi.mocked(api.getPlannedDays).mock.calls.length
|
||||
|
||||
await act(async () => {
|
||||
await result.current.refresh()
|
||||
})
|
||||
|
||||
expect(vi.mocked(api.getPlannedDays).mock.calls.length).toBeGreaterThan(callCount)
|
||||
})
|
||||
|
||||
it('sets loading state during fetch', async () => {
|
||||
let resolveGetPlannedDays: (value: any) => void
|
||||
const getPlannedDaysPromise = new Promise(resolve => {
|
||||
resolveGetPlannedDays = resolve
|
||||
})
|
||||
|
||||
vi.mocked(api.getPlannedDays).mockReturnValue(getPlannedDaysPromise as any)
|
||||
|
||||
const { result } = renderHook(() => usePlannedDays('child1'))
|
||||
|
||||
expect(result.current.isLoading).toBe(true)
|
||||
|
||||
await act(async () => {
|
||||
resolveGetPlannedDays!([])
|
||||
await getPlannedDaysPromise
|
||||
})
|
||||
|
||||
expect(result.current.isLoading).toBe(false)
|
||||
})
|
||||
|
||||
it('clears error on successful fetch after error', async () => {
|
||||
vi.mocked(api.getPlannedDays).mockRejectedValueOnce(new Error('Network error'))
|
||||
vi.mocked(api.getPlannedDays).mockResolvedValueOnce([])
|
||||
|
||||
const { result, rerender } = renderHook(({ childId }: { childId: string }) => usePlannedDays(childId), {
|
||||
initialProps: { childId: 'child1' },
|
||||
})
|
||||
|
||||
await act(async () => {
|
||||
await new Promise(resolve => setTimeout(resolve, 0))
|
||||
})
|
||||
|
||||
expect(result.current.error).toBe('Network error')
|
||||
|
||||
rerender({ childId: 'child2' })
|
||||
|
||||
await act(async () => {
|
||||
await new Promise(resolve => setTimeout(resolve, 0))
|
||||
})
|
||||
|
||||
expect(result.current.error).toBeNull()
|
||||
})
|
||||
|
||||
it('handles add error gracefully', async () => {
|
||||
vi.mocked(api.getPlannedDays).mockResolvedValue([])
|
||||
vi.mocked(api.createPlannedDay).mockRejectedValue(new Error('Create failed'))
|
||||
|
||||
const { result } = renderHook(() => usePlannedDays('child1'))
|
||||
|
||||
await act(async () => {
|
||||
await new Promise(resolve => setTimeout(resolve, 0))
|
||||
})
|
||||
|
||||
let addError: Error | undefined
|
||||
await act(async () => {
|
||||
try {
|
||||
await result.current.add({ workspace_id: 'ws1', child_id: 'child1', date: '2026-06-16', day_type: 'vacation', parent_personal_data_uuid: 'parent1' })
|
||||
} catch (err) {
|
||||
addError = err as Error
|
||||
}
|
||||
})
|
||||
|
||||
expect(addError?.message).toBe('Create failed')
|
||||
})
|
||||
|
||||
it('handles update error gracefully', async () => {
|
||||
vi.mocked(api.getPlannedDays).mockResolvedValue([])
|
||||
vi.mocked(api.updatePlannedDay).mockRejectedValue(new Error('Update failed'))
|
||||
|
||||
const { result } = renderHook(() => usePlannedDays('child1'))
|
||||
|
||||
await act(async () => {
|
||||
await new Promise(resolve => setTimeout(resolve, 0))
|
||||
})
|
||||
|
||||
let updateError: Error | undefined
|
||||
await act(async () => {
|
||||
try {
|
||||
await result.current.update('1', { day_type: 'lagsta' })
|
||||
} catch (err) {
|
||||
updateError = err as Error
|
||||
}
|
||||
})
|
||||
|
||||
expect(updateError?.message).toBe('Update failed')
|
||||
})
|
||||
|
||||
it('handles remove error gracefully', async () => {
|
||||
vi.mocked(api.getPlannedDays).mockResolvedValue([])
|
||||
vi.mocked(api.deletePlannedDay).mockRejectedValue(new Error('Delete failed'))
|
||||
|
||||
const { result } = renderHook(() => usePlannedDays('child1'))
|
||||
|
||||
await act(async () => {
|
||||
await new Promise(resolve => setTimeout(resolve, 0))
|
||||
})
|
||||
|
||||
let removeError: Error | undefined
|
||||
await act(async () => {
|
||||
try {
|
||||
await result.current.remove('1')
|
||||
} catch (err) {
|
||||
removeError = err as Error
|
||||
}
|
||||
})
|
||||
|
||||
expect(removeError?.message).toBe('Delete failed')
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user