From 619fcac49988a4bb14c47669a60bb21b9e5e05ea Mon Sep 17 00:00:00 2001 From: frikky Date: Fri, 18 Mar 2022 22:14:17 +0100 Subject: [PATCH] Fixed issue with trigger selection --- backend/go-app/go.mod | 2 +- backend/go-app/main.go | 8 ++++---- frontend/src/components/ParsedAction.jsx | 2 -- frontend/src/views/Admin.jsx | 2 ++ frontend/src/views/AngularWorkflow.jsx | 16 +++++++++++++--- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod index 5fea5ec6..c2060f41 100644 --- a/backend/go-app/go.mod +++ b/backend/go-app/go.mod @@ -2,7 +2,7 @@ module main go 1.16 -//replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared +replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared //replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi //replace github.com/frikky/go-elasticsearch => ../../../../git/go-elasticsearch diff --git a/backend/go-app/main.go b/backend/go-app/main.go index e47dbbbf..36ccd48c 100644 --- a/backend/go-app/main.go +++ b/backend/go-app/main.go @@ -3732,12 +3732,12 @@ func remoteOrgJobController(org shuffle.Org, body []byte) error { if err != nil { log.Printf("[WARNING] Failed setting organization when stopping sync: %s", err) } else { - log.Printf("[INFO] Successfully STOPPED org cloud sync for %s", org.Id) + log.Printf("[INFO] Successfully STOPPED org cloud sync for %s (%s)", org.Name, org.Id) } return errors.New("Stopped schedule for org locally because of bad apikey.") } else { - return errors.New(fmt.Sprintf("Failed finding the schedule for org %s", org.Id)) + return errors.New(fmt.Sprintf("Failed finding the schedule for org %s (%s)", org.Name, org.Id)) } } @@ -4048,7 +4048,7 @@ func runInitEs(ctx context.Context) { continue } - log.Printf("[DEBUG] Should start schedule for org %s", org.Name) + log.Printf("[DEBUG] Should start schedule for org %s (%s)", org.Name, org.Id) job := func() { err := remoteOrgJobHandler(org, interval) if err != nil { @@ -4737,7 +4737,7 @@ func runInit(ctx context.Context) { continue } - log.Printf("[DEBUG] Should start schedule for org %s", org.Name) + log.Printf("[DEBUG] Should start schedule for org %s (%s)", org.Name, org.Id) job := func() { err := remoteOrgJobHandler(org, interval) if err != nil { diff --git a/frontend/src/components/ParsedAction.jsx b/frontend/src/components/ParsedAction.jsx index 95aea682..9b5f086a 100644 --- a/frontend/src/components/ParsedAction.jsx +++ b/frontend/src/components/ParsedAction.jsx @@ -2881,8 +2881,6 @@ const ParsedAction = (props) => { newActionname.substring(1) ).replaceAll("_", " "); - - return ( { return } + console.log("event: ", event.target.value) setMatchingOrganizations(event.target.value) // Workaround for empty orgs if (event.target.value.length === 0) { @@ -1643,6 +1644,7 @@ const Admin = (props) => { } setUser(selectedUser.id, "suborgs", event.target.value) + //setUser(selectedUser.id, "suborgs", matchingOrganizations) } const userOrgEdit = selectedUser.id !== undefined && selectedUser.orgs !== undefined && selectedUser.orgs !== null && selectedOrganization.child_orgs !== undefined && selectedOrganization.child_orgs !== null && selectedOrganization.child_orgs.length > 0 ? diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx index fb846e02..670d3098 100644 --- a/frontend/src/views/AngularWorkflow.jsx +++ b/frontend/src/views/AngularWorkflow.jsx @@ -1852,6 +1852,7 @@ const AngularWorkflow = (defaultprops) => { setTriggerAuthentication({}) setSelectedTriggerIndex(-1) setTriggerFolders([]) + setSubworkflow({}) // Can be used for right side view setRightSideBarOpen(false); @@ -2417,6 +2418,7 @@ const AngularWorkflow = (defaultprops) => { //var newapps = JSON.parse(JSON.stringify(apps)) var newapps = apps + console.log(event.target.data()) const curapp = newapps.find( (a) => a.name === curaction.app_name && @@ -2607,7 +2609,7 @@ const AngularWorkflow = (defaultprops) => { selected: "", }); }) - }; + } const activateApp = (appid) => { fetch(globalUrl+"/api/v1/apps/"+appid+"/activate", { @@ -5815,11 +5817,19 @@ const AngularWorkflow = (defaultprops) => { const newaction = selectedApp.actions.find( (a) => a.name === e.target.value ); + if (newaction === undefined || newaction === null) { alert.error("Failed to find the action"); return; } + if (workflow.actions !== undefined && workflow.actions !== null) { + const foundInfo = workflow.actions.find(ac => ac.id === selectedAction.id) + console.log("aigo: ", foundInfo) + } + + console.log("PRe: ", selectedAction) + // Does this one find the wrong one? //var newSelectedAction = JSON.parse(JSON.stringify(selectedAction)) var newSelectedAction = selectedAction @@ -5832,7 +5842,7 @@ const AngularWorkflow = (defaultprops) => { // Simmple action swap autocompleter if (selectedAction.parameters !== undefined && newSelectedAction.parameters !== undefined && selectedAction.id === newSelectedAction.id) { - //console.log("OLD: ", selectedAction, "NEW: ", newSelectedAction) + console.log("OLD: ", selectedAction, "NEW: ", newSelectedAction) for (var paramkey in selectedAction.parameters) { const param = selectedAction.parameters[paramkey]; @@ -5914,7 +5924,7 @@ const AngularWorkflow = (defaultprops) => { //setSelectedActionEnvironment(env) - console.log("ACTION: ", newSelectedAction); + console.log("NEW ACTION: ", newSelectedAction); setSelectedAction(newSelectedAction); if (workflow.actions !== undefined && workflow.actions !== null && workflow.actions.length > 0) { const foundActionIndex = workflow.actions.findIndex(actiondata => actiondata.id === newSelectedAction.id)