BUG: Fixed bug in app sdk for OpenAPI lists

backend/app_sdk/app_base.py

@@ -147,6 +147,7 @@ class AppBase:
         #self.action = action
 
         loopnames = []
+        print(f"Baseparams to check!!: {baseparams}")
         for key, value in baseparams.items():
             check_value = ""
             for param in self.action["parameters"]:
@@ -160,6 +161,7 @@ class AppBase:
                     self.result_wrapper_count = octothorpe_count
                     print("[INFO] NEW OCTOTHORPE WRAPPER: %d" % octothorpe_count)
 
+
             # This whole thing is hard.
             # item = [{"data": "1.2.3.4", "dataType": "ip"}] 
             # $item         = DONT loop items. 
@@ -178,12 +180,40 @@ class AppBase:
             # FIXME: Check the above, and fix so that nested looped items can be 
             # Skipped if wanted
 
-            print("\nCHECK: %s" % check_value)
+            #print("\nCHECK: %s" % check_value)
+            #try:
+            #    values = parameter["value_replace"]
+            #    if values != None:
+            #        print(values)
+            #        for val in values:
+            #            print(val)
+            #except:
+            #    pass
+
             should_merge = False
             if "#" in check_value:
                 should_merge = True
 
+            # Specific for OpenAPI body replacement
+            print("\n\n\nDOING STUFF BELOW HERE")
+            if not should_merge:
+                for parameter in self.action["parameters"]:
+                    if parameter["name"] == key:
+                        print("CHECKING BODY FOR VALUE REPLACE DATA!")
+                        try:
+                            values = parameter["value_replace"]
+                            if values != None:
+                                print(values)
+                                for val in values:
+                                    if "#" in val["value"]:
+                                        should_merge = True
+                                        break
+                        except:
+                            pass
+
+            print(f"MERGE: {should_merge}")
             if isinstance(value, list):
+                print("Item {value} is a list.")
                 if len(value) <= 1:
                     if len(value) == 1:
                         baseparams[key] = value[0]
@@ -206,7 +236,7 @@ class AppBase:
                 all_list_keys.append(key)
                 all_lists.append(baseparams[key])
             else:
-                print("%s is not a list: " % value)
+                print(f"{value} is not a list")
 
         print("Listlengths: %s" % listlengths)
         if len(listlengths) == 0:
@@ -271,20 +301,25 @@ class AppBase:
 
     # Runs recursed versions with inner loops and such 
     async def run_recursed_items(self, func, baseparams, loop_wrapper):
+        print(f"RECURSED ITEMS: {baseparams}")
         has_loop = False
 
         newparams = {}
         for key, value in baseparams.items():
             if isinstance(value, list) and len(value) > 0:
-                print("In list check")
+                print(f"In list check for {key}")
+
                 try:
-                    value[0] = json.loads(value[0])
+                    # Added skip for body (OpenAPI) which uses data= in requests
+                    # Can be screwed up if they name theirs body too 
+                    if key != "body":
+                        value[0] = json.loads(value[0])
                 except json.decoder.JSONDecodeError as e:
                     print("JSON casting error: %s" % e)
                 except TypeError as e:
                     print("TypeError: %s" % e)
 
-                print("POST list check")
+                print("POST initial list check")
 
             if isinstance(value, list) and len(value) == 1 and isinstance(value[0], list):
                 try:
@@ -294,12 +329,11 @@ class AppBase:
                 except KeyError:
                     loop_wrapper[key] = 1
 
-                print("Key %s is a list: %s" % (key, value))
+                print(f"Key {key} is a list: {value}")
                 newparams[key] = value[0]
                 has_loop = True 
             else:
-                print("Key %s is NOT a list within a list" % (key))
+                print(f"Key {key} is NOT a list within a list. Value: {value}")
-
                 newparams[key] = value
         
         results = []
@@ -315,6 +349,7 @@ class AppBase:
 
             print("[INFO] Multiplier length: %d" % len(param_multiplier))
             for subparams in param_multiplier:
+                print(f"SUBPARAMS IN MULTI: {subparams}")
                 try:
                     tmp = await func(**subparams)
                 except:
@@ -1361,6 +1396,7 @@ class AppBase:
     
             return True, ""
 
+        # THE START IS ACTUALLY RIGHT HERE :O
         # Checks whether conditions are met, otherwise set 
         branchcheck, tmpresult = check_branch_conditions(action, fullexecution)
         if not branchcheck:
