From 4a6595e56a2a5cb05cbadb37a4d14953156320f7 Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Fri, 19 Jun 2020 20:42:34 +0200
Subject: [PATCH] Fixed regex parsing for action variables

---
 backend/app_sdk/app_base.py     |  3 ++-
 frontend/src/AngularWorkflow.js | 13 ++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py
index a5e52921..9131d5d8 100644
--- a/backend/app_sdk/app_base.py
+++ b/backend/app_sdk/app_base.py
@@ -415,7 +415,7 @@ class AppBase:
         def parse_params(action, fullexecution, parameter):
             # Skip if it starts with $?
             jsonparsevalue = "$."
-            match = ".*([$]{1}([a-zA-Z0-9()# _-]+\.?){1,})"
+            match = ".*([$]{1}([a-zA-Z0-9# _-]+\.?){1,})"
 
             # Regex to find all the things
             if parameter["variant"] == "STATIC_VALUE":
@@ -424,6 +424,7 @@ class AppBase:
                 #self.logger.debug(f"\n\nHandle static data with JSON: {data}\n\n")
                 #self.logger.info("STATIC PARSED: %s" % actualitem)
                 if len(actualitem) > 0:
+                    print("ACTUAL: %s", actualitem)
                     for replace in actualitem:
                         try:
                             to_be_replaced = replace[0]
diff --git a/frontend/src/AngularWorkflow.js b/frontend/src/AngularWorkflow.js
index 822bcfa7..51200e49 100644
--- a/frontend/src/AngularWorkflow.js
+++ b/frontend/src/AngularWorkflow.js
@@ -1455,7 +1455,7 @@ const AngularWorkflow = (props) => {
 		return (
 			<div style={appViewStyle}>
 				<div style={variableScrollStyle}>
-						<a href="https://shuffler.io/docs/workflows#variables" target="_blank" style={{textDecoration: "none", color: "#f85a3e"}}>What are WORKFLOW variables?</a>
+						What are <a href="https://shuffler.io/docs/workflows#variables" target="_blank" style={{textDecoration: "none", color: "#f85a3e"}}>WORKFLOW variables?</a>
 					{workflow.workflow_variables === null ? 
 					null : workflow.workflow_variables.map(variable=> {
 						return (
@@ -1519,8 +1519,8 @@ const AngularWorkflow = (props) => {
 						<Button fullWidth style={{margin: "auto", marginTop: "10px",}} color="primary" variant="outlined" onClick={() => setVariablesModalOpen(true)}>New workflow variable</Button> 				
 					</div>
 					<Divider style={{marginBottom: 20, marginTop: 20, height: 1, width: "100%", backgroundColor: "rgb(91, 96, 100)"}}/>
-						<a href="https://shuffler.io/docs/workflows#execution_variables" target="_blank" style={{textDecoration: "none", color: "#f85a3e"}}>What are EXECUTION variables?</a>
-					{workflow.execution_variables === null ? 
+						What are <a href="https://shuffler.io/docs/workflows#execution_variables" target="_blank" style={{textDecoration: "none", color: "#f85a3e"}}>EXECUTION variables?</a>
+					{workflow.execution_variables === null || workflow.execution_variables === undefined ? 
 					null : workflow.execution_variables.map(variable=> {
 						return (
 							<div>
@@ -2142,7 +2142,14 @@ const AngularWorkflow = (props) => {
 	// appname & version 
 	// description
 	// ACTION select
+	//
 	const selectedNameChange = (event) => {
+		event.target.value = event.target.value.replace("(", "")
+		event.target.value = event.target.value.replace(")", "")
+		event.target.value = event.target.value.replace("$", "")
+		event.target.value = event.target.value.replace("#", "")
+		event.target.value = event.target.value.replace(".", "")
+		event.target.value = event.target.value.replace(",", "")
 		selectedAction.label = event.target.value
 		setSelectedAction(selectedAction)
 	}