@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.26.1 → 4.26.3

package/dpr/DprQueryParamClass.mjs

@@ -150,6 +150,8 @@ class DprQueryParamClass extends DprClientClass {
         this.queryParams.delete('preventDefault')
       }
     })
+
+    this.queryParams.set('selectedPage', 1)
     window.history.replaceState(null, null, `?${this.queryParams.toString()}`)
   }
 

package/dpr/all.scss

@@ -718,7 +718,6 @@ ul.dpr-card-group__item__filters-list {
   position: relative;
   row-gap: 15px;
   flex-flow: column wrap;
-  padding-bottom: 40px;
 
   .dpr-summary-container {
     min-width: 200px;
@@ -861,10 +860,22 @@ ul.dpr-card-group__item__filters-list {
 
 .dpr-table-container {
   position: relative;
-  // overflow: scroll;
+  
+  #dpr-data-table-list {
+    .govuk-table__header {
+      padding-right: govuk-spacing(4);
+      white-space: nowrap;
+    }
+    
+    .govuk-table__cell {
+      padding-right: govuk-spacing(4);
+    }
 
-  td {
-    padding: govuk-spacing(2);
+    .govuk-table__body {
+      tr.govuk-table__row:nth-child(odd) {
+        background-color: govuk-colour("light-grey");
+      }
+    }
   }
 
   .dpr-section-header {
@@ -902,6 +913,7 @@ ul.dpr-card-group__item__filters-list {
     padding-left: govuk-spacing(2);
     padding-right: govuk-spacing(2);
     padding-top: govuk-spacing(1);
+    background-color: white;
   }
 
   .govuk-table__cell {
@@ -946,6 +958,7 @@ ul.dpr-card-group__item__filters-list {
     -webkit-mask-size: 100% 100%;
     -webkit-mask-repeat: no-repeat;
     -webkit-mask-position: left top, left bottom;
+    z-index: 100;
   }
 
   .data-table-header-button {
@@ -1013,6 +1026,10 @@ ul.dpr-card-group__item__filters-list {
     word-break: break-all;
   }
 
+  .data-table-cell-long-string {
+    min-width: 300px;
+  }
+
   #pageSize {
     min-width: 5em;
   }
@@ -1058,7 +1075,12 @@ ul.dpr-card-group__item__filters-list {
   }
 
   .dpr-table-wrapper {
-    overflow: scroll;
+    overflow-x: scroll;
+    transform: rotateX(180deg);
+
+    .dpr-table-content {
+      transform: rotateX(180deg);
+    }
   }
 
   .table-row-count {
@@ -1855,7 +1877,7 @@ ul.dpr-card-group__item__filters-list {
   background-color: govuk-colour("dark-blue")
 }
 
-@for $i from 1 through 50 {
+@for $i from 1 through 200 {
   .dpr-chart-height-#{$i} {
     height: $i * 80px !important;
   }
@@ -1946,7 +1968,7 @@ ul.dpr-card-group__item__filters-list {
   }
   td.govuk-table__cell {
     font-size: 16px;
-    padding: 20px 20px 20px 0
+    padding: 20px 40px 20px 0
   }
 
   .govuk-table__cell:last-child {

package/dpr/components/_catalogue/catalogue-list/styles.scss

@@ -4,7 +4,7 @@
   }
   td.govuk-table__cell {
     font-size: 16px;
-    padding: 20px 20px 20px 0
+    padding: 20px 40px 20px 0
   }
 
   .govuk-table__cell:last-child {

package/dpr/components/_charts/chart/styles.scss

@@ -22,7 +22,7 @@
   background-color: govuk-colour("dark-blue")
 }
 
-@for $i from 1 through 50 {
+@for $i from 1 through 200 {
   .dpr-chart-height-#{$i} {
     height: $i * 80px !important;
   }

package/dpr/components/_filters/filters-selected/clientClass.mjs

@@ -43,6 +43,7 @@ class SelectedFilters extends DprFiltersFormClass {
             }
           })
 
+          this.updateQueryParam('selectedPage', 1)
           this.updateQueryParam('preventDefault', true)
           window.location.reload()
         })

package/dpr/components/_reports/report/view.njk

@@ -25,11 +25,11 @@
           {% endif %}
         {% endfor %}
       {% else %}
-        {{ dprDataTableWrapper(dataTable, classification) }}
+        {{ dprDataTableWrapper(dataTable, classification, template) }}
       {% endif %}
     </div>
     
-    <div class='govuk-!-margin-bottom-6'>
+    <div class='govuk-!-margin-bottom-6 govuk-!-margin-top-6'>
       {{ dprReportTotals(options.totals) }}
     </div>
     

package/dpr/components/_reports/report-data-table/style.scss

@@ -2,10 +2,22 @@
 
 .dpr-table-container {
   position: relative;
-  // overflow: scroll;
+  
+  #dpr-data-table-list {
+    .govuk-table__header {
+      padding-right: govuk-spacing(4);
+      white-space: nowrap;
+    }
+    
+    .govuk-table__cell {
+      padding-right: govuk-spacing(4);
+    }
 
-  td {
-    padding: govuk-spacing(2);
+    .govuk-table__body {
+      tr.govuk-table__row:nth-child(odd) {
+        background-color: govuk-colour("light-grey");
+      }
+    }
   }
 
   .dpr-section-header {
@@ -43,6 +55,7 @@
     padding-left: govuk-spacing(2);
     padding-right: govuk-spacing(2);
     padding-top: govuk-spacing(1);
+    background-color: white;
   }
 
   .govuk-table__cell {
@@ -87,6 +100,7 @@
     -webkit-mask-size: 100% 100%;
     -webkit-mask-repeat: no-repeat;
     -webkit-mask-position: left top, left bottom;
+    z-index: 100;
   }
 
   .data-table-header-button {
@@ -154,6 +168,10 @@
     word-break: break-all;
   }
 
+  .data-table-cell-long-string {
+    min-width: 300px;
+  }
+
   #pageSize {
     min-width: 5em;
   }
@@ -199,7 +217,12 @@
   }
 
   .dpr-table-wrapper {
-    overflow: scroll;
+    overflow-x: scroll;
+    transform: rotateX(180deg);
+
+    .dpr-table-content {
+      transform: rotateX(180deg);
+    }
   }
 
   .table-row-count {

package/dpr/components/_reports/report-data-table/view.njk

@@ -1,6 +1,6 @@
 {% from "govuk/components/table/macro.njk" import govukTable %}
 
-{% macro dprDataTable(dataTable, classification) %}
+{% macro dprDataTable(dataTable, classification, template) %}
   {% set rows = dataTable.rows %}
   {% set head = dataTable.head %}
   {% set colCount = dataTable.colCount %}
@@ -8,15 +8,17 @@
   <div id="table-container" class='dpr-table-container' data-dpr-module="data-table" aria-labelledby="dpr-report-name">
     <div class="dpr-overflow-gradient" id="dpr-overflow-gradient"></div>
     <div class="dpr-table-wrapper" id="dpr-table-wrapper">
-      {{ govukTable({
-        head: head,
-        rows: rows,
-        attributes: { 
-          'id': 'dpr-data-table',
-          'data-classification': classification,
-          'data-col-length': colCount
-        }
-      }) }}
+      <div class="dpr-table-content">
+        {{ govukTable({
+          head: head,
+          rows: rows,
+          attributes: { 
+            'id': 'dpr-data-table-' + template,
+            'data-classification': classification,
+            'data-col-length': colCount
+          }
+        }) }}
+      </div>
     </div>
   </div>
 {% endmacro %}

package/dpr/components/_reports/report-data-table-wrapper/view.njk

@@ -1,14 +1,14 @@
 {% from "../report-data-table/view.njk" import dprDataTable %}
 {% from "govuk/components/tabs/macro.njk" import govukTabs %}
 
-{% macro dprDataTableWrapper(dataTables, classification) %}
+{% macro dprDataTableWrapper(dataTables, classification, template) %}
 
   {% if dataTables.length > 1 %}
       {% set tabItems = [] %}
       {% for dataTable in dataTables %}
         
         {% set dataTableHtml %}
-          {{ dprDataTable(dataTable, classification) }}
+          {{ dprDataTable(dataTable, classification, template) }}
         {% endset -%}
 
         {% set tabItems = (tabItems.push({
@@ -22,6 +22,6 @@
 
       {{ govukTabs({ items: tabItems}) }}
   {% else %}
-    {{ dprDataTable(dataTables[0], classification) }}
+    {{ dprDataTable(dataTables[0], classification, template) }}
   {% endif %}
 {% endmacro %}

package/dpr/components/_reports/report-summary-table/styles.scss

@@ -3,7 +3,6 @@
   position: relative;
   row-gap: 15px;
   flex-flow: column wrap;
-  padding-bottom: 40px;
 
   .dpr-summary-container {
     min-width: 200px;

package/dpr/routes/journeys/request-report/controller.js

@@ -1,2 +1,2 @@
-"use strict";var d=Object.create;var a=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var R=Object.getOwnPropertyNames;var p=Object.getPrototypeOf,f=Object.prototype.hasOwnProperty;var h=(t,r)=>{for(var e in r)a(t,e,{get:r[e],enumerable:!0})},l=(t,r,e,s)=>{if(r&&typeof r=="object"||typeof r=="function")for(let o of R(r))!f.call(t,o)&&o!==e&&a(t,o,{get:()=>r[o],enumerable:!(s=y(r,o))||s.enumerable});return t};var n=(t,r,e)=>(e=t!=null?d(p(t)):{},l(r||!t||!t.__esModule?a(e,"default",{value:t,enumerable:!0}):e,t)),m=t=>l(a({},"__esModule",{value:!0}),t);var g={};h(g,{RequestReportController:()=>i,default:()=>b});module.exports=m(g);var c=n(require("./filters/utils")),u=n(require("../../../utils/ErrorHandler"));class i{layoutPath;services;constructor(r,e){this.layoutPath=r,this.services=e}errorHandler=async(r,e,s,o)=>{s.render("dpr/routes/journeys/view-report/error",{layoutPath:this.layoutPath,...e.body,...e.params,error:e.body.error,params:e.params})};CANCEL=async(r,e,s)=>{try{await c.default.cancelRequest({req:r,res:e,services:this.services})}catch(o){return r.body.title="Failed to abort request",r.body.errorDescription="We were unable to abort the report request for the following reason:",r.body.error=new u.default(o).formatError(),r.flash("ERROR_BODY",JSON.stringify(r.body)),r.flash("ERROR_PARAMS",JSON.stringify(r.params)),r.flash("ERROR",JSON.stringify(r.body.error)),e.redirect(`${r.originalUrl}/failed`)}return e.redirect(r.originalUrl.replace("/cancel","/status"))}}var b=i;0&&(module.exports={RequestReportController});
+"use strict";var u=Object.create;var a=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var R=Object.getOwnPropertyNames;var p=Object.getPrototypeOf,f=Object.prototype.hasOwnProperty;var h=(t,r)=>{for(var e in r)a(t,e,{get:r[e],enumerable:!0})},l=(t,r,e,s)=>{if(r&&typeof r=="object"||typeof r=="function")for(let o of R(r))!f.call(t,o)&&o!==e&&a(t,o,{get:()=>r[o],enumerable:!(s=y(r,o))||s.enumerable});return t};var n=(t,r,e)=>(e=t!=null?u(p(t)):{},l(r||!t||!t.__esModule?a(e,"default",{value:t,enumerable:!0}):e,t)),m=t=>l(a({},"__esModule",{value:!0}),t);var g={};h(g,{RequestReportController:()=>i,default:()=>b});module.exports=m(g);var c=n(require("./filters/utils")),d=n(require("../../../utils/ErrorHandler"));class i{layoutPath;services;constructor(r,e){this.layoutPath=r,this.services=e}errorHandler=async(r,e,s,o)=>{s.render("dpr/routes/journeys/view-report/error",{layoutPath:this.layoutPath,...e.body&&{...e.body},...e.params,error:e.body?.error,params:e?.params})};CANCEL=async(r,e,s)=>{try{await c.default.cancelRequest({req:r,res:e,services:this.services})}catch(o){return r.body??={},r.body.title="Failed to abort request",r.body.errorDescription="We were unable to abort the report request for the following reason:",r.body.error=new d.default(o).formatError(),r.flash("ERROR_BODY",JSON.stringify(r.body)),r.flash("ERROR_PARAMS",JSON.stringify(r.params)),r.flash("ERROR",JSON.stringify(r.body?.error||{})),e.redirect(`${r.originalUrl}/failed`)}return e.redirect(r.originalUrl.replace("/cancel","/status"))}}var b=i;0&&(module.exports={RequestReportController});
 //# sourceMappingURL=controller.js.map

package/dpr/routes/journeys/request-report/controller.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/routes/journeys/request-report/controller.ts"],
-  "sourcesContent": ["import { ErrorRequestHandler, RequestHandler } from 'express'\nimport { Services } from '../../../types/Services'\nimport AsyncRequestUtils from './filters/utils'\nimport ErrorHandler from '../../../utils/ErrorHandler'\n\nclass RequestReportController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  errorHandler: ErrorRequestHandler = async (_error, req, res, _next) => {\n    res.render(`dpr/routes/journeys/view-report/error`, {\n      layoutPath: this.layoutPath,\n      ...req.body,\n      ...req.params,\n      error: req.body.error,\n      params: req.params,\n    })\n  }\n\n  CANCEL: RequestHandler = async (req, res, _next) => {\n    try {\n      await AsyncRequestUtils.cancelRequest({\n        req,\n        res,\n        services: this.services,\n      })\n    } catch (error) {\n      req.body.title = 'Failed to abort request'\n      req.body.errorDescription = 'We were unable to abort the report request for the following reason:'\n      req.body.error = new ErrorHandler(error).formatError()\n\n      req.flash('ERROR_BODY', JSON.stringify(req.body))\n      req.flash('ERROR_PARAMS', JSON.stringify(req.params))\n      req.flash('ERROR', JSON.stringify(req.body.error))\n\n      return res.redirect(`${req.originalUrl}/failed`)\n    }\n    return res.redirect(req.originalUrl.replace('/cancel', '/status'))\n  }\n}\n\nexport { RequestReportController }\nexport default RequestReportController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAA8B,8BAC9BC,EAAyB,0CAEzB,MAAMJ,CAAwB,CAC5B,WAEA,SAEA,YAAYK,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAEA,aAAoC,MAAOC,EAAQC,EAAKC,EAAKC,IAAU,CACrED,EAAI,OAAO,wCAAyC,CAClD,WAAY,KAAK,WACjB,GAAGD,EAAI,KACP,GAAGA,EAAI,OACP,MAAOA,EAAI,KAAK,MAChB,OAAQA,EAAI,MACd,CAAC,CACH,EAEA,OAAyB,MAAOA,EAAKC,EAAKC,IAAU,CAClD,GAAI,CACF,MAAM,EAAAC,QAAkB,cAAc,CACpC,IAAAH,EACA,IAAAC,EACA,SAAU,KAAK,QACjB,CAAC,CACH,OAASG,EAAO,CACd,OAAAJ,EAAI,KAAK,MAAQ,0BACjBA,EAAI,KAAK,iBAAmB,uEAC5BA,EAAI,KAAK,MAAQ,IAAI,EAAAK,QAAaD,CAAK,EAAE,YAAY,EAErDJ,EAAI,MAAM,aAAc,KAAK,UAAUA,EAAI,IAAI,CAAC,EAChDA,EAAI,MAAM,eAAgB,KAAK,UAAUA,EAAI,MAAM,CAAC,EACpDA,EAAI,MAAM,QAAS,KAAK,UAAUA,EAAI,KAAK,KAAK,CAAC,EAE1CC,EAAI,SAAS,GAAGD,EAAI,WAAW,SAAS,CACjD,CACA,OAAOC,EAAI,SAASD,EAAI,YAAY,QAAQ,UAAW,SAAS,CAAC,CACnE,CACF,CAGA,IAAOP,EAAQD",
+  "sourcesContent": ["import { ErrorRequestHandler, RequestHandler } from 'express'\nimport { Services } from '../../../types/Services'\nimport AsyncRequestUtils from './filters/utils'\nimport ErrorHandler from '../../../utils/ErrorHandler'\n\nclass RequestReportController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  errorHandler: ErrorRequestHandler = async (_error, req, res, _next) => {\n    res.render(`dpr/routes/journeys/view-report/error`, {\n      layoutPath: this.layoutPath,\n      ...(req.body && { ...req.body }),\n      ...req.params,\n      error: req.body?.error,\n      params: req?.params,\n    })\n  }\n\n  CANCEL: RequestHandler = async (req, res, _next) => {\n    try {\n      await AsyncRequestUtils.cancelRequest({\n        req,\n        res,\n        services: this.services,\n      })\n    } catch (error) {\n      req.body ??= {}\n      req.body.title = 'Failed to abort request'\n      req.body.errorDescription = 'We were unable to abort the report request for the following reason:'\n      req.body.error = new ErrorHandler(error).formatError()\n\n      req.flash('ERROR_BODY', JSON.stringify(req.body))\n      req.flash('ERROR_PARAMS', JSON.stringify(req.params))\n      req.flash('ERROR', JSON.stringify(req.body?.error || {}))\n\n      return res.redirect(`${req.originalUrl}/failed`)\n    }\n    return res.redirect(req.originalUrl.replace('/cancel', '/status'))\n  }\n}\n\nexport { RequestReportController }\nexport default RequestReportController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAA8B,8BAC9BC,EAAyB,0CAEzB,MAAMJ,CAAwB,CAC5B,WAEA,SAEA,YAAYK,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAEA,aAAoC,MAAOC,EAAQC,EAAKC,EAAKC,IAAU,CACrED,EAAI,OAAO,wCAAyC,CAClD,WAAY,KAAK,WACjB,GAAID,EAAI,MAAQ,CAAE,GAAGA,EAAI,IAAK,EAC9B,GAAGA,EAAI,OACP,MAAOA,EAAI,MAAM,MACjB,OAAQA,GAAK,MACf,CAAC,CACH,EAEA,OAAyB,MAAOA,EAAKC,EAAKC,IAAU,CAClD,GAAI,CACF,MAAM,EAAAC,QAAkB,cAAc,CACpC,IAAAH,EACA,IAAAC,EACA,SAAU,KAAK,QACjB,CAAC,CACH,OAASG,EAAO,CACd,OAAAJ,EAAI,OAAS,CAAC,EACdA,EAAI,KAAK,MAAQ,0BACjBA,EAAI,KAAK,iBAAmB,uEAC5BA,EAAI,KAAK,MAAQ,IAAI,EAAAK,QAAaD,CAAK,EAAE,YAAY,EAErDJ,EAAI,MAAM,aAAc,KAAK,UAAUA,EAAI,IAAI,CAAC,EAChDA,EAAI,MAAM,eAAgB,KAAK,UAAUA,EAAI,MAAM,CAAC,EACpDA,EAAI,MAAM,QAAS,KAAK,UAAUA,EAAI,MAAM,OAAS,CAAC,CAAC,CAAC,EAEjDC,EAAI,SAAS,GAAGD,EAAI,WAAW,SAAS,CACjD,CACA,OAAOC,EAAI,SAASD,EAAI,YAAY,QAAQ,UAAW,SAAS,CAAC,CACnE,CACF,CAGA,IAAOP,EAAQD",
   "names": ["controller_exports", "__export", "RequestReportController", "controller_default", "__toCommonJS", "import_utils", "import_ErrorHandler", "layoutPath", "services", "_error", "req", "res", "_next", "AsyncRequestUtils", "error", "ErrorHandler"]
 }

package/dpr/routes/journeys/request-report/controller.ts

@@ -16,10 +16,10 @@ class RequestReportController {
   errorHandler: ErrorRequestHandler = async (_error, req, res, _next) => {
     res.render(`dpr/routes/journeys/view-report/error`, {
       layoutPath: this.layoutPath,
-      ...req.body,
+      ...(req.body && { ...req.body }),
       ...req.params,
-      error: req.body.error,
-      params: req.params,
+      error: req.body?.error,
+      params: req?.params,
     })
   }
 
@@ -31,13 +31,14 @@ class RequestReportController {
         services: this.services,
       })
     } catch (error) {
+      req.body ??= {}
       req.body.title = 'Failed to abort request'
       req.body.errorDescription = 'We were unable to abort the report request for the following reason:'
       req.body.error = new ErrorHandler(error).formatError()
 
       req.flash('ERROR_BODY', JSON.stringify(req.body))
       req.flash('ERROR_PARAMS', JSON.stringify(req.params))
-      req.flash('ERROR', JSON.stringify(req.body.error))
+      req.flash('ERROR', JSON.stringify(req.body?.error || {}))
 
       return res.redirect(`${req.originalUrl}/failed`)
     }

package/dpr/routes/journeys/request-report/filters/controller.js

@@ -1,2 +1,2 @@
-"use strict";var p=Object.create;var l=Object.defineProperty;var v=Object.getOwnPropertyDescriptor;var R=Object.getOwnPropertyNames;var D=Object.getPrototypeOf,b=Object.prototype.hasOwnProperty;var E=(s,e)=>{for(var t in e)l(s,t,{get:e[t],enumerable:!0})},m=(s,e,t,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of R(e))!b.call(s,r)&&r!==t&&l(s,r,{get:()=>e[r],enumerable:!(a=v(e,r))||a.enumerable});return s};var c=(s,e,t)=>(t=s!=null?p(D(s)):{},m(e||!s||!s.__esModule?l(t,"default",{value:s,enumerable:!0}):t,s)),P=s=>m(l({},"__esModule",{value:!0}),s);var F={};E(F,{RequestReportController:()=>y,default:()=>w});module.exports=P(F);var u=c(require("./utils")),d=c(require("../../../../utils/Personalisation/personalisationUtils")),n=require("../../../../components/_filters/filtersTypeEnum"),i=c(require("../../../../utils/ErrorHandler"));class y{layoutPath;services;constructor(e,t){this.layoutPath=e,this.services=t}GET=async(e,t,a)=>{try{const r=await u.default.renderRequest({req:e,res:t,services:this.services,next:a});t.render("dpr/routes/journeys/request-report/filters/view",{layoutPath:this.layoutPath,...r})}catch(r){e.body.title="Request failed",e.body.errorDescription=`Your ${e.params.type} has failed to generate.`,e.body.error=new i.default(r).formatError(),a()}};POST=async(e,t,a)=>{try{const r=await u.default.request({req:e,res:t,services:this.services,next:a}),{executionId:o,dataProductDefinitionsPath:f}=r;if(o){const h=f?`${o}/status?dataProductDefinitionsPath=${f}`:`${o}/status`;t.redirect(h)}else t.end()}catch(r){const o=u.default.getFiltersFromReqBody(e);e.body={title:"Request Failed",errorDescription:`Your ${e.params.type} has failed to generate.`,error:new i.default(r).formatError(),retry:!0,filters:o,...e.body},a(r)}};saveDefaultFilterValues=async(e,t,a)=>{try{await d.default.saveDefaults(n.FiltersType.REQUEST,t,e,this.services),t.redirect(`${e.baseUrl}?defaultsSaved=true`)}catch(r){e.body={title:"Failed to save defaults",error:new i.default(r).formatError(),...e.body},a()}};removeDefaultFilterValues=async(e,t,a)=>{try{await d.default.removeDefaults(n.FiltersType.REQUEST,t,e,this.services),t.redirect(e.baseUrl)}catch(r){e.body={title:"Failed to remove defaults",error:new i.default(r).formatError(),...e.body},a()}}}var w=y;0&&(module.exports={RequestReportController});
+"use strict";var p=Object.create;var l=Object.defineProperty;var v=Object.getOwnPropertyDescriptor;var R=Object.getOwnPropertyNames;var b=Object.getPrototypeOf,D=Object.prototype.hasOwnProperty;var E=(s,e)=>{for(var t in e)l(s,t,{get:e[t],enumerable:!0})},m=(s,e,t,o)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of R(e))!D.call(s,r)&&r!==t&&l(s,r,{get:()=>e[r],enumerable:!(o=v(e,r))||o.enumerable});return s};var u=(s,e,t)=>(t=s!=null?p(b(s)):{},m(e||!s||!s.__esModule?l(t,"default",{value:s,enumerable:!0}):t,s)),P=s=>m(l({},"__esModule",{value:!0}),s);var F={};E(F,{RequestReportController:()=>y,default:()=>w});module.exports=P(F);var d=u(require("./utils")),c=u(require("../../../../utils/Personalisation/personalisationUtils")),n=require("../../../../components/_filters/filtersTypeEnum"),i=u(require("../../../../utils/ErrorHandler"));class y{layoutPath;services;constructor(e,t){this.layoutPath=e,this.services=t}GET=async(e,t,o)=>{try{const r=await d.default.renderRequest({req:e,res:t,services:this.services,next:o});t.render("dpr/routes/journeys/request-report/filters/view",{layoutPath:this.layoutPath,...r})}catch(r){e.body??={},e.body.title="Request failed",e.body.errorDescription=`Your ${e.params.type} has failed to generate.`,e.body.error=new i.default(r).formatError(),o()}};POST=async(e,t,o)=>{try{const r=await d.default.request({req:e,res:t,services:this.services,next:o}),{executionId:a,dataProductDefinitionsPath:f}=r;if(a){const h=f?`${a}/status?dataProductDefinitionsPath=${f}`:`${a}/status`;t.redirect(h)}else t.end()}catch(r){const a=d.default.getFiltersFromReqBody(e);e.body={title:"Request Failed",errorDescription:`Your ${e.params.type} has failed to generate.`,error:new i.default(r).formatError(),retry:!0,filters:a,...e.body&&{...e.body}},o(r)}};saveDefaultFilterValues=async(e,t,o)=>{try{await c.default.saveDefaults(n.FiltersType.REQUEST,t,e,this.services),t.redirect(`${e.baseUrl}?defaultsSaved=true`)}catch(r){e.body={title:"Failed to save defaults",error:new i.default(r).formatError(),...e.body&&{...e.body}},o()}};removeDefaultFilterValues=async(e,t,o)=>{try{await c.default.removeDefaults(n.FiltersType.REQUEST,t,e,this.services),t.redirect(e.baseUrl)}catch(r){e.body={title:"Failed to remove defaults",error:new i.default(r).formatError(),...e.body&&{...e.body}},o()}}}var w=y;0&&(module.exports={RequestReportController});
 //# sourceMappingURL=controller.js.map

package/dpr/routes/journeys/request-report/filters/controller.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/request-report/filters/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../types/Services'\nimport { RequestDataResult } from '../../../../types/AsyncReportUtils'\nimport AysncRequestUtils from './utils'\nimport PersonalisationUtils from '../../../../utils/Personalisation/personalisationUtils'\nimport { FiltersType } from '../../../../components/_filters/filtersTypeEnum'\nimport ErrorHandler from '../../../../utils/ErrorHandler'\n\nclass RequestReportController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  // Render request page\n  GET: RequestHandler = async (req, res, next) => {\n    try {\n      const requestRenderData = <RequestDataResult>await AysncRequestUtils.renderRequest({\n        req,\n        res,\n        services: this.services,\n        next,\n      })\n\n      res.render(`dpr/routes/journeys/request-report/filters/view`, {\n        layoutPath: this.layoutPath,\n        ...requestRenderData,\n      })\n    } catch (error) {\n      req.body.title = 'Request failed'\n      req.body.errorDescription = `Your ${req.params['type']} has failed to generate.`\n      req.body.error = new ErrorHandler(error).formatError()\n      next()\n    }\n  }\n\n  // Request report\n  POST: RequestHandler = async (req, res, next) => {\n    try {\n      const executionData = await AysncRequestUtils.request({\n        req,\n        res,\n        services: this.services,\n        next,\n      })\n\n      const { executionId, dataProductDefinitionsPath } = executionData\n\n      if (executionId) {\n        const redirect = dataProductDefinitionsPath\n          ? `${executionId}/status?dataProductDefinitionsPath=${dataProductDefinitionsPath}`\n          : `${executionId}/status`\n        res.redirect(redirect)\n      } else {\n        res.end()\n      }\n    } catch (error) {\n      const filters = AysncRequestUtils.getFiltersFromReqBody(req)\n\n      req.body = {\n        title: 'Request Failed',\n        errorDescription: `Your ${req.params['type']} has failed to generate.`,\n        error: new ErrorHandler(error).formatError(),\n        retry: true,\n        filters,\n        ...req.body,\n      }\n      next(error)\n    }\n  }\n\n  saveDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      await PersonalisationUtils.saveDefaults(FiltersType.REQUEST, res, req, this.services)\n      res.redirect(`${req.baseUrl}?defaultsSaved=true`)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to save defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...req.body,\n      }\n      next()\n    }\n  }\n\n  removeDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      await PersonalisationUtils.removeDefaults(FiltersType.REQUEST, res, req, this.services)\n      res.redirect(req.baseUrl)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to remove defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...req.body,\n      }\n      next()\n    }\n  }\n}\n\nexport { RequestReportController }\nexport default RequestReportController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAGA,IAAAK,EAA8B,sBAC9BC,EAAiC,qEACjCC,EAA4B,2DAC5BC,EAAyB,6CAEzB,MAAMN,CAAwB,CAC5B,WAEA,SAEA,YAAYO,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAGA,IAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,GAAI,CACF,MAAMC,EAAuC,MAAM,EAAAC,QAAkB,cAAc,CACjF,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,SACf,KAAAC,CACF,CAAC,EAEDD,EAAI,OAAO,kDAAmD,CAC5D,WAAY,KAAK,WACjB,GAAGE,CACL,CAAC,CACH,OAASE,EAAO,CACdL,EAAI,KAAK,MAAQ,iBACjBA,EAAI,KAAK,iBAAmB,QAAQA,EAAI,OAAO,IAAO,2BACtDA,EAAI,KAAK,MAAQ,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EACrDH,EAAK,CACP,CACF,EAGA,KAAuB,MAAOF,EAAKC,EAAKC,IAAS,CAC/C,GAAI,CACF,MAAMK,EAAgB,MAAM,EAAAH,QAAkB,QAAQ,CACpD,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,SACf,KAAAC,CACF,CAAC,EAEK,CAAE,YAAAM,EAAa,2BAAAC,CAA2B,EAAIF,EAEpD,GAAIC,EAAa,CACf,MAAME,EAAWD,EACb,GAAGD,CAAW,sCAAsCC,CAA0B,GAC9E,GAAGD,CAAW,UAClBP,EAAI,SAASS,CAAQ,CACvB,MACET,EAAI,IAAI,CAEZ,OAASI,EAAO,CACd,MAAMM,EAAU,EAAAP,QAAkB,sBAAsBJ,CAAG,EAE3DA,EAAI,KAAO,CACT,MAAO,iBACP,iBAAkB,QAAQA,EAAI,OAAO,IAAO,2BAC5C,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,MAAO,GACP,QAAAM,EACA,GAAGX,EAAI,IACT,EACAE,EAAKG,CAAK,CACZ,CACF,EAEA,wBAA0C,MAAOL,EAAKC,EAAKC,IAAS,CAClE,GAAI,CACF,MAAM,EAAAU,QAAqB,aAAa,cAAY,QAASX,EAAKD,EAAK,KAAK,QAAQ,EACpFC,EAAI,SAAS,GAAGD,EAAI,OAAO,qBAAqB,CAClD,OAASK,EAAO,CACdL,EAAI,KAAO,CACT,MAAO,0BACP,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAGL,EAAI,IACT,EACAE,EAAK,CACP,CACF,EAEA,0BAA4C,MAAOF,EAAKC,EAAKC,IAAS,CACpE,GAAI,CACF,MAAM,EAAAU,QAAqB,eAAe,cAAY,QAASX,EAAKD,EAAK,KAAK,QAAQ,EACtFC,EAAI,SAASD,EAAI,OAAO,CAC1B,OAASK,EAAO,CACdL,EAAI,KAAO,CACT,MAAO,4BACP,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAGL,EAAI,IACT,EACAE,EAAK,CACP,CACF,CACF,CAGA,IAAOV,EAAQD",
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../types/Services'\nimport { RequestDataResult } from '../../../../types/AsyncReportUtils'\nimport AysncRequestUtils from './utils'\nimport PersonalisationUtils from '../../../../utils/Personalisation/personalisationUtils'\nimport { FiltersType } from '../../../../components/_filters/filtersTypeEnum'\nimport ErrorHandler from '../../../../utils/ErrorHandler'\n\nclass RequestReportController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  // Render request page\n  GET: RequestHandler = async (req, res, next) => {\n    try {\n      const requestRenderData = <RequestDataResult>await AysncRequestUtils.renderRequest({\n        req,\n        res,\n        services: this.services,\n        next,\n      })\n\n      res.render(`dpr/routes/journeys/request-report/filters/view`, {\n        layoutPath: this.layoutPath,\n        ...requestRenderData,\n      })\n    } catch (error) {\n      req.body ??= {}\n      req.body.title = 'Request failed'\n      req.body.errorDescription = `Your ${req.params['type']} has failed to generate.`\n      req.body.error = new ErrorHandler(error).formatError()\n      next()\n    }\n  }\n\n  // Request report\n  POST: RequestHandler = async (req, res, next) => {\n    try {\n      const executionData = await AysncRequestUtils.request({\n        req,\n        res,\n        services: this.services,\n        next,\n      })\n\n      const { executionId, dataProductDefinitionsPath } = executionData\n\n      if (executionId) {\n        const redirect = dataProductDefinitionsPath\n          ? `${executionId}/status?dataProductDefinitionsPath=${dataProductDefinitionsPath}`\n          : `${executionId}/status`\n        res.redirect(redirect)\n      } else {\n        res.end()\n      }\n    } catch (error) {\n      const filters = AysncRequestUtils.getFiltersFromReqBody(req)\n\n      req.body = {\n        title: 'Request Failed',\n        errorDescription: `Your ${req.params['type']} has failed to generate.`,\n        error: new ErrorHandler(error).formatError(),\n        retry: true,\n        filters,\n        ...(req.body && { ...req.body }),\n      }\n      next(error)\n    }\n  }\n\n  saveDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      await PersonalisationUtils.saveDefaults(FiltersType.REQUEST, res, req, this.services)\n      res.redirect(`${req.baseUrl}?defaultsSaved=true`)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to save defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...(req.body && { ...req.body }),\n      }\n      next()\n    }\n  }\n\n  removeDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      await PersonalisationUtils.removeDefaults(FiltersType.REQUEST, res, req, this.services)\n      res.redirect(req.baseUrl)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to remove defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...(req.body && { ...req.body }),\n      }\n      next()\n    }\n  }\n}\n\nexport { RequestReportController }\nexport default RequestReportController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAGA,IAAAK,EAA8B,sBAC9BC,EAAiC,qEACjCC,EAA4B,2DAC5BC,EAAyB,6CAEzB,MAAMN,CAAwB,CAC5B,WAEA,SAEA,YAAYO,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAGA,IAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,GAAI,CACF,MAAMC,EAAuC,MAAM,EAAAC,QAAkB,cAAc,CACjF,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,SACf,KAAAC,CACF,CAAC,EAEDD,EAAI,OAAO,kDAAmD,CAC5D,WAAY,KAAK,WACjB,GAAGE,CACL,CAAC,CACH,OAASE,EAAO,CACdL,EAAI,OAAS,CAAC,EACdA,EAAI,KAAK,MAAQ,iBACjBA,EAAI,KAAK,iBAAmB,QAAQA,EAAI,OAAO,IAAO,2BACtDA,EAAI,KAAK,MAAQ,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EACrDH,EAAK,CACP,CACF,EAGA,KAAuB,MAAOF,EAAKC,EAAKC,IAAS,CAC/C,GAAI,CACF,MAAMK,EAAgB,MAAM,EAAAH,QAAkB,QAAQ,CACpD,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,SACf,KAAAC,CACF,CAAC,EAEK,CAAE,YAAAM,EAAa,2BAAAC,CAA2B,EAAIF,EAEpD,GAAIC,EAAa,CACf,MAAME,EAAWD,EACb,GAAGD,CAAW,sCAAsCC,CAA0B,GAC9E,GAAGD,CAAW,UAClBP,EAAI,SAASS,CAAQ,CACvB,MACET,EAAI,IAAI,CAEZ,OAASI,EAAO,CACd,MAAMM,EAAU,EAAAP,QAAkB,sBAAsBJ,CAAG,EAE3DA,EAAI,KAAO,CACT,MAAO,iBACP,iBAAkB,QAAQA,EAAI,OAAO,IAAO,2BAC5C,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,MAAO,GACP,QAAAM,EACA,GAAIX,EAAI,MAAQ,CAAE,GAAGA,EAAI,IAAK,CAChC,EACAE,EAAKG,CAAK,CACZ,CACF,EAEA,wBAA0C,MAAOL,EAAKC,EAAKC,IAAS,CAClE,GAAI,CACF,MAAM,EAAAU,QAAqB,aAAa,cAAY,QAASX,EAAKD,EAAK,KAAK,QAAQ,EACpFC,EAAI,SAAS,GAAGD,EAAI,OAAO,qBAAqB,CAClD,OAASK,EAAO,CACdL,EAAI,KAAO,CACT,MAAO,0BACP,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAIL,EAAI,MAAQ,CAAE,GAAGA,EAAI,IAAK,CAChC,EACAE,EAAK,CACP,CACF,EAEA,0BAA4C,MAAOF,EAAKC,EAAKC,IAAS,CACpE,GAAI,CACF,MAAM,EAAAU,QAAqB,eAAe,cAAY,QAASX,EAAKD,EAAK,KAAK,QAAQ,EACtFC,EAAI,SAASD,EAAI,OAAO,CAC1B,OAASK,EAAO,CACdL,EAAI,KAAO,CACT,MAAO,4BACP,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAIL,EAAI,MAAQ,CAAE,GAAGA,EAAI,IAAK,CAChC,EACAE,EAAK,CACP,CACF,CACF,CAGA,IAAOV,EAAQD",
   "names": ["controller_exports", "__export", "RequestReportController", "controller_default", "__toCommonJS", "import_utils", "import_personalisationUtils", "import_filtersTypeEnum", "import_ErrorHandler", "layoutPath", "services", "req", "res", "next", "requestRenderData", "AysncRequestUtils", "error", "ErrorHandler", "executionData", "executionId", "dataProductDefinitionsPath", "redirect", "filters", "PersonalisationUtils"]
 }

package/dpr/routes/journeys/request-report/filters/controller.ts

@@ -31,6 +31,7 @@ class RequestReportController {
         ...requestRenderData,
       })
     } catch (error) {
+      req.body ??= {}
       req.body.title = 'Request failed'
       req.body.errorDescription = `Your ${req.params['type']} has failed to generate.`
       req.body.error = new ErrorHandler(error).formatError()
@@ -67,7 +68,7 @@ class RequestReportController {
         error: new ErrorHandler(error).formatError(),
         retry: true,
         filters,
-        ...req.body,
+        ...(req.body && { ...req.body }),
       }
       next(error)
     }
@@ -81,7 +82,7 @@ class RequestReportController {
       req.body = {
         title: 'Failed to save defaults',
         error: new ErrorHandler(error).formatError(),
-        ...req.body,
+        ...(req.body && { ...req.body }),
       }
       next()
     }
@@ -95,7 +96,7 @@ class RequestReportController {
       req.body = {
         title: 'Failed to remove defaults',
         error: new ErrorHandler(error).formatError(),
-        ...req.body,
+        ...(req.body && { ...req.body }),
       }
       next()
     }

package/dpr/routes/journeys/request-report/status/controller.js

@@ -1,2 +1,2 @@
-"use strict";var p=Object.create;var i=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var h=Object.getOwnPropertyNames;var v=Object.getPrototypeOf,m=Object.prototype.hasOwnProperty;var f=(r,t)=>{for(var e in t)i(r,e,{get:t[e],enumerable:!0})},u=(r,t,e,o)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of h(t))!m.call(r,s)&&s!==e&&i(r,s,{get:()=>t[s],enumerable:!(o=y(t,s))||o.enumerable});return r};var a=(r,t,e)=>(e=r!=null?p(v(r)):{},u(t||!r||!r.__esModule?i(e,"default",{value:r,enumerable:!0}):e,r)),P=r=>u(i({},"__esModule",{value:!0}),r);var g={};f(g,{RequestStatusController:()=>n,default:()=>R});module.exports=P(g);var c=a(require("./utils")),l=a(require("../../../../components/user-reports/requested/utils")),d=a(require("../../../../utils/ErrorHandler"));class n{layoutPath;services;constructor(t,e){this.layoutPath=t,this.services=e}GET=async(t,e,o)=>{try{const s=await c.default.renderPolling({req:t,res:e,services:this.services,next:o});e.render("dpr/routes/journeys/request-report/status/view",{layoutPath:this.layoutPath,...s})}catch(s){t.body.title="Failed to retrieve report status",t.body.errorDescription="We were unable to retrieve the report status:",t.body.error=new d.default(s).formatError(),o()}};POST=async(t,e,o)=>{try{const s=await l.default.getRequestStatus({req:t,res:e,services:this.services});e.send({status:s.status})}catch{e.send({status:"FAILED"})}}}var R=n;0&&(module.exports={RequestStatusController});
+"use strict";var y=Object.create;var i=Object.defineProperty;var p=Object.getOwnPropertyDescriptor;var h=Object.getOwnPropertyNames;var v=Object.getPrototypeOf,m=Object.prototype.hasOwnProperty;var f=(r,t)=>{for(var e in t)i(r,e,{get:t[e],enumerable:!0})},u=(r,t,e,o)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of h(t))!m.call(r,s)&&s!==e&&i(r,s,{get:()=>t[s],enumerable:!(o=p(t,s))||o.enumerable});return r};var a=(r,t,e)=>(e=r!=null?y(v(r)):{},u(t||!r||!r.__esModule?i(e,"default",{value:r,enumerable:!0}):e,r)),P=r=>u(i({},"__esModule",{value:!0}),r);var g={};f(g,{RequestStatusController:()=>n,default:()=>R});module.exports=P(g);var c=a(require("./utils")),l=a(require("../../../../components/user-reports/requested/utils")),d=a(require("../../../../utils/ErrorHandler"));class n{layoutPath;services;constructor(t,e){this.layoutPath=t,this.services=e}GET=async(t,e,o)=>{try{const s=await c.default.renderPolling({req:t,res:e,services:this.services,next:o});e.render("dpr/routes/journeys/request-report/status/view",{layoutPath:this.layoutPath,...s})}catch(s){t.body??={},t.body.title="Failed to retrieve report status",t.body.errorDescription="We were unable to retrieve the report status:",t.body.error=new d.default(s).formatError(),o()}};POST=async(t,e,o)=>{try{const s=await l.default.getRequestStatus({req:t,res:e,services:this.services});e.send({status:s.status})}catch{e.send({status:"FAILED"})}}}var R=n;0&&(module.exports={RequestStatusController});
 //# sourceMappingURL=controller.js.map

package/dpr/routes/journeys/request-report/status/controller.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/request-report/status/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../types/Services'\nimport AsyncPollingUtils from './utils'\nimport AsyncRequestListUtils from '../../../../components/user-reports/requested/utils'\nimport ErrorHandler from '../../../../utils/ErrorHandler'\n\nclass RequestStatusController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  // Render status page\n  GET: RequestHandler = async (req, res, next) => {\n    try {\n      const pollingRenderData = await AsyncPollingUtils.renderPolling({\n        req,\n        res,\n        services: this.services,\n        next,\n      })\n      res.render(`dpr/routes/journeys/request-report/status/view`, {\n        layoutPath: this.layoutPath,\n        ...pollingRenderData,\n      })\n    } catch (error) {\n      req.body.title = 'Failed to retrieve report status'\n      req.body.errorDescription = 'We were unable to retrieve the report status:'\n      req.body.error = new ErrorHandler(error).formatError()\n      next()\n    }\n  }\n\n  // Poll request status\n  POST: RequestHandler = async (req, res, _next) => {\n    try {\n      const response = await AsyncRequestListUtils.getRequestStatus({ req, res, services: this.services })\n      res.send({ status: response.status })\n    } catch (error) {\n      res.send({ status: 'FAILED' })\n    }\n  }\n}\n\nexport { RequestStatusController }\nexport default RequestStatusController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAA8B,sBAC9BA,EAAkC,kEAClCC,EAAyB,6CAEzB,MAAMJ,CAAwB,CAC5B,WAEA,SAEA,YAAYK,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAGA,IAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,GAAI,CACF,MAAMC,EAAoB,MAAM,EAAAC,QAAkB,cAAc,CAC9D,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,SACf,KAAAC,CACF,CAAC,EACDD,EAAI,OAAO,iDAAkD,CAC3D,WAAY,KAAK,WACjB,GAAGE,CACL,CAAC,CACH,OAASE,EAAO,CACdL,EAAI,KAAK,MAAQ,mCACjBA,EAAI,KAAK,iBAAmB,gDAC5BA,EAAI,KAAK,MAAQ,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EACrDH,EAAK,CACP,CACF,EAGA,KAAuB,MAAOF,EAAKC,EAAKM,IAAU,CAChD,GAAI,CACF,MAAMC,EAAW,MAAM,EAAAC,QAAsB,iBAAiB,CAAE,IAAAT,EAAK,IAAAC,EAAK,SAAU,KAAK,QAAS,CAAC,EACnGA,EAAI,KAAK,CAAE,OAAQO,EAAS,MAAO,CAAC,CACtC,MAAgB,CACdP,EAAI,KAAK,CAAE,OAAQ,QAAS,CAAC,CAC/B,CACF,CACF,CAGA,IAAOP,EAAQD",
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../types/Services'\nimport AsyncPollingUtils from './utils'\nimport AsyncRequestListUtils from '../../../../components/user-reports/requested/utils'\nimport ErrorHandler from '../../../../utils/ErrorHandler'\n\nclass RequestStatusController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  // Render status page\n  GET: RequestHandler = async (req, res, next) => {\n    try {\n      const pollingRenderData = await AsyncPollingUtils.renderPolling({\n        req,\n        res,\n        services: this.services,\n        next,\n      })\n      res.render(`dpr/routes/journeys/request-report/status/view`, {\n        layoutPath: this.layoutPath,\n        ...pollingRenderData,\n      })\n    } catch (error) {\n      req.body ??= {}\n      req.body.title = 'Failed to retrieve report status'\n      req.body.errorDescription = 'We were unable to retrieve the report status:'\n      req.body.error = new ErrorHandler(error).formatError()\n      next()\n    }\n  }\n\n  // Poll request status\n  POST: RequestHandler = async (req, res, _next) => {\n    try {\n      const response = await AsyncRequestListUtils.getRequestStatus({ req, res, services: this.services })\n      res.send({ status: response.status })\n    } catch (error) {\n      res.send({ status: 'FAILED' })\n    }\n  }\n}\n\nexport { RequestStatusController }\nexport default RequestStatusController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAA8B,sBAC9BA,EAAkC,kEAClCC,EAAyB,6CAEzB,MAAMJ,CAAwB,CAC5B,WAEA,SAEA,YAAYK,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAGA,IAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,GAAI,CACF,MAAMC,EAAoB,MAAM,EAAAC,QAAkB,cAAc,CAC9D,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,SACf,KAAAC,CACF,CAAC,EACDD,EAAI,OAAO,iDAAkD,CAC3D,WAAY,KAAK,WACjB,GAAGE,CACL,CAAC,CACH,OAASE,EAAO,CACdL,EAAI,OAAS,CAAC,EACdA,EAAI,KAAK,MAAQ,mCACjBA,EAAI,KAAK,iBAAmB,gDAC5BA,EAAI,KAAK,MAAQ,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EACrDH,EAAK,CACP,CACF,EAGA,KAAuB,MAAOF,EAAKC,EAAKM,IAAU,CAChD,GAAI,CACF,MAAMC,EAAW,MAAM,EAAAC,QAAsB,iBAAiB,CAAE,IAAAT,EAAK,IAAAC,EAAK,SAAU,KAAK,QAAS,CAAC,EACnGA,EAAI,KAAK,CAAE,OAAQO,EAAS,MAAO,CAAC,CACtC,MAAgB,CACdP,EAAI,KAAK,CAAE,OAAQ,QAAS,CAAC,CAC/B,CACF,CACF,CAGA,IAAOP,EAAQD",
   "names": ["controller_exports", "__export", "RequestStatusController", "controller_default", "__toCommonJS", "import_utils", "import_ErrorHandler", "layoutPath", "services", "req", "res", "next", "pollingRenderData", "AsyncPollingUtils", "error", "ErrorHandler", "_next", "response", "AsyncRequestListUtils"]
 }

