@topconsultnpm/sdkui-react 6.21.0-dev2.50 → 6.21.0-dev2.52

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

@@ -144,7 +144,7 @@ const TMMergeToPdfForm = ({ mode, selectedDcmtInfos, onClose, showTMRelationView
         const pdfFiles = [];
         const rfo = new RetrieveFileOptions();
         rfo.retrieveReason = DcmtOpers.None;
-        rfo.generalRetrieveFormat = GeneralRetrieveFormats.Original;
+        rfo.generalRetrieveFormat = GeneralRetrieveFormats.OriginalUnsigned;
         rfo.cvtFormat = FileFormats.PDF;
         rfo.invoiceRetrieveFormat = SDKUI_Globals.userSettings?.searchSettings.invoiceRetrieveFormat;
         rfo.orderRetrieveFormat = SDKUI_Globals.userSettings?.searchSettings.orderRetrieveFormat;

package/lib/hooks/useDcmtOperations.js

@@ -18,16 +18,49 @@ const isScannerLicenseConfigured = () => {
 };
 let abortController = new AbortController();
 const downloadCountMap = new Map();
-const getDownloadFileName = (fileName) => {
-    const firstDot = fileName.indexOf('.');
-    const lastDot = fileName.lastIndexOf('.');
-    if (firstDot === -1 || firstDot === lastDot)
-        return fileName;
-    const count = downloadCountMap.get(fileName) ?? 0;
-    downloadCountMap.set(fileName, count + 1);
-    if (count === 0)
-        return fileName;
-    return `${fileName.slice(0, firstDot)}(${count})${fileName.slice(firstDot)}`;
+/**
+ * Genera il nome file per il download con fallback: backend → fileName → DID.
+ * Aggiunge estensione se mancante e gestisce duplicati per file multi-estensione.
+ */
+const getDownloadFileName = (file, dcmtInfo) => {
+    // === FASE 1: Costruzione nome base con fallback ===
+    // Determina l'estensione con fallback
+    const fileExtFromBackend = file?.name?.split('.').pop()?.toLowerCase();
+    const fileExtFromDcmt = dcmtInfo.FILEEXT?.toLowerCase();
+    const fileExtension = fileExtFromBackend ?? fileExtFromDcmt ?? '';
+    let baseFileName;
+    // 1. Priorità massima: nome dal backend
+    if (file?.name) {
+        baseFileName = file.name;
+    }
+    // 2. Seconda priorità: nome salvato nel documento
+    else if (dcmtInfo.fileName) {
+        const hasExtension = dcmtInfo.fileName.includes('.');
+        baseFileName = hasExtension
+            ? dcmtInfo.fileName
+            : (fileExtension ? `${dcmtInfo.fileName}.${fileExtension}` : dcmtInfo.fileName);
+    }
+    // 3. Fallback finale: ID documento con estensione
+    else {
+        baseFileName = fileExtension ? `${dcmtInfo.DID}.${fileExtension}` : `${dcmtInfo.DID}`;
+    }
+    // === FASE 2: Gestione duplicati per file con estensioni multiple ===
+    const firstDot = baseFileName.indexOf('.');
+    const lastDot = baseFileName.lastIndexOf('.');
+    // Se non ci sono punti o c'è una sola estensione, ritorna il nome così com'è
+    if (firstDot === -1 || firstDot === lastDot) {
+        return baseFileName;
+    }
+    // Gestisce il contatore per evitare sovrascritture
+    const count = downloadCountMap.get(baseFileName) ?? 0;
+    downloadCountMap.set(baseFileName, count + 1);
+    // Prima occorrenza: nome originale
+    if (count === 0) {
+        return baseFileName;
+    }
+    // Download successivi: inserisce contatore dopo il nome base
+    // Es: "file.pdf.p7m" -> "file(1).pdf.p7m"
+    return `${baseFileName.slice(0, firstDot)}(${count})${baseFileName.slice(firstDot)}`;
 };
 export const useDcmtOperations = () => {
     const [showWaitPanel, setShowWaitPanel] = useState(false);
@@ -126,8 +159,7 @@ export const useDcmtOperations = () => {
                     else {
                         const alink2 = document.createElement('a');
                         alink2.href = fileURL;
-                        const baseFileName = inputDcmts[i].fileName ?? (inputDcmts[i].FILEEXT ? `${inputDcmts[i].DID}.${inputDcmts[i].FILEEXT}` : file?.name);
-                        alink2.download = getDownloadFileName(baseFileName);
+                        alink2.download = getDownloadFileName(file, inputDcmts[i]);
                         alink2.target = "_blank";
                         alink2.rel = "noreferrer";
                         alink2.click();

package/package.json

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