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

package/dpr/data/dashboardClient.js

@@ -1,2 +1,2 @@
-var m=Object.create;var g=Object.defineProperty;var p=Object.getOwnPropertyDescriptor;var u=Object.getOwnPropertyNames;var b=Object.getPrototypeOf,C=Object.prototype.hasOwnProperty;var $=(r,s)=>{for(var t in s)g(r,t,{get:s[t],enumerable:!0})},c=(r,s,t,n)=>{if(s&&typeof s=="object"||typeof s=="function")for(let i of u(s))!C.call(r,i)&&i!==t&&g(r,i,{get:()=>s[i],enumerable:!(n=p(s,i))||n.enumerable});return r};var l=(r,s,t)=>(t=r!=null?m(b(r)):{},c(s||!r||!r.__esModule?g(t,"default",{value:r,enumerable:!0}):t,r)),y=r=>c(g({},"__esModule",{value:!0}),r);var P={};$(P,{DashboardClient:()=>h,default:()=>R});module.exports=y(P);var a=l(require("../utils/logger")),D=l(require("./restClient"));class h{constructor(s){this.restClient=new D.default("Dashboard API Client",s)}getDefinition(s,t,n,i){this.logInfo("Get definition:",{dpdId:n,dashboardId:t});const e={dataProductDefinitionsPath:i};return this.restClient.get({path:`/definitions/${n}/dashboards/${t}`,query:e,token:s}).then(o=>o)}requestAsyncDashboard(s,t,n,i){return this.logInfo("Request dashboard:",{reportId:t,dashboardId:n}),this.restClient.get({path:`/async/dashboards/${t}/${n}`,token:s,query:i}).then(e=>e)}getAsyncDashboard(s,t,n,i,e){return this.logInfo("Get dashboard:",{reportId:t,dashboardId:n,tableId:i}),this.restClient.get({path:`/reports/${t}/dashboards/${n}/tables/${i}/result`,token:s,query:e}).then(o=>o)}getAsyncStatus(s,t,n,i,e,o){return this.logInfo("Get status:",{reportId:t,dashboardId:n,executionId:i,tableId:e}),this.restClient.get({path:`/reports/${t}/dashboards/${n}/statements/${i}/status`,token:s,query:{dataProductDefinitionsPath:o,tableId:e}}).then(f=>f)}cancelAsyncRequest(s,t,n,i,e){return this.logInfo("Cancel request:",{reportId:t,dashboardId:n,executionId:i}),this.restClient.delete({path:`/reports/${t}/dashboards/${n}/statements/${i}`,token:s,query:{dataProductDefinitionsPath:e}}).then(o=>o)}logInfo(s,t){a.default.info(`Dashboard client: ${s}:`),t&&Object.keys(t).length&&a.default.info(JSON.stringify(t,null,2))}}var R=h;0&&(module.exports={DashboardClient});
+"use strict";var D=Object.create;var a=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var p=Object.getOwnPropertyNames;var b=Object.getPrototypeOf,C=Object.prototype.hasOwnProperty;var $=(i,s)=>{for(var t in s)a(i,t,{get:s[t],enumerable:!0})},c=(i,s,t,e)=>{if(s&&typeof s=="object"||typeof s=="function")for(let n of p(s))!C.call(i,n)&&n!==t&&a(i,n,{get:()=>s[n],enumerable:!(e=u(s,n))||e.enumerable});return i};var m=(i,s,t)=>(t=i!=null?D(b(i)):{},c(s||!i||!i.__esModule?a(t,"default",{value:i,enumerable:!0}):t,i)),y=i=>c(a({},"__esModule",{value:!0}),i);var P={};$(P,{DashboardClient:()=>h,default:()=>R});module.exports=y(P);var g=m(require("../utils/logger")),l=m(require("./restClient"));class h{constructor(s){this.restClient=new l.default("Dashboard API Client",s)}getDefinition(s,t,e,n){this.logInfo("Get definition:",{dpdId:e,dashboardId:t});const r={dataProductDefinitionsPath:n};return this.restClient.get({path:`/definitions/${e}/dashboards/${t}`,query:r,token:s}).then(o=>o)}requestAsyncDashboard(s,t,e,n){return this.logInfo("Request dashboard:",{reportId:t,dashboardId:e}),this.restClient.get({path:`/async/dashboards/${t}/${e}`,token:s,query:n}).then(r=>r)}getAsyncDashboard(s,t,e,n,r){return this.logInfo("Get dashboard:",{reportId:t,dashboardId:e,tableId:n}),this.restClient.get({path:`/reports/${t}/dashboards/${e}/tables/${n}/result`,token:s,query:r}).then(o=>o)}getAsyncStatus(s,t,e,n,r,o){return this.logInfo("Get status:",{reportId:t,dashboardId:e,executionId:n,tableId:r}),this.restClient.get({path:`/reports/${t}/dashboards/${e}/statements/${n}/status`,token:s,query:{dataProductDefinitionsPath:o,tableId:r}}).then(f=>f)}cancelAsyncRequest(s,t,e,n,r){return this.logInfo("Cancel request:",{reportId:t,dashboardId:e,executionId:n}),this.restClient.delete({path:`/reports/${t}/dashboards/${e}/statements/${n}`,token:s,query:{dataProductDefinitionsPath:r}}).then(o=>o)}logInfo(s,t){g.default.info(`Dashboard client: ${s}:`),t&&Object.keys(t).length&&g.default.info(JSON.stringify(t,null,2))}}var R=h;0&&(module.exports={DashboardClient});
 //# sourceMappingURL=dashboardClient.js.map

