@topconsultnpm/sdkui-react 6.21.0-dev5.1 → 6.21.0-dev5.10

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

@@ -14,10 +14,11 @@ import { TMPanelManagerProvider, useTMPanelManagerContext } from '../../layout/p
 import TMSearchResult from '../search/TMSearchResult';
 import TMDcmtForm from './TMDcmtForm';
 import { TMNothingToShow } from './TMDcmtPreview';
-import { Spinner, TMButton, TMLayoutWaitingContainer } from '../..';
+import { TMButton, TMLayoutWaitingContainer } from '../..';
 import { useDocumentOperations } from '../../../hooks/useDocumentOperations';
 import TMToppyMessage from '../../../helper/TMToppyMessage';
 import TMPanel from '../../base/TMPanel';
+import sixLogo from '../../../assets/six.png';
 const TMMasterDetailDcmts = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, addTaskCallback, editTaskCallback, handleNavigateToWGs, handleNavigateToDossiers, deviceType, inputDcmts, isForMaster, showCurrentDcmtIndicator = true, allowNavigation, canNext, canPrev, onNext, onPrev, onBack, appendMasterDcmts, onTaskCreateRequest, onRefreshAfterAddDcmtToFavs, editPdfForm, openS4TViewer, onOpenS4TViewerRequest, onOpenPdfEditorRequest, datagridUtility, dcmtUtility, fetchRemoteCertificates }) => {
     const floatingBarContainerRef = useRef(null);
     const [focusedItem, setFocusedItem] = useState();
@@ -31,6 +32,10 @@ const TMMasterDetailDcmts = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallba
     const [contextMenuPosition, setContextMenuPosition] = useState({ x: 0, y: 0 });
     // Track if TMRelationViewer is loading (used to disable context menu during loading)
     const [isRelationViewerLoading, setIsRelationViewerLoading] = useState(false);
+    // Track if loading has ever been TRUE (to distinguish initial false from post-load false)
+    const hasLoadingBeenTrueRef = useRef(false);
+    // Track the previous loading state to detect transitions
+    const prevIsRelationViewerLoadingRef = useRef(false);
     const [dtdFocused, setDtdFocused] = useState();
     const [refreshKey, setRefreshKey] = useState(0);
     // Separate refresh key for TMFormOrResultWrapper only (doesn't affect tmTreeView)
@@ -39,6 +44,21 @@ const TMMasterDetailDcmts = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallba
     const [focusedItemFormData, setFocusedItemFormData] = useState([]);
     // Trigger operationItems refresh (after file substitution, etc.)
     const [refreshOperationsTrigger, setRefreshOperationsTrigger] = useState(0);
+    // Safety net: when TMRelationViewer finishes loading (transition from TRUE to FALSE),
+    // hide the spinner regardless of whether a document was focused or not.
+    // This handles edge cases where no document gets isRoot=true.
+    useEffect(() => {
+        const prevLoading = prevIsRelationViewerLoadingRef.current;
+        prevIsRelationViewerLoadingRef.current = isRelationViewerLoading;
+        if (isRelationViewerLoading) {
+            // Loading started - mark that we've seen a true state
+            hasLoadingBeenTrueRef.current = true;
+        }
+        else if (prevLoading && hasLoadingBeenTrueRef.current && isCheckingFirstLoad) {
+            // Transition from TRUE to FALSE (loading completed) - hide spinner
+            setIsCheckingFirstLoad(false);
+        }
+    }, [isRelationViewerLoading, isCheckingFirstLoad]);
     // Increments trigger counter to force operationItems to re-calculate
     const onRefreshOperationsDatagrid = useCallback(async () => {
         setRefreshOperationsTrigger(prev => prev + 1);
@@ -258,6 +278,7 @@ const TMMasterDetailDcmts = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallba
     useEffect(() => {
         if (noRelationsOnFirstLoad) {
             setNoRelationsOnFirstLoad(false);
+            setIsCheckingFirstLoad(false); // Hide spinner before navigating back
             ShowAlert({
                 message: SDKUI_Localizator.RelatedDcmtsNotFound,
                 title: SDKUI_Localizator.RelationsNotFound,
@@ -392,7 +413,10 @@ const TMMasterDetailDcmts = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallba
             toolbarOptions: { icon: _jsx(IconSearchCheck, { fontSize: 24 }), visible: false, orderNumber: 2, isActive: allInitialPanelVisibility['tmFormOrResult'] }
         }
     ], [tmTreeView, tmFormOrResult, focusedItem?.isDcmt, dtdMaster]);
-    return (_jsxs("div", { style: { width: '100%', height: '100%', position: 'relative' }, children: [isCheckingFirstLoad && (_jsx(Spinner, { description: SDKUI_Localizator.Loading, flat: true })), _jsxs("div", { style: isCheckingFirstLoad ? { position: 'absolute', width: 0, height: 0, overflow: 'hidden', opacity: 0, pointerEvents: 'none' } : { width: '100%', height: '100%' }, children: [_jsx(TMLayoutWaitingContainer, { direction: 'vertical', showWaitPanel: showWaitPanel, showWaitPanelPrimary: showPrimary, showWaitPanelSecondary: showSecondary, waitPanelTitle: waitPanelTitle, waitPanelTextPrimary: waitPanelTextPrimary, waitPanelValuePrimary: waitPanelValuePrimary, waitPanelMaxValuePrimary: waitPanelMaxValuePrimary, waitPanelTextSecondary: waitPanelTextSecondary, waitPanelValueSecondary: waitPanelValueSecondary, waitPanelMaxValueSecondary: waitPanelMaxValueSecondary, isCancelable: true, abortController: abortController, children: _jsx(TMPanelManagerProvider, { panels: initialPanels, initialVisibility: allInitialPanelVisibility, defaultDimensions: initialPanelDimensions, initialDimensions: initialPanelDimensions, initialMobilePanelId: 'tmTreeView', children: _jsx(TMPanelManagerContainer, { panels: initialPanels, direction: "horizontal", showToolbar: true }) }) }), renderDcmtOperations, renderFloatingBar] })] }));
+    return (_jsxs("div", { style: { width: '100%', height: '100%', position: 'relative' }, children: [isCheckingFirstLoad && (_jsx(TMLoadingOverlay, { onCancel: () => {
+                    setIsCheckingFirstLoad(false);
+                    onBack?.();
+                } })), _jsxs("div", { style: isCheckingFirstLoad ? { position: 'absolute', width: 0, height: 0, overflow: 'hidden', opacity: 0, pointerEvents: 'none' } : { width: '100%', height: '100%' }, children: [_jsx(TMLayoutWaitingContainer, { direction: 'vertical', showWaitPanel: showWaitPanel, showWaitPanelPrimary: showPrimary, showWaitPanelSecondary: showSecondary, waitPanelTitle: waitPanelTitle, waitPanelTextPrimary: waitPanelTextPrimary, waitPanelValuePrimary: waitPanelValuePrimary, waitPanelMaxValuePrimary: waitPanelMaxValuePrimary, waitPanelTextSecondary: waitPanelTextSecondary, waitPanelValueSecondary: waitPanelValueSecondary, waitPanelMaxValueSecondary: waitPanelMaxValueSecondary, isCancelable: true, abortController: abortController, children: _jsx(TMPanelManagerProvider, { panels: initialPanels, initialVisibility: allInitialPanelVisibility, defaultDimensions: initialPanelDimensions, initialDimensions: initialPanelDimensions, initialMobilePanelId: 'tmTreeView', children: _jsx(TMPanelManagerContainer, { panels: initialPanels, direction: "horizontal", showToolbar: true }) }) }), renderDcmtOperations, renderFloatingBar] })] }));
 };
 export default TMMasterDetailDcmts;
 /**
@@ -471,3 +495,94 @@ const TMFormOrResultWrapper = ({ refreshKey, deviceType, focusedItem, onTaskCrea
                 }, fetchRemoteCertificates: fetchRemoteCertificates }, refreshKey) :
             focusedItem?.searchResult === undefined ? (_jsx(TMPanel, { title: SDKUI_Localizator.SearchResult, children: _jsx(TMToppyMessage, { message: SDKUI_Localizator.SelectDocumentToViewSearchResults }) })) : (_jsx(TMSearchResult, { groupId: 'tmFormOrResult', isClosable: deviceType !== DeviceType.MOBILE, context: SearchResultContext.METADATA_SEARCH, allowFloatingBar: false, allowRelations: false, openDcmtFormAsModal: true, searchResults: focusedItem?.searchResult ?? [], showSearchResultSidebar: false, showDcmtFormSidebar: false, autoFocusFirstRow: false, onTaskCreateRequest: onTaskCreateRequest, onClose: () => { setPanelVisibilityById('tmTreeView', true); }, allTasks: allTasks, getAllTasks: getAllTasks, deleteTaskByIdsCallback: deleteTaskByIdsCallback, addTaskCallback: addTaskCallback, editTaskCallback: editTaskCallback, handleNavigateToWGs: handleNavigateToWGs, handleNavigateToDossiers: handleNavigateToDossiers, editPdfForm: editPdfForm, onOpenPdfEditorRequest: onOpenPdfEditorRequest, openS4TViewer: openS4TViewer, onOpenS4TViewerRequest: onOpenS4TViewerRequest, enablePinIcons: false, onRefreshAfterAddDcmtToFavs: onRefreshAfterAddDcmtToFavs, showBackButton: false, onRefreshSearchAsyncDatagrid: onRefreshSearchResults, onReferenceClick: handleNavigateToReference, fetchRemoteCertificates: fetchRemoteCertificates }, refreshKey)) }));
 };
+const TMLoadingOverlay = ({ onCancel, description, cancelText }) => {
+    return (_jsx("div", { style: {
+            position: 'absolute',
+            top: 0,
+            left: 0,
+            width: '100%',
+            height: '100%',
+            backgroundColor: 'rgba(248, 250, 252, 0.92)',
+            zIndex: 1000,
+            display: 'flex',
+            justifyContent: 'center',
+            alignItems: 'center',
+        }, children: _jsxs("div", { style: {
+                display: 'flex',
+                flexDirection: 'column',
+                alignItems: 'center',
+                gap: '16px',
+                padding: '24px 32px',
+                background: '#fcfcfc',
+                borderRadius: '8px',
+                boxShadow: '0 4px 16px rgba(0, 0, 0, 0.1)',
+            }, children: [_jsxs("div", { style: { position: 'relative', width: '80px', height: '80px' }, children: [_jsx("img", { style: {
+                                position: 'absolute',
+                                top: '50%',
+                                left: '50%',
+                                transform: 'translate(-54%, -54%)'
+                            }, src: sixLogo, width: 35, alt: "" }), _jsx("style", { children: `
+						@keyframes tmSpinnerRotate {
+							0% { transform: rotate(0deg); }
+							100% { transform: rotate(360deg); }
+						}
+						.tm-spinner-animation {
+							display: inline-block;
+							width: 80px;
+							height: 80px;
+							position: absolute;
+							top: 50%;
+							left: 50%;
+							transform: translate(-50%, -50%);
+						}
+						.tm-spinner-animation div {
+							animation: tmSpinnerRotate 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;
+							transform-origin: 40px 40px;
+						}
+						.tm-spinner-animation div:after {
+							content: " ";
+							display: block;
+							position: absolute;
+							width: 7px;
+							height: 7px;
+							border-radius: 50%;
+							background: #0c448e;
+							margin: -4px 0 0 -4px;
+						}
+						.tm-spinner-animation div:nth-child(1) { animation-delay: -0.036s; }
+						.tm-spinner-animation div:nth-child(1):after { top: 63px; left: 63px; background: #f7a51f; }
+						.tm-spinner-animation div:nth-child(2) { animation-delay: -0.072s; }
+						.tm-spinner-animation div:nth-child(2):after { top: 68px; left: 56px; background: #f7a51f; }
+						.tm-spinner-animation div:nth-child(3) { animation-delay: -0.108s; }
+						.tm-spinner-animation div:nth-child(3):after { top: 71px; left: 48px; background: #d3237b; }
+						.tm-spinner-animation div:nth-child(4) { animation-delay: -0.144s; }
+						.tm-spinner-animation div:nth-child(4):after { top: 72px; left: 40px; background: #d3237b; }
+						.tm-spinner-animation div:nth-child(5) { animation-delay: -0.18s; }
+						.tm-spinner-animation div:nth-child(5):after { top: 71px; left: 32px; background: #d12a1c; }
+						.tm-spinner-animation div:nth-child(6) { animation-delay: -0.216s; }
+						.tm-spinner-animation div:nth-child(6):after { top: 68px; left: 24px; background: #d12a1c; }
+						.tm-spinner-animation div:nth-child(7) { animation-delay: -0.252s; }
+						.tm-spinner-animation div:nth-child(7):after { top: 63px; left: 17px; background: #782b7d; }
+						.tm-spinner-animation div:nth-child(8) { animation-delay: -0.288s; }
+						.tm-spinner-animation div:nth-child(8):after { top: 56px; left: 12px; background: #782b7d; }
+					` }), _jsxs("div", { className: "tm-spinner-animation", children: [_jsx("div", {}), _jsx("div", {}), _jsx("div", {}), _jsx("div", {}), _jsx("div", {}), _jsx("div", {}), _jsx("div", {}), _jsx("div", {})] })] }), _jsx("span", { style: { fontSize: '14px', color: '#334155', textAlign: 'center' }, children: description ?? SDKUI_Localizator.Loading }), onCancel && (_jsx("button", { onClick: onCancel, style: {
+                        marginTop: '4px',
+                        padding: '8px 24px',
+                        fontSize: '13px',
+                        fontWeight: 500,
+                        color: '#64748b',
+                        background: 'transparent',
+                        border: '1.5px solid #cbd5e1',
+                        borderRadius: '6px',
+                        cursor: 'pointer',
+                        transition: 'all 0.2s ease',
+                    }, onMouseEnter: (e) => {
+                        e.currentTarget.style.background = '#f1f5f9';
+                        e.currentTarget.style.borderColor = '#94a3b8';
+                        e.currentTarget.style.color = '#475569';
+                    }, onMouseLeave: (e) => {
+                        e.currentTarget.style.background = 'transparent';
+                        e.currentTarget.style.borderColor = '#cbd5e1';
+                        e.currentTarget.style.color = '#64748b';
+                    }, children: cancelText ?? SDKUI_Localizator.Cancel }))] }) }));
+};

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

@@ -1,4 +1,3 @@
-import React from 'react';
 import { DcmtInfo } from '../../../ts';
 import { HomeBlogPost, TaskDescriptor } from '@topconsultnpm/sdk-ts';
 import { TMCopyToFolderMode } from '../../../hooks/useDocumentOperations';
@@ -21,5 +20,5 @@ interface ITMMergeToPdfFormProps {
  * Condivide TMDownloadRelationViewerSection e gli helper in copyAndMergeDcmtsShared
  * con TMCopyToFolderForm.
  */
-declare const TMMergeToPdfForm: (props: ITMMergeToPdfFormProps) => React.JSX.Element;
+declare const TMMergeToPdfForm: (props: ITMMergeToPdfFormProps) => import("react/jsx-runtime").JSX.Element;
 export default TMMergeToPdfForm;

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
@@ -146,6 +147,8 @@ export declare const hasMasterRelations: (dTID: number | undefined) => Promise<b
 export declare const getDisplayValueByColumn: (col: DataColumnDescriptor | undefined, value: any) => any;
 /**
  * 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
  */
 export declare const searchResultToDataSource: (searchResult: SearchResultDescriptor | undefined, hideSysMetadata?: boolean) => Promise<any[]>;
 export declare const DEFAULT_RELATION_EXPAND_LEVEL = 4;

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

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { DcmtTypeListCacheService, SDK_Globals, DataColumnTypes, MetadataFormats, MetadataDataDomains, RelationCacheService, RelationTypes, UserListCacheService } from "@topconsultnpm/sdk-ts";
-import { genUniqueId, IconFolder, IconBackhandIndexPointingRight, IconCircleInfo, getDcmtCicoStatus, IconChevronDown, IconChevronRight, SDKUI_Localizator, buildDcmtDisplayName, SDKUI_Globals } from '../../../helper';
+import { DcmtTypeListCacheService, SDK_Globals, DataColumnTypes, MetadataFormats, MetadataDataDomains, RelationCacheService, RelationTypes, UserListCacheService, LayoutModes } from "@topconsultnpm/sdk-ts";
+import { genUniqueId, IconFolder, IconBackhandIndexPointingRight, IconCircleInfo, getDcmtCicoStatus, IconChevronDown, IconChevronRight, SDKUI_Localizator, buildDcmtDisplayName, SDKUI_Globals, searchResultToMetadataValues } from '../../../helper';
 import ShowAlert from '../../base/TMAlert';
 import TMToppyMessage from '../../../helper/TMToppyMessage';
 import { TMColors } from '../../../utils/theme';
@@ -88,41 +88,77 @@ export const getDisplayValueByColumn = (col, value) => {
 };
 /**
  * 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
  */
 export const searchResultToDataSource = async (searchResult, hideSysMetadata) => {
     const rows = searchResult?.dtdResult?.rows ?? [];
-    const tid = searchResult?.fromTID;
-    // IMPORTANT: Pass true to get full metadata with all properties (isSpecialSearchOutput, etc.)
-    const dtd = await DcmtTypeListCacheService.GetAsync(tid, true);
     const output = [];
+    // Find TID and DID column indices
+    const columns = searchResult?.dtdResult?.columns ?? [];
+    const tidColIndex = columns.findIndex(col => col.caption?.toUpperCase() === 'TID');
+    const didColIndex = columns.findIndex(col => col.caption?.toUpperCase() === 'DID');
     for (let index = 0; index < rows.length; index++) {
-        const item = { rowIndex: index };
         const row = rows[index];
-        for (let i = 0; i < row.length; i++) {
-            const column = searchResult?.dtdResult?.columns?.[i];
-            const mid = Number(column?.extendedProperties?.["MID"] ?? "0");
-            if (hideSysMetadata && mid < 100)
-                continue;
-            // For system metadata (MID <= 100), use UPPERCASE caption as key
-            // For custom metadata (MID > 100), use caption as key but handle duplicates
-            let key = column?.caption ?? '';
-            if (mid <= 100) {
-                key = key.toUpperCase();
+        // 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 ?? [];
+            // Convert to MetadataValueDescriptorEx array
+            const metadataList = searchResultToMetadataValues(tid, dtdResult, metadataRows, 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;
+                const key = mvd.mid !== undefined && mvd.mid <= 100
+                    ? (mvd.md?.name ?? '').toUpperCase()
+                    : (mvd.md?.name ?? '');
+                if (key) {
+                    item[key] = {
+                        md: mvd.md,
+                        value: mvd.value
+                    };
+                }
             }
-            else {
-                // If key already exists with a different MID, append MID to make it unique
-                if (item[key] !== undefined && item[key]?.md?.id !== mid) {
-                    key = `${key}_${mid}`;
+            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);
+            for (let i = 0; i < row.length; i++) {
+                const column = searchResult?.dtdResult?.columns?.[i];
+                const mid = Number(column?.extendedProperties?.["MID"] ?? "0");
+                if (hideSysMetadata && mid < 100)
+                    continue;
+                let key = column?.caption ?? '';
+                if (mid <= 100) {
+                    key = key.toUpperCase();
+                }
+                else {
+                    if (item[key] !== undefined && item[key]?.md?.id !== mid) {
+                        key = `${key}_${mid}`;
+                    }
                 }
+                const value = row[i];
+                const md = dtd?.metadata?.find(o => o.id == mid);
+                item[key] = {
+                    md: md,
+                    value: getDisplayValueByColumn(column, value)
+                };
             }
-            const value = row[i];
-            const md = dtd?.metadata?.find(o => o.id == mid);
-            item[key] = {
-                md: md,
-                value: getDisplayValueByColumn(column, value)
-            };
+            output.push(item);
         }
-        output.push(item);
     }
     return output;
 };
@@ -273,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
                         });
                     }
@@ -282,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]);
@@ -357,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,
@@ -437,71 +475,82 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
     const setupInitialTreeExpansion = (tree) => {
         if (tree.length === 0)
             return tree;
-        // ALWAYS expand the first container (even if empty, to show infoMessage)
-        const firstRootContainer = tree[0];
-        if (!firstRootContainer)
-            return tree;
-        // Create a deep copy of the first container with expanded=true, isRoot=true
-        let newFirstContainer = {
-            ...firstRootContainer,
-            expanded: true,
-            isRoot: true
-        };
-        // 2. Find first document/container and expand it
-        const firstRootItems = newFirstContainer.items;
-        if (firstRootItems && firstRootItems.length > 0) {
-            const firstDocOrContainer = firstRootItems[0];
-            if (firstDocOrContainer.isDcmt) {
-                // First item is a document - expand it and mark as root for focus
-                let newFirstDoc = {
-                    ...firstDocOrContainer,
-                    expanded: true,
-                    isRoot: true
-                };
-                // 3. 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)]
-                    };
+        // Find the first container with documents (not empty)
+        // This ensures we focus on an actual document, not an empty container
+        const findFirstNonEmptyContainerIndex = () => {
+            for (let i = 0; i < tree.length; i++) {
+                const container = tree[i];
+                if (!container.isZero && container.items && Array.isArray(container.items) && container.items.length > 0) {
+                    return i;
                 }
-                // Update the container's items
-                newFirstContainer = {
-                    ...newFirstContainer,
-                    items: [newFirstDoc, ...firstRootItems.slice(1)]
-                };
             }
-            else if (firstDocOrContainer.isContainer) {
-                // First item is a container (correlation folder)
-                // Count how many sibling containers there are
-                const siblingContainers = firstRootItems.filter(child => child.isContainer);
-                const shouldExpand = siblingContainers.length === 1;
-                let newFirstCorrelation = {
-                    ...firstDocOrContainer,
-                    expanded: shouldExpand
-                };
-                // Find first document inside this container and mark for focus
-                const containerItems = newFirstCorrelation.items;
-                if (containerItems && containerItems.length > 0 && containerItems[0].isDcmt) {
-                    const newFirstDoc = { ...containerItems[0], isRoot: true };
-                    newFirstCorrelation = {
-                        ...newFirstCorrelation,
-                        items: [newFirstDoc, ...containerItems.slice(1)]
-                    };
+            return 0; // Fallback to first container if all are empty
+        };
+        const targetContainerIndex = findFirstNonEmptyContainerIndex();
+        // Process all containers, but only mark the target one for focus
+        const result = tree.map((container, index) => {
+            const isTargetContainer = index === targetContainerIndex;
+            const isFirstContainer = index === 0;
+            // Always expand the first container (even if empty, to show infoMessage)
+            // Also expand the target container if different
+            const shouldExpand = isFirstContainer || isTargetContainer;
+            if (!shouldExpand && !isTargetContainer) {
+                return container; // Keep non-target containers as-is
+            }
+            // Create a copy with expanded state
+            let newContainer = {
+                ...container,
+                expanded: shouldExpand,
+                isRoot: isTargetContainer // Only mark target container as root
+            };
+            // Only process items for the target container (the one with documents)
+            if (isTargetContainer) {
+                const containerItems = newContainer.items;
+                if (containerItems && containerItems.length > 0) {
+                    const firstDocOrContainer = containerItems[0];
+                    if (firstDocOrContainer.isDcmt) {
+                        // First item is a document - expand it and mark as root for focus
+                        let newFirstDoc = {
+                            ...firstDocOrContainer,
+                            expanded: true,
+                            isRoot: true
+                        };
+                        // 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,
+                            items: [newFirstDoc, ...containerItems.slice(1)]
+                        };
+                    }
+                    else if (firstDocOrContainer.isContainer) {
+                        // First item is a container (correlation folder)
+                        // 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: false
+                        };
+                        // Find first document inside this container and mark for focus
+                        const correlationItems = newFirstCorrelation.items;
+                        if (correlationItems && correlationItems.length > 0 && correlationItems[0].isDcmt) {
+                            const newFirstDoc = { ...correlationItems[0], isRoot: true };
+                            newFirstCorrelation = {
+                                ...newFirstCorrelation,
+                                items: [newFirstDoc, ...correlationItems.slice(1)]
+                            };
+                        }
+                        // Update the container's items
+                        newContainer = {
+                            ...newContainer,
+                            items: [newFirstCorrelation, ...containerItems.slice(1)]
+                        };
+                    }
                 }
-                // Update the container's items
-                newFirstContainer = {
-                    ...newFirstContainer,
-                    items: [newFirstCorrelation, ...firstRootItems.slice(1)]
-                };
             }
-        }
-        // If firstRootItems is empty/undefined, the container is still expanded (will show infoMessage)
-        // Return new tree with the modified first container
-        return [newFirstContainer, ...tree.slice(1)];
+            return newContainer;
+        });
+        return result;
     };
     /**
      * Main data loading function
@@ -670,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);
@@ -1130,9 +1180,7 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
             transition: 'opacity 0.2s ease-in-out',
             textDecoration: isLogicallyDeleted ? 'line-through' : 'none'
         };
-        const documentStyle = customDocumentStyle
-            ? { ...defaultDocumentStyle, ...customDocumentStyle(item) }
-            : defaultDocumentStyle;
+        const documentStyle = customDocumentStyle ? { ...defaultDocumentStyle, ...customDocumentStyle(item) } : defaultDocumentStyle;
         const textDecoration = isLogicallyDeleted ? 'line-through' : 'none';
         const textColor = isLogicallyDeleted ? 'gray' : undefined;
         const defaultMetadataContent = item.values && (() => {
@@ -1165,9 +1213,7 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
                                 }, children: value }))] }, `${key}_${index}`));
                 }) }));
         })();
-        const metadataContent = customDocumentContent
-            ? customDocumentContent(item, defaultMetadataContent || _jsx(_Fragment, {}))
-            : defaultMetadataContent;
+        const metadataContent = customDocumentContent ? customDocumentContent(item, defaultMetadataContent || _jsx(_Fragment, {})) : defaultMetadataContent;
         // Calculate checkout status for non-root documents
         let checkoutStatusIcon = null;
         if (item.values && item.dtd) {
@@ -1225,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))
@@ -1232,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)
@@ -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/lib/components/features/search/TMDcmtCheckoutInfoForm.d.ts

@@ -1,9 +1,8 @@
-import React from "react";
 import { DcmtInfo } from "../../../ts";
 interface TMDcmtCheckoutInfoFormProps {
     dtdName: string;
     selectedDcmtOrFocused: DcmtInfo;
     onClose: () => void;
 }
-declare const TMDcmtCheckoutInfoForm: (props: TMDcmtCheckoutInfoFormProps) => React.JSX.Element;
+declare const TMDcmtCheckoutInfoForm: (props: TMDcmtCheckoutInfoFormProps) => import("react/jsx-runtime").JSX.Element;
 export default TMDcmtCheckoutInfoForm;