npm - @ministryofjustice/hmpps-digital-prison-reporting-frontend - Versions diffs - 4.25.0 → 4.26.0 - Mend

@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.25.0 → 4.26.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (144) hide show

package/dpr/data/restClient.js CHANGED Viewed

@@ -1,2 +1,2 @@
-"use strict";var w=Object.create;var l=Object.defineProperty;var T=Object.getOwnPropertyDescriptor;var b=Object.getOwnPropertyNames;var E=Object.getPrototypeOf,W=Object.prototype.hasOwnProperty;var q=(r,e)=>{for(var t in e)l(r,t,{get:e[t],enumerable:!0})},R=(r,e,t,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of b(e))!W.call(r,i)&&i!==t&&l(r,i,{get:()=>e[i],enumerable:!(a=T(e,i))||a.enumerable});return r};var f=(r,e,t)=>(t=r!=null?w(E(r)):{},R(e||!r||!r.__esModule?l(t,"default",{value:r,enumerable:!0}):t,r)),C=r=>R(l({},"__esModule",{value:!0}),r);var v={};q(v,{RestClient:()=>m,default:()=>P});module.exports=C(v);var c=f(require("superagent")),$=f(require("agentkeepalive")),o=f(require("../utils/logger")),y=f(require("../utils/sanitisedError"));class m{constructor(e,t){this.name=e;this.config=t;this.agent=t.url.startsWith("https")?new $.HttpsAgent(t.agent):new $.default(t.agent)}apiUrl(){return this.config.url}timeoutConfig(){return this.config.agent.timeout}async get(e){return this.getWithHeaders(e).then(t=>t.data)}async requestWithBody(e,{path:t,query:a={},headers:i={},responseType:g="",data:u={},raw:p=!1,retry:n=!1},s){o.default.info(`${this.name} ${e.toUpperCase()}: ${t}`),o.default.info(`info about request: ${e} | ${t} | ${JSON.stringify(u)} | ${a}`);try{const h=await c.default[e](`${this.apiUrl()}${t}`).query(a).send(u).agent(this.agent).retry(2,d=>{if(n===!1)return!1;d&&o.default.info(`Retry handler found API error with ${d.code} ${d.message}`)}).auth(s,{type:"bearer"}).set(i).responseType(g).timeout(this.timeoutConfig());return p?h:h.body}catch(h){if(!(h instanceof Error))throw h;const d=(0,y.default)(h);throw o.default.warn({...d},`Error calling ${this.name}, path: '${t}', verb: '${e.toUpperCase()}'`),d}}async post(e,t){return this.requestWithBody("post",e,t)}async getWithHeaders({path:e="",query:t={},headers:a={},responseType:i="",raw:g=!1,token:u}){const p={path:`${this.config.url}${e}`,query:t};o.default.info(`${this.name}: ${JSON.stringify(p,null,2)}`);try{const n=await c.default.get(`${this.apiUrl()}${e}`).agent(this.agent).retry(2,s=>{s&&o.default.info(`Retry handler found API error with ${s.code} ${s.message}`)}).query(t).auth(u,{type:"bearer"}).set(a).responseType(i).timeout(this.timeoutConfig());return{data:g?n:n.body,headers:n.headers}}catch(n){const s=(0,y.default)(n);throw o.default.warn({...s,query:t},`Error calling ${this.name}, path: '${e}', verb: 'GET'`),s}}async deleteWithHeaders({path:e="",query:t={},headers:a={},responseType:i="",raw:g=!1,token:u}){const p={path:`${this.config.url}${e}`,query:t};o.default.info(`${this.name}: ${JSON.stringify(p,null,2)}`);try{const n=await c.default.delete(`${this.apiUrl()}${e}`).agent(this.agent).retry(2,s=>{s&&o.default.info(`Retry handler found API error with ${s.code} ${s.message}`)}).query(t).auth(u,{type:"bearer"}).set(a).responseType(i).timeout(this.timeoutConfig());return{data:g?n:n.body,headers:n.headers}}catch(n){const s=(0,y.default)(n);throw o.default.warn({...s,query:t},`Error calling ${this.name}, path: '${e}', verb: 'GET'`),s}}async delete(e){return this.deleteWithHeaders(e).then(t=>t.data)}}var P=m;0&&(module.exports={RestClient});
+"use strict";var w=Object.create;var l=Object.defineProperty;var T=Object.getOwnPropertyDescriptor;var b=Object.getOwnPropertyNames;var E=Object.getPrototypeOf,W=Object.prototype.hasOwnProperty;var q=(r,e)=>{for(var t in e)l(r,t,{get:e[t],enumerable:!0})},R=(r,e,t,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of b(e))!W.call(r,i)&&i!==t&&l(r,i,{get:()=>e[i],enumerable:!(a=T(e,i))||a.enumerable});return r};var f=(r,e,t)=>(t=r!=null?w(E(r)):{},R(e||!r||!r.__esModule?l(t,"default",{value:r,enumerable:!0}):t,r)),C=r=>R(l({},"__esModule",{value:!0}),r);var v={};q(v,{RestClient:()=>m,default:()=>P});module.exports=C(v);var c=f(require("superagent")),$=f(require("agentkeepalive")),o=f(require("../utils/logger")),y=f(require("../utils/sanitisedError"));class m{constructor(e,t){this.name=e;this.config=t;this.agent=t.url.startsWith("https")?new $.HttpsAgent(t.agent):new $.default(t.agent)}agent;apiUrl(){return this.config.url}timeoutConfig(){return this.config.agent.timeout}async get(e){return this.getWithHeaders(e).then(t=>t.data)}async requestWithBody(e,{path:t,query:a={},headers:i={},responseType:g="",data:u={},raw:p=!1,retry:n=!1},s){o.default.info(`${this.name} ${e.toUpperCase()}: ${t}`),o.default.info(`info about request: ${e} | ${t} | ${JSON.stringify(u)} | ${a}`);try{const h=await c.default[e](`${this.apiUrl()}${t}`).query(a).send(u).agent(this.agent).retry(2,d=>{if(n===!1)return!1;d&&o.default.info(`Retry handler found API error with ${d.code} ${d.message}`)}).auth(s,{type:"bearer"}).set(i).responseType(g).timeout(this.timeoutConfig());return p?h:h.body}catch(h){if(!(h instanceof Error))throw h;const d=(0,y.default)(h);throw o.default.warn({...d},`Error calling ${this.name}, path: '${t}', verb: '${e.toUpperCase()}'`),d}}async post(e,t){return this.requestWithBody("post",e,t)}async getWithHeaders({path:e="",query:t={},headers:a={},responseType:i="",raw:g=!1,token:u}){const p={path:`${this.config.url}${e}`,query:t};o.default.info(`${this.name}: ${JSON.stringify(p,null,2)}`);try{const n=await c.default.get(`${this.apiUrl()}${e}`).agent(this.agent).retry(2,s=>{s&&o.default.info(`Retry handler found API error with ${s.code} ${s.message}`)}).query(t).auth(u,{type:"bearer"}).set(a).responseType(i).timeout(this.timeoutConfig());return{data:g?n:n.body,headers:n.headers}}catch(n){const s=(0,y.default)(n);throw o.default.warn({...s,query:t},`Error calling ${this.name}, path: '${e}', verb: 'GET'`),s}}async deleteWithHeaders({path:e="",query:t={},headers:a={},responseType:i="",raw:g=!1,token:u}){const p={path:`${this.config.url}${e}`,query:t};o.default.info(`${this.name}: ${JSON.stringify(p,null,2)}`);try{const n=await c.default.delete(`${this.apiUrl()}${e}`).agent(this.agent).retry(2,s=>{s&&o.default.info(`Retry handler found API error with ${s.code} ${s.message}`)}).query(t).auth(u,{type:"bearer"}).set(a).responseType(i).timeout(this.timeoutConfig());return{data:g?n:n.body,headers:n.headers}}catch(n){const s=(0,y.default)(n);throw o.default.warn({...s,query:t},`Error calling ${this.name}, path: '${e}', verb: 'GET'`),s}}async delete(e){return this.deleteWithHeaders(e).then(t=>t.data)}}var P=m;0&&(module.exports={RestClient});
 //# sourceMappingURL=restClient.js.map

package/dpr/data/restClient.js.map CHANGED Viewed

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/dpr/data/restClient.ts"],
   "sourcesContent": ["import superagent, { ResponseError } from 'superagent'\nimport Agent, { HttpsAgent } from 'agentkeepalive'\n\nimport logger from '../utils/logger'\nimport sanitiseError from '../utils/sanitisedError'\nimport { ApiConfig, GetRequest } from './types'\nimport Dict = NodeJS.Dict\n\nexport interface ResultWithHeaders<T> {\n  data: T\n  headers: Dict<string>\n}\n\ninterface Request {\n  path: string\n  query?: object | string\n  headers?: Record<string, string>\n  responseType?: string\n  raw?: boolean\n}\ninterface RequestWithBody extends Request {\n  data?: Record<string, unknown> | string\n  retry?: boolean\n}\n\nclass RestClient {\n  agent: Agent\n\n  constructor(private readonly name: string, private readonly config: ApiConfig) {\n    this.agent = config.url.startsWith('https') ? new HttpsAgent(config.agent) : new Agent(config.agent)\n  }\n\n  private apiUrl() {\n    return this.config.url\n  }\n\n  private timeoutConfig() {\n    return this.config.agent.timeout\n  }\n\n  async get<T>(request: GetRequest): Promise<T> {\n    return this.getWithHeaders<T>(request).then((result) => result.data)\n  }\n\n  private async requestWithBody<Response = unknown>(\n    method: 'patch' | 'post' | 'put',\n    { path, query = {}, headers = {}, responseType = '', data = {}, raw = false, retry = false }: RequestWithBody,\n    token: string,\n  ): Promise<Response> {\n    logger.info(`${this.name} ${method.toUpperCase()}: ${path}`)\n    logger.info(`info about request: ${method} | ${path} | ${JSON.stringify(data)} | ${query}`)\n    try {\n      const result = await superagent[method](`${this.apiUrl()}${path}`)\n        .query(query)\n        .send(data)\n        .agent(this.agent)\n        .retry(2, (err) => {\n          if (retry === false) {\n            return false\n          }\n          if (err) logger.info(`Retry handler found API error with ${err.code} ${err.message}`)\n          return undefined // retry handler only for logging retries, not to influence retry logic\n        })\n        .auth(token, { type: 'bearer' })\n        .set(headers)\n        .responseType(responseType)\n        .timeout(this.timeoutConfig())\n\n      return raw ? (result as Response) : result.body\n    } catch (error) {\n      if (!(error instanceof Error)) {\n        throw error\n      }\n      const sanitisedError = sanitiseError(error)\n      logger.warn({ ...sanitisedError }, `Error calling ${this.name}, path: '${path}', verb: '${method.toUpperCase()}'`)\n      throw sanitisedError\n    }\n  }\n\n  async post<Response = unknown>(request: RequestWithBody, token: string): Promise<Response> {\n    return this.requestWithBody('post', request, token)\n  }\n\n  async getWithHeaders<T>({\n    path = '',\n    query = {},\n    headers = {},\n    responseType = '',\n    raw = false,\n    token,\n  }: GetRequest): Promise<ResultWithHeaders<T>> {\n    const loggerData = {\n      path: `${this.config.url}${path}`,\n      query,\n    }\n    logger.info(`${this.name}: ${JSON.stringify(loggerData, null, 2)}`)\n    try {\n      const result = await superagent\n        .get(`${this.apiUrl()}${path}`)\n        .agent(this.agent)\n        .retry(2, (err) => {\n          if (err) logger.info(`Retry handler found API error with ${err.code} ${err.message}`)\n          return undefined // retry handler only for logging retries, not to influence retry logic\n        })\n        .query(query)\n        .auth(token, { type: 'bearer' })\n        .set(headers)\n        .responseType(responseType)\n        .timeout(this.timeoutConfig())\n\n      return {\n        data: raw ? result : result.body,\n        headers: result.headers,\n      }\n    } catch (error) {\n      const sanitisedError = sanitiseError(<ResponseError>error)\n      logger.warn({ ...sanitisedError, query }, `Error calling ${this.name}, path: '${path}', verb: 'GET'`)\n      throw sanitisedError\n    }\n  }\n\n  async deleteWithHeaders<T>({\n    path = '',\n    query = {},\n    headers = {},\n    responseType = '',\n    raw = false,\n    token,\n  }: GetRequest): Promise<ResultWithHeaders<T>> {\n    const loggerData = {\n      path: `${this.config.url}${path}`,\n      query,\n    }\n    logger.info(`${this.name}: ${JSON.stringify(loggerData, null, 2)}`)\n    try {\n      const result = await superagent\n        .delete(`${this.apiUrl()}${path}`)\n        .agent(this.agent)\n        .retry(2, (err) => {\n          if (err) logger.info(`Retry handler found API error with ${err.code} ${err.message}`)\n          return undefined // retry handler only for logging retries, not to influence retry logic\n        })\n        .query(query)\n        .auth(token, { type: 'bearer' })\n        .set(headers)\n        .responseType(responseType)\n        .timeout(this.timeoutConfig())\n\n      return {\n        data: raw ? result : result.body,\n        headers: result.headers,\n      }\n    } catch (error) {\n      const sanitisedError = sanitiseError(<ResponseError>error)\n      logger.warn({ ...sanitisedError, query }, `Error calling ${this.name}, path: '${path}', verb: 'GET'`)\n      throw sanitisedError\n    }\n  }\n\n  async delete<T>(request: GetRequest): Promise<T> {\n    return this.deleteWithHeaders<T>(request).then((result) => result.data)\n  }\n}\n\nexport { RestClient }\nexport default RestClient\n"],
