@topconsultnpm/sdkui-react 6.19.0-dev2.16 → 6.19.0-dev2.18

package/lib/components/NewComponents/FloatingMenuBar/types.d.ts

@@ -0,0 +1,30 @@
+import type { TMContextMenuItemProps } from '../ContextMenu';
+export interface TMFloatingMenuItem {
+    id: string;
+    name: string;
+    icon: React.ReactNode;
+    onClick: () => void;
+    disabled?: boolean;
+    isPinned?: boolean;
+    originalMenuItem?: TMContextMenuItemProps;
+}
+export interface TMFloatingMenuBarProps {
+    containerRef: React.RefObject<HTMLElement | null>;
+    contextMenuItems?: TMContextMenuItemProps[];
+    storageKey?: string;
+    isConstrained?: boolean;
+    defaultPosition?: Position;
+    maxItems?: number;
+}
+export interface Position {
+    x: number;
+    y: number;
+}
+export interface TMFloatingMenuBarState {
+    position: Position;
+    isDragging: boolean;
+    isConfigMode: boolean;
+    orientation: 'horizontal' | 'vertical';
+    items: TMFloatingMenuItem[];
+    draggedItemIndex: number | null;
+}

package/lib/components/NewComponents/FloatingMenuBar/types.js

@@ -0,0 +1 @@
+export {};

package/lib/components/NewComponents/Notification/Notification.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import type { NotificationProps } from './types';
+declare const Notification: React.FC<NotificationProps>;
+export default Notification;

package/lib/components/NewComponents/Notification/Notification.js

@@ -0,0 +1,60 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useState, useEffect, useRef } from 'react';
+import * as S from './styles';
+const Notification = ({ title, message, mode = 'info', position = 'top-right', duration = 3000, closable = false, stopOnMouseEnter = true, hasProgress = true, onClose, }) => {
+    const [state, setState] = useState({
+        visible: true,
+        isPaused: false,
+        progress: 100,
+    });
+    const timeoutRef = useRef(undefined);
+    const remainingTimeRef = useRef(duration);
+    const pauseTimeRef = useRef(0);
+    const closeNotification = () => {
+        setState(prev => ({ ...prev, visible: false }));
+        setTimeout(() => {
+            onClose?.();
+        }, 300);
+    };
+    useEffect(() => {
+        // Set up auto-close timer
+        timeoutRef.current = setTimeout(() => {
+            closeNotification();
+        }, duration);
+        return () => {
+            if (timeoutRef.current) {
+                clearTimeout(timeoutRef.current);
+            }
+        };
+    }, [duration]);
+    const handleMouseEnter = () => {
+        if (!stopOnMouseEnter)
+            return;
+        // Pause the timer
+        if (timeoutRef.current) {
+            clearTimeout(timeoutRef.current);
+            pauseTimeRef.current = Date.now();
+        }
+        setState(prev => ({ ...prev, isPaused: true }));
+    };
+    const handleMouseLeave = () => {
+        if (!stopOnMouseEnter)
+            return;
+        // Resume the timer with remaining time
+        const pauseDuration = Date.now() - pauseTimeRef.current;
+        remainingTimeRef.current = Math.max(0, remainingTimeRef.current - pauseDuration);
+        timeoutRef.current = setTimeout(() => {
+            closeNotification();
+        }, remainingTimeRef.current);
+        setState(prev => ({ ...prev, isPaused: false }));
+    };
+    const handleClose = (e) => {
+        e.stopPropagation();
+        if (timeoutRef.current) {
+            clearTimeout(timeoutRef.current);
+        }
+        closeNotification();
+    };
+    return (_jsxs(S.NotificationContainer, { "$position": position, "$mode": mode, "$visible": state.visible, onMouseEnter: handleMouseEnter, onMouseLeave: handleMouseLeave, role: "alert", "aria-live": "assertive", children: [_jsxs(S.NotificationContent, { children: [_jsx(S.NotificationTitle, { children: title }), _jsx(S.NotificationMessage, { children: message })] }), closable && (_jsx(S.CloseButton, { onClick: handleClose, "aria-label": "Close notification", children: "\u00D7" })), hasProgress && (_jsx(S.ProgressBar, { "$duration": duration, "$mode": mode, "$isPaused": state.isPaused }))] }));
+};
+export default Notification;

