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

Started fixing background issues for condition and documentation modals

Browse Source
This commit is contained in:
frikky
2021-12-16 04:18:51 +01:00
parent 3f033bf732
commit 69541676cf
2 changed files with 90 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/ParsedAction.jsx
+20 -10
View File
@@ -979,9 +979,9 @@ const ParsedAction = (props) => {
return helperText return helperText
} }
console.log("D: ", selectedAction) //console.log("D: ", selectedAction)
console.log("DESC: ", selectedAction.description) //console.log("DESC: ", selectedAction.description)
console.log("DESC2: ", selectedApp.description) //console.log("DESC2: ", selectedApp.description)
// FIXME: Issue #40 - selectedActionParameters not reset // FIXME: Issue #40 - selectedActionParameters not reset
if ( if (
@@ -993,13 +993,14 @@ const ParsedAction = (props) => {
<div style={{ marginTop: hideExtraTypes ? 10 : 30 }}> <div style={{ marginTop: hideExtraTypes ? 10 : 30 }}>
<Tooltip <Tooltip
color="secondary" color="secondary"
title={"Click to learn more"} title={"Click to learn more about this action"}
placement="top" placement="top"
> >
<Button <Button
variant="text" variant="text"
color="secondary" color="secondary"
style={{textTransform: "none",}} style={{justifyContent: "flex-start", textAlign: "left", textTransform: "none", width: "100%",}}
fullWidth
onClick={() => { onClick={() => {
setHiddenDescription(!hiddenDescription) setHiddenDescription(!hiddenDescription)
}} }}
@@ -1112,7 +1113,7 @@ const ParsedAction = (props) => {
data.configuration && data.configuration &&
hideExtraTypes hideExtraTypes
) { ) {
console.log("GENERATED WITH DATA: ", data); //console.log("GENERATED WITH DATA: ", data);
return null; return null;
} }
@@ -1898,6 +1899,7 @@ const ParsedAction = (props) => {
height: 24, height: 24,
marginRight: 10, marginRight: 10,
}} }}
color="primary"
onClick={() => { onClick={() => {
setAuthenticationModalOpen(true); setAuthenticationModalOpen(true);
}} }}
@@ -2092,7 +2094,7 @@ const ParsedAction = (props) => {
const expansionModal = ( const expansionModal = (
<Dialog <Dialog
disableEnforceFocus={true} disableEnforceFocus={false}
hideBackdrop={true} hideBackdrop={true}
open={expansionModalOpen} open={expansionModalOpen}
onClose={() => { onClose={() => {
@@ -2775,16 +2777,24 @@ const ParsedAction = (props) => {
</Select> </Select>
: null*/} : null*/}
{selectedAction.description !== undefined && selectedAction.description !== null && selectedAction.description.length > 0 && hideExtraTypes !== true && hiddenDescription === false ? ( {selectedAction.description !== undefined && selectedAction.description !== null && selectedAction.description.length > 0 && hiddenDescription === false ? (
<div <div
style={{ style={{
marginTop: 10, border: "1px solid rgba(255,255,255,0.6)",
borderRadius: theme.palette.borderRadius,
marginTop: 15,
marginBottom: 10, marginBottom: 10,
maxHeight: 60, maxHeight: 60,
overflow: "hidden", overflow: "hidden",
padding: 15,
}} }}
> >
{selectedAction.description} <Typography style={{}}>
<b>Description</b>
</Typography>
<Typography style={{}}>
{selectedAction.description}
</Typography>
</div> </div>
) : null} ) : null}
frontend/src/views/AngularWorkflow.jsx
+70 -47
View File
@@ -36,6 +36,7 @@ import {
IconButton, IconButton,
Menu, Menu,
Input, Input,
Fade,
FormGroup, FormGroup,
FormControlLabel, FormControlLabel,
Typography, Typography,
@@ -5333,6 +5334,10 @@ const AngularWorkflow = (props) => {
// Starts on current node and climbs UP the tree to the root object. // Starts on current node and climbs UP the tree to the root object.
// Sends back everything in it's path // Sends back everything in it's path
const getParents = (action) => { const getParents = (action) => {
if (action === undefined || action === null) {
return []
}
var allkeys = [action.id]; var allkeys = [action.id];
var handled = []; var handled = [];
var results = []; var results = [];
@@ -5865,8 +5870,11 @@ const AngularWorkflow = (props) => {
const conditionsModal = ( const conditionsModal = (
<Dialog <Dialog
modal disableEnforceFocus={true}
hideBackdrop={true}
disableBackdropClick={true}
open={conditionsModalOpen} open={conditionsModalOpen}
style={{ pointerEvents: "none" }}
PaperProps={{ PaperProps={{
style: { style: {
backgroundColor: surfaceColor, backgroundColor: surfaceColor,
@@ -5875,10 +5883,6 @@ const AngularWorkflow = (props) => {
}, },
}} }}
onClose={() => { onClose={() => {
setConditionsModalOpen(false);
setSourceValue({});
setConditionValue({});
setDestinationValue({});
}} }}
> >
<span <span
@@ -6095,8 +6099,22 @@ const AngularWorkflow = (props) => {
</div> </div>
</DialogContent> </DialogContent>
<DialogActions> <DialogActions>
<Button
style={{ borderRadius: "0px" }}
variant="text"
onClick={() => {
setConditionsModalOpen(false);
setSourceValue({});
setConditionValue({});
setDestinationValue({});
}}
color="secondary"
>
Cancel
</Button>
<Button <Button
style={{ borderRadius: "0px" }} style={{ borderRadius: "0px" }}
variant="contained"
onClick={() => { onClick={() => {
setSelectedEdge({}); setSelectedEdge({});
@@ -9867,44 +9885,46 @@ const AngularWorkflow = (props) => {
} }
return ( return (
<div id="rightside_actions" style={rightsidebarStyle}> <Fade in={true} style={{ transitionDelay: `$0ms` }}>
<ParsedAction <div id="rightside_actions" style={rightsidebarStyle}>
id="rightside_subactions" <ParsedAction
getAppAuthentication={getAppAuthentication} id="rightside_subactions"
appAuthentication={appAuthentication} getAppAuthentication={getAppAuthentication}
authenticationType={authenticationType} appAuthentication={appAuthentication}
scrollConfig={scrollConfig} authenticationType={authenticationType}
setScrollConfig={setScrollConfig} scrollConfig={scrollConfig}
selectedAction={selectedAction} setScrollConfig={setScrollConfig}
workflow={workflow} selectedAction={selectedAction}
setWorkflow={setWorkflow} workflow={workflow}
setSelectedAction={setSelectedAction} setWorkflow={setWorkflow}
setUpdate={setUpdate} setSelectedAction={setSelectedAction}
selectedApp={selectedApp} setUpdate={setUpdate}
workflowExecutions={workflowExecutions} selectedApp={selectedApp}
setSelectedResult={setSelectedResult} workflowExecutions={workflowExecutions}
setSelectedApp={setSelectedApp} setSelectedResult={setSelectedResult}
setSelectedTrigger={setSelectedTrigger} setSelectedApp={setSelectedApp}
setSelectedEdge={setSelectedEdge} setSelectedTrigger={setSelectedTrigger}
setCurrentView={setCurrentView} setSelectedEdge={setSelectedEdge}
cy={cy} setCurrentView={setCurrentView}
setAuthenticationModalOpen={setAuthenticationModalOpen} cy={cy}
setVariablesModalOpen={setVariablesModalOpen} setAuthenticationModalOpen={setAuthenticationModalOpen}
setLastSaved={setLastSaved} setVariablesModalOpen={setVariablesModalOpen}
setCodeModalOpen={setCodeModalOpen} setLastSaved={setLastSaved}
selectedNameChange={selectedNameChange} setCodeModalOpen={setCodeModalOpen}
rightsidebarStyle={rightsidebarStyle} selectedNameChange={selectedNameChange}
showEnvironment={showEnvironment} rightsidebarStyle={rightsidebarStyle}
selectedActionEnvironment={selectedActionEnvironment} showEnvironment={showEnvironment}
environments={environments} selectedActionEnvironment={selectedActionEnvironment}
setNewSelectedAction={setNewSelectedAction} environments={environments}
sortByKey={sortByKey} setNewSelectedAction={setNewSelectedAction}
appApiViewStyle={appApiViewStyle} sortByKey={sortByKey}
globalUrl={globalUrl} appApiViewStyle={appApiViewStyle}
setSelectedActionEnvironment={setSelectedActionEnvironment} globalUrl={globalUrl}
requiresAuthentication={requiresAuthentication} setSelectedActionEnvironment={setSelectedActionEnvironment}
/> requiresAuthentication={requiresAuthentication}
</div> />
</div>
</Fade>
); );
} else if (Object.getOwnPropertyNames(selectedComment).length > 0) { } else if (Object.getOwnPropertyNames(selectedComment).length > 0) {
return ( return (
@@ -11572,7 +11592,6 @@ const AngularWorkflow = (props) => {
const executionVariableModal = executionVariablesModalOpen ? ( const executionVariableModal = executionVariablesModalOpen ? (
<Dialog <Dialog
modal
open={executionVariablesModalOpen} open={executionVariablesModalOpen}
onClose={() => { onClose={() => {
setNewVariableName(""); setNewVariableName("");
@@ -12173,14 +12192,18 @@ const AngularWorkflow = (props) => {
// This whole part is redundant. Made it part of Arguments instead. // This whole part is redundant. Made it part of Arguments instead.
const authenticationModal = authenticationModalOpen ? ( const authenticationModal = authenticationModalOpen ? (
<Dialog <Dialog
disableEnforceFocus={true}
hideBackdrop={true}
open={authenticationModalOpen} open={authenticationModalOpen}
style={{pointerEvents: "none",}}
onClose={() => { onClose={() => {
if (configureWorkflowModalOpen) { //if (configureWorkflowModalOpen) {
setSelectedAction({}); // setSelectedAction({});
} //}
}} }}
PaperProps={{ PaperProps={{
style: { style: {
pointerEvents: "none",
backgroundColor: surfaceColor, backgroundColor: surfaceColor,
color: "white", color: "white",
minWidth: 1100, minWidth: 1100,