-  "mappings": "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",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,gBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAA0C,yBAC1CC,EAAkC,6BAElCC,EAAmB,8BACnBC,EAA0B,sCAqB1B,MAAMN,CAAW,CAGf,YAA6BO,EAA+BC,EAAmB,CAAlD,UAAAD,EAA+B,YAAAC,EAC1D,KAAK,MAAQA,EAAO,IAAI,WAAW,OAAO,EAAI,IAAI,aAAWA,EAAO,KAAK,EAAI,IAAI,EAAAC,QAAMD,EAAO,KAAK,CACrG,CAJA,MAMQ,QAAS,CACf,OAAO,KAAK,OAAO,GACrB,CAEQ,eAAgB,CACtB,OAAO,KAAK,OAAO,MAAM,OAC3B,CAEA,MAAM,IAAOE,EAAiC,CAC5C,OAAO,KAAK,eAAkBA,CAAO,EAAE,KAAMC,GAAWA,EAAO,IAAI,CACrE,CAEA,MAAc,gBACZC,EACA,CAAE,KAAAC,EAAM,MAAAC,EAAQ,CAAC,EAAG,QAAAC,EAAU,CAAC,EAAG,aAAAC,EAAe,GAAI,KAAAC,EAAO,CAAC,EAAG,IAAAC,EAAM,GAAO,MAAAC,EAAQ,EAAM,EAC3FC,EACmB,CACnB,EAAAC,QAAO,KAAK,GAAG,KAAK,IAAI,IAAIT,EAAO,YAAY,CAAC,KAAKC,CAAI,EAAE,EAC3D,EAAAQ,QAAO,KAAK,uBAAuBT,CAAM,MAAMC,CAAI,MAAM,KAAK,UAAUI,CAAI,CAAC,MAAMH,CAAK,EAAE,EAC1F,GAAI,CACF,MAAMH,EAAS,MAAM,EAAAW,QAAWV,CAAM,EAAE,GAAG,KAAK,OAAO,CAAC,GAAGC,CAAI,EAAE,EAC9D,MAAMC,CAAK,EACX,KAAKG,CAAI,EACT,MAAM,KAAK,KAAK,EAChB,MAAM,EAAIM,GAAQ,CACjB,GAAIJ,IAAU,GACZ,MAAO,GAELI,GAAK,EAAAF,QAAO,KAAK,sCAAsCE,EAAI,IAAI,IAAIA,EAAI,OAAO,EAAE,CAEtF,CAAC,EACA,KAAKH,EAAO,CAAE,KAAM,QAAS,CAAC,EAC9B,IAAIL,CAAO,EACX,aAAaC,CAAY,EACzB,QAAQ,KAAK,cAAc,CAAC,EAE/B,OAAOE,EAAOP,EAAsBA,EAAO,IAC7C,OAASa,EAAO,CACd,GAAI,EAAEA,aAAiB,OACrB,MAAMA,EAER,MAAMC,KAAiB,EAAAC,SAAcF,CAAK,EAC1C,QAAAH,QAAO,KAAK,CAAE,GAAGI,CAAe,EAAG,iBAAiB,KAAK,IAAI,YAAYZ,CAAI,aAAaD,EAAO,YAAY,CAAC,GAAG,EAC3Ga,CACR,CACF,CAEA,MAAM,KAAyBf,EAA0BU,EAAkC,CACzF,OAAO,KAAK,gBAAgB,OAAQV,EAASU,CAAK,CACpD,CAEA,MAAM,eAAkB,CACtB,KAAAP,EAAO,GACP,MAAAC,EAAQ,CAAC,EACT,QAAAC,EAAU,CAAC,EACX,aAAAC,EAAe,GACf,IAAAE,EAAM,GACN,MAAAE,CACF,EAA8C,CAC5C,MAAMO,EAAa,CACjB,KAAM,GAAG,KAAK,OAAO,GAAG,GAAGd,CAAI,GAC/B,MAAAC,CACF,EACA,EAAAO,QAAO,KAAK,GAAG,KAAK,IAAI,KAAK,KAAK,UAAUM,EAAY,KAAM,CAAC,CAAC,EAAE,EAClE,GAAI,CACF,MAAMhB,EAAS,MAAM,EAAAW,QAClB,IAAI,GAAG,KAAK,OAAO,CAAC,GAAGT,CAAI,EAAE,EAC7B,MAAM,KAAK,KAAK,EAChB,MAAM,EAAIU,GAAQ,CACbA,GAAK,EAAAF,QAAO,KAAK,sCAAsCE,EAAI,IAAI,IAAIA,EAAI,OAAO,EAAE,CAEtF,CAAC,EACA,MAAMT,CAAK,EACX,KAAKM,EAAO,CAAE,KAAM,QAAS,CAAC,EAC9B,IAAIL,CAAO,EACX,aAAaC,CAAY,EACzB,QAAQ,KAAK,cAAc,CAAC,EAE/B,MAAO,CACL,KAAME,EAAMP,EAASA,EAAO,KAC5B,QAASA,EAAO,OAClB,CACF,OAASa,EAAO,CACd,MAAMC,KAAiB,EAAAC,SAA6BF,CAAK,EACzD,QAAAH,QAAO,KAAK,CAAE,GAAGI,EAAgB,MAAAX,CAAM,EAAG,iBAAiB,KAAK,IAAI,YAAYD,CAAI,gBAAgB,EAC9FY,CACR,CACF,CAEA,MAAM,kBAAqB,CACzB,KAAAZ,EAAO,GACP,MAAAC,EAAQ,CAAC,EACT,QAAAC,EAAU,CAAC,EACX,aAAAC,EAAe,GACf,IAAAE,EAAM,GACN,MAAAE,CACF,EAA8C,CAC5C,MAAMO,EAAa,CACjB,KAAM,GAAG,KAAK,OAAO,GAAG,GAAGd,CAAI,GAC/B,MAAAC,CACF,EACA,EAAAO,QAAO,KAAK,GAAG,KAAK,IAAI,KAAK,KAAK,UAAUM,EAAY,KAAM,CAAC,CAAC,EAAE,EAClE,GAAI,CACF,MAAMhB,EAAS,MAAM,EAAAW,QAClB,OAAO,GAAG,KAAK,OAAO,CAAC,GAAGT,CAAI,EAAE,EAChC,MAAM,KAAK,KAAK,EAChB,MAAM,EAAIU,GAAQ,CACbA,GAAK,EAAAF,QAAO,KAAK,sCAAsCE,EAAI,IAAI,IAAIA,EAAI,OAAO,EAAE,CAEtF,CAAC,EACA,MAAMT,CAAK,EACX,KAAKM,EAAO,CAAE,KAAM,QAAS,CAAC,EAC9B,IAAIL,CAAO,EACX,aAAaC,CAAY,EACzB,QAAQ,KAAK,cAAc,CAAC,EAE/B,MAAO,CACL,KAAME,EAAMP,EAASA,EAAO,KAC5B,QAASA,EAAO,OAClB,CACF,OAASa,EAAO,CACd,MAAMC,KAAiB,EAAAC,SAA6BF,CAAK,EACzD,QAAAH,QAAO,KAAK,CAAE,GAAGI,EAAgB,MAAAX,CAAM,EAAG,iBAAiB,KAAK,IAAI,YAAYD,CAAI,gBAAgB,EAC9FY,CACR,CACF,CAEA,MAAM,OAAUf,EAAiC,CAC/C,OAAO,KAAK,kBAAqBA,CAAO,EAAE,KAAMC,GAAWA,EAAO,IAAI,CACxE,CACF,CAGA,IAAOV,EAAQD",
   "names": ["restClient_exports", "__export", "RestClient", "restClient_default", "__toCommonJS", "import_superagent", "import_agentkeepalive", "import_logger", "import_sanitisedError", "name", "config", "Agent", "request", "result", "method", "path", "query", "headers", "responseType", "data", "raw", "retry", "token", "logger", "superagent", "err", "error", "sanitisedError", "sanitiseError", "loggerData"]
 }

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

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

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../src/dpr/routes/journeys/download-report/controller.ts"],
   "sourcesContent": ["import { RequestHandler } from 'express'\nimport LocalsHelper from '../../../utils/localsHelper'\nimport DownloadUtils from './utils'\nimport { Services } from '../../../types/Services'\n\nclass DownloadReportController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  POST: RequestHandler = async (req, res) => {\n    const { dprUser } = LocalsHelper.getValues(res)\n    const { reportId, id, loadType, currentUrl, currentQueryParams } = req.body\n\n    let redirect = `${currentUrl}/download-disabled`\n    redirect = currentQueryParams ? `${redirect}${currentQueryParams}` : redirect\n\n    const canDownloadReport = await this.services.downloadPermissionService.downloadEnabledForReport(\n      dprUser.id,\n      reportId,\n      id,\n    )\n\n    if (canDownloadReport) {\n      await DownloadUtils.downloadReport({ req, res, services: this.services, redirect, loadType })\n    } else {\n      res.redirect(redirect)\n    }\n  }\n}\n\nexport { DownloadReportController }\nexport default DownloadReportController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,8BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,0CACzBC,EAA0B,sBAG1B,MAAMJ,CAAyB,CAK7B,YAAYK,EAAoBC,EAAoB,CAKpD,UAAuB,MAAOC,EAAKC,IAAQ,CACzC,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUF,CAAG,EACxC,CAAE,SAAAG,EAAU,GAAAC,EAAI,SAAAC,EAAU,WAAAC,EAAY,mBAAAC,CAAmB,EAAIR,EAAI,KAEvE,IAAIS,EAAW,GAAGF,CAAU,qBAC5BE,EAAWD,EAAqB,GAAGC,CAAQ,GAAGD,CAAkB,GAAKC,EAE3C,MAAM,KAAK,SAAS,0BAA0B,yBACtEP,EAAQ,GACRE,EACAC,CACF,EAGE,MAAM,EAAAK,QAAc,eAAe,CAAE,IAAAV,EAAK,IAAAC,EAAK,SAAU,KAAK,SAAU,SAAAQ,EAAU,SAAAH,CAAS,CAAC,EAE5FL,EAAI,SAASQ,CAAQ,CAEzB,EAtBE,KAAK,WAAaX,EAClB,KAAK,SAAWC,CAClB,CAqBF,CAGA,IAAOL,EAAQD",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,8BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,0CACzBC,EAA0B,sBAG1B,MAAMJ,CAAyB,CAC7B,WAEA,SAEA,YAAYK,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAEA,KAAuB,MAAOC,EAAKC,IAAQ,CACzC,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUF,CAAG,EACxC,CAAE,SAAAG,EAAU,GAAAC,EAAI,SAAAC,EAAU,WAAAC,EAAY,mBAAAC,CAAmB,EAAIR,EAAI,KAEvE,IAAIS,EAAW,GAAGF,CAAU,qBAC5BE,EAAWD,EAAqB,GAAGC,CAAQ,GAAGD,CAAkB,GAAKC,EAE3C,MAAM,KAAK,SAAS,0BAA0B,yBACtEP,EAAQ,GACRE,EACAC,CACF,EAGE,MAAM,EAAAK,QAAc,eAAe,CAAE,IAAAV,EAAK,IAAAC,EAAK,SAAU,KAAK,SAAU,SAAAQ,EAAU,SAAAH,CAAS,CAAC,EAE5FL,EAAI,SAASQ,CAAQ,CAEzB,CACF,CAGA,IAAOf,EAAQD",
   "names": ["controller_exports", "__export", "DownloadReportController", "controller_default", "__toCommonJS", "import_localsHelper", "import_utils", "layoutPath", "services", "req", "res", "dprUser", "LocalsHelper", "reportId", "id", "loadType", "currentUrl", "currentQueryParams", "redirect", "DownloadUtils"]
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,2 +1,2 @@
-"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});
+"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{layoutPath;services;constructor(r,o){this.layoutPath=r,this.services=o}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()}}var b=a;0&&(module.exports={BookmarkController});
 //# sourceMappingURL=controller.js.map

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/my-reports/bookmarks/controller.ts"],
   "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../types/Services'\nimport LocalsHelper from '../../../../utils/localsHelper'\n\nclass BookmarkController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  POST: RequestHandler = async (req, res) => {\n    const { dprUser } = LocalsHelper.getValues(res)\n    const { reportId, id, reportType, 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",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,wBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAyB,6CAEzB,MAAMH,CAAmB,CACvB,WAEA,SAEA,YAAYI,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAEA,KAAuB,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,CACF,CAGA,IAAON,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/list/controller.js CHANGED Viewed

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

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

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

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

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

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

@@ -2,6 +2,6 @@
   "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    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    const bookmarkButton = `<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    return automatic || isMissing ? '' : bookmarkButton\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,MAAMY,EAAiB;AAAA,wDAC6BhB,CAAQ,IAAID,CAAE,IAAIW,CAAK,qBAAqBV,CAAQ,cAAcD,CAAE,uBAAuBY,CAAU,sBAAsBF,CAAS,oBAAoBI,CAAa,KAAKE,CAAO;AAAA,4BAC7MhB,CAAE,IAAIC,CAAQ,IAAIU,CAAK,yBAAyBV,CAAQ,IAAID,CAAE,IAAIW,CAAK,mDAAmDI,CAAO;AAAA,WAGzJ,OAAOP,GAAaK,EAAY,GAAKI,CACvC,CACF,CAGA,IAAOxB,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", "bookmarkButton"]