package/dpr/routes/journeys/request-report/status/controller.ts

@@ -28,6 +28,7 @@ class RequestStatusController {
         ...pollingRenderData,
       })
     } catch (error) {
+      req.body ??= {}
       req.body.title = 'Failed to retrieve report status'
       req.body.errorDescription = 'We were unable to retrieve the report status:'
       req.body.error = new ErrorHandler(error).formatError()

package/dpr/routes/journeys/view-report/async/controller.js

@@ -1,2 +1,2 @@
-"use strict";var f=Object.create;var a=Object.defineProperty;var v=Object.getOwnPropertyDescriptor;var p=Object.getOwnPropertyNames;var y=Object.getPrototypeOf,h=Object.prototype.hasOwnProperty;var E=(t,e)=>{for(var r in e)a(t,r,{get:e[r],enumerable:!0})},u=(t,e,r,o)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of p(e))!h.call(t,s)&&s!==r&&a(t,s,{get:()=>e[s],enumerable:!(o=v(e,s))||o.enumerable});return t};var i=(t,e,r)=>(r=t!=null?f(y(t)):{},u(e||!t||!t.__esModule?a(r,"default",{value:t,enumerable:!0}):r,t)),R=t=>u(a({},"__esModule",{value:!0}),t);var F={};E(F,{AsyncController:()=>n,default:()=>b});module.exports=R(F);var l=i(require("../../../../utils/ErrorHandler")),m=i(require("../../../../components/user-reports/utils")),c=require("../../../../components/_filters/filtersTypeEnum"),d=i(require("../../../../utils/Personalisation/personalisationUtils"));class n{layoutPath;services;constructor(e,r){this.layoutPath=e,this.services=r}POST=async(e,r,o)=>{try{const s=await m.default.updateExpiredStatus({req:e,res:r,services:this.services});r.send({isExpired:s})}catch{r.send({status:"FAILED"})}};saveDefaultFilterValues=async(e,r,o)=>{try{d.default.saveDefaults(c.FiltersType.INTERACTIVE,r,e,this.services),r.redirect(`${e.baseUrl}?defaultsSaved=true`)}catch(s){e.body={title:"Failed to save defaults",error:new l.default(s).formatError(),...e.body},o()}};removeDefaultFilterValues=async(e,r,o)=>{try{d.default.removeDefaults(c.FiltersType.INTERACTIVE,r,e,this.services),r.redirect(e.baseUrl)}catch(s){e.body={title:"Failed to remove defaults",error:new l.default(s).formatError(),...e.body},o()}}}var b=n;0&&(module.exports={AsyncController});
+"use strict";var f=Object.create;var a=Object.defineProperty;var v=Object.getOwnPropertyDescriptor;var y=Object.getOwnPropertyNames;var p=Object.getPrototypeOf,h=Object.prototype.hasOwnProperty;var E=(t,e)=>{for(var r in e)a(t,r,{get:e[r],enumerable:!0})},u=(t,e,r,o)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of y(e))!h.call(t,s)&&s!==r&&a(t,s,{get:()=>e[s],enumerable:!(o=v(e,s))||o.enumerable});return t};var i=(t,e,r)=>(r=t!=null?f(p(t)):{},u(e||!t||!t.__esModule?a(r,"default",{value:t,enumerable:!0}):r,t)),b=t=>u(a({},"__esModule",{value:!0}),t);var F={};E(F,{AsyncController:()=>n,default:()=>R});module.exports=b(F);var l=i(require("../../../../utils/ErrorHandler")),m=i(require("../../../../components/user-reports/utils")),c=require("../../../../components/_filters/filtersTypeEnum"),d=i(require("../../../../utils/Personalisation/personalisationUtils"));class n{layoutPath;services;constructor(e,r){this.layoutPath=e,this.services=r}POST=async(e,r,o)=>{try{const s=await m.default.updateExpiredStatus({req:e,res:r,services:this.services});r.send({isExpired:s})}catch{r.send({status:"FAILED"})}};saveDefaultFilterValues=async(e,r,o)=>{try{d.default.saveDefaults(c.FiltersType.INTERACTIVE,r,e,this.services),r.redirect(`${e.baseUrl}?defaultsSaved=true`)}catch(s){e.body={title:"Failed to save defaults",error:new l.default(s).formatError(),...e.body&&{...e.body}},o()}};removeDefaultFilterValues=async(e,r,o)=>{try{d.default.removeDefaults(c.FiltersType.INTERACTIVE,r,e,this.services),r.redirect(e.baseUrl)}catch(s){e.body={title:"Failed to remove defaults",error:new l.default(s).formatError(),...e.body&&{...e.body}},o()}}}var R=n;0&&(module.exports={AsyncController});
 //# sourceMappingURL=controller.js.map

