@topconsultnpm/sdkui-react 6.21.0-dev5.5 → 6.21.0-dev5.7

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

@@ -108,8 +108,10 @@ const TMMergeToPdfForm = (props) => {
             });
             return null;
         }
-        // Mappa per lookup veloce di FILECOUNT e FILEEXT da selectedItemsFull
-        const fileInfoMap = new Map(selectedItemsFull.map(d => [`${d.TID}_${d.DID}`, { fileExt: d.FILEEXT, fileCount: d.FILECOUNT }]));
+        // Mappa per lookup veloce di FILECOUNT e FILEEXT
+        const fileInfoMap = new Map(showTMRelationViewer
+            ? selectedItemsRelationViewer.map(d => [`${d.tid}_${d.did}`, { fileExt: d.fileExt ?? null, fileCount: d.fileCount ?? null }])
+            : selectedItemsFull.map(d => [`${d.TID}_${d.DID}`, { fileExt: d.FILEEXT, fileCount: d.FILECOUNT }]));
         // Mappa per i risultati: mantiene l'ordine originale
         const pdfFilesMap = new Map();
         // Identifica documenti di soli metadati e documenti con file

package/lib/components/features/documents/TMRelationViewer.d.ts

@@ -24,6 +24,7 @@ export interface RelationTreeItem extends ITMTreeItem {
     searchResult?: SearchResultDescriptor[];
     itemsCount?: number;
     fileExt?: string;
+    fileCount?: number;
 }
 /**
  * Props for TMRelationViewer component

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

@@ -309,6 +309,7 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                             hidden: false,
                             name: row?.SYS_Abstract?.value || row?.SYS_SUBJECT?.value || `Documento ${did}`,
                             fileExt: row?.FILEEXT?.value,
+                            fileCount: row?.FILECOUNT?.value,
                             // Note: Recursive loading on expansion is handled by calculateItemsForNode
                         });
                     }
@@ -318,7 +319,7 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
             }
         }
         catch (error) {
-            console.error('❌ Error loading detail documents:', error);
+            console.error('Error loading detail documents:', error);
         }
         return items;
     }, [allowedTIDs]);
@@ -393,6 +394,7 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                             values: row,
                             searchResult: [searchResult],
                             fileExt: row?.FILEEXT?.value,
+                            fileCount: row?.FILECOUNT?.value,
                             // Leave items and itemsCount undefined so TMTreeView shows expand arrow based on isExpandible
                             // Children will be loaded lazily by calculateItemsForNode when expanded
                             expanded: false,
@@ -513,16 +515,8 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                             expanded: true,
                             isRoot: true
                         };
-                        // Expand first correlation folder ONLY if there's exactly one
-                        const docItems = newFirstDoc.items;
-                        const containerChildren = docItems?.filter(child => child.isContainer) ?? [];
-                        if (containerChildren.length === 1 && docItems && docItems.length > 0 && docItems[0].isContainer) {
-                            const newFirstCorrelation = { ...docItems[0], expanded: true };
-                            newFirstDoc = {
-                                ...newFirstDoc,
-                                items: [newFirstCorrelation, ...docItems.slice(1)]
-                            };
-                        }
+                        // NOTE: Le cartelle di correlazione rimangono con expanded: false.
+                        // Verranno espanse solo tramite il pulsante "espandi n livelli" o espansione manuale.
                         // Update the container's items
                         newContainer = {
                             ...newContainer,
@@ -531,11 +525,11 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                     }
                     else if (firstDocOrContainer.isContainer) {
                         // First item is a container (correlation folder)
-                        const siblingContainers = containerItems.filter(child => child.isContainer);
-                        const shouldExpandCorrelation = siblingContainers.length === 1;
+                        // NOTE: Le cartelle di correlazione rimangono con expanded: false.
+                        // Verranno espanse solo tramite il pulsante "espandi n livelli" o espansione manuale.
                         let newFirstCorrelation = {
                             ...firstDocOrContainer,
-                            expanded: shouldExpandCorrelation
+                            expanded: false
                         };
                         // Find first document inside this container and mark for focus
                         const correlationItems = newFirstCorrelation.items;
@@ -725,7 +719,8 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                         searchResult: result ? [result] : [],
                         items: relatedDocs,
                         itemsCount: relatedDocs.length,
-                        fileExt: docRow?.FILEEXT?.value
+                        fileExt: docRow?.FILEEXT?.value,
+                        fileCount: docRow?.FILECOUNT?.value
                     };
                     // Check if a type container for this TID already exists in the tree
                     const existingContainer = tree.find(c => c.tid === dcmt.TID && c.isContainer);
@@ -1276,6 +1271,8 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
     /**
      * Recursively set the `expanded` property on every node that has children loaded.
      * Nodes without `items` are left untouched (will be loaded lazily on user click).
+     * NOTE: Solo i nodi con figli già caricati (isLoaded o hasChildren) vengono espansi.
+     * I nodi con isExpandible ma senza figli caricati rimangono chiusi.
      */
     const setExpandedRecursively = useCallback((nodes, expanded) => {
         if (!nodes || !Array.isArray(nodes))
@@ -1283,8 +1280,9 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
         return nodes.map(node => {
             const hasChildren = Array.isArray(node.items) && node.items.length > 0;
             const newItems = hasChildren ? setExpandedRecursively(node.items, expanded) : node.items;
-            // Only toggle expansion if the node is expandable (container/doc with children or marked expandible)
-            const canExpand = hasChildren || node.isExpandible;
+            // Only toggle expansion if the node has children already loaded.
+            // Nodes with isExpandible but no loaded children stay collapsed (will be loaded lazily).
+            const canExpand = hasChildren || node.isLoaded;
             return { ...node, expanded: canExpand ? expanded : node.expanded, items: newItems };
         });
     }, []);

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