+  "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,CAC/C,QAEA,YAAYC,EAAkCC,EAA4C,CACxF,MAAMD,CAAe,EACrB,KAAK,QAAU,EAAQC,EAAqB,YACvC,KAAK,SAAS,EAAAC,QAAO,KAAK,wBAAwB,CACzD,CAEA,MAAM,gBAAgBC,EAA8C,CAClE,OAAK,KAAK,SAES,MAAM,KAAK,SAASA,CAAM,GAC3B,UAHQ,CAAC,CAI7B,CAEA,MAAM,YACJA,EACAC,EACAC,EACAC,EACAC,EACe,CACf,GAAI,CAAC,KAAK,QAAS,OAEnB,MAAMC,EAAa,MAAM,KAAK,SAASL,CAAM,EACxC,KAAK,kBAAkBK,EAAYH,EAAID,CAAQ,GAClDI,EAAW,UAAU,QAAQ,CAAE,SAAAJ,EAAU,GAAAC,EAAI,KAAAC,EAAM,UAAAC,CAAU,CAAC,EAEhE,MAAM,KAAK,UAAUJ,EAAQK,CAAU,CACzC,CAEA,MAAM,eAAeL,EAAgBE,EAAYD,EAAiC,CAChF,GAAI,CAAC,KAAK,QAAS,OAEnB,MAAMI,EAAa,MAAM,KAAK,SAASL,CAAM,EACvCM,EAAQD,EAAW,UAAU,UAAWE,GAC5BA,EAAS,KACNL,GAAMK,EAAS,WAAaN,CAChD,EACGK,GAAS,GACXD,EAAW,UAAU,OAAOC,EAAO,CAAC,EAEtC,MAAM,KAAK,UAAUN,EAAQK,CAAU,CACzC,CAEA,aAAe,MAAOH,EAAYD,EAAkBD,IAAiD,CACnG,GAAI,CAAC,KAAK,QAAS,MAAO,GAE1B,MAAMK,EAAa,MAAM,KAAK,SAASL,CAAM,EACvCQ,EAAe,KAAK,kBAAkBH,EAAYH,EAAID,CAAQ,EACpE,IAAIM,EACJ,OAAIC,IACFD,EAAW,KAAK,YAAYF,EAAYH,EAAID,CAAQ,GAG/CM,GAAU,UAAY,OAAYC,CAC3C,EAEQ,kBAAoB,CAACH,EAA+BH,EAAYD,IAC/DI,EAAW,UAAU,KAAME,GAChBA,EAAS,KACNL,GAAMK,EAAS,WAAaN,CAChD,EAGK,YAAc,CAACI,EAA+BH,EAAYD,IACzDI,EAAW,UAAU,KAAME,GAChBA,EAAS,KACNL,GAAMK,EAAS,WAAaN,CAChD,EAGH,MAAM,yBAAyB,CAC7B,WAAAI,EACA,SAAAJ,EACA,GAAAC,EACA,UAAAO,EACA,MAAAC,EACA,WAAAC,EACA,UAAAC,EACA,cAAAC,CACF,EASG,CACD,IAAIC,EAAU,eACVV,EAAY,GACZW,EAAU,KAEd,GAAIV,GAAY,UAAW,CACzB,MAAME,EAAW,KAAK,YAAYF,EAAYH,EAAID,CAAQ,EACtDM,IACFQ,EAAU,UACVD,EAAU,kBACVV,EAAY,EAAQG,EAAS,UAEjC,CAEA,MAAMS,EAAiB;AAAA,wDAC6Bf,CAAQ,IAAIC,CAAE,IAAIQ,CAAK,qBAAqBT,CAAQ,cAAcC,CAAE,uBAAuBS,CAAU,sBAAsBF,CAAS,oBAAoBI,CAAa,KAAKE,CAAO;AAAA,4BAC7Mb,CAAE,IAAID,CAAQ,IAAIS,CAAK,yBAAyBT,CAAQ,IAAIC,CAAE,IAAIQ,CAAK,mDAAmDI,CAAO;AAAA,WAGzJ,OAAOV,GAAaQ,EAAY,GAAKI,CACvC,CACF,CAGA,IAAOxB,EAAQD",
+  "names": ["service_exports", "__export", "BookmarkService", "service_default", "__toCommonJS", "import_reportStoreService", "import_logger", "ReportStoreService", "reportDataStore", "serviceFeatureConfig", "logger", "userId", "reportId", "id", "type", "automatic", "userConfig", "index", "bookmark", "isBookmarked", "csrfToken", "ctxId", "reportType", "isMissing", "nestedBaseUrl", "tooltip", "checked", "bookmarkButton"]
 }

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

@@ -1,2 +1,2 @@
-"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.POST=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});
+"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{services;constructor(r){this.services=r}POST=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()}}var f=c;0&&(module.exports={RecentlyViewedReportsController});
 //# sourceMappingURL=controller.js.map

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

