refactor(dnd): remove drag-and-drop reorder for stories and tasks
- Remove reorderStoriesAction, reorderTasksAction, reorderSprintStoriesAction - Delete REST route app/api/stories/[id]/tasks/reorder/route.ts - Remove DnD from backlog story-panel and task-panel (flat list) - Remove reorder-within-sprint branch from sprint-board-client handleDragEnd - Switch SortableSprintRow to plain SprintRow using useDraggable (membership drag kept) - Remove all DnD from task-list (status toggle + edit kept) - Remove story-order/task-order/sprint-story-order/sprint-task-order mutation types and store handlers - Remove related tests for deleted reorder route; fix sprint store tests
This commit is contained in:
parent
b816cbe710
commit
f68d985c2c
16 changed files with 52 additions and 816 deletions
|
|
@ -1,111 +0,0 @@
|
|||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
|
||||
vi.mock('@/lib/prisma', () => ({
|
||||
prisma: {
|
||||
story: {
|
||||
findFirst: vi.fn(),
|
||||
},
|
||||
task: {
|
||||
update: vi.fn(),
|
||||
},
|
||||
$transaction: vi.fn(),
|
||||
},
|
||||
}))
|
||||
|
||||
vi.mock('@/lib/api-auth', () => ({
|
||||
authenticateApiRequest: vi.fn(),
|
||||
}))
|
||||
|
||||
import { prisma } from '@/lib/prisma'
|
||||
import { authenticateApiRequest } from '@/lib/api-auth'
|
||||
import { PATCH as patchReorder } from '@/app/api/stories/[id]/tasks/reorder/route'
|
||||
|
||||
const mockPrisma = prisma as unknown as {
|
||||
story: { findFirst: ReturnType<typeof vi.fn> }
|
||||
task: { update: ReturnType<typeof vi.fn> }
|
||||
$transaction: ReturnType<typeof vi.fn>
|
||||
}
|
||||
const mockAuth = authenticateApiRequest as ReturnType<typeof vi.fn>
|
||||
|
||||
function makeStory(taskIds: string[]) {
|
||||
return {
|
||||
id: 'story-1',
|
||||
product_id: 'prod-1',
|
||||
tasks: taskIds.map(id => ({ id })),
|
||||
}
|
||||
}
|
||||
|
||||
function makeRequest(body: unknown, storyId = 'story-1'): [Request, { params: Promise<{ id: string }> }] {
|
||||
return [
|
||||
new Request(`http://localhost/api/stories/${storyId}/tasks/reorder`, {
|
||||
method: 'PATCH',
|
||||
headers: { Authorization: 'Bearer test-token', 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(body),
|
||||
}),
|
||||
{ params: Promise.resolve({ id: storyId }) },
|
||||
]
|
||||
}
|
||||
|
||||
describe('PATCH /api/stories/:id/tasks/reorder', () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
mockAuth.mockResolvedValue({ userId: 'user-1', isDemo: false })
|
||||
mockPrisma.$transaction.mockResolvedValue([])
|
||||
mockPrisma.task.update.mockResolvedValue({ id: 'task-1', sort_order: 1 })
|
||||
})
|
||||
|
||||
// TC-RO-06 — body validation fires before story lookup
|
||||
it('returns 422 when task_ids is an empty array', async () => {
|
||||
const res = await patchReorder(...makeRequest({ task_ids: [] }))
|
||||
expect(res.status).toBe(422)
|
||||
expect(mockPrisma.story.findFirst).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
// TC-RO-07
|
||||
it('returns 422 when task_ids is not an array', async () => {
|
||||
const res = await patchReorder(...makeRequest({ task_ids: 'task-1' }))
|
||||
expect(res.status).toBe(422)
|
||||
expect(mockPrisma.story.findFirst).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('returns 422 when task_ids is missing entirely', async () => {
|
||||
const res = await patchReorder(...makeRequest({}))
|
||||
expect(res.status).toBe(422)
|
||||
})
|
||||
|
||||
// TC-RO-08
|
||||
it('returns 422 when task_ids contains an ID not belonging to the story', async () => {
|
||||
mockPrisma.story.findFirst.mockResolvedValue(makeStory(['task-1', 'task-2']))
|
||||
|
||||
const res = await patchReorder(...makeRequest({ task_ids: ['task-1', 'task-from-other-story'] }))
|
||||
const data = await res.json()
|
||||
|
||||
expect(res.status).toBe(422)
|
||||
expect(data.error).toContain('task-from-other-story')
|
||||
})
|
||||
|
||||
// TC-RO-09
|
||||
it('reorders tasks and returns 200 with success: true', async () => {
|
||||
mockPrisma.story.findFirst.mockResolvedValue(makeStory(['task-1', 'task-2', 'task-3']))
|
||||
|
||||
const res = await patchReorder(...makeRequest({ task_ids: ['task-3', 'task-1', 'task-2'] }))
|
||||
const data = await res.json()
|
||||
|
||||
expect(res.status).toBe(200)
|
||||
expect(data).toEqual({ success: true })
|
||||
expect(mockPrisma.$transaction).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('updates each task with its new sort_order index', async () => {
|
||||
mockPrisma.story.findFirst.mockResolvedValue(makeStory(['task-1', 'task-2']))
|
||||
|
||||
await patchReorder(...makeRequest({ task_ids: ['task-2', 'task-1'] }))
|
||||
|
||||
expect(mockPrisma.task.update).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ where: { id: 'task-2' }, data: { sort_order: 1 } })
|
||||
)
|
||||
expect(mockPrisma.task.update).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ where: { id: 'task-1' }, data: { sort_order: 2 } })
|
||||
)
|
||||
})
|
||||
})
|
||||
|
|
@ -54,7 +54,6 @@ import { authenticateApiRequest } from '@/lib/api-auth'
|
|||
import { GET as getProducts } from '@/app/api/products/route'
|
||||
import { GET as getNextStory } from '@/app/api/products/[id]/next-story/route'
|
||||
import { GET as getSprintTasks } from '@/app/api/sprints/[id]/tasks/route'
|
||||
import { PATCH as patchReorder } from '@/app/api/stories/[id]/tasks/reorder/route'
|
||||
import { POST as postStoryLog } from '@/app/api/stories/[id]/log/route'
|
||||
import { PATCH as patchTask } from '@/app/api/tasks/[id]/route'
|
||||
|
||||
|
|
@ -276,56 +275,6 @@ describe('GET /api/sprints/:id/tasks', () => {
|
|||
})
|
||||
})
|
||||
|
||||
// ─── PATCH /api/stories/:id/tasks/reorder ────────────────────────────────────
|
||||
|
||||
describe('PATCH /api/stories/:id/tasks/reorder', () => {
|
||||
const VALID_BODY = { task_ids: ['task-x'] }
|
||||
|
||||
// TC-RO-01
|
||||
it('returns 401 when no valid token provided', async () => {
|
||||
mockAuth.mockResolvedValue(UNAUTHORIZED)
|
||||
const res = await patchReorder(
|
||||
makePatch('http://localhost/api/stories/story-1/tasks/reorder', VALID_BODY),
|
||||
routeCtx('story-1')
|
||||
)
|
||||
expect(res.status).toBe(401)
|
||||
})
|
||||
|
||||
// TC-RO-03
|
||||
it('returns 403 for demo users', async () => {
|
||||
mockAuth.mockResolvedValue(DEMO_AUTH)
|
||||
const res = await patchReorder(
|
||||
makePatch('http://localhost/api/stories/story-1/tasks/reorder', VALID_BODY),
|
||||
routeCtx('story-1')
|
||||
)
|
||||
expect(res.status).toBe(403)
|
||||
const data = await res.json()
|
||||
expect(data.error).toBe('Niet beschikbaar in demo-modus')
|
||||
})
|
||||
|
||||
// TC-RO-04 / TC-RO-05
|
||||
it('returns 404 when story is not accessible to the authenticated user', async () => {
|
||||
mockAuth.mockResolvedValue(USER_2_AUTH)
|
||||
mockPrisma.story.findFirst.mockResolvedValue(null)
|
||||
|
||||
const res = await patchReorder(
|
||||
makePatch('http://localhost/api/stories/story-1/tasks/reorder', VALID_BODY),
|
||||
routeCtx('story-1')
|
||||
)
|
||||
expect(res.status).toBe(404)
|
||||
expect(mockPrisma.story.findFirst).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
where: expect.objectContaining({
|
||||
id: 'story-1',
|
||||
product: expect.objectContaining({
|
||||
OR: expect.arrayContaining([{ user_id: 'user-2' }]),
|
||||
}),
|
||||
}),
|
||||
})
|
||||
)
|
||||
})
|
||||
})
|
||||
|
||||
// ─── POST /api/stories/:id/log ────────────────────────────────────────────────
|
||||
|
||||
describe('POST /api/stories/:id/log', () => {
|
||||
|
|
|
|||
|
|
@ -852,56 +852,6 @@ describe('restore-hint flow — chain triggert na ensure*Loaded', () => {
|
|||
// ─────────────────────────────────────────────────────────────────────────
|
||||
|
||||
describe('optimistic mutations', () => {
|
||||
it('rollback herstelt vorige sprint-story-order', () => {
|
||||
useSprintWorkspaceStore.getState().hydrateSnapshot(
|
||||
snapshotWith(
|
||||
makeSprint({ id: 'sp-1', product_id: 'prod-1' }),
|
||||
[
|
||||
makeStory({ id: 'a', pbi_id: 'p', sprint_id: 'sp-1', sort_order: 1 }),
|
||||
makeStory({ id: 'b', pbi_id: 'p', sprint_id: 'sp-1', sort_order: 2 }),
|
||||
],
|
||||
),
|
||||
)
|
||||
const prevOrder = [
|
||||
...useSprintWorkspaceStore.getState().relations.storyIdsBySprint['sp-1'],
|
||||
]
|
||||
|
||||
const id = useSprintWorkspaceStore.getState().applyOptimisticMutation({
|
||||
kind: 'sprint-story-order',
|
||||
sprintId: 'sp-1',
|
||||
prevStoryIds: prevOrder,
|
||||
})
|
||||
useSprintWorkspaceStore.setState((s) => {
|
||||
s.relations.storyIdsBySprint['sp-1'] = ['b', 'a']
|
||||
})
|
||||
|
||||
useSprintWorkspaceStore.getState().rollbackMutation(id)
|
||||
expect(useSprintWorkspaceStore.getState().relations.storyIdsBySprint['sp-1']).toEqual(
|
||||
prevOrder,
|
||||
)
|
||||
expect(useSprintWorkspaceStore.getState().pendingMutations[id]).toBeUndefined()
|
||||
})
|
||||
|
||||
it('settle ruimt pending op zonder state te wijzigen', () => {
|
||||
useSprintWorkspaceStore.getState().hydrateSnapshot(
|
||||
snapshotWith(makeSprint({ id: 'sp-1', product_id: 'prod-1' }), [
|
||||
makeStory({ id: 'a', pbi_id: 'p', sprint_id: 'sp-1' }),
|
||||
]),
|
||||
)
|
||||
const id = useSprintWorkspaceStore.getState().applyOptimisticMutation({
|
||||
kind: 'sprint-story-order',
|
||||
sprintId: 'sp-1',
|
||||
prevStoryIds: ['a'],
|
||||
})
|
||||
expect(useSprintWorkspaceStore.getState().pendingMutations[id]).toBeDefined()
|
||||
|
||||
useSprintWorkspaceStore.getState().settleMutation(id)
|
||||
expect(useSprintWorkspaceStore.getState().pendingMutations[id]).toBeUndefined()
|
||||
expect(useSprintWorkspaceStore.getState().relations.storyIdsBySprint['sp-1']).toEqual([
|
||||
'a',
|
||||
])
|
||||
})
|
||||
|
||||
it('SSE-echo van een al-bestaande sprint is idempotent', () => {
|
||||
useSprintWorkspaceStore.setState((s) => {
|
||||
s.context.activeProduct = { id: 'prod-1', name: 'P' }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue