Readded matches regex and added new is empty conditions
This commit is contained in:
@@ -1386,9 +1386,10 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
setVisited([]);
|
setVisited([])
|
||||||
setExecutionRequest({});
|
setExecutionRequest({})
|
||||||
stop();
|
stop()
|
||||||
|
})
|
||||||
|
|
||||||
var curelements = cy.elements();
|
var curelements = cy.elements();
|
||||||
for (var i = 0; i < curelements.length; i++) {
|
for (var i = 0; i < curelements.length; i++) {
|
||||||
@@ -1409,6 +1410,7 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
|
setExecutionRequestStarted(false)
|
||||||
if (response.status !== 200) {
|
if (response.status !== 200) {
|
||||||
console.log("Status not 200 for WORKFLOW EXECUTION :O!");
|
console.log("Status not 200 for WORKFLOW EXECUTION :O!");
|
||||||
}
|
}
|
||||||
@@ -1460,9 +1462,9 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
//alert.error(error.toString());
|
//alert.error(error.toString());
|
||||||
|
setExecutionRequestStarted(false)
|
||||||
console.log("Execute workflow err: ", error.toString());
|
console.log("Execute workflow err: ", error.toString());
|
||||||
});
|
});
|
||||||
})
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// This can be used to only show prioritzed ones later
|
// This can be used to only show prioritzed ones later
|
||||||
@@ -5511,12 +5513,12 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
{triggers.map((trigger, index) => {
|
{triggers.map((trigger, index) => {
|
||||||
var imageline =
|
var imageline =
|
||||||
trigger.large_image.length === 0 ? (
|
trigger.large_image.length === 0 ? (
|
||||||
<img alt="" style={{ width: isMobile ? 40 : 80, pointerEvents: "none" }} />
|
<img alt="" style={{ borderRadius: theme.palette.borderRadius, width: isMobile ? 40 : 80, pointerEvents: "none" }} />
|
||||||
) : (
|
) : (
|
||||||
<img
|
<img
|
||||||
alt=""
|
alt=""
|
||||||
src={trigger.large_image}
|
src={trigger.large_image}
|
||||||
style={{ width: isMobile ? 40 : 80, height: isMobile ? 40 : 80, pointerEvents: "none" }}
|
style={{ borderRadius: theme.palette.borderRadius, width: isMobile ? 40 : 80, height: isMobile ? 40 : 80, pointerEvents: "none" }}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -7231,7 +7233,7 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
>
|
>
|
||||||
contains any of
|
contains any of
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
{/*<MenuItem
|
<MenuItem
|
||||||
style={menuItemStyle}
|
style={menuItemStyle}
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
conditionValue.value = "matches regex";
|
conditionValue.value = "matches regex";
|
||||||
@@ -7241,7 +7243,7 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
key={"matches regex"}
|
key={"matches regex"}
|
||||||
>
|
>
|
||||||
matches regex
|
matches regex
|
||||||
</MenuItem>*/}
|
</MenuItem>
|
||||||
<MenuItem
|
<MenuItem
|
||||||
style={menuItemStyle}
|
style={menuItemStyle}
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
@@ -7264,6 +7266,17 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
>
|
>
|
||||||
less than
|
less than
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
|
<MenuItem
|
||||||
|
style={menuItemStyle}
|
||||||
|
onClick={(e) => {
|
||||||
|
conditionValue.value = "is empty";
|
||||||
|
setConditionValue(conditionValue);
|
||||||
|
setVariableAnchorEl(null);
|
||||||
|
}}
|
||||||
|
key={"is empty"}
|
||||||
|
>
|
||||||
|
is empty
|
||||||
|
</MenuItem>
|
||||||
</Menu>
|
</Menu>
|
||||||
</div>
|
</div>
|
||||||
<div style={{ flex: "2" }}>
|
<div style={{ flex: "2" }}>
|
||||||
@@ -11009,7 +11022,7 @@ const AngularWorkflow = (defaultprops) => {
|
|||||||
<span>
|
<span>
|
||||||
<Button
|
<Button
|
||||||
disabled={
|
disabled={
|
||||||
workflow.public || executionRequestStarted || !workflow.isValid
|
workflow.public || executionRequestStarted
|
||||||
}
|
}
|
||||||
style={{ height: boxSize, width: boxSize }}
|
style={{ height: boxSize, width: boxSize }}
|
||||||
color="primary"
|
color="primary"
|
||||||
|
|||||||
Reference in New Issue
Block a user