@@ -2,6 +2,6 @@
   "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  POST: 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,UAAuB,MAAOC,EAAKC,IAAQ,CACzC,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",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAyB,6CAEzB,MAAMH,CAAgC,CACpC,SAEA,YAAYI,EAAoB,CAC9B,KAAK,SAAWA,CAClB,CAEA,KAAuB,MAAOC,EAAKC,IAAQ,CACzC,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUF,CAAG,EACxC,CAAE,GAAAG,CAAG,EAAIJ,EAAI,OACnB,MAAM,KAAK,SAAS,sBAAsB,aAAaI,EAAIF,EAAQ,EAAE,EACrE,MAAM,KAAK,SAAS,uBAAuB,aAAaE,EAAIF,EAAQ,EAAE,EACtED,EAAI,IAAI,CACV,CACF,CAGA,IAAOL,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/list/controller.js CHANGED Viewed

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

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/my-reports/recently-viewed/list/controller.ts"],
   "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../../types/Services'\n\nimport RecentReportslistUtils from '../../../../../components/user-reports/viewed/utils'\nimport UserReportsListUtils from '../../../../../components/user-reports/utils'\nimport LocalsHelper from '../../../../../utils/localsHelper'\n\nclass RecentlyViewedReportsListController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  GET: RequestHandler = async (_req, res) => {\n    const { recentlyViewedReports } = LocalsHelper.getValues(res)\n\n    const listParams = await UserReportsListUtils.renderList({\n      reportsData: recentlyViewedReports,\n      filterFunction: RecentReportslistUtils.filterReports,\n      res,\n      type: 'viewed',\n    })\n\n    res.render(`dpr/routes/journeys/my-reports/view`, {\n      title: 'Recently viewed reports',\n      id: 'recently-viewed-reports-list',\n      layoutPath: this.layoutPath,\n      ...listParams,\n    })\n  }\n}\n\nexport { RecentlyViewedReportsListController }\nexport default RecentlyViewedReportsListController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,yCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAGA,IAAAK,EAAmC,kEACnCA,EAAiC,2DACjCC,EAAyB,gDAEzB,MAAMJ,CAAoC,CAKxC,YAAYK,EAAoBC,EAAoB,CAKpD,SAAsB,MAAOC,EAAMC,IAAQ,CACzC,KAAM,CAAE,sBAAAC,CAAsB,EAAI,EAAAC,QAAa,UAAUF,CAAG,EAEtDG,EAAa,MAAM,EAAAC,QAAqB,WAAW,CACvD,YAAaH,EACb,eAAgB,EAAAI,QAAuB,cACvC,IAAAL,EACA,KAAM,QACR,CAAC,EAEDA,EAAI,OAAO,sCAAuC,CAChD,MAAO,0BACP,GAAI,+BACJ,WAAY,KAAK,WACjB,GAAGG,CACL,CAAC,CACH,EApBE,KAAK,WAAaN,EAClB,KAAK,SAAWC,CAClB,CAmBF,CAGA,IAAOL,EAAQD",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,yCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAGA,IAAAK,EAAmC,kEACnCA,EAAiC,2DACjCC,EAAyB,gDAEzB,MAAMJ,CAAoC,CACxC,WAEA,SAEA,YAAYK,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAEA,IAAsB,MAAOC,EAAMC,IAAQ,CACzC,KAAM,CAAE,sBAAAC,CAAsB,EAAI,EAAAC,QAAa,UAAUF,CAAG,EAEtDG,EAAa,MAAM,EAAAC,QAAqB,WAAW,CACvD,YAAaH,EACb,eAAgB,EAAAI,QAAuB,cACvC,IAAAL,EACA,KAAM,QACR,CAAC,EAEDA,EAAI,OAAO,sCAAuC,CAChD,MAAO,0BACP,GAAI,+BACJ,WAAY,KAAK,WACjB,GAAGG,CACL,CAAC,CACH,CACF,CAGA,IAAOV,EAAQD",
   "names": ["controller_exports", "__export", "RecentlyViewedReportsListController", "controller_default", "__toCommonJS", "import_utils", "import_localsHelper", "layoutPath", "services", "_req", "res", "recentlyViewedReports", "LocalsHelper", "listParams", "UserReportsListUtils", "RecentReportslistUtils"]
 }

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

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

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/my-reports/requested-reports/controller.ts"],
   "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../types/Services'\nimport LocalsHelper from '../../../../utils/localsHelper'\n\nclass RequestedReportsController {\n  services: Services\n\n  constructor(services: Services) {\n    this.services = services\n  }\n\n  POST: RequestHandler = async (req, res) => {\n    const { dprUser } = LocalsHelper.getValues(res)\n    const { id } = req.params\n    await this.services.requestedReportService.removeReport(id, dprUser.id)\n    res.end()\n  }\n}\n\nexport { RequestedReportsController }\nexport default RequestedReportsController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,gCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAyB,6CAEzB,MAAMH,CAA2B,CAG/B,YAAYI,EAAoB,CAIhC,UAAuB,MAAOC,EAAKC,IAAQ,CACzC,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUF,CAAG,EACxC,CAAE,GAAAG,CAAG,EAAIJ,EAAI,OACnB,MAAM,KAAK,SAAS,uBAAuB,aAAaI,EAAIF,EAAQ,EAAE,EACtED,EAAI,IAAI,CACV,EARE,KAAK,SAAWF,CAClB,CAQF,CAGA,IAAOH,EAAQD",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,gCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAyB,6CAEzB,MAAMH,CAA2B,CAC/B,SAEA,YAAYI,EAAoB,CAC9B,KAAK,SAAWA,CAClB,CAEA,KAAuB,MAAOC,EAAKC,IAAQ,CACzC,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUF,CAAG,EACxC,CAAE,GAAAG,CAAG,EAAIJ,EAAI,OACnB,MAAM,KAAK,SAAS,uBAAuB,aAAaI,EAAIF,EAAQ,EAAE,EACtED,EAAI,IAAI,CACV,CACF,CAGA,IAAOL,EAAQD",
   "names": ["controller_exports", "__export", "RequestedReportsController", "controller_default", "__toCommonJS", "import_localsHelper", "services", "req", "res", "dprUser", "LocalsHelper", "id"]
 }

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

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

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/my-reports/requested-reports/list/controller.ts"],
   "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../../types/Services'\n\nimport AsyncRequestListUtils from '../../../../../components/user-reports/requested/utils'\nimport UserReportsListUtils from '../../../../../components/user-reports/utils'\nimport LocalsHelper from '../../../../../utils/localsHelper'\n\nclass RequestedReportsListController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  GET: RequestHandler = async (_req, res) => {\n    const { requestedReports } = LocalsHelper.getValues(res)\n\n    const listParams = await UserReportsListUtils.renderList({\n      reportsData: requestedReports,\n      filterFunction: AsyncRequestListUtils.filterReports,\n      res,\n      type: 'requested',\n    })\n\n    res.render(`dpr/routes/journeys/my-reports/view`, {\n      title: 'Requested reports',\n      id: 'requested-reports-list',\n      layoutPath: this.layoutPath,\n      ...listParams,\n    })\n  }\n}\n\nexport { RequestedReportsListController }\nexport default RequestedReportsListController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,oCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAGA,IAAAK,EAAkC,qEAClCA,EAAiC,2DACjCC,EAAyB,gDAEzB,MAAMJ,CAA+B,CAKnC,YAAYK,EAAoBC,EAAoB,CAKpD,SAAsB,MAAOC,EAAMC,IAAQ,CACzC,KAAM,CAAE,iBAAAC,CAAiB,EAAI,EAAAC,QAAa,UAAUF,CAAG,EAEjDG,EAAa,MAAM,EAAAC,QAAqB,WAAW,CACvD,YAAaH,EACb,eAAgB,EAAAI,QAAsB,cACtC,IAAAL,EACA,KAAM,WACR,CAAC,EAEDA,EAAI,OAAO,sCAAuC,CAChD,MAAO,oBACP,GAAI,yBACJ,WAAY,KAAK,WACjB,GAAGG,CACL,CAAC,CACH,EApBE,KAAK,WAAaN,EAClB,KAAK,SAAWC,CAClB,CAmBF,CAGA,IAAOL,EAAQD",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,oCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAGA,IAAAK,EAAkC,qEAClCA,EAAiC,2DACjCC,EAAyB,gDAEzB,MAAMJ,CAA+B,CACnC,WAEA,SAEA,YAAYK,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAEA,IAAsB,MAAOC,EAAMC,IAAQ,CACzC,KAAM,CAAE,iBAAAC,CAAiB,EAAI,EAAAC,QAAa,UAAUF,CAAG,EAEjDG,EAAa,MAAM,EAAAC,QAAqB,WAAW,CACvD,YAAaH,EACb,eAAgB,EAAAI,QAAsB,cACtC,IAAAL,EACA,KAAM,WACR,CAAC,EAEDA,EAAI,OAAO,sCAAuC,CAChD,MAAO,oBACP,GAAI,yBACJ,WAAY,KAAK,WACjB,GAAGG,CACL,CAAC,CACH,CACF,CAGA,IAAOV,EAAQD",
   "names": ["controller_exports", "__export", "RequestedReportsListController", "controller_default", "__toCommonJS", "import_utils", "import_localsHelper", "layoutPath", "services", "_req", "res", "requestedReports", "LocalsHelper", "listParams", "UserReportsListUtils", "AsyncRequestListUtils"]
 }

package/dpr/routes/journeys/product-collection/selected/controller.js CHANGED Viewed

@@ -1,2 +1,2 @@
-"use strict";var S=Object.create;var c=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var a=Object.getOwnPropertyNames;var p=Object.getPrototypeOf,C=Object.prototype.hasOwnProperty;var m=(e,t)=>{for(var o in t)c(e,o,{get:t[o],enumerable:!0})},n=(e,t,o,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of a(t))!C.call(e,r)&&r!==o&&c(e,r,{get:()=>t[r],enumerable:!(i=u(t,r))||i.enumerable});return e};var v=(e,t,o)=>(o=e!=null?S(p(e)):{},n(t||!e||!e.__esModule?c(o,"default",{value:e,enumerable:!0}):o,e)),h=e=>n(c({},"__esModule",{value:!0}),e);var f={};m(f,{SelectedProductCollectionController:()=>P});module.exports=h(f);var d=v(require("../../../../utils/localsHelper"));class P{constructor(t,o){this.POST=async(t,o,i)=>{const{productCollection:r}=t.body,{dprUser:s,nestedBaseUrl:l}=d.default.getValues(o);await this.productCollectionStoreService.setSelectedProductCollectionId(s.id,r==="RESET"?void 0:r).then(()=>{o.redirect(`${l}/`)}).catch(()=>{o.redirect(`${l}/`)})};this.layoutPath=t,this.productCollectionStoreService=o.productCollectionStoreService}}0&&(module.exports={SelectedProductCollectionController});
+"use strict";var S=Object.create;var c=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var a=Object.getOwnPropertyNames;var p=Object.getPrototypeOf,C=Object.prototype.hasOwnProperty;var m=(e,t)=>{for(var o in t)c(e,o,{get:t[o],enumerable:!0})},n=(e,t,o,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of a(t))!C.call(e,r)&&r!==o&&c(e,r,{get:()=>t[r],enumerable:!(i=u(t,r))||i.enumerable});return e};var v=(e,t,o)=>(o=e!=null?S(p(e)):{},n(t||!e||!e.__esModule?c(o,"default",{value:e,enumerable:!0}):o,e)),h=e=>n(c({},"__esModule",{value:!0}),e);var f={};m(f,{SelectedProductCollectionController:()=>P});module.exports=h(f);var d=v(require("../../../../utils/localsHelper"));class P{layoutPath;productCollectionStoreService;constructor(t,o){this.layoutPath=t,this.productCollectionStoreService=o.productCollectionStoreService}POST=async(t,o,i)=>{const{productCollection:r}=t.body,{dprUser:s,nestedBaseUrl:l}=d.default.getValues(o);await this.productCollectionStoreService.setSelectedProductCollectionId(s.id,r==="RESET"?void 0:r).then(()=>{o.redirect(`${l}/`)}).catch(()=>{o.redirect(`${l}/`)})}}0&&(module.exports={SelectedProductCollectionController});
 //# sourceMappingURL=controller.js.map

