@topconsultnpm/sdkui-react-beta 6.17.23 → 6.17.26

package/lib/components/base/TMDataGridExportForm.js

@@ -16,7 +16,7 @@ const formatDataSource = [
 ];
 const TMDataGridExportForm = (props) => {
     const { searchResult, dataSource, dataColumns, selectedRowKeys, onCloseExportForm } = props;
-    // State to track the selected export format (default: 'xlsx')
+    // State to track the selected export format (default: 'csv')
     const [formatSelected, setFormatSelected] = useState('csv');
     // Boolean state to indicate whether to export only the selected items
     const [exportSelectedOnly, setExportSelectedOnly] = useState(selectedRowKeys.length > 0 ? true : false);
@@ -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 = exportDescriptionsForDataLists ? await buildValueToLabelMapFromDataColumns(columns) : new Map();
+            const { valueToNameMap, captions } = exportDescriptionsForDataLists ? await buildValueToLabelMapFromDataColumns(columns) : { valueToNameMap: new Map(), captions: new Set() };
             // 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
@@ -81,7 +81,10 @@ const TMDataGridExportForm = (props) => {
             // Function to get the value for a column and its value in a row
             const getValue = (col, value) => {
                 // Replace raw value with corresponding label from the map if applicable
-                let result = exportDescriptionsForDataLists ? valueToNameMap.get(value) ?? value : value;
+                let result = value;
+                if (exportDescriptionsForDataLists && col.caption && captions.has(col.caption.toString())) {
+                    result = valueToNameMap.get(value) ?? value;
+                }
                 // If the column is a datetime type, attempt to format it as a locale date string
                 if (col.dataType === 'datetime' && result) {
                     const parsedDate = new Date(result);

package/lib/components/choosers/TMPathChooser.js

@@ -28,7 +28,7 @@ const TMPathChooser = (props) => {
     const [waitPanelTextSecondary, setWaitPanelTextSecondary] = useState('');
     const [waitPanelValueSecondary, setWaitPanelValueSecondary] = useState(0);
     const [waitPanelMaxValueSecondary, setWaitPanelMaxValueSecondary] = useState(0);
-    const formulaItems = ['{@JobName}', '{@JobStartDate}', '{@JobStartDateTime}', '{@ProcessRunID}', '{@ProcessName}', '{@ProcessStartDate}', '{@ProcessStartDateTime}'];
+    const formulaItems = ['{@JobName}', '{@JobStartDate}', '{@JobStartDate_DDMMYYYY}', '{@JobStartDateTime}', '{@ProcessRunID}', '{@ProcessName}', '{@ProcessStartDate}', '{@ProcessStartDateTime}'];
     //useEffect(() => { setPath(props.value) }, [props.value])
     useEffect(() => {
         if (props.elementStyle) {

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

@@ -1,6 +1,6 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { AccessLevels, AccessLevelsEx, AppModules, FileFormats, LayoutModes, SDK_Globals, DcmtTypeListCacheService, LicenseModuleStatus } from '@topconsultnpm/sdk-ts-beta';
-import { IconActivity, IconArchiveDoc, IconBatchUpdate, IconCheckFile, IconCheckIn, IconCircleInfo, IconCloseCircle, IconConvertFilePdf, IconDelete, IconDotsVerticalCircleOutline, IconDownload, IconEdit, IconExportTo, IconFileDots, IconHide, IconInfo, IconMenuCAArchive, IconPlatform, IconPreview, IconRelation, IconSearch, IconShow, IconSignature, IconStar, IconSubstFile, IconUndo, IconUserGroupOutline, SDKUI_Localizator, svgToString, searchResultToMetadataValues } from '../../../helper';
+import { IconActivity, IconArchiveDoc, IconBatchUpdate, IconCheckFile, IconCheckIn, IconCircleInfo, IconCloseCircle, IconConvertFilePdf, IconDelete, IconDotsVerticalCircleOutline, IconDownload, IconEdit, IconExportTo, IconFileDots, IconHide, IconInfo, IconMenuCAArchive, IconPlatform, IconPreview, IconRelation, IconSearch, IconShow, IconStar, IconSubstFile, IconUndo, IconUserGroupOutline, SDKUI_Localizator, svgToString, searchResultToMetadataValues, IconSignaturePencil } from '../../../helper';
 import ShowAlert from '../../base/TMAlert';
 import { TMMessageBoxManager, ButtonNames, TMExceptionBoxManager } from '../../base/TMPopUp';
 import TMSpinner from '../../base/TMSpinner';
@@ -263,7 +263,7 @@ export const getCommandsMenuItems = (isMobile, dtd, selectedItems, focusedItem,
     };
     const signatureMenuItem = () => {
         return {
-            icon: svgToString(_jsx(IconSignature, {})),
+            icon: svgToString(_jsx(IconSignaturePencil, {})),
             text: SDKUI_Localizator.Signature,
             disabled: disabledForSingleRow(selectedItems, focusedItem) && disabledForMultiRow(selectedItems, focusedItem),
             items: [
@@ -282,7 +282,7 @@ export const getCommandsMenuItems = (isMobile, dtd, selectedItems, focusedItem,
                     onClick: async () => { await runOperationAsync(getSelectedDcmtsOrFocused(selectedItems, focusedItem), DcmtOperationTypes.VerifySign); }
                 },
                 {
-                    icon: svgToString(_jsx(IconSignature, {})),
+                    icon: svgToString(_jsx(IconSignaturePencil, {})),
                     operationType: 'singleRow',
                     disabled: disabledForSingleRow(selectedItems, focusedItem),
                     text: SDKUI_Localizator.Signature,

package/lib/components/features/workflow/TMWorkflowPopup.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from "react";
 import { Priorities, ResultTypes, SDK_Globals, SDK_Localizator, TaskEngine, UserListCacheService, ValidationItem, WorkflowCacheService } from '@topconsultnpm/sdk-ts-beta';
 import styled from "styled-components";
-import { SDKUI_Localizator, IconApply, IconCloseOutline, IconUser, IconInfo, IconSignature, DateDisplayTypes, TASK_MORE_INFO_PREFIX_NAME } from "../../../helper";
+import { SDKUI_Localizator, IconApply, IconCloseOutline, IconUser, IconInfo, DateDisplayTypes, TASK_MORE_INFO_PREFIX_NAME, IconSignaturePencil } from "../../../helper";
 import { TMColors } from "../../../utils/theme";
 import TMButton from "../../base/TMButton";
 import { DeviceType } from "../../base/TMDeviceProvider";
@@ -67,7 +67,7 @@ const StyledHorizontalContainer = styled.div `
 `;
 export const WorkFlowOperationButtons = ({ deviceType = DeviceType.DESKTOP, approveDisable = false, signApproveDisable = false, reassignDisable = false, rejectDisable = false, infoDisable = false, onApprove, onSignApprove, onReAssign, onReject, onMoreInfo }) => {
     const isMobile = deviceType === DeviceType.MOBILE;
-    return (_jsxs(StyledWorkFlowOperationButtonsContainer, { "$isMobile": isMobile, children: [_jsx(TMButton, { btnStyle: isMobile ? 'toolbar' : 'advanced', showTooltip: isMobile, icon: _jsx(IconApply, {}), caption: SDKUI_Localizator.Approve, disabled: approveDisable, onClick: () => !approveDisable && onApprove?.(), advancedColor: TMColors.success, color: 'success' }), _jsx(TMButton, { btnStyle: isMobile ? 'toolbar' : 'advanced', showTooltip: isMobile, icon: _jsx(IconSignature, {}), caption: SDKUI_Localizator.SignatureAndApprove, width: '160px', disabled: signApproveDisable, onClick: () => !signApproveDisable && onSignApprove?.(), advancedColor: TMColors.success, color: 'success' }), _jsx(TMButton, { btnStyle: isMobile ? 'toolbar' : 'advanced', showTooltip: isMobile, icon: _jsx(IconCloseOutline, {}), caption: SDKUI_Localizator.Reject, disabled: rejectDisable, onClick: () => !rejectDisable && onReject?.(), advancedColor: TMColors.error, color: 'error' }), _jsx(TMButton, { btnStyle: isMobile ? 'toolbar' : 'advanced', showTooltip: isMobile, icon: _jsx(IconUser, { fontSize: 16 }), caption: SDKUI_Localizator.Reassign, disabled: reassignDisable, onClick: () => !reassignDisable && onReAssign?.(), advancedColor: TMColors.tertiary, color: 'tertiary' }), _jsx(TMButton, { btnStyle: isMobile ? 'toolbar' : 'advanced', showTooltip: isMobile, icon: _jsx(IconInfo, { fontSize: 16 }), caption: SDKUI_Localizator.MoreInformation, width: '180px', disabled: infoDisable, onClick: () => !infoDisable && onMoreInfo?.(), advancedColor: TMColors.info, color: 'info' })] }));
+    return (_jsxs(StyledWorkFlowOperationButtonsContainer, { "$isMobile": isMobile, children: [_jsx(TMButton, { btnStyle: isMobile ? 'toolbar' : 'advanced', showTooltip: isMobile, icon: _jsx(IconApply, {}), caption: SDKUI_Localizator.Approve, disabled: approveDisable, onClick: () => !approveDisable && onApprove?.(), advancedColor: TMColors.success, color: 'success' }), _jsx(TMButton, { btnStyle: isMobile ? 'toolbar' : 'advanced', showTooltip: isMobile, icon: _jsx(IconSignaturePencil, {}), caption: SDKUI_Localizator.SignatureAndApprove, width: '160px', disabled: signApproveDisable, onClick: () => !signApproveDisable && onSignApprove?.(), advancedColor: TMColors.success, color: 'success' }), _jsx(TMButton, { btnStyle: isMobile ? 'toolbar' : 'advanced', showTooltip: isMobile, icon: _jsx(IconCloseOutline, {}), caption: SDKUI_Localizator.Reject, disabled: rejectDisable, onClick: () => !rejectDisable && onReject?.(), advancedColor: TMColors.error, color: 'error' }), _jsx(TMButton, { btnStyle: isMobile ? 'toolbar' : 'advanced', showTooltip: isMobile, icon: _jsx(IconUser, { fontSize: 16 }), caption: SDKUI_Localizator.Reassign, disabled: reassignDisable, onClick: () => !reassignDisable && onReAssign?.(), advancedColor: TMColors.tertiary, color: 'tertiary' }), _jsx(TMButton, { btnStyle: isMobile ? 'toolbar' : 'advanced', showTooltip: isMobile, icon: _jsx(IconInfo, { fontSize: 16 }), caption: SDKUI_Localizator.MoreInformation, width: '180px', disabled: infoDisable, onClick: () => !infoDisable && onMoreInfo?.(), advancedColor: TMColors.info, color: 'info' })] }));
 };
 export const WorkFlowApproveRejectPopUp = ({ TID = 0, DID = 0, deviceType = DeviceType.DESKTOP, isReject, selectedItems = [], onClose, onCompleted }) => {
     const [commentValue, setCommentValue] = useState('');

package/lib/helper/TMUtils.d.ts

@@ -5,6 +5,9 @@ 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<Map<string, string>>;
+export declare const buildValueToLabelMapFromDataColumns: (columns: Array<DataColumnDescriptor>) => Promise<{
+    valueToNameMap: Map<string, string>;
+    captions: Set<string>;
+}>;
 export declare const getAvatarColor: (name: string) => string;
 export declare const extractInitialsFromName: (name: string) => string;

package/lib/helper/TMUtils.js

@@ -119,10 +119,14 @@ 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 dataListID = Number(col.extendedProperties?.["DataListID"]);
         if (dataDomain === MetadataDataDomains.DataList) {
+            if (col.caption) {
+                captions.add(col.caption);
+            }
             const dl = await DataListCacheService.GetAsync(dataListID);
             dl?.items?.forEach((item) => {
                 if (item?.name !== undefined && item?.value !== undefined) {
@@ -131,7 +135,7 @@ export const buildValueToLabelMapFromDataColumns = async (columns) => {
             });
         }
     }
-    return valueToNameMap;
+    return { valueToNameMap, captions };
 };
 export const getAvatarColor = (name) => {
     const colors = [

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topconsultnpm/sdkui-react-beta",
-    "version": "6.17.23",
+    "version": "6.17.26",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",