@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.17.4 → 4.17.6

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 { Services } from '../../../../types/Services'\nimport UserReportsListUtils from '../../../../components/user-reports/utils'\nimport { FiltersType } from '../../../../components/_filters/filtersTypeEnum'\nimport ErrorSummaryUtils from '../../../../components/error-summary/utils'\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: ErrorSummaryUtils.handleError(<Error>error, req.params.type),\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: ErrorSummaryUtils.handleError(<Error>error, req.params.type),\n        ...req.body,\n      }\n      next()\n    }\n  }\n}\n\nexport { AsyncController }\nexport default AsyncController\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAiC,wDACjCC,EAA4B,2DAC5BD,EAA8B,yDAC9BE,EAAiC,qEAEjC,MAAML,CAAgB,CAKpB,YAAYM,EAAoBC,EAAoB,CAKpD,UAAuB,MAAOC,EAAKC,EAAKC,IAAS,CAC/C,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,6BAA0C,MAAOD,EAAKC,EAAKC,IAAS,CAClE,GAAI,CACF,EAAAG,QAAqB,aAAa,cAAY,YAAaJ,EAAKD,EAAK,KAAK,QAAQ,EAClFC,EAAI,SAAS,GAAGD,EAAI,OAAO,qBAAqB,CAClD,OAASM,EAAO,CACdN,EAAI,KAAO,CACT,MAAO,0BACP,MAAO,EAAAO,QAAkB,YAAmBD,EAAON,EAAI,OAAO,IAAI,EAClE,GAAGA,EAAI,IACT,EACAE,EAAK,CACP,CACF,EAEA,+BAA4C,MAAOF,EAAKC,EAAKC,IAAS,CACpE,GAAI,CACF,EAAAG,QAAqB,eAAe,cAAY,YAAaJ,EAAKD,EAAK,KAAK,QAAQ,EACpFC,EAAI,SAASD,EAAI,OAAO,CAC1B,OAASM,EAAO,CACdN,EAAI,KAAO,CACT,MAAO,4BACP,MAAO,EAAAO,QAAkB,YAAmBD,EAAON,EAAI,OAAO,IAAI,EAClE,GAAGA,EAAI,IACT,EACAE,EAAK,CACP,CACF,EA3CE,KAAK,WAAaJ,EAClB,KAAK,SAAWC,CAClB,CA0CF,CAGA,IAAON,EAAQD",
-  "names": ["controller_exports", "__export", "AsyncController", "controller_default", "__toCommonJS", "import_utils", "import_filtersTypeEnum", "import_personalisationUtils", "layoutPath", "services", "req", "res", "next", "response", "UserReportsListUtils", "PersonalisationUtils", "error", "ErrorSummaryUtils"]
+  "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,CAKpB,YAAYO,EAAoBC,EAAoB,CAKpD,UAAuB,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,6BAA0C,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,+BAA4C,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,EA3CE,KAAK,WAAaP,EAClB,KAAK,SAAWC,CAClB,CA0CF,CAGA,IAAOP,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

@@ -1,8 +1,8 @@
 import { RequestHandler } from 'express'
+import ErrorHandler from '../../../../utils/ErrorHandler'
 import { Services } from '../../../../types/Services'
 import UserReportsListUtils from '../../../../components/user-reports/utils'
 import { FiltersType } from '../../../../components/_filters/filtersTypeEnum'
-import ErrorSummaryUtils from '../../../../components/error-summary/utils'
 import PersonalisationUtils from '../../../../utils/Personalisation/personalisationUtils'
 
 class AsyncController {
@@ -15,7 +15,7 @@ class AsyncController {
     this.services = services
   }
 
-  POST: RequestHandler = async (req, res, next) => {
+  POST: RequestHandler = async (req, res, _next) => {
     try {
       const response = await UserReportsListUtils.updateExpiredStatus({
         req,
@@ -35,7 +35,7 @@ class AsyncController {
     } catch (error) {
       req.body = {
         title: 'Failed to save defaults',
-        error: ErrorSummaryUtils.handleError(<Error>error, req.params.type),
+        error: new ErrorHandler(error).formatError(),
         ...req.body,
       }
       next()
@@ -49,7 +49,7 @@ class AsyncController {
     } catch (error) {
       req.body = {
         title: 'Failed to remove defaults',
-        error: ErrorSummaryUtils.handleError(<Error>error, req.params.type),
+        error: new ErrorHandler(error).formatError(),
         ...req.body,
       }
       next()

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

@@ -1,2 +1,2 @@
-var f=Object.create;var i=Object.defineProperty;var b=Object.getOwnPropertyDescriptor;var w=Object.getOwnPropertyNames;var E=Object.getPrototypeOf,D=Object.prototype.hasOwnProperty;var S=(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?f(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 H={};S(H,{ViewAsyncDashboardController:()=>n,default:()=>R});module.exports=P(H);var y=c(require("../../../../../components/error-summary/utils")),h=c(require("../../../../../utils/localsHelper")),m=c(require("./utils")),u=c(require("../../utils"));class n{constructor(r,e){this.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=y.default.handleError(l,r.params.type);let d;if(o.status==="EXPIRED"){const{dprUser:v}=h.default.getValues(e);d=await this.services.recentlyViewedService.asyncSetToExpiredByTableId(r.params.tableId,v.id)}r.body.title=`Failed to retrieve ${s}`,r.body.error=o,d&&(r.body.refreshLink=d),a()}};this.applyFilters=async(r,e,a)=>{await u.default.applyDashboardInteractiveQuery(r,e,this.services,"filters")};this.layoutPath=r,this.services=e}}var R=n;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:()=>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{constructor(r,e){this.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()}};this.applyFilters=async(r,e,a)=>{await u.default.applyDashboardInteractiveQuery(r,e,this.services,"filters")};this.layoutPath=r,this.services=e}}var R=d;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 { Services } from '../../../../../types/Services'\nimport ErrorSummaryUtils from '../../../../../components/error-summary/utils'\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 = ErrorSummaryUtils.handleError(error, req.params.type)\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": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,kCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAA8B,4DAC9BC,EAAyB,gDACzBD,EAA2B,sBAC3BA,EAA4B,0BAE5B,MAAMH,CAA6B,CAKjC,YAAYK,EAAoBC,EAAoB,CAKpD,SAAsB,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,EAAAC,QAAkB,YAAYF,EAAOP,EAAI,OAAO,IAAI,EACrE,IAAIU,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,kBAA+B,MAAOF,EAAKC,EAAKC,IAAS,CACvD,MAAM,EAAAW,QAAgB,+BAA+Bb,EAAKC,EAAK,KAAK,SAAU,SAAS,CACzF,EApCE,KAAK,WAAaH,EAClB,KAAK,SAAWC,CAClB,CAmCF,CAGA,IAAOL,EAAQD",
-  "names": ["controller_exports", "__export", "ViewAsyncDashboardController", "controller_default", "__toCommonJS", "import_utils", "import_localsHelper", "layoutPath", "services", "req", "res", "next", "type", "params", "renderData", "DashboardUtils", "error", "dprError", "ErrorSummaryUtils", "refreshLink", "dprUser", "LocalsHelper", "ViewReportUtils"]
+  "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,CAKjC,YAAYM,EAAoBC,EAAoB,CAKpD,SAAsB,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,kBAA+B,MAAOF,EAAKC,EAAKY,IAAU,CACxD,MAAM,EAAAC,QAAgB,+BAA+Bd,EAAKC,EAAK,KAAK,SAAU,SAAS,CACzF,EApCE,KAAK,WAAaH,EAClB,KAAK,SAAWC,CAClB,CAmCF,CAGA,IAAON,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

@@ -1,6 +1,6 @@
 import { RequestHandler } from 'express'
+import ErrorHandler from '../../../../../utils/ErrorHandler'
 import { Services } from '../../../../../types/Services'
-import ErrorSummaryUtils from '../../../../../components/error-summary/utils'
 import LocalsHelper from '../../../../../utils/localsHelper'
 import DashboardUtils from './utils'
 import ViewReportUtils from '../../utils'
@@ -27,12 +27,12 @@ class ViewAsyncDashboardController {
         ...renderData,
       })
     } catch (error) {
-      const dprError = ErrorSummaryUtils.handleError(error, req.params.type)
+      const dprError = new ErrorHandler(error).formatError()
       let refreshLink
       if (dprError.status === 'EXPIRED') {
         const { dprUser } = LocalsHelper.getValues(res)
         refreshLink = await this.services.recentlyViewedService.asyncSetToExpiredByTableId(
-          req.params.tableId,
+          req.params['tableId'],
           dprUser.id,
         )
       }
@@ -45,7 +45,7 @@ class ViewAsyncDashboardController {
     }
   }
 
-  applyFilters: RequestHandler = async (req, res, next) => {
+  applyFilters: RequestHandler = async (req, res, _next) => {
     await ViewReportUtils.applyDashboardInteractiveQuery(req, res, this.services, 'filters')
   }
 }

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

@@ -1,2 +1,2 @@
-var c=Object.create;var i=Object.defineProperty;var m=Object.getOwnPropertyDescriptor;var u=Object.getOwnPropertyNames;var f=Object.getPrototypeOf,y=Object.prototype.hasOwnProperty;var g=(r,e)=>{for(var t in e)i(r,t,{get:e[t],enumerable:!0})},l=(r,e,t,o)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of u(e))!y.call(r,s)&&s!==t&&i(r,s,{get:()=>e[s],enumerable:!(o=m(e,s))||o.enumerable});return r};var v=(r,e,t)=>(t=r!=null?c(f(r)):{},l(e||!r||!r.__esModule?i(t,"default",{value:r,enumerable:!0}):t,r)),d=r=>l(i({},"__esModule",{value:!0}),r);var w={};g(w,{default:()=>h,routes:()=>a});module.exports=d(w);var n=require("express"),p=v(require("./controller"));function a({layoutPath:r,services:e}){const t=(0,n.Router)({mergeParams:!0}),o=new p.default(r,e);return t.get("/",o.GET),t.post("/apply-filters",o.applyFilters),t}var h=a;0&&(module.exports={routes});
+"use strict";var c=Object.create;var i=Object.defineProperty;var m=Object.getOwnPropertyDescriptor;var u=Object.getOwnPropertyNames;var f=Object.getPrototypeOf,y=Object.prototype.hasOwnProperty;var g=(r,e)=>{for(var t in e)i(r,t,{get:e[t],enumerable:!0})},l=(r,e,t,o)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of u(e))!y.call(r,s)&&s!==t&&i(r,s,{get:()=>e[s],enumerable:!(o=m(e,s))||o.enumerable});return r};var v=(r,e,t)=>(t=r!=null?c(f(r)):{},l(e||!r||!r.__esModule?i(t,"default",{value:r,enumerable:!0}):t,r)),d=r=>l(i({},"__esModule",{value:!0}),r);var w={};g(w,{default:()=>h,routes:()=>a});module.exports=d(w);var n=require("express"),p=v(require("./controller"));function a({layoutPath:r,services:e}){const t=(0,n.Router)({mergeParams:!0}),o=new p.default(r,e);return t.get("/",o.GET),t.post("/apply-filters",o.applyFilters),t}var h=a;0&&(module.exports={routes});
 //# sourceMappingURL=routes.js.map

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/view-report/async/dashboard/routes.ts"],
   "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport ViewAsyncDashboardController from './controller'\nimport { Services } from '../../../../../types/Services'\n\nexport function routes({ layoutPath, services }: { layoutPath: string; services: Services }) {\n  const router = Router({ mergeParams: true })\n  const controller = new ViewAsyncDashboardController(layoutPath, services)\n\n  router.get(`/`, controller.GET)\n  router.post('/apply-filters', controller.applyFilters)\n\n  return router\n}\n\nexport default routes\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBACvBC,EAAyC,2BAGlC,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EACrCC,EAAa,IAAI,EAAAC,QAA6BJ,EAAYC,CAAQ,EAExE,OAAAC,EAAO,IAAI,IAAKC,EAAW,GAAG,EAC9BD,EAAO,KAAK,iBAAkBC,EAAW,YAAY,EAE9CD,CACT,CAEA,IAAOP,EAAQC",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBACvBC,EAAyC,2BAGlC,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EACrCC,EAAa,IAAI,EAAAC,QAA6BJ,EAAYC,CAAQ,EAExE,OAAAC,EAAO,IAAI,IAAKC,EAAW,GAAG,EAC9BD,EAAO,KAAK,iBAAkBC,EAAW,YAAY,EAE9CD,CACT,CAEA,IAAOP,EAAQC",
   "names": ["routes_exports", "__export", "routes_default", "routes", "__toCommonJS", "import_express", "import_controller", "layoutPath", "services", "router", "controller", "ViewAsyncDashboardController"]
 }

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

