@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.26.8 → 4.28.0

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

@@ -1,2 +1,332 @@
-"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 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))!z.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)),K=e=>T(g({},"__esModule",{value:!0}),e);var re={};G(re,{cancelRequest:()=>N,default:()=>te,getDefintionByType:()=>Q,getFiltersFromReqBody:()=>H,renderRequest:()=>k,request:()=>B,updateStore:()=>O});module.exports=K(re);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"),w=h(require("../../../../utils/Personalisation/personalisationUtils")),C=require("../../../../components/_filters/filtersTypeEnum");const O=async({req:e,res:t,services:r,queryData:a,executionData:i,childExecutionData:s})=>{const{search:l,id:d,type:o}=e.body,{dprUser:n,definitionsPath:c,dpdPathFromQuery:u}=D.default.getValues(t);await(0,q.removeDuplicates)({storeService:r.requestedReportService,userId:n.id,id:d,search:l}),await(0,q.removeDuplicates)({storeService:r.recentlyViewedService,userId:n.id,id:d,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(o){case f.ReportType.REPORT:m=new E.default(R,p).addExecutionData(i).addChildExecutionData(s).addFilters(a?.filterData).addSortData(a?.sortData).addDefinitionsPath(c,u).addRequestUrls(e).addQuery(a).addStatus(f.RequestStatus.SUBMITTED).addTimestamp().build();break;case f.ReportType.DASHBOARD:{m=new E.default(R,p).addExecutionData(i).addChildExecutionData(s).addFilters(a?.filterData).addDefinitionsPath(c,u).addRequestUrls(e).addQuery(a).addStatus(f.RequestStatus.SUBMITTED).addTimestamp().addMetrics(JSON.parse(e.body.sections)).build();break}default:break}m&&await r.requestedReportService.addReport(n.id,m)};async function W(e,t,r,a,i,s){let l;return i&&(l=i.query,delete l.sortColumn,delete l.sortedAsc),Promise.all(e.map(d=>t.requestAsyncReport(r,a,d.id,{...l&&l,...s&&{dataProductDefinitionsPath:s}}).then(o=>{const{executionId:n,tableId:c}=o;if(!n||!c)throw new Error("requestChildReports: No execution of tableId in response");return{executionId:n,tableId:c,variantId:d.id}})))}const X=async({req:e,res:t,token:r,dashboardService:a,reportingService:i})=>{const{definitionsPath:s,dpdPathFromQuery:l}=D.default.getValues(t),{reportId:d,id:o,type:n}=e.body;let c,u,p,R,m,y=[];n===f.ReportType.REPORT&&(m=await i.getDefinition(r,d,o,s),c=m?.variant.specification?.fields||[],u=x.default.setQueryFromFilters(e,c),{executionId:p,tableId:R}=await i.requestAsyncReport(r,d,o,{...u.query,dataProductDefinitionsPath:s}),y=m.variant.childVariants??[]),n===f.ReportType.DASHBOARD&&(m=await a.getDefinition(r,d,o,s),c=m?.filterFields||[],u=x.default.setQueryFromFilters(e,c),{executionId:p,tableId:R}=await a.requestAsyncDashboard(r,d,o,{...u.query,dataProductDefinitionsPath:s}));const S=await W(y,i,r,d,u,s);return{executionData:{executionId:p,tableId:R,...l&&{dataProductDefinitionsPath:s}},childExecutionData:S,queryData:u}},Y=async({token:e,reportId:t,definitionPath:r,services:a,definition:i})=>{const d=(await a.reportingService.getDefinitions(e,r)).find(p=>p.id===t)?.name,{name:o,description:n,sections:c,filterFields:u}=i;return{reportName:d,name:o,description:n,sections:c||[],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,r,a)=>{const{token:i,definitionsPath:s}=D.default.getValues(t),{reportId:l,id:d,variantId:o,type:n}=e.params;return await(n===f.ReportType.REPORT?a.reportingService:a.dashboardService).getDefinition(i,l,o||d,s)},ee=async(e,t,r,a,i,s)=>{const{reportId:l,id:d}=e.params;let o=await x.default.renderFilters(r,a);o.filters=w.default.setUserContextDefaults(t,o.filters);let n;return t.locals.saveDefaultsEnabled&&(n=await i.defaultFilterValuesService.get(s,l,d,C.FiltersType.REQUEST)),n&&(o=w.default.setFilterValuesFromSavedDefaults(o.filters,o.sortBy||[],n)),o.filters=U.default.setFilterValuesFromRequest(o.filters,e),{filtersData:o,defaultFilterValues:n}},B=async({req:e,res:t,services:r})=>{const{token:a}=D.default.getValues(t),i={req:e,res:t,token:a},{executionData:s,queryData:l,childExecutionData:d}=await X({...i,dashboardService:r.dashboardService,reportingService:r.reportingService});if(s.executionId&&s.tableId)await O({req:e,res:t,services:r,queryData:l,executionData:s,childExecutionData:d});else throw new Error("No execution data returned");return s},N=async({req:e,res:t,services:r})=>{const{token:a,dprUser:i,definitionsPath:s}=D.default.getValues(t),{reportId:l,id:d,executionId:o,type:n}=e.params;let c=r.reportingService;n===f.ReportType.REPORT&&(c=r.reportingService),n===f.ReportType.DASHBOARD&&(c=r.dashboardService);const u=await c.cancelAsyncRequest(a,l,d,o,s);u&&u.cancellationSucceeded&&await r.requestedReportService.updateStatus(o,i.id,f.RequestStatus.ABORTED)},k=async({req:e,res:t,services:r,next:a})=>{try{const{token:i,csrfToken:s,definitionsPath:l,dpdPathFromQuery:d,dprUser:o}=D.default.getValues(t),{reportId:n,type:c,id:u}=e.params,{definition:p}=t.locals,R=e.query.defaultsSaved,m={token:i,reportId:n,definitionPath:l,services:r};let y,S,v,M,F=[],P,A,I,b=[];if(c===f.ReportType.REPORT&&({name:y,reportName:S,description:v,fields:F,interactive:A}=await Z(p)),c===f.ReportType.DASHBOARD&&({name:y,reportName:S,description:v,sections:P,fields:F}=await Y({...m,definition:p})),F){const V=await ee(e,t,F,A||!1,r,o.id);b=V.defaultFilterValues||b,I=V.filtersData}const _={reportName:S,name:y,description:v,reportId:n,id:u,...d&&{definitionPath:l},csrfToken:s,template:M,sections:P,hasDefaults:b?.length>0,defaultsSaved:R,type:c,saveDefaultsEnabled:t.locals.saveDefaultsEnabled};return{title:`Request ${c}`,filtersDescription:`Customise your ${c} using the filters below and submit your request.`,filtersData:I,reportData:_}}catch(i){return a(i),!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});
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+__export(utils_exports, {
+  cancelRequest: () => cancelRequest,
+  default: () => utils_default,
+  getDefintionByType: () => getDefintionByType,
+  getFiltersFromReqBody: () => getFiltersFromReqBody,
+  renderRequest: () => renderRequest,
+  request: () => request,
+  updateStore: () => updateStore
+});
+module.exports = __toCommonJS(utils_exports);
+var import_utils = __toESM(require("../../../../components/_async/async-filters-form/utils"));
+var import_localsHelper = __toESM(require("../../../../utils/localsHelper"));
+var import_utils2 = __toESM(require("../../../../components/_filters/utils"));
+var import_reportStoreHelper = require("../../../../utils/reportStoreHelper");
+var import_UserStoreItemBuilder = __toESM(require("../../../../utils/UserStoreItemBuilder"));
+var import_UserReports = require("../../../../types/UserReports");
+var import_personalisationUtils = __toESM(require("../../../../utils/Personalisation/personalisationUtils"));
+var import_filtersTypeEnum = require("../../../../components/_filters/filtersTypeEnum");
+const updateStore = async ({
+  req,
+  res,
+  services,
+  queryData,
+  executionData,
+  childExecutionData
+}) => {
+  const { search, id, type } = req.body;
+  const { dprUser, definitionsPath, dpdPathFromQuery } = import_localsHelper.default.getValues(res);
+  await (0, import_reportStoreHelper.removeDuplicates)({ storeService: services.requestedReportService, userId: dprUser.id, id, search });
+  await (0, import_reportStoreHelper.removeDuplicates)({ storeService: services.recentlyViewedService, userId: dprUser.id, id, search });
+  const requestFormData = req.body;
+  const reportData = {
+    type: requestFormData.type,
+    reportId: requestFormData.reportId,
+    reportName: requestFormData.reportName,
+    description: requestFormData.description,
+    id: requestFormData.id,
+    name: requestFormData.name
+  };
+  let requestedReportData;
+  switch (type) {
+    case import_UserReports.ReportType.REPORT:
+      requestedReportData = new import_UserStoreItemBuilder.default(reportData, requestFormData).addExecutionData(executionData).addChildExecutionData(childExecutionData).addFilters(queryData?.filterData).addSortData(queryData?.sortData).addDefinitionsPath(definitionsPath, dpdPathFromQuery).addRequestUrls(req).addQuery(queryData).addStatus(import_UserReports.RequestStatus.SUBMITTED).addTimestamp().build();
+      break;
+    case import_UserReports.ReportType.DASHBOARD: {
+      requestedReportData = new import_UserStoreItemBuilder.default(reportData, requestFormData).addExecutionData(executionData).addChildExecutionData(childExecutionData).addFilters(queryData?.filterData).addDefinitionsPath(definitionsPath, dpdPathFromQuery).addRequestUrls(req).addQuery(queryData).addStatus(import_UserReports.RequestStatus.SUBMITTED).addTimestamp().addMetrics(JSON.parse(req.body.sections)).build();
+      break;
+    }
+    default:
+      break;
+  }
+  if (requestedReportData) await services.requestedReportService.addReport(dprUser.id, requestedReportData);
+};
+async function requestChildReports(childVariants, reportingService, token, reportId, queryData, dataProductDefinitionsPath) {
+  let query;
+  if (queryData) {
+    query = queryData.query;
+    delete query["sortColumn"];
+    delete query["sortedAsc"];
+  }
+  return Promise.all(
+    childVariants.map(
+      (childVariant) => reportingService.requestAsyncReport(token, reportId, childVariant.id, {
+        ...query && 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 };
+      })
+    )
+  );
+}
+const requestProduct = async ({
+  req,
+  res,
+  token,
+  dashboardService,
+  reportingService
+}) => {
+  const { definitionsPath: dataProductDefinitionsPath, dpdPathFromQuery } = import_localsHelper.default.getValues(res);
+  const { reportId, id, type } = req.body;
+  let fields;
+  let queryData;
+  let executionId;
+  let tableId;
+  let definition;
+  let childVariants = [];
+  if (type === import_UserReports.ReportType.REPORT) {
+    definition = await reportingService.getDefinition(token, reportId, id, dataProductDefinitionsPath);
+    fields = definition?.variant.specification?.fields || [];
+    queryData = import_utils.default.setQueryFromFilters(req, fields);
+    ({ executionId, tableId } = await reportingService.requestAsyncReport(token, reportId, id, {
+      ...queryData.query,
+      dataProductDefinitionsPath
+    }));
+    childVariants = definition.variant.childVariants ?? [];
+  }
+  if (type === import_UserReports.ReportType.DASHBOARD) {
+    definition = await dashboardService.getDefinition(token, reportId, id, dataProductDefinitionsPath);
+    fields = definition?.filterFields || [];
+    queryData = import_utils.default.setQueryFromFilters(req, fields);
+    ({ executionId, tableId } = await dashboardService.requestAsyncDashboard(token, reportId, id, {
+      ...queryData.query,
+      dataProductDefinitionsPath
+    }));
+  }
+  const childExecutionData = await requestChildReports(
+    childVariants,
+    reportingService,
+    token,
+    reportId,
+    queryData,
+    dataProductDefinitionsPath
+  );
+  const executionData = {
+    executionId,
+    tableId,
+    ...dpdPathFromQuery && { dataProductDefinitionsPath }
+  };
+  return {
+    executionData,
+    childExecutionData,
+    queryData
+  };
+};
+const renderDashboardRequestData = async ({
+  token,
+  reportId,
+  definitionPath,
+  services,
+  definition
+}) => {
+  const productDefinitions = await services.reportingService.getDefinitions(token, definitionPath);
+  const productDefinition = productDefinitions.find(
+    (def) => def.id === reportId
+  );
+  const reportName = productDefinition?.name;
+  const { name, description, sections, filterFields: fields } = definition;
+  return {
+    reportName,
+    name,
+    description,
+    sections: sections || [],
+    fields: fields || []
+  };
+};
+const renderReportRequestData = async (definition) => {
+  return {
+    definition,
+    reportName: definition.name,
+    name: definition.variant.name,
+    description: definition.variant.description || definition.description,
+    template: definition.variant.specification,
+    fields: definition?.variant?.specification?.fields || [],
+    interactive: definition?.variant?.interactive
+  };
+};
+const getDefintionByType = async (req, res, _next, services) => {
+  const { token, definitionsPath } = import_localsHelper.default.getValues(res);
+  const { reportId, id, variantId, type } = req.params;
+  const service = type === import_UserReports.ReportType.REPORT ? services.reportingService : services.dashboardService;
+  const definition = await service.getDefinition(token, reportId, variantId || id, definitionsPath);
+  return definition;
+};
+const getFilterData = async (req, res, fields, interactive, services, userId) => {
+  const { reportId, id } = req.params;
+  let filtersData = await import_utils.default.renderFilters(fields, interactive);
+  filtersData.filters = import_personalisationUtils.default.setUserContextDefaults(res, filtersData.filters);
+  let defaultFilterValues;
+  if (res.locals["saveDefaultsEnabled"]) {
+    defaultFilterValues = await services.defaultFilterValuesService.get(userId, reportId, id, import_filtersTypeEnum.FiltersType.REQUEST);
+  }
+  if (defaultFilterValues) {
+    filtersData = import_personalisationUtils.default.setFilterValuesFromSavedDefaults(
+      filtersData.filters,
+      filtersData.sortBy || [],
+      defaultFilterValues
+    );
+  }
+  filtersData.filters = import_utils2.default.setFilterValuesFromRequest(filtersData.filters, req);
+  return { filtersData, defaultFilterValues };
+};
+const request = async ({ req, res, services }) => {
+  const { token } = import_localsHelper.default.getValues(res);
+  const requestArgs = { req, res, token };
+  const { executionData, queryData, childExecutionData } = await requestProduct({
+    ...requestArgs,
+    dashboardService: services.dashboardService,
+    reportingService: services.reportingService
+  });
+  if (executionData.executionId && executionData.tableId) {
+    await updateStore({
+      req,
+      res,
+      services,
+      queryData,
+      executionData,
+      childExecutionData
+    });
+  } else {
+    throw new Error("No execution data returned");
+  }
+  return executionData;
+};
+const cancelRequest = async ({ req, res, services }) => {
+  const { token, dprUser, definitionsPath } = import_localsHelper.default.getValues(res);
+  const { reportId, id, executionId, type } = req.params;
+  let service = services.reportingService;
+  if (type === import_UserReports.ReportType.REPORT) service = services.reportingService;
+  if (type === import_UserReports.ReportType.DASHBOARD) service = services.dashboardService;
+  const response = await service.cancelAsyncRequest(token, reportId, id, executionId, definitionsPath);
+  if (response && response["cancellationSucceeded"]) {
+    await services.requestedReportService.updateStatus(executionId, dprUser.id, import_UserReports.RequestStatus.ABORTED);
+  }
+};
+const renderRequest = async ({
+  req,
+  res,
+  services,
+  next
+}) => {
+  try {
+    const { token, csrfToken, definitionsPath: definitionPath, dpdPathFromQuery, dprUser } = import_localsHelper.default.getValues(res);
+    const { reportId, type, id } = req.params;
+    const { definition } = res.locals;
+    const defaultsSaved = req.query["defaultsSaved"];
+    const definitionApiArgs = { token, reportId, definitionPath, services };
+    let name;
+    let reportName;
+    let description;
+    let template;
+    let fields = [];
+    let sections;
+    let interactive;
+    let filtersData;
+    let defaultFilterValues = [];
+    if (type === import_UserReports.ReportType.REPORT) {
+      ;
+      ({ name, reportName, description, fields, interactive } = await renderReportRequestData(definition));
+    }
+    if (type === import_UserReports.ReportType.DASHBOARD) {
+      ;
+      ({ name, reportName, description, sections, fields } = await renderDashboardRequestData({
+        ...definitionApiArgs,
+        definition
+      }));
+    }
+    if (fields) {
+      const filterData = await getFilterData(req, res, fields, interactive || false, services, dprUser.id);
+      defaultFilterValues = filterData.defaultFilterValues || defaultFilterValues;
+      filtersData = filterData.filtersData;
+    }
+    const reportData = {
+      reportName,
+      name,
+      description,
+      reportId,
+      id,
+      ...dpdPathFromQuery && { definitionPath },
+      csrfToken,
+      template,
+      sections,
+      hasDefaults: defaultFilterValues?.length > 0,
+      defaultsSaved,
+      type,
+      saveDefaultsEnabled: res.locals["saveDefaultsEnabled"]
+    };
+    return {
+      title: `Request ${type}`,
+      filtersDescription: `Customise your ${type} using the filters below and submit your request.`,
+      filtersData,
+      reportData
+    };
+  } catch (error) {
+    next(error);
+    return false;
+  }
+};
+const getFiltersFromReqBody = (req) => {
+  return Object.keys(req.body).filter((attr) => attr.includes("filters.")).filter((attr) => !!req.body[attr]).map((attr) => {
+    return { name: attr, value: req.body[attr] };
+  });
+};
+var utils_default = {
+  request,
+  cancelRequest,
+  renderRequest,
+  getFiltersFromReqBody,
+  getDefintionByType
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  cancelRequest,
+  getDefintionByType,
+  getFiltersFromReqBody,
+  renderRequest,
+  request,
+  updateStore
+});
 //# sourceMappingURL=utils.js.map

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

@@ -2,6 +2,6 @@
   "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 { 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  let query: Record<string, string>\n  if (queryData) {\n    query = queryData.query\n    delete query['sortColumn']\n    delete query['sortedAsc']\n  }\n\n  return Promise.all(\n    childVariants.map((childVariant) =>\n      reportingService\n        .requestAsyncReport(token, reportId, childVariant.id, {\n          ...(query && 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  // 1. Get filters from definition with default values\n  let filtersData = <RenderFiltersReturnValue>await FiltersFormUtils.renderFilters(fields, interactive)\n\n  // 2. Update filter values with user context values. eg. establishmnent code\n  filtersData.filters = PersonalistionUtils.setUserContextDefaults(res, filtersData.filters)\n\n  // 3. Update filter values with saved defaults\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  // 4. Overwrite filter values with query param values\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.executionId && executionData.tableId) {\n    await updateStore({\n      req,\n      res,\n      services,\n      queryData,\n      executionData,\n      childExecutionData,\n    })\n  } else {\n    throw new Error('No execution data returned')\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": "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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", "query", "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"]