package/lib/components/NewComponents/Notification/NotificationContainer.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import type { NotificationPosition } from './types';
+interface NotificationContainerProps {
+    position: NotificationPosition;
+    children: React.ReactNode;
+}
+declare const NotificationContainer: React.FC<NotificationContainerProps>;
+export default NotificationContainer;

package/lib/components/NewComponents/Notification/NotificationContainer.js

@@ -0,0 +1,33 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import styled from 'styled-components';
+const Container = styled.div `
+  position: fixed;
+  z-index: 10002;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  pointer-events: none;
+
+  ${props => {
+    const isTop = props.$position.startsWith('top');
+    const isBottom = props.$position.startsWith('bottom');
+    const isLeft = props.$position.endsWith('left');
+    const isRight = props.$position.endsWith('right');
+    const isCenter = props.$position.endsWith('center');
+    return `
+      ${isTop ? 'top: 24px;' : ''}
+      ${isBottom ? 'bottom: 24px;' : ''}
+      ${isLeft ? 'left: 24px;' : ''}
+      ${isRight ? 'right: 24px;' : ''}
+      ${isCenter ? 'left: 50%; transform: translateX(-50%);' : ''}
+    `;
+}}
+
+  & > * {
+    pointer-events: auto;
+  }
+`;
+const NotificationContainer = ({ position, children }) => {
+    return _jsx(Container, { "$position": position, children: children });
+};
+export default NotificationContainer;

package/lib/components/NewComponents/Notification/index.d.ts

@@ -0,0 +1,2 @@
+export { default } from './Notification';
+export * from './types';

package/lib/components/NewComponents/Notification/index.js

@@ -0,0 +1,2 @@
+export { default } from './Notification';
+export * from './types';

package/lib/components/NewComponents/Notification/styles.d.ts

@@ -0,0 +1,21 @@
+import type { NotificationMode, NotificationPosition } from './types';
+export declare const NotificationContainer: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components/dist/types").Substitute<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {
+    $position: NotificationPosition;
+    $mode: NotificationMode;
+    $visible: boolean;
+}>> & string;
+export declare const NotificationContent: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>> & string;
+export declare const NotificationTitle: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>> & string;
+export declare const NotificationMessage: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>> & string;
+export declare const CloseButton: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>, never>> & string;
+export declare const ProgressBar: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components/dist/types").Substitute<import("styled-components/dist/types").Substitute<import("styled-components/dist/types").Substitute<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, Omit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & {
+    ref?: ((instance: HTMLDivElement | null) => void | import("react").DO_NOT_USE_OR_YOU_WILL_BE_FIRED_CALLBACK_REF_RETURN_VALUES[keyof import("react").DO_NOT_USE_OR_YOU_WILL_BE_FIRED_CALLBACK_REF_RETURN_VALUES]) | import("react").RefObject<HTMLDivElement> | null | undefined;
+}>, {
+    $duration: number;
+    $mode: NotificationMode;
+    $isPaused: boolean;
+}>, {
+    $duration: number;
+    $mode: NotificationMode;
+    $isPaused: boolean;
+}>> & string;

package/lib/components/NewComponents/Notification/styles.js