@@ -1,2 +1,2 @@
-var e=require("../../../../../../../cypress-tests/cypressUtils");context("Viewing a report",()=>{const t="/embedded/platform/";describe("dashboard tests",()=>{before(()=>{(0,e.executeDashboardStubs)(),cy.task("stubTestDashboard8"),cy.task("stubDashboardSuccessResult20")}),it("should mark the dashboard as recently viewed",()=>{cy.visit(t),cy.findByRole("tab",{name:/Viewed \(0\)/}).should("be.visible"),(0,e.checkA11y)(),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(i,s)=>s.textContent.includes("Test Dashboard")&&s.textContent.includes("Dashboard used for testing testing")}).within(()=>{cy.findByRole("link",{name:"Request dashboard"}).click()})}),(0,e.checkA11y)(),cy.findByRole("button",{name:/Request/}).click(),(0,e.checkA11y)(),cy.findByRole("heading",{level:1,name:/Test Dashboard/}).should("be.visible"),(0,e.checkA11y)(),cy.visit(t),cy.findByRole("tab",{name:/Viewed \(1\)/}).should("be.visible")})})});
+"use strict";var e=require("../../../../../../../cypress-tests/cypressUtils");context("Viewing a report",()=>{const t="/embedded/platform/";describe("dashboard tests",()=>{before(()=>{(0,e.executeDashboardStubs)(),cy.task("stubTestDashboard8"),cy.task("stubDashboardSuccessResult20")}),it("should mark the dashboard as recently viewed",()=>{cy.visit(t),cy.findByRole("tab",{name:/Viewed \(0\)/}).should("be.visible"),(0,e.checkA11y)(),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(a,s)=>!!s.textContent?.includes("Test Dashboard")&&!!s.textContent?.includes("Dashboard used for testing testing")}).within(()=>{cy.findByRole("link",{name:"Request dashboard"}).click()})}),(0,e.checkA11y)(),cy.findByRole("button",{name:/Request/}).click(),(0,e.checkA11y)(),cy.findByRole("heading",{level:1,name:/Test Dashboard/}).should("be.visible"),(0,e.checkA11y)(),cy.visit(t),cy.findByRole("tab",{name:/Viewed \(1\)/}).should("be.visible")})})});
 //# sourceMappingURL=tests.cy.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/view-report/async/dashboard/tests.cy.ts"],
