@topconsultnpm/sdkui-react-beta 6.16.64 → 6.16.65

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

@@ -589,7 +589,7 @@ const WFDiagram = ({ xmlDiagramString, currentSetID, readOnly = false, zoomLevel
             return;
         }
     }, [wfDiagram, selectedItems, selectedConnections, handleUndo, handleRedo, handleDelete, updateDiagram, handleCopy, handleCut, handlePaste, readOnly]);
-    const handleExportDiagram = useCallback(() => {
+    const handleExportDiagram = useCallback(async () => {
         if (!wfDiagram) {
             // Visualizza un errore se il diagramma non è stato caricato o è vuoto
             TMExceptionBoxManager.show({ exception: new Error('Diagram not loaded.') });
@@ -597,7 +597,7 @@ const WFDiagram = ({ xmlDiagramString, currentSetID, readOnly = false, zoomLevel
         }
         try {
             // 1. Serializza il diagramma in XML
-            const xmlString = serializeWfDiagramToXml(wfDiagram);
+            const xmlString = await serializeWfDiagramToXml(wfDiagram);
             // 2. Determina il nome del file (usa l'ID o un UUID se non disponibile)
             const filename = `WorkflowDiagram_${wfDiagram.Info?.ID || generateUUID()}.xml`;
             // 3. Avvia il download (la cartella è scelta dal browser)

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

@@ -8,4 +8,4 @@ export declare const getWFAppTypesNumber: (appType: WFAppTypes | undefined) => n
 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) => string;
+export declare const serializeWfDiagramToXml: (wfDiagram: WfDiagram | null) => Promise<string>;

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

@@ -174,12 +174,16 @@ const mapWFAppTypes = (appTypeValue) => {
     }
 };
 export const serializeQueryDescriptorXml = async (qd) => {
-    console.log('serializeQueryDescriptorXml qd', qd);
+    // try {
     if (!qd)
         return '';
     let xml = await SDK_Globals.tmSession?.NewDcmtPlatformEngine().UtilsSerializeQdAsync(qd) ?? '';
-    console.log('serializeQueryDescriptorXml xml', xml);
     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) => {
@@ -192,7 +196,6 @@ const serializeMetadataValuesXml = (values) => {
 export const parseWfDiagramXml = (xmlString) => {
     const parser = new DOMParser();
     const xmlDoc = parser.parseFromString(xmlString, "application/xml");
-    console.log('xmlDoc', xmlDoc);
     const wfDiagram = {
         Info: {
             ID: "",
@@ -336,11 +339,10 @@ export const parseWfDiagramXml = (xmlString) => {
     return wfDiagram;
 };
 // Funzione di serializzazione (inclusa per completezza, se l'avevi)
-export const serializeWfDiagramToXml = (wfDiagram) => {
+export const serializeWfDiagramToXml = async (wfDiagram) => {
     if (!wfDiagram) {
         return '<?xml version="1.0" encoding="utf-8"?>\n<Root></Root>';
     }
-    console.log('qd', escapeXml('<QueryDescriptor xmlns="http://schemas.datacontract.org/2004/07/TopConsult.TM5.Server.WEBSDK.Contracts" xmlns:i="http://www.w3.org/2001/XMLSchema-instance"><Description i:nil="true"/><ID>0</ID><Name i:nil="true"/><Fetch>0</Fetch><From><TID>8601</TID></From><IsDistinct>false</IsDistinct><IsLexProt>0</IsLexProt><Join i:nil="true"/><MaxDcmtsToBeReturned>1000</MaxDcmtsToBeReturned><Offset>0</Offset><OrderBy i:nil="true"/><Params i:nil="true"/><Select><SelectItem><Alias i:nil="true"/><As i:nil="true"/><Function>None</Function><MID>8601001</MID><TID>8601</TID><Visibility>Visible</Visibility></SelectItem><SelectItem><Alias i:nil="true"/><As i:nil="true"/><Function>None</Function><MID>8601002</MID><TID>8601</TID><Visibility>Visible</Visibility></SelectItem><SelectItem><Alias i:nil="true"/><As i:nil="true"/><Function>None</Function><MID>8601006</MID><TID>8601</TID><Visibility>Visible</Visibility></SelectItem><SelectItem><Alias i:nil="true"/><As i:nil="true"/><Function>None</Function><MID>8601003</MID><TID>8601</TID><Visibility>Visible</Visibility></SelectItem><SelectItem><Alias i:nil="true"/><As i:nil="true"/><Function>None</Function><MID>8601004</MID><TID>8601</TID><Visibility>Visible</Visibility></SelectItem><SelectItem><Alias i:nil="true"/><As i:nil="true"/><Function>None</Function><MID>8601005</MID><TID>8601</TID><Visibility>Visible</Visibility></SelectItem></Select><Where><WhereItem><Alias i:nil="true"/><LeftBrackets>(</LeftBrackets><MID>8601006</MID><Operator>GreaterOrEqual</Operator><Or>false</Or><RightBrackets>)</RightBrackets><TID>8601</TID><Value1>100</Value1><Value2 i:nil="true"/></WhereItem></Where></QueryDescriptor>'));
     let xml = '<?xml version="1.0" encoding="utf-8"?>\n';
     xml += '<Root>\n';
     // 1. Serializzazione WfInfo
@@ -354,7 +356,8 @@ export const serializeWfDiagramToXml = (wfDiagram) => {
     }
     // 2. Serializzazione DiagramItems
     xml += '  <DiagramItems>\n';
-    wfDiagram.DiagramItems.forEach(async (item) => {
+    // Usa Promise.all con map invece di forEach
+    for (const item of wfDiagram.DiagramItems) {
         xml += '    <DiagramItem>\n';
         xml += `      <ID>${escapeXml(item.ID)}</ID>\n`;
         xml += `      <L>${item.Left}</L>\n`;
@@ -414,15 +417,18 @@ export const serializeWfDiagramToXml = (wfDiagram) => {
         if (item.EndWFInstance !== undefined)
             xml += `      <EndWFInstance>${item.EndWFInstance}</EndWFInstance>\n`;
         // QueryDescriptor (QD)
-        if (item.QD)
-            xml += `      <QD>${escapeXml(await serializeQueryDescriptorXml(item.QD))}</QD>\n`;
+        if (item.QD) {
+            let qdXmlContent = await serializeQueryDescriptorXml(item.QD);
+            let qdEscaped = escapeXml(qdXmlContent);
+            xml += `      <QD>${qdEscaped}</QD>\n`;
+        }
         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.MetadataValues && item.MetadataValues.length > 0) {
+        // 	const mvXmlContent = serializeMetadataValuesXml(item.MetadataValues);
+        // 	xml += `      <MetadataValues><![CDATA[${mvXmlContent}]]></MetadataValues>\n`;
+        // }
         if (item.Severity !== undefined)
             xml += `      <Severity>${getSeveritiesNumber(item.Severity)}</Severity>\n`;
         if (item.RegAsWfInstPart !== undefined)
@@ -454,7 +460,7 @@ export const serializeWfDiagramToXml = (wfDiagram) => {
         if (item.Trunc !== undefined)
             xml += `      <Trunc>${item.Trunc}</Trunc>\n`;
         xml += '    </DiagramItem>\n';
-    });
+    }
     xml += '  </DiagramItems>\n';
     // 3. Serializzazione Connections
     xml += '  <Connections>\n';

package/package.json

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