diff --git a/frontend/src/AngularWorkflow.js b/frontend/src/AngularWorkflow.js index d93aa1e4..a6931465 100644 --- a/frontend/src/AngularWorkflow.js +++ b/frontend/src/AngularWorkflow.js @@ -850,6 +850,7 @@ const AngularWorkflow = (props) => { const onEdgeAdded = (event) => { setLastSaved(false) const edge = event.target.data() + console.log(workflow.branches) // Check if: // dest == source && source == dest @@ -863,7 +864,7 @@ const AngularWorkflow = (props) => { found = true break } else if (workflow.branches[key].destination_id === edge.target && workflow.branches[key].source_id === edge.source) { - console.log(edge) + console.log(edge.source) alert.error("That branch already exists") event.target.remove() found = true @@ -1333,9 +1334,9 @@ const AngularWorkflow = (props) => { }) .then((responseJson) => { if (!responseJson.success) { - alert.error("Failed to delete schedule: " + responseJson.reason) + //alert.error("Failed to delete schedule: " + responseJson.reason) } else { - alert.success("Successfully stopped schedule") + //alert.success("Successfully stopped schedule") workflow.triggers[triggerindex].status = "stopped" trigger.status = "stopped" setSelectedTrigger(trigger) @@ -1807,7 +1808,7 @@ const AngularWorkflow = (props) => { } if (data.is_valid === false) { - alert.error("Sorry, "+data.name+" is not ready yet") + alert.error(data.name+" is only available on https://shuffler.io") return } @@ -1881,7 +1882,7 @@ const AngularWorkflow = (props) => { } if (data.name !== "User Input") { - workflow.branches.push(newbranch) + //workflow.branches.push(newbranch) cy.add(edgeToBeAdded) } @@ -4022,7 +4023,7 @@ const AngularWorkflow = (props) => { }) .then((responseJson) => { if (responseJson.success) { - alert.success("Successfully stopped webhook") + //alert.success("Successfully stopped webhook") // Set the status workflow.triggers[triggerindex].status = "stopped" trigger.status = "stopped" diff --git a/frontend/src/Workflows.js b/frontend/src/Workflows.js index 04ea2dd9..043b35c7 100644 --- a/frontend/src/Workflows.js +++ b/frontend/src/Workflows.js @@ -89,7 +89,6 @@ const Workflows = (props) => { return response.json() }) .then((responseJson) => { - console.log(responseJson) setSelectedExecution({}) setWorkflowExecutions([]) @@ -807,7 +806,7 @@ const Workflows = (props) => { const ret = setNewWorkflow(data.name, data.description, data, false) .then((response) => { if (response !== undefined) { - alert.success("Successfully created "+data.name) + alert.success("Successfully imported "+data.name) } }) } @@ -1031,20 +1030,20 @@ const Workflows = (props) => { }) .then((response) => { if (response.status === 200) { - response.text().then(function (text) { - console.log("RETURN: ", text) - alert.success("Loaded existing apps!") - }) + alert.success("Successfully loaded workflows from "+downloadUrl) + getAvailableWorkflows() } return response.json() }) .then((responseJson) => { console.log("DATA: ", responseJson) - if (responseJson.reason !== undefined) { - alert.error("Failed loading: "+responseJson.reason) - } else { - alert.error("Failed loading") + if (!responseJson.success) { + if (responseJson.reason !== undefined) { + alert.error("Failed loading: "+responseJson.reason) + } else { + alert.error("Failed loading") + } } }) .catch(error => {