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

package/dpr/services/dashboardService.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/services/dashboardService.ts"],
-  "sourcesContent": ["import Dict = NodeJS.Dict\nimport logger from '../utils/logger'\nimport DashboardClient from '../data/dashboardClient'\nimport { components } from '../types/api'\nimport { DashboardDataResponse } from '../types/Metrics'\n\n/* eslint-disable @typescript-eslint/no-explicit-any */\nclass DashboardService {\n  constructor(private readonly dashboardClient: DashboardClient) {\n    this.dashboardClient = dashboardClient\n    logger.info('Service created: DashboardService')\n  }\n\n  async getDefinition(\n    token: string,\n    dpdId: string,\n    id: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<components['schemas']['DashboardDefinition']> {\n    return this.dashboardClient.getDefinition(token, id, dpdId, dataProductDefinitionsPath)\n  }\n\n  async requestAsyncDashboard(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    query: Record<string, string | boolean | number>,\n  ): Promise<Dict<string>> {\n    return this.dashboardClient.requestAsyncDashboard(token, reportId, dashboardId, query)\n  }\n\n  async cancelAsyncRequest(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    executionId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Dict<string>> {\n    return this.dashboardClient.cancelAsyncRequest(\n      token,\n      reportId,\n      dashboardId,\n      executionId,\n      dataProductDefinitionsPath,\n    )\n  }\n\n  async getAsyncStatus(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    executionId: string,\n    tableId?: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Dict<string>> {\n    return this.dashboardClient.getAsyncStatus(\n      token,\n      reportId,\n      dashboardId,\n      executionId,\n      tableId,\n      dataProductDefinitionsPath,\n    )\n  }\n\n  async getAsyncDashboard(\n    token: string,\n    dashboardId: string,\n    reportId: string,\n    tableId: string,\n    query: Record<string, string | string[]>,\n  ): Promise<DashboardDataResponse[][]> {\n    return this.dashboardClient.getAsyncDashboard(token, reportId, dashboardId, tableId, query)\n  }\n}\n\nexport { DashboardService }\nexport default DashboardService\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,sBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAmB,8BAMnB,MAAMH,CAAiB,CACrB,YAA6BI,EAAkC,CAAlC,qBAAAA,EAC3B,KAAK,gBAAkBA,EACvB,EAAAC,QAAO,KAAK,mCAAmC,CACjD,CAEA,MAAM,cACJC,EACAC,EACAC,EACAC,EACuD,CACvD,OAAO,KAAK,gBAAgB,cAAcH,EAAOE,EAAID,EAAOE,CAA0B,CACxF,CAEA,MAAM,sBACJH,EACAI,EACAC,EACAC,EACuB,CACvB,OAAO,KAAK,gBAAgB,sBAAsBN,EAAOI,EAAUC,EAAaC,CAAK,CACvF,CAEA,MAAM,mBACJN,EACAI,EACAC,EACAE,EACAJ,EACuB,CACvB,OAAO,KAAK,gBAAgB,mBAC1BH,EACAI,EACAC,EACAE,EACAJ,CACF,CACF,CAEA,MAAM,eACJH,EACAI,EACAC,EACAE,EACAC,EACAL,EACuB,CACvB,OAAO,KAAK,gBAAgB,eAC1BH,EACAI,EACAC,EACAE,EACAC,EACAL,CACF,CACF,CAEA,MAAM,kBACJH,EACAK,EACAD,EACAI,EACAF,EACoC,CACpC,OAAO,KAAK,gBAAgB,kBAAkBN,EAAOI,EAAUC,EAAaG,EAASF,CAAK,CAC5F,CACF,CAGA,IAAOX,EAAQD",
-  "names": ["dashboardService_exports", "__export", "DashboardService", "dashboardService_default", "__toCommonJS", "import_logger", "dashboardClient", "logger", "token", "dpdId", "id", "dataProductDefinitionsPath", "reportId", "dashboardId", "query", "executionId", "tableId"]
+  "sourcesContent": ["import Dict = NodeJS.Dict\nimport DashboardClient from '../data/dashboardClient'\nimport { components } from '../types/api'\nimport { DashboardDataResponse } from '../types/Metrics'\n\n/* eslint-disable @typescript-eslint/no-explicit-any */\nclass DashboardService {\n  constructor(private readonly dashboardClient: DashboardClient) {\n    this.dashboardClient = dashboardClient\n  }\n\n  async getDefinition(\n    token: string,\n    dpdId: string,\n    id: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<components['schemas']['DashboardDefinition']> {\n    return this.dashboardClient.getDefinition(token, id, dpdId, dataProductDefinitionsPath)\n  }\n\n  async requestAsyncDashboard(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    query: Record<string, string | boolean | number>,\n  ): Promise<Dict<string>> {\n    return this.dashboardClient.requestAsyncDashboard(token, reportId, dashboardId, query)\n  }\n\n  async cancelAsyncRequest(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    executionId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Dict<string>> {\n    return this.dashboardClient.cancelAsyncRequest(\n      token,\n      reportId,\n      dashboardId,\n      executionId,\n      dataProductDefinitionsPath,\n    )\n  }\n\n  async 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    return this.dashboardClient.getAsyncStatus(\n      token,\n      reportId,\n      dashboardId,\n      executionId,\n      tableId,\n      dataProductDefinitionsPath,\n    )\n  }\n\n  async getAsyncDashboard(\n    token: string,\n    dashboardId: string,\n    reportId: string,\n    tableId: string,\n    query: Record<string, string | string[]>,\n  ): Promise<DashboardDataResponse[][]> {\n    return this.dashboardClient.getAsyncDashboard(token, reportId, dashboardId, tableId, query)\n  }\n}\n\nexport { DashboardService }\nexport default DashboardService\n"],
+  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,sBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAMA,MAAME,CAAiB,CACrB,YAA6BG,EAAkC,CAAlC,qBAAAA,EAC3B,KAAK,gBAAkBA,CACzB,CAEA,MAAM,cACJC,EACAC,EACAC,EACAC,EACuD,CACvD,OAAO,KAAK,gBAAgB,cAAcH,EAAOE,EAAID,EAAOE,CAA0B,CACxF,CAEA,MAAM,sBACJH,EACAI,EACAC,EACAC,EACuB,CACvB,OAAO,KAAK,gBAAgB,sBAAsBN,EAAOI,EAAUC,EAAaC,CAAK,CACvF,CAEA,MAAM,mBACJN,EACAI,EACAC,EACAE,EACAJ,EACuB,CACvB,OAAO,KAAK,gBAAgB,mBAC1BH,EACAI,EACAC,EACAE,EACAJ,CACF,CACF,CAEA,MAAM,eACJH,EACAI,EACAC,EACAE,EACAC,EACAL,EAC4D,CAC5D,OAAO,KAAK,gBAAgB,eAC1BH,EACAI,EACAC,EACAE,EACAC,EACAL,CACF,CACF,CAEA,MAAM,kBACJH,EACAK,EACAD,EACAI,EACAF,EACoC,CACpC,OAAO,KAAK,gBAAgB,kBAAkBN,EAAOI,EAAUC,EAAaG,EAASF,CAAK,CAC5F,CACF,CAGA,IAAOT,EAAQD",
+  "names": ["dashboardService_exports", "__export", "DashboardService", "dashboardService_default", "__toCommonJS", "dashboardClient", "token", "dpdId", "id", "dataProductDefinitionsPath", "reportId", "dashboardId", "query", "executionId", "tableId"]
 }

package/dpr/services/dashboardService.ts

@@ -1,5 +1,4 @@
 import Dict = NodeJS.Dict
-import logger from '../utils/logger'
 import DashboardClient from '../data/dashboardClient'
 import { components } from '../types/api'
 import { DashboardDataResponse } from '../types/Metrics'
