@topconsultnpm/sdkui-react 6.22.0-t2 → 6.22.0-t3

package/lib/components/features/documents/TMRelationViewer.js

@@ -1,5 +1,5 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { DcmtTypeListCacheService, SDK_Globals, DataColumnTypes, MetadataDataDomains, RelationCacheService, RelationTypes, UserListCacheService, LayoutModes } from "@topconsultnpm/sdk-ts";
 import { genUniqueId, IconFolder, IconBackhandIndexPointingRight, IconCircleInfo, getDcmtCicoStatus, IconChevronDown, IconChevronRight, SDKUI_Localizator, buildDcmtDisplayName, SDKUI_Globals, searchResultToMetadataValues, getColumnFormatInfo, formatDateTimeByMetadataFormat, formatNumberByMetadataFormat } from '../../../helper';
 import ShowAlert from '../../base/TMAlert';
@@ -7,12 +7,13 @@ import TMToppyMessage from '../../../helper/TMToppyMessage';
 import { TMColors } from '../../../utils/theme';
 import { StyledDivHorizontal, StyledBadge } from '../../base/Styled';
 import TMTreeView from '../../base/TMTreeView';
-import { TMWaitPanel } from '../../base/TMWaitPanel';
+import TMWaitPanelManager from '../../base/waitPanel/TMWaitPanelManager';
 import TMDataListItemViewer from '../../viewers/TMDataListItemViewer';
 import TMDcmtIcon from './TMDcmtIcon';
 import TMDataUserIdItemViewer from '../../viewers/TMDataUserIdItemViewer';
 import TMTooltip from '../../base/TMTooltip';
 import TMSpinner from '../../base/TMSpinner';
+import { applyRelationTreeState, collectRelationTreeState, findRelationNodeByPath } from './relationTreeState';
 /**
  * Check if document type has detail relations
  */
@@ -65,10 +66,24 @@ export const getDisplayValueByColumn = (col, value) => {
         return formatNumberByMetadataFormat(value, format, formatCulture);
     return value;
 };