@@ -1437,6 +1473,10 @@ class AppBase:
                             except (IndexError, KeyError, TypeError) as e:
                                 print("Options err: {e}")
 
+                            # This part is purely for OpenAPI accessibility. 
+                            # It replaces the data back into the main item
+                            # Earlier, we handled each of the items and did later string replacement, 
+                            # but this has changed to do lists within items and such
                             if parameter["name"] == "body": 
                                 bodyindex = counter
                                 #print("PARAM: %s" % parameter)
@@ -1445,16 +1485,27 @@ class AppBase:
                                     if values != None:
                                         added = 0
                                         for val in values:
-                                            newparams.append({
+                                            print(f"VAL: {val}")
-                                                "name": val["key"],
+                                            #parameter["value"].replace(val["key"], val["value"], -1)
-                                                "value": val["value"],
+                                            print(f'PARAM1: {action["parameters"][counter]["value"]}')
-                                                "variant": "STATIC_VALUE",
+                                            action["parameters"][counter]["value"] = action["parameters"][counter]["value"].replace(val["key"], val["value"], 1)
-                                                "id": "body_replacement",
+                                            #action["parameters"][counter]["value"].replace(r"${url}", r"$Find_URLs.valid.#.data", 1)
-                                            })
+                                            print(f'PARAM2: {action["parameters"][counter]["value"]}')
+                                            #newparams.append({
+                                            #    "name": val["key"],
+                                            #    "value": val["value"],
+                                            #    "variant": "STATIC_VALUE",
+                                            #    "id": "body_replacement",
+                                            #    "schema": {
+                                            #        "type": "string",
+                                            #    },
+                                            #})
 
-                                            print("Added param %s for body" % val["key"])
+                                            print(f'[INFO] Added param {val["key"]} for body with value {val["value"]} (using OpenAPI)')
                                             added += 1
 
+                                        #action["parameters"]["body"]
+
                                         print("ADDED %d parameters for body" % added)
                                 except KeyError as e:
                                     print("KeyError body OpenAPI: %s" % e)
@@ -1462,6 +1513,7 @@ class AppBase:
 
                                 break
 
+                        print(action["parameters"])
                         for parameter in newparams:
                             action["parameters"].append(parameter)
 
@@ -1478,6 +1530,7 @@ class AppBase:
                         multi_parameters = json.loads(json.dumps(params))
                         multiexecution = False
                         multi_execution_lists = []
+                        remove_params = []
                         for parameter in action["parameters"]:
                             check, value, is_loop = parse_params(action, fullexecution, parameter)
                             if check:
@@ -1506,6 +1559,7 @@ class AppBase:
                                 print("Before first part in multiexec!")
                                 handled = False
                                 if len(actualitem[0]) > 2 and actualitem[0][1] == "SHUFFLE_NO_SPLITTER":
+
                                     print("(1) Pre replacement: %s" % actualitem[0][2])
                                     tmpitem = value
 
@@ -1555,10 +1609,10 @@ class AppBase:
                                     tmpitem = tmpitem.replace(actualitem[0][0], replacement, 1)
 
                                     # This code handles files.
-                                    print("(1) ------------ PARAM: %s" % parameter["schema"]["type"])
                                     resultarray = []
                                     isfile = False
                                     try:
+                                        print("(1) ------------ PARAM: %s" % parameter["schema"]["type"])
                                         if parameter["schema"]["type"] == "file" and len(value) > 0:
                                             print("(1) SHOULD HANDLE FILE IN MULTI. Get based on value %s" % tmpitem) 
                                             # This is silly :)
@@ -1572,8 +1626,10 @@ class AppBase:
                                                 print("(1) FILE VALUE FOR VAL %s: %s" % (tmp_file_split, file_value))
 
                                             isfile = True
+                                    except NameError as e:
+                                        print("(1) SCHEMA NAMEERROR IN FILE HANDLING: %s" % e)
                                     except KeyError as e:
-                                        print("(1) SCHEMA ERROR IN FILE HANDLING: %s" % e)
+                                        print("(1) SCHEMA KEYERROR IN FILE HANDLING: %s" % e)
                                     except json.decoder.JSONDecodeError as e:
                                         print("(1) JSON ERROR IN FILE HANDLING: %s" % e)
 
