@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.22.2 → 4.22.3

package/dpr/components/user-reports/utils.ts

@@ -311,6 +311,7 @@ export const updateExpiredStatus = async ({ req, res, services }: AsyncReportUti
 
 export const init = async ({ services, res, maxRows = 6 }: { services: Services; res: Response; maxRows?: number }) => {
   const { requestedReports, recentlyViewedReports, bookmarkingEnabled } = LocalsHelper.getValues(res)
+
   const requestedReportsList = await renderList({
     res,
     reportsData: requestedReports,
@@ -318,6 +319,7 @@ export const init = async ({ services, res, maxRows = 6 }: { services: Services;
     maxRows,
     type: 'requested',
   })
+
   const viewedReportsList = await renderList({
     res,
     reportsData: recentlyViewedReports,

package/dpr/components/user-reports/viewed/clientClass.mjs

@@ -11,7 +11,8 @@ class DprRecentlyViewedList extends DprPollingStatusClass {
     this.POLLING_FREQUENCY = '60000' // 1 min
 
     this.viewedList = document.getElementById('dpr-recently-viewed-component')
-    this.viewedReportData = this.viewedList.getAttribute('data-request-data')
+    const viewedReportData = this.viewedList.getAttribute('data-request-data')
+    this.viewedReportData = viewedReportData ? JSON.parse(viewedReportData) : undefined
     this.csrfToken = this.viewedList.getAttribute('data-csrf-token')
     this.removeActions = document.querySelectorAll('.dpr-remove-viewed-report-button')
 
@@ -31,7 +32,7 @@ class DprRecentlyViewedList extends DprPollingStatusClass {
 
   async checkIsExpired() {
     await Promise.all(
-      JSON.parse(this.viewedReportData).map(async (metaData) => {
+      this.viewedReportData.map(async (metaData) => {
         const { status, reportUrl } = metaData
         if (status !== 'EXPIRED') {
           const response = await this.getExpiredStatus(reportUrl, metaData, this.csrfToken)

package/dpr/middleware/setUpDprResources.js

@@ -1,2 +1,2 @@
-"use strict";var y=Object.create;var d=Object.defineProperty;var E=Object.getOwnPropertyDescriptor;var w=Object.getOwnPropertyNames;var C=Object.getPrototypeOf,v=Object.prototype.hasOwnProperty;var F=(t,e)=>{for(var o in e)d(t,o,{get:e[o],enumerable:!0})},P=(t,e,o,i)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of w(e))!v.call(t,r)&&r!==o&&d(t,r,{get:()=>e[r],enumerable:!(i=E(e,r))||i.enumerable});return t};var S=(t,e,o)=>(o=t!=null?y(C(t)):{},P(e||!t||!t.__esModule?d(o,"default",{value:t,enumerable:!0}):o,t)),V=t=>P(d({},"__esModule",{value:!0}),t);var B={};F(B,{default:()=>A,errorRequestHandler:()=>h,populateDefinitions:()=>b,populateRequestedReports:()=>k,setupResources:()=>D});module.exports=V(B);var c=S(require("../utils/definitionUtils")),m=S(require("../utils/localsHelper"));const H=(t,e)=>t[e]?t[e].toString():null,Q=t=>H(t,"dataProductDefinitionsPath"),x=t=>{const e=Q(t);return e||null},h=t=>(e,o,i,r)=>e.status===401||e.status===403?i.render("dpr/routes/authError.njk",{layoutPath:t,message:"Sorry, there is a problem with authenticating your request"}):e.status>=400?i.render("dpr/routes/serviceProblem.njk",{layoutPath:t}):r(),D=(t,e,o)=>async(i,r,a)=>{I(i,r);try{return await b(t,i,r,o),await k(t,r),a()}catch(s){return h(e)(s,i,r,a)}},I=(t,e)=>{const o=t.flash("DPR_ERRORS");o&&o[0]&&(e.locals.validationErrors=JSON.parse(o[0]))},b=async(t,e,o,i)=>{const{token:r,dprUser:a}=m.default.getValues(o),s=x(e.query),n=e.body?.dataProductDefinitionsPath,l=s||n;l&&(o.locals.dpdPathFromQuery=!0);const g=i?.dataProductDefinitionsPath;g&&(o.locals.dpdPathFromConfig=!0),o.locals.definitionsPath=l||g,o.locals.pathSuffix=`?dataProductDefinitionsPath=${o.locals.definitionsPath}`;let u;r&&(u=await t.productCollectionStoreService.getSelectedProductCollectionId(a.id)),o.locals.definitions=await Promise.all([t.reportingService.getDefinitions(r,o.locals.definitionsPath),u&&t.productCollectionService.getProductCollection(r,u)]).then(([R,p])=>{if(p&&p){const q=p.products.map(f=>f.productId);return R.filter(f=>q.includes(f.id))}return R})??[]},k=async(t,e)=>{const{dprUser:o}=m.default.getValues(e);if(o.id){const{definitions:i,definitionsPath:r}=e.locals,a=await t.requestedReportService.getAllReports(o.id);e.locals.requestedReports=r?a.filter(n=>c.default.getCurrentVariantDefinition(i,n.reportId,n.id)):a;const s=await t.recentlyViewedService.getAllReports(o.id);if(e.locals.recentlyViewedReports=r?s.filter(n=>c.default.getCurrentVariantDefinition(i,n.reportId,n.id)):s,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=r?n.filter(l=>c.default.getCurrentVariantDefinition(i,l.reportId,l.id)):n}}};var A=D;0&&(module.exports={errorRequestHandler,populateDefinitions,populateRequestedReports,setupResources});
+"use strict";var y=Object.create;var d=Object.defineProperty;var E=Object.getOwnPropertyDescriptor;var w=Object.getOwnPropertyNames;var C=Object.getPrototypeOf,v=Object.prototype.hasOwnProperty;var F=(t,e)=>{for(var o in e)d(t,o,{get:e[o],enumerable:!0})},P=(t,e,o,i)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of w(e))!v.call(t,r)&&r!==o&&d(t,r,{get:()=>e[r],enumerable:!(i=E(e,r))||i.enumerable});return t};var S=(t,e,o)=>(o=t!=null?y(C(t)):{},P(e||!t||!t.__esModule?d(o,"default",{value:t,enumerable:!0}):o,t)),V=t=>P(d({},"__esModule",{value:!0}),t);var B={};F(B,{default:()=>A,errorRequestHandler:()=>h,populateDefinitions:()=>b,populateRequestedReports:()=>k,setupResources:()=>D});module.exports=V(B);var c=S(require("../utils/definitionUtils")),m=S(require("../utils/localsHelper"));const H=(t,e)=>t[e]?t[e].toString():null,Q=t=>H(t,"dataProductDefinitionsPath"),x=t=>{const e=Q(t);return e||null},h=t=>(e,o,i,r)=>e.status===401||e.status===403?i.render("dpr/routes/authError.njk",{layoutPath:t,message:"Sorry, there is a problem with authenticating your request"}):e.status>=400?i.render("dpr/routes/serviceProblem.njk",{layoutPath:t}):r(),D=(t,e,o)=>async(i,r,a)=>{I(i,r);try{return await b(t,i,r,o),await k(t,r),a()}catch(s){return h(e)(s,i,r,a)}},I=(t,e)=>{const o=t.flash("DPR_ERRORS");o&&o[0]&&(e.locals.validationErrors=JSON.parse(o[0]))},b=async(t,e,o,i)=>{const{token:r,dprUser:a}=m.default.getValues(o),s=x(e.query),n=e.body?.dataProductDefinitionsPath,l=s||n;l&&(o.locals.dpdPathFromQuery=!0);const R=i?.dataProductDefinitionsPath;R&&(o.locals.dpdPathFromConfig=!0),o.locals.definitionsPath=l||R,o.locals.pathSuffix=`?dataProductDefinitionsPath=${o.locals.definitionsPath}`;let u;r&&(u=await t.productCollectionStoreService.getSelectedProductCollectionId(a.id)),o.locals.definitions=await Promise.all([t.reportingService.getDefinitions(r,o.locals.definitionsPath),u&&t.productCollectionService.getProductCollection(r,u)]).then(([g,p])=>{if(p&&p){const q=p.products.map(f=>f.productId);return g.filter(f=>q.includes(f.id))}return g})??[]},k=async(t,e)=>{const{dprUser:o}=m.default.getValues(e);if(o.id){const{definitions:i,definitionsPath:r}=e.locals,a=await t.recentlyViewedService.getAllReports(o.id);await t.requestedReportService.cleanList(o.id,a);const s=await t.requestedReportService.getAllReports(o.id);if(e.locals.requestedReports=r?s.filter(n=>c.default.getCurrentVariantDefinition(i,n.reportId,n.id)):s,e.locals.recentlyViewedReports=r?a.filter(n=>c.default.getCurrentVariantDefinition(i,n.reportId,n.id)):a,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=r?n.filter(l=>c.default.getCurrentVariantDefinition(i,l.reportId,l.id)):n}}};var A=D;0&&(module.exports={errorRequestHandler,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, ErrorRequestHandler, NextFunction } from 'express'\nimport type { ParsedQs } from 'qs'\nimport { HTTPError } from 'superagent'\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 errorRequestHandler =\n  (layoutPath: string): ErrorRequestHandler =>\n  (error: HTTPError, _req: Request, res: Response, next: NextFunction) => {\n    if (error.status === 401 || error.status === 403) {\n      return res.render('dpr/routes/authError.njk', {\n        layoutPath,\n        message: 'Sorry, there is a problem with authenticating your request',\n      })\n    }\n    if (error.status >= 400) {\n      return res.render('dpr/routes/serviceProblem.njk', {\n        layoutPath,\n      })\n    }\n    return next()\n  }\n\nexport const setupResources = (services: Services, layoutPath: string, 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 errorRequestHandler(layoutPath)(error, req, res, next)\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", "errorRequestHandler", "populateDefinitions", "populateRequestedReports", "setupResources", "__toCommonJS", "import_definitionUtils", "import_localsHelper", "getQueryParamAsString", "query", "name", "getDefinitionsPath", "deriveDefinitionsPath", "definitionsPath", "layoutPath", "error", "_req", "res", "next", "services", "config", "req", "populateValidationErrors", "errors", "token", "dprUser", "localsHelper", "dpdPathFromQuery", "dpdPathFromBody", "definitionsPathFromQuery", "dpdPathFromConfig", "selectedProductCollectionId", "defs", "selectedProductCollection", "productIds", "product", "def", "definitions", "requested", "report", "DefinitionUtils", "recent", "bookmarks", "bookmark"]
+  "sourcesContent": ["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport { RequestHandler, Response, Request, ErrorRequestHandler, NextFunction } from 'express'\nimport type { ParsedQs } from 'qs'\nimport { HTTPError } from 'superagent'\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 errorRequestHandler =\n  (layoutPath: string): ErrorRequestHandler =>\n  (error: HTTPError, _req: Request, res: Response, next: NextFunction) => {\n    if (error.status === 401 || error.status === 403) {\n      return res.render('dpr/routes/authError.njk', {\n        layoutPath,\n        message: 'Sorry, there is a problem with authenticating your request',\n      })\n    }\n    if (error.status >= 400) {\n      return res.render('dpr/routes/serviceProblem.njk', {\n        layoutPath,\n      })\n    }\n    return next()\n  }\n\nexport const setupResources = (services: Services, layoutPath: string, 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 errorRequestHandler(layoutPath)(error, req, res, next)\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 recent = await services.recentlyViewedService.getAllReports(dprUser.id)\n    await services.requestedReportService.cleanList(dprUser.id, recent)\n    const requested = await services.requestedReportService.getAllReports(dprUser.id)\n\n    res.locals['requestedReports'] = !definitionsPath\n      ? requested\n      : requested.filter((report: RequestedReport) => {\n          return DefinitionUtils.getCurrentVariantDefinition(definitions, report.reportId, report.id)\n        })\n\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": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,wBAAAC,EAAA,wBAAAC,EAAA,6BAAAC,EAAA,mBAAAC,IAAA,eAAAC,EAAAP,GAMA,IAAAQ,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,EAEaZ,EACVa,GACD,CAACC,EAAkBC,EAAeC,EAAeC,IAC3CH,EAAM,SAAW,KAAOA,EAAM,SAAW,IACpCE,EAAI,OAAO,2BAA4B,CAC5C,WAAAH,EACA,QAAS,4DACX,CAAC,EAECC,EAAM,QAAU,IACXE,EAAI,OAAO,gCAAiC,CACjD,WAAAH,CACF,CAAC,EAEII,EAAK,EAGHd,EAAiB,CAACe,EAAoBL,EAAoBM,IAC9D,MAAOC,EAAKJ,EAAKC,IAAS,CAC/BI,EAAyBD,EAAKJ,CAAG,EACjC,GAAI,CACF,aAAMf,EAAoBiB,EAAUE,EAAKJ,EAAKG,CAAM,EACpD,MAAMjB,EAAyBgB,EAAUF,CAAG,EACrCC,EAAK,CACd,OAASH,EAAO,CACd,OAAOd,EAAoBa,CAAU,EAAEC,EAAOM,EAAKJ,EAAKC,CAAI,CAC9D,CACF,EAGII,EAA2B,CAACD,EAAcJ,IAAkB,CAChE,MAAMM,EAASF,EAAI,MAAM,YAAY,EACjCE,GAAUA,EAAO,CAAC,IACpBN,EAAI,OAAO,iBAAsB,KAAK,MAAMM,EAAO,CAAC,CAAC,EAEzD,EAEarB,EAAsB,MAAOiB,EAAoBE,EAAcJ,EAAeG,IAAuB,CAEhH,KAAM,CAAE,MAAAI,EAAO,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUT,CAAG,EAE/CU,EAAmBf,EAAsBS,EAAI,KAAK,EAClDO,EAAkBP,EAAI,MAAM,2BAC5BQ,EAA2BF,GAAoBC,EAEjDC,IACFZ,EAAI,OAAO,iBAAsB,IAInC,MAAMa,EAAoBV,GAAQ,2BAC9BU,IACFb,EAAI,OAAO,kBAAuB,IAIpCA,EAAI,OAAO,gBAAqBY,GAA4BC,EAC5Db,EAAI,OAAO,WAAgB,+BAA+BA,EAAI,OAAO,eAAkB,GAEvF,IAAIc,EACAP,IACFO,EAA8B,MAAMZ,EAAS,8BAA8B,+BACzEM,EAAQ,EACV,GAGFR,EAAI,OAAO,YACR,MAAM,QAAQ,IAAI,CACjBE,EAAS,iBAAiB,eAAeK,EAAOP,EAAI,OAAO,eAAkB,EAC7Ec,GACEZ,EAAS,yBAAyB,qBAAqBK,EAAOO,CAA2B,CAC7F,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,EAEa7B,EAA2B,MAAOgB,EAAoBF,IAAkB,CACnF,KAAM,CAAE,QAAAQ,CAAQ,EAAI,EAAAC,QAAa,UAAUT,CAAG,EAC9C,GAAIQ,EAAQ,GAAI,CACd,KAAM,CAAE,YAAAY,EAAa,gBAAAxB,CAAgB,EAAII,EAAI,OAEvCqB,EAAS,MAAMnB,EAAS,sBAAsB,cAAcM,EAAQ,EAAE,EAC5E,MAAMN,EAAS,uBAAuB,UAAUM,EAAQ,GAAIa,CAAM,EAClE,MAAMC,EAAY,MAAMpB,EAAS,uBAAuB,cAAcM,EAAQ,EAAE,EAoBhF,GAlBAR,EAAI,OAAO,iBAAuBJ,EAE9B0B,EAAU,OAAQC,GACT,EAAAC,QAAgB,4BAA4BJ,EAAaG,EAAO,SAAUA,EAAO,EAAE,CAC3F,EAHDD,EAKJtB,EAAI,OAAO,sBAA4BJ,EAEnCyB,EAAO,OAAQE,GACN,EAAAC,QAAgB,4BAA4BJ,EAAaG,EAAO,SAAUA,EAAO,EAAE,CAC3F,EAHDF,EAKJrB,EAAI,OAAO,mBAAwBE,EAAS,0BAA0B,QACtEF,EAAI,OAAO,mBAAwBE,EAAS,gBAAgB,QAC5DF,EAAI,OAAO,mBAAwBE,EAAS,yBAAyB,QACrEF,EAAI,OAAO,sBAA2BE,EAAS,qBAAqB,QACpEF,EAAI,OAAO,oBAAyBE,EAAS,2BAA2B,QAEpEF,EAAI,OAAO,mBAAuB,CACpC,MAAMyB,EAAY,MAAMvB,EAAS,gBAAgB,gBAAgBM,EAAQ,EAAE,EAC3ER,EAAI,OAAO,UAAgBJ,EAEvB6B,EAAU,OAAQC,GACT,EAAAF,QAAgB,4BAA4BJ,EAAaM,EAAS,SAAUA,EAAS,EAAE,CAC/F,EAHDD,CAIN,CACF,CACF,EAEA,IAAO1C,EAAQI",
+  "names": ["setUpDprResources_exports", "__export", "setUpDprResources_default", "errorRequestHandler", "populateDefinitions", "populateRequestedReports", "setupResources", "__toCommonJS", "import_definitionUtils", "import_localsHelper", "getQueryParamAsString", "query", "name", "getDefinitionsPath", "deriveDefinitionsPath", "definitionsPath", "layoutPath", "error", "_req", "res", "next", "services", "config", "req", "populateValidationErrors", "errors", "token", "dprUser", "localsHelper", "dpdPathFromQuery", "dpdPathFromBody", "definitionsPathFromQuery", "dpdPathFromConfig", "selectedProductCollectionId", "defs", "selectedProductCollection", "productIds", "product", "def", "definitions", "recent", "requested", "report", "DefinitionUtils", "bookmarks", "bookmark"]
 }

package/dpr/middleware/setUpDprResources.test.ts

@@ -31,6 +31,7 @@ describe('setUpDprResources', () => {
     beforeEach(() => {
       requestedReportService = {
         getAllReports: jest.fn().mockReturnValueOnce([]),
+        cleanList: jest.fn(),
       } as unknown as RequestedReportService
 
       recentlyViewedService = {

package/dpr/middleware/setUpDprResources.ts

@@ -106,14 +106,16 @@ export const populateRequestedReports = async (services: Services, res: Response
   if (dprUser.id) {
     const { definitions, definitionsPath } = res.locals
 
+    const recent = await services.recentlyViewedService.getAllReports(dprUser.id)
+    await services.requestedReportService.cleanList(dprUser.id, recent)
     const requested = await services.requestedReportService.getAllReports(dprUser.id)
+
     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
       ? recent
       : recent.filter((report: StoredReportData) => {

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

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

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

@@ -1,7 +1,7 @@
 {
   "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": "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"]
+  "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, type } = req.body\n    if (type === 'add') {\n      await this.services.bookmarkService.addBookmark(dprUser.id, reportId, id, reportType)\n    } else {\n      await this.services.bookmarkService.removeBookmark(dprUser.id, id, reportId)\n    }\n    res.end()\n  }\n}\n\nexport { BookmarkController }\nexport default BookmarkController\n"],
+  "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,EAAY,KAAAC,CAAK,EAAIP,EAAI,KAC3CO,IAAS,MACX,MAAM,KAAK,SAAS,gBAAgB,YAAYL,EAAQ,GAAIE,EAAUC,EAAIC,CAAU,EAEpF,MAAM,KAAK,SAAS,gBAAgB,eAAeJ,EAAQ,GAAIG,EAAID,CAAQ,EAE7EH,EAAI,IAAI,CACV,EAbE,KAAK,WAAaH,EAClB,KAAK,SAAWC,CAClB,CAYF,CAGA,IAAOJ,EAAQD",
+  "names": ["controller_exports", "__export", "BookmarkController", "controller_default", "__toCommonJS", "import_localsHelper", "layoutPath", "services", "req", "res", "dprUser", "LocalsHelper", "reportId", "id", "reportType", "type"]
 }

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

@@ -14,15 +14,12 @@ class BookmarkController {
 
   POST: RequestHandler = async (req, res) => {
     const { dprUser } = LocalsHelper.getValues(res)
-    const { reportId, id, reportType } = req.body
-    await this.services.bookmarkService.addBookmark(dprUser.id, reportId, id, reportType)
-    res.end()
-  }
-
-  DELETE: RequestHandler = async (req, res) => {
-    const { dprUser } = LocalsHelper.getValues(res)
-    const { id, reportId } = req.body
-    await this.services.bookmarkService.removeBookmark(dprUser.id, id, reportId)
+    const { reportId, id, reportType, type } = req.body
+    if (type === 'add') {
+      await this.services.bookmarkService.addBookmark(dprUser.id, reportId, id, reportType)
+    } else {
+      await this.services.bookmarkService.removeBookmark(dprUser.id, id, reportId)
+    }
     res.end()
   }
 }

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

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

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

@@ -1,7 +1,7 @@
 {
   "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": "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",
+  "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  router.post('/', controller.POST)\n  router.use(`/list`, listRoutes({ layoutPath, services }))\n  return router\n}\n\nexport default routes\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBAEvBC,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,EAC9D,OAAAC,EAAO,KAAK,IAAKC,EAAW,IAAI,EAChCD,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"]
 }

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

@@ -8,10 +8,7 @@ export function routes({ layoutPath, services }: { layoutPath: string; services:
   const router = Router({ mergeParams: true })
 
   const controller = new BookmarkController(layoutPath, services)
-
   router.post('/', controller.POST)
-  router.delete('/', controller.DELETE)
-
   router.use(`/list`, listRoutes({ layoutPath, services }))
   return router
 }

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

@@ -1,5 +1,5 @@
-"use strict";var S=Object.create;var k=Object.defineProperty;var B=Object.getOwnPropertyDescriptor;var $=Object.getOwnPropertyNames;var C=Object.getPrototypeOf,v=Object.prototype.hasOwnProperty;var y=(a,s)=>{for(var o in s)k(a,o,{get:s[o],enumerable:!0})},f=(a,s,o,t)=>{if(s&&typeof s=="object"||typeof s=="function")for(let e of $(s))!v.call(a,e)&&e!==o&&k(a,e,{get:()=>s[e],enumerable:!(t=B(s,e))||t.enumerable});return a};var p=(a,s,o)=>(o=a!=null?S(C(a)):{},f(s||!a||!a.__esModule?k(o,"default",{value:a,enumerable:!0}):o,a)),R=a=>f(k({},"__esModule",{value:!0}),a);var x={};y(x,{BookmarkService:()=>m,default:()=>w});module.exports=R(x);var u=p(require("../../../../services/reportStoreService")),h=p(require("../../../../utils/logger"));class m extends u.default{constructor(o,t){super(o);this.isBookmarked=async(o,t,e)=>{if(!this.enabled)return!1;const r=await this.getState(e),i=this.isBookmarkedCheck(r,o,t);let n;return i&&(n=this.getBookmark(r,o,t)),n?.automatic?void 0:i};this.isBookmarkedCheck=(o,t,e)=>o.bookmarks.some(r=>r.id===t&&r.reportId===e);this.getBookmark=(o,t,e)=>o.bookmarks.find(r=>r.id===t&&r.reportId===e);this.enabled=!!t.bookmarking,this.enabled||h.default.info("Bookmarking: disabled ")}async getAllBookmarks(o){return this.enabled?(await this.getState(o)).bookmarks:[]}async addBookmark(o,t,e,r,i){if(!this.enabled)return;const n=await this.getState(o);this.isBookmarkedCheck(n,e,t)||n.bookmarks.unshift({reportId:t,id:e,type:r,automatic:i}),await this.saveState(o,n)}async removeBookmark(o,t,e){if(!this.enabled)return;const r=await this.getState(o),i=r.bookmarks.findIndex(n=>n.id===t&&n.reportId===e);i>=0&&r.bookmarks.splice(i,1),await this.saveState(o,r)}async createBookMarkToggleHtml({userConfig:o,reportId:t,id:e,csrfToken:r,ctxId:i,reportType:n,isMissing:d}){let g="Add bookmark",l=!1,b=null;if(o?.bookmarks){const c=this.getBookmark(o,e,t);c&&(b="checked",g="Remove bookmark",l=!!c.automatic)}return l||d?"":`<button class='dpr-bookmark dpr-bookmark-table' data-dpr-module='bookmark-toggle'>
-  <input class='bookmark-input' type='checkbox' id='${t}-${e}-${i}' data-report-id='${t}' data-id='${e}' data-report-type='${n}' data-csrf-token='${r}' ${b} />
+"use strict";var S=Object.create;var k=Object.defineProperty;var $=Object.getOwnPropertyDescriptor;var C=Object.getOwnPropertyNames;var v=Object.getPrototypeOf,y=Object.prototype.hasOwnProperty;var R=(a,s)=>{for(var o in s)k(a,o,{get:s[o],enumerable:!0})},c=(a,s,o,t)=>{if(s&&typeof s=="object"||typeof s=="function")for(let e of C(s))!y.call(a,e)&&e!==o&&k(a,e,{get:()=>s[e],enumerable:!(t=$(s,e))||t.enumerable});return a};var p=(a,s,o)=>(o=a!=null?S(v(a)):{},c(s||!a||!a.__esModule?k(o,"default",{value:a,enumerable:!0}):o,a)),w=a=>c(k({},"__esModule",{value:!0}),a);var T={};R(T,{BookmarkService:()=>m,default:()=>x});module.exports=w(T);var u=p(require("../../../../services/reportStoreService")),h=p(require("../../../../utils/logger"));class m extends u.default{constructor(o,t){super(o);this.isBookmarked=async(o,t,e)=>{if(!this.enabled)return!1;const r=await this.getState(e),i=this.isBookmarkedCheck(r,o,t);let n;return i&&(n=this.getBookmark(r,o,t)),n?.automatic?void 0:i};this.isBookmarkedCheck=(o,t,e)=>o.bookmarks.some(r=>r.id===t&&r.reportId===e);this.getBookmark=(o,t,e)=>o.bookmarks.find(r=>r.id===t&&r.reportId===e);this.enabled=!!t.bookmarking,this.enabled||h.default.info("Bookmarking: disabled ")}async getAllBookmarks(o){return this.enabled?(await this.getState(o)).bookmarks:[]}async addBookmark(o,t,e,r,i){if(!this.enabled)return;const n=await this.getState(o);this.isBookmarkedCheck(n,e,t)||n.bookmarks.unshift({reportId:t,id:e,type:r,automatic:i}),await this.saveState(o,n)}async removeBookmark(o,t,e){if(!this.enabled)return;const r=await this.getState(o),i=r.bookmarks.findIndex(n=>n.id===t&&n.reportId===e);i>=0&&r.bookmarks.splice(i,1),await this.saveState(o,r)}async createBookMarkToggleHtml({userConfig:o,reportId:t,id:e,csrfToken:r,ctxId:i,reportType:n,isMissing:d,nestedBaseUrl:B}){let g="Add bookmark",l=!1,b=null;if(o?.bookmarks){const f=this.getBookmark(o,e,t);f&&(b="checked",g="Remove bookmark",l=!!f.automatic)}return l||d?"":`<button class='dpr-bookmark dpr-bookmark-table' data-dpr-module='bookmark-toggle'>
+  <input class='bookmark-input' type='checkbox' id='${t}-${e}-${i}' data-report-id='${t}' data-id='${e}' data-report-type='${n}' data-csrf-token='${r}' data-base-url="${B}" ${b} />
   <label tabindex='0' id='${e}-${t}-${i}-bookmark-label' for='${t}-${e}-${i}'><span class='dpr-bookmark-label govuk-body-s'>${g}</span></label>
-</button>`}}var w=m;0&&(module.exports={BookmarkService});
+</button>`}}var x=m;0&&(module.exports={BookmarkService});
 //# sourceMappingURL=service.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/my-reports/bookmarks/service.ts"],
-  "sourcesContent": ["import ReportStoreService from '../../../../services/reportStoreService'\nimport ReportDataStore from '../../../../data/reportDataStore'\nimport { ReportType } from '../../../../types/UserReports'\nimport { ReportStoreConfig } from '../../../../types/ReportStore'\nimport logger from '../../../../utils/logger'\nimport { BookmarkStoreData } from '../../../../types/Bookmark'\nimport { ServiceFeatureConfig } from '../../../../types/DprConfig'\n\nclass BookmarkService extends ReportStoreService {\n  enabled: boolean\n\n  constructor(reportDataStore: ReportDataStore, serviceFeatureConfig: ServiceFeatureConfig) {\n    super(reportDataStore)\n    this.enabled = Boolean(serviceFeatureConfig.bookmarking)\n    if (!this.enabled) logger.info(`Bookmarking: disabled `)\n  }\n\n  async getAllBookmarks(userId: string): Promise<BookmarkStoreData[]> {\n    if (!this.enabled) return []\n\n    const userConfig = await this.getState(userId)\n    return userConfig.bookmarks\n  }\n\n  async addBookmark(\n    userId: string,\n    reportId: string,\n    id: string,\n    type: ReportType,\n    automatic?: boolean,\n  ): Promise<void> {\n    if (!this.enabled) return\n\n    const userConfig = await this.getState(userId)\n    if (!this.isBookmarkedCheck(userConfig, id, reportId)) {\n      userConfig.bookmarks.unshift({ reportId, id, type, automatic })\n    }\n    await this.saveState(userId, userConfig)\n  }\n\n  async removeBookmark(userId: string, id: string, reportId: string): Promise<void> {\n    if (!this.enabled) return\n\n    const userConfig = await this.getState(userId)\n    const index = userConfig.bookmarks.findIndex((bookmark) => {\n      const bmVarId = bookmark.id\n      return bmVarId === id && bookmark.reportId === reportId\n    })\n    if (index >= 0) {\n      userConfig.bookmarks.splice(index, 1)\n    }\n    await this.saveState(userId, userConfig)\n  }\n\n  isBookmarked = async (id: string, reportId: string, userId: string): Promise<boolean | undefined> => {\n    if (!this.enabled) return false\n\n    const userConfig = await this.getState(userId)\n    const isBookmarked = this.isBookmarkedCheck(userConfig, id, reportId)\n    let bookmark\n    if (isBookmarked) {\n      bookmark = this.getBookmark(userConfig, id, reportId)\n    }\n\n    return bookmark?.automatic ? undefined : isBookmarked\n  }\n\n  private isBookmarkedCheck = (userConfig: ReportStoreConfig, id: string, reportId: string): boolean => {\n    return userConfig.bookmarks.some((bookmark) => {\n      const bmVarId = bookmark.id\n      return bmVarId === id && bookmark.reportId === reportId\n    })\n  }\n\n  private getBookmark = (userConfig: ReportStoreConfig, id: string, reportId: string) => {\n    return userConfig.bookmarks.find((bookmark) => {\n      const bmVarId = bookmark.id\n      return bmVarId === id && bookmark.reportId === reportId\n    })\n  }\n\n  async createBookMarkToggleHtml({\n    userConfig,\n    reportId,\n    id,\n    csrfToken,\n    ctxId,\n    reportType,\n    isMissing,\n  }: {\n    userConfig: ReportStoreConfig\n    reportId: string\n    id: string\n    csrfToken: string\n    ctxId: string\n    reportType: ReportType\n    isMissing: boolean\n  }) {\n    let tooltip = 'Add bookmark'\n    let automatic = false\n    let checked = null\n    if (userConfig?.bookmarks) {\n      const bookmark = this.getBookmark(userConfig, id, reportId)\n      if (bookmark) {\n        checked = 'checked'\n        tooltip = 'Remove bookmark'\n        automatic = Boolean(bookmark.automatic)\n      }\n    }\n\n    return automatic || isMissing\n      ? ''\n      : `<button class='dpr-bookmark dpr-bookmark-table' data-dpr-module='bookmark-toggle'>\n  <input class='bookmark-input' type='checkbox' id='${reportId}-${id}-${ctxId}' data-report-id='${reportId}' data-id='${id}' data-report-type='${reportType}' data-csrf-token='${csrfToken}' ${checked} />\n  <label tabindex='0' id='${id}-${reportId}-${ctxId}-bookmark-label' for='${reportId}-${id}-${ctxId}'><span class='dpr-bookmark-label govuk-body-s'>${tooltip}</span></label>\n</button>`\n  }\n}\n\nexport { BookmarkService }\nexport default BookmarkService\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAA+B,sDAI/BC,EAAmB,uCAInB,MAAMJ,UAAwB,EAAAK,OAAmB,CAG/C,YAAYC,EAAkCC,EAA4C,CACxF,MAAMD,CAAe,EA0CvB,kBAAe,MAAOE,EAAYC,EAAkBC,IAAiD,CACnG,GAAI,CAAC,KAAK,QAAS,MAAO,GAE1B,MAAMC,EAAa,MAAM,KAAK,SAASD,CAAM,EACvCE,EAAe,KAAK,kBAAkBD,EAAYH,EAAIC,CAAQ,EACpE,IAAII,EACJ,OAAID,IACFC,EAAW,KAAK,YAAYF,EAAYH,EAAIC,CAAQ,GAG/CI,GAAU,UAAY,OAAYD,CAC3C,EAEA,KAAQ,kBAAoB,CAACD,EAA+BH,EAAYC,IAC/DE,EAAW,UAAU,KAAME,GAChBA,EAAS,KACNL,GAAMK,EAAS,WAAaJ,CAChD,EAGH,KAAQ,YAAc,CAACE,EAA+BH,EAAYC,IACzDE,EAAW,UAAU,KAAME,GAChBA,EAAS,KACNL,GAAMK,EAAS,WAAaJ,CAChD,EAjED,KAAK,QAAU,EAAQF,EAAqB,YACvC,KAAK,SAAS,EAAAO,QAAO,KAAK,wBAAwB,CACzD,CAEA,MAAM,gBAAgBJ,EAA8C,CAClE,OAAK,KAAK,SAES,MAAM,KAAK,SAASA,CAAM,GAC3B,UAHQ,CAAC,CAI7B,CAEA,MAAM,YACJA,EACAD,EACAD,EACAO,EACAC,EACe,CACf,GAAI,CAAC,KAAK,QAAS,OAEnB,MAAML,EAAa,MAAM,KAAK,SAASD,CAAM,EACxC,KAAK,kBAAkBC,EAAYH,EAAIC,CAAQ,GAClDE,EAAW,UAAU,QAAQ,CAAE,SAAAF,EAAU,GAAAD,EAAI,KAAAO,EAAM,UAAAC,CAAU,CAAC,EAEhE,MAAM,KAAK,UAAUN,EAAQC,CAAU,CACzC,CAEA,MAAM,eAAeD,EAAgBF,EAAYC,EAAiC,CAChF,GAAI,CAAC,KAAK,QAAS,OAEnB,MAAME,EAAa,MAAM,KAAK,SAASD,CAAM,EACvCO,EAAQN,EAAW,UAAU,UAAWE,GAC5BA,EAAS,KACNL,GAAMK,EAAS,WAAaJ,CAChD,EACGQ,GAAS,GACXN,EAAW,UAAU,OAAOM,EAAO,CAAC,EAEtC,MAAM,KAAK,UAAUP,EAAQC,CAAU,CACzC,CA6BA,MAAM,yBAAyB,CAC7B,WAAAA,EACA,SAAAF,EACA,GAAAD,EACA,UAAAU,EACA,MAAAC,EACA,WAAAC,EACA,UAAAC,CACF,EAQG,CACD,IAAIC,EAAU,eACVN,EAAY,GACZO,EAAU,KACd,GAAIZ,GAAY,UAAW,CACzB,MAAME,EAAW,KAAK,YAAYF,EAAYH,EAAIC,CAAQ,EACtDI,IACFU,EAAU,UACVD,EAAU,kBACVN,EAAY,EAAQH,EAAS,UAEjC,CAEA,OAAOG,GAAaK,EAChB,GACA;AAAA,sDAC8CZ,CAAQ,IAAID,CAAE,IAAIW,CAAK,qBAAqBV,CAAQ,cAAcD,CAAE,uBAAuBY,CAAU,sBAAsBF,CAAS,KAAKK,CAAO;AAAA,4BAC1Kf,CAAE,IAAIC,CAAQ,IAAIU,CAAK,yBAAyBV,CAAQ,IAAID,CAAE,IAAIW,CAAK,mDAAmDG,CAAO;AAAA,UAE3J,CACF,CAGA,IAAOrB,EAAQD",
-  "names": ["service_exports", "__export", "BookmarkService", "service_default", "__toCommonJS", "import_reportStoreService", "import_logger", "ReportStoreService", "reportDataStore", "serviceFeatureConfig", "id", "reportId", "userId", "userConfig", "isBookmarked", "bookmark", "logger", "type", "automatic", "index", "csrfToken", "ctxId", "reportType", "isMissing", "tooltip", "checked"]
+  "sourcesContent": ["import ReportStoreService from '../../../../services/reportStoreService'\nimport ReportDataStore from '../../../../data/reportDataStore'\nimport { ReportType } from '../../../../types/UserReports'\nimport { ReportStoreConfig } from '../../../../types/ReportStore'\nimport logger from '../../../../utils/logger'\nimport { BookmarkStoreData } from '../../../../types/Bookmark'\nimport { ServiceFeatureConfig } from '../../../../types/DprConfig'\n\nclass BookmarkService extends ReportStoreService {\n  enabled: boolean\n\n  constructor(reportDataStore: ReportDataStore, serviceFeatureConfig: ServiceFeatureConfig) {\n    super(reportDataStore)\n    this.enabled = Boolean(serviceFeatureConfig.bookmarking)\n    if (!this.enabled) logger.info(`Bookmarking: disabled `)\n  }\n\n  async getAllBookmarks(userId: string): Promise<BookmarkStoreData[]> {\n    if (!this.enabled) return []\n\n    const userConfig = await this.getState(userId)\n    return userConfig.bookmarks\n  }\n\n  async addBookmark(\n    userId: string,\n    reportId: string,\n    id: string,\n    type: ReportType,\n    automatic?: boolean,\n  ): Promise<void> {\n    if (!this.enabled) return\n\n    const userConfig = await this.getState(userId)\n    if (!this.isBookmarkedCheck(userConfig, id, reportId)) {\n      userConfig.bookmarks.unshift({ reportId, id, type, automatic })\n    }\n    await this.saveState(userId, userConfig)\n  }\n\n  async removeBookmark(userId: string, id: string, reportId: string): Promise<void> {\n    if (!this.enabled) return\n\n    const userConfig = await this.getState(userId)\n    const index = userConfig.bookmarks.findIndex((bookmark) => {\n      const bmVarId = bookmark.id\n      return bmVarId === id && bookmark.reportId === reportId\n    })\n    if (index >= 0) {\n      userConfig.bookmarks.splice(index, 1)\n    }\n    await this.saveState(userId, userConfig)\n  }\n\n  isBookmarked = async (id: string, reportId: string, userId: string): Promise<boolean | undefined> => {\n    if (!this.enabled) return false\n\n    const userConfig = await this.getState(userId)\n    const isBookmarked = this.isBookmarkedCheck(userConfig, id, reportId)\n    let bookmark\n    if (isBookmarked) {\n      bookmark = this.getBookmark(userConfig, id, reportId)\n    }\n\n    return bookmark?.automatic ? undefined : isBookmarked\n  }\n\n  private isBookmarkedCheck = (userConfig: ReportStoreConfig, id: string, reportId: string): boolean => {\n    return userConfig.bookmarks.some((bookmark) => {\n      const bmVarId = bookmark.id\n      return bmVarId === id && bookmark.reportId === reportId\n    })\n  }\n\n  private getBookmark = (userConfig: ReportStoreConfig, id: string, reportId: string) => {\n    return userConfig.bookmarks.find((bookmark) => {\n      const bmVarId = bookmark.id\n      return bmVarId === id && bookmark.reportId === reportId\n    })\n  }\n\n  async createBookMarkToggleHtml({\n    userConfig,\n    reportId,\n    id,\n    csrfToken,\n    ctxId,\n    reportType,\n    isMissing,\n    nestedBaseUrl,\n  }: {\n    userConfig: ReportStoreConfig\n    reportId: string\n    id: string\n    csrfToken: string\n    ctxId: string\n    reportType: ReportType\n    isMissing: boolean\n    nestedBaseUrl: string | undefined\n  }) {\n    let tooltip = 'Add bookmark'\n    let automatic = false\n    let checked = null\n\n    if (userConfig?.bookmarks) {\n      const bookmark = this.getBookmark(userConfig, id, reportId)\n      if (bookmark) {\n        checked = 'checked'\n        tooltip = 'Remove bookmark'\n        automatic = Boolean(bookmark.automatic)\n      }\n    }\n\n    return automatic || isMissing\n      ? ''\n      : `<button class='dpr-bookmark dpr-bookmark-table' data-dpr-module='bookmark-toggle'>\n  <input class='bookmark-input' type='checkbox' id='${reportId}-${id}-${ctxId}' data-report-id='${reportId}' data-id='${id}' data-report-type='${reportType}' data-csrf-token='${csrfToken}' data-base-url=\"${nestedBaseUrl}\" ${checked} />\n  <label tabindex='0' id='${id}-${reportId}-${ctxId}-bookmark-label' for='${reportId}-${id}-${ctxId}'><span class='dpr-bookmark-label govuk-body-s'>${tooltip}</span></label>\n</button>`\n  }\n}\n\nexport { BookmarkService }\nexport default BookmarkService\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAA+B,sDAI/BC,EAAmB,uCAInB,MAAMJ,UAAwB,EAAAK,OAAmB,CAG/C,YAAYC,EAAkCC,EAA4C,CACxF,MAAMD,CAAe,EA0CvB,kBAAe,MAAOE,EAAYC,EAAkBC,IAAiD,CACnG,GAAI,CAAC,KAAK,QAAS,MAAO,GAE1B,MAAMC,EAAa,MAAM,KAAK,SAASD,CAAM,EACvCE,EAAe,KAAK,kBAAkBD,EAAYH,EAAIC,CAAQ,EACpE,IAAII,EACJ,OAAID,IACFC,EAAW,KAAK,YAAYF,EAAYH,EAAIC,CAAQ,GAG/CI,GAAU,UAAY,OAAYD,CAC3C,EAEA,KAAQ,kBAAoB,CAACD,EAA+BH,EAAYC,IAC/DE,EAAW,UAAU,KAAME,GAChBA,EAAS,KACNL,GAAMK,EAAS,WAAaJ,CAChD,EAGH,KAAQ,YAAc,CAACE,EAA+BH,EAAYC,IACzDE,EAAW,UAAU,KAAME,GAChBA,EAAS,KACNL,GAAMK,EAAS,WAAaJ,CAChD,EAjED,KAAK,QAAU,EAAQF,EAAqB,YACvC,KAAK,SAAS,EAAAO,QAAO,KAAK,wBAAwB,CACzD,CAEA,MAAM,gBAAgBJ,EAA8C,CAClE,OAAK,KAAK,SAES,MAAM,KAAK,SAASA,CAAM,GAC3B,UAHQ,CAAC,CAI7B,CAEA,MAAM,YACJA,EACAD,EACAD,EACAO,EACAC,EACe,CACf,GAAI,CAAC,KAAK,QAAS,OAEnB,MAAML,EAAa,MAAM,KAAK,SAASD,CAAM,EACxC,KAAK,kBAAkBC,EAAYH,EAAIC,CAAQ,GAClDE,EAAW,UAAU,QAAQ,CAAE,SAAAF,EAAU,GAAAD,EAAI,KAAAO,EAAM,UAAAC,CAAU,CAAC,EAEhE,MAAM,KAAK,UAAUN,EAAQC,CAAU,CACzC,CAEA,MAAM,eAAeD,EAAgBF,EAAYC,EAAiC,CAChF,GAAI,CAAC,KAAK,QAAS,OAEnB,MAAME,EAAa,MAAM,KAAK,SAASD,CAAM,EACvCO,EAAQN,EAAW,UAAU,UAAWE,GAC5BA,EAAS,KACNL,GAAMK,EAAS,WAAaJ,CAChD,EACGQ,GAAS,GACXN,EAAW,UAAU,OAAOM,EAAO,CAAC,EAEtC,MAAM,KAAK,UAAUP,EAAQC,CAAU,CACzC,CA6BA,MAAM,yBAAyB,CAC7B,WAAAA,EACA,SAAAF,EACA,GAAAD,EACA,UAAAU,EACA,MAAAC,EACA,WAAAC,EACA,UAAAC,EACA,cAAAC,CACF,EASG,CACD,IAAIC,EAAU,eACVP,EAAY,GACZQ,EAAU,KAEd,GAAIb,GAAY,UAAW,CACzB,MAAME,EAAW,KAAK,YAAYF,EAAYH,EAAIC,CAAQ,EACtDI,IACFW,EAAU,UACVD,EAAU,kBACVP,EAAY,EAAQH,EAAS,UAEjC,CAEA,OAAOG,GAAaK,EAChB,GACA;AAAA,sDAC8CZ,CAAQ,IAAID,CAAE,IAAIW,CAAK,qBAAqBV,CAAQ,cAAcD,CAAE,uBAAuBY,CAAU,sBAAsBF,CAAS,oBAAoBI,CAAa,KAAKE,CAAO;AAAA,4BAC3MhB,CAAE,IAAIC,CAAQ,IAAIU,CAAK,yBAAyBV,CAAQ,IAAID,CAAE,IAAIW,CAAK,mDAAmDI,CAAO;AAAA,UAE3J,CACF,CAGA,IAAOtB,EAAQD",
+  "names": ["service_exports", "__export", "BookmarkService", "service_default", "__toCommonJS", "import_reportStoreService", "import_logger", "ReportStoreService", "reportDataStore", "serviceFeatureConfig", "id", "reportId", "userId", "userConfig", "isBookmarked", "bookmark", "logger", "type", "automatic", "index", "csrfToken", "ctxId", "reportType", "isMissing", "nestedBaseUrl", "tooltip", "checked"]
 }

package/dpr/routes/journeys/my-reports/bookmarks/service.ts

@@ -87,6 +87,7 @@ class BookmarkService extends ReportStoreService {
     ctxId,
     reportType,
     isMissing,
+    nestedBaseUrl,
   }: {
     userConfig: ReportStoreConfig
     reportId: string
@@ -95,10 +96,12 @@ class BookmarkService extends ReportStoreService {
     ctxId: string
     reportType: ReportType
     isMissing: boolean
+    nestedBaseUrl: string | undefined
   }) {
     let tooltip = 'Add bookmark'
     let automatic = false
     let checked = null
+
     if (userConfig?.bookmarks) {
       const bookmark = this.getBookmark(userConfig, id, reportId)
       if (bookmark) {
@@ -111,7 +114,7 @@ class BookmarkService extends ReportStoreService {
     return automatic || isMissing
       ? ''
       : `<button class='dpr-bookmark dpr-bookmark-table' data-dpr-module='bookmark-toggle'>
-  <input class='bookmark-input' type='checkbox' id='${reportId}-${id}-${ctxId}' data-report-id='${reportId}' data-id='${id}' data-report-type='${reportType}' data-csrf-token='${csrfToken}' ${checked} />
+  <input class='bookmark-input' type='checkbox' id='${reportId}-${id}-${ctxId}' data-report-id='${reportId}' data-id='${id}' data-report-type='${reportType}' data-csrf-token='${csrfToken}' data-base-url="${nestedBaseUrl}" ${checked} />
   <label tabindex='0' id='${id}-${reportId}-${ctxId}-bookmark-label' for='${reportId}-${id}-${ctxId}'><span class='dpr-bookmark-label govuk-body-s'>${tooltip}</span></label>
 </button>`
   }

package/dpr/routes/journeys/my-reports/recently-viewed/controller.js

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

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/my-reports/recently-viewed/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../types/Services'\nimport LocalsHelper from '../../../../utils/localsHelper'\n\nclass RecentlyViewedReportsController {\n  services: Services\n\n  constructor(services: Services) {\n    this.services = services\n  }\n\n  DELETE: RequestHandler = async (req, res) => {\n    const { dprUser } = LocalsHelper.getValues(res)\n    const { id } = req.params\n    await this.services.recentlyViewedService.removeReport(id, dprUser.id)\n    res.end()\n  }\n}\n\nexport { RecentlyViewedReportsController }\nexport default RecentlyViewedReportsController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAyB,6CAEzB,MAAMH,CAAgC,CAGpC,YAAYI,EAAoB,CAIhC,YAAyB,MAAOC,EAAKC,IAAQ,CAC3C,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUF,CAAG,EACxC,CAAE,GAAAG,CAAG,EAAIJ,EAAI,OACnB,MAAM,KAAK,SAAS,sBAAsB,aAAaI,EAAIF,EAAQ,EAAE,EACrED,EAAI,IAAI,CACV,EARE,KAAK,SAAWF,CAClB,CAQF,CAGA,IAAOH,EAAQD",
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../types/Services'\nimport LocalsHelper from '../../../../utils/localsHelper'\n\nclass RecentlyViewedReportsController {\n  services: Services\n\n  constructor(services: Services) {\n    this.services = services\n  }\n\n  DELETE: RequestHandler = async (req, res) => {\n    const { dprUser } = LocalsHelper.getValues(res)\n    const { id } = req.params\n    await this.services.recentlyViewedService.removeReport(id, dprUser.id)\n    await this.services.requestedReportService.removeReport(id, dprUser.id)\n    res.end()\n  }\n}\n\nexport { RecentlyViewedReportsController }\nexport default RecentlyViewedReportsController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAyB,6CAEzB,MAAMH,CAAgC,CAGpC,YAAYI,EAAoB,CAIhC,YAAyB,MAAOC,EAAKC,IAAQ,CAC3C,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUF,CAAG,EACxC,CAAE,GAAAG,CAAG,EAAIJ,EAAI,OACnB,MAAM,KAAK,SAAS,sBAAsB,aAAaI,EAAIF,EAAQ,EAAE,EACrE,MAAM,KAAK,SAAS,uBAAuB,aAAaE,EAAIF,EAAQ,EAAE,EACtED,EAAI,IAAI,CACV,EATE,KAAK,SAAWF,CAClB,CASF,CAGA,IAAOH,EAAQD",
   "names": ["controller_exports", "__export", "RecentlyViewedReportsController", "controller_default", "__toCommonJS", "import_localsHelper", "services", "req", "res", "dprUser", "LocalsHelper", "id"]
 }

package/dpr/routes/journeys/my-reports/recently-viewed/controller.ts

@@ -13,6 +13,7 @@ class RecentlyViewedReportsController {
     const { dprUser } = LocalsHelper.getValues(res)
     const { id } = req.params
     await this.services.recentlyViewedService.removeReport(id, dprUser.id)
+    await this.services.requestedReportService.removeReport(id, dprUser.id)
     res.end()
   }
 }

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

@@ -1,2 +1,2 @@
-"use strict";var q=Object.create;var p=Object.defineProperty;var w=Object.getOwnPropertyDescriptor;var y=Object.getOwnPropertyNames;var x=Object.getPrototypeOf,I=Object.prototype.hasOwnProperty;var D=(i,t)=>{for(var e in t)p(i,e,{get:t[e],enumerable:!0})},R=(i,t,e,s)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of y(t))!I.call(i,r)&&r!==e&&p(i,r,{get:()=>t[r],enumerable:!(s=w(t,r))||s.enumerable});return i};var E=(i,t,e)=>(e=i!=null?q(x(i)):{},R(t||!i||!i.__esModule?p(e,"default",{value:i,enumerable:!0}):e,i)),C=i=>R(p({},"__esModule",{value:!0}),i);var v={};D(v,{RequestedReportService:()=>c,default:()=>b});module.exports=C(v);var n=require("../../../../types/UserReports"),f=E(require("../../../../services/reportStoreService")),l=require("../../../../utils/urlHelper");class c extends f.default{constructor(t){super(t)}async addReport(t,e){const s=await this.getState(t);s.requestedReports.unshift(e),await this.saveState(t,s)}async removeReport(t,e){const s=await this.getState(e),r=this.findIndexByExecutionId(t,s.requestedReports);s.requestedReports.splice(r,1),await this.saveState(e,s)}async getReportByExecutionId(t,e){return(await this.getState(e)).requestedReports.find(r=>r.executionId===t)}async getReportByTableId(t,e){return(await this.getState(e)).requestedReports.find(r=>r.tableId===t)}async getAllReports(t){return(await this.getState(t)).requestedReports}async getAllReportsById(t,e){return(await this.getState(e)).requestedReports.filter(r=>r.id&&r.id===t||r.variantId&&r.variantId===t)}async updateLastViewed(t,e){const s=await this.getState(e),r=this.findIndexByExecutionId(t,s.requestedReports),a=s.requestedReports[r];a.timestamp.lastViewed=new Date,s.requestedReports[r]=a,await this.saveState(e,s)}async updateStatus(t,e,s,r){const a=await this.getState(e),u=this.findIndexByExecutionId(t,a.requestedReports);let o=a.requestedReports[u];o&&(o=this.updateDataByStatus(o,s,r)),a.requestedReports[u]=o,await this.saveState(e,a)}async setToExpired(t,e){const s=await this.getState(e),r=this.findIndexByExecutionId(t,s.requestedReports);let a=s.requestedReports[r];a&&(a={...a,status:n.RequestStatus.EXPIRED,timestamp:{...a.timestamp,expired:new Date}},s.requestedReports[r]=a,await this.saveState(e,s))}setReportUrl(t){const{tableId:e,url:s,dpdPathFromQuery:r,dataProductDefinitionsPath:a,type:u}=t;let o,g;if(s&&s.polling?.pathname){let d=Array.from(new Array(2));d=s.polling.pathname.replace("/request-report","/view-report/async").split("/"),d[d.length-2]=e,d[d.length-1]=u;const h=d.join("/"),m=s.report?.search?s.report.search:"",S=a&&r?`${(0,l.getDpdPathSuffix)(a)}`:"";o=`${h}${m||S}`,g=`${s.origin}${o}`}return{pathname:o,fullUrl:g}}updateDataByStatus(t,e,s){const r=new Date;switch(e&&(t.status=e),e){case n.RequestStatus.FAILED:t.timestamp.failed=r,s&&(t.errorMessage=s);break;case n.RequestStatus.EXPIRED:t.timestamp.expired=r;break;case n.RequestStatus.ABORTED:t.timestamp.aborted=r;break;case n.RequestStatus.FINISHED:{t.timestamp.completed=r,t.url&&(t.url.report={...t.url.report,...this.setReportUrl(t)});break}case n.RequestStatus.SUBMITTED:t.timestamp.requested=r;break;case n.RequestStatus.STARTED:case n.RequestStatus.PICKED:break;default:t.timestamp.lastViewed=r;break}return t}}var b=c;0&&(module.exports={RequestedReportService});
+"use strict";var y=Object.create;var R=Object.defineProperty;var x=Object.getOwnPropertyDescriptor;var I=Object.getOwnPropertyNames;var D=Object.getPrototypeOf,v=Object.prototype.hasOwnProperty;var E=(i,e)=>{for(var t in e)R(i,t,{get:e[t],enumerable:!0})},f=(i,e,t,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of I(e))!v.call(i,r)&&r!==t&&R(i,r,{get:()=>e[r],enumerable:!(s=x(e,r))||s.enumerable});return i};var m=(i,e,t)=>(t=i!=null?y(D(i)):{},f(e||!i||!i.__esModule?R(t,"default",{value:i,enumerable:!0}):t,i)),C=i=>f(R({},"__esModule",{value:!0}),i);var b={};E(b,{RequestedReportService:()=>l,default:()=>P});module.exports=C(b);var o=require("../../../../types/UserReports"),h=m(require("../../../../services/reportStoreService")),q=require("../../../../utils/urlHelper"),S=m(require("../../../../utils/logger"));class l extends h.default{constructor(e){super(e)}async addReport(e,t){const s=await this.getState(e);s.requestedReports.unshift(t),await this.saveState(e,s)}async removeReport(e,t){const s=await this.getState(t),r=this.findIndexByExecutionId(e,s.requestedReports);s.requestedReports.splice(r,1),await this.saveState(t,s)}async getReportByExecutionId(e,t){return(await this.getState(t)).requestedReports.find(r=>r.executionId===e)}async getReportByTableId(e,t){return(await this.getState(t)).requestedReports.find(r=>r.tableId===e)}async getAllReports(e){return(await this.getState(e)).requestedReports}async getAllReportsById(e,t){return(await this.getState(t)).requestedReports.filter(r=>r.id&&r.id===e||r.variantId&&r.variantId===e)}async updateLastViewed(e,t){const s=await this.getState(t),r=this.findIndexByExecutionId(e,s.requestedReports),a=s.requestedReports[r];a.timestamp.lastViewed=new Date,s.requestedReports[r]=a,await this.saveState(t,s)}async updateStatus(e,t,s,r){const a=await this.getState(t),d=this.findIndexByExecutionId(e,a.requestedReports);let n=a.requestedReports[d];n&&(n=this.updateDataByStatus(n,s,r)),a.requestedReports[d]=n,await this.saveState(t,a)}async setToExpired(e,t){const s=await this.getState(t),r=this.findIndexByExecutionId(e,s.requestedReports);let a=s.requestedReports[r];a&&(a={...a,status:o.RequestStatus.EXPIRED,timestamp:{...a.timestamp,expired:new Date}},s.requestedReports[r]=a,await this.saveState(t,s))}async cleanList(e,t){const a=(await this.getState(e)).requestedReports.filter(n=>n.timestamp.lastViewed!==void 0);let d=0;await Promise.all(a.map(async n=>{const{executionId:p}=n;!t.find(g=>{const{executionId:c}=g;return c&&c===p})&&p&&(await this.removeReport(p,e),d+=1)})),d>0&&S.default.info(`RequestedReports: Removed ${d} stale reports from list`)}setReportUrl(e){const{tableId:t,url:s,dpdPathFromQuery:r,dataProductDefinitionsPath:a,type:d}=e;let n,p;if(s&&s.polling?.pathname){let u=Array.from(new Array(2));u=s.polling.pathname.replace("/request-report","/view-report/async").split("/"),u[u.length-2]=t,u[u.length-1]=d;const g=u.join("/"),c=s.report?.search?s.report.search:"",w=a&&r?`${(0,q.getDpdPathSuffix)(a)}`:"";n=`${g}${c||w}`,p=`${s.origin}${n}`}return{pathname:n,fullUrl:p}}updateDataByStatus(e,t,s){const r=new Date;switch(t&&(e.status=t),t){case o.RequestStatus.FAILED:e.timestamp.failed=r,s&&(e.errorMessage=s);break;case o.RequestStatus.EXPIRED:e.timestamp.expired=r;break;case o.RequestStatus.ABORTED:e.timestamp.aborted=r;break;case o.RequestStatus.FINISHED:{e.timestamp.completed=r,e.url&&(e.url.report={...e.url.report,...this.setReportUrl(e)});break}case o.RequestStatus.SUBMITTED:e.timestamp.requested=r;break;case o.RequestStatus.STARTED:case o.RequestStatus.PICKED:break;default:e.timestamp.lastViewed=r;break}return e}}var P=l;0&&(module.exports={RequestedReportService});
 //# sourceMappingURL=service.js.map

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

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

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

@@ -1,8 +1,9 @@
 /* eslint-disable no-param-reassign */
 import UserDataStore from '../../../../data/reportDataStore'
-import { RequestedReport, RequestStatus } from '../../../../types/UserReports'
+import { RequestedReport, RequestStatus, StoredReportData } from '../../../../types/UserReports'
 import ReportStoreService from '../../../../services/reportStoreService'
 import { getDpdPathSuffix } from '../../../../utils/urlHelper'
+import logger from '../../../../utils/logger'
 
 class RequestedReportService extends ReportStoreService {
   constructor(userDataStore: UserDataStore) {
@@ -80,6 +81,41 @@ class RequestedReportService extends ReportStoreService {
     }
   }
 
+  /**
+   * Removes old stale data from requested reports
+   * - When a report is viewed it is given a lastViewed ts.
+   * - If the requested data has a lastViewed ts and
+   * - has no corresponding viewed entry
+   * - then that requested data is stale and can be removed
+   *
+   * @param {string} userId
+   * @param {StoredReportData[]} viewedReports
+   * @memberof RequestedReportService
+   */
+  async cleanList(userId: string, viewedReports: StoredReportData[]) {
+    const userConfig = await this.getState(userId)
+    const allRequested = userConfig.requestedReports
+    const viewedRequestedReports = allRequested.filter((requestedReport) => {
+      return requestedReport.timestamp.lastViewed !== undefined
+    })
+
+    let count = 0
+    await Promise.all(
+      viewedRequestedReports.map(async (viewedRequestReport) => {
+        const { executionId } = viewedRequestReport
+        const viewedReport = viewedReports.find((report) => {
+          const { executionId: viewedExecutionId } = report
+          return viewedExecutionId && viewedExecutionId === executionId
+        })
+        if (!viewedReport && executionId) {
+          await this.removeReport(executionId, userId)
+          count += 1
+        }
+      }),
+    )
+    if (count > 0) logger.info(`RequestedReports: Removed ${count} stale reports from list`)
+  }
+
   setReportUrl(report: RequestedReport) {
     const { tableId, url, dpdPathFromQuery, dataProductDefinitionsPath, type } = report
 

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

@@ -1,2 +1,2 @@
-"use strict";var $=Object.create;var g=Object.defineProperty;var j=Object.getOwnPropertyDescriptor;var J=Object.getOwnPropertyNames;var L=Object.getPrototypeOf,z=Object.prototype.hasOwnProperty;var G=(e,t)=>{for(var i in t)g(e,i,{get:t[i],enumerable:!0})},T=(e,t,i,s)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of J(t))!z.call(e,r)&&r!==i&&g(e,r,{get:()=>t[r],enumerable:!(s=j(t,r))||s.enumerable});return e};var h=(e,t,i)=>(i=e!=null?$(L(e)):{},T(t||!e||!e.__esModule?g(i,"default",{value:e,enumerable:!0}):i,e)),K=e=>T(g({},"__esModule",{value:!0}),e);var ie={};G(ie,{cancelRequest:()=>N,default:()=>te,getDefintionByType:()=>Q,getFiltersFromReqBody:()=>H,renderRequest:()=>k,request:()=>B,updateStore:()=>O});module.exports=K(ie);var x=h(require("../../../../components/_async/async-filters-form/utils")),D=h(require("../../../../utils/localsHelper")),U=h(require("../../../../components/_filters/utils")),q=require("../../../../utils/reportStoreHelper"),E=h(require("../../../../utils/UserStoreItemBuilder")),f=require("../../../../types/UserReports"),P=h(require("../../../../utils/Personalisation/personalisationUtils")),C=require("../../../../components/_filters/filtersTypeEnum");const O=async({req:e,res:t,services:i,queryData:s,executionData:r,childExecutionData:o})=>{const{search:l,id:c,type:a}=e.body,{dprUser:n,definitionsPath:d,dpdPathFromQuery:u}=D.default.getValues(t);await(0,q.removeDuplicates)({storeService:i.requestedReportService,userId:n.id,id:c,search:l}),await(0,q.removeDuplicates)({storeService:i.recentlyViewedService,userId:n.id,id:c,search:l});const p=e.body,R={type:p.type,reportId:p.reportId,reportName:p.reportName,description:p.description,id:p.id,name:p.name};let m;switch(a){case f.ReportType.REPORT:m=new E.default(R,p).addExecutionData(r).addChildExecutionData(o).addFilters(s?.filterData).addSortData(s?.sortData).addDefinitionsPath(d,u).addRequestUrls(e).addQuery(s).addStatus(f.RequestStatus.SUBMITTED).addTimestamp().build();break;case f.ReportType.DASHBOARD:{m=new E.default(R,p).addExecutionData(r).addChildExecutionData(o).addFilters(s?.filterData).addDefinitionsPath(d,u).addRequestUrls(e).addQuery(s).addStatus(f.RequestStatus.SUBMITTED).addTimestamp().addMetrics(JSON.parse(e.body.sections)).build();break}default:break}m&&await i.requestedReportService.addReport(n.id,m)};async function W(e,t,i,s,r,o){return Promise.all(e.map(l=>t.requestAsyncReport(i,s,l.id,{...r&&r.query,...o&&{dataProductDefinitionsPath:o}}).then(c=>{const{executionId:a,tableId:n}=c;if(!a||!n)throw new Error("requestChildReports: No execution of tableId in response");return{executionId:a,tableId:n,variantId:l.id}})))}const X=async({req:e,res:t,token:i,dashboardService:s,reportingService:r})=>{const{definitionsPath:o,dpdPathFromQuery:l}=D.default.getValues(t),{reportId:c,id:a,type:n}=e.body;let d,u,p,R,m,y=[];n===f.ReportType.REPORT&&(m=await r.getDefinition(i,c,a,o),d=m?.variant.specification?.fields||[],u=x.default.setQueryFromFilters(e,d),{executionId:p,tableId:R}=await r.requestAsyncReport(i,c,a,{...u.query,dataProductDefinitionsPath:o}),y=m.variant.childVariants??[]),n===f.ReportType.DASHBOARD&&(m=await s.getDefinition(i,c,a,o),d=m?.filterFields||[],u=x.default.setQueryFromFilters(e,d),{executionId:p,tableId:R}=await s.requestAsyncDashboard(i,c,a,{...u.query,dataProductDefinitionsPath:o}));const S=await W(y,r,i,c,u,o);return{executionData:{executionId:p,tableId:R,...l&&{dataProductDefinitionsPath:o}},childExecutionData:S,queryData:u}},Y=async({token:e,reportId:t,definitionPath:i,services:s,definition:r})=>{const c=(await s.reportingService.getDefinitions(e,i)).find(p=>p.id===t)?.name,{name:a,description:n,sections:d,filterFields:u}=r;return{reportName:c,name:a,description:n,sections:d||[],fields:u||[]}},Z=async e=>({definition:e,reportName:e.name,name:e.variant.name,description:e.variant.description||e.description,template:e.variant.specification,fields:e?.variant?.specification?.fields||[],interactive:e?.variant?.interactive}),Q=async(e,t,i,s)=>{const{token:r,definitionsPath:o}=D.default.getValues(t),{reportId:l,id:c,variantId:a,type:n}=e.params;return await(n===f.ReportType.REPORT?s.reportingService:s.dashboardService).getDefinition(r,l,a||c,o)},ee=async(e,t,i,s,r,o)=>{const{reportId:l,id:c}=e.params;let a=await x.default.renderFilters(i,s);a.filters=P.default.setUserContextDefaults(t,a.filters);let n;return t.locals.saveDefaultsEnabled&&(n=await r.defaultFilterValuesService.get(o,l,c,C.FiltersType.REQUEST)),n&&(a=P.default.setFilterValuesFromSavedDefaults(a.filters,a.sortBy||[],n)),a.filters=U.default.setFilterValuesFromRequest(a.filters,e),{filtersData:a,defaultFilterValues:n}},B=async({req:e,res:t,services:i})=>{const{token:s}=D.default.getValues(t),r={req:e,res:t,token:s},{executionData:o,queryData:l,childExecutionData:c}=await X({...r,dashboardService:i.dashboardService,reportingService:i.reportingService});return o&&await O({req:e,res:t,services:i,queryData:l,executionData:o,childExecutionData:c}),o},N=async({req:e,res:t,services:i})=>{const{token:s,dprUser:r,definitionsPath:o}=D.default.getValues(t),{reportId:l,id:c,executionId:a,type:n}=e.params;let d=i.reportingService;n===f.ReportType.REPORT&&(d=i.reportingService),n===f.ReportType.DASHBOARD&&(d=i.dashboardService);const u=await d.cancelAsyncRequest(s,l,c,a,o);u&&u.cancellationSucceeded&&await i.requestedReportService.updateStatus(a,r.id,f.RequestStatus.ABORTED)},k=async({req:e,res:t,services:i,next:s})=>{try{const{token:r,csrfToken:o,definitionsPath:l,dpdPathFromQuery:c,dprUser:a}=D.default.getValues(t),{reportId:n,type:d,id:u}=e.params,{definition:p}=t.locals,R=e.query.defaultsSaved,m={token:r,reportId:n,definitionPath:l,services:i};let y,S,v,M,F=[],w,A,I,b=[];if(d===f.ReportType.REPORT&&({name:y,reportName:S,description:v,fields:F,interactive:A}=await Z(p)),d===f.ReportType.DASHBOARD&&({name:y,reportName:S,description:v,sections:w,fields:F}=await Y({...m,definition:p})),F){const V=await ee(e,t,F,A||!1,i,a.id);b=V.defaultFilterValues||b,I=V.filtersData}const _={reportName:S,name:y,description:v,reportId:n,id:u,...c&&{definitionPath:l},csrfToken:o,template:M,sections:w,hasDefaults:b?.length>0,defaultsSaved:R,type:d,saveDefaultsEnabled:t.locals.saveDefaultsEnabled};return{title:`Request ${d}`,filtersDescription:`Customise your ${d} using the filters below and submit your request.`,filtersData:I,reportData:_}}catch(r){return s(r),!1}},H=e=>Object.keys(e.body).filter(t=>t.includes("filters.")).filter(t=>!!e.body[t]).map(t=>({name:t,value:e.body[t]}));var te={request:B,cancelRequest:N,renderRequest:k,getFiltersFromReqBody:H,getDefintionByType:Q};0&&(module.exports={cancelRequest,getDefintionByType,getFiltersFromReqBody,renderRequest,request,updateStore});
+"use strict";var $=Object.create;var g=Object.defineProperty;var j=Object.getOwnPropertyDescriptor;var J=Object.getOwnPropertyNames;var L=Object.getPrototypeOf,z=Object.prototype.hasOwnProperty;var G=(e,t)=>{for(var r in t)g(e,r,{get:t[r],enumerable:!0})},T=(e,t,r,s)=>{if(t&&typeof t=="object"||typeof t=="function")for(let i of J(t))!z.call(e,i)&&i!==r&&g(e,i,{get:()=>t[i],enumerable:!(s=j(t,i))||s.enumerable});return e};var h=(e,t,r)=>(r=e!=null?$(L(e)):{},T(t||!e||!e.__esModule?g(r,"default",{value:e,enumerable:!0}):r,e)),K=e=>T(g({},"__esModule",{value:!0}),e);var re={};G(re,{cancelRequest:()=>N,default:()=>te,getDefintionByType:()=>Q,getFiltersFromReqBody:()=>H,renderRequest:()=>k,request:()=>B,updateStore:()=>O});module.exports=K(re);var x=h(require("../../../../components/_async/async-filters-form/utils")),D=h(require("../../../../utils/localsHelper")),U=h(require("../../../../components/_filters/utils")),q=require("../../../../utils/reportStoreHelper"),E=h(require("../../../../utils/UserStoreItemBuilder")),f=require("../../../../types/UserReports"),w=h(require("../../../../utils/Personalisation/personalisationUtils")),C=require("../../../../components/_filters/filtersTypeEnum");const O=async({req:e,res:t,services:r,queryData:s,executionData:i,childExecutionData:o})=>{const{search:l,id:d,type:a}=e.body,{dprUser:n,definitionsPath:c,dpdPathFromQuery:u}=D.default.getValues(t);await(0,q.removeDuplicates)({storeService:r.requestedReportService,userId:n.id,id:d,search:l}),await(0,q.removeDuplicates)({storeService:r.recentlyViewedService,userId:n.id,id:d,search:l});const p=e.body,R={type:p.type,reportId:p.reportId,reportName:p.reportName,description:p.description,id:p.id,name:p.name};let m;switch(a){case f.ReportType.REPORT:m=new E.default(R,p).addExecutionData(i).addChildExecutionData(o).addFilters(s?.filterData).addSortData(s?.sortData).addDefinitionsPath(c,u).addRequestUrls(e).addQuery(s).addStatus(f.RequestStatus.SUBMITTED).addTimestamp().build();break;case f.ReportType.DASHBOARD:{m=new E.default(R,p).addExecutionData(i).addChildExecutionData(o).addFilters(s?.filterData).addDefinitionsPath(c,u).addRequestUrls(e).addQuery(s).addStatus(f.RequestStatus.SUBMITTED).addTimestamp().addMetrics(JSON.parse(e.body.sections)).build();break}default:break}m&&await r.requestedReportService.addReport(n.id,m)};async function W(e,t,r,s,i,o){return Promise.all(e.map(l=>t.requestAsyncReport(r,s,l.id,{...i&&i.query,...o&&{dataProductDefinitionsPath:o}}).then(d=>{const{executionId:a,tableId:n}=d;if(!a||!n)throw new Error("requestChildReports: No execution of tableId in response");return{executionId:a,tableId:n,variantId:l.id}})))}const X=async({req:e,res:t,token:r,dashboardService:s,reportingService:i})=>{const{definitionsPath:o,dpdPathFromQuery:l}=D.default.getValues(t),{reportId:d,id:a,type:n}=e.body;let c,u,p,R,m,y=[];n===f.ReportType.REPORT&&(m=await i.getDefinition(r,d,a,o),c=m?.variant.specification?.fields||[],u=x.default.setQueryFromFilters(e,c),{executionId:p,tableId:R}=await i.requestAsyncReport(r,d,a,{...u.query,dataProductDefinitionsPath:o}),y=m.variant.childVariants??[]),n===f.ReportType.DASHBOARD&&(m=await s.getDefinition(r,d,a,o),c=m?.filterFields||[],u=x.default.setQueryFromFilters(e,c),{executionId:p,tableId:R}=await s.requestAsyncDashboard(r,d,a,{...u.query,dataProductDefinitionsPath:o}));const S=await W(y,i,r,d,u,o);return{executionData:{executionId:p,tableId:R,...l&&{dataProductDefinitionsPath:o}},childExecutionData:S,queryData:u}},Y=async({token:e,reportId:t,definitionPath:r,services:s,definition:i})=>{const d=(await s.reportingService.getDefinitions(e,r)).find(p=>p.id===t)?.name,{name:a,description:n,sections:c,filterFields:u}=i;return{reportName:d,name:a,description:n,sections:c||[],fields:u||[]}},Z=async e=>({definition:e,reportName:e.name,name:e.variant.name,description:e.variant.description||e.description,template:e.variant.specification,fields:e?.variant?.specification?.fields||[],interactive:e?.variant?.interactive}),Q=async(e,t,r,s)=>{const{token:i,definitionsPath:o}=D.default.getValues(t),{reportId:l,id:d,variantId:a,type:n}=e.params;return await(n===f.ReportType.REPORT?s.reportingService:s.dashboardService).getDefinition(i,l,a||d,o)},ee=async(e,t,r,s,i,o)=>{const{reportId:l,id:d}=e.params;let a=await x.default.renderFilters(r,s);a.filters=w.default.setUserContextDefaults(t,a.filters);let n;return t.locals.saveDefaultsEnabled&&(n=await i.defaultFilterValuesService.get(o,l,d,C.FiltersType.REQUEST)),n&&(a=w.default.setFilterValuesFromSavedDefaults(a.filters,a.sortBy||[],n)),a.filters=U.default.setFilterValuesFromRequest(a.filters,e),{filtersData:a,defaultFilterValues:n}},B=async({req:e,res:t,services:r})=>{const{token:s}=D.default.getValues(t),i={req:e,res:t,token:s},{executionData:o,queryData:l,childExecutionData:d}=await X({...i,dashboardService:r.dashboardService,reportingService:r.reportingService});if(o.executionId&&o.tableId)await O({req:e,res:t,services:r,queryData:l,executionData:o,childExecutionData:d});else throw new Error("No execution data returned");return o},N=async({req:e,res:t,services:r})=>{const{token:s,dprUser:i,definitionsPath:o}=D.default.getValues(t),{reportId:l,id:d,executionId:a,type:n}=e.params;let c=r.reportingService;n===f.ReportType.REPORT&&(c=r.reportingService),n===f.ReportType.DASHBOARD&&(c=r.dashboardService);const u=await c.cancelAsyncRequest(s,l,d,a,o);u&&u.cancellationSucceeded&&await r.requestedReportService.updateStatus(a,i.id,f.RequestStatus.ABORTED)},k=async({req:e,res:t,services:r,next:s})=>{try{const{token:i,csrfToken:o,definitionsPath:l,dpdPathFromQuery:d,dprUser:a}=D.default.getValues(t),{reportId:n,type:c,id:u}=e.params,{definition:p}=t.locals,R=e.query.defaultsSaved,m={token:i,reportId:n,definitionPath:l,services:r};let y,S,v,M,F=[],P,A,I,b=[];if(c===f.ReportType.REPORT&&({name:y,reportName:S,description:v,fields:F,interactive:A}=await Z(p)),c===f.ReportType.DASHBOARD&&({name:y,reportName:S,description:v,sections:P,fields:F}=await Y({...m,definition:p})),F){const V=await ee(e,t,F,A||!1,r,a.id);b=V.defaultFilterValues||b,I=V.filtersData}const _={reportName:S,name:y,description:v,reportId:n,id:u,...d&&{definitionPath:l},csrfToken:o,template:M,sections:P,hasDefaults:b?.length>0,defaultsSaved:R,type:c,saveDefaultsEnabled:t.locals.saveDefaultsEnabled};return{title:`Request ${c}`,filtersDescription:`Customise your ${c} using the filters below and submit your request.`,filtersData:I,reportData:_}}catch(i){return s(i),!1}},H=e=>Object.keys(e.body).filter(t=>t.includes("filters.")).filter(t=>!!e.body[t]).map(t=>({name:t,value:e.body[t]}));var te={request:B,cancelRequest:N,renderRequest:k,getFiltersFromReqBody:H,getDefintionByType:Q};0&&(module.exports={cancelRequest,getDefintionByType,getFiltersFromReqBody,renderRequest,request,updateStore});
 //# sourceMappingURL=utils.js.map