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

package/dpr/routes/journeys/my-reports/requested-reports/list/controller.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/my-reports/requested-reports/list/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../../types/Services'\n\nimport AsyncRequestListUtils from '../../../../../components/user-reports/requested/utils'\nimport UserReportsListUtils from '../../../../../components/user-reports/utils'\nimport LocalsHelper from '../../../../../utils/localsHelper'\n\nclass RequestedReportsListController {\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) => {\n    const { requestedReports } = LocalsHelper.getValues(res)\n\n    const listParams = await UserReportsListUtils.renderList({\n      reportsData: requestedReports,\n      filterFunction: AsyncRequestListUtils.filterReports,\n      res,\n      type: 'requested',\n    })\n\n    res.render(`dpr/routes/journeys/my-reports/view`, {\n      title: 'Requested reports',\n      id: 'requested-reports-list',\n      layoutPath: this.layoutPath,\n      ...listParams,\n    })\n  }\n}\n\nexport { RequestedReportsListController }\nexport default RequestedReportsListController\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,oCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAGA,IAAAK,EAAkC,qEAClCA,EAAiC,2DACjCC,EAAyB,gDAEzB,MAAMJ,CAA+B,CAKnC,YAAYK,EAAoBC,EAAoB,CAKpD,SAAsB,MAAOC,EAAKC,IAAQ,CACxC,KAAM,CAAE,iBAAAC,CAAiB,EAAI,EAAAC,QAAa,UAAUF,CAAG,EAEjDG,EAAa,MAAM,EAAAC,QAAqB,WAAW,CACvD,YAAaH,EACb,eAAgB,EAAAI,QAAsB,cACtC,IAAAL,EACA,KAAM,WACR,CAAC,EAEDA,EAAI,OAAO,sCAAuC,CAChD,MAAO,oBACP,GAAI,yBACJ,WAAY,KAAK,WACjB,GAAGG,CACL,CAAC,CACH,EApBE,KAAK,WAAaN,EAClB,KAAK,SAAWC,CAClB,CAmBF,CAGA,IAAOL,EAAQD",
-  "names": ["controller_exports", "__export", "RequestedReportsListController", "controller_default", "__toCommonJS", "import_utils", "import_localsHelper", "layoutPath", "services", "req", "res", "requestedReports", "LocalsHelper", "listParams", "UserReportsListUtils", "AsyncRequestListUtils"]
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../../types/Services'\n\nimport AsyncRequestListUtils from '../../../../../components/user-reports/requested/utils'\nimport UserReportsListUtils from '../../../../../components/user-reports/utils'\nimport LocalsHelper from '../../../../../utils/localsHelper'\n\nclass RequestedReportsListController {\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) => {\n    const { requestedReports } = LocalsHelper.getValues(res)\n\n    const listParams = await UserReportsListUtils.renderList({\n      reportsData: requestedReports,\n      filterFunction: AsyncRequestListUtils.filterReports,\n      res,\n      type: 'requested',\n    })\n\n    res.render(`dpr/routes/journeys/my-reports/view`, {\n      title: 'Requested reports',\n      id: 'requested-reports-list',\n      layoutPath: this.layoutPath,\n      ...listParams,\n    })\n  }\n}\n\nexport { RequestedReportsListController }\nexport default RequestedReportsListController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,oCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAGA,IAAAK,EAAkC,qEAClCA,EAAiC,2DACjCC,EAAyB,gDAEzB,MAAMJ,CAA+B,CAKnC,YAAYK,EAAoBC,EAAoB,CAKpD,SAAsB,MAAOC,EAAMC,IAAQ,CACzC,KAAM,CAAE,iBAAAC,CAAiB,EAAI,EAAAC,QAAa,UAAUF,CAAG,EAEjDG,EAAa,MAAM,EAAAC,QAAqB,WAAW,CACvD,YAAaH,EACb,eAAgB,EAAAI,QAAsB,cACtC,IAAAL,EACA,KAAM,WACR,CAAC,EAEDA,EAAI,OAAO,sCAAuC,CAChD,MAAO,oBACP,GAAI,yBACJ,WAAY,KAAK,WACjB,GAAGG,CACL,CAAC,CACH,EApBE,KAAK,WAAaN,EAClB,KAAK,SAAWC,CAClB,CAmBF,CAGA,IAAOL,EAAQD",
+  "names": ["controller_exports", "__export", "RequestedReportsListController", "controller_default", "__toCommonJS", "import_utils", "import_localsHelper", "layoutPath", "services", "_req", "res", "requestedReports", "LocalsHelper", "listParams", "UserReportsListUtils", "AsyncRequestListUtils"]
 }

package/dpr/routes/journeys/my-reports/requested-reports/list/controller.ts

@@ -15,7 +15,7 @@ class RequestedReportsListController {
     this.services = services
   }
 
-  GET: RequestHandler = async (req, res) => {
+  GET: RequestHandler = async (_req, res) => {
     const { requestedReports } = LocalsHelper.getValues(res)
 
     const listParams = await UserReportsListUtils.renderList({

package/dpr/routes/journeys/my-reports/requested-reports/list/routes.js

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

package/dpr/routes/journeys/my-reports/requested-reports/list/routes.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/my-reports/requested-reports/list/routes.ts"],
   "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport RequestedReportsListController from './controller'\nimport { Services } from '../../../../../types/Services'\n\nexport function routes({ layoutPath, services }: { layoutPath: string; services: Services }) {\n  const router = Router({ mergeParams: true })\n\n  const controller = new RequestedReportsListController(layoutPath, services)\n  router.get(`/`, controller.GET)\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,EAA2C,2BAGpC,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAA+BJ,EAAYC,CAAQ,EAC1E,OAAAC,EAAO,IAAI,IAAKC,EAAW,GAAG,EAEvBD,CACT,CAEA,IAAOP,EAAQC",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBACvBC,EAA2C,2BAGpC,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAA+BJ,EAAYC,CAAQ,EAC1E,OAAAC,EAAO,IAAI,IAAKC,EAAW,GAAG,EAEvBD,CACT,CAEA,IAAOP,EAAQC",
   "names": ["routes_exports", "__export", "routes_default", "routes", "__toCommonJS", "import_express", "import_controller", "layoutPath", "services", "router", "controller", "RequestedReportsListController"]
 }

package/dpr/routes/journeys/my-reports/requested-reports/list/tests.cy.js

@@ -1,2 +1,2 @@
-context("Requested report list",()=>{const e="/embedded/platform/dpr/my-reports/requested-reports/list";before(()=>{cy.task("resetStubs"),cy.task("resetRedis"),cy.task("stubDefinitions"),cy.task("stubSingleSummaries")}),it("is accessible",()=>{cy.visit(e),cy.injectAxe(),cy.checkA11y()})});
+"use strict";context("Requested report list",()=>{const e="/embedded/platform/dpr/my-reports/requested-reports/list";before(()=>{cy.task("resetStubs"),cy.task("resetRedis"),cy.task("stubDefinitions"),cy.task("stubSingleSummaries")}),it("is accessible",()=>{cy.visit(e),cy.injectAxe(),cy.checkA11y()})});
 //# sourceMappingURL=tests.cy.js.map

package/dpr/routes/journeys/my-reports/requested-reports/list/tests.cy.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/my-reports/requested-reports/list/tests.cy.ts"],
   "sourcesContent": ["context('Requested report list', () => {\n  const path = '/embedded/platform/dpr/my-reports/requested-reports/list'\n\n  before(() => {\n    cy.task('resetStubs')\n    cy.task('resetRedis')\n    cy.task('stubDefinitions')\n    cy.task('stubSingleSummaries')\n  })\n\n  it('is accessible', () => {\n    cy.visit(path)\n    cy.injectAxe()\n    cy.checkA11y()\n  })\n})\n"],
-  "mappings": "AAAA,QAAQ,wBAAyB,IAAM,CACrC,MAAMA,EAAO,2DAEb,OAAO,IAAM,CACX,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,iBAAiB,EACzB,GAAG,KAAK,qBAAqB,CAC/B,CAAC,EAED,GAAG,gBAAiB,IAAM,CACxB,GAAG,MAAMA,CAAI,EACb,GAAG,UAAU,EACb,GAAG,UAAU,CACf,CAAC,CACH,CAAC",
+  "mappings": "aAAA,QAAQ,wBAAyB,IAAM,CACrC,MAAMA,EAAO,2DAEb,OAAO,IAAM,CACX,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,iBAAiB,EACzB,GAAG,KAAK,qBAAqB,CAC/B,CAAC,EAED,GAAG,gBAAiB,IAAM,CACxB,GAAG,MAAMA,CAAI,EACb,GAAG,UAAU,EACb,GAAG,UAAU,CACf,CAAC,CACH,CAAC",
   "names": ["path"]
 }

package/dpr/routes/journeys/my-reports/requested-reports/routes.js

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

package/dpr/routes/journeys/my-reports/requested-reports/routes.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/my-reports/requested-reports/routes.ts"],
   "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport { Services } from '../../../../types/Services'\nimport RequestedReportsController from './controller'\nimport listRoutes from './list/routes'\n\nexport function routes({ layoutPath, services }: { layoutPath: string; services: Services }) {\n  const router = Router({ mergeParams: true })\n\n  const controller = new RequestedReportsController(services)\n  router.delete('/:id', controller.DELETE)\n\n  router.use(`/list`, listRoutes({ layoutPath, services }))\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,mBAEvBC,EAAuC,2BACvCC,EAAuB,4BAEhB,SAASJ,EAAO,CAAE,WAAAK,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAA2BH,CAAQ,EAC1D,OAAAC,EAAO,OAAO,OAAQC,EAAW,MAAM,EAEvCD,EAAO,IAAI,WAAS,EAAAG,SAAW,CAAE,WAAAL,EAAY,SAAAC,CAAS,CAAC,CAAC,EACjDC,CACT,CAEA,IAAOR,EAAQC",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBAEvBC,EAAuC,2BACvCC,EAAuB,4BAEhB,SAASJ,EAAO,CAAE,WAAAK,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAA2BH,CAAQ,EAC1D,OAAAC,EAAO,OAAO,OAAQC,EAAW,MAAM,EAEvCD,EAAO,IAAI,WAAS,EAAAG,SAAW,CAAE,WAAAL,EAAY,SAAAC,CAAS,CAAC,CAAC,EACjDC,CACT,CAEA,IAAOR,EAAQC",
   "names": ["routes_exports", "__export", "routes_default", "routes", "__toCommonJS", "import_express", "import_controller", "import_routes", "layoutPath", "services", "router", "controller", "RequestedReportsController", "listRoutes"]
 }

package/dpr/routes/journeys/my-reports/requested-reports/service.js

@@ -1,2 +1,2 @@
-var x=Object.create;var u=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var I=Object.getOwnPropertyNames;var D=Object.getPrototypeOf,E=Object.prototype.hasOwnProperty;var C=(a,e)=>{for(var t in e)u(a,t,{get:e[t],enumerable:!0})},R=(a,e,t,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of I(e))!E.call(a,s)&&s!==t&&u(a,s,{get:()=>e[s],enumerable:!(r=y(e,s))||r.enumerable});return a};var f=(a,e,t)=>(t=a!=null?x(D(a)):{},R(e||!a||!a.__esModule?u(t,"default",{value:a,enumerable:!0}):t,a)),v=a=>R(u({},"__esModule",{value:!0}),a);var B={};C(B,{RequestedReportService:()=>p,default:()=>b});module.exports=v(B);var o=require("../../../../types/UserReports"),l=f(require("../../../../services/reportStoreService")),h=require("../../../../utils/urlHelper"),m=f(require("../../../../utils/logger"));class p extends l.default{constructor(e){super(e),m.default.info("Service created: RequestedReportService")}async addReport(e,t){const r=await this.getState(e);r.requestedReports.unshift(t),await this.saveState(e,r)}async removeReport(e,t){const r=await this.getState(t),s=this.findIndexByExecutionId(e,r.requestedReports);r.requestedReports.splice(s,1),await this.saveState(t,r)}async getReportByExecutionId(e,t){return(await this.getState(t)).requestedReports.find(s=>s.executionId===e)}async getReportByTableId(e,t){return(await this.getState(t)).requestedReports.find(s=>s.tableId===e)}async getAllReports(e){return(await this.getState(e)).requestedReports}async getAllReportsById(e,t){return(await this.getState(t)).requestedReports.filter(s=>s.id&&s.id===e||s.variantId&&s.variantId===e)}async updateLastViewed(e,t){const r=await this.getState(t),s=this.findIndexByExecutionId(e,r.requestedReports),i=r.requestedReports[s];i.timestamp.lastViewed=new Date,r.requestedReports[s]=i,await this.saveState(t,r)}async updateStatus(e,t,r,s){const i=await this.getState(t),d=this.findIndexByExecutionId(e,i.requestedReports);let n=i.requestedReports[d];n&&(n=this.updateDataByStatus(n,r,s)),i.requestedReports[d]=n,await this.saveState(t,i)}async setToExpired(e,t){const r=await this.getState(t),s=this.findIndexByExecutionId(e,r.requestedReports);let i=r.requestedReports[s];i&&(i={...i,status:o.RequestStatus.EXPIRED,timestamp:{...i.timestamp,expired:new Date}},r.requestedReports[s]=i,await this.saveState(t,r))}setReportUrl(e){const{tableId:t,url:r,dpdPathFromQuery:s,dataProductDefinitionsPath:i,type:d}=e,n=r.polling.pathname.replace("/request-report","/view-report/async").split("/");n[n.length-2]=t,n[n.length-1]=d;const c=n.join("/"),S=e.url.report?.search?e.url.report.search:"",q=s?`${(0,h.getDpdPathSuffix)(i)}`:"",g=S||q,w=`${c}${g}`;return{pathname:`${c}${g}`,fullUrl:`${r.origin}${w}`}}updateDataByStatus(e,t,r){const s=new Date;switch(t&&(e.status=t),t){case o.RequestStatus.FAILED:e.timestamp.failed=s,e.errorMessage=r;break;case o.RequestStatus.EXPIRED:e.timestamp.expired=s;break;case o.RequestStatus.ABORTED:e.timestamp.aborted=s;break;case o.RequestStatus.FINISHED:{e.timestamp.completed=s,e.url.report={...e.url.report,...this.setReportUrl(e)};break}case o.RequestStatus.SUBMITTED:e.timestamp.requested=s;break;case o.RequestStatus.STARTED:case o.RequestStatus.PICKED:break;default:e.timestamp.lastViewed=s;break}return e}}var b=p;0&&(module.exports={RequestedReportService});
+"use strict";var q=Object.create;var p=Object.defineProperty;var w=Object.getOwnPropertyDescriptor;var y=Object.getOwnPropertyNames;var x=Object.getPrototypeOf,I=Object.prototype.hasOwnProperty;var D=(i,t)=>{for(var e in t)p(i,e,{get:t[e],enumerable:!0})},R=(i,t,e,s)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of y(t))!I.call(i,r)&&r!==e&&p(i,r,{get:()=>t[r],enumerable:!(s=w(t,r))||s.enumerable});return i};var E=(i,t,e)=>(e=i!=null?q(x(i)):{},R(t||!i||!i.__esModule?p(e,"default",{value:i,enumerable:!0}):e,i)),C=i=>R(p({},"__esModule",{value:!0}),i);var v={};D(v,{RequestedReportService:()=>c,default:()=>b});module.exports=C(v);var n=require("../../../../types/UserReports"),f=E(require("../../../../services/reportStoreService")),l=require("../../../../utils/urlHelper");class c extends f.default{constructor(t){super(t)}async addReport(t,e){const s=await this.getState(t);s.requestedReports.unshift(e),await this.saveState(t,s)}async removeReport(t,e){const s=await this.getState(e),r=this.findIndexByExecutionId(t,s.requestedReports);s.requestedReports.splice(r,1),await this.saveState(e,s)}async getReportByExecutionId(t,e){return(await this.getState(e)).requestedReports.find(r=>r.executionId===t)}async getReportByTableId(t,e){return(await this.getState(e)).requestedReports.find(r=>r.tableId===t)}async getAllReports(t){return(await this.getState(t)).requestedReports}async getAllReportsById(t,e){return(await this.getState(e)).requestedReports.filter(r=>r.id&&r.id===t||r.variantId&&r.variantId===t)}async updateLastViewed(t,e){const s=await this.getState(e),r=this.findIndexByExecutionId(t,s.requestedReports),a=s.requestedReports[r];a.timestamp.lastViewed=new Date,s.requestedReports[r]=a,await this.saveState(e,s)}async updateStatus(t,e,s,r){const a=await this.getState(e),u=this.findIndexByExecutionId(t,a.requestedReports);let o=a.requestedReports[u];o&&(o=this.updateDataByStatus(o,s,r)),a.requestedReports[u]=o,await this.saveState(e,a)}async setToExpired(t,e){const s=await this.getState(e),r=this.findIndexByExecutionId(t,s.requestedReports);let a=s.requestedReports[r];a&&(a={...a,status:n.RequestStatus.EXPIRED,timestamp:{...a.timestamp,expired:new Date}},s.requestedReports[r]=a,await this.saveState(e,s))}setReportUrl(t){const{tableId:e,url:s,dpdPathFromQuery:r,dataProductDefinitionsPath:a,type:u}=t;let o,g;if(s&&s.polling?.pathname){let d=Array.from(new Array(2));d=s.polling.pathname.replace("/request-report","/view-report/async").split("/"),d[d.length-2]=e,d[d.length-1]=u;const h=d.join("/"),m=s.report?.search?s.report.search:"",S=a&&r?`${(0,l.getDpdPathSuffix)(a)}`:"";o=`${h}${m||S}`,g=`${s.origin}${o}`}return{pathname:o,fullUrl:g}}updateDataByStatus(t,e,s){const r=new Date;switch(e&&(t.status=e),e){case n.RequestStatus.FAILED:t.timestamp.failed=r,s&&(t.errorMessage=s);break;case n.RequestStatus.EXPIRED:t.timestamp.expired=r;break;case n.RequestStatus.ABORTED:t.timestamp.aborted=r;break;case n.RequestStatus.FINISHED:{t.timestamp.completed=r,t.url&&(t.url.report={...t.url.report,...this.setReportUrl(t)});break}case n.RequestStatus.SUBMITTED:t.timestamp.requested=r;break;case n.RequestStatus.STARTED:case n.RequestStatus.PICKED:break;default:t.timestamp.lastViewed=r;break}return t}}var b=c;0&&(module.exports={RequestedReportService});
 //# sourceMappingURL=service.js.map

package/dpr/routes/journeys/my-reports/requested-reports/service.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/my-reports/requested-reports/service.ts"],
-  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport UserDataStore from '../../../../data/reportDataStore'\nimport { RequestedReport, RequestStatus } from '../../../../types/UserReports'\nimport ReportStoreService from '../../../../services/reportStoreService'\nimport { getDpdPathSuffix } from '../../../../utils/urlHelper'\nimport logger from '../../../../utils/logger'\n\nclass RequestedReportService extends ReportStoreService {\n  constructor(userDataStore: UserDataStore) {\n    super(userDataStore)\n    logger.info('Service created: RequestedReportService')\n  }\n\n  async addReport(userId: string, reportStateData: RequestedReport) {\n    const userConfig = await this.getState(userId)\n    userConfig.requestedReports.unshift(reportStateData)\n    await this.saveState(userId, userConfig)\n  }\n\n  async removeReport(id: string, userId: string) {\n    const userConfig = await this.getState(userId)\n    const index = this.findIndexByExecutionId(id, userConfig.requestedReports)\n    userConfig.requestedReports.splice(index, 1)\n    await this.saveState(userId, userConfig)\n  }\n\n  async getReportByExecutionId(id: string, userId: string) {\n    const userConfig = await this.getState(userId)\n    return userConfig.requestedReports.find((report) => report.executionId === id)\n  }\n\n  async getReportByTableId(id: string, userId: string) {\n    const userConfig = await this.getState(userId)\n    return userConfig.requestedReports.find((report) => report.tableId === id)\n  }\n\n  async getAllReports(userId: string): Promise<RequestedReport[]> {\n    const userConfig = await this.getState(userId)\n    return userConfig.requestedReports\n  }\n\n  async getAllReportsById(id: string, userId: string) {\n    const userConfig = await this.getState(userId)\n    return userConfig.requestedReports.filter((requested) => {\n      return (requested.id && requested.id === id) || (requested.variantId && requested.variantId === id)\n    })\n  }\n\n  async updateLastViewed(id: string, userId: string) {\n    const userConfig = await this.getState(userId)\n    const index = this.findIndexByExecutionId(id, userConfig.requestedReports)\n    const report: RequestedReport = userConfig.requestedReports[index]\n    report.timestamp.lastViewed = new Date()\n    userConfig.requestedReports[index] = report\n    await this.saveState(userId, userConfig)\n  }\n\n  async updateStatus(id: string, userId: string, status?: RequestStatus, errorMessage?: string) {\n    const userConfig = await this.getState(userId)\n    const index = this.findIndexByExecutionId(id, userConfig.requestedReports)\n    let report: RequestedReport = userConfig.requestedReports[index]\n    if (report) report = this.updateDataByStatus(report, status, errorMessage)\n    userConfig.requestedReports[index] = report\n    await this.saveState(userId, userConfig)\n  }\n\n  async setToExpired(id: string, userId: string) {\n    const userConfig = await this.getState(userId)\n    const index = this.findIndexByExecutionId(id, userConfig.requestedReports)\n    let report: RequestedReport = userConfig.requestedReports[index]\n    if (report) {\n      report = {\n        ...report,\n        status: RequestStatus.EXPIRED,\n        timestamp: {\n          ...report.timestamp,\n          expired: new Date(),\n        },\n      }\n      userConfig.requestedReports[index] = report\n      await this.saveState(userId, userConfig)\n    }\n  }\n\n  setReportUrl(report: RequestedReport) {\n    const { tableId, url, dpdPathFromQuery, dataProductDefinitionsPath, type } = report\n\n    const reportUrlArr = url.polling.pathname.replace('/request-report', '/view-report/async').split('/')\n    reportUrlArr[reportUrlArr.length - 2] = tableId\n    reportUrlArr[reportUrlArr.length - 1] = type\n    const reportUrl = reportUrlArr.join('/')\n\n    const search = report.url.report?.search ? report.url.report.search : ''\n    const dpdPath = dpdPathFromQuery ? `${getDpdPathSuffix(dataProductDefinitionsPath)}` : ''\n    const searchPath = search || dpdPath\n    const pathname = `${reportUrl}${searchPath}`\n\n    return {\n      pathname: `${reportUrl}${searchPath}`,\n      fullUrl: `${url.origin}${pathname}`,\n    }\n  }\n\n  updateDataByStatus(report: RequestedReport, status?: RequestStatus | undefined, errorMessage?: string) {\n    const ts = new Date()\n    if (status) report.status = status\n    switch (status) {\n      case RequestStatus.FAILED:\n        report.timestamp.failed = ts\n        report.errorMessage = errorMessage\n        break\n      case RequestStatus.EXPIRED:\n        report.timestamp.expired = ts\n        break\n      case RequestStatus.ABORTED:\n        report.timestamp.aborted = ts\n        break\n      case RequestStatus.FINISHED: {\n        report.timestamp.completed = ts\n        report.url.report = {\n          ...report.url.report,\n          ...this.setReportUrl(report),\n        }\n        break\n      }\n      case RequestStatus.SUBMITTED:\n        report.timestamp.requested = ts\n        break\n      case RequestStatus.STARTED:\n      case RequestStatus.PICKED:\n        break\n      default:\n        report.timestamp.lastViewed = ts\n        break\n    }\n\n    return report\n  }\n}\n\nexport { RequestedReportService }\nexport default RequestedReportService\n"],
-  "mappings": "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",
-  "names": ["service_exports", "__export", "RequestedReportService", "service_default", "__toCommonJS", "import_UserReports", "import_reportStoreService", "import_urlHelper", "import_logger", "ReportStoreService", "userDataStore", "logger", "userId", "reportStateData", "userConfig", "id", "index", "report", "requested", "status", "errorMessage", "tableId", "url", "dpdPathFromQuery", "dataProductDefinitionsPath", "type", "reportUrlArr", "reportUrl", "search", "dpdPath", "searchPath", "pathname", "ts"]
+  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport UserDataStore from '../../../../data/reportDataStore'\nimport { RequestedReport, RequestStatus } from '../../../../types/UserReports'\nimport ReportStoreService from '../../../../services/reportStoreService'\nimport { getDpdPathSuffix } from '../../../../utils/urlHelper'\n\nclass RequestedReportService extends ReportStoreService {\n  constructor(userDataStore: UserDataStore) {\n    super(userDataStore)\n  }\n\n  async addReport(userId: string, reportStateData: RequestedReport) {\n    const userConfig = await this.getState(userId)\n    userConfig.requestedReports.unshift(reportStateData)\n    await this.saveState(userId, userConfig)\n  }\n\n  async removeReport(id: string, userId: string) {\n    const userConfig = await this.getState(userId)\n    const index = this.findIndexByExecutionId(id, userConfig.requestedReports)\n    userConfig.requestedReports.splice(index, 1)\n    await this.saveState(userId, userConfig)\n  }\n\n  async getReportByExecutionId(id: string, userId: string) {\n    const userConfig = await this.getState(userId)\n    return userConfig.requestedReports.find((report) => report.executionId === id)\n  }\n\n  async getReportByTableId(id: string, userId: string) {\n    const userConfig = await this.getState(userId)\n    return userConfig.requestedReports.find((report) => report.tableId === id)\n  }\n\n  async getAllReports(userId: string): Promise<RequestedReport[]> {\n    const userConfig = await this.getState(userId)\n    return userConfig.requestedReports\n  }\n\n  async getAllReportsById(id: string, userId: string) {\n    const userConfig = await this.getState(userId)\n    return userConfig.requestedReports.filter((requested) => {\n      return (requested.id && requested.id === id) || (requested.variantId && requested.variantId === id)\n    })\n  }\n\n  async updateLastViewed(id: string, userId: string) {\n    const userConfig = await this.getState(userId)\n    const index = this.findIndexByExecutionId(id, userConfig.requestedReports)\n    const report: RequestedReport = userConfig.requestedReports[index]\n    report.timestamp.lastViewed = new Date()\n    userConfig.requestedReports[index] = report\n    await this.saveState(userId, userConfig)\n  }\n\n  async updateStatus(id: string, userId: string, status?: RequestStatus, errorMessage?: string) {\n    const userConfig = await this.getState(userId)\n    const index = this.findIndexByExecutionId(id, userConfig.requestedReports)\n    let report: RequestedReport = userConfig.requestedReports[index]\n    if (report) report = this.updateDataByStatus(report, status, errorMessage)\n    userConfig.requestedReports[index] = report\n    await this.saveState(userId, userConfig)\n  }\n\n  async setToExpired(id: string, userId: string) {\n    const userConfig = await this.getState(userId)\n    const index = this.findIndexByExecutionId(id, userConfig.requestedReports)\n    let report: RequestedReport = userConfig.requestedReports[index]\n    if (report) {\n      report = {\n        ...report,\n        status: RequestStatus.EXPIRED,\n        timestamp: {\n          ...report.timestamp,\n          expired: new Date(),\n        },\n      }\n      userConfig.requestedReports[index] = report\n      await this.saveState(userId, userConfig)\n    }\n  }\n\n  setReportUrl(report: RequestedReport) {\n    const { tableId, url, dpdPathFromQuery, dataProductDefinitionsPath, type } = report\n\n    let pathname\n    let fullUrl\n\n    if (url && url.polling?.pathname) {\n      let reportUrlArr = Array.from(new Array(2))\n      reportUrlArr = url.polling.pathname.replace('/request-report', '/view-report/async').split('/')\n      reportUrlArr[reportUrlArr.length - 2] = tableId\n      reportUrlArr[reportUrlArr.length - 1] = type\n      const reportUrl = reportUrlArr.join('/')\n\n      const search = url.report?.search ? url.report.search : ''\n      const dpdPath =\n        dataProductDefinitionsPath && dpdPathFromQuery ? `${getDpdPathSuffix(dataProductDefinitionsPath)}` : ''\n      const searchPath = search || dpdPath\n      pathname = `${reportUrl}${searchPath}`\n      fullUrl = `${url.origin}${pathname}`\n    }\n\n    return {\n      pathname,\n      fullUrl,\n    }\n  }\n\n  updateDataByStatus(report: RequestedReport, status?: RequestStatus | undefined, errorMessage?: string) {\n    const ts = new Date()\n    if (status) report.status = status\n    switch (status) {\n      case RequestStatus.FAILED:\n        report.timestamp.failed = ts\n        if (errorMessage) report.errorMessage = errorMessage\n        break\n      case RequestStatus.EXPIRED:\n        report.timestamp.expired = ts\n        break\n      case RequestStatus.ABORTED:\n        report.timestamp.aborted = ts\n        break\n      case RequestStatus.FINISHED: {\n        report.timestamp.completed = ts\n        if (report.url) {\n          report.url.report = {\n            ...report.url.report,\n            ...this.setReportUrl(report),\n          }\n        }\n        break\n      }\n      case RequestStatus.SUBMITTED:\n        report.timestamp.requested = ts\n        break\n      case RequestStatus.STARTED:\n      case RequestStatus.PICKED:\n        break\n      default:\n        report.timestamp.lastViewed = ts\n        break\n    }\n\n    return report\n  }\n}\n\nexport { RequestedReportService }\nexport default RequestedReportService\n"],
+  "mappings": "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",
+  "names": ["service_exports", "__export", "RequestedReportService", "service_default", "__toCommonJS", "import_UserReports", "import_reportStoreService", "import_urlHelper", "ReportStoreService", "userDataStore", "userId", "reportStateData", "userConfig", "id", "index", "report", "requested", "status", "errorMessage", "tableId", "url", "dpdPathFromQuery", "dataProductDefinitionsPath", "type", "pathname", "fullUrl", "reportUrlArr", "reportUrl", "search", "dpdPath", "ts"]
 }