+/**
+ * Attende la chiamata, ma smette di aspettarla (restituendo undefined) appena l'utente interrompe.
+ * Serve perché il SearchEngine dell'SDK non accetta un AbortSignal: senza, "Interrompi" aspetterebbe la fine della chiamata in corso.
+ */
+const untilAborted = (promise, signal) => {
+    if (!signal)
+        return promise;
+    if (signal.aborted)
+        return Promise.resolve(undefined);
+    const aborted = new Promise(resolve => signal.addEventListener('abort', () => resolve(undefined), { once: true }));
+    // Vince chi termina prima: la risposta del server oppure l'interruzione (la chiamata prosegue in background e viene ignorata)
+    return Promise.race([promise, aborted]);
+};
 /**
  * Convert SearchResultDescriptor to structured data source with metadata
- * For each document, fetches complete metadata using GetMetadataAsync to ensure
- * all metadata properties (isSpecialSearchOutput, permissions, etc.) are available
+ * I valori dei documenti sono già presenti nelle righe restituite dalla ricerca:
+ * qui vengono solo abbinati ai rispettivi MetadataDescriptor (perm,
+ * isSpecialSearchOutput, ...), risolti una sola volta per tipo documento.
  */
 export const searchResultToDataSource = async (searchResult, hideSysMetadata, signal) => {
     const rows = searchResult?.dtdResult?.rows ?? [];
@@ -77,27 +92,28 @@ export const searchResultToDataSource = async (searchResult, hideSysMetadata, si
     const columns = searchResult?.dtdResult?.columns ?? [];
     const tidColIndex = columns.findIndex(col => col.caption?.toUpperCase() === 'TID');
     const didColIndex = columns.findIndex(col => col.caption?.toUpperCase() === 'DID');
+    const firstRow = rows[0] ?? [];
+    const tid = tidColIndex >= 0 && firstRow.length > 0 ? Number(firstRow[tidColIndex]) : searchResult?.fromTID;
+    const firstDid = didColIndex >= 0 && firstRow.length > 0 ? Number(firstRow[didColIndex]) : undefined;
+    const dtdWithMetadata = await DcmtTypeListCacheService.GetWithNotGrantedAsync(tid, firstDid, searchResult);
+    const mdList = dtdWithMetadata?.metadata ?? [];
+    // Posizione di ogni MID nelle colonne del risultato: identica per tutte le righe,
+    // quindi calcolata una volta sola invece di una find() per metadato per riga.
+    const mids = columns.map(col => Number(col.extendedProperties?.["MID"] ?? "0"));
+    const columnByMid = new Map();
+    columns.forEach((col, i) => { if (!columnByMid.has(mids[i]))
+        columnByMid.set(mids[i], col); });
+    const dtdResult = searchResult?.dtdResult;
     for (let index = 0; index < rows.length; index++) {
         // Interruzione richiesta dall'utente: restituisce i documenti già elaborati
         if (signal?.aborted)
             break;
         const row = rows[index];
-        // Extract TID and DID from row
-        const tid = tidColIndex >= 0 ? Number(row[tidColIndex]) : searchResult?.fromTID;
-        const did = didColIndex >= 0 ? Number(row[didColIndex]) : undefined;
-        // Fetch complete metadata for this specific document (like getFilteredMetadata does)
-        const metadata = await SDK_Globals.tmSession?.NewSearchEngine().GetMetadataAsync(tid, did, true);
-        if (metadata) {
-            // Get full DTD with metadata for this document
-            const dtdResult = metadata.dtdResult;
-            const metadataRows = dtdResult?.rows?.[0] ?? [];
-            const mids = metadata.selectMIDs;
-            const dtdWithMetadata = await DcmtTypeListCacheService.GetWithNotGrantedAsync(tid, did, metadata);
-            const mdList = dtdWithMetadata?.metadata ?? [];
+        const item = { rowIndex: index };
+        if (mdList.length > 0) {
             // Convert to MetadataValueDescriptorEx array
-            const metadataList = searchResultToMetadataValues(tid, dtdResult, metadataRows, mids, mdList, LayoutModes.Update);
+            const metadataList = searchResultToMetadataValues(tid, dtdResult, row, mids, mdList, LayoutModes.Update);
             // Convert to DcmtMetadataMap format (like getFilteredMetadata does)
-            const item = { rowIndex: index };
             for (const mvd of metadataList) {
                 if (hideSysMetadata && mvd.mid !== undefined && mvd.mid < 100)
                     continue;
@@ -106,23 +122,18 @@ export const searchResultToDataSource = async (searchResult, hideSysMetadata, si
                     : (mvd.md?.name ?? '');
                 if (key) {
                     // Find the corresponding column by MID to format the value
-                    const column = dtdResult?.columns?.find(c => Number(c.extendedProperties?.["MID"] ?? "0") === mvd.mid);
                     item[key] = {
                         md: mvd.md,
-                        value: getDisplayValueByColumn(column, mvd.value)
+                        value: getDisplayValueByColumn(columnByMid.get(mvd.mid ?? 0), mvd.value)
                     };
                 }
             }
-            output.push(item);
         }
         else {
-            // Fallback: use original row data with basic parsing
-            const item = { rowIndex: index };
-            const fallbackTid = searchResult?.fromTID;
-            const dtd = await DcmtTypeListCacheService.GetWithNotGrantedAsync(fallbackTid, undefined, searchResult);
+            // Fallback: il DTD non è risolvibile, usa le colonne grezze del risultato
             for (let i = 0; i < row.length; i++) {
-                const column = searchResult?.dtdResult?.columns?.[i];
-                const mid = Number(column?.extendedProperties?.["MID"] ?? "0");
+                const column = columns[i];
+                const mid = mids[i];
                 if (hideSysMetadata && mid < 100)
                     continue;
                 let key = column?.caption ?? '';
@@ -134,20 +145,18 @@ export const searchResultToDataSource = async (searchResult, hideSysMetadata, si
                         key = `${key}_${mid}`;
                     }
                 }
-                const value = row[i];
-                const md = dtd?.metadata?.find(o => o.id == mid);
                 item[key] = {
-                    md: md,
-                    value: getDisplayValueByColumn(column, value)
+                    md: undefined,
+                    value: getDisplayValueByColumn(column, row[i])
                 };
             }
-            output.push(item);
         }
+        output.push(item);
     }
     return output;
 };
 export const DEFAULT_RELATION_EXPAND_LEVEL = 4; // Default maximum depth level for expansion (can be adjusted)
-const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndicator = true, allowShowZeroDcmts = true, initialShowZeroDcmts = false, allowedTIDs, allowMultipleSelection = false, focusedItem, selectedItems, onFocusedItemChanged, onSelectedItemsChanged, onAllItemsChanged, onDocumentDoubleClick, customItemRender, customDocumentStyle, customMainContainerContent, customDocumentContent, showMetadataNames = false, maxDepthLevel = 2, invertMasterNavigation = true, additionalStaticItems, showMainDocument = true, labelMainContainer, onNoRelationsFound, onItemContextMenu, focusedItemFormData = [], showExpandAllButton = false, defaultExpandAll = false, onLoadingStateChanged, onStopCalculationReady, onCalculationStopped }) => {
+const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndicator = true, allowShowZeroDcmts = true, initialShowZeroDcmts = false, allowedTIDs, allowMultipleSelection = false, focusedItem, selectedItems, onFocusedItemChanged, onSelectedItemsChanged, onAllItemsChanged, onDocumentDoubleClick, customItemRender, customDocumentStyle, customMainContainerContent, customDocumentContent, showMetadataNames = false, maxDepthLevel = 2, invertMasterNavigation = true, additionalStaticItems, showMainDocument = true, labelMainContainer, onNoRelationsFound, onItemContextMenu, showExpandAllButton = false, defaultExpandAll = false, onLoadingStateChanged, onStopCalculationReady, onCalculationStopped, initialTreeState, onTreeStateChange }) => {
     // State
     const [dcmtTypes, setDcmtTypes] = useState([]);
     const [treeData, setTreeData] = useState([]);
@@ -156,21 +165,21 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
     const getInitialExpandLevel = () => SDKUI_Globals.userSettings?.searchSettings?.relationExpandLevel ?? DEFAULT_RELATION_EXPAND_LEVEL;
     const [expandLevel, setExpandLevel] = useState(getInitialExpandLevel);
     const [isAllCollapsed, setIsAllCollapsed] = useState(false);
-    const initialExpandAllAppliedRef = React.useRef(false);
-    const [showWaitPanel, setShowWaitPanel] = useState(false);
-    const [waitPanelTextPrimary, setWaitPanelTextPrimary] = useState('');
-    const [waitPanelValuePrimary, setWaitPanelValuePrimary] = useState(0);
-    const [waitPanelMaxValuePrimary, setWaitPanelMaxValuePrimary] = useState(0);
+    const initialExpandAllAppliedRef = useRef(false);
+    // Calcolo iniziale: il pannello e' imperativo, qui resta solo il flag per il render.
+    const [isInitialLoading, setIsInitialLoading] = useState(false);
+    const loadPanelRef = useRef(undefined);
     const [abortController] = useState(new AbortController());
     // True quando l'utente ha interrotto il calcolo delle correlazioni (pulsante "Interrompi")
     const [loadStoppedByUser, setLoadStoppedByUser] = useState(false);
-    const [showExpansionWaitPanel, setShowExpansionWaitPanel] = useState(false);
-    const [expansionWaitPanelText, setExpansionWaitPanelText] = useState('');
-    const [expansionWaitPanelValue, setExpansionWaitPanelValue] = useState(0);
-    const [expansionWaitPanelMaxValue, setExpansionWaitPanelMaxValue] = useState(0);
-    const [expansionAbortController, setExpansionAbortController] = useState(undefined);
+    // Espansione di un nodo: il pannello e' imperativo, qui resta solo il flag per il render.
+    // qui resta solo il flag che serve al render e alla notifica al padre.
+    const [isExpansionLoading, setIsExpansionLoading] = useState(false);
+    // AbortController dell'espansione in corso, accessibile da callback stabili
+    const expansionAbortControllerRef = useRef(undefined);
+    const expansionPanelRef = useRef(undefined);
     // Ref to track last loaded input to prevent unnecessary reloads
-    const lastLoadedInputRef = React.useRef('');
+    const lastLoadedInputRef = useRef('');
     // State to track loaded input key - triggers re-render for focus selection
     const [loadedInputKey, setLoadedInputKey] = React.useState('');
     // State to track how many GetMetadataAsync calls failed
@@ -178,9 +187,17 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
     // State to track total master documents found (used when isForMaster is true)
     const [totalMasterDocuments, setTotalMasterDocuments] = React.useState(0);
     // Ref to track if user has manually expanded/collapsed static items
-    const userInteractedWithStaticItemsRef = React.useRef(false);
+    const userInteractedWithStaticItemsRef = useRef(false);
     // Ref to track the last inputKey for which we set the focused item
-    const lastFocusedInputRef = React.useRef('');
+    const lastFocusedInputRef = useRef('');
+    // Catturato al mount (il padre lo aggiorna di continuo) e azzerato dopo l'uso,
+    // così vale solo per il primo caricamento
+    const stateToRestoreRef = useRef(initialTreeState);
+    // Parte dallo stato ricevuto: il padre azzera il fuoco prima di rimontare, quindi
+    // la prima notifica dopo il rimontaggio lo perderebbe
+    const lastReportedStateRef = useRef(initialTreeState);
+    // Percorso su cui rimettere il fuoco dopo un ripristino
+    const pendingFocusPathRef = useRef(undefined);
     // State for all users (used for checkout status display)
     const [allUsers, setAllUsers] = useState([]);
     // Load all users for checkout status resolution
@@ -193,20 +210,19 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
     }, []);
     // Notify parent when loading state changes
     useEffect(() => {
-        const isLoading = showWaitPanel || showExpansionWaitPanel;
+        const isLoading = isInitialLoading || isExpansionLoading;
         onLoadingStateChanged?.(isLoading);
-    }, [showWaitPanel, showExpansionWaitPanel, onLoadingStateChanged]);
-    // Mantiene l'AbortController dell'espansione in corso accessibile da callback stabili
-    const expansionAbortControllerRef = React.useRef(undefined);
-    useEffect(() => {
-        expansionAbortControllerRef.current = expansionAbortController;
-    }, [expansionAbortController]);
+    }, [isInitialLoading, isExpansionLoading, onLoadingStateChanged]);
+    // I pannelli vivono fuori dall'albero React: se il viewer viene smontato mentre un
+    // caricamento e' in corso vanno chiusi a mano, altrimenti resterebbero a schermo.
+    useEffect(() => () => {
+        loadPanelRef.current?.close();
+        expansionPanelRef.current?.close();
+    }, []);
     /**
      * Interrompe il calcolo delle correlazioni (iniziale e/o espansione in corso):
      * non vengono eseguite ulteriori chiamate GetMetadata e vengono mantenute
      * solo le correlazioni già calcolate.
-     * È sincrona: può essere invocata immediatamente prima di smontare il viewer
-     * (es. pulsante "Indietro"), quando un effect non farebbe in tempo.
      */
     const stopCalculation = useCallback(() => {
         if (!abortController.signal.aborted)
@@ -264,7 +280,7 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
             const searchEngine = SDK_Globals.tmSession?.NewSearchEngine();
             if (!searchEngine)
                 return items;
-            const results = await searchEngine.GetAllDetailDcmtsAsync(mTID, mDID) ?? [];
+            const results = await untilAborted(searchEngine.GetAllDetailDcmtsAsync(mTID, mDID), signal) ?? [];
             for (const searchResult of results) {
                 // Interruzione richiesta dall'utente: restituisce le correlazioni già calcolate
                 if (signal?.aborted)
@@ -354,7 +370,7 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
             const searchEngine = SDK_Globals.tmSession?.NewSearchEngine();
             if (!searchEngine)
                 return items;
-            const results = await searchEngine.GetAllMasterDcmtsAsync(dTID, dDID) ?? [];
+            const results = await untilAborted(searchEngine.GetAllMasterDcmtsAsync(dTID, dDID), signal) ?? [];
             for (const searchResult of results) {
                 // Interruzione richiesta dall'utente: restituisce le correlazioni già calcolate
                 if (signal?.aborted)
@@ -478,6 +494,26 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
             return { ...node, hidden: shouldHide, items: updatedItems };
         });
     }, [showZeroDcmts]);
