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

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/routes/journeys/request-report/controller.ts"],
-  "sourcesContent": ["import { ErrorRequestHandler, RequestHandler } from 'express'\nimport { Services } from '../../../types/Services'\nimport AsyncRequestUtils from './filters/utils'\nimport ErrorHandler from '../../../utils/ErrorHandler'\n\nclass RequestReportController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  errorHandler: ErrorRequestHandler = async (_error, req, res, _next) => {\n    res.render(`dpr/routes/journeys/view-report/error`, {\n      layoutPath: this.layoutPath,\n      ...(req.body && { ...req.body }),\n      ...req.params,\n      error: req.body?.error,\n      params: req?.params,\n    })\n  }\n\n  CANCEL: RequestHandler = async (req, res, _next) => {\n    try {\n      await AsyncRequestUtils.cancelRequest({\n        req,\n        res,\n        services: this.services,\n      })\n    } catch (error) {\n      req.body ??= {}\n      req.body.title = 'Failed to abort request'\n      req.body.errorDescription = 'We were unable to abort the report request for the following reason:'\n      req.body.error = new ErrorHandler(error).formatError()\n\n      req.flash('ERROR_BODY', JSON.stringify(req.body))\n      req.flash('ERROR_PARAMS', JSON.stringify(req.params))\n      req.flash('ERROR', JSON.stringify(req.body?.error || {}))\n\n      return res.redirect(`${req.originalUrl}/failed`)\n    }\n    return res.redirect(req.originalUrl.replace('/cancel', '/status'))\n  }\n}\n\nexport { RequestReportController }\nexport default RequestReportController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAA8B,8BAC9BC,EAAyB,0CAEzB,MAAMJ,CAAwB,CAC5B,WAEA,SAEA,YAAYK,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAEA,aAAoC,MAAOC,EAAQC,EAAKC,EAAKC,IAAU,CACrED,EAAI,OAAO,wCAAyC,CAClD,WAAY,KAAK,WACjB,GAAID,EAAI,MAAQ,CAAE,GAAGA,EAAI,IAAK,EAC9B,GAAGA,EAAI,OACP,MAAOA,EAAI,MAAM,MACjB,OAAQA,GAAK,MACf,CAAC,CACH,EAEA,OAAyB,MAAOA,EAAKC,EAAKC,IAAU,CAClD,GAAI,CACF,MAAM,EAAAC,QAAkB,cAAc,CACpC,IAAAH,EACA,IAAAC,EACA,SAAU,KAAK,QACjB,CAAC,CACH,OAASG,EAAO,CACd,OAAAJ,EAAI,OAAS,CAAC,EACdA,EAAI,KAAK,MAAQ,0BACjBA,EAAI,KAAK,iBAAmB,uEAC5BA,EAAI,KAAK,MAAQ,IAAI,EAAAK,QAAaD,CAAK,EAAE,YAAY,EAErDJ,EAAI,MAAM,aAAc,KAAK,UAAUA,EAAI,IAAI,CAAC,EAChDA,EAAI,MAAM,eAAgB,KAAK,UAAUA,EAAI,MAAM,CAAC,EACpDA,EAAI,MAAM,QAAS,KAAK,UAAUA,EAAI,MAAM,OAAS,CAAC,CAAC,CAAC,EAEjDC,EAAI,SAAS,GAAGD,EAAI,WAAW,SAAS,CACjD,CACA,OAAOC,EAAI,SAASD,EAAI,YAAY,QAAQ,UAAW,SAAS,CAAC,CACnE,CACF,CAGA,IAAOP,EAAQD",
-  "names": ["controller_exports", "__export", "RequestReportController", "controller_default", "__toCommonJS", "import_utils", "import_ErrorHandler", "layoutPath", "services", "_error", "req", "res", "_next", "AsyncRequestUtils", "error", "ErrorHandler"]
+  "sourcesContent": ["import { ErrorRequestHandler, RequestHandler } from 'express'\nimport { captureException } from '@sentry/node'\nimport { Services } from '../../../types/Services'\nimport AsyncRequestUtils from './filters/utils'\nimport ErrorHandler from '../../../utils/ErrorHandler'\n\nclass RequestReportController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  errorHandler: ErrorRequestHandler = async (error, req, res, _next) => {\n    captureException(error)\n    res.render(`dpr/routes/journeys/view-report/error`, {\n      layoutPath: this.layoutPath,\n      ...(req.body && { ...req.body }),\n      ...req.params,\n      error: req.body?.error,\n      params: req?.params,\n    })\n  }\n\n  CANCEL: RequestHandler = async (req, res, _next) => {\n    try {\n      await AsyncRequestUtils.cancelRequest({\n        req,\n        res,\n        services: this.services,\n      })\n    } catch (error) {\n      req.body ??= {}\n      req.body.title = 'Failed to abort request'\n      req.body.errorDescription = 'We were unable to abort the report request for the following reason:'\n      req.body.error = new ErrorHandler(error).formatError()\n\n      req.flash('ERROR_BODY', JSON.stringify(req.body))\n      req.flash('ERROR_PARAMS', JSON.stringify(req.params))\n      req.flash('ERROR', JSON.stringify(req.body?.error || {}))\n\n      return res.redirect(`${req.originalUrl}/failed`)\n    }\n    return res.redirect(req.originalUrl.replace('/cancel', '/status'))\n  }\n}\n\nexport { RequestReportController }\nexport default RequestReportController\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAiC;AAEjC,mBAA8B;AAC9B,0BAAyB;AAEzB,MAAM,wBAAwB;AAAA,EAC5B;AAAA,EAEA;AAAA,EAEA,YAAY,YAAoB,UAAoB;AAClD,SAAK,aAAa;AAClB,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,eAAoC,OAAO,OAAO,KAAK,KAAK,UAAU;AACpE,sCAAiB,KAAK;AACtB,QAAI,OAAO,yCAAyC;AAAA,MAClD,YAAY,KAAK;AAAA,MACjB,GAAI,IAAI,QAAQ,EAAE,GAAG,IAAI,KAAK;AAAA,MAC9B,GAAG,IAAI;AAAA,MACP,OAAO,IAAI,MAAM;AAAA,MACjB,QAAQ,KAAK;AAAA,IACf,CAAC;AAAA,EACH;AAAA,EAEA,SAAyB,OAAO,KAAK,KAAK,UAAU;AAClD,QAAI;AACF,YAAM,aAAAA,QAAkB,cAAc;AAAA,QACpC;AAAA,QACA;AAAA,QACA,UAAU,KAAK;AAAA,MACjB,CAAC;AAAA,IACH,SAAS,OAAO;AACd,UAAI,SAAS,CAAC;AACd,UAAI,KAAK,QAAQ;AACjB,UAAI,KAAK,mBAAmB;AAC5B,UAAI,KAAK,QAAQ,IAAI,oBAAAC,QAAa,KAAK,EAAE,YAAY;AAErD,UAAI,MAAM,cAAc,KAAK,UAAU,IAAI,IAAI,CAAC;AAChD,UAAI,MAAM,gBAAgB,KAAK,UAAU,IAAI,MAAM,CAAC;AACpD,UAAI,MAAM,SAAS,KAAK,UAAU,IAAI,MAAM,SAAS,CAAC,CAAC,CAAC;AAExD,aAAO,IAAI,SAAS,GAAG,IAAI,WAAW,SAAS;AAAA,IACjD;AACA,WAAO,IAAI,SAAS,IAAI,YAAY,QAAQ,WAAW,SAAS,CAAC;AAAA,EACnE;AACF;AAGA,IAAO,qBAAQ;",
+  "names": ["AsyncRequestUtils", "ErrorHandler"]
 }

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

@@ -1,4 +1,5 @@
 import { ErrorRequestHandler, RequestHandler } from 'express'
+import { captureException } from '@sentry/node'
 import { Services } from '../../../types/Services'
 import AsyncRequestUtils from './filters/utils'
 import ErrorHandler from '../../../utils/ErrorHandler'
@@ -13,7 +14,8 @@ class RequestReportController {
     this.services = services
   }
 
-  errorHandler: ErrorRequestHandler = async (_error, req, res, _next) => {
+  errorHandler: ErrorRequestHandler = async (error, req, res, _next) => {
+    captureException(error)
     res.render(`dpr/routes/journeys/view-report/error`, {
       layoutPath: this.layoutPath,
       ...(req.body && { ...req.body }),

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

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

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/request-report/filters/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../types/Services'\nimport { RequestDataResult } from '../../../../types/AsyncReportUtils'\nimport AysncRequestUtils from './utils'\nimport PersonalisationUtils from '../../../../utils/Personalisation/personalisationUtils'\nimport { FiltersType } from '../../../../components/_filters/filtersTypeEnum'\nimport ErrorHandler from '../../../../utils/ErrorHandler'\n\nclass RequestReportController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  // Render request page\n  GET: RequestHandler = async (req, res, next) => {\n    try {\n      const requestRenderData = <RequestDataResult>await AysncRequestUtils.renderRequest({\n        req,\n        res,\n        services: this.services,\n        next,\n      })\n\n      res.render(`dpr/routes/journeys/request-report/filters/view`, {\n        layoutPath: this.layoutPath,\n        ...requestRenderData,\n      })\n    } catch (error) {\n      req.body ??= {}\n      req.body.title = 'Request failed'\n      req.body.errorDescription = `Your ${req.params['type']} has failed to generate.`\n      req.body.error = new ErrorHandler(error).formatError()\n      next()\n    }\n  }\n\n  // Request report\n  POST: RequestHandler = async (req, res, next) => {\n    try {\n      const executionData = await AysncRequestUtils.request({\n        req,\n        res,\n        services: this.services,\n        next,\n      })\n\n      const { executionId, dataProductDefinitionsPath } = executionData\n\n      if (executionId) {\n        const redirect = dataProductDefinitionsPath\n          ? `${executionId}/status?dataProductDefinitionsPath=${dataProductDefinitionsPath}`\n          : `${executionId}/status`\n        res.redirect(redirect)\n      } else {\n        res.end()\n      }\n    } catch (error) {\n      const filters = AysncRequestUtils.getFiltersFromReqBody(req)\n\n      req.body = {\n        title: 'Request Failed',\n        errorDescription: `Your ${req.params['type']} has failed to generate.`,\n        error: new ErrorHandler(error).formatError(),\n        retry: true,\n        filters,\n        ...(req.body && { ...req.body }),\n      }\n      next(error)\n    }\n  }\n\n  saveDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      await PersonalisationUtils.saveDefaults(FiltersType.REQUEST, res, req, this.services)\n      res.redirect(`${req.baseUrl}?defaultsSaved=true`)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to save defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...(req.body && { ...req.body }),\n      }\n      next()\n    }\n  }\n\n  removeDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      await PersonalisationUtils.removeDefaults(FiltersType.REQUEST, res, req, this.services)\n      res.redirect(req.baseUrl)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to remove defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...(req.body && { ...req.body }),\n      }\n      next()\n    }\n  }\n}\n\nexport { RequestReportController }\nexport default RequestReportController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAGA,IAAAK,EAA8B,sBAC9BC,EAAiC,qEACjCC,EAA4B,2DAC5BC,EAAyB,6CAEzB,MAAMN,CAAwB,CAC5B,WAEA,SAEA,YAAYO,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAGA,IAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,GAAI,CACF,MAAMC,EAAuC,MAAM,EAAAC,QAAkB,cAAc,CACjF,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,SACf,KAAAC,CACF,CAAC,EAEDD,EAAI,OAAO,kDAAmD,CAC5D,WAAY,KAAK,WACjB,GAAGE,CACL,CAAC,CACH,OAASE,EAAO,CACdL,EAAI,OAAS,CAAC,EACdA,EAAI,KAAK,MAAQ,iBACjBA,EAAI,KAAK,iBAAmB,QAAQA,EAAI,OAAO,IAAO,2BACtDA,EAAI,KAAK,MAAQ,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EACrDH,EAAK,CACP,CACF,EAGA,KAAuB,MAAOF,EAAKC,EAAKC,IAAS,CAC/C,GAAI,CACF,MAAMK,EAAgB,MAAM,EAAAH,QAAkB,QAAQ,CACpD,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,SACf,KAAAC,CACF,CAAC,EAEK,CAAE,YAAAM,EAAa,2BAAAC,CAA2B,EAAIF,EAEpD,GAAIC,EAAa,CACf,MAAME,EAAWD,EACb,GAAGD,CAAW,sCAAsCC,CAA0B,GAC9E,GAAGD,CAAW,UAClBP,EAAI,SAASS,CAAQ,CACvB,MACET,EAAI,IAAI,CAEZ,OAASI,EAAO,CACd,MAAMM,EAAU,EAAAP,QAAkB,sBAAsBJ,CAAG,EAE3DA,EAAI,KAAO,CACT,MAAO,iBACP,iBAAkB,QAAQA,EAAI,OAAO,IAAO,2BAC5C,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,MAAO,GACP,QAAAM,EACA,GAAIX,EAAI,MAAQ,CAAE,GAAGA,EAAI,IAAK,CAChC,EACAE,EAAKG,CAAK,CACZ,CACF,EAEA,wBAA0C,MAAOL,EAAKC,EAAKC,IAAS,CAClE,GAAI,CACF,MAAM,EAAAU,QAAqB,aAAa,cAAY,QAASX,EAAKD,EAAK,KAAK,QAAQ,EACpFC,EAAI,SAAS,GAAGD,EAAI,OAAO,qBAAqB,CAClD,OAASK,EAAO,CACdL,EAAI,KAAO,CACT,MAAO,0BACP,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAIL,EAAI,MAAQ,CAAE,GAAGA,EAAI,IAAK,CAChC,EACAE,EAAK,CACP,CACF,EAEA,0BAA4C,MAAOF,EAAKC,EAAKC,IAAS,CACpE,GAAI,CACF,MAAM,EAAAU,QAAqB,eAAe,cAAY,QAASX,EAAKD,EAAK,KAAK,QAAQ,EACtFC,EAAI,SAASD,EAAI,OAAO,CAC1B,OAASK,EAAO,CACdL,EAAI,KAAO,CACT,MAAO,4BACP,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAIL,EAAI,MAAQ,CAAE,GAAGA,EAAI,IAAK,CAChC,EACAE,EAAK,CACP,CACF,CACF,CAGA,IAAOV,EAAQD",
-  "names": ["controller_exports", "__export", "RequestReportController", "controller_default", "__toCommonJS", "import_utils", "import_personalisationUtils", "import_filtersTypeEnum", "import_ErrorHandler", "layoutPath", "services", "req", "res", "next", "requestRenderData", "AysncRequestUtils", "error", "ErrorHandler", "executionData", "executionId", "dataProductDefinitionsPath", "redirect", "filters", "PersonalisationUtils"]
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../types/Services'\nimport { RequestDataResult } from '../../../../types/AsyncReportUtils'\nimport AysncRequestUtils from './utils'\nimport PersonalisationUtils from '../../../../utils/Personalisation/personalisationUtils'\nimport { FiltersType } from '../../../../components/_filters/filtersTypeEnum'\nimport ErrorHandler from '../../../../utils/ErrorHandler'\n\nclass RequestReportController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  // Render request page\n  GET: RequestHandler = async (req, res, next) => {\n    try {\n      const requestRenderData = <RequestDataResult>await AysncRequestUtils.renderRequest({\n        req,\n        res,\n        services: this.services,\n        next,\n      })\n\n      res.render(`dpr/routes/journeys/request-report/filters/view`, {\n        layoutPath: this.layoutPath,\n        ...requestRenderData,\n      })\n    } catch (error) {\n      req.body ??= {}\n      req.body.title = 'Request failed'\n      req.body.errorDescription = `Your ${req.params['type']} has failed to generate.`\n      req.body.error = new ErrorHandler(error).formatError()\n      next(req.body.error)\n    }\n  }\n\n  // Request report\n  POST: RequestHandler = async (req, res, next) => {\n    try {\n      const executionData = await AysncRequestUtils.request({\n        req,\n        res,\n        services: this.services,\n        next,\n      })\n\n      const { executionId, dataProductDefinitionsPath } = executionData\n\n      if (executionId) {\n        const redirect = dataProductDefinitionsPath\n          ? `${executionId}/status?dataProductDefinitionsPath=${dataProductDefinitionsPath}`\n          : `${executionId}/status`\n        res.redirect(redirect)\n      } else {\n        res.end()\n      }\n    } catch (error) {\n      const filters = AysncRequestUtils.getFiltersFromReqBody(req)\n\n      req.body = {\n        title: 'Request Failed',\n        errorDescription: `Your ${req.params['type']} has failed to generate.`,\n        error: new ErrorHandler(error).formatError(),\n        retry: true,\n        filters,\n        ...(req.body && { ...req.body }),\n      }\n      next(error)\n    }\n  }\n\n  saveDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      await PersonalisationUtils.saveDefaults(FiltersType.REQUEST, res, req, this.services)\n      res.redirect(`${req.baseUrl}?defaultsSaved=true`)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to save defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...(req.body && { ...req.body }),\n      }\n      next(error)\n    }\n  }\n\n  removeDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      await PersonalisationUtils.removeDefaults(FiltersType.REQUEST, res, req, this.services)\n      res.redirect(req.baseUrl)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to remove defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...(req.body && { ...req.body }),\n      }\n      next(error)\n    }\n  }\n}\n\nexport { RequestReportController }\nexport default RequestReportController\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,mBAA8B;AAC9B,kCAAiC;AACjC,6BAA4B;AAC5B,0BAAyB;AAEzB,MAAM,wBAAwB;AAAA,EAC5B;AAAA,EAEA;AAAA,EAEA,YAAY,YAAoB,UAAoB;AAClD,SAAK,aAAa;AAClB,SAAK,WAAW;AAAA,EAClB;AAAA;AAAA,EAGA,MAAsB,OAAO,KAAK,KAAK,SAAS;AAC9C,QAAI;AACF,YAAM,oBAAuC,MAAM,aAAAA,QAAkB,cAAc;AAAA,QACjF;AAAA,QACA;AAAA,QACA,UAAU,KAAK;AAAA,QACf;AAAA,MACF,CAAC;AAED,UAAI,OAAO,mDAAmD;AAAA,QAC5D,YAAY,KAAK;AAAA,QACjB,GAAG;AAAA,MACL,CAAC;AAAA,IACH,SAAS,OAAO;AACd,UAAI,SAAS,CAAC;AACd,UAAI,KAAK,QAAQ;AACjB,UAAI,KAAK,mBAAmB,QAAQ,IAAI,OAAO,MAAM,CAAC;AACtD,UAAI,KAAK,QAAQ,IAAI,oBAAAC,QAAa,KAAK,EAAE,YAAY;AACrD,WAAK,IAAI,KAAK,KAAK;AAAA,IACrB;AAAA,EACF;AAAA;AAAA,EAGA,OAAuB,OAAO,KAAK,KAAK,SAAS;AAC/C,QAAI;AACF,YAAM,gBAAgB,MAAM,aAAAD,QAAkB,QAAQ;AAAA,QACpD;AAAA,QACA;AAAA,QACA,UAAU,KAAK;AAAA,QACf;AAAA,MACF,CAAC;AAED,YAAM,EAAE,aAAa,2BAA2B,IAAI;AAEpD,UAAI,aAAa;AACf,cAAM,WAAW,6BACb,GAAG,WAAW,sCAAsC,0BAA0B,KAC9E,GAAG,WAAW;AAClB,YAAI,SAAS,QAAQ;AAAA,MACvB,OAAO;AACL,YAAI,IAAI;AAAA,MACV;AAAA,IACF,SAAS,OAAO;AACd,YAAM,UAAU,aAAAA,QAAkB,sBAAsB,GAAG;AAE3D,UAAI,OAAO;AAAA,QACT,OAAO;AAAA,QACP,kBAAkB,QAAQ,IAAI,OAAO,MAAM,CAAC;AAAA,QAC5C,OAAO,IAAI,oBAAAC,QAAa,KAAK,EAAE,YAAY;AAAA,QAC3C,OAAO;AAAA,QACP;AAAA,QACA,GAAI,IAAI,QAAQ,EAAE,GAAG,IAAI,KAAK;AAAA,MAChC;AACA,WAAK,KAAK;AAAA,IACZ;AAAA,EACF;AAAA,EAEA,0BAA0C,OAAO,KAAK,KAAK,SAAS;AAClE,QAAI;AACF,YAAM,4BAAAC,QAAqB,aAAa,mCAAY,SAAS,KAAK,KAAK,KAAK,QAAQ;AACpF,UAAI,SAAS,GAAG,IAAI,OAAO,qBAAqB;AAAA,IAClD,SAAS,OAAO;AACd,UAAI,OAAO;AAAA,QACT,OAAO;AAAA,QACP,OAAO,IAAI,oBAAAD,QAAa,KAAK,EAAE,YAAY;AAAA,QAC3C,GAAI,IAAI,QAAQ,EAAE,GAAG,IAAI,KAAK;AAAA,MAChC;AACA,WAAK,KAAK;AAAA,IACZ;AAAA,EACF;AAAA,EAEA,4BAA4C,OAAO,KAAK,KAAK,SAAS;AACpE,QAAI;AACF,YAAM,4BAAAC,QAAqB,eAAe,mCAAY,SAAS,KAAK,KAAK,KAAK,QAAQ;AACtF,UAAI,SAAS,IAAI,OAAO;AAAA,IAC1B,SAAS,OAAO;AACd,UAAI,OAAO;AAAA,QACT,OAAO;AAAA,QACP,OAAO,IAAI,oBAAAD,QAAa,KAAK,EAAE,YAAY;AAAA,QAC3C,GAAI,IAAI,QAAQ,EAAE,GAAG,IAAI,KAAK;AAAA,MAChC;AACA,WAAK,KAAK;AAAA,IACZ;AAAA,EACF;AACF;AAGA,IAAO,qBAAQ;",
+  "names": ["AysncRequestUtils", "ErrorHandler", "PersonalisationUtils"]
 }

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

@@ -35,7 +35,7 @@ class RequestReportController {
       req.body.title = 'Request failed'
       req.body.errorDescription = `Your ${req.params['type']} has failed to generate.`
       req.body.error = new ErrorHandler(error).formatError()
-      next()
+      next(req.body.error)
     }
   }
 
@@ -84,7 +84,7 @@ class RequestReportController {
         error: new ErrorHandler(error).formatError(),
         ...(req.body && { ...req.body }),
       }
-      next()
+      next(error)
     }
   }
 
@@ -98,7 +98,7 @@ class RequestReportController {
         error: new ErrorHandler(error).formatError(),
         ...(req.body && { ...req.body }),
       }
-      next()
+      next(error)
     }
   }
 }

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

