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

Fixed options field bug in workflow

Browse Source
This commit is contained in:
frikky
2020-10-28 05:42:13 +01:00
parent ca798de0cd
commit dd4af346d3
1 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/AngularWorkflow.jsx
+32 -25
View File
@@ -2853,7 +2853,7 @@ const AngularWorkflow = (props) => {
))} ))}
</Select> </Select>
} else if (data.variant === "STATIC_VALUE") { } else if (data.variant === "STATIC_VALUE") {
staticcolor = "#f85a3e" staticcolor = "#f85a3e"
} else if (data.variant === "ACTION_RESULT") { } else if (data.variant === "ACTION_RESULT") {
// Gets the parents of the current node // Gets the parents of the current node
@@ -3137,6 +3137,8 @@ const AngularWorkflow = (props) => {
return ( return (
<div key={data.name}> <div key={data.name}>
<div style={{marginTop: 20, marginBottom: 7, display: "flex"}}> <div style={{marginTop: 20, marginBottom: 7, display: "flex"}}>
{data.configuration === true ? {data.configuration === true ?
<Tooltip color="primary" title={`Authenticate ${selectedApp.name}`} placement="top"> <Tooltip color="primary" title={`Authenticate ${selectedApp.name}`} placement="top">
<LockOpenIcon style={{cursor: "pointer", width: 24, height: 24, marginRight: 10, }} onClick={() => { <LockOpenIcon style={{cursor: "pointer", width: 24, height: 24, marginRight: 10, }} onClick={() => {
@@ -3149,32 +3151,37 @@ const AngularWorkflow = (props) => {
<div style={{flex: "10"}}> <div style={{flex: "10"}}>
<b>{data.name} </b> <b>{data.name} </b>
</div> </div>
<Tooltip color="primary" title="Static data" placement="top">
<div style={{cursor: "pointer", color: staticcolor}} onClick={(e) => { {selectedActionParameters[count].options !== undefined && selectedActionParameters[count].options !== null && selectedActionParameters[count].options.length > 0 ? null :
<div style={{display: "flex"}}>
<Tooltip color="primary" title="Static data" placement="top">
<div style={{cursor: "pointer", color: staticcolor}} onClick={(e) => {
e.preventDefault()
changeActionParameterVariant("STATIC_VALUE", count)
}}>
<CreateIcon />
</div>
</Tooltip>
&nbsp;|&nbsp;
<Tooltip color="primary" title="Data from previous action" placement="top">
<div style={{cursor: "pointer", color: actioncolor}} onClick={(e) => {
e.preventDefault() e.preventDefault()
changeActionParameterVariant("STATIC_VALUE", count) changeActionParameterVariant("ACTION_RESULT", count)
}}> }}>
<CreateIcon /> <AppsIcon />
</div> </div>
</Tooltip> </Tooltip>
&nbsp;|&nbsp; &nbsp;|&nbsp;
<Tooltip color="primary" title="Data from previous action" placement="top"> <Tooltip color="primary" title="Use local variable" placement="top">
<div style={{cursor: "pointer", color: actioncolor}} onClick={(e) => { <div style={{cursor: "pointer", color: varcolor}} onClick={(e) => {
e.preventDefault() e.preventDefault()
changeActionParameterVariant("ACTION_RESULT", count) changeActionParameterVariant("WORKFLOW_VARIABLE", count)
}}> }}>
<AppsIcon /> <FavoriteBorderIcon />
</div> </div>
</Tooltip> </Tooltip>
&nbsp;|&nbsp; </div>
<Tooltip color="primary" title="Use local variable" placement="top"> }
<div style={{cursor: "pointer", color: varcolor}} onClick={(e) => {
e.preventDefault()
changeActionParameterVariant("WORKFLOW_VARIABLE", count)
}}>
<FavoriteBorderIcon />
</div>
</Tooltip>
</div> </div>
{datafield} {datafield}
{showDropdown && showDropdownNumber === count && data.variant === "STATIC_VALUE" && jsonList.length > 0 ? {showDropdown && showDropdownNumber === count && data.variant === "STATIC_VALUE" && jsonList.length > 0 ?