+    /** Messaggio informativo in testa se tutti i figli sono nascosti dal filtro; senza figli il nodo resta vuoto (nessuna freccina). */
+    const applyZeroFilterInfoMessage = useCallback((nodeKey, items) => {
+        const cleaned = items.filter(child => !(child.isInfoMessage && child.key?.startsWith('__info__')));
+        if (showZeroDcmts)
+            return cleaned;
+        const realChildren = cleaned.filter(child => !child.isInfoMessage);
+        if (realChildren.length === 0 || !realChildren.every(child => child.hidden))
+            return cleaned;
+        return [
+            {
+                key: `__info__${nodeKey}`,
+                name: SDKUI_Localizator.NoRelatedDocumentsToDisplay,
+                isContainer: false,
+                isDcmt: false,
+                isInfoMessage: true,
+                isExpandible: false
+            },
+            ...cleaned // Keep hidden containers so they can be shown when toggling
+        ];
+    }, [showZeroDcmts]);
     /**
      * Helper function to set up initial tree expansion state.
      * Called after all data is loaded but before setTreeData.
@@ -565,10 +601,22 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
         });
         return result;
     };
+    /**
+     * Carica i figli di un documento durante il ripristino. Usa i loader e non
+     * calculateItemsForNode, che accenderebbe il wait panel di espansione mentre
+     * è già attivo quello del caricamento principale.
+     */
+    const loadChildrenForRestore = async (node) => {
+        if (!node.tid || !node.did)
+            return [];
+        if (isForMaster && invertMasterNavigation)
+            return await getMasterDcmtsAsync(node.tid, node.did, 1, abortController.signal);
+        return await getDetailDcmtsAsync(node.tid, node.did, 1, abortController.signal);
+    };
     /**
      * Main data loading function
      */
