From 83089d2d39f839d1cc7177de508d20696512e2ef Mon Sep 17 00:00:00 2001 From: frikky Date: Fri, 13 Nov 2020 14:24:17 +0100 Subject: [PATCH] Started work on user input trigger --- backend/go-app/main.go | 18 +++++ backend/go-app/walkoff.go | 101 ++++++++++++++++++++++- frontend/src/views/AngularWorkflow.jsx | 106 ++++++++++++++++++------- 3 files changed, 196 insertions(+), 29 deletions(-) diff --git a/backend/go-app/main.go b/backend/go-app/main.go index 1d2bed7c..406a7c7b 100644 --- a/backend/go-app/main.go +++ b/backend/go-app/main.go @@ -280,6 +280,7 @@ type ScheduleOld struct { LastModificationtime int64 `json:"lastmodificationtime" datastore:"lastmodificationtime,noindex"` LastRuntime int64 `json:"lastruntime" datastore:"lastruntime,noindex"` Frequency string `json:"frequency" datastore:"frequency,noindex"` + Environment string `json:"environment" datastore:"environment"` } // Returned from /GET /schedules @@ -1184,6 +1185,7 @@ func createNewUser(username, password, role, apikey string, org Org) error { } neworg, err := getOrg(ctx, org.Id) + log.Printf("Users: %d", len(org.Users)) if err == nil { log.Printf("Updating org %s with user %s", org.Name, newUser.Username) neworg.Users = append(org.Users, *newUser) @@ -2817,6 +2819,8 @@ func fixUserOrg(ctx context.Context, user *User) *User { continue } + log.Printf("Org users: %d", len(org.Users)) + orgIndex := 0 userFound := false for index, orgUser := range org.Users { @@ -2838,6 +2842,7 @@ func fixUserOrg(ctx context.Context, user *User) *User { org.Users = append(org.Users, *user) } + log.Printf("Users 2: %d", len(org.Users)) err = setOrg(ctx, *org, orgId) if err != nil { log.Printf("Failed setting org %s", orgId) @@ -7190,6 +7195,12 @@ func runInit(ctx context.Context) { continue } + log.Printf("ENV: %s", item.Environment) + if item.Environment == "cloud" { + log.Printf("Skipping cloud schedule") + continue + } + item.Org = activeOrgs[0].Id err = setSchedule(ctx, item) if err != nil { @@ -7241,6 +7252,11 @@ func runInit(ctx context.Context) { } else { log.Printf("Setting up %d schedule(s)", len(schedules)) for _, schedule := range schedules { + if schedule.Environment == "cloud" { + log.Printf("Skipping cloud schedule") + continue + } + //log.Printf("Schedule: %#v", schedule) job := func() { request := &http.Request{ @@ -8146,6 +8162,8 @@ func initHandlers() { // NEW for 0.8.0 r.HandleFunc("/api/v1/cloud/setup", handleCloudSetup).Methods("POST", "OPTIONS") + + // Orgs r.HandleFunc("/api/v1/orgs", handleGetOrgs).Methods("GET", "OPTIONS") r.HandleFunc("/api/v1/orgs/{orgId}", handleGetOrg).Methods("GET", "OPTIONS") r.HandleFunc("/api/v1/orgs/{orgId}", handleEditOrg).Methods("POST", "OPTIONS") diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go index 140924d1..1eef8da3 100644 --- a/backend/go-app/walkoff.go +++ b/backend/go-app/walkoff.go @@ -85,6 +85,8 @@ type SyncData struct { Name string `json:"name" datastore:"name"` Description string `json:"description" datastore:"description"` Limit int64 `json:"limit" datastore:"limit"` + StartDate int64 `json:"start_date" datastore:"start_date"` + EndDate int64 `json:"end_date" datastore:"end_date"` } type SyncConfig struct { @@ -354,6 +356,7 @@ type Workflow struct { Name string `json:"name" datastore:"name"` Value string `json:"value" datastore:"value,noindex"` } `json:"execution_variables,omitempty" datastore:"execution_variables"` + ExecutionEnvironment string `json:"execution_environment" datastore:"execution_environment"` } type ActionResult struct { @@ -572,6 +575,7 @@ func createSchedule(ctx context.Context, scheduleId, workflowId, name, startNode LastModificationtime: timeNow, LastRuntime: timeNow, Org: orgId, + Environment: "onprem", } err = setSchedule(ctx, schedule) @@ -1461,7 +1465,27 @@ func setNewWorkflow(resp http.ResponseWriter, request *http.Request) { log.Printf("Has %d actions already", len(newActions)) } + for _, item := range workflow.Actions { + item.ID = uuid.NewV4().String() + newActions = append(newActions, item) + } + + newTriggers := []Trigger{} + for _, item := range workflow.Triggers { + item.Status = "uninitialized" + item.ID = uuid.NewV4().String() + newTriggers = append(newTriggers, item) + } + + newSchedules := []Schedule{} + for _, item := range workflow.Schedules { + item.Id = uuid.NewV4().String() + newSchedules = append(newSchedules, item) + } + workflow.Actions = newActions + workflow.Triggers = newTriggers + workflow.Schedules = newSchedules workflow.IsValid = true workflow.Configuration.ExitOnError = false @@ -3025,10 +3049,61 @@ func stopSchedule(resp http.ResponseWriter, request *http.Request) { return } + schedule, err := getSchedule(ctx, scheduleId) + if err != nil { + log.Printf("Failed finding schedule %s", scheduleId) + resp.WriteHeader(401) + resp.Write([]byte(`{"success": false}`)) + return + } + + log.Printf("Schedule: %#v", schedule) + + if schedule.Environment == "cloud" { + log.Printf("[INFO] Should STOP a cloud schedule for workflow %s with schedule ID %s", fileId, scheduleId) + // https://shuffler.io/v1/hooks/webhook_80184973-3e82-4852-842e-0290f7f34d7c + org, err := getOrg(ctx, user.ActiveOrg.Id) + if err != nil { + log.Printf("Failed finding org %s: %s", org.Id, err) + return + } + + // 1. Send request to cloud + // 2. Remove schedule if success + action := CloudSyncJob{ + Type: "schedule", + Action: "stop", + OrgId: org.Id, + PrimaryItemId: scheduleId, + SecondaryItem: schedule.Frequency, + ThirdItem: workflow.ID, + } + + err = executeCloudAction(action, org.SyncConfig.Apikey) + if err != nil { + log.Printf("Failed cloud action STOP schedule", err) + resp.WriteHeader(401) + resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "%s"}`, err))) + return + } else { + log.Printf("Successfully ran cloud action STOP schedule") + err = DeleteKey(ctx, "schedules", scheduleId) + if err != nil { + log.Printf("Failed deleting cloud schedule onprem..") + resp.WriteHeader(401) + resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed deleting cloud schedule"}`))) + return + } + + resp.WriteHeader(200) + resp.Write([]byte(fmt.Sprintf(`{"success": true}`))) + return + } + } + err = deleteSchedule(ctx, scheduleId) if err != nil { log.Printf("Failed deleting schedule: %s", err) - if strings.Contains(err.Error(), "Job not found") { resp.WriteHeader(200) resp.Write([]byte(fmt.Sprintf(`{"success": true}`))) @@ -3329,8 +3404,30 @@ func scheduleWorkflow(resp http.ResponseWriter, request *http.Request) { FourthItem: schedule.ExecutionArgument, } - log.Printf("Action: %#v", action) + timeNow := int64(time.Now().Unix()) + newSchedule := ScheduleOld{ + Id: schedule.Id, + WorkflowId: workflow.ID, + StartNode: startNode, + Argument: string(schedule.ExecutionArgument), + WrappedArgument: parsedBody, + CreationTime: timeNow, + LastModificationtime: timeNow, + LastRuntime: timeNow, + Org: org.Id, + Frequency: schedule.Frequency, + Environment: "cloud", + } + err = setSchedule(ctx, newSchedule) + if err != nil { + log.Printf("Failed setting cloud schedule: returning", err) + resp.WriteHeader(401) + resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "%s"}`, err))) + return + } + + log.Printf("Action: %#v", action) err = executeCloudAction(action, org.SyncConfig.Apikey) if err != nil { log.Printf("Failed cloud action START schedule", err) diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx index ee973c89..b8e15488 100644 --- a/frontend/src/views/AngularWorkflow.jsx +++ b/frontend/src/views/AngularWorkflow.jsx @@ -796,6 +796,7 @@ const AngularWorkflow = (props) => { "Testing", "Http", ] + const getAppAuthentication = () => { fetch(globalUrl+"/api/v1/apps/authentication", { method: 'GET', @@ -4860,6 +4861,9 @@ const AngularWorkflow = (props) => { // email,sms,app ... workflow.triggers[selectedTriggerIndex].parameters[2] = {"name": "type", "value": "email"} + + workflow.triggers[selectedTriggerIndex].parameters[3] = {"name": "email", "value": "test@test.com"} + workflow.triggers[selectedTriggerIndex].parameters[4] = {"name": "sms", "value": "0000000"} setWorkflow(workflow) } @@ -4868,7 +4872,7 @@ const AngularWorkflow = (props) => {

