@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.16.1 → 4.17.1

package/dpr/types/api.d.ts

@@ -3,8 +3,6 @@
  * Do not make direct changes to the file.
  */
 
-import { LoadType } from './UserReports'
-
 export interface paths {
   '/missingRequest/{reportId}/{variantId}': {
     parameters: {
@@ -232,6 +230,40 @@ export interface paths {
     patch?: never
     trace?: never
   }
+  '/productCollections': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /** @description Gets all product collections */
+    get: operations['getCollections']
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
+  '/productCollections/{id}': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /** @description Gets product collection by id */
+    get: operations['getCollections_1']
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
   '/definitions': {
     parameters: {
       query?: never
@@ -431,12 +463,28 @@ export interface components {
       /** @description Specific to Athena queries. Further detail about the status of the query. */
       stateChangeReason?: string
     }
+    ProductCollectionSummary: {
+      id: string
+      name: string
+      version: string
+      ownerName: string
+    }
+    ProductCollectionDTO: {
+      id: string
+      name: string
+      version: string
+      ownerName: string
+      products: components['schemas']['ProductCollectionProduct'][]
+    }
+    ProductCollectionProduct: {
+      productId: string
+    }
     DashboardDefinitionSummary: {
       id: string
       name: string
       description?: string
       /** @enum {string} */
-      loadType?: 'sync' | 'async'
+      loadType?: LoadType
     }
     ReportDefinitionSummary: {
       id: string
@@ -452,7 +500,7 @@ export interface components {
       description?: string
       isMissing: boolean
       /** @enum {string} */
-      loadType?: LoadType
+      loadType?: 'sync' | 'async'
     }
     ChildVariantDefinition: {
       id: string
@@ -572,6 +620,13 @@ export interface components {
       interactive?: boolean
       childVariants?: components['schemas']['ChildVariantDefinition'][]
     }
+    DashboardBucketDefinition: {
+      /** Format: int64 */
+      min?: number
+      /** Format: int64 */
+      max?: number
+      hexColour?: string
+    }
     DashboardDefinition: {
       id: string
       name: string
@@ -579,6 +634,13 @@ export interface components {
       sections: components['schemas']['DashboardSectionDefinition'][]
       filterFields?: components['schemas']['FieldDefinition'][]
     }
+    DashboardOptionDefinition: {
+      useRagColour?: boolean
+      baseColour?: string
+      buckets?: components['schemas']['DashboardBucketDefinition'][]
+      showLatest?: boolean
+      columnsAsList?: boolean
+    }
     DashboardSectionDefinition: {
       id: string
       display?: string
@@ -587,13 +649,14 @@ export interface components {
     }
     DashboardVisualisationColumnDefinition: {
       id: string
-      display: string
+      display?: string
       /** @enum {string} */
       aggregate?: 'sum' | 'average'
       /** @enum {string} */
       unit?: 'NUMBER' | 'PERCENTAGE'
       displayValue?: boolean
       axis?: string
+      optional?: boolean
     }
     DashboardVisualisationColumnsDefinition: {
       keys?: components['schemas']['DashboardVisualisationColumnDefinition'][]
@@ -604,10 +667,20 @@ export interface components {
     DashboardVisualisationDefinition: {
       id: string
       /** @enum {string} */
-      type: 'list' | 'doughnut' | 'bar' | 'bar-timeseries' | 'line' | 'scorecard' | 'scorecard-group'
+      type:
+        | 'list'
+        | 'doughnut'
+        | 'bar'
+        | 'bar-timeseries'
+        | 'line'
+        | 'scorecard'
+        | 'scorecard-group'
+        | 'matrix-timeseries'
+        | 'line-timeseries'
       display?: string
       description?: string
       columns: components['schemas']['DashboardVisualisationColumnsDefinition']
+      options?: components['schemas']['DashboardOptionDefinition']
     }
     ValueVisualisationColumnDefinition: {
       id: string
@@ -1535,6 +1608,124 @@ export interface operations {
       }
     }
   }
+  getCollections: {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    requestBody?: never
+    responses: {
+      /** @description OK */
+      200: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['ProductCollectionSummary'][]
+        }
+      }
+      /** @description Bad Request */
+      400: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
+      /** @description Forbidden */
+      403: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
+      /** @description Too Many Requests */
+      429: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
+      /** @description Internal Server Error */
+      500: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
+    }
+  }
+  getCollections_1: {
+    parameters: {
+      query?: never
+      header?: never
+      path: {
+        /**
+         * @description The ID of the product collection.
+         * @example 72c22579-3f77-4e23-8d16-1e5aadcc88c9
+         */
+        id: string
+      }
+      cookie?: never
+    }
+    requestBody?: never
+    responses: {
+      /** @description OK */
+      200: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['ProductCollectionDTO']
+        }
+      }
+      /** @description Bad Request */
+      400: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
+      /** @description Forbidden */
+      403: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
+      /** @description Too Many Requests */
+      429: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
+      /** @description Internal Server Error */
+      500: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
+    }
+  }
   definitions_1: {
     parameters: {
       query?: {

package/dpr/utils/Personalisation/personalisationUtils.js

@@ -1,2 +1,2 @@
-var k=Object.create;var V=Object.defineProperty;var A=Object.getOwnPropertyDescriptor;var P=Object.getOwnPropertyNames;var E=Object.getPrototypeOf,G=Object.prototype.hasOwnProperty;var M=(e,t)=>{for(var a in t)V(e,a,{get:t[a],enumerable:!0})},C=(e,t,a,o)=>{if(t&&typeof t=="object"||typeof t=="function")for(let n of P(t))!G.call(e,n)&&n!==a&&V(e,n,{get:()=>t[n],enumerable:!(o=A(t,n))||o.enumerable});return e};var d=(e,t,a)=>(a=e!=null?k(E(e)):{},C(t||!e||!e.__esModule?V(a,"default",{value:e,enumerable:!0}):a,e)),j=e=>C(V({},"__esModule",{value:!0}),e);var H={};M(H,{default:()=>B,removeDefaults:()=>T,saveDefaults:()=>h,setFilterValuesFromSavedDefaults:()=>x,setUserContextDefaults:()=>I});module.exports=j(H);var m=d(require("../localsHelper")),R=require("../../types/UserReports"),c=require("../../components/_filters/filter-input/enum"),y=d(require("../../components/_inputs/date-range/utils")),D=d(require("../../components/_inputs/granular-date-range/utils")),b=d(require("../../components/_inputs/multi-select/utils")),S=d(require("../../components/_inputs/date-input/utils"));const h=async(e,t,a,o)=>{const n=await W(a,t,o,e),{dprUser:u}=m.default.getValues(t),{reportId:i,id:s}=a.params;return o.defaultFilterValuesService.save(u.id,i,s,n)},T=async(e,t,a,o)=>{const{dprUser:n}=m.default.getValues(t),{reportId:u,id:i}=a.params;return o.defaultFilterValuesService.delete(n.id,u,i,e)},W=async(e,t,a,o)=>{const{token:n,definitionsPath:u}=m.default.getValues(t),{reportId:i,id:s,type:r}=e.params,f=await(r===R.ReportType.REPORT?a.reportingService:a.dashboardService).getDefinition(n,i,s,u),O=r===R.ReportType.REPORT?f.variant.specification.fields:f.filterFields,L=Object.keys(e.body).filter(l=>l.includes("filters.")||l.includes("sortColumn")||l.includes("sortedAsc")).map(l=>({name:l.replace("filters.",""),value:e.body[l]})).map(l=>{const v=l.name.split(".")[0],g=O.find(w=>w.name===v);let{value:F,name:p}=l;if(g)switch(g.filter?.type.toLocaleLowerCase()){case c.FilterType.multiselect.toLocaleLowerCase():F=Array.isArray(l.value)?l.value.join(","):l.value;break;case c.FilterType.dateRange.toLocaleLowerCase():({value:F,name:p}=y.default.setDefaultValue(e,p));break;case c.FilterType.granularDateRange.toLocaleLowerCase():({name:p,value:F}=D.default.setDefaultValue(e,p));break;default:break}return{name:p,value:F,type:o}});return Array.from(new Set(L.map(l=>l.name))).map(l=>L.find(v=>v.name===l)).filter(l=>l!==void 0).filter(l=>l?l.value!=="":!1)},x=(e,t,a)=>{const o=e.some(i=>a.findIndex(r=>r.name===i.name)!==-1),n=e.map(i=>{const s=a.find(f=>f.name===i.name);let r={...i};switch(i.type.toLocaleLowerCase()){case c.FilterType.multiselect.toLocaleLowerCase():r=b.default.setFilterValuesFromSavedDefault(r,o,s);break;case c.FilterType.date.toLocaleLowerCase():o&&(r.value=""),s&&(r=S.default.setFilterValueFromDefault(s,r));break;case c.FilterType.dateRange.toLocaleLowerCase():o&&(r.value={start:"",end:"",relative:void 0}),s&&(r=y.default.setFilterValueFromDefault(s,r));break;case c.FilterType.granularDateRange.toLocaleLowerCase():o&&(r.value={start:"",end:"",granularity:void 0,quickFilter:void 0}),s&&(r=D.default.setFilterValueFromDefault(s,r));break;default:{let f=o?"":r.value;f=s?s.value:f,r={...i,value:f}}break}return r}),u=t.map(i=>{const s=a.find(r=>r.name===i.name);return{...i,...s&&{value:s.value}}});return{filters:n,sortBy:u}},I=(e,t)=>{const{dprUser:a}=m.default.getValues(e),{activeCaseLoadId:o}=a;return t.forEach(n=>{if(n.type.toLocaleLowerCase()===c.FilterType.autocomplete.toLocaleLowerCase()&&n.text.toLocaleLowerCase().includes("establishment")&&o?.length){const u=n,i=u.options.find(s=>s.value===o);i&&(u.value=i.text,u.staticOptionNameValue=o)}}),t};var B={saveDefaults:h,removeDefaults:T,setFilterValuesFromSavedDefaults:x,setUserContextDefaults:I};0&&(module.exports={removeDefaults,saveDefaults,setFilterValuesFromSavedDefaults,setUserContextDefaults});
+var k=Object.create;var v=Object.defineProperty;var O=Object.getOwnPropertyDescriptor;var A=Object.getOwnPropertyNames;var G=Object.getPrototypeOf,M=Object.prototype.hasOwnProperty;var P=(e,t)=>{for(var l in t)v(e,l,{get:t[l],enumerable:!0})},C=(e,t,l,s)=>{if(t&&typeof t=="object"||typeof t=="function")for(let n of A(t))!M.call(e,n)&&n!==l&&v(e,n,{get:()=>t[n],enumerable:!(s=O(t,n))||s.enumerable});return e};var m=(e,t,l)=>(l=e!=null?k(G(e)):{},C(t||!e||!e.__esModule?v(l,"default",{value:e,enumerable:!0}):l,e)),j=e=>C(v({},"__esModule",{value:!0}),e);var B={};P(B,{default:()=>W,removeDefaults:()=>T,saveDefaults:()=>x,setFilterValuesFromSavedDefaults:()=>I,setUserContextDefaults:()=>U});module.exports=j(B);var V=m(require("../localsHelper")),b=require("../../types/UserReports"),f=require("../../components/_filters/filter-input/enum"),R=m(require("../../components/_inputs/date-range/utils")),y=m(require("../../components/_inputs/granular-date-range/utils")),h=m(require("../../components/_inputs/multi-select/utils")),S=m(require("../../components/_inputs/date-input/utils"));const x=async(e,t,l,s)=>{const n=await E(l,t,s,e),{dprUser:u}=V.default.getValues(t),{reportId:i,id:a}=l.params,{defaultFilterValuesService:r}=s;return r?r.save(u.id,i,a,n):void 0},T=async(e,t,l,s)=>{const{dprUser:n}=V.default.getValues(t),{reportId:u,id:i}=l.params,{defaultFilterValuesService:a}=s;return a?a.delete(n.id,u,i,e):void 0},E=async(e,t,l,s)=>{const{token:n,definitionsPath:u}=V.default.getValues(t),{reportId:i,id:a,type:r}=e.params;let p,c=[];r===b.ReportType.REPORT?(p=await l.reportingService.getDefinition(n,i,a,u),c=p.variant.specification?.fields||[]):(p=await l.dashboardService.getDefinition(n,i,a,u),c=p.filterFields||[]);const g=Object.keys(e.body).filter(o=>o.includes("filters.")||o.includes("sortColumn")||o.includes("sortedAsc")).map(o=>({name:o.replace("filters.",""),value:e.body[o]})).map(o=>{const D=o.name.split(".")[0],L=c.find(w=>w.name===D);let{value:F,name:d}=o;if(L)switch(L.filter?.type.toLocaleLowerCase()){case f.FilterType.multiselect.toLocaleLowerCase():F=Array.isArray(o.value)?o.value.join(","):o.value;break;case f.FilterType.dateRange.toLocaleLowerCase():({value:F,name:d}=R.default.setDefaultValue(e,d));break;case f.FilterType.granularDateRange.toLocaleLowerCase():({name:d,value:F}=y.default.setDefaultValue(e,d));break;default:break}return{name:d,value:F,type:s}});return Array.from(new Set(g.map(o=>o.name))).map(o=>g.find(D=>D.name===o)).filter(o=>o!==void 0).filter(o=>o?o.value!=="":!1)},I=(e,t,l)=>{const s=e.some(i=>l.findIndex(r=>r.name===i.name)!==-1),n=e.map(i=>{const a=l.find(c=>c.name===i.name);let r={...i};switch(i.type.toLocaleLowerCase()){case f.FilterType.multiselect.toLocaleLowerCase():r=h.default.setFilterValuesFromSavedDefault(r,s,a);break;case f.FilterType.date.toLocaleLowerCase():s&&(r.value=""),a&&(r=S.default.setFilterValueFromDefault(a,r));break;case f.FilterType.dateRange.toLocaleLowerCase():s&&(r.value={start:"",end:"",relative:void 0}),a&&(r=R.default.setFilterValueFromDefault(a,r));break;case f.FilterType.granularDateRange.toLocaleLowerCase():s&&(r.value={start:"",end:"",granularity:void 0,quickFilter:void 0}),a&&(r=y.default.setFilterValueFromDefault(a,r));break;default:{let c=s?"":r.value;c=a?a.value:c,r={...i,value:c}}break}return r}),u=t.map(i=>{const a=l.find(r=>r.name===i.name);return{...i,...a&&{value:a.value}}});return{filters:n,sortBy:u}},U=(e,t)=>{const{dprUser:l}=V.default.getValues(e),{activeCaseLoadId:s}=l;return t.forEach(n=>{if(n.type.toLocaleLowerCase()===f.FilterType.autocomplete.toLocaleLowerCase()&&n.text.toLocaleLowerCase().includes("establishment")&&s?.length){const u=n,i=u.options.find(a=>a.value===s);i&&(u.value=i.text,u.staticOptionNameValue=s)}}),t};var W={saveDefaults:x,removeDefaults:T,setFilterValuesFromSavedDefaults:I,setUserContextDefaults:U};0&&(module.exports={removeDefaults,saveDefaults,setFilterValuesFromSavedDefaults,setUserContextDefaults});
 //# sourceMappingURL=personalisationUtils.js.map

package/dpr/utils/Personalisation/personalisationUtils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/dpr/utils/Personalisation/personalisationUtils.ts"],
-  "sourcesContent": ["import { Request, Response } from 'express'\nimport { Services } from '../../types/Services'\nimport localsHelper from '../localsHelper'\nimport { ReportType } from '../../types/UserReports'\nimport { components } from '../../types/api'\nimport { FilterType } from '../../components/_filters/filter-input/enum'\nimport DateRangeInputUtils from '../../components/_inputs/date-range/utils'\nimport GranularDateRangeInputUtils from '../../components/_inputs/granular-date-range/utils'\nimport MultiSelectUtils from '../../components/_inputs/multi-select/utils'\nimport DateInputUtils from '../../components/_inputs/date-input/utils'\nimport { RenderFiltersReturnValue } from '../../components/_async/async-filters-form/types'\nimport {\n  DateFilterValue,\n  DateRangeFilterValue,\n  FilterValue,\n  FilterValueWithOptions,\n  GranularDateRangeFilterValue,\n  MultiselectFilterValue,\n} from '../../components/_filters/types'\nimport { defaultFilterValue } from './types'\nimport { FiltersType } from '../../components/_filters/filtersTypeEnum'\n\nexport const saveDefaults = async (type: FiltersType, res: Response, req: Request, services: Services) => {\n  const defaultValuesForReport = await getDefaultValues(req, res, services, type)\n  const { dprUser } = localsHelper.getValues(res)\n  const { reportId, id } = req.params\n  return services.defaultFilterValuesService.save(dprUser.id, reportId, id, defaultValuesForReport)\n}\n\nexport const removeDefaults = async (type: FiltersType, res: Response, req: Request, services: Services) => {\n  const { dprUser } = localsHelper.getValues(res)\n  const { reportId, id } = req.params\n  return services.defaultFilterValuesService.delete(dprUser.id, reportId, id, type)\n}\n\nconst getDefaultValues = async (\n  req: Request,\n  res: Response,\n  services: Services,\n  filtersType: FiltersType,\n): Promise<defaultFilterValue[]> => {\n  const { token, definitionsPath } = localsHelper.getValues(res)\n  const { reportId, id, type } = req.params\n\n  const service = type === ReportType.REPORT ? services.reportingService : services.dashboardService\n  const definition = await service.getDefinition(token, reportId, id, definitionsPath)\n  const fields: components['schemas']['FieldDefinition'][] =\n    type === ReportType.REPORT ? definition.variant.specification.fields : definition.filterFields\n\n  const bodyFilterValues = Object.keys(req.body)\n    .filter((k) => {\n      return k.includes('filters.') || k.includes('sortColumn') || k.includes('sortedAsc')\n    })\n    .map((k) => {\n      return { name: k.replace('filters.', ''), value: req.body[k] }\n    })\n    .map((k) => {\n      const n = k.name.split('.')[0]\n      const field = fields.find((f) => f.name === n)\n      let { value, name } = k\n\n      if (field) {\n        const filterType = field.filter?.type.toLocaleLowerCase()\n\n        switch (filterType) {\n          case FilterType.multiselect.toLocaleLowerCase():\n            value = Array.isArray(k.value) ? k.value.join(',') : k.value\n            break\n\n          case FilterType.dateRange.toLocaleLowerCase():\n            ;({ value, name } = DateRangeInputUtils.setDefaultValue(req, name))\n            break\n\n          case FilterType.granularDateRange.toLocaleLowerCase():\n            ;({ name, value } = GranularDateRangeInputUtils.setDefaultValue(req, name))\n            break\n\n          default:\n            break\n        }\n      }\n\n      return {\n        name,\n        value,\n        type: filtersType,\n      }\n    })\n\n  const defaultValuesConfig = Array.from(new Set(bodyFilterValues.map((a) => a.name)))\n    .map((name) => {\n      return bodyFilterValues.find((a) => a.name === name)\n    })\n    .filter((c) => c !== undefined)\n\n  return defaultValuesConfig.filter((defaultValue) => {\n    return defaultValue ? defaultValue.value !== '' : false\n  })\n}\n\nexport const setFilterValuesFromSavedDefaults = (\n  filters: FilterValue[],\n  sortBy: FilterValue[],\n  defaultValues: defaultFilterValue[],\n): RenderFiltersReturnValue => {\n  const hasDefaults = filters.some((f) => {\n    const defaultValue = defaultValues.findIndex((v) => v.name === f.name)\n    return defaultValue !== -1\n  })\n\n  const filterValues = filters.map((filter) => {\n    const defaultValue = defaultValues.find((v) => v.name === filter.name)\n    let updatedFilter = {\n      ...filter,\n    }\n    const type = filter.type.toLocaleLowerCase()\n\n    switch (type) {\n      case FilterType.multiselect.toLocaleLowerCase():\n        updatedFilter = MultiSelectUtils.setFilterValuesFromSavedDefault(\n          <MultiselectFilterValue>updatedFilter,\n          hasDefaults,\n          defaultValue,\n        )\n        break\n      case FilterType.date.toLocaleLowerCase():\n        if (hasDefaults) {\n          updatedFilter.value = ''\n        }\n        if (defaultValue) {\n          updatedFilter = <DateFilterValue>DateInputUtils.setFilterValueFromDefault(defaultValue, updatedFilter)\n        }\n        break\n      case FilterType.dateRange.toLocaleLowerCase():\n        if (hasDefaults) {\n          updatedFilter.value = { start: '', end: '', relative: undefined }\n        }\n        if (defaultValue) {\n          updatedFilter = <DateRangeFilterValue>(\n            DateRangeInputUtils.setFilterValueFromDefault(defaultValue, updatedFilter)\n          )\n        }\n        break\n      case FilterType.granularDateRange.toLocaleLowerCase():\n        if (hasDefaults) {\n          updatedFilter.value = { start: '', end: '', granularity: undefined, quickFilter: undefined }\n        }\n        if (defaultValue) {\n          updatedFilter = <GranularDateRangeFilterValue>(\n            GranularDateRangeInputUtils.setFilterValueFromDefault(defaultValue, updatedFilter)\n          )\n        }\n        break\n      default:\n        {\n          let value = hasDefaults ? '' : updatedFilter.value\n          value = defaultValue ? defaultValue.value : value\n          updatedFilter = {\n            ...filter,\n            value,\n          }\n        }\n\n        break\n    }\n\n    return updatedFilter\n  })\n\n  const sortValues = sortBy.map((sortFilter) => {\n    const defaultValue = defaultValues.find((v) => v.name === sortFilter.name)\n    return {\n      ...sortFilter,\n      ...(defaultValue && { value: defaultValue.value }),\n    }\n  })\n\n  return {\n    filters: filterValues,\n    sortBy: sortValues,\n  }\n}\n\nexport const setUserContextDefaults = (res: Response, filters: FilterValue[]) => {\n  const { dprUser } = localsHelper.getValues(res)\n  const { activeCaseLoadId } = dprUser\n\n  filters.forEach((filter) => {\n    if (\n      filter.type.toLocaleLowerCase() === FilterType.autocomplete.toLocaleLowerCase() &&\n      filter.text.toLocaleLowerCase().includes('establishment') &&\n      activeCaseLoadId?.length\n    ) {\n      const f = <FilterValueWithOptions>filter\n      const option = f.options.find((opt) => opt.value === activeCaseLoadId)\n\n      if (option) {\n        f.value = option.text\n        f.staticOptionNameValue = activeCaseLoadId\n      }\n    }\n  })\n\n  return filters\n}\n\nexport default { saveDefaults, removeDefaults, setFilterValuesFromSavedDefaults, setUserContextDefaults }\n"],
-  "mappings": "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",
-  "names": ["personalisationUtils_exports", "__export", "personalisationUtils_default", "removeDefaults", "saveDefaults", "setFilterValuesFromSavedDefaults", "setUserContextDefaults", "__toCommonJS", "import_localsHelper", "import_UserReports", "import_enum", "import_utils", "type", "res", "req", "services", "defaultValuesForReport", "getDefaultValues", "dprUser", "localsHelper", "reportId", "id", "filtersType", "token", "definitionsPath", "definition", "fields", "bodyFilterValues", "k", "n", "field", "f", "value", "name", "DateRangeInputUtils", "GranularDateRangeInputUtils", "a", "c", "defaultValue", "filters", "sortBy", "defaultValues", "hasDefaults", "v", "filterValues", "filter", "updatedFilter", "MultiSelectUtils", "DateInputUtils", "sortValues", "sortFilter", "activeCaseLoadId", "option", "opt"]
+  "sourcesContent": ["import { Request, Response } from 'express'\nimport { Services } from '../../types/Services'\nimport localsHelper from '../localsHelper'\nimport { ReportType } from '../../types/UserReports'\nimport { components } from '../../types/api'\nimport { FilterType } from '../../components/_filters/filter-input/enum'\nimport DateRangeInputUtils from '../../components/_inputs/date-range/utils'\nimport GranularDateRangeInputUtils from '../../components/_inputs/granular-date-range/utils'\nimport MultiSelectUtils from '../../components/_inputs/multi-select/utils'\nimport DateInputUtils from '../../components/_inputs/date-input/utils'\nimport { RenderFiltersReturnValue } from '../../components/_async/async-filters-form/types'\nimport {\n  DateFilterValue,\n  DateRangeFilterValue,\n  FilterValue,\n  FilterValueWithOptions,\n  GranularDateRangeFilterValue,\n  MultiselectFilterValue,\n} from '../../components/_filters/types'\nimport { defaultFilterValue } from './types'\nimport { FiltersType } from '../../components/_filters/filtersTypeEnum'\n\nexport const saveDefaults = async (type: FiltersType, res: Response, req: Request, services: Services) => {\n  const defaultValuesForReport = await getDefaultValues(req, res, services, type)\n  const { dprUser } = localsHelper.getValues(res)\n  const { reportId, id } = req.params\n  const { defaultFilterValuesService } = services\n  return defaultFilterValuesService\n    ? defaultFilterValuesService.save(dprUser.id, reportId, id, defaultValuesForReport)\n    : undefined\n}\n\nexport const removeDefaults = async (type: FiltersType, res: Response, req: Request, services: Services) => {\n  const { dprUser } = localsHelper.getValues(res)\n  const { reportId, id } = req.params\n  const { defaultFilterValuesService } = services\n  return defaultFilterValuesService ? defaultFilterValuesService.delete(dprUser.id, reportId, id, type) : undefined\n}\n\nconst getDefaultValues = async (\n  req: Request,\n  res: Response,\n  services: Services,\n  filtersType: FiltersType,\n): Promise<defaultFilterValue[]> => {\n  const { token, definitionsPath } = localsHelper.getValues(res)\n  const { reportId, id, type } = req.params\n\n  let definition: components['schemas']['SingleVariantReportDefinition'] | components['schemas']['DashboardDefinition']\n  let fields = []\n  if (type === ReportType.REPORT) {\n    definition = await services.reportingService.getDefinition(token, reportId, id, definitionsPath)\n    fields = definition.variant.specification?.fields || []\n  } else {\n    definition = await services.dashboardService.getDefinition(token, reportId, id, definitionsPath)\n    fields = definition.filterFields || []\n  }\n\n  const bodyFilterValues = Object.keys(req.body)\n    .filter((k) => {\n      return k.includes('filters.') || k.includes('sortColumn') || k.includes('sortedAsc')\n    })\n    .map((k) => {\n      return { name: k.replace('filters.', ''), value: req.body[k] }\n    })\n    .map((k) => {\n      const n = k.name.split('.')[0]\n      const field = fields.find((f) => f.name === n)\n      let { value, name } = k\n\n      if (field) {\n        const filterType = field.filter?.type.toLocaleLowerCase()\n\n        switch (filterType) {\n          case FilterType.multiselect.toLocaleLowerCase():\n            value = Array.isArray(k.value) ? k.value.join(',') : k.value\n            break\n\n          case FilterType.dateRange.toLocaleLowerCase():\n            ;({ value, name } = DateRangeInputUtils.setDefaultValue(req, name))\n            break\n\n          case FilterType.granularDateRange.toLocaleLowerCase():\n            ;({ name, value } = GranularDateRangeInputUtils.setDefaultValue(req, name))\n            break\n\n          default:\n            break\n        }\n      }\n\n      return {\n        name,\n        value,\n        type: filtersType,\n      }\n    })\n\n  const defaultValuesConfig = Array.from(new Set(bodyFilterValues.map((a) => a.name)))\n    .map((name) => {\n      return bodyFilterValues.find((a) => a.name === name)\n    })\n    .filter((c) => c !== undefined)\n\n  return defaultValuesConfig.filter((defaultValue) => {\n    return defaultValue ? defaultValue.value !== '' : false\n  })\n}\n\nexport const setFilterValuesFromSavedDefaults = (\n  filters: FilterValue[],\n  sortBy: FilterValue[],\n  defaultValues: defaultFilterValue[],\n): RenderFiltersReturnValue => {\n  const hasDefaults = filters.some((f) => {\n    const defaultValue = defaultValues.findIndex((v) => v.name === f.name)\n    return defaultValue !== -1\n  })\n\n  const filterValues = filters.map((filter) => {\n    const defaultValue = defaultValues.find((v) => v.name === filter.name)\n    let updatedFilter = {\n      ...filter,\n    }\n    const type = filter.type.toLocaleLowerCase()\n\n    switch (type) {\n      case FilterType.multiselect.toLocaleLowerCase():\n        updatedFilter = MultiSelectUtils.setFilterValuesFromSavedDefault(\n          <MultiselectFilterValue>updatedFilter,\n          hasDefaults,\n          defaultValue,\n        )\n        break\n      case FilterType.date.toLocaleLowerCase():\n        if (hasDefaults) {\n          updatedFilter.value = ''\n        }\n        if (defaultValue) {\n          updatedFilter = <DateFilterValue>DateInputUtils.setFilterValueFromDefault(defaultValue, updatedFilter)\n        }\n        break\n      case FilterType.dateRange.toLocaleLowerCase():\n        if (hasDefaults) {\n          updatedFilter.value = { start: '', end: '', relative: undefined }\n        }\n        if (defaultValue) {\n          updatedFilter = <DateRangeFilterValue>(\n            DateRangeInputUtils.setFilterValueFromDefault(defaultValue, updatedFilter)\n          )\n        }\n        break\n      case FilterType.granularDateRange.toLocaleLowerCase():\n        if (hasDefaults) {\n          updatedFilter.value = { start: '', end: '', granularity: undefined, quickFilter: undefined }\n        }\n        if (defaultValue) {\n          updatedFilter = <GranularDateRangeFilterValue>(\n            GranularDateRangeInputUtils.setFilterValueFromDefault(defaultValue, updatedFilter)\n          )\n        }\n        break\n      default:\n        {\n          let value = hasDefaults ? '' : updatedFilter.value\n          value = defaultValue ? defaultValue.value : value\n          updatedFilter = {\n            ...filter,\n            value,\n          }\n        }\n\n        break\n    }\n\n    return updatedFilter\n  })\n\n  const sortValues = sortBy.map((sortFilter) => {\n    const defaultValue = defaultValues.find((v) => v.name === sortFilter.name)\n    return {\n      ...sortFilter,\n      ...(defaultValue && { value: defaultValue.value }),\n    }\n  })\n\n  return {\n    filters: filterValues,\n    sortBy: sortValues,\n  }\n}\n\nexport const setUserContextDefaults = (res: Response, filters: FilterValue[]) => {\n  const { dprUser } = localsHelper.getValues(res)\n  const { activeCaseLoadId } = dprUser\n\n  filters.forEach((filter) => {\n    if (\n      filter.type.toLocaleLowerCase() === FilterType.autocomplete.toLocaleLowerCase() &&\n      filter.text.toLocaleLowerCase().includes('establishment') &&\n      activeCaseLoadId?.length\n    ) {\n      const f = <FilterValueWithOptions>filter\n      const option = f.options.find((opt) => opt.value === activeCaseLoadId)\n\n      if (option) {\n        f.value = option.text\n        f.staticOptionNameValue = activeCaseLoadId\n      }\n    }\n  })\n\n  return filters\n}\n\nexport default { saveDefaults, removeDefaults, setFilterValuesFromSavedDefaults, setUserContextDefaults }\n"],
+  "mappings": "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",
+  "names": ["personalisationUtils_exports", "__export", "personalisationUtils_default", "removeDefaults", "saveDefaults", "setFilterValuesFromSavedDefaults", "setUserContextDefaults", "__toCommonJS", "import_localsHelper", "import_UserReports", "import_enum", "import_utils", "type", "res", "req", "services", "defaultValuesForReport", "getDefaultValues", "dprUser", "localsHelper", "reportId", "id", "defaultFilterValuesService", "filtersType", "token", "definitionsPath", "definition", "fields", "bodyFilterValues", "k", "n", "field", "f", "value", "name", "DateRangeInputUtils", "GranularDateRangeInputUtils", "a", "c", "defaultValue", "filters", "sortBy", "defaultValues", "hasDefaults", "v", "filterValues", "filter", "updatedFilter", "MultiSelectUtils", "DateInputUtils", "sortValues", "sortFilter", "activeCaseLoadId", "option", "opt"]
 }

package/dpr/utils/Personalisation/personalisationUtils.ts

@@ -24,13 +24,17 @@ export const saveDefaults = async (type: FiltersType, res: Response, req: Reques
   const defaultValuesForReport = await getDefaultValues(req, res, services, type)
   const { dprUser } = localsHelper.getValues(res)
   const { reportId, id } = req.params
-  return services.defaultFilterValuesService.save(dprUser.id, reportId, id, defaultValuesForReport)
+  const { defaultFilterValuesService } = services
+  return defaultFilterValuesService
+    ? defaultFilterValuesService.save(dprUser.id, reportId, id, defaultValuesForReport)
+    : undefined
 }
 
 export const removeDefaults = async (type: FiltersType, res: Response, req: Request, services: Services) => {
   const { dprUser } = localsHelper.getValues(res)
   const { reportId, id } = req.params
-  return services.defaultFilterValuesService.delete(dprUser.id, reportId, id, type)
+  const { defaultFilterValuesService } = services
+  return defaultFilterValuesService ? defaultFilterValuesService.delete(dprUser.id, reportId, id, type) : undefined
 }
 
 const getDefaultValues = async (
@@ -42,10 +46,15 @@ const getDefaultValues = async (
   const { token, definitionsPath } = localsHelper.getValues(res)
   const { reportId, id, type } = req.params
 
-  const service = type === ReportType.REPORT ? services.reportingService : services.dashboardService
-  const definition = await service.getDefinition(token, reportId, id, definitionsPath)
-  const fields: components['schemas']['FieldDefinition'][] =
-    type === ReportType.REPORT ? definition.variant.specification.fields : definition.filterFields
+  let definition: components['schemas']['SingleVariantReportDefinition'] | components['schemas']['DashboardDefinition']
+  let fields = []
+  if (type === ReportType.REPORT) {
+    definition = await services.reportingService.getDefinition(token, reportId, id, definitionsPath)
+    fields = definition.variant.specification?.fields || []
+  } else {
+    definition = await services.dashboardService.getDefinition(token, reportId, id, definitionsPath)
+    fields = definition.filterFields || []
+  }
 
   const bodyFilterValues = Object.keys(req.body)
     .filter((k) => {

package/dpr/utils/ReportStoreServiceUtils.js

@@ -1,2 +1,2 @@
-var p=Object.create;var S=Object.defineProperty;var s=Object.getOwnPropertyDescriptor;var v=Object.getOwnPropertyNames;var R=Object.getPrototypeOf,m=Object.prototype.hasOwnProperty;var f=(e,r)=>{for(var i in r)S(e,i,{get:r[i],enumerable:!0})},d=(e,r,i,a)=>{if(r&&typeof r=="object"||typeof r=="function")for(let n of v(r))!m.call(e,n)&&n!==i&&S(e,n,{get:()=>r[n],enumerable:!(a=s(r,n))||a.enumerable});return e};var g=(e,r,i)=>(i=e!=null?p(R(e)):{},d(r||!e||!e.__esModule?S(i,"default",{value:e,enumerable:!0}):i,e)),u=e=>d(S({},"__esModule",{value:!0}),e);var P={};f(P,{createDprServices:()=>l,default:()=>h});module.exports=u(P);var o=require("../services"),c=g(require("./logger"));const l=(e,r={})=>{c.default.info("Creating DPR services...");const{reportingClient:i,dashboardClient:a,reportDataStore:n}=e;let t={};return i&&(t=C(t,i)),a&&(t=D(t,a)),n&&(t=w(n,t,r)),t={...t,missingReportClient:e.missingReportClient},t},C=(e,r)=>(e={...e,reportingService:new o.ReportingService(r)},e),D=(e,r)=>(e={...e,dashboardService:new o.DashboardService(r)},e),w=(e,r,i={})=>(r={...r,requestedReportService:new o.RequestedReportService(e),recentlyViewedService:new o.RecentlyViewedStoreService(e),defaultFilterValuesService:new o.DefaultFilterValuesService(e)},i.bookmarking===void 0||i.bookmarking?r=k(r,e):c.default.info("Service Disabled: BookmarkService"),i.download===void 0||i.download?r=b(r,e):c.default.info("Service Disabled: DownloadPermissionService"),r),b=(e,r)=>(e={...e,downloadPermissionService:new o.DownloadPermissionService(r)},e),k=(e,r)=>(e={...e,bookmarkService:new o.BookmarkService(r)},e);var h=l;0&&(module.exports={createDprServices});
+var v=Object.create;var S=Object.defineProperty;var s=Object.getOwnPropertyDescriptor;var m=Object.getOwnPropertyNames;var R=Object.getPrototypeOf,u=Object.prototype.hasOwnProperty;var C=(e,r)=>{for(var o in r)S(e,o,{get:r[o],enumerable:!0})},a=(e,r,o,c)=>{if(r&&typeof r=="object"||typeof r=="function")for(let n of m(r))!u.call(e,n)&&n!==o&&S(e,n,{get:()=>r[n],enumerable:!(c=s(r,n))||c.enumerable});return e};var f=(e,r,o)=>(o=e!=null?v(R(e)):{},a(r||!e||!e.__esModule?S(o,"default",{value:e,enumerable:!0}):o,e)),g=e=>a(S({},"__esModule",{value:!0}),e);var V={};C(V,{createDprServices:()=>p,default:()=>h});module.exports=g(V);var i=require("../services"),l=f(require("./logger")),d=require("../services/productCollection/productCollectionStoreService");const p=(e,r={})=>{l.default.info("Creating DPR services...");const{reportingClient:o,dashboardClient:c,reportDataStore:n}=e;let t={};return o&&(t=w(t,o)),c&&(t=D(t,c)),n&&(t=b(n,t,r)),t={...t,missingReportClient:e.missingReportClient,productCollectionService:e.productCollectionService},t},w=(e,r)=>(e={...e,reportingService:new i.ReportingService(r)},e),D=(e,r)=>(e={...e,dashboardService:new i.DashboardService(r)},e),b=(e,r,o={})=>(r={...r,requestedReportService:new i.RequestedReportService(e),recentlyViewedService:new i.RecentlyViewedStoreService(e),defaultFilterValuesService:new i.DefaultFilterValuesService(e),productCollectionStoreService:new d.ProductCollectionStoreService(e)},o.bookmarking===void 0||o.bookmarking?r=P(r,e):l.default.info("Service Disabled: BookmarkService"),o.download===void 0||o.download?r=k(r,e):l.default.info("Service Disabled: DownloadPermissionService"),r),k=(e,r)=>(e={...e,downloadPermissionService:new i.DownloadPermissionService(r)},e),P=(e,r)=>(e={...e,bookmarkService:new i.BookmarkService(r)},e);var h=p;0&&(module.exports={createDprServices});
 //# sourceMappingURL=ReportStoreServiceUtils.js.map

package/dpr/utils/ReportStoreServiceUtils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/utils/ReportStoreServiceUtils.ts"],
-  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport {\n  DownloadPermissionService,\n  BookmarkService,\n  RequestedReportService,\n  RecentlyViewedStoreService,\n  ReportingService,\n  DashboardService,\n  DefaultFilterValuesService,\n} from '../services'\nimport ReportDataStore from '../data/reportDataStore'\nimport ReportingClient from '../data/reportingClient'\nimport DashboardClient from '../data/dashboardClient'\nimport logger from './logger'\nimport { Services } from '../types/Services'\nimport MissingReportClient from '../services/missingReport/missingReportClient'\n\nexport interface InitDPRServicesArgs {\n  reportingClient: ReportingClient\n  dashboardClient: DashboardClient\n  reportDataStore: ReportDataStore\n  missingReportClient: MissingReportClient\n}\n\ninterface dprServices {\n  reportingService?: ReportingService\n  dashboardService?: DashboardService\n  requestedReportService?: RequestedReportService\n  missingReportClient?: MissingReportClient\n  recentlyViewedService?: RecentlyViewedStoreService\n  bookmarkService?: BookmarkService\n  downloadPermissionService?: DownloadPermissionService\n  defaultFilterValuesService?: DefaultFilterValuesService\n}\n\nexport const createDprServices = (\n  clients: InitDPRServicesArgs,\n  reportStoreConfig: ReportStoreConfig = {},\n): Services => {\n  logger.info('Creating DPR services...')\n\n  const { reportingClient, dashboardClient, reportDataStore } = clients\n  let services: dprServices = {}\n\n  if (reportingClient) {\n    services = createReportingService(services, reportingClient)\n  }\n\n  if (dashboardClient) {\n    services = createDashboardService(services, dashboardClient)\n  }\n\n  if (reportDataStore) {\n    services = createReportStoreServices(reportDataStore, services, reportStoreConfig)\n  }\n\n  services = {\n    ...services,\n    missingReportClient: clients.missingReportClient,\n  }\n\n  return services as Services\n}\n\nconst createReportingService = (services: dprServices, client: ReportingClient) => {\n  services = {\n    ...services,\n    reportingService: new ReportingService(client),\n  }\n\n  return services\n}\n\nconst createDashboardService = (services: dprServices, client: DashboardClient) => {\n  services = {\n    ...services,\n    dashboardService: new DashboardService(client),\n  }\n\n  return services\n}\n\ninterface ReportStoreConfig {\n  bookmarking?: boolean\n  download?: boolean\n}\n\nconst createReportStoreServices = (\n  reportDataStore: ReportDataStore,\n  services: dprServices,\n  config: ReportStoreConfig = {},\n) => {\n  services = {\n    ...services,\n    requestedReportService: new RequestedReportService(reportDataStore),\n    recentlyViewedService: new RecentlyViewedStoreService(reportDataStore),\n    defaultFilterValuesService: new DefaultFilterValuesService(reportDataStore),\n  }\n\n  if (config.bookmarking === undefined || config.bookmarking) {\n    services = createBookmarkService(services, reportDataStore)\n  } else {\n    logger.info('Service Disabled: BookmarkService')\n  }\n\n  if (config.download === undefined || config.download) {\n    services = createDownloadService(services, reportDataStore)\n  } else {\n    logger.info('Service Disabled: DownloadPermissionService')\n  }\n\n  return services\n}\n\nconst createDownloadService = (services: dprServices, reportDataStore: ReportDataStore) => {\n  services = {\n    ...services,\n    downloadPermissionService: new DownloadPermissionService(reportDataStore),\n  }\n\n  return services\n}\n\nconst createBookmarkService = (services: dprServices, reportDataStore: ReportDataStore) => {\n  services = {\n    ...services,\n    bookmarkService: new BookmarkService(reportDataStore),\n  }\n\n  return services\n}\n\nexport default createDprServices\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,uBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAQO,uBAIPC,EAAmB,uBAsBZ,MAAMJ,EAAoB,CAC/BK,EACAC,EAAuC,CAAC,IAC3B,CACb,EAAAC,QAAO,KAAK,0BAA0B,EAEtC,KAAM,CAAE,gBAAAC,EAAiB,gBAAAC,EAAiB,gBAAAC,CAAgB,EAAIL,EAC9D,IAAIM,EAAwB,CAAC,EAE7B,OAAIH,IACFG,EAAWC,EAAuBD,EAAUH,CAAe,GAGzDC,IACFE,EAAWE,EAAuBF,EAAUF,CAAe,GAGzDC,IACFC,EAAWG,EAA0BJ,EAAiBC,EAAUL,CAAiB,GAGnFK,EAAW,CACT,GAAGA,EACH,oBAAqBN,EAAQ,mBAC/B,EAEOM,CACT,EAEMC,EAAyB,CAACD,EAAuBI,KACrDJ,EAAW,CACT,GAAGA,EACH,iBAAkB,IAAI,mBAAiBI,CAAM,CAC/C,EAEOJ,GAGHE,EAAyB,CAACF,EAAuBI,KACrDJ,EAAW,CACT,GAAGA,EACH,iBAAkB,IAAI,mBAAiBI,CAAM,CAC/C,EAEOJ,GAQHG,EAA4B,CAChCJ,EACAC,EACAK,EAA4B,CAAC,KAE7BL,EAAW,CACT,GAAGA,EACH,uBAAwB,IAAI,yBAAuBD,CAAe,EAClE,sBAAuB,IAAI,6BAA2BA,CAAe,EACrE,2BAA4B,IAAI,6BAA2BA,CAAe,CAC5E,EAEIM,EAAO,cAAgB,QAAaA,EAAO,YAC7CL,EAAWM,EAAsBN,EAAUD,CAAe,EAE1D,EAAAH,QAAO,KAAK,mCAAmC,EAG7CS,EAAO,WAAa,QAAaA,EAAO,SAC1CL,EAAWO,EAAsBP,EAAUD,CAAe,EAE1D,EAAAH,QAAO,KAAK,6CAA6C,EAGpDI,GAGHO,EAAwB,CAACP,EAAuBD,KACpDC,EAAW,CACT,GAAGA,EACH,0BAA2B,IAAI,4BAA0BD,CAAe,CAC1E,EAEOC,GAGHM,EAAwB,CAACN,EAAuBD,KACpDC,EAAW,CACT,GAAGA,EACH,gBAAiB,IAAI,kBAAgBD,CAAe,CACtD,EAEOC,GAGT,IAAOV,EAAQD",
-  "names": ["ReportStoreServiceUtils_exports", "__export", "createDprServices", "ReportStoreServiceUtils_default", "__toCommonJS", "import_services", "import_logger", "clients", "reportStoreConfig", "logger", "reportingClient", "dashboardClient", "reportDataStore", "services", "createReportingService", "createDashboardService", "createReportStoreServices", "client", "config", "createBookmarkService", "createDownloadService"]
+  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport {\n  DownloadPermissionService,\n  BookmarkService,\n  RequestedReportService,\n  RecentlyViewedStoreService,\n  ReportingService,\n  DashboardService,\n  DefaultFilterValuesService,\n} from '../services'\nimport ReportDataStore from '../data/reportDataStore'\nimport ReportingClient from '../data/reportingClient'\nimport DashboardClient from '../data/dashboardClient'\nimport logger from './logger'\nimport { Services } from '../types/Services'\nimport MissingReportClient from '../services/missingReport/missingReportClient'\nimport { ProductCollectionStoreService } from '../services/productCollection/productCollectionStoreService'\nimport { ProductCollectionService } from '../services/productCollection/productCollectionService'\n\nexport interface InitDPRServicesArgs {\n  reportingClient: ReportingClient\n  dashboardClient: DashboardClient\n  reportDataStore: ReportDataStore\n  missingReportClient: MissingReportClient\n  productCollectionService?: ProductCollectionService\n}\n\ninterface dprServices {\n  reportingService?: ReportingService\n  dashboardService?: DashboardService\n  productCollectionService?: ProductCollectionService\n  requestedReportService?: RequestedReportService\n  missingReportClient?: MissingReportClient\n  recentlyViewedService?: RecentlyViewedStoreService\n  bookmarkService?: BookmarkService\n  downloadPermissionService?: DownloadPermissionService\n  defaultFilterValuesService?: DefaultFilterValuesService\n  productCollectionStoreService?: ProductCollectionStoreService\n}\n\nexport const createDprServices = (\n  clients: InitDPRServicesArgs,\n  reportStoreConfig: ReportStoreConfig = {},\n): Services => {\n  logger.info('Creating DPR services...')\n\n  const { reportingClient, dashboardClient, reportDataStore } = clients\n  let services: dprServices = {}\n\n  if (reportingClient) {\n    services = createReportingService(services, reportingClient)\n  }\n\n  if (dashboardClient) {\n    services = createDashboardService(services, dashboardClient)\n  }\n\n  if (reportDataStore) {\n    services = createReportStoreServices(reportDataStore, services, reportStoreConfig)\n  }\n\n  services = {\n    ...services,\n    missingReportClient: clients.missingReportClient,\n    productCollectionService: clients.productCollectionService,\n  }\n\n  return services as Services\n}\n\nconst createReportingService = (services: dprServices, client: ReportingClient) => {\n  services = {\n    ...services,\n    reportingService: new ReportingService(client),\n  }\n\n  return services\n}\n\nconst createDashboardService = (services: dprServices, client: DashboardClient) => {\n  services = {\n    ...services,\n    dashboardService: new DashboardService(client),\n  }\n\n  return services\n}\n\ninterface ReportStoreConfig {\n  bookmarking?: boolean\n  download?: boolean\n}\n\nconst createReportStoreServices = (\n  reportDataStore: ReportDataStore,\n  services: dprServices,\n  config: ReportStoreConfig = {},\n) => {\n  services = {\n    ...services,\n    requestedReportService: new RequestedReportService(reportDataStore),\n    recentlyViewedService: new RecentlyViewedStoreService(reportDataStore),\n    defaultFilterValuesService: new DefaultFilterValuesService(reportDataStore),\n    productCollectionStoreService: new ProductCollectionStoreService(reportDataStore),\n  }\n\n  if (config.bookmarking === undefined || config.bookmarking) {\n    services = createBookmarkService(services, reportDataStore)\n  } else {\n    logger.info('Service Disabled: BookmarkService')\n  }\n\n  if (config.download === undefined || config.download) {\n    services = createDownloadService(services, reportDataStore)\n  } else {\n    logger.info('Service Disabled: DownloadPermissionService')\n  }\n\n  return services\n}\n\nconst createDownloadService = (services: dprServices, reportDataStore: ReportDataStore) => {\n  services = {\n    ...services,\n    downloadPermissionService: new DownloadPermissionService(reportDataStore),\n  }\n\n  return services\n}\n\nconst createBookmarkService = (services: dprServices, reportDataStore: ReportDataStore) => {\n  services = {\n    ...services,\n    bookmarkService: new BookmarkService(reportDataStore),\n  }\n\n  return services\n}\n\nexport default createDprServices\n"],
+  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,uBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAQO,uBAIPC,EAAmB,uBAGnBC,EAA8C,uEAwBvC,MAAML,EAAoB,CAC/BM,EACAC,EAAuC,CAAC,IAC3B,CACb,EAAAC,QAAO,KAAK,0BAA0B,EAEtC,KAAM,CAAE,gBAAAC,EAAiB,gBAAAC,EAAiB,gBAAAC,CAAgB,EAAIL,EAC9D,IAAIM,EAAwB,CAAC,EAE7B,OAAIH,IACFG,EAAWC,EAAuBD,EAAUH,CAAe,GAGzDC,IACFE,EAAWE,EAAuBF,EAAUF,CAAe,GAGzDC,IACFC,EAAWG,EAA0BJ,EAAiBC,EAAUL,CAAiB,GAGnFK,EAAW,CACT,GAAGA,EACH,oBAAqBN,EAAQ,oBAC7B,yBAA0BA,EAAQ,wBACpC,EAEOM,CACT,EAEMC,EAAyB,CAACD,EAAuBI,KACrDJ,EAAW,CACT,GAAGA,EACH,iBAAkB,IAAI,mBAAiBI,CAAM,CAC/C,EAEOJ,GAGHE,EAAyB,CAACF,EAAuBI,KACrDJ,EAAW,CACT,GAAGA,EACH,iBAAkB,IAAI,mBAAiBI,CAAM,CAC/C,EAEOJ,GAQHG,EAA4B,CAChCJ,EACAC,EACAK,EAA4B,CAAC,KAE7BL,EAAW,CACT,GAAGA,EACH,uBAAwB,IAAI,yBAAuBD,CAAe,EAClE,sBAAuB,IAAI,6BAA2BA,CAAe,EACrE,2BAA4B,IAAI,6BAA2BA,CAAe,EAC1E,8BAA+B,IAAI,gCAA8BA,CAAe,CAClF,EAEIM,EAAO,cAAgB,QAAaA,EAAO,YAC7CL,EAAWM,EAAsBN,EAAUD,CAAe,EAE1D,EAAAH,QAAO,KAAK,mCAAmC,EAG7CS,EAAO,WAAa,QAAaA,EAAO,SAC1CL,EAAWO,EAAsBP,EAAUD,CAAe,EAE1D,EAAAH,QAAO,KAAK,6CAA6C,EAGpDI,GAGHO,EAAwB,CAACP,EAAuBD,KACpDC,EAAW,CACT,GAAGA,EACH,0BAA2B,IAAI,4BAA0BD,CAAe,CAC1E,EAEOC,GAGHM,EAAwB,CAACN,EAAuBD,KACpDC,EAAW,CACT,GAAGA,EACH,gBAAiB,IAAI,kBAAgBD,CAAe,CACtD,EAEOC,GAGT,IAAOX,EAAQD",
+  "names": ["ReportStoreServiceUtils_exports", "__export", "createDprServices", "ReportStoreServiceUtils_default", "__toCommonJS", "import_services", "import_logger", "import_productCollectionStoreService", "clients", "reportStoreConfig", "logger", "reportingClient", "dashboardClient", "reportDataStore", "services", "createReportingService", "createDashboardService", "createReportStoreServices", "client", "config", "createBookmarkService", "createDownloadService"]
 }

package/dpr/utils/ReportStoreServiceUtils.ts

@@ -14,23 +14,28 @@ import DashboardClient from '../data/dashboardClient'
 import logger from './logger'
 import { Services } from '../types/Services'
 import MissingReportClient from '../services/missingReport/missingReportClient'
+import { ProductCollectionStoreService } from '../services/productCollection/productCollectionStoreService'
+import { ProductCollectionService } from '../services/productCollection/productCollectionService'
 
 export interface InitDPRServicesArgs {
   reportingClient: ReportingClient
   dashboardClient: DashboardClient
   reportDataStore: ReportDataStore
   missingReportClient: MissingReportClient
+  productCollectionService?: ProductCollectionService
 }
 
 interface dprServices {
   reportingService?: ReportingService
   dashboardService?: DashboardService
+  productCollectionService?: ProductCollectionService
   requestedReportService?: RequestedReportService
   missingReportClient?: MissingReportClient
   recentlyViewedService?: RecentlyViewedStoreService
   bookmarkService?: BookmarkService
   downloadPermissionService?: DownloadPermissionService
   defaultFilterValuesService?: DefaultFilterValuesService
+  productCollectionStoreService?: ProductCollectionStoreService
 }
 
 export const createDprServices = (
@@ -57,6 +62,7 @@ export const createDprServices = (
   services = {
     ...services,
     missingReportClient: clients.missingReportClient,
+    productCollectionService: clients.productCollectionService,
   }
 
   return services as Services
@@ -95,6 +101,7 @@ const createReportStoreServices = (
     requestedReportService: new RequestedReportService(reportDataStore),
     recentlyViewedService: new RecentlyViewedStoreService(reportDataStore),
     defaultFilterValuesService: new DefaultFilterValuesService(reportDataStore),
+    productCollectionStoreService: new ProductCollectionStoreService(reportDataStore),
   }
 
   if (config.bookmarking === undefined || config.bookmarking) {

package/dpr/utils/UserStoreItemBuilder.js

@@ -1,2 +1,2 @@
-var I=Object.create;var u=Object.defineProperty;var g=Object.getOwnPropertyDescriptor;var y=Object.getOwnPropertyNames;var D=Object.getPrototypeOf,R=Object.prototype.hasOwnProperty;var q=(r,t)=>{for(var e in t)u(r,e,{get:t[e],enumerable:!0})},d=(r,t,e,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of y(t))!R.call(r,s)&&s!==e&&u(r,s,{get:()=>t[s],enumerable:!(i=g(t,s))||i.enumerable});return r};var f=(r,t,e)=>(e=r!=null?I(D(r)):{},d(t||!r||!r.__esModule?u(e,"default",{value:r,enumerable:!0}):e,r)),U=r=>d(u({},"__esModule",{value:!0}),r);var b={};q(b,{UserStoreItemBuilder:()=>h,default:()=>E});module.exports=U(b);var p=f(require("parseurl")),o=require("../types/UserReports");class h{constructor(t,e){this.build=()=>this.userStoreItem;this.addReportData=({type:t,reportId:e,reportName:i,description:s,id:m,name:n})=>({type:t,reportId:e,reportName:i,description:s,id:m,name:n,timestamp:{}});this.addExecutionData=t=>(this.userStoreItem={...this.userStoreItem,...t},this);this.addChildExecutionData=t=>(this.userStoreItem={...this.userStoreItem,childExecutionData:t},this);this.addFilters=t=>{const e=new URLSearchParams(t).toString();return this.userStoreItem={...this.userStoreItem,filters:{data:t,queryString:e}},this};this.addSortData=t=>{const e=new URLSearchParams(t).toString();return this.userStoreItem={...this.userStoreItem,sortBy:{data:t,queryString:e}},this};this.addRequestUrls=t=>{const{origin:e,pathname:i,search:s,href:m}=this.requestFormData,{executionId:n,dataProductDefinitionsPath:S,dpdPathFromQuery:l}=this.userStoreItem;let a=t.baseUrl.replace("/filters",`/${n}/status`);l&&(a=`${a}?dataProductDefinitionsPath=${S}`);const c=`${e}${a}`;return this.userStoreItem={...this.userStoreItem,url:{origin:e,request:{fullUrl:m,pathname:i,search:s},polling:{fullUrl:c,pathname:a}}},this};this.addAsyncUrls=t=>(this.userStoreItem={...this.userStoreItem,url:t},this);this.addReportUrls=t=>{const e=t.get("host"),i=`${t.protocol}://${t.get("host")}${t.originalUrl}`,s=(0,p.default)(t);return this.userStoreItem={...this.userStoreItem,url:{origin:e||this.userStoreItem.url?.origin||"",...this.userStoreItem.url?.request&&{request:this.userStoreItem.url.request},...this.userStoreItem.url?.polling&&{polling:this.userStoreItem.url.polling},report:{...this.userStoreItem.url?.report&&this.userStoreItem.url.report,fullUrl:i,...s&&s.search&&{search:s.search}}}},this};this.addLoadType=t=>(this.userStoreItem={...this.userStoreItem,loadType:t},this);this.addQuery=t=>(this.userStoreItem={...this.userStoreItem,...t&&{query:{data:t.query,summary:t.querySummary}}},this);this.addInteractiveQuery=t=>(t&&(this.userStoreItem={...this.userStoreItem,interactiveQuery:{data:t.query,summary:t.querySummary}}),this);this.addStatus=t=>(this.userStoreItem={...this.userStoreItem,status:t},this);this.addMetrics=t=>(this.userStoreItem={...this.userStoreItem,metrics:t.filter(e=>e.display).map(e=>({name:e.display||""}))},this);this.addTimestamp=()=>{const{status:t}=this.userStoreItem,e=new Date;switch(t){case o.RequestStatus.FAILED:this.userStoreItem.timestamp.failed=e;break;case o.RequestStatus.EXPIRED:this.userStoreItem.timestamp.expired=e;break;case o.RequestStatus.ABORTED:this.userStoreItem.timestamp.aborted=e;break;case o.RequestStatus.FINISHED:this.userStoreItem.timestamp.completed=e;break;case o.RequestStatus.SUBMITTED:this.userStoreItem.timestamp.requested=e;break;case o.RequestStatus.STARTED:case o.RequestStatus.PICKED:break;default:this.userStoreItem.timestamp.lastViewed=e;break}return this};this.addDefinitionsPath=(t,e)=>(t&&(this.userStoreItem={...this.userStoreItem,dataProductDefinitionsPath:t,dpdPathFromQuery:e}),this);this.requestFormData=e||{},this.userStoreItem=this.addReportData(t)}}var E=h;0&&(module.exports={UserStoreItemBuilder});
+var I=Object.create;var u=Object.defineProperty;var g=Object.getOwnPropertyDescriptor;var y=Object.getOwnPropertyNames;var D=Object.getPrototypeOf,R=Object.prototype.hasOwnProperty;var f=(r,t)=>{for(var e in t)u(r,e,{get:t[e],enumerable:!0})},d=(r,t,e,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of y(t))!R.call(r,s)&&s!==e&&u(r,s,{get:()=>t[s],enumerable:!(i=g(t,s))||i.enumerable});return r};var q=(r,t,e)=>(e=r!=null?I(D(r)):{},d(t||!r||!r.__esModule?u(e,"default",{value:r,enumerable:!0}):e,r)),U=r=>d(u({},"__esModule",{value:!0}),r);var T={};f(T,{UserStoreItemBuilder:()=>h,default:()=>E});module.exports=U(T);var p=q(require("parseurl")),o=require("../types/UserReports");class h{constructor(t,e){this.build=()=>this.userStoreItem;this.addReportData=({type:t,reportId:e,reportName:i,description:s,id:m,name:n})=>({type:t,reportId:e,reportName:i,description:s,id:m,name:n,timestamp:{}});this.addExecutionData=t=>(this.userStoreItem={...this.userStoreItem,...t},this);this.addChildExecutionData=t=>(this.userStoreItem={...this.userStoreItem,childExecutionData:t},this);this.addFilters=t=>{const e=new URLSearchParams(t).toString();return this.userStoreItem={...this.userStoreItem,filters:{data:t,queryString:e}},this};this.addSortData=t=>{const e=new URLSearchParams(t).toString();return this.userStoreItem={...this.userStoreItem,sortBy:{data:t,queryString:e}},this};this.addRequestUrls=t=>{const{origin:e,pathname:i,search:s,href:m}=this.requestFormData,{executionId:n,dataProductDefinitionsPath:S,dpdPathFromQuery:l}=this.userStoreItem;let a=t.baseUrl.replace("/filters",`/${n}/status`);l&&(a=`${a}?dataProductDefinitionsPath=${S}`);const c=`${e}${a}`;return this.userStoreItem={...this.userStoreItem,url:{origin:e,request:{fullUrl:m,pathname:i,search:s},polling:{fullUrl:c,pathname:a}}},this};this.addAsyncUrls=t=>(this.userStoreItem={...this.userStoreItem,url:t},this);this.addReportUrls=t=>{const e=t.get("host"),i=`${t.protocol}://${t.get("host")}${t.originalUrl}`,s=(0,p.default)(t);return this.userStoreItem={...this.userStoreItem,url:{origin:e||this.userStoreItem.url?.origin||"",...this.userStoreItem.url?.request&&{request:this.userStoreItem.url.request},...this.userStoreItem.url?.polling&&{polling:this.userStoreItem.url.polling},report:{...this.userStoreItem.url?.report&&this.userStoreItem.url.report,fullUrl:i,...s&&s.search&&{search:s.search}}}},this};this.addLoadType=t=>(this.userStoreItem={...this.userStoreItem,loadType:t},this);this.addQuery=t=>(this.userStoreItem={...this.userStoreItem,...t&&{query:{data:t.query,summary:t.querySummary}}},this);this.addInteractiveQuery=t=>(t&&(this.userStoreItem={...this.userStoreItem,interactiveQuery:{data:t.query,summary:t.querySummary}}),this);this.addStatus=t=>(this.userStoreItem={...this.userStoreItem,status:t},this);this.addMetrics=t=>(this.userStoreItem={...this.userStoreItem,metrics:t.filter(e=>e.display).map(e=>({name:e.display||""}))},this);this.addTimestamp=()=>{const{status:t}=this.userStoreItem,e=new Date;switch(t){case o.RequestStatus.FAILED:this.userStoreItem.timestamp.failed=e;break;case o.RequestStatus.EXPIRED:this.userStoreItem.timestamp.expired=e;break;case o.RequestStatus.ABORTED:this.userStoreItem.timestamp.aborted=e;break;case o.RequestStatus.FINISHED:this.userStoreItem.timestamp.completed=e;break;case o.RequestStatus.SUBMITTED:this.userStoreItem.timestamp.requested=e;break;case o.RequestStatus.STARTED:case o.RequestStatus.PICKED:break;default:this.userStoreItem.timestamp.lastViewed=e;break}return this};this.addDefinitionsPath=(t,e)=>(t&&(this.userStoreItem={...this.userStoreItem,dataProductDefinitionsPath:t,dpdPathFromQuery:e}),this);this.requestFormData=e||{},this.userStoreItem=this.addReportData(t)}}var E=h;0&&(module.exports={UserStoreItemBuilder});
 //# sourceMappingURL=UserStoreItemBuilder.js.map

package/dpr/utils/UserStoreItemBuilder.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/utils/UserStoreItemBuilder.ts"],
-  "sourcesContent": ["import type { Request } from 'express'\nimport parseUrl from 'parseurl'\nimport {\n  AsyncReportUrlData,\n  LoadType,\n  ReportType,\n  RequestedReport,\n  RequestFormData,\n  RequestStatus,\n  UserReportData,\n} from '../types/UserReports'\nimport Dict = NodeJS.Dict\nimport { ChildReportExecutionData, ExecutionData } from '../types/ExecutionData'\nimport { DashboardSection } from '../components/_dashboards/dashboard/types'\n\nclass UserStoreItemBuilder {\n  userStoreItem: UserReportData\n\n  requestFormData: RequestFormData | Record<string, never>\n\n  constructor(\n    reportData: {\n      type: ReportType\n      reportId: string\n      reportName: string\n      description: string\n      id: string\n      name: string\n    },\n    requestFormData?: RequestFormData,\n  ) {\n    this.requestFormData = requestFormData || {}\n    this.userStoreItem = this.addReportData(reportData)\n  }\n\n  build = () => {\n    return this.userStoreItem as RequestedReport\n  }\n\n  addReportData = ({\n    type,\n    reportId,\n    reportName,\n    description,\n    id,\n    name,\n  }: {\n    type: ReportType\n    reportId: string\n    reportName: string\n    description: string\n    id: string\n    name: string\n  }) => {\n    return {\n      type: type as ReportType,\n      reportId,\n      reportName,\n      description,\n      id,\n      name,\n      timestamp: {},\n    }\n  }\n\n  addExecutionData = (executionData: ExecutionData) => {\n    this.userStoreItem = {\n      ...(<UserReportData>this.userStoreItem),\n      ...executionData,\n    }\n    return this\n  }\n\n  addChildExecutionData = (childExecutionData: Array<ChildReportExecutionData>) => {\n    this.userStoreItem = {\n      ...(<UserReportData>this.userStoreItem),\n      childExecutionData,\n    }\n    return this\n  }\n\n  addFilters = (filterData?: Record<string, string>) => {\n    const filtersQueryString = new URLSearchParams(filterData).toString()\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        filters: {\n          data: filterData,\n          queryString: filtersQueryString,\n        },\n      },\n    }\n    return this\n  }\n\n  addSortData = (sortData: Record<string, string>) => {\n    const sortByQueryString = new URLSearchParams(sortData).toString()\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        sortBy: {\n          data: sortData,\n          queryString: sortByQueryString,\n        },\n      },\n    }\n    return this\n  }\n\n  addRequestUrls = (req: Request) => {\n    const { origin, pathname, search, href } = this.requestFormData\n    const { executionId, dataProductDefinitionsPath, dpdPathFromQuery } = this.userStoreItem\n\n    // Polling path\n    let pollingPath = req.baseUrl.replace('/filters', `/${executionId}/status`)\n    if (dpdPathFromQuery) {\n      pollingPath = `${pollingPath}?dataProductDefinitionsPath=${dataProductDefinitionsPath}`\n    }\n    const pollingFullUrl = `${origin}${pollingPath}`\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        url: {\n          origin,\n          request: {\n            fullUrl: href,\n            pathname,\n            search,\n          },\n          polling: {\n            fullUrl: pollingFullUrl,\n            pathname: pollingPath,\n          },\n        },\n      },\n    }\n\n    return this\n  }\n\n  addAsyncUrls = (url: AsyncReportUrlData) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        url,\n      },\n    }\n\n    return this\n  }\n\n  addReportUrls = (req: Request) => {\n    const origin = req.get('host')\n    const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`\n    const urlData = parseUrl(req)\n\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        url: {\n          origin: origin || this.userStoreItem.url?.origin || '',\n          ...(this.userStoreItem.url?.request && { request: this.userStoreItem.url.request }),\n          ...(this.userStoreItem.url?.polling && { polling: this.userStoreItem.url.polling }),\n          report: {\n            ...(this.userStoreItem.url?.report && this.userStoreItem.url.report),\n            fullUrl,\n            ...(urlData && urlData.search && { search: urlData.search }),\n          },\n        },\n      },\n    }\n\n    return this\n  }\n\n  addLoadType = (loadType: LoadType) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      loadType,\n    }\n\n    return this\n  }\n\n  addQuery = (queryData?: { query: Dict<string | string[]>; querySummary: Array<Dict<string>> }) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...(queryData && {\n        query: {\n          data: queryData.query,\n          summary: queryData.querySummary,\n        },\n      }),\n    }\n    return this\n  }\n\n  addInteractiveQuery = (queryData?: { query: Dict<string | string[]>; querySummary: Array<Dict<string>> }) => {\n    if (queryData) {\n      this.userStoreItem = {\n        ...this.userStoreItem,\n        ...{\n          interactiveQuery: {\n            data: queryData.query,\n            summary: queryData.querySummary,\n          },\n        },\n      }\n    }\n    return this\n  }\n\n  addStatus = (status: RequestStatus) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      status,\n    }\n    return this\n  }\n\n  addMetrics = (metrics: DashboardSection[]) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      metrics: metrics.filter((metric) => metric.display).map((metric) => ({ name: metric.display || '' })),\n    }\n    return this\n  }\n\n  addTimestamp = () => {\n    const { status } = this.userStoreItem\n    const ts = new Date()\n    switch (status) {\n      case RequestStatus.FAILED:\n        this.userStoreItem.timestamp.failed = ts\n        break\n      case RequestStatus.EXPIRED:\n        this.userStoreItem.timestamp.expired = ts\n        break\n      case RequestStatus.ABORTED:\n        this.userStoreItem.timestamp.aborted = ts\n        break\n      case RequestStatus.FINISHED:\n        this.userStoreItem.timestamp.completed = ts\n        break\n      case RequestStatus.SUBMITTED:\n        this.userStoreItem.timestamp.requested = ts\n        break\n      case RequestStatus.STARTED:\n      case RequestStatus.PICKED:\n        break\n      default:\n        this.userStoreItem.timestamp.lastViewed = ts\n        break\n    }\n    return this\n  }\n\n  addDefinitionsPath = (definitionsPath: string, dpdPathFromQuery: boolean) => {\n    if (definitionsPath) {\n      this.userStoreItem = {\n        ...this.userStoreItem,\n        dataProductDefinitionsPath: definitionsPath,\n        dpdPathFromQuery,\n      }\n    }\n    return this\n  }\n}\n\nexport { UserStoreItemBuilder }\nexport default UserStoreItemBuilder\n"],
+  "sourcesContent": ["import type { Request } from 'express'\nimport parseUrl from 'parseurl'\nimport {\n  AsyncReportUrlData,\n  LoadType,\n  ReportType,\n  RequestedReport,\n  RequestFormData,\n  RequestStatus,\n  UserReportData,\n} from '../types/UserReports'\nimport Dict = NodeJS.Dict\nimport { ChildReportExecutionData, ExecutionData } from '../types/ExecutionData'\nimport { components } from '../types/api'\n\nclass UserStoreItemBuilder {\n  userStoreItem: UserReportData\n\n  requestFormData: RequestFormData | Record<string, never>\n\n  constructor(\n    reportData: {\n      type: ReportType\n      reportId: string\n      reportName: string\n      description: string\n      id: string\n      name: string\n    },\n    requestFormData?: RequestFormData,\n  ) {\n    this.requestFormData = requestFormData || {}\n    this.userStoreItem = this.addReportData(reportData)\n  }\n\n  build = () => {\n    return this.userStoreItem as RequestedReport\n  }\n\n  addReportData = ({\n    type,\n    reportId,\n    reportName,\n    description,\n    id,\n    name,\n  }: {\n    type: ReportType\n    reportId: string\n    reportName: string\n    description: string\n    id: string\n    name: string\n  }) => {\n    return {\n      type: type as ReportType,\n      reportId,\n      reportName,\n      description,\n      id,\n      name,\n      timestamp: {},\n    }\n  }\n\n  addExecutionData = (executionData: ExecutionData) => {\n    this.userStoreItem = {\n      ...(<UserReportData>this.userStoreItem),\n      ...executionData,\n    }\n    return this\n  }\n\n  addChildExecutionData = (childExecutionData: Array<ChildReportExecutionData>) => {\n    this.userStoreItem = {\n      ...(<UserReportData>this.userStoreItem),\n      childExecutionData,\n    }\n    return this\n  }\n\n  addFilters = (filterData?: Record<string, string>) => {\n    const filtersQueryString = new URLSearchParams(filterData).toString()\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        filters: {\n          data: filterData,\n          queryString: filtersQueryString,\n        },\n      },\n    }\n    return this\n  }\n\n  addSortData = (sortData: Record<string, string>) => {\n    const sortByQueryString = new URLSearchParams(sortData).toString()\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        sortBy: {\n          data: sortData,\n          queryString: sortByQueryString,\n        },\n      },\n    }\n    return this\n  }\n\n  addRequestUrls = (req: Request) => {\n    const { origin, pathname, search, href } = this.requestFormData\n    const { executionId, dataProductDefinitionsPath, dpdPathFromQuery } = this.userStoreItem\n\n    // Polling path\n    let pollingPath = req.baseUrl.replace('/filters', `/${executionId}/status`)\n    if (dpdPathFromQuery) {\n      pollingPath = `${pollingPath}?dataProductDefinitionsPath=${dataProductDefinitionsPath}`\n    }\n    const pollingFullUrl = `${origin}${pollingPath}`\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        url: {\n          origin,\n          request: {\n            fullUrl: href,\n            pathname,\n            search,\n          },\n          polling: {\n            fullUrl: pollingFullUrl,\n            pathname: pollingPath,\n          },\n        },\n      },\n    }\n\n    return this\n  }\n\n  addAsyncUrls = (url: AsyncReportUrlData) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        url,\n      },\n    }\n\n    return this\n  }\n\n  addReportUrls = (req: Request) => {\n    const origin = req.get('host')\n    const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`\n    const urlData = parseUrl(req)\n\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        url: {\n          origin: origin || this.userStoreItem.url?.origin || '',\n          ...(this.userStoreItem.url?.request && { request: this.userStoreItem.url.request }),\n          ...(this.userStoreItem.url?.polling && { polling: this.userStoreItem.url.polling }),\n          report: {\n            ...(this.userStoreItem.url?.report && this.userStoreItem.url.report),\n            fullUrl,\n            ...(urlData && urlData.search && { search: urlData.search }),\n          },\n        },\n      },\n    }\n\n    return this\n  }\n\n  addLoadType = (loadType: LoadType) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      loadType,\n    }\n\n    return this\n  }\n\n  addQuery = (queryData?: { query: Dict<string | string[]>; querySummary: Array<Dict<string>> }) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...(queryData && {\n        query: {\n          data: queryData.query,\n          summary: queryData.querySummary,\n        },\n      }),\n    }\n    return this\n  }\n\n  addInteractiveQuery = (queryData?: { query: Dict<string | string[]>; querySummary: Array<Dict<string>> }) => {\n    if (queryData) {\n      this.userStoreItem = {\n        ...this.userStoreItem,\n        ...{\n          interactiveQuery: {\n            data: queryData.query,\n            summary: queryData.querySummary,\n          },\n        },\n      }\n    }\n    return this\n  }\n\n  addStatus = (status: RequestStatus) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      status,\n    }\n    return this\n  }\n\n  addMetrics = (metrics: components['schemas']['DashboardSectionDefinition'][]) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      metrics: metrics.filter((metric) => metric.display).map((metric) => ({ name: metric.display || '' })),\n    }\n    return this\n  }\n\n  addTimestamp = () => {\n    const { status } = this.userStoreItem\n    const ts = new Date()\n    switch (status) {\n      case RequestStatus.FAILED:\n        this.userStoreItem.timestamp.failed = ts\n        break\n      case RequestStatus.EXPIRED:\n        this.userStoreItem.timestamp.expired = ts\n        break\n      case RequestStatus.ABORTED:\n        this.userStoreItem.timestamp.aborted = ts\n        break\n      case RequestStatus.FINISHED:\n        this.userStoreItem.timestamp.completed = ts\n        break\n      case RequestStatus.SUBMITTED:\n        this.userStoreItem.timestamp.requested = ts\n        break\n      case RequestStatus.STARTED:\n      case RequestStatus.PICKED:\n        break\n      default:\n        this.userStoreItem.timestamp.lastViewed = ts\n        break\n    }\n    return this\n  }\n\n  addDefinitionsPath = (definitionsPath: string, dpdPathFromQuery: boolean) => {\n    if (definitionsPath) {\n      this.userStoreItem = {\n        ...this.userStoreItem,\n        dataProductDefinitionsPath: definitionsPath,\n        dpdPathFromQuery,\n      }\n    }\n    return this\n  }\n}\n\nexport { UserStoreItemBuilder }\nexport default UserStoreItemBuilder\n"],
   "mappings": "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",
   "names": ["UserStoreItemBuilder_exports", "__export", "UserStoreItemBuilder", "UserStoreItemBuilder_default", "__toCommonJS", "import_parseurl", "import_UserReports", "reportData", "requestFormData", "type", "reportId", "reportName", "description", "id", "name", "executionData", "childExecutionData", "filterData", "filtersQueryString", "sortData", "sortByQueryString", "req", "origin", "pathname", "search", "href", "executionId", "dataProductDefinitionsPath", "dpdPathFromQuery", "pollingPath", "pollingFullUrl", "url", "fullUrl", "urlData", "parseUrl", "loadType", "queryData", "status", "metrics", "metric", "ts", "definitionsPath"]
 }

package/dpr/utils/UserStoreItemBuilder.ts

@@ -11,7 +11,7 @@ import {
 } from '../types/UserReports'
 import Dict = NodeJS.Dict
 import { ChildReportExecutionData, ExecutionData } from '../types/ExecutionData'
-import { DashboardSection } from '../components/_dashboards/dashboard/types'
+import { components } from '../types/api'
 
 class UserStoreItemBuilder {
   userStoreItem: UserReportData
@@ -218,7 +218,7 @@ class UserStoreItemBuilder {
     return this
   }
 
-  addMetrics = (metrics: DashboardSection[]) => {
+  addMetrics = (metrics: components['schemas']['DashboardSectionDefinition'][]) => {
     this.userStoreItem = {
       ...this.userStoreItem,
       metrics: metrics.filter((metric) => metric.display).map((metric) => ({ name: metric.display || '' })),

package/dpr/utils/datasetHelper.js

@@ -1,2 +1,2 @@
-var h=Object.defineProperty;var k=Object.getOwnPropertyDescriptor;var E=Object.getOwnPropertyNames;var O=Object.prototype.hasOwnProperty;var q=(e,s)=>{for(var n in s)h(e,n,{get:s[n],enumerable:!0})},T=(e,s,n,t)=>{if(s&&typeof s=="object"||typeof s=="function")for(let o of E(s))!O.call(e,o)&&o!==n&&h(e,o,{get:()=>s[o],enumerable:!(t=k(s,o))||t.enumerable});return e};var j=e=>T(h({},"__esModule",{value:!0}),e);var H={};q(H,{default:()=>B,filterKeys:()=>R,filterRowsByDisplayColumns:()=>I,getDatasetRows:()=>g,getEarliestDataset:()=>V,getGroupKey:()=>K,getKeyIds:()=>b,getKeyVariations:()=>y,getLastestDataset:()=>v,groupRowsByKey:()=>C,groupRowsByTimestamp:()=>x});module.exports=j(H);const g=(e,s)=>{const{keys:n,measures:t,filters:o,expectNulls:r}=e.columns,a=t.map(p=>p.id),i=n?.map(p=>p.id)||[],l=o?.map(p=>p.id)||[],u=n?.some(p=>p.optional);s.length&&s[0].ts&&i.unshift("ts");const m=s.filter(p=>{const w=[];return Object.keys(p).forEach(f=>{const c=p[f].raw;let d=!0;l.includes(f)?d=(o?o.filter(D=>D.id===f).map(D=>D.equals):[]).includes(c):i.includes(f)&&u?d=!0:i.includes(f)&&!u||a.includes(f)?d=c!==""&&c!==void 0&&c!==null:r&&(d=c===""||c===void 0||c===null),w.push(d)}),w.every(f=>f)});return u?R(m,n||[]):m},y=(e,s)=>{const n=[],t=s.map(a=>a.id),o=s.every(a=>a.optional),r=[...t];return t.reverse().forEach(a=>{const i=s.find(l=>l.id===a);n.push([...r]),i&&i.optional&&r.pop()}),o&&n.push([]),n},b=(e,s)=>{let n=[];return s.every(t=>{const o=[];return e.forEach(r=>{const a=[];Object.keys(r).forEach(i=>{const l=r[i].raw;let u=!0;t.includes(i)&&(u=l!==""&&l!==void 0&&l!==null),a.push(u)}),a.every(i=>i)&&o.push(r)}),o.length>0?(n=t,!1):(n=t,!0)}),n},R=(e,s)=>{const n=y(e,s),t=b(e,n);return e.filter(o=>{const r=[];return Object.keys(o).forEach(a=>{const i=o[a].raw;let l=!0;t.includes(a)&&(l=i!==""&&i!==void 0&&i!==null),r.push(l)}),r.every(a=>a)})},v=e=>{const s=e[e.length-1]?.ts?.raw;return s?e.filter(n=>n.ts.raw===s):e},V=e=>{const s=e[0]?.ts?.raw;return s?e.filter(n=>n.ts.raw===s):e},x=e=>[...new Set(e.map(n=>n.ts.raw))].map(n=>e.filter(t=>t.ts.raw===n)),C=(e,s)=>[...new Set(e.map(t=>t[s].raw))].map(t=>e.filter(o=>o[s].raw===t)),K=(e,s)=>{if(!e||!e.length||!s.length)return;const n=s[0];let t=e.length-1,o=!1;for(;!o;){const r=`${e[t]?.id}`;r&&t!==-1&&(!n[r]||!n[r].raw||n[r].raw===""||n[r].raw===null)?t-=1:o=!0}return t!==-1?e[t]:void 0},I=(e,s,n=!1)=>{const{keys:t,measures:o}=e.columns,r=t||[];let a=[...o];n&&(a=[...r,...o]);const i=a.map(l=>l.id);return s.map(l=>Object.keys(l).filter(u=>i.includes(u)).reduce((u,m)=>(u[m]=l[m],u),{}))};var B={getDatasetRows:g,getLastestDataset:v,getEarliestDataset:V,filterRowsByDisplayColumns:I,groupRowsByTimestamp:x,groupRowsByKey:C,getGroupKey:K,getKeyVariations:y,getKeyIds:b,filterKeys:R};0&&(module.exports={filterKeys,filterRowsByDisplayColumns,getDatasetRows,getEarliestDataset,getGroupKey,getKeyIds,getKeyVariations,getLastestDataset,groupRowsByKey,groupRowsByTimestamp});
+var h=Object.defineProperty;var k=Object.getOwnPropertyDescriptor;var E=Object.getOwnPropertyNames;var O=Object.prototype.hasOwnProperty;var q=(e,s)=>{for(var n in s)h(e,n,{get:s[n],enumerable:!0})},T=(e,s,n,o)=>{if(s&&typeof s=="object"||typeof s=="function")for(let t of E(s))!O.call(e,t)&&t!==n&&h(e,t,{get:()=>s[t],enumerable:!(o=k(s,t))||o.enumerable});return e};var j=e=>T(h({},"__esModule",{value:!0}),e);var B={};q(B,{default:()=>A,filterKeys:()=>R,filterRowsByDisplayColumns:()=>K,getDatasetRows:()=>w,getEarliestDataset:()=>x,getGroupKey:()=>I,getKeyIds:()=>b,getKeyVariations:()=>y,getLastestDataset:()=>v,groupRowsByKey:()=>V,groupRowsByTimestamp:()=>C});module.exports=j(B);const w=(e,s)=>{const{measures:n,filters:o,expectNulls:t}=e.columns,a=e.columns.keys,r=n.map(p=>p.id),i=a?.map(p=>p.id)||[],l=o?.map(p=>p.id)||[],u=a?.some(p=>p.optional);s.length&&s[0].ts&&i.unshift("ts");const d=s.filter(p=>{const g=[];return Object.keys(p).forEach(f=>{const c=p[f].raw;let m=!0;l.includes(f)?m=(o?o.filter(D=>D.id===f).map(D=>D.equals):[]).includes(c):i.includes(f)&&u?m=!0:i.includes(f)&&!u||r.includes(f)?m=c!==""&&c!==void 0&&c!==null:t&&(m=c===""||c===void 0||c===null),g.push(m)}),g.every(f=>f)});return u?R(d,a||[]):d},y=(e,s)=>{const n=[],o=s.map(r=>r.id),t=s.every(r=>r.optional),a=[...o];return o.reverse().forEach(r=>{const i=s.find(l=>l.id===r);n.push([...a]),i&&i.optional&&a.pop()}),t&&n.push([]),n},b=(e,s)=>{let n=[];return s.every(o=>{const t=[];return e.forEach(a=>{const r=[];Object.keys(a).forEach(i=>{const l=a[i].raw;let u=!0;o.includes(i)&&(u=l!==""&&l!==void 0&&l!==null),r.push(u)}),r.every(i=>i)&&t.push(a)}),t.length>0?(n=o,!1):(n=o,!0)}),n},R=(e,s)=>{const n=y(e,s),o=b(e,n);return e.filter(t=>{const a=[];return Object.keys(t).forEach(r=>{const i=t[r].raw;let l=!0;o.includes(r)&&(l=i!==""&&i!==void 0&&i!==null),a.push(l)}),a.every(r=>r)})},v=e=>{const s=e[e.length-1]?.ts?.raw;return s?e.filter(n=>n.ts.raw===s):e},x=e=>{const s=e[0]?.ts?.raw;return s?e.filter(n=>n.ts.raw===s):e},C=e=>[...new Set(e.map(n=>n.ts.raw))].map(n=>e.filter(o=>o.ts.raw===n)),V=(e,s)=>[...new Set(e.map(o=>o[s].raw))].map(o=>e.filter(t=>t[s].raw===o)),I=(e,s)=>{if(!e||!e.length||!s.length)return;const n=s[0];let o=e.length-1,t=!1;for(;!t;){const a=`${e[o]?.id}`;a&&o!==-1&&(!n[a]||!n[a].raw||n[a].raw===""||n[a].raw===null)?o-=1:t=!0}return o!==-1?e[o]:void 0},K=(e,s,n=!1)=>{const{keys:o,measures:t}=e.columns,a=o||[];let r=[...t];n&&(r=[...a,...t]);const i=r.map(l=>l.id);return s.map(l=>Object.keys(l).filter(u=>i.includes(u)).reduce((u,d)=>(u[d]=l[d],u),{}))};var A={getDatasetRows:w,getLastestDataset:v,getEarliestDataset:x,filterRowsByDisplayColumns:K,groupRowsByTimestamp:C,groupRowsByKey:V,getGroupKey:I,getKeyVariations:y,getKeyIds:b,filterKeys:R};0&&(module.exports={filterKeys,filterRowsByDisplayColumns,getDatasetRows,getEarliestDataset,getGroupKey,getKeyIds,getKeyVariations,getLastestDataset,groupRowsByKey,groupRowsByTimestamp});
 //# sourceMappingURL=datasetHelper.js.map