package/dpr/routes/journeys/view-report/async/controller.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/view-report/async/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport ErrorHandler from '../../../../utils/ErrorHandler'\nimport { Services } from '../../../../types/Services'\nimport UserReportsListUtils from '../../../../components/user-reports/utils'\nimport { FiltersType } from '../../../../components/_filters/filtersTypeEnum'\nimport PersonalisationUtils from '../../../../utils/Personalisation/personalisationUtils'\n\nclass AsyncController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  POST: RequestHandler = async (req, res, _next) => {\n    try {\n      const response = await UserReportsListUtils.updateExpiredStatus({\n        req,\n        res,\n        services: this.services,\n      })\n      res.send({ isExpired: response })\n    } catch (error) {\n      res.send({ status: 'FAILED' })\n    }\n  }\n\n  saveDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      PersonalisationUtils.saveDefaults(FiltersType.INTERACTIVE, res, req, this.services)\n      res.redirect(`${req.baseUrl}?defaultsSaved=true`)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to save defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...req.body,\n      }\n      next()\n    }\n  }\n\n  removeDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      PersonalisationUtils.removeDefaults(FiltersType.INTERACTIVE, res, req, this.services)\n      res.redirect(req.baseUrl)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to remove defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...req.body,\n      }\n      next()\n    }\n  }\n}\n\nexport { AsyncController }\nexport default AsyncController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,6CAEzBC,EAAiC,wDACjCC,EAA4B,2DAC5BC,EAAiC,qEAEjC,MAAMN,CAAgB,CACpB,WAEA,SAEA,YAAYO,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAEA,KAAuB,MAAOC,EAAKC,EAAKC,IAAU,CAChD,GAAI,CACF,MAAMC,EAAW,MAAM,EAAAC,QAAqB,oBAAoB,CAC9D,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,QACjB,CAAC,EACDA,EAAI,KAAK,CAAE,UAAWE,CAAS,CAAC,CAClC,MAAgB,CACdF,EAAI,KAAK,CAAE,OAAQ,QAAS,CAAC,CAC/B,CACF,EAEA,wBAA0C,MAAOD,EAAKC,EAAKI,IAAS,CAClE,GAAI,CACF,EAAAC,QAAqB,aAAa,cAAY,YAAaL,EAAKD,EAAK,KAAK,QAAQ,EAClFC,EAAI,SAAS,GAAGD,EAAI,OAAO,qBAAqB,CAClD,OAASO,EAAO,CACdP,EAAI,KAAO,CACT,MAAO,0BACP,MAAO,IAAI,EAAAQ,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAGP,EAAI,IACT,EACAK,EAAK,CACP,CACF,EAEA,0BAA4C,MAAOL,EAAKC,EAAKI,IAAS,CACpE,GAAI,CACF,EAAAC,QAAqB,eAAe,cAAY,YAAaL,EAAKD,EAAK,KAAK,QAAQ,EACpFC,EAAI,SAASD,EAAI,OAAO,CAC1B,OAASO,EAAO,CACdP,EAAI,KAAO,CACT,MAAO,4BACP,MAAO,IAAI,EAAAQ,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAGP,EAAI,IACT,EACAK,EAAK,CACP,CACF,CACF,CAGA,IAAOb,EAAQD",
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport ErrorHandler from '../../../../utils/ErrorHandler'\nimport { Services } from '../../../../types/Services'\nimport UserReportsListUtils from '../../../../components/user-reports/utils'\nimport { FiltersType } from '../../../../components/_filters/filtersTypeEnum'\nimport PersonalisationUtils from '../../../../utils/Personalisation/personalisationUtils'\n\nclass AsyncController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  POST: RequestHandler = async (req, res, _next) => {\n    try {\n      const response = await UserReportsListUtils.updateExpiredStatus({\n        req,\n        res,\n        services: this.services,\n      })\n      res.send({ isExpired: response })\n    } catch (error) {\n      res.send({ status: 'FAILED' })\n    }\n  }\n\n  saveDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      PersonalisationUtils.saveDefaults(FiltersType.INTERACTIVE, res, req, this.services)\n      res.redirect(`${req.baseUrl}?defaultsSaved=true`)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to save defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...(req.body && { ...req.body }),\n      }\n      next()\n    }\n  }\n\n  removeDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      PersonalisationUtils.removeDefaults(FiltersType.INTERACTIVE, res, req, this.services)\n      res.redirect(req.baseUrl)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to remove defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...(req.body && { ...req.body }),\n      }\n      next()\n    }\n  }\n}\n\nexport { AsyncController }\nexport default AsyncController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,6CAEzBC,EAAiC,wDACjCC,EAA4B,2DAC5BC,EAAiC,qEAEjC,MAAMN,CAAgB,CACpB,WAEA,SAEA,YAAYO,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAEA,KAAuB,MAAOC,EAAKC,EAAKC,IAAU,CAChD,GAAI,CACF,MAAMC,EAAW,MAAM,EAAAC,QAAqB,oBAAoB,CAC9D,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,QACjB,CAAC,EACDA,EAAI,KAAK,CAAE,UAAWE,CAAS,CAAC,CAClC,MAAgB,CACdF,EAAI,KAAK,CAAE,OAAQ,QAAS,CAAC,CAC/B,CACF,EAEA,wBAA0C,MAAOD,EAAKC,EAAKI,IAAS,CAClE,GAAI,CACF,EAAAC,QAAqB,aAAa,cAAY,YAAaL,EAAKD,EAAK,KAAK,QAAQ,EAClFC,EAAI,SAAS,GAAGD,EAAI,OAAO,qBAAqB,CAClD,OAASO,EAAO,CACdP,EAAI,KAAO,CACT,MAAO,0BACP,MAAO,IAAI,EAAAQ,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAIP,EAAI,MAAQ,CAAE,GAAGA,EAAI,IAAK,CAChC,EACAK,EAAK,CACP,CACF,EAEA,0BAA4C,MAAOL,EAAKC,EAAKI,IAAS,CACpE,GAAI,CACF,EAAAC,QAAqB,eAAe,cAAY,YAAaL,EAAKD,EAAK,KAAK,QAAQ,EACpFC,EAAI,SAASD,EAAI,OAAO,CAC1B,OAASO,EAAO,CACdP,EAAI,KAAO,CACT,MAAO,4BACP,MAAO,IAAI,EAAAQ,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAIP,EAAI,MAAQ,CAAE,GAAGA,EAAI,IAAK,CAChC,EACAK,EAAK,CACP,CACF,CACF,CAGA,IAAOb,EAAQD",
   "names": ["controller_exports", "__export", "AsyncController", "controller_default", "__toCommonJS", "import_ErrorHandler", "import_utils", "import_filtersTypeEnum", "import_personalisationUtils", "layoutPath", "services", "req", "res", "_next", "response", "UserReportsListUtils", "next", "PersonalisationUtils", "error", "ErrorHandler"]
 }