@@ -0,0 +1,180 @@
+import styled, { keyframes } from 'styled-components';
+const slideInFromTop = keyframes `
+  from {
+    opacity: 0;
+    transform: translateY(-100%);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+`;
+const slideInFromBottom = keyframes `
+  from {
+    opacity: 0;
+    transform: translateY(100%);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+`;
+const slideOut = keyframes `
+  from {
+    opacity: 1;
+    transform: scale(1);
+  }
+  to {
+    opacity: 0;
+    transform: scale(0.9);
+  }
+`;
+const getModeColors = (mode) => {
+    const colors = {
+        success: {
+            bg: '#10b981',
+            bgDark: '#059669',
+            border: '#34d399',
+            text: '#ffffff',
+        },
+        error: {
+            bg: '#ef4444',
+            bgDark: '#dc2626',
+            border: '#f87171',
+            text: '#ffffff',
+        },
+        warning: {
+            bg: '#f59e0b',
+            bgDark: '#d97706',
+            border: '#fbbf24',
+            text: '#ffffff',
+        },
+        info: {
+            bg: '#3b82f6',
+            bgDark: '#2563eb',
+            border: '#60a5fa',
+            text: '#ffffff',
+        },
+    };
+    return colors[mode];
+};
+export const NotificationContainer = styled.div `
+  position: relative;
+  z-index: 1;
+  min-width: 320px;
+  max-width: 420px;
+  background: ${props => getModeColors(props.$mode).bg};
+  border-radius: 12px;
+  box-shadow: 0 12px 40px rgba(0, 0, 0, 0.2),
+              0 4px 12px rgba(0, 0, 0, 0.15);
+  padding: 16px 20px;
+  animation: ${props => {
+    if (!props.$visible)
+        return slideOut;
+    return props.$position.startsWith('top') ? slideInFromTop : slideInFromBottom;
+}} 0.3s cubic-bezier(0.4, 0, 0.2, 1) forwards;
+  backdrop-filter: blur(10px);
+  border: 2px solid ${props => getModeColors(props.$mode).border};
+  color: ${props => getModeColors(props.$mode).text};
+  overflow: hidden;
+
+  [data-theme='dark'] & {
+    background: ${props => getModeColors(props.$mode).bgDark};
+    box-shadow: 0 12px 40px rgba(0, 0, 0, 0.4),
+                0 4px 12px rgba(0, 0, 0, 0.3);
+  }
+
+  @media (max-width: 768px) {
+    min-width: 280px;
+    max-width: calc(100vw - 48px);
+  }
+`;
+export const NotificationContent = styled.div `
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  padding-right: 24px;
+`;
+export const NotificationTitle = styled.div `
+  font-size: 16px;
+  font-weight: 600;
+  line-height: 1.4;
+  letter-spacing: -0.01em;
+`;
+export const NotificationMessage = styled.div `
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 1.5;
+  opacity: 0.95;
+`;
+export const CloseButton = styled.button `
+  position: absolute;
+  top: 12px;
+  right: 12px;
+  background: transparent;
+  border: none;
+  color: inherit;
+  cursor: pointer;
+  width: 24px;
+  height: 24px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 6px;
+  transition: all 0.15s ease;
+  font-size: 18px;
+  line-height: 1;
+  padding: 0;
+  opacity: 0.8;
+
+  &:hover {
+    opacity: 1;
+    background: rgba(255, 255, 255, 0.2);
+    transform: scale(1.1);
+  }
+
+  &:active {
+    transform: scale(0.95);
+  }
+
+  &:focus {
+    outline: 2px solid rgba(255, 255, 255, 0.5);
+    outline-offset: 2px;
+  }
+`;
+export const ProgressBar = styled.div.attrs(props => ({
+    style: {
+        animationDuration: `${props.$duration}ms`,
+    },
+})) `
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  height: 4px;
+  width: 100%;
+  background: ${props => getModeColors(props.$mode).border};
+  border-radius: 0 0 0 10px;
+  box-shadow: 0 0 8px ${props => getModeColors(props.$mode).border};
+  transform-origin: left;
+  animation: progress-shrink linear forwards;
+  animation-play-state: ${props => props.$isPaused ? 'paused' : 'running'};
+
+  @keyframes progress-shrink {
+    from {
+      transform: scaleX(1);
+    }
+    to {
+      transform: scaleX(0);
+    }
+  }
+
+  &::after {
+    content: '';
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 20px;
+    height: 100%;
+    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.4));
+  }
+`;

