marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#444: Fixed basic pieces for user input trigger to run open source standalone

Browse Source
This commit is contained in:
frikky
2021-12-11 02:43:31 +01:00
parent 5532296f74
commit 001e1df08e
8 changed files with 271 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/AngularWorkflow.jsx
+61 -2
View File
@@ -8705,6 +8705,11 @@ const AngularWorkflow = (props) => {
name: "sms",
value: "0000000",
};
workflow.triggers[selectedTriggerIndex].parameters[5] = {
name: "subflow",
value: "",
};
setWorkflow(workflow);
}
@@ -8807,7 +8812,7 @@ const AngularWorkflow = (props) => {
}}
/>
<div style={{ flex: "10" }}>
<b>Information: </b>
<b>Information</b>
</div>
</div>
<TextField
@@ -8853,13 +8858,33 @@ const AngularWorkflow = (props) => {
}}
/>
<div style={{ flex: "10" }}>
<b>Contact options: </b>
<b>Contact options</b>
</div>
</div>
<FormGroup
style={{ paddingLeft: 10, backgroundColor: inputColor }}
row
>
<FormControlLabel
control={
<Checkbox
checked={
workflow.triggers[selectedTriggerIndex].parameters[2] !==
undefined &&
workflow.triggers[
selectedTriggerIndex
].parameters[2].value.includes("subflow")
}
onChange={() => {
setTriggerOptionsWrapper("subflow");
}}
color="primary"
value="subflow"
disabled
/>
}
label={<div style={{ color: "white" }}>Subflow</div>}
/>
<FormControlLabel
control={
<Checkbox
@@ -8916,6 +8941,7 @@ const AngularWorkflow = (props) => {
}}
fullWidth
color="primary"
required
placeholder={"mail1@company.com,mail2@company.com"}
defaultValue={
workflow.triggers[selectedTriggerIndex].parameters[3].value
@@ -8960,6 +8986,39 @@ const AngularWorkflow = (props) => {
setUpdate(Math.random());
}}
/>
) : null}
{workflow.triggers[selectedTriggerIndex].parameters[2] !==
undefined &&
workflow.triggers[
selectedTriggerIndex
].parameters[2].value.includes("subflow") ? (
<TextField
style={{
backgroundColor: inputColor,
borderRadius: theme.palette.borderRadius,
}}
InputProps={{
style: {
color: "white",
marginLeft: "5px",
maxWidth: "95%",
height: 50,
fontSize: "1em",
},
}}
fullWidth
color="primary"
placeholder={"ID of another workflow"}
defaultValue={
workflow.triggers[selectedTriggerIndex].parameters[5].value
}
onBlur={(event) => {
workflow.triggers[selectedTriggerIndex].parameters[5].value =
event.target.value;
setWorkflow(workflow);
setUpdate(Math.random());
}}
/>
) : null}
</div>
</div>
frontend/src/views/Workflows.jsx
+3 -3
View File
@@ -400,7 +400,7 @@ export const validateJson = (showResult) => {
try {
result = jsonvalid ? JSON.parse(showResult) : showResult;
} catch (e) {
//console.log("Failed parsing JSON even though its valid: ", e)
////console.log("Failed parsing JSON even though its valid: ", e)
jsonvalid = false;
}
@@ -413,12 +413,12 @@ export const validateJson = (showResult) => {
try {
var newstr = showResult.replaceAll("'", '"')
console.log("Try replacements and trimming with new value: ", newstr)
//console.log("Try replacements and trimming with new value: ", newstr)
result = JSON.parse(newstr)
jsonvalid = true
} catch (e) {
console.log("Failed parsing JSON even though its valid (2): ", e)
//console.log("Failed parsing JSON even though its valid (2): ", e)
jsonvalid = false
}
}