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

Minor play button fixes for worker + backend

Browse Source
This commit is contained in:
Frikky
2023-12-07 21:54:52 +01:00
parent 02713941f0
commit bb37e3e55d
5 changed files with 235 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/ShuffleCodeEditor.jsx
+23 -8
View File
@@ -1597,14 +1597,29 @@ const CodeEditor = (props) => {
Expected Output
</span>
<IconButton disabled={executing} color="secondary" style={{border: `1px solid ${theme.palette.primary.main}`, marginLeft: 250, padding: 8}} variant="contained" onClick={() => {
executeSingleAction(expOutput)
}}>
<Tooltip title="Try it! This runs the Shuffle Tools 'repeat back to me' or 'execute python' action with what you see in the expected output window. Commonly used to test your Python scripts or Liquid filters, not requiring the full workflow to run again." placement="top">
{executing ? <CircularProgress style={{height: 18, width: 18, }} /> : <PlayArrowIcon style={{height: 18, width: 18, }} /> }
</Tooltip>
</IconButton>
<Tooltip title="Try it! This runs the Shuffle Tools 'repeat back to me' or 'execute python' action with what you see in the expected output window. Commonly used to test your Python scripts or Liquid filters, not requiring the full workflow to run again." placement="top">
<Button
variant="outlined"
disabled={executing}
color="primary"
style={{
border: `1px solid ${theme.palette.primary.main}`,
marginLeft: 200,
maxHeight: 35,
minWidth: 70,
}}
variant="contained"
onClick={() => {
executeSingleAction(expOutput)
}}
>
{executing ?
<CircularProgress style={{height: 18, width: 18, }} />
:
<span>Try it <PlayArrowIcon style={{height: 18, width: 18, marginBottom: -4, marginLeft: 5, }} /> </span>
}
</Button>
</Tooltip>
</DialogTitle>
}
frontend/src/views/AngularWorkflow.jsx
+27 -54
View File
@@ -11151,15 +11151,7 @@ const AngularWorkflow = (defaultprops) => {
style={{ marginTop: 10 }}
label={<div style={{ color: "white" }}>Wait for results</div>}
/>
<Divider
style={{
marginTop: "20px",
height: "1px",
width: "100%",
backgroundColor: "rgb(91, 96, 100)",
}}
/>
<div style={{ flex: "6", marginTop: "20px" }}>
<div style={{ flex: "6", marginTop: 10, }}>
<div>
<div style={{ display: "flex" }}>
<div
@@ -12543,7 +12535,7 @@ const AngularWorkflow = (defaultprops) => {
// email,sms,app ...
workflow.triggers[selectedTriggerIndex].parameters[2] = {
name: "type",
value: "email",
value: "subflow",
};
workflow.triggers[selectedTriggerIndex].parameters[3] = {
@@ -12624,16 +12616,7 @@ const AngularWorkflow = (defaultprops) => {
/>
</div>
*/}
<Divider
style={{
marginTop: "20px",
height: "1px",
width: "100%",
backgroundColor: "rgb(91, 96, 100)",
}}
/>
<div style={{ flex: "6", marginTop: "20px" }}>
<b>Parameters</b>
<div style={{ flex: "6", marginTop: 10, }}>
<div
style={{
marginTop: "20px",
@@ -12641,17 +12624,11 @@ const AngularWorkflow = (defaultprops) => {
display: "flex",
}}
>
<div
style={{
width: "17px",
height: "17px",
borderRadius: 17 / 2,
backgroundColor: "#f85a3e",
marginRight: "10px",
}}
/>
<div style={{ flex: "10" }}>
<b>Information</b>
<Typography variant="body2" color="textSecondary">
The information you want to show the user. Supports variables.
</Typography>
</div>
</div>
<TextField
@@ -12682,17 +12659,11 @@ const AngularWorkflow = (defaultprops) => {
display: "flex",
}}
>
<div
style={{
width: "17px",
height: "17px",
borderRadius: 17 / 2,
backgroundColor: "#f85a3e",
marginRight: "10px",
}}
/>
<div style={{ flex: "10" }}>
<b>Contact options</b>
<b>Input options</b>
<Typography variant="body2" color="textSecondary">
Use subflows to connect to any app you want, or use the default email and sms options
</Typography>
</div>
</div>
<FormGroup
@@ -12702,6 +12673,20 @@ const AngularWorkflow = (defaultprops) => {
<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"
/>
}
label={<div style={{ color: "white" }}>Subflow</div>}
/>
<FormControlLabel
control={
<Checkbox
disabled={!isCloud}
checked={
workflow.triggers[selectedTriggerIndex].parameters[2] !== undefined && workflow.triggers[selectedTriggerIndex].parameters[2].value.includes("email")
}
@@ -12717,6 +12702,7 @@ const AngularWorkflow = (defaultprops) => {
<FormControlLabel
control={
<Checkbox
disabled={!isCloud}
checked={workflow.triggers !== undefined && workflow.triggers !== null && workflow.triggers[selectedTriggerIndex].parameters !== undefined && workflow.triggers[selectedTriggerIndex].parameters.length > 0 && workflow.triggers[selectedTriggerIndex].parameters[2] !== undefined && workflow.triggers[selectedTriggerIndex].parameters[2].value !== undefined ? workflow.triggers[selectedTriggerIndex].parameters[2].value.includes("sms") : false}
onChange={() => {
setTriggerOptionsWrapper("sms");
@@ -12728,21 +12714,8 @@ const AngularWorkflow = (defaultprops) => {
}
label={<div style={{ color: "white" }}>SMS</div>}
/>
<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"
/>
}
label={<div style={{ color: "white" }}>Subflow</div>}
/>
</FormGroup>
{workflow.triggers[selectedTriggerIndex].parameters[2] !== undefined && workflow.triggers[selectedTriggerIndex].parameters[2].value.includes("subflow") ? (
{workflow.triggers[selectedTriggerIndex].parameters[2] !== undefined && workflow.triggers[selectedTriggerIndex].parameters[2].value.includes("subflow") ? (
<div style={{ }}>
{workflows === undefined ||
workflows === null ||
@@ -12848,7 +12821,7 @@ const AngularWorkflow = (defaultprops) => {
},
}}
fullWidth
label="Email"
label="Email"
color="primary"
required
placeholder={"mail1@company.com,mail2@company.com"}