package/dpr/routes/journeys/my-reports/requested-reports/service.ts

@@ -3,12 +3,10 @@ import UserDataStore from '../../../../data/reportDataStore'
 import { RequestedReport, RequestStatus } from '../../../../types/UserReports'
 import ReportStoreService from '../../../../services/reportStoreService'
 import { getDpdPathSuffix } from '../../../../utils/urlHelper'
-import logger from '../../../../utils/logger'
 
 class RequestedReportService extends ReportStoreService {
   constructor(userDataStore: UserDataStore) {
     super(userDataStore)
-    logger.info('Service created: RequestedReportService')
   }
 
   async addReport(userId: string, reportStateData: RequestedReport) {
@@ -85,19 +83,27 @@ class RequestedReportService extends ReportStoreService {
   setReportUrl(report: RequestedReport) {
     const { tableId, url, dpdPathFromQuery, dataProductDefinitionsPath, type } = report
 
-    const reportUrlArr = url.polling.pathname.replace('/request-report', '/view-report/async').split('/')
-    reportUrlArr[reportUrlArr.length - 2] = tableId
-    reportUrlArr[reportUrlArr.length - 1] = type
-    const reportUrl = reportUrlArr.join('/')
-
-    const search = report.url.report?.search ? report.url.report.search : ''
-    const dpdPath = dpdPathFromQuery ? `${getDpdPathSuffix(dataProductDefinitionsPath)}` : ''
-    const searchPath = search || dpdPath
-    const pathname = `${reportUrl}${searchPath}`
+    let pathname
+    let fullUrl
+
+    if (url && url.polling?.pathname) {
+      let reportUrlArr = Array.from(new Array(2))
+      reportUrlArr = url.polling.pathname.replace('/request-report', '/view-report/async').split('/')
+      reportUrlArr[reportUrlArr.length - 2] = tableId
+      reportUrlArr[reportUrlArr.length - 1] = type
+      const reportUrl = reportUrlArr.join('/')
+
+      const search = url.report?.search ? url.report.search : ''
+      const dpdPath =
+        dataProductDefinitionsPath && dpdPathFromQuery ? `${getDpdPathSuffix(dataProductDefinitionsPath)}` : ''
+      const searchPath = search || dpdPath
+      pathname = `${reportUrl}${searchPath}`
+      fullUrl = `${url.origin}${pathname}`
+    }
 
     return {
-      pathname: `${reportUrl}${searchPath}`,
-      fullUrl: `${url.origin}${pathname}`,
+      pathname,
+      fullUrl,
     }
   }
 
@@ -107,7 +113,7 @@ class RequestedReportService extends ReportStoreService {
     switch (status) {
       case RequestStatus.FAILED:
         report.timestamp.failed = ts
-        report.errorMessage = errorMessage
+        if (errorMessage) report.errorMessage = errorMessage
         break
       case RequestStatus.EXPIRED:
         report.timestamp.expired = ts
@@ -117,9 +123,11 @@ class RequestedReportService extends ReportStoreService {
         break
       case RequestStatus.FINISHED: {
         report.timestamp.completed = ts
-        report.url.report = {
-          ...report.url.report,
-          ...this.setReportUrl(report),
+        if (report.url) {
+          report.url.report = {
+            ...report.url.report,
+            ...this.setReportUrl(report),
+          }
         }
         break
       }

package/dpr/routes/journeys/my-reports/routes.js

@@ -1,2 +1,2 @@
-var g=Object.create;var i=Object.defineProperty;var d=Object.getOwnPropertyDescriptor;var l=Object.getOwnPropertyNames;var k=Object.getPrototypeOf,v=Object.prototype.hasOwnProperty;var y=(e,r)=>{for(var t in r)i(e,t,{get:r[t],enumerable:!0})},n=(e,r,t,o)=>{if(r&&typeof r=="object"||typeof r=="function")for(let s of l(r))!v.call(e,s)&&s!==t&&i(e,s,{get:()=>r[s],enumerable:!(o=d(r,s))||o.enumerable});return e};var u=(e,r,t)=>(t=e!=null?g(k(e)):{},n(r||!e||!e.__esModule?i(t,"default",{value:e,enumerable:!0}):t,e)),w=e=>n(i({},"__esModule",{value:!0}),e);var b={};y(b,{MyReportsRoutes:()=>S,Routes:()=>f});module.exports=w(b);var m=require("express"),p=u(require("../../../utils/logger")),c=u(require("./bookmarks/routes")),a=u(require("./recently-viewed/routes")),R=u(require("./requested-reports/routes"));function f({layoutPath:e,services:r}){const t=(0,m.Router)({mergeParams:!0});return t.use("/bookmarks",(0,c.default)({layoutPath:e,services:r})),t.use("/recently-viewed",(0,a.default)({layoutPath:e,services:r})),t.use("/requested-reports",(0,R.default)({layoutPath:e,services:r})),t}const S=({services:e,path:r,layoutPath:t})=>{p.default.info("Initialiasing routes: Recently Viewed");const o=(0,m.Router)({mergeParams:!0});return o.use(r,f({services:e,layoutPath:t})),o};0&&(module.exports={MyReportsRoutes,Routes});
+"use strict";var f=Object.create;var u=Object.defineProperty;var g=Object.getOwnPropertyDescriptor;var d=Object.getOwnPropertyNames;var k=Object.getPrototypeOf,v=Object.prototype.hasOwnProperty;var y=(e,r)=>{for(var t in r)u(e,t,{get:r[t],enumerable:!0})},n=(e,r,t,o)=>{if(r&&typeof r=="object"||typeof r=="function")for(let s of d(r))!v.call(e,s)&&s!==t&&u(e,s,{get:()=>r[s],enumerable:!(o=g(r,s))||o.enumerable});return e};var m=(e,r,t)=>(t=e!=null?f(k(e)):{},n(r||!e||!e.__esModule?u(t,"default",{value:e,enumerable:!0}):t,e)),S=e=>n(u({},"__esModule",{value:!0}),e);var l={};y(l,{MyReportsRoutes:()=>b,Routes:()=>a});module.exports=S(l);var i=require("express"),p=m(require("./bookmarks/routes")),c=m(require("./recently-viewed/routes")),R=m(require("./requested-reports/routes"));function a({layoutPath:e,services:r}){const t=(0,i.Router)({mergeParams:!0});return t.use("/bookmarks",(0,p.default)({layoutPath:e,services:r})),t.use("/recently-viewed",(0,c.default)({layoutPath:e,services:r})),t.use("/requested-reports",(0,R.default)({layoutPath:e,services:r})),t}const b=({services:e,path:r,layoutPath:t})=>{const o=(0,i.Router)({mergeParams:!0});return o.use(r,a({services:e,layoutPath:t})),o};0&&(module.exports={MyReportsRoutes,Routes});
 //# sourceMappingURL=routes.js.map

package/dpr/routes/journeys/my-reports/routes.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/routes/journeys/my-reports/routes.ts"],
-  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport { Services } from '../../../types/Services'\nimport logger from '../../../utils/logger'\n\n// Routes\nimport bookmarkRoutes from './bookmarks/routes'\nimport recentlyViewedRoutes from './recently-viewed/routes'\nimport requestedReportsRoutes from './requested-reports/routes'\n\nexport function Routes({ layoutPath, services }: { services: Services; layoutPath: string }) {\n  const router = Router({ mergeParams: true })\n\n  router.use(`/bookmarks`, bookmarkRoutes({ layoutPath, services }))\n  router.use(`/recently-viewed`, recentlyViewedRoutes({ layoutPath, services }))\n  router.use(`/requested-reports`, requestedReportsRoutes({ layoutPath, services }))\n\n  return router\n}\n\nexport const MyReportsRoutes = ({\n  services,\n  path,\n  layoutPath,\n}: {\n  services: Services\n  path: string\n  layoutPath: string\n}) => {\n  logger.info('Initialiasing routes: Recently Viewed')\n\n  const router = Router({ mergeParams: true })\n  router.use(path, Routes({ services, layoutPath }))\n  return router\n}\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qBAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBAEvBC,EAAmB,oCAGnBC,EAA2B,iCAC3BA,EAAiC,uCACjCA,EAAmC,yCAE5B,SAASJ,EAAO,CAAE,WAAAK,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAE3C,OAAAA,EAAO,IAAI,gBAAc,EAAAC,SAAe,CAAE,WAAAH,EAAY,SAAAC,CAAS,CAAC,CAAC,EACjEC,EAAO,IAAI,sBAAoB,EAAAE,SAAqB,CAAE,WAAAJ,EAAY,SAAAC,CAAS,CAAC,CAAC,EAC7EC,EAAO,IAAI,wBAAsB,EAAAG,SAAuB,CAAE,WAAAL,EAAY,SAAAC,CAAS,CAAC,CAAC,EAE1EC,CACT,CAEO,MAAMR,EAAkB,CAAC,CAC9B,SAAAO,EACA,KAAAK,EACA,WAAAN,CACF,IAIM,CACJ,EAAAO,QAAO,KAAK,uCAAuC,EAEnD,MAAML,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAC3C,OAAAA,EAAO,IAAII,EAAMX,EAAO,CAAE,SAAAM,EAAU,WAAAD,CAAW,CAAC,CAAC,EAC1CE,CACT",
-  "names": ["routes_exports", "__export", "MyReportsRoutes", "Routes", "__toCommonJS", "import_express", "import_logger", "import_routes", "layoutPath", "services", "router", "bookmarkRoutes", "recentlyViewedRoutes", "requestedReportsRoutes", "path", "logger"]
+  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport { Services } from '../../../types/Services'\n\n// Routes\nimport bookmarkRoutes from './bookmarks/routes'\nimport recentlyViewedRoutes from './recently-viewed/routes'\nimport requestedReportsRoutes from './requested-reports/routes'\n\nexport function Routes({ layoutPath, services }: { services: Services; layoutPath: string }) {\n  const router = Router({ mergeParams: true })\n\n  router.use(`/bookmarks`, bookmarkRoutes({ layoutPath, services }))\n  router.use(`/recently-viewed`, recentlyViewedRoutes({ layoutPath, services }))\n  router.use(`/requested-reports`, requestedReportsRoutes({ layoutPath, services }))\n\n  return router\n}\n\nexport const MyReportsRoutes = ({\n  services,\n  path,\n  layoutPath,\n}: {\n  services: Services\n  path: string\n  layoutPath: string\n}) => {\n  const router = Router({ mergeParams: true })\n  router.use(path, Routes({ services, layoutPath }))\n  return router\n}\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qBAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBAIvBC,EAA2B,iCAC3BA,EAAiC,uCACjCA,EAAmC,yCAE5B,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAE3C,OAAAA,EAAO,IAAI,gBAAc,EAAAC,SAAe,CAAE,WAAAH,EAAY,SAAAC,CAAS,CAAC,CAAC,EACjEC,EAAO,IAAI,sBAAoB,EAAAE,SAAqB,CAAE,WAAAJ,EAAY,SAAAC,CAAS,CAAC,CAAC,EAC7EC,EAAO,IAAI,wBAAsB,EAAAG,SAAuB,CAAE,WAAAL,EAAY,SAAAC,CAAS,CAAC,CAAC,EAE1EC,CACT,CAEO,MAAMP,EAAkB,CAAC,CAC9B,SAAAM,EACA,KAAAK,EACA,WAAAN,CACF,IAIM,CACJ,MAAME,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAC3C,OAAAA,EAAO,IAAII,EAAMV,EAAO,CAAE,SAAAK,EAAU,WAAAD,CAAW,CAAC,CAAC,EAC1CE,CACT",
+  "names": ["routes_exports", "__export", "MyReportsRoutes", "Routes", "__toCommonJS", "import_express", "import_routes", "layoutPath", "services", "router", "bookmarkRoutes", "recentlyViewedRoutes", "requestedReportsRoutes", "path"]
 }

package/dpr/routes/journeys/my-reports/routes.ts

@@ -1,7 +1,6 @@
 /* eslint-disable no-param-reassign */
 import { Router } from 'express'
 import { Services } from '../../../types/Services'
-import logger from '../../../utils/logger'
 
 // Routes
 import bookmarkRoutes from './bookmarks/routes'
@@ -27,8 +26,6 @@ export const MyReportsRoutes = ({
   path: string
   layoutPath: string
 }) => {
-  logger.info('Initialiasing routes: Recently Viewed')
-
   const router = Router({ mergeParams: true })
   router.use(path, Routes({ services, layoutPath }))
   return router

package/dpr/routes/journeys/product-collection/routes.js

@@ -1,2 +1,2 @@
-var u=Object.defineProperty;var a=Object.getOwnPropertyDescriptor;var m=Object.getOwnPropertyNames;var l=Object.prototype.hasOwnProperty;var p=(r,e)=>{for(var t in e)u(r,t,{get:e[t],enumerable:!0})},g=(r,e,t,o)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of m(e))!l.call(r,s)&&s!==t&&u(r,s,{get:()=>e[s],enumerable:!(o=a(e,s))||o.enumerable});return r};var v=r=>g(u({},"__esModule",{value:!0}),r);var f={};p(f,{ProductCollectionRoutes:()=>P,Routes:()=>n});module.exports=v(f);var c=require("express"),i=require("./selected/routes");function n({layoutPath:r,services:e}){const t=(0,c.Router)({mergeParams:!0});return t.use("/selected",(0,i.routes)({layoutPath:r,services:e})),t}const P=({services:r,path:e,layoutPath:t})=>{const o=(0,c.Router)({mergeParams:!0});return o.use(e,n({services:r,layoutPath:t})),o};0&&(module.exports={ProductCollectionRoutes,Routes});
+"use strict";var u=Object.defineProperty;var a=Object.getOwnPropertyDescriptor;var m=Object.getOwnPropertyNames;var l=Object.prototype.hasOwnProperty;var p=(r,e)=>{for(var t in e)u(r,t,{get:e[t],enumerable:!0})},g=(r,e,t,o)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of m(e))!l.call(r,s)&&s!==t&&u(r,s,{get:()=>e[s],enumerable:!(o=a(e,s))||o.enumerable});return r};var v=r=>g(u({},"__esModule",{value:!0}),r);var f={};p(f,{ProductCollectionRoutes:()=>P,Routes:()=>n});module.exports=v(f);var c=require("express"),i=require("./selected/routes");function n({layoutPath:r,services:e}){const t=(0,c.Router)({mergeParams:!0});return t.use("/selected",(0,i.routes)({layoutPath:r,services:e})),t}const P=({services:r,path:e,layoutPath:t})=>{const o=(0,c.Router)({mergeParams:!0});return o.use(e,n({services:r,layoutPath:t})),o};0&&(module.exports={ProductCollectionRoutes,Routes});
 //# sourceMappingURL=routes.js.map

package/dpr/routes/journeys/product-collection/routes.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../src/dpr/routes/journeys/product-collection/routes.ts"],
   "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\n\n// Routes\nimport { routes as selectedRoutes } from './selected/routes'\nimport { Services } from '../../../types/Services'\n\nexport function Routes({ layoutPath, services }: { services: Services; layoutPath: string }) {\n  const router = Router({ mergeParams: true })\n  router.use(`/selected`, selectedRoutes({ layoutPath, services }))\n\n  return router\n}\n\nexport const ProductCollectionRoutes = ({\n  services,\n  path,\n  layoutPath,\n}: {\n  services: Services\n  path: string\n  layoutPath: string\n}) => {\n  const router = Router({ mergeParams: true })\n  router.use(path, Routes({ services, layoutPath }))\n\n  return router\n}\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBAGvBC,EAAyC,6BAGlC,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAC3C,OAAAA,EAAO,IAAI,eAAa,EAAAC,QAAe,CAAE,WAAAH,EAAY,SAAAC,CAAS,CAAC,CAAC,EAEzDC,CACT,CAEO,MAAMP,EAA0B,CAAC,CACtC,SAAAM,EACA,KAAAG,EACA,WAAAJ,CACF,IAIM,CACJ,MAAME,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAC3C,OAAAA,EAAO,IAAIE,EAAMR,EAAO,CAAE,SAAAK,EAAU,WAAAD,CAAW,CAAC,CAAC,EAE1CE,CACT",
+  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBAGvBC,EAAyC,6BAGlC,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAC3C,OAAAA,EAAO,IAAI,eAAa,EAAAC,QAAe,CAAE,WAAAH,EAAY,SAAAC,CAAS,CAAC,CAAC,EAEzDC,CACT,CAEO,MAAMP,EAA0B,CAAC,CACtC,SAAAM,EACA,KAAAG,EACA,WAAAJ,CACF,IAIM,CACJ,MAAME,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAC3C,OAAAA,EAAO,IAAIE,EAAMR,EAAO,CAAE,SAAAK,EAAU,WAAAD,CAAW,CAAC,CAAC,EAE1CE,CACT",
   "names": ["routes_exports", "__export", "ProductCollectionRoutes", "Routes", "__toCommonJS", "import_express", "import_routes", "layoutPath", "services", "router", "selectedRoutes", "path"]
 }

package/dpr/routes/journeys/product-collection/selected/controller.js

@@ -1,2 +1,2 @@
-var S=Object.create;var c=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var a=Object.getOwnPropertyNames;var p=Object.getPrototypeOf,C=Object.prototype.hasOwnProperty;var m=(e,t)=>{for(var o in t)c(e,o,{get:t[o],enumerable:!0})},n=(e,t,o,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of a(t))!C.call(e,r)&&r!==o&&c(e,r,{get:()=>t[r],enumerable:!(i=u(t,r))||i.enumerable});return e};var v=(e,t,o)=>(o=e!=null?S(p(e)):{},n(t||!e||!e.__esModule?c(o,"default",{value:e,enumerable:!0}):o,e)),h=e=>n(c({},"__esModule",{value:!0}),e);var f={};m(f,{SelectedProductCollectionController:()=>P});module.exports=h(f);var d=v(require("../../../../utils/localsHelper"));class P{constructor(t,o){this.POST=async(t,o,i)=>{const{productCollection:r}=t.body,{dprUser:s,nestedBaseUrl:l}=d.default.getValues(o);await this.productCollectionStoreService.setSelectedProductCollectionId(s.id,r==="RESET"?void 0:r).then(()=>{o.redirect(`${l}/`)}).catch(()=>{o.redirect(`${l}/`)})};this.layoutPath=t,this.productCollectionStoreService=o.productCollectionStoreService}}0&&(module.exports={SelectedProductCollectionController});
+"use strict";var S=Object.create;var c=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var a=Object.getOwnPropertyNames;var p=Object.getPrototypeOf,C=Object.prototype.hasOwnProperty;var m=(e,t)=>{for(var o in t)c(e,o,{get:t[o],enumerable:!0})},n=(e,t,o,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of a(t))!C.call(e,r)&&r!==o&&c(e,r,{get:()=>t[r],enumerable:!(i=u(t,r))||i.enumerable});return e};var v=(e,t,o)=>(o=e!=null?S(p(e)):{},n(t||!e||!e.__esModule?c(o,"default",{value:e,enumerable:!0}):o,e)),h=e=>n(c({},"__esModule",{value:!0}),e);var f={};m(f,{SelectedProductCollectionController:()=>P});module.exports=h(f);var d=v(require("../../../../utils/localsHelper"));class P{constructor(t,o){this.POST=async(t,o,i)=>{const{productCollection:r}=t.body,{dprUser:s,nestedBaseUrl:l}=d.default.getValues(o);await this.productCollectionStoreService.setSelectedProductCollectionId(s.id,r==="RESET"?void 0:r).then(()=>{o.redirect(`${l}/`)}).catch(()=>{o.redirect(`${l}/`)})};this.layoutPath=t,this.productCollectionStoreService=o.productCollectionStoreService}}0&&(module.exports={SelectedProductCollectionController});
 //# sourceMappingURL=controller.js.map