-    const loadData = useCallback(async () => {
+    const loadData = useCallback(async (panel) => {
         if (!inputDcmts || inputDcmts.length === 0 || dcmtTypes.length === 0) {
             setTreeData([]);
             return;
@@ -583,14 +631,14 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                 break;
             }
             // Update wait panel progress
-            setWaitPanelTextPrimary(`Caricamento correlazione ${processedCount + 1} di ${inputDcmts.length}`);
+            panel.setSubtitle(`Caricamento correlazione ${processedCount + 1} di ${inputDcmts.length}`);
             const searchEngine = SDK_Globals.tmSession?.NewSearchEngine();
             if (!searchEngine)
                 continue;
             // Load document metadata
             let result;
             try {
-                result = await searchEngine.GetMetadataAsync(dcmt.TID, dcmt.DID, false);
+                result = await untilAborted(searchEngine.GetMetadataAsync(dcmt.TID, dcmt.DID, false), abortController.signal);
             }
             catch (metadataError) {
                 console.warn('[TMRelationViewer] GetMetadataAsync failed for TID:', dcmt.TID, 'DID:', dcmt.DID, metadataError);
@@ -603,9 +651,12 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                 });
                 // Skip this document and continue with the next one
                 processedCount++;
-                setWaitPanelValuePrimary(processedCount);
+                await panel.step();
                 continue;
             }
+            // Interrotto durante la chiamata: esce con le correlazioni gia' calcolate
+            if (abortController.signal.aborted)
+                break;
             const dtd = await DcmtTypeListCacheService.GetAsync(dcmt.TID);
             // Parse document values
             const docValues = await searchResultToDataSource(result, undefined, abortController.signal);
@@ -638,6 +689,11 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                         }
                     }
                 }
+                // Interruzione richiesta dall'utente: il documento corrente non è stato
+                // caricato per intero, quindi non viene aggiunto all'albero. Il parziale
+                // resta così a granularità di documento (es. 3 completi su 10).
+                if (abortController.signal.aborted)
+                    break;
                 // Aggiungi i master come root, raggruppando per TID e relationId
                 for (const masterContainer of masterDocs) {
                     const existingContainer = tree.find(c => c.tid === masterContainer.tid && c.relationId === masterContainer.relationId && c.isContainer);
@@ -666,6 +722,9 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                 const relatedDocs = isForMaster
                     ? await getMasterDcmtsAsync(dcmt.TID, dcmt.DID, maxDepthLevel, abortController.signal)
                     : await getDetailDcmtsAsync(dcmt.TID, dcmt.DID, maxDepthLevel, abortController.signal);
+                // Interruzione richiesta dall'utente
+                if (abortController.signal.aborted)
+                    break;
                 // Se showMainDocument è false, mostra i container dei dettagli direttamente sotto il container principale
                 if (!showMainDocument) {
                     // Check if a container for this TID already exists in the tree
@@ -773,7 +832,8 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
             }
             // Update progress counter
             processedCount++;
-            setWaitPanelValuePrimary(processedCount);
+            // step() attende anche la conferma di interruzione: col dialogo aperto il ciclo resta fermo
+            await panel.step();
         }
         /**
          * Helper function to check if a node has any actual correlated documents
@@ -817,7 +877,7 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
         const wasStopped = abortController.signal.aborted;
         if (wasStopped) {
             setLoadStoppedByUser(true);
-            onCalculationStopped?.();
+            onCalculationStopped?.(processedCount, inputDcmts.length);
         }
         // If no relations found, notify parent
         if (!wasStopped && hasNoRelations && onNoRelationsFound) {
@@ -843,12 +903,20 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
         }
         // FIRST setup initial expansion state (root container expanded, first document expanded with focus, first correlation folder expanded)
         // This must run BEFORE updateHiddenProperty so that infoMessage logic sees expanded=true
-        const expandedTree = setupInitialTreeExpansion(tree);
+        let expandedTree = setupInitialTreeExpansion(tree);
+        // Stato precedente da ripristinare (rimontaggio dopo un'operazione): si riapplica
+        // sopra l'espansione iniziale, che resta necessaria perché marca isRoot.
+        const stateToRestore = stateToRestoreRef.current;
+        stateToRestoreRef.current = undefined;
+        if (stateToRestore && stateToRestore.inputKey === getInputKey()) {
+            expandedTree = await applyRelationTreeState(expandedTree, stateToRestore, loadChildrenForRestore, () => abortController.signal.aborted);
+            pendingFocusPathRef.current = stateToRestore.focusedPath;
+        }
         // THEN apply hidden property transformations (creates new objects, adds infoMessage where needed)
         // Now it will correctly detect expanded nodes and add infoMessage if all children are hidden
         const processedTree = updateHiddenProperty(expandedTree);
         setTreeData(processedTree);
-    }, [inputDcmts, dcmtTypes, maxDepthLevel, isForMaster, invertMasterNavigation, getDetailDcmtsAsync, getMasterDcmtsAsync, abortController, updateHiddenProperty, showMainDocument, labelMainContainer, onNoRelationsFound, onCalculationStopped]);
+    }, [inputDcmts, dcmtTypes, maxDepthLevel, isForMaster, invertMasterNavigation, getDetailDcmtsAsync, getMasterDcmtsAsync, abortController, updateHiddenProperty, showMainDocument, labelMainContainer, onNoRelationsFound, onCalculationStopped, getInputKey]);
     /**
      * Merge main tree data with additional static items
      */