package/dpr/data/dashboardClient.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/data/dashboardClient.ts"],
-  "sourcesContent": ["import logger from '../utils/logger'\nimport RestClient from './restClient'\nimport Dict = NodeJS.Dict\nimport { ApiConfig } from './types'\nimport { components } from '../types/api'\nimport { DashboardDataResponse } from '../types/Metrics'\n\nclass DashboardClient {\n  restClient: RestClient\n\n  constructor(config: ApiConfig) {\n    this.restClient = new RestClient('Dashboard API Client', config)\n  }\n\n  getDefinition(\n    token: string,\n    dashboardId: string,\n    dpdId: string,\n    definitionsPath?: string,\n  ): Promise<components['schemas']['DashboardDefinition']> {\n    this.logInfo('Get definition:', { dpdId, dashboardId })\n    const query = {\n      dataProductDefinitionsPath: definitionsPath,\n    }\n    return this.restClient\n      .get({\n        path: `/definitions/${dpdId}/dashboards/${dashboardId}`,\n        query,\n        token,\n      })\n      .then((response) => <components['schemas']['DashboardDefinition']>response)\n  }\n\n  requestAsyncDashboard(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    query: Record<string, string | boolean | number>,\n  ): Promise<Dict<string>> {\n    this.logInfo('Request dashboard:', { reportId, dashboardId })\n\n    return this.restClient\n      .get({\n        path: `/async/dashboards/${reportId}/${dashboardId}`,\n        token,\n        query,\n      })\n      .then((response) => <Dict<string>>response)\n  }\n\n  getAsyncDashboard(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    tableId: string,\n    query: Record<string, string | string[]>,\n  ): Promise<DashboardDataResponse[][]> {\n    this.logInfo('Get dashboard:', { reportId, dashboardId, tableId })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/dashboards/${dashboardId}/tables/${tableId}/result`,\n        token,\n        query,\n      })\n      .then((response) => <DashboardDataResponse[][]>response)\n  }\n\n  getAsyncStatus(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    executionId: string,\n    tableId?: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Dict<string>> {\n    this.logInfo('Get status:', { reportId, dashboardId, executionId, tableId })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/dashboards/${dashboardId}/statements/${executionId}/status`,\n        token,\n        query: {\n          dataProductDefinitionsPath,\n          tableId,\n        },\n      })\n      .then((response) => <Dict<string>>response)\n  }\n\n  cancelAsyncRequest(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    executionId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Dict<string>> {\n    this.logInfo('Cancel request:', { reportId, dashboardId, executionId })\n\n    return this.restClient\n      .delete({\n        path: `/reports/${reportId}/dashboards/${dashboardId}/statements/${executionId}`,\n        token,\n        query: {\n          dataProductDefinitionsPath,\n        },\n      })\n      .then((response) => <Dict<string>>response)\n  }\n\n  logInfo(title: string, args?: Dict<string>) {\n    logger.info(`Dashboard client: ${title}:`)\n    if (args && Object.keys(args).length) logger.info(JSON.stringify(args, null, 2))\n  }\n}\n\nexport { DashboardClient }\nexport default DashboardClient\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAAmB,8BACnBC,EAAuB,2BAMvB,MAAMJ,CAAgB,CAGpB,YAAYK,EAAmB,CAC7B,KAAK,WAAa,IAAI,EAAAC,QAAW,uBAAwBD,CAAM,CACjE,CAEA,cACEE,EACAC,EACAC,EACAC,EACuD,CACvD,KAAK,QAAQ,kBAAmB,CAAE,MAAAD,EAAO,YAAAD,CAAY,CAAC,EACtD,MAAMG,EAAQ,CACZ,2BAA4BD,CAC9B,EACA,OAAO,KAAK,WACT,IAAI,CACH,KAAM,gBAAgBD,CAAK,eAAeD,CAAW,GACrD,MAAAG,EACA,MAAAJ,CACF,CAAC,EACA,KAAMK,GAA2DA,CAAQ,CAC9E,CAEA,sBACEL,EACAM,EACAL,EACAG,EACuB,CACvB,YAAK,QAAQ,qBAAsB,CAAE,SAAAE,EAAU,YAAAL,CAAY,CAAC,EAErD,KAAK,WACT,IAAI,CACH,KAAM,qBAAqBK,CAAQ,IAAIL,CAAW,GAClD,MAAAD,EACA,MAAAI,CACF,CAAC,EACA,KAAMC,GAA2BA,CAAQ,CAC9C,CAEA,kBACEL,EACAM,EACAL,EACAM,EACAH,EACoC,CACpC,YAAK,QAAQ,iBAAkB,CAAE,SAAAE,EAAU,YAAAL,EAAa,QAAAM,CAAQ,CAAC,EAE1D,KAAK,WACT,IAAI,CACH,KAAM,YAAYD,CAAQ,eAAeL,CAAW,WAAWM,CAAO,UACtE,MAAAP,EACA,MAAAI,CACF,CAAC,EACA,KAAMC,GAAwCA,CAAQ,CAC3D,CAEA,eACEL,EACAM,EACAL,EACAO,EACAD,EACAE,EACuB,CACvB,YAAK,QAAQ,cAAe,CAAE,SAAAH,EAAU,YAAAL,EAAa,YAAAO,EAAa,QAAAD,CAAQ,CAAC,EAEpE,KAAK,WACT,IAAI,CACH,KAAM,YAAYD,CAAQ,eAAeL,CAAW,eAAeO,CAAW,UAC9E,MAAAR,EACA,MAAO,CACL,2BAAAS,EACA,QAAAF,CACF,CACF,CAAC,EACA,KAAMF,GAA2BA,CAAQ,CAC9C,CAEA,mBACEL,EACAM,EACAL,EACAO,EACAC,EACuB,CACvB,YAAK,QAAQ,kBAAmB,CAAE,SAAAH,EAAU,YAAAL,EAAa,YAAAO,CAAY,CAAC,EAE/D,KAAK,WACT,OAAO,CACN,KAAM,YAAYF,CAAQ,eAAeL,CAAW,eAAeO,CAAW,GAC9E,MAAAR,EACA,MAAO,CACL,2BAAAS,CACF,CACF,CAAC,EACA,KAAMJ,GAA2BA,CAAQ,CAC9C,CAEA,QAAQK,EAAeC,EAAqB,CAC1C,EAAAC,QAAO,KAAK,qBAAqBF,CAAK,GAAG,EACrCC,GAAQ,OAAO,KAAKA,CAAI,EAAE,QAAQ,EAAAC,QAAO,KAAK,KAAK,UAAUD,EAAM,KAAM,CAAC,CAAC,CACjF,CACF,CAGA,IAAOjB,EAAQD",
+  "sourcesContent": ["import logger from '../utils/logger'\nimport RestClient from './restClient'\nimport Dict = NodeJS.Dict\nimport { ApiConfig } from './types'\nimport { components } from '../types/api'\nimport { DashboardDataResponse } from '../types/Metrics'\n\nclass DashboardClient {\n  restClient: RestClient\n\n  constructor(config: ApiConfig) {\n    this.restClient = new RestClient('Dashboard API Client', config)\n  }\n\n  getDefinition(\n    token: string,\n    dashboardId: string,\n    dpdId: string,\n    definitionsPath?: string,\n  ): Promise<components['schemas']['DashboardDefinition']> {\n    this.logInfo('Get definition:', { dpdId, dashboardId })\n    const query = {\n      dataProductDefinitionsPath: definitionsPath,\n    }\n    return this.restClient\n      .get({\n        path: `/definitions/${dpdId}/dashboards/${dashboardId}`,\n        query,\n        token,\n      })\n      .then((response) => <components['schemas']['DashboardDefinition']>response)\n  }\n\n  requestAsyncDashboard(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    query: Record<string, string | boolean | number>,\n  ): Promise<Dict<string>> {\n    this.logInfo('Request dashboard:', { reportId, dashboardId })\n\n    return this.restClient\n      .get({\n        path: `/async/dashboards/${reportId}/${dashboardId}`,\n        token,\n        query,\n      })\n      .then((response) => <Dict<string>>response)\n  }\n\n  getAsyncDashboard(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    tableId: string,\n    query: Record<string, string | string[]>,\n  ): Promise<DashboardDataResponse[][]> {\n    this.logInfo('Get dashboard:', { reportId, dashboardId, tableId })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/dashboards/${dashboardId}/tables/${tableId}/result`,\n        token,\n        query,\n      })\n      .then((response) => <DashboardDataResponse[][]>response)\n  }\n\n  getAsyncStatus(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    executionId: string,\n    tableId?: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<components['schemas']['StatementExecutionStatus']> {\n    this.logInfo('Get status:', { reportId, dashboardId, executionId, tableId })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/dashboards/${dashboardId}/statements/${executionId}/status`,\n        token,\n        query: {\n          dataProductDefinitionsPath,\n          tableId,\n        },\n      })\n      .then((response) => <components['schemas']['StatementExecutionStatus']>response)\n  }\n\n  cancelAsyncRequest(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    executionId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Dict<string>> {\n    this.logInfo('Cancel request:', { reportId, dashboardId, executionId })\n\n    return this.restClient\n      .delete({\n        path: `/reports/${reportId}/dashboards/${dashboardId}/statements/${executionId}`,\n        token,\n        query: {\n          dataProductDefinitionsPath,\n        },\n      })\n      .then((response) => <Dict<string>>response)\n  }\n\n  logInfo(title: string, args?: Dict<string>) {\n    logger.info(`Dashboard client: ${title}:`)\n    if (args && Object.keys(args).length) logger.info(JSON.stringify(args, null, 2))\n  }\n}\n\nexport { DashboardClient }\nexport default DashboardClient\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAAmB,8BACnBC,EAAuB,2BAMvB,MAAMJ,CAAgB,CAGpB,YAAYK,EAAmB,CAC7B,KAAK,WAAa,IAAI,EAAAC,QAAW,uBAAwBD,CAAM,CACjE,CAEA,cACEE,EACAC,EACAC,EACAC,EACuD,CACvD,KAAK,QAAQ,kBAAmB,CAAE,MAAAD,EAAO,YAAAD,CAAY,CAAC,EACtD,MAAMG,EAAQ,CACZ,2BAA4BD,CAC9B,EACA,OAAO,KAAK,WACT,IAAI,CACH,KAAM,gBAAgBD,CAAK,eAAeD,CAAW,GACrD,MAAAG,EACA,MAAAJ,CACF,CAAC,EACA,KAAMK,GAA2DA,CAAQ,CAC9E,CAEA,sBACEL,EACAM,EACAL,EACAG,EACuB,CACvB,YAAK,QAAQ,qBAAsB,CAAE,SAAAE,EAAU,YAAAL,CAAY,CAAC,EAErD,KAAK,WACT,IAAI,CACH,KAAM,qBAAqBK,CAAQ,IAAIL,CAAW,GAClD,MAAAD,EACA,MAAAI,CACF,CAAC,EACA,KAAMC,GAA2BA,CAAQ,CAC9C,CAEA,kBACEL,EACAM,EACAL,EACAM,EACAH,EACoC,CACpC,YAAK,QAAQ,iBAAkB,CAAE,SAAAE,EAAU,YAAAL,EAAa,QAAAM,CAAQ,CAAC,EAE1D,KAAK,WACT,IAAI,CACH,KAAM,YAAYD,CAAQ,eAAeL,CAAW,WAAWM,CAAO,UACtE,MAAAP,EACA,MAAAI,CACF,CAAC,EACA,KAAMC,GAAwCA,CAAQ,CAC3D,CAEA,eACEL,EACAM,EACAL,EACAO,EACAD,EACAE,EAC4D,CAC5D,YAAK,QAAQ,cAAe,CAAE,SAAAH,EAAU,YAAAL,EAAa,YAAAO,EAAa,QAAAD,CAAQ,CAAC,EAEpE,KAAK,WACT,IAAI,CACH,KAAM,YAAYD,CAAQ,eAAeL,CAAW,eAAeO,CAAW,UAC9E,MAAAR,EACA,MAAO,CACL,2BAAAS,EACA,QAAAF,CACF,CACF,CAAC,EACA,KAAMF,GAAgEA,CAAQ,CACnF,CAEA,mBACEL,EACAM,EACAL,EACAO,EACAC,EACuB,CACvB,YAAK,QAAQ,kBAAmB,CAAE,SAAAH,EAAU,YAAAL,EAAa,YAAAO,CAAY,CAAC,EAE/D,KAAK,WACT,OAAO,CACN,KAAM,YAAYF,CAAQ,eAAeL,CAAW,eAAeO,CAAW,GAC9E,MAAAR,EACA,MAAO,CACL,2BAAAS,CACF,CACF,CAAC,EACA,KAAMJ,GAA2BA,CAAQ,CAC9C,CAEA,QAAQK,EAAeC,EAAqB,CAC1C,EAAAC,QAAO,KAAK,qBAAqBF,CAAK,GAAG,EACrCC,GAAQ,OAAO,KAAKA,CAAI,EAAE,QAAQ,EAAAC,QAAO,KAAK,KAAK,UAAUD,EAAM,KAAM,CAAC,CAAC,CACjF,CACF,CAGA,IAAOjB,EAAQD",
   "names": ["dashboardClient_exports", "__export", "DashboardClient", "dashboardClient_default", "__toCommonJS", "import_logger", "import_restClient", "config", "RestClient", "token", "dashboardId", "dpdId", "definitionsPath", "query", "response", "reportId", "tableId", "executionId", "dataProductDefinitionsPath", "title", "args", "logger"]
 }

package/dpr/data/dashboardClient.ts

@@ -73,7 +73,7 @@ class DashboardClient {
     executionId: string,
     tableId?: string,
     dataProductDefinitionsPath?: string,
-  ): Promise<Dict<string>> {
+  ): Promise<components['schemas']['StatementExecutionStatus']> {
     this.logInfo('Get status:', { reportId, dashboardId, executionId, tableId })
 
     return this.restClient
@@ -85,7 +85,7 @@ class DashboardClient {
           tableId,
         },
       })
-      .then((response) => <Dict<string>>response)
+      .then((response) => <components['schemas']['StatementExecutionStatus']>response)
   }
 
   cancelAsyncRequest(

package/dpr/data/dprReportingClient.js

@@ -1,2 +1,2 @@
-var R=Object.create;var i=Object.defineProperty;var f=Object.getOwnPropertyDescriptor;var w=Object.getOwnPropertyNames;var u=Object.getPrototypeOf,D=Object.prototype.hasOwnProperty;var S=(t,e)=>{for(var r in e)i(t,r,{get:e[r],enumerable:!0})},m=(t,e,r,l)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of w(e))!D.call(t,o)&&o!==r&&i(t,o,{get:()=>e[o],enumerable:!(l=f(e,o))||l.enumerable});return t};var n=(t,e,r)=>(r=t!=null?R(u(t)):{},m(e||!t||!t.__esModule?i(r,"default",{value:t,enumerable:!0}):r,t)),b=t=>m(i({},"__esModule",{value:!0}),t);var h={};S(h,{default:()=>g,initDprReportingClients:()=>c});module.exports=b(h);var p=n(require("./reportingClient")),s=n(require("./dashboardClient")),C=n(require("./reportDataStore")),a=n(require("../services/missingReport/missingReportClient")),d=require("../services/productCollection/productCollectionService");const c=(t,e,r)=>({reportingClient:new p.default(t),dashboardClient:new s.default(t),reportDataStore:new C.default(e,r),missingReportClient:new a.default(t),productCollectionService:new d.ProductCollectionService(t)});var g=c;0&&(module.exports={initDprReportingClients});
+"use strict";var f=Object.create;var n=Object.defineProperty;var c=Object.getOwnPropertyDescriptor;var w=Object.getOwnPropertyNames;var u=Object.getPrototypeOf,D=Object.prototype.hasOwnProperty;var b=(t,e)=>{for(var o in e)n(t,o,{get:e[o],enumerable:!0})},m=(t,e,o,l)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of w(e))!D.call(t,r)&&r!==o&&n(t,r,{get:()=>e[r],enumerable:!(l=c(e,r))||l.enumerable});return t};var i=(t,e,o)=>(o=t!=null?f(u(t)):{},m(e||!t||!t.__esModule?n(o,"default",{value:t,enumerable:!0}):o,t)),g=t=>m(n({},"__esModule",{value:!0}),t);var x={};b(x,{default:()=>h,initDprReportingClients:()=>R});module.exports=g(x);var p=i(require("./reportingClient")),C=i(require("./dashboardClient")),s=i(require("./reportDataStore")),a=i(require("./missingReportClient")),d=i(require("./productCollectionClient"));const R=(t,e,o)=>({reportingClient:new p.default(t),dashboardClient:new C.default(t),reportDataStore:new s.default(e,o),missingReportClient:new a.default(t),productCollectionClient:new d.default(t)});var h=R;0&&(module.exports={initDprReportingClients});
 //# sourceMappingURL=dprReportingClient.js.map