package/dpr/routes/journeys/product-collection/selected/controller.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/product-collection/selected/controller.ts"],
   "sourcesContent": ["import { RequestHandler } from 'express'\nimport { ProductCollectionStoreService } from 'src/dpr/services/productCollection/productCollectionStoreService'\nimport LocalsHelper from '../../../../utils/localsHelper'\nimport { Services } from '../../../../types/Services'\n\nexport class SelectedProductCollectionController {\n  layoutPath: string\n\n  productCollectionStoreService: ProductCollectionStoreService\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.productCollectionStoreService = services.productCollectionStoreService\n  }\n\n  POST: RequestHandler = async (req, res, _next) => {\n    const { productCollection } = req.body\n    const { dprUser, nestedBaseUrl } = LocalsHelper.getValues(res)\n\n    await this.productCollectionStoreService\n      .setSelectedProductCollectionId(dprUser.id, productCollection === 'RESET' ? undefined : productCollection)\n      .then(() => {\n        res.redirect(`${nestedBaseUrl}/`)\n      })\n      .catch(() => {\n        res.redirect(`${nestedBaseUrl}/`)\n      })\n  }\n}\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,yCAAAE,IAAA,eAAAC,EAAAH,GAEA,IAAAI,EAAyB,6CAGlB,MAAMF,CAAoC,CAK/C,YAAYG,EAAoBC,EAAoB,CAKpD,UAAuB,MAAOC,EAAKC,EAAKC,IAAU,CAChD,KAAM,CAAE,kBAAAC,CAAkB,EAAIH,EAAI,KAC5B,CAAE,QAAAI,EAAS,cAAAC,CAAc,EAAI,EAAAC,QAAa,UAAUL,CAAG,EAE7D,MAAM,KAAK,8BACR,+BAA+BG,EAAQ,GAAID,IAAsB,QAAU,OAAYA,CAAiB,EACxG,KAAK,IAAM,CACVF,EAAI,SAAS,GAAGI,CAAa,GAAG,CAClC,CAAC,EACA,MAAM,IAAM,CACXJ,EAAI,SAAS,GAAGI,CAAa,GAAG,CAClC,CAAC,CACL,EAhBE,KAAK,WAAaP,EAClB,KAAK,8BAAgCC,EAAS,6BAChD,CAeF",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,yCAAAE,IAAA,eAAAC,EAAAH,GAEA,IAAAI,EAAyB,6CAGlB,MAAMF,CAAoC,CAK/C,YAAYG,EAAoBC,EAAoB,CAKpD,UAAuB,MAAOC,EAAKC,EAAKC,IAAU,CAChD,KAAM,CAAE,kBAAAC,CAAkB,EAAIH,EAAI,KAC5B,CAAE,QAAAI,EAAS,cAAAC,CAAc,EAAI,EAAAC,QAAa,UAAUL,CAAG,EAE7D,MAAM,KAAK,8BACR,+BAA+BG,EAAQ,GAAID,IAAsB,QAAU,OAAYA,CAAiB,EACxG,KAAK,IAAM,CACVF,EAAI,SAAS,GAAGI,CAAa,GAAG,CAClC,CAAC,EACA,MAAM,IAAM,CACXJ,EAAI,SAAS,GAAGI,CAAa,GAAG,CAClC,CAAC,CACL,EAhBE,KAAK,WAAaP,EAClB,KAAK,8BAAgCC,EAAS,6BAChD,CAeF",
   "names": ["controller_exports", "__export", "SelectedProductCollectionController", "__toCommonJS", "import_localsHelper", "layoutPath", "services", "req", "res", "_next", "productCollection", "dprUser", "nestedBaseUrl", "LocalsHelper"]
 }

