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

package/dpr/routes/journeys/download-report/request-download/form/submitted/tests.cy.js

@@ -1,2 +1,2 @@
-context("Request download form submitted",()=>{before(()=>{cy.task("resetStubs"),cy.task("resetRedis"),cy.task("stubDefinitions"),cy.task("stubSingleSummaries")}),it("is accessible",()=>{cy.visit("/embedded/platform/dpr/download-report/request-download/request-examples/request-example-success/tableId/tblId_1753863906851/form/submitted?reportName=C%20Test%20Report&variantName=Successful%20Report&reportUrl=/embedded/platform/dpr/view-report/async/report/request-examples/request-example-success/tblId_1753863906851/report"),cy.injectAxe(),cy.checkA11y(),cy.findByText(/Download is now enabled for this report/).should("be.visible")})});
+"use strict";context("Request download form submitted",()=>{before(()=>{cy.task("resetStubs"),cy.task("resetRedis"),cy.task("stubDefinitions"),cy.task("stubSingleSummaries")}),it("is accessible",()=>{cy.visit("/embedded/platform/dpr/download-report/request-download/request-examples/request-example-success/tableId/tblId_1753863906851/form/submitted?reportName=C%20Test%20Report&variantName=Successful%20Report&reportUrl=/embedded/platform/dpr/view-report/async/report/request-examples/request-example-success/tblId_1753863906851/report"),cy.injectAxe(),cy.checkA11y(),cy.findByText(/Download is now enabled for this report/).should("be.visible")})});
 //# sourceMappingURL=tests.cy.js.map

package/dpr/routes/journeys/download-report/request-download/form/submitted/tests.cy.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../../../src/dpr/routes/journeys/download-report/request-download/form/submitted/tests.cy.ts"],
   "sourcesContent": ["context('Request download form submitted', () => {\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(\n      '/embedded/platform/dpr/download-report/request-download/request-examples/request-example-success/tableId/tblId_1753863906851/form/submitted?reportName=C%20Test%20Report&variantName=Successful%20Report&reportUrl=/embedded/platform/dpr/view-report/async/report/request-examples/request-example-success/tblId_1753863906851/report',\n    )\n    cy.injectAxe()\n    cy.checkA11y()\n    cy.findByText(/Download is now enabled for this report/).should('be.visible')\n  })\n})\n"],
-  "mappings": "AAAA,QAAQ,kCAAmC,IAAM,CAC/C,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,MACD,wUACF,EACA,GAAG,UAAU,EACb,GAAG,UAAU,EACb,GAAG,WAAW,yCAAyC,EAAE,OAAO,YAAY,CAC9E,CAAC,CACH,CAAC",
+  "mappings": "aAAA,QAAQ,kCAAmC,IAAM,CAC/C,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,MACD,wUACF,EACA,GAAG,UAAU,EACb,GAAG,UAAU,EACb,GAAG,WAAW,yCAAyC,EAAE,OAAO,YAAY,CAC9E,CAAC,CACH,CAAC",
   "names": []
 }

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

@@ -1,2 +1,2 @@
-context("Request download form",()=>{const e="/embedded/platform/dpr/download-report/request-download/request-examples/request-example-success/tableId/tblId_1753863906851/form?reportUrl=/embedded/platform/dpr/view-report/async/report/request-examples/request-example-success/tblId_1753863906851/report";before(()=>{cy.task("resetStubs"),cy.task("resetRedis"),cy.task("stubDefinitions"),cy.task("stubSingleSummaries"),cy.task("stubDefinitionRequestExamplesSuccess")}),it("is accessible",()=>{cy.visit(e),cy.injectAxe(),cy.checkA11y(),cy.findByRole("heading",{name:/Download request form/}).should("be.visible"),cy.findByRole("button",{name:/Submit request/}).click(),cy.findByRole("link",{name:/provide information on how you will use this data/}).should("be.visible").click(),cy.findByRole("textbox",{name:/Can you provide more detail/}).should("be.focused").type("foo"),cy.findByRole("link",{name:/Enter your Job title/}).should("be.visible").click(),cy.findByRole("textbox",{name:/What is your Job title\?/}).should("be.focused").type("foo"),cy.findByRole("button",{name:/Submit request/}).click(),cy.findByRole("heading",{name:/Download request form/}).should("not.exist")})});
+"use strict";context("Request download form",()=>{const e="/embedded/platform/dpr/download-report/request-download/request-examples/request-example-success/tableId/tblId_1753863906851/form?reportUrl=/embedded/platform/dpr/view-report/async/report/request-examples/request-example-success/tblId_1753863906851/report";before(()=>{cy.task("resetStubs"),cy.task("resetRedis"),cy.task("stubDefinitions"),cy.task("stubSingleSummaries"),cy.task("stubDefinitionRequestExamplesSuccess")}),it("is accessible",()=>{cy.visit(e),cy.injectAxe(),cy.checkA11y(),cy.findByRole("heading",{name:/Download request form/}).should("be.visible"),cy.findByRole("button",{name:/Submit request/}).click(),cy.findByRole("link",{name:/provide information on how you will use this data/}).should("be.visible").click(),cy.findByRole("textbox",{name:/Can you provide more detail/}).should("be.focused").type("foo"),cy.findByRole("link",{name:/Enter your Job title/}).should("be.visible").click(),cy.findByRole("textbox",{name:/What is your Job title\?/}).should("be.focused").type("foo"),cy.findByRole("button",{name:/Submit request/}).click(),cy.findByRole("heading",{name:/Download request form/}).should("not.exist")})});
 //# sourceMappingURL=tests.cy.js.map

package/dpr/routes/journeys/download-report/request-download/form/tests.cy.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/download-report/request-download/form/tests.cy.ts"],
   "sourcesContent": ["context('Request download form', () => {\n  const path =\n    '/embedded/platform/dpr/download-report/request-download/request-examples/request-example-success/tableId/tblId_1753863906851/form?reportUrl=/embedded/platform/dpr/view-report/async/report/request-examples/request-example-success/tblId_1753863906851/report'\n\n  before(() => {\n    cy.task('resetStubs')\n    cy.task('resetRedis')\n    cy.task('stubDefinitions')\n    cy.task('stubSingleSummaries')\n    cy.task('stubDefinitionRequestExamplesSuccess')\n  })\n\n  it('is accessible', () => {\n    cy.visit(path)\n    cy.injectAxe()\n    cy.checkA11y()\n    cy.findByRole('heading', { name: /Download request form/ }).should('be.visible')\n    cy.findByRole('button', { name: /Submit request/ }).click()\n    cy.findByRole('link', { name: /provide information on how you will use this data/ })\n      .should('be.visible')\n      .click()\n    cy.findByRole('textbox', { name: /Can you provide more detail/ })\n      .should('be.focused')\n      .type('foo')\n    cy.findByRole('link', { name: /Enter your Job title/ })\n      .should('be.visible')\n      .click()\n    cy.findByRole('textbox', { name: /What is your Job title\\?/ })\n      .should('be.focused')\n      .type('foo')\n    cy.findByRole('button', { name: /Submit request/ }).click()\n    cy.findByRole('heading', { name: /Download request form/ }).should('not.exist')\n  })\n})\n"],
-  "mappings": "AAAA,QAAQ,wBAAyB,IAAM,CACrC,MAAMA,EACJ,kQAEF,OAAO,IAAM,CACX,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,iBAAiB,EACzB,GAAG,KAAK,qBAAqB,EAC7B,GAAG,KAAK,sCAAsC,CAChD,CAAC,EAED,GAAG,gBAAiB,IAAM,CACxB,GAAG,MAAMA,CAAI,EACb,GAAG,UAAU,EACb,GAAG,UAAU,EACb,GAAG,WAAW,UAAW,CAAE,KAAM,uBAAwB,CAAC,EAAE,OAAO,YAAY,EAC/E,GAAG,WAAW,SAAU,CAAE,KAAM,gBAAiB,CAAC,EAAE,MAAM,EAC1D,GAAG,WAAW,OAAQ,CAAE,KAAM,mDAAoD,CAAC,EAChF,OAAO,YAAY,EACnB,MAAM,EACT,GAAG,WAAW,UAAW,CAAE,KAAM,6BAA8B,CAAC,EAC7D,OAAO,YAAY,EACnB,KAAK,KAAK,EACb,GAAG,WAAW,OAAQ,CAAE,KAAM,sBAAuB,CAAC,EACnD,OAAO,YAAY,EACnB,MAAM,EACT,GAAG,WAAW,UAAW,CAAE,KAAM,0BAA2B,CAAC,EAC1D,OAAO,YAAY,EACnB,KAAK,KAAK,EACb,GAAG,WAAW,SAAU,CAAE,KAAM,gBAAiB,CAAC,EAAE,MAAM,EAC1D,GAAG,WAAW,UAAW,CAAE,KAAM,uBAAwB,CAAC,EAAE,OAAO,WAAW,CAChF,CAAC,CACH,CAAC",
+  "mappings": "aAAA,QAAQ,wBAAyB,IAAM,CACrC,MAAMA,EACJ,kQAEF,OAAO,IAAM,CACX,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,iBAAiB,EACzB,GAAG,KAAK,qBAAqB,EAC7B,GAAG,KAAK,sCAAsC,CAChD,CAAC,EAED,GAAG,gBAAiB,IAAM,CACxB,GAAG,MAAMA,CAAI,EACb,GAAG,UAAU,EACb,GAAG,UAAU,EACb,GAAG,WAAW,UAAW,CAAE,KAAM,uBAAwB,CAAC,EAAE,OAAO,YAAY,EAC/E,GAAG,WAAW,SAAU,CAAE,KAAM,gBAAiB,CAAC,EAAE,MAAM,EAC1D,GAAG,WAAW,OAAQ,CAAE,KAAM,mDAAoD,CAAC,EAChF,OAAO,YAAY,EACnB,MAAM,EACT,GAAG,WAAW,UAAW,CAAE,KAAM,6BAA8B,CAAC,EAC7D,OAAO,YAAY,EACnB,KAAK,KAAK,EACb,GAAG,WAAW,OAAQ,CAAE,KAAM,sBAAuB,CAAC,EACnD,OAAO,YAAY,EACnB,MAAM,EACT,GAAG,WAAW,UAAW,CAAE,KAAM,0BAA2B,CAAC,EAC1D,OAAO,YAAY,EACnB,KAAK,KAAK,EACb,GAAG,WAAW,SAAU,CAAE,KAAM,gBAAiB,CAAC,EAAE,MAAM,EAC1D,GAAG,WAAW,UAAW,CAAE,KAAM,uBAAwB,CAAC,EAAE,OAAO,WAAW,CAChF,CAAC,CACH,CAAC",
   "names": ["path"]
 }

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

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

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/download-report/request-download/routes.ts"],
   "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\n\n// Routes\nimport formRoutes from './form/routes'\nimport { Services } from '../../../../types/Services'\n\nexport function routes({ layoutPath, services }: { layoutPath: string; services: Services }) {\n  const router = Router({ mergeParams: true })\n\n  router.use(`/form`, formRoutes({ layoutPath, services }))\n\n  return router\n}\n\nexport default routes\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBAGvBC,EAAuB,4BAGhB,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAE3C,OAAAA,EAAO,IAAI,WAAS,EAAAC,SAAW,CAAE,WAAAH,EAAY,SAAAC,CAAS,CAAC,CAAC,EAEjDC,CACT,CAEA,IAAOP,EAAQC",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBAGvBC,EAAuB,4BAGhB,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAE3C,OAAAA,EAAO,IAAI,WAAS,EAAAC,SAAW,CAAE,WAAAH,EAAY,SAAAC,CAAS,CAAC,CAAC,EAEjDC,CACT,CAEA,IAAOP,EAAQC",
   "names": ["routes_exports", "__export", "routes_default", "routes", "__toCommonJS", "import_express", "import_routes", "layoutPath", "services", "router", "formRoutes"]
 }

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

@@ -1,2 +1,2 @@
-var c=Object.create;var a=Object.defineProperty;var p=Object.getOwnPropertyDescriptor;var P=Object.getOwnPropertyNames;var D=Object.getPrototypeOf,S=Object.prototype.hasOwnProperty;var u=(n,s)=>{for(var o in s)a(n,o,{get:s[o],enumerable:!0})},l=(n,s,o,t)=>{if(s&&typeof s=="object"||typeof s=="function")for(let i of P(s))!S.call(n,i)&&i!==o&&a(n,i,{get:()=>s[i],enumerable:!(t=p(s,i))||t.enumerable});return n};var m=(n,s,o)=>(o=n!=null?c(D(n)):{},l(s||!n||!n.__esModule?a(o,"default",{value:n,enumerable:!0}):o,n)),h=n=>l(a({},"__esModule",{value:!0}),n);var x={};u(x,{DownloadPermissionService:()=>g,default:()=>v});module.exports=h(x);var d=m(require("../../../../utils/logger")),f=m(require("../../../../services/reportStoreService"));class g extends f.default{constructor(s){super(s),d.default.info("Service created: DownloadPermissionService")}async saveDownloadPermissionData(s,o,t){const i=await this.getState(s);i.downloadPermissions||(i.downloadPermissions=[]),await this.downloadEnabled(s,o,t)||(i.downloadPermissions.push({reportId:o,id:t}),d.default.info(`Download permission granted for ${s}: ${o} - ${t}`),await this.saveState(s,i))}async removeDownloadPermissionData(s,o,t){const i=await this.getState(s),{downloadPermissions:e}=i;if(e){const r=e.findIndex(w=>w.id===t);r>=0&&e.splice(r,1),await this.saveState(s,i)}}async downloadEnabled(s,o,t){const i=await this.getState(s);return i.downloadPermissions?!!i.downloadPermissions.find(r=>r.id===t&&r.reportId===o):!1}async getAllDownloadPermissions(s){return(await this.getState(s)).downloadPermissions}}var v=g;0&&(module.exports={DownloadPermissionService});
+"use strict";var w=Object.create;var a=Object.defineProperty;var c=Object.getOwnPropertyDescriptor;var P=Object.getOwnPropertyNames;var p=Object.getPrototypeOf,u=Object.prototype.hasOwnProperty;var h=(s,o)=>{for(var i in o)a(s,i,{get:o[i],enumerable:!0})},f=(s,o,i,n)=>{if(o&&typeof o=="object"||typeof o=="function")for(let e of P(o))!u.call(s,e)&&e!==i&&a(s,e,{get:()=>o[e],enumerable:!(n=c(o,e))||n.enumerable});return s};var m=(s,o,i)=>(i=s!=null?w(p(s)):{},f(o||!s||!s.__esModule?a(i,"default",{value:s,enumerable:!0}):i,s)),D=s=>f(a({},"__esModule",{value:!0}),s);var b={};h(b,{DownloadPermissionService:()=>l,default:()=>S});module.exports=D(b);var d=m(require("../../../../utils/logger")),g=m(require("../../../../services/reportStoreService"));class l extends g.default{constructor(o,i){super(o),this.enabled=!!i.download,this.enabled||d.default.info("Download: disabled ")}async saveDownloadPermissionData(o,i,n){if(!this.enabled)return;const e=await this.getState(o);e.downloadPermissions||(e.downloadPermissions=[]),await this.downloadEnabledForReport(o,i,n)||(e.downloadPermissions.push({reportId:i,id:n}),d.default.info(`Download permission granted for ${o}: ${i} - ${n}`),await this.saveState(o,e))}async removeDownloadPermissionData(o,i){if(!this.enabled)return;const n=await this.getState(o),{downloadPermissions:e}=n;if(e){const t=e.findIndex(r=>r.id===i);t>=0&&e.splice(t,1),await this.saveState(o,n)}}async downloadEnabledForReport(o,i,n){if(!this.enabled)return!1;const e=await this.getState(o);return e.downloadPermissions?!!e.downloadPermissions.find(r=>r.id===n&&r.reportId===i):!1}async getAllDownloadPermissions(o){return this.enabled?(await this.getState(o)).downloadPermissions||[]:[]}}var S=l;0&&(module.exports={DownloadPermissionService});
 //# sourceMappingURL=service.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/download-report/request-download/service.ts"],
-  "sourcesContent": ["import logger from '../../../../utils/logger'\nimport type { DownloadPermissionConfig } from '../../../../types/Download'\nimport ReportStoreService from '../../../../services/reportStoreService'\nimport UserDataStore from '../../../../data/reportDataStore'\n\nclass DownloadPermissionService extends ReportStoreService {\n  constructor(userDataStore: UserDataStore) {\n    super(userDataStore)\n    logger.info('Service created: DownloadPermissionService')\n  }\n\n  async saveDownloadPermissionData(userId: string, reportId: string, id: string) {\n    const userConfig = await this.getState(userId)\n\n    // Init downloads if not present\n    if (!userConfig.downloadPermissions) {\n      userConfig.downloadPermissions = []\n    }\n    const permissionExists = await this.downloadEnabled(userId, reportId, id)\n    if (!permissionExists) {\n      userConfig.downloadPermissions.push({ reportId, id })\n      logger.info(`Download permission granted for ${userId}: ${reportId} - ${id}`)\n      await this.saveState(userId, userConfig)\n    }\n  }\n\n  async removeDownloadPermissionData(userId: string, reportId: string, id: string) {\n    const userConfig = await this.getState(userId)\n    const { downloadPermissions } = userConfig\n    if (downloadPermissions) {\n      const index = downloadPermissions.findIndex((downloadConfig) => {\n        return downloadConfig.id === id\n      })\n      if (index >= 0) {\n        downloadPermissions.splice(index, 1)\n      }\n      await this.saveState(userId, userConfig)\n    }\n  }\n\n  async downloadEnabled(userId: string, reportId: string, id: string) {\n    const userConfig = await this.getState(userId)\n\n    if (!userConfig.downloadPermissions) return false\n\n    const config = userConfig.downloadPermissions.find((downloadConfig: DownloadPermissionConfig) => {\n      return downloadConfig.id === id && downloadConfig.reportId === reportId\n    })\n    return !!config\n  }\n\n  async getAllDownloadPermissions(userId: string) {\n    const userConfig = await this.getState(userId)\n    return userConfig.downloadPermissions\n  }\n}\n\nexport { DownloadPermissionService }\nexport default DownloadPermissionService\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,+BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAAmB,uCAEnBC,EAA+B,sDAG/B,MAAMJ,UAAkC,EAAAK,OAAmB,CACzD,YAAYC,EAA8B,CACxC,MAAMA,CAAa,EACnB,EAAAC,QAAO,KAAK,4CAA4C,CAC1D,CAEA,MAAM,2BAA2BC,EAAgBC,EAAkBC,EAAY,CAC7E,MAAMC,EAAa,MAAM,KAAK,SAASH,CAAM,EAGxCG,EAAW,sBACdA,EAAW,oBAAsB,CAAC,GAEX,MAAM,KAAK,gBAAgBH,EAAQC,EAAUC,CAAE,IAEtEC,EAAW,oBAAoB,KAAK,CAAE,SAAAF,EAAU,GAAAC,CAAG,CAAC,EACpD,EAAAH,QAAO,KAAK,mCAAmCC,CAAM,KAAKC,CAAQ,MAAMC,CAAE,EAAE,EAC5E,MAAM,KAAK,UAAUF,EAAQG,CAAU,EAE3C,CAEA,MAAM,6BAA6BH,EAAgBC,EAAkBC,EAAY,CAC/E,MAAMC,EAAa,MAAM,KAAK,SAASH,CAAM,EACvC,CAAE,oBAAAI,CAAoB,EAAID,EAChC,GAAIC,EAAqB,CACvB,MAAMC,EAAQD,EAAoB,UAAWE,GACpCA,EAAe,KAAOJ,CAC9B,EACGG,GAAS,GACXD,EAAoB,OAAOC,EAAO,CAAC,EAErC,MAAM,KAAK,UAAUL,EAAQG,CAAU,CACzC,CACF,CAEA,MAAM,gBAAgBH,EAAgBC,EAAkBC,EAAY,CAClE,MAAMC,EAAa,MAAM,KAAK,SAASH,CAAM,EAE7C,OAAKG,EAAW,oBAKT,CAAC,CAHOA,EAAW,oBAAoB,KAAMG,GAC3CA,EAAe,KAAOJ,GAAMI,EAAe,WAAaL,CAChE,EAJ2C,EAM9C,CAEA,MAAM,0BAA0BD,EAAgB,CAE9C,OADmB,MAAM,KAAK,SAASA,CAAM,GAC3B,mBACpB,CACF,CAGA,IAAOP,EAAQD",
-  "names": ["service_exports", "__export", "DownloadPermissionService", "service_default", "__toCommonJS", "import_logger", "import_reportStoreService", "ReportStoreService", "userDataStore", "logger", "userId", "reportId", "id", "userConfig", "downloadPermissions", "index", "downloadConfig"]
+  "sourcesContent": ["import logger from '../../../../utils/logger'\nimport type { DownloadPermissionConfig } from '../../../../types/Download'\nimport ReportStoreService from '../../../../services/reportStoreService'\nimport UserDataStore from '../../../../data/reportDataStore'\nimport { ServiceFeatureConfig } from '../../../../types/DprConfig'\n\nclass DownloadPermissionService extends ReportStoreService {\n  enabled: boolean\n\n  constructor(userDataStore: UserDataStore, serviceFeatureConfig: ServiceFeatureConfig) {\n    super(userDataStore)\n    this.enabled = Boolean(serviceFeatureConfig.download)\n    if (!this.enabled) logger.info(`Download: disabled `)\n  }\n\n  async saveDownloadPermissionData(userId: string, reportId: string, id: string): Promise<void> {\n    if (!this.enabled) return\n\n    const userConfig = await this.getState(userId)\n\n    // Init downloads if not present\n    if (!userConfig.downloadPermissions) {\n      userConfig.downloadPermissions = []\n    }\n    const permissionExists = await this.downloadEnabledForReport(userId, reportId, id)\n    if (!permissionExists) {\n      userConfig.downloadPermissions.push({ reportId, id })\n      logger.info(`Download permission granted for ${userId}: ${reportId} - ${id}`)\n      await this.saveState(userId, userConfig)\n    }\n  }\n\n  async removeDownloadPermissionData(userId: string, id: string): Promise<void> {\n    if (!this.enabled) return\n\n    const userConfig = await this.getState(userId)\n    const { downloadPermissions } = userConfig\n    if (downloadPermissions) {\n      const index = downloadPermissions.findIndex((downloadConfig) => {\n        return downloadConfig.id === id\n      })\n      if (index >= 0) {\n        downloadPermissions.splice(index, 1)\n      }\n      await this.saveState(userId, userConfig)\n    }\n  }\n\n  async downloadEnabledForReport(userId: string, reportId: string, id: string): Promise<boolean> {\n    if (!this.enabled) return false\n\n    const userConfig = await this.getState(userId)\n\n    if (!userConfig.downloadPermissions) return false\n\n    const config = userConfig.downloadPermissions.find((downloadConfig: DownloadPermissionConfig) => {\n      return downloadConfig.id === id && downloadConfig.reportId === reportId\n    })\n    return !!config\n  }\n\n  async getAllDownloadPermissions(userId: string): Promise<DownloadPermissionConfig[]> {\n    if (!this.enabled) return []\n\n    const userConfig = await this.getState(userId)\n    return userConfig.downloadPermissions || []\n  }\n}\n\nexport { DownloadPermissionService }\nexport default DownloadPermissionService\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,+BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAAmB,uCAEnBC,EAA+B,sDAI/B,MAAMJ,UAAkC,EAAAK,OAAmB,CAGzD,YAAYC,EAA8BC,EAA4C,CACpF,MAAMD,CAAa,EACnB,KAAK,QAAU,EAAQC,EAAqB,SACvC,KAAK,SAAS,EAAAC,QAAO,KAAK,qBAAqB,CACtD,CAEA,MAAM,2BAA2BC,EAAgBC,EAAkBC,EAA2B,CAC5F,GAAI,CAAC,KAAK,QAAS,OAEnB,MAAMC,EAAa,MAAM,KAAK,SAASH,CAAM,EAGxCG,EAAW,sBACdA,EAAW,oBAAsB,CAAC,GAEX,MAAM,KAAK,yBAAyBH,EAAQC,EAAUC,CAAE,IAE/EC,EAAW,oBAAoB,KAAK,CAAE,SAAAF,EAAU,GAAAC,CAAG,CAAC,EACpD,EAAAH,QAAO,KAAK,mCAAmCC,CAAM,KAAKC,CAAQ,MAAMC,CAAE,EAAE,EAC5E,MAAM,KAAK,UAAUF,EAAQG,CAAU,EAE3C,CAEA,MAAM,6BAA6BH,EAAgBE,EAA2B,CAC5E,GAAI,CAAC,KAAK,QAAS,OAEnB,MAAMC,EAAa,MAAM,KAAK,SAASH,CAAM,EACvC,CAAE,oBAAAI,CAAoB,EAAID,EAChC,GAAIC,EAAqB,CACvB,MAAMC,EAAQD,EAAoB,UAAWE,GACpCA,EAAe,KAAOJ,CAC9B,EACGG,GAAS,GACXD,EAAoB,OAAOC,EAAO,CAAC,EAErC,MAAM,KAAK,UAAUL,EAAQG,CAAU,CACzC,CACF,CAEA,MAAM,yBAAyBH,EAAgBC,EAAkBC,EAA8B,CAC7F,GAAI,CAAC,KAAK,QAAS,MAAO,GAE1B,MAAMC,EAAa,MAAM,KAAK,SAASH,CAAM,EAE7C,OAAKG,EAAW,oBAKT,CAAC,CAHOA,EAAW,oBAAoB,KAAMG,GAC3CA,EAAe,KAAOJ,GAAMI,EAAe,WAAaL,CAChE,EAJ2C,EAM9C,CAEA,MAAM,0BAA0BD,EAAqD,CACnF,OAAK,KAAK,SAES,MAAM,KAAK,SAASA,CAAM,GAC3B,qBAAuB,CAAC,EAHhB,CAAC,CAI7B,CACF,CAGA,IAAOR,EAAQD",
+  "names": ["service_exports", "__export", "DownloadPermissionService", "service_default", "__toCommonJS", "import_logger", "import_reportStoreService", "ReportStoreService", "userDataStore", "serviceFeatureConfig", "logger", "userId", "reportId", "id", "userConfig", "downloadPermissions", "index", "downloadConfig"]
 }

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

@@ -2,21 +2,27 @@ import logger from '../../../../utils/logger'
 import type { DownloadPermissionConfig } from '../../../../types/Download'
 import ReportStoreService from '../../../../services/reportStoreService'
 import UserDataStore from '../../../../data/reportDataStore'
+import { ServiceFeatureConfig } from '../../../../types/DprConfig'
 
 class DownloadPermissionService extends ReportStoreService {
-  constructor(userDataStore: UserDataStore) {
+  enabled: boolean
+
+  constructor(userDataStore: UserDataStore, serviceFeatureConfig: ServiceFeatureConfig) {
     super(userDataStore)
-    logger.info('Service created: DownloadPermissionService')
+    this.enabled = Boolean(serviceFeatureConfig.download)
+    if (!this.enabled) logger.info(`Download: disabled `)
   }
 
-  async saveDownloadPermissionData(userId: string, reportId: string, id: string) {
+  async saveDownloadPermissionData(userId: string, reportId: string, id: string): Promise<void> {
+    if (!this.enabled) return
+
     const userConfig = await this.getState(userId)
 
     // Init downloads if not present
     if (!userConfig.downloadPermissions) {
       userConfig.downloadPermissions = []
     }
-    const permissionExists = await this.downloadEnabled(userId, reportId, id)
+    const permissionExists = await this.downloadEnabledForReport(userId, reportId, id)
     if (!permissionExists) {
       userConfig.downloadPermissions.push({ reportId, id })
       logger.info(`Download permission granted for ${userId}: ${reportId} - ${id}`)
@@ -24,7 +30,9 @@ class DownloadPermissionService extends ReportStoreService {
     }
   }
 
-  async removeDownloadPermissionData(userId: string, reportId: string, id: string) {
+  async removeDownloadPermissionData(userId: string, id: string): Promise<void> {
+    if (!this.enabled) return
+
     const userConfig = await this.getState(userId)
     const { downloadPermissions } = userConfig
     if (downloadPermissions) {
@@ -38,7 +46,9 @@ class DownloadPermissionService extends ReportStoreService {
     }
   }
 
-  async downloadEnabled(userId: string, reportId: string, id: string) {
+  async downloadEnabledForReport(userId: string, reportId: string, id: string): Promise<boolean> {
+    if (!this.enabled) return false
+
     const userConfig = await this.getState(userId)
 
     if (!userConfig.downloadPermissions) return false
@@ -49,9 +59,11 @@ class DownloadPermissionService extends ReportStoreService {
     return !!config
   }
 
-  async getAllDownloadPermissions(userId: string) {
+  async getAllDownloadPermissions(userId: string): Promise<DownloadPermissionConfig[]> {
+    if (!this.enabled) return []
+
     const userConfig = await this.getState(userId)
-    return userConfig.downloadPermissions
+    return userConfig.downloadPermissions || []
   }
 }
 

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

@@ -1,2 +1,2 @@
-var c=Object.create;var s=Object.defineProperty;var f=Object.getOwnPropertyDescriptor;var g=Object.getOwnPropertyNames;var w=Object.getPrototypeOf,I=Object.prototype.hasOwnProperty;var R=(o,r)=>{for(var e in r)s(o,e,{get:r[e],enumerable:!0})},u=(o,r,e,t)=>{if(r&&typeof r=="object"||typeof r=="function")for(let n of g(r))!I.call(o,n)&&n!==e&&s(o,n,{get:()=>r[n],enumerable:!(t=f(r,n))||t.enumerable});return o};var i=(o,r,e)=>(e=o!=null?c(w(o)):{},u(r||!o||!o.__esModule?s(e,"default",{value:o,enumerable:!0}):e,o)),v=o=>u(s({},"__esModule",{value:!0}),o);var S={};R(S,{DownloadReportRoutes:()=>P,Routes:()=>p});module.exports=v(S);var a=require("express"),d=i(require("./controller")),l=i(require("./request-download/routes")),m=i(require("../../../utils/logger"));function p({layoutPath:o,services:r}){const e=(0,a.Router)({mergeParams:!0}),t=new d.default(o,r);return e.post("/",t.POST),e.use(["/request-download/:reportId/:variantId/tableId/:tableId","/request-download/:reportId/:variantId"],(0,l.default)({layoutPath:o,services:r})),e}const P=({services:o,path:r,layoutPath:e})=>{m.default.info("Initialiasing routes: Download");const t=(0,a.Router)({mergeParams:!0});return o.downloadPermissionService&&t.use(r,p({services:o,layoutPath:e})),t};0&&(module.exports={DownloadReportRoutes,Routes});
+"use strict";var p=Object.create;var s=Object.defineProperty;var c=Object.getOwnPropertyDescriptor;var w=Object.getOwnPropertyNames;var R=Object.getPrototypeOf,f=Object.prototype.hasOwnProperty;var v=(r,e)=>{for(var o in e)s(r,o,{get:e[o],enumerable:!0})},i=(r,e,o,t)=>{if(e&&typeof e=="object"||typeof e=="function")for(let n of w(e))!f.call(r,n)&&n!==o&&s(r,n,{get:()=>e[n],enumerable:!(t=c(e,n))||t.enumerable});return r};var u=(r,e,o)=>(o=r!=null?p(R(r)):{},i(e||!r||!r.__esModule?s(o,"default",{value:r,enumerable:!0}):o,r)),I=r=>i(s({},"__esModule",{value:!0}),r);var P={};v(P,{DownloadReportRoutes:()=>g,Routes:()=>m});module.exports=I(P);var a=require("express"),d=u(require("./controller")),l=u(require("./request-download/routes"));function m({layoutPath:r,services:e}){const o=(0,a.Router)({mergeParams:!0}),t=new d.default(r,e);return o.post("/",t.POST),o.use(["/request-download/:reportId/:variantId/tableId/:tableId","/request-download/:reportId/:variantId"],(0,l.default)({layoutPath:r,services:e})),o}const g=({services:r,path:e,layoutPath:o})=>{const t=(0,a.Router)({mergeParams:!0});return r.downloadPermissionService.enabled&&t.use(e,m({services:r,layoutPath:o})),t};0&&(module.exports={DownloadReportRoutes,Routes});
 //# sourceMappingURL=routes.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/routes/journeys/download-report/routes.ts"],
-  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\n\nimport DownloadReportController from './controller'\n\n// Routes\nimport RequestDownloadRoutes from './request-download/routes'\nimport { Services } from '../../../types/Services'\nimport logger from '../../../utils/logger'\n\nexport function Routes({ layoutPath, services }: { services: Services; layoutPath: string }) {\n  const router = Router({ mergeParams: true })\n\n  const controller = new DownloadReportController(layoutPath, services)\n\n  // Download report\n  router.post('/', controller.POST)\n\n  // Request download form routes\n  router.use(\n    [`/request-download/:reportId/:variantId/tableId/:tableId`, `/request-download/:reportId/:variantId`],\n    RequestDownloadRoutes({ layoutPath, services }),\n  )\n\n  return router\n}\n\nexport const DownloadReportRoutes = ({\n  services,\n  path,\n  layoutPath,\n}: {\n  services: Services\n  path: string\n  layoutPath: string\n}) => {\n  logger.info('Initialiasing routes: Download')\n\n  const router = Router({ mergeParams: true })\n  if (services.downloadPermissionService) {\n    router.use(path, Routes({ services, layoutPath }))\n  }\n  return router\n}\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,0BAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBAEvBC,EAAqC,2BAGrCC,EAAkC,wCAElCC,EAAmB,oCAEZ,SAASL,EAAO,CAAE,WAAAM,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAAyBJ,EAAYC,CAAQ,EAGpE,OAAAC,EAAO,KAAK,IAAKC,EAAW,IAAI,EAGhCD,EAAO,IACL,CAAC,0DAA2D,wCAAwC,KACpG,EAAAG,SAAsB,CAAE,WAAAL,EAAY,SAAAC,CAAS,CAAC,CAChD,EAEOC,CACT,CAEO,MAAMT,EAAuB,CAAC,CACnC,SAAAQ,EACA,KAAAK,EACA,WAAAN,CACF,IAIM,CACJ,EAAAO,QAAO,KAAK,gCAAgC,EAE5C,MAAML,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAC3C,OAAID,EAAS,2BACXC,EAAO,IAAII,EAAMZ,EAAO,CAAE,SAAAO,EAAU,WAAAD,CAAW,CAAC,CAAC,EAE5CE,CACT",
-  "names": ["routes_exports", "__export", "DownloadReportRoutes", "Routes", "__toCommonJS", "import_express", "import_controller", "import_routes", "import_logger", "layoutPath", "services", "router", "controller", "DownloadReportController", "RequestDownloadRoutes", "path", "logger"]
+  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\n\nimport DownloadReportController from './controller'\n\n// Routes\nimport RequestDownloadRoutes from './request-download/routes'\nimport { Services } from '../../../types/Services'\n\nexport function Routes({ layoutPath, services }: { services: Services; layoutPath: string }) {\n  const router = Router({ mergeParams: true })\n\n  const controller = new DownloadReportController(layoutPath, services)\n\n  // Download report\n  router.post('/', controller.POST)\n\n  // Request download form routes\n  router.use(\n    [`/request-download/:reportId/:variantId/tableId/:tableId`, `/request-download/:reportId/:variantId`],\n    RequestDownloadRoutes({ layoutPath, services }),\n  )\n\n  return router\n}\n\nexport const DownloadReportRoutes = ({\n  services,\n  path,\n  layoutPath,\n}: {\n  services: Services\n  path: string\n  layoutPath: string\n}) => {\n  const router = Router({ mergeParams: true })\n  if (services.downloadPermissionService.enabled) {\n    router.use(path, Routes({ services, layoutPath }))\n  }\n  return router\n}\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,0BAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBAEvBC,EAAqC,2BAGrCC,EAAkC,wCAG3B,SAASJ,EAAO,CAAE,WAAAK,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAAyBJ,EAAYC,CAAQ,EAGpE,OAAAC,EAAO,KAAK,IAAKC,EAAW,IAAI,EAGhCD,EAAO,IACL,CAAC,0DAA2D,wCAAwC,KACpG,EAAAG,SAAsB,CAAE,WAAAL,EAAY,SAAAC,CAAS,CAAC,CAChD,EAEOC,CACT,CAEO,MAAMR,EAAuB,CAAC,CACnC,SAAAO,EACA,KAAAK,EACA,WAAAN,CACF,IAIM,CACJ,MAAME,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAC3C,OAAID,EAAS,0BAA0B,SACrCC,EAAO,IAAII,EAAMX,EAAO,CAAE,SAAAM,EAAU,WAAAD,CAAW,CAAC,CAAC,EAE5CE,CACT",
+  "names": ["routes_exports", "__export", "DownloadReportRoutes", "Routes", "__toCommonJS", "import_express", "import_controller", "import_routes", "layoutPath", "services", "router", "controller", "DownloadReportController", "RequestDownloadRoutes", "path"]
 }

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

@@ -6,7 +6,6 @@ import DownloadReportController from './controller'
 // Routes
 import RequestDownloadRoutes from './request-download/routes'
 import { Services } from '../../../types/Services'
-import logger from '../../../utils/logger'
 
 export function Routes({ layoutPath, services }: { services: Services; layoutPath: string }) {
   const router = Router({ mergeParams: true })
@@ -34,10 +33,8 @@ export const DownloadReportRoutes = ({
   path: string
   layoutPath: string
 }) => {
-  logger.info('Initialiasing routes: Download')
-
   const router = Router({ mergeParams: true })
-  if (services.downloadPermissionService) {
+  if (services.downloadPermissionService.enabled) {
     router.use(path, Routes({ services, layoutPath }))
   }
   return router

package/dpr/routes/journeys/download-report/tests.cy.js

@@ -1,2 +1,2 @@
-var s=require("test-app/routes/integrationTests/redisStateTestUtils"),o=require("../../../../../cypress-tests/cypressUtils");context("Download report",()=>{const d="/embedded/platform/";let t,l;before(()=>{(0,o.executeReportStubs)(),cy.task("stubDefinitionRequestExamplesSuccess"),cy.task("stubRequestSuccessResult20"),cy.task("stubRequestSuccessResult100"),cy.visit(d),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(e,i)=>i.textContent.includes("Successful Report")&&i.textContent.includes("this will succeed")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),(0,o.checkA11y)(),cy.findByRole("button",{name:/Request/}).click(),(0,o.checkA11y)(),cy.findByRole("heading",{level:1,name:/Successful Report/}).should("be.visible"),cy.url().then(e=>{l=e})}),beforeEach(()=>{cy.visit(l)}),describe("Enabling download",()=>{it("should show the enable download button",()=>{cy.findByLabelText(/Enable download/).should("exist").should("be.visible"),cy.findByRole("heading",{name:"To download this report"}).should("not.exist")}),it("should show the download disabled message with link to form",()=>{cy.findByLabelText(/Enable download/).click(),cy.url().should("have.string","/report/download-disabled"),cy.findByRole("heading",{name:"To download this report"}).should("be.visible"),cy.findByRole("link",{name:"Fill out a form"})}),it("should go to the request download form",()=>{cy.findByLabelText(/Enable download/).click(),cy.findByRole("link",{name:"Fill out a form"}).click(),cy.url().then(e=>{t=e}),cy.url().should("match",/\/embedded\/platform\/dpr\/download-report\/request-download\/request-examples\/request-example-success\/tableId\/tblId_[0-9]+\/form/),cy.location().should(e=>{expect(e.search).to.match(/.*reportUrl=\/embedded\/platform\/dpr\/view-report\/async\/report\/request-examples\/request-example-success\/tblId_[0-9]+\/report/)})})}),describe("Requesting download",()=>{it("should prefill the user data in the request form",()=>{cy.visit(t),cy.findByRole("textbox",{name:"What is your Full name?"}).should("have.value","Test User"),cy.findByRole("textbox",{name:"What is your Email address?"}).should("have.value","test@user.com")}),it("should validate the required fields",()=>{cy.visit(t),cy.findByRole("alert").should("not.exist"),cy.findAllByRole("paragraph").contains("Enter your Job title").should("not.exist"),cy.findAllByRole("paragraph").contains("provide information on how you will use this data").should("not.exist"),cy.get("#more-detail-error").should("not.be.visible"),cy.findByRole("button",{name:/Submit request/}).click(),cy.findByRole("alert").should("exist"),cy.findAllByRole("paragraph").contains("Enter your Job title").should("exist"),cy.findAllByRole("paragraph").contains("provide information on how you will use this data").should("exist")}),it("should submit the download request",()=>{cy.visit(t),cy.findByRole("textbox",{name:"What is your Job title?"}).type("Software engineer"),cy.findByRole("textbox",{name:"Can you provide more detail"}).type("I like this report"),cy.findByRole("button",{name:"Submit request"}).click(),cy.findByText(/You have been granted permission/).should("be.visible"),cy.url().as("downloadRequestSubmittedPage"),cy.url().and("match",/dpr\/download-report\/request-download\/request-examples\/request-example-success\/tableId\/tblId_[0-9]+\/form\/submitted/),cy.findByRole("link",{name:/Return to report to download/}).click(),cy.findAllByRole("heading").contains("Successful Report").should("exist"),cy.findByRole("button",{name:/download/}).should("be.visible"),cy.task("stubRequestSuccessResult10MissingFirstRow"),cy.findByRole("button",{name:/download/}).click(),cy.task("checkContents10RowExcelValid").should("equal",!0)}),it("should redirect on trying to download after having the permission to download removed",()=>{(0,s.updateRedisState)("downloadPermissions",[]),cy.findByRole("heading",{name:/To download this report/}).should("not.exist"),cy.findByRole("button",{name:/download/}).click(),cy.findByRole("heading",{name:/To download this report/}).should("be.visible")})})});
+"use strict";var s=require("test-app/routes/integrationTests/redisStateTestUtils"),o=require("../../../../../cypress-tests/cypressUtils");context("Download report",()=>{const d="/embedded/platform/";let t,l;before(()=>{(0,o.executeReportStubs)(),cy.task("stubDefinitionRequestExamplesSuccess"),cy.task("stubRequestSuccessResult20"),cy.task("stubRequestSuccessResult100"),cy.visit(d),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(e,i)=>!!i.textContent?.includes("Successful Report")&&!!i.textContent?.includes("this will succeed")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),(0,o.checkA11y)(),cy.findByRole("button",{name:/Request/}).click(),(0,o.checkA11y)(),cy.findByRole("heading",{level:1,name:/Successful Report/}).should("be.visible"),cy.url().then(e=>{l=e})}),beforeEach(()=>{cy.visit(l)}),describe("Enabling download",()=>{it("should show the enable download button",()=>{cy.findByLabelText(/Enable download/).should("exist").should("be.visible"),cy.findByRole("heading",{name:"To download this report"}).should("not.exist")}),it("should show the download disabled message with link to form",()=>{cy.findByLabelText(/Enable download/).click(),cy.url().should("have.string","/report/download-disabled"),cy.findByRole("heading",{name:"To download this report"}).should("be.visible"),cy.findByRole("link",{name:"Fill out a form"})}),it("should go to the request download form",()=>{cy.findByLabelText(/Enable download/).click(),cy.findByRole("link",{name:"Fill out a form"}).click(),cy.url().then(e=>{t=e}),cy.url().should("match",/\/embedded\/platform\/dpr\/download-report\/request-download\/request-examples\/request-example-success\/tableId\/tblId_[0-9]+\/form/),cy.location().should(e=>{expect(e.search).to.match(/.*reportUrl=\/embedded\/platform\/dpr\/view-report\/async\/report\/request-examples\/request-example-success\/tblId_[0-9]+\/report/)})})}),describe("Requesting download",()=>{it("should prefill the user data in the request form",()=>{cy.visit(t),cy.findByRole("textbox",{name:"What is your Full name?"}).should("have.value","Test User"),cy.findByRole("textbox",{name:"What is your Email address?"}).should("have.value","test@user.com")}),it("should validate the required fields",()=>{cy.visit(t),cy.findByRole("alert").should("not.exist"),cy.findAllByRole("paragraph").contains("Enter your Job title").should("not.exist"),cy.findAllByRole("paragraph").contains("provide information on how you will use this data").should("not.exist"),cy.get("#more-detail-error").should("not.be.visible"),cy.findByRole("button",{name:/Submit request/}).click(),cy.findByRole("alert").should("exist"),cy.findAllByRole("paragraph").contains("Enter your Job title").should("exist"),cy.findAllByRole("paragraph").contains("provide information on how you will use this data").should("exist")}),it("should submit the download request",()=>{cy.visit(t),cy.findByRole("textbox",{name:"What is your Job title?"}).type("Software engineer"),cy.findByRole("textbox",{name:"Can you provide more detail"}).type("I like this report"),cy.findByRole("button",{name:"Submit request"}).click(),cy.findByText(/You have been granted permission/).should("be.visible"),cy.url().as("downloadRequestSubmittedPage"),cy.url().and("match",/dpr\/download-report\/request-download\/request-examples\/request-example-success\/tableId\/tblId_[0-9]+\/form\/submitted/),cy.findByRole("link",{name:/Return to report to download/}).click(),cy.findAllByRole("heading").contains("Successful Report").should("exist"),cy.findByRole("button",{name:/download/}).should("be.visible"),cy.task("stubRequestSuccessResult10MissingFirstRow"),cy.findByRole("button",{name:/download/}).click(),cy.task("checkContents10RowExcelValid").should("equal",!0)}),it("should redirect on trying to download after having the permission to download removed",()=>{(0,s.updateRedisState)("downloadPermissions",[]),cy.findByRole("heading",{name:/To download this report/}).should("not.exist"),cy.findByRole("button",{name:/download/}).click(),cy.findByRole("heading",{name:/To download this report/}).should("be.visible")})})});
 //# sourceMappingURL=tests.cy.js.map

package/dpr/routes/journeys/download-report/tests.cy.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/routes/journeys/download-report/tests.cy.ts"],
-  "sourcesContent": ["import { updateRedisState } from 'test-app/routes/integrationTests/redisStateTestUtils'\nimport { checkA11y, executeReportStubs } from '../../../../../cypress-tests/cypressUtils'\n\ncontext('Download report', () => {\n  const path = '/embedded/platform/'\n  let downloadRequestFormPage: string\n  let viewReportUrl: string\n\n  before(() => {\n    executeReportStubs()\n    cy.task('stubDefinitionRequestExamplesSuccess')\n    cy.task('stubRequestSuccessResult20')\n    cy.task('stubRequestSuccessResult100')\n    cy.visit(path)\n    cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n      cy.findByRole('row', {\n        name: (_, element) => {\n          return element.textContent.includes('Successful Report') && element.textContent.includes('this will succeed')\n        },\n      }).within(() => {\n        cy.findByRole('link', { name: 'Request report' }).click()\n      })\n    })\n    checkA11y()\n    cy.findByRole('button', { name: /Request/ }).click()\n    checkA11y()\n    cy.findByRole('heading', { level: 1, name: /Successful Report/ }).should('be.visible')\n    cy.url().then((url) => {\n      viewReportUrl = url\n    })\n  })\n\n  beforeEach(() => {\n    cy.visit(viewReportUrl)\n  })\n\n  describe('Enabling download', () => {\n    it('should show the enable download button', () => {\n      cy.findByLabelText(/Enable download/)\n        .should('exist')\n        .should('be.visible')\n      cy.findByRole('heading', { name: 'To download this report' }).should('not.exist')\n    })\n\n    it('should show the download disabled message with link to form', () => {\n      cy.findByLabelText(/Enable download/).click()\n      cy.url().should('have.string', '/report/download-disabled')\n      cy.findByRole('heading', { name: 'To download this report' }).should('be.visible')\n      cy.findByRole('link', { name: 'Fill out a form' })\n    })\n\n    it('should go to the request download form', () => {\n      cy.findByLabelText(/Enable download/).click()\n      cy.findByRole('link', { name: 'Fill out a form' }).click()\n\n      cy.url().then((url) => {\n        downloadRequestFormPage = url\n      })\n\n      cy.url().should(\n        'match',\n        /\\/embedded\\/platform\\/dpr\\/download-report\\/request-download\\/request-examples\\/request-example-success\\/tableId\\/tblId_[0-9]+\\/form/,\n      )\n      cy.location().should((location) => {\n        expect(location.search).to.match(\n          /.*reportUrl=\\/embedded\\/platform\\/dpr\\/view-report\\/async\\/report\\/request-examples\\/request-example-success\\/tblId_[0-9]+\\/report/,\n        )\n      })\n    })\n  })\n\n  describe('Requesting download', () => {\n    it('should prefill the user data in the request form', () => {\n      cy.visit(downloadRequestFormPage)\n      cy.findByRole('textbox', { name: 'What is your Full name?' }).should('have.value', 'Test User')\n      cy.findByRole('textbox', { name: 'What is your Email address?' }).should('have.value', 'test@user.com')\n    })\n\n    it('should validate the required fields', () => {\n      cy.visit(downloadRequestFormPage)\n      cy.findByRole('alert').should('not.exist')\n\n      cy.findAllByRole('paragraph').contains('Enter your Job title').should('not.exist')\n      cy.findAllByRole('paragraph').contains('provide information on how you will use this data').should('not.exist')\n      cy.get('#more-detail-error').should('not.be.visible')\n\n      cy.findByRole('button', { name: /Submit request/ }).click()\n\n      cy.findByRole('alert').should('exist')\n      cy.findAllByRole('paragraph').contains('Enter your Job title').should('exist')\n      cy.findAllByRole('paragraph').contains('provide information on how you will use this data').should('exist')\n    })\n\n    it('should submit the download request', () => {\n      cy.visit(downloadRequestFormPage)\n      cy.findByRole('textbox', { name: 'What is your Job title?' }).type('Software engineer')\n      cy.findByRole('textbox', { name: 'Can you provide more detail' }).type('I like this report')\n\n      cy.findByRole('button', { name: 'Submit request' }).click()\n      cy.findByText(/You have been granted permission/).should('be.visible')\n\n      cy.url().as('downloadRequestSubmittedPage')\n\n      cy.url().and(\n        'match',\n        /dpr\\/download-report\\/request-download\\/request-examples\\/request-example-success\\/tableId\\/tblId_[0-9]+\\/form\\/submitted/,\n      )\n      cy.findByRole('link', { name: /Return to report to download/ }).click()\n      cy.findAllByRole('heading').contains('Successful Report').should('exist')\n      cy.findByRole('button', { name: /download/ }).should('be.visible')\n\n      cy.task('stubRequestSuccessResult10MissingFirstRow')\n      cy.findByRole('button', { name: /download/ }).click()\n      cy.task('checkContents10RowExcelValid').should('equal', true)\n    })\n\n    it('should redirect on trying to download after having the permission to download removed', () => {\n      updateRedisState('downloadPermissions', [])\n      cy.findByRole('heading', { name: /To download this report/ }).should('not.exist')\n      cy.findByRole('button', { name: /download/ }).click()\n      cy.findByRole('heading', { name: /To download this report/ }).should('be.visible')\n    })\n  })\n})\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { updateRedisState } from 'test-app/routes/integrationTests/redisStateTestUtils'\nimport { checkA11y, executeReportStubs } from '../../../../../cypress-tests/cypressUtils'\n\ncontext('Download report', () => {\n  const path = '/embedded/platform/'\n  let downloadRequestFormPage: string\n  let viewReportUrl: string\n\n  before(() => {\n    executeReportStubs()\n    cy.task('stubDefinitionRequestExamplesSuccess')\n    cy.task('stubRequestSuccessResult20')\n    cy.task('stubRequestSuccessResult100')\n    cy.visit(path)\n    cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n      cy.findByRole('row', {\n        name: (_, element) => {\n          return (\n            Boolean(element.textContent?.includes('Successful Report')) &&\n            Boolean(element.textContent?.includes('this will succeed'))\n          )\n        },\n      }).within(() => {\n        cy.findByRole('link', { name: 'Request report' }).click()\n      })\n    })\n    checkA11y()\n    cy.findByRole('button', { name: /Request/ }).click()\n    checkA11y()\n    cy.findByRole('heading', { level: 1, name: /Successful Report/ }).should('be.visible')\n    cy.url().then((url) => {\n      viewReportUrl = url\n    })\n  })\n\n  beforeEach(() => {\n    cy.visit(viewReportUrl)\n  })\n\n  describe('Enabling download', () => {\n    it('should show the enable download button', () => {\n      cy.findByLabelText(/Enable download/)\n        .should('exist')\n        .should('be.visible')\n      cy.findByRole('heading', { name: 'To download this report' }).should('not.exist')\n    })\n\n    it('should show the download disabled message with link to form', () => {\n      cy.findByLabelText(/Enable download/).click()\n      cy.url().should('have.string', '/report/download-disabled')\n      cy.findByRole('heading', { name: 'To download this report' }).should('be.visible')\n      cy.findByRole('link', { name: 'Fill out a form' })\n    })\n\n    it('should go to the request download form', () => {\n      cy.findByLabelText(/Enable download/).click()\n      cy.findByRole('link', { name: 'Fill out a form' }).click()\n\n      cy.url().then((url) => {\n        downloadRequestFormPage = url\n      })\n\n      cy.url().should(\n        'match',\n        /\\/embedded\\/platform\\/dpr\\/download-report\\/request-download\\/request-examples\\/request-example-success\\/tableId\\/tblId_[0-9]+\\/form/,\n      )\n      cy.location().should((location) => {\n        expect(location.search).to.match(\n          /.*reportUrl=\\/embedded\\/platform\\/dpr\\/view-report\\/async\\/report\\/request-examples\\/request-example-success\\/tblId_[0-9]+\\/report/,\n        )\n      })\n    })\n  })\n\n  describe('Requesting download', () => {\n    it('should prefill the user data in the request form', () => {\n      cy.visit(downloadRequestFormPage)\n      cy.findByRole('textbox', { name: 'What is your Full name?' }).should('have.value', 'Test User')\n      cy.findByRole('textbox', { name: 'What is your Email address?' }).should('have.value', 'test@user.com')\n    })\n\n    it('should validate the required fields', () => {\n      cy.visit(downloadRequestFormPage)\n      cy.findByRole('alert').should('not.exist')\n\n      cy.findAllByRole('paragraph').contains('Enter your Job title').should('not.exist')\n      cy.findAllByRole('paragraph').contains('provide information on how you will use this data').should('not.exist')\n      cy.get('#more-detail-error').should('not.be.visible')\n\n      cy.findByRole('button', { name: /Submit request/ }).click()\n\n      cy.findByRole('alert').should('exist')\n      cy.findAllByRole('paragraph').contains('Enter your Job title').should('exist')\n      cy.findAllByRole('paragraph').contains('provide information on how you will use this data').should('exist')\n    })\n\n    it('should submit the download request', () => {\n      cy.visit(downloadRequestFormPage)\n      cy.findByRole('textbox', { name: 'What is your Job title?' }).type('Software engineer')\n      cy.findByRole('textbox', { name: 'Can you provide more detail' }).type('I like this report')\n\n      cy.findByRole('button', { name: 'Submit request' }).click()\n      cy.findByText(/You have been granted permission/).should('be.visible')\n\n      cy.url().as('downloadRequestSubmittedPage')\n\n      cy.url().and(\n        'match',\n        /dpr\\/download-report\\/request-download\\/request-examples\\/request-example-success\\/tableId\\/tblId_[0-9]+\\/form\\/submitted/,\n      )\n      cy.findByRole('link', { name: /Return to report to download/ }).click()\n      cy.findAllByRole('heading').contains('Successful Report').should('exist')\n      cy.findByRole('button', { name: /download/ }).should('be.visible')\n\n      cy.task('stubRequestSuccessResult10MissingFirstRow')\n      cy.findByRole('button', { name: /download/ }).click()\n      cy.task('checkContents10RowExcelValid').should('equal', true)\n    })\n\n    it('should redirect on trying to download after having the permission to download removed', () => {\n      updateRedisState('downloadPermissions', [])\n      cy.findByRole('heading', { name: /To download this report/ }).should('not.exist')\n      cy.findByRole('button', { name: /download/ }).click()\n      cy.findByRole('heading', { name: /To download this report/ }).should('be.visible')\n    })\n  })\n})\n"],
+  "mappings": "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",
   "names": ["import_redisStateTestUtils", "import_cypressUtils", "path", "downloadRequestFormPage", "viewReportUrl", "_", "element", "url", "location"]
 }

package/dpr/routes/journeys/download-report/tests.cy.ts

@@ -15,7 +15,10 @@ context('Download report', () => {
     cy.findByLabelText(/Reports catalogue.*/i).within(() => {
       cy.findByRole('row', {
         name: (_, element) => {
-          return element.textContent.includes('Successful Report') && element.textContent.includes('this will succeed')
+          return (
+            Boolean(element.textContent?.includes('Successful Report')) &&
+            Boolean(element.textContent?.includes('this will succeed'))
+          )
         },
       }).within(() => {
         cy.findByRole('link', { name: 'Request report' }).click()

package/dpr/routes/journeys/download-report/utils.js

@@ -1,2 +1,2 @@
-var N=Object.create;var m=Object.defineProperty;var O=Object.getOwnPropertyDescriptor;var x=Object.getOwnPropertyNames;var H=Object.getPrototypeOf,K=Object.prototype.hasOwnProperty;var V=(n,t)=>{for(var e in t)m(n,e,{get:t[e],enumerable:!0})},C=(n,t,e,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of x(t))!K.call(n,s)&&s!==e&&m(n,s,{get:()=>t[s],enumerable:!(i=O(t,s))||i.enumerable});return n};var R=(n,t,e)=>(e=n!=null?N(H(n)):{},C(t||!n||!n.__esModule?m(e,"default",{value:n,enumerable:!0}):e,n)),E=n=>C(m({},"__esModule",{value:!0}),n);var W={};V(W,{default:()=>$,downloadReport:()=>b,getKeys:()=>y});module.exports=E(W);var T=require("json-2-csv"),q=require("../../../types/UserReports"),L=R(require("../../../utils/localsHelper")),u=R(require("../../../types/ReportQuery"));const J=(n,t)=>(0,T.json2csv)(n,t),y=(n,t)=>{const e=[],i=[];return n.forEach(s=>{Object.keys(s).forEach(o=>{const a=t.find(r=>r.name===o);a&&!i.includes(o)&&(i.push(o),e.push({field:o,title:a.display}))})}),e},j=(n,t)=>n.map(e=>Object.keys(e).filter(i=>t.includes(i)).reduce((i,s)=>(i[s]=e[s],i),{})),z=(n,t)=>{const{specification:e}=t.variant;if(e){const{fields:i}=e,s=i.filter(o=>o.type==="HTML");s.length&&n.map(o=>(s.forEach(a=>{const{name:r}=a,c=o[r];if(c){const p=/target="_blank">(.*?)<\/a>/g.exec(c);o[r]=p?p[1]:c}}),o))}return n},F=async n=>{const{token:t,services:e,tableId:i,reportId:s,id:o,queryParams:a}=n,r=await e.reportingService.getAsyncCount(t,i),c={...a,pageSize:r.toString()};return e.reportingService.getAsyncReport(t,s,o,i,c)},Q=async n=>{const{token:t,services:e,queryParams:i,definition:s}=n,{variant:o}=s,{resourceName:a,specification:r}=o;let c=[];if(r){const p=new u.default({fields:r.fields,template:r.template,queryParams:i,definitionsPath:i.dataProductDefinitionsPath}),l=await e.reportingService.getCount(a,t,p),f=new u.default({fields:r.fields,template:r.template,queryParams:{...i,pageSize:l.toString()},definitionsPath:i.dataProductDefinitionsPath});c=(await e.reportingService.getListWithWarnings(a,t,f)).data}return c},b=async({req:n,services:t,res:e,redirect:i,loadType:s})=>{const{dprUser:o,token:a}=L.default.getValues(e),{reportId:r,id:c,tableId:p,dataProductDefinitionsPath:l,reportName:f,name:D,cols:v,sortedAsc:S,sortColumn:h}=n.body,{downloadPermissionService:P}=t;if(!(P?await P.downloadEnabled(o.id,r,c):!1))e.redirect(i);else{const g=await t.reportingService.getDefinition(a,r,c,l),w={dataProductDefinitionsPath:l,...S&&{sortedAsc:S},...h&&{sortColumn:h}};let d;s===q.LoadType.SYNC?d=await Q({definition:g,services:t,token:a,queryParams:w}):d=await F({services:t,token:a,reportId:r,id:c,tableId:p,queryParams:w}),v&&(d=j(d,JSON.parse(v))),d=z(d,g);const k=g.variant.specification?.fields||[],A=y(d,k),I=J(d,{keys:A,emptyFieldValue:""});e.setHeader("Content-Type","application/json"),e.setHeader("Content-disposition",`attachment; filename=${f}-${D}-${new Date().toISOString()}.csv`),e.end(I)}};var $={downloadReport:b,getKeys:y};0&&(module.exports={downloadReport,getKeys});
+"use strict";var N=Object.create;var m=Object.defineProperty;var O=Object.getOwnPropertyDescriptor;var x=Object.getOwnPropertyNames;var H=Object.getPrototypeOf,K=Object.prototype.hasOwnProperty;var V=(n,t)=>{for(var e in t)m(n,e,{get:t[e],enumerable:!0})},w=(n,t,e,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let o of x(t))!K.call(n,o)&&o!==e&&m(n,o,{get:()=>t[o],enumerable:!(i=O(t,o))||i.enumerable});return n};var R=(n,t,e)=>(e=n!=null?N(H(n)):{},w(t||!n||!n.__esModule?m(e,"default",{value:n,enumerable:!0}):e,n)),E=n=>w(m({},"__esModule",{value:!0}),n);var W={};V(W,{default:()=>$,downloadReport:()=>L,getKeys:()=>y});module.exports=E(W);var C=require("json-2-csv"),T=require("../../../types/UserReports"),q=R(require("../../../utils/localsHelper")),u=R(require("../../../types/ReportQuery"));const F=(n,t)=>(0,C.json2csv)(n,t),y=(n,t)=>{const e=[],i=[];return n.forEach(o=>{Object.keys(o).forEach(s=>{const a=t.find(r=>r.name===s);a&&!i.includes(s)&&(i.push(s),e.push({field:s,title:a.display}))})}),e},J=(n,t)=>n.map(e=>Object.keys(e).filter(i=>t.includes(i)).reduce((i,o)=>(i[o]=e[o],i),{})),j=(n,t)=>{const{specification:e}=t.variant;if(e){const{fields:i}=e,o=i.filter(s=>s.type==="HTML");o.length&&n.map(s=>(o.forEach(a=>{const{name:r}=a,c=s[r];if(c){const p=/target="_blank">(.*?)<\/a>/g.exec(c);s[r]=p?p[1]:c}}),s))}return n},z=async n=>{const{token:t,services:e,tableId:i,reportId:o,id:s,queryParams:a}=n,r=await e.reportingService.getAsyncCount(t,i),c={...a,pageSize:r.toString()};return e.reportingService.getAsyncReport(t,o,s,i,c)},Q=async n=>{const{token:t,services:e,queryParams:i,definition:o}=n,{variant:s}=o,{resourceName:a,specification:r}=s;let c=[];if(r){const p=new u.default({fields:r.fields,template:r.template,queryParams:i,definitionsPath:i.dataProductDefinitionsPath}),l=await e.reportingService.getCount(a,t,p),f=new u.default({fields:r.fields,template:r.template,queryParams:{...i,pageSize:l.toString()},definitionsPath:i.dataProductDefinitionsPath});c=(await e.reportingService.getListWithWarnings(a,t,f)).data}return c},L=async({req:n,services:t,res:e,redirect:i,loadType:o})=>{const{dprUser:s,token:a}=q.default.getValues(e),{reportId:r,id:c,tableId:p,dataProductDefinitionsPath:l,reportName:f,name:D,cols:v,sortedAsc:S,sortColumn:h}=n.body,{downloadPermissionService:b}=t;if(!await b.downloadEnabledForReport(s.id,r,c))e.redirect(i);else{const g=await t.reportingService.getDefinition(a,r,c,l),P={dataProductDefinitionsPath:l,...S&&{sortedAsc:S},...h&&{sortColumn:h}};let d;o===T.LoadType.SYNC?d=await Q({definition:g,services:t,token:a,queryParams:P}):d=await z({services:t,token:a,reportId:r,id:c,tableId:p,queryParams:P}),v&&(d=J(d,JSON.parse(v))),d=j(d,g);const k=g.variant.specification?.fields||[],A=y(d,k),I=F(d,{keys:A,emptyFieldValue:""});e.setHeader("Content-Type","application/json"),e.setHeader("Content-disposition",`attachment; filename=${f}-${D}-${new Date().toISOString()}.csv`),e.end(I)}};var $={downloadReport:L,getKeys:y};0&&(module.exports={downloadReport,getKeys});
 //# sourceMappingURL=utils.js.map

package/dpr/routes/journeys/download-report/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/routes/journeys/download-report/utils.ts"],
-  "sourcesContent": ["import { Response, Request } from 'express'\nimport { json2csv, Json2CsvOptions } from 'json-2-csv'\nimport { KeysList } from 'json-2-csv/lib/types'\nimport { Services } from '../../../types/Services'\nimport Dict = NodeJS.Dict\nimport { LoadType } from '../../../types/UserReports'\nimport { components } from '../../../types/api'\nimport LocalsHelper from '../../../utils/localsHelper'\nimport { Template } from '../../../types/Templates'\nimport ReportQuery from '../../../types/ReportQuery'\n\nconst convertToCsv = (reportData: Dict<string>[], options: Json2CsvOptions) => {\n  const csvData = json2csv(reportData, options)\n  return csvData\n}\n\nexport const getKeys = (reportData: Dict<string>[], fields: components['schemas']['FieldDefinition'][]): KeysList => {\n  const keys: KeysList = []\n  const keyNames: string[] = []\n  reportData.forEach((row) => {\n    Object.keys(row).forEach((key) => {\n      const field = fields.find((f) => f.name === key)\n      if (field && !keyNames.includes(key)) {\n        keyNames.push(key)\n        keys.push({\n          field: key,\n          title: field.display,\n        })\n      }\n    })\n  })\n  return keys\n}\n\nconst applyColumnsAndSort = (data: Dict<string>[], columns: string[]) => {\n  return data.map((row) => {\n    return Object.keys(row)\n      .filter((key) => columns.includes(key))\n      .reduce((obj: Dict<string>, key) => {\n        // eslint-disable-next-line no-param-reassign\n        obj[key] = row[key]\n        return obj\n      }, {})\n  })\n}\n\nconst removeHtmlTags = (\n  reportData: Dict<string>[],\n  reportDefinition: components['schemas']['SingleVariantReportDefinition'],\n) => {\n  // Find HMTL field + name\n  const { specification } = reportDefinition.variant\n  if (specification) {\n    const { fields } = specification\n    const htmlFields = fields.filter((field) => {\n      return field.type === 'HTML'\n    })\n\n    if (htmlFields.length) {\n      reportData.map((d) => {\n        htmlFields.forEach((field) => {\n          const { name } = field\n          const colValue = d[name]\n          if (colValue) {\n            const innerText = /target=\"_blank\">(.*?)<\\/a>/g.exec(colValue)\n            // eslint-disable-next-line prefer-destructuring, no-param-reassign\n            d[name] = innerText ? innerText[1] : colValue\n          }\n        })\n        return d\n      })\n    }\n  }\n  return reportData\n}\n\nconst dowloadAsyncData = async (args: {\n  services: Services\n  token: string\n  tableId: string\n  reportId: string\n  id: string\n  queryParams: {\n    dataProductDefinitionsPath: string\n    sortedAsc?: string\n    sortColumn?: string\n  }\n}) => {\n  const { token, services, tableId, reportId, id, queryParams } = args\n  const pageSize = await services.reportingService.getAsyncCount(token, tableId)\n  const query: Record<string, string | string[]> = {\n    ...queryParams,\n    pageSize: pageSize.toString(),\n  }\n  return services.reportingService.getAsyncReport(token, reportId, id, tableId, query)\n}\n\nconst downloadSyncData = async (args: {\n  definition: components['schemas']['SingleVariantReportDefinition']\n  services: Services\n  token: string\n  queryParams: {\n    dataProductDefinitionsPath: string\n    sortedAsc?: string\n    sortColumn?: string\n  }\n}) => {\n  const { token, services, queryParams, definition } = args\n  const { variant } = definition\n  const { resourceName, specification } = variant\n  let data: Dict<string>[] = []\n\n  if (specification) {\n    const countReportQuery = new ReportQuery({\n      fields: specification.fields,\n      template: specification.template as Template,\n      queryParams,\n      definitionsPath: <string>queryParams.dataProductDefinitionsPath,\n    })\n    const count = await services.reportingService.getCount(resourceName, token, countReportQuery)\n\n    const dataReportQuery = new ReportQuery({\n      fields: specification.fields,\n      template: specification.template as Template,\n      queryParams: {\n        ...queryParams,\n        pageSize: count.toString(),\n      },\n      definitionsPath: <string>queryParams.dataProductDefinitionsPath,\n    })\n    const reportData = await services.reportingService.getListWithWarnings(resourceName, token, dataReportQuery)\n    data = reportData.data\n  }\n\n  return data\n}\n\nexport const downloadReport = async ({\n  req,\n  services,\n  res,\n  redirect,\n  loadType,\n}: {\n  req: Request\n  services: Services\n  res: Response\n  redirect: string\n  loadType?: LoadType\n}) => {\n  const { dprUser, token } = LocalsHelper.getValues(res)\n  const {\n    reportId,\n    id,\n    tableId,\n    dataProductDefinitionsPath,\n    reportName,\n    name,\n    cols: columns,\n    sortedAsc,\n    sortColumn,\n  } = req.body\n  const { downloadPermissionService } = services\n  const canDownload = downloadPermissionService\n    ? await downloadPermissionService.downloadEnabled(dprUser.id, reportId, id)\n    : false\n  if (!canDownload) {\n    res.redirect(redirect)\n  } else {\n    const definition = await services.reportingService.getDefinition(token, reportId, id, dataProductDefinitionsPath)\n    const queryParams = {\n      dataProductDefinitionsPath,\n      ...(sortedAsc && { sortedAsc }),\n      ...(sortColumn && { sortColumn }),\n    }\n\n    let reportData\n    if (loadType === LoadType.SYNC) {\n      reportData = await downloadSyncData({\n        definition,\n        services,\n        token,\n        queryParams,\n      })\n    } else {\n      reportData = await dowloadAsyncData({\n        services,\n        token,\n        reportId,\n        id,\n        tableId,\n        queryParams,\n      })\n    }\n    if (columns) {\n      reportData = applyColumnsAndSort(reportData, JSON.parse(columns))\n    }\n    reportData = removeHtmlTags(reportData, definition)\n    const fields = definition.variant.specification?.fields || []\n    const keys: KeysList = getKeys(reportData, fields)\n    const csvData = convertToCsv(reportData, { keys, emptyFieldValue: '' })\n\n    res.setHeader('Content-Type', 'application/json')\n    res.setHeader('Content-disposition', `attachment; filename=${reportName}-${name}-${new Date().toISOString()}.csv`)\n    res.end(csvData)\n  }\n}\n\nexport default {\n  downloadReport,\n  getKeys,\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { Response, Request } from 'express'\nimport { json2csv, Json2CsvOptions } from 'json-2-csv'\nimport { KeysList } from 'json-2-csv/lib/types'\nimport { Services } from '../../../types/Services'\nimport Dict = NodeJS.Dict\nimport { LoadType } from '../../../types/UserReports'\nimport { components } from '../../../types/api'\nimport LocalsHelper from '../../../utils/localsHelper'\nimport { Template } from '../../../types/Templates'\nimport ReportQuery from '../../../types/ReportQuery'\n\nconst convertToCsv = (reportData: Dict<string>[], options: Json2CsvOptions) => {\n  const csvData = json2csv(reportData, options)\n  return csvData\n}\n\nexport const getKeys = (reportData: Dict<string>[], fields: components['schemas']['FieldDefinition'][]): KeysList => {\n  const keys: KeysList = []\n  const keyNames: string[] = []\n  reportData.forEach((row) => {\n    Object.keys(row).forEach((key) => {\n      const field = fields.find((f) => f.name === key)\n      if (field && !keyNames.includes(key)) {\n        keyNames.push(key)\n        keys.push({\n          field: key,\n          title: field.display,\n        })\n      }\n    })\n  })\n  return keys\n}\n\nconst applyColumnsAndSort = (data: Dict<string>[], columns: string[]) => {\n  return data.map((row) => {\n    return Object.keys(row)\n      .filter((key) => columns.includes(key))\n      .reduce((obj: Dict<string>, key) => {\n        // eslint-disable-next-line no-param-reassign\n        obj[key] = row[key]\n        return obj\n      }, {})\n  })\n}\n\nconst removeHtmlTags = (\n  reportData: Dict<string>[],\n  reportDefinition: components['schemas']['SingleVariantReportDefinition'],\n) => {\n  // Find HMTL field + name\n  const { specification } = reportDefinition.variant\n  if (specification) {\n    const { fields } = specification\n    const htmlFields = fields.filter((field) => {\n      return field.type === 'HTML'\n    })\n\n    if (htmlFields.length) {\n      reportData.map((d) => {\n        htmlFields.forEach((field) => {\n          const { name } = field\n          const colValue = d[name]\n          if (colValue) {\n            const innerText = /target=\"_blank\">(.*?)<\\/a>/g.exec(colValue)\n            // eslint-disable-next-line prefer-destructuring, no-param-reassign\n            d[name] = innerText ? innerText[1] : colValue\n          }\n        })\n        return d\n      })\n    }\n  }\n  return reportData\n}\n\nconst dowloadAsyncData = async (args: {\n  services: Services\n  token: string\n  tableId: string\n  reportId: string\n  id: string\n  queryParams: {\n    dataProductDefinitionsPath: string\n    sortedAsc?: string\n    sortColumn?: string\n  }\n}) => {\n  const { token, services, tableId, reportId, id, queryParams } = args\n  const pageSize = await services.reportingService.getAsyncCount(token, tableId)\n  const query: Record<string, string | string[]> = {\n    ...queryParams,\n    pageSize: pageSize.toString(),\n  }\n  return services.reportingService.getAsyncReport(token, reportId, id, tableId, query)\n}\n\nconst downloadSyncData = async (args: {\n  definition: components['schemas']['SingleVariantReportDefinition']\n  services: Services\n  token: string\n  queryParams: {\n    dataProductDefinitionsPath: string\n    sortedAsc?: string\n    sortColumn?: string\n  }\n}) => {\n  const { token, services, queryParams, definition } = args\n  const { variant } = definition\n  const { resourceName, specification } = variant\n  let data: Dict<string>[] = []\n\n  if (specification) {\n    const countReportQuery = new ReportQuery({\n      fields: specification.fields,\n      template: specification.template as Template,\n      queryParams,\n      definitionsPath: <string>queryParams.dataProductDefinitionsPath,\n    })\n    const count = await services.reportingService.getCount(resourceName, token, countReportQuery)\n\n    const dataReportQuery = new ReportQuery({\n      fields: specification.fields,\n      template: specification.template as Template,\n      queryParams: {\n        ...queryParams,\n        pageSize: count.toString(),\n      },\n      definitionsPath: <string>queryParams.dataProductDefinitionsPath,\n    })\n    const reportData = await services.reportingService.getListWithWarnings(resourceName, token, dataReportQuery)\n    data = reportData.data\n  }\n\n  return data\n}\n\nexport const downloadReport = async ({\n  req,\n  services,\n  res,\n  redirect,\n  loadType,\n}: {\n  req: Request\n  services: Services\n  res: Response\n  redirect: string\n  loadType?: LoadType\n}) => {\n  const { dprUser, token } = LocalsHelper.getValues(res)\n  const {\n    reportId,\n    id,\n    tableId,\n    dataProductDefinitionsPath,\n    reportName,\n    name,\n    cols: columns,\n    sortedAsc,\n    sortColumn,\n  } = req.body\n  const { downloadPermissionService } = services\n  const canDownloadReport = await downloadPermissionService.downloadEnabledForReport(dprUser.id, reportId, id)\n  if (!canDownloadReport) {\n    res.redirect(redirect)\n  } else {\n    const definition = await services.reportingService.getDefinition(token, reportId, id, dataProductDefinitionsPath)\n    const queryParams = {\n      dataProductDefinitionsPath,\n      ...(sortedAsc && { sortedAsc }),\n      ...(sortColumn && { sortColumn }),\n    }\n\n    let reportData\n    if (loadType === LoadType.SYNC) {\n      reportData = await downloadSyncData({\n        definition,\n        services,\n        token,\n        queryParams,\n      })\n    } else {\n      reportData = await dowloadAsyncData({\n        services,\n        token,\n        reportId,\n        id,\n        tableId,\n        queryParams,\n      })\n    }\n    if (columns) {\n      reportData = applyColumnsAndSort(reportData, JSON.parse(columns))\n    }\n    reportData = removeHtmlTags(reportData, definition)\n    const fields = definition.variant.specification?.fields || []\n    const keys: KeysList = getKeys(reportData, fields)\n    const csvData = convertToCsv(reportData, { keys, emptyFieldValue: '' })\n\n    res.setHeader('Content-Type', 'application/json')\n    res.setHeader('Content-disposition', `attachment; filename=${reportName}-${name}-${new Date().toISOString()}.csv`)\n    res.end(csvData)\n  }\n}\n\nexport default {\n  downloadReport,\n  getKeys,\n}\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,mBAAAC,EAAA,YAAAC,IAAA,eAAAC,EAAAL,GACA,IAAAM,EAA0C,sBAI1CC,EAAyB,sCAEzBC,EAAyB,0CAEzBC,EAAwB,yCAExB,MAAMC,EAAe,CAACC,EAA4BC,OAChC,YAASD,EAAYC,CAAO,EAIjCR,EAAU,CAACO,EAA4BE,IAAiE,CACnH,MAAMC,EAAiB,CAAC,EAClBC,EAAqB,CAAC,EAC5B,OAAAJ,EAAW,QAASK,GAAQ,CAC1B,OAAO,KAAKA,CAAG,EAAE,QAASC,GAAQ,CAChC,MAAMC,EAAQL,EAAO,KAAMM,GAAMA,EAAE,OAASF,CAAG,EAC3CC,GAAS,CAACH,EAAS,SAASE,CAAG,IACjCF,EAAS,KAAKE,CAAG,EACjBH,EAAK,KAAK,CACR,MAAOG,EACP,MAAOC,EAAM,OACf,CAAC,EAEL,CAAC,CACH,CAAC,EACMJ,CACT,EAEMM,EAAsB,CAACC,EAAsBC,IAC1CD,EAAK,IAAKL,GACR,OAAO,KAAKA,CAAG,EACnB,OAAQC,GAAQK,EAAQ,SAASL,CAAG,CAAC,EACrC,OAAO,CAACM,EAAmBN,KAE1BM,EAAIN,CAAG,EAAID,EAAIC,CAAG,EACXM,GACN,CAAC,CAAC,CACR,EAGGC,EAAiB,CACrBb,EACAc,IACG,CAEH,KAAM,CAAE,cAAAC,CAAc,EAAID,EAAiB,QAC3C,GAAIC,EAAe,CACjB,KAAM,CAAE,OAAAb,CAAO,EAAIa,EACbC,EAAad,EAAO,OAAQK,GACzBA,EAAM,OAAS,MACvB,EAEGS,EAAW,QACbhB,EAAW,IAAKiB,IACdD,EAAW,QAAST,GAAU,CAC5B,KAAM,CAAE,KAAAW,CAAK,EAAIX,EACXY,EAAWF,EAAEC,CAAI,EACvB,GAAIC,EAAU,CACZ,MAAMC,EAAY,8BAA8B,KAAKD,CAAQ,EAE7DF,EAAEC,CAAI,EAAIE,EAAYA,EAAU,CAAC,EAAID,CACvC,CACF,CAAC,EACMF,EACR,CAEL,CACA,OAAOjB,CACT,EAEMqB,EAAmB,MAAOC,GAW1B,CACJ,KAAM,CAAE,MAAAC,EAAO,SAAAC,EAAU,QAAAC,EAAS,SAAAC,EAAU,GAAAC,EAAI,YAAAC,CAAY,EAAIN,EAC1DO,EAAW,MAAML,EAAS,iBAAiB,cAAcD,EAAOE,CAAO,EACvEK,EAA2C,CAC/C,GAAGF,EACH,SAAUC,EAAS,SAAS,CAC9B,EACA,OAAOL,EAAS,iBAAiB,eAAeD,EAAOG,EAAUC,EAAIF,EAASK,CAAK,CACrF,EAEMC,EAAmB,MAAOT,GAS1B,CACJ,KAAM,CAAE,MAAAC,EAAO,SAAAC,EAAU,YAAAI,EAAa,WAAAI,CAAW,EAAIV,EAC/C,CAAE,QAAAW,CAAQ,EAAID,EACd,CAAE,aAAAE,EAAc,cAAAnB,CAAc,EAAIkB,EACxC,IAAIvB,EAAuB,CAAC,EAE5B,GAAIK,EAAe,CACjB,MAAMoB,EAAmB,IAAI,EAAAC,QAAY,CACvC,OAAQrB,EAAc,OACtB,SAAUA,EAAc,SACxB,YAAAa,EACA,gBAAyBA,EAAY,0BACvC,CAAC,EACKS,EAAQ,MAAMb,EAAS,iBAAiB,SAASU,EAAcX,EAAOY,CAAgB,EAEtFG,EAAkB,IAAI,EAAAF,QAAY,CACtC,OAAQrB,EAAc,OACtB,SAAUA,EAAc,SACxB,YAAa,CACX,GAAGa,EACH,SAAUS,EAAM,SAAS,CAC3B,EACA,gBAAyBT,EAAY,0BACvC,CAAC,EAEDlB,GADmB,MAAMc,EAAS,iBAAiB,oBAAoBU,EAAcX,EAAOe,CAAe,GACzF,IACpB,CAEA,OAAO5B,CACT,EAEalB,EAAiB,MAAO,CACnC,IAAA+C,EACA,SAAAf,EACA,IAAAgB,EACA,SAAAC,EACA,SAAAC,CACF,IAMM,CACJ,KAAM,CAAE,QAAAC,EAAS,MAAApB,CAAM,EAAI,EAAAqB,QAAa,UAAUJ,CAAG,EAC/C,CACJ,SAAAd,EACA,GAAAC,EACA,QAAAF,EACA,2BAAAoB,EACA,WAAAC,EACA,KAAA5B,EACA,KAAMP,EACN,UAAAoC,EACA,WAAAC,CACF,EAAIT,EAAI,KACF,CAAE,0BAAAU,CAA0B,EAAIzB,EAEtC,GAAI,CADsB,MAAMyB,EAA0B,yBAAyBN,EAAQ,GAAIjB,EAAUC,CAAE,EAEzGa,EAAI,SAASC,CAAQ,MAChB,CACL,MAAMT,EAAa,MAAMR,EAAS,iBAAiB,cAAcD,EAAOG,EAAUC,EAAIkB,CAA0B,EAC1GjB,EAAc,CAClB,2BAAAiB,EACA,GAAIE,GAAa,CAAE,UAAAA,CAAU,EAC7B,GAAIC,GAAc,CAAE,WAAAA,CAAW,CACjC,EAEA,IAAIhD,EACA0C,IAAa,WAAS,KACxB1C,EAAa,MAAM+B,EAAiB,CAClC,WAAAC,EACA,SAAAR,EACA,MAAAD,EACA,YAAAK,CACF,CAAC,EAED5B,EAAa,MAAMqB,EAAiB,CAClC,SAAAG,EACA,MAAAD,EACA,SAAAG,EACA,GAAAC,EACA,QAAAF,EACA,YAAAG,CACF,CAAC,EAECjB,IACFX,EAAaS,EAAoBT,EAAY,KAAK,MAAMW,CAAO,CAAC,GAElEX,EAAaa,EAAeb,EAAYgC,CAAU,EAClD,MAAM9B,EAAS8B,EAAW,QAAQ,eAAe,QAAU,CAAC,EACtD7B,EAAiBV,EAAQO,EAAYE,CAAM,EAC3CgD,EAAUnD,EAAaC,EAAY,CAAE,KAAAG,EAAM,gBAAiB,EAAG,CAAC,EAEtEqC,EAAI,UAAU,eAAgB,kBAAkB,EAChDA,EAAI,UAAU,sBAAuB,wBAAwBM,CAAU,IAAI5B,CAAI,IAAI,IAAI,KAAK,EAAE,YAAY,CAAC,MAAM,EACjHsB,EAAI,IAAIU,CAAO,CACjB,CACF,EAEA,IAAO3D,EAAQ,CACb,eAAAC,EACA,QAAAC,CACF",
   "names": ["utils_exports", "__export", "utils_default", "downloadReport", "getKeys", "__toCommonJS", "import_json_2_csv", "import_UserReports", "import_localsHelper", "import_ReportQuery", "convertToCsv", "reportData", "options", "fields", "keys", "keyNames", "row", "key", "field", "f", "applyColumnsAndSort", "data", "columns", "obj", "removeHtmlTags", "reportDefinition", "specification", "htmlFields", "d", "name", "colValue", "innerText", "dowloadAsyncData", "args", "token", "services", "tableId", "reportId", "id", "queryParams", "pageSize", "query", "downloadSyncData", "definition", "variant", "resourceName", "countReportQuery", "ReportQuery", "count", "dataReportQuery", "req", "res", "redirect", "loadType", "dprUser", "LocalsHelper", "dataProductDefinitionsPath", "reportName", "sortedAsc", "sortColumn", "downloadPermissionService", "csvData"]
 }

package/dpr/routes/journeys/download-report/utils.ts

@@ -161,10 +161,8 @@ export const downloadReport = async ({
     sortColumn,
   } = req.body
   const { downloadPermissionService } = services
-  const canDownload = downloadPermissionService
-    ? await downloadPermissionService.downloadEnabled(dprUser.id, reportId, id)
-    : false
-  if (!canDownload) {
+  const canDownloadReport = await downloadPermissionService.downloadEnabledForReport(dprUser.id, reportId, id)
+  if (!canDownloadReport) {
     res.redirect(redirect)
   } else {
     const definition = await services.reportingService.getDefinition(token, reportId, id, dataProductDefinitionsPath)

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

@@ -1,2 +1,2 @@
-var m=Object.create;var a=Object.defineProperty;var p=Object.getOwnPropertyDescriptor;var k=Object.getOwnPropertyNames;var v=Object.getPrototypeOf,u=Object.prototype.hasOwnProperty;var y=(o,e)=>{for(var r in e)a(o,r,{get:e[r],enumerable:!0})},n=(o,e,r,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let t of k(e))!u.call(o,t)&&t!==r&&a(o,t,{get:()=>e[t],enumerable:!(s=p(e,t))||s.enumerable});return o};var h=(o,e,r)=>(r=o!=null?m(v(o)):{},n(e||!o||!o.__esModule?a(r,"default",{value:o,enumerable:!0}):r,o)),S=o=>n(a({},"__esModule",{value:!0}),o);var f={};y(f,{BookmarkController:()=>d,default:()=>b});module.exports=S(f);var c=h(require("../../../../utils/localsHelper"));class d{constructor(e,r){this.POST=async(e,r)=>{const{dprUser:s}=c.default.getValues(r),{reportId:t,id:i,reportType:l}=e.body;await this.services.bookmarkService.addBookmark(s.id,t,i,l),r.end()};this.DELETE=async(e,r)=>{const{dprUser:s}=c.default.getValues(r),{id:t,reportId:i}=e.body;await this.services.bookmarkService.removeBookmark(s.id,t,i),r.end()};this.layoutPath=e,this.services=r}}var b=d;0&&(module.exports={BookmarkController});
+"use strict";var m=Object.create;var a=Object.defineProperty;var p=Object.getOwnPropertyDescriptor;var k=Object.getOwnPropertyNames;var v=Object.getPrototypeOf,u=Object.prototype.hasOwnProperty;var y=(o,e)=>{for(var r in e)a(o,r,{get:e[r],enumerable:!0})},n=(o,e,r,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let t of k(e))!u.call(o,t)&&t!==r&&a(o,t,{get:()=>e[t],enumerable:!(s=p(e,t))||s.enumerable});return o};var h=(o,e,r)=>(r=o!=null?m(v(o)):{},n(e||!o||!o.__esModule?a(r,"default",{value:o,enumerable:!0}):r,o)),S=o=>n(a({},"__esModule",{value:!0}),o);var f={};y(f,{BookmarkController:()=>d,default:()=>b});module.exports=S(f);var c=h(require("../../../../utils/localsHelper"));class d{constructor(e,r){this.POST=async(e,r)=>{const{dprUser:s}=c.default.getValues(r),{reportId:t,id:i,reportType:l}=e.body;await this.services.bookmarkService.addBookmark(s.id,t,i,l),r.end()};this.DELETE=async(e,r)=>{const{dprUser:s}=c.default.getValues(r),{id:t,reportId:i}=e.body;await this.services.bookmarkService.removeBookmark(s.id,t,i),r.end()};this.layoutPath=e,this.services=r}}var b=d;0&&(module.exports={BookmarkController});
 //# sourceMappingURL=controller.js.map

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/my-reports/bookmarks/controller.ts"],
   "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../types/Services'\nimport LocalsHelper from '../../../../utils/localsHelper'\n\nclass BookmarkController {\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  POST: RequestHandler = async (req, res) => {\n    const { dprUser } = LocalsHelper.getValues(res)\n    const { reportId, id, reportType } = req.body\n    await this.services.bookmarkService.addBookmark(dprUser.id, reportId, id, reportType)\n    res.end()\n  }\n\n  DELETE: RequestHandler = async (req, res) => {\n    const { dprUser } = LocalsHelper.getValues(res)\n    const { id, reportId } = req.body\n    await this.services.bookmarkService.removeBookmark(dprUser.id, id, reportId)\n    res.end()\n  }\n}\n\nexport { BookmarkController }\nexport default BookmarkController\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,wBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAyB,6CAEzB,MAAMH,CAAmB,CAKvB,YAAYI,EAAoBC,EAAoB,CAKpD,UAAuB,MAAOC,EAAKC,IAAQ,CACzC,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUF,CAAG,EACxC,CAAE,SAAAG,EAAU,GAAAC,EAAI,WAAAC,CAAW,EAAIN,EAAI,KACzC,MAAM,KAAK,SAAS,gBAAgB,YAAYE,EAAQ,GAAIE,EAAUC,EAAIC,CAAU,EACpFL,EAAI,IAAI,CACV,EAEA,YAAyB,MAAOD,EAAKC,IAAQ,CAC3C,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUF,CAAG,EACxC,CAAE,GAAAI,EAAI,SAAAD,CAAS,EAAIJ,EAAI,KAC7B,MAAM,KAAK,SAAS,gBAAgB,eAAeE,EAAQ,GAAIG,EAAID,CAAQ,EAC3EH,EAAI,IAAI,CACV,EAhBE,KAAK,WAAaH,EAClB,KAAK,SAAWC,CAClB,CAeF,CAGA,IAAOJ,EAAQD",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,wBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAyB,6CAEzB,MAAMH,CAAmB,CAKvB,YAAYI,EAAoBC,EAAoB,CAKpD,UAAuB,MAAOC,EAAKC,IAAQ,CACzC,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUF,CAAG,EACxC,CAAE,SAAAG,EAAU,GAAAC,EAAI,WAAAC,CAAW,EAAIN,EAAI,KACzC,MAAM,KAAK,SAAS,gBAAgB,YAAYE,EAAQ,GAAIE,EAAUC,EAAIC,CAAU,EACpFL,EAAI,IAAI,CACV,EAEA,YAAyB,MAAOD,EAAKC,IAAQ,CAC3C,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUF,CAAG,EACxC,CAAE,GAAAI,EAAI,SAAAD,CAAS,EAAIJ,EAAI,KAC7B,MAAM,KAAK,SAAS,gBAAgB,eAAeE,EAAQ,GAAIG,EAAID,CAAQ,EAC3EH,EAAI,IAAI,CACV,EAhBE,KAAK,WAAaH,EAClB,KAAK,SAAWC,CAClB,CAeF,CAGA,IAAOJ,EAAQD",
   "names": ["controller_exports", "__export", "BookmarkController", "controller_default", "__toCommonJS", "import_localsHelper", "layoutPath", "services", "req", "res", "dprUser", "LocalsHelper", "reportId", "id", "reportType"]
 }

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

@@ -1,2 +1,2 @@
-var n=Object.create;var o=Object.defineProperty;var c=Object.getOwnPropertyDescriptor;var k=Object.getOwnPropertyNames;var u=Object.getPrototypeOf,d=Object.prototype.hasOwnProperty;var h=(r,t)=>{for(var e in t)o(r,e,{get:t[e],enumerable:!0})},l=(r,t,e,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of k(t))!d.call(r,s)&&s!==e&&o(r,s,{get:()=>t[s],enumerable:!(i=c(t,s))||i.enumerable});return r};var p=(r,t,e)=>(e=r!=null?n(u(r)):{},l(t||!r||!r.__esModule?o(e,"default",{value:r,enumerable:!0}):e,r)),v=r=>l(o({},"__esModule",{value:!0}),r);var f={};h(f,{BookmarkListingController:()=>a,default:()=>y});module.exports=v(f);var m=p(require("../../../../../components/user-reports/bookmarks/utils"));class a{constructor(t,e){this.GET=async(t,e,i)=>{e.render("dpr/routes/journeys/my-reports/view",{title:"Bookmarks",layoutPath:this.layoutPath,id:"dpr-bookmarks-list",...await m.default.renderBookmarkList({services:this.services,res:e,req:t})})};this.layoutPath=t,this.services=e}}var y=a;0&&(module.exports={BookmarkListingController});
+"use strict";var n=Object.create;var o=Object.defineProperty;var c=Object.getOwnPropertyDescriptor;var k=Object.getOwnPropertyNames;var u=Object.getPrototypeOf,d=Object.prototype.hasOwnProperty;var h=(r,t)=>{for(var e in t)o(r,e,{get:t[e],enumerable:!0})},l=(r,t,e,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of k(t))!d.call(r,s)&&s!==e&&o(r,s,{get:()=>t[s],enumerable:!(i=c(t,s))||i.enumerable});return r};var p=(r,t,e)=>(e=r!=null?n(u(r)):{},l(t||!r||!r.__esModule?o(e,"default",{value:r,enumerable:!0}):e,r)),v=r=>l(o({},"__esModule",{value:!0}),r);var f={};h(f,{BookmarkListingController:()=>a,default:()=>y});module.exports=v(f);var m=p(require("../../../../../components/user-reports/bookmarks/utils"));class a{constructor(t,e){this.GET=async(t,e,i)=>{e.render("dpr/routes/journeys/my-reports/view",{title:"Bookmarks",layoutPath:this.layoutPath,id:"dpr-bookmarks-list",...await m.default.renderBookmarkList({services:this.services,res:e})})};this.layoutPath=t,this.services=e}}var y=a;0&&(module.exports={BookmarkListingController});
 //# sourceMappingURL=controller.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/my-reports/bookmarks/list/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport BookmarklistUtils from '../../../../../components/user-reports/bookmarks/utils'\nimport { Services } from '../../../../../types/Services'\n\nclass BookmarkListingController {\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, next) => {\n    res.render(`dpr/routes/journeys/my-reports/view`, {\n      title: 'Bookmarks',\n      layoutPath: this.layoutPath,\n      id: 'dpr-bookmarks-list',\n      ...(await BookmarklistUtils.renderBookmarkList({ services: this.services, res, req })),\n    })\n  }\n}\n\nexport { BookmarkListingController }\nexport default BookmarkListingController\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,+BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAA8B,qEAG9B,MAAMH,CAA0B,CAK9B,YAAYI,EAAoBC,EAAoB,CAKpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9CD,EAAI,OAAO,sCAAuC,CAChD,MAAO,YACP,WAAY,KAAK,WACjB,GAAI,qBACJ,GAAI,MAAM,EAAAE,QAAkB,mBAAmB,CAAE,SAAU,KAAK,SAAU,IAAAF,EAAK,IAAAD,CAAI,CAAC,CACtF,CAAC,CACH,EAXE,KAAK,WAAaF,EAClB,KAAK,SAAWC,CAClB,CAUF,CAGA,IAAOJ,EAAQD",
-  "names": ["controller_exports", "__export", "BookmarkListingController", "controller_default", "__toCommonJS", "import_utils", "layoutPath", "services", "req", "res", "next", "BookmarklistUtils"]
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport BookmarklistUtils from '../../../../../components/user-reports/bookmarks/utils'\nimport { Services } from '../../../../../types/Services'\n\nclass BookmarkListingController {\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, _next) => {\n    res.render(`dpr/routes/journeys/my-reports/view`, {\n      title: 'Bookmarks',\n      layoutPath: this.layoutPath,\n      id: 'dpr-bookmarks-list',\n      ...(await BookmarklistUtils.renderBookmarkList({ services: this.services, res })),\n    })\n  }\n}\n\nexport { BookmarkListingController }\nexport default BookmarkListingController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,+BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAA8B,qEAG9B,MAAMH,CAA0B,CAK9B,YAAYI,EAAoBC,EAAoB,CAKpD,SAAsB,MAAOC,EAAMC,EAAKC,IAAU,CAChDD,EAAI,OAAO,sCAAuC,CAChD,MAAO,YACP,WAAY,KAAK,WACjB,GAAI,qBACJ,GAAI,MAAM,EAAAE,QAAkB,mBAAmB,CAAE,SAAU,KAAK,SAAU,IAAAF,CAAI,CAAC,CACjF,CAAC,CACH,EAXE,KAAK,WAAaH,EAClB,KAAK,SAAWC,CAClB,CAUF,CAGA,IAAOJ,EAAQD",
+  "names": ["controller_exports", "__export", "BookmarkListingController", "controller_default", "__toCommonJS", "import_utils", "layoutPath", "services", "_req", "res", "_next", "BookmarklistUtils"]
 }

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

@@ -12,12 +12,12 @@ class BookmarkListingController {
     this.services = services
   }
 
-  GET: RequestHandler = async (req, res, next) => {
+  GET: RequestHandler = async (_req, res, _next) => {
     res.render(`dpr/routes/journeys/my-reports/view`, {
       title: 'Bookmarks',
       layoutPath: this.layoutPath,
       id: 'dpr-bookmarks-list',
-      ...(await BookmarklistUtils.renderBookmarkList({ services: this.services, res, req })),
+      ...(await BookmarklistUtils.renderBookmarkList({ services: this.services, res })),
     })
   }
 }

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

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

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/my-reports/bookmarks/list/routes.ts"],
   "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport BookmarkListingController 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 BookmarkListingController(layoutPath, services)\n  router.get(`/`, controller.GET)\n\n  return router\n}\n\nexport default routes\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBACvBC,EAAsC,2BAG/B,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAA0BJ,EAAYC,CAAQ,EACrE,OAAAC,EAAO,IAAI,IAAKC,EAAW,GAAG,EAEvBD,CACT,CAEA,IAAOP,EAAQC",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBACvBC,EAAsC,2BAG/B,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAA0BJ,EAAYC,CAAQ,EACrE,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", "BookmarkListingController"]
 }

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

@@ -1,2 +1,2 @@
-var e=require("../../../../../../../test-app/routes/integrationTests/redisStateTestUtils"),s=require("../../../../../types/UserReports");context("Bookmarks list",()=>{const t="/embedded/platform/dpr/my-reports/bookmarks/list";before(()=>{cy.task("resetStubs"),cy.task("resetRedis"),cy.task("stubDefinitions"),cy.task("stubSingleSummaries"),cy.task("stubDefinitionRequestExamplesSuccess")}),it("is accessible",()=>{(0,e.setRedisState)({requestedReports:[],recentlyViewedReports:[],bookmarks:[{reportId:"request-examples",id:"request-examples",variantId:"request-example-success",type:s.ReportType.REPORT}],downloadPermissions:[{reportId:"request-examples",id:"request-example-success"}],defaultFilters:[]}),cy.visit(t),cy.injectAxe(),cy.checkA11y(),cy.findAllByText(/Successful Report/).should("be.visible")})});
+"use strict";var e=require("../../../../../../../test-app/routes/integrationTests/redisStateTestUtils"),s=require("../../../../../types/UserReports");context("Bookmarks list",()=>{const t="/embedded/platform/dpr/my-reports/bookmarks/list";before(()=>{cy.task("resetStubs"),cy.task("resetRedis"),cy.task("stubDefinitions"),cy.task("stubSingleSummaries"),cy.task("stubDefinitionRequestExamplesSuccess")}),it("is accessible",()=>{(0,e.setRedisState)({requestedReports:[],recentlyViewedReports:[],bookmarks:[{reportId:"request-examples",id:"request-example-success",type:s.ReportType.REPORT}],downloadPermissions:[{reportId:"request-examples",id:"request-example-success"}],defaultFilters:[]}),cy.visit(t),cy.injectAxe(),cy.checkA11y(),cy.findAllByText(/Successful Report/).should("be.visible")})});
 //# sourceMappingURL=tests.cy.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/my-reports/bookmarks/list/tests.cy.ts"],
-  "sourcesContent": ["import { setRedisState } from '../../../../../../../test-app/routes/integrationTests/redisStateTestUtils'\nimport { ReportType } from '../../../../../types/UserReports'\n\ncontext('Bookmarks list', () => {\n  const path = '/embedded/platform/dpr/my-reports/bookmarks/list'\n\n  before(() => {\n    cy.task('resetStubs')\n    cy.task('resetRedis')\n    cy.task('stubDefinitions')\n    cy.task('stubSingleSummaries')\n    cy.task('stubDefinitionRequestExamplesSuccess')\n  })\n\n  it('is accessible', () => {\n    setRedisState({\n      requestedReports: [],\n      recentlyViewedReports: [],\n      bookmarks: [\n        {\n          reportId: 'request-examples',\n          id: 'request-examples',\n          variantId: 'request-example-success',\n          type: ReportType.REPORT,\n        },\n      ],\n      downloadPermissions: [{ reportId: 'request-examples', id: 'request-example-success' }],\n      defaultFilters: [],\n    })\n    cy.visit(path)\n    cy.injectAxe()\n    cy.checkA11y()\n    cy.findAllByText(/Successful Report/).should('be.visible')\n  })\n})\n"],
-  "mappings": "AAAA,IAAAA,EAA8B,qFAC9BC,EAA2B,4CAE3B,QAAQ,iBAAkB,IAAM,CAC9B,MAAMC,EAAO,mDAEb,OAAO,IAAM,CACX,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,iBAAiB,EACzB,GAAG,KAAK,qBAAqB,EAC7B,GAAG,KAAK,sCAAsC,CAChD,CAAC,EAED,GAAG,gBAAiB,IAAM,IACxB,iBAAc,CACZ,iBAAkB,CAAC,EACnB,sBAAuB,CAAC,EACxB,UAAW,CACT,CACE,SAAU,mBACV,GAAI,mBACJ,UAAW,0BACX,KAAM,aAAW,MACnB,CACF,EACA,oBAAqB,CAAC,CAAE,SAAU,mBAAoB,GAAI,yBAA0B,CAAC,EACrF,eAAgB,CAAC,CACnB,CAAC,EACD,GAAG,MAAMA,CAAI,EACb,GAAG,UAAU,EACb,GAAG,UAAU,EACb,GAAG,cAAc,mBAAmB,EAAE,OAAO,YAAY,CAC3D,CAAC,CACH,CAAC",
+  "sourcesContent": ["import { setRedisState } from '../../../../../../../test-app/routes/integrationTests/redisStateTestUtils'\nimport { ReportType } from '../../../../../types/UserReports'\n\ncontext('Bookmarks list', () => {\n  const path = '/embedded/platform/dpr/my-reports/bookmarks/list'\n\n  before(() => {\n    cy.task('resetStubs')\n    cy.task('resetRedis')\n    cy.task('stubDefinitions')\n    cy.task('stubSingleSummaries')\n    cy.task('stubDefinitionRequestExamplesSuccess')\n  })\n\n  it('is accessible', () => {\n    setRedisState({\n      requestedReports: [],\n      recentlyViewedReports: [],\n      bookmarks: [\n        {\n          reportId: 'request-examples',\n          id: 'request-example-success',\n          type: ReportType.REPORT,\n        },\n      ],\n      downloadPermissions: [{ reportId: 'request-examples', id: 'request-example-success' }],\n      defaultFilters: [],\n    })\n    cy.visit(path)\n    cy.injectAxe()\n    cy.checkA11y()\n    cy.findAllByText(/Successful Report/).should('be.visible')\n  })\n})\n"],
+  "mappings": "aAAA,IAAAA,EAA8B,qFAC9BC,EAA2B,4CAE3B,QAAQ,iBAAkB,IAAM,CAC9B,MAAMC,EAAO,mDAEb,OAAO,IAAM,CACX,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,iBAAiB,EACzB,GAAG,KAAK,qBAAqB,EAC7B,GAAG,KAAK,sCAAsC,CAChD,CAAC,EAED,GAAG,gBAAiB,IAAM,IACxB,iBAAc,CACZ,iBAAkB,CAAC,EACnB,sBAAuB,CAAC,EACxB,UAAW,CACT,CACE,SAAU,mBACV,GAAI,0BACJ,KAAM,aAAW,MACnB,CACF,EACA,oBAAqB,CAAC,CAAE,SAAU,mBAAoB,GAAI,yBAA0B,CAAC,EACrF,eAAgB,CAAC,CACnB,CAAC,EACD,GAAG,MAAMA,CAAI,EACb,GAAG,UAAU,EACb,GAAG,UAAU,EACb,GAAG,cAAc,mBAAmB,EAAE,OAAO,YAAY,CAC3D,CAAC,CACH,CAAC",
   "names": ["import_redisStateTestUtils", "import_UserReports", "path"]
 }

package/dpr/routes/journeys/my-reports/bookmarks/list/tests.cy.ts

@@ -19,8 +19,7 @@ context('Bookmarks list', () => {
       bookmarks: [
         {
           reportId: 'request-examples',
-          id: 'request-examples',
-          variantId: 'request-example-success',
+          id: 'request-example-success',
           type: ReportType.REPORT,
         },
       ],

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

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

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/my-reports/bookmarks/routes.ts"],
   "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport { Services } from '../../../../types/Services'\nimport BookmarkController 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 BookmarkController(layoutPath, services)\n\n  router.post('/', controller.POST)\n  router.delete('/', controller.DELETE)\n\n  router.use(`/list`, listRoutes({ layoutPath, services }))\n  return router\n}\n\nexport default routes\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBAEvBC,EAA+B,2BAC/BC,EAAuB,4BAEhB,SAASJ,EAAO,CAAE,WAAAK,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAAmBJ,EAAYC,CAAQ,EAE9D,OAAAC,EAAO,KAAK,IAAKC,EAAW,IAAI,EAChCD,EAAO,OAAO,IAAKC,EAAW,MAAM,EAEpCD,EAAO,IAAI,WAAS,EAAAG,SAAW,CAAE,WAAAL,EAAY,SAAAC,CAAS,CAAC,CAAC,EACjDC,CACT,CAEA,IAAOR,EAAQC",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBAEvBC,EAA+B,2BAC/BC,EAAuB,4BAEhB,SAASJ,EAAO,CAAE,WAAAK,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAAmBJ,EAAYC,CAAQ,EAE9D,OAAAC,EAAO,KAAK,IAAKC,EAAW,IAAI,EAChCD,EAAO,OAAO,IAAKC,EAAW,MAAM,EAEpCD,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", "BookmarkController", "listRoutes"]
 }