From 09a8e7a38f1b480af5952c4f2776f2cd06bc319a Mon Sep 17 00:00:00 2001 From: "i.seliverstov" Date: Sun, 18 Oct 2026 14:01:28 +0500 Subject: [PATCH] feat(backlog): create tasks through full modal form --- .../features/projects/ui/BacklogStoryRow.vue | 17 +--- .../src/features/projects/ui/SprintBlock.vue | 24 ++---- .../src/views/ProjectBacklogView.vue | 78 ++++++++++++++++--- .../projects/ui/BacklogStoryRow.spec.ts | 5 +- .../features/projects/ui/SprintBlock.spec.ts | 14 ++-- .../tests/views/ProjectBacklogView.spec.ts | 68 ++++++++++++++-- 6 files changed, 144 insertions(+), 62 deletions(-) diff --git a/alfy-bot-frontend/src/features/projects/ui/BacklogStoryRow.vue b/alfy-bot-frontend/src/features/projects/ui/BacklogStoryRow.vue index 8e78665..62babf7 100644 --- a/alfy-bot-frontend/src/features/projects/ui/BacklogStoryRow.vue +++ b/alfy-bot-frontend/src/features/projects/ui/BacklogStoryRow.vue @@ -11,7 +11,6 @@ import { releaseLabel } from '../lib/release' import { useReleaseStore } from '../model/release-store' import { useGroupDetail } from '../model/use-group-detail' import BacklogTaskRow from './BacklogTaskRow.vue' -import InlineTitleInput from './InlineTitleInput.vue' import ReleasePickerContent from './ReleasePickerContent.vue' const props = defineProps<{ @@ -21,7 +20,7 @@ const props = defineProps<{ }>() const emit = defineEmits<{ - createTask: [groupId: string, title: string] + createTask: [groupId: string] openTask: [task: Task] toggleTask: [id: string] moveTask: [taskId: string, sprintId: string | null] @@ -29,7 +28,6 @@ const emit = defineEmits<{ }>() const expanded = ref(false) -const addingTask = ref(false) const releaseOpen = ref(false) const savingRelease = ref(false) const errorMessage = ref(null) @@ -39,14 +37,9 @@ const story = computed(() => props.entry.story) const label = computed(() => releaseLabel(releaseStore.releasesOf(story.value.projectId), story.value.releaseId)) const released = computed(() => releaseStore.releasesOf(story.value.projectId).some(r => r.id === story.value.releaseId && r.status === 'released')) -function createTask(title: string) { - emit('createTask', story.value.id, title) - addingTask.value = false -} - function startAddingTask() { expanded.value = true - addingTask.value = true + emit('createTask', story.value.id) } async function setRelease(releaseId: string | null) { @@ -136,11 +129,7 @@ function handleChange(event: { added?: { element: Task } }) {
-

- Новая задача будет без релиза. Релиз можно выбрать в её карточке. -

- -
diff --git a/alfy-bot-frontend/src/features/projects/ui/SprintBlock.vue b/alfy-bot-frontend/src/features/projects/ui/SprintBlock.vue index 8e3d6fb..5c5384b 100644 --- a/alfy-bot-frontend/src/features/projects/ui/SprintBlock.vue +++ b/alfy-bot-frontend/src/features/projects/ui/SprintBlock.vue @@ -20,7 +20,6 @@ import { useGroupStore } from '../model/group-store' import { useSprintStore } from '../model/sprint-store' import BacklogStoryRow from './BacklogStoryRow.vue' import BacklogTaskRow from './BacklogTaskRow.vue' -import InlineTitleInput from './InlineTitleInput.vue' /** * Блок вкладки «Бэклог»: один спринт проекта или сам бэклог (`sprint = null`). @@ -64,10 +63,10 @@ const emit = defineEmits<{ /** Задача перенесена в этот блок или выбрана в меню «В спринт…»: id задачи и id спринта (`null` — бэклог). */ moveTask: [taskId: string, sprintId: string | null] moveStory: [storyId: string, sprintId: string | null] - /** Введено название новой задачи. */ - createTask: [title: string] + /** Запрошено создание задачи в текущем блоке. */ + createTask: [] /** Создание задачи с группой истории в спринте текущего блока. */ - createStoryTask: [groupId: string, title: string] + createStoryTask: [groupId: string] /** Клик по строке задачи. */ openTask: [task: Task] /** Смена отметки выполнения задачи. */ @@ -83,7 +82,6 @@ const planningTasks = computed(() => taskStore.tasks.filter(t => t.projectId === const stories = computed(() => backlogStories(tree.value, props.tasks, planningTasks.value, props.sprint?.id ?? null, props.epicFilter, props.showCompleted)) const standaloneTasks = computed(() => standaloneBacklogTasks(props.tasks, tree.value)) -const addingTask = ref(false) const keepFocusOnClose = ref(false) const showStart = computed(() => @@ -135,11 +133,6 @@ function onCloseAutoFocus(event: Event) { keepFocusOnClose.value = false event.preventDefault() } - -function handleCreateTask(taskTitle: string) { - addingTask.value = false - emit('createTask', taskTitle) -} diff --git a/alfy-bot-frontend/src/views/ProjectBacklogView.vue b/alfy-bot-frontend/src/views/ProjectBacklogView.vue index 0972c26..cc576f4 100644 --- a/alfy-bot-frontend/src/views/ProjectBacklogView.vue +++ b/alfy-bot-frontend/src/views/ProjectBacklogView.vue @@ -8,6 +8,7 @@ import { computed, inject, onMounted, ref, watch } from 'vue' import { useRoute, useRouter } from 'vue-router' import AppHeader from '@/components/AppHeader.vue' import { Button } from '@/components/ui/button' +import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog' import { useConfirm } from '@/composables/useConfirm' import { apiErrorMessage } from '@/features/projects/lib/api-error' import { matchesEpic } from '@/features/projects/lib/backlog-stories' @@ -28,6 +29,7 @@ import { useShowCompleted } from '@/features/tasks/lib/use-show-completed' import { useTaskDetailHandlers } from '@/features/tasks/lib/use-task-detail-handlers' import { useTaskStore } from '@/features/tasks/model/task-store' import TaskDetailDialog from '@/features/tasks/ui/TaskDetailDialog.vue' +import TaskForm from '@/features/tasks/ui/TaskForm.vue' import TaskListOptionsMenu from '@/features/tasks/ui/TaskListOptionsMenu.vue' const openSidebar = inject<() => void>('openSidebar') @@ -101,15 +103,51 @@ async function handleMoveStory(storyId: string, sprintId: string | null) { } } -async function handleCreateTask(sprintId: string | null, title: string, groupId?: string) { - actionError.value = null +const creationTarget = ref<{ projectId: string, sprintId: string | null, groupId?: string } | null>(null) +const isCreatingTask = ref(false) +const taskCreationError = ref(null) +const creationStory = computed(() => creationTarget.value?.groupId + ? findGroup(groupStore.groupsOf(creationTarget.value.projectId), creationTarget.value.groupId) + : null) +const isReleasedStory = computed(() => !!creationTarget.value && releaseStore.releasesOf(creationTarget.value.projectId) + .some(release => release.id === creationStory.value?.releaseId && release.status === 'released')) +const creationLabel = computed(() => { + const target = creationTarget.value + if (!target) + return '' + const sprint = sprintStore.lists[target.projectId]?.find(item => item.id === target.sprintId) + return [project.value?.title, sprint?.name ?? 'Бэклог', creationStory.value?.title].filter(Boolean).join(' · ') +}) + +function openTaskCreation(sprintId: string | null, groupId?: string) { + if (isCreatingTask.value) + return + taskCreationError.value = null + creationTarget.value = { projectId: projectId.value, sprintId, groupId } +} + +function closeTaskCreation(open: boolean) { + if (!open && !isCreatingTask.value) + creationTarget.value = null +} + +async function handleCreateTask(data: Omit) { + const target = creationTarget.value + if (!target || isCreatingTask.value) + return + isCreatingTask.value = true + taskCreationError.value = null try { - const story = groupId ? findGroup(groupStore.groupsOf(projectId.value), groupId) : null - const releasedStory = releaseStore.releasesOf(projectId.value).some(r => r.id === story?.releaseId && r.status === 'released') - await taskStore.createTask({ title, completed: false, projectId: projectId.value, sprintId, ...(groupId ? { groupId } : {}), ...(releasedStory ? { releaseId: null } : {}) }) + await taskStore.createTask({ ...data, completed: false, projectId: target.projectId, sprintId: target.sprintId, groupId: target.groupId ?? null, ...(isReleasedStory.value ? { releaseId: null } : {}) }) + if (creationTarget.value === target) + creationTarget.value = null } catch (err) { - actionError.value = apiErrorMessage(err, 'Не удалось создать задачу') + if (creationTarget.value === target) + taskCreationError.value = apiErrorMessage(err, 'Не удалось создать задачу') + } + finally { + isCreatingTask.value = false } } @@ -173,6 +211,7 @@ onMounted(() => { watch(projectId, (id) => { epicFilter.value = 'all' actionError.value = null + creationTarget.value = null if (id) loadProjectData(id) }) @@ -230,8 +269,8 @@ watch([projectId, isAgileProject], ([id, isAgile]) => { @complete="completeTarget = activeSprint" @move-task="handleMoveTask" @move-story="handleMoveStory" - @create-task="handleCreateTask(activeSprint.id, $event)" - @create-story-task="(groupId, title) => handleCreateTask(activeSprint!.id, title, groupId)" + @create-task="openTaskCreation(activeSprint.id)" + @create-story-task="groupId => openTaskCreation(activeSprint!.id, groupId)" @open-task="handleOpenTask" @toggle-task="handleToggleTask" /> @@ -251,8 +290,8 @@ watch([projectId, isAgileProject], ([id, isAgile]) => { @delete="handleDeleteSprint(sprint)" @move-task="handleMoveTask" @move-story="handleMoveStory" - @create-task="handleCreateTask(sprint.id, $event)" - @create-story-task="(groupId, title) => handleCreateTask(sprint.id, title, groupId)" + @create-task="openTaskCreation(sprint.id)" + @create-story-task="groupId => openTaskCreation(sprint.id, groupId)" @open-task="handleOpenTask" @toggle-task="handleToggleTask" /> @@ -271,8 +310,8 @@ watch([projectId, isAgileProject], ([id, isAgile]) => { :has-active-sprint="!!activeSprint" @move-task="handleMoveTask" @move-story="handleMoveStory" - @create-task="handleCreateTask(null, $event)" - @create-story-task="(groupId, title) => handleCreateTask(null, title, groupId)" + @create-task="openTaskCreation(null)" + @create-story-task="groupId => openTaskCreation(null, groupId)" @open-task="handleOpenTask" @toggle-task="handleToggleTask" /> @@ -280,6 +319,21 @@ watch([projectId, isAgileProject], ([id, isAgile]) => { + + + + Новая задача + {{ creationLabel }} + +

+ Новая задача будет без релиза. Релиз можно выбрать в её карточке. +

+ + +
+
{ expect(row.find('[data-task-id]').exists()).toBe(false) await row.get('button[aria-label="Добавить задачу в историю Оплата"]').trigger('click') expect(row.find('[data-task-id="task"]').exists()).toBe(true) - await row.get('input[placeholder="Название задачи в истории"]').setValue('Проверка оплаты') - await row.get('input[placeholder="Название задачи в истории"]').trigger('keydown.enter') - expect(row.emitted('createTask')).toEqual([['story', 'Проверка оплаты']]) + expect(row.find('input[placeholder="Название задачи в истории"]').exists()).toBe(false) + expect(row.emitted('createTask')).toEqual([['story']]) row.unmount() }) diff --git a/alfy-bot-frontend/tests/features/projects/ui/SprintBlock.spec.ts b/alfy-bot-frontend/tests/features/projects/ui/SprintBlock.spec.ts index cbd4931..d94efe6 100644 --- a/alfy-bot-frontend/tests/features/projects/ui/SprintBlock.spec.ts +++ b/alfy-bot-frontend/tests/features/projects/ui/SprintBlock.spec.ts @@ -98,15 +98,13 @@ describe('sprintBlock', () => { backlog.unmount() }) - it('«+ задача» в блоке спринта эмитит createTask с названием', async () => { + it('«+ задача» в блоке спринта запрашивает модалку создания', async () => { const wrapper = mountBlock({ sprint: makeSprint() }) await buttonByText(wrapper, 'задача')!.trigger('click') - const input = wrapper.find('input') - await input.setValue('Новая') - await input.trigger('keydown.enter') + expect(wrapper.find('input').exists()).toBe(false) - expect(wrapper.emitted('createTask')).toEqual([['Новая']]) + expect(wrapper.emitted('createTask')).toEqual([[]]) wrapper.unmount() }) @@ -114,11 +112,9 @@ describe('sprintBlock', () => { const wrapper = mountBlock({ sprint: null }) await buttonByText(wrapper, 'задача')!.trigger('click') - const input = wrapper.find('input') - await input.setValue('В бэклог') - await input.trigger('keydown.enter') + expect(wrapper.find('input').exists()).toBe(false) - expect(wrapper.emitted('createTask')).toEqual([['В бэклог']]) + expect(wrapper.emitted('createTask')).toEqual([[]]) wrapper.unmount() }) diff --git a/alfy-bot-frontend/tests/views/ProjectBacklogView.spec.ts b/alfy-bot-frontend/tests/views/ProjectBacklogView.spec.ts index 8b450bb..11c2740 100644 --- a/alfy-bot-frontend/tests/views/ProjectBacklogView.spec.ts +++ b/alfy-bot-frontend/tests/views/ProjectBacklogView.spec.ts @@ -16,6 +16,7 @@ import SprintBlock from '@/features/projects/ui/SprintBlock.vue' import SprintCompleteDialog from '@/features/projects/ui/SprintCompleteDialog.vue' import SprintFormDialog from '@/features/projects/ui/SprintFormDialog.vue' import TaskDetailDialog from '@/features/tasks/ui/TaskDetailDialog.vue' +import TaskForm from '@/features/tasks/ui/TaskForm.vue' import ProjectBacklogView from '@/views/ProjectBacklogView.vue' vi.mock('@/api/client', () => ({ @@ -105,6 +106,7 @@ function rawTask(overrides: Record = {}) { } const stubs = { + TaskForm: true, TaskDetailDialog: true, TaskListOptionsMenu: true, BacklogEpicsPanel: true, @@ -185,16 +187,68 @@ describe('projectBacklogView', () => { vi.mocked(api.post).mockImplementation(async (_url, body: any) => ({ data: { id: `srv-${body.title}`, ...body } })) const blocks = wrapper.findAllComponents(SprintBlock) - blocks[0]!.vm.$emit('createTask', 'В спринт') - blocks[1]!.vm.$emit('createTask', 'В бэклог') + blocks[0]!.vm.$emit('createTask') + await flushPromises() + expect(api.post).not.toHaveBeenCalled() + wrapper.getComponent(TaskForm).vm.$emit('submit', { title: 'В спринт', description: 'Подробности', priority: 'high' }) + await flushPromises() + expect(wrapper.findComponent(TaskForm).exists()).toBe(false) + blocks[1]!.vm.$emit('createTask') + await flushPromises() + wrapper.getComponent(TaskForm).vm.$emit('submit', { title: 'В бэклог' }) await flushPromises() const bodies = vi.mocked(api.post).mock.calls.map(c => c[1] as Record) - expect(bodies).toContainEqual(expect.objectContaining({ title: 'В спринт', sprintId: 'active', projectId: 'proj-1' })) + expect(bodies).toContainEqual(expect.objectContaining({ title: 'В спринт', description: 'Подробности', priority: 'high', sprintId: 'active', projectId: 'proj-1' })) expect(bodies).toContainEqual(expect.objectContaining({ title: 'В бэклог', sprintId: null, projectId: 'proj-1' })) wrapper.unmount() }) + it('отмена закрывает форму без создания задачи', async () => { + const wrapper = await mountView([]) + wrapper.getComponent(SprintBlock).vm.$emit('createTask') + await flushPromises() + wrapper.getComponent(TaskForm).vm.$emit('cancel') + await flushPromises() + expect(wrapper.findComponent(TaskForm).exists()).toBe(false) + expect(api.post).not.toHaveBeenCalled() + wrapper.unmount() + }) + + it('сбой сохранения оставляет форму открытой и показывает ошибку', async () => { + const wrapper = await mountView([]) + vi.mocked(api.post).mockRejectedValueOnce(new Error('Сеть недоступна')) + wrapper.getComponent(SprintBlock).vm.$emit('createTask') + await flushPromises() + wrapper.getComponent(TaskForm).vm.$emit('submit', { title: 'Сохранить черновик' }) + await flushPromises() + expect(wrapper.findComponent(TaskForm).exists()).toBe(true) + expect(document.body.textContent).toContain('Сеть недоступна') + expect(wrapper.getComponent(TaskForm).props('loading')).toBe(false) + wrapper.unmount() + }) + + it('блокирует повторное создание и закрытие во время запроса', async () => { + const wrapper = await mountView([]) + let finish!: (value: unknown) => void + vi.mocked(api.post).mockReturnValueOnce(new Promise((resolve) => { + finish = resolve + }) as any) + wrapper.getComponent(SprintBlock).vm.$emit('createTask') + await flushPromises() + const form = wrapper.getComponent(TaskForm) + form.vm.$emit('submit', { title: 'Один запрос' }) + form.vm.$emit('submit', { title: 'Один запрос' }) + form.vm.$emit('cancel') + await flushPromises() + expect(api.post).toHaveBeenCalledTimes(1) + expect(wrapper.findComponent(TaskForm).exists()).toBe(true) + finish({ data: rawTask({ title: 'Один запрос' }) }) + await flushPromises() + expect(wrapper.findComponent(TaskForm).exists()).toBe(false) + wrapper.unmount() + }) + it('фильтрует все блоки по эпику и оставляет полный счётчик спринта', async () => { const wrapper = await mountView([makeSprint({ id: 'active' })], [rawTask({ id: 'a', groupId: 'epic-a', sprintId: 'active' }), rawTask({ id: 'b', groupId: 'epic-b', sprintId: 'active' }), rawTask({ id: 'c', groupId: null, sprintId: null })]) useGroupStore().trees['proj-1'] = [{ id: 'epic-a', children: [] }, { id: 'epic-b', children: [] }] as BoardGroupNode[] @@ -212,7 +266,9 @@ describe('projectBacklogView', () => { it('создание из истории передаёт группу и спринт без явного релиза', async () => { const wrapper = await mountView([makeSprint({ id: 'active' })]) vi.mocked(api.post).mockImplementation(async (_url, body: any) => ({ data: { id: 'new-task', ...body } })) - wrapper.findAllComponents(SprintBlock)[0]!.vm.$emit('createStoryTask', 'story-1', 'Новая в истории') + wrapper.findAllComponents(SprintBlock)[0]!.vm.$emit('createStoryTask', 'story-1') + await flushPromises() + wrapper.getComponent(TaskForm).vm.$emit('submit', { title: 'Новая в истории' }) await flushPromises() const payload = vi.mocked(api.post).mock.calls.find(call => call[0] === '/tasks')?.[1] as Record expect(payload).toMatchObject({ groupId: 'story-1', sprintId: 'active', projectId: 'proj-1' }) @@ -225,7 +281,9 @@ describe('projectBacklogView', () => { useGroupStore().trees['proj-1'] = [{ id: 'story-1', releaseId: 'shipped', children: [] } as unknown as BoardGroupNode] useReleaseStore().lists['proj-1'] = [{ id: 'shipped', status: 'released' } as any] vi.mocked(api.post).mockImplementation(async (_url, body: any) => ({ data: { id: 'new-task', ...body } })) - wrapper.findAllComponents(SprintBlock)[0]!.vm.$emit('createStoryTask', 'story-1', 'Новая работа') + wrapper.findAllComponents(SprintBlock)[0]!.vm.$emit('createStoryTask', 'story-1') + await flushPromises() + wrapper.getComponent(TaskForm).vm.$emit('submit', { title: 'Новая работа' }) await flushPromises() expect(vi.mocked(api.post).mock.calls.find(call => call[0] === '/tasks')?.[1]).toMatchObject({ groupId: 'story-1', releaseId: null }) wrapper.unmount()