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

package/lib/components/base/TMCustomButton.js

@@ -1,5 +1,4 @@
 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';
@@ -93,10 +92,7 @@ const TMCustomButton = (props) => {
         }
         else if (iframeRef.current?.contentWindow) {
             // Modalità RunOnce: invia dati all'iframe quando è caricato
-            iframeRef.current.contentWindow.postMessage({
-                "options": attributes,
-                "session": SDK_Globals.tmSession
-            }, targetOrigin);
+            iframeRef.current.contentWindow.postMessage({ "options": attributes }, targetOrigin);
             //clearTimeout(timeoutIframe);
         }
     }, [loading, error, RunOnce]);

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

@@ -6,6 +6,7 @@ interface TMBlogCommentFormProps {
     participants: Array<UserDescriptor>;
     onClose: () => void;
     showAttachmentsSection?: boolean;
+    removeAndEditAttachment?: boolean;
     selectedAttachments?: Array<FileItem>;
     selectedAttachmentDid?: Array<number>;
     title?: string;

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, onSavedCallback, onFilterCreated, refreshCallback } = props;
+    const { title = SDKUI_Localizator.AddNewComment, participants, selectedAttachments, selectedAttachmentDid, allFileItems, allArchivedDocumentsFileItems = [], onClose, context, showAttachmentsSection = true, removeAndEditAttachment = true, onSavedCallback, onFilterCreated, refreshCallback } = props;
     // Initialize state with combined array
     const [dataSource, setDataSource] = useState(() => [...getNonDirectoryFiles(allFileItems?.items || [], []), ...allArchivedDocumentsFileItems]);
     const [isEditorEnabled, setIsEditorEnabled] = useState(true);
@@ -220,7 +220,7 @@ const TMBlogCommentForm = (props) => {
         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% - 60px)',
+                                        width: `calc(100% - ${removeAndEditAttachment ? 60 : 0}px)`,
                                         overflowX: 'auto',
                                         whiteSpace: 'nowrap',
                                         height: '50px',
@@ -234,7 +234,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', // <-- this centers content vertically
+                                                alignItems: 'center',
                                                 padding: '4px 8px',
                                                 margin: '4px',
                                                 border: '1px solid #ddd',
@@ -261,7 +261,7 @@ const TMBlogCommentForm = (props) => {
                                                         fontWeight: 'bold',
                                                         marginRight: '8px',
                                                         boxShadow: '1px 1px 2px #00000020',
-                                                    }, children: _jsx(TMTooltip, { content: SDKUI_Localizator.Version, children: draft.version }) })), _jsx(TMTooltip, { content: SDKUI_Localizator.RemoveAttachment, children: _jsx("span", { onClick: () => removeAttachment(draft), style: {
+                                                    }, children: _jsx(TMTooltip, { content: SDKUI_Localizator.Version, children: draft.version }) })), removeAndEditAttachment && _jsx(TMTooltip, { content: SDKUI_Localizator.RemoveAttachment, children: _jsx("span", { onClick: () => removeAttachment(draft), style: {
                                                             display: 'inline-flex',
                                                             width: '20px',
                                                             height: '20px',
@@ -273,7 +273,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 })) }), _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 })) }), 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: {
                                                     width: '50px',
                                                     height: '50px',
                                                     marginLeft: '10px',

package/lib/helper/dcmtsHelper.d.ts

@@ -4,4 +4,4 @@ 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) => any[] | Record<string, any> | undefined;
+export declare const processButtonAttributes: (args: string | undefined, formData: MetadataValueDescriptorEx[] | undefined, selectedItems: Array<any> | undefined) => Record<string, any> | undefined;

package/lib/helper/dcmtsHelper.js

@@ -26,68 +26,66 @@ 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, returnObject = true) => {
-    // Regex per catturare sia chiave={@campo} che {@campo} o {valore}
-    const tokens = args.match(/(\w+)=\{@?[^}]+\}|\{@?[^}]+\}/g) || [];
+const formDataMap = (data, args, selectedItems) => {
     const session = SDK_Globals.tmSession;
     const sessionDescr = session?.SessionDescr;
-    const results = tokens.map(token => {
-        let value;
-        let fieldName = '';
-        // Verifica se ha formato chiave={@campo}
-        const keyValueMatch = token.match(/(\w+)=\{@?([^}]+)\}/);
-        if (keyValueMatch) {
-            // Formato: Test={@Campo}
-            fieldName = keyValueMatch[1]; // Test
-            const innerField = keyValueMatch[2]; // Campo
-            const md = data.find(md => md.md?.name === innerField);
-            value = md?.value;
+    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 (token.startsWith('{@')) {
+        else if (match[3]) {
+            // Formato: chiave={valore}
+            const key = match[3];
+            const value = match[4];
+            result[key] = value;
+        }
+        else if (match[5]) {
             // Formato: {@campo}
-            fieldName = token.slice(2, -1);
+            const fieldName = match[5];
             const md = data.find(md => md.md?.name === fieldName);
             switch (fieldName) {
                 case 'SelectedDIDs':
-                    value = processSelectedItems(selectedItems);
+                    result[fieldName] = processSelectedItems(selectedItems);
                     break;
                 case 'AuthenticationMode':
-                    value = sessionDescr?.authenticationMode ?? null;
+                    result[fieldName] = sessionDescr?.authenticationMode ?? null;
                     break;
                 case 'ArchiveID':
-                    value = sessionDescr?.archiveID ?? null;
+                    result[fieldName] = sessionDescr?.archiveID ?? null;
                     break;
                 case 'CultureID':
-                    value = sessionDescr?.cultureID ?? null;
+                    result[fieldName] = sessionDescr?.cultureID ?? null;
                     break;
                 case 'Domain':
-                    value = sessionDescr?.domain ?? null;
+                    result[fieldName] = sessionDescr?.domain ?? null;
                     break;
                 case 'UserID':
-                    value = sessionDescr?.userID ?? null;
+                    result[fieldName] = sessionDescr?.userID ?? null;
                     break;
                 case 'UserName':
-                    value = sessionDescr?.userName ?? null;
+                    result[fieldName] = sessionDescr?.userName ?? null;
                     break;
                 case 'Session':
-                    value = session ?? null;
+                    result[fieldName] = session ?? null;
                     break;
                 default:
-                    value = md?.value;
+                    result[fieldName] = md?.value;
             }
         }
-        else {
-            // Formato: {valore}
-            fieldName = token.slice(1, -1);
-            value = fieldName;
-        }
-        return { fieldName, value };
-    });
-    if (returnObject) {
-        return results.reduce((acc, { fieldName, value }) => {
-            acc[fieldName] = value;
-            return acc;
-        }, {});
     }
-    return results.map(r => r.value);
+    return result;
 };

package/package.json

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