@@ -863,6 +931,18 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
         // and may contain custom properties that would be lost by the spread operator
         return [...treeData, ...itemsToMerge];
     }, [treeData, additionalStaticItems, staticItemsState]);
+    /** Notifica al padre lo stato dell'albero, così che possa restituirlo dopo un refresh. */
+    useEffect(() => {
+        if (!onTreeStateChange)
+            return;
+        // Ad albero vuoto (caricamento in corso) si sovrascriverebbe lo stato da ripristinare
+        if (treeData.length === 0)
+            return;
+        // Il padre azzera il fuoco all'avvio di un refresh: si conserva l'ultimo noto
+        const state = collectRelationTreeState(treeData, getInputKey(), focusedItem?.key, lastReportedStateRef.current?.focusedPath);
+        lastReportedStateRef.current = state;
+        onTreeStateChange(state);
+    }, [treeData, focusedItem, getInputKey, onTreeStateChange]);
     /**
      * Notify parent with a flattened list of all items whenever the merged tree data changes.
      */
@@ -903,20 +983,28 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
         lastLoadedInputRef.current = currentKey;
         // Reset interaction flag when loading new data
         userInteractedWithStaticItemsRef.current = false;
-        setShowWaitPanel(true);
-        setWaitPanelMaxValuePrimary(inputDcmts.length);
-        setWaitPanelValuePrimary(0);
+        setIsInitialLoading(true);
+        const panel = TMWaitPanelManager.show({
+            title: isForMaster ? SDKUI_Localizator.LoadingMasterDocuments : SDKUI_Localizator.LoadingDetailDocuments,
+            max: inputDcmts.length,
+            showCounters: false,
+            cancelable: true,
+            onAbort: () => abortController.abort(),
+        });
+        loadPanelRef.current = panel;
         // Call loadData and use .then() instead of await to allow React to render