package/dpr/data/dprReportingClient.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/data/dprReportingClient.ts"],
-  "sourcesContent": ["import ReportingClient from './reportingClient'\nimport DashboardClient from './dashboardClient'\nimport ReportDataStore, { RedisClient } from './reportDataStore'\nimport { ApiConfig } from './types'\nimport MissingReportClient from '../services/missingReport/missingReportClient'\nimport { ProductCollectionService } from '../services/productCollection/productCollectionService'\n\nexport const initDprReportingClients = (\n  reportingApiConfig: ApiConfig,\n  redisClient: RedisClient,\n  storePrefix?: string,\n) => {\n  return {\n    reportingClient: new ReportingClient(reportingApiConfig),\n    dashboardClient: new DashboardClient(reportingApiConfig),\n    reportDataStore: new ReportDataStore(redisClient, storePrefix),\n    missingReportClient: new MissingReportClient(reportingApiConfig),\n    productCollectionService: new ProductCollectionService(reportingApiConfig),\n  }\n}\n\nexport default initDprReportingClients\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,4BAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAA4B,gCAC5BC,EAA4B,gCAC5BC,EAA6C,gCAE7CC,EAAgC,4DAChCC,EAAyC,kEAElC,MAAMN,EAA0B,CACrCO,EACAC,EACAC,KAEO,CACL,gBAAiB,IAAI,EAAAC,QAAgBH,CAAkB,EACvD,gBAAiB,IAAI,EAAAI,QAAgBJ,CAAkB,EACvD,gBAAiB,IAAI,EAAAK,QAAgBJ,EAAaC,CAAW,EAC7D,oBAAqB,IAAI,EAAAI,QAAoBN,CAAkB,EAC/D,yBAA0B,IAAI,2BAAyBA,CAAkB,CAC3E,GAGF,IAAOR,EAAQC",
-  "names": ["dprReportingClient_exports", "__export", "dprReportingClient_default", "initDprReportingClients", "__toCommonJS", "import_reportingClient", "import_dashboardClient", "import_reportDataStore", "import_missingReportClient", "import_productCollectionService", "reportingApiConfig", "redisClient", "storePrefix", "ReportingClient", "DashboardClient", "ReportDataStore", "MissingReportClient"]
+  "sourcesContent": ["import ReportingClient from './reportingClient'\nimport DashboardClient from './dashboardClient'\nimport ReportDataStore, { RedisClient } from './reportDataStore'\nimport { ApiConfig } from './types'\nimport MissingReportClient from './missingReportClient'\nimport ProductCollectionClient from './productCollectionClient'\n\nexport const initDprReportingClients = (\n  reportingApiConfig: ApiConfig,\n  redisClient: RedisClient,\n  storePrefix?: string,\n) => {\n  return {\n    reportingClient: new ReportingClient(reportingApiConfig),\n    dashboardClient: new DashboardClient(reportingApiConfig),\n    reportDataStore: new ReportDataStore(redisClient, storePrefix),\n    missingReportClient: new MissingReportClient(reportingApiConfig),\n    productCollectionClient: new ProductCollectionClient(reportingApiConfig),\n  }\n}\n\nexport default initDprReportingClients\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,4BAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAA4B,gCAC5BC,EAA4B,gCAC5BC,EAA6C,gCAE7CC,EAAgC,oCAChCC,EAAoC,wCAE7B,MAAMN,EAA0B,CACrCO,EACAC,EACAC,KAEO,CACL,gBAAiB,IAAI,EAAAC,QAAgBH,CAAkB,EACvD,gBAAiB,IAAI,EAAAI,QAAgBJ,CAAkB,EACvD,gBAAiB,IAAI,EAAAK,QAAgBJ,EAAaC,CAAW,EAC7D,oBAAqB,IAAI,EAAAI,QAAoBN,CAAkB,EAC/D,wBAAyB,IAAI,EAAAO,QAAwBP,CAAkB,CACzE,GAGF,IAAOR,EAAQC",
+  "names": ["dprReportingClient_exports", "__export", "dprReportingClient_default", "initDprReportingClients", "__toCommonJS", "import_reportingClient", "import_dashboardClient", "import_reportDataStore", "import_missingReportClient", "import_productCollectionClient", "reportingApiConfig", "redisClient", "storePrefix", "ReportingClient", "DashboardClient", "ReportDataStore", "MissingReportClient", "ProductCollectionClient"]
 }

package/dpr/data/dprReportingClient.ts

@@ -2,8 +2,8 @@ import ReportingClient from './reportingClient'
 import DashboardClient from './dashboardClient'
 import ReportDataStore, { RedisClient } from './reportDataStore'
 import { ApiConfig } from './types'
-import MissingReportClient from '../services/missingReport/missingReportClient'
-import { ProductCollectionService } from '../services/productCollection/productCollectionService'
+import MissingReportClient from './missingReportClient'
+import ProductCollectionClient from './productCollectionClient'
 
 export const initDprReportingClients = (
   reportingApiConfig: ApiConfig,
@@ -15,7 +15,7 @@ export const initDprReportingClients = (
     dashboardClient: new DashboardClient(reportingApiConfig),
     reportDataStore: new ReportDataStore(redisClient, storePrefix),
     missingReportClient: new MissingReportClient(reportingApiConfig),
-    productCollectionService: new ProductCollectionService(reportingApiConfig),
+    productCollectionClient: new ProductCollectionClient(reportingApiConfig),
   }
 }
 

package/dpr/data/missingReportClient.js

@@ -0,0 +1,2 @@
+"use strict";var g=Object.create;var r=Object.defineProperty;var l=Object.getOwnPropertyDescriptor;var C=Object.getOwnPropertyNames;var c=Object.getPrototypeOf,f=Object.prototype.hasOwnProperty;var u=(t,i)=>{for(var s in i)r(t,s,{get:i[s],enumerable:!0})},p=(t,i,s,n)=>{if(i&&typeof i=="object"||typeof i=="function")for(let e of C(i))!f.call(t,e)&&e!==s&&r(t,e,{get:()=>i[e],enumerable:!(n=l(i,e))||n.enumerable});return t};var R=(t,i,s)=>(s=t!=null?g(c(t)):{},p(i||!t||!t.__esModule?r(s,"default",{value:t,enumerable:!0}):s,t)),a=t=>p(r({},"__esModule",{value:!0}),t);var M={};u(M,{MissingReportClient:()=>o,default:()=>h});module.exports=a(M);var m=R(require("./restClient"));class o{constructor(i){this.restClient=new m.default("Missing report API Client",i)}submitMissingReportEntry(i,s,n,e){return this.restClient.post({path:`/missingRequest/${s}/${n}`,...e&&{data:e}},i)}}var h=o;0&&(module.exports={MissingReportClient});
+//# sourceMappingURL=missingReportClient.js.map

package/dpr/data/missingReportClient.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/dpr/data/missingReportClient.ts"],
+  "sourcesContent": ["import RestClient from './restClient'\nimport { ApiConfig } from './types'\nimport { components } from '../types/api'\n\nclass MissingReportClient {\n  restClient: RestClient\n\n  constructor(config: ApiConfig) {\n    this.restClient = new RestClient('Missing report API Client', config)\n  }\n\n  submitMissingReportEntry(\n    token: string,\n    reportId: string,\n    variantId: string,\n    reason?: string,\n  ): Promise<components['schemas']['MissingReportSubmission']> {\n    return this.restClient.post(\n      {\n        path: `/missingRequest/${reportId}/${variantId}`,\n        ...(reason && { data: reason }),\n      },\n      token,\n    )\n  }\n}\n\nexport { MissingReportClient }\nexport default MissingReportClient\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,yBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAAuB,2BAIvB,MAAMH,CAAoB,CAGxB,YAAYI,EAAmB,CAC7B,KAAK,WAAa,IAAI,EAAAC,QAAW,4BAA6BD,CAAM,CACtE,CAEA,yBACEE,EACAC,EACAC,EACAC,EAC2D,CAC3D,OAAO,KAAK,WAAW,KACrB,CACE,KAAM,mBAAmBF,CAAQ,IAAIC,CAAS,GAC9C,GAAIC,GAAU,CAAE,KAAMA,CAAO,CAC/B,EACAH,CACF,CACF,CACF,CAGA,IAAOL,EAAQD",
+  "names": ["missingReportClient_exports", "__export", "MissingReportClient", "missingReportClient_default", "__toCommonJS", "import_restClient", "config", "RestClient", "token", "reportId", "variantId", "reason"]
+}

package/dpr/{services/missingReport → data}/missingReportClient.ts

@@ -1,6 +1,6 @@
-import RestClient from '../../data/restClient'
-import { ApiConfig } from '../../data/types'
-import { components } from '../../types/api'
+import RestClient from './restClient'
+import { ApiConfig } from './types'
+import { components } from '../types/api'
 
 class MissingReportClient {
   restClient: RestClient
@@ -18,7 +18,7 @@ class MissingReportClient {
     return this.restClient.post(
       {
         path: `/missingRequest/${reportId}/${variantId}`,
-        data: reason,
+        ...(reason && { data: reason }),
       },
       token,
     )

package/dpr/data/productCollectionClient.js

@@ -0,0 +1,2 @@
+"use strict";var C=Object.create;var r=Object.defineProperty;var m=Object.getOwnPropertyDescriptor;var p=Object.getOwnPropertyNames;var u=Object.getPrototypeOf,a=Object.prototype.hasOwnProperty;var d=(o,t)=>{for(var e in t)r(o,e,{get:t[e],enumerable:!0})},c=(o,t,e,s)=>{if(t&&typeof t=="object"||typeof t=="function")for(let n of p(t))!a.call(o,n)&&n!==e&&r(o,n,{get:()=>t[n],enumerable:!(s=m(t,n))||s.enumerable});return o};var g=(o,t,e)=>(e=o!=null?C(u(o)):{},c(t||!o||!o.__esModule?r(e,"default",{value:o,enumerable:!0}):e,o)),P=o=>c(r({},"__esModule",{value:!0}),o);var f={};d(f,{ProductCollectionClient:()=>i,default:()=>h});module.exports=P(f);var l=g(require("./restClient"));class i{constructor(t){this.restClient=new l.default("ProductCollection API",t)}async getProductCollections(t){return this.restClient.get({path:"/productCollections",token:t})}async getProductCollection(t,e){return this.restClient.get({path:`/productCollections/${e}`,token:t})}}var h=i;0&&(module.exports={ProductCollectionClient});
+//# sourceMappingURL=productCollectionClient.js.map

package/dpr/data/productCollectionClient.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/dpr/data/productCollectionClient.ts"],
+  "sourcesContent": ["import { ApiConfig } from './types'\nimport { components } from '../types/api'\nimport RestClient from './restClient'\n\nclass ProductCollectionClient {\n  restClient: RestClient\n\n  constructor(config: ApiConfig) {\n    this.restClient = new RestClient('ProductCollection API', config)\n  }\n\n  async getProductCollections(token: string): Promise<components['schemas']['ProductCollectionSummary'][]> {\n    return this.restClient.get({\n      path: `/productCollections`,\n      token,\n    })\n  }\n\n  async getProductCollection(token: string, id: string): Promise<components['schemas']['ProductCollectionDTO']> {\n    return this.restClient.get({\n      path: `/productCollections/${id}`,\n      token,\n    })\n  }\n}\n\nexport { ProductCollectionClient }\nexport default ProductCollectionClient\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAuB,2BAEvB,MAAMH,CAAwB,CAG5B,YAAYI,EAAmB,CAC7B,KAAK,WAAa,IAAI,EAAAC,QAAW,wBAAyBD,CAAM,CAClE,CAEA,MAAM,sBAAsBE,EAA6E,CACvG,OAAO,KAAK,WAAW,IAAI,CACzB,KAAM,sBACN,MAAAA,CACF,CAAC,CACH,CAEA,MAAM,qBAAqBA,EAAeC,EAAoE,CAC5G,OAAO,KAAK,WAAW,IAAI,CACzB,KAAM,uBAAuBA,CAAE,GAC/B,MAAAD,CACF,CAAC,CACH,CACF,CAGA,IAAOL,EAAQD",
+  "names": ["productCollectionClient_exports", "__export", "ProductCollectionClient", "productCollectionClient_default", "__toCommonJS", "import_restClient", "config", "RestClient", "token", "id"]
+}

package/dpr/data/productCollectionClient.ts

@@ -0,0 +1,28 @@
+import { ApiConfig } from './types'
+import { components } from '../types/api'
+import RestClient from './restClient'
+
+class ProductCollectionClient {
+  restClient: RestClient
+
+  constructor(config: ApiConfig) {
+    this.restClient = new RestClient('ProductCollection API', config)
+  }
+
+  async getProductCollections(token: string): Promise<components['schemas']['ProductCollectionSummary'][]> {
+    return this.restClient.get({
+      path: `/productCollections`,
+      token,
+    })
+  }
+
+  async getProductCollection(token: string, id: string): Promise<components['schemas']['ProductCollectionDTO']> {
+    return this.restClient.get({
+      path: `/productCollections/${id}`,
+      token,
+    })
+  }
+}
+
+export { ProductCollectionClient }
+export default ProductCollectionClient

package/dpr/data/reportDataStore.js

@@ -1,2 +1,2 @@
-var l=Object.create;var o=Object.defineProperty;var c=Object.getOwnPropertyDescriptor;var g=Object.getOwnPropertyNames;var C=Object.getPrototypeOf,d=Object.prototype.hasOwnProperty;var u=(r,e)=>{for(var t in e)o(r,t,{get:e[t],enumerable:!0})},p=(r,e,t,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of g(e))!d.call(r,i)&&i!==t&&o(r,i,{get:()=>e[i],enumerable:!(s=c(e,i))||s.enumerable});return r};var R=(r,e,t)=>(t=r!=null?l(C(r)):{},p(e||!r||!r.__esModule?o(t,"default",{value:r,enumerable:!0}):t,r)),h=r=>p(o({},"__esModule",{value:!0}),r);var y={};u(y,{ReportDataStore:()=>a,default:()=>m});module.exports=h(y);var n=R(require("../utils/logger"));class a{constructor(e,t="dprReportStoreUser:"){this.redisClient=e;e.on("error",s=>{n.default.error(s,"Redis error")}),this.prefix=t}async ensureConnected(){this.redisClient.isOpen||await this.redisClient.connect()}async setUserConfig(e,t){await this.ensureConnected(),await this.redisClient.set(`${this.prefix}${e}`,JSON.stringify(t))}async getUserConfig(e){await this.ensureConnected();const t=await this.redisClient.get(`${this.prefix}${e}`);return t?JSON.parse(String(t)):this.setBaseplate(e)}async setBaseplate(e){n.default.info(`Initialising new DPR user config in store. prefix: ${this.prefix}`);const t={...f};return await this.setUserConfig(e,t),{...f}}}const f={requestedReports:[],recentlyViewedReports:[],bookmarks:[],downloadPermissions:[],defaultFilters:[]};var m=a;0&&(module.exports={ReportDataStore});
+"use strict";var l=Object.create;var o=Object.defineProperty;var c=Object.getOwnPropertyDescriptor;var g=Object.getOwnPropertyNames;var C=Object.getPrototypeOf,d=Object.prototype.hasOwnProperty;var u=(r,e)=>{for(var t in e)o(r,t,{get:e[t],enumerable:!0})},p=(r,e,t,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of g(e))!d.call(r,i)&&i!==t&&o(r,i,{get:()=>e[i],enumerable:!(s=c(e,i))||s.enumerable});return r};var R=(r,e,t)=>(t=r!=null?l(C(r)):{},p(e||!r||!r.__esModule?o(t,"default",{value:r,enumerable:!0}):t,r)),h=r=>p(o({},"__esModule",{value:!0}),r);var y={};u(y,{ReportDataStore:()=>a,default:()=>m});module.exports=h(y);var n=R(require("../utils/logger"));class a{constructor(e,t="dprReportStoreUser:"){this.redisClient=e;e.on("error",s=>{n.default.error(s,"Redis error")}),this.prefix=t}async ensureConnected(){this.redisClient.isOpen||await this.redisClient.connect()}async setUserConfig(e,t){await this.ensureConnected(),await this.redisClient.set(`${this.prefix}${e}`,JSON.stringify(t))}async getUserConfig(e){await this.ensureConnected();const t=await this.redisClient.get(`${this.prefix}${e}`);return t?JSON.parse(String(t)):this.setBaseplate(e)}async setBaseplate(e){n.default.info(`Initialising new DPR user config in store. prefix: ${this.prefix}`);const t={...f};return await this.setUserConfig(e,t),{...f}}}const f={requestedReports:[],recentlyViewedReports:[],bookmarks:[],downloadPermissions:[],defaultFilters:[]};var m=a;0&&(module.exports={ReportDataStore});
 //# sourceMappingURL=reportDataStore.js.map

package/dpr/data/reportDataStore.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/dpr/data/reportDataStore.ts"],
   "sourcesContent": ["// eslint-disable-next-line import/no-extraneous-dependencies\nimport { createClient } from 'redis'\nimport logger from '../utils/logger'\nimport { ReportStoreConfig } from '../types/ReportStore'\n\nexport type RedisClient = ReturnType<typeof createClient>\n\nclass ReportDataStore {\n  prefix: string\n\n  constructor(private readonly redisClient: RedisClient, prefix = 'dprReportStoreUser:') {\n    redisClient.on('error', (error) => {\n      logger.error(error, `Redis error`)\n    })\n    this.prefix = prefix\n  }\n\n  private async ensureConnected() {\n    if (!this.redisClient.isOpen) {\n      await this.redisClient.connect()\n    }\n  }\n\n  public async setUserConfig(userId: string, config: ReportStoreConfig): Promise<void> {\n    await this.ensureConnected()\n    await this.redisClient.set(`${this.prefix}${userId}`, JSON.stringify(config))\n  }\n\n  public async getUserConfig(userId: string): Promise<ReportStoreConfig> {\n    await this.ensureConnected()\n    const userConfig = await this.redisClient.get(`${this.prefix}${userId}`)\n    return userConfig ? JSON.parse(String(userConfig)) : this.setBaseplate(userId)\n  }\n\n  private async setBaseplate(userId: string) {\n    logger.info(`Initialising new DPR user config in store. prefix: ${this.prefix}`)\n    const userConfig = { ...baseplateStore }\n    await this.setUserConfig(userId, userConfig)\n    return { ...baseplateStore }\n  }\n}\n\nconst baseplateStore: ReportStoreConfig = {\n  requestedReports: [],\n  recentlyViewedReports: [],\n  bookmarks: [],\n  downloadPermissions: [],\n  defaultFilters: [],\n}\n\nexport { ReportDataStore }\nexport default ReportDataStore\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAmB,8BAKnB,MAAMH,CAAgB,CAGpB,YAA6BI,EAA0BC,EAAS,sBAAuB,CAA1D,iBAAAD,EAC3BA,EAAY,GAAG,QAAUE,GAAU,CACjC,EAAAC,QAAO,MAAMD,EAAO,aAAa,CACnC,CAAC,EACD,KAAK,OAASD,CAChB,CAEA,MAAc,iBAAkB,CACzB,KAAK,YAAY,QACpB,MAAM,KAAK,YAAY,QAAQ,CAEnC,CAEA,MAAa,cAAcG,EAAgBC,EAA0C,CACnF,MAAM,KAAK,gBAAgB,EAC3B,MAAM,KAAK,YAAY,IAAI,GAAG,KAAK,MAAM,GAAGD,CAAM,GAAI,KAAK,UAAUC,CAAM,CAAC,CAC9E,CAEA,MAAa,cAAcD,EAA4C,CACrE,MAAM,KAAK,gBAAgB,EAC3B,MAAME,EAAa,MAAM,KAAK,YAAY,IAAI,GAAG,KAAK,MAAM,GAAGF,CAAM,EAAE,EACvE,OAAOE,EAAa,KAAK,MAAM,OAAOA,CAAU,CAAC,EAAI,KAAK,aAAaF,CAAM,CAC/E,CAEA,MAAc,aAAaA,EAAgB,CACzC,EAAAD,QAAO,KAAK,sDAAsD,KAAK,MAAM,EAAE,EAC/E,MAAMG,EAAa,CAAE,GAAGC,CAAe,EACvC,aAAM,KAAK,cAAcH,EAAQE,CAAU,EACpC,CAAE,GAAGC,CAAe,CAC7B,CACF,CAEA,MAAMA,EAAoC,CACxC,iBAAkB,CAAC,EACnB,sBAAuB,CAAC,EACxB,UAAW,CAAC,EACZ,oBAAqB,CAAC,EACtB,eAAgB,CAAC,CACnB,EAGA,IAAOV,EAAQD",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAmB,8BAKnB,MAAMH,CAAgB,CAGpB,YAA6BI,EAA0BC,EAAS,sBAAuB,CAA1D,iBAAAD,EAC3BA,EAAY,GAAG,QAAUE,GAAU,CACjC,EAAAC,QAAO,MAAMD,EAAO,aAAa,CACnC,CAAC,EACD,KAAK,OAASD,CAChB,CAEA,MAAc,iBAAkB,CACzB,KAAK,YAAY,QACpB,MAAM,KAAK,YAAY,QAAQ,CAEnC,CAEA,MAAa,cAAcG,EAAgBC,EAA0C,CACnF,MAAM,KAAK,gBAAgB,EAC3B,MAAM,KAAK,YAAY,IAAI,GAAG,KAAK,MAAM,GAAGD,CAAM,GAAI,KAAK,UAAUC,CAAM,CAAC,CAC9E,CAEA,MAAa,cAAcD,EAA4C,CACrE,MAAM,KAAK,gBAAgB,EAC3B,MAAME,EAAa,MAAM,KAAK,YAAY,IAAI,GAAG,KAAK,MAAM,GAAGF,CAAM,EAAE,EACvE,OAAOE,EAAa,KAAK,MAAM,OAAOA,CAAU,CAAC,EAAI,KAAK,aAAaF,CAAM,CAC/E,CAEA,MAAc,aAAaA,EAAgB,CACzC,EAAAD,QAAO,KAAK,sDAAsD,KAAK,MAAM,EAAE,EAC/E,MAAMG,EAAa,CAAE,GAAGC,CAAe,EACvC,aAAM,KAAK,cAAcH,EAAQE,CAAU,EACpC,CAAE,GAAGC,CAAe,CAC7B,CACF,CAEA,MAAMA,EAAoC,CACxC,iBAAkB,CAAC,EACnB,sBAAuB,CAAC,EACxB,UAAW,CAAC,EACZ,oBAAqB,CAAC,EACtB,eAAgB,CAAC,CACnB,EAGA,IAAOV,EAAQD",
   "names": ["reportDataStore_exports", "__export", "ReportDataStore", "reportDataStore_default", "__toCommonJS", "import_logger", "redisClient", "prefix", "error", "logger", "userId", "config", "userConfig", "baseplateStore"]
 }

package/dpr/data/reportingClient.js

@@ -1,2 +1,2 @@
-var y=Object.create;var u=Object.defineProperty;var f=Object.getOwnPropertyDescriptor;var R=Object.getOwnPropertyNames;var D=Object.getPrototypeOf,C=Object.prototype.hasOwnProperty;var $=(s,e)=>{for(var t in e)u(s,t,{get:e[t],enumerable:!0})},c=(s,e,t,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of R(e))!C.call(s,i)&&i!==t&&u(s,i,{get:()=>e[i],enumerable:!(r=f(e,i))||r.enumerable});return s};var m=(s,e,t)=>(t=s!=null?y(D(s)):{},c(e||!s||!s.__esModule?u(t,"default",{value:s,enumerable:!0}):t,s)),P=s=>c(u({},"__esModule",{value:!0}),s);var q={};$(q,{ReportingClient:()=>h,default:()=>A});module.exports=P(q);var a=m(require("../utils/logger")),l=m(require("./restClient"));class h{constructor(e){this.restClient=new l.default("Reporting API Client",e)}getCount(e,t,r){return a.default.info(`Reporting client: Get count. { resourceName: ${e} }`),this.restClient.get({path:`/${e}/count`,query:r.toRecordWithFilterPrefix(!0),token:t}).then(i=>i.count)}getList(e,t,r){return this.getListWithWarnings(e,t,r).then(i=>i.data)}getListWithWarnings(e,t,r){return a.default.info(`Reporting client: Get list. { resourceName: ${e} }`),this.restClient.getWithHeaders({path:`/${e}`,query:r.toRecordWithFilterPrefix(!0),token:t}).then(i=>({data:i.data,warnings:{noDataAvailable:i.headers["x-no-data-warning"]}}))}getDefinitionSummary(e,t,r){this.logInfo("Get definition summary",{reportId:t});const i={dataProductDefinitionsPath:r};return this.restClient.get({path:`/definitions/${t}`,query:i,token:e}).then(n=>n)}getDefinitions(e,t){this.logInfo("Get definitions");const r={query:{renderMethod:"HTML",dataProductDefinitionsPath:t}};return this.restClient.get({path:"/definitions",query:r.query,token:e}).then(i=>i)}getDefinition(e,t,r,i){const n={dataProductDefinitionsPath:i};return this.logInfo("Get definition",{reportId:t,variantId:r}),this.restClient.get({path:`/definitions/${t}/${r}`,query:n,token:e}).then(o=>o)}getFieldValues({token:e,definitionName:t,variantName:r,fieldName:i,prefix:n,definitionsPath:o}){const g={dataProductDefinitionsPath:o,prefix:n};return this.logInfo("Get field values",{definitionName:t,variantName:r,fieldName:i,prefix:n}),this.restClient.get({path:`/reports/${t}/${r}/${i}`,token:e,query:g}).then(p=>p)}requestAsyncReport(e,t,r,i){return this.logInfo("Request report",{reportId:t,variantId:r}),this.restClient.get({path:`/async/reports/${t}/${r}`,token:e,query:i}).then(n=>n)}cancelAsyncRequest(e,t,r,i,n){return this.logInfo("Cancel Request",{reportId:t,variantId:r,executionId:i}),this.restClient.delete({path:`/reports/${t}/${r}/statements/${i}`,token:e,query:{dataProductDefinitionsPath:n}}).then(o=>o)}getAsyncReport(e,t,r,i,n){return this.logInfo("Get Data",{reportId:t,variantId:r,tableId:i}),this.restClient.get({path:`/reports/${t}/${r}/tables/${i}/result`,token:e,query:n}).then(o=>o)}getAsyncSummaryReport(e,t,r,i,n,o){return this.logInfo("Get summary data",{reportId:t,variantId:r,tableId:i,summaryId:n}),this.restClient.get({path:`/reports/${t}/${r}/tables/${i}/result/summary/${n}`,token:e,query:o}).then(g=>g)}getAsyncReportStatus(e,t,r,i,n,o){return this.logInfo("Get status",{reportId:t,variantId:r,tableId:o,executionId:i}),this.restClient.get({path:`/reports/${t}/${r}/statements/${i}/status`,token:e,query:{dataProductDefinitionsPath:n,tableId:o}}).then(g=>g)}getAsyncCount(e,t,r){return this.logInfo("Get count",{tableId:t}),this.restClient.get({path:`/report/tables/${t}/count`,token:e,query:{dataProductDefinitionsPath:r}}).then(i=>i.count)}getAsyncInteractiveCount(e,t,r,i,n){return this.logInfo("Get interactive count",{tableId:t,reportId:r,id:i}),this.restClient.get({path:`/reports/${r}/${i}/tables/${t}/count`,token:e,query:n.toRecordWithFilterPrefix(!0)}).then(o=>o.count)}logInfo(e,t){a.default.info(`Reporting Client: ${e}:`),t&&Object.keys(t).length&&a.default.info(JSON.stringify(t,null,2))}}var A=h;0&&(module.exports={ReportingClient});
+"use strict";var y=Object.create;var u=Object.defineProperty;var f=Object.getOwnPropertyDescriptor;var R=Object.getOwnPropertyNames;var C=Object.getPrototypeOf,D=Object.prototype.hasOwnProperty;var $=(s,e)=>{for(var t in e)u(s,t,{get:e[t],enumerable:!0})},c=(s,e,t,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let n of R(e))!D.call(s,n)&&n!==t&&u(s,n,{get:()=>e[n],enumerable:!(r=f(e,n))||r.enumerable});return s};var m=(s,e,t)=>(t=s!=null?y(C(s)):{},c(e||!s||!s.__esModule?u(t,"default",{value:s,enumerable:!0}):t,s)),P=s=>c(u({},"__esModule",{value:!0}),s);var q={};$(q,{ReportingClient:()=>h,default:()=>A});module.exports=P(q);var a=m(require("../utils/logger")),l=m(require("./restClient"));class h{constructor(e){this.restClient=new l.default("Reporting API Client",e)}getCount(e,t,r){return a.default.info(`Reporting client: Get count. { resourceName: ${e} }`),this.restClient.get({path:`/${e}/count`,query:r.toRecordWithFilterPrefix(!0),token:t}).then(n=>n.count)}getList(e,t,r){return this.getListWithWarnings(e,t,r).then(n=>n.data)}getListWithWarnings(e,t,r){return a.default.info(`Reporting client: Get list. { resourceName: ${e} }`),this.restClient.getWithHeaders({path:`/${e}`,query:r.toRecordWithFilterPrefix(!0),token:t}).then(n=>({data:n.data,warnings:{noDataAvailable:n.headers["x-no-data-warning"]}}))}getDefinitionSummary(e,t,r){this.logInfo("Get definition summary",{reportId:t});const n={...r&&{dataProductDefinitionsPath:r}};return this.restClient.get({path:`/definitions/${t}`,query:n,token:e}).then(i=>i)}getDefinitions(e,t){this.logInfo("Get definitions");const r={renderMethod:"HTML",...t&&{dataProductDefinitionsPath:t}};return this.restClient.get({path:"/definitions",query:r,token:e}).then(n=>n)}getDefinition(e,t,r,n){const i={dataProductDefinitionsPath:n};return this.logInfo("Get definition",{reportId:t,variantId:r}),this.restClient.get({path:`/definitions/${t}/${r}`,query:i,token:e}).then(o=>o)}getFieldValues({token:e,definitionName:t,variantName:r,fieldName:n,prefix:i,definitionsPath:o}){const g={dataProductDefinitionsPath:o,prefix:i};return this.logInfo("Get field values",{definitionName:t,variantName:r,fieldName:n,prefix:i}),this.restClient.get({path:`/reports/${t}/${r}/${n}`,token:e,query:g}).then(p=>p)}requestAsyncReport(e,t,r,n){return this.logInfo("Request report",{reportId:t,variantId:r}),this.restClient.get({path:`/async/reports/${t}/${r}`,token:e,query:n}).then(i=>i)}cancelAsyncRequest(e,t,r,n,i){return this.logInfo("Cancel Request",{reportId:t,variantId:r,executionId:n}),this.restClient.delete({path:`/reports/${t}/${r}/statements/${n}`,token:e,query:{dataProductDefinitionsPath:i}}).then(o=>o)}getAsyncReport(e,t,r,n,i){return this.logInfo("Get Data",{reportId:t,variantId:r,tableId:n}),this.restClient.get({path:`/reports/${t}/${r}/tables/${n}/result`,token:e,query:i}).then(o=>o)}getAsyncSummaryReport(e,t,r,n,i,o){return this.logInfo("Get summary data",{reportId:t,variantId:r,tableId:n,summaryId:i}),this.restClient.get({path:`/reports/${t}/${r}/tables/${n}/result/summary/${i}`,token:e,query:o}).then(g=>g)}getAsyncReportStatus(e,t,r,n,i,o){return this.logInfo("Get status",{reportId:t,variantId:r,tableId:o,executionId:n}),this.restClient.get({path:`/reports/${t}/${r}/statements/${n}/status`,token:e,query:{dataProductDefinitionsPath:i,tableId:o}}).then(g=>g)}getAsyncCount(e,t,r){return this.logInfo("Get count",{tableId:t}),this.restClient.get({path:`/report/tables/${t}/count`,token:e,query:{dataProductDefinitionsPath:r}}).then(n=>n.count)}getAsyncInteractiveCount(e,t,r,n,i){return this.logInfo("Get interactive count",{tableId:t,reportId:r,id:n}),this.restClient.get({path:`/reports/${r}/${n}/tables/${t}/count`,token:e,query:i.toRecordWithFilterPrefix(!0)}).then(o=>o.count)}logInfo(e,t){a.default.info(`Reporting Client: ${e}:`),t&&Object.keys(t).length&&a.default.info(JSON.stringify(t,null,2))}}var A=h;0&&(module.exports={ReportingClient});
 //# sourceMappingURL=reportingClient.js.map

