diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py index 3fc01232..794fc9ae 100644 --- a/backend/app_sdk/app_base.py +++ b/backend/app_sdk/app_base.py @@ -393,12 +393,19 @@ class AppBase: # FIXME: This is absolutely not perfect. print("In recursion v2: ", actualitem) + is_loop = True newvalue = [] firstitem = actualitem[0][0] seconditem = actualitem[0][1] + + # Means it's a single item -> continue if seconditem == "": - print("In first") - newvalue = basejson[int(firstitem)] + print("In first - handling %s", seconditem) + tmpitem = basejson[int(firstitem)] + try: + newvalue, is_loop = recurse_json(tmpitem, parsersplit[outercnt+1:]) + except IndexError: + newvalue, is_loop = (tmpitem, parsersplit[outercnt+1:]) else: if seconditem == "max": seconditem = len(basejson) @@ -422,7 +429,7 @@ class AppBase: #exit() newvalue.append(ret) - return newvalue, True + return newvalue, is_loop # FIXME: Add specific loop for other indexes else: diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx index 33f9b67f..6ab6e3f3 100644 --- a/frontend/src/views/AngularWorkflow.jsx +++ b/frontend/src/views/AngularWorkflow.jsx @@ -3069,7 +3069,7 @@ const AngularWorkflow = (props) => { } parentMenuOpen={!!menuPosition} - style={{backgroundColor: inputColor, color: "white"}} + style={{backgroundColor: inputColor, color: "white", minWidth: 250,}} onClick={() => { handleItemClick([innerdata]) }} @@ -3078,7 +3078,7 @@ const AngularWorkflow = (props) => { // FIXME: Should be recursive in here const icon = pathdata.type === "value" ? : pathdata.type === "list" ? : return ( - {}} + {}} onClick={() => { handleItemClick([innerdata, pathdata]) }} diff --git a/frontend/src/views/Apps.jsx b/frontend/src/views/Apps.jsx index b9d6365c..9c4fb0ab 100644 --- a/frontend/src/views/Apps.jsx +++ b/frontend/src/views/Apps.jsx @@ -67,7 +67,7 @@ export const GetParsedPaths = (inputdata, basekey) => { return parsedValues } - console.log("KEY: ", key, "VALUE: ", value, "BASEKEY: ", basekeyname) + //console.log("KEY: ", key, "VALUE: ", value, "BASEKEY: ", basekeyname) if (typeof(value) === 'object') { if (Array.isArray(value)) { // Check if each item is object