Fixed the shared memoryspace between same node issue

This commit is contained in:
frikky
2021-10-04 22:22:29 +02:00
parent b5fbdb06b8
commit a509dcd300
3 changed files with 24 additions and 6 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
frontend: frontend:
#build: ./frontend build: ./frontend
image: ghcr.io/frikky/shuffle-frontend:nightly image: ghcr.io/frikky/shuffle-frontend:nightly
container_name: shuffle-frontend container_name: shuffle-frontend
hostname: shuffle-frontend hostname: shuffle-frontend
@@ -16,7 +16,7 @@ services:
depends_on: depends_on:
- backend - backend
backend: backend:
#build: ./backend build: ./backend
image: ghcr.io/frikky/shuffle-backend:nightly image: ghcr.io/frikky/shuffle-backend:nightly
container_name: shuffle-backend container_name: shuffle-backend
hostname: ${BACKEND_HOSTNAME} hostname: ${BACKEND_HOSTNAME}
+1
View File
@@ -481,6 +481,7 @@ const ParsedAction = (props) => {
} }
} }
//console.log("CHANGING ACTION COUNT !")
selectedActionParameters[count].value = event.target.value selectedActionParameters[count].value = event.target.value
selectedAction.parameters[count].value = event.target.value selectedAction.parameters[count].value = event.target.value
setSelectedAction(selectedAction) setSelectedAction(selectedAction)
+21 -4
View File
@@ -1892,6 +1892,7 @@ const AngularWorkflow = (props) => {
// https://stackoverflow.com/questions/16677856/cy-onselect-callback-only-once // https://stackoverflow.com/questions/16677856/cy-onselect-callback-only-once
const onNodeSelect = (event, newAppAuth) => { const onNodeSelect = (event, newAppAuth) => {
const data = event.target.data() const data = event.target.data()
//console.log("NEW NODE ID: ", data.id)
if (data.isButton) { if (data.isButton) {
//console.log("BUTTON CLICKED: ", data) //console.log("BUTTON CLICKED: ", data)
if (data.buttonType === "delete") { 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) //const branch = workflow.branches.filter(branch => branch.source_id === data.id || branch.destination_id === data.id)
//console.log("APPAUTH: ", newAppAuth) //console.log("APPAUTH: ", newAppAuth)
//console.log("BRANCHES: ", branch) //console.log("BRANCHES: ", branch)
console.log("CLICK: ", data) //console.log("CLICK: ", data)
if (data.type === "ACTION") { if (data.type === "ACTION") {
//setSelectedApp({}) //setSelectedApp({})
//setSelectedAction({}) //setSelectedAction({})
var curaction = workflow.actions.find(a => a.id === data.id) var curaction = workflow.actions.find(a => a.id === data.id)
//console.log("PARAMS: ", curaction.parameters[0])
//console.log("INSIDE CURACTION: ", curaction) //console.log("INSIDE CURACTION: ", curaction)
if (!curaction || curaction === undefined) { if (!curaction || curaction === undefined) {
//event.target.unselect() //event.target.unselect()
@@ -2056,6 +2058,7 @@ const AngularWorkflow = (props) => {
return 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))))) 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) //console.log("APP: ", curapp)
if (!curapp || curapp === undefined) { if (!curapp || curapp === undefined) {
@@ -2069,8 +2072,8 @@ const AngularWorkflow = (props) => {
actions: [curaction], actions: [curaction],
} }
console.log(tmpapp) //console.log(tmpapp)
console.log(curaction) //console.log(curaction)
setSelectedApp(tmpapp) setSelectedApp(tmpapp)
//setSelectedAction(JSON.parse(JSON.stringify(curaction))) //setSelectedAction(JSON.parse(JSON.stringify(curaction)))
setSelectedAction(curaction) setSelectedAction(curaction)
@@ -2434,6 +2437,7 @@ const AngularWorkflow = (props) => {
if (dstdata.parameters[paramkey].value.length === 0) { if (dstdata.parameters[paramkey].value.length === 0) {
dstdata.parameters[paramkey].value = `$${parentlabel}${foundresult}` dstdata.parameters[paramkey].value = `$${parentlabel}${foundresult}`
} else { } else {
dstdata.parameters[paramkey].value = `$${parentlabel}${foundresult}`
//console.log("Skipping ", dstdata.parameters[paramkey], " because it already has a value") //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") console.log("SHOULD STITCH WITH STARTNODE")
cy.add(edgeToBeAdded) cy.add(edgeToBeAdded)
} }
if (nodedata.app_name === "Shuffle Tools") { if (nodedata.app_name === "Shuffle Tools") {
const iconInfo = GetIconInfo(nodedata) const iconInfo = GetIconInfo(nodedata)
const svg_pin = `<svg width="${svgSize}" height="${svgSize}" viewBox="0 0 ${svgSize} ${svgSize}" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="${iconInfo.icon}" fill="${iconInfo.iconColor}"></path></svg>` const svg_pin = `<svg width="${svgSize}" height="${svgSize}" viewBox="0 0 ${svgSize} ${svgSize}" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="${iconInfo.icon}" fill="${iconInfo.iconColor}"></path></svg>`
@@ -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) { if (workflow.actions === undefined || workflow.actions === null) {
workflow.actions = [nodedata] workflow.actions = [nodedata]
} else { } else {