@topconsultnpm/sdkui-react 6.21.0-dev5.4 → 6.21.0-dev5.6

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

@@ -100,15 +100,18 @@ const TMMergeToPdfForm = (props) => {
             });
             return null;
         }
-        if (pdfDcmtInfosToDownload.length < MIN_PDF_FOR_MERGE) {
+        // Permetti merge anche con 1 solo file se convertibile o metadata-only
+        if (!hasEnoughPdfForMerge) {
             TMMessageBoxManager.show({
                 message: SDKUI_Localizator.OnlyOnePdfOrConvertibleFileMergeBlocked.replaceParams(MIN_PDF_FOR_MERGE.toString()),
                 buttons: [ButtonNames.OK]
             });
             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,
@@ -725,7 +727,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);

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)
@@ -68,7 +76,9 @@ export const getMergePdfSelectionStats = (selectedDcmtInfos, selectedItemsFull,
         metadataOnlySelectedItems,
         hasMetadataOnlySelected: metadataOnlySelectedItems.length > 0,
         mergeableSelectedCount,
-        hasEnoughPdfForMerge: mergeableSelectedCount >= MIN_PDF_FOR_MERGE,
+        // Merge possibile se: >= 2 file unibili OPPURE >= 1 file convertibile/metadata-only (verrà trasformato in PDF)
+        hasEnoughPdfForMerge: mergeableSelectedCount >= MIN_PDF_FOR_MERGE ||
+            (mergeableSelectedCount >= 1 && (convertibleSelectedItems.length > 0 || metadataOnlySelectedItems.length > 0)),
     };
 };
 // LAZY LOADING pdf-lib

package/package.json

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