From 9f201fe6fd1b5afd509ca9998bbfe7538026ffc5 Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Tue, 4 Aug 2026 12:28:27 +0300 Subject: [PATCH] Updated flows tree --- .../hierarchies/hooks/useSystemOptions.ts | 18 +++++----- .../components/ChainVisualization.tsx | 35 ++++++++++++++++--- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/src/features/hierarchies/hooks/useSystemOptions.ts b/src/features/hierarchies/hooks/useSystemOptions.ts index bf019e3..4391c84 100644 --- a/src/features/hierarchies/hooks/useSystemOptions.ts +++ b/src/features/hierarchies/hooks/useSystemOptions.ts @@ -1,4 +1,3 @@ -// src/features/hierarchies/hooks/useSystemOptions.ts import { useQueries } from '@tanstack/react-query' import { useCategories } from '@/features/categories/hooks/useCategories' import { useFlowNodesTree, FLOW_NODES_QUERY_KEY } from '@/features/flowNodes/hooks/useFlowNodes' @@ -10,20 +9,19 @@ export interface SystemOption { label: string } -function extractSystemOptions(nodes: ApprovalFlowNode[] | null | undefined): SystemOption[] { +function extractSystemOptions(nodes: ApprovalFlowNode[] | null | undefined, contextLabel = 'unknown'): SystemOption[] { + console.log(`[extractSystemOptions] Анализ узлов (${contextLabel}):`, nodes) if (!nodes) return [] + const seen = new Map() - // НОВОЕ: Рекурсивная функция для обхода всех уровней вложенности function traverse(nodeList: ApprovalFlowNode[]) { for (const n of nodeList) { if (n.is_multi_select && n.multi_select_key === 'systems' && n.multi_select_value) { if (!seen.has(n.multi_select_value)) { - // Используем label (например "1С" или "ОКБ"), если он есть seen.set(n.multi_select_value, n.label || n.multi_select_value) } } - // Если есть вложенные узлы — погружаемся в них if (n.children && n.children.length > 0) { traverse(n.children) } @@ -32,12 +30,15 @@ function extractSystemOptions(nodes: ApprovalFlowNode[] | null | undefined): Sys traverse(nodes) - return Array.from(seen.entries()).map(([value, label]) => ({ value, label })) + const result = Array.from(seen.entries()).map(([value, label]) => ({ value, label })) + console.log(`[extractSystemOptions] Итог для (${contextLabel}):`, result) + return result } export function useCategorySystemOptions(categoryId: number | null) { const { data, isLoading } = useFlowNodesTree(categoryId) - const options = extractSystemOptions(data?.data) + console.log(`[useCategorySystemOptions] categoryId: ${categoryId}, получено узлов:`, data?.data?.length) + const options = extractSystemOptions(data?.data, `category-${categoryId}`) return { options, isLoading: categoryId ? isLoading : false } } @@ -63,12 +64,13 @@ export function useAllSystemOptions(enabled: boolean = true) { const merged = new Map() for (const r of results) { const nodes = (r.data as ApiResponse | undefined)?.data - for (const opt of extractSystemOptions(nodes)) { + for (const opt of extractSystemOptions(nodes, 'all-systems-scan')) { if (!merged.has(opt.value)) merged.set(opt.value, opt.label) } } const options = Array.from(merged.entries()).map(([value, label]) => ({ value, label })) + console.log('[useAllSystemOptions] Итоговые уникальные системы по всей системе:', options) return { options, isLoading } } diff --git a/src/pages/hierarchies/components/ChainVisualization.tsx b/src/pages/hierarchies/components/ChainVisualization.tsx index 74bb9d9..ef3edb2 100644 --- a/src/pages/hierarchies/components/ChainVisualization.tsx +++ b/src/pages/hierarchies/components/ChainVisualization.tsx @@ -1,5 +1,5 @@ // ChainVisualization.tsx -import { useState } from 'react' +import {useMemo, useState} from 'react' import { Paper, Group, @@ -26,7 +26,12 @@ import { } from '@tabler/icons-react' import type { ChainGroup } from '@/features/hierarchies/utils' import { SCOPE_COLORS, SCOPE_LABELS } from '@/features/hierarchies/utils' -import { useCategorySystemOptions, ALL_SYSTEMS_VALUE } from '@/features/hierarchies/hooks/useSystemOptions' +import { + useCategorySystemOptions, + ALL_SYSTEMS_VALUE, + useAllSystemOptions +} from '@/features/hierarchies/hooks/useSystemOptions' +import {useTopics} from "@/features/topics/hooks/useTopics.ts"; interface ChainVisualizationProps { group: ChainGroup @@ -50,6 +55,7 @@ const ScopeIcon = ({ type }: { type: string }) => { } } +// Внутри компонента ChainVisualization: export default function ChainVisualization({ group, onEditStep, @@ -58,9 +64,28 @@ export default function ChainVisualization({ onDuplicateChain, onBulkUpdateSystem, }: ChainVisualizationProps) { - // Получаем доступные системы для категории (или темы) - const categoryId = group.scopeType === 'category' ? group.scopeObjectId : null - const { options: systemOptions } = useCategorySystemOptions(categoryId) + // Получаем все темы, чтобы уметь мапить topicId -> categoryId, если scopeType === 'topic' + const { data: allTopics } = useTopics({ limit: 1000 }) + + const resolvedCategoryId = useMemo(() => { + if (group.scopeType === 'category') { + return group.scopeObjectId + } + if (group.scopeType === 'topic' && group.scopeObjectId && allTopics?.data) { + const foundTopic = allTopics.data.find(t => t.id === group.scopeObjectId) + return foundTopic?.category_id || null + } + return null + }, [group.scopeType, group.scopeObjectId, allTopics?.data]) + + // Если цепочка глобальная (resolvedCategoryId === null), берем вообще все системы через useAllSystemOptions, + // иначе — системы конкретной категории через useCategorySystemOptions. + const categoryOptionsResult = useCategorySystemOptions(resolvedCategoryId) + const allOptionsResult = useAllSystemOptions(group.scopeType === 'global') + + const systemOptions = group.scopeType === 'global' ? allOptionsResult.options : categoryOptionsResult.options + + console.log(`[ChainVisualization] Группа ${group.key} (scope: ${group.scopeType}): resolvedCategoryId = ${resolvedCategoryId}, доступно систем:`, systemOptions) // Текущая система цепочки (если у всех шагов одинаковая система, иначе 'all') const currentChainSystem = group.steps.every(