From 19f91269f5e7488f08ec09042b32f9f60f387f64 Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Tue, 4 Aug 2026 12:20:27 +0300 Subject: [PATCH] Updated flows tree --- .../hierarchies/hooks/useSystemOptions.ts | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/features/hierarchies/hooks/useSystemOptions.ts b/src/features/hierarchies/hooks/useSystemOptions.ts index b9db77a..bf019e3 100644 --- a/src/features/hierarchies/hooks/useSystemOptions.ts +++ b/src/features/hierarchies/hooks/useSystemOptions.ts @@ -1,3 +1,4 @@ +// 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' @@ -12,13 +13,25 @@ export interface SystemOption { function extractSystemOptions(nodes: ApprovalFlowNode[] | null | undefined): SystemOption[] { if (!nodes) return [] const seen = new Map() - for (const n of nodes) { - if (n.is_multi_select && n.multi_select_key === 'systems' && n.multi_select_value) { - if (!seen.has(n.multi_select_value)) { - seen.set(n.multi_select_value, n.label || n.multi_select_value) + + // НОВОЕ: Рекурсивная функция для обхода всех уровней вложенности + 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) } } } + + traverse(nodes) + return Array.from(seen.entries()).map(([value, label]) => ({ value, label })) }