package/dpr/routes/journeys/view-report/async/controller.ts

@@ -36,7 +36,7 @@ class AsyncController {
       req.body = {
         title: 'Failed to save defaults',
         error: new ErrorHandler(error).formatError(),
-        ...req.body,
+        ...(req.body && { ...req.body }),
       }
       next()
     }
@@ -50,7 +50,7 @@ class AsyncController {
       req.body = {
         title: 'Failed to remove defaults',
         error: new ErrorHandler(error).formatError(),
-        ...req.body,
+        ...(req.body && { ...req.body }),
       }
       next()
     }

package/dpr/routes/journeys/view-report/async/dashboard/controller.js

@@ -1,2 +1,2 @@
-"use strict";var v=Object.create;var i=Object.defineProperty;var b=Object.getOwnPropertyDescriptor;var w=Object.getOwnPropertyNames;var E=Object.getPrototypeOf,D=Object.prototype.hasOwnProperty;var H=(t,r)=>{for(var e in r)i(t,e,{get:r[e],enumerable:!0})},p=(t,r,e,a)=>{if(r&&typeof r=="object"||typeof r=="function")for(let s of w(r))!D.call(t,s)&&s!==e&&i(t,s,{get:()=>r[s],enumerable:!(a=b(r,s))||a.enumerable});return t};var c=(t,r,e)=>(e=t!=null?v(E(t)):{},p(r||!t||!t.__esModule?i(e,"default",{value:t,enumerable:!0}):e,t)),P=t=>p(i({},"__esModule",{value:!0}),t);var S={};H(S,{ViewAsyncDashboardController:()=>d,default:()=>R});module.exports=P(S);var y=c(require("../../../../../utils/ErrorHandler")),h=c(require("../../../../../utils/localsHelper")),m=c(require("./utils")),u=c(require("../../utils"));class d{layoutPath;services;constructor(r,e){this.layoutPath=r,this.services=e}GET=async(r,e,a)=>{const{type:s}=r.params;try{const l={req:r,res:e,services:this.services,next:a},o=await m.default.renderAsyncDashboard(l);e.render("dpr/routes/journeys/view-report/dashboard",{layoutPath:this.layoutPath,...o})}catch(l){const o=new y.default(l).formatError();let n;if(o.status==="EXPIRED"){const{dprUser:f}=h.default.getValues(e);n=await this.services.recentlyViewedService.asyncSetToExpiredByTableId(r.params.tableId,f.id)}r.body.title=`Failed to retrieve ${s}`,r.body.error=o,n&&(r.body.refreshLink=n),a()}};applyFilters=async(r,e,a)=>{await u.default.applyDashboardInteractiveQuery(r,e,this.services,"filters")}}var R=d;0&&(module.exports={ViewAsyncDashboardController});
+"use strict";var v=Object.create;var i=Object.defineProperty;var b=Object.getOwnPropertyDescriptor;var w=Object.getOwnPropertyNames;var E=Object.getPrototypeOf,D=Object.prototype.hasOwnProperty;var H=(t,r)=>{for(var e in r)i(t,e,{get:r[e],enumerable:!0})},p=(t,r,e,a)=>{if(r&&typeof r=="object"||typeof r=="function")for(let s of w(r))!D.call(t,s)&&s!==e&&i(t,s,{get:()=>r[s],enumerable:!(a=b(r,s))||a.enumerable});return t};var c=(t,r,e)=>(e=t!=null?v(E(t)):{},p(r||!t||!t.__esModule?i(e,"default",{value:t,enumerable:!0}):e,t)),P=t=>p(i({},"__esModule",{value:!0}),t);var S={};H(S,{ViewAsyncDashboardController:()=>n,default:()=>R});module.exports=P(S);var y=c(require("../../../../../utils/ErrorHandler")),h=c(require("../../../../../utils/localsHelper")),m=c(require("./utils")),u=c(require("../../utils"));class n{layoutPath;services;constructor(r,e){this.layoutPath=r,this.services=e}GET=async(r,e,a)=>{const{type:s}=r.params;try{const d={req:r,res:e,services:this.services,next:a},o=await m.default.renderAsyncDashboard(d);e.render("dpr/routes/journeys/view-report/dashboard",{layoutPath:this.layoutPath,...o})}catch(d){const o=new y.default(d).formatError();let l;if(o.status==="EXPIRED"){const{dprUser:f}=h.default.getValues(e);l=await this.services.recentlyViewedService.asyncSetToExpiredByTableId(r.params.tableId,f.id)}r.body??={},r.body.title=`Failed to retrieve ${s}`,r.body.error=o,l&&(r.body.refreshLink=l),a()}};applyFilters=async(r,e,a)=>{await u.default.applyDashboardInteractiveQuery(r,e,this.services,"filters")}}var R=n;0&&(module.exports={ViewAsyncDashboardController});
 //# sourceMappingURL=controller.js.map