package/dpr/routes/journeys/product-collection/selected/controller.js.map CHANGED Viewed

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/product-collection/selected/controller.ts"],
   "sourcesContent": ["import { RequestHandler } from 'express'\nimport { ProductCollectionStoreService } from '../../../../services/productCollection/productCollectionStoreService'\nimport LocalsHelper from '../../../../utils/localsHelper'\nimport { Services } from '../../../../types/Services'\n\nexport class SelectedProductCollectionController {\n  layoutPath: string\n\n  productCollectionStoreService: ProductCollectionStoreService\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.productCollectionStoreService = services.productCollectionStoreService\n  }\n\n  POST: RequestHandler = async (req, res, _next) => {\n    const { productCollection } = req.body\n    const { dprUser, nestedBaseUrl } = LocalsHelper.getValues(res)\n\n    await this.productCollectionStoreService\n      .setSelectedProductCollectionId(dprUser.id, productCollection === 'RESET' ? undefined : productCollection)\n      .then(() => {\n        res.redirect(`${nestedBaseUrl}/`)\n      })\n      .catch(() => {\n        res.redirect(`${nestedBaseUrl}/`)\n      })\n  }\n}\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,yCAAAE,IAAA,eAAAC,EAAAH,GAEA,IAAAI,EAAyB,6CAGlB,MAAMF,CAAoC,CAK/C,YAAYG,EAAoBC,EAAoB,CAKpD,UAAuB,MAAOC,EAAKC,EAAKC,IAAU,CAChD,KAAM,CAAE,kBAAAC,CAAkB,EAAIH,EAAI,KAC5B,CAAE,QAAAI,EAAS,cAAAC,CAAc,EAAI,EAAAC,QAAa,UAAUL,CAAG,EAE7D,MAAM,KAAK,8BACR,+BAA+BG,EAAQ,GAAID,IAAsB,QAAU,OAAYA,CAAiB,EACxG,KAAK,IAAM,CACVF,EAAI,SAAS,GAAGI,CAAa,GAAG,CAClC,CAAC,EACA,MAAM,IAAM,CACXJ,EAAI,SAAS,GAAGI,CAAa,GAAG,CAClC,CAAC,CACL,EAhBE,KAAK,WAAaP,EAClB,KAAK,8BAAgCC,EAAS,6BAChD,CAeF",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,yCAAAE,IAAA,eAAAC,EAAAH,GAEA,IAAAI,EAAyB,6CAGlB,MAAMF,CAAoC,CAC/C,WAEA,8BAEA,YAAYG,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,8BAAgCC,EAAS,6BAChD,CAEA,KAAuB,MAAOC,EAAKC,EAAKC,IAAU,CAChD,KAAM,CAAE,kBAAAC,CAAkB,EAAIH,EAAI,KAC5B,CAAE,QAAAI,EAAS,cAAAC,CAAc,EAAI,EAAAC,QAAa,UAAUL,CAAG,EAE7D,MAAM,KAAK,8BACR,+BAA+BG,EAAQ,GAAID,IAAsB,QAAU,OAAYA,CAAiB,EACxG,KAAK,IAAM,CACVF,EAAI,SAAS,GAAGI,CAAa,GAAG,CAClC,CAAC,EACA,MAAM,IAAM,CACXJ,EAAI,SAAS,GAAGI,CAAa,GAAG,CAClC,CAAC,CACL,CACF",
   "names": ["controller_exports", "__export", "SelectedProductCollectionController", "__toCommonJS", "import_localsHelper", "layoutPath", "services", "req", "res", "_next", "productCollection", "dprUser", "nestedBaseUrl", "LocalsHelper"]
 }

package/dpr/routes/journeys/request-missing-report/form/controller.js CHANGED Viewed

@@ -1,2 +1,2 @@
-"use strict";var S=Object.create;var d=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var y=Object.getOwnPropertyNames;var q=Object.getPrototypeOf,P=Object.prototype.hasOwnProperty;var $=(t,e)=>{for(var r in e)d(t,r,{get:e[r],enumerable:!0})},h=(t,e,r,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of y(e))!P.call(t,i)&&i!==r&&d(t,i,{get:()=>e[i],enumerable:!(n=R(e,i))||n.enumerable});return t};var b=(t,e,r)=>(r=t!=null?S(q(t)):{},h(e||!t||!t.__esModule?d(r,"default",{value:t,enumerable:!0}):r,t)),I=t=>h(d({},"__esModule",{value:!0}),t);var w={};$(w,{MissingReportFormController:()=>u,default:()=>E});module.exports=I(w);var g=b(require("../../../../utils/localsHelper"));class u{constructor(e,r){this.GET=async(e,r,n)=>{const{token:i,csrfToken:p,definitionsPath:c,dprUser:v}=g.default.getValues(r),{reportId:s,variantId:a}=e.params,m=await this.reportingService.getDefinition(i,s,a,c??"definitions/prisons/missing"),{variant:o,name:l}=m;try{r.render("dpr/routes/journeys/request-missing-report/form/view",{title:"This report is not available",report:{reportId:s,variantId:a,reportName:l,name:o.name,description:o.description||m.description},user:v,csrfToken:p,layoutPath:this.layoutPath,postEndpoint:`/dpr/request-missing-report/${s}/${a}/form/submit`})}catch{n()}};this.POST=async(e,r,n)=>{const{body:i}=e,{reportId:p,variantId:c,reportName:v,variantName:s,"more-detail":a}=i,{token:m}=g.default.getValues(r);try{const o=this.missingReportService.submitMissingReportEntry(m,p,c,a);o&&o.then(()=>{const f=`./submitted?${`reportName=${v}&name=${s}&reportId=${p}&variantId=${c}`}`;r.redirect(f)},()=>{r.render("dpr/components/serviceError/view")})}catch{r.render("dpr/components/serviceError/view")}};this.layoutPath=e,this.missingReportService=r.missingReportService,this.reportingService=r.reportingService}}var E=u;0&&(module.exports={MissingReportFormController});
+"use strict";var S=Object.create;var d=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var y=Object.getOwnPropertyNames;var q=Object.getPrototypeOf,P=Object.prototype.hasOwnProperty;var $=(t,e)=>{for(var r in e)d(t,r,{get:e[r],enumerable:!0})},h=(t,e,r,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of y(e))!P.call(t,i)&&i!==r&&d(t,i,{get:()=>e[i],enumerable:!(n=R(e,i))||n.enumerable});return t};var b=(t,e,r)=>(r=t!=null?S(q(t)):{},h(e||!t||!t.__esModule?d(r,"default",{value:t,enumerable:!0}):r,t)),I=t=>h(d({},"__esModule",{value:!0}),t);var w={};$(w,{MissingReportFormController:()=>u,default:()=>E});module.exports=I(w);var g=b(require("../../../../utils/localsHelper"));class u{layoutPath;missingReportService;reportingService;constructor(e,r){this.layoutPath=e,this.missingReportService=r.missingReportService,this.reportingService=r.reportingService}GET=async(e,r,n)=>{const{token:i,csrfToken:p,definitionsPath:c,dprUser:v}=g.default.getValues(r),{reportId:s,variantId:a}=e.params,m=await this.reportingService.getDefinition(i,s,a,c??"definitions/prisons/missing"),{variant:o,name:l}=m;try{r.render("dpr/routes/journeys/request-missing-report/form/view",{title:"This report is not available",report:{reportId:s,variantId:a,reportName:l,name:o.name,description:o.description||m.description},user:v,csrfToken:p,layoutPath:this.layoutPath,postEndpoint:`/dpr/request-missing-report/${s}/${a}/form/submit`})}catch{n()}};POST=async(e,r,n)=>{const{body:i}=e,{reportId:p,variantId:c,reportName:v,variantName:s,"more-detail":a}=i,{token:m}=g.default.getValues(r);try{const o=this.missingReportService.submitMissingReportEntry(m,p,c,a);o&&o.then(()=>{const f=`./submitted?${`reportName=${v}&name=${s}&reportId=${p}&variantId=${c}`}`;r.redirect(f)},()=>{r.render("dpr/components/serviceError/view")})}catch{r.render("dpr/components/serviceError/view")}}}var E=u;0&&(module.exports={MissingReportFormController});
 //# sourceMappingURL=controller.js.map