-        loadData().then(() => {
+        loadData(panel).then(() => {
             // Mark as loaded AFTER data is ready - state update triggers re-render for focus selection
             lastLoadedInputRef.current = currentKey;
             setLoadedInputKey(currentKey);
-            setShowWaitPanel(false);
-            setWaitPanelTextPrimary('');
-            setWaitPanelMaxValuePrimary(0);
-            setWaitPanelValuePrimary(0);
+        }).finally(() => {
+            // Il pannello resta aperto per tutto loadData, ripristini inclusi
+            panel.close();
+            if (loadPanelRef.current === panel)
+                loadPanelRef.current = undefined;
+            setIsInitialLoading(false);
         });
-    }, [inputDcmts, dcmtTypes, maxDepthLevel, getInputKey, loadData, treeData.length]);
+    }, [inputDcmts, dcmtTypes, maxDepthLevel, isForMaster, abortController, getInputKey, loadData, treeData.length]);
     /**
      * Update tree when showZeroDcmts changes
      * Updates the visualization without re-fetching data (isLoaded stays true)
@@ -942,6 +1030,18 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
         if (lastFocusedInputRef.current === currentInputKey) {
             return;
         }
+        // Ripristino dopo un refresh. Se il nodo non esiste più (es. documento cancellato
+        // fisicamente) si prosegue con il fuoco predefinito sul root.
+        const focusPathToRestore = pendingFocusPathRef.current;
+        pendingFocusPathRef.current = undefined;
+        if (focusPathToRestore) {
+            const nodeToFocus = findRelationNodeByPath(treeData, focusPathToRestore);
+            if (nodeToFocus) {
+                onFocusedItemChanged(nodeToFocus);
+                lastFocusedInputRef.current = currentInputKey;
+                return;
+            }
+        }
         // Helper function to recursively find the first document with isRoot=true
         const findFirstRootDocument = (items) => {
             for (const item of items) {
@@ -1019,29 +1119,7 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
         if (node.isLoaded && node.items) {
             // Apply current show/hide logic based on showZeroDcmts
             const updatedItems = updateHiddenProperty(node.items);
-            // If this is a container, check if we need to show info message
-            if (node.isContainer) {
-                // Remove any existing info messages
-                const filteredItems = updatedItems.filter(child => !(child.isInfoMessage && child.key?.startsWith('__info__')));
-                // Check if all real children are hidden
-                const realChildren = filteredItems.filter(child => !child.isInfoMessage);
-                const allChildrenHidden = realChildren.length > 0 && realChildren.every(child => child.hidden);
-                // If showZeroDcmts is false and all items are hidden, show info message + keep hidden containers
-                if (!showZeroDcmts && allChildrenHidden) {
-                    return [
-                        {
-                            key: `__info__${node.key}`,
-                            name: SDKUI_Localizator.NoRelatedDocumentsToDisplay,
-                            isContainer: false,
-                            isDcmt: false,
-                            isInfoMessage: true,
-                            isExpandible: false
-                        },
-                        ...filteredItems // Keep hidden containers so they can be shown when toggling
-                    ];
-                }
-            }
-            return updatedItems;
+            return applyZeroFilterInfoMessage(node.key, updatedItems);
         }
         // ============================================
         // CONTAINER: Show items immediately (no API calls)
@@ -1055,21 +1133,7 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
             if (!node.items)
                 return [];
             const updatedItems = updateHiddenProperty(node.items);
-            // If showZeroDcmts is false and all items are hidden, add info message + keep hidden containers
-            if (!showZeroDcmts && updatedItems.length > 0 && updatedItems.every(item => item.hidden)) {
-                return [
-                    {
-                        key: `__info__${node.key}`,
-                        name: SDKUI_Localizator.NoRelatedDocumentsToDisplay,
-                        isContainer: false,
-                        isDcmt: false,
-                        isInfoMessage: true,
-                        isExpandible: false
-                    },
-                    ...updatedItems // Keep hidden containers so they can be shown when toggling
-                ];
-            }
-            return updatedItems;
+            return applyZeroFilterInfoMessage(node.key, updatedItems);
         }
         // ============================================
         // DOCUMENT: Load its children (relation containers) lazily
@@ -1077,11 +1141,19 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
         // ============================================
         if (node.isDcmt && node.tid && node.did) {
             const newAbortController = new AbortController();
-            setExpansionAbortController(newAbortController);
-            setShowExpansionWaitPanel(true);
-            setExpansionWaitPanelMaxValue(1);
-            setExpansionWaitPanelValue(0);
-            setExpansionWaitPanelText(`Caricamento documenti correlati...`);
+            expansionAbortControllerRef.current = newAbortController;
+            setIsExpansionLoading(true);
+            // Un solo nodo: niente contatori ne' stima dei tempi, solo l'attesa annullabile.
+            const panel = TMWaitPanelManager.show({
+                title: isForMaster ? SDKUI_Localizator.LoadingMasterDocuments : SDKUI_Localizator.LoadingDetailDocuments,
+                subtitle: 'Caricamento documenti correlati...',
+                max: 1,
+                showCounters: false,
+                showEta: false,
+                cancelable: true,
+                onAbort: () => newAbortController.abort(),
+            });
+            expansionPanelRef.current = panel;
             try {
                 // Check for abort
                 if (newAbortController.signal.aborted) {
@@ -1110,34 +1182,22 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                 // - Relation type containers are always visible (even if empty)
                 // - Other containers with zero items can be hidden based on showZeroDcmts
                 const updatedItems = updateHiddenProperty(loadedItems);
-                // If showZeroDcmts is false and all items are hidden, add info message + keep hidden containers
-                if (!showZeroDcmts && updatedItems.length > 0 && updatedItems.every(item => item.hidden)) {
-                    return [
-                        {
-                            key: `__info__${node.key}`,
-                            name: SDKUI_Localizator.NoRelatedDocumentsToDisplay,
-                            isContainer: false,
-                            isDcmt: false,
-                            isInfoMessage: true,
-                            isExpandible: false
-                        },
-                        ...updatedItems // Keep hidden containers so they can be shown when toggling
-                    ];
-                }
-                return updatedItems;
+                return applyZeroFilterInfoMessage(node.key, updatedItems);
             }
             catch (error) {
                 console.error('Error loading document relations:', error);
                 return [];
             }
             finally {
-                setShowExpansionWaitPanel(false);
-                setExpansionAbortController(undefined);
+                panel.close();
+                setIsExpansionLoading(false);
+                expansionAbortControllerRef.current = undefined;
+                expansionPanelRef.current = undefined;
             }
         }
         // Default: return existing items
         return node.items;
-    }, [isForMaster, invertMasterNavigation, getDetailDcmtsAsync, getMasterDcmtsAsync, updateHiddenProperty, showZeroDcmts]);
+    }, [isForMaster, invertMasterNavigation, getDetailDcmtsAsync, getMasterDcmtsAsync, updateHiddenProperty, applyZeroFilterInfoMessage, showZeroDcmts]);
     /**
      * Default item renderer with metadata display (adapted from TMMasterDetailDcmts.tsx)
      */
@@ -1170,8 +1230,7 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                 gap: '10px',
                 height: '32px',
                 padding: '6px 0',
-                opacity: item.isZero ? 0.99 : 1,
-                transition: 'opacity 0.2s ease-in-out'
+                opacity: item.isZero ? 0.4 : 1,
             };
             // Se è il container principale (root) e showMainDocument è false,
             // non mostrare il badge perché conterrebbe il numero di sotto-container, non di documenti
@@ -1181,7 +1240,7 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                                     textOverflow: 'ellipsis',
                                     fontSize: '1rem',
                                     color: 'inherit'
-                                }, children: item.name }), shouldShowBadge && (_jsx(StyledBadge, { "$backgroundColor": TMColors.info, children: item.items?.length ?? 0 }))] })] }));
+                                }, children: item.name }), shouldShowBadge && (_jsx(StyledBadge, { $backgroundColor: TMColors.info, children: item.items?.length ?? 0 }))] })] }));
             // Se è il container principale (root) e abbiamo un custom renderer, usalo
             const content = (item.isRoot && customMainContainerContent)
                 ? customMainContainerContent(item, defaultContent)
@@ -1201,8 +1260,7 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
             alignItems: 'center',
             cursor: 'pointer',
             userSelect: 'none',
-            opacity: item.isZero ? 0.99 : 1,
-            transition: 'opacity 0.2s ease-in-out',
+            opacity: item.isZero ? 0.4 : 1,
             textDecoration: isLogicallyDeleted ? 'line-through' : 'none'
         };
         const documentStyle = customDocumentStyle ? { ...defaultDocumentStyle, ...customDocumentStyle(item) } : defaultDocumentStyle;
@@ -1262,7 +1320,7 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                 checkoutStatusIcon = checkoutStatus.icon;
             }
         }
