diff --git a/templates/da_cache_to_shub.json.j2 b/templates/da_cache_to_shub.json.j2 index b6f5367..b756e6b 100644 --- a/templates/da_cache_to_shub.json.j2 +++ b/templates/da_cache_to_shub.json.j2 @@ -14,6 +14,7 @@ "inputParameters": { "downloads" : "${workflow.input.descriptor.downloads.*}", "storagehub" : "{{ storagehub }}", + "workspace" : "{{ workspaceurl }}", "auth" : "Bearer ${workflow.input.token}", "parentfolder" : "Blue-Cloud Data Downloads", "folder" : "${workflow.input.descriptor.order_name}-${workflow.input.descriptor.order_number}", @@ -77,7 +78,7 @@ }, "body" : { "name" : "${init.input.parentfolder}", - "description" : "Root folder of all Bluecloud data downloads", + "description" : "Root folder of all ${init.input.parentfolder}", "hidden" : "false" } } @@ -195,7 +196,7 @@ "inputParameters": { "input" : "${workflow.input.descriptor}", "output" : "${join_parallel_downloads.output}", - "scriptExpression": "var k,report='
Download | Outcome | Link |
---|---|---|
'+index+' | ';var o=$.output[keys[k]];o.endpoint1.error||o.endpoint2.error?report+=''+(o.endpoint1.error||'')+(o.endpoint2.error||'')+' | ':report+='OK | ',report+='
Download | Outcome | |
---|---|---|
'+index+' | ';var o=$.output[keys[k]];o.endpoint1.error||o.endpoint2.error?report+=''+(o.endpoint1.error||'')+(o.endpoint2.error||'')+' | ':report+='OK | ',report+='
Dear user,
your request with id {v1} related to order {v2} number {v3} has completed with the following outcome:
Dear user,
your request with id {v1} related to order {v2} number {v3} has completed with the following outcome:
You can access your data through the D4Science workspace in the folder {v6}
", "subject" : "Outcome of Bluecloud DA cache download {v1}", "extra_vars":{ "v1" : "${workflow.input.descriptor.request_id}", "v2" : "${workflow.input.descriptor.order_name}", "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}" } } }