package/dpr/routes/journeys/request-missing-report/form/controller.js.map CHANGED Viewed

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/request-missing-report/form/controller.ts"],
   "sourcesContent": ["import { RequestHandler } from 'express'\nimport LocalsHelper from '../../../../utils/localsHelper'\nimport { components } from '../../../../types/api'\nimport { Services } from '../../../../types/Services'\nimport MissingReportService from '../../../../services/missingReport/missingReportService'\nimport { ReportingService } from '../../../../services'\n\nclass MissingReportFormController {\n  layoutPath: string\n\n  missingReportService: MissingReportService\n\n  reportingService: ReportingService\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.missingReportService = services.missingReportService\n    this.reportingService = services.reportingService\n  }\n\n  GET: RequestHandler = async (req, res, next) => {\n    const { token, csrfToken, definitionsPath, dprUser } = LocalsHelper.getValues(res)\n    const { reportId, variantId } = req.params\n\n    const reportDefinition: components['schemas']['SingleVariantReportDefinition'] =\n      await this.reportingService.getDefinition(\n        token,\n        reportId,\n        variantId,\n        definitionsPath ?? 'definitions/prisons/missing',\n      )\n\n    const { variant, name } = reportDefinition\n\n    try {\n      res.render(`dpr/routes/journeys/request-missing-report/form/view`, {\n        title: 'This report is not available',\n        report: {\n          reportId,\n          variantId,\n          reportName: name,\n          name: variant.name,\n          description: variant.description || reportDefinition.description,\n        },\n        user: dprUser,\n        csrfToken,\n        layoutPath: this.layoutPath,\n        postEndpoint: `/dpr/request-missing-report/${reportId}/${variantId}/form/submit`,\n      })\n    } catch (error) {\n      next()\n    }\n  }\n\n  POST: RequestHandler = async (req, res, _next) => {\n    const { body } = req\n    const { reportId, variantId, reportName, variantName, 'more-detail': requestDetails } = body\n\n    const { token } = LocalsHelper.getValues(res)\n\n    try {\n      const submission = this.missingReportService.submitMissingReportEntry(token, reportId, variantId, requestDetails)\n      if (submission) {\n        submission.then(\n          () => {\n            const queryParams = `reportName=${reportName}&name=${variantName}&reportId=${reportId}&variantId=${variantId}`\n            const redirect = `./submitted?${queryParams}`\n\n            res.redirect(redirect)\n          },\n          () => {\n            res.render(`dpr/components/serviceError/view`)\n          },\n        )\n      }\n    } catch (_error) {\n      res.render(`dpr/components/serviceError/view`)\n    }\n  }\n}\n\nexport { MissingReportFormController }\nexport default MissingReportFormController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,iCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,6CAMzB,MAAMH,CAA4B,CAOhC,YAAYI,EAAoBC,EAAoB,CAMpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,KAAM,CAAE,MAAAC,EAAO,UAAAC,EAAW,gBAAAC,EAAiB,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUN,CAAG,EAC3E,CAAE,SAAAO,EAAU,UAAAC,CAAU,EAAIT,EAAI,OAE9BU,EACJ,MAAM,KAAK,iBAAiB,cAC1BP,EACAK,EACAC,EACAJ,GAAmB,6BACrB,EAEI,CAAE,QAAAM,EAAS,KAAAC,CAAK,EAAIF,EAE1B,GAAI,CACFT,EAAI,OAAO,uDAAwD,CACjE,MAAO,+BACP,OAAQ,CACN,SAAAO,EACA,UAAAC,EACA,WAAYG,EACZ,KAAMD,EAAQ,KACd,YAAaA,EAAQ,aAAeD,EAAiB,WACvD,EACA,KAAMJ,EACN,UAAAF,EACA,WAAY,KAAK,WACjB,aAAc,+BAA+BI,CAAQ,IAAIC,CAAS,cACpE,CAAC,CACH,MAAgB,CACdP,EAAK,CACP,CACF,EAEA,UAAuB,MAAOF,EAAKC,EAAKY,IAAU,CAChD,KAAM,CAAE,KAAAC,CAAK,EAAId,EACX,CAAE,SAAAQ,EAAU,UAAAC,EAAW,WAAAM,EAAY,YAAAC,EAAa,cAAeC,CAAe,EAAIH,EAElF,CAAE,MAAAX,CAAM,EAAI,EAAAI,QAAa,UAAUN,CAAG,EAE5C,GAAI,CACF,MAAMiB,EAAa,KAAK,qBAAqB,yBAAyBf,EAAOK,EAAUC,EAAWQ,CAAc,EAC5GC,GACFA,EAAW,KACT,IAAM,CAEJ,MAAMC,EAAW,eADG,cAAcJ,CAAU,SAASC,CAAW,aAAaR,CAAQ,cAAcC,CAAS,EACjE,GAE3CR,EAAI,SAASkB,CAAQ,CACvB,EACA,IAAM,CACJlB,EAAI,OAAO,kCAAkC,CAC/C,CACF,CAEJ,MAAiB,CACfA,EAAI,OAAO,kCAAkC,CAC/C,CACF,EA/DE,KAAK,WAAaH,EAClB,KAAK,qBAAuBC,EAAS,qBACrC,KAAK,iBAAmBA,EAAS,gBACnC,CA6DF,CAGA,IAAOJ,EAAQD",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,iCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,6CAMzB,MAAMH,CAA4B,CAChC,WAEA,qBAEA,iBAEA,YAAYI,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,qBAAuBC,EAAS,qBACrC,KAAK,iBAAmBA,EAAS,gBACnC,CAEA,IAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,KAAM,CAAE,MAAAC,EAAO,UAAAC,EAAW,gBAAAC,EAAiB,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUN,CAAG,EAC3E,CAAE,SAAAO,EAAU,UAAAC,CAAU,EAAIT,EAAI,OAE9BU,EACJ,MAAM,KAAK,iBAAiB,cAC1BP,EACAK,EACAC,EACAJ,GAAmB,6BACrB,EAEI,CAAE,QAAAM,EAAS,KAAAC,CAAK,EAAIF,EAE1B,GAAI,CACFT,EAAI,OAAO,uDAAwD,CACjE,MAAO,+BACP,OAAQ,CACN,SAAAO,EACA,UAAAC,EACA,WAAYG,EACZ,KAAMD,EAAQ,KACd,YAAaA,EAAQ,aAAeD,EAAiB,WACvD,EACA,KAAMJ,EACN,UAAAF,EACA,WAAY,KAAK,WACjB,aAAc,+BAA+BI,CAAQ,IAAIC,CAAS,cACpE,CAAC,CACH,MAAgB,CACdP,EAAK,CACP,CACF,EAEA,KAAuB,MAAOF,EAAKC,EAAKY,IAAU,CAChD,KAAM,CAAE,KAAAC,CAAK,EAAId,EACX,CAAE,SAAAQ,EAAU,UAAAC,EAAW,WAAAM,EAAY,YAAAC,EAAa,cAAeC,CAAe,EAAIH,EAElF,CAAE,MAAAX,CAAM,EAAI,EAAAI,QAAa,UAAUN,CAAG,EAE5C,GAAI,CACF,MAAMiB,EAAa,KAAK,qBAAqB,yBAAyBf,EAAOK,EAAUC,EAAWQ,CAAc,EAC5GC,GACFA,EAAW,KACT,IAAM,CAEJ,MAAMC,EAAW,eADG,cAAcJ,CAAU,SAASC,CAAW,aAAaR,CAAQ,cAAcC,CAAS,EACjE,GAE3CR,EAAI,SAASkB,CAAQ,CACvB,EACA,IAAM,CACJlB,EAAI,OAAO,kCAAkC,CAC/C,CACF,CAEJ,MAAiB,CACfA,EAAI,OAAO,kCAAkC,CAC/C,CACF,CACF,CAGA,IAAON,EAAQD",
   "names": ["controller_exports", "__export", "MissingReportFormController", "controller_default", "__toCommonJS", "import_localsHelper", "layoutPath", "services", "req", "res", "next", "token", "csrfToken", "definitionsPath", "dprUser", "LocalsHelper", "reportId", "variantId", "reportDefinition", "variant", "name", "_next", "body", "reportName", "variantName", "requestDetails", "submission", "redirect"]
 }

package/dpr/routes/journeys/request-missing-report/submitted/controller.js CHANGED Viewed

@@ -1,2 +1,2 @@
-"use strict";var c=Object.create;var a=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var h=Object.getOwnPropertyNames;var g=Object.getPrototypeOf,q=Object.prototype.hasOwnProperty;var P=(t,e)=>{for(var r in e)a(t,r,{get:e[r],enumerable:!0})},i=(t,e,r,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of h(e))!q.call(t,o)&&o!==r&&a(t,o,{get:()=>e[o],enumerable:!(s=y(e,o))||s.enumerable});return t};var R=(t,e,r)=>(r=t!=null?c(g(t)):{},i(e||!t||!t.__esModule?a(r,"default",{value:t,enumerable:!0}):r,t)),b=t=>i(a({},"__esModule",{value:!0}),t);var H={};P(H,{MissingReportSubmittedController:()=>u,default:()=>f});module.exports=b(H);var l=R(require("../../../../utils/localsHelper"));class u{constructor(e){this.GET=async(e,r,s)=>{const{nestedBaseUrl:o}=l.default.getValues(r),{reportId:n,variantId:d,reportName:p,name:m}=e.query;try{r.render("dpr/routes/journeys/request-missing-report/submitted/view",{title:"Request submitted",report:{reportId:n,variantId:d,reportName:p,name:m},nestedBaseUrl:o,layoutPath:this.layoutPath})}catch{s()}};this.layoutPath=e}}var f=u;0&&(module.exports={MissingReportSubmittedController});
+"use strict";var c=Object.create;var a=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var h=Object.getOwnPropertyNames;var g=Object.getPrototypeOf,q=Object.prototype.hasOwnProperty;var P=(t,e)=>{for(var r in e)a(t,r,{get:e[r],enumerable:!0})},i=(t,e,r,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of h(e))!q.call(t,o)&&o!==r&&a(t,o,{get:()=>e[o],enumerable:!(s=y(e,o))||s.enumerable});return t};var R=(t,e,r)=>(r=t!=null?c(g(t)):{},i(e||!t||!t.__esModule?a(r,"default",{value:t,enumerable:!0}):r,t)),b=t=>i(a({},"__esModule",{value:!0}),t);var H={};P(H,{MissingReportSubmittedController:()=>u,default:()=>f});module.exports=b(H);var l=R(require("../../../../utils/localsHelper"));class u{layoutPath;constructor(e){this.layoutPath=e}GET=async(e,r,s)=>{const{nestedBaseUrl:o}=l.default.getValues(r),{reportId:n,variantId:d,reportName:p,name:m}=e.query;try{r.render("dpr/routes/journeys/request-missing-report/submitted/view",{title:"Request submitted",report:{reportId:n,variantId:d,reportName:p,name:m},nestedBaseUrl:o,layoutPath:this.layoutPath})}catch{s()}}}var f=u;0&&(module.exports={MissingReportSubmittedController});
 //# sourceMappingURL=controller.js.map

package/dpr/routes/journeys/request-missing-report/submitted/controller.js.map CHANGED Viewed

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/request-missing-report/submitted/controller.ts"],
   "sourcesContent": ["import { RequestHandler } from 'express'\nimport localsHelper from '../../../../utils/localsHelper'\n\nclass MissingReportSubmittedController {\n  layoutPath: string\n\n  constructor(layoutPath: string) {\n    this.layoutPath = layoutPath\n  }\n\n  GET: RequestHandler = async (req, res, next) => {\n    const { nestedBaseUrl } = localsHelper.getValues(res)\n    const { reportId, variantId, reportName, name } = req.query\n\n    try {\n      res.render(`dpr/routes/journeys/request-missing-report/submitted/view`, {\n        title: 'Request submitted',\n        report: {\n          reportId,\n          variantId,\n          reportName,\n          name,\n        },\n        nestedBaseUrl,\n        layoutPath: this.layoutPath,\n      })\n    } catch (error) {\n      next()\n    }\n  }\n}\n\nexport { MissingReportSubmittedController }\nexport default MissingReportSubmittedController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,sCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,6CAEzB,MAAMH,CAAiC,CAGrC,YAAYI,EAAoB,CAIhC,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,KAAM,CAAE,cAAAC,CAAc,EAAI,EAAAC,QAAa,UAAUH,CAAG,EAC9C,CAAE,SAAAI,EAAU,UAAAC,EAAW,WAAAC,EAAY,KAAAC,CAAK,EAAIR,EAAI,MAEtD,GAAI,CACFC,EAAI,OAAO,4DAA6D,CACtE,MAAO,oBACP,OAAQ,CACN,SAAAI,EACA,UAAAC,EACA,WAAAC,EACA,KAAAC,CACF,EACA,cAAAL,EACA,WAAY,KAAK,UACnB,CAAC,CACH,MAAgB,CACdD,EAAK,CACP,CACF,EAtBE,KAAK,WAAaH,CACpB,CAsBF,CAGA,IAAOH,EAAQD",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,sCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,6CAEzB,MAAMH,CAAiC,CACrC,WAEA,YAAYI,EAAoB,CAC9B,KAAK,WAAaA,CACpB,CAEA,IAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,KAAM,CAAE,cAAAC,CAAc,EAAI,EAAAC,QAAa,UAAUH,CAAG,EAC9C,CAAE,SAAAI,EAAU,UAAAC,EAAW,WAAAC,EAAY,KAAAC,CAAK,EAAIR,EAAI,MAEtD,GAAI,CACFC,EAAI,OAAO,4DAA6D,CACtE,MAAO,oBACP,OAAQ,CACN,SAAAI,EACA,UAAAC,EACA,WAAAC,EACA,KAAAC,CACF,EACA,cAAAL,EACA,WAAY,KAAK,UACnB,CAAC,CACH,MAAgB,CACdD,EAAK,CACP,CACF,CACF,CAGA,IAAON,EAAQD",
   "names": ["controller_exports", "__export", "MissingReportSubmittedController", "controller_default", "__toCommonJS", "import_localsHelper", "layoutPath", "req", "res", "next", "nestedBaseUrl", "localsHelper", "reportId", "variantId", "reportName", "name"]
 }

