@topconsultnpm/sdkui-react 6.22.0-dev1.2 → 6.22.0-dev1.3

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

@@ -82,7 +82,7 @@ const TMMergeToPdfForm = (props) => {
         pdfValidationItems.push(new ValidationItem(ResultTypes.ERROR, SDKUI_Localizator.PdfFileName, SDKUI_Localizator.RequiredField));
     }
     // ---- Statistiche selezione PDF / convertibili / non-PDF ----
-    const { convertibleSelectedItems, hasConvertibleSelected, nonPdfSelectedItems, hasNonPdfSelected, metadataOnlySelectedItems, hasMetadataOnlySelected, mergeableSelectedCount, hasEnoughPdfForMerge, } = getMergePdfSelectionStats(selectedDcmtInfos, selectedItemsFull, selectedItemsRelationViewer, showTMRelationViewer);
+    const { convertibleSelectedItems, hasConvertibleSelected, nonPdfSelectedItems, hasNonPdfSelected, metadataOnlySelectedItems, hasMetadataOnlySelected, pdfSelectedItems, hasPdfSelected, mergeableSelectedCount, hasEnoughPdfForMerge, } = getMergePdfSelectionStats(selectedDcmtInfos, selectedItemsFull, selectedItemsRelationViewer, showTMRelationViewer);
     const isFormValid = () => pdfValidationItems.length === 0;
     // ---- Recupero dei file PDF da unire (condiviso tra Esegui e Anteprima) ----
     const collectPdfFilesToMerge = async () => {
@@ -285,7 +285,7 @@ const TMMergeToPdfForm = (props) => {
                                                 width: 'max-content',
                                                 backgroundColor: TMColors.default_background,
                                                 zIndex: 1,
-                                            }, children: SDKUI_Localizator.Path }), _jsxs("div", { style: { border: `1px solid ${TMColors.border_normal}`, borderRadius: '5px', padding: '4px 10px 4px 13px', display: 'flex', alignItems: 'center', gap: '8px', backgroundColor: '#fafafa' }, children: [_jsx(IconFolderOpen, {}), _jsx("span", { style: { fontSize: '0.9rem', color: '#333' }, children: "Download" })] }), _jsx("span", { style: { fontSize: '0.8rem', color: '#888', fontStyle: 'italic', marginTop: '4px', display: 'block' }, children: SDKUI_Localizator.BrowserDoesNotSupportFolderSelection })] }) })), _jsx("div", { style: { flex: '1.5 1 420px', minWidth: '350px', width: '100%' }, children: _jsx(TMTextBox, { label: SDKUI_Localizator.PdfFileName, value: pdfFileName, validationItems: pdfValidationItems, autoComplete: "one-time-code", onValueChanged: (e) => setPdfFileName(e.target.value) }) })] }), (hasConvertibleSelected || hasMetadataOnlySelected || !hasEnoughPdfForMerge || hasNonPdfSelected) && (_jsxs("div", { style: {
+                                            }, children: SDKUI_Localizator.Path }), _jsxs("div", { style: { border: `1px solid ${TMColors.border_normal}`, borderRadius: '5px', padding: '4px 10px 4px 13px', display: 'flex', alignItems: 'center', gap: '8px', backgroundColor: '#fafafa' }, children: [_jsx(IconFolderOpen, {}), _jsx("span", { style: { fontSize: '0.9rem', color: '#333' }, children: "Download" })] }), _jsx("span", { style: { fontSize: '0.8rem', color: '#888', fontStyle: 'italic', marginTop: '4px', display: 'block' }, children: SDKUI_Localizator.BrowserDoesNotSupportFolderSelection })] }) })), _jsx("div", { style: { flex: '1.5 1 420px', minWidth: '350px', width: '100%' }, children: _jsx(TMTextBox, { label: SDKUI_Localizator.PdfFileName, value: pdfFileName, validationItems: pdfValidationItems, autoComplete: "one-time-code", onValueChanged: (e) => setPdfFileName(e.target.value) }) })] }), (hasConvertibleSelected || hasMetadataOnlySelected || !hasEnoughPdfForMerge || hasNonPdfSelected || hasPdfSelected) && (_jsxs("div", { style: {
                             display: 'flex',
                             flexDirection: 'column',
                             gap: '6px',
@@ -308,17 +308,25 @@ const TMMergeToPdfForm = (props) => {
                                 }, children: SDKUI_Localizator.NotesAndWarnings }), _jsxs("ul", { style: { margin: 0, paddingLeft: '18px', display: 'flex', flexDirection: 'column', gap: '4px' }, children: [(hasConvertibleSelected || hasMetadataOnlySelected) && (_jsx("li", { style: { color: '#00527a' }, children: (() => {
                                             // Combina convertibili + metadataOnly
                                             const allConvertible = [...convertibleSelectedItems, ...metadataOnlySelectedItems];
-                                            const extSet = Array.from(new Set([
-                                                ...convertibleSelectedItems.map(i => (i.ext ?? '').toString().trim().toLowerCase().replace(/^\./, '')).filter(e => e.length > 0),
-                                                ...(hasMetadataOnlySelected ? ['metadati'] : [])
-                                            ]));
-                                            const extLabel = extSet.length > 0
-                                                ? ` (${extSet.map(e => '.' + e).join(', ')})`
-                                                : '';
-                                            return allConvertible.length === 1
-                                                ? SDKUI_Localizator.DocumentWillBeConvertedDuringMerge.replaceParams(extLabel)
-                                                : SDKUI_Localizator.DocumentsWillBeConvertedDuringMerge.replaceParams(allConvertible.length.toString(), extLabel);
-                                        })() })), !hasEnoughPdfForMerge && (_jsx("li", { style: { color: '#7a5d00' }, children: mergeableSelectedCount === 0
+                                            // Conta le occorrenze per ogni estensione
+                                            const extCounts = new Map();
+                                            convertibleSelectedItems.forEach(i => {
+                                                const ext = (i.ext ?? '').toString().trim().toLowerCase().replace(/^\./, '');
+                                                if (ext.length > 0) {
+                                                    extCounts.set(ext, (extCounts.get(ext) || 0) + 1);
+                                                }
+                                            });
+                                            if (hasMetadataOnlySelected) {
+                                                extCounts.set('metadati', metadataOnlySelectedItems.length);
+                                            }
+                                            // Genera label per tooltip: "3 xml, 2 doc, 1 metadati"
+                                            const extLabel = Array.from(extCounts.entries()).map(([ext, count]) => `${count} ${ext}`).join(', ');
+                                            return (_jsxs("span", { style: { display: 'inline-flex', alignItems: 'center', gap: '6px' }, children: [_jsx("span", { children: allConvertible.length === 1
+                                                            ? SDKUI_Localizator.DocumentWillBeConvertedDuringMerge
+                                                            : SDKUI_Localizator.DocumentsWillBeConvertedDuringMerge.replaceParams(allConvertible.length.toString()) }), extLabel && (_jsx(TMTooltip, { content: _jsxs("div", { style: { minWidth: 180, padding: "10px 12px", borderRadius: 8 }, children: [_jsxs("div", { style: { textAlign: "center", fontWeight: 600, fontSize: 13, marginBottom: 10, paddingBottom: 8, borderBottom: "1px solid rgba(255,255,255,0.15)" }, children: [SDKUI_Localizator.ConversionDetails, " (", Array.from(extCounts.values()).reduce((a, b) => a + b, 0), ")"] }), _jsx("div", { style: { display: "flex", flexDirection: "column", gap: 4, maxHeight: 150, overflowY: "auto" }, children: Array.from(extCounts.entries()).sort((a, b) => a[0].localeCompare(b[0])).map(([ext, count]) => (_jsxs("div", { style: { display: "flex", justifyContent: "space-between", alignItems: "center", padding: "4px 8px", background: "rgba(255,255,255,0.08)", borderRadius: 4 }, children: [_jsx("span", { style: { fontSize: 11, fontWeight: 500, textTransform: "uppercase" }, children: ext }), _jsx("span", { style: { display: "inline-flex", alignItems: "center", justifyContent: "center", minWidth: 24, height: 24, padding: "0 6px", background: "transparent", border: "2px solid #4caf50", borderRadius: 12, fontSize: 11, fontWeight: 600, lineHeight: 1 }, children: count > 99 ? '99+' : count })] }, ext))) })] }), children: _jsx("span", { style: { display: 'inline-flex', alignItems: 'center', cursor: 'help' }, children: _jsx("i", { className: "dx-icon-info", style: { fontSize: '16px', color: '#00527a' } }) }) }))] }));
+                                        })() })), hasPdfSelected && (_jsx("li", { style: { color: '#00527a' }, children: pdfSelectedItems.length === 1
+                                            ? SDKUI_Localizator.DocumentAlreadyInPdfNoConversionNeeded
+                                            : SDKUI_Localizator.DocumentsAlreadyInPdfNoConversionNeeded.replaceParams(pdfSelectedItems.length.toString()) })), !hasEnoughPdfForMerge && (_jsx("li", { style: { color: '#7a5d00' }, children: mergeableSelectedCount === 0
                                             ? SDKUI_Localizator.NoPdfOrConvertibleFilesSelected_Param.replaceParams(MIN_PDF_FOR_MERGE.toString())
                                             : SDKUI_Localizator.OnlyOnePdfOrConvertibleFileSelected.replaceParams(MIN_PDF_FOR_MERGE.toString()) })), hasNonPdfSelected && (_jsx("li", { style: { color: '#7a5d00' }, children: (() => {
                                             const extSet = Array.from(new Set(nonPdfSelectedItems.map(i => (i.ext ?? '').toString().trim().toLowerCase().replace(/^\./, '')).filter(e => e.length > 0)));

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

@@ -19,6 +19,10 @@ export interface IMergePdfSelectionStats {
     metadataOnlySelectedItems: Array<ISelectedItemInfo>;
     /** True se ci sono documenti di soli metadati selezionati */
     hasMetadataOnlySelected: boolean;
+    /** Elementi già in formato PDF (non richiedono conversione) */
+    pdfSelectedItems: Array<ISelectedItemInfo>;
+    /** True se ci sono elementi già in PDF selezionati */
+    hasPdfSelected: boolean;
     /** Numero totale di file unibili (PDF nativi + convertibili) */
     mergeableSelectedCount: number;
     /** True se ci sono abbastanza file per il merge (>= MIN_PDF_FOR_MERGE) */

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

@@ -65,6 +65,10 @@ export const getMergePdfSelectionStats = (selectedDcmtInfos, selectedItemsFull,
     const metadataOnlySelectedItems = docs
         .filter(i => i.isMetadataOnly)
         .map(i => ({ key: i.key, ext: i.ext }));
+    // Elementi già in formato PDF (non richiedono conversione)
+    const pdfSelectedItems = docs
+        .filter(i => i.isPdf && !i.isMetadataOnly)
+        .map(i => ({ key: i.key, ext: i.ext }));
     // Conteggio file unibili: PDF nativi + convertibili + documenti di soli metadati
     const mergeableSelectedCount = docs
         .filter(i => i.isPdf || i.isConvertible || i.isMetadataOnly).length;
@@ -75,6 +79,8 @@ export const getMergePdfSelectionStats = (selectedDcmtInfos, selectedItemsFull,
         hasNonPdfSelected: nonPdfSelectedItems.length > 0,
         metadataOnlySelectedItems,
         hasMetadataOnlySelected: metadataOnlySelectedItems.length > 0,
+        pdfSelectedItems,
+        hasPdfSelected: pdfSelectedItems.length > 0,
         mergeableSelectedCount,
         // Merge possibile se: >= 2 file unibili OPPURE >= 1 file convertibile/metadata-only (verrà trasformato in PDF)
         hasEnoughPdfForMerge: mergeableSelectedCount >= MIN_PDF_FOR_MERGE ||

package/lib/helper/SDKUI_Localizator.d.ts

@@ -226,6 +226,9 @@ export declare class SDKUI_Localizator {
     static get DocumentTypeNameAndCustomMetadata(): string;
     static get DocumentWillBeConvertedDuringMerge(): string;
     static get DocumentsWillBeConvertedDuringMerge(): string;
+    static get DocumentAlreadyInPdfNoConversionNeeded(): string;
+    static get DocumentsAlreadyInPdfNoConversionNeeded(): string;
+    static get ConversionDetails(): string;
     static get Domain(): "Domäne" | "Domain" | "Dominio" | "Domaine";
     static get DoNotCopy(): string;
     static get Dossier(): "Übung" | "Dossier" | "Expediente" | "Pratique" | "Prática" | "Pratica";

package/lib/helper/SDKUI_Localizator.js

@@ -2191,22 +2191,52 @@ export class SDKUI_Localizator {
     }
     static get DocumentWillBeConvertedDuringMerge() {
         switch (this._cultureID) {
-            case CultureIDs.De_DE: return "Ein Dokument{{0}} wird während der Zusammenführung in PDF konvertiert";
-            case CultureIDs.En_US: return "One document{{0}} will be converted to PDF during the merge";
-            case CultureIDs.Es_ES: return "Un documento{{0}} se convertirá a PDF durante la unión";
-            case CultureIDs.Fr_FR: return "Un document{{0}} sera converti en PDF lors de la fusion";
-            case CultureIDs.Pt_PT: return "Um documento{{0}} será convertido em PDF durante a fusão";
-            default: return "Un documento{{0}} verrà convertito in PDF durante l'unione";
+            case CultureIDs.De_DE: return "Ein Dokument wird während der Zusammenführung in PDF konvertiert";
+            case CultureIDs.En_US: return "One document will be converted to PDF during the merge";
+            case CultureIDs.Es_ES: return "Un documento se convertirá a PDF durante la unión";
+            case CultureIDs.Fr_FR: return "Un document sera converti en PDF lors de la fusion";
+            case CultureIDs.Pt_PT: return "Um documento será convertido em PDF durante a fusão";
+            default: return "Un documento verrà convertito in PDF durante l'unione";
         }
     }
     static get DocumentsWillBeConvertedDuringMerge() {
         switch (this._cultureID) {
-            case CultureIDs.De_DE: return "{{0}} Dokumente{{1}} werden während der Zusammenführung in PDF konvertiert";
-            case CultureIDs.En_US: return "{{0}} documents{{1}} will be converted to PDF during the merge";
-            case CultureIDs.Es_ES: return "{{0}} documentos{{1}} se convertirán a PDF durante la unión";
-            case CultureIDs.Fr_FR: return "{{0}} documents{{1}} seront convertis en PDF lors de la fusion";
-            case CultureIDs.Pt_PT: return "{{0}} documentos{{1}} serão convertidos em PDF durante a fusão";
-            default: return "{{0}} documenti{{1}} verranno convertiti in PDF durante l'unione";
+            case CultureIDs.De_DE: return "{{0}} Dokumente werden während der Zusammenführung in PDF konvertiert";
+            case CultureIDs.En_US: return "{{0}} documents will be converted to PDF during the merge";
+            case CultureIDs.Es_ES: return "{{0}} documentos se convertirán a PDF durante la unión";
+            case CultureIDs.Fr_FR: return "{{0}} documents seront convertis en PDF lors de la fusion";
+            case CultureIDs.Pt_PT: return "{{0}} documentos serão convertidos em PDF durante a fusão";
+            default: return "{{0}} documenti verranno convertiti in PDF durante l'unione";
+        }
+    }
+    static get DocumentAlreadyInPdfNoConversionNeeded() {
+        switch (this._cultureID) {
+            case CultureIDs.De_DE: return "Ein Dokument ist bereits im PDF-Format und erfordert keine Konvertierung";
+            case CultureIDs.En_US: return "One document is already in PDF format and does not require conversion";
+            case CultureIDs.Es_ES: return "Un documento ya está en formato PDF y no requiere conversión";
+            case CultureIDs.Fr_FR: return "Un document est déjà au format PDF et ne nécessite pas de conversion";
+            case CultureIDs.Pt_PT: return "Um documento já está em formato PDF e não requer conversão";
+            default: return "Un documento è già in formato PDF e non richiede conversione";
+        }
+    }
+    static get DocumentsAlreadyInPdfNoConversionNeeded() {
+        switch (this._cultureID) {
+            case CultureIDs.De_DE: return "{{0}} Dokumente sind bereits im PDF-Format und erfordern keine Konvertierung";
+            case CultureIDs.En_US: return "{{0}} documents are already in PDF format and do not require conversion";
+            case CultureIDs.Es_ES: return "{{0}} documentos ya están en formato PDF y no requieren conversión";
+            case CultureIDs.Fr_FR: return "{{0}} documents sont déjà au format PDF et ne nécessitent pas de conversion";
+            case CultureIDs.Pt_PT: return "{{0}} documentos já estão em formato PDF e não requerem conversão";
+            default: return "{{0}} documenti sono già in formato PDF e non richiedono conversione";
+        }
+    }
+    static get ConversionDetails() {
+        switch (this._cultureID) {
+            case CultureIDs.De_DE: return "Konvertierungsdetails";
+            case CultureIDs.En_US: return "Conversion details";
+            case CultureIDs.Es_ES: return "Detalles de conversión";
+            case CultureIDs.Fr_FR: return "Détails de conversion";
+            case CultureIDs.Pt_PT: return "Detalhes da conversão";
+            default: return "Dettaglio conversioni";
         }
     }
     static get Domain() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":  "@topconsultnpm/sdkui-react",
-    "version":  "6.22.0-dev1.2",
+    "version":  "6.22.0-dev1.3",
     "description":  "",
     "scripts":  {
                     "test":  "echo \"Error: no test specified\" \u0026\u0026 exit 1",