Properly implemented default environment

This commit is contained in:
frikky
2020-08-24 08:34:42 +02:00
parent bdcb3ecfde
commit 9fa2865430
3 changed files with 65 additions and 23 deletions
+23 -6
View File
@@ -1240,11 +1240,16 @@ func setNewWorkflow(resp http.ResponseWriter, request *http.Request) {
workflowapps, err := getAllWorkflowApps(ctx)
if err == nil {
// FIXME: Add real env
//q := datastore.NewQuery("Environments").Limit(1)
//count, err := dbclient.Get(ctx, q)
//envName := "Shuffle"
//if err == nil {
//}
envName := "Shuffle"
environments, err := getEnvironments(ctx)
if err == nil {
for _, env := range environments {
if env.Default {
envName = env.Name
break
}
}
}
for _, item := range workflowapps {
if item.Name == "Testing" && item.AppVersion == "1.0.0" {
@@ -1253,7 +1258,7 @@ func setNewWorkflow(resp http.ResponseWriter, request *http.Request) {
newActions = append(newActions, Action{
Label: "Start node",
Name: "hello_world",
Environment: "Shuffle",
Environment: envName,
Parameters: []WorkflowAppActionParameter{},
Position: struct {
X float64 "json:\"x\" datastore:\"x\""
@@ -3104,6 +3109,18 @@ func getWorkflow(ctx context.Context, id string) (*Workflow, error) {
return workflow, nil
}
func getEnvironments(ctx context.Context) ([]Environment, error) {
var environments []Environment
q := datastore.NewQuery("Environments")
_, err := dbclient.GetAll(ctx, q, &environments)
if err != nil {
return []Environment{}, err
}
return environments, nil
}
func getAllWorkflows(ctx context.Context) ([]Workflow, error) {
var allworkflows []Workflow
q := datastore.NewQuery("workflow")
File diff suppressed because one or more lines are too long
+3 -3
View File
@@ -476,7 +476,7 @@ const Workflows = (props) => {
var results = data.results.length
}
return (
<Paper square style={paperAppStyle} onClick={() => {
<Paper key={data.id} square style={paperAppStyle} onClick={() => {
setSelectedExecution(data)
}}>
<div style={{marginLeft: "10px", marginTop: "5px", marginBottom: "5px", width: boxWidth, backgroundColor: boxColor}} />
@@ -851,7 +851,7 @@ const Workflows = (props) => {
}
const modalView = modalOpen ?
<Dialog modal
<Dialog
open={modalOpen}
onClose={() => {setModalOpen(false)}}
PaperProps={{
@@ -1090,7 +1090,7 @@ const Workflows = (props) => {
}
const workflowDownloadModalOpen = loadWorkflowsModalOpen ?
<Dialog modal
<Dialog
open={loadWorkflowsModalOpen}
onClose={() => {
}}