-  "sourcesContent": ["import { checkA11y, executeDashboardStubs } from '../../../../../../../cypress-tests/cypressUtils'\n\ncontext('Viewing a report', () => {\n  const path = '/embedded/platform/'\n\n  describe('dashboard tests', () => {\n    before(() => {\n      executeDashboardStubs()\n      cy.task('stubTestDashboard8')\n      cy.task('stubDashboardSuccessResult20')\n    })\n\n    it('should mark the dashboard as recently viewed', () => {\n      // Request and run a report so we can go back to it for each test\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Viewed \\(0\\)/ }).should('be.visible')\n      checkA11y()\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              element.textContent.includes('Test Dashboard') &&\n              element.textContent.includes('Dashboard used for testing testing')\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request dashboard' }).click()\n        })\n      })\n      checkA11y()\n      cy.findByRole('button', { name: /Request/ }).click()\n      checkA11y()\n      cy.findByRole('heading', { level: 1, name: /Test Dashboard/ }).should('be.visible')\n      checkA11y()\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Viewed \\(1\\)/ }).should('be.visible')\n    })\n  })\n})\n"],
-  "mappings": "AAAA,IAAAA,EAAiD,2DAEjD,QAAQ,mBAAoB,IAAM,CAChC,MAAMC,EAAO,sBAEb,SAAS,kBAAmB,IAAM,CAChC,OAAO,IAAM,IACX,yBAAsB,EACtB,GAAG,KAAK,oBAAoB,EAC5B,GAAG,KAAK,8BAA8B,CACxC,CAAC,EAED,GAAG,+CAAgD,IAAM,CAEvD,GAAG,MAAMA,CAAI,EACb,GAAG,WAAW,MAAO,CAAE,KAAM,cAAe,CAAC,EAAE,OAAO,YAAY,KAClE,aAAU,EACV,GAAG,gBAAgB,sBAAsB,EAAE,OAAO,IAAM,CACtD,GAAG,WAAW,MAAO,CACnB,KAAM,CAACC,EAAGC,IAENA,EAAQ,YAAY,SAAS,gBAAgB,GAC7CA,EAAQ,YAAY,SAAS,oCAAoC,CAGvE,CAAC,EAAE,OAAO,IAAM,CACd,GAAG,WAAW,OAAQ,CAAE,KAAM,mBAAoB,CAAC,EAAE,MAAM,CAC7D,CAAC,CACH,CAAC,KACD,aAAU,EACV,GAAG,WAAW,SAAU,CAAE,KAAM,SAAU,CAAC,EAAE,MAAM,KACnD,aAAU,EACV,GAAG,WAAW,UAAW,CAAE,MAAO,EAAG,KAAM,gBAAiB,CAAC,EAAE,OAAO,YAAY,KAClF,aAAU,EACV,GAAG,MAAMF,CAAI,EACb,GAAG,WAAW,MAAO,CAAE,KAAM,cAAe,CAAC,EAAE,OAAO,YAAY,CACpE,CAAC,CACH,CAAC,CACH,CAAC",
+  "sourcesContent": ["import { checkA11y, executeDashboardStubs } from '../../../../../../../cypress-tests/cypressUtils'\n\ncontext('Viewing a report', () => {\n  const path = '/embedded/platform/'\n\n  describe('dashboard tests', () => {\n    before(() => {\n      executeDashboardStubs()\n      cy.task('stubTestDashboard8')\n      cy.task('stubDashboardSuccessResult20')\n    })\n\n    it('should mark the dashboard as recently viewed', () => {\n      // Request and run a report so we can go back to it for each test\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Viewed \\(0\\)/ }).should('be.visible')\n      checkA11y()\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              Boolean(element.textContent?.includes('Test Dashboard')) &&\n              Boolean(element.textContent?.includes('Dashboard used for testing testing'))\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request dashboard' }).click()\n        })\n      })\n      checkA11y()\n      cy.findByRole('button', { name: /Request/ }).click()\n      checkA11y()\n      cy.findByRole('heading', { level: 1, name: /Test Dashboard/ }).should('be.visible')\n      checkA11y()\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Viewed \\(1\\)/ }).should('be.visible')\n    })\n  })\n})\n"],
+  "mappings": "aAAA,IAAAA,EAAiD,2DAEjD,QAAQ,mBAAoB,IAAM,CAChC,MAAMC,EAAO,sBAEb,SAAS,kBAAmB,IAAM,CAChC,OAAO,IAAM,IACX,yBAAsB,EACtB,GAAG,KAAK,oBAAoB,EAC5B,GAAG,KAAK,8BAA8B,CACxC,CAAC,EAED,GAAG,+CAAgD,IAAM,CAEvD,GAAG,MAAMA,CAAI,EACb,GAAG,WAAW,MAAO,CAAE,KAAM,cAAe,CAAC,EAAE,OAAO,YAAY,KAClE,aAAU,EACV,GAAG,gBAAgB,sBAAsB,EAAE,OAAO,IAAM,CACtD,GAAG,WAAW,MAAO,CACnB,KAAM,CAACC,EAAGC,IAEN,EAAQA,EAAQ,aAAa,SAAS,gBAAgB,GACtD,EAAQA,EAAQ,aAAa,SAAS,oCAAoC,CAGhF,CAAC,EAAE,OAAO,IAAM,CACd,GAAG,WAAW,OAAQ,CAAE,KAAM,mBAAoB,CAAC,EAAE,MAAM,CAC7D,CAAC,CACH,CAAC,KACD,aAAU,EACV,GAAG,WAAW,SAAU,CAAE,KAAM,SAAU,CAAC,EAAE,MAAM,KACnD,aAAU,EACV,GAAG,WAAW,UAAW,CAAE,MAAO,EAAG,KAAM,gBAAiB,CAAC,EAAE,OAAO,YAAY,KAClF,aAAU,EACV,GAAG,MAAMF,CAAI,EACb,GAAG,WAAW,MAAO,CAAE,KAAM,cAAe,CAAC,EAAE,OAAO,YAAY,CACpE,CAAC,CACH,CAAC,CACH,CAAC",
   "names": ["import_cypressUtils", "path", "_", "element"]
 }

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

