diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx index c37e55e7..889a407b 100755 --- a/frontend/src/views/AngularWorkflow.jsx +++ b/frontend/src/views/AngularWorkflow.jsx @@ -432,7 +432,7 @@ const AngularWorkflow = (defaultprops) => { const [history, setHistory] = React.useState([]); const [historyIndex, setHistoryIndex] = React.useState(history.length); const [variableInfo, setVariableInfo] = React.useState({}) - + const [selectedVersion, setSelectedVersion] = React.useState(null) const [appAuthentication, setAppAuthentication] = React.useState(undefined); const [variablesModalOpen, setVariablesModalOpen] = React.useState(false); const [aiQueryModalOpen, setAiQueryModalOpen] = React.useState(false) @@ -472,7 +472,6 @@ const AngularWorkflow = (defaultprops) => { const [conditionValue, setConditionValue] = React.useState({}); const [dragging, setDragging] = React.useState(false); const [showWorkflowRevisions, setShowWorkflowRevisions] = React.useState(false); - const [selectedRevision, setSelectedRevision] = useState({}) const [dragPosition, setDragPosition] = React.useState({ x: 0, y: 0, @@ -2098,6 +2097,7 @@ const releaseToConnectLabel = "Release to Connect" setTimeout(() => { setSavingState(0); }, 1500); + getRevisionHistory(useworkflow.id) } }) .catch((error) => { @@ -7967,6 +7967,7 @@ const releaseToConnectLabel = "Release to Connect" } setAllRevisions(responseJson) + setSelectedVersion(responseJson[0]) }) .catch((error) => { console.log("Error getting workflow revisions: ", error) @@ -16571,7 +16572,6 @@ const releaseToConnectLabel = "Release to Connect" console.log("Show workflow revisions key pressed") if (!workflow.public) { setShowWorkflowRevisions(true) - setSelectedRevision(workflow) //setOriginalWorkflow(workflow) } } @@ -16624,7 +16624,6 @@ const releaseToConnectLabel = "Release to Connect" console.log("Show workflow revisions key pressed") if (!workflow.public) { setShowWorkflowRevisions(true) - setSelectedRevision(workflow) //setOriginalWorkflow(workflow) } } @@ -17099,7 +17098,6 @@ const releaseToConnectLabel = "Release to Connect" variant={"outlined"} onClick={() => { setShowWorkflowRevisions(true) - setSelectedRevision(workflow) //setOriginalWorkflow(workflow) }} > @@ -21408,14 +21406,12 @@ const releaseToConnectLabel = "Release to Connect" }*/ const RevisionBox = (props) => { - const { revision, } = props - - if (revision === undefined || revision === null || revision === {}) { + const { revision, } = props + if (revision === undefined || revision === null) { return null } var newrevision = JSON.parse(JSON.stringify(revision)) - // Make unix timestamp into ISO timestamp in the format July 27th, 3:05 AM // Format: July 27th, 3:05 AM //console.log("Edited time: ", revision.edited) @@ -21440,18 +21436,17 @@ const releaseToConnectLabel = "Release to Connect" return ( { - if (newrevision.edited === selectedRevision.edited) { + if (newrevision.edited === selectedVersion.edited) { console.log("Same revision! No setting.") return } - // Should render if it's not the same as workflow.edited console.log("Clicked revision: ", newrevision) - setLastSaved(false) - setSelectedRevision(newrevision) + setLastSaved(false) + setSelectedVersion(newrevision); setWorkflow(newrevision) setSelectedAction({}); setSelectedApp({}) @@ -21474,7 +21469,11 @@ const releaseToConnectLabel = "Release to Connect" //cy.remove('*') setElements([]) } - + + // Remove all edges + cy.edges().remove() + cy.nodes().remove() + // Remove all cy nodes setTimeout(() => { setupGraph(newrevision) @@ -21525,6 +21524,7 @@ const releaseToConnectLabel = "Release to Connect" {translatedDate} + {/* {newrevision.edited.toString().slice(6,10)} | {newrevision.revision_id.slice(0,5)} */} @@ -21607,39 +21607,64 @@ const releaseToConnectLabel = "Release to Connect" ) } - - const drawerData = originalWorkflow !== undefined && originalWorkflow !== null && originalWorkflow !== {} ? -
- + //! Logs + console.log("Workflow state", workflow) + console.log("All revision", allRevisions) + const drawerData = originalWorkflow !== undefined && originalWorkflow !== null ? +
+ Version History (Beta) +
+
+
+ + Current Version + + +
- + +
- {allRevisions.length > 0 ? - allRevisions.map((revision, index) => { - if (revision.edited === originalWorkflow.edited) { - return null - } - return ( - - ) - }) - : -
- - No other revisions found. Save your workflow with changes to create a revision. - -
- } -
+ {allRevisions.length > 0 ? +
+ { + allRevisions.map((revision, index) => { + if(revision.edited === selectedVersion.edited){ + return null + } + + return ( + + ) + }) + } +
+ + : +
+ + No other revisions found. Save your workflow with changes to create a revision. + +
+ } +
+
: null const workflowRevisions = !showWorkflowRevisions ? null : @@ -21650,7 +21675,7 @@ const releaseToConnectLabel = "Release to Connect" onClose={() => { //setShowWorkflowRevisions(false) }} - style={{ resize: "both", overflow: "auto", zIndex: 10005 }} + style={{ resize: "both", overflow: "hidden", zIndex: 10005 }} hideBackdrop={true} variant="persistent" BackdropProps={{ @@ -21661,7 +21686,7 @@ const releaseToConnectLabel = "Release to Connect" PaperProps={{ style: { resize: "both", - overflow: "auto", + overflow: "hidden", minWidth: isMobile ? "100%" : 360, maxWidth: isMobile ? "100%" : 360, backgroundColor: theme.palette.platformColor, @@ -21669,7 +21694,6 @@ const releaseToConnectLabel = "Release to Connect" fontSize: 18, zIndex: 15001, borderRight: theme.palette.defaultBorder, - paddingTop: 15, }, }} > @@ -21692,7 +21716,7 @@ const releaseToConnectLabel = "Release to Connect"
- {selectedRevision.name} + {selectedVersion.name}
{/* Cross icon to close it */}