+  "mappings": "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",
+  "names": ["import_utils", "LocalsHelper", "UserStoreItemBuilder", "FiltersFormUtils", "PersonalistionUtils", "FiltersUtils"]
 }

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

@@ -1,2 +1,101 @@
-"use strict";var $=Object.create;var n=Object.defineProperty;var S=Object.getOwnPropertyDescriptor;var q=Object.getOwnPropertyNames;var O=Object.getPrototypeOf,A=Object.prototype.hasOwnProperty;var E=(e,r)=>{for(var t in r)n(e,t,{get:r[t],enumerable:!0})},R=(e,r,t,o)=>{if(r&&typeof r=="object"||typeof r=="function")for(let s of q(r))!A.call(e,s)&&s!==t&&n(e,s,{get:()=>r[s],enumerable:!(o=S(r,s))||o.enumerable});return e};var u=(e,r,t)=>(t=e!=null?$(O(e)):{},R(r||!e||!e.__esModule?n(t,"default",{value:e,enumerable:!0}):t,e)),B=e=>R(n({},"__esModule",{value:!0}),e);var N={};E(N,{Redirects:()=>x,RequestReportRoutes:()=>C,Routes:()=>g});module.exports=B(N);var d=require("express"),l=u(require("./controller")),f=u(require("./filters/routes")),I=u(require("./status/routes")),c=u(require("../../../middleware/reportAuthoriser"));function g({layoutPath:e,services:r}){const t=(0,d.Router)({mergeParams:!0}),o=new l.default(e,r);return t.post("/:type/:reportId/:id/:executionId/cancel",o.CANCEL),t.use("/:type/:reportId/:id/filters",(0,c.default)(r,e),(0,f.default)({layoutPath:e,services:r}),o.errorHandler),t.use("/:type/:reportId/:id/:executionId/status",(0,c.default)(r,e),(0,I.default)({layoutPath:e,services:r}),o.errorHandler),t.get("/:type/:reportId/:id/:executionId/cancel/failed",(s,p,a)=>{const m=JSON.parse(s.flash("ERROR_BODY")?.[0]||""),i=JSON.parse(s.flash("ERROR_PARAMS")?.[0]||""),y=s.flash("ERROR");p.render("dpr/routes/journeys/view-report/error",{layoutPath:e,...m&&{...m},...i&&{...i},error:y,params:i})}),t}function x(){const e=(0,d.Router)({mergeParams:!0});return e.get("/async/:type/:reportId/:id/request",(r,t)=>{const{type:o,reportId:s,id:p}=r.params;t.redirect(`${t.locals.nestedBaseUrl}/dpr/request-report/${o}/${s}/${p}/filters`)}),e.get("/async/:type/:reportId/:id/request/:executionId",(r,t)=>{const{type:o,reportId:s,id:p,executionId:a}=r.params;t.redirect(`${t.locals.nestedBaseUrl}/dpr/request-report/${o}/${s}/${p}/${a}/status`)}),e}const C=({services:e,path:r,layoutPath:t})=>{const o=(0,d.Router)({mergeParams:!0});return o.use(r,g({services:e,layoutPath:t})),o.use("/",x()),o};0&&(module.exports={Redirects,RequestReportRoutes,Routes});
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var routes_exports = {};
+__export(routes_exports, {
+  Redirects: () => Redirects,
+  RequestReportRoutes: () => RequestReportRoutes,
+  Routes: () => Routes
+});
+module.exports = __toCommonJS(routes_exports);
+var import_express = require("express");
+var import_node = require("@sentry/node");
+var import_controller = __toESM(require("./controller"));
+var import_routes = __toESM(require("./filters/routes"));
+var import_routes2 = __toESM(require("./status/routes"));
+var import_reportAuthoriser = __toESM(require("../../../middleware/reportAuthoriser"));
+function Routes({ layoutPath, services }) {
+  const router = (0, import_express.Router)({ mergeParams: true });
+  const controller = new import_controller.default(layoutPath, services);
+  router.post(`/:type/:reportId/:id/:executionId/cancel`, controller.CANCEL);
+  router.use(
+    `/:type/:reportId/:id/filters`,
+    (0, import_reportAuthoriser.default)(services, layoutPath),
+    (0, import_routes.default)({ layoutPath, services }),
+    controller.errorHandler
+  );
+  router.use(
+    `/:type/:reportId/:id/:executionId/status`,
+    (0, import_reportAuthoriser.default)(services, layoutPath),
+    (0, import_routes2.default)({ layoutPath, services }),
+    controller.errorHandler
+  );
+  router.get(`/:type/:reportId/:id/:executionId/cancel/failed`, (req, res, _next) => {
+    const body = JSON.parse(req.flash("ERROR_BODY")?.[0] || "");
+    const params = JSON.parse(req.flash("ERROR_PARAMS")?.[0] || "");
+    const error = req.flash("ERROR");
+    (0, import_node.captureException)(error);
+    res.render(`dpr/routes/journeys/view-report/error`, {
+      layoutPath,
+      ...body && { ...body },
+      ...params && { ...params },
+      error,
+      params
+    });
+  });
+  return router;
+}
+function Redirects() {
+  const router = (0, import_express.Router)({ mergeParams: true });
+  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`);
+  });
+  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`);
+  });
+  return router;
+}
+const RequestReportRoutes = ({
+  services,
+  path,
+  layoutPath
+}) => {
+  const router = (0, import_express.Router)({ mergeParams: true });
+  router.use(path, Routes({ services, layoutPath }));
+  router.use("/", Redirects());
+  return router;
+};
+// Annotate the CommonJS export names for ESM import in node:
+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\n  router.post(`/:type/:reportId/:id/:executionId/cancel`, controller.CANCEL)\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  router.get(`/:type/:reportId/:id/:executionId/cancel/failed`, (req, res, _next) => {\n    const body = JSON.parse(req.flash('ERROR_BODY')?.[0] || '')\n    const params = JSON.parse(req.flash('ERROR_PARAMS')?.[0] || '')\n    const error = req.flash('ERROR')\n\n    res.render(`dpr/routes/journeys/view-report/error`, {\n      layoutPath,\n      ...(body && { ...body }),\n      ...(params && { ...params }),\n      error,\n      params,\n    })\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,EAEnE,OAAAC,EAAO,KAAK,2CAA4CC,EAAW,MAAM,EACzED,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,EAEAD,EAAO,IAAI,kDAAmD,CAACM,EAAKC,EAAKC,IAAU,CACjF,MAAMC,EAAO,KAAK,MAAMH,EAAI,MAAM,YAAY,IAAI,CAAC,GAAK,EAAE,EACpDI,EAAS,KAAK,MAAMJ,EAAI,MAAM,cAAc,IAAI,CAAC,GAAK,EAAE,EACxDK,EAAQL,EAAI,MAAM,OAAO,EAE/BC,EAAI,OAAO,wCAAyC,CAClD,WAAAT,EACA,GAAIW,GAAQ,CAAE,GAAGA,CAAK,EACtB,GAAIC,GAAU,CAAE,GAAGA,CAAO,EAC1B,MAAAC,EACA,OAAAD,CACF,CAAC,CACH,CAAC,EAEMV,CACT,CAEO,SAASV,GAAY,CAC1B,MAAMU,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAG3C,OAAAA,EAAO,IAAI,qCAAsC,CAACM,EAAKC,IAAQ,CAC7D,KAAM,CAAE,KAAAK,EAAM,SAAAC,EAAU,GAAAC,CAAG,EAAIR,EAAI,OACnCC,EAAI,SAAS,GAAGA,EAAI,OAAO,aAAgB,uBAAuBK,CAAI,IAAIC,CAAQ,IAAIC,CAAE,UAAU,CACpG,CAAC,EAGDd,EAAO,IAAI,kDAAmD,CAACM,EAAKC,IAAQ,CAC1E,KAAM,CAAE,KAAAK,EAAM,SAAAC,EAAU,GAAAC,EAAI,YAAAC,CAAY,EAAIT,EAAI,OAChDC,EAAI,SAAS,GAAGA,EAAI,OAAO,aAAgB,uBAAuBK,CAAI,IAAIC,CAAQ,IAAIC,CAAE,IAAIC,CAAW,SAAS,CAClH,CAAC,EAEMf,CACT,CAEO,MAAMT,EAAsB,CAAC,CAClC,SAAAQ,EACA,KAAAiB,EACA,WAAAlB,CACF,IAIM,CACJ,MAAME,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAC3C,OAAAA,EAAO,IAAIgB,EAAMxB,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", "_next", "body", "params", "error", "type", "reportId", "id", "executionId", "path"]
+  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport { captureException } from '@sentry/node'\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\n  router.post(`/:type/:reportId/:id/:executionId/cancel`, controller.CANCEL)\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  router.get(`/:type/:reportId/:id/:executionId/cancel/failed`, (req, res, _next) => {\n    const body = JSON.parse(req.flash('ERROR_BODY')?.[0] || '')\n    const params = JSON.parse(req.flash('ERROR_PARAMS')?.[0] || '')\n    const error = req.flash('ERROR')\n\n    captureException(error)\n    res.render(`dpr/routes/journeys/view-report/error`, {\n      layoutPath,\n      ...(body && { ...body }),\n      ...(params && { ...params }),\n      error,\n      params,\n    })\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": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,qBAAuB;AACvB,kBAAiC;AAEjC,wBAAoC;AAGpC,oBAAgC;AAChC,IAAAA,iBAAgC;AAGhC,8BAA6B;AAEtB,SAAS,OAAO,EAAE,YAAY,SAAS,GAA+C;AAC3F,QAAM,aAAS,uBAAO,EAAE,aAAa,KAAK,CAAC;AAE3C,QAAM,aAAa,IAAI,kBAAAC,QAAwB,YAAY,QAAQ;AAEnE,SAAO,KAAK,4CAA4C,WAAW,MAAM;AACzE,SAAO;AAAA,IACL;AAAA,QACA,wBAAAC,SAAiB,UAAU,UAAU;AAAA,QACrC,cAAAC,SAAoB,EAAE,YAAY,SAAS,CAAC;AAAA,IAC5C,WAAW;AAAA,EACb;AACA,SAAO;AAAA,IACL;AAAA,QACA,wBAAAD,SAAiB,UAAU,UAAU;AAAA,QACrC,eAAAE,SAAoB,EAAE,YAAY,SAAS,CAAC;AAAA,IAC5C,WAAW;AAAA,EACb;AAEA,SAAO,IAAI,mDAAmD,CAAC,KAAK,KAAK,UAAU;AACjF,UAAM,OAAO,KAAK,MAAM,IAAI,MAAM,YAAY,IAAI,CAAC,KAAK,EAAE;AAC1D,UAAM,SAAS,KAAK,MAAM,IAAI,MAAM,cAAc,IAAI,CAAC,KAAK,EAAE;AAC9D,UAAM,QAAQ,IAAI,MAAM,OAAO;AAE/B,sCAAiB,KAAK;AACtB,QAAI,OAAO,yCAAyC;AAAA,MAClD;AAAA,MACA,GAAI,QAAQ,EAAE,GAAG,KAAK;AAAA,MACtB,GAAI,UAAU,EAAE,GAAG,OAAO;AAAA,MAC1B;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH,CAAC;AAED,SAAO;AACT;AAEO,SAAS,YAAY;AAC1B,QAAM,aAAS,uBAAO,EAAE,aAAa,KAAK,CAAC;AAG3C,SAAO,IAAI,sCAAsC,CAAC,KAAK,QAAQ;AAC7D,UAAM,EAAE,MAAM,UAAU,GAAG,IAAI,IAAI;AACnC,QAAI,SAAS,GAAG,IAAI,OAAO,eAAe,CAAC,uBAAuB,IAAI,IAAI,QAAQ,IAAI,EAAE,UAAU;AAAA,EACpG,CAAC;AAGD,SAAO,IAAI,mDAAmD,CAAC,KAAK,QAAQ;AAC1E,UAAM,EAAE,MAAM,UAAU,IAAI,YAAY,IAAI,IAAI;AAChD,QAAI,SAAS,GAAG,IAAI,OAAO,eAAe,CAAC,uBAAuB,IAAI,IAAI,QAAQ,IAAI,EAAE,IAAI,WAAW,SAAS;AAAA,EAClH,CAAC;AAED,SAAO;AACT;AAEO,MAAM,sBAAsB,CAAC;AAAA,EAClC;AAAA,EACA;AAAA,EACA;AACF,MAIM;AACJ,QAAM,aAAS,uBAAO,EAAE,aAAa,KAAK,CAAC;AAC3C,SAAO,IAAI,MAAM,OAAO,EAAE,UAAU,WAAW,CAAC,CAAC;AACjD,SAAO,IAAI,KAAK,UAAU,CAAC;AAE3B,SAAO;AACT;",
+  "names": ["import_routes", "RequestReportController", "reportAuthoriser", "requestReportRoutes", "requestStatusRoutes"]
 }

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

@@ -1,5 +1,6 @@
 /* eslint-disable no-param-reassign */
 import { Router } from 'express'
+import { captureException } from '@sentry/node'
 import { Services } from '../../../types/Services'
 import RequestReportController from './controller'
 
@@ -34,6 +35,7 @@ export function Routes({ layoutPath, services }: { services: Services; layoutPat
     const params = JSON.parse(req.flash('ERROR_PARAMS')?.[0] || '')
     const error = req.flash('ERROR')
 
+    captureException(error)
     res.render(`dpr/routes/journeys/view-report/error`, {
       layoutPath,
       ...(body && { ...body }),