@@ -8,7 +7,6 @@ import { DashboardDataResponse } from '../types/Metrics'
 class DashboardService {
   constructor(private readonly dashboardClient: DashboardClient) {
     this.dashboardClient = dashboardClient
-    logger.info('Service created: DashboardService')
   }
 
   async getDefinition(
@@ -52,7 +50,7 @@ class DashboardService {
     executionId: string,
     tableId?: string,
     dataProductDefinitionsPath?: string,
-  ): Promise<Dict<string>> {
+  ): Promise<components['schemas']['StatementExecutionStatus']> {
     return this.dashboardClient.getAsyncStatus(
       token,
       reportId,

package/dpr/services/defaultFilterValuesService.js

@@ -1,2 +1,2 @@
-var S=Object.create;var o=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var F=Object.getOwnPropertyNames;var h=Object.getPrototypeOf,m=Object.prototype.hasOwnProperty;var w=(i,t)=>{for(var e in t)o(i,e,{get:t[e],enumerable:!0})},d=(i,t,e,a)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of F(t))!m.call(i,r)&&r!==e&&o(i,r,{get:()=>t[r],enumerable:!(a=y(t,r))||a.enumerable});return i};var x=(i,t,e)=>(e=i!=null?S(h(i)):{},d(t||!i||!i.__esModule?o(e,"default",{value:i,enumerable:!0}):e,i)),v=i=>d(o({},"__esModule",{value:!0}),i);var R={};w(R,{DefaultFilterValuesService:()=>g,default:()=>C});module.exports=v(R);var c=x(require("./reportStoreService")),u=require("../components/_filters/filtersTypeEnum");class g extends c.default{constructor(t){super(t)}async init(t,e){t.defaultFilters||(t.defaultFilters=[],await this.saveState(e,t))}async save(t,e,a,r){const s=await this.getState(t);await this.init(s,t);const l={reportId:e,id:a,values:r},n=await this.getIndex(t,e,a);n===-1?s.defaultFilters.push(l):s.defaultFilters[n]=l,await this.saveState(t,s)}async get(t,e,a,r){const l=(await this.getState(t)).defaultFilters?.find(n=>n.id===a&&n.reportId===e);if(l)return l.values.filter(n=>{const f=n.type?n.type:u.FiltersType.REQUEST;return r===f})}async getIndex(t,e,a){return(await this.getState(t)).defaultFilters.findIndex(s=>s.id===a&&s.reportId===e)}async delete(t,e,a,r){const s=await this.getState(t),l=await this.getIndex(t,e,a);if(l!==-1){const n=s.defaultFilters[l];if(n.values.length>0){const f=n.values.filter(p=>(p.type?p.type:u.FiltersType.REQUEST)!==r);s.defaultFilters[l].values=f}else s.defaultFilters.splice(l,1);await this.saveState(t,s)}}}var C=g;0&&(module.exports={DefaultFilterValuesService});
+"use strict";var h=Object.create;var o=Object.defineProperty;var S=Object.getOwnPropertyDescriptor;var v=Object.getOwnPropertyNames;var y=Object.getPrototypeOf,b=Object.prototype.hasOwnProperty;var w=(i,e)=>{for(var t in e)o(i,t,{get:e[t],enumerable:!0})},p=(i,e,t,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of v(e))!b.call(i,s)&&s!==t&&o(i,s,{get:()=>e[s],enumerable:!(n=S(e,s))||n.enumerable});return i};var c=(i,e,t)=>(t=i!=null?h(y(i)):{},p(e||!i||!i.__esModule?o(t,"default",{value:i,enumerable:!0}):t,i)),x=i=>p(o({},"__esModule",{value:!0}),i);var R={};w(R,{DefaultFilterValuesService:()=>d,default:()=>C});module.exports=x(R);var m=c(require("./reportStoreService")),u=require("../components/_filters/filtersTypeEnum"),F=c(require("../utils/logger"));class d extends m.default{constructor(e,t){super(e),this.enabled=!!t.saveDefaults,this.enabled||F.default.info("saveDefaultsFilters: disabled")}async init(e,t){this.enabled&&(e.defaultFilters||(e.defaultFilters=[],await this.saveState(t,e)))}async save(e,t,n,s){if(!this.enabled)return;const r=await this.getState(e);await this.init(r,e);const l={reportId:t,id:n,values:s},a=await this.getIndex(e,t,n);r.defaultFilters!==void 0&&(a===-1?r.defaultFilters.push(l):typeof a=="number"&&(r.defaultFilters[a]=l),await this.saveState(e,r))}async get(e,t,n,s){if(!this.enabled)return[];const l=(await this.getState(e)).defaultFilters?.find(a=>a.id===n&&a.reportId===t);if(l)return l.values.filter(a=>{const f=a.type?a.type:u.FiltersType.REQUEST;return s===f})}async getIndex(e,t,n){return(await this.getState(e)).defaultFilters?.findIndex(r=>r.id===n&&r.reportId===t)}async delete(e,t,n,s){if(!this.enabled)return;const r=await this.getState(e),l=await this.getIndex(e,t,n);if(l!==void 0&&l!==-1&&r.defaultFilters){const a=r.defaultFilters[l];if(a.values.length>0){const f=a.values.filter(g=>(g.type?g.type:u.FiltersType.REQUEST)!==s);r.defaultFilters[l].values=f}else r.defaultFilters.splice(l,1);await this.saveState(e,r)}}}var C=d;0&&(module.exports={DefaultFilterValuesService});
 //# sourceMappingURL=defaultFilterValuesService.js.map

package/dpr/services/defaultFilterValuesService.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/services/defaultFilterValuesService.ts"],
-  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport ReportStoreService from './reportStoreService'\nimport ReportDataStore from '../data/reportDataStore'\nimport { ReportStoreConfig } from '../types/ReportStore'\nimport { defaultFilterValue } from '../utils/Personalisation/types'\nimport { FiltersType } from '../components/_filters/filtersTypeEnum'\n\nclass DefaultFilterValuesService extends ReportStoreService {\n  constructor(reportDataStore: ReportDataStore) {\n    super(reportDataStore)\n  }\n\n  async init(userConfig: ReportStoreConfig, userId: string) {\n    if (!userConfig.defaultFilters) {\n      userConfig.defaultFilters = []\n      await this.saveState(userId, userConfig)\n    }\n  }\n\n  async save(userId: string, reportId: string, id: string, values: defaultFilterValue[]) {\n    const userConfig = await this.getState(userId)\n    await this.init(userConfig, userId)\n\n    const defaults = {\n      reportId,\n      id,\n      values,\n    }\n\n    const defaultValuesIndex = await this.getIndex(userId, reportId, id)\n\n    if (defaultValuesIndex === -1) {\n      userConfig.defaultFilters.push(defaults)\n    } else {\n      userConfig.defaultFilters[defaultValuesIndex] = defaults\n    }\n\n    await this.saveState(userId, userConfig)\n  }\n\n  async get(userId: string, reportId: string, id: string, filtersType: FiltersType) {\n    const userConfig = await this.getState(userId)\n    const defaultConfig = userConfig.defaultFilters?.find((defaultFilter) => {\n      return defaultFilter.id === id && defaultFilter.reportId === reportId\n    })\n    if (!defaultConfig) {\n      return undefined\n    }\n    return defaultConfig.values.filter((v) => {\n      const type = !v.type ? FiltersType.REQUEST : v.type\n      return filtersType === type\n    })\n  }\n\n  async getIndex(userId: string, reportId: string, id: string) {\n    const userConfig = await this.getState(userId)\n    return userConfig.defaultFilters.findIndex((defaultFilter) => {\n      return defaultFilter.id === id && defaultFilter.reportId === reportId\n    })\n  }\n\n  async delete(userId: string, reportId: string, id: string, type: FiltersType) {\n    const userConfig = await this.getState(userId)\n    const index = await this.getIndex(userId, reportId, id)\n    if (index !== -1) {\n      const defaults = userConfig.defaultFilters[index]\n      if (defaults.values.length > 0) {\n        const updatedValues = defaults.values.filter((value) => {\n          const filtersType = !value.type ? FiltersType.REQUEST : value.type\n          return filtersType !== type\n        })\n        userConfig.defaultFilters[index].values = updatedValues\n      } else {\n        userConfig.defaultFilters.splice(index, 1)\n      }\n      await this.saveState(userId, userConfig)\n    }\n  }\n}\n\nexport { DefaultFilterValuesService }\nexport default DefaultFilterValuesService\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,gCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAA+B,mCAI/BC,EAA4B,kDAE5B,MAAMJ,UAAmC,EAAAK,OAAmB,CAC1D,YAAYC,EAAkC,CAC5C,MAAMA,CAAe,CACvB,CAEA,MAAM,KAAKC,EAA+BC,EAAgB,CACnDD,EAAW,iBACdA,EAAW,eAAiB,CAAC,EAC7B,MAAM,KAAK,UAAUC,EAAQD,CAAU,EAE3C,CAEA,MAAM,KAAKC,EAAgBC,EAAkBC,EAAYC,EAA8B,CACrF,MAAMJ,EAAa,MAAM,KAAK,SAASC,CAAM,EAC7C,MAAM,KAAK,KAAKD,EAAYC,CAAM,EAElC,MAAMI,EAAW,CACf,SAAAH,EACA,GAAAC,EACA,OAAAC,CACF,EAEME,EAAqB,MAAM,KAAK,SAASL,EAAQC,EAAUC,CAAE,EAE/DG,IAAuB,GACzBN,EAAW,eAAe,KAAKK,CAAQ,EAEvCL,EAAW,eAAeM,CAAkB,EAAID,EAGlD,MAAM,KAAK,UAAUJ,EAAQD,CAAU,CACzC,CAEA,MAAM,IAAIC,EAAgBC,EAAkBC,EAAYI,EAA0B,CAEhF,MAAMC,GADa,MAAM,KAAK,SAASP,CAAM,GACZ,gBAAgB,KAAMQ,GAC9CA,EAAc,KAAON,GAAMM,EAAc,WAAaP,CAC9D,EACD,GAAKM,EAGL,OAAOA,EAAc,OAAO,OAAQE,GAAM,CACxC,MAAMC,EAAQD,EAAE,KAA6BA,EAAE,KAAxB,cAAY,QACnC,OAAOH,IAAgBI,CACzB,CAAC,CACH,CAEA,MAAM,SAASV,EAAgBC,EAAkBC,EAAY,CAE3D,OADmB,MAAM,KAAK,SAASF,CAAM,GAC3B,eAAe,UAAWQ,GACnCA,EAAc,KAAON,GAAMM,EAAc,WAAaP,CAC9D,CACH,CAEA,MAAM,OAAOD,EAAgBC,EAAkBC,EAAYQ,EAAmB,CAC5E,MAAMX,EAAa,MAAM,KAAK,SAASC,CAAM,EACvCW,EAAQ,MAAM,KAAK,SAASX,EAAQC,EAAUC,CAAE,EACtD,GAAIS,IAAU,GAAI,CAChB,MAAMP,EAAWL,EAAW,eAAeY,CAAK,EAChD,GAAIP,EAAS,OAAO,OAAS,EAAG,CAC9B,MAAMQ,EAAgBR,EAAS,OAAO,OAAQS,IACvBA,EAAM,KAA6BA,EAAM,KAA5B,cAAY,WACvBH,CACxB,EACDX,EAAW,eAAeY,CAAK,EAAE,OAASC,CAC5C,MACEb,EAAW,eAAe,OAAOY,EAAO,CAAC,EAE3C,MAAM,KAAK,UAAUX,EAAQD,CAAU,CACzC,CACF,CACF,CAGA,IAAON,EAAQD",
-  "names": ["defaultFilterValuesService_exports", "__export", "DefaultFilterValuesService", "defaultFilterValuesService_default", "__toCommonJS", "import_reportStoreService", "import_filtersTypeEnum", "ReportStoreService", "reportDataStore", "userConfig", "userId", "reportId", "id", "values", "defaults", "defaultValuesIndex", "filtersType", "defaultConfig", "defaultFilter", "v", "type", "index", "updatedValues", "value"]
+  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport ReportStoreService from './reportStoreService'\nimport ReportDataStore from '../data/reportDataStore'\nimport { ReportStoreConfig } from '../types/ReportStore'\nimport { defaultFilterValue } from '../utils/Personalisation/types'\nimport { FiltersType } from '../components/_filters/filtersTypeEnum'\nimport { ServiceFeatureConfig } from '../types/DprConfig'\nimport logger from '../utils/logger'\n\nclass DefaultFilterValuesService extends ReportStoreService {\n  enabled: boolean\n\n  constructor(reportDataStore: ReportDataStore, serviceFeatureConfig: ServiceFeatureConfig) {\n    super(reportDataStore)\n    this.enabled = Boolean(serviceFeatureConfig.saveDefaults)\n    if (!this.enabled) logger.info(`saveDefaultsFilters: disabled`)\n  }\n\n  async init(userConfig: ReportStoreConfig, userId: string): Promise<void> {\n    if (!this.enabled) return\n\n    if (!userConfig.defaultFilters) {\n      userConfig.defaultFilters = []\n      await this.saveState(userId, userConfig)\n    }\n  }\n\n  async save(userId: string, reportId: string, id: string, values: defaultFilterValue[]): Promise<void> {\n    if (!this.enabled) return\n\n    const userConfig = await this.getState(userId)\n    await this.init(userConfig, userId)\n\n    const defaults = {\n      reportId,\n      id,\n      values,\n    }\n\n    const defaultValuesIndex = await this.getIndex(userId, reportId, id)\n    if (userConfig.defaultFilters !== undefined) {\n      if (defaultValuesIndex === -1) {\n        userConfig.defaultFilters.push(defaults)\n      } else if (typeof defaultValuesIndex === 'number') {\n        userConfig.defaultFilters[defaultValuesIndex] = defaults\n      }\n      await this.saveState(userId, userConfig)\n    }\n  }\n\n  async get(\n    userId: string,\n    reportId: string,\n    id: string,\n    filtersType: FiltersType,\n  ): Promise<defaultFilterValue[] | undefined> {\n    if (!this.enabled) return []\n\n    const userConfig = await this.getState(userId)\n    const defaultConfig = userConfig.defaultFilters?.find((defaultFilter) => {\n      return defaultFilter.id === id && defaultFilter.reportId === reportId\n    })\n    if (!defaultConfig) {\n      return undefined\n    }\n    return defaultConfig.values.filter((v) => {\n      const type = !v.type ? FiltersType.REQUEST : v.type\n      return filtersType === type\n    })\n  }\n\n  private async getIndex(userId: string, reportId: string, id: string) {\n    const userConfig = await this.getState(userId)\n    return userConfig.defaultFilters?.findIndex((defaultFilter) => {\n      return defaultFilter.id === id && defaultFilter.reportId === reportId\n    })\n  }\n\n  async delete(userId: string, reportId: string, id: string, type: FiltersType): Promise<void> {\n    if (!this.enabled) return\n\n    const userConfig = await this.getState(userId)\n    const index = await this.getIndex(userId, reportId, id)\n    if (index !== undefined && index !== -1 && userConfig.defaultFilters) {\n      const defaults = userConfig.defaultFilters[index]\n      if (defaults.values.length > 0) {\n        const updatedValues = defaults.values.filter((value) => {\n          const filtersType = !value.type ? FiltersType.REQUEST : value.type\n          return filtersType !== type\n        })\n        userConfig.defaultFilters[index].values = updatedValues\n      } else {\n        userConfig.defaultFilters.splice(index, 1)\n      }\n      await this.saveState(userId, userConfig)\n    }\n  }\n}\n\nexport { DefaultFilterValuesService }\nexport default DefaultFilterValuesService\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,gCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAA+B,mCAI/BC,EAA4B,kDAE5BC,EAAmB,8BAEnB,MAAML,UAAmC,EAAAM,OAAmB,CAG1D,YAAYC,EAAkCC,EAA4C,CACxF,MAAMD,CAAe,EACrB,KAAK,QAAU,EAAQC,EAAqB,aACvC,KAAK,SAAS,EAAAC,QAAO,KAAK,+BAA+B,CAChE,CAEA,MAAM,KAAKC,EAA+BC,EAA+B,CAClE,KAAK,UAELD,EAAW,iBACdA,EAAW,eAAiB,CAAC,EAC7B,MAAM,KAAK,UAAUC,EAAQD,CAAU,GAE3C,CAEA,MAAM,KAAKC,EAAgBC,EAAkBC,EAAYC,EAA6C,CACpG,GAAI,CAAC,KAAK,QAAS,OAEnB,MAAMJ,EAAa,MAAM,KAAK,SAASC,CAAM,EAC7C,MAAM,KAAK,KAAKD,EAAYC,CAAM,EAElC,MAAMI,EAAW,CACf,SAAAH,EACA,GAAAC,EACA,OAAAC,CACF,EAEME,EAAqB,MAAM,KAAK,SAASL,EAAQC,EAAUC,CAAE,EAC/DH,EAAW,iBAAmB,SAC5BM,IAAuB,GACzBN,EAAW,eAAe,KAAKK,CAAQ,EAC9B,OAAOC,GAAuB,WACvCN,EAAW,eAAeM,CAAkB,EAAID,GAElD,MAAM,KAAK,UAAUJ,EAAQD,CAAU,EAE3C,CAEA,MAAM,IACJC,EACAC,EACAC,EACAI,EAC2C,CAC3C,GAAI,CAAC,KAAK,QAAS,MAAO,CAAC,EAG3B,MAAMC,GADa,MAAM,KAAK,SAASP,CAAM,GACZ,gBAAgB,KAAMQ,GAC9CA,EAAc,KAAON,GAAMM,EAAc,WAAaP,CAC9D,EACD,GAAKM,EAGL,OAAOA,EAAc,OAAO,OAAQE,GAAM,CACxC,MAAMC,EAAQD,EAAE,KAA6BA,EAAE,KAAxB,cAAY,QACnC,OAAOH,IAAgBI,CACzB,CAAC,CACH,CAEA,MAAc,SAASV,EAAgBC,EAAkBC,EAAY,CAEnE,OADmB,MAAM,KAAK,SAASF,CAAM,GAC3B,gBAAgB,UAAWQ,GACpCA,EAAc,KAAON,GAAMM,EAAc,WAAaP,CAC9D,CACH,CAEA,MAAM,OAAOD,EAAgBC,EAAkBC,EAAYQ,EAAkC,CAC3F,GAAI,CAAC,KAAK,QAAS,OAEnB,MAAMX,EAAa,MAAM,KAAK,SAASC,CAAM,EACvCW,EAAQ,MAAM,KAAK,SAASX,EAAQC,EAAUC,CAAE,EACtD,GAAIS,IAAU,QAAaA,IAAU,IAAMZ,EAAW,eAAgB,CACpE,MAAMK,EAAWL,EAAW,eAAeY,CAAK,EAChD,GAAIP,EAAS,OAAO,OAAS,EAAG,CAC9B,MAAMQ,EAAgBR,EAAS,OAAO,OAAQS,IACvBA,EAAM,KAA6BA,EAAM,KAA5B,cAAY,WACvBH,CACxB,EACDX,EAAW,eAAeY,CAAK,EAAE,OAASC,CAC5C,MACEb,EAAW,eAAe,OAAOY,EAAO,CAAC,EAE3C,MAAM,KAAK,UAAUX,EAAQD,CAAU,CACzC,CACF,CACF,CAGA,IAAOT,EAAQD",
+  "names": ["defaultFilterValuesService_exports", "__export", "DefaultFilterValuesService", "defaultFilterValuesService_default", "__toCommonJS", "import_reportStoreService", "import_filtersTypeEnum", "import_logger", "ReportStoreService", "reportDataStore", "serviceFeatureConfig", "logger", "userConfig", "userId", "reportId", "id", "values", "defaults", "defaultValuesIndex", "filtersType", "defaultConfig", "defaultFilter", "v", "type", "index", "updatedValues", "value"]
 }

