Show a success message after requesting a new download

Author: paulrobertlloyd

app/controllers/download.js

@@ -103,7 +103,8 @@ export const downloadController = {
   create(request, response) {
     const { account } = request.app.locals
     const { programmeType, session_id, type } = request.body.download
-    const { data } = request.session
+    const { data, referrer } = request.session
+    const { __ } = response.locals
 
     let createdDownload
     if (type) {
@@ -132,13 +133,9 @@ export const downloadController = {
 
     const download = new Download(createdDownload, data)
 
-    // Generate and return file
-    const { buffer, fileName, mimetype } = download.createFile(data)
+    request.flash('success', __(`download.new.success`, { download }))
 
-    response.header('Content-Type', mimetype)
-    response.header('Content-disposition', `attachment; filename=${fileName}`)
-
-    response.end(buffer)
+    response.redirect(referrer)
   },
 
   download(request, response) {

app/locales/en.js

@@ -724,7 +724,9 @@ export const en = {
       '{count, plural, =0 {No exports matching your search criteria were found} one {Showing <b>{from}</b> to <b>{to}</b> of <b>{count}</b> export} other {Showing <b>{from}</b> to <b>{to}</b> of <b>{count}</b> exports}}',
     new: {
       label: 'Download vaccination report',
-      confirm: 'Download vaccination data'
+      confirm: 'Download vaccination data',
+      success:
+        'The records will take some time to download. You will be able to download them soon in [Exports](/downloads)'
     },
     createdAt: {
       label: 'Requested at'

app/views/download/form.njk

@@ -1,5 +1,6 @@
 {% extends "_layouts/form.njk" %}
 
+{% set formAction = "/downloads/new?referrer=/reports" %}
 {% set confirmButtonText = __("download.new.confirm") %}
 {% set title = __("download.new.label") %}
 

app/views/move/list.njk

@@ -21,7 +21,7 @@
       value: DownloadType.Moves,
       decorate: "download.type",
       attributes: {
-        formaction: "/downloads/new",
+        formaction: "/downloads/new?referrer=/moves",
         formmethod: "post"
       }
     }) }}

app/views/session/offline.njk

@@ -2,7 +2,7 @@
 
 {% set title = __("session.offline.title") %}
 {% set confirmButtonText = __("session.offline.confirm") %}
-{% set formAction = "/downloads/new" %}
+{% set formAction = "/downloads/new?referrer=" + session.uri %}
 
 {% block beforeContent %}
   {{ breadcrumb({