package/dpr/data/reportingClient.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/data/reportingClient.ts"],
-  "sourcesContent": ["import ReportQuery from '../types/ReportQuery'\nimport logger from '../utils/logger'\nimport RestClient from './restClient'\nimport Dict = NodeJS.Dict\nimport { components, operations } from '../types/api'\nimport { ApiConfig, Count, FieldValuesRequest, ListWithWarnings } from './types'\nimport type { ResultWithHeaders } from './restClient'\n\nclass ReportingClient {\n  restClient: RestClient\n\n  constructor(config: ApiConfig) {\n    this.restClient = new RestClient('Reporting API Client', config)\n  }\n\n  getCount(resourceName: string, token: string, countRequest: ReportQuery): Promise<number> {\n    logger.info(`Reporting client: Get count. { resourceName: ${resourceName} }`)\n\n    return this.restClient\n      .get({\n        path: `/${resourceName}/count`,\n        query: countRequest.toRecordWithFilterPrefix(true),\n        token,\n      })\n      .then((response) => (<Count>response).count)\n  }\n\n  getList(resourceName: string, token: string, listRequest: ReportQuery): Promise<Array<Dict<string>>> {\n    return this.getListWithWarnings(resourceName, token, listRequest).then((response) => response.data)\n  }\n\n  getListWithWarnings(resourceName: string, token: string, listRequest: ReportQuery): Promise<ListWithWarnings> {\n    logger.info(`Reporting client: Get list. { resourceName: ${resourceName} }`)\n\n    return this.restClient\n      .getWithHeaders<Array<Dict<string>>>({\n        path: `/${resourceName}`,\n        query: listRequest.toRecordWithFilterPrefix(true),\n        token,\n      })\n      .then((response: ResultWithHeaders<Array<Dict<string>>>) => ({\n        data: response.data,\n        warnings: {\n          noDataAvailable: response.headers['x-no-data-warning'],\n        },\n      }))\n  }\n\n  getDefinitionSummary(\n    token: string,\n    reportId: string,\n    definitionsPath?: string,\n  ): Promise<components['schemas']['ReportDefinitionSummary']> {\n    this.logInfo('Get definition summary', { reportId })\n\n    const queryParams: operations['definitionSummary']['parameters']['query'] = {\n      dataProductDefinitionsPath: definitionsPath,\n    }\n\n    return this.restClient\n      .get({\n        path: `/definitions/${reportId}`,\n        query: queryParams,\n        token,\n      })\n      .then((response) => <components['schemas']['ReportDefinitionSummary']>response)\n  }\n\n  getDefinitions(\n    token: string,\n    definitionsPath?: string,\n  ): Promise<Array<components['schemas']['ReportDefinitionSummary']>> {\n    this.logInfo('Get definitions')\n\n    const params: operations['definitions_1']['parameters'] = {\n      query: {\n        renderMethod: 'HTML',\n        dataProductDefinitionsPath: definitionsPath,\n      },\n    }\n\n    return this.restClient\n      .get({\n        path: '/definitions',\n        query: params.query,\n        token,\n      })\n      .then((response) => <Array<components['schemas']['ReportDefinitionSummary']>>response)\n  }\n\n  getDefinition(\n    token: string,\n    reportId: string,\n    variantId: string,\n    definitionsPath?: string,\n  ): Promise<components['schemas']['SingleVariantReportDefinition']> {\n    const query = {\n      dataProductDefinitionsPath: definitionsPath,\n    }\n    this.logInfo('Get definition', { reportId, variantId })\n\n    return this.restClient\n      .get({\n        path: `/definitions/${reportId}/${variantId}`,\n        query,\n        token,\n      })\n      .then((response) => <components['schemas']['SingleVariantReportDefinition']>response)\n  }\n\n  getFieldValues({\n    token,\n    definitionName,\n    variantName,\n    fieldName,\n    prefix,\n    definitionsPath,\n  }: FieldValuesRequest): Promise<Array<string>> {\n    const query = {\n      dataProductDefinitionsPath: definitionsPath,\n      prefix,\n    }\n    this.logInfo('Get field values', { definitionName, variantName, fieldName, prefix })\n\n    return this.restClient\n      .get({\n        path: `/reports/${definitionName}/${variantName}/${fieldName}`,\n        token,\n        query,\n      })\n      .then((response) => <Array<string>>response)\n  }\n\n  requestAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    query: Record<string, string | boolean | number>,\n  ): Promise<Dict<string>> {\n    this.logInfo('Request report', { reportId, variantId })\n\n    return this.restClient\n      .get({\n        path: `/async/reports/${reportId}/${variantId}`,\n        token,\n        query,\n      })\n      .then((response) => <Dict<string>>response)\n  }\n\n  cancelAsyncRequest(\n    token: string,\n    reportId: string,\n    variantId: string,\n    executionId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Dict<string>> {\n    this.logInfo('Cancel Request', { reportId, variantId, executionId })\n\n    return this.restClient\n      .delete({\n        path: `/reports/${reportId}/${variantId}/statements/${executionId}`,\n        token,\n        query: {\n          dataProductDefinitionsPath,\n        },\n      })\n      .then((response) => <Dict<string>>response)\n  }\n\n  getAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    tableId: string,\n    query: Record<string, string | string[]>,\n  ): Promise<Array<Dict<string>>> {\n    this.logInfo('Get Data', { reportId, variantId, tableId })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/${variantId}/tables/${tableId}/result`,\n        token,\n        query,\n      })\n      .then((response) => <Array<Dict<string>>>response)\n  }\n\n  getAsyncSummaryReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    tableId: string,\n    summaryId: string,\n    query: Dict<string | number>,\n  ): Promise<Array<Dict<string>>> {\n    this.logInfo('Get summary data', { reportId, variantId, tableId, summaryId })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/${variantId}/tables/${tableId}/result/summary/${summaryId}`,\n        token,\n        query,\n      })\n      .then((response) => <Array<Dict<string>>>response)\n  }\n\n  getAsyncReportStatus(\n    token: string,\n    reportId: string,\n    variantId: string,\n    executionId: string,\n    dataProductDefinitionsPath?: string,\n    tableId?: string,\n  ): Promise<Dict<string>> {\n    this.logInfo('Get status', { reportId, variantId, tableId, executionId })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/${variantId}/statements/${executionId}/status`,\n        token,\n        query: {\n          dataProductDefinitionsPath,\n          tableId,\n        },\n      })\n      .then((response) => <Dict<string>>response)\n  }\n\n  getAsyncCount(token: string, tableId: string, dataProductDefinitionsPath?: string): Promise<number> {\n    this.logInfo('Get count', { tableId })\n\n    return this.restClient\n      .get({\n        path: `/report/tables/${tableId}/count`,\n        token,\n        query: {\n          dataProductDefinitionsPath,\n        },\n      })\n      .then((response) => (<Count>response).count)\n  }\n\n  getAsyncInteractiveCount(\n    token: string,\n    tableId: string,\n    reportId: string,\n    id: string,\n    filters: ReportQuery,\n  ): Promise<number> {\n    this.logInfo('Get interactive count', { tableId, reportId, id })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/${id}/tables/${tableId}/count`,\n        token,\n        query: filters.toRecordWithFilterPrefix(true),\n      })\n      .then((response) => (<Count>response).count)\n  }\n\n  logInfo(title: string, args?: Dict<string>) {\n    logger.info(`Reporting Client: ${title}:`)\n    if (args && Object.keys(args).length) logger.info(JSON.stringify(args, null, 2))\n  }\n}\n\nexport { ReportingClient }\nexport default ReportingClient\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAmB,8BACnBC,EAAuB,2BAMvB,MAAMJ,CAAgB,CAGpB,YAAYK,EAAmB,CAC7B,KAAK,WAAa,IAAI,EAAAC,QAAW,uBAAwBD,CAAM,CACjE,CAEA,SAASE,EAAsBC,EAAeC,EAA4C,CACxF,SAAAC,QAAO,KAAK,gDAAgDH,CAAY,IAAI,EAErE,KAAK,WACT,IAAI,CACH,KAAM,IAAIA,CAAY,SACtB,MAAOE,EAAa,yBAAyB,EAAI,EACjD,MAAAD,CACF,CAAC,EACA,KAAMG,GAAqBA,EAAU,KAAK,CAC/C,CAEA,QAAQJ,EAAsBC,EAAeI,EAAwD,CACnG,OAAO,KAAK,oBAAoBL,EAAcC,EAAOI,CAAW,EAAE,KAAMD,GAAaA,EAAS,IAAI,CACpG,CAEA,oBAAoBJ,EAAsBC,EAAeI,EAAqD,CAC5G,SAAAF,QAAO,KAAK,+CAA+CH,CAAY,IAAI,EAEpE,KAAK,WACT,eAAoC,CACnC,KAAM,IAAIA,CAAY,GACtB,MAAOK,EAAY,yBAAyB,EAAI,EAChD,MAAAJ,CACF,CAAC,EACA,KAAMG,IAAsD,CAC3D,KAAMA,EAAS,KACf,SAAU,CACR,gBAAiBA,EAAS,QAAQ,mBAAmB,CACvD,CACF,EAAE,CACN,CAEA,qBACEH,EACAK,EACAC,EAC2D,CAC3D,KAAK,QAAQ,yBAA0B,CAAE,SAAAD,CAAS,CAAC,EAEnD,MAAME,EAAsE,CAC1E,2BAA4BD,CAC9B,EAEA,OAAO,KAAK,WACT,IAAI,CACH,KAAM,gBAAgBD,CAAQ,GAC9B,MAAOE,EACP,MAAAP,CACF,CAAC,EACA,KAAMG,GAA+DA,CAAQ,CAClF,CAEA,eACEH,EACAM,EACkE,CAClE,KAAK,QAAQ,iBAAiB,EAE9B,MAAME,EAAoD,CACxD,MAAO,CACL,aAAc,OACd,2BAA4BF,CAC9B,CACF,EAEA,OAAO,KAAK,WACT,IAAI,CACH,KAAM,eACN,MAAOE,EAAO,MACd,MAAAR,CACF,CAAC,EACA,KAAMG,GAAsEA,CAAQ,CACzF,CAEA,cACEH,EACAK,EACAI,EACAH,EACiE,CACjE,MAAMI,EAAQ,CACZ,2BAA4BJ,CAC9B,EACA,YAAK,QAAQ,iBAAkB,CAAE,SAAAD,EAAU,UAAAI,CAAU,CAAC,EAE/C,KAAK,WACT,IAAI,CACH,KAAM,gBAAgBJ,CAAQ,IAAII,CAAS,GAC3C,MAAAC,EACA,MAAAV,CACF,CAAC,EACA,KAAMG,GAAqEA,CAAQ,CACxF,CAEA,eAAe,CACb,MAAAH,EACA,eAAAW,EACA,YAAAC,EACA,UAAAC,EACA,OAAAC,EACA,gBAAAR,CACF,EAA+C,CAC7C,MAAMI,EAAQ,CACZ,2BAA4BJ,EAC5B,OAAAQ,CACF,EACA,YAAK,QAAQ,mBAAoB,CAAE,eAAAH,EAAgB,YAAAC,EAAa,UAAAC,EAAW,OAAAC,CAAO,CAAC,EAE5E,KAAK,WACT,IAAI,CACH,KAAM,YAAYH,CAAc,IAAIC,CAAW,IAAIC,CAAS,GAC5D,MAAAb,EACA,MAAAU,CACF,CAAC,EACA,KAAMP,GAA4BA,CAAQ,CAC/C,CAEA,mBACEH,EACAK,EACAI,EACAC,EACuB,CACvB,YAAK,QAAQ,iBAAkB,CAAE,SAAAL,EAAU,UAAAI,CAAU,CAAC,EAE/C,KAAK,WACT,IAAI,CACH,KAAM,kBAAkBJ,CAAQ,IAAII,CAAS,GAC7C,MAAAT,EACA,MAAAU,CACF,CAAC,EACA,KAAMP,GAA2BA,CAAQ,CAC9C,CAEA,mBACEH,EACAK,EACAI,EACAM,EACAC,EACuB,CACvB,YAAK,QAAQ,iBAAkB,CAAE,SAAAX,EAAU,UAAAI,EAAW,YAAAM,CAAY,CAAC,EAE5D,KAAK,WACT,OAAO,CACN,KAAM,YAAYV,CAAQ,IAAII,CAAS,eAAeM,CAAW,GACjE,MAAAf,EACA,MAAO,CACL,2BAAAgB,CACF,CACF,CAAC,EACA,KAAMb,GAA2BA,CAAQ,CAC9C,CAEA,eACEH,EACAK,EACAI,EACAQ,EACAP,EAC8B,CAC9B,YAAK,QAAQ,WAAY,CAAE,SAAAL,EAAU,UAAAI,EAAW,QAAAQ,CAAQ,CAAC,EAElD,KAAK,WACT,IAAI,CACH,KAAM,YAAYZ,CAAQ,IAAII,CAAS,WAAWQ,CAAO,UACzD,MAAAjB,EACA,MAAAU,CACF,CAAC,EACA,KAAMP,GAAkCA,CAAQ,CACrD,CAEA,sBACEH,EACAK,EACAI,EACAQ,EACAC,EACAR,EAC8B,CAC9B,YAAK,QAAQ,mBAAoB,CAAE,SAAAL,EAAU,UAAAI,EAAW,QAAAQ,EAAS,UAAAC,CAAU,CAAC,EAErE,KAAK,WACT,IAAI,CACH,KAAM,YAAYb,CAAQ,IAAII,CAAS,WAAWQ,CAAO,mBAAmBC,CAAS,GACrF,MAAAlB,EACA,MAAAU,CACF,CAAC,EACA,KAAMP,GAAkCA,CAAQ,CACrD,CAEA,qBACEH,EACAK,EACAI,EACAM,EACAC,EACAC,EACuB,CACvB,YAAK,QAAQ,aAAc,CAAE,SAAAZ,EAAU,UAAAI,EAAW,QAAAQ,EAAS,YAAAF,CAAY,CAAC,EAEjE,KAAK,WACT,IAAI,CACH,KAAM,YAAYV,CAAQ,IAAII,CAAS,eAAeM,CAAW,UACjE,MAAAf,EACA,MAAO,CACL,2BAAAgB,EACA,QAAAC,CACF,CACF,CAAC,EACA,KAAMd,GAA2BA,CAAQ,CAC9C,CAEA,cAAcH,EAAeiB,EAAiBD,EAAsD,CAClG,YAAK,QAAQ,YAAa,CAAE,QAAAC,CAAQ,CAAC,EAE9B,KAAK,WACT,IAAI,CACH,KAAM,kBAAkBA,CAAO,SAC/B,MAAAjB,EACA,MAAO,CACL,2BAAAgB,CACF,CACF,CAAC,EACA,KAAMb,GAAqBA,EAAU,KAAK,CAC/C,CAEA,yBACEH,EACAiB,EACAZ,EACAc,EACAC,EACiB,CACjB,YAAK,QAAQ,wBAAyB,CAAE,QAAAH,EAAS,SAAAZ,EAAU,GAAAc,CAAG,CAAC,EAExD,KAAK,WACT,IAAI,CACH,KAAM,YAAYd,CAAQ,IAAIc,CAAE,WAAWF,CAAO,SAClD,MAAAjB,EACA,MAAOoB,EAAQ,yBAAyB,EAAI,CAC9C,CAAC,EACA,KAAMjB,GAAqBA,EAAU,KAAK,CAC/C,CAEA,QAAQkB,EAAeC,EAAqB,CAC1C,EAAApB,QAAO,KAAK,qBAAqBmB,CAAK,GAAG,EACrCC,GAAQ,OAAO,KAAKA,CAAI,EAAE,QAAQ,EAAApB,QAAO,KAAK,KAAK,UAAUoB,EAAM,KAAM,CAAC,CAAC,CACjF,CACF,CAGA,IAAO7B,EAAQD",
-  "names": ["reportingClient_exports", "__export", "ReportingClient", "reportingClient_default", "__toCommonJS", "import_logger", "import_restClient", "config", "RestClient", "resourceName", "token", "countRequest", "logger", "response", "listRequest", "reportId", "definitionsPath", "queryParams", "params", "variantId", "query", "definitionName", "variantName", "fieldName", "prefix", "executionId", "dataProductDefinitionsPath", "tableId", "summaryId", "id", "filters", "title", "args"]
+  "sourcesContent": ["import ReportQuery from '../types/ReportQuery'\nimport logger from '../utils/logger'\nimport RestClient from './restClient'\nimport Dict = NodeJS.Dict\nimport { components, operations } from '../types/api'\nimport { ApiConfig, Count, FieldValuesRequest, ListWithWarnings } from './types'\nimport type { ResultWithHeaders } from './restClient'\n\nclass ReportingClient {\n  restClient: RestClient\n\n  constructor(config: ApiConfig) {\n    this.restClient = new RestClient('Reporting API Client', config)\n  }\n\n  getCount(resourceName: string, token: string, countRequest: ReportQuery): Promise<number> {\n    logger.info(`Reporting client: Get count. { resourceName: ${resourceName} }`)\n\n    return this.restClient\n      .get({\n        path: `/${resourceName}/count`,\n        query: countRequest.toRecordWithFilterPrefix(true),\n        token,\n      })\n      .then((response) => (<Count>response).count)\n  }\n\n  getList(resourceName: string, token: string, listRequest: ReportQuery): Promise<Array<Dict<string>>> {\n    return this.getListWithWarnings(resourceName, token, listRequest).then((response) => response.data)\n  }\n\n  getListWithWarnings(resourceName: string, token: string, listRequest: ReportQuery): Promise<ListWithWarnings> {\n    logger.info(`Reporting client: Get list. { resourceName: ${resourceName} }`)\n\n    return this.restClient\n      .getWithHeaders<Array<Dict<string>>>({\n        path: `/${resourceName}`,\n        query: listRequest.toRecordWithFilterPrefix(true),\n        token,\n      })\n      .then((response: ResultWithHeaders<Array<Dict<string>>>) => ({\n        data: response.data,\n        warnings: {\n          noDataAvailable: response.headers['x-no-data-warning'],\n        },\n      }))\n  }\n\n  getDefinitionSummary(\n    token: string,\n    reportId: string,\n    definitionsPath?: string,\n  ): Promise<components['schemas']['ReportDefinitionSummary']> {\n    this.logInfo('Get definition summary', { reportId })\n\n    const queryParams: operations['definitionSummary']['parameters']['query'] = {\n      ...(definitionsPath && { dataProductDefinitionsPath: definitionsPath }),\n    }\n\n    return this.restClient\n      .get({\n        path: `/definitions/${reportId}`,\n        query: queryParams,\n        token,\n      })\n      .then((response) => <components['schemas']['ReportDefinitionSummary']>response)\n  }\n\n  getDefinitions(\n    token: string,\n    definitionsPath?: string,\n  ): Promise<Array<components['schemas']['ReportDefinitionSummary']>> {\n    this.logInfo('Get definitions')\n\n    const queryParams: operations['definitions_1']['parameters']['query'] = {\n      renderMethod: 'HTML',\n      ...(definitionsPath && { dataProductDefinitionsPath: definitionsPath }),\n    }\n\n    return this.restClient\n      .get({\n        path: '/definitions',\n        query: queryParams,\n        token,\n      })\n      .then((response) => <Array<components['schemas']['ReportDefinitionSummary']>>response)\n  }\n\n  getDefinition(\n    token: string,\n    reportId: string,\n    variantId: string,\n    definitionsPath?: string,\n  ): Promise<components['schemas']['SingleVariantReportDefinition']> {\n    const query = {\n      dataProductDefinitionsPath: definitionsPath,\n    }\n    this.logInfo('Get definition', { reportId, variantId })\n\n    return this.restClient\n      .get({\n        path: `/definitions/${reportId}/${variantId}`,\n        query,\n        token,\n      })\n      .then((response) => <components['schemas']['SingleVariantReportDefinition']>response)\n  }\n\n  getFieldValues({\n    token,\n    definitionName,\n    variantName,\n    fieldName,\n    prefix,\n    definitionsPath,\n  }: FieldValuesRequest): Promise<Array<string>> {\n    const query = {\n      dataProductDefinitionsPath: definitionsPath,\n      prefix,\n    }\n    this.logInfo('Get field values', { definitionName, variantName, fieldName, prefix })\n\n    return this.restClient\n      .get({\n        path: `/reports/${definitionName}/${variantName}/${fieldName}`,\n        token,\n        query,\n      })\n      .then((response) => <Array<string>>response)\n  }\n\n  requestAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    query: Record<string, string | boolean | number>,\n  ): Promise<Dict<string>> {\n    this.logInfo('Request report', { reportId, variantId })\n\n    return this.restClient\n      .get({\n        path: `/async/reports/${reportId}/${variantId}`,\n        token,\n        query,\n      })\n      .then((response) => <Dict<string>>response)\n  }\n\n  cancelAsyncRequest(\n    token: string,\n    reportId: string,\n    variantId: string,\n    executionId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Dict<string>> {\n    this.logInfo('Cancel Request', { reportId, variantId, executionId })\n\n    return this.restClient\n      .delete({\n        path: `/reports/${reportId}/${variantId}/statements/${executionId}`,\n        token,\n        query: {\n          dataProductDefinitionsPath,\n        },\n      })\n      .then((response) => <Dict<string>>response)\n  }\n\n  getAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    tableId: string,\n    query: Record<string, string | string[]>,\n  ): Promise<Array<Dict<string>>> {\n    this.logInfo('Get Data', { reportId, variantId, tableId })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/${variantId}/tables/${tableId}/result`,\n        token,\n        query,\n      })\n      .then((response) => <Array<Dict<string>>>response)\n  }\n\n  getAsyncSummaryReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    tableId: string,\n    summaryId: string,\n    query: Dict<string | number>,\n  ): Promise<Array<Dict<string>>> {\n    this.logInfo('Get summary data', { reportId, variantId, tableId, summaryId })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/${variantId}/tables/${tableId}/result/summary/${summaryId}`,\n        token,\n        query,\n      })\n      .then((response) => <Array<Dict<string>>>response)\n  }\n\n  getAsyncReportStatus(\n    token: string,\n    reportId: string,\n    variantId: string,\n    executionId: string,\n    dataProductDefinitionsPath?: string,\n    tableId?: string,\n  ): Promise<components['schemas']['StatementExecutionStatus']> {\n    this.logInfo('Get status', { reportId, variantId, tableId, executionId })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/${variantId}/statements/${executionId}/status`,\n        token,\n        query: {\n          dataProductDefinitionsPath,\n          tableId,\n        },\n      })\n      .then((response) => <components['schemas']['StatementExecutionStatus']>response)\n  }\n\n  getAsyncCount(token: string, tableId: string, dataProductDefinitionsPath?: string): Promise<number> {\n    this.logInfo('Get count', { tableId })\n\n    return this.restClient\n      .get({\n        path: `/report/tables/${tableId}/count`,\n        token,\n        query: {\n          dataProductDefinitionsPath,\n        },\n      })\n      .then((response) => (<Count>response).count)\n  }\n\n  getAsyncInteractiveCount(\n    token: string,\n    tableId: string,\n    reportId: string,\n    id: string,\n    filters: ReportQuery,\n  ): Promise<number> {\n    this.logInfo('Get interactive count', { tableId, reportId, id })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/${id}/tables/${tableId}/count`,\n        token,\n        query: filters.toRecordWithFilterPrefix(true),\n      })\n      .then((response) => (<Count>response).count)\n  }\n\n  logInfo(title: string, args?: Dict<string>) {\n    logger.info(`Reporting Client: ${title}:`)\n    if (args && Object.keys(args).length) logger.info(JSON.stringify(args, null, 2))\n  }\n}\n\nexport { ReportingClient }\nexport default ReportingClient\n"],
+  "mappings": "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",
+  "names": ["reportingClient_exports", "__export", "ReportingClient", "reportingClient_default", "__toCommonJS", "import_logger", "import_restClient", "config", "RestClient", "resourceName", "token", "countRequest", "logger", "response", "listRequest", "reportId", "definitionsPath", "queryParams", "variantId", "query", "definitionName", "variantName", "fieldName", "prefix", "executionId", "dataProductDefinitionsPath", "tableId", "summaryId", "id", "filters", "title", "args"]
 }

