Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
- **📱 Три поверхности, один бэкенд.** Telegram-бот (telegraf), Telegram WebApp и обычный SPA — всё работает поверх одного REST API. Веб собран как PWA (offline, web-push, установка на домашний экран).
- **🧱 Чистая архитектура.** Бэкенд — Clean Architecture по модулям (порты в `domain/`, адаптеры в `infrastructure/`, оркестрация в сервисах). Фронтенд — Feature-Sliced Design. Границы слоёв реальны, а не декоративны.
- **🌍 Корректные таймзоны и локали.** Все операции с датами уважают IANA-таймзону пользователя; даты в БД хранятся в UTC и сдвигаются к wall-clock пользователя на границе домена. Календарь, локаль и первый день недели — из настроек пользователя.
- **🗓 Богатый UI задач.** Inbox, проекты со списками и board-колонками, повторяющиеся задачи, календарь с drag-create по сетке часов, Pomodoro-таймер, два независимых drag-and-drop-движка (кастомный на PointerEvents + vuedraggable). Agile-проекты включают эпики, истории, спринты и релизы; историю можно перенести в спринт целиком с задачами через меню или drag-and-drop.
- **🗓 Богатый UI задач.** Inbox, проекты со списками и board-колонками, повторяющиеся задачи, календарь с drag-create по сетке часов, Pomodoro-таймер, два независимых drag-and-drop-движка (кастомный на PointerEvents + vuedraggable). Agile-проекты включают эпики, истории, спринты и релизы; историю можно перенести в спринт целиком с задачами через меню или drag-and-drop. Стрелки ↑/↓ прямо на доске меняют порядок эпиков и историй внутри эпика; порядок сохраняется после перезагрузки.
- **🔔 Уведомления.** Web-push (VAPID) с подписками на устройство.

