Skip to content

Commit

Permalink
Merge pull request #373 from vmware/bugfix/324-canvas-item-error-hand…
Browse files Browse the repository at this point in the history 
…ling-xml-error

[vrotsc,vrotsc-annotations] (#324) Canvas Error Handling Feature XML Tag Fix
  • Loading branch information
@akantchev
akantchev authored Aug 2, 2024
2 parents 8e4dc69 + 8af1d1d commit 843f311
Show file tree
Hide file tree
Showing 33 changed files with 66 additions and 66 deletions.
2 changes: 1 addition & 1 deletion typescript/vrotsc/e2e/expect/all-content/workflows/MyOrg/MyProject/Test Workflow 1.xml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="3fd94148-9381-3524-8543-8db55ad749b7" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Test Workflow 1]]></display-name><position x="50" y="100" /><input><param name="foo" type="string" /><param name="bar" type="string" /></input><workflow-item name="item0" type="end" end-mode="0"><position x="200" y="100" /></workflow-item><workflow-item name="item1" out-name="item0" type="task"><script encoded="false"><![CDATA[System.log("foo=".concat(foo, ", bar=").concat(bar));
<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="3fd94148-9381-3524-8543-8db55ad749b7" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Test Workflow 1]]></display-name><position x="50" y="100" /><input><param name="foo" type="string" /><param name="bar" type="string" /></input><workflow-item name="item0" type="end" end-mode="0"><position x="200" y="100" /></workflow-item><workflow-item name="item1" out-name="item0" type="task" ><script encoded="false"><![CDATA[System.log("foo=".concat(foo, ", bar=").concat(bar));
]]></script><display-name><![CDATA[test1]]></display-name><in-binding><bind name="foo" type="string" export-name="foo" /><bind name="bar" type="string" export-name="bar" /></in-binding><position x="100" y="100" /></workflow-item><presentation><p-param name="foo"><desc><![CDATA[foo]]></desc><p-qual kind="static" name="mandatory" type="boolean"><![CDATA[true]]></p-qual></p-param><p-param name="bar"><desc><![CDATA[bar]]></desc><p-qual kind="static" name="mandatory" type="boolean"><![CDATA[true]]></p-qual></p-param></presentation></workflow>
2 changes: 1 addition & 1 deletion typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Action Happy Path.xml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="9d4c6c70-66a1-3969-9e79-513d73819e55" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Action Happy Path]]></display-name><position x="50" y="100" /><attrib name="first" type="number" read-only="false" /><attrib name="second" type="number" read-only="false" /><attrib name="actionResult" type="ActionResult" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="100" /></workflow-item><workflow-item name="item1" out-name="item2" type="task" script-module="com.vmware.pscoe.onboarding.sgenov.actions/test"><script encoded="false"><![CDATA[actionResult = System.getModule("com.vmware.pscoe.onboarding.sgenov.actions").test(first, second);
]]></script><display-name><![CDATA[callTestAction]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></in-binding><out-binding><bind name="actionResult" type="ActionResult" export-name="actionResult" /></out-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item0" type="task"><script encoded="false"><![CDATA[System.log("Action result: ".concat(actionResult.getResult()));
]]></script><display-name><![CDATA[callTestAction]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></in-binding><out-binding><bind name="actionResult" type="ActionResult" export-name="actionResult" /></out-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item0" type="task" ><script encoded="false"><![CDATA[System.log("Action result: ".concat(actionResult.getResult()));
]]></script><display-name><![CDATA[printActionResult]]></display-name><in-binding><bind name="actionResult" type="ActionResult" export-name="actionResult" /></in-binding><position x="200" y="100" /></workflow-item><presentation><p-param name="first"><desc><![CDATA[first]]></desc></p-param><p-param name="second"><desc><![CDATA[second]]></desc></p-param></presentation></workflow>
8 changes: 4 additions & 4 deletions typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Async Workflow Test.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item4" object-name="workflow:name=generic" id="4b483071-6bbc-34e5-a554-f0476933f6ed" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Async Workflow Test]]></display-name><description><![CDATA[Calling another workflow asynchronously and binding values correctly]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><attrib name="first" type="number" read-only="false" /><attrib name="second" type="number" read-only="false" /><attrib name="wfToken" type="WorkflowToken" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="500" y="100" /></workflow-item><workflow-item name="item1" out-name="item3" type="task" launched-workflow-id="9e4503db-cbaa-435a-9fad-144409c08df0"><script encoded="false"><![CDATA[var workflowParameters = new Properties(), workflowToLaunch = Server.getWorkflowWithId("9e4503db-cbaa-435a-9fad-144409c08df0");
<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item4" object-name="workflow:name=generic" id="4b483071-6bbc-34e5-a554-f0476933f6ed" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Async Workflow Test]]></display-name><description><![CDATA[Calling another workflow asynchronously and binding values correctly]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><attrib name="first" type="number" read-only="false" /><attrib name="second" type="number" read-only="false" /><attrib name="wfToken" type="WorkflowToken" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="500" y="100" /></workflow-item><workflow-item name="item1" out-name="item3" type="task" launched-workflow-id="9e4503db-cbaa-435a-9fad-144409c08df0" ><script encoded="false"><![CDATA[var workflowParameters = new Properties(), workflowToLaunch = Server.getWorkflowWithId("9e4503db-cbaa-435a-9fad-144409c08df0");
if (workflowToLaunch == null) {
throw "Workflow not found";
}
workflowParameters.put("first", first);
workflowParameters.put("second", second);
wfToken = workflowToLaunch.execute(workflowParameters);
]]></script><display-name><![CDATA[asyncCall]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></in-binding><out-binding><bind name="wfToken" type="WorkflowToken" export-name="wfToken" /></out-binding><position x="300" y="100" /></workflow-item><workflow-item name="item2" out-name="item1" type="task"><script encoded="false"><![CDATA[first = 1;
]]></script><display-name><![CDATA[asyncCall]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></in-binding><out-binding><bind name="wfToken" type="WorkflowToken" export-name="wfToken" /></out-binding><position x="300" y="100" /></workflow-item><workflow-item name="item2" out-name="item1" type="task" ><script encoded="false"><![CDATA[first = 1;
second = 2;
]]></script><display-name><![CDATA[prepareItems]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></in-binding><out-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></out-binding><position x="200" y="100" /></workflow-item><workflow-item name="item3" out-name="item0" type="task"><script encoded="false"><![CDATA[System.log("Workflow token: ".concat(wfToken.id, " and state: ").concat(wfToken.state));
]]></script><display-name><![CDATA[prepareItems]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></in-binding><out-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></out-binding><position x="200" y="100" /></workflow-item><workflow-item name="item3" out-name="item0" type="task" ><script encoded="false"><![CDATA[System.log("Workflow token: ".concat(wfToken.id, " and state: ").concat(wfToken.state));
System.log("Workflow finished");
]]></script><display-name><![CDATA[printAsync]]></display-name><in-binding><bind name="wfToken" type="WorkflowToken" export-name="wfToken" /></in-binding><position x="400" y="100" /></workflow-item><workflow-item name="item4" out-name="item2" type="task"><script encoded="false"><![CDATA[System.log("Starting workflow");
]]></script><display-name><![CDATA[printAsync]]></display-name><in-binding><bind name="wfToken" type="WorkflowToken" export-name="wfToken" /></in-binding><position x="400" y="100" /></workflow-item><workflow-item name="item4" out-name="item2" type="task" ><script encoded="false"><![CDATA[System.log("Starting workflow");
]]></script><display-name><![CDATA[start]]></display-name><position x="100" y="100" /></workflow-item><presentation></presentation></workflow>
6 changes: 3 additions & 3 deletions typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Complex.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item3" object-name="workflow:name=generic" id="16083aae-bae5-38d8-a11e-a21445c7b9e9" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Complex]]></display-name><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="400" y="150" /></workflow-item><workflow-item name="item1" out-name="item4" type="custom-condition" alt-out-name="item0"><script encoded="false"><![CDATA[return waitingTimer !== null;]]></script><display-name><![CDATA[decisionElement]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /></in-binding><position x="300" y="100" /></workflow-item><workflow-item name="item2" out-name="item1" type="task"><script encoded="false"><![CDATA[if (!counter) {
<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item3" object-name="workflow:name=generic" id="16083aae-bae5-38d8-a11e-a21445c7b9e9" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Complex]]></display-name><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="400" y="150" /></workflow-item><workflow-item name="item1" out-name="item4" type="custom-condition" alt-out-name="item0" ><script encoded="false"><![CDATA[return waitingTimer !== null;]]></script><display-name><![CDATA[decisionElement]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /></in-binding><position x="300" y="100" /></workflow-item><workflow-item name="item2" out-name="item1" type="task" ><script encoded="false"><![CDATA[if (!counter) {
counter = 0;
}
counter++;
Expand All @@ -11,5 +11,5 @@ else {
}
System.log("Counter: " + counter);
System.log("Waiting Timer: " + waitingTimer);
]]></script><display-name><![CDATA[execute]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /><bind name="counter" type="number" export-name="counter" /></in-binding><out-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /><bind name="counter" type="number" export-name="counter" /></out-binding><position x="200" y="100" /></workflow-item><workflow-item name="item3" out-name="item2" type="task"><script encoded="false"><![CDATA[System.log("Starting workflow");
]]></script><display-name><![CDATA[start]]></display-name><position x="100" y="100" /></workflow-item><workflow-item name="item4" out-name="item2" type="waiting-timer"><display-name><![CDATA[waitForEvent]]></display-name><in-binding><bind name="timer.date" type="Date" export-name="waitingTimer" /></in-binding><position x="400" y="50" /></workflow-item><presentation></presentation></workflow>
]]></script><display-name><![CDATA[execute]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /><bind name="counter" type="number" export-name="counter" /></in-binding><out-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /><bind name="counter" type="number" export-name="counter" /></out-binding><position x="200" y="100" /></workflow-item><workflow-item name="item3" out-name="item2" type="task" ><script encoded="false"><![CDATA[System.log("Starting workflow");
]]></script><display-name><![CDATA[start]]></display-name><position x="100" y="100" /></workflow-item><workflow-item name="item4" out-name="item2" type="waiting-timer" ><display-name><![CDATA[waitForEvent]]></display-name><in-binding><bind name="timer.date" type="Date" export-name="waitingTimer" /></in-binding><position x="400" y="50" /></workflow-item><presentation></presentation></workflow>
2 changes: 1 addition & 1 deletion typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Decision Edge 2.xml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="065a9b48-3ed1-387b-8b04-cb881f069b7a" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Decision Edge 2]]></display-name><description><![CDATA[decisionElement is the root, it will point with target and else to shouldGoHere. shouldGoHere points to end]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="50" /></workflow-item><workflow-item name="item1" out-name="item2" type="custom-condition" alt-out-name="item2"><script encoded="false"><![CDATA[return waitingTimer !== null;]]></script><display-name><![CDATA[decisionElement]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /></in-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item0" type="task"><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[shouldGoHere]]></display-name><position x="200" y="50" /></workflow-item><presentation><p-param name="waitingTimer"><desc><![CDATA[waitingTimer]]></desc></p-param></presentation></workflow>
<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="065a9b48-3ed1-387b-8b04-cb881f069b7a" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Decision Edge 2]]></display-name><description><![CDATA[decisionElement is the root, it will point with target and else to shouldGoHere. shouldGoHere points to end]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="50" /></workflow-item><workflow-item name="item1" out-name="item2" type="custom-condition" alt-out-name="item2" ><script encoded="false"><![CDATA[return waitingTimer !== null;]]></script><display-name><![CDATA[decisionElement]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /></in-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item0" type="task" ><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[shouldGoHere]]></display-name><position x="200" y="50" /></workflow-item><presentation><p-param name="waitingTimer"><desc><![CDATA[waitingTimer]]></desc></p-param></presentation></workflow>
Loading

0 comments on commit 843f311

Please sign in to comment.