@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.27.0 → 4.28.1

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

@@ -1,2 +1,53 @@
-"use strict";var d=Object.create;var i=Object.defineProperty;var l=Object.getOwnPropertyDescriptor;var m=Object.getOwnPropertyNames;var n=Object.getPrototypeOf,v=Object.prototype.hasOwnProperty;var u=(e,r)=>{for(var s in r)i(e,s,{get:r[s],enumerable:!0})},a=(e,r,s,o)=>{if(r&&typeof r=="object"||typeof r=="function")for(let t of m(r))!v.call(e,t)&&t!==s&&i(e,t,{get:()=>r[t],enumerable:!(o=l(r,t))||o.enumerable});return e};var R=(e,r,s)=>(s=e!=null?d(n(e)):{},a(r||!e||!e.__esModule?i(s,"default",{value:e,enumerable:!0}):s,e)),S=e=>a(i({},"__esModule",{value:!0}),e);var q={};u(q,{RequestedReportsController:()=>c,default:()=>f});module.exports=S(q);var p=R(require("../../../../utils/localsHelper"));class c{services;constructor(r){this.services=r}POST=async(r,s)=>{const{dprUser:o}=p.default.getValues(s),{id:t}=r.params;await this.services.requestedReportService.removeReport(t,o.id),s.end()}}var f=c;0&&(module.exports={RequestedReportsController});
+"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, {
+  RequestedReportsController: () => RequestedReportsController,
+  default: () => controller_default
+});
+module.exports = __toCommonJS(controller_exports);
+var import_localsHelper = __toESM(require("../../../../utils/localsHelper"));
+class RequestedReportsController {
+  services;
+  constructor(services) {
+    this.services = services;
+  }
+  POST = async (req, res) => {
+    const { dprUser } = import_localsHelper.default.getValues(res);
+    const { id } = req.params;
+    await this.services.requestedReportService.removeReport(id, dprUser.id);
+    res.end();
+  };
+}
+var controller_default = RequestedReportsController;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  RequestedReportsController
+});
 //# sourceMappingURL=controller.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../../../../src/dpr/routes/journeys/my-reports/requested-reports/controller.ts"],
+  "sources": ["../../../../../dpr/routes/journeys/my-reports/requested-reports/controller.ts"],
   "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../types/Services'\nimport LocalsHelper from '../../../../utils/localsHelper'\n\nclass RequestedReportsController {\n  services: Services\n\n  constructor(services: Services) {\n    this.services = services\n  }\n\n  POST: RequestHandler = async (req, res) => {\n    const { dprUser } = LocalsHelper.getValues(res)\n    const { id } = req.params\n    await this.services.requestedReportService.removeReport(id, dprUser.id)\n    res.end()\n  }\n}\n\nexport { RequestedReportsController }\nexport default RequestedReportsController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,gCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAyB,6CAEzB,MAAMH,CAA2B,CAC/B,SAEA,YAAYI,EAAoB,CAC9B,KAAK,SAAWA,CAClB,CAEA,KAAuB,MAAOC,EAAKC,IAAQ,CACzC,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUF,CAAG,EACxC,CAAE,GAAAG,CAAG,EAAIJ,EAAI,OACnB,MAAM,KAAK,SAAS,uBAAuB,aAAaI,EAAIF,EAAQ,EAAE,EACtED,EAAI,IAAI,CACV,CACF,CAGA,IAAOL,EAAQD",
-  "names": ["controller_exports", "__export", "RequestedReportsController", "controller_default", "__toCommonJS", "import_localsHelper", "services", "req", "res", "dprUser", "LocalsHelper", "id"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,0BAAyB;AAEzB,MAAM,2BAA2B;AAAA,EAC/B;AAAA,EAEA,YAAY,UAAoB;AAC9B,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,OAAuB,OAAO,KAAK,QAAQ;AACzC,UAAM,EAAE,QAAQ,IAAI,oBAAAA,QAAa,UAAU,GAAG;AAC9C,UAAM,EAAE,GAAG,IAAI,IAAI;AACnB,UAAM,KAAK,SAAS,uBAAuB,aAAa,IAAI,QAAQ,EAAE;AACtE,QAAI,IAAI;AAAA,EACV;AACF;AAGA,IAAO,qBAAQ;",
+  "names": ["LocalsHelper"]
 }

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

@@ -1,2 +1,66 @@
-"use strict";var d=Object.create;var i=Object.defineProperty;var m=Object.getOwnPropertyDescriptor;var q=Object.getOwnPropertyNames;var y=Object.getPrototypeOf,R=Object.prototype.hasOwnProperty;var f=(e,t)=>{for(var r in t)i(e,r,{get:t[r],enumerable:!0})},p=(e,t,r,o)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of q(t))!R.call(e,s)&&s!==r&&i(e,s,{get:()=>t[s],enumerable:!(o=m(t,s))||o.enumerable});return e};var a=(e,t,r)=>(r=e!=null?d(y(e)):{},p(t||!e||!e.__esModule?i(r,"default",{value:e,enumerable:!0}):r,e)),h=e=>p(i({},"__esModule",{value:!0}),e);var L={};f(L,{RequestedReportsListController:()=>l,default:()=>v});module.exports=h(L);var u=a(require("../../../../../components/user-reports/requested/utils")),n=a(require("../../../../../components/user-reports/utils")),c=a(require("../../../../../utils/localsHelper"));class l{layoutPath;services;constructor(t,r){this.layoutPath=t,this.services=r}GET=async(t,r)=>{const{requestedReports:o}=c.default.getValues(r),s=await n.default.renderList({reportsData:o,filterFunction:u.default.filterReports,res:r,type:"requested"});r.render("dpr/routes/journeys/my-reports/view",{title:"Requested reports",id:"requested-reports-list",layoutPath:this.layoutPath,...s})}}var v=l;0&&(module.exports={RequestedReportsListController});
+"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, {
+  RequestedReportsListController: () => RequestedReportsListController,
+  default: () => controller_default
+});
+module.exports = __toCommonJS(controller_exports);
+var import_utils = __toESM(require("../../../../../components/user-reports/requested/utils"));
+var import_utils2 = __toESM(require("../../../../../components/user-reports/utils"));
+var import_localsHelper = __toESM(require("../../../../../utils/localsHelper"));
+class RequestedReportsListController {
+  layoutPath;
+  services;
+  constructor(layoutPath, services) {
+    this.layoutPath = layoutPath;
+    this.services = services;
+  }
+  GET = async (_req, res) => {
+    const { requestedReports } = import_localsHelper.default.getValues(res);
+    const listParams = await import_utils2.default.renderList({
+      reportsData: requestedReports,
+      filterFunction: import_utils.default.filterReports,
+      res,
+      type: "requested"
+    });
+    res.render(`dpr/routes/journeys/my-reports/view`, {
+      title: "Requested reports",
+      id: "requested-reports-list",
+      layoutPath: this.layoutPath,
+      ...listParams
+    });
+  };
+}
+var controller_default = RequestedReportsListController;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  RequestedReportsListController
+});
 //# sourceMappingURL=controller.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../../../../../src/dpr/routes/journeys/my-reports/requested-reports/list/controller.ts"],
+  "sources": ["../../../../../../dpr/routes/journeys/my-reports/requested-reports/list/controller.ts"],
   "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../../types/Services'\n\nimport AsyncRequestListUtils from '../../../../../components/user-reports/requested/utils'\nimport UserReportsListUtils from '../../../../../components/user-reports/utils'\nimport LocalsHelper from '../../../../../utils/localsHelper'\n\nclass RequestedReportsListController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  GET: RequestHandler = async (_req, res) => {\n    const { requestedReports } = LocalsHelper.getValues(res)\n\n    const listParams = await UserReportsListUtils.renderList({\n      reportsData: requestedReports,\n      filterFunction: AsyncRequestListUtils.filterReports,\n      res,\n      type: 'requested',\n    })\n\n    res.render(`dpr/routes/journeys/my-reports/view`, {\n      title: 'Requested reports',\n      id: 'requested-reports-list',\n      layoutPath: this.layoutPath,\n      ...listParams,\n    })\n  }\n}\n\nexport { RequestedReportsListController }\nexport default RequestedReportsListController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,oCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAGA,IAAAK,EAAkC,qEAClCA,EAAiC,2DACjCC,EAAyB,gDAEzB,MAAMJ,CAA+B,CACnC,WAEA,SAEA,YAAYK,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAEA,IAAsB,MAAOC,EAAMC,IAAQ,CACzC,KAAM,CAAE,iBAAAC,CAAiB,EAAI,EAAAC,QAAa,UAAUF,CAAG,EAEjDG,EAAa,MAAM,EAAAC,QAAqB,WAAW,CACvD,YAAaH,EACb,eAAgB,EAAAI,QAAsB,cACtC,IAAAL,EACA,KAAM,WACR,CAAC,EAEDA,EAAI,OAAO,sCAAuC,CAChD,MAAO,oBACP,GAAI,yBACJ,WAAY,KAAK,WACjB,GAAGG,CACL,CAAC,CACH,CACF,CAGA,IAAOV,EAAQD",
-  "names": ["controller_exports", "__export", "RequestedReportsListController", "controller_default", "__toCommonJS", "import_utils", "import_localsHelper", "layoutPath", "services", "_req", "res", "requestedReports", "LocalsHelper", "listParams", "UserReportsListUtils", "AsyncRequestListUtils"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,mBAAkC;AAClC,IAAAA,gBAAiC;AACjC,0BAAyB;AAEzB,MAAM,+BAA+B;AAAA,EACnC;AAAA,EAEA;AAAA,EAEA,YAAY,YAAoB,UAAoB;AAClD,SAAK,aAAa;AAClB,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,MAAsB,OAAO,MAAM,QAAQ;AACzC,UAAM,EAAE,iBAAiB,IAAI,oBAAAC,QAAa,UAAU,GAAG;AAEvD,UAAM,aAAa,MAAM,cAAAC,QAAqB,WAAW;AAAA,MACvD,aAAa;AAAA,MACb,gBAAgB,aAAAC,QAAsB;AAAA,MACtC;AAAA,MACA,MAAM;AAAA,IACR,CAAC;AAED,QAAI,OAAO,uCAAuC;AAAA,MAChD,OAAO;AAAA,MACP,IAAI;AAAA,MACJ,YAAY,KAAK;AAAA,MACjB,GAAG;AAAA,IACL,CAAC;AAAA,EACH;AACF;AAGA,IAAO,qBAAQ;",
+  "names": ["import_utils", "LocalsHelper", "UserReportsListUtils", "AsyncRequestListUtils"]
 }

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

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../../../../../src/dpr/routes/journeys/my-reports/requested-reports/list/routes.ts"],
+  "sources": ["../../../../../../dpr/routes/journeys/my-reports/requested-reports/list/routes.ts"],
   "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport RequestedReportsListController from './controller'\nimport { Services } from '../../../../../types/Services'\n\nexport function routes({ layoutPath, services }: { layoutPath: string; services: Services }) {\n  const router = Router({ mergeParams: true })\n\n  const controller = new RequestedReportsListController(layoutPath, services)\n  router.get(`/`, controller.GET)\n\n  return router\n}\n\nexport default routes\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBACvBC,EAA2C,2BAGpC,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAA+BJ,EAAYC,CAAQ,EAC1E,OAAAC,EAAO,IAAI,IAAKC,EAAW,GAAG,EAEvBD,CACT,CAEA,IAAOP,EAAQC",
-  "names": ["routes_exports", "__export", "routes_default", "routes", "__toCommonJS", "import_express", "import_controller", "layoutPath", "services", "router", "controller", "RequestedReportsListController"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,qBAAuB;AACvB,wBAA2C;AAGpC,SAAS,OAAO,EAAE,YAAY,SAAS,GAA+C;AAC3F,QAAM,aAAS,uBAAO,EAAE,aAAa,KAAK,CAAC;AAE3C,QAAM,aAAa,IAAI,kBAAAA,QAA+B,YAAY,QAAQ;AAC1E,SAAO,IAAI,KAAK,WAAW,GAAG;AAE9B,SAAO;AACT;AAEA,IAAO,iBAAQ;",
+  "names": ["RequestedReportsListController"]
 }

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

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

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../../../../../src/dpr/routes/journeys/my-reports/requested-reports/list/tests.cy.ts"],
+  "sources": ["../../../../../../dpr/routes/journeys/my-reports/requested-reports/list/tests.cy.ts"],
   "sourcesContent": ["context('Requested report list', () => {\n  const path = '/embedded/platform/dpr/my-reports/requested-reports/list'\n\n  before(() => {\n    cy.task('resetStubs')\n    cy.task('resetRedis')\n    cy.task('stubDefinitions')\n    cy.task('stubSingleSummaries')\n  })\n\n  it('is accessible', () => {\n    cy.visit(path)\n    cy.injectAxe()\n    cy.checkA11y()\n  })\n})\n"],
-  "mappings": "aAAA,QAAQ,wBAAyB,IAAM,CACrC,MAAMA,EAAO,2DAEb,OAAO,IAAM,CACX,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,iBAAiB,EACzB,GAAG,KAAK,qBAAqB,CAC/B,CAAC,EAED,GAAG,gBAAiB,IAAM,CACxB,GAAG,MAAMA,CAAI,EACb,GAAG,UAAU,EACb,GAAG,UAAU,CACf,CAAC,CACH,CAAC",
-  "names": ["path"]
+  "mappings": ";AAAA,QAAQ,yBAAyB,MAAM;AACrC,QAAM,OAAO;AAEb,SAAO,MAAM;AACX,OAAG,KAAK,YAAY;AACpB,OAAG,KAAK,YAAY;AACpB,OAAG,KAAK,iBAAiB;AACzB,OAAG,KAAK,qBAAqB;AAAA,EAC/B,CAAC;AAED,KAAG,iBAAiB,MAAM;AACxB,OAAG,MAAM,IAAI;AACb,OAAG,UAAU;AACb,OAAG,UAAU;AAAA,EACf,CAAC;AACH,CAAC;",
+  "names": []
 }

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

@@ -1,2 +1,50 @@
-"use strict";var f=Object.create;var i=Object.defineProperty;var a=Object.getOwnPropertyDescriptor;var R=Object.getOwnPropertyNames;var d=Object.getPrototypeOf,P=Object.prototype.hasOwnProperty;var S=(r,t)=>{for(var o in t)i(r,o,{get:t[o],enumerable:!0})},u=(r,t,o,s)=>{if(t&&typeof t=="object"||typeof t=="function")for(let e of R(t))!P.call(r,e)&&e!==o&&i(r,e,{get:()=>t[e],enumerable:!(s=a(t,e))||s.enumerable});return r};var m=(r,t,o)=>(o=r!=null?f(d(r)):{},u(t||!r||!r.__esModule?i(o,"default",{value:r,enumerable:!0}):o,r)),g=r=>u(i({},"__esModule",{value:!0}),r);var x={};S(x,{default:()=>v,routes:()=>c});module.exports=g(x);var n=require("express"),l=m(require("./controller")),p=m(require("./list/routes"));function c({layoutPath:r,services:t}){const o=(0,n.Router)({mergeParams:!0}),s=new l.default(t);return o.post("/:id",s.POST),o.use("/list",(0,p.default)({layoutPath:r,services:t})),o}var v=c;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"));
+var import_routes = __toESM(require("./list/routes"));
+function routes({ layoutPath, services }) {
+  const router = (0, import_express.Router)({ mergeParams: true });
+  const controller = new import_controller.default(services);
+  router.post("/:id", controller.POST);
+  router.use(`/list`, (0, import_routes.default)({ layoutPath, services }));
+  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/my-reports/requested-reports/routes.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../../../../src/dpr/routes/journeys/my-reports/requested-reports/routes.ts"],
+  "sources": ["../../../../../dpr/routes/journeys/my-reports/requested-reports/routes.ts"],
   "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport { Services } from '../../../../types/Services'\nimport RequestedReportsController from './controller'\nimport listRoutes from './list/routes'\n\nexport function routes({ layoutPath, services }: { layoutPath: string; services: Services }) {\n  const router = Router({ mergeParams: true })\n\n  const controller = new RequestedReportsController(services)\n  router.post('/:id', controller.POST)\n\n  router.use(`/list`, listRoutes({ layoutPath, services }))\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,mBAEvBC,EAAuC,2BACvCC,EAAuB,4BAEhB,SAASJ,EAAO,CAAE,WAAAK,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAA2BH,CAAQ,EAC1D,OAAAC,EAAO,KAAK,OAAQC,EAAW,IAAI,EAEnCD,EAAO,IAAI,WAAS,EAAAG,SAAW,CAAE,WAAAL,EAAY,SAAAC,CAAS,CAAC,CAAC,EACjDC,CACT,CAEA,IAAOR,EAAQC",
-  "names": ["routes_exports", "__export", "routes_default", "routes", "__toCommonJS", "import_express", "import_controller", "import_routes", "layoutPath", "services", "router", "controller", "RequestedReportsController", "listRoutes"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,qBAAuB;AAEvB,wBAAuC;AACvC,oBAAuB;AAEhB,SAAS,OAAO,EAAE,YAAY,SAAS,GAA+C;AAC3F,QAAM,aAAS,uBAAO,EAAE,aAAa,KAAK,CAAC;AAE3C,QAAM,aAAa,IAAI,kBAAAA,QAA2B,QAAQ;AAC1D,SAAO,KAAK,QAAQ,WAAW,IAAI;AAEnC,SAAO,IAAI,aAAS,cAAAC,SAAW,EAAE,YAAY,SAAS,CAAC,CAAC;AACxD,SAAO;AACT;AAEA,IAAO,iBAAQ;",
+  "names": ["RequestedReportsController", "listRoutes"]
 }

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

@@ -1,2 +1,201 @@
-"use strict";var y=Object.create;var R=Object.defineProperty;var x=Object.getOwnPropertyDescriptor;var I=Object.getOwnPropertyNames;var D=Object.getPrototypeOf,v=Object.prototype.hasOwnProperty;var E=(i,e)=>{for(var t in e)R(i,t,{get:e[t],enumerable:!0})},f=(i,e,t,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of I(e))!v.call(i,r)&&r!==t&&R(i,r,{get:()=>e[r],enumerable:!(s=x(e,r))||s.enumerable});return i};var m=(i,e,t)=>(t=i!=null?y(D(i)):{},f(e||!i||!i.__esModule?R(t,"default",{value:i,enumerable:!0}):t,i)),C=i=>f(R({},"__esModule",{value:!0}),i);var b={};E(b,{RequestedReportService:()=>l,default:()=>P});module.exports=C(b);var o=require("../../../../types/UserReports"),h=m(require("../../../../services/reportStoreService")),q=require("../../../../utils/urlHelper"),S=m(require("../../../../utils/logger"));class l extends h.default{constructor(e){super(e)}async addReport(e,t){const s=await this.getState(e);s.requestedReports.unshift(t),await this.saveState(e,s)}async removeReport(e,t){const s=await this.getState(t),r=this.findIndexByExecutionId(e,s.requestedReports);s.requestedReports.splice(r,1),await this.saveState(t,s)}async getReportByExecutionId(e,t){return(await this.getState(t)).requestedReports.find(r=>r.executionId===e)}async getReportByTableId(e,t){return(await this.getState(t)).requestedReports.find(r=>r.tableId===e)}async getAllReports(e){return(await this.getState(e)).requestedReports}async getAllReportsById(e,t){return(await this.getState(t)).requestedReports.filter(r=>r.id&&r.id===e||r.variantId&&r.variantId===e)}async updateLastViewed(e,t){const s=await this.getState(t),r=this.findIndexByExecutionId(e,s.requestedReports),a=s.requestedReports[r];a.timestamp.lastViewed=new Date,s.requestedReports[r]=a,await this.saveState(t,s)}async updateStatus(e,t,s,r){const a=await this.getState(t),d=this.findIndexByExecutionId(e,a.requestedReports);let n=a.requestedReports[d];n&&(n=this.updateDataByStatus(n,s,r)),a.requestedReports[d]=n,await this.saveState(t,a)}async setToExpired(e,t){const s=await this.getState(t),r=this.findIndexByExecutionId(e,s.requestedReports);let a=s.requestedReports[r];a&&(a={...a,status:o.RequestStatus.EXPIRED,timestamp:{...a.timestamp,expired:new Date}},s.requestedReports[r]=a,await this.saveState(t,s))}async cleanList(e,t){const a=(await this.getState(e)).requestedReports.filter(n=>n.timestamp.lastViewed!==void 0);let d=0;await Promise.all(a.map(async n=>{const{executionId:p}=n;!t.find(g=>{const{executionId:c}=g;return c&&c===p})&&p&&(await this.removeReport(p,e),d+=1)})),d>0&&S.default.info(`RequestedReports: Removed ${d} stale reports from list`)}setReportUrl(e){const{tableId:t,url:s,dpdPathFromQuery:r,dataProductDefinitionsPath:a,type:d}=e;let n,p;if(s&&s.polling?.pathname){let u=Array.from(new Array(2));u=s.polling.pathname.replace("/request-report","/view-report/async").split("/"),u[u.length-2]=t,u[u.length-1]=d;const g=u.join("/"),c=s.report?.search?s.report.search:"",w=a&&r?`${(0,q.getDpdPathSuffix)(a)}`:"";n=`${g}${c||w}`,p=`${s.origin}${n}`}return{pathname:n,fullUrl:p}}updateDataByStatus(e,t,s){const r=new Date;switch(t&&(e.status=t),t){case o.RequestStatus.FAILED:e.timestamp.failed=r,s&&(e.errorMessage=s);break;case o.RequestStatus.EXPIRED:e.timestamp.expired=r;break;case o.RequestStatus.ABORTED:e.timestamp.aborted=r;break;case o.RequestStatus.FINISHED:{e.timestamp.completed=r,e.url&&(e.url.report={...e.url.report,...this.setReportUrl(e)});break}case o.RequestStatus.SUBMITTED:e.timestamp.requested=r;break;case o.RequestStatus.STARTED:case o.RequestStatus.PICKED:break;default:e.timestamp.lastViewed=r;break}return e}}var P=l;0&&(module.exports={RequestedReportService});
+"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 service_exports = {};
+__export(service_exports, {
+  RequestedReportService: () => RequestedReportService,
+  default: () => service_default
+});
+module.exports = __toCommonJS(service_exports);
+var import_UserReports = require("../../../../types/UserReports");
+var import_reportStoreService = __toESM(require("../../../../services/reportStoreService"));
+var import_urlHelper = require("../../../../utils/urlHelper");
+var import_logger = __toESM(require("../../../../utils/logger"));
+class RequestedReportService extends import_reportStoreService.default {
+  constructor(userDataStore) {
+    super(userDataStore);
+  }
+  async addReport(userId, reportStateData) {
+    const userConfig = await this.getState(userId);
+    userConfig.requestedReports.unshift(reportStateData);
+    await this.saveState(userId, userConfig);
+  }
+  async removeReport(id, userId) {
+    const userConfig = await this.getState(userId);
+    const index = this.findIndexByExecutionId(id, userConfig.requestedReports);
+    userConfig.requestedReports.splice(index, 1);
+    await this.saveState(userId, userConfig);
+  }
+  async getReportByExecutionId(id, userId) {
+    const userConfig = await this.getState(userId);
+    return userConfig.requestedReports.find((report) => report.executionId === id);
+  }
+  async getReportByTableId(id, userId) {
+    const userConfig = await this.getState(userId);
+    return userConfig.requestedReports.find((report) => report.tableId === id);
+  }
+  async getAllReports(userId) {
+    const userConfig = await this.getState(userId);
+    return userConfig.requestedReports;
+  }
+  async getAllReportsById(id, userId) {
+    const userConfig = await this.getState(userId);
+    return userConfig.requestedReports.filter((requested) => {
+      return requested.id && requested.id === id || requested.variantId && requested.variantId === id;
+    });
+  }
+  async updateLastViewed(id, userId) {
+    const userConfig = await this.getState(userId);
+    const index = this.findIndexByExecutionId(id, userConfig.requestedReports);
+    const report = userConfig.requestedReports[index];
+    report.timestamp.lastViewed = /* @__PURE__ */ new Date();
+    userConfig.requestedReports[index] = report;
+    await this.saveState(userId, userConfig);
+  }
+  async updateStatus(id, userId, status, errorMessage) {
+    const userConfig = await this.getState(userId);
+    const index = this.findIndexByExecutionId(id, userConfig.requestedReports);
+    let report = userConfig.requestedReports[index];
+    if (report) report = this.updateDataByStatus(report, status, errorMessage);
+    userConfig.requestedReports[index] = report;
+    await this.saveState(userId, userConfig);
+  }
+  async setToExpired(id, userId) {
+    const userConfig = await this.getState(userId);
+    const index = this.findIndexByExecutionId(id, userConfig.requestedReports);
+    let report = userConfig.requestedReports[index];
+    if (report) {
+      report = {
+        ...report,
+        status: import_UserReports.RequestStatus.EXPIRED,
+        timestamp: {
+          ...report.timestamp,
+          expired: /* @__PURE__ */ new Date()
+        }
+      };
+      userConfig.requestedReports[index] = report;
+      await this.saveState(userId, userConfig);
+    }
+  }
+  /**
+   * Removes old stale data from requested reports
+   * - When a report is viewed it is given a lastViewed ts.
+   * - If the requested data has a lastViewed ts and
+   * - has no corresponding viewed entry
+   * - then that requested data is stale and can be removed
+   *
+   * @param {string} userId
+   * @param {StoredReportData[]} viewedReports
+   * @memberof RequestedReportService
+   */
+  async cleanList(userId, viewedReports) {
+    const userConfig = await this.getState(userId);
+    const allRequested = userConfig.requestedReports;
+    const viewedRequestedReports = allRequested.filter((requestedReport) => {
+      return requestedReport.timestamp.lastViewed !== void 0;
+    });
+    let count = 0;
+    await Promise.all(
+      viewedRequestedReports.map(async (viewedRequestReport) => {
+        const { executionId } = viewedRequestReport;
+        const viewedReport = viewedReports.find((report) => {
+          const { executionId: viewedExecutionId } = report;
+          return viewedExecutionId && viewedExecutionId === executionId;
+        });
+        if (!viewedReport && executionId) {
+          await this.removeReport(executionId, userId);
+          count += 1;
+        }
+      })
+    );
+    if (count > 0) import_logger.default.info(`RequestedReports: Removed ${count} stale reports from list`);
+  }
+  setReportUrl(report) {
+    const { tableId, url, dpdPathFromQuery, dataProductDefinitionsPath, type } = report;
+    let pathname;
+    let fullUrl;
+    if (url && url.polling?.pathname) {
+      let reportUrlArr = Array.from(new Array(2));
+      reportUrlArr = url.polling.pathname.replace("/request-report", "/view-report/async").split("/");
+      reportUrlArr[reportUrlArr.length - 2] = tableId;
+      reportUrlArr[reportUrlArr.length - 1] = type;
+      const reportUrl = reportUrlArr.join("/");
+      const search = url.report?.search ? url.report.search : "";
+      const dpdPath = dataProductDefinitionsPath && dpdPathFromQuery ? `${(0, import_urlHelper.getDpdPathSuffix)(dataProductDefinitionsPath)}` : "";
+      const searchPath = search || dpdPath;
+      pathname = `${reportUrl}${searchPath}`;
+      fullUrl = `${url.origin}${pathname}`;
+    }
+    return {
+      pathname,
+      fullUrl
+    };
+  }
+  updateDataByStatus(report, status, errorMessage) {
+    const ts = /* @__PURE__ */ new Date();
+    if (status) report.status = status;
+    switch (status) {
+      case import_UserReports.RequestStatus.FAILED:
+        report.timestamp.failed = ts;
+        if (errorMessage) report.errorMessage = errorMessage;
+        break;
+      case import_UserReports.RequestStatus.EXPIRED:
+        report.timestamp.expired = ts;
+        break;
+      case import_UserReports.RequestStatus.ABORTED:
+        report.timestamp.aborted = ts;
+        break;
+      case import_UserReports.RequestStatus.FINISHED: {
+        report.timestamp.completed = ts;
+        if (report.url) {
+          report.url.report = {
+            ...report.url.report,
+            ...this.setReportUrl(report)
+          };
+        }
+        break;
+      }
+      case import_UserReports.RequestStatus.SUBMITTED:
+        report.timestamp.requested = ts;
+        break;
+      case import_UserReports.RequestStatus.STARTED:
+      case import_UserReports.RequestStatus.PICKED:
+        break;
+      default:
+        report.timestamp.lastViewed = ts;
+        break;
+    }
+    return report;
+  }
+}
+var service_default = RequestedReportService;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  RequestedReportService
+});
 //# sourceMappingURL=service.js.map

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

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