From f0065eaa11e912ebd8e70b307c163fc55a64dbe3 Mon Sep 17 00:00:00 2001 From: frikky Date: Tue, 25 May 2021 21:22:42 +0200 Subject: [PATCH] Minor app drag calculation changes --- docker-compose.yml | 10 ---------- frontend/package.json | 4 ++-- frontend/src/views/AngularWorkflow.jsx | 15 ++------------- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 05b999e3..a503ac8a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -100,10 +100,6 @@ services: - 9200:9200 networks: - shuffle - #volumes: - # #- ${DB_LOCATION}/opensearch:/usr/share/opensearch/data - # #- tmp/opensearch:/usr/share/opensearch/data - # - ${DB_LOCATION}:/usr/share/opensearch/data #database: # #build: ./backend/database # image: frikky/shuffle:database @@ -122,9 +118,3 @@ services: networks: shuffle: driver: bridge -#volumes: -# opensearch-data1: -# driver: local -# driver_opts: -# type: nfs -# device: ${DB_LOCATION} diff --git a/frontend/package.json b/frontend/package.json index c9372113..4bfb693d 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,7 +1,7 @@ { "name": "shuffler", "homepage": "https://shuffler.io", - "version": "0.8.76", + "version": "0.8.92", "private": true, "dependencies": { "@babel/helper-regex": "^7.10.5", @@ -46,7 +46,7 @@ "react-cytoscapejs": "^1.2.0", "react-device-detect": "^1.9.10", "react-dom": "^16.14.0", - "react-draggable": "^3.3.2", + "react-draggable": "4.4.3", "react-dropzone": "^10.1.10", "react-ga": "^2.7.0", "react-iframe": "^1.8.0", diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx index af5d7437..6e8f8050 100644 --- a/frontend/src/views/AngularWorkflow.jsx +++ b/frontend/src/views/AngularWorkflow.jsx @@ -3400,9 +3400,6 @@ const AngularWorkflow = (props) => { const handleAppDrag = (e, app) => { const cycontainer = cy.container() - console.log("X: ", e.pageX) - console.log("Y: ", e.pageY) - console.log("Height: ", cycontainer.offsetHeight) // Chrome lol //if (e.srcElement !== undefined && e.srcElement.localName === "canvas") { @@ -3413,8 +3410,6 @@ const AngularWorkflow = (props) => { return } - console.log("RENDEREDX: ", e.pageX-cycontainer.offsetLeft) - console.log("RENDEREDY: ", e.pageY-cycontainer.offsetTop) currentnode[0].renderedPosition("x", e.pageX-cycontainer.offsetLeft) currentnode[0].renderedPosition("y", e.pageY-cycontainer.offsetTop) } else{ @@ -3480,14 +3475,8 @@ const AngularWorkflow = (props) => { // FIXME: overwrite category if the ACTION chosen has a different category // const image = "url("+app.large_image+")" - // FIXME - find the cytoscape offset position // Can this be done with zoom calculations? - console.log("LAYERX: ", e.layerX) - console.log("LAYERY: ", e.layerY) - console.log("RENDEREDX: ", e.pageX-cycontainer.offsetLeft) - console.log("RENDEREDY: ", e.pageY-cycontainer.offsetTop) - console.log("E: ", e) const nodeToBeAdded = { group: "nodes", data: newAppData, @@ -3593,8 +3582,8 @@ const AngularWorkflow = (props) => { newAppData.selectedAuthentication = {} } - workflow.actions.push(newAppData) - setWorkflow(workflow) + //workflow.actions.push(newAppData) + //setWorkflow(workflow) if (newAppPopup) { //alert.error("SHOULD MAKE USER AUTHENTICATE THE APP OR SET hasError")