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

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

@@ -1,2 +1,2 @@
-var $=Object.create;var g=Object.defineProperty;var j=Object.getOwnPropertyDescriptor;var J=Object.getOwnPropertyNames;var L=Object.getPrototypeOf,_=Object.prototype.hasOwnProperty;var z=(e,t)=>{for(var r in t)g(e,r,{get:t[r],enumerable:!0})},T=(e,t,r,a)=>{if(t&&typeof t=="object"||typeof t=="function")for(let i of J(t))!_.call(e,i)&&i!==r&&g(e,i,{get:()=>t[i],enumerable:!(a=j(t,i))||a.enumerable});return e};var h=(e,t,r)=>(r=e!=null?$(L(e)):{},T(t||!e||!e.__esModule?g(r,"default",{value:e,enumerable:!0}):r,e)),G=e=>T(g({},"__esModule",{value:!0}),e);var te={};z(te,{cancelRequest:()=>C,default:()=>ee,getDefintionByType:()=>Q,getFiltersFromReqBody:()=>k,renderRequest:()=>N,request:()=>B,updateStore:()=>O});module.exports=G(te);var x=h(require("../../../../components/_async/async-filters-form/utils")),y=h(require("../../../../utils/localsHelper")),U=h(require("../../../../components/_filters/utils")),q=require("../../../../utils/reportStoreHelper"),P=h(require("../../../../utils/UserStoreItemBuilder")),m=require("../../../../types/UserReports"),b=h(require("../../../../utils/Personalisation/personalisationUtils")),V=require("../../../../components/_filters/filtersTypeEnum");const O=async({req:e,res:t,services:r,queryData:a,executionData:i,childExecutionData:o})=>{const{search:p,id:n,type:s}=e.body,{dprUser:c,definitionsPath:d,dpdPathFromQuery:l}=y.default.getValues(t);await(0,q.removeDuplicates)({storeService:r.requestedReportService,userId:c.id,id:n,search:p}),await(0,q.removeDuplicates)({storeService:r.recentlyViewedService,userId:c.id,id:n,search:p});const u=e.body,R={type:u.type,reportId:u.reportId,reportName:u.reportName,description:u.description,id:u.id,name:u.name};let f;switch(s){case m.ReportType.REPORT:f=new P.default(R,u).addExecutionData(i).addChildExecutionData(o).addFilters(a?.filterData).addSortData(a?.sortData).addDefinitionsPath(d,l).addRequestUrls(e).addQuery(a).addStatus(m.RequestStatus.SUBMITTED).addTimestamp().build();break;case m.ReportType.DASHBOARD:{f=new P.default(R,u).addExecutionData(i).addChildExecutionData(o).addFilters(a?.filterData).addDefinitionsPath(d,l).addRequestUrls(e).addQuery(a).addStatus(m.RequestStatus.SUBMITTED).addTimestamp().addMetrics(JSON.parse(e.body.sections)).build();break}default:break}await r.requestedReportService.addReport(c.id,f)};async function K(e,t,r,a,i,o){return Promise.all(e.map(p=>t.requestAsyncReport(r,a,p.id,{...i.query,dataProductDefinitionsPath:o}).then(n=>{const{executionId:s,tableId:c}=n;return{executionId:s,tableId:c,variantId:p.id}})))}const W=async({req:e,res:t,token:r,dashboardService:a,reportingService:i})=>{const{definitionsPath:o,dpdPathFromQuery:p}=y.default.getValues(t),{reportId:n,id:s,type:c}=e.body;let d,l,u,R,f,D=[];c===m.ReportType.REPORT&&(f=await i.getDefinition(r,n,s,o),d=f?f.variant.specification?.fields:[],l=x.default.setQueryFromFilters(e,d),{executionId:u,tableId:R}=await i.requestAsyncReport(r,n,s,{...l.query,dataProductDefinitionsPath:o}),D=f.variant.childVariants??[]),c===m.ReportType.DASHBOARD&&(f=await a.getDefinition(r,n,s,o),d=f?f.filterFields:[],l=x.default.setQueryFromFilters(e,d),{executionId:u,tableId:R}=await a.requestAsyncDashboard(r,n,s,{...l.query,dataProductDefinitionsPath:o}));const S=await K(D,i,r,n,l,o);return{executionData:{executionId:u,tableId:R,...p&&{dataProductDefinitionsPath:o}},childExecutionData:S,queryData:l}},X=async({token:e,reportId:t,definitionPath:r,services:a,definition:i})=>{const n=(await a.reportingService.getDefinitions(e,r)).find(u=>u.id===t).name,{name:s,description:c,sections:d,filterFields:l}=i;return{reportName:n,name:s,description:c,sections:d||[],fields:l}},Y=async e=>({definition:e,reportName:e.name,name:e.variant.name,description:e.variant.description||e.description,template:e.variant.specification,fields:e?.variant?.specification?.fields,interactive:e?.variant?.interactive}),Q=async(e,t,r,a)=>{const{token:i,definitionsPath:o}=y.default.getValues(t),{reportId:p,id:n,variantId:s,type:c}=e.params;return await(c===m.ReportType.REPORT?a.reportingService:a.dashboardService).getDefinition(i,p,s||n,o)},Z=async(e,t,r,a,i,o)=>{const{reportId:p,id:n}=e.params;let s=await x.default.renderFilters(r,a);s.filters=b.default.setUserContextDefaults(t,s.filters);const c=await i.defaultFilterValuesService.get(o,p,n,V.FiltersType.REQUEST);return c&&(s=b.default.setFilterValuesFromSavedDefaults(s.filters,s.sortBy,c)),s.filters=U.default.setFilterValuesFromRequest(s.filters,e),{filtersData:s,defaultFilterValues:c}},B=async({req:e,res:t,services:r})=>{const{token:a}=y.default.getValues(t),i={req:e,res:t,token:a},{executionData:o,queryData:p,childExecutionData:n}=await W({...i,dashboardService:r.dashboardService,reportingService:r.reportingService});return o&&await O({req:e,res:t,services:r,queryData:p,executionData:o,childExecutionData:n}),o},C=async({req:e,res:t,services:r})=>{const{token:a,dprUser:i,definitionsPath:o}=y.default.getValues(t),{reportId:p,id:n,executionId:s,type:c}=e.params;let d;c===m.ReportType.REPORT&&(d=r.reportingService),c===m.ReportType.DASHBOARD&&(d=r.dashboardService);const l=await d.cancelAsyncRequest(a,p,n,s,o);l&&l.cancellationSucceeded&&await r.requestedReportService.updateStatus(s,i.id,m.RequestStatus.ABORTED)},N=async({req:e,res:t,services:r,next:a})=>{try{const{token:i,csrfToken:o,definitionsPath:p,dpdPathFromQuery:n,dprUser:s}=y.default.getValues(t),{reportId:c,type:d,id:l}=e.params,{definition:u}=t.locals,R=e.query.defaultsSaved,f={token:i,reportId:c,definitionPath:p,services:r};let D,S,v,H,F,A,E,w,I;d===m.ReportType.REPORT&&({name:D,reportName:S,description:v,fields:F,interactive:E}=await Y(u)),d===m.ReportType.DASHBOARD&&({name:D,reportName:S,description:v,sections:A,fields:F}=await X({...f,definition:u})),F&&({filtersData:w,defaultFilterValues:I}=await Z(e,t,F,E,r,s.id));const M={reportName:S,name:D,description:v,reportId:c,id:l,...n&&{definitionPath:p},csrfToken:o,template:H,sections:A,hasDefaults:I?.length>0,defaultsSaved:R,type:d};return{title:`Request ${d}`,filtersDescription:`Customise your ${d} using the filters below and submit your request.`,filtersData:w,reportData:M}}catch(i){return a(i),!1}},k=e=>Object.keys(e.body).filter(t=>t.includes("filters.")).filter(t=>!!e.body[t]).map(t=>({name:t,value:e.body[t]}));var ee={request:B,cancelRequest:C,renderRequest:N,getFiltersFromReqBody:k,getDefintionByType:Q};0&&(module.exports={cancelRequest,getDefintionByType,getFiltersFromReqBody,renderRequest,request,updateStore});
+"use strict";var $=Object.create;var g=Object.defineProperty;var j=Object.getOwnPropertyDescriptor;var J=Object.getOwnPropertyNames;var L=Object.getPrototypeOf,z=Object.prototype.hasOwnProperty;var G=(e,t)=>{for(var i in t)g(e,i,{get:t[i],enumerable:!0})},T=(e,t,i,s)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of J(t))!z.call(e,r)&&r!==i&&g(e,r,{get:()=>t[r],enumerable:!(s=j(t,r))||s.enumerable});return e};var h=(e,t,i)=>(i=e!=null?$(L(e)):{},T(t||!e||!e.__esModule?g(i,"default",{value:e,enumerable:!0}):i,e)),K=e=>T(g({},"__esModule",{value:!0}),e);var ie={};G(ie,{cancelRequest:()=>N,default:()=>te,getDefintionByType:()=>Q,getFiltersFromReqBody:()=>H,renderRequest:()=>k,request:()=>B,updateStore:()=>O});module.exports=K(ie);var x=h(require("../../../../components/_async/async-filters-form/utils")),D=h(require("../../../../utils/localsHelper")),U=h(require("../../../../components/_filters/utils")),q=require("../../../../utils/reportStoreHelper"),E=h(require("../../../../utils/UserStoreItemBuilder")),f=require("../../../../types/UserReports"),P=h(require("../../../../utils/Personalisation/personalisationUtils")),C=require("../../../../components/_filters/filtersTypeEnum");const O=async({req:e,res:t,services:i,queryData:s,executionData:r,childExecutionData:o})=>{const{search:l,id:c,type:a}=e.body,{dprUser:n,definitionsPath:d,dpdPathFromQuery:u}=D.default.getValues(t);await(0,q.removeDuplicates)({storeService:i.requestedReportService,userId:n.id,id:c,search:l}),await(0,q.removeDuplicates)({storeService:i.recentlyViewedService,userId:n.id,id:c,search:l});const p=e.body,R={type:p.type,reportId:p.reportId,reportName:p.reportName,description:p.description,id:p.id,name:p.name};let m;switch(a){case f.ReportType.REPORT:m=new E.default(R,p).addExecutionData(r).addChildExecutionData(o).addFilters(s?.filterData).addSortData(s?.sortData).addDefinitionsPath(d,u).addRequestUrls(e).addQuery(s).addStatus(f.RequestStatus.SUBMITTED).addTimestamp().build();break;case f.ReportType.DASHBOARD:{m=new E.default(R,p).addExecutionData(r).addChildExecutionData(o).addFilters(s?.filterData).addDefinitionsPath(d,u).addRequestUrls(e).addQuery(s).addStatus(f.RequestStatus.SUBMITTED).addTimestamp().addMetrics(JSON.parse(e.body.sections)).build();break}default:break}m&&await i.requestedReportService.addReport(n.id,m)};async function W(e,t,i,s,r,o){return Promise.all(e.map(l=>t.requestAsyncReport(i,s,l.id,{...r&&{queryData:r.query},...o&&{dataProductDefinitionsPath:o}}).then(c=>{const{executionId:a,tableId:n}=c;if(!a||!n)throw new Error("requestChildReports: No execution of tableId in response");return{executionId:a,tableId:n,variantId:l.id}})))}const X=async({req:e,res:t,token:i,dashboardService:s,reportingService:r})=>{const{definitionsPath:o,dpdPathFromQuery:l}=D.default.getValues(t),{reportId:c,id:a,type:n}=e.body;let d,u,p,R,m,y=[];n===f.ReportType.REPORT&&(m=await r.getDefinition(i,c,a,o),d=m?.variant.specification?.fields||[],u=x.default.setQueryFromFilters(e,d),{executionId:p,tableId:R}=await r.requestAsyncReport(i,c,a,{...u.query,dataProductDefinitionsPath:o}),y=m.variant.childVariants??[]),n===f.ReportType.DASHBOARD&&(m=await s.getDefinition(i,c,a,o),d=m?.filterFields||[],u=x.default.setQueryFromFilters(e,d),{executionId:p,tableId:R}=await s.requestAsyncDashboard(i,c,a,{...u.query,dataProductDefinitionsPath:o}));const S=await W(y,r,i,c,u,o);return{executionData:{executionId:p,tableId:R,...l&&{dataProductDefinitionsPath:o}},childExecutionData:S,queryData:u}},Y=async({token:e,reportId:t,definitionPath:i,services:s,definition:r})=>{const c=(await s.reportingService.getDefinitions(e,i)).find(p=>p.id===t)?.name,{name:a,description:n,sections:d,filterFields:u}=r;return{reportName:c,name:a,description:n,sections:d||[],fields:u||[]}},Z=async e=>({definition:e,reportName:e.name,name:e.variant.name,description:e.variant.description||e.description,template:e.variant.specification,fields:e?.variant?.specification?.fields||[],interactive:e?.variant?.interactive}),Q=async(e,t,i,s)=>{const{token:r,definitionsPath:o}=D.default.getValues(t),{reportId:l,id:c,variantId:a,type:n}=e.params;return await(n===f.ReportType.REPORT?s.reportingService:s.dashboardService).getDefinition(r,l,a||c,o)},ee=async(e,t,i,s,r,o)=>{const{reportId:l,id:c}=e.params;let a=await x.default.renderFilters(i,s);a.filters=P.default.setUserContextDefaults(t,a.filters);let n;return t.locals.saveDefaultsEnabled&&(n=await r.defaultFilterValuesService.get(o,l,c,C.FiltersType.REQUEST)),n&&(a=P.default.setFilterValuesFromSavedDefaults(a.filters,a.sortBy||[],n)),a.filters=U.default.setFilterValuesFromRequest(a.filters,e),{filtersData:a,defaultFilterValues:n}},B=async({req:e,res:t,services:i})=>{const{token:s}=D.default.getValues(t),r={req:e,res:t,token:s},{executionData:o,queryData:l,childExecutionData:c}=await X({...r,dashboardService:i.dashboardService,reportingService:i.reportingService});return o&&await O({req:e,res:t,services:i,queryData:l,executionData:o,childExecutionData:c}),o},N=async({req:e,res:t,services:i})=>{const{token:s,dprUser:r,definitionsPath:o}=D.default.getValues(t),{reportId:l,id:c,executionId:a,type:n}=e.params;let d=i.reportingService;n===f.ReportType.REPORT&&(d=i.reportingService),n===f.ReportType.DASHBOARD&&(d=i.dashboardService);const u=await d.cancelAsyncRequest(s,l,c,a,o);u&&u.cancellationSucceeded&&await i.requestedReportService.updateStatus(a,r.id,f.RequestStatus.ABORTED)},k=async({req:e,res:t,services:i,next:s})=>{try{const{token:r,csrfToken:o,definitionsPath:l,dpdPathFromQuery:c,dprUser:a}=D.default.getValues(t),{reportId:n,type:d,id:u}=e.params,{definition:p}=t.locals,R=e.query.defaultsSaved,m={token:r,reportId:n,definitionPath:l,services:i};let y,S,v,M,F=[],w,A,I,b=[];if(d===f.ReportType.REPORT&&({name:y,reportName:S,description:v,fields:F,interactive:A}=await Z(p)),d===f.ReportType.DASHBOARD&&({name:y,reportName:S,description:v,sections:w,fields:F}=await Y({...m,definition:p})),F){const V=await ee(e,t,F,A||!1,i,a.id);b=V.defaultFilterValues||b,I=V.filtersData}const _={reportName:S,name:y,description:v,reportId:n,id:u,...c&&{definitionPath:l},csrfToken:o,template:M,sections:w,hasDefaults:b?.length>0,defaultsSaved:R,type:d,saveDefaultsEnabled:t.locals.saveDefaultsEnabled};return{title:`Request ${d}`,filtersDescription:`Customise your ${d} using the filters below and submit your request.`,filtersData:I,reportData:_}}catch(r){return s(r),!1}},H=e=>Object.keys(e.body).filter(t=>t.includes("filters.")).filter(t=>!!e.body[t]).map(t=>({name:t,value:e.body[t]}));var te={request:B,cancelRequest:N,renderRequest:k,getFiltersFromReqBody:H,getDefintionByType:Q};0&&(module.exports={cancelRequest,getDefintionByType,getFiltersFromReqBody,renderRequest,request,updateStore});
 //# sourceMappingURL=utils.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/request-report/filters/utils.ts"],