package/dpr/routes/journeys/view-report/async/dashboard/controller.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/view-report/async/dashboard/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport ErrorHandler from '../../../../../utils/ErrorHandler'\nimport { Services } from '../../../../../types/Services'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport DashboardUtils from './utils'\nimport ViewReportUtils from '../../utils'\n\nclass ViewAsyncDashboardController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  GET: RequestHandler = async (req, res, next) => {\n    const { type } = req.params\n    try {\n      const params = { req, res, services: this.services, next }\n\n      const renderData = await DashboardUtils.renderAsyncDashboard(params)\n\n      res.render(`dpr/routes/journeys/view-report/dashboard`, {\n        layoutPath: this.layoutPath,\n        ...renderData,\n      })\n    } catch (error) {\n      const dprError = new ErrorHandler(error).formatError()\n      let refreshLink\n      if (dprError.status === 'EXPIRED') {\n        const { dprUser } = LocalsHelper.getValues(res)\n        refreshLink = await this.services.recentlyViewedService.asyncSetToExpiredByTableId(\n          req.params['tableId'],\n          dprUser.id,\n        )\n      }\n      req.body.title = `Failed to retrieve ${type}`\n      req.body.error = dprError\n      if (refreshLink) {\n        req.body.refreshLink = refreshLink\n      }\n      next()\n    }\n  }\n\n  applyFilters: RequestHandler = async (req, res, _next) => {\n    await ViewReportUtils.applyDashboardInteractiveQuery(req, res, this.services, 'filters')\n  }\n}\n\nexport { ViewAsyncDashboardController }\nexport default ViewAsyncDashboardController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,kCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,gDAEzBC,EAAyB,gDACzBC,EAA2B,sBAC3BA,EAA4B,0BAE5B,MAAML,CAA6B,CACjC,WAEA,SAEA,YAAYM,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAEA,IAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,KAAM,CAAE,KAAAC,CAAK,EAAIH,EAAI,OACrB,GAAI,CACF,MAAMI,EAAS,CAAE,IAAAJ,EAAK,IAAAC,EAAK,SAAU,KAAK,SAAU,KAAAC,CAAK,EAEnDG,EAAa,MAAM,EAAAC,QAAe,qBAAqBF,CAAM,EAEnEH,EAAI,OAAO,4CAA6C,CACtD,WAAY,KAAK,WACjB,GAAGI,CACL,CAAC,CACH,OAASE,EAAO,CACd,MAAMC,EAAW,IAAI,EAAAC,QAAaF,CAAK,EAAE,YAAY,EACrD,IAAIG,EACJ,GAAIF,EAAS,SAAW,UAAW,CACjC,KAAM,CAAE,QAAAG,CAAQ,EAAI,EAAAC,QAAa,UAAUX,CAAG,EAC9CS,EAAc,MAAM,KAAK,SAAS,sBAAsB,2BACtDV,EAAI,OAAO,QACXW,EAAQ,EACV,CACF,CACAX,EAAI,KAAK,MAAQ,sBAAsBG,CAAI,GAC3CH,EAAI,KAAK,MAAQQ,EACbE,IACFV,EAAI,KAAK,YAAcU,GAEzBR,EAAK,CACP,CACF,EAEA,aAA+B,MAAOF,EAAKC,EAAKY,IAAU,CACxD,MAAM,EAAAC,QAAgB,+BAA+Bd,EAAKC,EAAK,KAAK,SAAU,SAAS,CACzF,CACF,CAGA,IAAOR,EAAQD",
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport ErrorHandler from '../../../../../utils/ErrorHandler'\nimport { Services } from '../../../../../types/Services'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport DashboardUtils from './utils'\nimport ViewReportUtils from '../../utils'\n\nclass ViewAsyncDashboardController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  GET: RequestHandler = async (req, res, next) => {\n    const { type } = req.params\n    try {\n      const params = { req, res, services: this.services, next }\n\n      const renderData = await DashboardUtils.renderAsyncDashboard(params)\n\n      res.render(`dpr/routes/journeys/view-report/dashboard`, {\n        layoutPath: this.layoutPath,\n        ...renderData,\n      })\n    } catch (error) {\n      const dprError = new ErrorHandler(error).formatError()\n      let refreshLink\n      if (dprError.status === 'EXPIRED') {\n        const { dprUser } = LocalsHelper.getValues(res)\n        refreshLink = await this.services.recentlyViewedService.asyncSetToExpiredByTableId(\n          req.params['tableId'],\n          dprUser.id,\n        )\n      }\n      req.body ??= {}\n      req.body.title = `Failed to retrieve ${type}`\n      req.body.error = dprError\n      if (refreshLink) {\n        req.body.refreshLink = refreshLink\n      }\n      next()\n    }\n  }\n\n  applyFilters: RequestHandler = async (req, res, _next) => {\n    await ViewReportUtils.applyDashboardInteractiveQuery(req, res, this.services, 'filters')\n  }\n}\n\nexport { ViewAsyncDashboardController }\nexport default ViewAsyncDashboardController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,kCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,gDAEzBC,EAAyB,gDACzBC,EAA2B,sBAC3BA,EAA4B,0BAE5B,MAAML,CAA6B,CACjC,WAEA,SAEA,YAAYM,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAEA,IAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,KAAM,CAAE,KAAAC,CAAK,EAAIH,EAAI,OACrB,GAAI,CACF,MAAMI,EAAS,CAAE,IAAAJ,EAAK,IAAAC,EAAK,SAAU,KAAK,SAAU,KAAAC,CAAK,EAEnDG,EAAa,MAAM,EAAAC,QAAe,qBAAqBF,CAAM,EAEnEH,EAAI,OAAO,4CAA6C,CACtD,WAAY,KAAK,WACjB,GAAGI,CACL,CAAC,CACH,OAASE,EAAO,CACd,MAAMC,EAAW,IAAI,EAAAC,QAAaF,CAAK,EAAE,YAAY,EACrD,IAAIG,EACJ,GAAIF,EAAS,SAAW,UAAW,CACjC,KAAM,CAAE,QAAAG,CAAQ,EAAI,EAAAC,QAAa,UAAUX,CAAG,EAC9CS,EAAc,MAAM,KAAK,SAAS,sBAAsB,2BACtDV,EAAI,OAAO,QACXW,EAAQ,EACV,CACF,CACAX,EAAI,OAAS,CAAC,EACdA,EAAI,KAAK,MAAQ,sBAAsBG,CAAI,GAC3CH,EAAI,KAAK,MAAQQ,EACbE,IACFV,EAAI,KAAK,YAAcU,GAEzBR,EAAK,CACP,CACF,EAEA,aAA+B,MAAOF,EAAKC,EAAKY,IAAU,CACxD,MAAM,EAAAC,QAAgB,+BAA+Bd,EAAKC,EAAK,KAAK,SAAU,SAAS,CACzF,CACF,CAGA,IAAOR,EAAQD",
   "names": ["controller_exports", "__export", "ViewAsyncDashboardController", "controller_default", "__toCommonJS", "import_ErrorHandler", "import_localsHelper", "import_utils", "layoutPath", "services", "req", "res", "next", "type", "params", "renderData", "DashboardUtils", "error", "dprError", "ErrorHandler", "refreshLink", "dprUser", "LocalsHelper", "_next", "ViewReportUtils"]
 }