package/dpr/services/defaultFilterValuesService.ts

@@ -4,20 +4,30 @@ import ReportDataStore from '../data/reportDataStore'
 import { ReportStoreConfig } from '../types/ReportStore'
 import { defaultFilterValue } from '../utils/Personalisation/types'
 import { FiltersType } from '../components/_filters/filtersTypeEnum'
+import { ServiceFeatureConfig } from '../types/DprConfig'
+import logger from '../utils/logger'
 
 class DefaultFilterValuesService extends ReportStoreService {
-  constructor(reportDataStore: ReportDataStore) {
+  enabled: boolean
+
+  constructor(reportDataStore: ReportDataStore, serviceFeatureConfig: ServiceFeatureConfig) {
     super(reportDataStore)
+    this.enabled = Boolean(serviceFeatureConfig.saveDefaults)
+    if (!this.enabled) logger.info(`saveDefaultsFilters: disabled`)
   }
 
-  async init(userConfig: ReportStoreConfig, userId: string) {
+  async init(userConfig: ReportStoreConfig, userId: string): Promise<void> {
+    if (!this.enabled) return
+
     if (!userConfig.defaultFilters) {
       userConfig.defaultFilters = []
       await this.saveState(userId, userConfig)
     }
   }
 
-  async save(userId: string, reportId: string, id: string, values: defaultFilterValue[]) {
+  async save(userId: string, reportId: string, id: string, values: defaultFilterValue[]): Promise<void> {
+    if (!this.enabled) return
+
     const userConfig = await this.getState(userId)
     await this.init(userConfig, userId)
 
@@ -28,17 +38,24 @@ class DefaultFilterValuesService extends ReportStoreService {
     }
 
     const defaultValuesIndex = await this.getIndex(userId, reportId, id)
-
-    if (defaultValuesIndex === -1) {
-      userConfig.defaultFilters.push(defaults)
-    } else {
-      userConfig.defaultFilters[defaultValuesIndex] = defaults
+    if (userConfig.defaultFilters !== undefined) {
+      if (defaultValuesIndex === -1) {
+        userConfig.defaultFilters.push(defaults)
+      } else if (typeof defaultValuesIndex === 'number') {
+        userConfig.defaultFilters[defaultValuesIndex] = defaults
+      }
+      await this.saveState(userId, userConfig)
     }
-
-    await this.saveState(userId, userConfig)
   }
 
-  async get(userId: string, reportId: string, id: string, filtersType: FiltersType) {
+  async get(
+    userId: string,
+    reportId: string,
+    id: string,
+    filtersType: FiltersType,
+  ): Promise<defaultFilterValue[] | undefined> {
+    if (!this.enabled) return []
+
     const userConfig = await this.getState(userId)
     const defaultConfig = userConfig.defaultFilters?.find((defaultFilter) => {
       return defaultFilter.id === id && defaultFilter.reportId === reportId
@@ -52,17 +69,19 @@ class DefaultFilterValuesService extends ReportStoreService {
     })
   }
 
-  async getIndex(userId: string, reportId: string, id: string) {
+  private async getIndex(userId: string, reportId: string, id: string) {
     const userConfig = await this.getState(userId)
-    return userConfig.defaultFilters.findIndex((defaultFilter) => {
+    return userConfig.defaultFilters?.findIndex((defaultFilter) => {
       return defaultFilter.id === id && defaultFilter.reportId === reportId
     })
   }
 
-  async delete(userId: string, reportId: string, id: string, type: FiltersType) {
+  async delete(userId: string, reportId: string, id: string, type: FiltersType): Promise<void> {
+    if (!this.enabled) return
+
     const userConfig = await this.getState(userId)
     const index = await this.getIndex(userId, reportId, id)
-    if (index !== -1) {
+    if (index !== undefined && index !== -1 && userConfig.defaultFilters) {
       const defaults = userConfig.defaultFilters[index]
       if (defaults.values.length > 0) {
         const updatedValues = defaults.values.filter((value) => {

package/dpr/services/index.js

@@ -1,2 +1,2 @@
-var n=Object.create;var t=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var D=Object.getOwnPropertyNames;var k=Object.getPrototypeOf,w=Object.prototype.hasOwnProperty;var V=(r,e)=>{for(var o in e)t(r,o,{get:e[o],enumerable:!0})},d=(r,e,o,R)=>{if(e&&typeof e=="object"||typeof e=="function")for(let m of D(e))!w.call(r,m)&&m!==o&&t(r,m,{get:()=>e[m],enumerable:!(R=u(e,m))||R.enumerable});return r};var i=(r,e,o)=>(o=r!=null?n(k(r)):{},d(e||!r||!r.__esModule?t(o,"default",{value:r,enumerable:!0}):o,r)),b=r=>d(t({},"__esModule",{value:!0}),r);var g={};V(g,{BookmarkService:()=>S.default,DashboardService:()=>s.default,DefaultFilterValuesService:()=>v.default,DownloadPermissionService:()=>p.default,RecentlyViewedStoreService:()=>f.default,ReportStoreService:()=>a.default,ReportingService:()=>l.default,RequestedReportService:()=>c.default});module.exports=b(g);var p=i(require("../routes/journeys/download-report/request-download/service")),S=i(require("../routes/journeys/my-reports/bookmarks/service")),c=i(require("../routes/journeys/my-reports/requested-reports/service")),f=i(require("../routes/journeys/my-reports/recently-viewed/service")),v=i(require("./defaultFilterValuesService")),a=i(require("./reportStoreService")),l=i(require("./reportingService")),s=i(require("./dashboardService"));0&&(module.exports={BookmarkService,DashboardService,DefaultFilterValuesService,DownloadPermissionService,RecentlyViewedStoreService,ReportStoreService,ReportingService,RequestedReportService});
+"use strict";var n=Object.create;var t=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var D=Object.getOwnPropertyNames;var k=Object.getPrototypeOf,w=Object.prototype.hasOwnProperty;var V=(r,e)=>{for(var o in e)t(r,o,{get:e[o],enumerable:!0})},d=(r,e,o,R)=>{if(e&&typeof e=="object"||typeof e=="function")for(let m of D(e))!w.call(r,m)&&m!==o&&t(r,m,{get:()=>e[m],enumerable:!(R=u(e,m))||R.enumerable});return r};var i=(r,e,o)=>(o=r!=null?n(k(r)):{},d(e||!r||!r.__esModule?t(o,"default",{value:r,enumerable:!0}):o,r)),b=r=>d(t({},"__esModule",{value:!0}),r);var g={};V(g,{BookmarkService:()=>S.default,DashboardService:()=>s.default,DefaultFilterValuesService:()=>v.default,DownloadPermissionService:()=>p.default,RecentlyViewedStoreService:()=>f.default,ReportStoreService:()=>a.default,ReportingService:()=>l.default,RequestedReportService:()=>c.default});module.exports=b(g);var p=i(require("../routes/journeys/download-report/request-download/service")),S=i(require("../routes/journeys/my-reports/bookmarks/service")),c=i(require("../routes/journeys/my-reports/requested-reports/service")),f=i(require("../routes/journeys/my-reports/recently-viewed/service")),v=i(require("./defaultFilterValuesService")),a=i(require("./reportStoreService")),l=i(require("./reportingService")),s=i(require("./dashboardService"));0&&(module.exports={BookmarkService,DashboardService,DefaultFilterValuesService,DownloadPermissionService,RecentlyViewedStoreService,ReportStoreService,ReportingService,RequestedReportService});
 //# sourceMappingURL=index.js.map

package/dpr/services/index.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/dpr/services/index.ts"],
   "sourcesContent": ["import DownloadPermissionService from '../routes/journeys/download-report/request-download/service'\nimport BookmarkService from '../routes/journeys/my-reports/bookmarks/service'\nimport RequestedReportService from '../routes/journeys/my-reports/requested-reports/service'\nimport RecentlyViewedStoreService from '../routes/journeys/my-reports/recently-viewed/service'\nimport DefaultFilterValuesService from './defaultFilterValuesService'\nimport ReportStoreService from './reportStoreService'\nimport ReportingService from './reportingService'\nimport DashboardService from './dashboardService'\n\nexport {\n  DownloadPermissionService,\n  BookmarkService,\n  ReportStoreService,\n  ReportingService,\n  RecentlyViewedStoreService,\n  RequestedReportService,\n  DashboardService,\n  DefaultFilterValuesService,\n}\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,uBAAAE,QAAA,uBAAAC,QAAA,iCAAAC,QAAA,gCAAAC,QAAA,iCAAAC,QAAA,yBAAAC,QAAA,uBAAAC,QAAA,6BAAAC,UAAA,eAAAC,EAAAV,GAAA,IAAAW,EAAsC,0EACtCA,EAA4B,8DAC5BA,EAAmC,sEACnCA,EAAuC,oEACvCC,EAAuC,2CACvCC,EAA+B,mCAC/BC,EAA6B,iCAC7BC,EAA6B",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,uBAAAE,QAAA,uBAAAC,QAAA,iCAAAC,QAAA,gCAAAC,QAAA,iCAAAC,QAAA,yBAAAC,QAAA,uBAAAC,QAAA,6BAAAC,UAAA,eAAAC,EAAAV,GAAA,IAAAW,EAAsC,0EACtCA,EAA4B,8DAC5BA,EAAmC,sEACnCA,EAAuC,oEACvCC,EAAuC,2CACvCC,EAA+B,mCAC/BC,EAA6B,iCAC7BC,EAA6B",
   "names": ["services_exports", "__export", "BookmarkService", "DashboardService", "DefaultFilterValuesService", "DownloadPermissionService", "RecentlyViewedStoreService", "ReportStoreService", "ReportingService", "RequestedReportService", "__toCommonJS", "import_service", "import_defaultFilterValuesService", "import_reportStoreService", "import_reportingService", "import_dashboardService"]
 }

package/dpr/services/missingReport/missingReportService.js

@@ -0,0 +1,2 @@
+"use strict";var l=Object.create;var s=Object.defineProperty;var m=Object.getOwnPropertyDescriptor;var a=Object.getOwnPropertyNames;var d=Object.getPrototypeOf,f=Object.prototype.hasOwnProperty;var c=(i,e)=>{for(var n in e)s(i,n,{get:e[n],enumerable:!0})},p=(i,e,n,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let t of a(e))!f.call(i,t)&&t!==n&&s(i,t,{get:()=>e[t],enumerable:!(r=m(e,t))||r.enumerable});return i};var u=(i,e,n)=>(n=i!=null?l(d(i)):{},p(e||!i||!i.__esModule?s(n,"default",{value:i,enumerable:!0}):n,i)),b=i=>p(s({},"__esModule",{value:!0}),i);var M={};c(M,{MissingReportService:()=>o,default:()=>R});module.exports=b(M);var g=u(require("../../utils/logger"));class o{constructor(e,n){this.missingReportClient=e;this.enabled=!!n.collections,this.enabled||g.default.info("Missing reports: disabled ")}submitMissingReportEntry(e,n,r,t){if(this.enabled)return this.missingReportClient.submitMissingReportEntry(e,n,r,t)}}var R=o;0&&(module.exports={MissingReportService});
+//# sourceMappingURL=missingReportService.js.map

package/dpr/services/missingReport/missingReportService.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/dpr/services/missingReport/missingReportService.ts"],
+  "sourcesContent": ["import logger from '../../utils/logger'\nimport MissingReportClient from '../../data/missingReportClient'\nimport { components } from '../../types/api'\nimport { ServiceFeatureConfig } from '../../types/DprConfig'\n\nclass MissingReportService {\n  enabled: boolean\n\n  constructor(private readonly missingReportClient: MissingReportClient, serviceFeatureConfig: ServiceFeatureConfig) {\n    this.enabled = Boolean(serviceFeatureConfig.collections)\n    if (!this.enabled) logger.info(`Missing reports: disabled `)\n  }\n\n  submitMissingReportEntry(\n    token: string,\n    reportId: string,\n    variantId: string,\n    reason?: string,\n  ): Promise<components['schemas']['MissingReportSubmission']> | undefined {\n    if (!this.enabled) return undefined\n    return this.missingReportClient.submitMissingReportEntry(token, reportId, variantId, reason)\n  }\n}\n\nexport { MissingReportService }\nexport default MissingReportService\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,0BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAAmB,iCAKnB,MAAMH,CAAqB,CAGzB,YAA6BI,EAA0CC,EAA4C,CAAtF,yBAAAD,EAC3B,KAAK,QAAU,EAAQC,EAAqB,YACvC,KAAK,SAAS,EAAAC,QAAO,KAAK,4BAA4B,CAC7D,CAEA,yBACEC,EACAC,EACAC,EACAC,EACuE,CACvE,GAAK,KAAK,QACV,OAAO,KAAK,oBAAoB,yBAAyBH,EAAOC,EAAUC,EAAWC,CAAM,CAC7F,CACF,CAGA,IAAOT,EAAQD",
+  "names": ["missingReportService_exports", "__export", "MissingReportService", "missingReportService_default", "__toCommonJS", "import_logger", "missingReportClient", "serviceFeatureConfig", "logger", "token", "reportId", "variantId", "reason"]
+}

package/dpr/services/missingReport/missingReportService.ts

@@ -0,0 +1,26 @@
+import logger from '../../utils/logger'
+import MissingReportClient from '../../data/missingReportClient'
+import { components } from '../../types/api'
+import { ServiceFeatureConfig } from '../../types/DprConfig'
+
+class MissingReportService {
+  enabled: boolean
+
+  constructor(private readonly missingReportClient: MissingReportClient, serviceFeatureConfig: ServiceFeatureConfig) {
+    this.enabled = Boolean(serviceFeatureConfig.collections)
+    if (!this.enabled) logger.info(`Missing reports: disabled `)
+  }
+
+  submitMissingReportEntry(
+    token: string,
+    reportId: string,
+    variantId: string,
+    reason?: string,
+  ): Promise<components['schemas']['MissingReportSubmission']> | undefined {
+    if (!this.enabled) return undefined
+    return this.missingReportClient.submitMissingReportEntry(token, reportId, variantId, reason)
+  }
+}
+
+export { MissingReportService }
+export default MissingReportService

package/dpr/services/productCollection/productCollectionService.js

@@ -1,2 +1,2 @@
-var l=Object.create;var n=Object.defineProperty;var C=Object.getOwnPropertyDescriptor;var m=Object.getOwnPropertyNames;var p=Object.getPrototypeOf,u=Object.prototype.hasOwnProperty;var g=(o,t)=>{for(var e in t)n(o,e,{get:t[e],enumerable:!0})},s=(o,t,e,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of m(t))!u.call(o,r)&&r!==e&&n(o,r,{get:()=>t[r],enumerable:!(i=C(t,r))||i.enumerable});return o};var P=(o,t,e)=>(e=o!=null?l(p(o)):{},s(t||!o||!o.__esModule?n(e,"default",{value:o,enumerable:!0}):e,o)),a=o=>s(n({},"__esModule",{value:!0}),o);var h={};g(h,{ProductCollectionService:()=>d});module.exports=a(h);var c=P(require("../../data/restClient"));class d{constructor(t){this.restClient=new c.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})}}0&&(module.exports={ProductCollectionService});
+"use strict";var s=Object.create;var i=Object.defineProperty;var d=Object.getOwnPropertyDescriptor;var u=Object.getOwnPropertyNames;var C=Object.getPrototypeOf,a=Object.prototype.hasOwnProperty;var m=(e,o)=>{for(var t in o)i(e,t,{get:o[t],enumerable:!0})},l=(e,o,t,r)=>{if(o&&typeof o=="object"||typeof o=="function")for(let n of u(o))!a.call(e,n)&&n!==t&&i(e,n,{get:()=>o[n],enumerable:!(r=d(o,n))||r.enumerable});return e};var f=(e,o,t)=>(t=e!=null?s(C(e)):{},l(o||!e||!e.__esModule?i(t,"default",{value:e,enumerable:!0}):t,e)),p=e=>l(i({},"__esModule",{value:!0}),e);var g={};m(g,{ProductCollectionService:()=>P});module.exports=p(g);var c=f(require("../../utils/logger"));class P{constructor(o,t){this.productCollectionClient=o;this.productCollectionClient=o,this.enabled=!!t.collections,this.enabled||c.default.info("Product collections: disabled ")}async getProductCollections(o){return this.enabled?this.productCollectionClient.getProductCollections(o):[]}async getProductCollection(o,t){if(this.enabled)return this.productCollectionClient.getProductCollection(o,t)}}0&&(module.exports={ProductCollectionService});
 //# sourceMappingURL=productCollectionService.js.map

package/dpr/services/productCollection/productCollectionService.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/dpr/services/productCollection/productCollectionService.ts"],
-  "sourcesContent": ["import { ApiConfig } from '../../data/types'\nimport { components } from '../../types/api'\nimport RestClient from '../../data/restClient'\n\nexport class ProductCollectionService {\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"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,8BAAAE,IAAA,eAAAC,EAAAH,GAEA,IAAAI,EAAuB,oCAEhB,MAAMF,CAAyB,CAGpC,YAAYG,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",
-  "names": ["productCollectionService_exports", "__export", "ProductCollectionService", "__toCommonJS", "import_restClient", "config", "RestClient", "token", "id"]
+  "sourcesContent": ["import { components } from '../../types/api'\nimport { ServiceFeatureConfig } from '../../types/DprConfig'\nimport { ProductCollectionClient } from '../../data/productCollectionClient'\nimport logger from '../../utils/logger'\n\nexport class ProductCollectionService {\n  enabled: boolean\n\n  constructor(\n    private readonly productCollectionClient: ProductCollectionClient,\n    serviceFeatureConfig: ServiceFeatureConfig,\n  ) {\n    this.productCollectionClient = productCollectionClient\n    this.enabled = Boolean(serviceFeatureConfig.collections)\n    if (!this.enabled) logger.info(`Product collections: disabled `)\n  }\n\n  async getProductCollections(token: string): Promise<components['schemas']['ProductCollectionSummary'][]> {\n    if (!this.enabled) return []\n    return this.productCollectionClient.getProductCollections(token)\n  }\n\n  async getProductCollection(\n    token: string,\n    id: string,\n  ): Promise<components['schemas']['ProductCollectionDTO'] | undefined> {\n    if (!this.enabled) return undefined\n    return this.productCollectionClient.getProductCollection(token, id)\n  }\n}\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,8BAAAE,IAAA,eAAAC,EAAAH,GAGA,IAAAI,EAAmB,iCAEZ,MAAMF,CAAyB,CAGpC,YACmBG,EACjBC,EACA,CAFiB,6BAAAD,EAGjB,KAAK,wBAA0BA,EAC/B,KAAK,QAAU,EAAQC,EAAqB,YACvC,KAAK,SAAS,EAAAC,QAAO,KAAK,gCAAgC,CACjE,CAEA,MAAM,sBAAsBC,EAA6E,CACvG,OAAK,KAAK,QACH,KAAK,wBAAwB,sBAAsBA,CAAK,EADrC,CAAC,CAE7B,CAEA,MAAM,qBACJA,EACAC,EACoE,CACpE,GAAK,KAAK,QACV,OAAO,KAAK,wBAAwB,qBAAqBD,EAAOC,CAAE,CACpE,CACF",
+  "names": ["productCollectionService_exports", "__export", "ProductCollectionService", "__toCommonJS", "import_logger", "productCollectionClient", "serviceFeatureConfig", "logger", "token", "id"]
 }

package/dpr/services/productCollection/productCollectionService.ts

@@ -1,25 +1,30 @@
-import { ApiConfig } from '../../data/types'
 import { components } from '../../types/api'
-import RestClient from '../../data/restClient'
+import { ServiceFeatureConfig } from '../../types/DprConfig'
+import { ProductCollectionClient } from '../../data/productCollectionClient'
+import logger from '../../utils/logger'
 
 export class ProductCollectionService {
-  restClient: RestClient
+  enabled: boolean
 
-  constructor(config: ApiConfig) {
-    this.restClient = new RestClient('ProductCollection API', config)
+  constructor(
+    private readonly productCollectionClient: ProductCollectionClient,
+    serviceFeatureConfig: ServiceFeatureConfig,
+  ) {
+    this.productCollectionClient = productCollectionClient
+    this.enabled = Boolean(serviceFeatureConfig.collections)
+    if (!this.enabled) logger.info(`Product collections: disabled `)
   }
 
   async getProductCollections(token: string): Promise<components['schemas']['ProductCollectionSummary'][]> {
-    return this.restClient.get({
-      path: `/productCollections`,
-      token,
-    })
+    if (!this.enabled) return []
+    return this.productCollectionClient.getProductCollections(token)
   }
 
-  async getProductCollection(token: string, id: string): Promise<components['schemas']['ProductCollectionDTO']> {
-    return this.restClient.get({
-      path: `/productCollections/${id}`,
-      token,
-    })
+  async getProductCollection(
+    token: string,
+    id: string,
+  ): Promise<components['schemas']['ProductCollectionDTO'] | undefined> {
+    if (!this.enabled) return undefined
+    return this.productCollectionClient.getProductCollection(token, id)
   }
 }

package/dpr/services/productCollection/productCollectionStoreService.js

@@ -1,2 +1,2 @@
-var a=Object.create;var i=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var S=Object.getOwnPropertyNames;var g=Object.getPrototypeOf,C=Object.prototype.hasOwnProperty;var f=(e,t)=>{for(var o in t)i(e,o,{get:t[o],enumerable:!0})},n=(e,t,o,r)=>{if(t&&typeof t=="object"||typeof t=="function")for(let c of S(t))!C.call(e,c)&&c!==o&&i(e,c,{get:()=>t[c],enumerable:!(r=u(t,c))||r.enumerable});return e};var l=(e,t,o)=>(o=e!=null?a(g(e)):{},n(t||!e||!e.__esModule?i(o,"default",{value:e,enumerable:!0}):o,e)),p=e=>n(i({},"__esModule",{value:!0}),e);var P={};f(P,{ProductCollectionStoreService:()=>m});module.exports=p(P);var s=l(require("../../utils/logger")),d=l(require("../reportStoreService"));class m extends d.default{constructor(t){super(t),s.default.info("Service created: ProductCollectionStoreService")}async getSelectedProductCollectionId(t){return(await this.getState(t)).productCollectionInfo?.selectedProductCollection}async setSelectedProductCollectionId(t,o){const r=await this.getState(t);return this.saveState(t,{...r,productCollectionInfo:{...r.productCollectionInfo,selectedProductCollection:o}})}}0&&(module.exports={ProductCollectionStoreService});
+"use strict";var s=Object.create;var i=Object.defineProperty;var d=Object.getOwnPropertyDescriptor;var a=Object.getOwnPropertyNames;var u=Object.getPrototypeOf,f=Object.prototype.hasOwnProperty;var C=(t,e)=>{for(var o in e)i(t,o,{get:e[o],enumerable:!0})},c=(t,e,o,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let n of a(e))!f.call(t,n)&&n!==o&&i(t,n,{get:()=>e[n],enumerable:!(r=d(e,n))||r.enumerable});return t};var S=(t,e,o)=>(o=t!=null?s(u(t)):{},c(e||!t||!t.__esModule?i(o,"default",{value:t,enumerable:!0}):o,t)),g=t=>c(i({},"__esModule",{value:!0}),t);var m={};C(m,{ProductCollectionStoreService:()=>p});module.exports=g(m);var l=S(require("../reportStoreService"));class p extends l.default{constructor(e,o){super(e),this.enabled=!!o.collections}async getSelectedProductCollectionId(e){return this.enabled?(await this.getState(e)).productCollectionInfo?.selectedProductCollection:void 0}async setSelectedProductCollectionId(e,o){if(!this.enabled)return;const r=await this.getState(e);return this.saveState(e,{...r,productCollectionInfo:{...r.productCollectionInfo,selectedProductCollection:o}})}}0&&(module.exports={ProductCollectionStoreService});
 //# sourceMappingURL=productCollectionStoreService.js.map

package/dpr/services/productCollection/productCollectionStoreService.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/dpr/services/productCollection/productCollectionStoreService.ts"],
-  "sourcesContent": ["import ReportDataStore from '../../data/reportDataStore'\nimport logger from '../../utils/logger'\nimport ReportStoreService from '../reportStoreService'\n\nexport class ProductCollectionStoreService extends ReportStoreService {\n  constructor(reportDataStore: ReportDataStore) {\n    super(reportDataStore)\n    logger.info('Service created: ProductCollectionStoreService')\n  }\n\n  async getSelectedProductCollectionId(userId: string): Promise<string | undefined> {\n    const userConfig = await this.getState(userId)\n    return userConfig.productCollectionInfo?.selectedProductCollection\n  }\n\n  async setSelectedProductCollectionId(userId: string, id: string): Promise<void> {\n    const userConfig = await this.getState(userId)\n    return this.saveState(userId, {\n      ...userConfig,\n      productCollectionInfo: {\n        ...userConfig.productCollectionInfo,\n        selectedProductCollection: id,\n      },\n    })\n  }\n}\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,mCAAAE,IAAA,eAAAC,EAAAH,GACA,IAAAI,EAAmB,iCACnBC,EAA+B,oCAExB,MAAMH,UAAsC,EAAAI,OAAmB,CACpE,YAAYC,EAAkC,CAC5C,MAAMA,CAAe,EACrB,EAAAC,QAAO,KAAK,gDAAgD,CAC9D,CAEA,MAAM,+BAA+BC,EAA6C,CAEhF,OADmB,MAAM,KAAK,SAASA,CAAM,GAC3B,uBAAuB,yBAC3C,CAEA,MAAM,+BAA+BA,EAAgBC,EAA2B,CAC9E,MAAMC,EAAa,MAAM,KAAK,SAASF,CAAM,EAC7C,OAAO,KAAK,UAAUA,EAAQ,CAC5B,GAAGE,EACH,sBAAuB,CACrB,GAAGA,EAAW,sBACd,0BAA2BD,CAC7B,CACF,CAAC,CACH,CACF",
-  "names": ["productCollectionStoreService_exports", "__export", "ProductCollectionStoreService", "__toCommonJS", "import_logger", "import_reportStoreService", "ReportStoreService", "reportDataStore", "logger", "userId", "id", "userConfig"]
+  "sourcesContent": ["import { ServiceFeatureConfig } from '../../types/DprConfig'\nimport ReportDataStore from '../../data/reportDataStore'\nimport ReportStoreService from '../reportStoreService'\n\nexport class ProductCollectionStoreService extends ReportStoreService {\n  enabled: boolean\n\n  constructor(reportDataStore: ReportDataStore, serviceFeatureConfig: ServiceFeatureConfig) {\n    super(reportDataStore)\n    this.enabled = Boolean(serviceFeatureConfig.collections)\n  }\n\n  async getSelectedProductCollectionId(userId: string): Promise<string | undefined> {\n    if (!this.enabled) return undefined\n\n    const userConfig = await this.getState(userId)\n    return userConfig.productCollectionInfo?.selectedProductCollection\n  }\n\n  async setSelectedProductCollectionId(userId: string, id: string): Promise<void> {\n    if (!this.enabled) return undefined\n\n    const userConfig = await this.getState(userId)\n    return this.saveState(userId, {\n      ...userConfig,\n      productCollectionInfo: {\n        ...userConfig.productCollectionInfo,\n        selectedProductCollection: id,\n      },\n    })\n  }\n}\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,mCAAAE,IAAA,eAAAC,EAAAH,GAEA,IAAAI,EAA+B,oCAExB,MAAMF,UAAsC,EAAAG,OAAmB,CAGpE,YAAYC,EAAkCC,EAA4C,CACxF,MAAMD,CAAe,EACrB,KAAK,QAAU,EAAQC,EAAqB,WAC9C,CAEA,MAAM,+BAA+BC,EAA6C,CAChF,OAAK,KAAK,SAES,MAAM,KAAK,SAASA,CAAM,GAC3B,uBAAuB,0BAHtB,MAIrB,CAEA,MAAM,+BAA+BA,EAAgBC,EAA2B,CAC9E,GAAI,CAAC,KAAK,QAAS,OAEnB,MAAMC,EAAa,MAAM,KAAK,SAASF,CAAM,EAC7C,OAAO,KAAK,UAAUA,EAAQ,CAC5B,GAAGE,EACH,sBAAuB,CACrB,GAAGA,EAAW,sBACd,0BAA2BD,CAC7B,CACF,CAAC,CACH,CACF",
+  "names": ["productCollectionStoreService_exports", "__export", "ProductCollectionStoreService", "__toCommonJS", "import_reportStoreService", "ReportStoreService", "reportDataStore", "serviceFeatureConfig", "userId", "id", "userConfig"]
 }

package/dpr/services/productCollection/productCollectionStoreService.ts

@@ -1,19 +1,25 @@
+import { ServiceFeatureConfig } from '../../types/DprConfig'
 import ReportDataStore from '../../data/reportDataStore'
-import logger from '../../utils/logger'
 import ReportStoreService from '../reportStoreService'
 
 export class ProductCollectionStoreService extends ReportStoreService {
-  constructor(reportDataStore: ReportDataStore) {
+  enabled: boolean
+
+  constructor(reportDataStore: ReportDataStore, serviceFeatureConfig: ServiceFeatureConfig) {
     super(reportDataStore)
-    logger.info('Service created: ProductCollectionStoreService')
+    this.enabled = Boolean(serviceFeatureConfig.collections)
   }
 
   async getSelectedProductCollectionId(userId: string): Promise<string | undefined> {
+    if (!this.enabled) return undefined
+
     const userConfig = await this.getState(userId)
     return userConfig.productCollectionInfo?.selectedProductCollection
   }
 
   async setSelectedProductCollectionId(userId: string, id: string): Promise<void> {
+    if (!this.enabled) return undefined
+
     const userConfig = await this.getState(userId)
     return this.saveState(userId, {
       ...userConfig,

package/dpr/services/reportStoreService.js

@@ -1,2 +1,2 @@
-var a=Object.defineProperty;var p=Object.getOwnPropertyDescriptor;var s=Object.getOwnPropertyNames;var d=Object.prototype.hasOwnProperty;var f=(e,t)=>{for(var r in t)a(e,r,{get:t[r],enumerable:!0})},S=(e,t,r,o)=>{if(t&&typeof t=="object"||typeof t=="function")for(let n of s(t))!d.call(e,n)&&n!==r&&a(e,n,{get:()=>t[n],enumerable:!(o=p(t,n))||o.enumerable});return e};var g=e=>S(a({},"__esModule",{value:!0}),e);var R={};f(R,{ReportStoreService:()=>i,default:()=>I});module.exports=g(R);class i{constructor(t){this.reportDataStore=t;this.reportStore=t}async getState(t){return this.reportStore.getUserConfig(t)}async saveState(t,r){await this.reportStore.setUserConfig(t,r)}findIndexByExecutionId(t,r){return r.findIndex(o=>o.executionId===t)}findIndexByTableId(t,r){return r.findIndex(o=>o.tableId===t)}findIndexByReportId(t,r){return r.findIndex(o=>o.id===t)}}var I=i;0&&(module.exports={ReportStoreService});
+"use strict";var a=Object.defineProperty;var s=Object.getOwnPropertyDescriptor;var d=Object.getOwnPropertyNames;var p=Object.prototype.hasOwnProperty;var f=(e,t)=>{for(var r in t)a(e,r,{get:t[r],enumerable:!0})},S=(e,t,r,o)=>{if(t&&typeof t=="object"||typeof t=="function")for(let n of d(t))!p.call(e,n)&&n!==r&&a(e,n,{get:()=>t[n],enumerable:!(o=s(t,n))||o.enumerable});return e};var g=e=>S(a({},"__esModule",{value:!0}),e);var R={};f(R,{ReportStoreService:()=>i,default:()=>I});module.exports=g(R);class i{constructor(t){this.reportDataStore=t;this.reportStore=t}async getState(t){return this.reportStore.getUserConfig(t)}async saveState(t,r){await this.reportStore.setUserConfig(t,r)}findIndexByExecutionId(t,r){return r.findIndex(o=>o.executionId===t)}findIndexByTableId(t,r){return r.findIndex(o=>o.tableId===t)}findIndexByReportId(t,r){return r.findIndex(o=>o.id===t)}}var I=i;0&&(module.exports={ReportStoreService});
 //# sourceMappingURL=reportStoreService.js.map

package/dpr/services/reportStoreService.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/services/reportStoreService.ts"],
-  "sourcesContent": ["import ReportDataStore from '../data/reportDataStore'\nimport { UserReportData } from '../types/UserReports'\nimport { ReportStoreConfig } from '../types/ReportStore'\n\nclass ReportStoreService {\n  reportStore: ReportDataStore\n\n  constructor(private readonly reportDataStore: ReportDataStore) {\n    this.reportStore = reportDataStore\n  }\n\n  async getState(userId: string) {\n    return this.reportStore.getUserConfig(userId)\n  }\n\n  async saveState(userId: string, userConfig: ReportStoreConfig) {\n    await this.reportStore.setUserConfig(userId, userConfig)\n  }\n\n  findIndexByExecutionId(id: string, array: UserReportData[]) {\n    return array.findIndex((report) => report.executionId === id)\n  }\n\n  findIndexByTableId(id: string, array: UserReportData[]) {\n    return array.findIndex((report) => report.tableId === id)\n  }\n\n  findIndexByReportId(id: string, array: UserReportData[]) {\n    return array.findIndex((report) => report.id === id)\n  }\n}\n\nexport { ReportStoreService }\nexport default ReportStoreService\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,wBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAIA,MAAME,CAAmB,CAGvB,YAA6BG,EAAkC,CAAlC,qBAAAA,EAC3B,KAAK,YAAcA,CACrB,CAEA,MAAM,SAASC,EAAgB,CAC7B,OAAO,KAAK,YAAY,cAAcA,CAAM,CAC9C,CAEA,MAAM,UAAUA,EAAgBC,EAA+B,CAC7D,MAAM,KAAK,YAAY,cAAcD,EAAQC,CAAU,CACzD,CAEA,uBAAuBC,EAAYC,EAAyB,CAC1D,OAAOA,EAAM,UAAWC,GAAWA,EAAO,cAAgBF,CAAE,CAC9D,CAEA,mBAAmBA,EAAYC,EAAyB,CACtD,OAAOA,EAAM,UAAWC,GAAWA,EAAO,UAAYF,CAAE,CAC1D,CAEA,oBAAoBA,EAAYC,EAAyB,CACvD,OAAOA,EAAM,UAAWC,GAAWA,EAAO,KAAOF,CAAE,CACrD,CACF,CAGA,IAAOL,EAAQD",
+  "sourcesContent": ["import ReportDataStore from '../data/reportDataStore'\nimport { UserReportData } from '../types/UserReports'\nimport { ReportStoreConfig } from '../types/ReportStore'\n\nclass ReportStoreService {\n  reportStore: ReportDataStore\n\n  constructor(readonly reportDataStore: ReportDataStore) {\n    this.reportStore = reportDataStore\n  }\n\n  async getState(userId: string) {\n    return this.reportStore.getUserConfig(userId)\n  }\n\n  async saveState(userId: string, userConfig: ReportStoreConfig) {\n    await this.reportStore.setUserConfig(userId, userConfig)\n  }\n\n  findIndexByExecutionId(id: string, array: UserReportData[]) {\n    return array.findIndex((report) => report.executionId === id)\n  }\n\n  findIndexByTableId(id: string, array: UserReportData[]) {\n    return array.findIndex((report) => report.tableId === id)\n  }\n\n  findIndexByReportId(id: string, array: UserReportData[]) {\n    return array.findIndex((report) => report.id === id)\n  }\n}\n\nexport { ReportStoreService }\nexport default ReportStoreService\n"],
+  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,wBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAIA,MAAME,CAAmB,CAGvB,YAAqBG,EAAkC,CAAlC,qBAAAA,EACnB,KAAK,YAAcA,CACrB,CAEA,MAAM,SAASC,EAAgB,CAC7B,OAAO,KAAK,YAAY,cAAcA,CAAM,CAC9C,CAEA,MAAM,UAAUA,EAAgBC,EAA+B,CAC7D,MAAM,KAAK,YAAY,cAAcD,EAAQC,CAAU,CACzD,CAEA,uBAAuBC,EAAYC,EAAyB,CAC1D,OAAOA,EAAM,UAAWC,GAAWA,EAAO,cAAgBF,CAAE,CAC9D,CAEA,mBAAmBA,EAAYC,EAAyB,CACtD,OAAOA,EAAM,UAAWC,GAAWA,EAAO,UAAYF,CAAE,CAC1D,CAEA,oBAAoBA,EAAYC,EAAyB,CACvD,OAAOA,EAAM,UAAWC,GAAWA,EAAO,KAAOF,CAAE,CACrD,CACF,CAGA,IAAOL,EAAQD",
   "names": ["reportStoreService_exports", "__export", "ReportStoreService", "reportStoreService_default", "__toCommonJS", "reportDataStore", "userId", "userConfig", "id", "array", "report"]
 }

package/dpr/services/reportStoreService.ts

@@ -5,7 +5,7 @@ import { ReportStoreConfig } from '../types/ReportStore'
 class ReportStoreService {
   reportStore: ReportDataStore
 
-  constructor(private readonly reportDataStore: ReportDataStore) {
+  constructor(readonly reportDataStore: ReportDataStore) {
     this.reportStore = reportDataStore
   }
 

package/dpr/services/reportingService.js

@@ -1,2 +1,2 @@
-var a=Object.create;var g=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var u=Object.getOwnPropertyNames;var l=Object.getPrototypeOf,R=Object.prototype.hasOwnProperty;var C=(e,t)=>{for(var r in t)g(e,r,{get:t[r],enumerable:!0})},p=(e,t,r,n)=>{if(t&&typeof t=="object"||typeof t=="function")for(let i of u(t))!R.call(e,i)&&i!==r&&g(e,i,{get:()=>t[i],enumerable:!(n=y(t,i))||n.enumerable});return e};var h=(e,t,r)=>(r=e!=null?a(l(e)):{},p(t||!e||!e.__esModule?g(r,"default",{value:e,enumerable:!0}):r,e)),A=e=>p(g({},"__esModule",{value:!0}),e);var f={};C(f,{ReportingService:()=>c,default:()=>D});module.exports=A(f);var m=h(require("../utils/logger"));class c{constructor(t){this.reportingClient=t;this.reportingClient=t,m.default.info("Service created: ReportingService")}async getCount(t,r,n){return this.reportingClient.getCount(t,r,n)}async getList(t,r,n){return this.reportingClient.getList(t,r,n)}async getListWithWarnings(t,r,n){return this.reportingClient.getListWithWarnings(t,r,n)}async getDefinitionSummary(t,r,n){return this.reportingClient.getDefinitionSummary(t,r,n)}async getDefinitions(t,r){return this.reportingClient.getDefinitions(t,r)}async getDefinition(t,r,n,i){return this.reportingClient.getDefinition(t,r,n,i)}async requestAsyncReport(t,r,n,i){return this.reportingClient.requestAsyncReport(t,r,n,i)}async cancelAsyncRequest(t,r,n,i,s){return this.reportingClient.cancelAsyncRequest(t,r,n,i,s)}async getAsyncReport(t,r,n,i,s){return this.reportingClient.getAsyncReport(t,r,n,i,s)}async getAsyncSummaryReport(t,r,n,i,s,o){return this.reportingClient.getAsyncSummaryReport(t,r,n,i,s,o)}async getAsyncReportStatus(t,r,n,i,s,o){return this.reportingClient.getAsyncReportStatus(t,r,n,i,s,o)}async getAsyncCount(t,r,n){return this.reportingClient.getAsyncCount(t,r,n)}async getAsyncInteractiveCount(t,r,n,i,s){return this.reportingClient.getAsyncInteractiveCount(t,r,n,i,s)}}var D=c;0&&(module.exports={ReportingService});
+"use strict";var o=Object.defineProperty;var m=Object.getOwnPropertyDescriptor;var a=Object.getOwnPropertyNames;var p=Object.prototype.hasOwnProperty;var u=(s,t)=>{for(var r in t)o(s,r,{get:t[r],enumerable:!0})},y=(s,t,r,n)=>{if(t&&typeof t=="object"||typeof t=="function")for(let i of a(t))!p.call(s,i)&&i!==r&&o(s,i,{get:()=>t[i],enumerable:!(n=m(t,i))||n.enumerable});return s};var l=s=>y(o({},"__esModule",{value:!0}),s);var R={};u(R,{ReportingService:()=>c,default:()=>C});module.exports=l(R);class c{constructor(t){this.reportingClient=t;this.reportingClient=t}async getCount(t,r,n){return this.reportingClient.getCount(t,r,n)}async getList(t,r,n){return this.reportingClient.getList(t,r,n)}async getListWithWarnings(t,r,n){return this.reportingClient.getListWithWarnings(t,r,n)}async getDefinitionSummary(t,r,n){return this.reportingClient.getDefinitionSummary(t,r,n)}async getDefinitions(t,r){return this.reportingClient.getDefinitions(t,r)}async getDefinition(t,r,n,i){return this.reportingClient.getDefinition(t,r,n,i)}async requestAsyncReport(t,r,n,i){return this.reportingClient.requestAsyncReport(t,r,n,i)}async cancelAsyncRequest(t,r,n,i,e){return this.reportingClient.cancelAsyncRequest(t,r,n,i,e)}async getAsyncReport(t,r,n,i,e){return this.reportingClient.getAsyncReport(t,r,n,i,e)}async getAsyncSummaryReport(t,r,n,i,e,g){return this.reportingClient.getAsyncSummaryReport(t,r,n,i,e,g)}async getAsyncReportStatus(t,r,n,i,e,g){return this.reportingClient.getAsyncReportStatus(t,r,n,i,e,g)}async getAsyncCount(t,r,n){return this.reportingClient.getAsyncCount(t,r,n)}async getAsyncInteractiveCount(t,r,n,i,e){return this.reportingClient.getAsyncInteractiveCount(t,r,n,i,e)}}var C=c;0&&(module.exports={ReportingService});
 //# sourceMappingURL=reportingService.js.map

package/dpr/services/reportingService.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/services/reportingService.ts"],
-  "sourcesContent": ["import { components } from '../types/api'\nimport type ReportingClient from '../data/reportingClient'\nimport ReportQuery from '../types/ReportQuery'\nimport Dict = NodeJS.Dict\nimport { ListWithWarnings } from '../data/types'\nimport logger from '../utils/logger'\n\nclass ReportingService {\n  constructor(private readonly reportingClient: ReportingClient) {\n    this.reportingClient = reportingClient\n    logger.info('Service created: ReportingService')\n  }\n\n  async getCount(resourceName: string, token: string, listRequest: ReportQuery): Promise<number> {\n    return this.reportingClient.getCount(resourceName, token, listRequest)\n  }\n\n  async getList(resourceName: string, token: string, listRequest: ReportQuery): Promise<Array<NodeJS.Dict<string>>> {\n    return this.reportingClient.getList(resourceName, token, listRequest)\n  }\n\n  async getListWithWarnings(resourceName: string, token: string, listRequest: ReportQuery): Promise<ListWithWarnings> {\n    return this.reportingClient.getListWithWarnings(resourceName, token, listRequest)\n  }\n\n  async getDefinitionSummary(\n    token: string,\n    reportId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<components['schemas']['ReportDefinitionSummary']> {\n    return this.reportingClient.getDefinitionSummary(token, reportId, dataProductDefinitionsPath)\n  }\n\n  async getDefinitions(\n    token: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Array<components['schemas']['ReportDefinitionSummary']>> {\n    return this.reportingClient.getDefinitions(token, dataProductDefinitionsPath)\n  }\n\n  async getDefinition(\n    token: string,\n    reportId: string,\n    variantId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<components['schemas']['SingleVariantReportDefinition']> {\n    return this.reportingClient.getDefinition(token, reportId, variantId, dataProductDefinitionsPath)\n  }\n\n  async requestAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    query: Record<string, string | boolean | number>,\n  ): Promise<Dict<string>> {\n    return this.reportingClient.requestAsyncReport(token, reportId, variantId, query)\n  }\n\n  async cancelAsyncRequest(\n    token: string,\n    reportId: string,\n    variantId: string,\n    executionId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Dict<string>> {\n    return this.reportingClient.cancelAsyncRequest(token, reportId, variantId, executionId, dataProductDefinitionsPath)\n  }\n\n  async 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    return this.reportingClient.getAsyncReport(token, reportId, variantId, tableId, query)\n  }\n\n  async 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    return this.reportingClient.getAsyncSummaryReport(token, reportId, variantId, tableId, summaryId, query)\n  }\n\n  async getAsyncReportStatus(\n    token: string,\n    reportId: string,\n    variantId: string,\n    executionId: string,\n    dataProductDefinitionsPath: string,\n    tableId: string,\n  ): Promise<Dict<string>> {\n    return this.reportingClient.getAsyncReportStatus(\n      token,\n      reportId,\n      variantId,\n      executionId,\n      dataProductDefinitionsPath,\n      tableId,\n    )\n  }\n\n  async getAsyncCount(token: string, tableId: string, dataProductDefinitionsPath?: string): Promise<number> {\n    return this.reportingClient.getAsyncCount(token, tableId, dataProductDefinitionsPath)\n  }\n\n  async getAsyncInteractiveCount(\n    token: string,\n    tableId: string,\n    reportId: string,\n    id: string,\n    filters: ReportQuery,\n  ): Promise<number> {\n    return this.reportingClient.getAsyncInteractiveCount(token, tableId, reportId, id, filters)\n  }\n}\n\nexport { ReportingService }\nexport default ReportingService\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,sBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAKA,IAAAK,EAAmB,8BAEnB,MAAMH,CAAiB,CACrB,YAA6BI,EAAkC,CAAlC,qBAAAA,EAC3B,KAAK,gBAAkBA,EACvB,EAAAC,QAAO,KAAK,mCAAmC,CACjD,CAEA,MAAM,SAASC,EAAsBC,EAAeC,EAA2C,CAC7F,OAAO,KAAK,gBAAgB,SAASF,EAAcC,EAAOC,CAAW,CACvE,CAEA,MAAM,QAAQF,EAAsBC,EAAeC,EAA+D,CAChH,OAAO,KAAK,gBAAgB,QAAQF,EAAcC,EAAOC,CAAW,CACtE,CAEA,MAAM,oBAAoBF,EAAsBC,EAAeC,EAAqD,CAClH,OAAO,KAAK,gBAAgB,oBAAoBF,EAAcC,EAAOC,CAAW,CAClF,CAEA,MAAM,qBACJD,EACAE,EACAC,EAC2D,CAC3D,OAAO,KAAK,gBAAgB,qBAAqBH,EAAOE,EAAUC,CAA0B,CAC9F,CAEA,MAAM,eACJH,EACAG,EACkE,CAClE,OAAO,KAAK,gBAAgB,eAAeH,EAAOG,CAA0B,CAC9E,CAEA,MAAM,cACJH,EACAE,EACAE,EACAD,EACiE,CACjE,OAAO,KAAK,gBAAgB,cAAcH,EAAOE,EAAUE,EAAWD,CAA0B,CAClG,CAEA,MAAM,mBACJH,EACAE,EACAE,EACAC,EACuB,CACvB,OAAO,KAAK,gBAAgB,mBAAmBL,EAAOE,EAAUE,EAAWC,CAAK,CAClF,CAEA,MAAM,mBACJL,EACAE,EACAE,EACAE,EACAH,EACuB,CACvB,OAAO,KAAK,gBAAgB,mBAAmBH,EAAOE,EAAUE,EAAWE,EAAaH,CAA0B,CACpH,CAEA,MAAM,eACJH,EACAE,EACAE,EACAG,EACAF,EAC8B,CAC9B,OAAO,KAAK,gBAAgB,eAAeL,EAAOE,EAAUE,EAAWG,EAASF,CAAK,CACvF,CAEA,MAAM,sBACJL,EACAE,EACAE,EACAG,EACAC,EACAH,EAC8B,CAC9B,OAAO,KAAK,gBAAgB,sBAAsBL,EAAOE,EAAUE,EAAWG,EAASC,EAAWH,CAAK,CACzG,CAEA,MAAM,qBACJL,EACAE,EACAE,EACAE,EACAH,EACAI,EACuB,CACvB,OAAO,KAAK,gBAAgB,qBAC1BP,EACAE,EACAE,EACAE,EACAH,EACAI,CACF,CACF,CAEA,MAAM,cAAcP,EAAeO,EAAiBJ,EAAsD,CACxG,OAAO,KAAK,gBAAgB,cAAcH,EAAOO,EAASJ,CAA0B,CACtF,CAEA,MAAM,yBACJH,EACAO,EACAL,EACAO,EACAC,EACiB,CACjB,OAAO,KAAK,gBAAgB,yBAAyBV,EAAOO,EAASL,EAAUO,EAAIC,CAAO,CAC5F,CACF,CAGA,IAAOhB,EAAQD",
-  "names": ["reportingService_exports", "__export", "ReportingService", "reportingService_default", "__toCommonJS", "import_logger", "reportingClient", "logger", "resourceName", "token", "listRequest", "reportId", "dataProductDefinitionsPath", "variantId", "query", "executionId", "tableId", "summaryId", "id", "filters"]
+  "sourcesContent": ["import { components } from '../types/api'\nimport type ReportingClient from '../data/reportingClient'\nimport ReportQuery from '../types/ReportQuery'\nimport Dict = NodeJS.Dict\nimport { ListWithWarnings } from '../data/types'\n\nclass ReportingService {\n  constructor(private readonly reportingClient: ReportingClient) {\n    this.reportingClient = reportingClient\n  }\n\n  async getCount(resourceName: string, token: string, listRequest: ReportQuery): Promise<number> {\n    return this.reportingClient.getCount(resourceName, token, listRequest)\n  }\n\n  async getList(resourceName: string, token: string, listRequest: ReportQuery): Promise<Array<NodeJS.Dict<string>>> {\n    return this.reportingClient.getList(resourceName, token, listRequest)\n  }\n\n  async getListWithWarnings(resourceName: string, token: string, listRequest: ReportQuery): Promise<ListWithWarnings> {\n    return this.reportingClient.getListWithWarnings(resourceName, token, listRequest)\n  }\n\n  async getDefinitionSummary(\n    token: string,\n    reportId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<components['schemas']['ReportDefinitionSummary']> {\n    return this.reportingClient.getDefinitionSummary(token, reportId, dataProductDefinitionsPath)\n  }\n\n  async getDefinitions(\n    token: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Array<components['schemas']['ReportDefinitionSummary']>> {\n    return this.reportingClient.getDefinitions(token, dataProductDefinitionsPath)\n  }\n\n  async getDefinition(\n    token: string,\n    reportId: string,\n    variantId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<components['schemas']['SingleVariantReportDefinition']> {\n    return this.reportingClient.getDefinition(token, reportId, variantId, dataProductDefinitionsPath)\n  }\n\n  async requestAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    query: Record<string, string | boolean | number>,\n  ): Promise<Dict<string>> {\n    return this.reportingClient.requestAsyncReport(token, reportId, variantId, query)\n  }\n\n  async cancelAsyncRequest(\n    token: string,\n    reportId: string,\n    variantId: string,\n    executionId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Dict<string>> {\n    return this.reportingClient.cancelAsyncRequest(token, reportId, variantId, executionId, dataProductDefinitionsPath)\n  }\n\n  async 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    return this.reportingClient.getAsyncReport(token, reportId, variantId, tableId, query)\n  }\n\n  async 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    return this.reportingClient.getAsyncSummaryReport(token, reportId, variantId, tableId, summaryId, query)\n  }\n\n  async 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    return this.reportingClient.getAsyncReportStatus(\n      token,\n      reportId,\n      variantId,\n      executionId,\n      dataProductDefinitionsPath,\n      tableId,\n    )\n  }\n\n  async getAsyncCount(token: string, tableId: string, dataProductDefinitionsPath?: string): Promise<number> {\n    return this.reportingClient.getAsyncCount(token, tableId, dataProductDefinitionsPath)\n  }\n\n  async getAsyncInteractiveCount(\n    token: string,\n    tableId: string,\n    reportId: string,\n    id: string,\n    filters: ReportQuery,\n  ): Promise<number> {\n    return this.reportingClient.getAsyncInteractiveCount(token, tableId, reportId, id, filters)\n  }\n}\n\nexport { ReportingService }\nexport default ReportingService\n"],
+  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,sBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAMA,MAAME,CAAiB,CACrB,YAA6BG,EAAkC,CAAlC,qBAAAA,EAC3B,KAAK,gBAAkBA,CACzB,CAEA,MAAM,SAASC,EAAsBC,EAAeC,EAA2C,CAC7F,OAAO,KAAK,gBAAgB,SAASF,EAAcC,EAAOC,CAAW,CACvE,CAEA,MAAM,QAAQF,EAAsBC,EAAeC,EAA+D,CAChH,OAAO,KAAK,gBAAgB,QAAQF,EAAcC,EAAOC,CAAW,CACtE,CAEA,MAAM,oBAAoBF,EAAsBC,EAAeC,EAAqD,CAClH,OAAO,KAAK,gBAAgB,oBAAoBF,EAAcC,EAAOC,CAAW,CAClF,CAEA,MAAM,qBACJD,EACAE,EACAC,EAC2D,CAC3D,OAAO,KAAK,gBAAgB,qBAAqBH,EAAOE,EAAUC,CAA0B,CAC9F,CAEA,MAAM,eACJH,EACAG,EACkE,CAClE,OAAO,KAAK,gBAAgB,eAAeH,EAAOG,CAA0B,CAC9E,CAEA,MAAM,cACJH,EACAE,EACAE,EACAD,EACiE,CACjE,OAAO,KAAK,gBAAgB,cAAcH,EAAOE,EAAUE,EAAWD,CAA0B,CAClG,CAEA,MAAM,mBACJH,EACAE,EACAE,EACAC,EACuB,CACvB,OAAO,KAAK,gBAAgB,mBAAmBL,EAAOE,EAAUE,EAAWC,CAAK,CAClF,CAEA,MAAM,mBACJL,EACAE,EACAE,EACAE,EACAH,EACuB,CACvB,OAAO,KAAK,gBAAgB,mBAAmBH,EAAOE,EAAUE,EAAWE,EAAaH,CAA0B,CACpH,CAEA,MAAM,eACJH,EACAE,EACAE,EACAG,EACAF,EAC8B,CAC9B,OAAO,KAAK,gBAAgB,eAAeL,EAAOE,EAAUE,EAAWG,EAASF,CAAK,CACvF,CAEA,MAAM,sBACJL,EACAE,EACAE,EACAG,EACAC,EACAH,EAC8B,CAC9B,OAAO,KAAK,gBAAgB,sBAAsBL,EAAOE,EAAUE,EAAWG,EAASC,EAAWH,CAAK,CACzG,CAEA,MAAM,qBACJL,EACAE,EACAE,EACAE,EACAH,EACAI,EAC4D,CAC5D,OAAO,KAAK,gBAAgB,qBAC1BP,EACAE,EACAE,EACAE,EACAH,EACAI,CACF,CACF,CAEA,MAAM,cAAcP,EAAeO,EAAiBJ,EAAsD,CACxG,OAAO,KAAK,gBAAgB,cAAcH,EAAOO,EAASJ,CAA0B,CACtF,CAEA,MAAM,yBACJH,EACAO,EACAL,EACAO,EACAC,EACiB,CACjB,OAAO,KAAK,gBAAgB,yBAAyBV,EAAOO,EAASL,EAAUO,EAAIC,CAAO,CAC5F,CACF,CAGA,IAAOd,EAAQD",
+  "names": ["reportingService_exports", "__export", "ReportingService", "reportingService_default", "__toCommonJS", "reportingClient", "resourceName", "token", "listRequest", "reportId", "dataProductDefinitionsPath", "variantId", "query", "executionId", "tableId", "summaryId", "id", "filters"]
 }

package/dpr/services/reportingService.ts

@@ -3,12 +3,10 @@ import type ReportingClient from '../data/reportingClient'
 import ReportQuery from '../types/ReportQuery'
 import Dict = NodeJS.Dict
 import { ListWithWarnings } from '../data/types'
-import logger from '../utils/logger'
 
 class ReportingService {
   constructor(private readonly reportingClient: ReportingClient) {
     this.reportingClient = reportingClient
-    logger.info('Service created: ReportingService')
   }
 
   async getCount(resourceName: string, token: string, listRequest: ReportQuery): Promise<number> {
@@ -94,7 +92,7 @@ class ReportingService {
     executionId: string,
     dataProductDefinitionsPath: string,
     tableId: string,
-  ): Promise<Dict<string>> {
+  ): Promise<components['schemas']['StatementExecutionStatus']> {
     return this.reportingClient.getAsyncReportStatus(
       token,
       reportId,

package/dpr/setUpNunjucksFilters.js

@@ -1,2 +1,2 @@
-var d=Object.create;var s=Object.defineProperty;var l=Object.getOwnPropertyDescriptor;var c=Object.getOwnPropertyNames;var p=Object.getPrototypeOf,f=Object.prototype.hasOwnProperty;var m=(t,r)=>{for(var e in r)s(t,e,{get:r[e],enumerable:!0})},u=(t,r,e,i)=>{if(r&&typeof r=="object"||typeof r=="function")for(let n of c(r))!f.call(t,n)&&n!==e&&s(t,n,{get:()=>r[n],enumerable:!(i=l(r,n))||i.enumerable});return t};var F=(t,r,e)=>(e=t!=null?d(p(t)):{},u(r||!t||!t.__esModule?s(e,"default",{value:t,enumerable:!0}):e,t)),g=t=>u(s({},"__esModule",{value:!0}),t);var x={};m(x,{default:()=>k,setUpNunjucksFilters:()=>a});module.exports=g(x);var o=F(require("nunjucks-date"));const a=t=>{t.addFilter("addRequiredAttributeToAll",b),t.addFilter("json",j),t.addFilter("capitaliseSentence",D),t.addFilter("dpr.findError",A),o.default.setDefaultFormat("DD/MM/YYYY"),o.default.install(t,"dprDate")},A=(t,r)=>{const e=t?.find(i=>i.href.slice(1)===r)?.text;return e?{text:e}:null},j=t=>JSON.stringify(t,null,2),D=t=>t.charAt(0).toUpperCase()+t.substring(1).toLowerCase(),b=t=>t.map(r=>({...r,attributes:{required:!0}}));var k=a;0&&(module.exports={setUpNunjucksFilters});
+"use strict";var d=Object.create;var s=Object.defineProperty;var l=Object.getOwnPropertyDescriptor;var c=Object.getOwnPropertyNames;var p=Object.getPrototypeOf,f=Object.prototype.hasOwnProperty;var m=(t,r)=>{for(var e in r)s(t,e,{get:r[e],enumerable:!0})},u=(t,r,e,i)=>{if(r&&typeof r=="object"||typeof r=="function")for(let n of c(r))!f.call(t,n)&&n!==e&&s(t,n,{get:()=>r[n],enumerable:!(i=l(r,n))||i.enumerable});return t};var F=(t,r,e)=>(e=t!=null?d(p(t)):{},u(r||!t||!t.__esModule?s(e,"default",{value:t,enumerable:!0}):e,t)),g=t=>u(s({},"__esModule",{value:!0}),t);var x={};m(x,{default:()=>k,setUpNunjucksFilters:()=>a});module.exports=g(x);var o=F(require("nunjucks-date"));const a=t=>{t.addFilter("addRequiredAttributeToAll",b),t.addFilter("json",j),t.addFilter("capitaliseSentence",D),t.addFilter("dpr.findError",A),o.default.setDefaultFormat("DD/MM/YYYY"),o.default.install(t,"dprDate")},A=(t,r)=>{const e=t?.find(i=>i.href.slice(1)===r)?.text;return e?{text:e}:null},j=t=>JSON.stringify(t,null,2),D=t=>t.charAt(0).toUpperCase()+t.substring(1).toLowerCase(),b=t=>t.map(r=>({...r,attributes:{required:!0}}));var k=a;0&&(module.exports={setUpNunjucksFilters});
 //# sourceMappingURL=setUpNunjucksFilters.js.map

package/dpr/setUpNunjucksFilters.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../src/dpr/setUpNunjucksFilters.ts"],
   "sourcesContent": ["import nunjucks from 'nunjucks'\nimport nunjucksDate from 'nunjucks-date'\nimport { FilterOption } from './components/_filters/filter-input/types'\n\nexport const setUpNunjucksFilters = (env: nunjucks.Environment) => {\n  env.addFilter('addRequiredAttributeToAll', addRequiredAttributeToAll)\n  env.addFilter('json', stringifyJson)\n  env.addFilter('capitaliseSentence', capitaliseSentence)\n  // Namespace our own filters\n  env.addFilter('dpr.findError', findError)\n  nunjucksDate.setDefaultFormat('DD/MM/YYYY')\n  nunjucksDate.install(env, 'dprDate')\n}\n\nconst findError = (errs: { text: string; href: string }[] | undefined, errToFind: string) => {\n  const error = errs?.find((err) => err.href.slice(1) === errToFind)?.text\n  return error ? { text: error } : null\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst stringifyJson = (jsonObj: any) => {\n  return JSON.stringify(jsonObj, null, 2)\n}\n\nconst capitaliseSentence = (text: string) => {\n  return text.charAt(0).toUpperCase() + text.substring(1).toLowerCase()\n}\n\nconst addRequiredAttributeToAll = (items: Array<FilterOption>) => {\n  return items.map((i) => ({\n    ...i,\n    attributes: {\n      required: true,\n    },\n  }))\n}\n\nexport default setUpNunjucksFilters\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,yBAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,4BAGlB,MAAMF,EAAwBG,GAA8B,CACjEA,EAAI,UAAU,4BAA6BC,CAAyB,EACpED,EAAI,UAAU,OAAQE,CAAa,EACnCF,EAAI,UAAU,qBAAsBG,CAAkB,EAEtDH,EAAI,UAAU,gBAAiBI,CAAS,EACxC,EAAAC,QAAa,iBAAiB,YAAY,EAC1C,EAAAA,QAAa,QAAQL,EAAK,SAAS,CACrC,EAEMI,EAAY,CAACE,EAAoDC,IAAsB,CAC3F,MAAMC,EAAQF,GAAM,KAAMG,GAAQA,EAAI,KAAK,MAAM,CAAC,IAAMF,CAAS,GAAG,KACpE,OAAOC,EAAQ,CAAE,KAAMA,CAAM,EAAI,IACnC,EAGMN,EAAiBQ,GACd,KAAK,UAAUA,EAAS,KAAM,CAAC,EAGlCP,EAAsBQ,GACnBA,EAAK,OAAO,CAAC,EAAE,YAAY,EAAIA,EAAK,UAAU,CAAC,EAAE,YAAY,EAGhEV,EAA6BW,GAC1BA,EAAM,IAAKC,IAAO,CACvB,GAAGA,EACH,WAAY,CACV,SAAU,EACZ,CACF,EAAE,EAGJ,IAAOjB,EAAQC",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,yBAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,4BAGlB,MAAMF,EAAwBG,GAA8B,CACjEA,EAAI,UAAU,4BAA6BC,CAAyB,EACpED,EAAI,UAAU,OAAQE,CAAa,EACnCF,EAAI,UAAU,qBAAsBG,CAAkB,EAEtDH,EAAI,UAAU,gBAAiBI,CAAS,EACxC,EAAAC,QAAa,iBAAiB,YAAY,EAC1C,EAAAA,QAAa,QAAQL,EAAK,SAAS,CACrC,EAEMI,EAAY,CAACE,EAAoDC,IAAsB,CAC3F,MAAMC,EAAQF,GAAM,KAAMG,GAAQA,EAAI,KAAK,MAAM,CAAC,IAAMF,CAAS,GAAG,KACpE,OAAOC,EAAQ,CAAE,KAAMA,CAAM,EAAI,IACnC,EAGMN,EAAiBQ,GACd,KAAK,UAAUA,EAAS,KAAM,CAAC,EAGlCP,EAAsBQ,GACnBA,EAAK,OAAO,CAAC,EAAE,YAAY,EAAIA,EAAK,UAAU,CAAC,EAAE,YAAY,EAGhEV,EAA6BW,GAC1BA,EAAM,IAAKC,IAAO,CACvB,GAAGA,EACH,WAAY,CACV,SAAU,EACZ,CACF,EAAE,EAGJ,IAAOjB,EAAQC",
   "names": ["setUpNunjucksFilters_exports", "__export", "setUpNunjucksFilters_default", "setUpNunjucksFilters", "__toCommonJS", "import_nunjucks_date", "env", "addRequiredAttributeToAll", "stringifyJson", "capitaliseSentence", "findError", "nunjucksDate", "errs", "errToFind", "error", "err", "jsonObj", "text", "items", "i"]
 }

package/dpr/types/AsyncReportUtils.js

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

package/dpr/types/AsyncReportUtils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/types/AsyncReportUtils.ts"],
-  "sourcesContent": ["import { Response, Request, NextFunction } from 'express'\nimport { Services } from './Services'\nimport { components } from './api'\nimport { ReportType } from './UserReports'\nimport { RenderFiltersReturnValue } from '../components/_async/async-filters-form/types'\n\nexport interface AsyncReportUtilsParams {\n  req: Request\n  res: Response\n  next?: NextFunction\n  services: Services\n}\n\nexport interface EmbeddedReportUtilsParams {\n  req?: Request\n  res: Response\n  next?: NextFunction\n  services: Services\n}\n\nexport interface RequestReportData {\n  interactiveFilters?: components['schemas']['FilterDefinition'][]\n  reportName: string\n  name: string\n  description: string\n  reportId: string\n  id: string\n  definitionPath: string\n  csrfToken: string\n  template?: string\n  sections: components['schemas']['DashboardSectionDefinition'][]\n  type: ReportType\n  defaultInteractiveQueryString?: string\n  hasDefaults: boolean\n  defaultsSaved?: string\n}\n\nexport interface RequestDataResult {\n  title: string\n  filtersDescription: string\n  filtersData: RenderFiltersReturnValue\n  reportData: RequestReportData\n}\n"],
-  "mappings": "kWAAA,IAAAA,EAAA,kBAAAC,EAAAD",
+  "sourcesContent": ["import { Response, Request, NextFunction } from 'express'\nimport { Services } from './Services'\nimport { components } from './api'\nimport { ReportType } from './UserReports'\nimport { RenderFiltersReturnValue } from '../components/_async/async-filters-form/types'\n\nexport interface AsyncReportUtilsParams {\n  req: Request\n  res: Response\n  next?: NextFunction\n  services: Services\n}\n\nexport interface EmbeddedReportUtilsParams {\n  req?: Request\n  res: Response\n  next?: NextFunction\n  services: Services\n}\n\nexport interface RequestReportData {\n  interactiveFilters?: components['schemas']['FilterDefinition'][]\n  reportName: string\n  name: string\n  description: string\n  reportId: string\n  id: string\n  definitionPath: string\n  csrfToken: string\n  template?: string\n  sections: components['schemas']['DashboardSectionDefinition'][]\n  type: ReportType\n  defaultInteractiveQueryString?: string\n  hasDefaults: boolean\n  defaultsSaved?: string\n  saveDefaultsEnabled: boolean\n}\n\nexport interface RequestDataResult {\n  title: string\n  filtersDescription: string\n  filtersData?: RenderFiltersReturnValue | undefined\n  reportData: RequestReportData\n}\n"],
+  "mappings": "+WAAA,IAAAA,EAAA,kBAAAC,EAAAD",
   "names": ["AsyncReportUtils_exports", "__toCommonJS"]
 }

package/dpr/types/AsyncReportUtils.ts

@@ -33,11 +33,12 @@ export interface RequestReportData {
   defaultInteractiveQueryString?: string
   hasDefaults: boolean
   defaultsSaved?: string
+  saveDefaultsEnabled: boolean
 }
 
 export interface RequestDataResult {
   title: string
   filtersDescription: string
-  filtersData: RenderFiltersReturnValue
+  filtersData?: RenderFiltersReturnValue | undefined
   reportData: RequestReportData
 }

package/dpr/types/Bookmark.js

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