-        return (_jsxs("div", { onDoubleClick: handleDoubleClick, style: documentStyle, children: [item.did && item.tid && showCurrentDcmtIndicator && inputDcmts?.some(d => d.DID === item.did && d.TID === item.tid) ? _jsx(IconBackhandIndexPointingRight, { fontSize: 22, overflow: 'visible' }) : _jsx(_Fragment, {}), item.values && (_jsx(TMDcmtIcon, { tid: item.values?.TID?.value, did: item.values?.DID?.value, fileExtension: item.values?.FILEEXT?.value, fileCount: item.values?.FILECOUNT?.value, isLexProt: item.values?.IsLexProt?.value, isMail: item.values?.ISMAIL?.value, isShared: item.values?.ISSHARED?.value, isSigned: item.values?.ISSIGNED?.value, downloadMode: 'openInNewWindow', usePortal: true })), checkoutStatusIcon, metadataContent] }));
+        return (_jsxs("div", { onDoubleClick: handleDoubleClick, style: documentStyle, children: [item.did && item.tid && showCurrentDcmtIndicator && inputDcmts?.some(d => d.DID === item.did && d.TID === item.tid) ? _jsx(IconBackhandIndexPointingRight, { fontSize: 22, overflow: 'visible' }) : _jsx(_Fragment, {}), item.values && (_jsx(TMDcmtIcon, { tid: item.values?.TID?.value, did: item.values?.DID?.value, fileExtension: item.values?.FILEEXT?.value, fileCount: item.values?.FILECOUNT?.value, isLexProt: item.values?.IsLexProt?.value, isMail: item.values?.ISMAIL?.value, isShared: item.values?.ISSHARED?.value, isSigned: item.values?.ISSIGNED?.value, downloadMode: 'openInNewWindow' })), checkoutStatusIcon, metadataContent] }));
     }, [onDocumentDoubleClick, showCurrentDcmtIndicator, inputDcmts, customMainContainerContent, customDocumentStyle, customDocumentContent, showMetadataNames, showMainDocument, allUsers]);
     /**
      * Wrapper renderer that handles custom rendering if provided
@@ -1376,15 +1434,18 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
         }
         const targetLevel = expandLevel;
         const newAbortController = new AbortController();
-        setExpansionAbortController(newAbortController);
+        expansionAbortControllerRef.current = newAbortController;
+        // Aperto solo se servono chiamate API (vedi hasApiCalls): con i figli già in
+        // memoria l'espansione è immediata e il pannello lampeggerebbe soltanto.
+        let panel;
         // CONTATORI DINAMICI:
         // - totalNodes: cresce quando scopriamo nuovi nodi (evita che percentuale > 100%)
         // - processedNodes: quanti nodi abbiamo già processato
-        // - maxReachedProgress: percentuale massima raggiunta (evita che la barra torni indietro)
+        // - shownProgress: percentuale mostrata, che non torna mai indietro
         let totalNodes = 0;
         let processedNodes = 0;
         let hasApiCalls = false;
-        let maxReachedProgress = 0;
+        let shownProgress = 0;
         /**
          * Conta i nodi espandibili in un array (solo primo livello, non ricorsivo).
          * Usato per aggiornare totalNodes man mano che scopriamo nuovi figli.
@@ -1400,6 +1461,7 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
         };
         // Conta iniziale: solo i nodi al livello root
         totalNodes = countNodesAtLevel([...workingTreeData, ...workingStaticData]);
+        const initialTotalNodes = totalNodes;
         /**
          * FUNZIONE RICORSIVA DI ESPANSIONE
          *
@@ -1453,9 +1515,17 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                         if (!hasApiCalls) {
                             hasApiCalls = true;
                             TMSpinner.hide();
-                            setShowExpansionWaitPanel(true);
-                            setExpansionWaitPanelMaxValue(100);
-                            setExpansionWaitPanelValue(0);
+                            setIsExpansionLoading(true);
+                            // Avanzamento in centesimi: il totale cambia mentre si scoprono i figli, niente ETA.
+                            panel = TMWaitPanelManager.show({
+                                title: isForMaster ? SDKUI_Localizator.LoadingMasterDocuments : SDKUI_Localizator.LoadingDetailDocuments,
+                                max: 100,
+                                showCounters: false,
+                                showEta: false,
+                                cancelable: true,
+                                onAbort: () => newAbortController.abort(),
+                            });
+                            expansionPanelRef.current = panel;
                         }
                         try {
                             let loadedItems = [];
@@ -1470,7 +1540,8 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                                 loadedItems = await getDetailDcmtsAsync(node.tid, node.did, 1, newAbortController.signal);
                             }
                             // Applica le regole di visibilità (showZeroDcmts)
-                            expandedNode.items = updateHiddenProperty(loadedItems);
+                            // Stesse regole dell'espansione manuale (messaggio informativo se tutto nascosto)
+                            expandedNode.items = applyZeroFilterInfoMessage(node.key, updateHiddenProperty(loadedItems));
                             expandedNode.isLoaded = true;
                             expandedNode.itemsCount = loadedItems.length;
                             // IMPORTANTE: Aggiungi i nuovi nodi scoperti al contatore totale
@@ -1497,14 +1568,15 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                     }
                     // Aggiorna il progresso DOPO aver processato questo nodo
                     processedNodes++;
-                    // Calcola percentuale e aggiorna solo se è più alta di prima
-                    // (evita che la barra di progresso torni indietro)
-                    const currentProgress = totalNodes > 0 ? Math.floor((processedNodes / totalNodes) * 100) : 0;
-                    if (currentProgress > maxReachedProgress) {
-                        maxReachedProgress = currentProgress;
-                        setExpansionWaitPanelValue(maxReachedProgress);
-                    }
-                    setExpansionWaitPanelText(SDKUI_Localizator.ExpansionProgress.replaceParams(processedNodes.toString(), totalNodes.toString()));
+                    // La barra non torna mai indietro: segue il valore reale quando sale, altrimenti avanza verso il 99%
+                    const realProgress = totalNodes > 0 ? (processedNodes / totalNodes) * 100 : 0;
+                    shownProgress = Math.min(99, realProgress > shownProgress
+                        ? realProgress
+                        : shownProgress + (99 - shownProgress) * 0.01);
+                    panel?.setValue(shownProgress);
+                    // Seconda riga: spiega perché percentuale e conteggio non vanno di pari passo
+                    panel?.setSubtitle(SDKUI_Localizator.ExpansionProgress.replaceParams(processedNodes.toString(), totalNodes.toString())
+                        + (totalNodes > initialTotalNodes ? `\n${SDKUI_Localizator.ExpansionProgressIsEstimated}` : ''));
                     // ═══════════════════════════════════════════════════════════════════
                     // PASSO 3: CHIAMATA RICORSIVA SUI FIGLI
                     // Questo è il punto chiave: i nuovi nodi appena caricati vengono
@@ -1532,10 +1604,12 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
         finally {
             // Cleanup: nascondi spinner e pannello di attesa
             TMSpinner.hide();
-            setShowExpansionWaitPanel(false);
-            setExpansionAbortController(undefined);
+            panel?.close();
+            setIsExpansionLoading(false);
+            expansionAbortControllerRef.current = undefined;
+            expansionPanelRef.current = undefined;
         }
-    }, [expandLevel, treeData, staticItemsState, isForMaster, invertMasterNavigation, getDetailDcmtsAsync, getMasterDcmtsAsync, updateHiddenProperty]);
+    }, [expandLevel, treeData, staticItemsState, isForMaster, invertMasterNavigation, getDetailDcmtsAsync, getMasterDcmtsAsync, updateHiddenProperty, applyZeroFilterInfoMessage]);
     /**
      * Apply defaultExpandAll once on initial tree load.
      */