-  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Request, Response, NextFunction } from 'express'\n\n// Utils\nimport FiltersFormUtils from '../../../../components/_async/async-filters-form/utils'\nimport LocalsHelper from '../../../../utils/localsHelper'\nimport FiltersUtils from '../../../../components/_filters/utils'\nimport { removeDuplicates } from '../../../../utils/reportStoreHelper'\nimport UserStoreItemBuilder from '../../../../utils/UserStoreItemBuilder'\n\n// Types\nimport type ReportingService from '../../../../services/reportingService'\nimport { ReportType, RequestFormData, RequestStatus } from '../../../../types/UserReports'\nimport type { ExecutionData, ChildReportExecutionData } from '../../../../types/ExecutionData'\nimport type { AsyncReportUtilsParams, RequestDataResult, RequestReportData } from '../../../../types/AsyncReportUtils'\nimport type {\n  RenderFiltersReturnValue,\n  SetQueryFromFiltersResult,\n} from '../../../../components/_async/async-filters-form/types'\nimport type { components } from '../../../../types/api'\nimport type { Services } from '../../../../types/Services'\nimport type DashboardService from '../../../../services/dashboardService'\nimport PersonalistionUtils from '../../../../utils/Personalisation/personalisationUtils'\nimport { FiltersType } from '../../../../components/_filters/filtersTypeEnum'\n\n/**\n * Updates the store with the request details\n *\n * @param {Request} req\n * @param {Response} res\n * @param {Services} services\n * @param {SetQueryFromFiltersResult} querySummaryData\n * @param {string} executionData\n * @return {*}  {Promise<string>}\n */\nexport const updateStore = async ({\n  req,\n  res,\n  services,\n  queryData,\n  executionData,\n  childExecutionData,\n}: {\n  req: Request\n  res: Response\n  services: Services\n  queryData?: SetQueryFromFiltersResult\n  executionData: ExecutionData\n  childExecutionData: Array<ChildReportExecutionData>\n}): Promise<void> => {\n  const { search, id, type } = req.body\n  const { dprUser, definitionsPath, dpdPathFromQuery } = LocalsHelper.getValues(res)\n\n  await removeDuplicates({ storeService: services.requestedReportService, userId: dprUser.id, id, search })\n  await removeDuplicates({ storeService: services.recentlyViewedService, userId: dprUser.id, id, search })\n\n  const requestFormData: RequestFormData = req.body\n  const reportData = {\n    type: requestFormData.type as ReportType,\n    reportId: requestFormData.reportId,\n    reportName: requestFormData.reportName,\n    description: requestFormData.description,\n    id: requestFormData.id,\n    name: requestFormData.name,\n  }\n\n  let requestedReportData\n  switch (type) {\n    case ReportType.REPORT:\n      requestedReportData = new UserStoreItemBuilder(reportData, requestFormData)\n        .addExecutionData(executionData)\n        .addChildExecutionData(childExecutionData)\n        .addFilters(queryData?.filterData)\n        .addSortData(queryData?.sortData)\n        .addDefinitionsPath(definitionsPath, dpdPathFromQuery)\n        .addRequestUrls(req)\n        .addQuery(queryData)\n        .addStatus(RequestStatus.SUBMITTED)\n        .addTimestamp()\n        .build()\n      break\n    case ReportType.DASHBOARD: {\n      requestedReportData = new UserStoreItemBuilder(reportData, requestFormData)\n        .addExecutionData(executionData)\n        .addChildExecutionData(childExecutionData)\n        .addFilters(queryData?.filterData)\n        .addDefinitionsPath(definitionsPath, dpdPathFromQuery)\n        .addRequestUrls(req)\n        .addQuery(queryData)\n        .addStatus(RequestStatus.SUBMITTED)\n        .addTimestamp()\n        .addMetrics(JSON.parse(req.body.sections))\n        .build()\n      break\n    }\n    default:\n      break\n  }\n\n  await services.requestedReportService.addReport(dprUser.id, requestedReportData)\n}\n\nasync function requestChildReports(\n  childVariants: Array<components['schemas']['ChildVariantDefinition']>,\n  reportingService: ReportingService,\n  token: string,\n  reportId: string,\n  queryData: SetQueryFromFiltersResult,\n  dataProductDefinitionsPath: string,\n): Promise<Array<ChildReportExecutionData>> {\n  return Promise.all(\n    childVariants.map((childVariant) =>\n      reportingService\n        .requestAsyncReport(token, reportId, childVariant.id, {\n          ...queryData.query,\n          dataProductDefinitionsPath,\n        })\n        .then((response) => {\n          const { executionId, tableId } = response\n          return { executionId, tableId, variantId: childVariant.id }\n        }),\n    ),\n  )\n}\n\nconst requestProduct = async ({\n  req,\n  res,\n  token,\n  dashboardService,\n  reportingService,\n}: {\n  req: Request\n  res: Response\n  token: string\n  dashboardService: DashboardService\n  reportingService: ReportingService\n}): Promise<{\n  executionData: ExecutionData\n  childExecutionData: Array<ChildReportExecutionData>\n  queryData: SetQueryFromFiltersResult\n}> => {\n  const { definitionsPath: dataProductDefinitionsPath, dpdPathFromQuery } = LocalsHelper.getValues(res)\n  const { reportId, id, type } = req.body\n\n  let fields\n  let queryData\n  let executionId\n  let tableId\n  let definition\n  let childVariants: components['schemas']['ChildVariantDefinition'][] = []\n\n  if (type === ReportType.REPORT) {\n    definition = await reportingService.getDefinition(token, reportId, id, dataProductDefinitionsPath)\n\n    fields = definition ? definition.variant.specification?.fields : []\n    queryData = FiltersFormUtils.setQueryFromFilters(req, fields)\n    ;({ executionId, tableId } = await reportingService.requestAsyncReport(token, reportId, id, {\n      ...queryData.query,\n      dataProductDefinitionsPath,\n    }))\n    childVariants = definition.variant.childVariants ?? []\n  }\n\n  if (type === ReportType.DASHBOARD) {\n    definition = await dashboardService.getDefinition(token, reportId, id, dataProductDefinitionsPath)\n\n    fields = definition ? definition.filterFields : []\n    queryData = FiltersFormUtils.setQueryFromFilters(req, fields)\n    ;({ executionId, tableId } = await dashboardService.requestAsyncDashboard(token, reportId, id, {\n      ...queryData.query,\n      dataProductDefinitionsPath,\n    }))\n  }\n\n  const childExecutionData = await requestChildReports(\n    childVariants,\n    reportingService,\n    token,\n    reportId,\n    queryData,\n    dataProductDefinitionsPath,\n  )\n\n  const executionData = {\n    executionId,\n    tableId,\n    ...(dpdPathFromQuery && { dataProductDefinitionsPath }),\n  }\n\n  return {\n    executionData,\n    childExecutionData,\n    queryData,\n  }\n}\n\nconst renderDashboardRequestData = async ({\n  token,\n  reportId,\n  definitionPath,\n  services,\n  definition,\n}: {\n  token: string\n  reportId: string\n  definitionPath: string\n  services: Services\n  definition: components['schemas']['DashboardDefinition']\n}) => {\n  const productDefinitions = await services.reportingService.getDefinitions(token, definitionPath)\n  const productDefinition = productDefinitions.find(\n    (def: components['schemas']['ReportDefinitionSummary']) => def.id === reportId,\n  )\n  const reportName = productDefinition.name\n  const { name, description, sections, filterFields: fields } = definition\n\n  return {\n    reportName,\n    name,\n    description,\n    sections: sections || [],\n    fields,\n  }\n}\n\nconst renderReportRequestData = async (definition: components['schemas']['SingleVariantReportDefinition']) => {\n  return {\n    definition,\n    reportName: definition.name,\n    name: definition.variant.name,\n    description: definition.variant.description || definition.description,\n    template: definition.variant.specification,\n    fields: definition?.variant?.specification?.fields,\n    interactive: definition?.variant?.interactive,\n  }\n}\n\nexport const getDefintionByType = async (req: Request, res: Response, next: NextFunction, services: Services) => {\n  const { token, definitionsPath } = LocalsHelper.getValues(res)\n  const { reportId, id, variantId, type } = req.params\n\n  const service = type === ReportType.REPORT ? services.reportingService : services.dashboardService\n  const definition = await service.getDefinition(token, reportId, variantId || id, definitionsPath)\n\n  return definition\n}\n\nconst getFilterData = async (\n  req: Request,\n  res: Response,\n  fields: components['schemas']['FieldDefinition'][],\n  interactive: boolean,\n  services: Services,\n  userId: string,\n) => {\n  const { reportId, id } = req.params\n\n  let filtersData = <RenderFiltersReturnValue>await FiltersFormUtils.renderFilters(fields, interactive)\n  filtersData.filters = PersonalistionUtils.setUserContextDefaults(res, filtersData.filters)\n\n  const defaultFilterValues = await services.defaultFilterValuesService.get(userId, reportId, id, FiltersType.REQUEST)\n  if (defaultFilterValues) {\n    filtersData = PersonalistionUtils.setFilterValuesFromSavedDefaults(\n      filtersData.filters,\n      filtersData.sortBy,\n      defaultFilterValues,\n    )\n  }\n\n  filtersData.filters = FiltersUtils.setFilterValuesFromRequest(filtersData.filters, req)\n\n  return { filtersData, defaultFilterValues }\n}\n\n/**\n * Sends the request for the async report\n *\n * @param {AsyncReportUtilsParams} { req, res, services }\n * @return {*}\n */\nexport const request = async ({ req, res, services }: AsyncReportUtilsParams) => {\n  const { token } = LocalsHelper.getValues(res)\n  const requestArgs = { req, res, token }\n\n  const { executionData, queryData, childExecutionData } = await requestProduct({\n    ...requestArgs,\n    dashboardService: services.dashboardService,\n    reportingService: services.reportingService,\n  })\n\n  if (executionData) {\n    await updateStore({\n      req,\n      res,\n      services,\n      queryData,\n      executionData,\n      childExecutionData,\n    })\n  }\n\n  return executionData\n}\n\nexport const cancelRequest = async ({ req, res, services }: AsyncReportUtilsParams) => {\n  const { token, dprUser, definitionsPath } = LocalsHelper.getValues(res)\n  const { reportId, id, executionId, type } = req.params\n\n  let service\n  if (type === ReportType.REPORT) service = services.reportingService\n  if (type === ReportType.DASHBOARD) service = services.dashboardService\n\n  const response = await service.cancelAsyncRequest(token, reportId, id, executionId, definitionsPath)\n\n  if (response && response.cancellationSucceeded) {\n    await services.requestedReportService.updateStatus(executionId, dprUser.id, RequestStatus.ABORTED)\n  }\n}\n\n/**\n * Returns the data required for rendering the async filters component\n *\n * @param {AsyncReportUtilsParams} { req, res, dataSources }\n * @return {*}\n */\nexport const renderRequest = async ({\n  req,\n  res,\n  services,\n  next,\n}: AsyncReportUtilsParams): Promise<RequestDataResult | boolean> => {\n  try {\n    const { token, csrfToken, definitionsPath: definitionPath, dpdPathFromQuery, dprUser } = LocalsHelper.getValues(res)\n    const { reportId, type, id } = req.params\n    const { definition } = res.locals\n    const defaultsSaved = <string>req.query.defaultsSaved\n\n    const definitionApiArgs = { token, reportId, definitionPath, services }\n\n    let name\n    let reportName\n    let description\n    let template\n    let fields: components['schemas']['FieldDefinition'][]\n    let sections\n    let interactive\n    let filtersData\n    let defaultFilterValues\n\n    if (type === ReportType.REPORT) {\n      ;({ name, reportName, description, fields, interactive } = await renderReportRequestData(definition))\n    }\n\n    if (type === ReportType.DASHBOARD) {\n      ;({ name, reportName, description, sections, fields } = await renderDashboardRequestData({\n        ...definitionApiArgs,\n        definition,\n      }))\n    }\n\n    if (fields) {\n      ;({ filtersData, defaultFilterValues } = await getFilterData(req, res, fields, interactive, services, dprUser.id))\n    }\n\n    const reportData: RequestReportData = {\n      reportName,\n      name,\n      description,\n      reportId,\n      id,\n      ...(dpdPathFromQuery && { definitionPath }),\n      csrfToken,\n      template,\n      sections,\n      hasDefaults: defaultFilterValues?.length > 0,\n      defaultsSaved,\n      type: type as ReportType,\n    }\n\n    return {\n      title: `Request ${type}`,\n      filtersDescription: `Customise your ${type} using the filters below and submit your request.`,\n      filtersData,\n      reportData,\n    }\n  } catch (error) {\n    next(error)\n    return false\n  }\n}\n\nexport const getFiltersFromReqBody = (req: Request) => {\n  return Object.keys(req.body)\n    .filter((attr) => attr.includes('filters.'))\n    .filter((attr) => !!req.body[attr])\n    .map((attr) => {\n      return { name: attr, value: req.body[attr] }\n    })\n}\n\nexport default {\n  request,\n  cancelRequest,\n  renderRequest,\n  getFiltersFromReqBody,\n  getDefintionByType,\n}\n"],
-  "mappings": "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",
-  "names": ["utils_exports", "__export", "cancelRequest", "utils_default", "getDefintionByType", "getFiltersFromReqBody", "renderRequest", "request", "updateStore", "__toCommonJS", "import_utils", "import_localsHelper", "import_reportStoreHelper", "import_UserStoreItemBuilder", "import_UserReports", "import_personalisationUtils", "import_filtersTypeEnum", "req", "res", "services", "queryData", "executionData", "childExecutionData", "search", "id", "type", "dprUser", "definitionsPath", "dpdPathFromQuery", "LocalsHelper", "requestFormData", "reportData", "requestedReportData", "UserStoreItemBuilder", "requestChildReports", "childVariants", "reportingService", "token", "reportId", "dataProductDefinitionsPath", "childVariant", "response", "executionId", "tableId", "requestProduct", "dashboardService", "fields", "definition", "FiltersFormUtils", "renderDashboardRequestData", "definitionPath", "reportName", "def", "name", "description", "sections", "renderReportRequestData", "next", "variantId", "getFilterData", "interactive", "userId", "filtersData", "PersonalistionUtils", "defaultFilterValues", "FiltersUtils", "requestArgs", "service", "csrfToken", "defaultsSaved", "definitionApiArgs", "template", "error", "attr"]
+  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Request, Response, NextFunction } from 'express'\n\n// Utils\nimport { defaultFilterValue } from '../../../../utils/Personalisation/types'\nimport FiltersFormUtils from '../../../../components/_async/async-filters-form/utils'\nimport LocalsHelper from '../../../../utils/localsHelper'\nimport FiltersUtils from '../../../../components/_filters/utils'\nimport { removeDuplicates } from '../../../../utils/reportStoreHelper'\nimport UserStoreItemBuilder from '../../../../utils/UserStoreItemBuilder'\n\n// Types\nimport type ReportingService from '../../../../services/reportingService'\nimport { ReportType, RequestFormData, RequestStatus } from '../../../../types/UserReports'\nimport type { ExecutionData, ChildReportExecutionData } from '../../../../types/ExecutionData'\nimport type { AsyncReportUtilsParams, RequestDataResult, RequestReportData } from '../../../../types/AsyncReportUtils'\nimport type {\n  RenderFiltersReturnValue,\n  SetQueryFromFiltersResult,\n} from '../../../../components/_async/async-filters-form/types'\nimport type { components } from '../../../../types/api'\nimport type { Services } from '../../../../types/Services'\nimport type DashboardService from '../../../../services/dashboardService'\nimport PersonalistionUtils from '../../../../utils/Personalisation/personalisationUtils'\nimport { FiltersType } from '../../../../components/_filters/filtersTypeEnum'\n\n/**\n * Updates the store with the request details\n *\n * @param {Request} req\n * @param {Response} res\n * @param {Services} services\n * @param {SetQueryFromFiltersResult} querySummaryData\n * @param {string} executionData\n * @return {*}  {Promise<string>}\n */\nexport const updateStore = async ({\n  req,\n  res,\n  services,\n  queryData,\n  executionData,\n  childExecutionData,\n}: {\n  req: Request\n  res: Response\n  services: Services\n  queryData?: SetQueryFromFiltersResult | undefined\n  executionData: ExecutionData\n  childExecutionData: Array<ChildReportExecutionData>\n}): Promise<void> => {\n  const { search, id, type } = req.body\n  const { dprUser, definitionsPath, dpdPathFromQuery } = LocalsHelper.getValues(res)\n\n  await removeDuplicates({ storeService: services.requestedReportService, userId: dprUser.id, id, search })\n  await removeDuplicates({ storeService: services.recentlyViewedService, userId: dprUser.id, id, search })\n\n  const requestFormData: RequestFormData = req.body\n  const reportData = {\n    type: requestFormData.type as ReportType,\n    reportId: requestFormData.reportId,\n    reportName: requestFormData.reportName,\n    description: requestFormData.description,\n    id: requestFormData.id,\n    name: requestFormData.name,\n  }\n\n  let requestedReportData\n  switch (type) {\n    case ReportType.REPORT:\n      requestedReportData = new UserStoreItemBuilder(reportData, requestFormData)\n        .addExecutionData(executionData)\n        .addChildExecutionData(childExecutionData)\n        .addFilters(queryData?.filterData)\n        .addSortData(queryData?.sortData)\n        .addDefinitionsPath(definitionsPath, dpdPathFromQuery)\n        .addRequestUrls(req)\n        .addQuery(queryData)\n        .addStatus(RequestStatus.SUBMITTED)\n        .addTimestamp()\n        .build()\n      break\n    case ReportType.DASHBOARD: {\n      requestedReportData = new UserStoreItemBuilder(reportData, requestFormData)\n        .addExecutionData(executionData)\n        .addChildExecutionData(childExecutionData)\n        .addFilters(queryData?.filterData)\n        .addDefinitionsPath(definitionsPath, dpdPathFromQuery)\n        .addRequestUrls(req)\n        .addQuery(queryData)\n        .addStatus(RequestStatus.SUBMITTED)\n        .addTimestamp()\n        .addMetrics(JSON.parse(req.body.sections))\n        .build()\n      break\n    }\n    default:\n      break\n  }\n\n  if (requestedReportData) await services.requestedReportService.addReport(dprUser.id, requestedReportData)\n}\n\nasync function requestChildReports(\n  childVariants: Array<components['schemas']['ChildVariantDefinition']>,\n  reportingService: ReportingService,\n  token: string,\n  reportId: string,\n  queryData?: SetQueryFromFiltersResult,\n  dataProductDefinitionsPath?: string,\n): Promise<Array<ChildReportExecutionData>> {\n  return Promise.all(\n    childVariants.map((childVariant) =>\n      reportingService\n        .requestAsyncReport(token, reportId, childVariant.id, {\n          ...(queryData && { queryData: queryData.query }),\n          ...(dataProductDefinitionsPath && { dataProductDefinitionsPath }),\n        })\n        .then((response) => {\n          const { executionId, tableId } = response\n          if (!executionId || !tableId) {\n            throw new Error('requestChildReports: No execution of tableId in response')\n          }\n          return { executionId, tableId, variantId: childVariant.id }\n        }),\n    ),\n  )\n}\n\nconst requestProduct = async ({\n  req,\n  res,\n  token,\n  dashboardService,\n  reportingService,\n}: {\n  req: Request\n  res: Response\n  token: string\n  dashboardService: DashboardService\n  reportingService: ReportingService\n}): Promise<{\n  executionData: ExecutionData\n  childExecutionData: Array<ChildReportExecutionData>\n  queryData?: SetQueryFromFiltersResult | undefined\n}> => {\n  const { definitionsPath: dataProductDefinitionsPath, dpdPathFromQuery } = LocalsHelper.getValues(res)\n  const { reportId, id, type } = req.body\n\n  let fields: components['schemas']['FieldDefinition'][]\n  let queryData\n  let executionId\n  let tableId\n  let definition\n  let childVariants: components['schemas']['ChildVariantDefinition'][] = []\n\n  if (type === ReportType.REPORT) {\n    definition = await reportingService.getDefinition(token, reportId, id, dataProductDefinitionsPath)\n\n    fields = definition?.variant.specification?.fields || []\n    queryData = FiltersFormUtils.setQueryFromFilters(req, fields)\n    ;({ executionId, tableId } = await reportingService.requestAsyncReport(token, reportId, id, {\n      ...queryData.query,\n      dataProductDefinitionsPath,\n    }))\n    childVariants = definition.variant.childVariants ?? []\n  }\n\n  if (type === ReportType.DASHBOARD) {\n    definition = await dashboardService.getDefinition(token, reportId, id, dataProductDefinitionsPath)\n\n    fields = definition?.filterFields || []\n    queryData = FiltersFormUtils.setQueryFromFilters(req, fields)\n    ;({ executionId, tableId } = await dashboardService.requestAsyncDashboard(token, reportId, id, {\n      ...queryData.query,\n      dataProductDefinitionsPath,\n    }))\n  }\n\n  const childExecutionData = await requestChildReports(\n    childVariants,\n    reportingService,\n    token,\n    reportId,\n    queryData,\n    dataProductDefinitionsPath,\n  )\n\n  const executionData = {\n    executionId,\n    tableId,\n    ...(dpdPathFromQuery && { dataProductDefinitionsPath }),\n  }\n\n  return {\n    executionData,\n    childExecutionData,\n    queryData,\n  }\n}\n\nconst renderDashboardRequestData = async ({\n  token,\n  reportId,\n  definitionPath,\n  services,\n  definition,\n}: {\n  token: string\n  reportId: string\n  definitionPath: string\n  services: Services\n  definition: components['schemas']['DashboardDefinition']\n}) => {\n  const productDefinitions = await services.reportingService.getDefinitions(token, definitionPath)\n  const productDefinition = productDefinitions.find(\n    (def: components['schemas']['ReportDefinitionSummary']) => def.id === reportId,\n  )\n  const reportName = productDefinition?.name\n  const { name, description, sections, filterFields: fields } = definition\n\n  return {\n    reportName,\n    name,\n    description,\n    sections: sections || [],\n    fields: fields || [],\n  }\n}\n\nconst renderReportRequestData = async (definition: components['schemas']['SingleVariantReportDefinition']) => {\n  return {\n    definition,\n    reportName: definition.name,\n    name: definition.variant.name,\n    description: definition.variant.description || definition.description,\n    template: definition.variant.specification,\n    fields: definition?.variant?.specification?.fields || [],\n    interactive: definition?.variant?.interactive,\n  }\n}\n\nexport const getDefintionByType = async (req: Request, res: Response, _next: NextFunction, services: Services) => {\n  const { token, definitionsPath } = LocalsHelper.getValues(res)\n  const { reportId, id, variantId, type } = req.params\n\n  const service = type === ReportType.REPORT ? services.reportingService : services.dashboardService\n  const definition = await service.getDefinition(token, reportId, variantId || id, definitionsPath)\n\n  return definition\n}\n\nconst getFilterData = async (\n  req: Request,\n  res: Response,\n  fields: components['schemas']['FieldDefinition'][],\n  interactive: boolean,\n  services: Services,\n  userId: string,\n) => {\n  const { reportId, id } = req.params\n\n  let filtersData = <RenderFiltersReturnValue>await FiltersFormUtils.renderFilters(fields, interactive)\n  filtersData.filters = PersonalistionUtils.setUserContextDefaults(res, filtersData.filters)\n\n  let defaultFilterValues\n  if (res.locals['saveDefaultsEnabled']) {\n    defaultFilterValues = await services.defaultFilterValuesService.get(userId, reportId, id, FiltersType.REQUEST)\n  }\n  if (defaultFilterValues) {\n    filtersData = PersonalistionUtils.setFilterValuesFromSavedDefaults(\n      filtersData.filters,\n      filtersData.sortBy || [],\n      defaultFilterValues,\n    )\n  }\n\n  filtersData.filters = FiltersUtils.setFilterValuesFromRequest(filtersData.filters, req)\n\n  return { filtersData, defaultFilterValues }\n}\n\n/**\n * Sends the request for the async report\n *\n * @param {AsyncReportUtilsParams} { req, res, services }\n * @return {*}\n */\nexport const request = async ({ req, res, services }: AsyncReportUtilsParams) => {\n  const { token } = LocalsHelper.getValues(res)\n  const requestArgs = { req, res, token }\n\n  const { executionData, queryData, childExecutionData } = await requestProduct({\n    ...requestArgs,\n    dashboardService: services.dashboardService,\n    reportingService: services.reportingService,\n  })\n\n  if (executionData) {\n    await updateStore({\n      req,\n      res,\n      services,\n      queryData,\n      executionData,\n      childExecutionData,\n    })\n  }\n\n  return executionData\n}\n\nexport const cancelRequest = async ({ req, res, services }: AsyncReportUtilsParams) => {\n  const { token, dprUser, definitionsPath } = LocalsHelper.getValues(res)\n  const { reportId, id, executionId, type } = req.params\n\n  let service: ReportingService | DashboardService = services.reportingService\n  if (type === ReportType.REPORT) service = services.reportingService\n  if (type === ReportType.DASHBOARD) service = services.dashboardService\n\n  const response = await service.cancelAsyncRequest(token, reportId, id, executionId, definitionsPath)\n\n  if (response && response['cancellationSucceeded']) {\n    await services.requestedReportService.updateStatus(executionId, dprUser.id, RequestStatus.ABORTED)\n  }\n}\n\n/**\n * Returns the data required for rendering the async filters component\n *\n * @param {AsyncReportUtilsParams} { req, res, dataSources }\n * @return {*}\n */\nexport const renderRequest = async ({\n  req,\n  res,\n  services,\n  next,\n}: {\n  req: Request\n  res: Response\n  next: NextFunction\n  services: Services\n}): Promise<RequestDataResult | boolean> => {\n  try {\n    const { token, csrfToken, definitionsPath: definitionPath, dpdPathFromQuery, dprUser } = LocalsHelper.getValues(res)\n    const { reportId, type, id } = req.params\n    const { definition } = res.locals\n    const defaultsSaved = <string>req.query['defaultsSaved']\n\n    const definitionApiArgs = { token, reportId, definitionPath, services }\n\n    let name\n    let reportName\n    let description\n    let template\n    let fields: components['schemas']['FieldDefinition'][] = []\n    let sections\n    let interactive\n    let filtersData\n    let defaultFilterValues: defaultFilterValue[] = []\n\n    if (type === ReportType.REPORT) {\n      ;({ name, reportName, description, fields, interactive } = await renderReportRequestData(definition))\n    }\n\n    if (type === ReportType.DASHBOARD) {\n      ;({ name, reportName, description, sections, fields } = await renderDashboardRequestData({\n        ...definitionApiArgs,\n        definition,\n      }))\n    }\n\n    if (fields) {\n      const filterData = await getFilterData(req, res, fields, interactive || false, services, dprUser.id)\n      defaultFilterValues = filterData.defaultFilterValues || defaultFilterValues\n      filtersData = filterData.filtersData\n    }\n\n    const reportData: RequestReportData = {\n      reportName,\n      name,\n      description,\n      reportId,\n      id,\n      ...(dpdPathFromQuery && { definitionPath }),\n      csrfToken,\n      template,\n      sections,\n      hasDefaults: defaultFilterValues?.length > 0,\n      defaultsSaved,\n      type: type as ReportType,\n      saveDefaultsEnabled: res.locals['saveDefaultsEnabled'],\n    }\n\n    return {\n      title: `Request ${type}`,\n      filtersDescription: `Customise your ${type} using the filters below and submit your request.`,\n      filtersData,\n      reportData,\n    }\n  } catch (error) {\n    next(error)\n    return false\n  }\n}\n\nexport const getFiltersFromReqBody = (req: Request) => {\n  return Object.keys(req.body)\n    .filter((attr) => attr.includes('filters.'))\n    .filter((attr) => !!req.body[attr])\n    .map((attr) => {\n      return { name: attr, value: req.body[attr] }\n    })\n}\n\nexport default {\n  request,\n  cancelRequest,\n  renderRequest,\n  getFiltersFromReqBody,\n  getDefintionByType,\n}\n"],
+  "mappings": "0jBAAA,IAAAA,GAAA,GAAAC,EAAAD,GAAA,mBAAAE,EAAA,YAAAC,GAAA,uBAAAC,EAAA,0BAAAC,EAAA,kBAAAC,EAAA,YAAAC,EAAA,gBAAAC,IAAA,eAAAC,EAAAT,IAKA,IAAAU,EAA6B,qEAC7BC,EAAyB,6CACzBD,EAAyB,oDACzBE,EAAiC,+CACjCC,EAAiC,qDAIjCC,EAA2D,yCAU3DC,EAAgC,qEAChCC,EAA4B,2DAYrB,MAAMR,EAAc,MAAO,CAChC,IAAAS,EACA,IAAAC,EACA,SAAAC,EACA,UAAAC,EACA,cAAAC,EACA,mBAAAC,CACF,IAOqB,CACnB,KAAM,CAAE,OAAAC,EAAQ,GAAAC,EAAI,KAAAC,CAAK,EAAIR,EAAI,KAC3B,CAAE,QAAAS,EAAS,gBAAAC,EAAiB,iBAAAC,CAAiB,EAAI,EAAAC,QAAa,UAAUX,CAAG,EAEjF,QAAM,oBAAiB,CAAE,aAAcC,EAAS,uBAAwB,OAAQO,EAAQ,GAAI,GAAAF,EAAI,OAAAD,CAAO,CAAC,EACxG,QAAM,oBAAiB,CAAE,aAAcJ,EAAS,sBAAuB,OAAQO,EAAQ,GAAI,GAAAF,EAAI,OAAAD,CAAO,CAAC,EAEvG,MAAMO,EAAmCb,EAAI,KACvCc,EAAa,CACjB,KAAMD,EAAgB,KACtB,SAAUA,EAAgB,SAC1B,WAAYA,EAAgB,WAC5B,YAAaA,EAAgB,YAC7B,GAAIA,EAAgB,GACpB,KAAMA,EAAgB,IACxB,EAEA,IAAIE,EACJ,OAAQP,EAAM,CACZ,KAAK,aAAW,OACdO,EAAsB,IAAI,EAAAC,QAAqBF,EAAYD,CAAe,EACvE,iBAAiBT,CAAa,EAC9B,sBAAsBC,CAAkB,EACxC,WAAWF,GAAW,UAAU,EAChC,YAAYA,GAAW,QAAQ,EAC/B,mBAAmBO,EAAiBC,CAAgB,EACpD,eAAeX,CAAG,EAClB,SAASG,CAAS,EAClB,UAAU,gBAAc,SAAS,EACjC,aAAa,EACb,MAAM,EACT,MACF,KAAK,aAAW,UAAW,CACzBY,EAAsB,IAAI,EAAAC,QAAqBF,EAAYD,CAAe,EACvE,iBAAiBT,CAAa,EAC9B,sBAAsBC,CAAkB,EACxC,WAAWF,GAAW,UAAU,EAChC,mBAAmBO,EAAiBC,CAAgB,EACpD,eAAeX,CAAG,EAClB,SAASG,CAAS,EAClB,UAAU,gBAAc,SAAS,EACjC,aAAa,EACb,WAAW,KAAK,MAAMH,EAAI,KAAK,QAAQ,CAAC,EACxC,MAAM,EACT,KACF,CACA,QACE,KACJ,CAEIe,GAAqB,MAAMb,EAAS,uBAAuB,UAAUO,EAAQ,GAAIM,CAAmB,CAC1G,EAEA,eAAeE,EACbC,EACAC,EACAC,EACAC,EACAlB,EACAmB,EAC0C,CAC1C,OAAO,QAAQ,IACbJ,EAAc,IAAKK,GACjBJ,EACG,mBAAmBC,EAAOC,EAAUE,EAAa,GAAI,CACpD,GAAIpB,GAAa,CAAE,UAAWA,EAAU,KAAM,EAC9C,GAAImB,GAA8B,CAAE,2BAAAA,CAA2B,CACjE,CAAC,EACA,KAAME,GAAa,CAClB,KAAM,CAAE,YAAAC,EAAa,QAAAC,CAAQ,EAAIF,EACjC,GAAI,CAACC,GAAe,CAACC,EACnB,MAAM,IAAI,MAAM,0DAA0D,EAE5E,MAAO,CAAE,YAAAD,EAAa,QAAAC,EAAS,UAAWH,EAAa,EAAG,CAC5D,CAAC,CACL,CACF,CACF,CAEA,MAAMI,EAAiB,MAAO,CAC5B,IAAA3B,EACA,IAAAC,EACA,MAAAmB,EACA,iBAAAQ,EACA,iBAAAT,CACF,IAUM,CACJ,KAAM,CAAE,gBAAiBG,EAA4B,iBAAAX,CAAiB,EAAI,EAAAC,QAAa,UAAUX,CAAG,EAC9F,CAAE,SAAAoB,EAAU,GAAAd,EAAI,KAAAC,CAAK,EAAIR,EAAI,KAEnC,IAAI6B,EACA1B,EACAsB,EACAC,EACAI,EACAZ,EAAmE,CAAC,EAEpEV,IAAS,aAAW,SACtBsB,EAAa,MAAMX,EAAiB,cAAcC,EAAOC,EAAUd,EAAIe,CAA0B,EAEjGO,EAASC,GAAY,QAAQ,eAAe,QAAU,CAAC,EACvD3B,EAAY,EAAA4B,QAAiB,oBAAoB/B,EAAK6B,CAAM,EAC1D,CAAE,YAAAJ,EAAa,QAAAC,CAAQ,EAAI,MAAMP,EAAiB,mBAAmBC,EAAOC,EAAUd,EAAI,CAC1F,GAAGJ,EAAU,MACb,2BAAAmB,CACF,CAAC,EACDJ,EAAgBY,EAAW,QAAQ,eAAiB,CAAC,GAGnDtB,IAAS,aAAW,YACtBsB,EAAa,MAAMF,EAAiB,cAAcR,EAAOC,EAAUd,EAAIe,CAA0B,EAEjGO,EAASC,GAAY,cAAgB,CAAC,EACtC3B,EAAY,EAAA4B,QAAiB,oBAAoB/B,EAAK6B,CAAM,EAC1D,CAAE,YAAAJ,EAAa,QAAAC,CAAQ,EAAI,MAAME,EAAiB,sBAAsBR,EAAOC,EAAUd,EAAI,CAC7F,GAAGJ,EAAU,MACb,2BAAAmB,CACF,CAAC,GAGH,MAAMjB,EAAqB,MAAMY,EAC/BC,EACAC,EACAC,EACAC,EACAlB,EACAmB,CACF,EAQA,MAAO,CACL,cAPoB,CACpB,YAAAG,EACA,QAAAC,EACA,GAAIf,GAAoB,CAAE,2BAAAW,CAA2B,CACvD,EAIE,mBAAAjB,EACA,UAAAF,CACF,CACF,EAEM6B,EAA6B,MAAO,CACxC,MAAAZ,EACA,SAAAC,EACA,eAAAY,EACA,SAAA/B,EACA,WAAA4B,CACF,IAMM,CAKJ,MAAMI,GAJqB,MAAMhC,EAAS,iBAAiB,eAAekB,EAAOa,CAAc,GAClD,KAC1CE,GAA0DA,EAAI,KAAOd,CACxE,GACsC,KAChC,CAAE,KAAAe,EAAM,YAAAC,EAAa,SAAAC,EAAU,aAAcT,CAAO,EAAIC,EAE9D,MAAO,CACL,WAAAI,EACA,KAAAE,EACA,YAAAC,EACA,SAAUC,GAAY,CAAC,EACvB,OAAQT,GAAU,CAAC,CACrB,CACF,EAEMU,EAA0B,MAAOT,IAC9B,CACL,WAAAA,EACA,WAAYA,EAAW,KACvB,KAAMA,EAAW,QAAQ,KACzB,YAAaA,EAAW,QAAQ,aAAeA,EAAW,YAC1D,SAAUA,EAAW,QAAQ,cAC7B,OAAQA,GAAY,SAAS,eAAe,QAAU,CAAC,EACvD,YAAaA,GAAY,SAAS,WACpC,GAGW3C,EAAqB,MAAOa,EAAcC,EAAeuC,EAAqBtC,IAAuB,CAChH,KAAM,CAAE,MAAAkB,EAAO,gBAAAV,CAAgB,EAAI,EAAAE,QAAa,UAAUX,CAAG,EACvD,CAAE,SAAAoB,EAAU,GAAAd,EAAI,UAAAkC,EAAW,KAAAjC,CAAK,EAAIR,EAAI,OAK9C,OAFmB,MADHQ,IAAS,aAAW,OAASN,EAAS,iBAAmBA,EAAS,kBACjD,cAAckB,EAAOC,EAAUoB,GAAalC,EAAIG,CAAe,CAGlG,EAEMgC,GAAgB,MACpB1C,EACAC,EACA4B,EACAc,EACAzC,EACA0C,IACG,CACH,KAAM,CAAE,SAAAvB,EAAU,GAAAd,CAAG,EAAIP,EAAI,OAE7B,IAAI6C,EAAwC,MAAM,EAAAd,QAAiB,cAAcF,EAAQc,CAAW,EACpGE,EAAY,QAAU,EAAAC,QAAoB,uBAAuB7C,EAAK4C,EAAY,OAAO,EAEzF,IAAIE,EACJ,OAAI9C,EAAI,OAAO,sBACb8C,EAAsB,MAAM7C,EAAS,2BAA2B,IAAI0C,EAAQvB,EAAUd,EAAI,cAAY,OAAO,GAE3GwC,IACFF,EAAc,EAAAC,QAAoB,iCAChCD,EAAY,QACZA,EAAY,QAAU,CAAC,EACvBE,CACF,GAGFF,EAAY,QAAU,EAAAG,QAAa,2BAA2BH,EAAY,QAAS7C,CAAG,EAE/E,CAAE,YAAA6C,EAAa,oBAAAE,CAAoB,CAC5C,EAQazD,EAAU,MAAO,CAAE,IAAAU,EAAK,IAAAC,EAAK,SAAAC,CAAS,IAA8B,CAC/E,KAAM,CAAE,MAAAkB,CAAM,EAAI,EAAAR,QAAa,UAAUX,CAAG,EACtCgD,EAAc,CAAE,IAAAjD,EAAK,IAAAC,EAAK,MAAAmB,CAAM,EAEhC,CAAE,cAAAhB,EAAe,UAAAD,EAAW,mBAAAE,CAAmB,EAAI,MAAMsB,EAAe,CAC5E,GAAGsB,EACH,iBAAkB/C,EAAS,iBAC3B,iBAAkBA,EAAS,gBAC7B,CAAC,EAED,OAAIE,GACF,MAAMb,EAAY,CAChB,IAAAS,EACA,IAAAC,EACA,SAAAC,EACA,UAAAC,EACA,cAAAC,EACA,mBAAAC,CACF,CAAC,EAGID,CACT,EAEanB,EAAgB,MAAO,CAAE,IAAAe,EAAK,IAAAC,EAAK,SAAAC,CAAS,IAA8B,CACrF,KAAM,CAAE,MAAAkB,EAAO,QAAAX,EAAS,gBAAAC,CAAgB,EAAI,EAAAE,QAAa,UAAUX,CAAG,EAChE,CAAE,SAAAoB,EAAU,GAAAd,EAAI,YAAAkB,EAAa,KAAAjB,CAAK,EAAIR,EAAI,OAEhD,IAAIkD,EAA+ChD,EAAS,iBACxDM,IAAS,aAAW,SAAQ0C,EAAUhD,EAAS,kBAC/CM,IAAS,aAAW,YAAW0C,EAAUhD,EAAS,kBAEtD,MAAMsB,EAAW,MAAM0B,EAAQ,mBAAmB9B,EAAOC,EAAUd,EAAIkB,EAAaf,CAAe,EAE/Fc,GAAYA,EAAS,uBACvB,MAAMtB,EAAS,uBAAuB,aAAauB,EAAahB,EAAQ,GAAI,gBAAc,OAAO,CAErG,EAQapB,EAAgB,MAAO,CAClC,IAAAW,EACA,IAAAC,EACA,SAAAC,EACA,KAAAiD,CACF,IAK4C,CAC1C,GAAI,CACF,KAAM,CAAE,MAAA/B,EAAO,UAAAgC,EAAW,gBAAiBnB,EAAgB,iBAAAtB,EAAkB,QAAAF,CAAQ,EAAI,EAAAG,QAAa,UAAUX,CAAG,EAC7G,CAAE,SAAAoB,EAAU,KAAAb,EAAM,GAAAD,CAAG,EAAIP,EAAI,OAC7B,CAAE,WAAA8B,CAAW,EAAI7B,EAAI,OACrBoD,EAAwBrD,EAAI,MAAM,cAElCsD,EAAoB,CAAE,MAAAlC,EAAO,SAAAC,EAAU,eAAAY,EAAgB,SAAA/B,CAAS,EAEtE,IAAIkC,EACAF,EACAG,EACAkB,EACA1B,EAAqD,CAAC,EACtDS,EACAK,EACAE,EACAE,EAA4C,CAAC,EAajD,GAXIvC,IAAS,aAAW,SACpB,CAAE,KAAA4B,EAAM,WAAAF,EAAY,YAAAG,EAAa,OAAAR,EAAQ,YAAAc,CAAY,EAAI,MAAMJ,EAAwBT,CAAU,GAGjGtB,IAAS,aAAW,YACpB,CAAE,KAAA4B,EAAM,WAAAF,EAAY,YAAAG,EAAa,SAAAC,EAAU,OAAAT,CAAO,EAAI,MAAMG,EAA2B,CACvF,GAAGsB,EACH,WAAAxB,CACF,CAAC,GAGCD,EAAQ,CACV,MAAM2B,EAAa,MAAMd,GAAc1C,EAAKC,EAAK4B,EAAQc,GAAe,GAAOzC,EAAUO,EAAQ,EAAE,EACnGsC,EAAsBS,EAAW,qBAAuBT,EACxDF,EAAcW,EAAW,WAC3B,CAEA,MAAM1C,EAAgC,CACpC,WAAAoB,EACA,KAAAE,EACA,YAAAC,EACA,SAAAhB,EACA,GAAAd,EACA,GAAII,GAAoB,CAAE,eAAAsB,CAAe,EACzC,UAAAmB,EACA,SAAAG,EACA,SAAAjB,EACA,YAAaS,GAAqB,OAAS,EAC3C,cAAAM,EACA,KAAM7C,EACN,oBAAqBP,EAAI,OAAO,mBAClC,EAEA,MAAO,CACL,MAAO,WAAWO,CAAI,GACtB,mBAAoB,kBAAkBA,CAAI,oDAC1C,YAAAqC,EACA,WAAA/B,CACF,CACF,OAAS2C,EAAO,CACd,OAAAN,EAAKM,CAAK,EACH,EACT,CACF,EAEarE,EAAyBY,GAC7B,OAAO,KAAKA,EAAI,IAAI,EACxB,OAAQ0D,GAASA,EAAK,SAAS,UAAU,CAAC,EAC1C,OAAQA,GAAS,CAAC,CAAC1D,EAAI,KAAK0D,CAAI,CAAC,EACjC,IAAKA,IACG,CAAE,KAAMA,EAAM,MAAO1D,EAAI,KAAK0D,CAAI,CAAE,EAC5C,EAGL,IAAOxE,GAAQ,CACb,QAAAI,EACA,cAAAL,EACA,cAAAI,EACA,sBAAAD,EACA,mBAAAD,CACF",
+  "names": ["utils_exports", "__export", "cancelRequest", "utils_default", "getDefintionByType", "getFiltersFromReqBody", "renderRequest", "request", "updateStore", "__toCommonJS", "import_utils", "import_localsHelper", "import_reportStoreHelper", "import_UserStoreItemBuilder", "import_UserReports", "import_personalisationUtils", "import_filtersTypeEnum", "req", "res", "services", "queryData", "executionData", "childExecutionData", "search", "id", "type", "dprUser", "definitionsPath", "dpdPathFromQuery", "LocalsHelper", "requestFormData", "reportData", "requestedReportData", "UserStoreItemBuilder", "requestChildReports", "childVariants", "reportingService", "token", "reportId", "dataProductDefinitionsPath", "childVariant", "response", "executionId", "tableId", "requestProduct", "dashboardService", "fields", "definition", "FiltersFormUtils", "renderDashboardRequestData", "definitionPath", "reportName", "def", "name", "description", "sections", "renderReportRequestData", "_next", "variantId", "getFilterData", "interactive", "userId", "filtersData", "PersonalistionUtils", "defaultFilterValues", "FiltersUtils", "requestArgs", "service", "next", "csrfToken", "defaultsSaved", "definitionApiArgs", "template", "filterData", "error", "attr"]
 }

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