package/dpr/routes/journeys/product-collection/selected/routes.js

@@ -1,2 +1,2 @@
-var s=Object.defineProperty;var a=Object.getOwnPropertyDescriptor;var p=Object.getOwnPropertyNames;var u=Object.prototype.hasOwnProperty;var f=(o,r)=>{for(var t in r)s(o,t,{get:r[t],enumerable:!0})},v=(o,r,t,m)=>{if(r&&typeof r=="object"||typeof r=="function")for(let e of p(r))!u.call(o,e)&&e!==t&&s(o,e,{get:()=>r[e],enumerable:!(m=a(r,e))||m.enumerable});return o};var P=o=>v(s({},"__esModule",{value:!0}),o);var d={};f(d,{routes:()=>S});module.exports=P(d);var c=require("express"),i=require("./controller"),l=require("./validation"),n=require("../../../../validation/validate");const S=({layoutPath:o,services:r})=>{const t=(0,c.Router)({mergeParams:!0}),m=new i.SelectedProductCollectionController(o,r);return t.post("/",(0,n.validate)(l.schema),m.POST),t};0&&(module.exports={routes});
+"use strict";var s=Object.defineProperty;var a=Object.getOwnPropertyDescriptor;var p=Object.getOwnPropertyNames;var u=Object.prototype.hasOwnProperty;var f=(o,r)=>{for(var t in r)s(o,t,{get:r[t],enumerable:!0})},v=(o,r,t,m)=>{if(r&&typeof r=="object"||typeof r=="function")for(let e of p(r))!u.call(o,e)&&e!==t&&s(o,e,{get:()=>r[e],enumerable:!(m=a(r,e))||m.enumerable});return o};var P=o=>v(s({},"__esModule",{value:!0}),o);var d={};f(d,{routes:()=>S});module.exports=P(d);var c=require("express"),i=require("./controller"),l=require("./validation"),n=require("../../../../validation/validate");const S=({layoutPath:o,services:r})=>{const t=(0,c.Router)({mergeParams:!0}),m=new i.SelectedProductCollectionController(o,r);return t.post("/",(0,n.validate)(l.schema),m.POST),t};0&&(module.exports={routes});
 //# sourceMappingURL=routes.js.map

package/dpr/routes/journeys/product-collection/selected/routes.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/product-collection/selected/routes.ts"],
   "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport { SelectedProductCollectionController } from './controller'\nimport { Services } from '../../../../types/Services'\nimport { schema } from './validation'\nimport { validate } from '../../../../validation/validate'\n\nexport const routes = ({ layoutPath, services }: { layoutPath: string; services: Services }) => {\n  const router = Router({ mergeParams: true })\n  const controller = new SelectedProductCollectionController(layoutPath, services)\n\n  router.post('/', validate(schema), controller.POST)\n\n  return router\n}\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,YAAAE,IAAA,eAAAC,EAAAH,GACA,IAAAI,EAAuB,mBACvBC,EAAoD,wBAEpDC,EAAuB,wBACvBC,EAAyB,2CAElB,MAAML,EAAS,CAAC,CAAE,WAAAM,EAAY,SAAAC,CAAS,IAAkD,CAC9F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EACrCC,EAAa,IAAI,sCAAoCH,EAAYC,CAAQ,EAE/E,OAAAC,EAAO,KAAK,OAAK,YAAS,QAAM,EAAGC,EAAW,IAAI,EAE3CD,CACT",
+  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,YAAAE,IAAA,eAAAC,EAAAH,GACA,IAAAI,EAAuB,mBACvBC,EAAoD,wBAEpDC,EAAuB,wBACvBC,EAAyB,2CAElB,MAAML,EAAS,CAAC,CAAE,WAAAM,EAAY,SAAAC,CAAS,IAAkD,CAC9F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EACrCC,EAAa,IAAI,sCAAoCH,EAAYC,CAAQ,EAE/E,OAAAC,EAAO,KAAK,OAAK,YAAS,QAAM,EAAGC,EAAW,IAAI,EAE3CD,CACT",
   "names": ["routes_exports", "__export", "routes", "__toCommonJS", "import_express", "import_controller", "import_validation", "import_validate", "layoutPath", "services", "router", "controller"]
 }

package/dpr/routes/journeys/product-collection/selected/tests.cy.js

