From 38248804173c1bd8e16025fba9c43905b5f5917b Mon Sep 17 00:00:00 2001 From: frikky Date: Wed, 7 Sep 2022 16:42:39 +0200 Subject: [PATCH] Readded matches regex and added new is empty conditions --- frontend/src/views/AngularWorkflow.jsx | 31 ++++++++++++++++++-------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx index 2c92e7b5..e608b668 100644 --- a/frontend/src/views/AngularWorkflow.jsx +++ b/frontend/src/views/AngularWorkflow.jsx @@ -1386,9 +1386,10 @@ const AngularWorkflow = (defaultprops) => { return; } - setVisited([]); - setExecutionRequest({}); - stop(); + setVisited([]) + setExecutionRequest({}) + stop() + }) var curelements = cy.elements(); for (var i = 0; i < curelements.length; i++) { @@ -1409,6 +1410,7 @@ const AngularWorkflow = (defaultprops) => { } ) .then((response) => { + setExecutionRequestStarted(false) if (response.status !== 200) { console.log("Status not 200 for WORKFLOW EXECUTION :O!"); } @@ -1460,9 +1462,9 @@ const AngularWorkflow = (defaultprops) => { }) .catch((error) => { //alert.error(error.toString()); + setExecutionRequestStarted(false) console.log("Execute workflow err: ", error.toString()); }); - }) }; // This can be used to only show prioritzed ones later @@ -5511,12 +5513,12 @@ const AngularWorkflow = (defaultprops) => { {triggers.map((trigger, index) => { var imageline = trigger.large_image.length === 0 ? ( - + ) : ( ); @@ -7231,7 +7233,7 @@ const AngularWorkflow = (defaultprops) => { > contains any of - {/* { conditionValue.value = "matches regex"; @@ -7241,7 +7243,7 @@ const AngularWorkflow = (defaultprops) => { key={"matches regex"} > matches regex - */} + { @@ -7264,6 +7266,17 @@ const AngularWorkflow = (defaultprops) => { > less than + { + conditionValue.value = "is empty"; + setConditionValue(conditionValue); + setVariableAnchorEl(null); + }} + key={"is empty"} + > + is empty +
@@ -11009,7 +11022,7 @@ const AngularWorkflow = (defaultprops) => {