diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py
index c78197f4..8a9e0795 100644
--- a/backend/app_sdk/app_base.py
+++ b/backend/app_sdk/app_base.py
@@ -5,6 +5,7 @@ import time
import json
import logging
import requests
+import urllib.parse
class AppBase:
""" The base class for Python-based apps in Shuffle, handles logging and callbacks configurations"""
@@ -536,6 +537,7 @@ class AppBase:
return False, "Failed condition: %s %s %s because %s" % (sourcevalue, condition["condition"]["value"], destinationvalue, check)
+ #sourcevalue = sourcevalue.encode("utf-8")
sourcevalue = parse_wrapper_start(sourcevalue)
destinationvalue = condition["destination"]["value"]
@@ -546,6 +548,7 @@ class AppBase:
if check:
return False, "Failed condition: %s %s %s because %s" % (sourcevalue, condition["condition"]["value"], destinationvalue, check)
+ #destinationvalue = destinationvalue.encode("utf-8")
destinationvalue = parse_wrapper_start(destinationvalue)
available_checks = [
"=",
@@ -692,7 +695,6 @@ class AppBase:
# Parses things like int(value)
self.logger.info("Parsing wrapper data")
value = parse_wrapper_start(value)
- self.logger.info("Parsing done: ", value)
params[parameter["name"]] = value
multi_parameters[parameter["name"]] = value
diff --git a/backend/go-app/codegen.go b/backend/go-app/codegen.go
index 9e9ad000..78dbd8ff 100644
--- a/backend/go-app/codegen.go
+++ b/backend/go-app/codegen.go
@@ -339,7 +339,7 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet
bodyAddin = ", data=body"
// FIXME: Does JSON data work?
- bodyFormatter = `body = " ".join(body.strip().split())`
+ bodyFormatter = `body = " ".join(body.strip().split()).encode("utf-8")`
}
}
@@ -499,7 +499,7 @@ func generateYaml(swagger *openapi3.Swagger, newmd5 string) (*openapi3.Swagger,
Description: "The apikey to use",
Multiline: false,
Required: true,
- Example: "The API key to use. Space = skip",
+ Example: "**********",
Schema: SchemaDefinition{
Type: "string",
},
@@ -525,7 +525,7 @@ func generateYaml(swagger *openapi3.Swagger, newmd5 string) (*openapi3.Swagger,
Description: "The password to use",
Multiline: false,
Required: true,
- Example: "The password to use",
+ Example: "***********",
Schema: SchemaDefinition{
Type: "string",
},
diff --git a/docker-compose.yml b/docker-compose.yml
index c47e9255..288063bb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,8 +31,6 @@ services:
- DATASTORE_EMULATOR_HOST=shuffle-database:8000
- APP_DOWNLOAD_LOCATION=${APP_DOWNLOAD_LOCATION}
- APP_HOTLOAD_FOLDER=/shuffle-apps
- - https_proxy=http://server:443
- - http_proxy=http://server:443
restart: unless-stopped
depends_on:
- database
diff --git a/frontend/src/AngularWorkflow.js b/frontend/src/AngularWorkflow.js
index 4f17c815..61c2428c 100644
--- a/frontend/src/AngularWorkflow.js
+++ b/frontend/src/AngularWorkflow.js
@@ -2510,7 +2510,7 @@ const AngularWorkflow = (props) => {
{selectedAction.app_name}
-
What are apps?
+
What are actions?
{selectedAction.errors !== null && selectedAction.errors.length > 0 ?
Errors: {selectedAction.errors.join("\n")}
@@ -2544,39 +2544,38 @@ const AngularWorkflow = (props) => {
placeholder={selectedAction.label}
onChange={selectedNameChange}
/>
-
-
- Environment
-
-
+ {environments !== undefined && environments.length > 1 ?
+
+ Environment
+
+
+ : null}
{/*requiresAuthentication ?