@@ -1,2 +1,2 @@
-var l=require("@networkMocks/definitionSummaries");context("Catalogue collections",()=>{const i="/embedded/platform/";describe("Check catalogue collections work properly",()=>{it("should allow the user to choose from any collection",()=>{cy.task("resetStubs"),cy.task("resetRedis"),cy.task("stubDefinitions"),cy.task("stubGetProductCollections"),cy.task("getProductCollection1"),cy.task("stubDefinitionUnprintable"),cy.task("stubDefinitionEmptyReport"),cy.task("stubDefinitionMockReportVariant35"),cy.visit(i),cy.findByRole("combobox",{name:/Your collections/}).should("be.visible").within(()=>cy.findAllByRole("option").should("have.length",3)),cy.findByDisplayValue(/Full catalogue/).should("be.visible");const o=l.summaries.reduce((e,t)=>e+(t.dashboards?.length??0)+t.variants.length,0);cy.findAllByText((e,t)=>new RegExp(`Showing ${o} of ${o} reports`).test(t.textContent)).should("be.visible"),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(e,t)=>t.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).click()})}),cy.findByRole("combobox",{name:/Your collections/}).select("My Starter Pack");const n=[l.summaries[0],l.summaries[1]].reduce((e,t)=>e+(t.dashboards?.length??0)+t.variants.length,0);cy.findAllByText((e,t)=>new RegExp(`Showing ${n} of ${n} reports`).test(t.textContent)).should("be.visible"),cy.findByRole("combobox",{name:/Your collections/}).select("Full catalogue"),cy.findAllByText((e,t)=>new RegExp(`Showing ${o} of ${o} reports`).test(t.textContent)).should("be.visible")})})});
+"use strict";var l=require("@networkMocks/definitionSummaries");context("Catalogue collections",()=>{const i="/embedded/platform/";describe("Check catalogue collections work properly",()=>{it("should allow the user to choose from any collection",()=>{cy.task("resetStubs"),cy.task("resetRedis"),cy.task("stubDefinitions"),cy.task("stubGetProductCollections"),cy.task("getProductCollection1"),cy.task("stubDefinitionUnprintable"),cy.task("stubDefinitionEmptyReport"),cy.task("stubDefinitionMockReportVariant35"),cy.visit(i),cy.findByRole("combobox",{name:/Your collections/}).should("be.visible").within(()=>cy.findAllByRole("option").should("have.length",3)),cy.findByDisplayValue(/Full catalogue/).should("be.visible");const o=l.summaries.reduce((e,t)=>e+(t.dashboards?.length??0)+t.variants.length,0);cy.findAllByText((e,t)=>new RegExp(`Showing ${o} of ${o} reports`).test(t?.textContent||"")).should("be.visible"),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(e,t)=>!!t.textContent?.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).click()})}),cy.findByRole("combobox",{name:/Your collections/}).select("My Starter Pack");const n=[l.summaries[0],l.summaries[1]].reduce((e,t)=>e+(t.dashboards?.length??0)+t.variants.length,0);cy.findAllByText((e,t)=>new RegExp(`Showing ${n} of ${n} reports`).test(t?.textContent||"")).should("be.visible"),cy.findByRole("combobox",{name:/Your collections/}).select("Full catalogue"),cy.findAllByText((e,t)=>new RegExp(`Showing ${o} of ${o} reports`).test(t?.textContent||"")).should("be.visible")})})});
 //# sourceMappingURL=tests.cy.js.map

package/dpr/routes/journeys/product-collection/selected/tests.cy.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/product-collection/selected/tests.cy.ts"],
-  "sourcesContent": ["import { summaries } from '@networkMocks/definitionSummaries'\n\ncontext('Catalogue collections', () => {\n  const path = '/embedded/platform/'\n\n  describe('Check catalogue collections work properly', () => {\n    it('should allow the user to choose from any collection', () => {\n      cy.task('resetStubs')\n      cy.task('resetRedis')\n      cy.task('stubDefinitions')\n      cy.task('stubGetProductCollections')\n      cy.task('getProductCollection1')\n      cy.task('stubDefinitionUnprintable')\n      cy.task('stubDefinitionEmptyReport')\n      cy.task('stubDefinitionMockReportVariant35')\n\n      cy.visit(path)\n\n      cy.findByRole('combobox', { name: /Your collections/ })\n        .should('be.visible')\n        .within(() => cy.findAllByRole('option').should('have.length', 3))\n      cy.findByDisplayValue(/Full catalogue/).should('be.visible')\n\n      const totalReports = summaries.reduce((acc, cur) => acc + (cur.dashboards?.length ?? 0) + cur.variants.length, 0)\n      cy.findAllByText((_text, el) =>\n        new RegExp(`Showing ${totalReports} of ${totalReports} reports`).test(el.textContent),\n      ).should('be.visible')\n\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return element.textContent.includes('Interactive Report with async filters')\n          },\n        }).within(() => {\n          cy.findByRole('button', { name: /Add bookmark/ }).click()\n        })\n      })\n\n      cy.findByRole('combobox', { name: /Your collections/ }).select('My Starter Pack')\n      const totalReportsStarterPack = [summaries[0], summaries[1]].reduce(\n        (acc, cur) => acc + (cur.dashboards?.length ?? 0) + cur.variants.length,\n        0,\n      )\n      cy.findAllByText((_text, el) =>\n        new RegExp(`Showing ${totalReportsStarterPack} of ${totalReportsStarterPack} reports`).test(el.textContent),\n      ).should('be.visible')\n\n      cy.findByRole('combobox', { name: /Your collections/ }).select('Full catalogue')\n      cy.findAllByText((_text, el) =>\n        new RegExp(`Showing ${totalReports} of ${totalReports} reports`).test(el.textContent),\n      ).should('be.visible')\n    })\n  })\n})\n"],
-  "mappings": "AAAA,IAAAA,EAA0B,6CAE1B,QAAQ,wBAAyB,IAAM,CACrC,MAAMC,EAAO,sBAEb,SAAS,4CAA6C,IAAM,CAC1D,GAAG,sDAAuD,IAAM,CAC9D,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,iBAAiB,EACzB,GAAG,KAAK,2BAA2B,EACnC,GAAG,KAAK,uBAAuB,EAC/B,GAAG,KAAK,2BAA2B,EACnC,GAAG,KAAK,2BAA2B,EACnC,GAAG,KAAK,mCAAmC,EAE3C,GAAG,MAAMA,CAAI,EAEb,GAAG,WAAW,WAAY,CAAE,KAAM,kBAAmB,CAAC,EACnD,OAAO,YAAY,EACnB,OAAO,IAAM,GAAG,cAAc,QAAQ,EAAE,OAAO,cAAe,CAAC,CAAC,EACnE,GAAG,mBAAmB,gBAAgB,EAAE,OAAO,YAAY,EAE3D,MAAMC,EAAe,YAAU,OAAO,CAACC,EAAKC,IAAQD,GAAOC,EAAI,YAAY,QAAU,GAAKA,EAAI,SAAS,OAAQ,CAAC,EAChH,GAAG,cAAc,CAACC,EAAOC,IACvB,IAAI,OAAO,WAAWJ,CAAY,OAAOA,CAAY,UAAU,EAAE,KAAKI,EAAG,WAAW,CACtF,EAAE,OAAO,YAAY,EAErB,GAAG,gBAAgB,sBAAsB,EAAE,OAAO,IAAM,CACtD,GAAG,WAAW,MAAO,CACnB,KAAM,CAACC,EAAGC,IACDA,EAAQ,YAAY,SAAS,uCAAuC,CAE/E,CAAC,EAAE,OAAO,IAAM,CACd,GAAG,WAAW,SAAU,CAAE,KAAM,cAAe,CAAC,EAAE,MAAM,CAC1D,CAAC,CACH,CAAC,EAED,GAAG,WAAW,WAAY,CAAE,KAAM,kBAAmB,CAAC,EAAE,OAAO,iBAAiB,EAChF,MAAMC,EAA0B,CAAC,YAAU,CAAC,EAAG,YAAU,CAAC,CAAC,EAAE,OAC3D,CAACN,EAAKC,IAAQD,GAAOC,EAAI,YAAY,QAAU,GAAKA,EAAI,SAAS,OACjE,CACF,EACA,GAAG,cAAc,CAACC,EAAOC,IACvB,IAAI,OAAO,WAAWG,CAAuB,OAAOA,CAAuB,UAAU,EAAE,KAAKH,EAAG,WAAW,CAC5G,EAAE,OAAO,YAAY,EAErB,GAAG,WAAW,WAAY,CAAE,KAAM,kBAAmB,CAAC,EAAE,OAAO,gBAAgB,EAC/E,GAAG,cAAc,CAACD,EAAOC,IACvB,IAAI,OAAO,WAAWJ,CAAY,OAAOA,CAAY,UAAU,EAAE,KAAKI,EAAG,WAAW,CACtF,EAAE,OAAO,YAAY,CACvB,CAAC,CACH,CAAC,CACH,CAAC",
+  "sourcesContent": ["import { summaries } from '@networkMocks/definitionSummaries'\n\ncontext('Catalogue collections', () => {\n  const path = '/embedded/platform/'\n\n  describe('Check catalogue collections work properly', () => {\n    it('should allow the user to choose from any collection', () => {\n      cy.task('resetStubs')\n      cy.task('resetRedis')\n      cy.task('stubDefinitions')\n      cy.task('stubGetProductCollections')\n      cy.task('getProductCollection1')\n      cy.task('stubDefinitionUnprintable')\n      cy.task('stubDefinitionEmptyReport')\n      cy.task('stubDefinitionMockReportVariant35')\n\n      cy.visit(path)\n\n      cy.findByRole('combobox', { name: /Your collections/ })\n        .should('be.visible')\n        .within(() => cy.findAllByRole('option').should('have.length', 3))\n      cy.findByDisplayValue(/Full catalogue/).should('be.visible')\n\n      const totalReports = summaries.reduce((acc, cur) => acc + (cur.dashboards?.length ?? 0) + cur.variants.length, 0)\n      cy.findAllByText((_text, el) =>\n        new RegExp(`Showing ${totalReports} of ${totalReports} reports`).test(el?.textContent || ''),\n      ).should('be.visible')\n\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Interactive Report with async filters'))\n          },\n        }).within(() => {\n          cy.findByRole('button', { name: /Add bookmark/ }).click()\n        })\n      })\n\n      cy.findByRole('combobox', { name: /Your collections/ }).select('My Starter Pack')\n      const totalReportsStarterPack = [summaries[0], summaries[1]].reduce(\n        (acc, cur) => acc + (cur.dashboards?.length ?? 0) + cur.variants.length,\n        0,\n      )\n      cy.findAllByText((_text, el) =>\n        new RegExp(`Showing ${totalReportsStarterPack} of ${totalReportsStarterPack} reports`).test(\n          el?.textContent || '',\n        ),\n      ).should('be.visible')\n\n      cy.findByRole('combobox', { name: /Your collections/ }).select('Full catalogue')\n      cy.findAllByText((_text, el) =>\n        new RegExp(`Showing ${totalReports} of ${totalReports} reports`).test(el?.textContent || ''),\n      ).should('be.visible')\n    })\n  })\n})\n"],
+  "mappings": "aAAA,IAAAA,EAA0B,6CAE1B,QAAQ,wBAAyB,IAAM,CACrC,MAAMC,EAAO,sBAEb,SAAS,4CAA6C,IAAM,CAC1D,GAAG,sDAAuD,IAAM,CAC9D,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,iBAAiB,EACzB,GAAG,KAAK,2BAA2B,EACnC,GAAG,KAAK,uBAAuB,EAC/B,GAAG,KAAK,2BAA2B,EACnC,GAAG,KAAK,2BAA2B,EACnC,GAAG,KAAK,mCAAmC,EAE3C,GAAG,MAAMA,CAAI,EAEb,GAAG,WAAW,WAAY,CAAE,KAAM,kBAAmB,CAAC,EACnD,OAAO,YAAY,EACnB,OAAO,IAAM,GAAG,cAAc,QAAQ,EAAE,OAAO,cAAe,CAAC,CAAC,EACnE,GAAG,mBAAmB,gBAAgB,EAAE,OAAO,YAAY,EAE3D,MAAMC,EAAe,YAAU,OAAO,CAACC,EAAKC,IAAQD,GAAOC,EAAI,YAAY,QAAU,GAAKA,EAAI,SAAS,OAAQ,CAAC,EAChH,GAAG,cAAc,CAACC,EAAOC,IACvB,IAAI,OAAO,WAAWJ,CAAY,OAAOA,CAAY,UAAU,EAAE,KAAKI,GAAI,aAAe,EAAE,CAC7F,EAAE,OAAO,YAAY,EAErB,GAAG,gBAAgB,sBAAsB,EAAE,OAAO,IAAM,CACtD,GAAG,WAAW,MAAO,CACnB,KAAM,CAACC,EAAGC,IACD,EAAQA,EAAQ,aAAa,SAAS,uCAAuC,CAExF,CAAC,EAAE,OAAO,IAAM,CACd,GAAG,WAAW,SAAU,CAAE,KAAM,cAAe,CAAC,EAAE,MAAM,CAC1D,CAAC,CACH,CAAC,EAED,GAAG,WAAW,WAAY,CAAE,KAAM,kBAAmB,CAAC,EAAE,OAAO,iBAAiB,EAChF,MAAMC,EAA0B,CAAC,YAAU,CAAC,EAAG,YAAU,CAAC,CAAC,EAAE,OAC3D,CAACN,EAAKC,IAAQD,GAAOC,EAAI,YAAY,QAAU,GAAKA,EAAI,SAAS,OACjE,CACF,EACA,GAAG,cAAc,CAACC,EAAOC,IACvB,IAAI,OAAO,WAAWG,CAAuB,OAAOA,CAAuB,UAAU,EAAE,KACrFH,GAAI,aAAe,EACrB,CACF,EAAE,OAAO,YAAY,EAErB,GAAG,WAAW,WAAY,CAAE,KAAM,kBAAmB,CAAC,EAAE,OAAO,gBAAgB,EAC/E,GAAG,cAAc,CAACD,EAAOC,IACvB,IAAI,OAAO,WAAWJ,CAAY,OAAOA,CAAY,UAAU,EAAE,KAAKI,GAAI,aAAe,EAAE,CAC7F,EAAE,OAAO,YAAY,CACvB,CAAC,CACH,CAAC,CACH,CAAC",
   "names": ["import_definitionSummaries", "path", "totalReports", "acc", "cur", "_text", "el", "_", "element", "totalReportsStarterPack"]
 }