package/dpr/routes/journeys/request-report/controller.js CHANGED Viewed

@@ -1,2 +1,2 @@
-"use strict";var d=Object.create;var a=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var R=Object.getOwnPropertyNames;var p=Object.getPrototypeOf,f=Object.prototype.hasOwnProperty;var h=(t,r)=>{for(var e in r)a(t,e,{get:r[e],enumerable:!0})},l=(t,r,e,s)=>{if(r&&typeof r=="object"||typeof r=="function")for(let o of R(r))!f.call(t,o)&&o!==e&&a(t,o,{get:()=>r[o],enumerable:!(s=y(r,o))||s.enumerable});return t};var n=(t,r,e)=>(e=t!=null?d(p(t)):{},l(r||!t||!t.__esModule?a(e,"default",{value:t,enumerable:!0}):e,t)),m=t=>l(a({},"__esModule",{value:!0}),t);var g={};h(g,{RequestReportController:()=>i,default:()=>b});module.exports=m(g);var c=n(require("./filters/utils")),u=n(require("../../../utils/ErrorHandler"));class i{constructor(r,e){this.errorHandler=async(r,e,s,o)=>{s.render("dpr/routes/journeys/view-report/error",{layoutPath:this.layoutPath,...e.body,...e.params,error:e.body.error,params:e.params})};this.CANCEL=async(r,e,s)=>{try{await c.default.cancelRequest({req:r,res:e,services:this.services})}catch(o){return r.body.title="Failed to abort request",r.body.errorDescription="We were unable to abort the report request for the following reason:",r.body.error=new u.default(o).formatError(),r.flash("ERROR_BODY",JSON.stringify(r.body)),r.flash("ERROR_PARAMS",JSON.stringify(r.params)),r.flash("ERROR",JSON.stringify(r.body.error)),e.redirect(`${r.originalUrl}/failed`)}return e.redirect(r.originalUrl.replace("/cancel","/status"))};this.layoutPath=r,this.services=e}}var b=i;0&&(module.exports={RequestReportController});
+"use strict";var d=Object.create;var a=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var R=Object.getOwnPropertyNames;var p=Object.getPrototypeOf,f=Object.prototype.hasOwnProperty;var h=(t,r)=>{for(var e in r)a(t,e,{get:r[e],enumerable:!0})},l=(t,r,e,s)=>{if(r&&typeof r=="object"||typeof r=="function")for(let o of R(r))!f.call(t,o)&&o!==e&&a(t,o,{get:()=>r[o],enumerable:!(s=y(r,o))||s.enumerable});return t};var n=(t,r,e)=>(e=t!=null?d(p(t)):{},l(r||!t||!t.__esModule?a(e,"default",{value:t,enumerable:!0}):e,t)),m=t=>l(a({},"__esModule",{value:!0}),t);var g={};h(g,{RequestReportController:()=>i,default:()=>b});module.exports=m(g);var c=n(require("./filters/utils")),u=n(require("../../../utils/ErrorHandler"));class i{layoutPath;services;constructor(r,e){this.layoutPath=r,this.services=e}errorHandler=async(r,e,s,o)=>{s.render("dpr/routes/journeys/view-report/error",{layoutPath:this.layoutPath,...e.body,...e.params,error:e.body.error,params:e.params})};CANCEL=async(r,e,s)=>{try{await c.default.cancelRequest({req:r,res:e,services:this.services})}catch(o){return r.body.title="Failed to abort request",r.body.errorDescription="We were unable to abort the report request for the following reason:",r.body.error=new u.default(o).formatError(),r.flash("ERROR_BODY",JSON.stringify(r.body)),r.flash("ERROR_PARAMS",JSON.stringify(r.params)),r.flash("ERROR",JSON.stringify(r.body.error)),e.redirect(`${r.originalUrl}/failed`)}return e.redirect(r.originalUrl.replace("/cancel","/status"))}}var b=i;0&&(module.exports={RequestReportController});
 //# sourceMappingURL=controller.js.map

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../src/dpr/routes/journeys/request-report/controller.ts"],
   "sourcesContent": ["import { ErrorRequestHandler, RequestHandler } from 'express'\nimport { Services } from '../../../types/Services'\nimport AsyncRequestUtils from './filters/utils'\nimport ErrorHandler from '../../../utils/ErrorHandler'\n\nclass RequestReportController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  errorHandler: ErrorRequestHandler = async (_error, req, res, _next) => {\n    res.render(`dpr/routes/journeys/view-report/error`, {\n      layoutPath: this.layoutPath,\n      ...req.body,\n      ...req.params,\n      error: req.body.error,\n      params: req.params,\n    })\n  }\n\n  CANCEL: RequestHandler = async (req, res, _next) => {\n    try {\n      await AsyncRequestUtils.cancelRequest({\n        req,\n        res,\n        services: this.services,\n      })\n    } catch (error) {\n      req.body.title = 'Failed to abort request'\n      req.body.errorDescription = 'We were unable to abort the report request for the following reason:'\n      req.body.error = new ErrorHandler(error).formatError()\n\n      req.flash('ERROR_BODY', JSON.stringify(req.body))\n      req.flash('ERROR_PARAMS', JSON.stringify(req.params))\n      req.flash('ERROR', JSON.stringify(req.body.error))\n\n      return res.redirect(`${req.originalUrl}/failed`)\n    }\n    return res.redirect(req.originalUrl.replace('/cancel', '/status'))\n  }\n}\n\nexport { RequestReportController }\nexport default RequestReportController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAA8B,8BAC9BC,EAAyB,0CAEzB,MAAMJ,CAAwB,CAK5B,YAAYK,EAAoBC,EAAoB,CAKpD,kBAAoC,MAAOC,EAAQC,EAAKC,EAAKC,IAAU,CACrED,EAAI,OAAO,wCAAyC,CAClD,WAAY,KAAK,WACjB,GAAGD,EAAI,KACP,GAAGA,EAAI,OACP,MAAOA,EAAI,KAAK,MAChB,OAAQA,EAAI,MACd,CAAC,CACH,EAEA,YAAyB,MAAOA,EAAKC,EAAKC,IAAU,CAClD,GAAI,CACF,MAAM,EAAAC,QAAkB,cAAc,CACpC,IAAAH,EACA,IAAAC,EACA,SAAU,KAAK,QACjB,CAAC,CACH,OAASG,EAAO,CACd,OAAAJ,EAAI,KAAK,MAAQ,0BACjBA,EAAI,KAAK,iBAAmB,uEAC5BA,EAAI,KAAK,MAAQ,IAAI,EAAAK,QAAaD,CAAK,EAAE,YAAY,EAErDJ,EAAI,MAAM,aAAc,KAAK,UAAUA,EAAI,IAAI,CAAC,EAChDA,EAAI,MAAM,eAAgB,KAAK,UAAUA,EAAI,MAAM,CAAC,EACpDA,EAAI,MAAM,QAAS,KAAK,UAAUA,EAAI,KAAK,KAAK,CAAC,EAE1CC,EAAI,SAAS,GAAGD,EAAI,WAAW,SAAS,CACjD,CACA,OAAOC,EAAI,SAASD,EAAI,YAAY,QAAQ,UAAW,SAAS,CAAC,CACnE,EAjCE,KAAK,WAAaH,EAClB,KAAK,SAAWC,CAClB,CAgCF,CAGA,IAAOL,EAAQD",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAA8B,8BAC9BC,EAAyB,0CAEzB,MAAMJ,CAAwB,CAC5B,WAEA,SAEA,YAAYK,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAEA,aAAoC,MAAOC,EAAQC,EAAKC,EAAKC,IAAU,CACrED,EAAI,OAAO,wCAAyC,CAClD,WAAY,KAAK,WACjB,GAAGD,EAAI,KACP,GAAGA,EAAI,OACP,MAAOA,EAAI,KAAK,MAChB,OAAQA,EAAI,MACd,CAAC,CACH,EAEA,OAAyB,MAAOA,EAAKC,EAAKC,IAAU,CAClD,GAAI,CACF,MAAM,EAAAC,QAAkB,cAAc,CACpC,IAAAH,EACA,IAAAC,EACA,SAAU,KAAK,QACjB,CAAC,CACH,OAASG,EAAO,CACd,OAAAJ,EAAI,KAAK,MAAQ,0BACjBA,EAAI,KAAK,iBAAmB,uEAC5BA,EAAI,KAAK,MAAQ,IAAI,EAAAK,QAAaD,CAAK,EAAE,YAAY,EAErDJ,EAAI,MAAM,aAAc,KAAK,UAAUA,EAAI,IAAI,CAAC,EAChDA,EAAI,MAAM,eAAgB,KAAK,UAAUA,EAAI,MAAM,CAAC,EACpDA,EAAI,MAAM,QAAS,KAAK,UAAUA,EAAI,KAAK,KAAK,CAAC,EAE1CC,EAAI,SAAS,GAAGD,EAAI,WAAW,SAAS,CACjD,CACA,OAAOC,EAAI,SAASD,EAAI,YAAY,QAAQ,UAAW,SAAS,CAAC,CACnE,CACF,CAGA,IAAOP,EAAQD",
   "names": ["controller_exports", "__export", "RequestReportController", "controller_default", "__toCommonJS", "import_utils", "import_ErrorHandler", "layoutPath", "services", "_error", "req", "res", "_next", "AsyncRequestUtils", "error", "ErrorHandler"]
 }

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

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

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/request-report/filters/controller.ts"],
   "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../types/Services'\nimport { RequestDataResult } from '../../../../types/AsyncReportUtils'\nimport AysncRequestUtils from './utils'\nimport PersonalisationUtils from '../../../../utils/Personalisation/personalisationUtils'\nimport { FiltersType } from '../../../../components/_filters/filtersTypeEnum'\nimport ErrorHandler from '../../../../utils/ErrorHandler'\n\nclass RequestReportController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  // Render request page\n  GET: RequestHandler = async (req, res, next) => {\n    try {\n      const requestRenderData = <RequestDataResult>await AysncRequestUtils.renderRequest({\n        req,\n        res,\n        services: this.services,\n        next,\n      })\n\n      res.render(`dpr/routes/journeys/request-report/filters/view`, {\n        layoutPath: this.layoutPath,\n        ...requestRenderData,\n      })\n    } catch (error) {\n      req.body.title = 'Request failed'\n      req.body.errorDescription = `Your ${req.params['type']} has failed to generate.`\n      req.body.error = new ErrorHandler(error).formatError()\n      next()\n    }\n  }\n\n  // Request report\n  POST: RequestHandler = async (req, res, next) => {\n    try {\n      const executionData = await AysncRequestUtils.request({\n        req,\n        res,\n        services: this.services,\n        next,\n      })\n\n      const { executionId, dataProductDefinitionsPath } = executionData\n\n      if (executionId) {\n        const redirect = dataProductDefinitionsPath\n          ? `${executionId}/status?dataProductDefinitionsPath=${dataProductDefinitionsPath}`\n          : `${executionId}/status`\n        res.redirect(redirect)\n      } else {\n        res.end()\n      }\n    } catch (error) {\n      const filters = AysncRequestUtils.getFiltersFromReqBody(req)\n\n      req.body = {\n        title: 'Request Failed',\n        errorDescription: `Your ${req.params['type']} has failed to generate.`,\n        error: new ErrorHandler(error).formatError(),\n        retry: true,\n        filters,\n        ...req.body,\n      }\n      next(error)\n    }\n  }\n\n  saveDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      await PersonalisationUtils.saveDefaults(FiltersType.REQUEST, res, req, this.services)\n      res.redirect(`${req.baseUrl}?defaultsSaved=true`)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to save defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...req.body,\n      }\n      next()\n    }\n  }\n\n  removeDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      await PersonalisationUtils.removeDefaults(FiltersType.REQUEST, res, req, this.services)\n      res.redirect(req.baseUrl)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to remove defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...req.body,\n      }\n      next()\n    }\n  }\n}\n\nexport { RequestReportController }\nexport default RequestReportController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAGA,IAAAK,EAA8B,sBAC9BC,EAAiC,qEACjCC,EAA4B,2DAC5BC,EAAyB,6CAEzB,MAAMN,CAAwB,CAK5B,YAAYO,EAAoBC,EAAoB,CAMpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,GAAI,CACF,MAAMC,EAAuC,MAAM,EAAAC,QAAkB,cAAc,CACjF,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,SACf,KAAAC,CACF,CAAC,EAEDD,EAAI,OAAO,kDAAmD,CAC5D,WAAY,KAAK,WACjB,GAAGE,CACL,CAAC,CACH,OAASE,EAAO,CACdL,EAAI,KAAK,MAAQ,iBACjBA,EAAI,KAAK,iBAAmB,QAAQA,EAAI,OAAO,IAAO,2BACtDA,EAAI,KAAK,MAAQ,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EACrDH,EAAK,CACP,CACF,EAGA,UAAuB,MAAOF,EAAKC,EAAKC,IAAS,CAC/C,GAAI,CACF,MAAMK,EAAgB,MAAM,EAAAH,QAAkB,QAAQ,CACpD,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,SACf,KAAAC,CACF,CAAC,EAEK,CAAE,YAAAM,EAAa,2BAAAC,CAA2B,EAAIF,EAEpD,GAAIC,EAAa,CACf,MAAME,EAAWD,EACb,GAAGD,CAAW,sCAAsCC,CAA0B,GAC9E,GAAGD,CAAW,UAClBP,EAAI,SAASS,CAAQ,CACvB,MACET,EAAI,IAAI,CAEZ,OAASI,EAAO,CACd,MAAMM,EAAU,EAAAP,QAAkB,sBAAsBJ,CAAG,EAE3DA,EAAI,KAAO,CACT,MAAO,iBACP,iBAAkB,QAAQA,EAAI,OAAO,IAAO,2BAC5C,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,MAAO,GACP,QAAAM,EACA,GAAGX,EAAI,IACT,EACAE,EAAKG,CAAK,CACZ,CACF,EAEA,6BAA0C,MAAOL,EAAKC,EAAKC,IAAS,CAClE,GAAI,CACF,MAAM,EAAAU,QAAqB,aAAa,cAAY,QAASX,EAAKD,EAAK,KAAK,QAAQ,EACpFC,EAAI,SAAS,GAAGD,EAAI,OAAO,qBAAqB,CAClD,OAASK,EAAO,CACdL,EAAI,KAAO,CACT,MAAO,0BACP,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAGL,EAAI,IACT,EACAE,EAAK,CACP,CACF,EAEA,+BAA4C,MAAOF,EAAKC,EAAKC,IAAS,CACpE,GAAI,CACF,MAAM,EAAAU,QAAqB,eAAe,cAAY,QAASX,EAAKD,EAAK,KAAK,QAAQ,EACtFC,EAAI,SAASD,EAAI,OAAO,CAC1B,OAASK,EAAO,CACdL,EAAI,KAAO,CACT,MAAO,4BACP,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAGL,EAAI,IACT,EACAE,EAAK,CACP,CACF,EAvFE,KAAK,WAAaJ,EAClB,KAAK,SAAWC,CAClB,CAsFF,CAGA,IAAOP,EAAQD",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAGA,IAAAK,EAA8B,sBAC9BC,EAAiC,qEACjCC,EAA4B,2DAC5BC,EAAyB,6CAEzB,MAAMN,CAAwB,CAC5B,WAEA,SAEA,YAAYO,EAAoBC,EAAoB,CAClD,KAAK,WAAaD,EAClB,KAAK,SAAWC,CAClB,CAGA,IAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,GAAI,CACF,MAAMC,EAAuC,MAAM,EAAAC,QAAkB,cAAc,CACjF,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,SACf,KAAAC,CACF,CAAC,EAEDD,EAAI,OAAO,kDAAmD,CAC5D,WAAY,KAAK,WACjB,GAAGE,CACL,CAAC,CACH,OAASE,EAAO,CACdL,EAAI,KAAK,MAAQ,iBACjBA,EAAI,KAAK,iBAAmB,QAAQA,EAAI,OAAO,IAAO,2BACtDA,EAAI,KAAK,MAAQ,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EACrDH,EAAK,CACP,CACF,EAGA,KAAuB,MAAOF,EAAKC,EAAKC,IAAS,CAC/C,GAAI,CACF,MAAMK,EAAgB,MAAM,EAAAH,QAAkB,QAAQ,CACpD,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,SACf,KAAAC,CACF,CAAC,EAEK,CAAE,YAAAM,EAAa,2BAAAC,CAA2B,EAAIF,EAEpD,GAAIC,EAAa,CACf,MAAME,EAAWD,EACb,GAAGD,CAAW,sCAAsCC,CAA0B,GAC9E,GAAGD,CAAW,UAClBP,EAAI,SAASS,CAAQ,CACvB,MACET,EAAI,IAAI,CAEZ,OAASI,EAAO,CACd,MAAMM,EAAU,EAAAP,QAAkB,sBAAsBJ,CAAG,EAE3DA,EAAI,KAAO,CACT,MAAO,iBACP,iBAAkB,QAAQA,EAAI,OAAO,IAAO,2BAC5C,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,MAAO,GACP,QAAAM,EACA,GAAGX,EAAI,IACT,EACAE,EAAKG,CAAK,CACZ,CACF,EAEA,wBAA0C,MAAOL,EAAKC,EAAKC,IAAS,CAClE,GAAI,CACF,MAAM,EAAAU,QAAqB,aAAa,cAAY,QAASX,EAAKD,EAAK,KAAK,QAAQ,EACpFC,EAAI,SAAS,GAAGD,EAAI,OAAO,qBAAqB,CAClD,OAASK,EAAO,CACdL,EAAI,KAAO,CACT,MAAO,0BACP,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAGL,EAAI,IACT,EACAE,EAAK,CACP,CACF,EAEA,0BAA4C,MAAOF,EAAKC,EAAKC,IAAS,CACpE,GAAI,CACF,MAAM,EAAAU,QAAqB,eAAe,cAAY,QAASX,EAAKD,EAAK,KAAK,QAAQ,EACtFC,EAAI,SAASD,EAAI,OAAO,CAC1B,OAASK,EAAO,CACdL,EAAI,KAAO,CACT,MAAO,4BACP,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAGL,EAAI,IACT,EACAE,EAAK,CACP,CACF,CACF,CAGA,IAAOV,EAAQD",
   "names": ["controller_exports", "__export", "RequestReportController", "controller_default", "__toCommonJS", "import_utils", "import_personalisationUtils", "import_filtersTypeEnum", "import_ErrorHandler", "layoutPath", "services", "req", "res", "next", "requestRenderData", "AysncRequestUtils", "error", "ErrorHandler", "executionData", "executionId", "dataProductDefinitionsPath", "redirect", "filters", "PersonalisationUtils"]
 }

