From 7142f55216e7493ad137b8b10edb411cb2473633 Mon Sep 17 00:00:00 2001 From: Hari Krishna Date: Fri, 23 Feb 2024 09:46:38 +0000 Subject: [PATCH 1/3] fixing cancel button issue --- frontend/src/views/AngularWorkflow.jsx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx index 2f461690..4ae83b79 100755 --- a/frontend/src/views/AngularWorkflow.jsx +++ b/frontend/src/views/AngularWorkflow.jsx @@ -467,6 +467,7 @@ const AngularWorkflow = (defaultprops) => { const [sourceValue, setSourceValue] = React.useState({}); const [destinationValue, setDestinationValue] = React.useState({}); const [conditionValue, setConditionValue] = React.useState({}); + const [tmpConditionValue, setTmpConditionValue] = React.useState({}); const [dragging, setDragging] = React.useState(false); const [showWorkflowRevisions, setShowWorkflowRevisions] = React.useState(false); const [selectedRevision, setSelectedRevision] = useState({}) @@ -8897,7 +8898,7 @@ const AngularWorkflow = (defaultprops) => { const AppConditionHandler = (props) => { const { tmpdata, type } = props; - const [data] = useState(tmpdata); + const [data] = useState({...tmpdata}); const [multiline, setMultiline] = useState(false); const [showAutocomplete, setShowAutocomplete] = React.useState(false); const [actionlist, setActionlist] = React.useState([]); @@ -9499,8 +9500,8 @@ const AngularWorkflow = (defaultprops) => { { - conditionValue.value = "equals"; - setConditionValue(conditionValue); + tmpConditionValue.value = "equals"; + setTmpConditionValue(tmpConditionValue); setVariableAnchorEl(null); }} key={"equals"} @@ -9510,8 +9511,8 @@ const AngularWorkflow = (defaultprops) => { { - conditionValue.value = "does not equal"; - setConditionValue(conditionValue); + tmpConditionValue.value = "does not equal"; + setTmpConditionValue(tmpConditionValue); setVariableAnchorEl(null); }} key={"does not equal"} @@ -9635,6 +9636,7 @@ const AngularWorkflow = (defaultprops) => { style={{ borderRadius: "0px" }} variant="contained" onClick={() => { + setConditionValue(tmpConditionValue); setSelectedEdge({}); var data = { From ac3e413cc669d7557a6ae3e992c66d6be6e0af21 Mon Sep 17 00:00:00 2001 From: Hari Krishna Date: Sat, 24 Feb 2024 11:20:10 +0000 Subject: [PATCH 2/3] fixed the issue with shared reference of the conditionValue object across components, causing changes made in one component to affect the other --- frontend/src/views/AngularWorkflow.jsx | 50 +++++++++++++++----------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx index 4ae83b79..2a093179 100755 --- a/frontend/src/views/AngularWorkflow.jsx +++ b/frontend/src/views/AngularWorkflow.jsx @@ -9500,8 +9500,9 @@ const AngularWorkflow = (defaultprops) => { { - tmpConditionValue.value = "equals"; - setTmpConditionValue(tmpConditionValue); + const newConditionValue = { ...conditionValue }; + newConditionValue.value = "equals"; + setConditionValue(newConditionValue); setVariableAnchorEl(null); }} key={"equals"} @@ -9511,8 +9512,9 @@ const AngularWorkflow = (defaultprops) => { { - tmpConditionValue.value = "does not equal"; - setTmpConditionValue(tmpConditionValue); + const newConditionValue = { ...conditionValue }; + newConditionValue.value = "does not equal"; + setConditionValue(newConditionValue); setVariableAnchorEl(null); }} key={"does not equal"} @@ -9522,8 +9524,9 @@ const AngularWorkflow = (defaultprops) => { { - conditionValue.value = "startswith"; - setConditionValue(conditionValue); + const newConditionValue = { ...conditionValue }; + newConditionValue.value = "startswith"; + setConditionValue(newConditionValue); setVariableAnchorEl(null); }} key={"starts with"} @@ -9533,8 +9536,9 @@ const AngularWorkflow = (defaultprops) => { { - conditionValue.value = "endswith"; - setConditionValue(conditionValue); + const newConditionValue = { ...conditionValue }; + newConditionValue.value = "endswith"; + setConditionValue(newConditionValue); setVariableAnchorEl(null); }} key={"ends with"} @@ -9544,8 +9548,9 @@ const AngularWorkflow = (defaultprops) => { { - conditionValue.value = "contains"; - setConditionValue(conditionValue); + const newConditionValue = { ...conditionValue }; + newConditionValue.value = "contains"; + setConditionValue(newConditionValue); setVariableAnchorEl(null); }} key={"contains"} @@ -9555,8 +9560,9 @@ const AngularWorkflow = (defaultprops) => { { - conditionValue.value = "contains_any_of"; - setConditionValue(conditionValue); + const newConditionValue = { ...conditionValue }; + newConditionValue.value = "contains_any_of"; + setConditionValue(newConditionValue); setVariableAnchorEl(null); }} key={"contains_any_of"} @@ -9566,8 +9572,9 @@ const AngularWorkflow = (defaultprops) => { { - conditionValue.value = "matches regex"; - setConditionValue(conditionValue); + const newConditionValue = { ...conditionValue }; + newConditionValue.value = "matches regex"; + setConditionValue(newConditionValue); setVariableAnchorEl(null); }} key={"matches regex"} @@ -9577,8 +9584,9 @@ const AngularWorkflow = (defaultprops) => { { - conditionValue.value = "larger than"; - setConditionValue(conditionValue); + const newConditionValue = { ...conditionValue }; + newConditionValue.value = "larger than"; + setConditionValue(newConditionValue); setVariableAnchorEl(null); }} key={"larger than"} @@ -9588,8 +9596,9 @@ const AngularWorkflow = (defaultprops) => { { - conditionValue.value = "less than"; - setConditionValue(conditionValue); + const newConditionValue = { ...conditionValue }; + newConditionValue.value = "less than"; + setConditionValue(newConditionValue); setVariableAnchorEl(null); }} key={"less than"} @@ -9599,8 +9608,9 @@ const AngularWorkflow = (defaultprops) => { { - conditionValue.value = "is empty"; - setConditionValue(conditionValue); + const newConditionValue = { ...conditionValue }; + newConditionValue.value = "is empty"; + setConditionValue(newConditionValue); setVariableAnchorEl(null); }} key={"is empty"} From 07516d3ae5a4d3c7af2a7b9b666c76a60f352cc8 Mon Sep 17 00:00:00 2001 From: Hari Krishna Date: Sat, 24 Feb 2024 11:58:03 +0000 Subject: [PATCH 3/3] removed unused variable --- frontend/src/views/AngularWorkflow.jsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx index 2a093179..c49f402c 100755 --- a/frontend/src/views/AngularWorkflow.jsx +++ b/frontend/src/views/AngularWorkflow.jsx @@ -467,7 +467,6 @@ const AngularWorkflow = (defaultprops) => { const [sourceValue, setSourceValue] = React.useState({}); const [destinationValue, setDestinationValue] = React.useState({}); const [conditionValue, setConditionValue] = React.useState({}); - const [tmpConditionValue, setTmpConditionValue] = React.useState({}); const [dragging, setDragging] = React.useState(false); const [showWorkflowRevisions, setShowWorkflowRevisions] = React.useState(false); const [selectedRevision, setSelectedRevision] = useState({}) @@ -9646,7 +9645,6 @@ const AngularWorkflow = (defaultprops) => { style={{ borderRadius: "0px" }} variant="contained" onClick={() => { - setConditionValue(tmpConditionValue); setSelectedEdge({}); var data = {