@@ -2,6 +2,7 @@
 import { Request, Response, NextFunction } from 'express'
 
 // Utils
+import { defaultFilterValue } from '../../../../utils/Personalisation/types'
 import FiltersFormUtils from '../../../../components/_async/async-filters-form/utils'
 import LocalsHelper from '../../../../utils/localsHelper'
 import FiltersUtils from '../../../../components/_filters/utils'
@@ -44,7 +45,7 @@ export const updateStore = async ({
   req: Request
   res: Response
   services: Services
-  queryData?: SetQueryFromFiltersResult
+  queryData?: SetQueryFromFiltersResult | undefined
   executionData: ExecutionData
   childExecutionData: Array<ChildReportExecutionData>
 }): Promise<void> => {
@@ -97,7 +98,7 @@ export const updateStore = async ({
       break
   }
 
-  await services.requestedReportService.addReport(dprUser.id, requestedReportData)
+  if (requestedReportData) await services.requestedReportService.addReport(dprUser.id, requestedReportData)
 }
 
 async function requestChildReports(
@@ -105,18 +106,21 @@ async function requestChildReports(
   reportingService: ReportingService,
   token: string,
   reportId: string,
-  queryData: SetQueryFromFiltersResult,
-  dataProductDefinitionsPath: string,
+  queryData?: SetQueryFromFiltersResult,
+  dataProductDefinitionsPath?: string,
 ): Promise<Array<ChildReportExecutionData>> {
   return Promise.all(
     childVariants.map((childVariant) =>
       reportingService
         .requestAsyncReport(token, reportId, childVariant.id, {
-          ...queryData.query,
-          dataProductDefinitionsPath,
+          ...(queryData && { queryData: queryData.query }),
+          ...(dataProductDefinitionsPath && { dataProductDefinitionsPath }),
         })
         .then((response) => {
           const { executionId, tableId } = response
+          if (!executionId || !tableId) {
+            throw new Error('requestChildReports: No execution of tableId in response')
+          }
           return { executionId, tableId, variantId: childVariant.id }
         }),
     ),
@@ -138,12 +142,12 @@ const requestProduct = async ({
 }): Promise<{
   executionData: ExecutionData
   childExecutionData: Array<ChildReportExecutionData>
-  queryData: SetQueryFromFiltersResult
+  queryData?: SetQueryFromFiltersResult | undefined
 }> => {
   const { definitionsPath: dataProductDefinitionsPath, dpdPathFromQuery } = LocalsHelper.getValues(res)
   const { reportId, id, type } = req.body
 
-  let fields
+  let fields: components['schemas']['FieldDefinition'][]
   let queryData
   let executionId
   let tableId
@@ -153,7 +157,7 @@ const requestProduct = async ({
   if (type === ReportType.REPORT) {
     definition = await reportingService.getDefinition(token, reportId, id, dataProductDefinitionsPath)
 
-    fields = definition ? definition.variant.specification?.fields : []
+    fields = definition?.variant.specification?.fields || []
     queryData = FiltersFormUtils.setQueryFromFilters(req, fields)
     ;({ executionId, tableId } = await reportingService.requestAsyncReport(token, reportId, id, {
       ...queryData.query,
@@ -165,7 +169,7 @@ const requestProduct = async ({
   if (type === ReportType.DASHBOARD) {
     definition = await dashboardService.getDefinition(token, reportId, id, dataProductDefinitionsPath)
 
-    fields = definition ? definition.filterFields : []
+    fields = definition?.filterFields || []
     queryData = FiltersFormUtils.setQueryFromFilters(req, fields)
     ;({ executionId, tableId } = await dashboardService.requestAsyncDashboard(token, reportId, id, {
       ...queryData.query,
@@ -212,7 +216,7 @@ const renderDashboardRequestData = async ({
   const productDefinition = productDefinitions.find(
     (def: components['schemas']['ReportDefinitionSummary']) => def.id === reportId,
   )
-  const reportName = productDefinition.name
+  const reportName = productDefinition?.name
   const { name, description, sections, filterFields: fields } = definition
 
   return {
@@ -220,7 +224,7 @@ const renderDashboardRequestData = async ({
     name,
     description,
     sections: sections || [],
-    fields,
+    fields: fields || [],
   }
 }
 
@@ -231,12 +235,12 @@ const renderReportRequestData = async (definition: components['schemas']['Single
     name: definition.variant.name,
     description: definition.variant.description || definition.description,
     template: definition.variant.specification,
-    fields: definition?.variant?.specification?.fields,
+    fields: definition?.variant?.specification?.fields || [],
     interactive: definition?.variant?.interactive,
   }
 }
 
-export const getDefintionByType = async (req: Request, res: Response, next: NextFunction, services: Services) => {
+export const getDefintionByType = async (req: Request, res: Response, _next: NextFunction, services: Services) => {
   const { token, definitionsPath } = LocalsHelper.getValues(res)
   const { reportId, id, variantId, type } = req.params
 
@@ -259,11 +263,14 @@ const getFilterData = async (
   let filtersData = <RenderFiltersReturnValue>await FiltersFormUtils.renderFilters(fields, interactive)
   filtersData.filters = PersonalistionUtils.setUserContextDefaults(res, filtersData.filters)
 
-  const defaultFilterValues = await services.defaultFilterValuesService.get(userId, reportId, id, FiltersType.REQUEST)
+  let defaultFilterValues
+  if (res.locals['saveDefaultsEnabled']) {
+    defaultFilterValues = await services.defaultFilterValuesService.get(userId, reportId, id, FiltersType.REQUEST)
+  }
   if (defaultFilterValues) {
     filtersData = PersonalistionUtils.setFilterValuesFromSavedDefaults(
       filtersData.filters,
-      filtersData.sortBy,
+      filtersData.sortBy || [],
       defaultFilterValues,
     )
   }
@@ -307,13 +314,13 @@ export const cancelRequest = async ({ req, res, services }: AsyncReportUtilsPara
   const { token, dprUser, definitionsPath } = LocalsHelper.getValues(res)
   const { reportId, id, executionId, type } = req.params
 
-  let service
+  let service: ReportingService | DashboardService = services.reportingService
   if (type === ReportType.REPORT) service = services.reportingService
   if (type === ReportType.DASHBOARD) service = services.dashboardService
 
   const response = await service.cancelAsyncRequest(token, reportId, id, executionId, definitionsPath)
 
-  if (response && response.cancellationSucceeded) {
+  if (response && response['cancellationSucceeded']) {
     await services.requestedReportService.updateStatus(executionId, dprUser.id, RequestStatus.ABORTED)
   }
 }
@@ -329,12 +336,17 @@ export const renderRequest = async ({
   res,
   services,
   next,
-}: AsyncReportUtilsParams): Promise<RequestDataResult | boolean> => {
+}: {
+  req: Request
+  res: Response
+  next: NextFunction
+  services: Services
+}): Promise<RequestDataResult | boolean> => {
   try {
     const { token, csrfToken, definitionsPath: definitionPath, dpdPathFromQuery, dprUser } = LocalsHelper.getValues(res)
     const { reportId, type, id } = req.params
     const { definition } = res.locals
-    const defaultsSaved = <string>req.query.defaultsSaved
+    const defaultsSaved = <string>req.query['defaultsSaved']
 
     const definitionApiArgs = { token, reportId, definitionPath, services }
 
@@ -342,11 +354,11 @@ export const renderRequest = async ({
     let reportName
     let description
     let template
-    let fields: components['schemas']['FieldDefinition'][]
+    let fields: components['schemas']['FieldDefinition'][] = []
     let sections
     let interactive
     let filtersData
-    let defaultFilterValues
+    let defaultFilterValues: defaultFilterValue[] = []
 
     if (type === ReportType.REPORT) {
       ;({ name, reportName, description, fields, interactive } = await renderReportRequestData(definition))
@@ -360,7 +372,9 @@ export const renderRequest = async ({
     }
 
     if (fields) {
-      ;({ filtersData, defaultFilterValues } = await getFilterData(req, res, fields, interactive, services, dprUser.id))
+      const filterData = await getFilterData(req, res, fields, interactive || false, services, dprUser.id)
+      defaultFilterValues = filterData.defaultFilterValues || defaultFilterValues
+      filtersData = filterData.filtersData
     }
 
     const reportData: RequestReportData = {
@@ -376,6 +390,7 @@ export const renderRequest = async ({
       hasDefaults: defaultFilterValues?.length > 0,
       defaultsSaved,
       type: type as ReportType,
+      saveDefaultsEnabled: res.locals['saveDefaultsEnabled'],
     }
 
     return {

package/dpr/routes/journeys/request-report/filters/view.njk

@@ -33,6 +33,7 @@
     sortBy: filtersData.sortBy, 
     data: reportData, 
     endpoint: postEndpoint,
-    type: type
+    type: type,
+    saveDefaultsEnabled: saveDefaultsEnabled
   }) }}
 {% endblock %}

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

@@ -1,2 +1,2 @@
-var $=Object.create;var u=Object.defineProperty;var g=Object.getOwnPropertyDescriptor;var q=Object.getOwnPropertyNames;var x=Object.getPrototypeOf,y=Object.prototype.hasOwnProperty;var S=(r,e)=>{for(var t in e)u(r,t,{get:e[t],enumerable:!0})},c=(r,e,t,o)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of q(e))!y.call(r,s)&&s!==t&&u(r,s,{get:()=>e[s],enumerable:!(o=g(e,s))||o.enumerable});return r};var p=(r,e,t)=>(t=r!=null?$(x(r)):{},c(e||!r||!r.__esModule?u(t,"default",{value:r,enumerable:!0}):t,r)),B=r=>c(u({},"__esModule",{value:!0}),r);var U={};S(U,{Redirects:()=>f,RequestReportRoutes:()=>H,Routes:()=>R});module.exports=B(U);var n=require("express"),m=p(require("./controller")),a=p(require("./filters/routes")),l=p(require("./status/routes")),d=p(require("../../../middleware/reportAuthoriser"));function R({layoutPath:r,services:e}){const t=(0,n.Router)({mergeParams:!0}),o=new m.default(r,e);return t.use("/:type/:reportId/:id/filters",(0,d.default)(e,r),(0,a.default)({layoutPath:r,services:e}),o.errorHandler),t.use("/:type/:reportId/:id/:executionId/status",(0,d.default)(e,r),(0,l.default)({layoutPath:r,services:e}),o.errorHandler),t}function f(){const r=(0,n.Router)({mergeParams:!0});return r.get("/async/:type/:reportId/:id/request",(e,t)=>{const{type:o,reportId:s,id:i}=e.params;t.redirect(`${t.locals.nestedBaseUrl}/dpr/request-report/${o}/${s}/${i}/filters`)}),r.get("/async/:type/:reportId/:id/request/:executionId",(e,t)=>{const{type:o,reportId:s,id:i,executionId:I}=e.params;t.redirect(`${t.locals.nestedBaseUrl}/dpr/request-report/${o}/${s}/${i}/${I}/status`)}),r}const H=({services:r,path:e,layoutPath:t})=>{const o=(0,n.Router)({mergeParams:!0});return o.use(e,R({services:r,layoutPath:t})),o.use("/",f()),o};0&&(module.exports={Redirects,RequestReportRoutes,Routes});
+"use strict";var $=Object.create;var u=Object.defineProperty;var g=Object.getOwnPropertyDescriptor;var q=Object.getOwnPropertyNames;var x=Object.getPrototypeOf,y=Object.prototype.hasOwnProperty;var S=(r,e)=>{for(var t in e)u(r,t,{get:e[t],enumerable:!0})},c=(r,e,t,o)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of q(e))!y.call(r,s)&&s!==t&&u(r,s,{get:()=>e[s],enumerable:!(o=g(e,s))||o.enumerable});return r};var p=(r,e,t)=>(t=r!=null?$(x(r)):{},c(e||!r||!r.__esModule?u(t,"default",{value:r,enumerable:!0}):t,r)),B=r=>c(u({},"__esModule",{value:!0}),r);var U={};S(U,{Redirects:()=>f,RequestReportRoutes:()=>H,Routes:()=>R});module.exports=B(U);var n=require("express"),m=p(require("./controller")),a=p(require("./filters/routes")),l=p(require("./status/routes")),d=p(require("../../../middleware/reportAuthoriser"));function R({layoutPath:r,services:e}){const t=(0,n.Router)({mergeParams:!0}),o=new m.default(r,e);return t.use("/:type/:reportId/:id/filters",(0,d.default)(e,r),(0,a.default)({layoutPath:r,services:e}),o.errorHandler),t.use("/:type/:reportId/:id/:executionId/status",(0,d.default)(e,r),(0,l.default)({layoutPath:r,services:e}),o.errorHandler),t}function f(){const r=(0,n.Router)({mergeParams:!0});return r.get("/async/:type/:reportId/:id/request",(e,t)=>{const{type:o,reportId:s,id:i}=e.params;t.redirect(`${t.locals.nestedBaseUrl}/dpr/request-report/${o}/${s}/${i}/filters`)}),r.get("/async/:type/:reportId/:id/request/:executionId",(e,t)=>{const{type:o,reportId:s,id:i,executionId:I}=e.params;t.redirect(`${t.locals.nestedBaseUrl}/dpr/request-report/${o}/${s}/${i}/${I}/status`)}),r}const H=({services:r,path:e,layoutPath:t})=>{const o=(0,n.Router)({mergeParams:!0});return o.use(e,R({services:r,layoutPath:t})),o.use("/",f()),o};0&&(module.exports={Redirects,RequestReportRoutes,Routes});
 //# sourceMappingURL=routes.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/routes/journeys/request-report/routes.ts"],
-  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport { Services } from '../../../types/Services'\nimport RequestReportController from './controller'\n\n// Routes\nimport requestReportRoutes from './filters/routes'\nimport requestStatusRoutes from './status/routes'\n\n// middleware\nimport reportAuthoriser from '../../../middleware/reportAuthoriser'\n\nexport function Routes({ layoutPath, services }: { services: Services; layoutPath: string }) {\n  const router = Router({ mergeParams: true })\n\n  const controller = new RequestReportController(layoutPath, services)\n  router.use(\n    `/:type/:reportId/:id/filters`,\n    reportAuthoriser(services, layoutPath),\n    requestReportRoutes({ layoutPath, services }),\n    controller.errorHandler,\n  )\n  router.use(\n    `/:type/:reportId/:id/:executionId/status`,\n    reportAuthoriser(services, layoutPath),\n    requestStatusRoutes({ layoutPath, services }),\n    controller.errorHandler,\n  )\n\n  return router\n}\n\nexport function Redirects() {\n  const router = Router({ mergeParams: true })\n\n  // Request route redirect\n  router.get(`/async/:type/:reportId/:id/request`, (req, res) => {\n    const { type, reportId, id } = req.params\n    res.redirect(`${res.locals.nestedBaseUrl}/dpr/request-report/${type}/${reportId}/${id}/filters`)\n  })\n\n  // Status route redirect\n  router.get(`/async/:type/:reportId/:id/request/:executionId`, (req, res) => {\n    const { type, reportId, id, executionId } = req.params\n    res.redirect(`${res.locals.nestedBaseUrl}/dpr/request-report/${type}/${reportId}/${id}/${executionId}/status`)\n  })\n\n  return router\n}\n\nexport const RequestReportRoutes = ({\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  router.use('/', Redirects())\n\n  return router\n}\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,eAAAE,EAAA,wBAAAC,EAAA,WAAAC,IAAA,eAAAC,EAAAL,GACA,IAAAM,EAAuB,mBAEvBC,EAAoC,2BAGpCC,EAAgC,+BAChCA,EAAgC,8BAGhCC,EAA6B,mDAEtB,SAASL,EAAO,CAAE,WAAAM,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAAwBJ,EAAYC,CAAQ,EACnE,OAAAC,EAAO,IACL,kCACA,EAAAG,SAAiBJ,EAAUD,CAAU,KACrC,EAAAM,SAAoB,CAAE,WAAAN,EAAY,SAAAC,CAAS,CAAC,EAC5CE,EAAW,YACb,EACAD,EAAO,IACL,8CACA,EAAAG,SAAiBJ,EAAUD,CAAU,KACrC,EAAAO,SAAoB,CAAE,WAAAP,EAAY,SAAAC,CAAS,CAAC,EAC5CE,EAAW,YACb,EAEOD,CACT,CAEO,SAASV,GAAY,CAC1B,MAAMU,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAG3C,OAAAA,EAAO,IAAI,qCAAsC,CAACM,EAAKC,IAAQ,CAC7D,KAAM,CAAE,KAAAC,EAAM,SAAAC,EAAU,GAAAC,CAAG,EAAIJ,EAAI,OACnCC,EAAI,SAAS,GAAGA,EAAI,OAAO,aAAa,uBAAuBC,CAAI,IAAIC,CAAQ,IAAIC,CAAE,UAAU,CACjG,CAAC,EAGDV,EAAO,IAAI,kDAAmD,CAACM,EAAKC,IAAQ,CAC1E,KAAM,CAAE,KAAAC,EAAM,SAAAC,EAAU,GAAAC,EAAI,YAAAC,CAAY,EAAIL,EAAI,OAChDC,EAAI,SAAS,GAAGA,EAAI,OAAO,aAAa,uBAAuBC,CAAI,IAAIC,CAAQ,IAAIC,CAAE,IAAIC,CAAW,SAAS,CAC/G,CAAC,EAEMX,CACT,CAEO,MAAMT,EAAsB,CAAC,CAClC,SAAAQ,EACA,KAAAa,EACA,WAAAd,CACF,IAIM,CACJ,MAAME,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAC3C,OAAAA,EAAO,IAAIY,EAAMpB,EAAO,CAAE,SAAAO,EAAU,WAAAD,CAAW,CAAC,CAAC,EACjDE,EAAO,IAAI,IAAKV,EAAU,CAAC,EAEpBU,CACT",
+  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport { Services } from '../../../types/Services'\nimport RequestReportController from './controller'\n\n// Routes\nimport requestReportRoutes from './filters/routes'\nimport requestStatusRoutes from './status/routes'\n\n// middleware\nimport reportAuthoriser from '../../../middleware/reportAuthoriser'\n\nexport function Routes({ layoutPath, services }: { services: Services; layoutPath: string }) {\n  const router = Router({ mergeParams: true })\n\n  const controller = new RequestReportController(layoutPath, services)\n  router.use(\n    `/:type/:reportId/:id/filters`,\n    reportAuthoriser(services, layoutPath),\n    requestReportRoutes({ layoutPath, services }),\n    controller.errorHandler,\n  )\n  router.use(\n    `/:type/:reportId/:id/:executionId/status`,\n    reportAuthoriser(services, layoutPath),\n    requestStatusRoutes({ layoutPath, services }),\n    controller.errorHandler,\n  )\n\n  return router\n}\n\nexport function Redirects() {\n  const router = Router({ mergeParams: true })\n\n  // Request route redirect\n  router.get(`/async/:type/:reportId/:id/request`, (req, res) => {\n    const { type, reportId, id } = req.params\n    res.redirect(`${res.locals['nestedBaseUrl']}/dpr/request-report/${type}/${reportId}/${id}/filters`)\n  })\n\n  // Status route redirect\n  router.get(`/async/:type/:reportId/:id/request/:executionId`, (req, res) => {\n    const { type, reportId, id, executionId } = req.params\n    res.redirect(`${res.locals['nestedBaseUrl']}/dpr/request-report/${type}/${reportId}/${id}/${executionId}/status`)\n  })\n\n  return router\n}\n\nexport const RequestReportRoutes = ({\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  router.use('/', Redirects())\n\n  return router\n}\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,eAAAE,EAAA,wBAAAC,EAAA,WAAAC,IAAA,eAAAC,EAAAL,GACA,IAAAM,EAAuB,mBAEvBC,EAAoC,2BAGpCC,EAAgC,+BAChCA,EAAgC,8BAGhCC,EAA6B,mDAEtB,SAASL,EAAO,CAAE,WAAAM,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAAwBJ,EAAYC,CAAQ,EACnE,OAAAC,EAAO,IACL,kCACA,EAAAG,SAAiBJ,EAAUD,CAAU,KACrC,EAAAM,SAAoB,CAAE,WAAAN,EAAY,SAAAC,CAAS,CAAC,EAC5CE,EAAW,YACb,EACAD,EAAO,IACL,8CACA,EAAAG,SAAiBJ,EAAUD,CAAU,KACrC,EAAAO,SAAoB,CAAE,WAAAP,EAAY,SAAAC,CAAS,CAAC,EAC5CE,EAAW,YACb,EAEOD,CACT,CAEO,SAASV,GAAY,CAC1B,MAAMU,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAG3C,OAAAA,EAAO,IAAI,qCAAsC,CAACM,EAAKC,IAAQ,CAC7D,KAAM,CAAE,KAAAC,EAAM,SAAAC,EAAU,GAAAC,CAAG,EAAIJ,EAAI,OACnCC,EAAI,SAAS,GAAGA,EAAI,OAAO,aAAgB,uBAAuBC,CAAI,IAAIC,CAAQ,IAAIC,CAAE,UAAU,CACpG,CAAC,EAGDV,EAAO,IAAI,kDAAmD,CAACM,EAAKC,IAAQ,CAC1E,KAAM,CAAE,KAAAC,EAAM,SAAAC,EAAU,GAAAC,EAAI,YAAAC,CAAY,EAAIL,EAAI,OAChDC,EAAI,SAAS,GAAGA,EAAI,OAAO,aAAgB,uBAAuBC,CAAI,IAAIC,CAAQ,IAAIC,CAAE,IAAIC,CAAW,SAAS,CAClH,CAAC,EAEMX,CACT,CAEO,MAAMT,EAAsB,CAAC,CAClC,SAAAQ,EACA,KAAAa,EACA,WAAAd,CACF,IAIM,CACJ,MAAME,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAC3C,OAAAA,EAAO,IAAIY,EAAMpB,EAAO,CAAE,SAAAO,EAAU,WAAAD,CAAW,CAAC,CAAC,EACjDE,EAAO,IAAI,IAAKV,EAAU,CAAC,EAEpBU,CACT",
   "names": ["routes_exports", "__export", "Redirects", "RequestReportRoutes", "Routes", "__toCommonJS", "import_express", "import_controller", "import_routes", "import_reportAuthoriser", "layoutPath", "services", "router", "controller", "RequestReportController", "reportAuthoriser", "requestReportRoutes", "requestStatusRoutes", "req", "res", "type", "reportId", "id", "executionId", "path"]
 }

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

@@ -36,13 +36,13 @@ export function Redirects() {
   // Request route redirect
   router.get(`/async/:type/:reportId/:id/request`, (req, res) => {
     const { type, reportId, id } = req.params
-    res.redirect(`${res.locals.nestedBaseUrl}/dpr/request-report/${type}/${reportId}/${id}/filters`)
+    res.redirect(`${res.locals['nestedBaseUrl']}/dpr/request-report/${type}/${reportId}/${id}/filters`)
   })
 
   // Status route redirect
   router.get(`/async/:type/:reportId/:id/request/:executionId`, (req, res) => {
     const { type, reportId, id, executionId } = req.params
-    res.redirect(`${res.locals.nestedBaseUrl}/dpr/request-report/${type}/${reportId}/${id}/${executionId}/status`)
+    res.redirect(`${res.locals['nestedBaseUrl']}/dpr/request-report/${type}/${reportId}/${id}/${executionId}/status`)
   })
 
   return router

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

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

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/request-report/status/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../types/Services'\nimport AsyncPollingUtils from './utils'\nimport AsyncRequestUtils from '../filters/utils'\nimport AsyncRequestListUtils from '../../../../components/user-reports/requested/utils'\nimport ErrorSummaryUtils from '../../../../components/error-summary/utils'\n\nclass RequestStatusController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  // Render status page\n  GET: RequestHandler = async (req, res, next) => {\n    try {\n      const pollingRenderData = await AsyncPollingUtils.renderPolling({\n        req,\n        res,\n        services: this.services,\n        next,\n      })\n      res.render(`dpr/routes/journeys/request-report/status/view`, {\n        layoutPath: this.layoutPath,\n        ...pollingRenderData,\n      })\n    } catch (error) {\n      req.body.title = 'Failed to retrieve report status'\n      req.body.errorDescription = 'We were unable to retrieve the report status:'\n      req.body.error = ErrorSummaryUtils.handleError(error)\n      next()\n    }\n  }\n\n  // Poll request status\n  POST: RequestHandler = async (req, res, next) => {\n    try {\n      const response = await AsyncRequestListUtils.getRequestStatus({ req, res, services: this.services })\n      res.send({ status: response.status })\n    } catch (error) {\n      res.send({ status: 'FAILED' })\n    }\n  }\n\n  DELETE: RequestHandler = async (req, res, next) => {\n    try {\n      await AsyncRequestUtils.cancelRequest({\n        req,\n        res,\n        services: this.services,\n      })\n      res.end()\n    } catch (error) {\n      req.body.title = 'Failed to abort request'\n      req.body.errorDescription = 'We were unable to abort the report request for the following reason:'\n      req.body.error = ErrorSummaryUtils.handleError(error)\n      next()\n    }\n  }\n}\n\nexport { RequestStatusController }\nexport default RequestStatusController\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAA8B,sBAC9BA,EAA8B,+BAC9BA,EAAkC,kEAClCA,EAA8B,yDAE9B,MAAMH,CAAwB,CAK5B,YAAYI,EAAoBC,EAAoB,CAMpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,GAAI,CACF,MAAMC,EAAoB,MAAM,EAAAC,QAAkB,cAAc,CAC9D,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,SACf,KAAAC,CACF,CAAC,EACDD,EAAI,OAAO,iDAAkD,CAC3D,WAAY,KAAK,WACjB,GAAGE,CACL,CAAC,CACH,OAASE,EAAO,CACdL,EAAI,KAAK,MAAQ,mCACjBA,EAAI,KAAK,iBAAmB,gDAC5BA,EAAI,KAAK,MAAQ,EAAAM,QAAkB,YAAYD,CAAK,EACpDH,EAAK,CACP,CACF,EAGA,UAAuB,MAAOF,EAAKC,EAAKC,IAAS,CAC/C,GAAI,CACF,MAAMK,EAAW,MAAM,EAAAC,QAAsB,iBAAiB,CAAE,IAAAR,EAAK,IAAAC,EAAK,SAAU,KAAK,QAAS,CAAC,EACnGA,EAAI,KAAK,CAAE,OAAQM,EAAS,MAAO,CAAC,CACtC,MAAgB,CACdN,EAAI,KAAK,CAAE,OAAQ,QAAS,CAAC,CAC/B,CACF,EAEA,YAAyB,MAAOD,EAAKC,EAAKC,IAAS,CACjD,GAAI,CACF,MAAM,EAAAO,QAAkB,cAAc,CACpC,IAAAT,EACA,IAAAC,EACA,SAAU,KAAK,QACjB,CAAC,EACDA,EAAI,IAAI,CACV,OAASI,EAAO,CACdL,EAAI,KAAK,MAAQ,0BACjBA,EAAI,KAAK,iBAAmB,uEAC5BA,EAAI,KAAK,MAAQ,EAAAM,QAAkB,YAAYD,CAAK,EACpDH,EAAK,CACP,CACF,EAjDE,KAAK,WAAaJ,EAClB,KAAK,SAAWC,CAClB,CAgDF,CAGA,IAAOJ,EAAQD",
-  "names": ["controller_exports", "__export", "RequestStatusController", "controller_default", "__toCommonJS", "import_utils", "layoutPath", "services", "req", "res", "next", "pollingRenderData", "AsyncPollingUtils", "error", "ErrorSummaryUtils", "response", "AsyncRequestListUtils", "AsyncRequestUtils"]
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../types/Services'\nimport AsyncPollingUtils from './utils'\nimport AsyncRequestUtils from '../filters/utils'\nimport AsyncRequestListUtils from '../../../../components/user-reports/requested/utils'\nimport ErrorHandler from '../../../../utils/ErrorHandler'\n\nclass RequestStatusController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  // Render status page\n  GET: RequestHandler = async (req, res, next) => {\n    try {\n      const pollingRenderData = await AsyncPollingUtils.renderPolling({\n        req,\n        res,\n        services: this.services,\n        next,\n      })\n      res.render(`dpr/routes/journeys/request-report/status/view`, {\n        layoutPath: this.layoutPath,\n        ...pollingRenderData,\n      })\n    } catch (error) {\n      req.body.title = 'Failed to retrieve report status'\n      req.body.errorDescription = 'We were unable to retrieve the report status:'\n      req.body.error = new ErrorHandler(error).formatError()\n      next()\n    }\n  }\n\n  // Poll request status\n  POST: RequestHandler = async (req, res, _next) => {\n    try {\n      const response = await AsyncRequestListUtils.getRequestStatus({ req, res, services: this.services })\n      res.send({ status: response.status })\n    } catch (error) {\n      res.send({ status: 'FAILED' })\n    }\n  }\n\n  DELETE: RequestHandler = async (req, res, next) => {\n    try {\n      await AsyncRequestUtils.cancelRequest({\n        req,\n        res,\n        services: this.services,\n      })\n      res.end()\n    } catch (error) {\n      req.body.title = 'Failed to abort request'\n      req.body.errorDescription = 'We were unable to abort the report request for the following reason:'\n      req.body.error = new ErrorHandler(error).formatError()\n      next()\n    }\n  }\n}\n\nexport { RequestStatusController }\nexport default RequestStatusController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAA8B,sBAC9BA,EAA8B,+BAC9BA,EAAkC,kEAClCC,EAAyB,6CAEzB,MAAMJ,CAAwB,CAK5B,YAAYK,EAAoBC,EAAoB,CAMpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,GAAI,CACF,MAAMC,EAAoB,MAAM,EAAAC,QAAkB,cAAc,CAC9D,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,SACf,KAAAC,CACF,CAAC,EACDD,EAAI,OAAO,iDAAkD,CAC3D,WAAY,KAAK,WACjB,GAAGE,CACL,CAAC,CACH,OAASE,EAAO,CACdL,EAAI,KAAK,MAAQ,mCACjBA,EAAI,KAAK,iBAAmB,gDAC5BA,EAAI,KAAK,MAAQ,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EACrDH,EAAK,CACP,CACF,EAGA,UAAuB,MAAOF,EAAKC,EAAKM,IAAU,CAChD,GAAI,CACF,MAAMC,EAAW,MAAM,EAAAC,QAAsB,iBAAiB,CAAE,IAAAT,EAAK,IAAAC,EAAK,SAAU,KAAK,QAAS,CAAC,EACnGA,EAAI,KAAK,CAAE,OAAQO,EAAS,MAAO,CAAC,CACtC,MAAgB,CACdP,EAAI,KAAK,CAAE,OAAQ,QAAS,CAAC,CAC/B,CACF,EAEA,YAAyB,MAAOD,EAAKC,EAAKC,IAAS,CACjD,GAAI,CACF,MAAM,EAAAQ,QAAkB,cAAc,CACpC,IAAAV,EACA,IAAAC,EACA,SAAU,KAAK,QACjB,CAAC,EACDA,EAAI,IAAI,CACV,OAASI,EAAO,CACdL,EAAI,KAAK,MAAQ,0BACjBA,EAAI,KAAK,iBAAmB,uEAC5BA,EAAI,KAAK,MAAQ,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EACrDH,EAAK,CACP,CACF,EAjDE,KAAK,WAAaJ,EAClB,KAAK,SAAWC,CAClB,CAgDF,CAGA,IAAOL,EAAQD",
+  "names": ["controller_exports", "__export", "RequestStatusController", "controller_default", "__toCommonJS", "import_utils", "import_ErrorHandler", "layoutPath", "services", "req", "res", "next", "pollingRenderData", "AsyncPollingUtils", "error", "ErrorHandler", "_next", "response", "AsyncRequestListUtils", "AsyncRequestUtils"]
 }

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

@@ -3,7 +3,7 @@ import { Services } from '../../../../types/Services'
 import AsyncPollingUtils from './utils'
 import AsyncRequestUtils from '../filters/utils'
 import AsyncRequestListUtils from '../../../../components/user-reports/requested/utils'
-import ErrorSummaryUtils from '../../../../components/error-summary/utils'
+import ErrorHandler from '../../../../utils/ErrorHandler'
 
 class RequestStatusController {
   layoutPath: string
@@ -31,13 +31,13 @@ class RequestStatusController {
     } catch (error) {
       req.body.title = 'Failed to retrieve report status'
       req.body.errorDescription = 'We were unable to retrieve the report status:'
-      req.body.error = ErrorSummaryUtils.handleError(error)
+      req.body.error = new ErrorHandler(error).formatError()
       next()
     }
   }
 
   // Poll request status
-  POST: RequestHandler = async (req, res, next) => {
+  POST: RequestHandler = async (req, res, _next) => {
     try {
       const response = await AsyncRequestListUtils.getRequestStatus({ req, res, services: this.services })
       res.send({ status: response.status })
@@ -57,7 +57,7 @@ class RequestStatusController {
     } catch (error) {
       req.body.title = 'Failed to abort request'
       req.body.errorDescription = 'We were unable to abort the report request for the following reason:'
-      req.body.error = ErrorSummaryUtils.handleError(error)
+      req.body.error = new ErrorHandler(error).formatError()
       next()
     }
   }

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

@@ -1,2 +1,2 @@
-var l=Object.create;var u=Object.defineProperty;var a=Object.getOwnPropertyDescriptor;var p=Object.getOwnPropertyNames;var f=Object.getPrototypeOf,E=Object.prototype.hasOwnProperty;var S=(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 p(r))!E.call(e,s)&&s!==t&&u(e,s,{get:()=>r[s],enumerable:!(o=a(r,s))||o.enumerable});return e};var g=(e,r,t)=>(t=e!=null?l(f(e)):{},n(r||!e||!e.__esModule?u(t,"default",{value:e,enumerable:!0}):t,e)),v=e=>n(u({},"__esModule",{value:!0}),e);var T={};S(T,{default:()=>P,routes:()=>c});module.exports=v(T);var i=require("express"),m=g(require("./controller"));function c({layoutPath:e,services:r}){const t=(0,i.Router)({mergeParams:!0}),o=new m.default(e,r);return t.get("/",o.GET),t.post("/",o.POST),t.delete("/",o.DELETE),t}var P=c;0&&(module.exports={routes});
+"use strict";var l=Object.create;var u=Object.defineProperty;var a=Object.getOwnPropertyDescriptor;var p=Object.getOwnPropertyNames;var f=Object.getPrototypeOf,E=Object.prototype.hasOwnProperty;var S=(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 p(r))!E.call(e,s)&&s!==t&&u(e,s,{get:()=>r[s],enumerable:!(o=a(r,s))||o.enumerable});return e};var g=(e,r,t)=>(t=e!=null?l(f(e)):{},n(r||!e||!e.__esModule?u(t,"default",{value:e,enumerable:!0}):t,e)),v=e=>n(u({},"__esModule",{value:!0}),e);var T={};S(T,{default:()=>P,routes:()=>c});module.exports=v(T);var i=require("express"),m=g(require("./controller"));function c({layoutPath:e,services:r}){const t=(0,i.Router)({mergeParams:!0}),o=new m.default(e,r);return t.get("/",o.GET),t.post("/",o.POST),t.delete("/",o.DELETE),t}var P=c;0&&(module.exports={routes});
 //# sourceMappingURL=routes.js.map

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/request-report/status/routes.ts"],
   "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport RequestStatusController 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 RequestStatusController(layoutPath, services)\n\n  router.get(`/`, controller.GET)\n  router.post(`/`, controller.POST)\n  router.delete(`/`, controller.DELETE)\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,EAAoC,2BAG7B,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EACrCC,EAAa,IAAI,EAAAC,QAAwBJ,EAAYC,CAAQ,EAEnE,OAAAC,EAAO,IAAI,IAAKC,EAAW,GAAG,EAC9BD,EAAO,KAAK,IAAKC,EAAW,IAAI,EAChCD,EAAO,OAAO,IAAKC,EAAW,MAAM,EAE7BD,CACT,CAEA,IAAOP,EAAQC",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBACvBC,EAAoC,2BAG7B,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EACrCC,EAAa,IAAI,EAAAC,QAAwBJ,EAAYC,CAAQ,EAEnE,OAAAC,EAAO,IAAI,IAAKC,EAAW,GAAG,EAC9BD,EAAO,KAAK,IAAKC,EAAW,IAAI,EAChCD,EAAO,OAAO,IAAKC,EAAW,MAAM,EAE7BD,CACT,CAEA,IAAOP,EAAQC",
   "names": ["routes_exports", "__export", "routes_default", "routes", "__toCommonJS", "import_express", "import_controller", "layoutPath", "services", "router", "controller", "RequestStatusController"]
 }

package/dpr/routes/journeys/request-report/status/tests.cy.js

@@ -1,2 +1,2 @@
-var n=Object.create;var u=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var a=Object.getOwnPropertyNames;var r=Object.getPrototypeOf,b=Object.prototype.hasOwnProperty;var h=(e,i,s,t)=>{if(i&&typeof i=="object"||typeof i=="function")for(let o of a(i))!b.call(e,o)&&o!==s&&u(e,o,{get:()=>i[o],enumerable:!(t=y(i,o))||t.enumerable});return e};var R=(e,i,s)=>(s=e!=null?n(r(e)):{},h(i||!e||!e.__esModule?u(s,"default",{value:e,enumerable:!0}):s,e));var c=require("cypress-tests/cypressUtils"),d=R(require("dayjs")),l=require("test-app/routes/integrationTests/redisStateTestUtils");context("Request status",()=>{const e="/embedded/platform/";beforeEach(()=>{(0,c.executeReportStubs)(),cy.task("stubDefinitionRequestExamplesSuccess"),cy.task("stubRequestSuccessResult20WithDelay")}),describe("post request",()=>{const i="";it("should show the status pages",()=>{cy.visit(e),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(s,t)=>t.textContent.includes("Successful Report")&&t.textContent.includes("this will succeed")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),cy.findByRole("button",{name:/Request/}).click(),(0,c.checkA11y)(),cy.task("stubReportsPickedStatus"),cy.findByText(/picked/i).should("be.visible"),(0,c.checkA11y)(),cy.task("stubReportsStartedStatus"),cy.findByText(/started/i).should("be.visible"),(0,c.checkA11y)(),cy.task("stubReportsFinishedStatus"),cy.findAllByRole("heading",{name:/successful report/i}).should("be.visible")}),it("should timeout",()=>{cy.visit(e),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(s,t)=>t.textContent.includes("Successful Report")&&t.textContent.includes("this will succeed")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),cy.findByRole("button",{name:/Request/}).click(),(0,c.checkA11y)(),cy.task("stubReportsPickedStatus"),cy.findByText("PICKED").should("be.visible"),(0,l.getRedisState)().then(s=>{const t={...s.body};t.requestedReports[0].timestamp.requested=(0,d.default)(s.body.requestedReports[0].timestamp.requested).add(-1,"days").toDate(),(0,l.setRedisState)(t)}),cy.findByText(/Request taking too long/).should("be.visible"),(0,c.checkA11y)()}),describe("failure status pages",()=>{beforeEach(()=>{cy.task("resetRedis"),cy.task("stubReportsPickedStatus"),cy.visit(e),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(s,t)=>t.textContent.includes("Successful Report")&&t.textContent.includes("this will succeed")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),cy.findByRole("button",{name:/Request/}).click(),cy.findByText(/submitted/i).should("be.visible"),cy.findByText(/picked/i).should("be.visible")}),it("should show the aborted status page",()=>{cy.task("stubReportsAbortedStatus"),cy.findByText(/aborted/i).should("be.visible"),cy.injectAxe(),cy.checkA11y()}),it("should show the expired status page",()=>{cy.task("stubReportsExpiredStatus"),cy.findByText(/expired/i).should("be.visible"),cy.injectAxe(),cy.checkA11y()}),it("should show the failed status page",()=>{cy.task("stubReportsFailedStatus"),cy.findByText(/your report has failed to generate/i).should("be.visible"),cy.findByRole("group").contains("Show full error").should("be.visible"),cy.findByText(/Show full error/).click(),cy.findByText(/a developer message goes here/).should("be.visible"),cy.findAllByRole("list").contains("Report ID: request-examples").should("be.visible"),cy.findAllByRole("list").contains(`Execution ID: ${i}`).should("be.visible"),cy.findAllByRole("list").contains("Table ID: tblId_").should("be.visible"),cy.injectAxe(),cy.checkA11y()})})})});
+"use strict";var d=Object.create;var n=Object.defineProperty;var a=Object.getOwnPropertyDescriptor;var y=Object.getOwnPropertyNames;var r=Object.getPrototypeOf,b=Object.prototype.hasOwnProperty;var h=(e,i,s,t)=>{if(i&&typeof i=="object"||typeof i=="function")for(let c of y(i))!b.call(e,c)&&c!==s&&n(e,c,{get:()=>i[c],enumerable:!(t=a(i,c))||t.enumerable});return e};var R=(e,i,s)=>(s=e!=null?d(r(e)):{},h(i||!e||!e.__esModule?n(s,"default",{value:e,enumerable:!0}):s,e));var o=require("cypress-tests/cypressUtils"),u=R(require("dayjs")),l=require("test-app/routes/integrationTests/redisStateTestUtils");context("Request status",()=>{const e="/embedded/platform/";beforeEach(()=>{(0,o.executeReportStubs)(),cy.task("stubDefinitionRequestExamplesSuccess"),cy.task("stubRequestSuccessResult20WithDelay")}),describe("post request",()=>{const i="";it("should show the status pages",()=>{cy.visit(e),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(s,t)=>!!t.textContent?.includes("Successful Report")&&!!t.textContent?.includes("this will succeed")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),cy.findByRole("button",{name:/Request/}).click(),(0,o.checkA11y)(),cy.task("stubReportsPickedStatus"),cy.findByText(/picked/i).should("be.visible"),(0,o.checkA11y)(),cy.task("stubReportsStartedStatus"),cy.findByText(/started/i).should("be.visible"),(0,o.checkA11y)(),cy.task("stubReportsFinishedStatus"),cy.findAllByRole("heading",{name:/successful report/i}).should("be.visible")}),it("should timeout",()=>{cy.visit(e),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(s,t)=>!!t.textContent?.includes("Successful Report")&&!!t.textContent?.includes("this will succeed")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),cy.findByRole("button",{name:/Request/}).click(),(0,o.checkA11y)(),cy.task("stubReportsPickedStatus"),cy.findByText("PICKED").should("be.visible"),(0,l.getRedisState)().then(s=>{const t={...s.body};t.requestedReports[0].timestamp.requested=(0,u.default)(s.body.requestedReports[0].timestamp.requested).add(-1,"days").toDate(),(0,l.setRedisState)(t)}),cy.findAllByText(/Request taking too long/).eq(0).should("be.visible"),(0,o.checkA11y)()}),describe("failure status pages",()=>{beforeEach(()=>{cy.task("resetRedis"),cy.task("stubReportsPickedStatus"),cy.visit(e),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(s,t)=>!!t.textContent?.includes("Successful Report")&&!!t.textContent?.includes("this will succeed")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),cy.findByRole("button",{name:/Request/}).click(),cy.findByText(/submitted/i).should("be.visible"),cy.findByText(/picked/i).should("be.visible")}),it("should show the aborted status page",()=>{cy.task("stubReportsAbortedStatus"),cy.findByText(/aborted/i).should("be.visible"),cy.injectAxe(),cy.checkA11y()}),it("should show the expired status page",()=>{cy.task("stubReportsExpiredStatus"),cy.findByText(/expired/i).should("be.visible"),cy.injectAxe(),cy.checkA11y()}),it("should show the failed status page",()=>{cy.task("stubReportsFailedStatus"),cy.findByText(/your report has failed to generate/i).should("be.visible"),cy.findByRole("group").contains("Show full error").should("be.visible"),cy.findByText(/Show full error/).click(),cy.findByText(/a developer message goes here/).should("be.visible"),cy.findAllByRole("list").contains("Report ID: request-examples").should("be.visible"),cy.findAllByRole("list").contains(`Execution ID: ${i}`).should("be.visible"),cy.findAllByRole("list").contains("Table ID: tblId_").should("be.visible"),cy.injectAxe(),cy.checkA11y()})})})});
 //# sourceMappingURL=tests.cy.js.map