@@ -1564,8 +1638,10 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
         // Reset collapsed state when user manually expands a node
         setIsAllCollapsed(false);
     }, []);
-    if (showWaitPanel) {
-        return _jsx("div", { style: { padding: '20px', textAlign: 'center' }, children: _jsx(TMWaitPanel, { title: SDKUI_Localizator.LoadingDetailDocuments, showPrimary: true, textPrimary: waitPanelTextPrimary, valuePrimary: waitPanelValuePrimary, maxValuePrimary: waitPanelMaxValuePrimary, isCancelable: true, abortController: abortController, onAbortClick: () => { setTimeout(() => { abortController.abort(); }, 1000); } }) });
+    // Il pannello di attesa è montato dal manager fuori dall'albero React: qui resta
+    // solo il posto dell'albero, che compare a calcolo finito.
+    if (isInitialLoading) {
+        return _jsx("div", { style: { width: '100%', height: '100%' } });
     }
     if (mergedTreeData.length === 0) {
         // Calcolo interrotto dall'utente prima di aver calcolato qualsiasi correlazione
@@ -1622,15 +1698,11 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                                 whiteSpace: 'nowrap',
                                 outline: 'none',
                                 transition: 'background 0.2s'
-                            }, children: [_jsx(IconChevronRight, { fontSize: 14 }), _jsx("span", { children: SDKUI_Localizator.CollapseAll })] }) })] })), _jsx("div", { style: { flex: 1, minHeight: 0, overflow: 'auto' }, children: _jsx(TMTreeView, { dataSource: mergedTreeData, itemRender: finalItemRender, calculateItemsForNode: calculateItemsForNode, onDataChanged: handleDataChanged, focusedItem: focusedItem, onFocusedItemChanged: handleFocusedItemChanged, allowMultipleSelection: allowMultipleSelection, selectedItems: selectedItems, itemsPerPage: 100, onSelectionChanged: handleSelectedItemsChanged, onItemContextMenu: showExpansionWaitPanel ? undefined : onItemContextMenu, enableVirtualization: true, shouldDelayFocusOnEvent: (node, e) => {
+                            }, children: [_jsx(IconChevronRight, { fontSize: 14 }), _jsx("span", { children: SDKUI_Localizator.CollapseAll })] }) })] })), _jsx("div", { style: { flex: 1, minHeight: 0, overflow: 'auto' }, children: _jsx(TMTreeView, { dataSource: mergedTreeData, itemRender: finalItemRender, calculateItemsForNode: calculateItemsForNode, onDataChanged: handleDataChanged, focusedItem: focusedItem, onFocusedItemChanged: handleFocusedItemChanged, allowMultipleSelection: allowMultipleSelection, selectedItems: selectedItems, itemsPerPage: 100, onSelectionChanged: handleSelectedItemsChanged, onItemContextMenu: isExpansionLoading ? undefined : onItemContextMenu, enableVirtualization: true, shouldDelayFocusOnEvent: (node, e) => {
                         // Ritarda il focus quando si clicca sull'icona del documento
                         // per permettere al doppio click di funzionare
                         const target = e.target;
                         return !!target.closest('.tm-dcmt-icon');
-                    } }) }), showExpansionWaitPanel && (_jsx(TMWaitPanel, { title: isForMaster ? SDKUI_Localizator.LoadingMasterDocuments : SDKUI_Localizator.LoadingDetailDocuments, showPrimary: true, textPrimary: expansionWaitPanelText, valuePrimary: expansionWaitPanelValue, maxValuePrimary: expansionWaitPanelMaxValue, isCancelable: true, abortController: expansionAbortController, onAbortClick: () => {
-                    setTimeout(() => {
-                        expansionAbortController?.abort();
-                    }, 100);
-                } }))] }));
+                    } }) })] }));
 };
 export default TMRelationViewer;