{selectedTrigger.app_name}: {selectedTrigger.status}

- What are user inputs? + What is the user input trigger?
@@ -4949,33 +4953,79 @@ const AngularWorkflow = (props) => { - { - setTriggerOptionsWrapper("email") - }} - color="primary" - value="email" - /> - } - label={
Email
} - /> - { - setTriggerOptionsWrapper("sms") - }} - color="primary" - value="sms" - /> - } - label={
SMS
} - /> + { + setTriggerOptionsWrapper("email") + }} + color="primary" + value="email" + /> + } + label={
Email
} + /> + { + setTriggerOptionsWrapper("sms") + }} + color="primary" + value="sms" + /> + } + label={
SMS
} + /> + {workflow.triggers[selectedTriggerIndex].parameters[2] !== undefined && workflow.triggers[selectedTriggerIndex].parameters[2].value.includes("email") ? + { + workflow.triggers[selectedTriggerIndex].parameters[3].value = event.target.value + setWorkflow(workflow) + setUpdate(Math.random()) + }} + /> + : null + } + {workflow.triggers[selectedTriggerIndex].parameters[2] !== undefined && workflow.triggers[selectedTriggerIndex].parameters[2].value.includes("sms") ? + { + workflow.triggers[selectedTriggerIndex].parameters[4].value = event.target.value + setWorkflow(workflow) + setUpdate(Math.random()) + }} + /> + : null + } ) @@ -5996,7 +6046,9 @@ const AngularWorkflow = (props) => { setNewAppAuth(newAuthOption) appAuthentication.push(newAuthOption) setAppAuthentication(appAuthentication) + getAppAuthentication() setUpdate(authenticationOption.id) + } return (