@topconsultnpm/sdkui-react 6.19.0-dev2.40 → 6.19.0-dev2.42

package/lib/components/base/TMCustomButton.js

@@ -1,9 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { SDK_Globals } from '@topconsultnpm/sdk-ts';
 import { useEffect, useRef, useState, useMemo } from 'react';
 import TMModal from './TMModal';
 import styled from 'styled-components';
 import { TMLayoutWaitingContainer } from '../..';
-import { processButtonAttributes } from '../../helper/dcmtsHelper';
+import { processButtonAttributes, processSelectedItems } from '../../helper/dcmtsHelper';
 const IframeContainer = styled.div `
   display: flex;
   height: 100%;
@@ -18,9 +19,8 @@ const TMCustomButton = (props) => {
     const { button, isModal = true, formData, selectedItems, onClose } = props;
     const { appName: scriptUrl, arguments: args } = button;
     const iframeRef = useRef(null);
-    const attributes = useMemo(() => processButtonAttributes(args, formData, selectedItems), [args, formData, selectedItems]);
-    const selectedItemsProcessed = []; //da eliminare
-    //const selectedItemsProcessed = useMemo(() => processSelectedItems(args, formData, selectedItems), [args, formData, selectedItems]);
+    const attributes = useMemo(() => processButtonAttributes(args, formData), [args, formData]);
+    const selectedItemsProcessed = useMemo(() => processSelectedItems(args, formData, selectedItems), [args, formData, selectedItems]);
     const RunOnce = button.mode === "RunOnce";
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState(false);
@@ -61,7 +61,10 @@ const TMCustomButton = (props) => {
                 const checkIframe = setInterval(() => {
                     if (iframeRef.current?.contentWindow) {
                         clearInterval(checkIframe);
-                        iframeRef.current.contentWindow.postMessage({ "options": item }, targetOrigin);
+                        iframeRef.current.contentWindow.postMessage({
+                            "options": item,
+                            "session": SDK_Globals.tmSession
+                        }, targetOrigin);
                         // Attendi prima di passare al prossimo
                         setTimeout(() => {
                             setWaitPanelValue(index + 1);
@@ -92,7 +95,11 @@ const TMCustomButton = (props) => {
         }
         else if (iframeRef.current?.contentWindow) {
             // Modalità RunOnce: invia dati all'iframe quando è caricato
-            iframeRef.current.contentWindow.postMessage({ "options": attributes }, targetOrigin);
+            const mergedAttributes = { ...attributes, selectedItems: selectedItemsProcessed };
+            iframeRef.current.contentWindow.postMessage({
+                "options": mergedAttributes,
+                "session": SDK_Globals.tmSession
+            }, targetOrigin);
             //clearTimeout(timeoutIframe);
         }
     }, [loading, error, RunOnce]);

package/lib/components/base/TMFileManagerDataGridView.js

@@ -96,6 +96,6 @@ const TMFileManagerDataGridView = (props) => {
             { dataField: "creationTime", caption: SDKUI_Localizator.CreationTime, dataType: 'datetime', format: 'dd/MM/yyyy HH:mm', cellRender: cellDatetimeRender },
         ];
     }, [searchText]);
-    return _jsx(TMDataGrid, { dataSource: items ?? [], dataColumns: dataColumns, focusedRowKey: focusedRowKey, selectedRowKeys: selectedRowKeys, onFocusedRowChanged: onFocusedRowChanged, onSelectionChanged: onSelectionChanged, onCellDblClick: onCellDblClick, onContextMenuPreparing: onContextMenuPreparing, showSearchPanel: false, noDataText: SDKUI_Localizator.FolderIsEmpty }, items.length);
+    return _jsx(TMDataGrid, { dataSource: items ?? [], dataColumns: dataColumns, focusedRowKey: focusedRowKey, selectedRowKeys: selectedRowKeys, onFocusedRowChanged: onFocusedRowChanged, onSelectionChanged: onSelectionChanged, onCellDblClick: onCellDblClick, onContextMenuPreparing: onContextMenuPreparing, showSearchPanel: false, noDataText: SDKUI_Localizator.FolderIsEmpty });
 };
 export default TMFileManagerDataGridView;

package/lib/components/features/blog/TMBlogCommentForm.d.ts

@@ -6,13 +6,10 @@ interface TMBlogCommentFormProps {
     participants: Array<UserDescriptor>;
     onClose: () => void;
     showAttachmentsSection?: boolean;
-    removeAndEditAttachment?: boolean;
     selectedAttachments?: Array<FileItem>;
     selectedAttachmentDid?: Array<number>;
-    title?: string;
     allFileItems?: FileItem;
     allArchivedDocumentsFileItems?: Array<FileItem>;
-    onSavedCallback?: () => void;
     onFilterCreated?: (predicate: (post: BlogPost) => boolean) => void;
     refreshCallback?: () => Promise<void>;
 }

package/lib/components/features/blog/TMBlogCommentForm.js

@@ -29,7 +29,7 @@ const getNonDirectoryFiles = (items, exclude) => {
 };
 const TMBlogCommentForm = (props) => {
     const maxLength = 1000;
-    const { title = SDKUI_Localizator.AddNewComment, participants, selectedAttachments, selectedAttachmentDid, allFileItems, allArchivedDocumentsFileItems = [], onClose, context, showAttachmentsSection = true, removeAndEditAttachment = true, onSavedCallback, onFilterCreated, refreshCallback } = props;
+    const { participants, selectedAttachments, selectedAttachmentDid, allFileItems, allArchivedDocumentsFileItems = [], onClose, context, showAttachmentsSection = true, onFilterCreated, refreshCallback } = props;
     // Initialize state with combined array
     const [dataSource, setDataSource] = useState(() => [...getNonDirectoryFiles(allFileItems?.items || [], []), ...allArchivedDocumentsFileItems]);
     const [isEditorEnabled, setIsEditorEnabled] = useState(true);
@@ -171,10 +171,7 @@ const TMBlogCommentForm = (props) => {
         finally {
             // Hide the loading spinner and close the operation (e.g., close a modal or cleanup)
             TMSpinner.hide();
-            if (onSavedCallback)
-                onSavedCallback();
-            else
-                onClose();
+            onClose();
         }
     };
     const onCloseCallback = () => {
@@ -219,8 +216,8 @@ const TMBlogCommentForm = (props) => {
         // Update the state with selected draft items
         setCurrentDraftAttachments(selectedDraftItems);
     };
-    return _jsx(TMSaveForm, { id: 1, title: title, showTitleFormMode: false, showErrorCount: false, customSaveButton: _jsx("i", { className: 'dx-icon-send' }), customTooltipSaveButton: SDKUI_Localizator.Send, showUndoButton: false, hasNavigation: false, skipIsModifiedCheck: true, isModal: true, width: calcResponsiveSizes(deviceType, '800px', '800px', '95%'), height: '550px', formMode: FormModes.Create, validationItems: validationItems, exception: exception, isModified: calcIsModified(formData, formDataOrig), onSaveAsync: onSaveAsync, onClose: onCloseCallback, customToolbarElements: _jsx("div", { style: { display: 'flex', gap: '2px' }, children: _jsx(TMButton, { btnStyle: "toolbar", icon: isEditorEnabled ? _jsx("i", { className: 'dx-icon-font' }) : _jsx("i", { className: 'dx-icon-background' }), caption: isEditorEnabled ? SDKUI_Localizator.HideFormattingOptions : SDKUI_Localizator.ShowFormattingOptions, onClick: toggleEditorMode }) }), children: _jsxs("div", { style: { width: "100%", height: "100%" }, children: [_jsxs("div", { style: { width: "100%", height: "100%" }, children: [_jsx("div", { style: { width: "100%", height: showAttachmentsSection ? "calc(100% - 60px)" : "100%" }, children: _jsx(TMHtmlEditor, { width: '100%', height: '100%', isEditorEnabled: isEditorEnabled, validationItems: validationItems, onValueChanged: onValueChanged, mentionsConfig: mentionsConfig, autoFocus: true, maxLength: maxLength }) }), showAttachmentsSection && _jsxs("div", { style: { display: 'flex', alignItems: 'center', height: '60px', marginTop: '10px' }, children: [_jsx("div", { style: {
-                                        width: `calc(100% - ${removeAndEditAttachment ? 60 : 0}px)`,
+    return _jsx(TMSaveForm, { id: 1, title: SDKUI_Localizator.AddNewComment, showTitleFormMode: false, showErrorCount: false, customSaveButton: _jsx("i", { className: 'dx-icon-send' }), customTooltipSaveButton: SDKUI_Localizator.Send, showUndoButton: false, hasNavigation: false, skipIsModifiedCheck: true, isModal: true, width: calcResponsiveSizes(deviceType, '800px', '800px', '95%'), height: '550px', formMode: FormModes.Create, validationItems: validationItems, exception: exception, isModified: calcIsModified(formData, formDataOrig), onSaveAsync: onSaveAsync, onClose: onCloseCallback, customToolbarElements: _jsx("div", { style: { display: 'flex', gap: '2px' }, children: _jsx(TMButton, { btnStyle: "toolbar", icon: isEditorEnabled ? _jsx("i", { className: 'dx-icon-font' }) : _jsx("i", { className: 'dx-icon-background' }), caption: isEditorEnabled ? SDKUI_Localizator.HideFormattingOptions : SDKUI_Localizator.ShowFormattingOptions, onClick: toggleEditorMode }) }), children: _jsxs("div", { style: { width: "100%", height: "100%" }, children: [_jsxs("div", { style: { width: "100%", height: "100%" }, children: [_jsx("div", { style: { width: "100%", height: showAttachmentsSection ? "calc(100% - 60px)" : "100%" }, children: _jsx(TMHtmlEditor, { width: '100%', height: '100%', isEditorEnabled: isEditorEnabled, validationItems: validationItems, onValueChanged: onValueChanged, mentionsConfig: mentionsConfig, autoFocus: true, maxLength: maxLength }) }), showAttachmentsSection && _jsxs("div", { style: { display: 'flex', alignItems: 'center', height: '60px', marginTop: '10px' }, children: [_jsx("div", { style: {
+                                        width: 'calc(100% - 60px)',
                                         overflowX: 'auto',
                                         whiteSpace: 'nowrap',
                                         height: '50px',
@@ -234,7 +231,7 @@ const TMBlogCommentForm = (props) => {
                                         const tooltipContent = (_jsxs("div", { style: { textAlign: 'left' }, children: [_jsxs("div", { children: [_jsxs("span", { style: { fontWeight: 'bold' }, children: [SDKUI_Localizator.Name, ":"] }), " ", draft.name ?? '-'] }), _jsxs("div", { children: [_jsxs("span", { style: { fontWeight: 'bold' }, children: [SDKUI_Localizator.Author, ":"] }), " ", draft.updaterName ?? '-'] }), _jsx("hr", {}), _jsxs("div", { children: [_jsxs("span", { style: { fontWeight: 'bold' }, children: [SDKUI_Localizator.Version, ":"] }), " ", draft.version] }), _jsxs("div", { children: [_jsxs("span", { style: { fontWeight: 'bold' }, children: [SDKUI_Localizator.Size, ":"] }), " ", formatBytes(draft.size ?? 0)] }), _jsx("hr", {}), _jsxs("div", { children: [_jsxs("span", { style: { fontWeight: 'bold' }, children: [SDKUI_Localizator.CreationTime, ":"] }), " ", Globalization.getDateTimeDisplayValue(draft.creationTime)] }), _jsxs("div", { children: [_jsxs("span", { style: { fontWeight: 'bold' }, children: [SDKUI_Localizator.LastUpdateTime, ":"] }), " ", Globalization.getDateTimeDisplayValue(draft.lastUpdateTime)] })] }));
                                         return _jsxs("div", { style: {
                                                 display: 'inline-flex',
-                                                alignItems: 'center',
+                                                alignItems: 'center', // <-- this centers content vertically
                                                 padding: '4px 8px',
                                                 margin: '4px',
                                                 border: '1px solid #ddd',
@@ -261,7 +258,7 @@ const TMBlogCommentForm = (props) => {
                                                         fontWeight: 'bold',
                                                         marginRight: '8px',
                                                         boxShadow: '1px 1px 2px #00000020',
-                                                    }, children: _jsx(TMTooltip, { content: SDKUI_Localizator.Version, children: draft.version }) })), removeAndEditAttachment && _jsx(TMTooltip, { content: SDKUI_Localizator.RemoveAttachment, children: _jsx("span", { onClick: () => removeAttachment(draft), style: {
+                                                    }, children: _jsx(TMTooltip, { content: SDKUI_Localizator.Version, children: draft.version }) })), _jsx(TMTooltip, { content: SDKUI_Localizator.RemoveAttachment, children: _jsx("span", { onClick: () => removeAttachment(draft), style: {
                                                             display: 'inline-flex',
                                                             width: '20px',
                                                             height: '20px',
@@ -273,7 +270,7 @@ const TMBlogCommentForm = (props) => {
                                                             cursor: 'pointer',
                                                             boxShadow: '1px 1px 2px #00000020',
                                                         }, children: _jsx("span", { style: { fontSize: '15px' }, children: "\u00D7" }) }) })] }, draft.did);
-                                    })) : (_jsx("div", { style: { color: '#999', width: '100%', textAlign: 'center' }, children: SDKUI_Localizator.NoAttachments })) }), removeAndEditAttachment && _jsx(TMTooltip, { content: SDKUI_Localizator.Attachments + ": " + currentDraftAttachments.length, children: _jsxs("div", { style: { position: 'relative', display: 'inline-block' }, children: [_jsx("i", { className: "dx-icon-attach", style: {
+                                    })) : (_jsx("div", { style: { color: '#999', width: '100%', textAlign: 'center' }, children: SDKUI_Localizator.NoAttachments })) }), _jsx(TMTooltip, { content: SDKUI_Localizator.Attachments + ": " + currentDraftAttachments.length, children: _jsxs("div", { style: { position: 'relative', display: 'inline-block' }, children: [_jsx("i", { className: "dx-icon-attach", style: {
                                                     width: '50px',
                                                     height: '50px',
                                                     marginLeft: '10px',

package/lib/helper/dcmtsHelper.d.ts

@@ -4,4 +4,5 @@ export declare const hasDetailRelations: (mTID: number | undefined) => Promise<b
 /** Check if dcmtType (mTID) has configured Master or Many-to-Many relations */
 export declare const hasMasterRelations: (mTID: number | undefined) => Promise<boolean>;
 export declare const isXMLFileExt: (fileExt: string | undefined) => boolean;
-export declare const processButtonAttributes: (args: string | undefined, formData: MetadataValueDescriptorEx[] | undefined, selectedItems: Array<any> | undefined) => Record<string, any> | undefined;
+export declare const processButtonAttributes: (args: string | undefined, formData: MetadataValueDescriptorEx[] | undefined) => (string | null)[] | undefined;
+export declare const processSelectedItems: (args: string | undefined, formData: MetadataValueDescriptorEx[] | undefined, selectedItems: Array<any> | undefined) => any[][];

package/lib/helper/dcmtsHelper.js

@@ -1,4 +1,4 @@
-import { RelationCacheService, RelationTypes, SDK_Globals } from "@topconsultnpm/sdk-ts";
+import { RelationCacheService, RelationTypes } from "@topconsultnpm/sdk-ts";
 /** Check if dcmtType (mTID) has configured Detail or Many-to-Many relations */
 export const hasDetailRelations = async (mTID) => {
     let allRelations = await RelationCacheService.GetAllAsync();
@@ -24,68 +24,27 @@ export const isXMLFileExt = (fileExt) => {
     }
 };
 /*utility functions for TMCustomButton*/
-export const processButtonAttributes = (args, formData, selectedItems) => args && formData ? formDataMap(formData, args, selectedItems) : undefined;
-const processSelectedItems = (selectedItems) => selectedItems && selectedItems.map(item => item["DID"]) || [];
-const formDataMap = (data, args, selectedItems) => {
-    const session = SDK_Globals.tmSession;
-    const sessionDescr = session?.SessionDescr;
-    const result = {};
-    // Regex per catturare: chiave=[{@campo} ...] o chiave={valore} o {@campo}
-    const keyValueRegex = /(\w+)=\[([^\]]+)\]|(\w+)=\{([^}]+)\}|\{@([^}]+)\}/g;
-    let match;
-    while ((match = keyValueRegex.exec(args)) !== null) {
-        if (match[1]) {
-            // Formato: chiave=[{@campo} {@campo} ...]
-            const key = match[1];
-            const content = match[2];
-            // Estrai tutti i {@campo} e concatenali
-            const fields = content.match(/\{@([^}]+)\}/g) || [];
-            const values = fields.map(field => {
-                const fieldName = field.slice(2, -1);
-                const md = data.find(md => md.md?.name === fieldName);
-                return md?.value ?? '';
-            }).filter(v => v);
-            result[key] = values.join(' ');
-        }
-        else if (match[3]) {
-            // Formato: chiave={valore}
-            const key = match[3];
-            const value = match[4];
-            result[key] = value;
-        }
-        else if (match[5]) {
-            // Formato: {@campo}
-            const fieldName = match[5];
+export const processButtonAttributes = (args, formData) => args && formData ? formDataMap(formData, args) : undefined;
+export const processSelectedItems = (args, formData, selectedItems) => {
+    if (!args || !selectedItems)
+        return [];
+    const MidList = formData ? formDataMap(formData, args, true) : [];
+    return selectedItems.map(item => 
+    //salvo il did come primo elemento dell'array
+    [item["DID"], ...MidList.map(key => key && item[key])]);
+};
+const formDataMap = (data, args, returnMid = false) => {
+    const tokens = args.match(/\{@?[^}]+\}/g) || [];
+    return tokens.map(token => {
+        if (token.startsWith('{@')) {
+            // Campo dinamico: {@campo} -> cerca in formData
+            const fieldName = token.slice(2, -1);
             const md = data.find(md => md.md?.name === fieldName);
-            switch (fieldName) {
-                case 'SelectedDIDs':
-                    result[fieldName] = processSelectedItems(selectedItems);
-                    break;
-                case 'AuthenticationMode':
-                    result[fieldName] = sessionDescr?.authenticationMode ?? null;
-                    break;
-                case 'ArchiveID':
-                    result[fieldName] = sessionDescr?.archiveID ?? null;
-                    break;
-                case 'CultureID':
-                    result[fieldName] = sessionDescr?.cultureID ?? null;
-                    break;
-                case 'Domain':
-                    result[fieldName] = sessionDescr?.domain ?? null;
-                    break;
-                case 'UserID':
-                    result[fieldName] = sessionDescr?.userID ?? null;
-                    break;
-                case 'UserName':
-                    result[fieldName] = sessionDescr?.userName ?? null;
-                    break;
-                case 'Session':
-                    result[fieldName] = session ?? null;
-                    break;
-                default:
-                    result[fieldName] = md?.value;
-            }
+            return returnMid ? (md ? `${md.tid}_${md.mid}` : null) : (md?.value ?? null);
         }
-    }
-    return result;
+        else {
+            // Campo statico: {valore} -> ritorna il valore o null
+            return returnMid ? null : token.slice(1, -1);
+        }
+    });
 };

package/package.json

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