From 096bfbca739edf5a5be069c21a381e745024c38c Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Sun, 21 Feb 2021 17:42:02 +0100
Subject: [PATCH] #266: Fixed key:value store for options with ||

---
 backend/app_sdk/app_base.py            | 14 ++++++++++
 frontend/src/views/AngularWorkflow.jsx | 36 ++++++++++++++++----------
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py
index 56a320c6..e428da9f 100644
--- a/backend/app_sdk/app_base.py
+++ b/backend/app_sdk/app_base.py
@@ -1423,6 +1423,20 @@ class AppBase:
                         for parameter in action["parameters"]:
                             counter += 1
 
+                            # Hack for key:value in options using ||
+                            try:
+                                if parameter["options"] != None and len(parameter["options"]) > 0:
+                                    #print(f'OPTIONS: {parameter["options"]}')
+                                    #print(f'OPTIONS VAL: {parameter}')
+                                    if "||" in parameter["value"]:
+                                        splitvalue = parameter["value"].split("||")
+                                        if len(splitvalue) > 1:
+                                            print(f'[INFO] Parsed split || options of actions["parameters"]["name"]')
+                                            action["parameters"][counter]["value"] = splitvalue[1]
+
+                            except (IndexError, KeyError, TypeError) as e:
+                                print("Options err: {e}")
+
                             if parameter["name"] == "body": 
                                 bodyindex = counter
                                 #print("PARAM: %s" % parameter)
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index eb88c253..79979409 100644
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -3355,11 +3355,19 @@ const AngularWorkflow = (props) => {
 									}}
 									style={{backgroundColor: surfaceColor, color: "white", height: "50px"}}
 									>
-									{selectedActionParameters[count].options.map(data => (
-										<MenuItem key={data} style={{backgroundColor: inputColor, color: "white"}} value={data}>
-											{data}
-										</MenuItem>
-									))}
+									{selectedActionParameters[count].options.map((data, index) => {
+										const split_data = data.split("||")
+										var viewed_data = data
+										if (split_data.length > 1) {
+											viewed_data = split_data[0]
+										}
+
+										return (
+											<MenuItem key={data} style={{backgroundColor: inputColor, color: "white"}} value={data}>
+												{viewed_data}
+											</MenuItem>
+										)
+									})}
 								</Select>
 
 						} else if (data.variant === "STATIC_VALUE") {
@@ -6628,15 +6636,15 @@ const AngularWorkflow = (props) => {
 					<div style={{display: "flex"}}>
 						<h2>Executing Workflow</h2>		
 						<Tooltip color="primary" title="Rerun workflow" placement="top">
-							<span>
-							<Button color="primary" style={{float: "right"}} onClick={() => {
-								console.log("DATA: ", executionData)
-								executeWorkflow(executionData.execution_argument, executionData.start)
-								setExecutionModalOpen(false)
-								//executionText, workflow.start)
-							}}>
-								<CachedIcon style={{}}/>
-							</Button>
+							<span style={{}}>
+								<Button color="primary" style={{float: "right", marginTop: 20, marginLeft: 10,}} onClick={() => {
+									console.log("DATA: ", executionData)
+									executeWorkflow(executionData.execution_argument, executionData.start)
+									setExecutionModalOpen(false)
+									//executionText, workflow.start)
+								}}>
+									<CachedIcon style={{}}/>
+								</Button>
 							</span>
 						</Tooltip>
 					</div>