package/dpr/routes/journeys/view-report/async/dashboard/controller.ts

@@ -36,6 +36,7 @@ class ViewAsyncDashboardController {
           dprUser.id,
         )
       }
+      req.body ??= {}
       req.body.title = `Failed to retrieve ${type}`
       req.body.error = dprError
       if (refreshLink) {

package/dpr/routes/journeys/view-report/async/report/controller.js

@@ -1,2 +1,2 @@
-"use strict";var R=Object.create;var i=Object.defineProperty;var w=Object.getOwnPropertyDescriptor;var E=Object.getOwnPropertyNames;var H=Object.getPrototypeOf,b=Object.prototype.hasOwnProperty;var I=(t,e)=>{for(var r in e)i(t,r,{get:e[r],enumerable:!0})},m=(t,e,r,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of E(e))!b.call(t,o)&&o!==r&&i(t,o,{get:()=>e[o],enumerable:!(s=w(e,o))||s.enumerable});return t};var n=(t,e,r)=>(r=t!=null?R(H(t)):{},m(e||!t||!t.__esModule?i(r,"default",{value:t,enumerable:!0}):r,t)),P=t=>m(i({},"__esModule",{value:!0}),t);var x={};I(x,{ViewAyncReportController:()=>y,default:()=>S});module.exports=P(x);var u=n(require("../../../../../utils/localsHelper")),v=n(require("./utils")),l=n(require("../../utils")),h=n(require("../../../../../utils/ErrorHandler"));class y{layoutPath;services;constructor(e,r){this.layoutPath=e,this.services=r}GET=async(e,r,s)=>{const{type:o}=e.params;try{const c={req:e,res:r,services:this.services,next:s},a=await v.default.renderReport(c);r.render("dpr/routes/journeys/view-report/report",{layoutPath:this.layoutPath,...a})}catch(c){const a=new h.default(c).formatError();let p;const{recentlyViewedService:d}=this.services;if(a.status==="EXPIRED"&&d){const{dprUser:f}=u.default.getValues(r);p=await d.asyncSetToExpiredByTableId(e.params.tableId,f.id)}e.body.title=`Failed to retrieve ${o}`,e.body.error=a,p&&(e.body.refreshLink=p),s()}};applyFilters=async(e,r,s)=>{await l.default.applyReportInteractiveQuery(e,r,this.services,"filters")};applyColumns=async(e,r,s)=>{await l.default.applyReportInteractiveQuery(e,r,this.services,"columns")}}var S=y;0&&(module.exports={ViewAyncReportController});
+"use strict";var R=Object.create;var i=Object.defineProperty;var w=Object.getOwnPropertyDescriptor;var E=Object.getOwnPropertyNames;var b=Object.getPrototypeOf,H=Object.prototype.hasOwnProperty;var I=(t,e)=>{for(var r in e)i(t,r,{get:e[r],enumerable:!0})},m=(t,e,r,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of E(e))!H.call(t,o)&&o!==r&&i(t,o,{get:()=>e[o],enumerable:!(s=w(e,o))||s.enumerable});return t};var n=(t,e,r)=>(r=t!=null?R(b(t)):{},m(e||!t||!t.__esModule?i(r,"default",{value:t,enumerable:!0}):r,t)),P=t=>m(i({},"__esModule",{value:!0}),t);var x={};I(x,{ViewAyncReportController:()=>y,default:()=>S});module.exports=P(x);var u=n(require("../../../../../utils/localsHelper")),v=n(require("./utils")),l=n(require("../../utils")),h=n(require("../../../../../utils/ErrorHandler"));class y{layoutPath;services;constructor(e,r){this.layoutPath=e,this.services=r}GET=async(e,r,s)=>{const{type:o}=e.params;try{const c={req:e,res:r,services:this.services,next:s},a=await v.default.renderReport(c);r.render("dpr/routes/journeys/view-report/report",{layoutPath:this.layoutPath,...a})}catch(c){const a=new h.default(c).formatError();let p;const{recentlyViewedService:d}=this.services;if(a.status==="EXPIRED"&&d){const{dprUser:f}=u.default.getValues(r);p=await d.asyncSetToExpiredByTableId(e.params.tableId,f.id)}e.body??={},e.body.title=`Failed to retrieve ${o}`,e.body.error=a,p&&(e.body.refreshLink=p),s()}};applyFilters=async(e,r,s)=>{await l.default.applyReportInteractiveQuery(e,r,this.services,"filters")};applyColumns=async(e,r,s)=>{await l.default.applyReportInteractiveQuery(e,r,this.services,"columns")}}var S=y;0&&(module.exports={ViewAyncReportController});
 //# sourceMappingURL=controller.js.map

