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

package/lib/components/base/TMCustomButton.js

@@ -4,7 +4,7 @@ import { useEffect, useRef, useState, useMemo } from 'react';
 import TMModal from './TMModal';
 import styled from 'styled-components';
 import { TMLayoutWaitingContainer } from '../..';
-import { processButtonAttributes, processSelectedItems } from '../../helper/dcmtsHelper';
+import { processButtonAttributes } from '../../helper/dcmtsHelper';
 const IframeContainer = styled.div `
   display: flex;
   height: 100%;
@@ -19,8 +19,9 @@ 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), [args, formData]);
-    const selectedItemsProcessed = useMemo(() => processSelectedItems(args, formData, selectedItems), [args, formData, selectedItems]);
+    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 RunOnce = button.mode === "RunOnce";
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState(false);
@@ -61,10 +62,7 @@ const TMCustomButton = (props) => {
                 const checkIframe = setInterval(() => {
                     if (iframeRef.current?.contentWindow) {
                         clearInterval(checkIframe);
-                        iframeRef.current.contentWindow.postMessage({
-                            "options": item,
-                            "session": SDK_Globals.tmSession
-                        }, targetOrigin);
+                        iframeRef.current.contentWindow.postMessage({ "options": item }, targetOrigin);
                         // Attendi prima di passare al prossimo
                         setTimeout(() => {
                             setWaitPanelValue(index + 1);
@@ -95,9 +93,8 @@ const TMCustomButton = (props) => {
         }
         else if (iframeRef.current?.contentWindow) {
             // Modalità RunOnce: invia dati all'iframe quando è caricato
-            const mergedAttributes = { ...attributes, selectedItems: selectedItemsProcessed };
             iframeRef.current.contentWindow.postMessage({
-                "options": mergedAttributes,
+                "options": attributes,
                 "session": SDK_Globals.tmSession
             }, targetOrigin);
             //clearTimeout(timeoutIframe);

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 });
+    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);
 };
 export default TMFileManagerDataGridView;

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

@@ -8,8 +8,10 @@ interface TMBlogCommentFormProps {
     showAttachmentsSection?: 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 { participants, selectedAttachments, selectedAttachmentDid, allFileItems, allArchivedDocumentsFileItems = [], onClose, context, showAttachmentsSection = true, onFilterCreated, refreshCallback } = props;
+    const { title = SDKUI_Localizator.AddNewComment, participants, selectedAttachments, selectedAttachmentDid, allFileItems, allArchivedDocumentsFileItems = [], onClose, context, showAttachmentsSection = true, onSavedCallback, onFilterCreated, refreshCallback } = props;
     // Initialize state with combined array
     const [dataSource, setDataSource] = useState(() => [...getNonDirectoryFiles(allFileItems?.items || [], []), ...allArchivedDocumentsFileItems]);
     const [isEditorEnabled, setIsEditorEnabled] = useState(true);
@@ -171,7 +171,10 @@ const TMBlogCommentForm = (props) => {
         finally {
             // Hide the loading spinner and close the operation (e.g., close a modal or cleanup)
             TMSpinner.hide();
-            onClose();
+            if (onSavedCallback)
+                onSavedCallback();
+            else
+                onClose();
         }
     };
     const onCloseCallback = () => {
@@ -216,7 +219,7 @@ const TMBlogCommentForm = (props) => {
         // Update the state with selected draft items
         setCurrentDraftAttachments(selectedDraftItems);
     };
-    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: {
+    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)',
                                         overflowX: 'auto',
                                         whiteSpace: 'nowrap',

package/lib/helper/dcmtsHelper.d.ts

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

package/lib/helper/dcmtsHelper.js

@@ -1,4 +1,4 @@
-import { RelationCacheService, RelationTypes } from "@topconsultnpm/sdk-ts";
+import { RelationCacheService, RelationTypes, SDK_Globals } 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,27 +24,70 @@ export const isXMLFileExt = (fileExt) => {
     }
 };
 /*utility functions for TMCustomButton*/
-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);
+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 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;
+        }
+        else if (token.startsWith('{@')) {
+            // Formato: {@campo}
+            fieldName = token.slice(2, -1);
             const md = data.find(md => md.md?.name === fieldName);
-            return returnMid ? (md ? `${md.tid}_${md.mid}` : null) : (md?.value ?? null);
+            switch (fieldName) {
+                case 'SelectedDIDs':
+                    value = processSelectedItems(selectedItems);
+                    break;
+                case 'AuthenticationMode':
+                    value = sessionDescr?.authenticationMode ?? null;
+                    break;
+                case 'ArchiveID':
+                    value = sessionDescr?.archiveID ?? null;
+                    break;
+                case 'CultureID':
+                    value = sessionDescr?.cultureID ?? null;
+                    break;
+                case 'Domain':
+                    value = sessionDescr?.domain ?? null;
+                    break;
+                case 'UserID':
+                    value = sessionDescr?.userID ?? null;
+                    break;
+                case 'UserName':
+                    value = sessionDescr?.userName ?? null;
+                    break;
+                case 'Session':
+                    value = session ?? null;
+                    break;
+                default:
+                    value = md?.value;
+            }
         }
         else {
-            // Campo statico: {valore} -> ritorna il valore o null
-            return returnMid ? null : token.slice(1, -1);
+            // 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);
 };

package/package.json

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