package/dpr/data/reportingClient.ts

@@ -54,7 +54,7 @@ class ReportingClient {
     this.logInfo('Get definition summary', { reportId })
 
     const queryParams: operations['definitionSummary']['parameters']['query'] = {
-      dataProductDefinitionsPath: definitionsPath,
+      ...(definitionsPath && { dataProductDefinitionsPath: definitionsPath }),
     }
 
     return this.restClient
@@ -72,17 +72,15 @@ class ReportingClient {
   ): Promise<Array<components['schemas']['ReportDefinitionSummary']>> {
     this.logInfo('Get definitions')
 
-    const params: operations['definitions_1']['parameters'] = {
-      query: {
-        renderMethod: 'HTML',
-        dataProductDefinitionsPath: definitionsPath,
-      },
+    const queryParams: operations['definitions_1']['parameters']['query'] = {
+      renderMethod: 'HTML',
+      ...(definitionsPath && { dataProductDefinitionsPath: definitionsPath }),
     }
 
     return this.restClient
       .get({
         path: '/definitions',
-        query: params.query,
+        query: queryParams,
         token,
       })
       .then((response) => <Array<components['schemas']['ReportDefinitionSummary']>>response)
@@ -212,7 +210,7 @@ class ReportingClient {
     executionId: string,
     dataProductDefinitionsPath?: string,
     tableId?: string,
-  ): Promise<Dict<string>> {
+  ): Promise<components['schemas']['StatementExecutionStatus']> {
     this.logInfo('Get status', { reportId, variantId, tableId, executionId })
 
     return this.restClient
@@ -224,7 +222,7 @@ class ReportingClient {
           tableId,
         },
       })
-      .then((response) => <Dict<string>>response)
+      .then((response) => <components['schemas']['StatementExecutionStatus']>response)
   }
 
   getAsyncCount(token: string, tableId: string, dataProductDefinitionsPath?: string): Promise<number> {

package/dpr/data/restClient.js

@@ -1,2 +1,2 @@
-var w=Object.create;var p=Object.defineProperty;var T=Object.getOwnPropertyDescriptor;var b=Object.getOwnPropertyNames;var W=Object.getPrototypeOf,q=Object.prototype.hasOwnProperty;var E=(r,e)=>{for(var t in e)p(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))!q.call(r,i)&&i!==t&&p(r,i,{get:()=>e[i],enumerable:!(a=T(e,i))||a.enumerable});return r};var f=(r,e,t)=>(t=r!=null?w(W(r)):{},R(e||!r||!r.__esModule?p(t,"default",{value:r,enumerable:!0}):t,r)),C=r=>R(p({},"__esModule",{value:!0}),r);var v={};E(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:l=!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 l?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=null,query:t={},headers:a={},responseType:i="",raw:g=!1,token:u}){const l={path:`${this.config.url}${e}`,query:t};o.default.info(`${this.name}: ${JSON.stringify(l,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=null,query:t={},headers:a={},responseType:i="",raw:g=!1,token:u}){const l={path:`${this.config.url}${e}`,query:t};o.default.info(`${this.name}: ${JSON.stringify(l,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)}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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/data/restClient.ts"],
-  "sourcesContent": ["import superagent 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 = null,\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(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 = null,\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(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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",
+  "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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",
   "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/data/restClient.ts

@@ -1,4 +1,4 @@
-import superagent from 'superagent'
+import superagent, { ResponseError } from 'superagent'
 import Agent, { HttpsAgent } from 'agentkeepalive'
 
 import logger from '../utils/logger'
@@ -82,7 +82,7 @@ class RestClient {
   }
 
   async getWithHeaders<T>({
-    path = null,
+    path = '',
     query = {},
     headers = {},
     responseType = '',
@@ -113,14 +113,14 @@ class RestClient {
         headers: result.headers,
       }
     } catch (error) {
-      const sanitisedError = sanitiseError(error)
+      const sanitisedError = sanitiseError(<ResponseError>error)
       logger.warn({ ...sanitisedError, query }, `Error calling ${this.name}, path: '${path}', verb: 'GET'`)
       throw sanitisedError
     }
   }
 
   async deleteWithHeaders<T>({
-    path = null,
+    path = '',
     query = {},
     headers = {},
     responseType = '',
@@ -151,7 +151,7 @@ class RestClient {
         headers: result.headers,
       }
     } catch (error) {
-      const sanitisedError = sanitiseError(error)
+      const sanitisedError = sanitiseError(<ResponseError>error)
       logger.warn({ ...sanitisedError, query }, `Error calling ${this.name}, path: '${path}', verb: 'GET'`)
       throw sanitisedError
     }

package/dpr/data/types.d.js

@@ -1,2 +1,2 @@
-var i=Object.defineProperty;var a=Object.getOwnPropertyDescriptor;var o=Object.getOwnPropertyNames;var g=Object.prototype.hasOwnProperty;var f=(e,t,s,r)=>{if(t&&typeof t=="object"||typeof t=="function")for(let n of o(t))!g.call(e,n)&&n!==s&&i(e,n,{get:()=>t[n],enumerable:!(r=a(t,n))||r.enumerable});return e};var c=e=>f(i({},"__esModule",{value:!0}),e);var p={};module.exports=c(p);
+"use strict";var i=Object.defineProperty;var a=Object.getOwnPropertyDescriptor;var o=Object.getOwnPropertyNames;var g=Object.prototype.hasOwnProperty;var f=(e,t,s,r)=>{if(t&&typeof t=="object"||typeof t=="function")for(let n of o(t))!g.call(e,n)&&n!==s&&i(e,n,{get:()=>t[n],enumerable:!(r=a(t,n))||r.enumerable});return e};var c=e=>f(i({},"__esModule",{value:!0}),e);var d={};module.exports=c(d);
 //# sourceMappingURL=types.d.js.map

package/dpr/data/types.d.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/data/types.d.ts"],
-  "sourcesContent": ["import AgentConfig from './agentConfig'\n\nexport interface GetRequest {\n  path?: string\n  query?: object\n  headers?: Record<string, string>\n  responseType?: string\n  raw?: boolean\n  token: string\n}\n\nexport interface ApiConfig {\n  url: string\n  agent: AgentConfig\n}\n\nexport interface Count {\n  count: number\n}\n\nexport interface ListWithWarnings {\n  data: Array<Dict<string>>\n  warnings: Warnings\n}\n\nexport interface Warnings {\n  noDataAvailable?: string\n}\n\nexport interface FieldValuesRequest {\n  token: string\n  definitionName: string\n  variantName: string\n  fieldName: string\n  prefix: string\n  definitionsPath?: string\n}\n\nexport interface AsyncRequestQuery {\n  sortColumn: string\n  sortedAsc: boolean\n  dataProductDefinitionsPath: string\n  [key: string]: string\n}\n\ninterface filter {\n  [filterId: string]: string\n}\n"],
-  "mappings": "kWAAA,IAAAA,EAAA,kBAAAC,EAAAD",
+  "sourcesContent": ["import AgentConfig from './agentConfig'\n\nexport interface GetRequest {\n  path?: string\n  query?: object\n  headers?: Record<string, string>\n  responseType?: string\n  raw?: boolean\n  token: string\n}\n\nexport interface ApiConfig {\n  url: string\n  agent: AgentConfig\n}\n\nexport interface Count {\n  count: number\n}\n\nexport interface ListWithWarnings {\n  data: Array<Dict<string>>\n  warnings: Warnings\n}\n\nexport interface Warnings {\n  noDataAvailable?: string | undefined\n}\n\nexport interface FieldValuesRequest {\n  token: string\n  definitionName: string\n  variantName: string\n  fieldName: string\n  prefix: string\n  definitionsPath?: string\n}\n\nexport interface AsyncRequestQuery {\n  sortColumn: string\n  sortedAsc: boolean\n  dataProductDefinitionsPath: string\n  [key: string]: string\n}\n\ninterface filter {\n  [filterId: string]: string\n}\n"],
+  "mappings": "+WAAA,IAAAA,EAAA,kBAAAC,EAAAD",
   "names": ["types_d_exports", "__toCommonJS"]
 }

package/dpr/data/types.d.ts

@@ -24,7 +24,7 @@ export interface ListWithWarnings {
 }
 
 export interface Warnings {
-  noDataAvailable?: string
+  noDataAvailable?: string | undefined
 }
 
 export interface FieldValuesRequest {

package/dpr/middleware/reportAuthoriser.js

@@ -1,2 +1,2 @@
-var S=Object.create;var n=Object.defineProperty;var v=Object.getOwnPropertyDescriptor;var P=Object.getOwnPropertyNames;var R=Object.getPrototypeOf,D=Object.prototype.hasOwnProperty;var w=(e,t)=>{for(var r in t)n(e,r,{get:t[r],enumerable:!0})},p=(e,t,r,o)=>{if(t&&typeof t=="object"||typeof t=="function")for(let i of P(t))!D.call(e,i)&&i!==r&&n(e,i,{get:()=>t[i],enumerable:!(o=v(t,i))||o.enumerable});return e};var H=(e,t,r)=>(r=e!=null?S(R(e)):{},p(t||!e||!e.__esModule?n(r,"default",{value:e,enumerable:!0}):r,e)),b=e=>p(n({},"__esModule",{value:!0}),e);var I={};w(I,{default:()=>x,reportAuthoriser:()=>m});module.exports=b(I);var c=H(require("../utils/localsHelper")),f=require("../types/UserReports");const m=(e,t)=>async(r,o,i)=>{const{token:a}=c.default.getValues(o),{reportId:d,id:l,variantId:y,type:g}=r.params,s=r.query.dataProductDefinitionsPath,u=await e.reportingService.getDefinitionSummary(a,d,s),h=g===f.ReportType.REPORT?e.reportingService:e.dashboardService;o.locals.definition=await h.getDefinition(a,d,y||l,s),u?.authorised!==void 0&&!u.authorised?o.render("dpr/routes/journeys/view-report/unauthorised",{layoutPath:t,...r.body}):i()};var x=m;0&&(module.exports={reportAuthoriser});
+"use strict";var S=Object.create;var n=Object.defineProperty;var v=Object.getOwnPropertyDescriptor;var P=Object.getOwnPropertyNames;var R=Object.getPrototypeOf,D=Object.prototype.hasOwnProperty;var w=(e,t)=>{for(var r in t)n(e,r,{get:t[r],enumerable:!0})},p=(e,t,r,o)=>{if(t&&typeof t=="object"||typeof t=="function")for(let i of P(t))!D.call(e,i)&&i!==r&&n(e,i,{get:()=>t[i],enumerable:!(o=v(t,i))||o.enumerable});return e};var H=(e,t,r)=>(r=e!=null?S(R(e)):{},p(t||!e||!e.__esModule?n(r,"default",{value:e,enumerable:!0}):r,e)),b=e=>p(n({},"__esModule",{value:!0}),e);var I={};w(I,{default:()=>x,reportAuthoriser:()=>m});module.exports=b(I);var c=H(require("../utils/localsHelper")),f=require("../types/UserReports");const m=(e,t)=>async(r,o,i)=>{const{token:a}=c.default.getValues(o),{reportId:d,id:l,variantId:y,type:g}=r.params,s=r.query.dataProductDefinitionsPath,u=await e.reportingService.getDefinitionSummary(a,d,s),h=g===f.ReportType.REPORT?e.reportingService:e.dashboardService;o.locals.definition=await h.getDefinition(a,d,y||l,s),u?.authorised!==void 0&&!u.authorised?o.render("dpr/routes/journeys/view-report/unauthorised",{layoutPath:t,...r.body}):i()};var x=m;0&&(module.exports={reportAuthoriser});
 //# sourceMappingURL=reportAuthoriser.js.map

package/dpr/middleware/reportAuthoriser.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/middleware/reportAuthoriser.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport LocalsHelper from '../utils/localsHelper'\nimport { Services } from '../types/Services'\nimport { ReportType } from '../types/UserReports'\n\nexport const reportAuthoriser = (services: Services, layoutPath: string): RequestHandler => {\n  return async (req, res, next) => {\n    const { token } = LocalsHelper.getValues(res)\n    const { reportId, id, variantId, type } = req.params\n    const dataProductDefinitionsPath = <string | undefined>req.query.dataProductDefinitionsPath\n\n    const definitionSummary = await services.reportingService.getDefinitionSummary(\n      token,\n      reportId,\n      dataProductDefinitionsPath,\n    )\n\n    const service = type === ReportType.REPORT ? services.reportingService : services.dashboardService\n    res.locals.definition = await service.getDefinition(token, reportId, variantId || id, dataProductDefinitionsPath)\n\n    if (definitionSummary?.authorised !== undefined && !definitionSummary.authorised) {\n      res.render(`dpr/routes/journeys/view-report/unauthorised`, {\n        layoutPath,\n        ...req.body,\n      })\n    } else {\n      next()\n    }\n  }\n}\n\nexport default reportAuthoriser\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,qBAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,oCAEzBC,EAA2B,gCAEpB,MAAMH,EAAmB,CAACI,EAAoBC,IAC5C,MAAOC,EAAKC,EAAKC,IAAS,CAC/B,KAAM,CAAE,MAAAC,CAAM,EAAI,EAAAC,QAAa,UAAUH,CAAG,EACtC,CAAE,SAAAI,EAAU,GAAAC,EAAI,UAAAC,EAAW,KAAAC,CAAK,EAAIR,EAAI,OACxCS,EAAiDT,EAAI,MAAM,2BAE3DU,EAAoB,MAAMZ,EAAS,iBAAiB,qBACxDK,EACAE,EACAI,CACF,EAEME,EAAUH,IAAS,aAAW,OAASV,EAAS,iBAAmBA,EAAS,iBAClFG,EAAI,OAAO,WAAa,MAAMU,EAAQ,cAAcR,EAAOE,EAAUE,GAAaD,EAAIG,CAA0B,EAE5GC,GAAmB,aAAe,QAAa,CAACA,EAAkB,WACpET,EAAI,OAAO,+CAAgD,CACzD,WAAAF,EACA,GAAGC,EAAI,IACT,CAAC,EAEDE,EAAK,CAET,EAGF,IAAOT,EAAQC",
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport LocalsHelper from '../utils/localsHelper'\nimport { Services } from '../types/Services'\nimport { ReportType } from '../types/UserReports'\n\nexport const reportAuthoriser = (services: Services, layoutPath: string): RequestHandler => {\n  return async (req, res, next) => {\n    const { token } = LocalsHelper.getValues(res)\n    const { reportId, id, variantId, type } = req.params\n    const dataProductDefinitionsPath = <string | undefined>req.query['dataProductDefinitionsPath']\n\n    const definitionSummary = await services.reportingService.getDefinitionSummary(\n      token,\n      reportId,\n      dataProductDefinitionsPath,\n    )\n\n    const service = type === ReportType.REPORT ? services.reportingService : services.dashboardService\n    res.locals['definition'] = await service.getDefinition(token, reportId, variantId || id, dataProductDefinitionsPath)\n\n    if (definitionSummary?.authorised !== undefined && !definitionSummary.authorised) {\n      res.render(`dpr/routes/journeys/view-report/unauthorised`, {\n        layoutPath,\n        ...req.body,\n      })\n    } else {\n      next()\n    }\n  }\n}\n\nexport default reportAuthoriser\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,qBAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,oCAEzBC,EAA2B,gCAEpB,MAAMH,EAAmB,CAACI,EAAoBC,IAC5C,MAAOC,EAAKC,EAAKC,IAAS,CAC/B,KAAM,CAAE,MAAAC,CAAM,EAAI,EAAAC,QAAa,UAAUH,CAAG,EACtC,CAAE,SAAAI,EAAU,GAAAC,EAAI,UAAAC,EAAW,KAAAC,CAAK,EAAIR,EAAI,OACxCS,EAAiDT,EAAI,MAAM,2BAE3DU,EAAoB,MAAMZ,EAAS,iBAAiB,qBACxDK,EACAE,EACAI,CACF,EAEME,EAAUH,IAAS,aAAW,OAASV,EAAS,iBAAmBA,EAAS,iBAClFG,EAAI,OAAO,WAAgB,MAAMU,EAAQ,cAAcR,EAAOE,EAAUE,GAAaD,EAAIG,CAA0B,EAE/GC,GAAmB,aAAe,QAAa,CAACA,EAAkB,WACpET,EAAI,OAAO,+CAAgD,CACzD,WAAAF,EACA,GAAGC,EAAI,IACT,CAAC,EAEDE,EAAK,CAET,EAGF,IAAOT,EAAQC",
   "names": ["reportAuthoriser_exports", "__export", "reportAuthoriser_default", "reportAuthoriser", "__toCommonJS", "import_localsHelper", "import_UserReports", "services", "layoutPath", "req", "res", "next", "token", "LocalsHelper", "reportId", "id", "variantId", "type", "dataProductDefinitionsPath", "definitionSummary", "service"]
 }

package/dpr/middleware/reportAuthoriser.ts

@@ -7,7 +7,7 @@ export const reportAuthoriser = (services: Services, layoutPath: string): Reques
   return async (req, res, next) => {
     const { token } = LocalsHelper.getValues(res)
     const { reportId, id, variantId, type } = req.params
-    const dataProductDefinitionsPath = <string | undefined>req.query.dataProductDefinitionsPath
+    const dataProductDefinitionsPath = <string | undefined>req.query['dataProductDefinitionsPath']
 
     const definitionSummary = await services.reportingService.getDefinitionSummary(
       token,
@@ -16,7 +16,7 @@ export const reportAuthoriser = (services: Services, layoutPath: string): Reques
     )
 
     const service = type === ReportType.REPORT ? services.reportingService : services.dashboardService
-    res.locals.definition = await service.getDefinition(token, reportId, variantId || id, dataProductDefinitionsPath)
+    res.locals['definition'] = await service.getDefinition(token, reportId, variantId || id, dataProductDefinitionsPath)
 
     if (definitionSummary?.authorised !== undefined && !definitionSummary.authorised) {
       res.render(`dpr/routes/journeys/view-report/unauthorised`, {