@@ -1,2 +1,51 @@
-"use strict";var f=Object.create;var u=Object.defineProperty;var n=Object.getOwnPropertyDescriptor;var p=Object.getOwnPropertyNames;var c=Object.getPrototypeOf,v=Object.prototype.hasOwnProperty;var d=(e,r)=>{for(var t in r)u(e,t,{get:r[t],enumerable:!0})},l=(e,r,t,o)=>{if(r&&typeof r=="object"||typeof r=="function")for(let s of p(r))!v.call(e,s)&&s!==t&&u(e,s,{get:()=>r[s],enumerable:!(o=n(r,s))||o.enumerable});return e};var g=(e,r,t)=>(t=e!=null?f(c(e)):{},l(r||!e||!e.__esModule?u(t,"default",{value:e,enumerable:!0}):t,e)),P=e=>l(u({},"__esModule",{value:!0}),e);var S={};d(S,{default:()=>R,routes:()=>m});module.exports=P(S);var a=require("express"),i=g(require("./controller"));function m({layoutPath:e,services:r}){const t=(0,a.Router)({mergeParams:!0}),o=new i.default(e,r);return t.get("/",o.GET),t.post("/",o.POST),t.post("/save-defaults",o.saveDefaultFilterValues),t.post("/remove-defaults",o.removeDefaultFilterValues),t}var R=m;0&&(module.exports={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, {
+  default: () => routes_default,
+  routes: () => routes
+});
+module.exports = __toCommonJS(routes_exports);
+var import_express = require("express");
+var import_controller = __toESM(require("./controller"));
+function routes({ layoutPath, services }) {
+  const router = (0, import_express.Router)({ mergeParams: true });
+  const controller = new import_controller.default(layoutPath, services);
+  router.get("/", controller.GET);
+  router.post("/", controller.POST);
+  router.post("/save-defaults", controller.saveDefaultFilterValues);
+  router.post("/remove-defaults", controller.removeDefaultFilterValues);
+  return router;
+}
+var routes_default = routes;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  routes
+});
 //# sourceMappingURL=routes.js.map

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/request-report/filters/routes.ts"],
   "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport RequestReportController 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 RequestReportController(layoutPath, services)\n\n  router.get('/', controller.GET)\n  router.post('/', controller.POST)\n  router.post('/save-defaults', controller.saveDefaultFilterValues)\n  router.post('/remove-defaults', controller.removeDefaultFilterValues)\n\n  return router\n}\n\nexport default routes\n"],
-  "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,KAAK,iBAAkBC,EAAW,uBAAuB,EAChED,EAAO,KAAK,mBAAoBC,EAAW,yBAAyB,EAE7DD,CACT,CAEA,IAAOP,EAAQC",
-  "names": ["routes_exports", "__export", "routes_default", "routes", "__toCommonJS", "import_express", "import_controller", "layoutPath", "services", "router", "controller", "RequestReportController"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,qBAAuB;AACvB,wBAAoC;AAG7B,SAAS,OAAO,EAAE,YAAY,SAAS,GAA+C;AAC3F,QAAM,aAAS,uBAAO,EAAE,aAAa,KAAK,CAAC;AAC3C,QAAM,aAAa,IAAI,kBAAAA,QAAwB,YAAY,QAAQ;AAEnE,SAAO,IAAI,KAAK,WAAW,GAAG;AAC9B,SAAO,KAAK,KAAK,WAAW,IAAI;AAChC,SAAO,KAAK,kBAAkB,WAAW,uBAAuB;AAChE,SAAO,KAAK,oBAAoB,WAAW,yBAAyB;AAEpE,SAAO;AACT;AAEA,IAAO,iBAAQ;",
+  "names": ["RequestReportController"]
 }