List all exports

Author: paulrobertlloyd

app/controllers/download.js

@@ -1,12 +1,57 @@
 import programmesData from '../datasets/programmes.js'
 import { AcademicYear, DownloadFormat, ProgrammeType } from '../enums.js'
 import { Download, Programme, Team } from '../models.js'
+import { getDateValueDifference } from '../utils/date.js'
+import { getResults, getPagination } from '../utils/pagination.js'
 
 export const downloadController = {
+  readAll(request, response, next) {
+    response.locals.downloads = Download.findAll(request.session.data)
+
+    next()
+  },
+
   list(request, response) {
+    const { type } = request.query
+    const { data } = request.session
+    const { downloads } = response.locals
+
+    let results = downloads
+
+    // Filter by type
+    if (type && type !== 'none') {
+      results = results.filter((download) => download.type === type)
+    }
+
+    // Sort
+    results = results.sort((a, b) =>
+      getDateValueDifference(b.createdAt, a.createdAt)
+    )
+
+    // Results
+    response.locals.results = getResults(results, request.query, 40)
+    response.locals.pages = getPagination(results, request.query, 40)
+
+    // Clean up session data
+    delete data.type
+
     response.render(`download/list`)
   },
 
+  filterList(request, response) {
+    const params = new URLSearchParams()
+
+    // Radios and text inputs
+    for (const key of ['type']) {
+      const value = request.body[key]
+      if (value) {
+        params.append(key, String(value))
+      }
+    }
+
+    response.redirect(`/downloads?${params}`)
+  },
+
   form(request, response) {
     const { data } = request.session
 

app/data.js

@@ -33,6 +33,7 @@ const data = {
   clinics,
   counts: {},
   defaultBatches: {},
+  downloads: {},
   features: {},
   instructions,
   moves,

app/enums.js

@@ -106,6 +106,14 @@ export const DownloadFormat = {
   SystmOne: 'XLSX for SystmOne (TPP)'
 }
 
+/**
+ * @readonly
+ * @enum {string}
+ */
+export const DownloadType = {
+  Report: 'Vaccination records'
+}
+
 /**
  * @readonly
  * @enum {string}

app/locales/en.js

@@ -717,10 +717,21 @@ export const en = {
       label: 'Exports',
       title: 'Exports'
     },
+    search: {
+      label: 'Find export'
+    },
+    results:
+      '{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'
     },
+    createdAt: {
+      label: 'Requested at'
+    },
+    createdBy: {
+      label: 'Requested by'
+    },
     startAt: {
       label: 'Get vaccination data from'
     },
@@ -735,6 +746,9 @@ export const en = {
       title: 'Select providers',
       label: 'Providers'
     },
+    type: {
+      label: 'Type'
+    },
     vaccinations: {
       label: 'Records'
     }
@@ -2139,7 +2153,7 @@ export const en = {
         'Use this page to upload and import child, class list and vaccination records.\n\nUpload times can vary. Refresh the page to see the latest status.'
     },
     search: {
-      label: 'Find upload'
+      label: 'Find import'
     },
     results:
       '{count, plural, =0 {No imports matching your search criteria were found} one {Showing <b>{from}</b> to <b>{to}</b> of <b>{count}</b> import} other {Showing <b>{from}</b> to <b>{to}</b> of <b>{count}</b> imports}}',

app/models/download.js

@@ -1,8 +1,8 @@
 import { fakerEN_GB as faker } from '@faker-js/faker'
 import xlsx from 'json-as-xlsx'
 
-import { DownloadFormat } from '../enums.js'
-import { Programme, Team, Vaccination } from '../models.js'
+import { DownloadFormat, DownloadType } from '../enums.js'
+import { Programme, Team, Vaccination, User } from '../models.js'
 import {
   convertIsoDateToObject,
   convertObjectToIsoDate,
@@ -25,6 +25,7 @@ import { formatList } from '../utils/string.js'
  * @property {Date} [endAt] - Date to end report
  * @property {object} [endAt_] - Date to end report (from `dateInput`)
  * @property {DownloadFormat} [format] - Downloaded file format
+ * @property {DownloadType} [type] - Download type
  * @property {string} [programme_id] - Programme ID
  * @property {Array<string>} [team_ids] - Team IDs
  * @property {Array<string>} [vaccination_uuids] - Vaccination UUIDs
@@ -41,11 +42,27 @@ export class Download {
     this.endAt = options?.endAt && new Date(options.endAt)
     this.endAt_ = options?.endAt_
     this.format = options?.format || DownloadFormat.CSV
+    this.type = options?.type || DownloadType.Report
     this.programme_id = options?.programme_id
     this.team_ids = options?.team_ids
     this.vaccination_uuids = options?.vaccination_uuids || []
   }
 
+  /**
+   * Get user who created upload
+   *
+   * @returns {User} User
+   */
+  get createdBy() {
+    try {
+      if (this.createdBy_uid) {
+        return User.findOne(this.createdBy_uid, this.context)
+      }
+    } catch (error) {
+      console.error('Upload.createdBy', error.message)
+    }
+  }
+
   /**
    * Get start date for `dateInput`
    *
@@ -291,6 +308,15 @@ export class Download {
    */
   get formatted() {
     return {
+      createdAt: formatDate(this.createdAt, {
+        day: 'numeric',
+        month: 'long',
+        year: 'numeric',
+        hour: 'numeric',
+        minute: '2-digit',
+        hour12: true
+      }),
+      createdBy: this.createdBy?.fullName,
       startAt: this.startAt
         ? formatDate(this.startAt, { dateStyle: 'long' })
         : 'Earliest recorded vaccination',
@@ -323,6 +349,19 @@ export class Download {
     return `/reports/${this.programme_id}/download/${this.id}`
   }
 
+  /**
+   * Find all
+   *
+   * @param {object} context - Context
+   * @returns {Array<Download>|undefined} Downloads
+   * @static
+   */
+  static findAll(context) {
+    return Object.values(context.downloads).map(
+      (upload) => new Download(upload, context)
+    )
+  }
+
   /**
    * Find one
    *

app/routes/download.js

@@ -4,7 +4,8 @@ import { downloadController as download } from '../controllers/download.js'
 
 const router = express.Router({ strict: true })
 
-router.get('/', download.list)
+router.get('/', download.readAll, download.list)
+router.post('/', download.filterList)
 
 router.get('/new', download.form)
 router.post('/new', download.create)

app/views/download/list.njk

@@ -12,4 +12,82 @@
   {{ interchangeNavigation({
     view: "downloads"
   }) }}
+
+  <div class="nhsuk-grid-row">
+    <app-auto-submit class="app-grid-column-filters">
+      {% call card({
+        classes: "app-filters",
+        feature: true,
+        heading: __("download.search.label"),
+        headingLevel: 3
+      }) %}
+        {{ radios({
+          classes: "nhsuk-radios--small",
+          fieldset: {
+            legend: {
+              classes: "nhsuk-fieldset__legend--s",
+              text: __("download.type.label")
+            }
+          },
+          items: radioFilterItems(DownloadType),
+          decorate: "type"
+        }) }}
+
+        {{ appButtonGroup({
+          buttons: [{
+            classes: "nhsuk-button--secondary nhsuk-button--small",
+            text: __("search.confirm"),
+            attributes: {
+              formaction: params.formaction,
+              formmethod: "post",
+              role: "search"
+            }
+          }, {
+            classes: "nhsuk-button--secondary nhsuk-button--small",
+            text: __("search.clear"),
+            href: "/downloads"
+          } if data.type]
+        }) }}
+      {% endcall %}
+    </app-auto-submit>
+
+    <div class="app-grid-column-results">
+      {% if data.type and data.type != "none" %}
+        {% set title = data.type | replace("records", "record exports") %}
+      {% else %}
+        {% set title = "All exports" %}
+      {% endif %}
+
+      {{ appHeading({
+        level: 3,
+        size: "m",
+        title: title,
+        summary: __mf("download.results", {
+          from: results.from,
+          to: results.to,
+          count: results.count
+        }) | safe
+      }) }}
+
+      {% for download in results.page %}
+        {{ summaryList({
+          card: {
+            classes: "app-card--compact",
+            heading: download.name,
+            headingSize: "s",
+            headingLevel: 4,
+            href: download.uri,
+            clickable: true
+          },
+          rows: summaryRows(download, {
+            createdAt: {},
+            createdBy: {},
+            type: {}
+          })
+        }) }}
+      {% endfor %}
+
+      {{ pagination(pages) }}
+    </div>
+  </div>
 {% endblock %}