@@ -1589,7 +1645,7 @@ class AppBase:
                                     multi_execution_lists.append(new_replacement)
                                     #print("MULTI finished: %s" % json_replacement)
                                 else:
-                                    print("(2) Pre replacement. ") #% actualitem)
+                                    print("(2) Pre replacement (loop with variables). ") #% actualitem)
                                     # This is here to handle for loops within variables.. kindof
                                     # 1. Find the length of the longest array
                                     # 2. Build an array with the base values based on parameter["value"] 
@@ -1664,22 +1720,56 @@ class AppBase:
                                         multi_execution_lists.append(resultarray)
 
                                     multi_parameters[parameter["name"]] = resultarray
+
+                                    #if parameter["id"] == "body_replacement": 
+                                    #    print("Should run body MULTI replacement in index %d with %s" % (bodyindex, parameter))
+                                    #    try:
+                                    #        print("PREBODY: %s" % params["body"])
+
+                                    #        parsedarray = str(resultarray)
+                                    #        try:
+                                    #            parsedarray = json.dumps(resultarray)
+                                    #        except:
+                                    #            pass
+
+                                    #        if f'\"{parameter["name"]}\"' in params["body"]:
+                                    #            params["body"] = params["body"].replace(f'\"{parameter["name"]}\"' , parsedarray, -1)
+                                    #            multi_parameters["body"] = multi_parameters["body"].replace(f'\"{parameter["name"]}\"' , parsedarray, -1)
+                                    #        else:
+                                    #            params["body"] = params["body"].replace(parameter["name"], parsedarray, -1)
+                                    #            multi_parameters["body"] = multi_parameters["body"].replace(parameter["name"], parsedarray, -1)
+
+                                    #        #print("POSTBODY: %s" % params["body"])
+                                    #        #if isinstance(multi_parameters, list):
+                                    #        #    print("MULTIPARAM AS LIST (NOT REPLACING!!)!")
+                                    #        #    for multiparam in multi_parameters:
+                                    #        #        print(f"MULTIPARAM: {multiparam}")
+                                    #        #        #multi_parameters["body"] = multi_parameters["body"].replace(parameter["name"], str(parameter["value"]), -1)
+                                    #        #else:
+                        
+                                    #    except KeyError as e:
+                                    #        print("KEYERROR: %s" % e)
+
+                                    #    remove_params.append(parameter["name"])
+                                    #    #bodyindex = counter
+                                    #    continue
+
                             else:
                                 # Parses things like int(value)
                                 print("Normal parsing (not looping)")#with data %s" % value)
                                 value = parse_wrapper_start(value)
 
-                                if parameter["id"] == "body_replacement": 
+                                #if parameter["id"] == "body_replacement": 
-                                    print("Should run body replacement in index %d with %s" % (bodyindex, parameter))
+                                #    print("Should run body replacement in index %d with %s" % (bodyindex, parameter))
-                                    try:
+                                #    try:
-                                        print("PREBODY: %s" % params["body"])
+                                #        print("PREBODY: %s" % params["body"])
-                                        params["body"] = params["body"].replace(parameter["name"], parameter["value"], -1)
+                                #        params["body"] = params["body"].replace(parameter["name"], parameter["value"], -1)
-                                        print("POSTBODY: %s" % params["body"])
+                                #        print("POSTBODY: %s" % params["body"])
-                                    except KeyError as e:
+                                #    except KeyError as e:
-                                        print("KEYERROR: %s" % e)
+                                #        print("KEYERROR: %s" % e)
 
-                                    #bodyindex = counter
+                                #    #bodyindex = counter
-                                    continue
+                                #    continue
 
                                 #for parameter in action["parameters"]:
                                 #if parameter["name"] == "body": 
@@ -1702,6 +1792,8 @@ class AppBase:
                                 except KeyError as e:
                                     print("SCHEMA ERROR IN FILE HANDLING: %s" % e)
 
+
+                        #remove_params.append(parameter["name"])
                         # Fix lists here
                         # FIXME: This doesn't really do anything anymore
                         print("CHECKING multi execution list!")
@@ -1723,7 +1815,7 @@ class AppBase:
 
                             #print("New list length: %d" % len(filteredlist))
                             if len(filteredlist) > 1:
-                                print("Calculating new multi-loop length with %d lists" % len(filteredlist))
+                                print(f"Calculating new multi-loop length with {len(filteredlist)} lists")
                                 tmplength = 1
                                 for innerlist in filteredlist:
                                     tmplength = len(innerlist)*tmplength