package/dpr/routes/journeys/product-collection/selected/tests.cy.ts

@@ -23,13 +23,13 @@ context('Catalogue collections', () => {
 
       const totalReports = summaries.reduce((acc, cur) => acc + (cur.dashboards?.length ?? 0) + cur.variants.length, 0)
       cy.findAllByText((_text, el) =>
-        new RegExp(`Showing ${totalReports} of ${totalReports} reports`).test(el.textContent),
+        new RegExp(`Showing ${totalReports} of ${totalReports} reports`).test(el?.textContent || ''),
       ).should('be.visible')
 
       cy.findByLabelText(/Reports catalogue.*/i).within(() => {
         cy.findByRole('row', {
           name: (_, element) => {
-            return element.textContent.includes('Interactive Report with async filters')
+            return Boolean(element.textContent?.includes('Interactive Report with async filters'))
           },
         }).within(() => {
           cy.findByRole('button', { name: /Add bookmark/ }).click()
@@ -42,12 +42,14 @@ context('Catalogue collections', () => {
         0,
       )
       cy.findAllByText((_text, el) =>
-        new RegExp(`Showing ${totalReportsStarterPack} of ${totalReportsStarterPack} reports`).test(el.textContent),
+        new RegExp(`Showing ${totalReportsStarterPack} of ${totalReportsStarterPack} reports`).test(
+          el?.textContent || '',
+        ),
       ).should('be.visible')
 
       cy.findByRole('combobox', { name: /Your collections/ }).select('Full catalogue')
       cy.findAllByText((_text, el) =>
-        new RegExp(`Showing ${totalReports} of ${totalReports} reports`).test(el.textContent),
+        new RegExp(`Showing ${totalReports} of ${totalReports} reports`).test(el?.textContent || ''),
       ).should('be.visible')
     })
   })

package/dpr/routes/journeys/product-collection/selected/validation.js

@@ -1,2 +1,2 @@
-var n=Object.create;var r=Object.defineProperty;var s=Object.getOwnPropertyDescriptor;var d=Object.getOwnPropertyNames;var p=Object.getPrototypeOf,u=Object.prototype.hasOwnProperty;var h=(o,t)=>{for(var c in t)r(o,c,{get:t[c],enumerable:!0})},m=(o,t,c,l)=>{if(t&&typeof t=="object"||typeof t=="function")for(let i of d(t))!u.call(o,i)&&i!==c&&r(o,i,{get:()=>t[i],enumerable:!(l=s(t,i))||l.enumerable});return o};var x=(o,t,c)=>(c=o!=null?n(p(o)):{},m(t||!o||!o.__esModule?r(c,"default",{value:o,enumerable:!0}):c,o)),C=o=>m(r({},"__esModule",{value:!0}),o);var b={};h(b,{schema:()=>a});module.exports=C(b);var e=x(require("zod"));const a=e.default.object({productCollection:e.default.string().trim().min(1,"Product Collection ID should exist")});0&&(module.exports={schema});
+"use strict";var n=Object.create;var r=Object.defineProperty;var s=Object.getOwnPropertyDescriptor;var d=Object.getOwnPropertyNames;var p=Object.getPrototypeOf,u=Object.prototype.hasOwnProperty;var h=(o,t)=>{for(var c in t)r(o,c,{get:t[c],enumerable:!0})},m=(o,t,c,l)=>{if(t&&typeof t=="object"||typeof t=="function")for(let i of d(t))!u.call(o,i)&&i!==c&&r(o,i,{get:()=>t[i],enumerable:!(l=s(t,i))||l.enumerable});return o};var x=(o,t,c)=>(c=o!=null?n(p(o)):{},m(t||!o||!o.__esModule?r(c,"default",{value:o,enumerable:!0}):c,o)),C=o=>m(r({},"__esModule",{value:!0}),o);var b={};h(b,{schema:()=>a});module.exports=C(b);var e=x(require("zod"));const a=e.default.object({productCollection:e.default.string().trim().min(1,"Product Collection ID should exist")});0&&(module.exports={schema});
 //# sourceMappingURL=validation.js.map

package/dpr/routes/journeys/product-collection/selected/validation.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/product-collection/selected/validation.ts"],
   "sourcesContent": ["import z from 'zod'\n\nexport const schema = z.object({\n  productCollection: z.string().trim().min(1, 'Product Collection ID should exist'),\n})\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,YAAAE,IAAA,eAAAC,EAAAH,GAAA,IAAAI,EAAc,kBAEP,MAAMF,EAAS,EAAAG,QAAE,OAAO,CAC7B,kBAAmB,EAAAA,QAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAG,oCAAoC,CAClF,CAAC",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,YAAAE,IAAA,eAAAC,EAAAH,GAAA,IAAAI,EAAc,kBAEP,MAAMF,EAAS,EAAAG,QAAE,OAAO,CAC7B,kBAAmB,EAAAA,QAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAG,oCAAoC,CAClF,CAAC",
   "names": ["validation_exports", "__export", "schema", "__toCommonJS", "import_zod", "z"]
 }

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

@@ -1,2 +1,2 @@
-var f=Object.create;var c=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var y=Object.getOwnPropertyNames;var S=Object.getPrototypeOf,q=Object.prototype.hasOwnProperty;var P=(t,r)=>{for(var e in r)c(t,e,{get:r[e],enumerable:!0})},h=(t,r,e,o)=>{if(r&&typeof r=="object"||typeof r=="function")for(let i of y(r))!q.call(t,i)&&i!==e&&c(t,i,{get:()=>r[i],enumerable:!(o=R(r,i))||o.enumerable});return t};var C=(t,r,e)=>(e=t!=null?f(S(t)):{},h(r||!t||!t.__esModule?c(e,"default",{value:t,enumerable:!0}):e,t)),$=t=>h(c({},"__esModule",{value:!0}),t);var b={};P(b,{MissingReportFormController:()=>v,default:()=>I});module.exports=$(b);var u=C(require("../../../../utils/localsHelper"));class v{constructor(r,e){this.GET=async(r,e,o)=>{const{token:i,csrfToken:a,definitionsPath:p,dprUser:d}=u.default.getValues(e),{reportId:n,variantId:s}=r.params,m=await this.reportingService.getDefinition(i,n,s,p??"definitions/prisons/missing"),{variant:l,name:g}=m;try{e.render("dpr/routes/journeys/request-missing-report/form/view",{title:"This report is not available",report:{reportId:n,variantId:s,reportName:g,name:l.name,description:l.description||m.description},user:d,csrfToken:a,layoutPath:this.layoutPath,postEndpoint:`/dpr/request-missing-report/${n}/${s}/form/submit`})}catch{o()}};this.POST=async(r,e,o)=>{const{body:i}=r,{reportId:a,variantId:p,reportName:d,variantName:n,"more-detail":s}=i,{token:m}=u.default.getValues(e);await this.missingReportClient.submitMissingReportEntry(m,a,p,s).then(()=>{const g=`./submitted?${`reportName=${d}&name=${n}&reportId=${a}&variantId=${p}`}`;e.redirect(g)},()=>{e.render("dpr/components/serviceError/view")}).catch(()=>{e.render("dpr/components/serviceError/view")})};this.layoutPath=r,this.missingReportClient=e.missingReportClient,this.reportingService=e.reportingService}}var I=v;0&&(module.exports={MissingReportFormController});
+"use strict";var S=Object.create;var d=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var y=Object.getOwnPropertyNames;var q=Object.getPrototypeOf,P=Object.prototype.hasOwnProperty;var $=(t,e)=>{for(var r in e)d(t,r,{get:e[r],enumerable:!0})},h=(t,e,r,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of y(e))!P.call(t,i)&&i!==r&&d(t,i,{get:()=>e[i],enumerable:!(n=R(e,i))||n.enumerable});return t};var b=(t,e,r)=>(r=t!=null?S(q(t)):{},h(e||!t||!t.__esModule?d(r,"default",{value:t,enumerable:!0}):r,t)),I=t=>h(d({},"__esModule",{value:!0}),t);var w={};$(w,{MissingReportFormController:()=>u,default:()=>E});module.exports=I(w);var g=b(require("../../../../utils/localsHelper"));class u{constructor(e,r){this.GET=async(e,r,n)=>{const{token:i,csrfToken:p,definitionsPath:c,dprUser:v}=g.default.getValues(r),{reportId:s,variantId:a}=e.params,m=await this.reportingService.getDefinition(i,s,a,c??"definitions/prisons/missing"),{variant:o,name:l}=m;try{r.render("dpr/routes/journeys/request-missing-report/form/view",{title:"This report is not available",report:{reportId:s,variantId:a,reportName:l,name:o.name,description:o.description||m.description},user:v,csrfToken:p,layoutPath:this.layoutPath,postEndpoint:`/dpr/request-missing-report/${s}/${a}/form/submit`})}catch{n()}};this.POST=async(e,r,n)=>{const{body:i}=e,{reportId:p,variantId:c,reportName:v,variantName:s,"more-detail":a}=i,{token:m}=g.default.getValues(r);try{const o=this.missingReportService.submitMissingReportEntry(m,p,c,a);o&&o.then(()=>{const f=`./submitted?${`reportName=${v}&name=${s}&reportId=${p}&variantId=${c}`}`;r.redirect(f)},()=>{r.render("dpr/components/serviceError/view")})}catch{r.render("dpr/components/serviceError/view")}};this.layoutPath=e,this.missingReportService=r.missingReportService,this.reportingService=r.reportingService}}var E=u;0&&(module.exports={MissingReportFormController});
 //# sourceMappingURL=controller.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/request-missing-report/form/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport LocalsHelper from '../../../../utils/localsHelper'\nimport { components } from '../../../../types/api'\nimport { Services } from '../../../../types/Services'\nimport MissingReportClient from '../../../../services/missingReport/missingReportClient'\nimport { ReportingService } from '../../../../services'\n\nclass MissingReportFormController {\n  layoutPath: string\n\n  missingReportClient: MissingReportClient\n\n  reportingService: ReportingService\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.missingReportClient = services.missingReportClient\n    this.reportingService = services.reportingService\n  }\n\n  GET: RequestHandler = async (req, res, next) => {\n    const { token, csrfToken, definitionsPath, dprUser } = LocalsHelper.getValues(res)\n    const { reportId, variantId } = req.params\n\n    const reportDefinition: components['schemas']['SingleVariantReportDefinition'] =\n      await this.reportingService.getDefinition(\n        token,\n        reportId,\n        variantId,\n        definitionsPath ?? 'definitions/prisons/missing',\n      )\n\n    const { variant, name } = reportDefinition\n\n    try {\n      res.render(`dpr/routes/journeys/request-missing-report/form/view`, {\n        title: 'This report is not available',\n        report: {\n          reportId,\n          variantId,\n          reportName: name,\n          name: variant.name,\n          description: variant.description || reportDefinition.description,\n        },\n        user: dprUser,\n        csrfToken,\n        layoutPath: this.layoutPath,\n        postEndpoint: `/dpr/request-missing-report/${reportId}/${variantId}/form/submit`,\n      })\n    } catch (error) {\n      next()\n    }\n  }\n\n  POST: RequestHandler = async (req, res, next) => {\n    const { body } = req\n    const { reportId, variantId, reportName, variantName, 'more-detail': requestDetails } = body\n\n    const { token } = LocalsHelper.getValues(res)\n\n    await this.missingReportClient\n      .submitMissingReportEntry(token, reportId, variantId, requestDetails)\n      .then(\n        () => {\n          const queryParams = `reportName=${reportName}&name=${variantName}&reportId=${reportId}&variantId=${variantId}`\n          const redirect = `./submitted?${queryParams}`\n\n          res.redirect(redirect)\n        },\n        () => {\n          res.render(`dpr/components/serviceError/view`)\n        },\n      )\n      .catch(() => {\n        res.render(`dpr/components/serviceError/view`)\n      })\n  }\n}\n\nexport { MissingReportFormController }\nexport default MissingReportFormController\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,iCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,6CAMzB,MAAMH,CAA4B,CAOhC,YAAYI,EAAoBC,EAAoB,CAMpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,KAAM,CAAE,MAAAC,EAAO,UAAAC,EAAW,gBAAAC,EAAiB,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUN,CAAG,EAC3E,CAAE,SAAAO,EAAU,UAAAC,CAAU,EAAIT,EAAI,OAE9BU,EACJ,MAAM,KAAK,iBAAiB,cAC1BP,EACAK,EACAC,EACAJ,GAAmB,6BACrB,EAEI,CAAE,QAAAM,EAAS,KAAAC,CAAK,EAAIF,EAE1B,GAAI,CACFT,EAAI,OAAO,uDAAwD,CACjE,MAAO,+BACP,OAAQ,CACN,SAAAO,EACA,UAAAC,EACA,WAAYG,EACZ,KAAMD,EAAQ,KACd,YAAaA,EAAQ,aAAeD,EAAiB,WACvD,EACA,KAAMJ,EACN,UAAAF,EACA,WAAY,KAAK,WACjB,aAAc,+BAA+BI,CAAQ,IAAIC,CAAS,cACpE,CAAC,CACH,MAAgB,CACdP,EAAK,CACP,CACF,EAEA,UAAuB,MAAOF,EAAKC,EAAKC,IAAS,CAC/C,KAAM,CAAE,KAAAW,CAAK,EAAIb,EACX,CAAE,SAAAQ,EAAU,UAAAC,EAAW,WAAAK,EAAY,YAAAC,EAAa,cAAeC,CAAe,EAAIH,EAElF,CAAE,MAAAV,CAAM,EAAI,EAAAI,QAAa,UAAUN,CAAG,EAE5C,MAAM,KAAK,oBACR,yBAAyBE,EAAOK,EAAUC,EAAWO,CAAc,EACnE,KACC,IAAM,CAEJ,MAAMC,EAAW,eADG,cAAcH,CAAU,SAASC,CAAW,aAAaP,CAAQ,cAAcC,CAAS,EACjE,GAE3CR,EAAI,SAASgB,CAAQ,CACvB,EACA,IAAM,CACJhB,EAAI,OAAO,kCAAkC,CAC/C,CACF,EACC,MAAM,IAAM,CACXA,EAAI,OAAO,kCAAkC,CAC/C,CAAC,CACL,EA7DE,KAAK,WAAaH,EAClB,KAAK,oBAAsBC,EAAS,oBACpC,KAAK,iBAAmBA,EAAS,gBACnC,CA2DF,CAGA,IAAOJ,EAAQD",
-  "names": ["controller_exports", "__export", "MissingReportFormController", "controller_default", "__toCommonJS", "import_localsHelper", "layoutPath", "services", "req", "res", "next", "token", "csrfToken", "definitionsPath", "dprUser", "LocalsHelper", "reportId", "variantId", "reportDefinition", "variant", "name", "body", "reportName", "variantName", "requestDetails", "redirect"]
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport LocalsHelper from '../../../../utils/localsHelper'\nimport { components } from '../../../../types/api'\nimport { Services } from '../../../../types/Services'\nimport MissingReportService from '../../../../services/missingReport/missingReportService'\nimport { ReportingService } from '../../../../services'\n\nclass MissingReportFormController {\n  layoutPath: string\n\n  missingReportService: MissingReportService\n\n  reportingService: ReportingService\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.missingReportService = services.missingReportService\n    this.reportingService = services.reportingService\n  }\n\n  GET: RequestHandler = async (req, res, next) => {\n    const { token, csrfToken, definitionsPath, dprUser } = LocalsHelper.getValues(res)\n    const { reportId, variantId } = req.params\n\n    const reportDefinition: components['schemas']['SingleVariantReportDefinition'] =\n      await this.reportingService.getDefinition(\n        token,\n        reportId,\n        variantId,\n        definitionsPath ?? 'definitions/prisons/missing',\n      )\n\n    const { variant, name } = reportDefinition\n\n    try {\n      res.render(`dpr/routes/journeys/request-missing-report/form/view`, {\n        title: 'This report is not available',\n        report: {\n          reportId,\n          variantId,\n          reportName: name,\n          name: variant.name,\n          description: variant.description || reportDefinition.description,\n        },\n        user: dprUser,\n        csrfToken,\n        layoutPath: this.layoutPath,\n        postEndpoint: `/dpr/request-missing-report/${reportId}/${variantId}/form/submit`,\n      })\n    } catch (error) {\n      next()\n    }\n  }\n\n  POST: RequestHandler = async (req, res, _next) => {\n    const { body } = req\n    const { reportId, variantId, reportName, variantName, 'more-detail': requestDetails } = body\n\n    const { token } = LocalsHelper.getValues(res)\n\n    try {\n      const submission = this.missingReportService.submitMissingReportEntry(token, reportId, variantId, requestDetails)\n      if (submission) {\n        submission.then(\n          () => {\n            const queryParams = `reportName=${reportName}&name=${variantName}&reportId=${reportId}&variantId=${variantId}`\n            const redirect = `./submitted?${queryParams}`\n\n            res.redirect(redirect)\n          },\n          () => {\n            res.render(`dpr/components/serviceError/view`)\n          },\n        )\n      }\n    } catch (_error) {\n      res.render(`dpr/components/serviceError/view`)\n    }\n  }\n}\n\nexport { MissingReportFormController }\nexport default MissingReportFormController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,iCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,6CAMzB,MAAMH,CAA4B,CAOhC,YAAYI,EAAoBC,EAAoB,CAMpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,KAAM,CAAE,MAAAC,EAAO,UAAAC,EAAW,gBAAAC,EAAiB,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUN,CAAG,EAC3E,CAAE,SAAAO,EAAU,UAAAC,CAAU,EAAIT,EAAI,OAE9BU,EACJ,MAAM,KAAK,iBAAiB,cAC1BP,EACAK,EACAC,EACAJ,GAAmB,6BACrB,EAEI,CAAE,QAAAM,EAAS,KAAAC,CAAK,EAAIF,EAE1B,GAAI,CACFT,EAAI,OAAO,uDAAwD,CACjE,MAAO,+BACP,OAAQ,CACN,SAAAO,EACA,UAAAC,EACA,WAAYG,EACZ,KAAMD,EAAQ,KACd,YAAaA,EAAQ,aAAeD,EAAiB,WACvD,EACA,KAAMJ,EACN,UAAAF,EACA,WAAY,KAAK,WACjB,aAAc,+BAA+BI,CAAQ,IAAIC,CAAS,cACpE,CAAC,CACH,MAAgB,CACdP,EAAK,CACP,CACF,EAEA,UAAuB,MAAOF,EAAKC,EAAKY,IAAU,CAChD,KAAM,CAAE,KAAAC,CAAK,EAAId,EACX,CAAE,SAAAQ,EAAU,UAAAC,EAAW,WAAAM,EAAY,YAAAC,EAAa,cAAeC,CAAe,EAAIH,EAElF,CAAE,MAAAX,CAAM,EAAI,EAAAI,QAAa,UAAUN,CAAG,EAE5C,GAAI,CACF,MAAMiB,EAAa,KAAK,qBAAqB,yBAAyBf,EAAOK,EAAUC,EAAWQ,CAAc,EAC5GC,GACFA,EAAW,KACT,IAAM,CAEJ,MAAMC,EAAW,eADG,cAAcJ,CAAU,SAASC,CAAW,aAAaR,CAAQ,cAAcC,CAAS,EACjE,GAE3CR,EAAI,SAASkB,CAAQ,CACvB,EACA,IAAM,CACJlB,EAAI,OAAO,kCAAkC,CAC/C,CACF,CAEJ,MAAiB,CACfA,EAAI,OAAO,kCAAkC,CAC/C,CACF,EA/DE,KAAK,WAAaH,EAClB,KAAK,qBAAuBC,EAAS,qBACrC,KAAK,iBAAmBA,EAAS,gBACnC,CA6DF,CAGA,IAAOJ,EAAQD",
+  "names": ["controller_exports", "__export", "MissingReportFormController", "controller_default", "__toCommonJS", "import_localsHelper", "layoutPath", "services", "req", "res", "next", "token", "csrfToken", "definitionsPath", "dprUser", "LocalsHelper", "reportId", "variantId", "reportDefinition", "variant", "name", "_next", "body", "reportName", "variantName", "requestDetails", "submission", "redirect"]
 }

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