@@ -19,8 +19,8 @@ context('Viewing a report', () => {
         cy.findByRole('row', {
           name: (_, element) => {
             return (
-              element.textContent.includes('Test Dashboard') &&
-              element.textContent.includes('Dashboard used for testing testing')
+              Boolean(element.textContent?.includes('Test Dashboard')) &&
+              Boolean(element.textContent?.includes('Dashboard used for testing testing'))
             )
           },
         }).within(() => {

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

@@ -1,2 +1,2 @@
-var O=Object.create;var h=Object.defineProperty;var _=Object.getOwnPropertyDescriptor;var H=Object.getOwnPropertyNames;var Q=Object.getPrototypeOf,G=Object.prototype.hasOwnProperty;var v=(t,e)=>{for(var r in e)h(t,r,{get:e[r],enumerable:!0})},w=(t,e,r,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of H(e))!G.call(t,s)&&s!==r&&h(t,s,{get:()=>e[s],enumerable:!(n=_(e,s))||n.enumerable});return t};var p=(t,e,r)=>(r=t!=null?O(Q(t)):{},w(e||!t||!t.__esModule?h(r,"default",{value:t,enumerable:!0}):r,t)),W=t=>w(h({},"__esModule",{value:!0}),t);var Y={};v(Y,{default:()=>K,renderAsyncDashboard:()=>M});module.exports=W(Y);var V=p(require("parseurl")),l=require("../../../../../components/_dashboards/dashboard-visualisation/types"),y=require("../../../../../types/UserReports"),b=p(require("../../../../../components/_charts/utils")),P=p(require("../../../../../utils/definitionUtils")),q=p(require("../../../../../components/user-reports/utils")),F=p(require("../../../../../components/_dashboards/dashboard-list/utils")),S=p(require("../../../../../components/_filters/utils")),C=p(require("../../../../../components/_dashboards/scorecard/utils")),g=p(require("../../../../../components/_dashboards/scorecard/Scorecard")),x=p(require("../../../../../components/_reports/report-actions/utils")),B=p(require("../../../../../types/ReportQuery")),U=p(require("../../../../../utils/localsHelper")),L=require("../../../../../components/_filters/filtersTypeEnum");const X=(t,e,r)=>{const n=e.name,{name:s}=t,a=r?.url?.request?.fullUrl,c=r?.executionId;let o={};return a&&(o={share:{reportName:n,name:s,url:a},copy:{url:a}},c&&(o={...o,refresh:{url:a,executionId:c}})),x.default.getActions(o)},j=async({req:t,res:e,services:r,next:n})=>{const{token:s}=U.default.getValues(e),{reportId:a,id:c}=t.params,o=t.query.dataProductDefinitionsPath,d=await r.dashboardService.getDefinition(s,a,c,o),i=await P.default.getReportSummary(a,r.reportingService,s,o),u=await S.default.getFilters({fields:d.filterFields||[],req:t,filtersType:L.FiltersType.INTERACTIVE}),f=S.default.setRequestQueryFromFilterValues(u.filters);return{query:new B.default({fields:d.filterFields||[],queryParams:f,definitionsPath:o,reportType:y.ReportType.DASHBOARD}).toRecordWithFilterPrefix(!0),filters:u,dashboardDefinition:d,reportDefinition:i}},z=(t,e,r)=>t.sections.map(n=>{const{id:s,display:a,description:c}=n;let o=!1;const d=n.visualisations.map(i=>{const{type:u,display:f,description:D,id:A}=i;let m;switch(u){case l.DashboardVisualisationType.LIST:m=F.default.createList(i,e);break;case l.DashboardVisualisationType.SCORECARD:o=!0,m=new g.default(e,i).build();break;case l.DashboardVisualisationType.SCORECARD_GROUP:m=new g.default(e,i,!0).build();break;case l.DashboardVisualisationType.BAR:case l.DashboardVisualisationType.LINE:case l.DashboardVisualisationType.DONUT:{m=b.default.createChart(i,e);break}case l.DashboardVisualisationType.MATRIX_TIMESERIES:{m=b.default.createMatrixChart(i,e,r);break}case l.DashboardVisualisationType.BAR_TIMESERIES:case l.DashboardVisualisationType.LINE_TIMESERIES:{m=b.default.createTimeseriesCharts(i,e);break}default:break}return{id:A,title:f,description:D,type:u,data:m}});return o&&C.default.mergeScorecardsIntoGroup(d),{id:s,title:a,description:c,visualisations:d}}),J=async(t,e,r,n,s,a)=>{const{requestedReportService:c}=t,o=c?await c.getReportByTableId(e,r):void 0;return n&&n.length&&o&&q.default.updateLastViewed({services:t,reportStateData:o,userId:r,req:s,filters:a}),o},M=async({req:t,res:e,services:r,next:n})=>{const{token:s,csrfToken:a,dprUser:c,nestedBaseUrl:o}=U.default.getValues(e),{reportId:d,id:i,tableId:u}=t.params,{bookmarkService:f,requestedReportService:D}=r,A=(0,V.default)(t),{query:m,filters:I,reportDefinition:k,dashboardDefinition:R}=await j({req:t,res:e,services:r}),N=(await r.dashboardService.getAsyncDashboard(s,i,d,u,m)).flat(),T=z(R,N,m);let E;return D&&(E=await J(r,u,c.id,T,t,I.filters)),{dashboardData:{token:s,id:i,reportId:d,name:R.name,description:R.description,reportName:k.name,bookmarked:f?await f.isBookmarked(i,d,c.id):!1,nestedBaseUrl:o,csrfToken:a,sections:T,filters:I,type:y.ReportType.DASHBOARD,actions:X(R,k,E)}}};var K={renderAsyncDashboard:M};0&&(module.exports={renderAsyncDashboard});
+"use strict";var x=Object.create;var b=Object.defineProperty;var M=Object.getOwnPropertyDescriptor;var N=Object.getOwnPropertyNames;var O=Object.getPrototypeOf,_=Object.prototype.hasOwnProperty;var H=(t,e)=>{for(var r in e)b(t,r,{get:e[r],enumerable:!0})},T=(t,e,r,o)=>{if(e&&typeof e=="object"||typeof e=="function")for(let a of N(e))!_.call(t,a)&&a!==r&&b(t,a,{get:()=>e[a],enumerable:!(o=M(e,a))||o.enumerable});return t};var d=(t,e,r)=>(r=t!=null?x(O(t)):{},T(e||!t||!t.__esModule?b(r,"default",{value:t,enumerable:!0}):r,t)),Q=t=>T(b({},"__esModule",{value:!0}),t);var z={};H(z,{default:()=>j,renderAsyncDashboard:()=>B});module.exports=Q(z);var m=require("../../../../../components/_dashboards/dashboard-visualisation/types"),S=require("../../../../../types/UserReports"),y=d(require("../../../../../components/_charts/utils")),E=d(require("../../../../../utils/definitionUtils")),w=d(require("../../../../../components/user-reports/utils")),V=d(require("../../../../../components/_dashboards/dashboard-list/utils")),g=d(require("../../../../../components/_filters/utils")),P=d(require("../../../../../components/_dashboards/scorecard/utils")),A=d(require("../../../../../components/_dashboards/scorecard/Scorecard")),q=d(require("../../../../../components/_reports/report-actions/utils")),F=d(require("../../../../../types/ReportQuery")),I=d(require("../../../../../utils/localsHelper")),C=require("../../../../../components/_filters/filtersTypeEnum");const G=(t,e,r)=>{const o=e.name,{name:a}=t,i=r?.url?.request?.fullUrl,n=r?.executionId;let s={};return i&&(s={share:{reportName:o,name:a,url:i},copy:{url:i}},n&&(s={...s,refresh:{url:i,executionId:n}})),q.default.getActions(s)},v=async({req:t,res:e,services:r})=>{const{token:o}=I.default.getValues(e),{reportId:a,id:i}=t.params,n=t.query.dataProductDefinitionsPath,s=await r.dashboardService.getDefinition(o,a,i,n),l=await E.default.getReportSummary(a,r.reportingService,o,n),c=await g.default.getFilters({fields:s.filterFields||[],req:t,filtersType:C.FiltersType.INTERACTIVE}),u=g.default.setRequestQueryFromFilterValues(c.filters);return{query:new F.default({fields:s.filterFields||[],queryParams:u,definitionsPath:n,reportType:S.ReportType.DASHBOARD}).toRecordWithFilterPrefix(!0),filters:c,dashboardDefinition:s,reportDefinition:l}},W=(t,e,r)=>t.sections.map(o=>{const{id:a,display:i,description:n}=o;let s=!1;const l=o.visualisations.map(c=>{const{type:u,display:f,description:D,id:R}=c;let p;switch(u){case m.DashboardVisualisationType.LIST:p=V.default.createList(c,e);break;case m.DashboardVisualisationType.SCORECARD:s=!0,p=new A.default(e,c).build();break;case m.DashboardVisualisationType.SCORECARD_GROUP:p=new A.default(e,c,!0).build();break;case m.DashboardVisualisationType.BAR:case m.DashboardVisualisationType.LINE:case m.DashboardVisualisationType.DONUT:{p=y.default.createChart(c,e);break}case m.DashboardVisualisationType.MATRIX_TIMESERIES:{p=y.default.createMatrixChart(c,e,r);break}case m.DashboardVisualisationType.BAR_TIMESERIES:case m.DashboardVisualisationType.LINE_TIMESERIES:{p=y.default.createTimeseriesCharts(c,e);break}default:break}return{id:R,title:f||"",description:D||"",type:u,data:p}});return s&&P.default.mergeScorecardsIntoGroup(l),{id:a,title:i||"",description:n||"",visualisations:l}}),X=async(t,e,r,o,a,i)=>{const{requestedReportService:n}=t,s=n?await n.getReportByTableId(e,r):void 0;return o&&o.length&&s&&w.default.updateLastViewed({services:t,reportStateData:s,userId:r,req:a,filters:i}),s},B=async({req:t,res:e,services:r})=>{const{token:o,csrfToken:a,dprUser:i,nestedBaseUrl:n}=I.default.getValues(e),{reportId:s,id:l,tableId:c}=t.params,{bookmarkService:u,requestedReportService:f}=r,{query:D,filters:R,reportDefinition:p,dashboardDefinition:h}=await v({req:t,res:e,services:r}),L=(await r.dashboardService.getAsyncDashboard(o,l,s,c,D)).flat(),U=W(h,L,D);let k;return f&&(k=await X(r,c,i.id,U,t,R.filters)),{dashboardData:{token:o,id:l,reportId:s,name:h.name,description:h.description,reportName:p.name,bookmarked:u?await u.isBookmarked(l,s,i.id):!1,nestedBaseUrl:n,csrfToken:a,sections:U,filters:R,type:S.ReportType.DASHBOARD,actions:G(h,p,k)}}};var j={renderAsyncDashboard:B};0&&(module.exports={renderAsyncDashboard});
 //# sourceMappingURL=utils.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/view-report/async/dashboard/utils.ts"],
-  "sourcesContent": ["import parseUrl from 'parseurl'\nimport { Request } from 'express'\nimport { Services } from '../../../../../types/Services'\nimport {\n  DashboardSection,\n  DashboardVisualisation,\n  DashboardVisualisationType,\n} from '../../../../../components/_dashboards/dashboard-visualisation/types'\nimport type { AsyncReportUtilsParams } from '../../../../../types/AsyncReportUtils'\n\nimport type { DashboardDataResponse } from '../../../../../types/Metrics'\nimport type { RequestedReport } from '../../../../../types/UserReports'\nimport { ReportType } from '../../../../../types/UserReports'\nimport type { components } from '../../../../../types/api'\n\nimport ChartUtils from '../../../../../components/_charts/utils'\nimport DefinitionUtils from '../../../../../utils/definitionUtils'\nimport UserReportsUtils from '../../../../../components/user-reports/utils'\nimport DashboardListUtils from '../../../../../components/_dashboards/dashboard-list/utils'\nimport FilterUtils from '../../../../../components/_filters/utils'\nimport ScorecardsUtils from '../../../../../components/_dashboards/scorecard/utils'\nimport ScorecardVisualisation from '../../../../../components/_dashboards/scorecard/Scorecard'\nimport ReportActionsUtils from '../../../../../components/_reports/report-actions/utils'\nimport ReportQuery from '../../../../../types/ReportQuery'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport { FilterValue } from '../../../../../components/_filters/types'\nimport { FiltersType } from '../../../../../components/_filters/filtersTypeEnum'\n\nconst setDashboardActions = (\n  dashboardDefinition: components['schemas']['DashboardDefinition'],\n  reportDefinition: components['schemas']['ReportDefinitionSummary'],\n  requestData?: RequestedReport,\n) => {\n  const reportName = reportDefinition.name\n  const { name } = dashboardDefinition\n  const actionsUrl = requestData?.url?.request?.fullUrl\n  const executionId = requestData?.executionId\n\n  let actions = {}\n  if (actionsUrl) {\n    actions = {\n      share: {\n        reportName,\n        name,\n        url: actionsUrl,\n      },\n      copy: {\n        url: actionsUrl,\n      },\n    }\n    if (executionId) {\n      actions = {\n        ...actions,\n        refresh: {\n          url: actionsUrl,\n          executionId,\n        },\n      }\n    }\n  }\n\n  return ReportActionsUtils.getActions(actions)\n}\n\nconst getDefinitionData = async ({ req, res, services, next }: AsyncReportUtilsParams) => {\n  const { token } = LocalsHelper.getValues(res)\n  const { reportId, id } = req.params\n  const dataProductDefinitionsPath = <string>req.query.dataProductDefinitionsPath\n\n  // Dashboard Definition,\n  const dashboardDefinition: components['schemas']['DashboardDefinition'] =\n    await services.dashboardService.getDefinition(token, reportId, id, dataProductDefinitionsPath)\n\n  // Report summary data\n  const reportDefinition = await DefinitionUtils.getReportSummary(\n    reportId,\n    services.reportingService,\n    token,\n    <string>dataProductDefinitionsPath,\n  )\n\n  // Get the filters\n  const filtersData = await FilterUtils.getFilters({\n    fields: dashboardDefinition.filterFields || [],\n    req,\n    filtersType: FiltersType.INTERACTIVE,\n  })\n\n  const filtersQuery = FilterUtils.setRequestQueryFromFilterValues(filtersData.filters)\n\n  // Create the query\n  const query = new ReportQuery({\n    fields: dashboardDefinition.filterFields || [],\n    queryParams: filtersQuery,\n    definitionsPath: <string>dataProductDefinitionsPath,\n    reportType: ReportType.DASHBOARD,\n  }).toRecordWithFilterPrefix(true)\n\n  return {\n    query,\n    filters: filtersData,\n    dashboardDefinition,\n    reportDefinition,\n  }\n}\n\nconst getSections = (\n  dashboardDefinition: components['schemas']['DashboardDefinition'],\n  dashboardData: DashboardDataResponse[],\n  query: Record<string, string | string[]>,\n): DashboardSection[] => {\n  return dashboardDefinition.sections.map((section: components['schemas']['DashboardSectionDefinition']) => {\n    const { id, display: title, description } = section\n\n    let hasScorecard = false\n    const visualisations: DashboardVisualisation[] = section.visualisations.map(\n      (visDefinition: components['schemas']['DashboardVisualisationDefinition']) => {\n        const { type, display, description: visDescription, id: visId } = visDefinition\n\n        let data: DashboardVisualisation['data'] | undefined\n\n        switch (type) {\n          case DashboardVisualisationType.LIST:\n            data = DashboardListUtils.createList(visDefinition, dashboardData)\n            break\n\n          case DashboardVisualisationType.SCORECARD:\n            hasScorecard = true\n            data = new ScorecardVisualisation(dashboardData, visDefinition).build()\n            break\n\n          case DashboardVisualisationType.SCORECARD_GROUP:\n            data = new ScorecardVisualisation(dashboardData, visDefinition, true).build()\n            break\n\n          case DashboardVisualisationType.BAR:\n          case DashboardVisualisationType.LINE:\n          case DashboardVisualisationType.DONUT: {\n            data = ChartUtils.createChart(visDefinition, dashboardData)\n            break\n          }\n          case DashboardVisualisationType.MATRIX_TIMESERIES: {\n            data = ChartUtils.createMatrixChart(visDefinition, dashboardData, query)\n            break\n          }\n          case DashboardVisualisationType.BAR_TIMESERIES:\n          case DashboardVisualisationType.LINE_TIMESERIES: {\n            data = ChartUtils.createTimeseriesCharts(visDefinition, dashboardData)\n            break\n          }\n          default:\n            break\n        }\n\n        return {\n          id: visId,\n          title: display,\n          description: visDescription,\n          type,\n          data,\n        }\n      },\n    )\n\n    if (hasScorecard) ScorecardsUtils.mergeScorecardsIntoGroup(visualisations)\n\n    return { id, title, description, visualisations }\n  })\n}\n\nconst updateStore = async (\n  services: Services,\n  tableId: string,\n  userId: string,\n  sections: DashboardSection[],\n  req: Request,\n  filters: FilterValue[],\n): Promise<RequestedReport | undefined> => {\n  const { requestedReportService } = services\n  const dashboardRequestData = requestedReportService\n    ? await requestedReportService.getReportByTableId(tableId, userId)\n    : undefined\n\n  // Add to recently viewed\n  if (sections && sections.length && dashboardRequestData) {\n    UserReportsUtils.updateLastViewed({\n      services,\n      reportStateData: dashboardRequestData,\n      userId,\n      req,\n      filters,\n    })\n  }\n\n  return dashboardRequestData\n}\n\nexport const renderAsyncDashboard = async ({ req, res, services, next }: AsyncReportUtilsParams) => {\n  const { token, csrfToken, dprUser, nestedBaseUrl } = LocalsHelper.getValues(res)\n  const { reportId, id, tableId } = req.params\n  const { bookmarkService, requestedReportService } = services\n  const url = parseUrl(req)\n\n  // Get the definition Data\n  const { query, filters, reportDefinition, dashboardDefinition } = await getDefinitionData({\n    req,\n    res,\n    services,\n  })\n\n  // Get the results data\n  const dashboardData: DashboardDataResponse[][] = await services.dashboardService.getAsyncDashboard(\n    token,\n    id,\n    reportId,\n    tableId,\n    query,\n  )\n\n  const flattenedData: DashboardDataResponse[] = dashboardData.flat()\n\n  // Get the dashboard parts\n  const sections: DashboardSection[] = getSections(dashboardDefinition, flattenedData, query)\n\n  // Update the store\n  let dashboardRequestData\n  if (requestedReportService) {\n    dashboardRequestData = await updateStore(services, tableId, dprUser.id, sections, req, filters.filters)\n  }\n\n  return {\n    dashboardData: {\n      token,\n      id,\n      reportId,\n      name: dashboardDefinition.name,\n      description: dashboardDefinition.description,\n      reportName: reportDefinition.name,\n      bookmarked: bookmarkService ? await bookmarkService.isBookmarked(id, reportId, dprUser.id) : false,\n      nestedBaseUrl,\n      csrfToken,\n      sections,\n      filters,\n      type: ReportType.DASHBOARD,\n      actions: setDashboardActions(dashboardDefinition, reportDefinition, dashboardRequestData),\n    },\n  }\n}\n\nexport default {\n  renderAsyncDashboard,\n}\n"],
-  "mappings": "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",
-  "names": ["utils_exports", "__export", "utils_default", "renderAsyncDashboard", "__toCommonJS", "import_parseurl", "import_types", "import_UserReports", "import_utils", "import_definitionUtils", "import_Scorecard", "import_ReportQuery", "import_localsHelper", "import_filtersTypeEnum", "setDashboardActions", "dashboardDefinition", "reportDefinition", "requestData", "reportName", "name", "actionsUrl", "executionId", "actions", "ReportActionsUtils", "getDefinitionData", "req", "res", "services", "next", "token", "LocalsHelper", "reportId", "id", "dataProductDefinitionsPath", "DefinitionUtils", "filtersData", "FilterUtils", "filtersQuery", "ReportQuery", "getSections", "dashboardData", "query", "section", "title", "description", "hasScorecard", "visualisations", "visDefinition", "type", "display", "visDescription", "visId", "data", "DashboardListUtils", "ScorecardVisualisation", "ChartUtils", "ScorecardsUtils", "updateStore", "tableId", "userId", "sections", "filters", "requestedReportService", "dashboardRequestData", "UserReportsUtils", "csrfToken", "dprUser", "nestedBaseUrl", "bookmarkService", "url", "parseUrl", "flattenedData"]
+  "sourcesContent": ["import { Request } from 'express'\nimport { Services } from '../../../../../types/Services'\nimport {\n  DashboardSection,\n  DashboardVisualisation,\n  DashboardVisualisationType,\n} from '../../../../../components/_dashboards/dashboard-visualisation/types'\nimport type { AsyncReportUtilsParams } from '../../../../../types/AsyncReportUtils'\n\nimport type { DashboardDataResponse } from '../../../../../types/Metrics'\nimport type { RequestedReport } from '../../../../../types/UserReports'\nimport { ReportType } from '../../../../../types/UserReports'\nimport type { components } from '../../../../../types/api'\n\nimport ChartUtils from '../../../../../components/_charts/utils'\nimport DefinitionUtils from '../../../../../utils/definitionUtils'\nimport UserReportsUtils from '../../../../../components/user-reports/utils'\nimport DashboardListUtils from '../../../../../components/_dashboards/dashboard-list/utils'\nimport FilterUtils from '../../../../../components/_filters/utils'\nimport ScorecardsUtils from '../../../../../components/_dashboards/scorecard/utils'\nimport ScorecardVisualisation from '../../../../../components/_dashboards/scorecard/Scorecard'\nimport ReportActionsUtils from '../../../../../components/_reports/report-actions/utils'\nimport ReportQuery from '../../../../../types/ReportQuery'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport { FilterValue } from '../../../../../components/_filters/types'\nimport { FiltersType } from '../../../../../components/_filters/filtersTypeEnum'\n\nconst setDashboardActions = (\n  dashboardDefinition: components['schemas']['DashboardDefinition'],\n  reportDefinition: components['schemas']['ReportDefinitionSummary'],\n  requestData?: RequestedReport,\n) => {\n  const reportName = reportDefinition.name\n  const { name } = dashboardDefinition\n  const actionsUrl = requestData?.url?.request?.fullUrl\n  const executionId = requestData?.executionId\n\n  let actions = {}\n  if (actionsUrl) {\n    actions = {\n      share: {\n        reportName,\n        name,\n        url: actionsUrl,\n      },\n      copy: {\n        url: actionsUrl,\n      },\n    }\n    if (executionId) {\n      actions = {\n        ...actions,\n        refresh: {\n          url: actionsUrl,\n          executionId,\n        },\n      }\n    }\n  }\n\n  return ReportActionsUtils.getActions(actions)\n}\n\nconst getDefinitionData = async ({ req, res, services }: AsyncReportUtilsParams) => {\n  const { token } = LocalsHelper.getValues(res)\n  const { reportId, id } = req.params\n  const dataProductDefinitionsPath = <string>req.query['dataProductDefinitionsPath']\n\n  // Dashboard Definition,\n  const dashboardDefinition: components['schemas']['DashboardDefinition'] =\n    await services.dashboardService.getDefinition(token, reportId, id, dataProductDefinitionsPath)\n\n  // Report summary data\n  const reportDefinition = await DefinitionUtils.getReportSummary(\n    reportId,\n    services.reportingService,\n    token,\n    <string>dataProductDefinitionsPath,\n  )\n\n  // Get the filters\n  const filtersData = await FilterUtils.getFilters({\n    fields: dashboardDefinition.filterFields || [],\n    req,\n    filtersType: FiltersType.INTERACTIVE,\n  })\n\n  const filtersQuery = FilterUtils.setRequestQueryFromFilterValues(filtersData.filters)\n\n  // Create the query\n  const query = new ReportQuery({\n    fields: dashboardDefinition.filterFields || [],\n    queryParams: filtersQuery,\n    definitionsPath: <string>dataProductDefinitionsPath,\n    reportType: ReportType.DASHBOARD,\n  }).toRecordWithFilterPrefix(true)\n\n  return {\n    query,\n    filters: filtersData,\n    dashboardDefinition,\n    reportDefinition,\n  }\n}\n\nconst getSections = (\n  dashboardDefinition: components['schemas']['DashboardDefinition'],\n  dashboardData: DashboardDataResponse[],\n  query: Record<string, string | string[]>,\n): DashboardSection[] => {\n  return dashboardDefinition.sections.map((section: components['schemas']['DashboardSectionDefinition']) => {\n    const { id, display: title, description } = section\n\n    let hasScorecard = false\n    const visualisations: DashboardVisualisation[] = section.visualisations.map(\n      (visDefinition: components['schemas']['DashboardVisualisationDefinition']) => {\n        const { type, display, description: visDescription, id: visId } = visDefinition\n\n        let data: DashboardVisualisation['data'] | undefined\n\n        switch (type) {\n          case DashboardVisualisationType.LIST:\n            data = DashboardListUtils.createList(visDefinition, dashboardData)\n            break\n\n          case DashboardVisualisationType.SCORECARD:\n            hasScorecard = true\n            data = new ScorecardVisualisation(dashboardData, visDefinition).build()\n            break\n\n          case DashboardVisualisationType.SCORECARD_GROUP:\n            data = new ScorecardVisualisation(dashboardData, visDefinition, true).build()\n            break\n\n          case DashboardVisualisationType.BAR:\n          case DashboardVisualisationType.LINE:\n          case DashboardVisualisationType.DONUT: {\n            data = ChartUtils.createChart(visDefinition, dashboardData)\n            break\n          }\n          case DashboardVisualisationType.MATRIX_TIMESERIES: {\n            data = ChartUtils.createMatrixChart(visDefinition, dashboardData, query)\n            break\n          }\n          case DashboardVisualisationType.BAR_TIMESERIES:\n          case DashboardVisualisationType.LINE_TIMESERIES: {\n            data = ChartUtils.createTimeseriesCharts(visDefinition, dashboardData)\n            break\n          }\n          default:\n            break\n        }\n\n        return {\n          id: visId,\n          title: display || '',\n          description: visDescription || '',\n          type,\n          data,\n        }\n      },\n    )\n\n    if (hasScorecard) ScorecardsUtils.mergeScorecardsIntoGroup(visualisations)\n\n    return { id, title: title || '', description: description || '', visualisations }\n  })\n}\n\nconst updateStore = async (\n  services: Services,\n  tableId: string,\n  userId: string,\n  sections: DashboardSection[],\n  req: Request,\n  filters: FilterValue[],\n): Promise<RequestedReport | undefined> => {\n  const { requestedReportService } = services\n  const dashboardRequestData = requestedReportService\n    ? await requestedReportService.getReportByTableId(tableId, userId)\n    : undefined\n\n  // Add to recently viewed\n  if (sections && sections.length && dashboardRequestData) {\n    UserReportsUtils.updateLastViewed({\n      services,\n      reportStateData: dashboardRequestData,\n      userId,\n      req,\n      filters,\n    })\n  }\n\n  return dashboardRequestData\n}\n\nexport const renderAsyncDashboard = async ({ req, res, services }: AsyncReportUtilsParams) => {\n  const { token, csrfToken, dprUser, nestedBaseUrl } = LocalsHelper.getValues(res)\n  const { reportId, id, tableId } = req.params\n  const { bookmarkService, requestedReportService } = services\n\n  // Get the definition Data\n  const { query, filters, reportDefinition, dashboardDefinition } = await getDefinitionData({\n    req,\n    res,\n    services,\n  })\n\n  // Get the results data\n  const dashboardData: DashboardDataResponse[][] = await services.dashboardService.getAsyncDashboard(\n    token,\n    id,\n    reportId,\n    tableId,\n    query,\n  )\n\n  const flattenedData: DashboardDataResponse[] = dashboardData.flat()\n\n  // Get the dashboard parts\n  const sections: DashboardSection[] = getSections(dashboardDefinition, flattenedData, query)\n\n  // Update the store\n  let dashboardRequestData\n  if (requestedReportService) {\n    dashboardRequestData = await updateStore(services, tableId, dprUser.id, sections, req, filters.filters)\n  }\n\n  return {\n    dashboardData: {\n      token,\n      id,\n      reportId,\n      name: dashboardDefinition.name,\n      description: dashboardDefinition.description,\n      reportName: reportDefinition.name,\n      bookmarked: bookmarkService ? await bookmarkService.isBookmarked(id, reportId, dprUser.id) : false,\n      nestedBaseUrl,\n      csrfToken,\n      sections,\n      filters,\n      type: ReportType.DASHBOARD,\n      actions: setDashboardActions(dashboardDefinition, reportDefinition, dashboardRequestData),\n    },\n  }\n}\n\nexport default {\n  renderAsyncDashboard,\n}\n"],
+  "mappings": "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",
+  "names": ["utils_exports", "__export", "utils_default", "renderAsyncDashboard", "__toCommonJS", "import_types", "import_UserReports", "import_utils", "import_definitionUtils", "import_Scorecard", "import_ReportQuery", "import_localsHelper", "import_filtersTypeEnum", "setDashboardActions", "dashboardDefinition", "reportDefinition", "requestData", "reportName", "name", "actionsUrl", "executionId", "actions", "ReportActionsUtils", "getDefinitionData", "req", "res", "services", "token", "LocalsHelper", "reportId", "id", "dataProductDefinitionsPath", "DefinitionUtils", "filtersData", "FilterUtils", "filtersQuery", "ReportQuery", "getSections", "dashboardData", "query", "section", "title", "description", "hasScorecard", "visualisations", "visDefinition", "type", "display", "visDescription", "visId", "data", "DashboardListUtils", "ScorecardVisualisation", "ChartUtils", "ScorecardsUtils", "updateStore", "tableId", "userId", "sections", "filters", "requestedReportService", "dashboardRequestData", "UserReportsUtils", "csrfToken", "dprUser", "nestedBaseUrl", "bookmarkService", "flattenedData"]
 }

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

@@ -1,4 +1,3 @@
-import parseUrl from 'parseurl'
 import { Request } from 'express'
 import { Services } from '../../../../../types/Services'
 import {
@@ -62,10 +61,10 @@ const setDashboardActions = (
   return ReportActionsUtils.getActions(actions)
 }
 
-const getDefinitionData = async ({ req, res, services, next }: AsyncReportUtilsParams) => {
+const getDefinitionData = async ({ req, res, services }: AsyncReportUtilsParams) => {
   const { token } = LocalsHelper.getValues(res)
   const { reportId, id } = req.params
-  const dataProductDefinitionsPath = <string>req.query.dataProductDefinitionsPath
+  const dataProductDefinitionsPath = <string>req.query['dataProductDefinitionsPath']
 
   // Dashboard Definition,
   const dashboardDefinition: components['schemas']['DashboardDefinition'] =
@@ -154,8 +153,8 @@ const getSections = (
 
         return {
           id: visId,
-          title: display,
-          description: visDescription,
+          title: display || '',
+          description: visDescription || '',
           type,
           data,
         }
@@ -164,7 +163,7 @@ const getSections = (
 
     if (hasScorecard) ScorecardsUtils.mergeScorecardsIntoGroup(visualisations)
 
-    return { id, title, description, visualisations }
+    return { id, title: title || '', description: description || '', visualisations }
   })
 }
 
@@ -195,11 +194,10 @@ const updateStore = async (
   return dashboardRequestData
 }
 
-export const renderAsyncDashboard = async ({ req, res, services, next }: AsyncReportUtilsParams) => {
+export const renderAsyncDashboard = async ({ req, res, services }: AsyncReportUtilsParams) => {
   const { token, csrfToken, dprUser, nestedBaseUrl } = LocalsHelper.getValues(res)
   const { reportId, id, tableId } = req.params
   const { bookmarkService, requestedReportService } = services
-  const url = parseUrl(req)
 
   // Get the definition Data
   const { query, filters, reportDefinition, dashboardDefinition } = await getDefinitionData({

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

@@ -1,2 +1,2 @@
-var R=Object.create;var i=Object.defineProperty;var w=Object.getOwnPropertyDescriptor;var E=Object.getOwnPropertyNames;var S=Object.getPrototypeOf,b=Object.prototype.hasOwnProperty;var H=(t,r)=>{for(var e in r)i(t,e,{get:r[e],enumerable:!0})},m=(t,r,e,s)=>{if(r&&typeof r=="object"||typeof r=="function")for(let o of E(r))!b.call(t,o)&&o!==e&&i(t,o,{get:()=>r[o],enumerable:!(s=w(r,o))||s.enumerable});return t};var p=(t,r,e)=>(e=t!=null?R(S(t)):{},m(r||!t||!t.__esModule?i(e,"default",{value:t,enumerable:!0}):e,t)),I=t=>m(i({},"__esModule",{value:!0}),t);var x={};H(x,{ViewAyncReportController:()=>y,default:()=>P});module.exports=I(x);var u=p(require("../../../../../components/error-summary/utils")),h=p(require("../../../../../utils/localsHelper")),v=p(require("./utils")),n=p(require("../../utils"));class y{constructor(r,e){this.GET=async(r,e,s)=>{const{type:o}=r.params;try{const c={req:r,res:e,services:this.services,next:s},a=await v.default.renderReport(c);e.render("dpr/routes/journeys/view-report/report",{layoutPath:this.layoutPath,...a})}catch(c){const a=u.default.handleError(c,r.params.type);let l;const{recentlyViewedService:d}=this.services;if(a.status==="EXPIRED"&&d){const{dprUser:f}=h.default.getValues(e);l=await d.asyncSetToExpiredByTableId(r.params.tableId,f.id)}r.body.title=`Failed to retrieve ${o}`,r.body.error=a,l&&(r.body.refreshLink=l),s()}};this.applyFilters=async(r,e,s)=>{await n.default.applyReportInteractiveQuery(r,e,this.services,"filters")};this.applyColumns=async(r,e,s)=>{await n.default.applyReportInteractiveQuery(r,e,this.services,"columns")};this.layoutPath=r,this.services=e}}var P=y;0&&(module.exports={ViewAyncReportController});
+"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{constructor(e,r){this.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()}};this.applyFilters=async(e,r,s)=>{await l.default.applyReportInteractiveQuery(e,r,this.services,"filters")};this.applyColumns=async(e,r,s)=>{await l.default.applyReportInteractiveQuery(e,r,this.services,"columns")};this.layoutPath=e,this.services=r}}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 ErrorSummaryUtils from '../../../../../components/error-summary/utils'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport AsyncReportUtils from './utils'\nimport ViewReportUtils from '../../utils'\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 = ErrorSummaryUtils.handleError(<Error>error, req.params.type)\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": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,8BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAA8B,4DAC9BC,EAAyB,gDACzBD,EAA6B,sBAC7BA,EAA4B,0BAE5B,MAAMH,CAAyB,CAK7B,YAAYK,EAAoBC,EAAoB,CAKpD,SAAsB,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,EAAAC,QAAkB,YAAmBF,EAAOP,EAAI,OAAO,IAAI,EAC5E,IAAIU,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,QAASY,EAAQ,EAAE,CACrG,CACAZ,EAAI,KAAK,MAAQ,sBAAsBG,CAAI,GAC3CH,EAAI,KAAK,MAAQQ,EACbE,IACFV,EAAI,KAAK,YAAcU,GAEzBR,EAAK,CACP,CACF,EAEA,kBAA+B,MAAOF,EAAKC,EAAKC,IAAS,CACvD,MAAM,EAAAY,QAAgB,4BAA4Bd,EAAKC,EAAK,KAAK,SAAU,SAAS,CACtF,EAEA,kBAA+B,MAAOD,EAAKC,EAAKC,IAAS,CACvD,MAAM,EAAAY,QAAgB,4BAA4Bd,EAAKC,EAAK,KAAK,SAAU,SAAS,CACtF,EAtCE,KAAK,WAAaH,EAClB,KAAK,SAAWC,CAClB,CAqCF,CAGA,IAAOL,EAAQD",
-  "names": ["controller_exports", "__export", "ViewAyncReportController", "controller_default", "__toCommonJS", "import_utils", "import_localsHelper", "layoutPath", "services", "req", "res", "next", "type", "params", "renderData", "AsyncReportUtils", "error", "dprError", "ErrorSummaryUtils", "refreshLink", "recentlyViewedService", "dprUser", "LocalsHelper", "ViewReportUtils"]
+  "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,CAK7B,YAAYM,EAAoBC,EAAoB,CAKpD,SAAsB,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,kBAA+B,MAAOF,EAAKC,EAAKa,IAAU,CACxD,MAAM,EAAAC,QAAgB,4BAA4Bf,EAAKC,EAAK,KAAK,SAAU,SAAS,CACtF,EAEA,kBAA+B,MAAOD,EAAKC,EAAKa,IAAU,CACxD,MAAM,EAAAC,QAAgB,4BAA4Bf,EAAKC,EAAK,KAAK,SAAU,SAAS,CACtF,EAtCE,KAAK,WAAaH,EAClB,KAAK,SAAWC,CAClB,CAqCF,CAGA,IAAON,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"]
 }

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

@@ -1,9 +1,9 @@
 import { RequestHandler } from 'express'
 import { Services } from '../../../../../types/Services'
-import ErrorSummaryUtils from '../../../../../components/error-summary/utils'
 import LocalsHelper from '../../../../../utils/localsHelper'
 import AsyncReportUtils from './utils'
 import ViewReportUtils from '../../utils'
+import ErrorHandler from '../../../../../utils/ErrorHandler'
 
 class ViewAyncReportController {
   layoutPath: string
@@ -27,12 +27,12 @@ class ViewAyncReportController {
         ...renderData,
       })
     } catch (error) {
-      const dprError = ErrorSummaryUtils.handleError(<Error>error, req.params.type)
+      const dprError = new ErrorHandler(error).formatError()
       let refreshLink
       const { recentlyViewedService } = this.services
       if (dprError.status === 'EXPIRED' && recentlyViewedService) {
         const { dprUser } = LocalsHelper.getValues(res)
-        refreshLink = await recentlyViewedService.asyncSetToExpiredByTableId(req.params.tableId, dprUser.id)
+        refreshLink = await recentlyViewedService.asyncSetToExpiredByTableId(req.params['tableId'], dprUser.id)
       }
       req.body.title = `Failed to retrieve ${type}`
       req.body.error = dprError
@@ -43,11 +43,11 @@ class ViewAyncReportController {
     }
   }
 
-  applyFilters: RequestHandler = async (req, res, next) => {
+  applyFilters: RequestHandler = async (req, res, _next) => {
     await ViewReportUtils.applyReportInteractiveQuery(req, res, this.services, 'filters')
   }
 
-  applyColumns: RequestHandler = async (req, res, next) => {
+  applyColumns: RequestHandler = async (req, res, _next) => {
     await ViewReportUtils.applyReportInteractiveQuery(req, res, this.services, 'columns')
   }
 }

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

@@ -1,2 +1,2 @@
-var f=Object.create;var s=Object.defineProperty;var c=Object.getOwnPropertyDescriptor;var d=Object.getOwnPropertyNames;var v=Object.getPrototypeOf,w=Object.prototype.hasOwnProperty;var y=(e,o)=>{for(var r in o)s(e,r,{get:o[r],enumerable:!0})},p=(e,o,r,l)=>{if(o&&typeof o=="object"||typeof o=="function")for(let t of d(o))!w.call(e,t)&&t!==r&&s(e,t,{get:()=>o[t],enumerable:!(l=c(o,t))||l.enumerable});return e};var a=(e,o,r)=>(r=e!=null?f(v(e)):{},p(o||!e||!e.__esModule?s(r,"default",{value:e,enumerable:!0}):r,e)),C=e=>p(s({},"__esModule",{value:!0}),e);var V={};y(V,{default:()=>R,routes:()=>m});module.exports=C(V);var n=require("express"),i=a(require("./controller")),u=a(require("../controller"));function m({layoutPath:e,services:o}){const r=(0,n.Router)({mergeParams:!0}),l=new i.default(e,o),t=new u.default(e,o);return r.get(["/","/download-disabled"],l.GET),r.post("/apply-filters",l.applyFilters),r.post("/apply-columns",l.applyColumns),r.post("/save-defaults",t.saveDefaultFilterValues),r.post("/remove-defaults",t.removeDefaultFilterValues),r}var R=m;0&&(module.exports={routes});
+"use strict";var f=Object.create;var s=Object.defineProperty;var c=Object.getOwnPropertyDescriptor;var d=Object.getOwnPropertyNames;var v=Object.getPrototypeOf,w=Object.prototype.hasOwnProperty;var y=(e,o)=>{for(var r in o)s(e,r,{get:o[r],enumerable:!0})},p=(e,o,r,l)=>{if(o&&typeof o=="object"||typeof o=="function")for(let t of d(o))!w.call(e,t)&&t!==r&&s(e,t,{get:()=>o[t],enumerable:!(l=c(o,t))||l.enumerable});return e};var a=(e,o,r)=>(r=e!=null?f(v(e)):{},p(o||!e||!e.__esModule?s(r,"default",{value:e,enumerable:!0}):r,e)),C=e=>p(s({},"__esModule",{value:!0}),e);var V={};y(V,{default:()=>R,routes:()=>m});module.exports=C(V);var n=require("express"),i=a(require("./controller")),u=a(require("../controller"));function m({layoutPath:e,services:o}){const r=(0,n.Router)({mergeParams:!0}),l=new i.default(e,o),t=new u.default(e,o);return r.get(["/","/download-disabled"],l.GET),r.post("/apply-filters",l.applyFilters),r.post("/apply-columns",l.applyColumns),r.post("/save-defaults",t.saveDefaultFilterValues),r.post("/remove-defaults",t.removeDefaultFilterValues),r}var R=m;0&&(module.exports={routes});
 //# sourceMappingURL=routes.js.map

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/view-report/async/report/routes.ts"],
   "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport ViewAsyncReportController from './controller'\nimport ViewReportController from '../controller'\nimport { Services } from '../../../../../types/Services'\n\nexport function routes({ layoutPath, services }: { layoutPath: string; services: Services }) {\n  const router = Router({ mergeParams: true })\n  const asyncReportController = new ViewAsyncReportController(layoutPath, services)\n  const viewReportController = new ViewReportController(layoutPath, services)\n\n  router.get([`/`, `/download-disabled`], asyncReportController.GET)\n\n  router.post('/apply-filters', asyncReportController.applyFilters)\n  router.post('/apply-columns', asyncReportController.applyColumns)\n\n  // User defined defaults\n  router.post('/save-defaults', viewReportController.saveDefaultFilterValues)\n  router.post('/remove-defaults', viewReportController.removeDefaultFilterValues)\n\n  return router\n}\n\nexport default routes\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBACvBC,EAAsC,2BACtCA,EAAiC,4BAG1B,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EACrCC,EAAwB,IAAI,EAAAC,QAA0BJ,EAAYC,CAAQ,EAC1EI,EAAuB,IAAI,EAAAC,QAAqBN,EAAYC,CAAQ,EAE1E,OAAAC,EAAO,IAAI,CAAC,IAAK,oBAAoB,EAAGC,EAAsB,GAAG,EAEjED,EAAO,KAAK,iBAAkBC,EAAsB,YAAY,EAChED,EAAO,KAAK,iBAAkBC,EAAsB,YAAY,EAGhED,EAAO,KAAK,iBAAkBG,EAAqB,uBAAuB,EAC1EH,EAAO,KAAK,mBAAoBG,EAAqB,yBAAyB,EAEvEH,CACT,CAEA,IAAOP,EAAQC",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBACvBC,EAAsC,2BACtCA,EAAiC,4BAG1B,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EACrCC,EAAwB,IAAI,EAAAC,QAA0BJ,EAAYC,CAAQ,EAC1EI,EAAuB,IAAI,EAAAC,QAAqBN,EAAYC,CAAQ,EAE1E,OAAAC,EAAO,IAAI,CAAC,IAAK,oBAAoB,EAAGC,EAAsB,GAAG,EAEjED,EAAO,KAAK,iBAAkBC,EAAsB,YAAY,EAChED,EAAO,KAAK,iBAAkBC,EAAsB,YAAY,EAGhED,EAAO,KAAK,iBAAkBG,EAAqB,uBAAuB,EAC1EH,EAAO,KAAK,mBAAoBG,EAAqB,yBAAyB,EAEvEH,CACT,CAEA,IAAOP,EAAQC",
   "names": ["routes_exports", "__export", "routes_default", "routes", "__toCommonJS", "import_express", "import_controller", "layoutPath", "services", "router", "asyncReportController", "ViewAsyncReportController", "viewReportController", "ViewReportController"]
 }