package/lib/components/NewComponents/Notification/types.d.ts

@@ -0,0 +1,18 @@
+export type NotificationMode = 'warning' | 'info' | 'error' | 'success';
+export type NotificationPosition = 'top-left' | 'top-center' | 'top-right' | 'bottom-left' | 'bottom-center' | 'bottom-right';
+export interface NotificationProps {
+    title: string;
+    message: string;
+    mode?: NotificationMode;
+    position?: NotificationPosition;
+    duration?: number;
+    closable?: boolean;
+    stopOnMouseEnter?: boolean;
+    hasProgress?: boolean;
+    onClose?: () => void;
+}
+export interface NotificationState {
+    visible: boolean;
+    isPaused: boolean;
+    progress: number;
+}

package/lib/components/NewComponents/Notification/types.js

@@ -0,0 +1 @@
+export {};

package/lib/components/base/TMCustomButton.js

@@ -8,6 +8,7 @@ const IframeContainer = styled.div `
   display: flex;
   height: 100%;
   flex-direction: column;
+  padding-left: 15px;
 `;
 const StyledIframe = styled.iframe `
   border: none;
@@ -36,7 +37,6 @@ const TMCustomButton = (props) => {
             const mergedAttributes = { ...attributes, selectedItems: selectedItems };
             iframeRef.current.contentWindow.postMessage({
                 "options": mergedAttributes,
-                "selectedItems": selectedItems,
                 "session": SDK_Globals.tmSession
             }, getTargetOrigin(scriptUrl));
         }
@@ -58,6 +58,6 @@ const TMCustomButton = (props) => {
             onClose?.();
         }
     }, [isModal, scriptUrl, onClose]);
-    return isModal ? (_jsx(TMModal, { title: button.title, width: '60%', height: '60%', resizable: true, onClose: onClose, children: _jsxs(IframeContainer, { children: [error && _jsx("div", { children: "Si \u00E8 verificato un errore nel caricamento del contenuto." }), !error && _jsx(StyledIframe, { ref: iframeRef, loading: 'lazy', onLoad: handleLoad, onError: handleError, src: scriptUrl })] }) })) : null;
+    return isModal ? (_jsx(TMModal, { title: button.title, width: '60%', height: '70%', resizable: true, onClose: onClose, children: _jsxs(IframeContainer, { children: [error && _jsx("div", { children: "Si \u00E8 verificato un errore nel caricamento del contenuto." }), !error && _jsx(StyledIframe, { ref: iframeRef, loading: 'lazy', onLoad: handleLoad, onError: handleError, src: scriptUrl })] }) })) : null;
 };
 export default TMCustomButton;

package/lib/components/base/TMDataGridExportForm.js

@@ -64,7 +64,7 @@ const TMDataGridExportForm = (props) => {
             // Retrieve columns from the search result, or use an empty array if not available
             const columns = searchResult?.dtdResult?.columns ?? [];
             // If exportDescriptionsForDataLists is true, build a map of values to labels for the columns; otherwise use an empty Map
-            const { valueToNameMap, captions } = exportDescriptionsForDataLists ? await buildValueToLabelMapFromDataColumns(columns) : { valueToNameMap: new Map(), captions: new Set() };
+            const valueToNameMap = exportDescriptionsForDataLists ? await buildValueToLabelMapFromDataColumns(columns) : new Map();
             // Create a Set from selectedRowKeys for efficient lookup
             const selectedSet = new Set(selectedRowKeys);
             // If exporting only selected rows, filter the dataSource accordingly; otherwise use the full dataSource
@@ -82,8 +82,14 @@ const TMDataGridExportForm = (props) => {
             const getValue = (col, value) => {
                 // Replace raw value with corresponding label from the map if applicable
                 let result = value;
-                if (exportDescriptionsForDataLists && col.caption && captions.has(col.caption.toString())) {
-                    result = valueToNameMap.get(value) ?? value;
+                if (exportDescriptionsForDataLists && col.dataField && valueToNameMap.size > 0) {
+                    const mapForField = valueToNameMap.get(col.dataField);
+                    if (mapForField) {
+                        result = mapForField.get(value) ?? value;
+                    }
+                    else {
+                        result = value;
+                    }
                 }
                 // If the column is a datetime type, attempt to format it as a locale date string
                 if (col.dataType === 'datetime' && result) {

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

@@ -8,7 +8,7 @@ import { DownloadTypes, FormModes } from '../../../ts';
 import { DeviceType, useDeviceType } from '../../base/TMDeviceProvider';
 import { useDcmtOperations } from '../../../hooks/useDcmtOperations';
 import { getWorkItemSetIDAsync, handleArchiveVisibility, searchResultToMetadataValues } from '../../../helper/queryHelper';
-import { genUniqueId, IconShow, SDKUI_Localizator, updateMruTids, IconBoard, IconDcmtTypeSys, IconDetailDcmts, svgToString, IconDownload, calcIsModified, IconMenuVertical, Globalization, getListMaxItems, getSystemMetadata, IconBoxArchiveIn, IconClear, IconUndo, SDKUI_Globals, IconPreview, isTaskMoreInfo, IconWorkflow, IconSearch, deepCompare, IconCheck, IconActivity } from '../../../helper';
+import { genUniqueId, IconShow, SDKUI_Localizator, updateMruTids, IconBoard, IconDcmtTypeSys, IconDetailDcmts, svgToString, IconDownload, calcIsModified, IconMenuVertical, Globalization, getListMaxItems, getSystemMetadata, IconBoxArchiveIn, IconClear, IconUndo, SDKUI_Globals, IconPreview, isTaskMoreInfo, IconWorkflow, IconSearch, deepCompare, IconCheck, IconActivity, TMImageLibrary } from '../../../helper';
 import { hasDetailRelations, hasMasterRelations, isXMLFileExt } from '../../../helper/dcmtsHelper';
 import { Gutters, TMColors } from '../../../utils/theme';
 import { StyledFormButtonsContainer, StyledLoadingContainer, StyledModalContainer, StyledReferenceButton, StyledSpinner, StyledToolbarCardContainer } from '../../base/Styled';
@@ -480,6 +480,7 @@ const TMDcmtForm = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, addTa
             const customButtonsItems = customButtonsLayout.customButtons
                 .filter((customButton) => customButton.isForUpdate && customButton.isForUpdate > 0)
                 .map((customButton) => ({
+                icon: svgToString(TMImageLibrary({ imageID: customButton.glyphID, showPath: true })),
                 text: customButton.title || 'Bottone personalizzato',
                 onClick: () => setCustomButton(customButton)
             }));

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

@@ -142,12 +142,16 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
     const [treeData, setTreeData] = useState([]);
     const [showZeroDcmts, setShowZeroDcmts] = useState(initialShowZeroDcmts);
     const [staticItemsState, setStaticItemsState] = useState([]);
-    // Wait Panel State (only used if allowWaitPanel is true)
     const [showWaitPanel, setShowWaitPanel] = useState(false);
     const [waitPanelTextPrimary, setWaitPanelTextPrimary] = useState('');
     const [waitPanelValuePrimary, setWaitPanelValuePrimary] = useState(0);
     const [waitPanelMaxValuePrimary, setWaitPanelMaxValuePrimary] = useState(0);
     const [abortController] = useState(new AbortController());
+    const [showExpansionWaitPanel, setShowExpansionWaitPanel] = useState(false);
+    const [expansionWaitPanelText, setExpansionWaitPanelText] = useState('');
+    const [expansionWaitPanelValue, setExpansionWaitPanelValue] = useState(0);
+    const [expansionWaitPanelMaxValue, setExpansionWaitPanelMaxValue] = useState(0);
+    const [expansionAbortController, setExpansionAbortController] = useState(undefined);
     // Ref to track last loaded input to prevent unnecessary reloads
     const lastLoadedInputRef = React.useRef('');
     // Ref to track if user has manually expanded/collapsed static items
@@ -560,30 +564,55 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
         // If container is already loaded, return items
         if (node.isLoaded)
             return node.items;
-        // Load sub-documents for each document in the container
-        const newItems = [];
-        for (const dcmt of node.items ?? []) {
-            const item = { ...dcmt }; // Create a new reference
-            if (item.tid && item.did && !item.isLoaded) {
-                // Nella modalità originale (invertMasterNavigation=false), 
-                // i documenti detail non devono caricare i master come figli
-                if (isForMaster && !invertMasterNavigation) {
-                    // Carica i detail dei detail (navigazione naturale detail→detail)
-                    const loadedItems = await getDetailDcmtsAsync(item.tid, item.did, 1);
-                    item.items = updateHiddenProperty(loadedItems);
+        const newAbortController = new AbortController();
+        setExpansionAbortController(newAbortController);
+        const itemsToLoad = node.items?.length ?? 0;
+        setShowExpansionWaitPanel(true);
+        setExpansionWaitPanelMaxValue(itemsToLoad);
+        setExpansionWaitPanelValue(0);
+        setExpansionWaitPanelText(`Caricamento documenti correlati...`);
+        try {
+            const newItems = [];
+            let processedCount = 0;
+            for (const dcmt of node.items ?? []) {
+                if (newAbortController.signal.aborted) {
+                    console.log('Folder expansion aborted by user');
+                    return node.items;
                 }
-                else {
-                    // Modalità standard o invertita
-                    const loadedItems = isForMaster
-                        ? await getMasterDcmtsAsync(item.tid, item.did, 1)
-                        : await getDetailDcmtsAsync(item.tid, item.did, 1);
-                    item.items = updateHiddenProperty(loadedItems);
+                const item = { ...dcmt };
+                if (item.tid && item.did && !item.isLoaded) {
+                    // Update progress
+                    processedCount++;
+                    setExpansionWaitPanelValue(processedCount);
+                    setExpansionWaitPanelText(`Caricamento ${processedCount} di ${itemsToLoad}...`);
+                    // Nella modalità originale (invertMasterNavigation=false), 
+                    // i documenti detail non devono caricare i master come figli
+                    if (isForMaster && !invertMasterNavigation) {
+                        // Carica i detail dei detail (navigazione naturale detail→detail)
+                        const loadedItems = await getDetailDcmtsAsync(item.tid, item.did, 1);
+                        item.items = updateHiddenProperty(loadedItems);
+                    }
+                    else {
+                        // Modalità standard o invertita
+                        const loadedItems = isForMaster
+                            ? await getMasterDcmtsAsync(item.tid, item.did, 1)
+                            : await getDetailDcmtsAsync(item.tid, item.did, 1);
+                        item.items = updateHiddenProperty(loadedItems);
+                    }
+                    item.isLoaded = true;
                 }
-                item.isLoaded = true;
+                newItems.push(item);
             }
-            newItems.push(item);
+            return newItems;
+        }
+        catch (error) {
+            console.error('Error loading folder contents:', error);
+            return node.items;
+        }
+        finally {
+            setShowExpansionWaitPanel(false);
+            setExpansionAbortController(undefined);
         }
-        return newItems;
     }, [isForMaster, invertMasterNavigation, getDetailDcmtsAsync, getMasterDcmtsAsync, updateHiddenProperty]);
     /**
      * Default item renderer with metadata display (adapted from TMMasterDetailDcmts.tsx)
@@ -715,6 +744,10 @@ const TMRelationViewer = ({ inputDcmts, isForMaster = false, showCurrentDcmtIndi
     if (mergedTreeData.length === 0) {
         return _jsx("div", { style: { padding: '20px', textAlign: 'center', color: '#666' }, children: "Nessuna relazione disponibile." });
     }
-    return (_jsx(TMTreeView, { dataSource: mergedTreeData, itemRender: finalItemRender, calculateItemsForNode: calculateItemsForNode, onDataChanged: handleDataChanged, focusedItem: focusedItem, onFocusedItemChanged: handleFocusedItemChanged, allowMultipleSelection: allowMultipleSelection, selectedItems: selectedItems, onSelectionChanged: handleSelectedItemsChanged }));
+    return (_jsxs(_Fragment, { children: [_jsx(TMTreeView, { dataSource: mergedTreeData, itemRender: finalItemRender, calculateItemsForNode: calculateItemsForNode, onDataChanged: handleDataChanged, focusedItem: focusedItem, onFocusedItemChanged: handleFocusedItemChanged, allowMultipleSelection: allowMultipleSelection, selectedItems: selectedItems, onSelectionChanged: handleSelectedItemsChanged }), showExpansionWaitPanel && (_jsx(TMWaitPanel, { title: isForMaster ? 'Caricamento documenti master' : 'Caricamento documenti dettaglio', showPrimary: true, textPrimary: expansionWaitPanelText, valuePrimary: expansionWaitPanelValue, maxValuePrimary: expansionWaitPanelMaxValue, isCancelable: true, abortController: expansionAbortController, onAbortClick: (abortController) => {
+                    setTimeout(() => {
+                        abortController?.abort();
+                    }, 100);
+                } }))] }));
 };
 export default TMRelationViewer;

package/lib/components/features/search/TMSearchResult.js

@@ -3,7 +3,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { SDK_Globals, DataColumnTypes, MetadataDataDomains, DataListViewModes, MetadataFormats, LayoutModes, TemplateTIDs, DcmtTypeListCacheService, AccessLevels, SystemMIDsAsNumber, RetrieveFileOptions, DcmtOpers, GeneralRetrieveFormats, AccessLevelsEx, ResultTypes, LayoutCacheService } from '@topconsultnpm/sdk-ts';
 import styled from 'styled-components';
 import { getCommandsMenuItems, getSelectedDcmtsOrFocused } from './TMSearchResultsMenuItems';
-import { genUniqueId, IconShow, IconBoard, IconDcmtTypeSys, IconDetailDcmts, SDKUI_Localizator, IconDelete, IconRefresh, IconMenuVertical, IconDownload, deepCompare, getDataColumnName, searchResultDescriptorToSimpleArray, searchResultToMetadataValues, IconSearchCheck, TMCommandsContextMenu, getExceptionMessage, IconCheck, svgToString } from '../../../helper';
+import { genUniqueId, IconShow, IconBoard, IconDcmtTypeSys, IconDetailDcmts, SDKUI_Localizator, IconDelete, IconRefresh, IconMenuVertical, IconDownload, deepCompare, getDataColumnName, searchResultDescriptorToSimpleArray, searchResultToMetadataValues, IconSearchCheck, TMCommandsContextMenu, getExceptionMessage, IconCheck, svgToString, TMImageLibrary } from '../../../helper';
 import { useDcmtOperations } from '../../../hooks/useDcmtOperations';
 import { useInputAttachmentsDialog, useInputCvtFormatDialog } from '../../../hooks/useInputDialog';
 import { useRelatedDocuments } from '../../../hooks/useRelatedDocuments';
@@ -309,7 +309,7 @@ const TMSearchResult = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, a
     const customButtonMenuItems = () => {
         const customButtonsItems = customButtonsLayout?.customButtons?.filter((customButton) => customButton.isForSearchResult && customButton.isForSearchResult > 0)
             .map((customButton) => ({
-            icon: svgToString(_jsx(IconCheck, {})),
+            icon: svgToString(TMImageLibrary({ imageID: customButton.glyphID, showPath: true })),
             text: customButton.title || 'Bottone personalizzato',
             onClick: () => setCustomButton(customButton)
         }));
@@ -595,7 +595,7 @@ const TMSearchResult = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, a
                                                 setShowReAssignPopup(true);
                                             }, onMoreInfo: () => {
                                                 setShowMoreInfoPopup(true);
-                                            }, approveDisable: selectedDocs.length === 0, signApproveDisable: disableSignApproveDisable, rejectDisable: selectedDocs.length === 0, reassignDisable: selectedDocs.length === 0, infoDisable: selectedDocs.length !== 1, dtd: fromDTD }) }) })] }), _jsx(ConfirmFormatDialog, {}), _jsx(ConfirmAttachmentsDialog, {}), customButton && _jsx(TMCustomButton, { button: customButton, formData: currentMetadataValues, selectedItems: [], onClose: () => setCustomButton(undefined) }), showRelatedDcmtsChooser &&
+                                            }, approveDisable: selectedDocs.length === 0, signApproveDisable: disableSignApproveDisable, rejectDisable: selectedDocs.length === 0, reassignDisable: selectedDocs.length === 0, infoDisable: selectedDocs.length !== 1, dtd: fromDTD }) }) })] }), _jsx(ConfirmFormatDialog, {}), _jsx(ConfirmAttachmentsDialog, {}), customButton && _jsx(TMCustomButton, { button: customButton, formData: currentMetadataValues, selectedItems: selectedItems, onClose: () => setCustomButton(undefined) }), showRelatedDcmtsChooser &&
                         _jsx(TMChooserForm, { dataSource: relatedDcmtsChooserDataSource, onChoose: async (selectedRelation) => {
                                 try {
                                     setShowRelatedDcmtsChooser(false);

package/lib/helper/TMUtils.d.ts

@@ -6,10 +6,7 @@ export interface RowData {
     [key: string]: string | number | null;
 }
 export declare const associateColumnsToRows: (columns: Array<DataColumnDescriptor> | undefined, rows: Array<Array<string>> | undefined) => Array<RowData>;
-export declare const buildValueToLabelMapFromDataColumns: (columns: Array<DataColumnDescriptor>) => Promise<{
-    valueToNameMap: Map<string, string>;
-    captions: Set<string>;
-}>;
+export declare const buildValueToLabelMapFromDataColumns: (columns: Array<DataColumnDescriptor>) => Promise<Map<string, Map<string, string>>>;
 export declare const getAvatarColor: (name: string) => string;
 export declare const extractInitialsFromName: (name: string) => string;
 export declare const SIGN4_TOP_WIDGET_ID = "60003";

package/lib/helper/TMUtils.js

@@ -119,23 +119,27 @@ export const associateColumnsToRows = (columns, rows) => {
 };
 export const buildValueToLabelMapFromDataColumns = async (columns) => {
     const valueToNameMap = new Map();
-    const captions = new Set();
-    for (const col of columns) {
-        const dataDomain = MetadataDataDomains[(col.extendedProperties?.["DataDomain"] ?? "None")];
+    const dataListColumns = columns.filter(col => {
+        const dataDomainRaw = col.extendedProperties?.["DataDomain"];
+        const dataDomain = MetadataDataDomains[(dataDomainRaw ?? "None")];
+        return dataDomain === MetadataDataDomains.DataList;
+    });
+    for (const col of dataListColumns) {
+        const tid = Number(col.extendedProperties?.["TID"]);
+        const mid = Number(col.extendedProperties?.["MID"]);
         const dataListID = Number(col.extendedProperties?.["DataListID"]);
-        if (dataDomain === MetadataDataDomains.DataList) {
-            if (col.caption) {
-                captions.add(col.caption);
-            }
+        if (tid && mid && dataListID) {
+            const tid_mid = `${tid}_${mid}`;
+            valueToNameMap.set(tid_mid, new Map());
             const dl = await DataListCacheService.GetAsync(dataListID);
             dl?.items?.forEach((item) => {
                 if (item?.name !== undefined && item?.value !== undefined) {
-                    valueToNameMap.set(item.value, item.name);
+                    valueToNameMap.get(tid_mid)?.set(item.value, item.name);
                 }
             });
         }
     }
-    return { valueToNameMap, captions };
+    return valueToNameMap;
 };
 export const getAvatarColor = (name) => {
     const colors = [

package/package.json

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