package/dpr/routes/journeys/view-report/async/report/controller.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/view-report/async/report/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../../types/Services'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport AsyncReportUtils from './utils'\nimport ViewReportUtils from '../../utils'\nimport ErrorHandler from '../../../../../utils/ErrorHandler'\n\nclass ViewAyncReportController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  GET: RequestHandler = async (req, res, next) => {\n    const { type } = req.params\n    try {\n      const params = { req, res, services: this.services, next }\n\n      const renderData = await AsyncReportUtils.renderReport(params)\n\n      res.render(`dpr/routes/journeys/view-report/report`, {\n        layoutPath: this.layoutPath,\n        ...renderData,\n      })\n    } catch (error) {\n      const dprError = new ErrorHandler(error).formatError()\n      let refreshLink\n      const { recentlyViewedService } = this.services\n      if (dprError.status === 'EXPIRED' && recentlyViewedService) {\n        const { dprUser } = LocalsHelper.getValues(res)\n        refreshLink = await recentlyViewedService.asyncSetToExpiredByTableId(req.params['tableId'], dprUser.id)\n      }\n      req.body.title = `Failed to retrieve ${type}`\n      req.body.error = dprError\n      if (refreshLink) {\n        req.body.refreshLink = refreshLink\n      }\n      next()\n    }\n  }\n\n  applyFilters: RequestHandler = async (req, res, _next) => {\n    await ViewReportUtils.applyReportInteractiveQuery(req, res, this.services, 'filters')\n  }\n\n  applyColumns: RequestHandler = async (req, res, _next) => {\n    await ViewReportUtils.applyReportInteractiveQuery(req, res, this.services, 'columns')\n  }\n}\n\nexport { ViewAyncReportController }\nexport default ViewAyncReportController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,8BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAyB,gDACzBC,EAA6B,sBAC7BA,EAA4B,0BAC5BC,EAAyB,gDAEzB,MAAML,CAAyB,CAC7B,WAEA,SAEA,YAAYM,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAEA,IAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,KAAM,CAAE,KAAAC,CAAK,EAAIH,EAAI,OACrB,GAAI,CACF,MAAMI,EAAS,CAAE,IAAAJ,EAAK,IAAAC,EAAK,SAAU,KAAK,SAAU,KAAAC,CAAK,EAEnDG,EAAa,MAAM,EAAAC,QAAiB,aAAaF,CAAM,EAE7DH,EAAI,OAAO,yCAA0C,CACnD,WAAY,KAAK,WACjB,GAAGI,CACL,CAAC,CACH,OAASE,EAAO,CACd,MAAMC,EAAW,IAAI,EAAAC,QAAaF,CAAK,EAAE,YAAY,EACrD,IAAIG,EACJ,KAAM,CAAE,sBAAAC,CAAsB,EAAI,KAAK,SACvC,GAAIH,EAAS,SAAW,WAAaG,EAAuB,CAC1D,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUZ,CAAG,EAC9CS,EAAc,MAAMC,EAAsB,2BAA2BX,EAAI,OAAO,QAAYY,EAAQ,EAAE,CACxG,CACAZ,EAAI,KAAK,MAAQ,sBAAsBG,CAAI,GAC3CH,EAAI,KAAK,MAAQQ,EACbE,IACFV,EAAI,KAAK,YAAcU,GAEzBR,EAAK,CACP,CACF,EAEA,aAA+B,MAAOF,EAAKC,EAAKa,IAAU,CACxD,MAAM,EAAAC,QAAgB,4BAA4Bf,EAAKC,EAAK,KAAK,SAAU,SAAS,CACtF,EAEA,aAA+B,MAAOD,EAAKC,EAAKa,IAAU,CACxD,MAAM,EAAAC,QAAgB,4BAA4Bf,EAAKC,EAAK,KAAK,SAAU,SAAS,CACtF,CACF,CAGA,IAAOR,EAAQD",
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../../types/Services'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport AsyncReportUtils from './utils'\nimport ViewReportUtils from '../../utils'\nimport ErrorHandler from '../../../../../utils/ErrorHandler'\n\nclass ViewAyncReportController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  GET: RequestHandler = async (req, res, next) => {\n    const { type } = req.params\n    try {\n      const params = { req, res, services: this.services, next }\n\n      const renderData = await AsyncReportUtils.renderReport(params)\n\n      res.render(`dpr/routes/journeys/view-report/report`, {\n        layoutPath: this.layoutPath,\n        ...renderData,\n      })\n    } catch (error) {\n      const dprError = new ErrorHandler(error).formatError()\n      let refreshLink\n      const { recentlyViewedService } = this.services\n      if (dprError.status === 'EXPIRED' && recentlyViewedService) {\n        const { dprUser } = LocalsHelper.getValues(res)\n        refreshLink = await recentlyViewedService.asyncSetToExpiredByTableId(req.params['tableId'], dprUser.id)\n      }\n      req.body ??= {}\n      req.body.title = `Failed to retrieve ${type}`\n      req.body.error = dprError\n      if (refreshLink) {\n        req.body.refreshLink = refreshLink\n      }\n      next()\n    }\n  }\n\n  applyFilters: RequestHandler = async (req, res, _next) => {\n    await ViewReportUtils.applyReportInteractiveQuery(req, res, this.services, 'filters')\n  }\n\n  applyColumns: RequestHandler = async (req, res, _next) => {\n    await ViewReportUtils.applyReportInteractiveQuery(req, res, this.services, 'columns')\n  }\n}\n\nexport { ViewAyncReportController }\nexport default ViewAyncReportController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,8BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAyB,gDACzBC,EAA6B,sBAC7BA,EAA4B,0BAC5BC,EAAyB,gDAEzB,MAAML,CAAyB,CAC7B,WAEA,SAEA,YAAYM,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAEA,IAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,KAAM,CAAE,KAAAC,CAAK,EAAIH,EAAI,OACrB,GAAI,CACF,MAAMI,EAAS,CAAE,IAAAJ,EAAK,IAAAC,EAAK,SAAU,KAAK,SAAU,KAAAC,CAAK,EAEnDG,EAAa,MAAM,EAAAC,QAAiB,aAAaF,CAAM,EAE7DH,EAAI,OAAO,yCAA0C,CACnD,WAAY,KAAK,WACjB,GAAGI,CACL,CAAC,CACH,OAASE,EAAO,CACd,MAAMC,EAAW,IAAI,EAAAC,QAAaF,CAAK,EAAE,YAAY,EACrD,IAAIG,EACJ,KAAM,CAAE,sBAAAC,CAAsB,EAAI,KAAK,SACvC,GAAIH,EAAS,SAAW,WAAaG,EAAuB,CAC1D,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUZ,CAAG,EAC9CS,EAAc,MAAMC,EAAsB,2BAA2BX,EAAI,OAAO,QAAYY,EAAQ,EAAE,CACxG,CACAZ,EAAI,OAAS,CAAC,EACdA,EAAI,KAAK,MAAQ,sBAAsBG,CAAI,GAC3CH,EAAI,KAAK,MAAQQ,EACbE,IACFV,EAAI,KAAK,YAAcU,GAEzBR,EAAK,CACP,CACF,EAEA,aAA+B,MAAOF,EAAKC,EAAKa,IAAU,CACxD,MAAM,EAAAC,QAAgB,4BAA4Bf,EAAKC,EAAK,KAAK,SAAU,SAAS,CACtF,EAEA,aAA+B,MAAOD,EAAKC,EAAKa,IAAU,CACxD,MAAM,EAAAC,QAAgB,4BAA4Bf,EAAKC,EAAK,KAAK,SAAU,SAAS,CACtF,CACF,CAGA,IAAOR,EAAQD",
   "names": ["controller_exports", "__export", "ViewAyncReportController", "controller_default", "__toCommonJS", "import_localsHelper", "import_utils", "import_ErrorHandler", "layoutPath", "services", "req", "res", "next", "type", "params", "renderData", "AsyncReportUtils", "error", "dprError", "ErrorHandler", "refreshLink", "recentlyViewedService", "dprUser", "LocalsHelper", "_next", "ViewReportUtils"]
 }