@@ -2,19 +2,19 @@ import { RequestHandler } from 'express'
 import LocalsHelper from '../../../../utils/localsHelper'
 import { components } from '../../../../types/api'
 import { Services } from '../../../../types/Services'
-import MissingReportClient from '../../../../services/missingReport/missingReportClient'
+import MissingReportService from '../../../../services/missingReport/missingReportService'
 import { ReportingService } from '../../../../services'
 
 class MissingReportFormController {
   layoutPath: string
 
-  missingReportClient: MissingReportClient
+  missingReportService: MissingReportService
 
   reportingService: ReportingService
 
   constructor(layoutPath: string, services: Services) {
     this.layoutPath = layoutPath
-    this.missingReportClient = services.missingReportClient
+    this.missingReportService = services.missingReportService
     this.reportingService = services.reportingService
   }
 
@@ -52,28 +52,30 @@ class MissingReportFormController {
     }
   }
 
-  POST: RequestHandler = async (req, res, next) => {
+  POST: RequestHandler = async (req, res, _next) => {
     const { body } = req
     const { reportId, variantId, reportName, variantName, 'more-detail': requestDetails } = body
 
     const { token } = LocalsHelper.getValues(res)
 
-    await this.missingReportClient
-      .submitMissingReportEntry(token, reportId, variantId, requestDetails)
-      .then(
-        () => {
-          const queryParams = `reportName=${reportName}&name=${variantName}&reportId=${reportId}&variantId=${variantId}`
-          const redirect = `./submitted?${queryParams}`
+    try {
+      const submission = this.missingReportService.submitMissingReportEntry(token, reportId, variantId, requestDetails)
+      if (submission) {
+        submission.then(
+          () => {
+            const queryParams = `reportName=${reportName}&name=${variantName}&reportId=${reportId}&variantId=${variantId}`
+            const redirect = `./submitted?${queryParams}`
 
-          res.redirect(redirect)
-        },
-        () => {
-          res.render(`dpr/components/serviceError/view`)
-        },
-      )
-      .catch(() => {
-        res.render(`dpr/components/serviceError/view`)
-      })
+            res.redirect(redirect)
+          },
+          () => {
+            res.render(`dpr/components/serviceError/view`)
+          },
+        )
+      }
+    } catch (_error) {
+      res.render(`dpr/components/serviceError/view`)
+    }
   }
 }