@@ -1733,6 +1825,25 @@ class AppBase:
 
                                 print("New multi execution length: %d\n" % tmplength)
 
+                        # Cleaning up extra list params
+                        for subparam in remove_params:
+                            #print(f"DELETING {subparam}")
+                            try:
+                                del params[subparam]
+                            except:
+                                pass
+                                #print(f"Error with subparam deletion of {subparam} in {params}")
+                            try:
+                                del multi_parameters[subparam]
+                            except:
+                                #print(f"Error with subparam deletion of {subparam} in {multi_parameters} (2)")
+                                pass
+
+                        print()
+                        print(f"Param: {params}")
+                        print(f"Multiparams: {multi_parameters}")
+                        print()
+                        
                         if not multiexecution:
                             #newparams.append({
                             #    "name": val["key"],
@@ -1744,7 +1855,7 @@ class AppBase:
                             #print("[INFO] APP_SDK DONE: Starting NORMAL execution of function")
                             print("[INFO] Running normal execution\n") 
                             newres = await func(**params)
-                            print("\n[INFO] Returned from execution with datalength!")#, newres)
+                            print("\n[INFO] Returned from execution!")#, newres)
                             if isinstance(newres, tuple):
                                 print("[INFO] Handling return as tuple")
                                 # Handles files.
@@ -1772,6 +1883,17 @@ class AppBase:
                             elif isinstance(newres, str):
                                 print("[INFO] Handling return as string of length %d" % len(newres))
                                 result += newres
+                            elif isinstance(newres, dict) or isinstance(newres, list):
+                                try:
+                                    result += json.dumps(newres, indent=4)
+                                except json.JSONDecodeError as e:
+                                    print("Failed decoding result: %s" % e)
+
+                                    try:
+                                        result += str(newres)
+                                    except ValueError:
+                                        result += "Failed autocasting. Can't handle %s type from function. Must be string" % type(newres)
+                                        print("Can't handle type %s value from function" % (type(newres)))
                             else:
                                 try:
                                     result += str(newres)
@@ -1898,10 +2020,16 @@ class AppBase:
 
                             # Dump the result as a string of a list
                             #print("RESULTS: %s" % results)
-                            if isinstance(results, list):
+                            if isinstance(results, list) or isinstance(results, dict):
                                 print("JSON OBJECT? ", json_object)
+
+                                # This part is weird lol
                                 if json_object:
-                                    result = json.dumps(results)
+                                    try:
+                                        result = json.dumps(results)
+                                    except json.JSONDecodeError as e:
+                                        print(f"Failed to decode: {e}")
+                                        result = results
                                 else:
                                     result = "["
                                     for item in results:

backend/go-app/codegen.go

@@ -1010,16 +1010,6 @@ func handleConnect(swagger *openapi3.Swagger, api WorkflowApp, extraParameters [
 	optionalQueries := []string{}
 	parameters := []string{}
 	optionalParameters := []WorkflowAppActionParameter{}
-	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
-		Name:        "ssl_verify",
-		Description: "Check if you want to verify request",
-		Multiline:   false,
-		Required:    false,
-		Example:     "True",
-		Schema: SchemaDefinition{
-			Type: "string",
-		},
-	})
 
 	headersFound := []string{}
 	if len(path.Connect.Parameters) > 0 {
@@ -1106,6 +1096,17 @@ func handleConnect(swagger *openapi3.Swagger, api WorkflowApp, extraParameters [
 		}
 	}
 
+	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
+		Name:        "ssl_verify",
+		Description: "Check if you want to verify request",
+		Multiline:   false,
+		Required:    false,
+		Example:     "True",
+		Schema: SchemaDefinition{
+			Type: "string",
+		},
+	})
+
 	// ensuring that they end up last in the specification
 	// (order is ish important for optional params) - they need to be last.
 	for _, optionalParam := range optionalParameters {
@@ -1145,16 +1146,6 @@ func handleGet(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
 	// FIXME - remove this when authentication is properly introduced
 	parameters := []string{}
 	optionalParameters := []WorkflowAppActionParameter{}
-	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
-		Name:        "ssl_verify",
-		Description: "Check if you want to verify the SSL certificate request",
-		Multiline:   false,
-		Required:    false,
-		Example:     "False - default=True",
-		Schema: SchemaDefinition{
-			Type: "string",
-		},
-	})
 
 	headersFound := []string{}
 	if len(path.Get.Parameters) > 0 {
@@ -1241,6 +1232,17 @@ func handleGet(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
 		}
 	}
 