---
Expand Down
16 changes: 13 additions & 3 deletions alfy-bot-frontend/src/features/projects/model/group-store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,12 @@ export const useGroupStore = defineStore('groups', () => {

const reorderGroups = async (projectId: string, orderedIds: string[]) => {
const tree = trees.value[projectId] ?? []
const previous = tree
const firstId = orderedIds[0]
const isRootLevel = tree.some(node => node.id === firstId)
const parent = isRootLevel ? undefined : tree.find(epic => epic.children.some(child => child.id === firstId))
const previousSiblings = isRootLevel ? tree : parent?.children ?? []
const previousOrders = new Map(previousSiblings.map(node => [node.id, node.order]))
const previousRanks = new Map(previousSiblings.map((node, index) => [node.id, index]))

if (isRootLevel) {
trees.value[projectId] = orderedIds
Expand All @@ -167,7 +170,6 @@ export const useGroupStore = defineStore('groups', () => {
.filter((n): n is BoardGroupNode => n !== null)
}
else {
const parent = tree.find(epic => epic.children.some(child => child.id === firstId))
if (parent) {
trees.value[projectId] = replaceNode(tree, parent.id, node => ({
...node,
Expand All @@ -185,7 +187,15 @@ export const useGroupStore = defineStore('groups', () => {
await groupsApi.reorderGroups(projectId, orderedIds)
}
catch (err) {
trees.value[projectId] = previous
const restoreOrder = (nodes: BoardGroupNode[]) => nodes
.map(node => ({ ...node, order: previousOrders.get(node.id) ?? node.order }))
.sort((a, b) => a.order - b.order
|| (previousRanks.get(a.id) ?? Number.MAX_SAFE_INTEGER) - (previousRanks.get(b.id) ?? Number.MAX_SAFE_INTEGER))
const current = trees.value[projectId] ?? []
if (isRootLevel)
trees.value[projectId] = restoreOrder(current)
else if (parent)
trees.value[projectId] = replaceNode(current, parent.id, node => ({ ...node, children: restoreOrder(node.children) }))
throw err
}
}
Expand Down
43 changes: 42 additions & 1 deletion alfy-bot-frontend/src/features/projects/ui/AgileBoardView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ const { deleteGroupWithConfirm } = useGroupDeletion()
const groupDetail = useGroupDetail()

const addingEpic = ref(false)
const reordering = ref(false)
const reorderError = ref<string | null>(null)

const sortedColumns = computed(() =>
[...columnStore.columns].sort((a, b) => a.order - b.order),
Expand Down Expand Up @@ -84,6 +86,37 @@ function laneTaskCount(lane: ProjectColumn): number {
return projectTasksByColumn.value.get(lane.id)?.length ?? 0
}

async function handleMoveGroup(group: BoardGroupNode, direction: -1 | 1) {
if (reordering.value)
return

const projectId = props.projectId
const tree = groupStore.groupsOf(projectId)
const siblings = [...(group.parentId ? tree.find(epic => epic.id === group.parentId)?.children ?? [] : tree)]
.sort((a, b) => a.order - b.order)
const index = siblings.findIndex(sibling => sibling.id === group.id)
const targetIndex = index + direction
if (index < 0 || targetIndex < 0 || targetIndex >= siblings.length)
return

const orderedIds = siblings.map(sibling => sibling.id)
const targetId = orderedIds[targetIndex]!
orderedIds[targetIndex] = group.id
orderedIds[index] = targetId
reordering.value = true
reorderError.value = null
try {
await groupStore.reorderGroups(projectId, orderedIds)
}
catch {
if (props.projectId === projectId)
reorderError.value = 'Не удалось сохранить порядок. Прежний порядок восстановлен. Попробуйте ещё раз.'
}
finally {
reordering.value = false
}
}

async function handleToggleGroupDone(group: BoardGroupNode) {
await groupStore.toggleGroupDone(props.projectId, group)
}
Expand Down Expand Up @@ -133,6 +166,7 @@ function handleTaskChange(event: any, columnId: string, groupId: string | null,
}

watch(() => props.projectId, (id) => {
reorderError.value = null
if (id) {
columnStore.fetchColumns(id)
groupStore.fetchGroups(id)
Expand All @@ -145,6 +179,9 @@ watch(() => props.projectId, (id) => {
<div class="animate-spin rounded-full h-8 w-8 border-b-2 border-primary mx-auto" />
</div>
<div v-else class="overflow-x-auto pb-4 h-full">
<p v-if="reorderError" role="alert" class="sticky left-0 mb-3 text-sm text-destructive">
{{ reorderError }}
</p>
<div class="grid gap-x-2" :style="{ gridTemplateColumns: `repeat(${lanes.length}, ${COLUMN_WIDTH_PX}px)` }">
<div class="contents">
<div
Expand All @@ -163,12 +200,16 @@ watch(() => props.projectId, (id) => {
</div>

<AgileEpicBlock
v-for="row in epicRows"
v-for="(row, index) in epicRows"
:key="row.epic.id"
:epic="row.epic"
:stories="row.stories"
:epic-tasks="row.epicTasks"
:lanes="lanes"
:can-move-up="index > 0"
:can-move-down="index < epicRows.length - 1"
:reordering="reordering"
@move-group="handleMoveGroup"
@toggle-task="$emit('toggleTask', $event)"
@open-task="$emit('openTask', $event)"
@task-change="handleTaskChange"
Expand Down
18 changes: 17 additions & 1 deletion alfy-bot-frontend/src/features/projects/ui/AgileEpicBlock.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,21 @@ import { groupTasksByColumn } from '../lib/agile-layout'
import AgileCell from './AgileCell.vue'
import AgileStoryBlock from './AgileStoryBlock.vue'
import GroupActionsMenu from './GroupActionsMenu.vue'
import GroupOrderControls from './GroupOrderControls.vue'
import InlineTitleInput from './InlineTitleInput.vue'

const props = defineProps<{
epic: BoardGroupNode
stories: AgileStoryRow[]
epicTasks: Task[]
lanes: ProjectColumn[]
canMoveUp?: boolean
canMoveDown?: boolean
reordering?: boolean
}>()

const emit = defineEmits<{
moveGroup: [group: BoardGroupNode, direction: -1 | 1]
toggleTask: [id: string]
openTask: [task: Task]
taskChange: [event: any, columnId: string, groupId: string | null, tasks: Task[]]
Expand Down Expand Up @@ -109,6 +114,13 @@ function handleCreateStory(title: string) {
<span class="text-xs text-muted-foreground shrink-0">{{ totalCount }}</span>
<span class="text-xs text-muted-foreground shrink-0">{{ doneCount }} из {{ totalCount }} готово</span>
<div class="flex items-center gap-0.5 shrink-0">
<GroupOrderControls
:label="`эпик ${epic.title}`"
:can-move-up="!!canMoveUp"
:can-move-down="!!canMoveDown"
:pending="!!reordering"
@move="direction => $emit('moveGroup', epic, direction)"
/>
<Button
variant="ghost"
size="icon-sm"
Expand All @@ -132,11 +144,15 @@ function handleCreateStory(title: string) {

<template v-if="!collapsed">
<AgileStoryBlock
v-for="storyRow in stories"
v-for="(storyRow, index) in stories"
:key="storyRow.story.id"
:story="storyRow.story"
:tasks="storyRow.tasks"
:lanes="lanes"
:can-move-up="index > 0"
:can-move-down="index < stories.length - 1"
:reordering="reordering"
@move-group="(group, direction) => $emit('moveGroup', group, direction)"
@toggle-task="$emit('toggleTask', $event)"
@open-task="$emit('openTask', $event)"
@task-change="(...args) => $emit('taskChange', ...args)"
Expand Down
12 changes: 12 additions & 0 deletions alfy-bot-frontend/src/features/projects/ui/AgileStoryBlock.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,20 @@ import { Button } from '@/components/ui/button'
import { groupTasksByColumn } from '../lib/agile-layout'
import AgileCell from './AgileCell.vue'
import GroupActionsMenu from './GroupActionsMenu.vue'
import GroupOrderControls from './GroupOrderControls.vue'
import InlineTitleInput from './InlineTitleInput.vue'

const props = defineProps<{
story: BoardGroupNode
tasks: Task[]
lanes: ProjectColumn[]
canMoveUp?: boolean
canMoveDown?: boolean
reordering?: boolean
}>()

const emit = defineEmits<{
moveGroup: [group: BoardGroupNode, direction: -1 | 1]
toggleTask: [id: string]
openTask: [task: Task]
taskChange: [event: any, columnId: string, groupId: string | null, tasks: Task[]]
Expand Down Expand Up @@ -67,6 +72,13 @@ function handleCreateTask(title: string) {
</button>
<span class="text-[11px] text-muted-foreground/60 shrink-0">{{ tasks.length }}</span>
<div class="flex items-center gap-0.5 shrink-0">
<GroupOrderControls
:label="`историю ${story.title}`"
:can-move-up="!!canMoveUp"
:can-move-down="!!canMoveDown"
:pending="!!reordering"
@move="direction => $emit('moveGroup', story, direction)"
/>
<Button
variant="ghost"
size="icon-sm"
Expand Down
42 changes: 42 additions & 0 deletions alfy-bot-frontend/src/features/projects/ui/GroupOrderControls.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<script setup lang="ts">
import { ArrowDown, ArrowUp } from 'lucide-vue-next'
import { Button } from '@/components/ui/button'

defineProps<{
label: string
canMoveUp: boolean
canMoveDown: boolean
pending: boolean
}>()

defineEmits<{
move: [direction: -1 | 1]
}>()
</script>

<template>
<div class="flex items-center shrink-0">
<Button
variant="ghost"
size="icon-sm"
class="text-muted-foreground hover:text-foreground"
:aria-label="`Переместить ${label} выше`"
:title="`Переместить ${label} выше`"
:disabled="pending || !canMoveUp"
@click="$emit('move', -1)"
>
<ArrowUp :size="14" />
</Button>
<Button
variant="ghost"
size="icon-sm"
class="text-muted-foreground hover:text-foreground"
:aria-label="`Переместить ${label} ниже`"
:title="`Переместить ${label} ниже`"
:disabled="pending || !canMoveDown"
@click="$emit('move', 1)"
>
<ArrowDown :size="14" />
</Button>
</div>
</template>
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,45 @@ describe('useGroupStore', () => {
vi.clearAllMocks()
})

it('ошибка сортировки восстанавливает только порядок, сохраняя параллельные изменения групп', async () => {
const store = useGroupStore()
const first = makeGroup({ id: 'first', order: 0 })
const second = makeGroup({ id: 'second', order: 1 })
store.trees['proj-a'] = [first, second]
let rejectSave!: (error: Error) => void
vi.mocked(groupsApi.reorderGroups).mockImplementationOnce(() => new Promise((_resolve, reject) => {
rejectSave = reject
}))
const pending = store.reorderGroups('proj-a', ['second', 'first'])
const failure = expect(pending).rejects.toThrow('offline')
vi.mocked(groupsApi.updateGroup).mockResolvedValueOnce({ data: { ...first, title: 'Новое название' } } as any)
await store.updateGroup('proj-a', 'first', { title: 'Новое название' })
vi.mocked(groupsApi.createGroup).mockResolvedValueOnce({ data: makeGroup({ id: 'third', order: 2 }) } as any)
await store.createGroup('proj-a', { title: 'Третий' })
rejectSave(new Error('offline'))
await failure

expect(store.groupsOf('proj-a').map(group => group.id)).toEqual(['first', 'second', 'third'])
expect(store.groupsOf('proj-a')[0]?.title).toBe('Новое название')
})

it.each([false, true])('ошибка восстанавливает порядок соседей с одинаковым order, истории: %s', async (nested) => {
const store = useGroupStore()
const siblings = [
makeGroup({ id: 'a', order: 0 }),
makeGroup({ id: 'c', order: 2 }),
makeGroup({ id: 'd', order: 2 }),
].map(group => nested ? { ...group, type: 'story' as const, parentId: 'parent' } : group)
store.trees['proj-a'] = nested ? [makeGroup({ id: 'parent', children: siblings })] : siblings
vi.mocked(groupsApi.reorderGroups).mockRejectedValueOnce(new Error('offline'))

await expect(store.reorderGroups('proj-a', ['a', 'd', 'c'])).rejects.toThrow('offline')

const restored = nested ? store.groupsOf('proj-a')[0]!.children : store.groupsOf('proj-a')
expect(restored.map(group => group.id)).toEqual(['a', 'c', 'd'])
expect(restored.map(group => group.order)).toEqual([0, 2, 2])
})

it('загрузка проекта B не меняет groupsOf(A)', async () => {
const store = useGroupStore()
const epicA = makeGroup({ id: 'epic-a', projectId: 'proj-a' })
Expand Down
Loading
Loading