From f970bb351e9bfff30ef697f3fa88059fe69d68f9 Mon Sep 17 00:00:00 2001 From: frikky Date: Mon, 14 Jun 2021 17:46:15 +0200 Subject: [PATCH] Added baseline for copy-pasting between workflows --- frontend/src/views/AngularWorkflow.jsx | 33 ++++++++++++++++++++++++-- frontend/src/views/Workflows.jsx | 2 +- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx index 91da6cdc..829b97da 100644 --- a/frontend/src/views/AngularWorkflow.jsx +++ b/frontend/src/views/AngularWorkflow.jsx @@ -1369,6 +1369,7 @@ const AngularWorkflow = (props) => { if (nodedata.app_name === undefined && nodedata.source === undefined) { return } + event.target.removeClass("selected") // Attempt at rewrite of name in other actions in following nodes. @@ -2735,6 +2736,13 @@ const AngularWorkflow = (props) => { case 67: if (previouskey === 17) { console.log("CTRL+C") + const filteredelements = cy.filter(function(element, i){ + return element.hasClass('selected') + }) + + for (var key in filteredelements) { + } + console.log("FILTERED: ", filteredelements) } break; case 86: @@ -2910,8 +2918,30 @@ const AngularWorkflow = (props) => { cy.fit(null, 200) - cy.on('select', 'node', (e) => onNodeSelect(e, appAuthentication)) + cy.on('boxselect', 'node', (e) => { + if (e.target.data("isButton") || e.target.data("isDescriptor")) { + e.target.unselect() + } + + e.target.addClass("selected") + }) + + cy.on('boxstart', (e) => { + console.log("START") + cy.removeListener('select') + //onNodeSelect(e, appAuthentication) + }) + cy.on('boxend', (e) => { + console.log("END") + cy.removeListener('select') + //onNodeSelect(e, appAuthentication) + }) + + cy.on('select', 'node', (e) => { + onNodeSelect(e, appAuthentication) + }) cy.on('select', 'edge', (e) => onEdgeSelect(e)) + cy.on('unselect', (e) => onUnselect(e)) cy.on('add', 'node', (e) => onNodeAdded(e)) @@ -4083,7 +4113,6 @@ const AngularWorkflow = (props) => { // Chrome lol //if (e.srcElement !== undefined && e.srcElement.localName === "canvas") { if (e.pageX > cycontainer.offsetLeft && e.pageX < cycontainer.offsetLeft+cycontainer.offsetWidth && e.pageY > cycontainer.offsetTop && e.pageY < cycontainer.offsetTop+cycontainer.offsetHeight) { - console.log("NODEID: ", newNodeId) if (newNodeId.length > 0) { var currentnode = cy.getElementById(newNodeId) if (currentnode === undefined || currentnode === null || currentnode.length === 0) { diff --git a/frontend/src/views/Workflows.jsx b/frontend/src/views/Workflows.jsx index dd865592..b17a2388 100644 --- a/frontend/src/views/Workflows.jsx +++ b/frontend/src/views/Workflows.jsx @@ -780,7 +780,7 @@ const Workflows = (props) => { const newId = uuid.v4() if (trigger.trigger_type === "WEBHOOK") { const hookname = "webhook_"+newId - if (trigger.parameters.length === 2) { + if (trigger.parameters !== undefined && trigger.parameters !== null && trigger.parameters.length === 2) { trigger.parameters[0].value = referenceUrl+"webhook_"+trigger.id trigger.parameters[1].value = "webhook_"+trigger.id } else {