From cc8a0e6141ed2692bc7334c546c0f68a52b5ef6c Mon Sep 17 00:00:00 2001 From: dcore94 Date: Fri, 17 Sep 2021 09:30:08 +0200 Subject: [PATCH] fixed report generation --- templates/da_cache_to_shub.json.j2 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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='',keys=[];for(var k in $.output) keys.push(k);keys.sort();for(k in keys){var index=keys[k].split('_')[1];report+='';var o=$.output[keys[k]];o.endpoint1.error||o.endpoint2.error?report+='':report+='',report+=''}report+='
DownloadOutcomeLink
'+index+''+(o.endpoint1.error||'')+(o.endpoint2.error||'')+'OK
';return { report : report}" + "scriptExpression": "var k,report='',keys=[];for(var k in $.output) keys.push(k);keys.sort();for(k in keys){var index=keys[k].split('_')[1];report+='';var o=$.output[keys[k]];o.endpoint1.error||o.endpoint2.error?report+='':report+='',report+=''}report+='
DownloadOutcome
'+index+''+(o.endpoint1.error||'')+(o.endpoint2.error||'')+'OK
';return { report : report}" } }, { @@ -205,13 +206,15 @@ "inputParameters" : { "from" : "bluecloud@d4science.org", "to" : "${workflow.input.callback.email}", - "html" : "

Dear user,

your request with id {v1} related to order {v2} number {v3} has completed with the following outcome:


{v4}", + "html" : "

Dear user,

your request with id {v1} related to order {v2} number {v3} has completed with the following outcome:


{v4}

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}" } } }