marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed labels for generated apps

Browse Source
This commit is contained in:
frikky
2020-05-13 08:41:49 +02:00
parent 59c311d78d
commit e4e945fe27
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/go-app/codegen.go
+6
View File
@@ -689,6 +689,7 @@ func handleConnect(swagger *openapi3.Swagger, api WorkflowApp, extraParameters [
action := WorkflowAppAction{
Description: path.Connect.Description,
Name: fmt.Sprintf("%s %s", "Connect", path.Connect.Summary),
Label: fmt.Sprintf(path.Connect.Summary),
NodeType: "action",
Environment: api.Environment,
Parameters: extraParameters,
@@ -857,6 +858,7 @@ func handleHead(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
action := WorkflowAppAction{
Description: path.Head.Description,
Name: fmt.Sprintf("%s %s", "Head", path.Head.Summary),
Label: fmt.Sprintf(path.Head.Summary),
NodeType: "action",
Environment: api.Environment,
Parameters: extraParameters,
@@ -938,6 +940,7 @@ func handleDelete(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []
action := WorkflowAppAction{
Description: path.Delete.Description,
Name: fmt.Sprintf("%s %s", "Delete", path.Delete.Summary),
Label: fmt.Sprintf(path.Delete.Summary),
NodeType: "action",
Environment: api.Environment,
Parameters: extraParameters,
@@ -1020,6 +1023,7 @@ func handlePost(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
action := WorkflowAppAction{
Description: path.Post.Description,
Name: fmt.Sprintf("%s %s", "Post", path.Post.Summary),
Label: fmt.Sprintf(path.Post.Summary),
NodeType: "action",
Environment: api.Environment,
Parameters: extraParameters,
@@ -1112,6 +1116,7 @@ func handlePatch(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []W
action := WorkflowAppAction{
Description: path.Patch.Description,
Name: fmt.Sprintf("%s %s", "Patch", path.Patch.Summary),
Label: fmt.Sprintf(path.Patch.Summary),
NodeType: "action",
Environment: api.Environment,
Parameters: extraParameters,
@@ -1204,6 +1209,7 @@ func handlePut(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
action := WorkflowAppAction{
Description: path.Put.Description,
Name: fmt.Sprintf("%s %s", "Put", path.Put.Summary),
Label: fmt.Sprintf(path.Put.Summary),
NodeType: "action",
Environment: api.Environment,
Parameters: extraParameters,
frontend/src/AngularWorkflow.js
+4 -1
View File
@@ -700,7 +700,7 @@ const AngularWorkflow = (props) => {
const curapp = apps.find(a => a.name === curaction.app_name && a.app_version === curaction.app_version)
if (!curapp || curapp === undefined) {
//console.log("App "+curaction.app_name+":"+curaction.app_version+" not found error")
alert.error("App "+curaction.app_name+" not found. Did someone delete it?")
return
}
@@ -2421,6 +2421,9 @@ const AngularWorkflow = (props) => {
>
{selectedApp.actions.map(data => {
var newActionname = data.name
if (data.label !== undefined && data.label !== null && data.label.length > 0) {
newActionname = data.label
}
// ROFL FIXME - loop
newActionname = newActionname.replace("_", " ")
newActionname = newActionname.replace("_", " ")