diff --git a/frontend/src/AngularWorkflow.js b/frontend/src/AngularWorkflow.js
index e61bcf84..28feea14 100644
--- a/frontend/src/AngularWorkflow.js
+++ b/frontend/src/AngularWorkflow.js
@@ -10,6 +10,8 @@ import Drawer from '@material-ui/core/Drawer';
import Button from '@material-ui/core/Button';
import Paper from '@material-ui/core/Paper';
import Grid from '@material-ui/core/Grid';
+import Tabs from '@material-ui/core/Tabs';
+import Tab from '@material-ui/core/Tab';
import ButtonBase from '@material-ui/core/ButtonBase';
import Tooltip from '@material-ui/core/Tooltip';
import Select from '@material-ui/core/Select';
@@ -100,7 +102,7 @@ const AngularWorkflow = (props) => {
const [cy, setCy] = React.useState()
const [appSearch, setAppSearch] = React.useState("")
- const [currentView, setCurrentView] = React.useState("apps")
+ const [currentView, setCurrentView] = React.useState(0)
const [triggerAuthentication, setTriggerAuthentication] = React.useState({})
const [triggerFolders, setTriggerFolders] = React.useState([])
@@ -164,9 +166,6 @@ const AngularWorkflow = (props) => {
const [lastSaved, setLastSaved] = React.useState(true)
- const [AppsHoverColor, setAppsHoverColor] = useState(hoverOutColor);
- const [VariablesHoverColor, setVariablesHoverColor] = useState(hoverOutColor);
- const [HookHoverColor, setHookHoverColor] = useState(hoverOutColor);
const [appAdded, setAppAdded] = useState(false)
const [update, setUpdate] = useState("");
const [workflowExecutions, setWorkflowExecutions] = React.useState([]);
@@ -549,68 +548,6 @@ const AngularWorkflow = (props) => {
return true
}
- const executeWorkflowWebsocket = () => {
- if (!lastSaved) {
- //alert.error("You might have forgotten to save before executing.")
- console.log("FIXME: Might have forgotten to save before executing.")
- }
-
- var returncheck = monitorUpdates()
- if (!returncheck) {
- alert.error("No startnode set.")
- return
- }
-
- setVisited([])
- setExecutionRunning(true)
- setExecutionRequest({})
-
- var curelements = cy.elements()
- for (var i = 0; i < curelements.length; i++) {
- curelements[i].addClass("not-executing-highlight")
- }
-
- if (executionText.length > 0) {
- alert.success("Starting execution with argument "+executionText)
- } else {
- alert.success("Starting execution")
- }
-
- const data = {"execution_argument": executionText}
- fetch(globalUrl+"/api/v1/workflows/"+props.match.params.key+"/execute_fs", {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'Accept': 'application/json',
- },
- credentials: "include",
- body: JSON.stringify(data),
- })
- .then((response) => {
- if (response.status !== 200) {
- console.log("Status not 200 for WORKFLOW EXECUTION :O!")
- }
-
- return response.json()
- })
- .then((responseJson) => {
- if (!responseJson.success) {
- alert.error("Failed to start: "+responseJson.reason)
- stop()
- return
- }
-
- setExecutionRequest({
- "execution_id": responseJson.execution_id,
- "authorization": responseJson.authorization,
- })
- setExecutingNodes([workflow.start])
- })
- .catch(error => {
- alert.error(error.toString())
- });
- }
-
const executeWorkflow = () => {
if (!lastSaved) {
//alert.error("You might have forgotten to save before executing.")
@@ -641,14 +578,14 @@ const AngularWorkflow = (props) => {
const data = {"execution_argument": executionText, "start": workflow.start}
fetch(globalUrl+"/api/v1/workflows/"+props.match.params.key+"/execute", {
- method: 'POST',
+ method: 'POST',
headers: {
'Content-Type': 'application/json',
'Accept': 'application/json',
},
credentials: "include",
body: JSON.stringify(data),
- })
+ })
.then((response) => {
if (response.status !== 200) {
console.log("Status not 200 for WORKFLOW EXECUTION :O!")
@@ -1437,16 +1374,17 @@ const AngularWorkflow = (props) => {
}
const appViewStyle = {
- marginLeft: "5px",
- marginRight: "5px",
+ marginLeft: 5,
+ marginRight: 5,
display: "flex",
flexDirection: "column",
+ height: "100%",
}
const scrollStyle = {
- marginTop: "10px",
+ marginTop: 10,
overflow: "scroll",
- height: "66vh",
+ height: "100%",
overflowX: "auto",
overflowY: "auto",
}
@@ -1463,36 +1401,6 @@ const AngularWorkflow = (props) => {
display: "flex",
}
- // All this is stupid lmao
- const handleHookHover = () => {
- setHookHoverColor(hoverColor)
- setAppsHoverColor(hoverOutColor)
- setVariablesHoverColor(hoverOutColor)
- }
-
- const handleHookHoverOut = () => {
- setHookHoverColor(hoverOutColor)
- }
-
- const handleAppsHover = () => {
- setAppsHoverColor(hoverColor)
- setHookHoverColor(hoverOutColor)
- setVariablesHoverColor(hoverOutColor)
- }
-
- const handleAppsHoverOut = () => {
- setAppsHoverColor(hoverOutColor)
- }
-
- const handleVariablesHover = () => {
- setVariablesHoverColor(hoverColor)
- setHookHoverColor(hoverOutColor)
- setAppsHoverColor(hoverOutColor)
- }
-
- const handleVariablesHoverOut = () => {
- setVariablesHoverColor(hoverOutColor)
- }
const paperVariableStyle = {
minHeight: "50px",
@@ -1614,57 +1522,77 @@ const AngularWorkflow = (props) => {
)
}
+
+ const curTab = 0
+ const handleSetTab = (event, newValue) => {
+ setCurrentView(newValue)
+ }
const HandleLeftView = () => {
// Defaults to apps.
var thisview =