package/dpr/routes/journeys/request-report/status/controller.js CHANGED Viewed

@@ -1,2 +1,2 @@
-"use strict";var p=Object.create;var i=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var h=Object.getOwnPropertyNames;var v=Object.getPrototypeOf,m=Object.prototype.hasOwnProperty;var f=(r,t)=>{for(var e in t)i(r,e,{get:t[e],enumerable:!0})},u=(r,t,e,o)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of h(t))!m.call(r,s)&&s!==e&&i(r,s,{get:()=>t[s],enumerable:!(o=y(t,s))||o.enumerable});return r};var a=(r,t,e)=>(e=r!=null?p(v(r)):{},u(t||!r||!r.__esModule?i(e,"default",{value:r,enumerable:!0}):e,r)),P=r=>u(i({},"__esModule",{value:!0}),r);var g={};f(g,{RequestStatusController:()=>n,default:()=>R});module.exports=P(g);var c=a(require("./utils")),l=a(require("../../../../components/user-reports/requested/utils")),d=a(require("../../../../utils/ErrorHandler"));class n{constructor(t,e){this.GET=async(t,e,o)=>{try{const s=await c.default.renderPolling({req:t,res:e,services:this.services,next:o});e.render("dpr/routes/journeys/request-report/status/view",{layoutPath:this.layoutPath,...s})}catch(s){t.body.title="Failed to retrieve report status",t.body.errorDescription="We were unable to retrieve the report status:",t.body.error=new d.default(s).formatError(),o()}};this.POST=async(t,e,o)=>{try{const s=await l.default.getRequestStatus({req:t,res:e,services:this.services});e.send({status:s.status})}catch{e.send({status:"FAILED"})}};this.layoutPath=t,this.services=e}}var R=n;0&&(module.exports={RequestStatusController});
+"use strict";var p=Object.create;var i=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var h=Object.getOwnPropertyNames;var v=Object.getPrototypeOf,m=Object.prototype.hasOwnProperty;var f=(r,t)=>{for(var e in t)i(r,e,{get:t[e],enumerable:!0})},u=(r,t,e,o)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of h(t))!m.call(r,s)&&s!==e&&i(r,s,{get:()=>t[s],enumerable:!(o=y(t,s))||o.enumerable});return r};var a=(r,t,e)=>(e=r!=null?p(v(r)):{},u(t||!r||!r.__esModule?i(e,"default",{value:r,enumerable:!0}):e,r)),P=r=>u(i({},"__esModule",{value:!0}),r);var g={};f(g,{RequestStatusController:()=>n,default:()=>R});module.exports=P(g);var c=a(require("./utils")),l=a(require("../../../../components/user-reports/requested/utils")),d=a(require("../../../../utils/ErrorHandler"));class n{layoutPath;services;constructor(t,e){this.layoutPath=t,this.services=e}GET=async(t,e,o)=>{try{const s=await c.default.renderPolling({req:t,res:e,services:this.services,next:o});e.render("dpr/routes/journeys/request-report/status/view",{layoutPath:this.layoutPath,...s})}catch(s){t.body.title="Failed to retrieve report status",t.body.errorDescription="We were unable to retrieve the report status:",t.body.error=new d.default(s).formatError(),o()}};POST=async(t,e,o)=>{try{const s=await l.default.getRequestStatus({req:t,res:e,services:this.services});e.send({status:s.status})}catch{e.send({status:"FAILED"})}}}var R=n;0&&(module.exports={RequestStatusController});
 //# sourceMappingURL=controller.js.map