From a509dcd300ed7d15c633d91c11f5d5903dd38939 Mon Sep 17 00:00:00 2001 From: frikky Date: Mon, 4 Oct 2021 22:22:29 +0200 Subject: [PATCH] Fixed the shared memoryspace between same node issue --- docker-compose.yml | 4 ++-- frontend/src/components/ParsedAction.jsx | 1 + frontend/src/views/AngularWorkflow.jsx | 25 ++++++++++++++++++++---- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2445fe52..5f18df8b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: frontend: - #build: ./frontend + build: ./frontend image: ghcr.io/frikky/shuffle-frontend:nightly container_name: shuffle-frontend hostname: shuffle-frontend @@ -16,7 +16,7 @@ services: depends_on: - backend backend: - #build: ./backend + build: ./backend image: ghcr.io/frikky/shuffle-backend:nightly container_name: shuffle-backend hostname: ${BACKEND_HOSTNAME} diff --git a/frontend/src/components/ParsedAction.jsx b/frontend/src/components/ParsedAction.jsx index 3e77046e..a582af95 100644 --- a/frontend/src/components/ParsedAction.jsx +++ b/frontend/src/components/ParsedAction.jsx @@ -481,6 +481,7 @@ const ParsedAction = (props) => { } } + //console.log("CHANGING ACTION COUNT !") selectedActionParameters[count].value = event.target.value selectedAction.parameters[count].value = event.target.value setSelectedAction(selectedAction) diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx index 3627275d..c6d15a56 100644 --- a/frontend/src/views/AngularWorkflow.jsx +++ b/frontend/src/views/AngularWorkflow.jsx @@ -1892,6 +1892,7 @@ const AngularWorkflow = (props) => { // https://stackoverflow.com/questions/16677856/cy-onselect-callback-only-once const onNodeSelect = (event, newAppAuth) => { const data = event.target.data() + //console.log("NEW NODE ID: ", data.id) if (data.isButton) { //console.log("BUTTON CLICKED: ", data) if (data.buttonType === "delete") { @@ -2043,12 +2044,13 @@ const AngularWorkflow = (props) => { //const branch = workflow.branches.filter(branch => branch.source_id === data.id || branch.destination_id === data.id) //console.log("APPAUTH: ", newAppAuth) //console.log("BRANCHES: ", branch) - console.log("CLICK: ", data) + //console.log("CLICK: ", data) if (data.type === "ACTION") { //setSelectedApp({}) //setSelectedAction({}) var curaction = workflow.actions.find(a => a.id === data.id) + //console.log("PARAMS: ", curaction.parameters[0]) //console.log("INSIDE CURACTION: ", curaction) if (!curaction || curaction === undefined) { //event.target.unselect() @@ -2056,6 +2058,7 @@ const AngularWorkflow = (props) => { return } + const curapp = apps.find(a => a.name === curaction.app_name && ((a.app_version === curaction.app_version || (a.loop_versions !== null && a.loop_versions.includes(curaction.app_version))))) //console.log("APP: ", curapp) if (!curapp || curapp === undefined) { @@ -2069,8 +2072,8 @@ const AngularWorkflow = (props) => { actions: [curaction], } - console.log(tmpapp) - console.log(curaction) + //console.log(tmpapp) + //console.log(curaction) setSelectedApp(tmpapp) //setSelectedAction(JSON.parse(JSON.stringify(curaction))) setSelectedAction(curaction) @@ -2434,6 +2437,7 @@ const AngularWorkflow = (props) => { if (dstdata.parameters[paramkey].value.length === 0) { dstdata.parameters[paramkey].value = `$${parentlabel}${foundresult}` } else { + dstdata.parameters[paramkey].value = `$${parentlabel}${foundresult}` //console.log("Skipping ", dstdata.parameters[paramkey], " because it already has a value") } } @@ -2654,7 +2658,7 @@ const AngularWorkflow = (props) => { console.log("SHOULD STITCH WITH STARTNODE") cy.add(edgeToBeAdded) } - + if (nodedata.app_name === "Shuffle Tools") { const iconInfo = GetIconInfo(nodedata) const svg_pin = `` @@ -2669,6 +2673,19 @@ const AngularWorkflow = (props) => { } } + if (nodedata.parameters !== undefined && nodedata.parameters !== null && !nodedata.label.endsWith("_copy")) { + var newparameters = [] + + for (var subkey in nodedata.parameters) { + var newparam = JSON.parse(JSON.stringify(nodedata.parameters[subkey])) + newparam.id = uuidv4() + newparam.value = "" + newparameters.push(newparam) + } + + nodedata.parameters = newparameters + } + if (workflow.actions === undefined || workflow.actions === null) { workflow.actions = [nodedata] } else {