Added 'create node' button to flow tree
Deploy Frontend / build-and-deploy (push) Successful in 47s
Details
Deploy Frontend / build-and-deploy (push) Successful in 47s
Details
This commit is contained in:
parent
4af68d31af
commit
fee216fc19
|
|
@ -29,6 +29,10 @@ import CategoryCreateModal from "@/pages/flowNodes/components/CategoryCreateModa
|
||||||
import FlowNodeEditModal from "@/pages/flowNodes/components/FlowNodeEditModal.tsx";
|
import FlowNodeEditModal from "@/pages/flowNodes/components/FlowNodeEditModal.tsx";
|
||||||
import SortableFlowTree from "@/pages/flowNodes/components/SortableFlowTree.tsx";
|
import SortableFlowTree from "@/pages/flowNodes/components/SortableFlowTree.tsx";
|
||||||
import TreeHealthPanel from "@/pages/flowNodes/components/TreeHealthPanel.tsx";
|
import TreeHealthPanel from "@/pages/flowNodes/components/TreeHealthPanel.tsx";
|
||||||
|
import {notifications} from "@mantine/notifications";
|
||||||
|
import apiClient from "@/api/client.ts";
|
||||||
|
import {flowNodesApi} from "@/api/flowNodes.ts";
|
||||||
|
import {topicsApi} from "@/api/topics.ts";
|
||||||
|
|
||||||
export default function FlowTreePage() {
|
export default function FlowTreePage() {
|
||||||
const [selectedCategoryId, setSelectedCategoryId] = useState<number | null>(null)
|
const [selectedCategoryId, setSelectedCategoryId] = useState<number | null>(null)
|
||||||
|
|
@ -122,6 +126,86 @@ export default function FlowTreePage() {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const handleConfigureTopic = async (node: ApprovalFlowNode) => {
|
||||||
|
if (!selectedCategoryId || !node.id) return
|
||||||
|
|
||||||
|
const collected: Record<string, string> = {}
|
||||||
|
const nodeMap = new Map<number, ApprovalFlowNode>()
|
||||||
|
|
||||||
|
const walk = (nodes: ApprovalFlowNode[]) => {
|
||||||
|
for (const n of nodes) {
|
||||||
|
if (n.id) nodeMap.set(n.id, n)
|
||||||
|
if (n.children) walk(n.children)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
walk(tree)
|
||||||
|
|
||||||
|
let current = nodeMap.get(node.id)
|
||||||
|
while (current) {
|
||||||
|
if (current.data_key && current.data_value) {
|
||||||
|
collected[current.data_key] = current.data_value
|
||||||
|
}
|
||||||
|
if (current.multi_select_key && current.multi_select_value) {
|
||||||
|
collected[current.multi_select_key] = current.multi_select_value
|
||||||
|
}
|
||||||
|
current = current.parent_id ? nodeMap.get(current.parent_id) : undefined
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await flowNodesApi.preview(selectedCategoryId, { collected })
|
||||||
|
const previewData = response.data
|
||||||
|
|
||||||
|
if (previewData.incomplete) {
|
||||||
|
notifications.show({
|
||||||
|
title: 'Недостаточно данных',
|
||||||
|
message: 'Невозможно настроить маршрут: на этом уровне не хватает данных для формирования кода темы.',
|
||||||
|
color: 'orange'
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Если темы с таким кодом еще нет, создаем её
|
||||||
|
if (!previewData.topic_exists) {
|
||||||
|
await topicsApi.create({
|
||||||
|
category_id: selectedCategoryId,
|
||||||
|
code: previewData.code,
|
||||||
|
name: `${selectedCategory?.name}: ${node.label} (Узел)`,
|
||||||
|
is_active: true,
|
||||||
|
allow_approver_selection: false,
|
||||||
|
allow_observer_selection: false,
|
||||||
|
allow_delegation_selection: false
|
||||||
|
})
|
||||||
|
|
||||||
|
notifications.show({
|
||||||
|
title: 'Успех',
|
||||||
|
message: 'Тема для этого узла успешно создана в базе.',
|
||||||
|
color: 'green'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
modals.openConfirmModal({
|
||||||
|
title: 'Настройка иерархии',
|
||||||
|
children: (
|
||||||
|
<Text size="sm">
|
||||||
|
Тема для каскадного согласования готова. Хотите перейти на страницу настройки иерархии прямо сейчас?
|
||||||
|
</Text>
|
||||||
|
),
|
||||||
|
labels: { confirm: 'Перейти', cancel: 'Настроить позже' },
|
||||||
|
onConfirm: () => {
|
||||||
|
navigate('/hierarchies')
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Ошибка при настройке маршрута:', error)
|
||||||
|
notifications.show({
|
||||||
|
title: 'Ошибка',
|
||||||
|
message: 'Не удалось подготовить маршрут. Проверьте консоль.',
|
||||||
|
color: 'red'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const handleDuplicate = (node: ApprovalFlowNode) => duplicateFlowNode.mutate(node.id!)
|
const handleDuplicate = (node: ApprovalFlowNode) => duplicateFlowNode.mutate(node.id!)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|
@ -232,6 +316,7 @@ export default function FlowTreePage() {
|
||||||
onAddChild={handleAddChild}
|
onAddChild={handleAddChild}
|
||||||
onDelete={handleDelete}
|
onDelete={handleDelete}
|
||||||
onDuplicate={handleDuplicate}
|
onDuplicate={handleDuplicate}
|
||||||
|
onConfigureTopic={handleConfigureTopic}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,7 @@ import {
|
||||||
IconChevronDown,
|
IconChevronDown,
|
||||||
IconChevronRight,
|
IconChevronRight,
|
||||||
IconArrowsMove,
|
IconArrowsMove,
|
||||||
|
IconRoute,
|
||||||
} from '@tabler/icons-react'
|
} from '@tabler/icons-react'
|
||||||
import type { ApprovalFlowNode } from '@/types/api'
|
import type { ApprovalFlowNode } from '@/types/api'
|
||||||
import { useReorderNodes } from '@/features/flowNodes/hooks/useFlowNodes'
|
import { useReorderNodes } from '@/features/flowNodes/hooks/useFlowNodes'
|
||||||
|
|
@ -36,6 +37,7 @@ interface SortableFlowTreeProps {
|
||||||
onAddChild: (parent: ApprovalFlowNode) => void
|
onAddChild: (parent: ApprovalFlowNode) => void
|
||||||
onDelete: (node: ApprovalFlowNode) => void
|
onDelete: (node: ApprovalFlowNode) => void
|
||||||
onDuplicate: (node: ApprovalFlowNode) => void
|
onDuplicate: (node: ApprovalFlowNode) => void
|
||||||
|
onConfigureTopic: (node: ApprovalFlowNode) => void
|
||||||
}
|
}
|
||||||
|
|
||||||
function nodeIcon(node: ApprovalFlowNode): string {
|
function nodeIcon(node: ApprovalFlowNode): string {
|
||||||
|
|
@ -50,7 +52,7 @@ function nodeKindLabel(node: ApprovalFlowNode): string {
|
||||||
return 'Кнопка'
|
return 'Кнопка'
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function SortableFlowTree({ tree, onEdit, onAddChild, onDelete, onDuplicate }: SortableFlowTreeProps) {
|
export default function SortableFlowTree({ tree, onEdit, onAddChild, onDelete, onDuplicate, onConfigureTopic }: SortableFlowTreeProps) {
|
||||||
const [collapsed, setCollapsed] = useState<Set<number>>(new Set())
|
const [collapsed, setCollapsed] = useState<Set<number>>(new Set())
|
||||||
const [activeId, setActiveId] = useState<number | null>(null)
|
const [activeId, setActiveId] = useState<number | null>(null)
|
||||||
const [overId, setOverId] = useState<number | null>(null)
|
const [overId, setOverId] = useState<number | null>(null)
|
||||||
|
|
@ -150,6 +152,7 @@ export default function SortableFlowTree({ tree, onEdit, onAddChild, onDelete, o
|
||||||
onAddChild={onAddChild}
|
onAddChild={onAddChild}
|
||||||
onDelete={onDelete}
|
onDelete={onDelete}
|
||||||
onDuplicate={onDuplicate}
|
onDuplicate={onDuplicate}
|
||||||
|
onConfigureTopic={onConfigureTopic}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
</Box>
|
</Box>
|
||||||
|
|
@ -178,9 +181,10 @@ interface SortableRowProps {
|
||||||
onAddChild: (parent: ApprovalFlowNode) => void
|
onAddChild: (parent: ApprovalFlowNode) => void
|
||||||
onDelete: (node: ApprovalFlowNode) => void
|
onDelete: (node: ApprovalFlowNode) => void
|
||||||
onDuplicate: (node: ApprovalFlowNode) => void
|
onDuplicate: (node: ApprovalFlowNode) => void
|
||||||
|
onConfigureTopic: (node: ApprovalFlowNode) => void
|
||||||
}
|
}
|
||||||
|
|
||||||
function SortableRow({ node, hasChildren, collapsed, onToggleCollapse, onEdit, onAddChild, onDelete, onDuplicate }: SortableRowProps) {
|
function SortableRow({ node, hasChildren, collapsed, onToggleCollapse, onEdit, onAddChild, onDelete, onDuplicate, onConfigureTopic }: SortableRowProps) {
|
||||||
const isRoot = node.depth === 0
|
const isRoot = node.depth === 0
|
||||||
const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
|
const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
|
||||||
id: node.id!,
|
id: node.id!,
|
||||||
|
|
@ -241,6 +245,19 @@ function SortableRow({ node, hasChildren, collapsed, onToggleCollapse, onEdit, o
|
||||||
</Group>
|
</Group>
|
||||||
|
|
||||||
<Group gap={2} wrap="nowrap">
|
<Group gap={2} wrap="nowrap">
|
||||||
|
{hasChildren && (
|
||||||
|
<Tooltip label="Настроить маршрут согласования для этого этапа">
|
||||||
|
<ActionIcon
|
||||||
|
variant="light"
|
||||||
|
size="sm"
|
||||||
|
color="violet"
|
||||||
|
onClick={() => onConfigureTopic(node)}
|
||||||
|
>
|
||||||
|
<IconRoute size={14} />
|
||||||
|
</ActionIcon>
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
|
|
||||||
<Tooltip label="Добавить следующий шаг после этой кнопки">
|
<Tooltip label="Добавить следующий шаг после этой кнопки">
|
||||||
<ActionIcon variant="subtle" size="sm" color="blue" onClick={() => onAddChild(node)}>
|
<ActionIcon variant="subtle" size="sm" color="blue" onClick={() => onAddChild(node)}>
|
||||||
<IconPlus size={14} />
|
<IconPlus size={14} />
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue