fixed report generation
This commit is contained in:
parent
16c34e86f4
commit
cc8a0e6141
|
@ -14,6 +14,7 @@
|
||||||
"inputParameters": {
|
"inputParameters": {
|
||||||
"downloads" : "${workflow.input.descriptor.downloads.*}",
|
"downloads" : "${workflow.input.descriptor.downloads.*}",
|
||||||
"storagehub" : "{{ storagehub }}",
|
"storagehub" : "{{ storagehub }}",
|
||||||
|
"workspace" : "{{ workspaceurl }}",
|
||||||
"auth" : "Bearer ${workflow.input.token}",
|
"auth" : "Bearer ${workflow.input.token}",
|
||||||
"parentfolder" : "Blue-Cloud Data Downloads",
|
"parentfolder" : "Blue-Cloud Data Downloads",
|
||||||
"folder" : "${workflow.input.descriptor.order_name}-${workflow.input.descriptor.order_number}",
|
"folder" : "${workflow.input.descriptor.order_name}-${workflow.input.descriptor.order_number}",
|
||||||
|
@ -77,7 +78,7 @@
|
||||||
},
|
},
|
||||||
"body" : {
|
"body" : {
|
||||||
"name" : "${init.input.parentfolder}",
|
"name" : "${init.input.parentfolder}",
|
||||||
"description" : "Root folder of all Bluecloud data downloads",
|
"description" : "Root folder of all ${init.input.parentfolder}",
|
||||||
"hidden" : "false"
|
"hidden" : "false"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -195,7 +196,7 @@
|
||||||
"inputParameters": {
|
"inputParameters": {
|
||||||
"input" : "${workflow.input.descriptor}",
|
"input" : "${workflow.input.descriptor}",
|
||||||
"output" : "${join_parallel_downloads.output}",
|
"output" : "${join_parallel_downloads.output}",
|
||||||
"scriptExpression": "var k,report='<table><thead><tr><th>Download</th><th>Outcome</th><th>Link</th></tr></thead><tbody>',keys=[];for(var k in $.output) keys.push(k);keys.sort();for(k in keys){var index=keys[k].split('_')[1];report+='<tr><td>'+index+'</td>';var o=$.output[keys[k]];o.endpoint1.error||o.endpoint2.error?report+='<td>'+(o.endpoint1.error||'')+(o.endpoint2.error||'')+'</td>':report+='<td>OK</td>',report+='</tr>'}report+='</tbody></table>';return { report : report}"
|
"scriptExpression": "var k,report='<table><thead><tr><th>Download</th><th>Outcome</th><!--th>Link</th--></tr></thead><tbody>',keys=[];for(var k in $.output) keys.push(k);keys.sort();for(k in keys){var index=keys[k].split('_')[1];report+='<tr><td>'+index+'</td>';var o=$.output[keys[k]];o.endpoint1.error||o.endpoint2.error?report+='<td>'+(o.endpoint1.error||'')+(o.endpoint2.error||'')+'</td>':report+='<td>OK</td>',report+='</tr>'}report+='</tbody></table>';return { report : report}"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -205,13 +206,15 @@
|
||||||
"inputParameters" : {
|
"inputParameters" : {
|
||||||
"from" : "bluecloud@d4science.org",
|
"from" : "bluecloud@d4science.org",
|
||||||
"to" : "${workflow.input.callback.email}",
|
"to" : "${workflow.input.callback.email}",
|
||||||
"html" : "<html><body><p>Dear user,</p> <p>your request with id <b>{v1}</b> related to order <b>{v2}</b> number <b>{v3}</b> has completed with the following outcome:</p><br/> {v4}</body></html>",
|
"html" : "<html><body><p>Dear user,</p> <p>your request with id <b>{v1}</b> related to order <b>{v2}</b> number <b>{v3}</b> has completed with the following outcome:</p><br/> {v4} <br/><p>You can access your data through the D4Science <a href="{v5}">workspace</a> in the folder {v6}</p></body></html>",
|
||||||
"subject" : "Outcome of Bluecloud DA cache download {v1}",
|
"subject" : "Outcome of Bluecloud DA cache download {v1}",
|
||||||
"extra_vars":{
|
"extra_vars":{
|
||||||
"v1" : "${workflow.input.descriptor.request_id}",
|
"v1" : "${workflow.input.descriptor.request_id}",
|
||||||
"v2" : "${workflow.input.descriptor.order_name}",
|
"v2" : "${workflow.input.descriptor.order_name}",
|
||||||
"v3" : "${workflow.input.descriptor.order_number}",
|
"v3" : "${workflow.input.descriptor.order_number}",
|
||||||
"v4" : "${build_email_report.output.result.report}"
|
"v4" : "${build_email_report.output.result.report}",
|
||||||
|
"v5" : "${init.input.workspace}",
|
||||||
|
"v6" : "${init.input.parentfolder}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue