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

package/dpr/middleware/setUpDprResources.js

@@ -1,2 +1,2 @@
-var w=Object.create;var l=Object.defineProperty;var C=Object.getOwnPropertyDescriptor;var q=Object.getOwnPropertyNames;var Q=Object.getPrototypeOf,V=Object.prototype.hasOwnProperty;var b=(t,o)=>{for(var e in o)l(t,e,{get:o[e],enumerable:!0})},g=(t,o,e,i)=>{if(o&&typeof o=="object"||typeof o=="function")for(let r of q(o))!V.call(t,r)&&r!==e&&l(t,r,{get:()=>o[r],enumerable:!(i=C(o,r))||i.enumerable});return t};var S=(t,o,e)=>(e=t!=null?w(Q(t)):{},g(o||!t||!t.__esModule?l(e,"default",{value:t,enumerable:!0}):e,t)),v=t=>g(l({},"__esModule",{value:!0}),t);var B={};b(B,{default:()=>A,populateDefinitions:()=>D,populateRequestedReports:()=>k,setupResources:()=>h});module.exports=v(B);var c=S(require("../utils/definitionUtils")),f=S(require("../utils/localsHelper"));const I=(t,o)=>t[o]?t[o].toString():null,F=t=>I(t,"dataProductDefinitionsPath"),E=t=>{const o=F(t);return o||null},h=(t,o)=>async(e,i,r)=>{x(e,i);try{return await D(t,e,i,o),await k(t,i),r()}catch(a){return r(a)}},x=(t,o)=>{const e=t.flash("DPR_ERRORS");e&&e[0]&&(o.locals.validationErrors=JSON.parse(e[0]))},D=async(t,o,e,i)=>{const{token:r,dprUser:a}=f.default.getValues(e),d=E(o.query),n=o.body?.dataProductDefinitionsPath,s=d||n;s&&(e.locals.dpdPathFromQuery=!0);const m=i?.dataProductDefinitionsPath;if(m&&(e.locals.dpdPathFromConfig=!0),e.locals.definitionsPath=s||m,e.locals.pathSuffix=`?dataProductDefinitionsPath=${e.locals.definitionsPath}`,r&&t.reportingService){const P=await t.productCollectionStoreService.getSelectedProductCollectionId(a.id);e.locals.definitions=await Promise.all([t.reportingService.getDefinitions(r,e.locals.definitionsPath),P&&t.productCollectionService.getProductCollection(a.id,P)]).then(([R,p])=>{if(p&&p){const y=p.products.map(u=>u.productId);return R.filter(u=>y.includes(u.id))}return R})??[]}},k=async(t,o)=>{const{dprUser:e}=f.default.getValues(o);if(e.id){const{definitions:i,definitionsPath:r}=o.locals,a=await t.requestedReportService.getAllReports(e.id);o.locals.requestedReports=r?a.filter(n=>c.default.getCurrentVariantDefinition(i,n.reportId,n.id)):a;const d=await t.recentlyViewedService.getAllReports(e.id);if(o.locals.recentlyViewedReports=r?d.filter(n=>c.default.getCurrentVariantDefinition(i,n.reportId,n.id)):d,t.bookmarkService){o.locals.bookmarkingEnabled=!0;const n=await t.bookmarkService.getAllBookmarks(e.id);o.locals.bookmarks=r?n.filter(s=>c.default.getCurrentVariantDefinition(i,s.reportId,s.id)):n}t.downloadPermissionService&&(o.locals.downloadingEnabled=!0)}};var A=h;0&&(module.exports={populateDefinitions,populateRequestedReports,setupResources});
+"use strict";var y=Object.create;var s=Object.defineProperty;var C=Object.getOwnPropertyDescriptor;var q=Object.getOwnPropertyNames;var w=Object.getPrototypeOf,E=Object.prototype.hasOwnProperty;var V=(t,e)=>{for(var o in e)s(t,o,{get:e[o],enumerable:!0})},R=(t,e,o,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of q(e))!E.call(t,i)&&i!==o&&s(t,i,{get:()=>e[i],enumerable:!(r=C(e,i))||r.enumerable});return t};var S=(t,e,o)=>(o=t!=null?y(w(t)):{},R(e||!t||!t.__esModule?s(o,"default",{value:t,enumerable:!0}):o,t)),v=t=>R(s({},"__esModule",{value:!0}),t);var B={};V(B,{default:()=>A,populateDefinitions:()=>D,populateRequestedReports:()=>b,setupResources:()=>h});module.exports=v(B);var c=S(require("../utils/definitionUtils")),m=S(require("../utils/localsHelper"));const Q=(t,e)=>t[e]?t[e].toString():null,F=t=>Q(t,"dataProductDefinitionsPath"),I=t=>{const e=F(t);return e||null},h=(t,e)=>async(o,r,i)=>{x(o,r);try{return await D(t,o,r,e),await b(t,r),i()}catch(a){return i(a)}},x=(t,e)=>{const o=t.flash("DPR_ERRORS");o&&o[0]&&(e.locals.validationErrors=JSON.parse(o[0]))},D=async(t,e,o,r)=>{const{token:i,dprUser:a}=m.default.getValues(o),d=I(e.query),n=e.body?.dataProductDefinitionsPath,l=d||n;l&&(o.locals.dpdPathFromQuery=!0);const P=r?.dataProductDefinitionsPath;P&&(o.locals.dpdPathFromConfig=!0),o.locals.definitionsPath=l||P,o.locals.pathSuffix=`?dataProductDefinitionsPath=${o.locals.definitionsPath}`;let u;i&&(u=await t.productCollectionStoreService.getSelectedProductCollectionId(a.id)),o.locals.definitions=await Promise.all([t.reportingService.getDefinitions(i,o.locals.definitionsPath),u&&t.productCollectionService.getProductCollection(i,u)]).then(([g,p])=>{if(p&&p){const k=p.products.map(f=>f.productId);return g.filter(f=>k.includes(f.id))}return g})??[]},b=async(t,e)=>{const{dprUser:o}=m.default.getValues(e);if(o.id){const{definitions:r,definitionsPath:i}=e.locals,a=await t.requestedReportService.getAllReports(o.id);e.locals.requestedReports=i?a.filter(n=>c.default.getCurrentVariantDefinition(r,n.reportId,n.id)):a;const d=await t.recentlyViewedService.getAllReports(o.id);if(e.locals.recentlyViewedReports=i?d.filter(n=>c.default.getCurrentVariantDefinition(r,n.reportId,n.id)):d,e.locals.downloadingEnabled=t.downloadPermissionService.enabled,e.locals.bookmarkingEnabled=t.bookmarkService.enabled,e.locals.collectionsEnabled=t.productCollectionService.enabled,e.locals.requestMissingEnabled=t.missingReportService.enabled,e.locals.saveDefaultsEnabled=t.defaultFilterValuesService.enabled,e.locals.bookmarkingEnabled){const n=await t.bookmarkService.getAllBookmarks(o.id);e.locals.bookmarks=i?n.filter(l=>c.default.getCurrentVariantDefinition(r,l.reportId,l.id)):n}}};var A=h;0&&(module.exports={populateDefinitions,populateRequestedReports,setupResources});
 //# sourceMappingURL=setUpDprResources.js.map

package/dpr/middleware/setUpDprResources.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/middleware/setUpDprResources.ts"],
-  "sourcesContent": ["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport { RequestHandler, Response, Request } from 'express'\nimport type { ParsedQs } from 'qs'\nimport { Services } from '../types/Services'\nimport { RequestedReport, StoredReportData } from '../types/UserReports'\nimport DefinitionUtils from '../utils/definitionUtils'\nimport { BookmarkStoreData } from '../types/Bookmark'\nimport { DprConfig } from '../types/DprConfig'\nimport localsHelper from '../utils/localsHelper'\n\nconst getQueryParamAsString = (query: ParsedQs, name: string) => (query[name] ? query[name].toString() : null)\nconst getDefinitionsPath = (query: ParsedQs) => getQueryParamAsString(query, 'dataProductDefinitionsPath')\n\nconst deriveDefinitionsPath = (query: ParsedQs): string | null => {\n  const definitionsPath = getDefinitionsPath(query)\n  if (definitionsPath) {\n    return definitionsPath\n  }\n\n  return null\n}\n\nexport const setupResources = (services: Services, config?: DprConfig): RequestHandler => {\n  return async (req, res, next) => {\n    populateValidationErrors(req, res)\n    try {\n      await populateDefinitions(services, req, res, config)\n      await populateRequestedReports(services, res)\n      return next()\n    } catch (error) {\n      return next(error)\n    }\n  }\n}\n\nconst populateValidationErrors = (req: Request, res: Response) => {\n  const errors = req.flash(`DPR_ERRORS`)\n  if (errors && errors[0]) {\n    res.locals.validationErrors = JSON.parse(errors[0])\n  }\n}\n\nexport const populateDefinitions = async (services: Services, req: Request, res: Response, config?: DprConfig) => {\n  // Get the DPD path from the query\n  const { token, dprUser } = localsHelper.getValues(res)\n\n  const dpdPathFromQuery = deriveDefinitionsPath(req.query)\n  const dpdPathFromBody = req.body?.dataProductDefinitionsPath\n  const definitionsPathFromQuery = dpdPathFromQuery || dpdPathFromBody\n\n  if (definitionsPathFromQuery) {\n    res.locals.dpdPathFromQuery = true\n  }\n\n  // Get the DPD path from the config\n  const dpdPathFromConfig = config?.dataProductDefinitionsPath\n  if (dpdPathFromConfig) {\n    res.locals.dpdPathFromConfig = true\n  }\n\n  // query takes presedence over config\n  res.locals.definitionsPath = definitionsPathFromQuery || dpdPathFromConfig\n  res.locals.pathSuffix = `?dataProductDefinitionsPath=${res.locals.definitionsPath}`\n\n  if (token && services.reportingService) {\n    const selectedProductCollectionId = await services.productCollectionStoreService.getSelectedProductCollectionId(\n      dprUser.id,\n    )\n\n    res.locals.definitions =\n      (await Promise.all([\n        services.reportingService.getDefinitions(token, res.locals.definitionsPath),\n        selectedProductCollectionId &&\n          services.productCollectionService.getProductCollection(dprUser.id, selectedProductCollectionId),\n      ]).then(([defs, selectedProductCollection]) => {\n        if (selectedProductCollection && selectedProductCollection) {\n          const productIds = selectedProductCollection.products.map((product) => product.productId)\n          return defs.filter((def) => productIds.includes(def.id))\n        }\n        return defs\n      })) ?? []\n  }\n}\n\nexport const populateRequestedReports = async (services: Services, res: Response) => {\n  const { dprUser } = localsHelper.getValues(res)\n  if (dprUser.id) {\n    const { definitions, definitionsPath } = res.locals\n\n    const requested = await services.requestedReportService.getAllReports(dprUser.id)\n    res.locals.requestedReports = !definitionsPath\n      ? requested\n      : requested.filter((report: RequestedReport) => {\n          return DefinitionUtils.getCurrentVariantDefinition(definitions, report.reportId, report.id)\n        })\n\n    const recent = await services.recentlyViewedService.getAllReports(dprUser.id)\n    res.locals.recentlyViewedReports = !definitionsPath\n      ? recent\n      : recent.filter((report: StoredReportData) => {\n          return DefinitionUtils.getCurrentVariantDefinition(definitions, report.reportId, report.id)\n        })\n\n    if (services.bookmarkService) {\n      res.locals.bookmarkingEnabled = true\n\n      const bookmarks = await services.bookmarkService.getAllBookmarks(dprUser.id)\n      res.locals.bookmarks = !definitionsPath\n        ? bookmarks\n        : bookmarks.filter((bookmark: BookmarkStoreData) => {\n            return DefinitionUtils.getCurrentVariantDefinition(definitions, bookmark.reportId, bookmark.id)\n          })\n    }\n\n    if (services.downloadPermissionService) {\n      res.locals.downloadingEnabled = true\n    }\n  }\n}\n\nexport default setupResources\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,wBAAAC,EAAA,6BAAAC,EAAA,mBAAAC,IAAA,eAAAC,EAAAN,GAKA,IAAAO,EAA4B,uCAG5BC,EAAyB,oCAEzB,MAAMC,EAAwB,CAACC,EAAiBC,IAAkBD,EAAMC,CAAI,EAAID,EAAMC,CAAI,EAAE,SAAS,EAAI,KACnGC,EAAsBF,GAAoBD,EAAsBC,EAAO,4BAA4B,EAEnGG,EAAyBH,GAAmC,CAChE,MAAMI,EAAkBF,EAAmBF,CAAK,EAChD,OAAII,GAIG,IACT,EAEaT,EAAiB,CAACU,EAAoBC,IAC1C,MAAOC,EAAKC,EAAKC,IAAS,CAC/BC,EAAyBH,EAAKC,CAAG,EACjC,GAAI,CACF,aAAMf,EAAoBY,EAAUE,EAAKC,EAAKF,CAAM,EACpD,MAAMZ,EAAyBW,EAAUG,CAAG,EACrCC,EAAK,CACd,OAASE,EAAO,CACd,OAAOF,EAAKE,CAAK,CACnB,CACF,EAGID,EAA2B,CAACH,EAAcC,IAAkB,CAChE,MAAMI,EAASL,EAAI,MAAM,YAAY,EACjCK,GAAUA,EAAO,CAAC,IACpBJ,EAAI,OAAO,iBAAmB,KAAK,MAAMI,EAAO,CAAC,CAAC,EAEtD,EAEanB,EAAsB,MAAOY,EAAoBE,EAAcC,EAAeF,IAAuB,CAEhH,KAAM,CAAE,MAAAO,EAAO,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUP,CAAG,EAE/CQ,EAAmBb,EAAsBI,EAAI,KAAK,EAClDU,EAAkBV,EAAI,MAAM,2BAC5BW,EAA2BF,GAAoBC,EAEjDC,IACFV,EAAI,OAAO,iBAAmB,IAIhC,MAAMW,EAAoBb,GAAQ,2BASlC,GARIa,IACFX,EAAI,OAAO,kBAAoB,IAIjCA,EAAI,OAAO,gBAAkBU,GAA4BC,EACzDX,EAAI,OAAO,WAAa,+BAA+BA,EAAI,OAAO,eAAe,GAE7EK,GAASR,EAAS,iBAAkB,CACtC,MAAMe,EAA8B,MAAMf,EAAS,8BAA8B,+BAC/ES,EAAQ,EACV,EAEAN,EAAI,OAAO,YACR,MAAM,QAAQ,IAAI,CACjBH,EAAS,iBAAiB,eAAeQ,EAAOL,EAAI,OAAO,eAAe,EAC1EY,GACEf,EAAS,yBAAyB,qBAAqBS,EAAQ,GAAIM,CAA2B,CAClG,CAAC,EAAE,KAAK,CAAC,CAACC,EAAMC,CAAyB,IAAM,CAC7C,GAAIA,GAA6BA,EAA2B,CAC1D,MAAMC,EAAaD,EAA0B,SAAS,IAAKE,GAAYA,EAAQ,SAAS,EACxF,OAAOH,EAAK,OAAQI,GAAQF,EAAW,SAASE,EAAI,EAAE,CAAC,CACzD,CACA,OAAOJ,CACT,CAAC,GAAM,CAAC,CACZ,CACF,EAEa3B,EAA2B,MAAOW,EAAoBG,IAAkB,CACnF,KAAM,CAAE,QAAAM,CAAQ,EAAI,EAAAC,QAAa,UAAUP,CAAG,EAC9C,GAAIM,EAAQ,GAAI,CACd,KAAM,CAAE,YAAAY,EAAa,gBAAAtB,CAAgB,EAAII,EAAI,OAEvCmB,EAAY,MAAMtB,EAAS,uBAAuB,cAAcS,EAAQ,EAAE,EAChFN,EAAI,OAAO,iBAAoBJ,EAE3BuB,EAAU,OAAQC,GACT,EAAAC,QAAgB,4BAA4BH,EAAaE,EAAO,SAAUA,EAAO,EAAE,CAC3F,EAHDD,EAKJ,MAAMG,EAAS,MAAMzB,EAAS,sBAAsB,cAAcS,EAAQ,EAAE,EAO5E,GANAN,EAAI,OAAO,sBAAyBJ,EAEhC0B,EAAO,OAAQF,GACN,EAAAC,QAAgB,4BAA4BH,EAAaE,EAAO,SAAUA,EAAO,EAAE,CAC3F,EAHDE,EAKAzB,EAAS,gBAAiB,CAC5BG,EAAI,OAAO,mBAAqB,GAEhC,MAAMuB,EAAY,MAAM1B,EAAS,gBAAgB,gBAAgBS,EAAQ,EAAE,EAC3EN,EAAI,OAAO,UAAaJ,EAEpB2B,EAAU,OAAQC,GACT,EAAAH,QAAgB,4BAA4BH,EAAaM,EAAS,SAAUA,EAAS,EAAE,CAC/F,EAHDD,CAIN,CAEI1B,EAAS,4BACXG,EAAI,OAAO,mBAAqB,GAEpC,CACF,EAEA,IAAOhB,EAAQG",
+  "sourcesContent": ["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport { RequestHandler, Response, Request } from 'express'\nimport type { ParsedQs } from 'qs'\nimport { Services } from '../types/Services'\nimport { RequestedReport, StoredReportData } from '../types/UserReports'\nimport DefinitionUtils from '../utils/definitionUtils'\nimport { BookmarkStoreData } from '../types/Bookmark'\nimport { DprConfig } from '../types/DprConfig'\nimport localsHelper from '../utils/localsHelper'\n\nconst getQueryParamAsString = (query: ParsedQs, name: string) => (query[name] ? query[name].toString() : null)\nconst getDefinitionsPath = (query: ParsedQs) => getQueryParamAsString(query, 'dataProductDefinitionsPath')\n\nconst deriveDefinitionsPath = (query: ParsedQs): string | null => {\n  const definitionsPath = getDefinitionsPath(query)\n  if (definitionsPath) {\n    return definitionsPath\n  }\n\n  return null\n}\n\nexport const setupResources = (services: Services, config?: DprConfig): RequestHandler => {\n  return async (req, res, next) => {\n    populateValidationErrors(req, res)\n    try {\n      await populateDefinitions(services, req, res, config)\n      await populateRequestedReports(services, res)\n      return next()\n    } catch (error) {\n      return next(error)\n    }\n  }\n}\n\nconst populateValidationErrors = (req: Request, res: Response) => {\n  const errors = req.flash(`DPR_ERRORS`)\n  if (errors && errors[0]) {\n    res.locals['validationErrors'] = JSON.parse(errors[0])\n  }\n}\n\nexport const populateDefinitions = async (services: Services, req: Request, res: Response, config?: DprConfig) => {\n  // Get the DPD path from the query\n  const { token, dprUser } = localsHelper.getValues(res)\n\n  const dpdPathFromQuery = deriveDefinitionsPath(req.query)\n  const dpdPathFromBody = req.body?.dataProductDefinitionsPath\n  const definitionsPathFromQuery = dpdPathFromQuery || dpdPathFromBody\n\n  if (definitionsPathFromQuery) {\n    res.locals['dpdPathFromQuery'] = true\n  }\n\n  // Get the DPD path from the config\n  const dpdPathFromConfig = config?.dataProductDefinitionsPath\n  if (dpdPathFromConfig) {\n    res.locals['dpdPathFromConfig'] = true\n  }\n\n  // query takes presedence over config\n  res.locals['definitionsPath'] = definitionsPathFromQuery || dpdPathFromConfig\n  res.locals['pathSuffix'] = `?dataProductDefinitionsPath=${res.locals['definitionsPath']}`\n\n  let selectedProductCollectionId: string | undefined\n  if (token) {\n    selectedProductCollectionId = await services.productCollectionStoreService.getSelectedProductCollectionId(\n      dprUser.id,\n    )\n  }\n\n  res.locals['definitions'] =\n    (await Promise.all([\n      services.reportingService.getDefinitions(token, res.locals['definitionsPath']),\n      selectedProductCollectionId &&\n        services.productCollectionService.getProductCollection(token, selectedProductCollectionId),\n    ]).then(([defs, selectedProductCollection]) => {\n      if (selectedProductCollection && selectedProductCollection) {\n        const productIds = selectedProductCollection.products.map((product) => product.productId)\n        return defs.filter((def) => productIds.includes(def.id))\n      }\n      return defs\n    })) ?? []\n}\n\nexport const populateRequestedReports = async (services: Services, res: Response) => {\n  const { dprUser } = localsHelper.getValues(res)\n  if (dprUser.id) {\n    const { definitions, definitionsPath } = res.locals\n\n    const requested = await services.requestedReportService.getAllReports(dprUser.id)\n    res.locals['requestedReports'] = !definitionsPath\n      ? requested\n      : requested.filter((report: RequestedReport) => {\n          return DefinitionUtils.getCurrentVariantDefinition(definitions, report.reportId, report.id)\n        })\n\n    const recent = await services.recentlyViewedService.getAllReports(dprUser.id)\n    res.locals['recentlyViewedReports'] = !definitionsPath\n      ? recent\n      : recent.filter((report: StoredReportData) => {\n          return DefinitionUtils.getCurrentVariantDefinition(definitions, report.reportId, report.id)\n        })\n\n    res.locals['downloadingEnabled'] = services.downloadPermissionService.enabled\n    res.locals['bookmarkingEnabled'] = services.bookmarkService.enabled\n    res.locals['collectionsEnabled'] = services.productCollectionService.enabled\n    res.locals['requestMissingEnabled'] = services.missingReportService.enabled\n    res.locals['saveDefaultsEnabled'] = services.defaultFilterValuesService.enabled\n\n    if (res.locals['bookmarkingEnabled']) {\n      const bookmarks = await services.bookmarkService.getAllBookmarks(dprUser.id)\n      res.locals['bookmarks'] = !definitionsPath\n        ? bookmarks\n        : bookmarks.filter((bookmark: BookmarkStoreData) => {\n            return DefinitionUtils.getCurrentVariantDefinition(definitions, bookmark.reportId, bookmark.id)\n          })\n    }\n  }\n}\n\nexport default setupResources\n"],
+  "mappings": "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",
   "names": ["setUpDprResources_exports", "__export", "setUpDprResources_default", "populateDefinitions", "populateRequestedReports", "setupResources", "__toCommonJS", "import_definitionUtils", "import_localsHelper", "getQueryParamAsString", "query", "name", "getDefinitionsPath", "deriveDefinitionsPath", "definitionsPath", "services", "config", "req", "res", "next", "populateValidationErrors", "error", "errors", "token", "dprUser", "localsHelper", "dpdPathFromQuery", "dpdPathFromBody", "definitionsPathFromQuery", "dpdPathFromConfig", "selectedProductCollectionId", "defs", "selectedProductCollection", "productIds", "product", "def", "definitions", "requested", "report", "DefinitionUtils", "recent", "bookmarks", "bookmark"]
 }

package/dpr/middleware/setUpDprResources.test.ts

@@ -1,9 +1,19 @@
+import { expect, jest } from '@jest/globals'
 import { Response, Request } from 'express'
 
 import { Services } from '../types/Services'
 import * as Middleware from './setUpDprResources'
 import { RecentlyViewedReport } from '../types/UserReports'
-import { DownloadPermissionService, RequestedReportService, ReportingService, BookmarkService } from '../services'
+import {
+  DownloadPermissionService,
+  RequestedReportService,
+  ReportingService,
+  BookmarkService,
+  DefaultFilterValuesService,
+} from '../services'
+import { ProductCollectionService } from '../services/productCollection/productCollectionService'
+import MissingReportService from '../services/missingReport/missingReportService'
+import { ProductCollectionStoreService } from '../services/productCollection/productCollectionStoreService'
 
 describe('setUpDprResources', () => {
   describe('populateRequestedReports', () => {
@@ -11,27 +21,56 @@ describe('setUpDprResources', () => {
     let bookmarkService: BookmarkService
     let recentlyViewedService: RecentlyViewedReport
     let downloadPermissionService: DownloadPermissionService
+    let productCollectionService: ProductCollectionService
+    let defaultFilterValuesService: DefaultFilterValuesService
+    let productCollectionStoreService: ProductCollectionStoreService
+    let missingReportService: MissingReportService
     let services: Services
     let res: Response
 
     beforeEach(() => {
       requestedReportService = {
-        getAllReports: jest.fn().mockResolvedValue([]),
+        getAllReports: jest.fn().mockReturnValueOnce([]),
       } as unknown as RequestedReportService
 
       recentlyViewedService = {
-        getAllReports: jest.fn().mockResolvedValue([]),
+        getAllReports: jest.fn().mockReturnValueOnce([]),
       } as unknown as RecentlyViewedReport
 
       bookmarkService = {
-        getAllBookmarks: jest.fn().mockResolvedValue([]),
+        getAllBookmarks: jest.fn().mockReturnValueOnce([]),
+        enabled: true,
       } as unknown as BookmarkService
 
-      downloadPermissionService = {} as unknown as DownloadPermissionService
+      downloadPermissionService = {
+        enabled: true,
+      } as unknown as DownloadPermissionService
+
+      productCollectionService = {
+        enabled: true,
+      } as unknown as ProductCollectionService
+
+      productCollectionStoreService = {
+        enabled: true,
+      } as unknown as ProductCollectionStoreService
+
+      defaultFilterValuesService = {
+        enabled: true,
+      } as unknown as DefaultFilterValuesService
+
+      missingReportService = {
+        enabled: true,
+      } as unknown as MissingReportService
 
       services = {
         requestedReportService,
         recentlyViewedService,
+        productCollectionService,
+        productCollectionStoreService,
+        missingReportService,
+        defaultFilterValuesService,
+        downloadPermissionService,
+        bookmarkService,
       } as unknown as Services
 
       res = {
@@ -49,8 +88,8 @@ describe('setUpDprResources', () => {
 
       expect(services.requestedReportService.getAllReports).toHaveBeenCalledWith('Uu1d')
       expect(services.recentlyViewedService.getAllReports).toHaveBeenCalledWith('Uu1d')
-      expect(res.locals.bookmarkingEnabled).toBeUndefined()
-      expect(res.locals.downloadingEnabled).toBeUndefined()
+      expect(res.locals['bookmarkingEnabled']).toBeTruthy()
+      expect(res.locals['downloadingEnabled']).toBeTruthy()
     })
 
     it('should get the bookmarks', async () => {
@@ -62,9 +101,9 @@ describe('setUpDprResources', () => {
 
       expect(services.requestedReportService.getAllReports).toHaveBeenCalledWith('Uu1d')
       expect(services.recentlyViewedService.getAllReports).toHaveBeenCalledWith('Uu1d')
-      expect(res.locals.bookmarkingEnabled).toBeTruthy()
+      expect(res.locals['bookmarkingEnabled']).toBeTruthy()
       expect(services.bookmarkService.getAllBookmarks).toHaveBeenCalledWith('Uu1d')
-      expect(res.locals.downloadingEnabled).toBeUndefined()
+      expect(res.locals['downloadingEnabled']).toBeTruthy()
     })
 
     it('should enable downloading', async () => {
@@ -77,9 +116,9 @@ describe('setUpDprResources', () => {
 
       expect(services.requestedReportService.getAllReports).toHaveBeenCalledWith('Uu1d')
       expect(services.recentlyViewedService.getAllReports).toHaveBeenCalledWith('Uu1d')
-      expect(res.locals.bookmarkingEnabled).toBeTruthy()
+      expect(res.locals['bookmarkingEnabled']).toBeTruthy()
       expect(services.bookmarkService.getAllBookmarks).toHaveBeenCalledWith('Uu1d')
-      expect(res.locals.downloadingEnabled).toBeTruthy()
+      expect(res.locals['downloadingEnabled']).toBeTruthy()
     })
   })
 
@@ -129,23 +168,23 @@ describe('setUpDprResources', () => {
       await Middleware.populateDefinitions(services, req, res, {
         dataProductDefinitionsPath: 'dpd/path/from/config',
       })
-      expect(res.locals.dpdPathFromConfig).toBeTruthy()
-      expect(res.locals.dpdPathFromQuery).toBeFalsy()
-      expect(res.locals.definitionsPath).toEqual('dpd/path/from/config')
-      expect(res.locals.pathSuffix).toEqual('?dataProductDefinitionsPath=dpd/path/from/config')
+      expect(res.locals['dpdPathFromConfig']).toBeTruthy()
+      expect(res.locals['dpdPathFromQuery']).toBeFalsy()
+      expect(res.locals['definitionsPath']).toEqual('dpd/path/from/config')
+      expect(res.locals['pathSuffix']).toEqual('?dataProductDefinitionsPath=dpd/path/from/config')
       expect(services.reportingService.getDefinitions).toHaveBeenCalledWith('T0k3n', 'dpd/path/from/config')
     })
 
     it('should get the definitions and override the config DPD path with DPD path from query', async () => {
-      req.query.dataProductDefinitionsPath = 'dpd/path/from/query'
+      req.query['dataProductDefinitionsPath'] = 'dpd/path/from/query'
 
       await Middleware.populateDefinitions(services, req, res, {
         dataProductDefinitionsPath: 'dpd/path/from/config',
       })
-      expect(res.locals.dpdPathFromConfig).toBeTruthy()
-      expect(res.locals.dpdPathFromQuery).toBeTruthy()
-      expect(res.locals.definitionsPath).toEqual('dpd/path/from/query')
-      expect(res.locals.pathSuffix).toEqual('?dataProductDefinitionsPath=dpd/path/from/query')
+      expect(res.locals['dpdPathFromConfig']).toBeTruthy()
+      expect(res.locals['dpdPathFromQuery']).toBeTruthy()
+      expect(res.locals['definitionsPath']).toEqual('dpd/path/from/query')
+      expect(res.locals['pathSuffix']).toEqual('?dataProductDefinitionsPath=dpd/path/from/query')
       expect(services.reportingService.getDefinitions).toHaveBeenCalledWith('T0k3n', 'dpd/path/from/query')
     })
   })

package/dpr/middleware/setUpDprResources.ts

@@ -36,7 +36,7 @@ export const setupResources = (services: Services, config?: DprConfig): RequestH
 const populateValidationErrors = (req: Request, res: Response) => {
   const errors = req.flash(`DPR_ERRORS`)
   if (errors && errors[0]) {
-    res.locals.validationErrors = JSON.parse(errors[0])
+    res.locals['validationErrors'] = JSON.parse(errors[0])
   }
 }
 
@@ -49,37 +49,38 @@ export const populateDefinitions = async (services: Services, req: Request, res:
   const definitionsPathFromQuery = dpdPathFromQuery || dpdPathFromBody
 
   if (definitionsPathFromQuery) {
-    res.locals.dpdPathFromQuery = true
+    res.locals['dpdPathFromQuery'] = true
   }
 
   // Get the DPD path from the config
   const dpdPathFromConfig = config?.dataProductDefinitionsPath
   if (dpdPathFromConfig) {
-    res.locals.dpdPathFromConfig = true
+    res.locals['dpdPathFromConfig'] = true
   }
 
   // query takes presedence over config
-  res.locals.definitionsPath = definitionsPathFromQuery || dpdPathFromConfig
-  res.locals.pathSuffix = `?dataProductDefinitionsPath=${res.locals.definitionsPath}`
+  res.locals['definitionsPath'] = definitionsPathFromQuery || dpdPathFromConfig
+  res.locals['pathSuffix'] = `?dataProductDefinitionsPath=${res.locals['definitionsPath']}`
 
-  if (token && services.reportingService) {
-    const selectedProductCollectionId = await services.productCollectionStoreService.getSelectedProductCollectionId(
+  let selectedProductCollectionId: string | undefined
+  if (token) {
+    selectedProductCollectionId = await services.productCollectionStoreService.getSelectedProductCollectionId(
       dprUser.id,
     )
-
-    res.locals.definitions =
-      (await Promise.all([
-        services.reportingService.getDefinitions(token, res.locals.definitionsPath),
-        selectedProductCollectionId &&
-          services.productCollectionService.getProductCollection(dprUser.id, selectedProductCollectionId),
-      ]).then(([defs, selectedProductCollection]) => {
-        if (selectedProductCollection && selectedProductCollection) {
-          const productIds = selectedProductCollection.products.map((product) => product.productId)
-          return defs.filter((def) => productIds.includes(def.id))
-        }
-        return defs
-      })) ?? []
   }
+
+  res.locals['definitions'] =
+    (await Promise.all([
+      services.reportingService.getDefinitions(token, res.locals['definitionsPath']),
+      selectedProductCollectionId &&
+        services.productCollectionService.getProductCollection(token, selectedProductCollectionId),
+    ]).then(([defs, selectedProductCollection]) => {
+      if (selectedProductCollection && selectedProductCollection) {
+        const productIds = selectedProductCollection.products.map((product) => product.productId)
+        return defs.filter((def) => productIds.includes(def.id))
+      }
+      return defs
+    })) ?? []
 }
 
 export const populateRequestedReports = async (services: Services, res: Response) => {
@@ -88,33 +89,33 @@ export const populateRequestedReports = async (services: Services, res: Response
     const { definitions, definitionsPath } = res.locals
 
     const requested = await services.requestedReportService.getAllReports(dprUser.id)
-    res.locals.requestedReports = !definitionsPath
+    res.locals['requestedReports'] = !definitionsPath
       ? requested
       : requested.filter((report: RequestedReport) => {
           return DefinitionUtils.getCurrentVariantDefinition(definitions, report.reportId, report.id)
         })
 
     const recent = await services.recentlyViewedService.getAllReports(dprUser.id)
-    res.locals.recentlyViewedReports = !definitionsPath
+    res.locals['recentlyViewedReports'] = !definitionsPath
       ? recent
       : recent.filter((report: StoredReportData) => {
           return DefinitionUtils.getCurrentVariantDefinition(definitions, report.reportId, report.id)
         })
 
-    if (services.bookmarkService) {
-      res.locals.bookmarkingEnabled = true
+    res.locals['downloadingEnabled'] = services.downloadPermissionService.enabled
+    res.locals['bookmarkingEnabled'] = services.bookmarkService.enabled
+    res.locals['collectionsEnabled'] = services.productCollectionService.enabled
+    res.locals['requestMissingEnabled'] = services.missingReportService.enabled
+    res.locals['saveDefaultsEnabled'] = services.defaultFilterValuesService.enabled
 
+    if (res.locals['bookmarkingEnabled']) {
       const bookmarks = await services.bookmarkService.getAllBookmarks(dprUser.id)
-      res.locals.bookmarks = !definitionsPath
+      res.locals['bookmarks'] = !definitionsPath
         ? bookmarks
         : bookmarks.filter((bookmark: BookmarkStoreData) => {
             return DefinitionUtils.getCurrentVariantDefinition(definitions, bookmark.reportId, bookmark.id)
           })
     }
-
-    if (services.downloadPermissionService) {
-      res.locals.downloadingEnabled = true
-    }
   }
 }
 

package/dpr/middleware/setUpNestedRoute.js

@@ -1,2 +1,2 @@
-var a=Object.defineProperty;var n=Object.getOwnPropertyDescriptor;var u=Object.getOwnPropertyNames;var d=Object.prototype.hasOwnProperty;var p=(t,e)=>{for(var r in e)a(t,r,{get:e[r],enumerable:!0})},c=(t,e,r,l)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of u(e))!d.call(t,s)&&s!==r&&a(t,s,{get:()=>e[s],enumerable:!(l=n(e,s))||l.enumerable});return t};var R=t=>c(a({},"__esModule",{value:!0}),t);var m={};p(m,{default:()=>f,setupNestedRoute:()=>o});module.exports=R(m);const o=()=>async(t,e,r)=>{e.locals.nestedBaseUrl=t.baseUrl,r()};var f=o;0&&(module.exports={setupNestedRoute});
+"use strict";var a=Object.defineProperty;var n=Object.getOwnPropertyDescriptor;var u=Object.getOwnPropertyNames;var d=Object.prototype.hasOwnProperty;var p=(t,e)=>{for(var r in e)a(t,r,{get:e[r],enumerable:!0})},c=(t,e,r,l)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of u(e))!d.call(t,s)&&s!==r&&a(t,s,{get:()=>e[s],enumerable:!(l=n(e,s))||l.enumerable});return t};var R=t=>c(a({},"__esModule",{value:!0}),t);var m={};p(m,{default:()=>f,setupNestedRoute:()=>o});module.exports=R(m);const o=()=>async(t,e,r)=>{e.locals.nestedBaseUrl=t.baseUrl,r()};var f=o;0&&(module.exports={setupNestedRoute});
 //# sourceMappingURL=setUpNestedRoute.js.map

package/dpr/middleware/setUpNestedRoute.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/middleware/setUpNestedRoute.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\n\nexport const setupNestedRoute = (): RequestHandler => {\n  return async (req, res, next) => {\n    res.locals.nestedBaseUrl = req.baseUrl\n    next()\n  }\n}\n\nexport default setupNestedRoute\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,qBAAAC,IAAA,eAAAC,EAAAJ,GAEO,MAAMG,EAAmB,IACvB,MAAOE,EAAKC,EAAKC,IAAS,CAC/BD,EAAI,OAAO,cAAgBD,EAAI,QAC/BE,EAAK,CACP,EAGF,IAAOL,EAAQC",
+  "sourcesContent": ["import { RequestHandler } from 'express'\n\nexport const setupNestedRoute = (): RequestHandler => {\n  return async (req, res, next) => {\n    res.locals['nestedBaseUrl'] = req.baseUrl\n    next()\n  }\n}\n\nexport default setupNestedRoute\n"],
+  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,qBAAAC,IAAA,eAAAC,EAAAJ,GAEO,MAAMG,EAAmB,IACvB,MAAOE,EAAKC,EAAKC,IAAS,CAC/BD,EAAI,OAAO,cAAmBD,EAAI,QAClCE,EAAK,CACP,EAGF,IAAOL,EAAQC",
   "names": ["setUpNestedRoute_exports", "__export", "setUpNestedRoute_default", "setupNestedRoute", "__toCommonJS", "req", "res", "next"]
 }

package/dpr/middleware/setUpNestedRoute.ts

@@ -2,7 +2,7 @@ import { RequestHandler } from 'express'
 
 export const setupNestedRoute = (): RequestHandler => {
   return async (req, res, next) => {
-    res.locals.nestedBaseUrl = req.baseUrl
+    res.locals['nestedBaseUrl'] = req.baseUrl
     next()
   }
 }

package/dpr/routes/index.js

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

package/dpr/routes/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/routes/index.ts"],
-  "sourcesContent": ["import { Router } from 'express'\nimport type { Services } from '../types/Services'\nimport logger from '../utils/logger'\nimport JourneyRoutes from './journeys/routes'\n// middleware\nimport setUpNestedRoute from '../middleware/setUpNestedRoute'\n\nfunction routes(routeImportParams: { services: Services; layoutPath: string }) {\n  logger.info('Initialiasing DPR Embedded reports routes...')\n\n  const router = Router({ mergeParams: true })\n  router.use('/', setUpNestedRoute(), JourneyRoutes(routeImportParams))\n  return router\n}\n\nexport default routes\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,IAAA,eAAAC,EAAAH,GAAA,IAAAI,EAAuB,mBAEvBC,EAAmB,8BACnBC,EAA0B,gCAE1BC,EAA6B,6CAE7B,SAASC,EAAOC,EAA+D,CAC7E,EAAAC,QAAO,KAAK,8CAA8C,EAE1D,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAC3C,OAAAA,EAAO,IAAI,OAAK,EAAAC,SAAiB,KAAG,EAAAC,SAAcJ,CAAiB,CAAC,EAC7DE,CACT,CAEA,IAAOT,EAAQM",
+  "sourcesContent": ["import { Router } from 'express'\nimport type { Services } from '../types/Services'\nimport logger from '../utils/logger'\nimport JourneyRoutes from './journeys/routes'\n// middleware\nimport setUpNestedRoute from '../middleware/setUpNestedRoute'\n\nfunction routes(routeImportParams: { services: Services; layoutPath: string }) {\n  logger.info('Initialiasing DPR routes...')\n  const router = Router({ mergeParams: true })\n  router.use('/', setUpNestedRoute(), JourneyRoutes(routeImportParams))\n  return router\n}\n\nexport default routes\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,IAAA,eAAAC,EAAAH,GAAA,IAAAI,EAAuB,mBAEvBC,EAAmB,8BACnBC,EAA0B,gCAE1BC,EAA6B,6CAE7B,SAASC,EAAOC,EAA+D,CAC7E,EAAAC,QAAO,KAAK,6BAA6B,EACzC,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAC3C,OAAAA,EAAO,IAAI,OAAK,EAAAC,SAAiB,KAAG,EAAAC,SAAcJ,CAAiB,CAAC,EAC7DE,CACT,CAEA,IAAOT,EAAQM",
   "names": ["routes_exports", "__export", "routes_default", "__toCommonJS", "import_express", "import_logger", "import_routes", "import_setUpNestedRoute", "routes", "routeImportParams", "logger", "router", "setUpNestedRoute", "JourneyRoutes"]
 }

package/dpr/routes/index.ts

@@ -6,8 +6,7 @@ import JourneyRoutes from './journeys/routes'
 import setUpNestedRoute from '../middleware/setUpNestedRoute'
 
 function routes(routeImportParams: { services: Services; layoutPath: string }) {
-  logger.info('Initialiasing DPR Embedded reports routes...')
-
+  logger.info('Initialiasing DPR routes...')
   const router = Router({ mergeParams: true })
   router.use('/', setUpNestedRoute(), JourneyRoutes(routeImportParams))
   return router

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

@@ -1,2 +1,2 @@
-var y=Object.create;var a=Object.defineProperty;var P=Object.getOwnPropertyDescriptor;var S=Object.getOwnPropertyNames;var D=Object.getPrototypeOf,R=Object.prototype.hasOwnProperty;var b=(o,e)=>{for(var r in e)a(o,r,{get:e[r],enumerable:!0})},c=(o,e,r,i)=>{if(e&&typeof e=="object"||typeof e=="function")for(let t of S(e))!R.call(o,t)&&t!==r&&a(o,t,{get:()=>e[t],enumerable:!(i=P(e,t))||i.enumerable});return o};var p=(o,e,r)=>(r=o!=null?y(D(o)):{},c(e||!o||!o.__esModule?a(r,"default",{value:o,enumerable:!0}):r,o)),g=o=>c(a({},"__esModule",{value:!0}),o);var H={};b(H,{DownloadReportController:()=>l,default:()=>x});module.exports=g(H);var m=p(require("../../../utils/localsHelper")),u=p(require("./utils"));class l{constructor(e,r){this.POST=async(e,r,i)=>{const{dprUser:t}=m.default.getValues(r),{reportId:w,id:v,loadType:f,currentUrl:h,currentQueryParams:d}=e.body;let s=`${h}/download-disabled`;s=d?`${s}${d}`:s;const{downloadPermissionService:n}=this.services;(n?await n.downloadEnabled(t.id,w,v):!1)?await u.default.downloadReport({req:e,res:r,services:this.services,redirect:s,loadType:f}):r.redirect(s)};this.layoutPath=e,this.services=r}}var x=l;0&&(module.exports={DownloadReportController});
+"use strict";var R=Object.create;var i=Object.defineProperty;var f=Object.getOwnPropertyDescriptor;var h=Object.getOwnPropertyNames;var y=Object.getPrototypeOf,P=Object.prototype.hasOwnProperty;var S=(r,e)=>{for(var o in e)i(r,o,{get:e[o],enumerable:!0})},n=(r,e,o,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let t of h(e))!P.call(r,t)&&t!==o&&i(r,t,{get:()=>e[t],enumerable:!(a=f(e,t))||a.enumerable});return r};var c=(r,e,o)=>(o=r!=null?R(y(r)):{},n(e||!r||!r.__esModule?i(o,"default",{value:r,enumerable:!0}):o,r)),D=r=>n(i({},"__esModule",{value:!0}),r);var g={};S(g,{DownloadReportController:()=>d,default:()=>b});module.exports=D(g);var p=c(require("../../../utils/localsHelper")),m=c(require("./utils"));class d{constructor(e,o){this.POST=async(e,o)=>{const{dprUser:a}=p.default.getValues(o),{reportId:t,id:u,loadType:w,currentUrl:v,currentQueryParams:l}=e.body;let s=`${v}/download-disabled`;s=l?`${s}${l}`:s,await this.services.downloadPermissionService.downloadEnabledForReport(a.id,t,u)?await m.default.downloadReport({req:e,res:o,services:this.services,redirect:s,loadType:w}):o.redirect(s)};this.layoutPath=e,this.services=o}}var b=d;0&&(module.exports={DownloadReportController});
 //# sourceMappingURL=controller.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/routes/journeys/download-report/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport LocalsHelper from '../../../utils/localsHelper'\nimport DownloadUtils from './utils'\nimport { Services } from '../../../types/Services'\n\nclass DownloadReportController {\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, next) => {\n    const { dprUser } = LocalsHelper.getValues(res)\n    const { reportId, id, loadType, currentUrl, currentQueryParams } = req.body\n\n    let redirect = `${currentUrl}/download-disabled`\n    redirect = currentQueryParams ? `${redirect}${currentQueryParams}` : redirect\n\n    const { downloadPermissionService } = this.services\n    const canDownload = downloadPermissionService\n      ? await downloadPermissionService.downloadEnabled(dprUser.id, reportId, id)\n      : false\n\n    if (canDownload) {\n      await DownloadUtils.downloadReport({ req, res, services: this.services, redirect, loadType })\n    } else {\n      res.redirect(redirect)\n    }\n  }\n}\n\nexport { DownloadReportController }\nexport default DownloadReportController\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,8BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,0CACzBC,EAA0B,sBAG1B,MAAMJ,CAAyB,CAK7B,YAAYK,EAAoBC,EAAoB,CAKpD,UAAuB,MAAOC,EAAKC,EAAKC,IAAS,CAC/C,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUH,CAAG,EACxC,CAAE,SAAAI,EAAU,GAAAC,EAAI,SAAAC,EAAU,WAAAC,EAAY,mBAAAC,CAAmB,EAAIT,EAAI,KAEvE,IAAIU,EAAW,GAAGF,CAAU,qBAC5BE,EAAWD,EAAqB,GAAGC,CAAQ,GAAGD,CAAkB,GAAKC,EAErE,KAAM,CAAE,0BAAAC,CAA0B,EAAI,KAAK,UACvBA,EAChB,MAAMA,EAA0B,gBAAgBR,EAAQ,GAAIE,EAAUC,CAAE,EACxE,IAGF,MAAM,EAAAM,QAAc,eAAe,CAAE,IAAAZ,EAAK,IAAAC,EAAK,SAAU,KAAK,SAAU,SAAAS,EAAU,SAAAH,CAAS,CAAC,EAE5FN,EAAI,SAASS,CAAQ,CAEzB,EArBE,KAAK,WAAaZ,EAClB,KAAK,SAAWC,CAClB,CAoBF,CAGA,IAAOL,EAAQD",
-  "names": ["controller_exports", "__export", "DownloadReportController", "controller_default", "__toCommonJS", "import_localsHelper", "import_utils", "layoutPath", "services", "req", "res", "next", "dprUser", "LocalsHelper", "reportId", "id", "loadType", "currentUrl", "currentQueryParams", "redirect", "downloadPermissionService", "DownloadUtils"]
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport LocalsHelper from '../../../utils/localsHelper'\nimport DownloadUtils from './utils'\nimport { Services } from '../../../types/Services'\n\nclass DownloadReportController {\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, loadType, currentUrl, currentQueryParams } = req.body\n\n    let redirect = `${currentUrl}/download-disabled`\n    redirect = currentQueryParams ? `${redirect}${currentQueryParams}` : redirect\n\n    const canDownloadReport = await this.services.downloadPermissionService.downloadEnabledForReport(\n      dprUser.id,\n      reportId,\n      id,\n    )\n\n    if (canDownloadReport) {\n      await DownloadUtils.downloadReport({ req, res, services: this.services, redirect, loadType })\n    } else {\n      res.redirect(redirect)\n    }\n  }\n}\n\nexport { DownloadReportController }\nexport default DownloadReportController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,8BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,0CACzBC,EAA0B,sBAG1B,MAAMJ,CAAyB,CAK7B,YAAYK,EAAoBC,EAAoB,CAKpD,UAAuB,MAAOC,EAAKC,IAAQ,CACzC,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUF,CAAG,EACxC,CAAE,SAAAG,EAAU,GAAAC,EAAI,SAAAC,EAAU,WAAAC,EAAY,mBAAAC,CAAmB,EAAIR,EAAI,KAEvE,IAAIS,EAAW,GAAGF,CAAU,qBAC5BE,EAAWD,EAAqB,GAAGC,CAAQ,GAAGD,CAAkB,GAAKC,EAE3C,MAAM,KAAK,SAAS,0BAA0B,yBACtEP,EAAQ,GACRE,EACAC,CACF,EAGE,MAAM,EAAAK,QAAc,eAAe,CAAE,IAAAV,EAAK,IAAAC,EAAK,SAAU,KAAK,SAAU,SAAAQ,EAAU,SAAAH,CAAS,CAAC,EAE5FL,EAAI,SAASQ,CAAQ,CAEzB,EAtBE,KAAK,WAAaX,EAClB,KAAK,SAAWC,CAClB,CAqBF,CAGA,IAAOL,EAAQD",
+  "names": ["controller_exports", "__export", "DownloadReportController", "controller_default", "__toCommonJS", "import_localsHelper", "import_utils", "layoutPath", "services", "req", "res", "dprUser", "LocalsHelper", "reportId", "id", "loadType", "currentUrl", "currentQueryParams", "redirect", "DownloadUtils"]
 }

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

@@ -13,19 +13,20 @@ class DownloadReportController {
     this.services = services
   }
 
-  POST: RequestHandler = async (req, res, next) => {
+  POST: RequestHandler = async (req, res) => {
     const { dprUser } = LocalsHelper.getValues(res)
     const { reportId, id, loadType, currentUrl, currentQueryParams } = req.body
 
     let redirect = `${currentUrl}/download-disabled`
     redirect = currentQueryParams ? `${redirect}${currentQueryParams}` : redirect
 
-    const { downloadPermissionService } = this.services
-    const canDownload = downloadPermissionService
-      ? await downloadPermissionService.downloadEnabled(dprUser.id, reportId, id)
-      : false
+    const canDownloadReport = await this.services.downloadPermissionService.downloadEnabledForReport(
+      dprUser.id,
+      reportId,
+      id,
+    )
 
-    if (canDownload) {
+    if (canDownloadReport) {
       await DownloadUtils.downloadReport({ req, res, services: this.services, redirect, loadType })
     } else {
       res.redirect(redirect)

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

@@ -1,2 +1,2 @@
-var R=Object.create;var d=Object.defineProperty;var U=Object.getOwnPropertyDescriptor;var $=Object.getOwnPropertyNames;var b=Object.getPrototypeOf,C=Object.prototype.hasOwnProperty;var I=(r,e)=>{for(var t in e)d(r,t,{get:e[t],enumerable:!0})},g=(r,e,t,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of $(e))!C.call(r,o)&&o!==t&&d(r,o,{get:()=>e[o],enumerable:!(n=U(e,o))||n.enumerable});return r};var P=(r,e,t)=>(t=r!=null?R(b(r)):{},g(e||!r||!r.__esModule?d(t,"default",{value:r,enumerable:!0}):t,r)),T=r=>g(d({},"__esModule",{value:!0}),r);var k={};I(k,{RequestDownloadController:()=>h,default:()=>H});module.exports=T(k);var D=P(require("../../../../../utils/localsHelper")),f=require("../../../../../types/UserReports"),w=P(require("../../../../../utils/logger"));class h{constructor(e,t){this.GET=async(e,t,n)=>{const{token:o,csrfToken:m,definitionsPath:p,dprUser:l}=D.default.getValues(t),{reportId:c,variantId:i,tableId:a}=e.params,u=a?f.LoadType.ASYNC:f.LoadType.SYNC,{reportSearch:s,reportUrl:N}=e.query;let S,y;s&&(S=decodeURIComponent(s),y=new URLSearchParams(S).get("dataProductDefinitionsPath")||p);const v=await this.services.reportingService.getDefinition(o,c,i,y);try{t.render("dpr/routes/journeys/download-report/request-download/form/view",{title:"Download request form",user:l,report:{reportId:c,reportName:v.name,variantId:i,variantName:v.variant.name,tableId:a,loadType:u,reportUrl:N,reportSearch:s||void 0,time:new Date().toDateString()},csrfToken:m,layoutPath:this.layoutPath})}catch{n()}};this.POST=async(e,t,n)=>{const{body:o,baseUrl:m}=e,{reportName:p,variantName:l,reportUrl:c,reportSearch:i}=o;w.default.info("Download Feedback Submission:",`${JSON.stringify(o)}`);let a;if(a=`?reportName=${p}&variantName=${l}&reportUrl=${c}`,i){const s=encodeURIComponent(i);a=`${a}&reportSearch=${s}`}const u=`${m}/submitted${a}`;t.redirect(u)};this.layoutPath=e,this.services=t}}var H=h;0&&(module.exports={RequestDownloadController});
+"use strict";var R=Object.create;var d=Object.defineProperty;var U=Object.getOwnPropertyDescriptor;var $=Object.getOwnPropertyNames;var b=Object.getPrototypeOf,C=Object.prototype.hasOwnProperty;var I=(r,e)=>{for(var t in e)d(r,t,{get:e[t],enumerable:!0})},g=(r,e,t,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of $(e))!C.call(r,o)&&o!==t&&d(r,o,{get:()=>e[o],enumerable:!(n=U(e,o))||n.enumerable});return r};var P=(r,e,t)=>(t=r!=null?R(b(r)):{},g(e||!r||!r.__esModule?d(t,"default",{value:r,enumerable:!0}):t,r)),T=r=>g(d({},"__esModule",{value:!0}),r);var k={};I(k,{RequestDownloadController:()=>h,default:()=>H});module.exports=T(k);var D=P(require("../../../../../utils/localsHelper")),f=require("../../../../../types/UserReports"),w=P(require("../../../../../utils/logger"));class h{constructor(e,t){this.GET=async(e,t,n)=>{const{token:o,csrfToken:m,definitionsPath:p,dprUser:l}=D.default.getValues(t),{reportId:c,variantId:i,tableId:a}=e.params,u=a?f.LoadType.ASYNC:f.LoadType.SYNC,{reportSearch:s,reportUrl:N}=e.query;let S,y;s&&(S=decodeURIComponent(s),y=new URLSearchParams(S).get("dataProductDefinitionsPath")||p);const v=await this.services.reportingService.getDefinition(o,c,i,y);try{t.render("dpr/routes/journeys/download-report/request-download/form/view",{title:"Download request form",user:l,report:{reportId:c,reportName:v.name,variantId:i,variantName:v.variant.name,tableId:a,loadType:u,reportUrl:N,reportSearch:s||void 0,time:new Date().toDateString()},csrfToken:m,layoutPath:this.layoutPath})}catch{n()}};this.POST=async(e,t,n)=>{const{body:o,baseUrl:m}=e,{reportName:p,variantName:l,reportUrl:c,reportSearch:i}=o;w.default.info("Download Feedback Submission:",`${JSON.stringify(o)}`);let a;if(a=`?reportName=${p}&variantName=${l}&reportUrl=${c}`,i){const s=encodeURIComponent(i);a=`${a}&reportSearch=${s}`}const u=`${m}/submitted${a}`;t.redirect(u)};this.layoutPath=e,this.services=t}}var H=h;0&&(module.exports={RequestDownloadController});
 //# sourceMappingURL=controller.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/download-report/request-download/form/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport { components } from '../../../../../types/api'\nimport { Services } from '../../../../../types/Services'\nimport { LoadType } from '../../../../../types/UserReports'\nimport logger from '../../../../../utils/logger'\n\nclass RequestDownloadController {\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    const { token, csrfToken, definitionsPath, dprUser } = LocalsHelper.getValues(res)\n    const { reportId, variantId, tableId } = req.params\n    const loadType = tableId ? LoadType.ASYNC : LoadType.SYNC\n\n    const { reportSearch, reportUrl } = req.query\n    let queryString\n    let dataProductDefinitionsPath\n\n    if (reportSearch) {\n      queryString = decodeURIComponent(<string>reportSearch)\n      const params = new URLSearchParams(queryString)\n      dataProductDefinitionsPath = params.get('dataProductDefinitionsPath') || definitionsPath\n    }\n\n    const variantData: components['schemas']['SingleVariantReportDefinition'] =\n      await this.services.reportingService.getDefinition(token, reportId, variantId, dataProductDefinitionsPath)\n\n    try {\n      res.render(`dpr/routes/journeys/download-report/request-download/form/view`, {\n        title: 'Download request form',\n        user: dprUser,\n        report: {\n          reportId,\n          reportName: variantData.name,\n          variantId,\n          variantName: variantData.variant.name,\n          tableId,\n          loadType,\n          reportUrl,\n          reportSearch: reportSearch || undefined,\n          time: new Date().toDateString(),\n        },\n        csrfToken,\n        layoutPath: this.layoutPath,\n      })\n    } catch (error) {\n      next()\n    }\n  }\n\n  POST: RequestHandler = async (req, res, next) => {\n    const { body, baseUrl } = req\n    const { reportName, variantName, reportUrl, reportSearch } = body\n    logger.info('Download Feedback Submission:', `${JSON.stringify(body)}`)\n\n    let queryParams\n    queryParams = `?reportName=${reportName}&variantName=${variantName}&reportUrl=${reportUrl}`\n\n    if (reportSearch) {\n      const encodedSearch = encodeURIComponent(reportSearch)\n      queryParams = `${queryParams}&reportSearch=${encodedSearch}`\n    }\n\n    const redirect = `${baseUrl}/submitted${queryParams}`\n\n    res.redirect(redirect)\n  }\n}\n\nexport { RequestDownloadController }\nexport default RequestDownloadController\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,+BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,gDAGzBC,EAAyB,4CACzBC,EAAmB,0CAEnB,MAAML,CAA0B,CAK9B,YAAYM,EAAoBC,EAAoB,CAKpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,KAAM,CAAE,MAAAC,EAAO,UAAAC,EAAW,gBAAAC,EAAiB,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUN,CAAG,EAC3E,CAAE,SAAAO,EAAU,UAAAC,EAAW,QAAAC,CAAQ,EAAIV,EAAI,OACvCW,EAAWD,EAAU,WAAS,MAAQ,WAAS,KAE/C,CAAE,aAAAE,EAAc,UAAAC,CAAU,EAAIb,EAAI,MACxC,IAAIc,EACAC,EAEAH,IACFE,EAAc,mBAA2BF,CAAY,EAErDG,EADe,IAAI,gBAAgBD,CAAW,EACV,IAAI,4BAA4B,GAAKT,GAG3E,MAAMW,EACJ,MAAM,KAAK,SAAS,iBAAiB,cAAcb,EAAOK,EAAUC,EAAWM,CAA0B,EAE3G,GAAI,CACFd,EAAI,OAAO,iEAAkE,CAC3E,MAAO,wBACP,KAAMK,EACN,OAAQ,CACN,SAAAE,EACA,WAAYQ,EAAY,KACxB,UAAAP,EACA,YAAaO,EAAY,QAAQ,KACjC,QAAAN,EACA,SAAAC,EACA,UAAAE,EACA,aAAcD,GAAgB,OAC9B,KAAM,IAAI,KAAK,EAAE,aAAa,CAChC,EACA,UAAAR,EACA,WAAY,KAAK,UACnB,CAAC,CACH,MAAgB,CACdF,EAAK,CACP,CACF,EAEA,UAAuB,MAAOF,EAAKC,EAAKC,IAAS,CAC/C,KAAM,CAAE,KAAAe,EAAM,QAAAC,CAAQ,EAAIlB,EACpB,CAAE,WAAAmB,EAAY,YAAAC,EAAa,UAAAP,EAAW,aAAAD,CAAa,EAAIK,EAC7D,EAAAI,QAAO,KAAK,gCAAiC,GAAG,KAAK,UAAUJ,CAAI,CAAC,EAAE,EAEtE,IAAIK,EAGJ,GAFAA,EAAc,eAAeH,CAAU,gBAAgBC,CAAW,cAAcP,CAAS,GAErFD,EAAc,CAChB,MAAMW,EAAgB,mBAAmBX,CAAY,EACrDU,EAAc,GAAGA,CAAW,iBAAiBC,CAAa,EAC5D,CAEA,MAAMC,EAAW,GAAGN,CAAO,aAAaI,CAAW,GAEnDrB,EAAI,SAASuB,CAAQ,CACvB,EA7DE,KAAK,WAAa1B,EAClB,KAAK,SAAWC,CAClB,CA4DF,CAGA,IAAON,EAAQD",
-  "names": ["controller_exports", "__export", "RequestDownloadController", "controller_default", "__toCommonJS", "import_localsHelper", "import_UserReports", "import_logger", "layoutPath", "services", "req", "res", "next", "token", "csrfToken", "definitionsPath", "dprUser", "LocalsHelper", "reportId", "variantId", "tableId", "loadType", "reportSearch", "reportUrl", "queryString", "dataProductDefinitionsPath", "variantData", "body", "baseUrl", "reportName", "variantName", "logger", "queryParams", "encodedSearch", "redirect"]
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport { components } from '../../../../../types/api'\nimport { Services } from '../../../../../types/Services'\nimport { LoadType } from '../../../../../types/UserReports'\nimport logger from '../../../../../utils/logger'\n\nclass RequestDownloadController {\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    const { token, csrfToken, definitionsPath, dprUser } = LocalsHelper.getValues(res)\n    const { reportId, variantId, tableId } = req.params\n    const loadType = tableId ? LoadType.ASYNC : LoadType.SYNC\n\n    const { reportSearch, reportUrl } = req.query\n    let queryString\n    let dataProductDefinitionsPath\n\n    if (reportSearch) {\n      queryString = decodeURIComponent(<string>reportSearch)\n      const params = new URLSearchParams(queryString)\n      dataProductDefinitionsPath = params.get('dataProductDefinitionsPath') || definitionsPath\n    }\n\n    const variantData: components['schemas']['SingleVariantReportDefinition'] =\n      await this.services.reportingService.getDefinition(token, reportId, variantId, dataProductDefinitionsPath)\n\n    try {\n      res.render(`dpr/routes/journeys/download-report/request-download/form/view`, {\n        title: 'Download request form',\n        user: dprUser,\n        report: {\n          reportId,\n          reportName: variantData.name,\n          variantId,\n          variantName: variantData.variant.name,\n          tableId,\n          loadType,\n          reportUrl,\n          reportSearch: reportSearch || undefined,\n          time: new Date().toDateString(),\n        },\n        csrfToken,\n        layoutPath: this.layoutPath,\n      })\n    } catch (error) {\n      next()\n    }\n  }\n\n  POST: RequestHandler = async (req, res, _next) => {\n    const { body, baseUrl } = req\n    const { reportName, variantName, reportUrl, reportSearch } = body\n    logger.info('Download Feedback Submission:', `${JSON.stringify(body)}`)\n\n    let queryParams\n    queryParams = `?reportName=${reportName}&variantName=${variantName}&reportUrl=${reportUrl}`\n\n    if (reportSearch) {\n      const encodedSearch = encodeURIComponent(reportSearch)\n      queryParams = `${queryParams}&reportSearch=${encodedSearch}`\n    }\n\n    const redirect = `${baseUrl}/submitted${queryParams}`\n\n    res.redirect(redirect)\n  }\n}\n\nexport { RequestDownloadController }\nexport default RequestDownloadController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,+BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,gDAGzBC,EAAyB,4CACzBC,EAAmB,0CAEnB,MAAML,CAA0B,CAK9B,YAAYM,EAAoBC,EAAoB,CAKpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,KAAM,CAAE,MAAAC,EAAO,UAAAC,EAAW,gBAAAC,EAAiB,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUN,CAAG,EAC3E,CAAE,SAAAO,EAAU,UAAAC,EAAW,QAAAC,CAAQ,EAAIV,EAAI,OACvCW,EAAWD,EAAU,WAAS,MAAQ,WAAS,KAE/C,CAAE,aAAAE,EAAc,UAAAC,CAAU,EAAIb,EAAI,MACxC,IAAIc,EACAC,EAEAH,IACFE,EAAc,mBAA2BF,CAAY,EAErDG,EADe,IAAI,gBAAgBD,CAAW,EACV,IAAI,4BAA4B,GAAKT,GAG3E,MAAMW,EACJ,MAAM,KAAK,SAAS,iBAAiB,cAAcb,EAAOK,EAAUC,EAAWM,CAA0B,EAE3G,GAAI,CACFd,EAAI,OAAO,iEAAkE,CAC3E,MAAO,wBACP,KAAMK,EACN,OAAQ,CACN,SAAAE,EACA,WAAYQ,EAAY,KACxB,UAAAP,EACA,YAAaO,EAAY,QAAQ,KACjC,QAAAN,EACA,SAAAC,EACA,UAAAE,EACA,aAAcD,GAAgB,OAC9B,KAAM,IAAI,KAAK,EAAE,aAAa,CAChC,EACA,UAAAR,EACA,WAAY,KAAK,UACnB,CAAC,CACH,MAAgB,CACdF,EAAK,CACP,CACF,EAEA,UAAuB,MAAOF,EAAKC,EAAKgB,IAAU,CAChD,KAAM,CAAE,KAAAC,EAAM,QAAAC,CAAQ,EAAInB,EACpB,CAAE,WAAAoB,EAAY,YAAAC,EAAa,UAAAR,EAAW,aAAAD,CAAa,EAAIM,EAC7D,EAAAI,QAAO,KAAK,gCAAiC,GAAG,KAAK,UAAUJ,CAAI,CAAC,EAAE,EAEtE,IAAIK,EAGJ,GAFAA,EAAc,eAAeH,CAAU,gBAAgBC,CAAW,cAAcR,CAAS,GAErFD,EAAc,CAChB,MAAMY,EAAgB,mBAAmBZ,CAAY,EACrDW,EAAc,GAAGA,CAAW,iBAAiBC,CAAa,EAC5D,CAEA,MAAMC,EAAW,GAAGN,CAAO,aAAaI,CAAW,GAEnDtB,EAAI,SAASwB,CAAQ,CACvB,EA7DE,KAAK,WAAa3B,EAClB,KAAK,SAAWC,CAClB,CA4DF,CAGA,IAAON,EAAQD",
+  "names": ["controller_exports", "__export", "RequestDownloadController", "controller_default", "__toCommonJS", "import_localsHelper", "import_UserReports", "import_logger", "layoutPath", "services", "req", "res", "next", "token", "csrfToken", "definitionsPath", "dprUser", "LocalsHelper", "reportId", "variantId", "tableId", "loadType", "reportSearch", "reportUrl", "queryString", "dataProductDefinitionsPath", "variantData", "_next", "body", "baseUrl", "reportName", "variantName", "logger", "queryParams", "encodedSearch", "redirect"]
 }

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

@@ -56,7 +56,7 @@ class RequestDownloadController {
     }
   }
 
-  POST: RequestHandler = async (req, res, next) => {
+  POST: RequestHandler = async (req, res, _next) => {
     const { body, baseUrl } = req
     const { reportName, variantName, reportUrl, reportSearch } = body
     logger.info('Download Feedback Submission:', `${JSON.stringify(body)}`)

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

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

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/download-report/request-download/form/routes.ts"],
   "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport RequestDownloadController from './controller'\nimport submittedRoutes from './submitted/routes'\nimport { Services } from '../../../../../types/Services'\n\nexport function routes({ layoutPath, services }: { layoutPath: string; services: Services }) {\n  const router = Router({ mergeParams: true })\n  const controller = new RequestDownloadController(layoutPath, services)\n\n  router.get('/', controller.GET)\n  router.post('/', controller.POST)\n\n  router.use('/submitted', submittedRoutes({ 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,mBACvBC,EAAsC,2BACtCC,EAA4B,iCAGrB,SAASJ,EAAO,CAAE,WAAAK,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EACrCC,EAAa,IAAI,EAAAC,QAA0BJ,EAAYC,CAAQ,EAErE,OAAAC,EAAO,IAAI,IAAKC,EAAW,GAAG,EAC9BD,EAAO,KAAK,IAAKC,EAAW,IAAI,EAEhCD,EAAO,IAAI,gBAAc,EAAAG,SAAgB,CAAE,WAAAL,EAAY,SAAAC,CAAS,CAAC,CAAC,EAE3DC,CACT,CAEA,IAAOR,EAAQC",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBACvBC,EAAsC,2BACtCC,EAA4B,iCAGrB,SAASJ,EAAO,CAAE,WAAAK,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EACrCC,EAAa,IAAI,EAAAC,QAA0BJ,EAAYC,CAAQ,EAErE,OAAAC,EAAO,IAAI,IAAKC,EAAW,GAAG,EAC9BD,EAAO,KAAK,IAAKC,EAAW,IAAI,EAEhCD,EAAO,IAAI,gBAAc,EAAAG,SAAgB,CAAE,WAAAL,EAAY,SAAAC,CAAS,CAAC,CAAC,EAE3DC,CACT,CAEA,IAAOR,EAAQC",
   "names": ["routes_exports", "__export", "routes_default", "routes", "__toCommonJS", "import_express", "import_controller", "import_routes", "layoutPath", "services", "router", "controller", "RequestDownloadController", "submittedRoutes"]
 }

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

@@ -1,2 +1,2 @@
-var w=Object.create;var s=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var S=Object.getOwnPropertyNames;var P=Object.getPrototypeOf,R=Object.prototype.hasOwnProperty;var g=(r,e)=>{for(var t in e)s(r,t,{get:e[t],enumerable:!0})},l=(r,e,t,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of S(e))!R.call(r,o)&&o!==t&&s(r,o,{get:()=>e[o],enumerable:!(a=y(e,o))||a.enumerable});return r};var q=(r,e,t)=>(t=r!=null?w(P(r)):{},l(e||!r||!r.__esModule?s(t,"default",{value:r,enumerable:!0}):t,r)),H=r=>l(s({},"__esModule",{value:!0}),r);var D={};g(D,{RequestDownloadSubmittedController:()=>n,default:()=>x});module.exports=H(D);var p=q(require("../../../../../../utils/localsHelper"));class n{constructor(e,t){this.GET=async(e,t,a)=>{const{dprUser:o}=p.default.getValues(t),{reportId:u,variantId:m}=e.params,{reportName:v,variantName:h,reportUrl:d,reportSearch:i}=e.query;let c;i&&(c=decodeURIComponent(i));const f=i?`${d}${c}`:`${d}`;await this.services.downloadPermissionService.saveDownloadPermissionData(o.id,u,m),t.render("dpr/routes/journeys/download-report/request-download/form/submitted/view",{title:"success",layoutPath:this.layoutPath,report:{reportName:v,variantName:h,reportHref:f}})};this.layoutPath=e,this.services=t}}var x=n;0&&(module.exports={RequestDownloadSubmittedController});
+"use strict";var w=Object.create;var s=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var S=Object.getOwnPropertyNames;var P=Object.getPrototypeOf,R=Object.prototype.hasOwnProperty;var g=(r,e)=>{for(var t in e)s(r,t,{get:e[t],enumerable:!0})},l=(r,e,t,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of S(e))!R.call(r,o)&&o!==t&&s(r,o,{get:()=>e[o],enumerable:!(a=y(e,o))||a.enumerable});return r};var q=(r,e,t)=>(t=r!=null?w(P(r)):{},l(e||!r||!r.__esModule?s(t,"default",{value:r,enumerable:!0}):t,r)),H=r=>l(s({},"__esModule",{value:!0}),r);var D={};g(D,{RequestDownloadSubmittedController:()=>n,default:()=>x});module.exports=H(D);var p=q(require("../../../../../../utils/localsHelper"));class n{constructor(e,t){this.GET=async(e,t,a)=>{const{dprUser:o}=p.default.getValues(t),{reportId:u,variantId:m}=e.params,{reportName:v,variantName:h,reportUrl:d,reportSearch:i}=e.query;let c;i&&(c=decodeURIComponent(i));const f=i?`${d}${c}`:`${d}`;await this.services.downloadPermissionService.saveDownloadPermissionData(o.id,u,m),t.render("dpr/routes/journeys/download-report/request-download/form/submitted/view",{title:"success",layoutPath:this.layoutPath,report:{reportName:v,variantName:h,reportHref:f}})};this.layoutPath=e,this.services=t}}var x=n;0&&(module.exports={RequestDownloadSubmittedController});
 //# sourceMappingURL=controller.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../../src/dpr/routes/journeys/download-report/request-download/form/submitted/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../../../types/Services'\nimport localsHelper from '../../../../../../utils/localsHelper'\n\nclass RequestDownloadSubmittedController {\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    const { dprUser } = localsHelper.getValues(res)\n    const { reportId, variantId } = req.params\n    const { reportName, variantName, reportUrl, reportSearch } = req.query\n\n    let decodedReportSearch\n    if (reportSearch) {\n      decodedReportSearch = decodeURIComponent(<string>reportSearch)\n    }\n\n    const reportHref = reportSearch ? `${reportUrl}${decodedReportSearch}` : `${reportUrl}`\n\n    await this.services.downloadPermissionService.saveDownloadPermissionData(dprUser.id, reportId, variantId)\n\n    res.render(`dpr/routes/journeys/download-report/request-download/form/submitted/view`, {\n      title: 'success',\n      layoutPath: this.layoutPath,\n      report: {\n        reportName,\n        variantName,\n        reportHref,\n      },\n    })\n  }\n}\n\nexport { RequestDownloadSubmittedController }\nexport default RequestDownloadSubmittedController\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,wCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAyB,mDAEzB,MAAMH,CAAmC,CAKvC,YAAYI,EAAoBC,EAAoB,CAKpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUH,CAAG,EACxC,CAAE,SAAAI,EAAU,UAAAC,CAAU,EAAIN,EAAI,OAC9B,CAAE,WAAAO,EAAY,YAAAC,EAAa,UAAAC,EAAW,aAAAC,CAAa,EAAIV,EAAI,MAEjE,IAAIW,EACAD,IACFC,EAAsB,mBAA2BD,CAAY,GAG/D,MAAME,EAAaF,EAAe,GAAGD,CAAS,GAAGE,CAAmB,GAAK,GAAGF,CAAS,GAErF,MAAM,KAAK,SAAS,0BAA0B,2BAA2BN,EAAQ,GAAIE,EAAUC,CAAS,EAExGL,EAAI,OAAO,2EAA4E,CACrF,MAAO,UACP,WAAY,KAAK,WACjB,OAAQ,CACN,WAAAM,EACA,YAAAC,EACA,WAAAI,CACF,CACF,CAAC,CACH,EA3BE,KAAK,WAAad,EAClB,KAAK,SAAWC,CAClB,CA0BF,CAGA,IAAOJ,EAAQD",
-  "names": ["controller_exports", "__export", "RequestDownloadSubmittedController", "controller_default", "__toCommonJS", "import_localsHelper", "layoutPath", "services", "req", "res", "next", "dprUser", "localsHelper", "reportId", "variantId", "reportName", "variantName", "reportUrl", "reportSearch", "decodedReportSearch", "reportHref"]
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../../../types/Services'\nimport localsHelper from '../../../../../../utils/localsHelper'\n\nclass RequestDownloadSubmittedController {\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    const { dprUser } = localsHelper.getValues(res)\n    const { reportId, variantId } = req.params\n    const { reportName, variantName, reportUrl, reportSearch } = req.query\n\n    let decodedReportSearch\n    if (reportSearch) {\n      decodedReportSearch = decodeURIComponent(<string>reportSearch)\n    }\n\n    const reportHref = reportSearch ? `${reportUrl}${decodedReportSearch}` : `${reportUrl}`\n\n    await this.services.downloadPermissionService.saveDownloadPermissionData(dprUser.id, reportId, variantId)\n\n    res.render(`dpr/routes/journeys/download-report/request-download/form/submitted/view`, {\n      title: 'success',\n      layoutPath: this.layoutPath,\n      report: {\n        reportName,\n        variantName,\n        reportHref,\n      },\n    })\n  }\n}\n\nexport { RequestDownloadSubmittedController }\nexport default RequestDownloadSubmittedController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,wCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAyB,mDAEzB,MAAMH,CAAmC,CAKvC,YAAYI,EAAoBC,EAAoB,CAKpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAU,CAC/C,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUH,CAAG,EACxC,CAAE,SAAAI,EAAU,UAAAC,CAAU,EAAIN,EAAI,OAC9B,CAAE,WAAAO,EAAY,YAAAC,EAAa,UAAAC,EAAW,aAAAC,CAAa,EAAIV,EAAI,MAEjE,IAAIW,EACAD,IACFC,EAAsB,mBAA2BD,CAAY,GAG/D,MAAME,EAAaF,EAAe,GAAGD,CAAS,GAAGE,CAAmB,GAAK,GAAGF,CAAS,GAErF,MAAM,KAAK,SAAS,0BAA0B,2BAA2BN,EAAQ,GAAIE,EAAUC,CAAS,EAExGL,EAAI,OAAO,2EAA4E,CACrF,MAAO,UACP,WAAY,KAAK,WACjB,OAAQ,CACN,WAAAM,EACA,YAAAC,EACA,WAAAI,CACF,CACF,CAAC,CACH,EA3BE,KAAK,WAAad,EAClB,KAAK,SAAWC,CAClB,CA0BF,CAGA,IAAOJ,EAAQD",
+  "names": ["controller_exports", "__export", "RequestDownloadSubmittedController", "controller_default", "__toCommonJS", "import_localsHelper", "layoutPath", "services", "req", "res", "_next", "dprUser", "localsHelper", "reportId", "variantId", "reportName", "variantName", "reportUrl", "reportSearch", "decodedReportSearch", "reportHref"]
 }

package/dpr/routes/journeys/download-report/request-download/form/submitted/controller.ts

@@ -12,7 +12,7 @@ class RequestDownloadSubmittedController {
     this.services = services
   }
 
-  GET: RequestHandler = async (req, res, next) => {
+  GET: RequestHandler = async (req, res, _next) => {
     const { dprUser } = localsHelper.getValues(res)
     const { reportId, variantId } = req.params
     const { reportName, variantName, reportUrl, reportSearch } = req.query

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

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

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../../../src/dpr/routes/journeys/download-report/request-download/form/submitted/routes.ts"],
   "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport RequestDownloadSubmittedController 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 RequestDownloadSubmittedController(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,EAA+C,2BAGxC,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAAmCJ,EAAYC,CAAQ,EAC9E,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,EAA+C,2BAGxC,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAAmCJ,EAAYC,CAAQ,EAC9E,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", "RequestDownloadSubmittedController"]
 }