@topconsultnpm/sdkui-react-beta 6.16.67 → 6.16.69

package/lib/components/base/TMFileManager.js

@@ -189,7 +189,7 @@ const TMFileManager = (props) => {
     const handleDragLeave = (e) => {
         setIsDragging(false);
     };
-    return _jsx(TMPanel, { title: SDKUI_Localizator.Drafts, totalItems: dcmtsFound ?? 0, showHeader: showPanel, onBack: (isMobile && openDraftList) ? onBackCallback : undefined, onClose: onClosePanel, allowMaximize: !isMobile ? allowMaximize : false, onMaximize: !isMobile ? onMaximizePanel : undefined, onHeaderDoubleClick: !isMobile ? onMaximizePanel : undefined, toolbar: toolbar, children: _jsx("div", { style: { flexDirection: "column", height: "100%", width: "100%", }, children: _jsxs(TMConditionalWrapper, { condition: !isMobile, wrapper: children => _jsx("div", { style: { display: "flex", flexGrow: 1, height: "100%" }, children: _jsx(TMSplitterLayout, { direction: 'horizontal', showSeparator: true, separatorColor: 'transparent', separatorActiveColor: 'transparent', min: ['0', '0'], start: [isLeftPanelCollapsed ? '0%' : "30%", isLeftPanelCollapsed ? '100%' : "70%"], children: children }, "TMWGs-panels-treeView") }), children: [_jsxs("div", { style: {
+    return _jsx(TMPanel, { title: SDKUI_Localizator.Drafts, totalItems: dcmtsFound ?? 0, showHeader: showPanel, onBack: (isMobile && openDraftList) ? onBackCallback : undefined, onClose: onClosePanel, allowMaximize: !isMobile ? allowMaximize : false, onMaximize: !isMobile ? onMaximizePanel : undefined, onHeaderDoubleClick: !isMobile ? onMaximizePanel : undefined, toolbar: toolbar, children: _jsx("div", { style: { flexDirection: "column", height: "100%", width: "100%", }, children: _jsxs(TMConditionalWrapper, { condition: !isMobile, wrapper: children => _jsx("div", { style: { display: "flex", flexGrow: 1, height: "100%" }, children: _jsx(TMSplitterLayout, { direction: 'horizontal', showSeparator: true, separatorColor: 'transparent', separatorActiveColor: 'transparent', min: ['0', '0'], start: [isLeftPanelCollapsed ? '0%' : "32%", isLeftPanelCollapsed ? '100%' : "68%"], children: children }, "TMWGs-panels-treeView") }), children: [_jsxs("div", { style: {
                             height: "100%",
                             width: "100%",
                             ...(isMobile && { display: openDraftList ? 'none' : 'block', transition: "opacity 0.3s ease-in-out" }),

package/lib/components/base/TMVilViewer.js

@@ -7,7 +7,7 @@ const TMVilViewer = ({ vil = [] }) => {
         if (!vil)
             return [];
         let errItems = [];
-        let sortedVil = vil.sort((a, b) => a.ResultType.localeCompare(b.ResultType));
+        let sortedVil = vil.slice().sort((a, b) => a.ResultType.localeCompare(b.ResultType));
         for (let i = 0; i < sortedVil.length; i++) {
             let viColor = sortedVil[i].ResultType == ResultTypes.ERROR ? TMColors.error : sortedVil[i].ResultType == ResultTypes.INFO ? TMColors.info : TMColors.tertiary;
             let msg_prefix = sortedVil.length > 1 ? `${i + 1}) ` : '';

package/lib/components/features/workflow/diagram/WFDiagram.d.ts

@@ -6,7 +6,6 @@ interface IWFDiagramProps {
     translateX?: number;
     translateY?: number;
     currentSetID?: string;
-    onDiagramImport?: (newXmlString: string) => void;
 }
 declare const WFDiagram: React.FC<IWFDiagramProps>;
 export default WFDiagram;

package/lib/components/features/workflow/diagram/WFDiagram.js

@@ -205,7 +205,7 @@ const DiagramMessage = styled.div `
   color: #555;
   text-align: center;
 `;
-const WFDiagram = ({ xmlDiagramString, currentSetID, readOnly = false, zoomLevel = 1, translateX = 0, translateY = 0, onDiagramImport }) => {
+const WFDiagram = ({ xmlDiagramString, currentSetID, readOnly = false, zoomLevel = 1, translateX = 0, translateY = 0 }) => {
     const [isLoading, setIsLoading] = useState(true);
     const [wfDiagram, setWfDiagram] = useState(null);
     const [selectedItems, setSelectedItems] = useState(new Set());
@@ -270,31 +270,6 @@ const WFDiagram = ({ xmlDiagramString, currentSetID, readOnly = false, zoomLevel
         const totalHeight = finalMaxY - finalMinY;
         return { svgWidth: Math.max(0, totalWidth * zoomLevel), svgHeight: Math.max(0, totalHeight * zoomLevel) };
     }, [wfDiagram, zoomLevel]);
-    // const updateWfDiagram = useCallback((newDiagram: WfDiagram) => {
-    //     if (readOnly) return;
-    //     try {
-    //         validateDiagram(newDiagram);
-    //         setWfDiagram(newDiagram);
-    //         if (!isUndoingRedoing.current) {
-    //             setWfDiagramHistory(prevHistory => {
-    //                 const newHistory = prevHistory.slice(0, historyIndex + 1);
-    //                 return [...newHistory, newDiagram];
-    //             });
-    //             setHistoryIndex(prevIndex => prevIndex + 1);
-    //         }
-    //     } catch (e: any) {
-    //         TMExceptionBoxManager.show({ exception: e });
-    //     }
-    // }, [historyIndex, readOnly]);
-    // const updateDiagramAndHistory = useCallback((newDiagram: WfDiagram) => {
-    //     if (readOnly) return;
-    //     if (!isUndoingRedoing.current) {
-    //         const newHistory = wfDiagramHistory.slice(0, historyIndex + 1);
-    //         setWfDiagramHistory([...newHistory, newDiagram]);
-    //         setHistoryIndex(newHistory.length);
-    //     }
-    //     setWfDiagram(newDiagram);
-    // }, [wfDiagramHistory, historyIndex, isUndoingRedoing, setWfDiagramHistory, setHistoryIndex, setWfDiagram, readOnly]);
     const updateDiagram = useCallback((newDiagram, validate = true) => {
         if (readOnly)
             return;
@@ -615,6 +590,7 @@ const WFDiagram = ({ xmlDiagramString, currentSetID, readOnly = false, zoomLevel
         }
     }, []);
     // Gestore dell'evento di selezione file (esegue il parse e chiama il genitore)
+    // Gestore dell'evento di selezione file (esegue il parse e chiama il genitore)
     const handleFileChange = useCallback((event) => {
         const file = event.target.files?.[0];
         if (!file) {
@@ -624,15 +600,13 @@ const WFDiagram = ({ xmlDiagramString, currentSetID, readOnly = false, zoomLevel
         reader.onload = (e) => {
             try {
                 const xmlContent = e.target?.result;
-                // 1. Esegui il parse per validare il file.
-                // parseWfDiagramXml lancerà un errore se l'XML è invalido o malformato,
-                // intercettato nel blocco catch.
-                // NON ASSEGNIAMO wfDiagram QUI, MA CHIAMIAMO SOLO PER VERIFICA.
-                parseWfDiagramXml(xmlContent);
-                // 2. Se il parsing ha successo, comunichiamo la nuova stringa XML al genitore.
-                // Il genitore sarà responsabile di aggiornare lo stato di xmlDiagramString,
-                // il che farà re-renderizzare questo componente con il nuovo diagramma.
-                onDiagramImport?.(xmlContent);
+                // 1. Esegui il parse per ottenere il nuovo oggetto WfDiagram.
+                const newWfDiagram = parseWfDiagramXml(xmlContent);
+                // 2. TRATTA L'IMPORT COME UNA MODIFICA:
+                // Usa updateDiagram per aggiornare lo stato interno (wfDiagram) e la history (wfDiagramHistory).
+                // L'originale xmlDiagramString del genitore resta intatto.
+                // Passiamo false per 'validate' in quanto il file importato è già stato validato da parseWfDiagramXml.
+                updateDiagram(newWfDiagram, false);
                 // 3. Resetta l'input per permettere re-import dello stesso file
                 if (fileInputRef.current) {
                     fileInputRef.current.value = '';
@@ -649,7 +623,7 @@ const WFDiagram = ({ xmlDiagramString, currentSetID, readOnly = false, zoomLevel
             }
         };
         reader.readAsText(file, 'UTF-8');
-    }, [onDiagramImport]);
+    }, [updateDiagram]);
     const calculateConnectionPath = useCallback((connection, sourceItem, sinkItem) => {
         const sourcePoint = getConnectionPoint(sourceItem, connection.Source.ConnectorName);
         const sinkPoint = getConnectionPoint(sinkItem, connection.Sink.ConnectorName);

package/lib/components/features/workflow/diagram/interfaces.d.ts

@@ -70,7 +70,7 @@ export interface DiagramItem {
     RegAsWfInstPart?: number;
     FormatCultureID?: CultureIDs | undefined;
     Tos2?: string;
-    QD2?: string;
+    QD2?: QueryDescriptor;
     PlatformObjName?: string;
     PlatformObjDescr?: string;
     Value1asInt?: number;

package/lib/components/features/workflow/diagram/metadataParser.js

@@ -1,20 +1,4 @@
 import { MetadataValueDescriptorEx } from "../../../../ts";
-// Funzione per decodificare le entità HTML/XML
-const decodeXmlEntities = (xmlString) => {
-    return xmlString.replace(/&lt;/g, "<")
-        .replace(/&gt;/g, ">")
-        .replace(/&amp;/g, "&")
-        .replace(/&quot;/g, '"')
-        .replace(/&apos;/g, "'");
-};
-// Funzione per codificare le entità XML
-const encodeXmlEntities = (xmlString) => {
-    return xmlString.replace(/&/g, "&amp;")
-        .replace(/</g, "&lt;")
-        .replace(/>/g, "&gt;")
-        .replace(/"/g, "&quot;")
-        .replace(/'/g, "&apos;");
-};
 /**
  * Parsa la stringa XML annidata di MetadataValues in un array di MetadataValueDescriptor.
  * @param xmlString La stringa XML grezza contenente le entità codificate.
@@ -22,8 +6,7 @@ const encodeXmlEntities = (xmlString) => {
  */
 export const parseMetadataValuesXml = (xmlString) => {
     const parser = new DOMParser();
-    const decodedXml = decodeXmlEntities(xmlString);
-    const xmlDoc = parser.parseFromString(decodedXml, "application/xml");
+    const xmlDoc = parser.parseFromString(xmlString, "application/xml");
     const metadataDescriptors = [];
     const itemsXML = xmlDoc.querySelectorAll("MetadataValueDescriptor");
     itemsXML.forEach(itemXML => {
@@ -67,5 +50,5 @@ export const serializeMetadataValuesToXml = (metadataValues) => {
     });
     xml += `</ArrayOfMetadataValueDescriptor>`;
     // Codifica le entità XML per inserire la stringa nel tag principale
-    return encodeXmlEntities(xml);
+    return xml;
 };

package/lib/components/features/workflow/diagram/queryDescriptorParser.d.ts

@@ -1,2 +1,3 @@
 import { QueryDescriptor } from '@topconsultnpm/sdk-ts-beta';
 export declare const parseQueryDescriptorXml: (xmlString: string) => QueryDescriptor | undefined;
+export declare const serializeQueryDescriptorXml: (qd: QueryDescriptor | undefined) => Promise<string>;

package/lib/components/features/workflow/diagram/queryDescriptorParser.js

@@ -1,4 +1,4 @@
-import { FromItem, JoinItem, OnJoinItem, OrderByItem, QueryDescriptor, QueryParameterDescriptor, SelectItem, WhereItem } from '@topconsultnpm/sdk-ts-beta';
+import { FromItem, JoinItem, OnJoinItem, OrderByItem, QueryDescriptor, QueryParameterDescriptor, SDK_Globals, SelectItem, WhereItem } from '@topconsultnpm/sdk-ts-beta';
 /**
  * Safely gets text content of an element and converts to a number.
  * Returns undefined if element or content is missing/invalid.
@@ -174,3 +174,15 @@ export const parseQueryDescriptorXml = (xmlString) => {
     queryDescriptor.params = paramsItems.length > 0 ? paramsItems : undefined;
     return queryDescriptor;
 };
+export const serializeQueryDescriptorXml = async (qd) => {
+    // try {
+    if (!qd)
+        return '';
+    let xml = await SDK_Globals.tmSession?.NewDcmtPlatformEngine().UtilsSerializeQdAsync(qd) ?? '';
+    return xml;
+    // } catch (error) {
+    // console.error('Error serializing QueryDescriptor to XML:', error);
+    //TODO: gestire errore
+    // 	return '';
+    // }
+};

package/lib/components/features/workflow/diagram/xmlParser.d.ts

@@ -1,11 +1,10 @@
 import { WfDiagram } from './interfaces';
-import { CultureIDs, QueryDescriptor, Severities, WFAppTypes, WorkItemSetRules, WorkItemStatus } from '@topconsultnpm/sdk-ts-beta';
+import { CultureIDs, Severities, WFAppTypes, WorkItemSetRules, WorkItemStatus } from '@topconsultnpm/sdk-ts-beta';
 export declare const getCultureIDsNumber: (cultureID: CultureIDs | undefined) => number;
 export declare const getWorkItemStatusNumber: (status: WorkItemStatus | undefined) => number;
 export declare const getSeveritiesNumber: (severity: Severities | undefined) => number;
 export declare const getWorkItemSetRulesNumber: (setRule: WorkItemSetRules | undefined) => number;
 export declare const getWFAppTypesNumber: (appType: WFAppTypes | undefined) => number;
 export declare const mapCultureIDs: (cultureIDValue: number) => CultureIDs;
-export declare const serializeQueryDescriptorXml: (qd: QueryDescriptor | undefined) => Promise<string>;
 export declare const parseWfDiagramXml: (xmlString: string) => WfDiagram;
 export declare const serializeWfDiagramToXml: (wfDiagram: WfDiagram | null) => Promise<string>;

package/lib/components/features/workflow/diagram/xmlParser.js

@@ -1,7 +1,7 @@
-import { ArrowSymbol } from './interfaces';
-import { CultureIDs, SDK_Globals, Severities, WFAppTypes, WorkItemSetRules, WorkItemStatus } from '@topconsultnpm/sdk-ts-beta';
-import { parseQueryDescriptorXml } from './queryDescriptorParser'; // Import the new parser
-import { parseMetadataValuesXml } from './metadataParser';
+import { ArrowSymbol, DiagramItemTypes } from './interfaces';
+import { CultureIDs, Severities, WFAppTypes, WorkItemSetRules, WorkItemStatus } from '@topconsultnpm/sdk-ts-beta';
+import { parseQueryDescriptorXml, serializeQueryDescriptorXml } from './queryDescriptorParser'; // Import the new parser
+import { parseMetadataValuesXml, serializeMetadataValuesToXml } from './metadataParser';
 // Funzione helper per escapare i caratteri XML speciali (necessaria per i campi stringa)
 const escapeXml = (unsafe) => {
     if (unsafe === undefined || unsafe === null)
@@ -13,7 +13,7 @@ const escapeXml = (unsafe) => {
             case '>': return '>';
             case '&': return '&';
             case "'": return ''';
-            case '"': return '"';
+            // case '"': return '"';
             default: return c;
         }
     });
@@ -105,7 +105,8 @@ export const mapCultureIDs = (cultureIDValue) => {
             return CultureIDs.Es_ES;
         case 6:
             return CultureIDs.De_DE;
-        case 0: // 0 è None
+        case 0:
+            return CultureIDs.None;
         default:
             console.warn(`Valore CultureID sconosciuto: ${cultureIDValue}. Ritorno CultureIDs.None.`);
             return CultureIDs.None;
@@ -173,26 +174,6 @@ const mapWFAppTypes = (appTypeValue) => {
             return WFAppTypes.None;
     }
 };
-export const serializeQueryDescriptorXml = async (qd) => {
-    // try {
-    if (!qd)
-        return '';
-    let xml = await SDK_Globals.tmSession?.NewDcmtPlatformEngine().UtilsSerializeQdAsync(qd) ?? '';
-    return xml;
-    // } catch (error) {
-    // console.error('Error serializing QueryDescriptor to XML:', error);
-    //TODO: gestire errore
-    // 	return '';
-    // }
-};
-// Placeholder per la serializzazione di MetadataValues in XML (DA MODIFICARE CON LA LOGICA REALE)
-const serializeMetadataValuesXml = (values) => {
-    if (!values || values.length === 0)
-        return '';
-    // Logica di serializzazione reale qui, ad esempio per ogni elemento in values:
-    // return values.map(v => `<Value Name="${v.Name}">${v.Value}</Value>`).join('');
-    return '[METADATA_VALUES_XML_PLACEHOLDER]';
-};
 export const parseWfDiagramXml = (xmlString) => {
     const parser = new DOMParser();
     const xmlDoc = parser.parseFromString(xmlString, "application/xml");
@@ -222,11 +203,6 @@ export const parseWfDiagramXml = (xmlString) => {
             MStatusDLID: parseInt(workflowXML.querySelector("WFMStatusDLID")?.textContent || "0", 10),
             Type: 0,
         };
-        // wfDiagram.Info.ID = workflowXML.querySelector("WFID")?.textContent || "";
-        // wfDiagram.Info.MTID = parseInt(workflowXML.querySelector("WFMTID")?.textContent || "0", 10);
-        // wfDiagram.Info.MStatusMID = parseInt(workflowXML.querySelector("WFMStatusMID")?.textContent || "0", 10);
-        // wfDiagram.Info.MStatusDLID = parseInt(workflowXML.querySelector("WFMStatusDLID")?.textContent || "0", 10);
-        // Potrebbe esserci un campo <Type> anche qui, se presente
     }
     // Parsing DiagramItems
     const diagramItemsXML = rootElement.querySelectorAll("DiagramItems > DiagramItem");
@@ -244,6 +220,12 @@ export const parseWfDiagramXml = (xmlString) => {
             // Parse the QD XML string into a QueryDescriptor object
             parsedQD = parseQueryDescriptorXml(qdXmlString);
         }
+        const qd2XmlString = itemXML.querySelector("QD2")?.textContent || undefined;
+        let parsedQD2 = undefined;
+        if (qd2XmlString) {
+            // Parse the QD XML string into a QueryDescriptor object
+            parsedQD2 = parseQueryDescriptorXml(qd2XmlString);
+        }
         const metadataValuesXmlString = itemXML.querySelector("MetadataValues")?.textContent || undefined;
         let parsedMetadataValues = undefined;
         if (metadataValuesXmlString) {
@@ -295,7 +277,7 @@ export const parseWfDiagramXml = (xmlString) => {
             RegAsWfInstPart: parseInt(itemXML.querySelector("RegAsWfInstPart")?.textContent || "0", 10),
             FormatCultureID: mapCultureIDs(parseInt(itemXML.querySelector("FormatCultureID")?.textContent || "0", 10)),
             Tos2: itemXML.querySelector("Tos2")?.textContent || undefined,
-            QD2: itemXML.querySelector("QD2")?.textContent || undefined,
+            QD2: parsedQD2,
             PlatformObjName: itemXML.querySelector("PlatformObjName")?.textContent || undefined,
             PlatformObjDescr: itemXML.querySelector("PlatformObjDescr")?.textContent || undefined,
             Value1asInt: parseInt(itemXML.querySelector("Value1asInt")?.textContent || "0", 10),
@@ -425,10 +407,11 @@ export const serializeWfDiagramToXml = async (wfDiagram) => {
         if (item.SOD)
             xml += `      <SOD>${escapeXml(item.SOD)}</SOD>\n`;
         // MetadataValues
-        // if (item.MetadataValues && item.MetadataValues.length > 0) {
-        // 	const mvXmlContent = serializeMetadataValuesXml(item.MetadataValues);
-        // 	xml += `      <MetadataValues><![CDATA[${mvXmlContent}]]></MetadataValues>\n`;
-        // }
+        if (item.Type === DiagramItemTypes.UpdateDcmt && item.MetadataValues && item.MetadataValues.length > 0) {
+            const mvXmlContent = serializeMetadataValuesToXml(item.MetadataValues);
+            let mvEscaped = escapeXml(mvXmlContent);
+            xml += `      <MetadataValues>${mvEscaped}</MetadataValues>\n`;
+        }
         if (item.Severity !== undefined)
             xml += `      <Severity>${getSeveritiesNumber(item.Severity)}</Severity>\n`;
         if (item.RegAsWfInstPart !== undefined)
@@ -437,8 +420,11 @@ export const serializeWfDiagramToXml = async (wfDiagram) => {
             xml += `      <FormatCultureID>${getCultureIDsNumber(item.FormatCultureID)}</FormatCultureID>\n`;
         if (item.Tos2)
             xml += `      <Tos2>${escapeXml(item.Tos2)}</Tos2>\n`;
-        if (item.QD2)
-            xml += `      <QD2>${escapeXml(item.QD2)}</QD2>\n`;
+        if (item.QD2) {
+            let qdXmlContent = await serializeQueryDescriptorXml(item.QD2);
+            let qdEscaped = escapeXml(qdXmlContent);
+            xml += `      <QD2>${qdEscaped}</QD2>\n`;
+        }
         if (item.PlatformObjName)
             xml += `      <PlatformObjName>${escapeXml(item.PlatformObjName)}</PlatformObjName>\n`;
         if (item.PlatformObjDescr)

package/package.json

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