@@ -224,7 +224,6 @@ export const generateTargetFileName = async (file, dcmtInfo, options) => {
         case 'onlyCustomMetadata': {
             try {
                 const filteredMetadata = await getFilteredMetadata(dcmtInfo.TID, dcmtInfo.DID, separatorChar);
-                console.log("filteredMetadata for TID:", dcmtInfo.TID, "DID:", dcmtInfo.DID, "is", filteredMetadata);
                 if (filteredMetadata) {
                     if (fileNamingMode === 'documentTypeAndCustomMetadata') {
                         const typeName = await getTypeName(dcmtInfo.TID);

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

@@ -17,11 +17,15 @@ export const isMetadataOnlyDcmt = (fileExt, fileCount) => {
  * @param showTMRelationViewer - Se true, usa selectedItemsRelationViewer, altrimenti selectedDcmtInfos
  */
 export const getMergePdfSelectionStats = (selectedDcmtInfos, selectedItemsFull, selectedItemsRelationViewer, showTMRelationViewer) => {
-    // Mappa per lookup veloce di FILECOUNT da selectedItemsFull (usato solo per isMetadataOnly)
-    const fileCountMap = new Map(selectedItemsFull.map(d => [`${d.TID}_${d.DID}`, d.FILECOUNT]));
-    // Pre-calcolo delle informazioni sui documenti selezionati
-    const docs = showTMRelationViewer
-        ? selectedItemsRelationViewer
+    /**
+     * Pre-calcola info documenti selezionati in base alla sorgente dati:
+     * - RelationViewer (showTMRelationViewer=true): usa IRelatedDcmt con itemsCount/fileExt
+     * - Griglia documenti (showTMRelationViewer=false): usa DcmtInfo + lookup FILECOUNT da selectedItemsFull
+     */
+    let docs;
+    if (showTMRelationViewer) {
+        // Sorgente: RelationViewer - itemsCount e fileExt disponibili direttamente su IRelatedDcmt
+        docs = selectedItemsRelationViewer
             .filter(i => i.isDcmt)
             .map(i => {
             const ext = i.fileExt ?? undefined;
@@ -30,21 +34,25 @@ export const getMergePdfSelectionStats = (selectedDcmtInfos, selectedItemsFull,
                 ext,
                 isPdf: isPdfExt(ext),
                 isConvertible: isConvertibleToPdfExt(ext),
-                isMetadataOnly: isMetadataOnlyDcmt(ext, null)
+                isMetadataOnly: isMetadataOnlyDcmt(ext, i.fileCount)
             };
-        })
-        : selectedDcmtInfos.map(d => {
+        });
+    }
+    else {
+        // Sorgente: Griglia documenti - FILECOUNT richiede lookup da selectedItemsFull
+        const fileCountMap = new Map(selectedItemsFull.map(d => [`${d.TID}_${d.DID}`, d.FILECOUNT]));
+        docs = selectedDcmtInfos.map(d => {
             const ext = d.FILEEXT ?? undefined;
             const key = `${d.TID}_${d.DID}`;
-            const fileCount = fileCountMap.get(key);
             return {
                 key,
                 ext,
                 isPdf: isPdfExt(ext),
                 isConvertible: isConvertibleToPdfExt(ext),
-                isMetadataOnly: isMetadataOnlyDcmt(ext, fileCount)
+                isMetadataOnly: isMetadataOnlyDcmt(ext, fileCountMap.get(key))
             };
         });
+    }
     // Elementi convertibili: file con estensione convertibile (esclusi documenti di soli metadati)
     const convertibleSelectedItems = docs
         .filter(i => i.isConvertible && !i.isMetadataOnly)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topconsultnpm/sdkui-react",
-    "version": "6.21.0-dev5.5",
+    "version": "6.21.0-dev5.7",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",