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

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/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.17",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",