+	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
+		Name:        "ssl_verify",
+		Description: "Check if you want to verify the SSL certificate request",
+		Multiline:   false,
+		Required:    false,
+		Example:     "False - default=True",
+		Schema: SchemaDefinition{
+			Type: "string",
+		},
+	})
+
 	// ensuring that they end up last in the specification
 	// (order is ish important for optional params) - they need to be last.
 	for _, optionalParam := range optionalParameters {
@@ -1280,16 +1282,6 @@ func handleHead(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
 	optionalQueries := []string{}
 	parameters := []string{}
 	optionalParameters := []WorkflowAppActionParameter{}
-	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
-		Name:        "ssl_verify",
-		Description: "Check if you want to verify request",
-		Multiline:   false,
-		Required:    false,
-		Example:     "True",
-		Schema: SchemaDefinition{
-			Type: "string",
-		},
-	})
 
 	headersFound := []string{}
 	if len(path.Head.Parameters) > 0 {
@@ -1374,6 +1366,17 @@ func handleHead(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
 		}
 	}
 
+	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
+		Name:        "ssl_verify",
+		Description: "Check if you want to verify request",
+		Multiline:   false,
+		Required:    false,
+		Example:     "True",
+		Schema: SchemaDefinition{
+			Type: "string",
+		},
+	})
+
 	// ensuring that they end up last in the specification
 	// (order is ish important for optional params) - they need to be last.
 	for _, optionalParam := range optionalParameters {
@@ -1413,16 +1416,6 @@ func handleDelete(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []
 	optionalQueries := []string{}
 	parameters := []string{}
 	optionalParameters := []WorkflowAppActionParameter{}
-	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
-		Name:        "ssl_verify",
-		Description: "Check if you want to verify request",
-		Multiline:   false,
-		Required:    false,
-		Example:     "True",
-		Schema: SchemaDefinition{
-			Type: "string",
-		},
-	})
 
 	headersFound := []string{}
 	if len(path.Delete.Parameters) > 0 {
@@ -1508,6 +1501,17 @@ func handleDelete(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []
 		}
 	}
 
+	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
+		Name:        "ssl_verify",
+		Description: "Check if you want to verify request",
+		Multiline:   false,
+		Required:    false,
+		Example:     "True",
+		Schema: SchemaDefinition{
+			Type: "string",
+		},
+	})
+
 	// ensuring that they end up last in the specification
 	// (order is ish important for optional params) - they need to be last.
 	for _, optionalParam := range optionalParameters {
@@ -1546,16 +1550,6 @@ func handlePost(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
 	optionalQueries := []string{}
 	parameters := []string{}
 	optionalParameters := []WorkflowAppActionParameter{}
-	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
-		Name:        "ssl_verify",
-		Description: "Check if you want to verify request",
-		Multiline:   false,
-		Required:    false,
-		Example:     "True",
-		Schema: SchemaDefinition{
-			Type: "string",
-		},
-	})
 
 	fileField := ""
 	if path.Post.RequestBody != nil {
@@ -1674,6 +1668,17 @@ func handlePost(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
 		}
 	}
 
+	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
+		Name:        "ssl_verify",
+		Description: "Check if you want to verify request",
+		Multiline:   false,
+		Required:    false,
+		Example:     "True",
+		Schema: SchemaDefinition{
+			Type: "string",
+		},
+	})
+
 	// ensuring that they end up last in the specification
 	// (order is ish important for optional params) - they need to be last.
 	for _, optionalParam := range optionalParameters {
@@ -1718,16 +1723,6 @@ func handlePatch(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []W
 	optionalQueries := []string{}
 	parameters := []string{}
 	optionalParameters := []WorkflowAppActionParameter{}
-	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
-		Name:        "ssl_verify",
-		Description: "Check if you want to verify request",
-		Multiline:   false,
-		Required:    false,
-		Example:     "True",
-		Schema: SchemaDefinition{
-			Type: "string",
-		},
-	})
 
 	headersFound := []string{}
 	if len(path.Patch.Parameters) > 0 {
@@ -1812,6 +1807,17 @@ func handlePatch(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []W
 		}
 	}
 
+	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
+		Name:        "ssl_verify",
+		Description: "Check if you want to verify request",
+		Multiline:   false,
+		Required:    false,
+		Example:     "True",
+		Schema: SchemaDefinition{
+			Type: "string",
+		},
+	})
+
 	// ensuring that they end up last in the specification
 	// (order is ish important for optional params) - they need to be last.
 	for _, optionalParam := range optionalParameters {
@@ -1851,16 +1857,6 @@ func handlePut(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
 	optionalQueries := []string{}
 	parameters := []string{}
 	optionalParameters := []WorkflowAppActionParameter{}
-	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
-		Name:        "ssl_verify",
-		Description: "Check if you want to verify request",
-		Multiline:   false,
-		Required:    false,
-		Example:     "True",
-		Schema: SchemaDefinition{
-			Type: "string",
-		},
-	})
 
 	headersFound := []string{}
 	if len(path.Put.Parameters) > 0 {
@@ -1946,6 +1942,17 @@ func handlePut(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
 		}
 	}
 
+	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
+		Name:        "ssl_verify",
+		Description: "Check if you want to verify request",
+		Multiline:   false,
+		Required:    false,
+		Example:     "True",
+		Schema: SchemaDefinition{
+			Type: "string",
+		},
+	})
+
 	// ensuring that they end up last in the specification
 	// (order is ish important for optional params) - they need to be last.
 	for _, optionalParam := range optionalParameters {

backend/go-app/docker.go

@@ -24,7 +24,6 @@ import (
 	"net/http"
 	"os"
 	"strings"
-	//"google.golang.org/appengine"
 )
 
 // Parses a directory with a Dockerfile into a tar for Docker images..

backend/go-app/main.go

@@ -62,16 +62,10 @@ import (
 	// githttp "gopkg.in/src-d/go-git.v4/plumbing/transport/http"
 
 	// Web
-	// "github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
+	"github.com/patrickmn/go-cache"
 	"google.golang.org/grpc"
 	http2 "gopkg.in/src-d/go-git.v4/plumbing/transport/http"
-	// Old items (cloud)
-	// "google.golang.org/appengine"
-	// "google.golang.org/appengine/memcache"
-	// applog "google.golang.org/appengine/log"
-	//cloudrun "google.golang.org/api/run/v1"
-	"github.com/patrickmn/go-cache"
 )
 
 // This is used to handle onprem vs offprem databases etc
@@ -5915,7 +5909,7 @@ func getOpenapi(resp http.ResponseWriter, request *http.Request) {
 		return
 	}
 
-	log.Printf("[INFO] API LENGTH GET: %d, ID: %s", len(parsedApi.Body), id)
+	log.Printf("[INFO] API LENGTH GET FOR OPENAPI %s: %d, ID: %s", id, len(parsedApi.Body), id)
 
 	parsedApi.Success = true
 	data, err := json.Marshal(parsedApi)
@@ -6579,7 +6573,7 @@ func verifySwagger(resp http.ResponseWriter, request *http.Request) {
 		Body: string(body),
 	}
 
-	log.Printf("[INFO] API LENGTH: %d, ID: %s", len(parsed.Body), newmd5)
+	log.Printf("[INFO] API LENGTH FOR %s: %d, ID: %s", api.Name, len(parsed.Body), newmd5)
 	// FIXME: Might cause versioning issues if we re-use the same!!
 	// FIXME: Need a way to track different versions of the same app properly.
 	// Hint: Save API.id somewhere, and use newmd5 to save latest version

backend/go-app/walkoff.go

@@ -2188,8 +2188,6 @@ func saveWorkflow(resp http.ResponseWriter, request *http.Request) {
 
 	// Here to check access rights
 	ctx := context.Background()
-	log.Println("GetWorkflow start")
-
 	tmpworkflow, err := getWorkflow(ctx, fileId)
 	if err != nil {
 		log.Printf("Failed getting the workflow locally (save workflow): %s", err)
@@ -2198,8 +2196,6 @@ func saveWorkflow(resp http.ResponseWriter, request *http.Request) {
 		return
 	}
 
-	log.Println("GetWorkflow end")
-
 	// FIXME - have a check for org etc too..
 	if user.Id != tmpworkflow.Owner && user.Role != "admin" {
 		log.Printf("Wrong user (%s) for workflow %s (save)", user.Username, tmpworkflow.ID)

frontend/src/views/AngularWorkflow.jsx

@@ -2832,7 +2832,6 @@ const AngularWorkflow = (props) => {
 						}
 
 						var exampledata = item.example === undefined ? "" : item.example
-						console.log("EXAMPLE: ", exampledata)
 						// Find previous execution and their variables
 						//exampledata === "" && 
 						if (workflowExecutions.length > 0) {
@@ -3485,10 +3484,11 @@ const AngularWorkflow = (props) => {
 
 								// Handles the fields under OpenAPI body to be parsed.
 								if (data.name.startsWith("${") && data.name.endsWith("}")) {
+									console.log("INSIDE VALUE REPLACE: ", data.name, toComplete)
 									// PARAM FIX - Gonna use the ID field, even though it's a hack
 									const paramcheck = selectedAction.parameters.find(param => param.name === "body")
 									if (paramcheck !== undefined) {
-										if (paramcheck["value_replace"] === undefined) {
+										if (paramcheck["value_replace"] === undefined || paramcheck["value_replace"] === null) {
 											paramcheck["value_replace"] = [{
 												"key": data.name,
 												"value": toComplete,
@@ -4559,14 +4559,14 @@ const AngularWorkflow = (props) => {
 
 					<div style={{display: "flex"}}>
 					<Tooltip color="primary" title={conditionValue.configuration ? "Negated" : "Default"} placement="top">
-						<span>
+						<span style={{margin: "auto", height: 50, marginBottom: "auto", marginTop: "auto", marginRight: 5}}>
-						<Button color="primary" variant={conditionValue.configuration ? "contained" : "outlined"} style={{margin: "auto", height: 50, marginBottom: "auto", marginTop: "auto", marginRight: 5}} onClick={(e) => {
+							<Button color="primary" variant={conditionValue.configuration ? "contained" : "outlined"} style={{margin: "auto", height: 50, marginBottom: "auto", marginTop: "auto", marginRight: 5}} onClick={(e) => {
-							conditionValue.configuration = !conditionValue.configuration
+								conditionValue.configuration = !conditionValue.configuration
-							setConditionValue(conditionValue)
+								setConditionValue(conditionValue)
-							setUpdate(Math.random())
+								setUpdate(Math.random())
-						}}>
+							}}>
-							{conditionValue.configuration ? "!" : "="}
+								{conditionValue.configuration ? "!" : "="}
-						</Button>
+							</Button>
 						</span>
 					</Tooltip>
 					<div style={{flex: "2"}}>
@@ -5205,7 +5205,10 @@ const AngularWorkflow = (props) => {
 									})}
 								</Select>
 							}
-							{workflow.triggers[selectedTriggerIndex].parameters[0].value.length === 0 ? null : <span style={{marginTop: 5}}><a rel="norefferer" href={`/workflows/${workflow.triggers[selectedTriggerIndex].parameters[0].value}`} target="_blank" style={{textDecoration: "none", color: "#f85a3e", marginLeft: 5,}}>Explore selected workflow</a></span>}
+							{workflow.triggers[selectedTriggerIndex].parameters[0].value.length === 0 ? null : 
+								workflow.triggers[selectedTriggerIndex].parameters[0].value === props.match.params.key ? null :
+								<span style={{marginTop: 5}}><a rel="norefferer" href={`/workflows/${workflow.triggers[selectedTriggerIndex].parameters[0].value}`} target="_blank" style={{textDecoration: "none", color: "#f85a3e", marginLeft: 5,}}>Explore selected workflow</a></span>
+							}
 
 							<div style={{marginTop: "20px", marginBottom: "7px", display: "flex"}}>
 								<div style={{width: "17px", height: "17px", borderRadius: 17 / 2, backgroundColor: "#f85a3e", marginRight: "10px"}}/>
@@ -6935,9 +6938,7 @@ const AngularWorkflow = (props) => {
 						<CloseIcon style={{color: "white"}}/>
 					</IconButton>
 				</Tooltip>
-				<div style={{marginBottom: 40,}} onClick={(event) => {
+				<div style={{marginBottom: 40,}}>
-					//event.preventDefault()	
-				}}>
 					<div style={{display: "flex", marginBottom: 15,}}>
 						{curapp === null ? null : <img alt={selectedResult.app_name} src={curapp === undefined ? "" : curapp.large_image} style={{marginRight: 20, width: imgsize, height: imgsize, border: `2px solid ${statusColor}`}} />}