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

package/dpr/assets/app.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/dpr/assets/app.js"],
   "sourcesContent": ["import * as govukFrontend from 'govuk-frontend'\nimport * as mojFrontend from '@ministryofjustice/frontend'\nimport * as dprFrontend from '../all.mjs'\n\ngovukFrontend.initAll()\nmojFrontend.initAll()\ndprFrontend.initAll()"],
-  "mappings": "2cAAA,IAAAA,EAA+B,6BAC/BC,EAA6B,0CAC7BC,EAA6B,yBAE7BF,EAAc,QAAQ,EACtBC,EAAY,QAAQ,EACpBC,EAAY,QAAQ",
+  "mappings": "wdAAA,IAAAA,EAA+B,6BAC/BC,EAA6B,0CAC7BC,EAA6B,yBAE7BF,EAAc,QAAQ,EACtBC,EAAY,QAAQ,EACpBC,EAAY,QAAQ",
   "names": ["govukFrontend", "mojFrontend", "dprFrontend"]
 }

package/dpr/components/_async/async-filters-form/sortByTemplate.js

@@ -1,2 +1,2 @@
-var a=Object.defineProperty;var n=Object.getOwnPropertyDescriptor;var p=Object.getOwnPropertyNames;var s=Object.prototype.hasOwnProperty;var u=(t,e)=>{for(var o in e)a(t,o,{get:e[o],enumerable:!0})},m=(t,e,o,l)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of p(e))!s.call(t,r)&&r!==o&&a(t,r,{get:()=>e[r],enumerable:!(l=n(e,r))||l.enumerable});return t};var d=t=>m(a({},"__esModule",{value:!0}),t);var F={};u(F,{default:()=>y,sortByTemplate:()=>i});module.exports=d(F);const i=()=>[{text:"Column",name:"sortColumn",type:"Radio",options:[],value:null,mandatory:!0},{text:"Direction",name:"sortedAsc",type:"Radio",options:[{value:"true",text:"Ascending"},{value:"false",text:"Descending"}],value:"false",mandatory:!0}];var y={sortByTemplate:i};0&&(module.exports={sortByTemplate});
+"use strict";var a=Object.defineProperty;var n=Object.getOwnPropertyDescriptor;var p=Object.getOwnPropertyNames;var s=Object.prototype.hasOwnProperty;var u=(t,e)=>{for(var o in e)a(t,o,{get:e[o],enumerable:!0})},m=(t,e,o,l)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of p(e))!s.call(t,r)&&r!==o&&a(t,r,{get:()=>e[r],enumerable:!(l=n(e,r))||l.enumerable});return t};var d=t=>m(a({},"__esModule",{value:!0}),t);var F={};u(F,{default:()=>y,sortByTemplate:()=>i});module.exports=d(F);const i=()=>[{text:"Column",name:"sortColumn",type:"Radio",options:[],value:null,mandatory:!0},{text:"Direction",name:"sortedAsc",type:"Radio",options:[{value:"true",text:"Ascending"},{value:"false",text:"Descending"}],value:"false",mandatory:!0}];var y={sortByTemplate:i};0&&(module.exports={sortByTemplate});
 //# sourceMappingURL=sortByTemplate.js.map

package/dpr/components/_async/async-filters-form/sortByTemplate.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../src/dpr/components/_async/async-filters-form/sortByTemplate.ts"],
   "sourcesContent": ["import { FilterType } from '../../_filters/filter-input/enum'\nimport { FilterOption, FilterValue } from '../../_filters/types'\n\nexport const sortByTemplate = (): FilterValue[] => {\n  return [\n    {\n      text: 'Column',\n      name: 'sortColumn',\n      type: 'Radio' as FilterType,\n      options: [] as FilterOption[],\n      value: null,\n      mandatory: true,\n    },\n    {\n      text: 'Direction',\n      name: 'sortedAsc',\n      type: 'Radio' as FilterType,\n      options: [\n        {\n          value: 'true',\n          text: 'Ascending',\n        },\n        {\n          value: 'false',\n          text: 'Descending',\n        },\n      ] as FilterOption[],\n      value: 'false',\n      mandatory: true,\n    },\n  ]\n}\n\nexport default {\n  sortByTemplate,\n}\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,mBAAAC,IAAA,eAAAC,EAAAJ,GAGO,MAAMG,EAAiB,IACrB,CACL,CACE,KAAM,SACN,KAAM,aACN,KAAM,QACN,QAAS,CAAC,EACV,MAAO,KACP,UAAW,EACb,EACA,CACE,KAAM,YACN,KAAM,YACN,KAAM,QACN,QAAS,CACP,CACE,MAAO,OACP,KAAM,WACR,EACA,CACE,MAAO,QACP,KAAM,YACR,CACF,EACA,MAAO,QACP,UAAW,EACb,CACF,EAGF,IAAOD,EAAQ,CACb,eAAAC,CACF",
+  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,mBAAAC,IAAA,eAAAC,EAAAJ,GAGO,MAAMG,EAAiB,IACrB,CACL,CACE,KAAM,SACN,KAAM,aACN,KAAM,QACN,QAAS,CAAC,EACV,MAAO,KACP,UAAW,EACb,EACA,CACE,KAAM,YACN,KAAM,YACN,KAAM,QACN,QAAS,CACP,CACE,MAAO,OACP,KAAM,WACR,EACA,CACE,MAAO,QACP,KAAM,YACR,CACF,EACA,MAAO,QACP,UAAW,EACb,CACF,EAGF,IAAOD,EAAQ,CACb,eAAAC,CACF",
   "names": ["sortByTemplate_exports", "__export", "sortByTemplate_default", "sortByTemplate", "__toCommonJS"]
 }

package/dpr/components/_async/async-filters-form/types.d.js

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

package/dpr/components/_async/async-filters-form/types.d.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../src/dpr/components/_async/async-filters-form/types.d.ts"],
   "sourcesContent": ["export interface requestAsyncReportParams {\n  apiTimeout: number\n  apiUrl: string\n  token: string\n  reportId: string\n  reportVariantId: string\n  query: Query\n}\n\n// todo update to correct type\ninterface Query {\n  sortColumn: string\n  sortedAsc: boolean\n  filters: filter[]\n  dataProductDefinitionsPath: string\n}\n\ninterface filter {\n  [filterId: string]: string\n}\n\nexport interface SortByDefaults {\n  options: { text: string; value: string }[]\n  value: string\n}\n\nexport interface RenderFiltersReturnValue {\n  filters: FilterValue[]\n  sortBy?: FilterValue[]\n}\n\nexport interface SetQueryFromFiltersResult {\n  query: Dict<string>\n  filterData: Dict<string>\n  querySummary: Array<Dict<string>>\n  sortData: Dict<string>\n}\n"],
-  "mappings": "kWAAA,IAAAA,EAAA,kBAAAC,EAAAD",
+  "mappings": "+WAAA,IAAAA,EAAA,kBAAAC,EAAAD",
   "names": ["types_d_exports", "__toCommonJS"]
 }

package/dpr/components/_async/async-filters-form/utils.js

@@ -1,2 +1,2 @@
-var x=Object.create;var m=Object.defineProperty;var A=Object.getOwnPropertyDescriptor;var M=Object.getOwnPropertyNames;var R=Object.getPrototypeOf,W=Object.prototype.hasOwnProperty;var v=(t,r)=>{for(var e in r)m(t,e,{get:r[e],enumerable:!0})},F=(t,r,e,a)=>{if(r&&typeof r=="object"||typeof r=="function")for(let i of M(r))!W.call(t,i)&&i!==e&&m(t,i,{get:()=>r[i],enumerable:!(a=A(r,i))||a.enumerable});return t};var u=(t,r,e)=>(e=t!=null?x(R(t)):{},F(r||!t||!t.__esModule?m(e,"default",{value:t,enumerable:!0}):e,t)),N=t=>F(m({},"__esModule",{value:!0}),t);var j={};v(j,{default:()=>U,getSortByFromDefinition:()=>$,renderFilters:()=>Y,setDurationStartAndEnd:()=>b,setQueryFromFilters:()=>O});module.exports=N(j);var h=u(require("./sortByTemplate")),g=u(require("../../../utils/definitionUtils")),S=u(require("../../../utils/DateMapper/DateMapper")),k=u(require("../../_filters/utils")),V=u(require("../../_inputs/date-range/utils"));const $=(t,r)=>{if(!r){const e=h.default.sortByTemplate(),a=t.filter(i=>i.sortable).map(i=>{i.defaultsort&&(e[0].value=i.name);const p={value:i.name,text:i.display};return i.sortDirection&&(e[1].value=i.sortDirection==="asc"?"true":"false"),p});if(a.length){const i=e[0];return i.options=a,e[0]=i,e}}return[]},b=(t,r,e,a,i,p)=>{const{startDate:D,endDate:y}=V.default.calcDates(r),s=D?D.format("YYYY-MM-DD").toString():"",c=y?y.format("YYYY-MM-DD").toString():"",n=t.split(".")[1],o=p.find(f=>f.name===n);e[`filters.${n}.start`]=s,e[`filters.${n}.end`]=c,a[t]=r;let l=`${r.charAt(0).toUpperCase()+r.slice(1).replace("-"," ")}`;return l=`${l} (${s} - ${c})`,i.push({name:o?`${o.display}`:t,value:l}),{querySummary:i,filterData:a,query:e}},Y=async(t,r)=>({filters:k.default.getFiltersFromDefinition(t,!1),sortBy:$(t,r)}),O=(t,r)=>{let e={},a={},i=[];const p={},D=new S.default,y=new URLSearchParams(t.body.search);return Object.keys(t.body).filter(s=>s!=="_csrf"&&t.body[s]!=="").forEach(s=>{const c=s.replace("filters.",""),n=t.body[s];if(s.startsWith("filters.")&&n!==""&&!e[s]&&n!=="no-filter")if(s.includes("relative-duration"))({query:e,filterData:a,querySummary:i}=b(s,n,e,a,i,r));else{let o=y.getAll(s);o=!o||o.length===0?n:o,o=o.length===1?`${o[0]}`:`${o}`,e[s]=o,a[c]=o;let l;if(D.isDate(n)){l=D.toDateString(n,"local-date");const d=D.toDateString(n,"iso");e[s]=d,a[c]=d}const f=g.default.getFieldDisplayName(r,c);i.push({name:f||c,value:l||o})}else if(s.startsWith("sort")){e[s]=n,p[s]=n;const o=g.default.getField(r,n);let l="Sort Direction",f=n==="true"?"Ascending":"Descending";o&&(l="Sort Column",f=o.display),i.push({name:l,value:f})}}),{query:e,filterData:a,querySummary:i,sortData:p}};var U={renderFilters:Y,setQueryFromFilters:O};0&&(module.exports={getSortByFromDefinition,renderFilters,setDurationStartAndEnd,setQueryFromFilters});
+"use strict";var O=Object.create;var m=Object.defineProperty;var x=Object.getOwnPropertyDescriptor;var M=Object.getOwnPropertyNames;var R=Object.getPrototypeOf,W=Object.prototype.hasOwnProperty;var v=(t,r)=>{for(var e in r)m(t,e,{get:r[e],enumerable:!0})},F=(t,r,e,a)=>{if(r&&typeof r=="object"||typeof r=="function")for(let i of M(r))!W.call(t,i)&&i!==e&&m(t,i,{get:()=>r[i],enumerable:!(a=x(r,i))||a.enumerable});return t};var u=(t,r,e)=>(e=t!=null?O(R(t)):{},F(r||!t||!t.__esModule?m(e,"default",{value:t,enumerable:!0}):e,t)),N=t=>F(m({},"__esModule",{value:!0}),t);var j={};v(j,{default:()=>U,getSortByFromDefinition:()=>$,renderFilters:()=>Y,setDurationStartAndEnd:()=>b,setQueryFromFilters:()=>A});module.exports=N(j);var h=u(require("./sortByTemplate")),g=u(require("../../../utils/definitionUtils")),S=u(require("../../../utils/DateMapper/DateMapper")),k=u(require("../../_filters/utils")),V=u(require("../../_inputs/date-range/utils"));const $=(t,r)=>{if(!r){const e=h.default.sortByTemplate(),a=t.filter(i=>i.sortable).map(i=>{i.defaultsort&&(e[0].value=i.name);const p={value:i.name,text:i.display};return i.sortDirection&&(e[1].value=i.sortDirection==="asc"?"true":"false"),p});if(a.length){const i=e[0];return i.options=a,e[0]=i,e}}return[]},b=(t,r,e,a,i,p)=>{const{startDate:D,endDate:y}=V.default.calcDates(r),s=D?D.format("YYYY-MM-DD").toString():"",c=y?y.format("YYYY-MM-DD").toString():"",n=t.split(".")[1],o=p.find(f=>f.name===n);e[`filters.${n}.start`]=s,e[`filters.${n}.end`]=c,a[t]=r;let l=`${r.charAt(0).toUpperCase()+r.slice(1).replaceAll("-"," ")}`;return l=`${l} (${s} - ${c})`,i.push({name:o?`${o.display}`:t,value:l}),{querySummary:i,filterData:a,query:e}},Y=async(t,r)=>({filters:k.default.getFiltersFromDefinition(t,!1),sortBy:$(t,r)}),A=(t,r)=>{let e={},a={},i=[];const p={},D=new S.default,y=new URLSearchParams(t.body.search);return Object.keys(t.body).filter(s=>s!=="_csrf"&&t.body[s]!=="").forEach(s=>{const c=s.replace("filters.",""),n=t.body[s];if(s.startsWith("filters.")&&n!==""&&!e[s]&&n!=="no-filter")if(s.includes("relative-duration"))({query:e,filterData:a,querySummary:i}=b(s,n,e,a,i,r));else{let o=y.getAll(s);o=!o||o.length===0?n:o,o=o.length===1?`${o[0]}`:`${o}`,e[s]=o,a[c]=o;let l;if(D.isDate(n)){l=D.toDateString(n,"local-date");const d=D.toDateString(n,"iso");e[s]=d,a[c]=d}const f=g.default.getFieldDisplayName(r,c);i.push({name:f||c,value:l||o})}else if(s.startsWith("sort")){e[s]=n,p[s]=n;const o=g.default.getField(r,n);let l="Sort Direction",f=n==="true"?"Ascending":"Descending";o&&(l="Sort Column",f=o.display),i.push({name:l,value:f})}}),{query:e,filterData:a,querySummary:i,sortData:p}};var U={renderFilters:Y,setQueryFromFilters:A};0&&(module.exports={getSortByFromDefinition,renderFilters,setDurationStartAndEnd,setQueryFromFilters});
 //# sourceMappingURL=utils.js.map

package/dpr/components/_async/async-filters-form/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/components/_async/async-filters-form/utils.ts"],
-  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Request } from 'express'\nimport { Dayjs } from 'dayjs'\nimport Dict = NodeJS.Dict\nimport type { SetQueryFromFiltersResult } from './types'\nimport type { components } from '../../../types/api'\n\nimport SortHelper from './sortByTemplate'\nimport DefinitionUtils from '../../../utils/definitionUtils'\nimport DateMapper from '../../../utils/DateMapper/DateMapper'\nimport FiltersUtils from '../../_filters/utils'\nimport DateRangeInputUtils from '../../_inputs/date-range/utils'\nimport { FilterOption, FilterValue, FilterValueWithOptions } from '../../_filters/types'\n\n/**\n * Initialises the sortData from the definition\n */\nexport const getSortByFromDefinition = (\n  fields: components['schemas']['FieldDefinition'][],\n  interactive?: boolean,\n): FilterValue[] => {\n  if (!interactive) {\n    const sortBy = SortHelper.sortByTemplate()\n    const options = fields\n      .filter((f) => f.sortable)\n      .map((f) => {\n        if (f.defaultsort) sortBy[0].value = f.name\n        const field: FilterOption = { value: f.name, text: f.display }\n        if (f.sortDirection) {\n          // the 'value' here is whether sortedAsc is true or not\n          sortBy[1].value = f.sortDirection === 'asc' ? 'true' : 'false'\n        }\n        return field\n      })\n\n    if (options.length) {\n      const sortWithOptions: FilterValueWithOptions = <FilterValueWithOptions>sortBy[0]\n      sortWithOptions.options = options\n      sortBy[0] = sortWithOptions\n      return sortBy\n    }\n  }\n  return []\n}\n\nexport const setDurationStartAndEnd = (\n  name: string,\n  value: string,\n  query: Dict<string>,\n  filterData: Dict<string>,\n  querySummary: Array<Dict<string>>,\n  fields: components['schemas']['FieldDefinition'][],\n) => {\n  const { startDate, endDate } = DateRangeInputUtils.calcDates(value)\n  const startDateDisplayString = startDate ? (<Dayjs>startDate).format('YYYY-MM-DD').toString() : ''\n  const endDateDisplayString = endDate ? (<Dayjs>endDate).format('YYYY-MM-DD').toString() : ''\n\n  const fieldId = name.split('.')[1]\n  const field = fields.find((f) => {\n    return f.name === fieldId\n  })\n\n  query[`filters.${fieldId}.start` as keyof Dict<string>] = startDateDisplayString\n  query[`filters.${fieldId}.end` as keyof Dict<string>] = endDateDisplayString\n\n  filterData[name as keyof Dict<string>] = value\n\n  let queryValue = `${value.charAt(0).toUpperCase() + value.slice(1).replace('-', ' ')}`\n  queryValue = `${queryValue} (${startDateDisplayString} - ${endDateDisplayString})`\n  querySummary.push({\n    name: field ? `${field.display}` : name,\n    value: queryValue,\n  })\n\n  return {\n    querySummary,\n    filterData,\n    query,\n  }\n}\n\n/**\n * Returns the data required for rendering the async filters component\n *\n * @param {AsyncReportUtilsParams} { req, res, dataSources }\n * @return {*}\n */\nexport const renderFilters = async (fields: components['schemas']['FieldDefinition'][], interactive?: boolean) => {\n  return {\n    filters: FiltersUtils.getFiltersFromDefinition(fields, false),\n    sortBy: getSortByFromDefinition(fields, interactive),\n  }\n}\n\nexport const setQueryFromFilters = (\n  req: Request,\n  fields: components['schemas']['FieldDefinition'][],\n): SetQueryFromFiltersResult => {\n  let query: Dict<string> = {}\n  let filterData: Dict<string> = {}\n  let querySummary: Array<Dict<string>> = []\n  const sortData: Dict<string> = {}\n  const dateMapper = new DateMapper()\n  const urlParams = new URLSearchParams(req.body.search)\n\n  Object.keys(req.body)\n    .filter((name) => name !== '_csrf' && req.body[name] !== '')\n    .forEach((name) => {\n      const shortName = name.replace('filters.', '')\n      const value = req.body[name]\n\n      if (name.startsWith('filters.') && value !== '' && !query[name] && value !== 'no-filter') {\n        if (name.includes('relative-duration')) {\n          ;({ query, filterData, querySummary } = setDurationStartAndEnd(\n            name,\n            value,\n            query,\n            filterData,\n            querySummary,\n            fields,\n          ))\n        } else {\n          let urlParamValue: string | string[] = urlParams.getAll(name)\n          urlParamValue = !urlParamValue || urlParamValue.length === 0 ? value : urlParamValue\n          urlParamValue = urlParamValue.length === 1 ? `${urlParamValue[0]}` : `${urlParamValue}`\n\n          query[name as keyof Dict<string>] = urlParamValue\n          filterData[shortName as keyof Dict<string>] = urlParamValue\n\n          let dateDisplayValue\n          if (dateMapper.isDate(value)) {\n            dateDisplayValue = dateMapper.toDateString(value, 'local-date')\n\n            const isoFormatDate = dateMapper.toDateString(value, 'iso')\n            query[name as keyof Dict<string>] = isoFormatDate\n            filterData[shortName as keyof Dict<string>] = isoFormatDate\n          }\n\n          const fieldDisplayName = DefinitionUtils.getFieldDisplayName(fields, shortName)\n          querySummary.push({\n            name: fieldDisplayName || shortName,\n            value: dateDisplayValue || urlParamValue,\n          })\n        }\n      } else if (name.startsWith('sort')) {\n        query[name as keyof Dict<string>] = value\n        sortData[name as keyof Dict<string>] = value\n\n        const fieldDef = DefinitionUtils.getField(fields, value)\n\n        let displayName = 'Sort Direction'\n        let displayValue = value === 'true' ? 'Ascending' : 'Descending'\n        if (fieldDef) {\n          displayName = 'Sort Column'\n          displayValue = fieldDef.display\n        }\n\n        querySummary.push({\n          name: displayName,\n          value: displayValue,\n        })\n      }\n    })\n\n  return {\n    query,\n    filterData,\n    querySummary,\n    sortData,\n  }\n}\n\nexport default {\n  renderFilters,\n  setQueryFromFilters,\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Request } from 'express'\nimport { Dayjs } from 'dayjs'\nimport Dict = NodeJS.Dict\nimport type { SetQueryFromFiltersResult } from './types'\nimport type { components } from '../../../types/api'\n\nimport SortHelper from './sortByTemplate'\nimport DefinitionUtils from '../../../utils/definitionUtils'\nimport DateMapper from '../../../utils/DateMapper/DateMapper'\nimport FiltersUtils from '../../_filters/utils'\nimport DateRangeInputUtils from '../../_inputs/date-range/utils'\nimport { FilterOption, FilterValue, FilterValueWithOptions } from '../../_filters/types'\n\n/**\n * Initialises the sortData from the definition\n */\nexport const getSortByFromDefinition = (\n  fields: components['schemas']['FieldDefinition'][],\n  interactive?: boolean,\n): FilterValue[] => {\n  if (!interactive) {\n    const sortBy = SortHelper.sortByTemplate()\n    const options = fields\n      .filter((f) => f.sortable)\n      .map((f) => {\n        if (f.defaultsort) sortBy[0].value = f.name\n        const field: FilterOption = { value: f.name, text: f.display }\n        if (f.sortDirection) {\n          // the 'value' here is whether sortedAsc is true or not\n          sortBy[1].value = f.sortDirection === 'asc' ? 'true' : 'false'\n        }\n        return field\n      })\n\n    if (options.length) {\n      const sortWithOptions: FilterValueWithOptions = <FilterValueWithOptions>sortBy[0]\n      sortWithOptions.options = options\n      sortBy[0] = sortWithOptions\n      return sortBy\n    }\n  }\n  return []\n}\n\nexport const setDurationStartAndEnd = (\n  name: string,\n  value: string,\n  query: Dict<string>,\n  filterData: Dict<string>,\n  querySummary: Array<Dict<string>>,\n  fields: components['schemas']['FieldDefinition'][],\n) => {\n  const { startDate, endDate } = DateRangeInputUtils.calcDates(value)\n  const startDateDisplayString = startDate ? (<Dayjs>startDate).format('YYYY-MM-DD').toString() : ''\n  const endDateDisplayString = endDate ? (<Dayjs>endDate).format('YYYY-MM-DD').toString() : ''\n\n  const fieldId = name.split('.')[1]\n  const field = fields.find((f) => {\n    return f.name === fieldId\n  })\n\n  query[`filters.${fieldId}.start` as keyof Dict<string>] = startDateDisplayString\n  query[`filters.${fieldId}.end` as keyof Dict<string>] = endDateDisplayString\n\n  filterData[name as keyof Dict<string>] = value\n\n  let queryValue = `${value.charAt(0).toUpperCase() + value.slice(1).replaceAll('-', ' ')}`\n  queryValue = `${queryValue} (${startDateDisplayString} - ${endDateDisplayString})`\n  querySummary.push({\n    name: field ? `${field.display}` : name,\n    value: queryValue,\n  })\n\n  return {\n    querySummary,\n    filterData,\n    query,\n  }\n}\n\n/**\n * Returns the data required for rendering the async filters component\n *\n * @param {AsyncReportUtilsParams} { req, res, dataSources }\n * @return {*}\n */\nexport const renderFilters = async (fields: components['schemas']['FieldDefinition'][], interactive?: boolean) => {\n  return {\n    filters: FiltersUtils.getFiltersFromDefinition(fields, false),\n    sortBy: getSortByFromDefinition(fields, interactive),\n  }\n}\n\nexport const setQueryFromFilters = (\n  req: Request,\n  fields: components['schemas']['FieldDefinition'][],\n): SetQueryFromFiltersResult => {\n  let query: Dict<string> = {}\n  let filterData: Dict<string> = {}\n  let querySummary: Array<Dict<string>> = []\n  const sortData: Dict<string> = {}\n  const dateMapper = new DateMapper()\n  const urlParams = new URLSearchParams(req.body.search)\n\n  Object.keys(req.body)\n    .filter((name) => name !== '_csrf' && req.body[name] !== '')\n    .forEach((name) => {\n      const shortName = name.replace('filters.', '')\n      const value = req.body[name]\n\n      if (name.startsWith('filters.') && value !== '' && !query[name] && value !== 'no-filter') {\n        if (name.includes('relative-duration')) {\n          ;({ query, filterData, querySummary } = setDurationStartAndEnd(\n            name,\n            value,\n            query,\n            filterData,\n            querySummary,\n            fields,\n          ))\n        } else {\n          let urlParamValue: string | string[] = urlParams.getAll(name)\n          urlParamValue = !urlParamValue || urlParamValue.length === 0 ? value : urlParamValue\n          urlParamValue = urlParamValue.length === 1 ? `${urlParamValue[0]}` : `${urlParamValue}`\n\n          query[name as keyof Dict<string>] = urlParamValue\n          filterData[shortName as keyof Dict<string>] = urlParamValue\n\n          let dateDisplayValue\n          if (dateMapper.isDate(value)) {\n            dateDisplayValue = dateMapper.toDateString(value, 'local-date')\n\n            const isoFormatDate = dateMapper.toDateString(value, 'iso')\n            query[name as keyof Dict<string>] = isoFormatDate\n            filterData[shortName as keyof Dict<string>] = isoFormatDate\n          }\n\n          const fieldDisplayName = DefinitionUtils.getFieldDisplayName(fields, shortName)\n          querySummary.push({\n            name: fieldDisplayName || shortName,\n            value: dateDisplayValue || urlParamValue,\n          })\n        }\n      } else if (name.startsWith('sort')) {\n        query[name as keyof Dict<string>] = value\n        sortData[name as keyof Dict<string>] = value\n\n        const fieldDef = DefinitionUtils.getField(fields, value)\n\n        let displayName = 'Sort Direction'\n        let displayValue = value === 'true' ? 'Ascending' : 'Descending'\n        if (fieldDef) {\n          displayName = 'Sort Column'\n          displayValue = fieldDef.display\n        }\n\n        querySummary.push({\n          name: displayName,\n          value: displayValue,\n        })\n      }\n    })\n\n  return {\n    query,\n    filterData,\n    querySummary,\n    sortData,\n  }\n}\n\nexport default {\n  renderFilters,\n  setQueryFromFilters,\n}\n"],
+  "mappings": "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",
   "names": ["utils_exports", "__export", "utils_default", "getSortByFromDefinition", "renderFilters", "setDurationStartAndEnd", "setQueryFromFilters", "__toCommonJS", "import_sortByTemplate", "import_definitionUtils", "import_DateMapper", "import_utils", "fields", "interactive", "sortBy", "SortHelper", "options", "f", "field", "sortWithOptions", "name", "value", "query", "filterData", "querySummary", "startDate", "endDate", "DateRangeInputUtils", "startDateDisplayString", "endDateDisplayString", "fieldId", "queryValue", "FiltersUtils", "req", "sortData", "dateMapper", "DateMapper", "urlParams", "shortName", "urlParamValue", "dateDisplayValue", "isoFormatDate", "fieldDisplayName", "DefinitionUtils", "fieldDef", "displayName", "displayValue"]
 }

package/dpr/components/_async/async-filters-form/utils.test.ts

@@ -1,3 +1,4 @@
+import { expect, jest } from '@jest/globals'
 import MockDate from 'mockdate'
 import { Request } from 'express'
 import mockVariant from '../../../../../test-app/mocks/mockClients/reports/mockVariants/feature-testing/missingDescription'
@@ -25,9 +26,8 @@ describe('AsyncFiltersUtils', () => {
 
   describe('renderFilters', () => {
     it('should get the render data for the filters page', async () => {
-      const filterRenderData = <RenderFiltersReturnValue>(
-        await AsyncFiltersUtils.default.renderFilters(mockReport.variant.specification.fields)
-      )
+      const fields = mockReport.variant?.specification?.fields || []
+      const filterRenderData = <RenderFiltersReturnValue>await AsyncFiltersUtils.default.renderFilters(fields)
       expect(filterRenderData.filters).toEqual(MockRenderFiltersData.filters)
       expect(filterRenderData.sortBy).toEqual(MockRenderFiltersData.sortBy)
     })
@@ -53,17 +53,17 @@ describe('AsyncFiltersUtils', () => {
     })
 
     it('should set the start and end date using a relative duration - Next week', () => {
-      const result = AsyncFiltersUtils.setDurationStartAndEnd(params.name, 'next-week', {}, {}, [], params.fields)
+      const result = AsyncFiltersUtils.setDurationStartAndEnd(params.name, 'next-seven-days', {}, {}, [], params.fields)
 
       const expectedResult = {
         querySummary: [
           {
             name: 'Duration Field name',
-            value: 'Next week (2024-06-06 - 2024-06-13)',
+            value: 'Next seven days (2024-06-06 - 2024-06-13)',
           },
         ],
         filterData: {
-          'filters.DurationFieldName.relative-duration': 'next-week',
+          'filters.DurationFieldName.relative-duration': 'next-seven-days',
         },
         query: {
           'filters.DurationFieldName.end': '2024-06-13',
@@ -75,16 +75,16 @@ describe('AsyncFiltersUtils', () => {
     })
 
     it('should set the start and end date using a relative duration - Last week', () => {
-      const result = AsyncFiltersUtils.setDurationStartAndEnd(params.name, 'last-week', {}, {}, [], params.fields)
+      const result = AsyncFiltersUtils.setDurationStartAndEnd(params.name, 'last-seven-days', {}, {}, [], params.fields)
 
       const expectedResult = {
         querySummary: [
           {
             name: 'Duration Field name',
-            value: 'Last week (2024-05-30 - 2024-06-06)',
+            value: 'Last seven days (2024-05-30 - 2024-06-06)',
           },
         ],
-        filterData: { 'filters.DurationFieldName.relative-duration': 'last-week' },
+        filterData: { 'filters.DurationFieldName.relative-duration': 'last-seven-days' },
         query: {
           'filters.DurationFieldName.end': '2024-06-06',
           'filters.DurationFieldName.start': '2024-05-30',

package/dpr/components/_async/async-filters-form/utils.ts

@@ -65,7 +65,7 @@ export const setDurationStartAndEnd = (
 
   filterData[name as keyof Dict<string>] = value
 
-  let queryValue = `${value.charAt(0).toUpperCase() + value.slice(1).replace('-', ' ')}`
+  let queryValue = `${value.charAt(0).toUpperCase() + value.slice(1).replaceAll('-', ' ')}`
   queryValue = `${queryValue} (${startDateDisplayString} - ${endDateDisplayString})`
   querySummary.push({
     name: field ? `${field.display}` : name,

package/dpr/components/_async/async-filters-form/view.njk

@@ -14,6 +14,7 @@
   {% set endpoint = args.endpoint %}
   {% set type = args.type %}
   {% set interactive = args.interactive %}
+  {% set saveDefaultsEnabled = args.saveDefaultsEnabled %}
 
   {% set reportId = data.reportId %}
   {% set id = data.id %}
@@ -84,9 +85,11 @@
               {{ dprSelectedFilters() }}
             </div>
 
-            <div class='dpr-request-save-filters-container'>
-              {{ dprFiltersSaveDefaults('async-filters-form', './filters', hasDefaults, defaultsSaved) }}
-            </div>
+            {% if saveDefaultsEnabled %}
+              <div class='dpr-request-save-filters-container'>
+                {{ dprFiltersSaveDefaults('async-filters-form', './filters', hasDefaults, defaultsSaved) }}
+              </div>
+            {% endif %}
 
             <div class="filter-container">
               {%- for filter in filters %}

package/dpr/components/_catalogue/catalogue/types.js

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

package/dpr/components/_catalogue/catalogue/types.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../src/dpr/components/_catalogue/catalogue/types.ts"],
   "sourcesContent": ["export interface CatalogueFeatures {\n  filteringEnabled?: boolean\n  unauthorisedToggleEnabled?: boolean\n  howToUseEnabled?: boolean\n  bookmarkingEnabled?: boolean\n}\n"],
-  "mappings": "kWAAA,IAAAA,EAAA,kBAAAC,EAAAD",
+  "mappings": "+WAAA,IAAAA,EAAA,kBAAAC,EAAAD",
   "names": ["types_exports", "__toCommonJS"]
 }

package/dpr/components/_catalogue/catalogue/utils.js

@@ -1,2 +1,2 @@
-var f=Object.create;var i=Object.defineProperty;var k=Object.getOwnPropertyDescriptor;var h=Object.getOwnPropertyNames;var S=Object.getPrototypeOf,T=Object.prototype.hasOwnProperty;var w=(o,e)=>{for(var t in e)i(o,t,{get:e[t],enumerable:!0})},s=(o,e,t,l)=>{if(e&&typeof e=="object"||typeof e=="function")for(let n of h(e))!T.call(o,n)&&n!==t&&i(o,n,{get:()=>e[n],enumerable:!(l=k(e,n))||l.enumerable});return o};var g=(o,e,t)=>(t=o!=null?f(S(o)):{},s(e||!o||!o.__esModule?i(t,"default",{value:o,enumerable:!0}):t,o)),v=o=>s(i({},"__esModule",{value:!0}),o);var U={};w(U,{default:()=>P,init:()=>m});module.exports=v(U);var b=g(require("../catalogue-list/utils")),p=g(require("../../../utils/localsHelper"));const m=async({features:o,res:e,services:t})=>{const l=await b.default.getReportsList(e,t,o),{token:n,bookmarkingEnabled:E,dprUser:d,csrfToken:C}=p.default.getValues(e),a=(await t.productCollectionService.getProductCollections(n))?.map(u=>({value:u.id,text:u.name}));a&&a.length>0&&a.unshift({value:"RESET",text:"Full catalogue"});const r=await t.productCollectionStoreService.getSelectedProductCollectionId(d.id),c=r&&await t.productCollectionService.getProductCollection(d.id,r);return{data:{...l,csrfToken:C},productCollectionInfo:{productCollections:a,...c&&{selectedProductCollection:c}},features:F(E,o)}},F=(o,e)=>({filteringEnabled:e?.filteringEnabled===void 0||e.filteringEnabled,unauthorisedToggleEnabled:e?.unauthorisedToggleEnabled===void 0||e.unauthorisedToggleEnabled,howToUseEnabled:e?.howToUseEnabled===void 0||e.howToUseEnabled,bookmarkingEnabled:e?.bookmarkingEnabled!==void 0?e.bookmarkingEnabled:o});var P={init:m};0&&(module.exports={init});
+"use strict";var E=Object.create;var i=Object.defineProperty;var h=Object.getOwnPropertyDescriptor;var S=Object.getOwnPropertyNames;var T=Object.getPrototypeOf,w=Object.prototype.hasOwnProperty;var v=(o,e)=>{for(var t in e)i(o,t,{get:e[t],enumerable:!0})},u=(o,e,t,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let l of S(e))!w.call(o,l)&&l!==t&&i(o,l,{get:()=>e[l],enumerable:!(n=h(e,l))||n.enumerable});return o};var s=(o,e,t)=>(t=o!=null?E(T(o)):{},u(e||!o||!o.__esModule?i(t,"default",{value:o,enumerable:!0}):t,o)),F=o=>u(i({},"__esModule",{value:!0}),o);var k={};v(k,{default:()=>U,init:()=>C});module.exports=F(k);var g=s(require("../catalogue-list/utils")),p=s(require("../../../utils/localsHelper"));const C=async({features:o,res:e,services:t})=>{const n=await g.default.getReportsList(e,t,o),{token:l,bookmarkingEnabled:m,dprUser:b,csrfToken:f}=p.default.getValues(e),a=(await t.productCollectionService.getProductCollections(l))?.map(c=>({value:c.id,text:c.name}));a&&a.length>0&&a.unshift({value:"RESET",text:"Full catalogue"});const r=await t.productCollectionStoreService.getSelectedProductCollectionId(b.id),d=r&&await t.productCollectionService.getProductCollection(l,r);return{data:{...n,csrfToken:f},productCollectionInfo:{productCollections:a,...d&&{selectedProductCollection:d}},features:P(m,o)}},P=(o,e)=>({bookmarkingEnabled:o,filteringEnabled:e?.filteringEnabled===void 0||e.filteringEnabled,unauthorisedToggleEnabled:e?.unauthorisedToggleEnabled===void 0||e.unauthorisedToggleEnabled,howToUseEnabled:e?.howToUseEnabled===void 0||e.howToUseEnabled});var U={init:C};0&&(module.exports={init});
 //# sourceMappingURL=utils.js.map

package/dpr/components/_catalogue/catalogue/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/components/_catalogue/catalogue/utils.ts"],
-  "sourcesContent": ["import { Response } from 'express'\nimport CatalogueListUtils from '../catalogue-list/utils'\nimport { Services } from '../../../types/Services'\nimport LocalsHelper from '../../../utils/localsHelper'\nimport { CatalogueFeatures } from './types'\n\nexport const init = async ({\n  features,\n  res,\n  services,\n}: {\n  features?: CatalogueFeatures\n  res: Response\n  services: Services\n}) => {\n  const data = await CatalogueListUtils.getReportsList(res, services, features)\n  const { token, bookmarkingEnabled, dprUser, csrfToken } = LocalsHelper.getValues(res)\n  const productCollections = (await services.productCollectionService.getProductCollections(token))?.map(\n    (collection) => ({\n      value: collection.id,\n      text: collection.name,\n    }),\n  )\n  if (productCollections && productCollections.length > 0) {\n    productCollections.unshift({ value: 'RESET', text: 'Full catalogue' })\n  }\n  const selectedProductCollectionId = await services.productCollectionStoreService.getSelectedProductCollectionId(\n    dprUser.id,\n  )\n  const selectedProductCollection =\n    selectedProductCollectionId &&\n    (await services.productCollectionService.getProductCollection(dprUser.id, selectedProductCollectionId))\n  return {\n    data: {\n      ...data,\n      csrfToken,\n    },\n    productCollectionInfo: {\n      productCollections,\n      ...(selectedProductCollection && { selectedProductCollection }),\n    },\n    features: setFeatures(bookmarkingEnabled, features),\n  }\n}\n\nconst setFeatures = (bookmarkingEnabled: boolean, features?: CatalogueFeatures) => {\n  return {\n    filteringEnabled: features?.filteringEnabled === undefined || features.filteringEnabled,\n    unauthorisedToggleEnabled: features?.unauthorisedToggleEnabled === undefined || features.unauthorisedToggleEnabled,\n    howToUseEnabled: features?.howToUseEnabled === undefined || features.howToUseEnabled,\n    bookmarkingEnabled: features?.bookmarkingEnabled !== undefined ? features.bookmarkingEnabled : bookmarkingEnabled,\n  }\n}\n\nexport default {\n  init,\n}\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,SAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAA+B,sCAE/BC,EAAyB,0CAGlB,MAAMH,EAAO,MAAO,CACzB,SAAAI,EACA,IAAAC,EACA,SAAAC,CACF,IAIM,CACJ,MAAMC,EAAO,MAAM,EAAAC,QAAmB,eAAeH,EAAKC,EAAUF,CAAQ,EACtE,CAAE,MAAAK,EAAO,mBAAAC,EAAoB,QAAAC,EAAS,UAAAC,CAAU,EAAI,EAAAC,QAAa,UAAUR,CAAG,EAC9ES,GAAsB,MAAMR,EAAS,yBAAyB,sBAAsBG,CAAK,IAAI,IAChGM,IAAgB,CACf,MAAOA,EAAW,GAClB,KAAMA,EAAW,IACnB,EACF,EACID,GAAsBA,EAAmB,OAAS,GACpDA,EAAmB,QAAQ,CAAE,MAAO,QAAS,KAAM,gBAAiB,CAAC,EAEvE,MAAME,EAA8B,MAAMV,EAAS,8BAA8B,+BAC/EK,EAAQ,EACV,EACMM,EACJD,GACC,MAAMV,EAAS,yBAAyB,qBAAqBK,EAAQ,GAAIK,CAA2B,EACvG,MAAO,CACL,KAAM,CACJ,GAAGT,EACH,UAAAK,CACF,EACA,sBAAuB,CACrB,mBAAAE,EACA,GAAIG,GAA6B,CAAE,0BAAAA,CAA0B,CAC/D,EACA,SAAUC,EAAYR,EAAoBN,CAAQ,CACpD,CACF,EAEMc,EAAc,CAACR,EAA6BN,KACzC,CACL,iBAAkBA,GAAU,mBAAqB,QAAaA,EAAS,iBACvE,0BAA2BA,GAAU,4BAA8B,QAAaA,EAAS,0BACzF,gBAAiBA,GAAU,kBAAoB,QAAaA,EAAS,gBACrE,mBAAoBA,GAAU,qBAAuB,OAAYA,EAAS,mBAAqBM,CACjG,GAGF,IAAOX,EAAQ,CACb,KAAAC,CACF",
+  "sourcesContent": ["import { Response } from 'express'\nimport CatalogueListUtils from '../catalogue-list/utils'\nimport { Services } from '../../../types/Services'\nimport LocalsHelper from '../../../utils/localsHelper'\nimport { CatalogueFeatures } from './types'\n\nexport const init = async ({\n  features,\n  res,\n  services,\n}: {\n  features?: CatalogueFeatures\n  res: Response\n  services: Services\n}) => {\n  const data = await CatalogueListUtils.getReportsList(res, services, features)\n  const { token, bookmarkingEnabled, dprUser, csrfToken } = LocalsHelper.getValues(res)\n  const productCollections = (await services.productCollectionService.getProductCollections(token))?.map(\n    (collection) => ({\n      value: collection.id,\n      text: collection.name,\n    }),\n  )\n  if (productCollections && productCollections.length > 0) {\n    productCollections.unshift({ value: 'RESET', text: 'Full catalogue' })\n  }\n  const selectedProductCollectionId = await services.productCollectionStoreService.getSelectedProductCollectionId(\n    dprUser.id,\n  )\n  const selectedProductCollection =\n    selectedProductCollectionId &&\n    (await services.productCollectionService.getProductCollection(token, selectedProductCollectionId))\n  return {\n    data: {\n      ...data,\n      csrfToken,\n    },\n    productCollectionInfo: {\n      productCollections,\n      ...(selectedProductCollection && { selectedProductCollection }),\n    },\n    features: setFeatures(bookmarkingEnabled, features),\n  }\n}\n\nconst setFeatures = (bookmarkingEnabled: boolean, features?: CatalogueFeatures) => {\n  return {\n    bookmarkingEnabled,\n    filteringEnabled: features?.filteringEnabled === undefined || features.filteringEnabled,\n    unauthorisedToggleEnabled: features?.unauthorisedToggleEnabled === undefined || features.unauthorisedToggleEnabled,\n    howToUseEnabled: features?.howToUseEnabled === undefined || features.howToUseEnabled,\n  }\n}\n\nexport default {\n  init,\n}\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,SAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAA+B,sCAE/BC,EAAyB,0CAGlB,MAAMH,EAAO,MAAO,CACzB,SAAAI,EACA,IAAAC,EACA,SAAAC,CACF,IAIM,CACJ,MAAMC,EAAO,MAAM,EAAAC,QAAmB,eAAeH,EAAKC,EAAUF,CAAQ,EACtE,CAAE,MAAAK,EAAO,mBAAAC,EAAoB,QAAAC,EAAS,UAAAC,CAAU,EAAI,EAAAC,QAAa,UAAUR,CAAG,EAC9ES,GAAsB,MAAMR,EAAS,yBAAyB,sBAAsBG,CAAK,IAAI,IAChGM,IAAgB,CACf,MAAOA,EAAW,GAClB,KAAMA,EAAW,IACnB,EACF,EACID,GAAsBA,EAAmB,OAAS,GACpDA,EAAmB,QAAQ,CAAE,MAAO,QAAS,KAAM,gBAAiB,CAAC,EAEvE,MAAME,EAA8B,MAAMV,EAAS,8BAA8B,+BAC/EK,EAAQ,EACV,EACMM,EACJD,GACC,MAAMV,EAAS,yBAAyB,qBAAqBG,EAAOO,CAA2B,EAClG,MAAO,CACL,KAAM,CACJ,GAAGT,EACH,UAAAK,CACF,EACA,sBAAuB,CACrB,mBAAAE,EACA,GAAIG,GAA6B,CAAE,0BAAAA,CAA0B,CAC/D,EACA,SAAUC,EAAYR,EAAoBN,CAAQ,CACpD,CACF,EAEMc,EAAc,CAACR,EAA6BN,KACzC,CACL,mBAAAM,EACA,iBAAkBN,GAAU,mBAAqB,QAAaA,EAAS,iBACvE,0BAA2BA,GAAU,4BAA8B,QAAaA,EAAS,0BACzF,gBAAiBA,GAAU,kBAAoB,QAAaA,EAAS,eACvE,GAGF,IAAOL,EAAQ,CACb,KAAAC,CACF",
   "names": ["utils_exports", "__export", "utils_default", "init", "__toCommonJS", "import_utils", "import_localsHelper", "features", "res", "services", "data", "CatalogueListUtils", "token", "bookmarkingEnabled", "dprUser", "csrfToken", "LocalsHelper", "productCollections", "collection", "selectedProductCollectionId", "selectedProductCollection", "setFeatures"]
 }

package/dpr/components/_catalogue/catalogue/utils.test.ts

@@ -1,3 +1,4 @@
+import { expect, jest } from '@jest/globals'
 import { Response } from 'express'
 import CatalogueUtils from './utils'
 import CatalogueListUtils from '../catalogue-list/utils'
@@ -7,6 +8,7 @@ describe('CatalogueUtils', () => {
   jest.spyOn(CatalogueListUtils, 'getReportsList').mockResolvedValue({
     head: [],
     rows: [],
+    id: 'id',
   })
 
   describe('init', () => {
@@ -19,6 +21,7 @@ describe('CatalogueUtils', () => {
           dprUser: {
             token: 'T0k3n',
           },
+          bookmarkingEnabled: false,
         },
       } as unknown as Response
 
@@ -37,9 +40,9 @@ describe('CatalogueUtils', () => {
       const result = await CatalogueUtils.init({ features: {}, res, services })
 
       expect(result).toEqual({
-        data: { head: [], rows: [], csrfToken: 'csrfToken' },
+        data: { head: [], rows: [], csrfToken: 'csrfToken', id: 'id' },
         features: {
-          bookmarkingEnabled: undefined,
+          bookmarkingEnabled: false,
           filteringEnabled: true,
           howToUseEnabled: true,
           unauthorisedToggleEnabled: true,
@@ -62,7 +65,7 @@ describe('CatalogueUtils', () => {
       })
 
       expect(result).toEqual({
-        data: { head: [], rows: [], csrfToken: 'csrfToken' },
+        data: { head: [], rows: [], csrfToken: 'csrfToken', id: 'id' },
         features: {
           bookmarkingEnabled: false,
           filteringEnabled: false,

package/dpr/components/_catalogue/catalogue/utils.ts

@@ -29,7 +29,7 @@ export const init = async ({
   )
   const selectedProductCollection =
     selectedProductCollectionId &&
-    (await services.productCollectionService.getProductCollection(dprUser.id, selectedProductCollectionId))
+    (await services.productCollectionService.getProductCollection(token, selectedProductCollectionId))
   return {
     data: {
       ...data,
@@ -45,10 +45,10 @@ export const init = async ({
 
 const setFeatures = (bookmarkingEnabled: boolean, features?: CatalogueFeatures) => {
   return {
+    bookmarkingEnabled,
     filteringEnabled: features?.filteringEnabled === undefined || features.filteringEnabled,
     unauthorisedToggleEnabled: features?.unauthorisedToggleEnabled === undefined || features.unauthorisedToggleEnabled,
     howToUseEnabled: features?.howToUseEnabled === undefined || features.howToUseEnabled,
-    bookmarkingEnabled: features?.bookmarkingEnabled !== undefined ? features.bookmarkingEnabled : bookmarkingEnabled,
   }
 }
 

package/dpr/components/_catalogue/catalogue-list/utils.js

@@ -1,2 +1,2 @@
-var P=Object.create;var b=Object.defineProperty;var B=Object.getOwnPropertyDescriptor;var E=Object.getOwnPropertyNames;var V=Object.getPrototypeOf,F=Object.prototype.hasOwnProperty;var O=(e,t)=>{for(var o in t)b(e,o,{get:t[o],enumerable:!0})},R=(e,t,o,D)=>{if(t&&typeof t=="object"||typeof t=="function")for(let n of E(t))!F.call(e,n)&&n!==o&&b(e,n,{get:()=>t[n],enumerable:!(D=B(t,n))||D.enumerable});return e};var M=(e,t,o)=>(o=e!=null?P(V(e)):{},R(t||!e||!e.__esModule?b(o,"default",{value:e,enumerable:!0}):o,e)),U=e=>R(b({},"__esModule",{value:!0}),e);var $={};O($,{default:()=>Y,getReportsList:()=>A});module.exports=U($);var d=require("../../../types/UserReports"),w=M(require("../../show-more/utils")),l=require("../../../utils/reportListsHelper"),x=M(require("../../../utils/localsHelper"));const A=async(e,t,o)=>{const{definitions:D,csrfToken:n,bookmarkingEnabled:H,dprUser:v}=x.default.getValues(e),C=D.sort((a,i)=>a.name<i.name?-1:a.name>i.name?1:0).flatMap(a=>{const{id:i,name:g,description:m,variants:S,dashboards:f,authorised:k}=a,p=S.map(r=>{const{id:s,name:u,description:c,isMissing:T}=r,N=r.loadType||d.LoadType.ASYNC;return{reportName:g,reportId:i,id:s,name:u,description:c,type:d.ReportType.REPORT,loadType:N,authorised:k,isMissing:T,...m&&m.length&&{reportDescription:m}}});let h=[];f&&(h=f.map(r=>{const{id:s,name:u,description:c}=r;return{reportName:g,reportId:i,id:s,name:u,description:c,type:d.ReportType.DASHBOARD,reportDescription:m,authorised:k,isMissing:!1,loadType:d.LoadType.ASYNC}}));const y=[...h,...p];return y.sort((r,s)=>r.name<s.name?-1:r.name>s.name?1:0),y}),I=await t.bookmarkService.getState(v.id),L=await Promise.all(C.map(async a=>{const{id:i,name:g,description:m,reportName:S,reportId:f,reportDescription:k,type:p,loadType:h,authorised:y,isMissing:r}=a,s=m||k||"",u=(0,l.setInitialHref)(h,p,f,i,e,r);let c;return(o?.bookmarkingEnabled!==void 0?o?.bookmarkingEnabled:H)&&(c=await t.bookmarkService.createBookMarkToggleHtml({userConfig:I,reportId:f,id:i,csrfToken:n,ctxId:"reports-list",reportType:p,isMissing:r})),[{html:`<p class="govuk-body-s">${S}</p>`},{html:(0,l.createListItemProductMin)(g,p)},{html:w.default.createShowMoreHtml(s)},{html:(0,l.createListActions)(u,p,h,c,y,r)}]}));return{head:[{text:"Product",classes:"dpr-product-head"},{text:"Name",classes:"dpr-name-head"},{text:"Description",classes:"dpr-description-head"},{text:"Actions",classes:"dpr-bookmark-head"}],rows:L,id:"dpr-reports-catalogue"}};var Y={getReportsList:A};0&&(module.exports={getReportsList});
+"use strict";var N=Object.create;var b=Object.defineProperty;var P=Object.getOwnPropertyDescriptor;var E=Object.getOwnPropertyNames;var V=Object.getPrototypeOf,F=Object.prototype.hasOwnProperty;var O=(e,t)=>{for(var o in t)b(e,o,{get:t[o],enumerable:!0})},M=(e,t,o,D)=>{if(t&&typeof t=="object"||typeof t=="function")for(let n of E(t))!F.call(e,n)&&n!==o&&b(e,n,{get:()=>t[n],enumerable:!(D=P(t,n))||D.enumerable});return e};var R=(e,t,o)=>(o=e!=null?N(V(e)):{},M(t||!e||!e.__esModule?b(o,"default",{value:e,enumerable:!0}):o,e)),U=e=>M(b({},"__esModule",{value:!0}),e);var $={};O($,{default:()=>Y,getReportsList:()=>A});module.exports=U($);var d=require("../../../types/UserReports"),w=R(require("../../show-more/utils")),l=require("../../../utils/reportListsHelper"),x=R(require("../../../utils/localsHelper"));const A=async(e,t,o)=>{const{definitions:D,csrfToken:n,bookmarkingEnabled:H,dprUser:L}=x.default.getValues(e),v=D.sort((a,i)=>a.name<i.name?-1:a.name>i.name?1:0).flatMap(a=>{const{id:i,name:g,description:m,variants:T,dashboards:f,authorised:y}=a,p=T.map(r=>{const{id:s,name:u,description:c,isMissing:S}=r,I=r.loadType||d.LoadType.ASYNC;return{reportName:g,reportId:i,id:s,name:u,description:c||"",type:d.ReportType.REPORT,loadType:I,authorised:y,isMissing:S,...m&&m.length&&{reportDescription:m}}});let h=[];f&&(h=f.map(r=>{const{id:s,name:u,description:c}=r;return{reportName:g,reportId:i,id:s,name:u,description:c||"",type:d.ReportType.DASHBOARD,reportDescription:m||"",authorised:y,isMissing:!1,loadType:d.LoadType.ASYNC}}));const k=[...h,...p];return k.sort((r,s)=>r.name<s.name?-1:r.name>s.name?1:0),k}),B=await t.bookmarkService.getState(L.id),C=await Promise.all(v.map(async a=>{const{id:i,name:g,description:m,reportName:T,reportId:f,reportDescription:y,type:p,loadType:h,authorised:k,isMissing:r}=a,s=m||y||"",u=(0,l.setInitialHref)(h,p,f,i,e,r);let c;return(o?.bookmarkingEnabled!==void 0?o?.bookmarkingEnabled:H)&&(c=await t.bookmarkService.createBookMarkToggleHtml({userConfig:B,reportId:f,id:i,csrfToken:n,ctxId:"reports-list",reportType:p,isMissing:!!r})),[{html:`<p class="govuk-body-s">${T}</p>`},{html:(0,l.createListItemProductMin)(g,p)},{html:w.default.createShowMoreHtml(s)},{html:(0,l.createListActions)(u,p,h,c,k,r)}]}));return{head:[{text:"Product",classes:"dpr-product-head"},{text:"Name",classes:"dpr-name-head"},{text:"Description",classes:"dpr-description-head"},{text:"Actions",classes:"dpr-bookmark-head"}],rows:C,id:"dpr-reports-catalogue"}};var Y={getReportsList:A};0&&(module.exports={getReportsList});
 //# sourceMappingURL=utils.js.map

package/dpr/components/_catalogue/catalogue-list/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/components/_catalogue/catalogue-list/utils.ts"],
-  "sourcesContent": ["import { Response } from 'express'\nimport { components } from '../../../types/api'\nimport { Services } from '../../../types/Services'\nimport { DefinitionData, LoadType, ReportType } from '../../../types/UserReports'\nimport ShowMoreUtils from '../../show-more/utils'\nimport { createListItemProductMin, createListActions, setInitialHref } from '../../../utils/reportListsHelper'\nimport { CatalogueFeatures } from '../catalogue/types'\nimport LocalsHelper from '../../../utils/localsHelper'\n\nexport const getReportsList = async (\n  res: Response,\n  services: Services,\n  features?: CatalogueFeatures,\n): Promise<{ head: { text: string }[]; rows: { text?: string; html?: string }[]; id: string }> => {\n  const { definitions, csrfToken, bookmarkingEnabled, dprUser } = LocalsHelper.getValues(res)\n\n  // Sort report Definitions by product name\n  const sortedDefinitions = definitions.sort(\n    (a: components['schemas']['ReportDefinitionSummary'], b: components['schemas']['ReportDefinitionSummary']) => {\n      if (a.name < b.name) return -1\n      if (a.name > b.name) return 1\n      return 0\n    },\n  )\n\n  // Sort by variant/dashboard name\n  const sortedVariants = sortedDefinitions.flatMap(\n    (\n      def: components['schemas']['ReportDefinitionSummary'] & {\n        dashboards: components['schemas']['DashboardDefinition'][]\n        authorised: boolean\n      },\n    ) => {\n      const { id: reportId, name: reportName, description: reportDescription, variants, dashboards, authorised } = def\n\n      const variantsArray: DefinitionData[] = variants.map(\n        (variant: components['schemas']['VariantDefinitionSummary']) => {\n          const { id, name, description, isMissing } = variant\n\n          // NOTE: loadType added to VariantDefinitionSummary mocked data to dictate the load/request journey. Not present in API response. To discuss\n          const loadType = variant.loadType || LoadType.ASYNC\n\n          return {\n            reportName,\n            reportId,\n            id,\n            name,\n            description,\n            type: ReportType.REPORT,\n            loadType,\n            authorised,\n            isMissing,\n            ...(reportDescription && reportDescription.length && { reportDescription }),\n          }\n        },\n      )\n\n      let dashboardsArray: DefinitionData[] = []\n      if (dashboards) {\n        dashboardsArray = dashboards.map((dashboard: components['schemas']['DashboardDefinition']) => {\n          const { id, name, description } = dashboard\n          return {\n            reportName,\n            reportId,\n            id,\n            name,\n            description,\n            type: ReportType.DASHBOARD,\n            reportDescription,\n            authorised,\n            isMissing: false,\n            loadType: LoadType.ASYNC,\n          }\n        })\n      }\n\n      const mergedArray = [...dashboardsArray, ...variantsArray]\n\n      mergedArray.sort((a: DefinitionData, b: DefinitionData) => {\n        if (a.name < b.name) return -1\n        if (a.name > b.name) return 1\n        return 0\n      })\n\n      return mergedArray\n    },\n  )\n\n  const userConfig = await services.bookmarkService.getState(dprUser.id)\n  const rows = await Promise.all(\n    sortedVariants.map(async (v: DefinitionData) => {\n      const { id, name, description, reportName, reportId, reportDescription, type, loadType, authorised, isMissing } =\n        v\n      const desc = description || reportDescription || ''\n\n      const href = setInitialHref(loadType, type, reportId, id, res, isMissing)\n\n      let bookmarkHtml\n      const showBookMarkToggle =\n        features?.bookmarkingEnabled !== undefined ? features?.bookmarkingEnabled : bookmarkingEnabled\n\n      if (showBookMarkToggle) {\n        bookmarkHtml = await services.bookmarkService.createBookMarkToggleHtml({\n          userConfig,\n          reportId,\n          id,\n          csrfToken,\n          ctxId: 'reports-list',\n          reportType: type,\n          isMissing,\n        })\n      }\n\n      return [\n        { html: `<p class=\"govuk-body-s\">${reportName}</p>` },\n        { html: createListItemProductMin(name, <ReportType>type) },\n        { html: ShowMoreUtils.createShowMoreHtml(desc) },\n        { html: createListActions(href, type, loadType, bookmarkHtml, authorised, isMissing) },\n      ]\n    }),\n  )\n\n  const head = [\n    { text: 'Product', classes: 'dpr-product-head' },\n    { text: 'Name', classes: 'dpr-name-head' },\n    { text: 'Description', classes: 'dpr-description-head' },\n    { text: 'Actions', classes: 'dpr-bookmark-head' },\n  ]\n\n  return {\n    head,\n    rows,\n    id: 'dpr-reports-catalogue',\n  }\n}\n\nexport default {\n  getReportsList,\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { Response } from 'express'\nimport { components } from '../../../types/api'\nimport { Services } from '../../../types/Services'\nimport { DefinitionData, LoadType, ReportType } from '../../../types/UserReports'\nimport ShowMoreUtils from '../../show-more/utils'\nimport { createListItemProductMin, createListActions, setInitialHref } from '../../../utils/reportListsHelper'\nimport { CatalogueFeatures } from '../catalogue/types'\nimport LocalsHelper from '../../../utils/localsHelper'\n\nexport const getReportsList = async (\n  res: Response,\n  services: Services,\n  features?: CatalogueFeatures,\n): Promise<{ head: { text: string }[]; rows: { text?: string; html?: string }[]; id: string }> => {\n  const { definitions, csrfToken, bookmarkingEnabled, dprUser } = LocalsHelper.getValues(res)\n\n  // Sort report Definitions by product name\n  const sortedDefinitions = definitions.sort(\n    (a: components['schemas']['ReportDefinitionSummary'], b: components['schemas']['ReportDefinitionSummary']) => {\n      if (a.name < b.name) return -1\n      if (a.name > b.name) return 1\n      return 0\n    },\n  )\n\n  // Sort by variant/dashboard name\n  const sortedVariants = sortedDefinitions.flatMap(\n    (\n      def: components['schemas']['ReportDefinitionSummary'] & {\n        dashboards: components['schemas']['DashboardDefinition'][]\n        authorised: boolean\n      },\n    ) => {\n      const { id: reportId, name: reportName, description: reportDescription, variants, dashboards, authorised } = def\n\n      const variantsArray: DefinitionData[] = variants.map(\n        (variant: components['schemas']['VariantDefinitionSummary']) => {\n          const { id, name, description, isMissing } = variant\n\n          // NOTE: loadType added to VariantDefinitionSummary mocked data to dictate the load/request journey. Not present in API response. To discuss\n          const loadType = variant.loadType || LoadType.ASYNC\n\n          return {\n            reportName,\n            reportId,\n            id,\n            name,\n            description: description || '',\n            type: ReportType.REPORT,\n            loadType: loadType as LoadType,\n            authorised,\n            isMissing,\n            ...(reportDescription && reportDescription.length && { reportDescription }),\n          }\n        },\n      )\n\n      let dashboardsArray: DefinitionData[] = []\n      if (dashboards) {\n        dashboardsArray = dashboards.map((dashboard: components['schemas']['DashboardDefinition']) => {\n          const { id, name, description } = dashboard\n          return {\n            reportName,\n            reportId,\n            id,\n            name,\n            description: description || '',\n            type: ReportType.DASHBOARD,\n            reportDescription: reportDescription || '',\n            authorised,\n            isMissing: false,\n            loadType: LoadType.ASYNC,\n          }\n        })\n      }\n\n      const mergedArray = [...dashboardsArray, ...variantsArray]\n\n      mergedArray.sort((a: DefinitionData, b: DefinitionData) => {\n        if (a.name < b.name) return -1\n        if (a.name > b.name) return 1\n        return 0\n      })\n\n      return mergedArray\n    },\n  )\n\n  const userConfig = await services.bookmarkService.getState(dprUser.id)\n  const rows = await Promise.all(\n    sortedVariants.map(async (v: DefinitionData) => {\n      const { id, name, description, reportName, reportId, reportDescription, type, loadType, authorised, isMissing } =\n        v\n      const desc = description || reportDescription || ''\n\n      const href = setInitialHref(loadType, type, reportId, id, res, isMissing)\n\n      let bookmarkHtml\n      const showBookMarkToggle =\n        features?.bookmarkingEnabled !== undefined ? features?.bookmarkingEnabled : bookmarkingEnabled\n\n      if (showBookMarkToggle) {\n        bookmarkHtml = await services.bookmarkService.createBookMarkToggleHtml({\n          userConfig,\n          reportId,\n          id,\n          csrfToken,\n          ctxId: 'reports-list',\n          reportType: type,\n          isMissing: Boolean(isMissing),\n        })\n      }\n\n      return [\n        { html: `<p class=\"govuk-body-s\">${reportName}</p>` },\n        { html: createListItemProductMin(name, <ReportType>type) },\n        { html: ShowMoreUtils.createShowMoreHtml(desc) },\n        { html: createListActions(href, type, loadType, bookmarkHtml, authorised, isMissing) },\n      ]\n    }),\n  )\n\n  const head = [\n    { text: 'Product', classes: 'dpr-product-head' },\n    { text: 'Name', classes: 'dpr-name-head' },\n    { text: 'Description', classes: 'dpr-description-head' },\n    { text: 'Actions', classes: 'dpr-bookmark-head' },\n  ]\n\n  return {\n    head,\n    rows,\n    id: 'dpr-reports-catalogue',\n  }\n}\n\nexport default {\n  getReportsList,\n}\n"],
+  "mappings": "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",
   "names": ["utils_exports", "__export", "utils_default", "getReportsList", "__toCommonJS", "import_UserReports", "import_utils", "import_reportListsHelper", "import_localsHelper", "res", "services", "features", "definitions", "csrfToken", "bookmarkingEnabled", "dprUser", "LocalsHelper", "sortedVariants", "b", "def", "reportId", "reportName", "reportDescription", "variants", "dashboards", "authorised", "variantsArray", "variant", "id", "name", "description", "isMissing", "loadType", "dashboardsArray", "dashboard", "mergedArray", "a", "userConfig", "rows", "v", "type", "desc", "href", "bookmarkHtml", "ShowMoreUtils"]
 }

package/dpr/components/_catalogue/catalogue-list/utils.test.ts

@@ -1,3 +1,4 @@
+import { expect, jest } from '@jest/globals'
 import { Response } from 'express'
 import CatalogueUtils from './utils'
 import { Services } from '../../../types/Services'

package/dpr/components/_catalogue/catalogue-list/utils.ts

@@ -45,9 +45,9 @@ export const getReportsList = async (
             reportId,
             id,
             name,
-            description,
+            description: description || '',
             type: ReportType.REPORT,
-            loadType,
+            loadType: loadType as LoadType,
             authorised,
             isMissing,
             ...(reportDescription && reportDescription.length && { reportDescription }),
@@ -64,9 +64,9 @@ export const getReportsList = async (
             reportId,
             id,
             name,
-            description,
+            description: description || '',
             type: ReportType.DASHBOARD,
-            reportDescription,
+            reportDescription: reportDescription || '',
             authorised,
             isMissing: false,
             loadType: LoadType.ASYNC,
@@ -107,7 +107,7 @@ export const getReportsList = async (
           csrfToken,
           ctxId: 'reports-list',
           reportType: type,
-          isMissing,
+          isMissing: Boolean(isMissing),
         })
       }
 

package/dpr/components/_charts/chart/Buckets.js

@@ -1,2 +1,2 @@
-var h=Object.defineProperty;var p=Object.getOwnPropertyDescriptor;var k=Object.getOwnPropertyNames;var b=Object.prototype.hasOwnProperty;var m=(u,t)=>{for(var s in t)h(u,s,{get:t[s],enumerable:!0})},f=(u,t,s,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let e of k(t))!b.call(u,e)&&e!==s&&h(u,e,{get:()=>t[e],enumerable:!(i=p(t,e))||i.enumerable});return u};var C=u=>f(h({},"__esModule",{value:!0}),u);var g={};m(g,{Buckets:()=>c,default:()=>d});module.exports=C(g);var l=require("with-alpha-hex");class c{constructor(t,s,i,e,o){this.baseColour="#1d70b8";this.ragColours=["#00703c","#ffdd00","#d4351c"];this.buckets=[];this.useRagColour=!1;this.bucketCount=0;this.onlyBucketColoursDefined=!1;this.autoBucketing=!1;this.hasRagScore=!1;this.options={};this.initFromOptions=t=>{this.options=t.options||{},this.baseColour=this.options?.baseColour||this.baseColour,this.useRagColour=this.options?.useRagColour||!1,this.onlyBucketColoursDefined=this.options&&this.options.buckets?this.options?.buckets?.every(s=>!s.max&&!s.min&&s.hexColour!==void 0):!1};this.initBuckets=()=>{const{buckets:t}=this.options;this.setBucketCount(),this.initBucketColours(),t?this.hasRagScore?this.onlyBucketColoursDefined&&(this.buckets=t):!this.hasRagScore&&this.onlyBucketColoursDefined&&this.autoBucketing?this.initAutomaticThresholdBucket():this.initCustomThresholdBuckets():!t&&!this.hasRagScore&&this.autoBucketing&&this.initAutomaticThresholdBucket()};this.initCustomThresholdBuckets=()=>{this.buckets=this.options.buckets?this.options.buckets.map((t,s)=>({...this.buckets[s],...t})):[]};this.initAutomaticThresholdBucket=()=>{const{min:t,max:s,bucketSize:i}=this.setAutomaticThresholdSize();let e=0;this.buckets=this.buckets.map((o,a)=>{let r=t;return a!==0&&(r=e+1),e=i*(a+1)+t,a===this.buckets.length-1&&(e=s),{hexColour:this.options?.buckets?this.options.buckets[a]?.hexColour:o.hexColour,min:r,max:e}})};this.initBucketColours=()=>{if(this.useRagColour&&this.bucketCount===3)this.buckets=Array.from(new Array(this.bucketCount)).map((t,s)=>({hexColour:this.ragColours[s]}));else{const t=1/this.bucketCount;this.buckets=Array.from(new Array(this.bucketCount)).map((s,i)=>{const e=t*(i+1);return{hexColour:(0,l.withAlphaHex)(this.baseColour,e)}})}};this.setAutomaticThresholdSize=()=>{const t=this.responseData.map(o=>Number(o[this.valueKey].raw)),s=Math.min(...t),i=Math.max(...t),e=Math.ceil((i-s)/this.bucketCount);return{min:s,max:i,bucketSize:e}};this.setBucketCount=()=>{const{buckets:t}=this.options;if(this.hasRagScore)if(this.useRagColour)this.bucketCount=3;else{const s=this.responseData.reduce((i,e)=>(e[this.valueKey].rag!==void 0&&i.push(e[this.valueKey].rag),i),[]);this.bucketCount=Math.max(...s)+1}else t?this.bucketCount=t.length:this.bucketCount=3};this.getBucketForValue=(t,s)=>{let i="",e=0;return s!==void 0?{colour:this.buckets[s].hexColour||i,score:s}:(this.buckets.forEach((o,a)=>{const{min:r,max:n}=o;!r&&n&&t<=n&&(i=o.hexColour||i,e=a),r&&t>=r&&n&&t<=n&&(i=o.hexColour||i,e=a),r&&!n&&t>=r&&(i=o.hexColour||i,e=a)}),{colour:i,score:e})};this.getBuckets=()=>this.buckets;this.responseData=t,this.initFromOptions(s),this.valueKey=i,this.hasRagScore=t[0][this.valueKey].rag!==void 0,this.autoBucketing=!!e,o&&(this.ragColours=o),this.initBuckets()}}var d=c;0&&(module.exports={Buckets});
+"use strict";var h=Object.defineProperty;var p=Object.getOwnPropertyDescriptor;var k=Object.getOwnPropertyNames;var b=Object.prototype.hasOwnProperty;var m=(u,t)=>{for(var s in t)h(u,s,{get:t[s],enumerable:!0})},f=(u,t,s,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let e of k(t))!b.call(u,e)&&e!==s&&h(u,e,{get:()=>t[e],enumerable:!(i=p(t,e))||i.enumerable});return u};var C=u=>f(h({},"__esModule",{value:!0}),u);var g={};m(g,{Buckets:()=>c,default:()=>d});module.exports=C(g);var l=require("with-alpha-hex");class c{constructor(t,s,i,e,o){this.baseColour="#1d70b8";this.ragColours=["#00703c","#ffdd00","#d4351c"];this.buckets=[];this.useRagColour=!1;this.bucketCount=0;this.onlyBucketColoursDefined=!1;this.autoBucketing=!1;this.hasRagScore=!1;this.options={};this.initFromOptions=t=>{this.options=t.options||{},this.baseColour=this.options?.baseColour||this.baseColour,this.useRagColour=this.options?.useRagColour||!1,this.onlyBucketColoursDefined=this.options&&this.options.buckets?this.options?.buckets?.every(s=>!s.max&&!s.min&&s.hexColour!==void 0):!1};this.initBuckets=()=>{const{buckets:t}=this.options;this.setBucketCount(),this.initBucketColours(),t?this.hasRagScore?this.onlyBucketColoursDefined&&(this.buckets=t):!this.hasRagScore&&this.onlyBucketColoursDefined&&this.autoBucketing?this.initAutomaticThresholdBucket():this.initCustomThresholdBuckets():!t&&!this.hasRagScore&&this.autoBucketing&&this.initAutomaticThresholdBucket()};this.initCustomThresholdBuckets=()=>{this.buckets=this.options.buckets?this.options.buckets.map((t,s)=>({...this.buckets[s],...t})):[]};this.initAutomaticThresholdBucket=()=>{const{min:t,max:s,bucketSize:i}=this.setAutomaticThresholdSize();let e=0;this.buckets=this.buckets.map((o,a)=>{let r=t;return a!==0&&(r=e+1),e=i*(a+1)+t,a===this.buckets.length-1&&(e=s),{hexColour:this.options?.buckets?this.options.buckets[a]?.hexColour:o.hexColour,min:r,max:e}})};this.initBucketColours=()=>{if(this.useRagColour&&this.bucketCount===3)this.buckets=Array.from(new Array(this.bucketCount)).map((t,s)=>({hexColour:this.ragColours[s]}));else{const t=1/this.bucketCount;this.buckets=Array.from(new Array(this.bucketCount)).map((s,i)=>{const e=t*(i+1);return{hexColour:(0,l.withAlphaHex)(this.baseColour,e)}})}};this.setAutomaticThresholdSize=()=>{const t=this.responseData.map(o=>Number(o[this.valueKey].raw)),s=Math.min(...t),i=Math.max(...t),e=Math.ceil((i-s)/this.bucketCount);return{min:s,max:i,bucketSize:e}};this.setBucketCount=()=>{const{buckets:t}=this.options;if(this.hasRagScore)if(this.useRagColour)this.bucketCount=3;else{const s=this.responseData.reduce((i,e)=>(e[this.valueKey].rag!==void 0&&i.push(e[this.valueKey].rag),i),[]);this.bucketCount=Math.max(...s)+1}else t?this.bucketCount=t.length:this.bucketCount=3};this.getBucketForValue=(t,s)=>{let i="",e=0;return s!==void 0?{colour:this.buckets[s].hexColour||i,score:s}:(this.buckets.forEach((o,a)=>{const{min:r,max:n}=o;!r&&n&&t<=n&&(i=o.hexColour||i,e=a),r&&t>=r&&n&&t<=n&&(i=o.hexColour||i,e=a),r&&!n&&t>=r&&(i=o.hexColour||i,e=a)}),{colour:i,score:e})};this.getBuckets=()=>this.buckets;this.responseData=t,this.initFromOptions(s),this.valueKey=i,this.hasRagScore=t[0][this.valueKey].rag!==void 0,this.autoBucketing=!!e,o&&(this.ragColours=o),this.initBuckets()}}var d=c;0&&(module.exports={Buckets});
 //# sourceMappingURL=Buckets.js.map

package/dpr/components/_charts/chart/Buckets.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/components/_charts/chart/Buckets.ts"],
-  "sourcesContent": ["/* eslint-disable prefer-destructuring */\nimport { withAlphaHex } from 'with-alpha-hex'\nimport { DashboardDataResponse, DashboardDataResponseWithRag } from '../../../types/Metrics'\nimport {\n  DashboardVisualisationBucket,\n  BucketDashboardVisualisationOptions,\n} from '../../_dashboards/dashboard-visualisation/types'\nimport { components } from '../../../types/api'\n\nclass Buckets {\n  private baseColour = '#1d70b8'\n\n  private ragColours: string[] = ['#00703c', '#ffdd00', '#d4351c']\n\n  private buckets: DashboardVisualisationBucket[] = []\n\n  private useRagColour = false\n\n  private bucketCount = 0\n\n  private onlyBucketColoursDefined = false\n\n  private autoBucketing = false\n\n  private hasRagScore = false\n\n  private valueKey: string\n\n  private options: BucketDashboardVisualisationOptions = {}\n\n  responseData: DashboardDataResponse[]\n\n  constructor(\n    responseData: DashboardDataResponse[],\n    definition: components['schemas']['DashboardVisualisationDefinition'],\n    valueKey: string,\n    autoBucketing?: boolean,\n    ragColours?: string[],\n  ) {\n    this.responseData = responseData\n    this.initFromOptions(definition)\n    this.valueKey = valueKey\n    this.hasRagScore = responseData[0][this.valueKey].rag !== undefined\n    this.autoBucketing = Boolean(autoBucketing)\n    if (ragColours) this.ragColours = ragColours\n    this.initBuckets()\n  }\n\n  private initFromOptions = (definition: components['schemas']['DashboardVisualisationDefinition']) => {\n    this.options = <BucketDashboardVisualisationOptions>definition.options || {}\n    this.baseColour = this.options?.baseColour || this.baseColour\n    this.useRagColour = this.options?.useRagColour || false\n    this.onlyBucketColoursDefined =\n      this.options && this.options.buckets\n        ? this.options?.buckets?.every((bucket) => !bucket.max && !bucket.min && bucket.hexColour !== undefined)\n        : false\n  }\n\n  private initBuckets = () => {\n    const { buckets } = this.options\n\n    this.setBucketCount()\n    this.initBucketColours()\n\n    if (buckets) {\n      if (this.hasRagScore) {\n        if (this.onlyBucketColoursDefined) {\n          this.buckets = buckets\n        }\n      } else if (!this.hasRagScore && this.onlyBucketColoursDefined && this.autoBucketing) {\n        this.initAutomaticThresholdBucket()\n      } else {\n        this.initCustomThresholdBuckets()\n      }\n    } else if (!buckets && !this.hasRagScore && this.autoBucketing) {\n      this.initAutomaticThresholdBucket()\n    }\n  }\n\n  private initCustomThresholdBuckets = () => {\n    this.buckets = this.options.buckets\n      ? this.options.buckets.map((bucket, i) => {\n          return {\n            ...this.buckets[i],\n            ...bucket,\n          }\n        })\n      : []\n  }\n\n  /**\n   * Initialises the bucket thresholds by defining the range between the min and max\n   * and dividing into 3 equal parts\n   */\n  private initAutomaticThresholdBucket = () => {\n    const { min, max, bucketSize } = this.setAutomaticThresholdSize()\n    let maxValue = 0\n    this.buckets = this.buckets.map((bucket, i) => {\n      let minValue = min\n      if (i !== 0) minValue = maxValue + 1\n      maxValue = bucketSize * (i + 1) + min\n      if (i === this.buckets.length - 1) maxValue = max\n\n      return {\n        hexColour: this.options?.buckets ? this.options.buckets[i]?.hexColour : bucket.hexColour,\n        min: minValue,\n        max: maxValue,\n      }\n    })\n  }\n\n  private initBucketColours = () => {\n    if (this.useRagColour && this.bucketCount === 3) {\n      this.buckets = Array.from(new Array(this.bucketCount)).map((d, i) => {\n        return {\n          hexColour: this.ragColours[i],\n        }\n      })\n    } else {\n      const alphaDivision = 1 / this.bucketCount\n      this.buckets = Array.from(new Array(this.bucketCount)).map((d, i) => {\n        const division = alphaDivision * (i + 1)\n        return {\n          hexColour: withAlphaHex(this.baseColour, division),\n        }\n      })\n    }\n  }\n\n  private setAutomaticThresholdSize = () => {\n    const values = this.responseData.map((resData) => Number(resData[this.valueKey].raw))\n    const min = Math.min(...values)\n    const max = Math.max(...values)\n    const bucketSize = Math.ceil((max - min) / this.bucketCount)\n\n    return {\n      min,\n      max,\n      bucketSize,\n    }\n  }\n\n  private setBucketCount = () => {\n    const { buckets } = this.options\n    if (this.hasRagScore) {\n      if (this.useRagColour) {\n        this.bucketCount = 3\n      } else {\n        const allRags: number[] = this.responseData.reduce((acc: number[], resData: DashboardDataResponse) => {\n          if (resData[this.valueKey].rag !== undefined) {\n            acc.push(<number>resData[this.valueKey].rag)\n          }\n          return acc\n        }, [])\n        this.bucketCount = Math.max(...allRags) + 1\n      }\n    } else if (buckets) {\n      this.bucketCount = buckets.length\n    } else {\n      this.bucketCount = 3\n    }\n  }\n\n  getBucketForValue = (value: number, ragScore?: number): { colour: string; score: number } => {\n    let colour = ''\n    let score = 0\n\n    if (ragScore !== undefined) {\n      return {\n        colour: this.buckets[ragScore].hexColour || colour,\n        score: ragScore,\n      }\n    }\n\n    this.buckets.forEach((bucket, index) => {\n      const { min, max } = bucket\n      // First bucket\n      if (!min && max && value <= max) {\n        colour = bucket.hexColour || colour\n        score = index\n      }\n      // middle buckets\n      if (min && value >= min && max && value <= max) {\n        colour = bucket.hexColour || colour\n        score = index\n      }\n      // last bucket\n      if (min && !max && value >= min) {\n        colour = bucket.hexColour || colour\n        score = index\n      }\n    })\n\n    return {\n      colour,\n      score,\n    }\n  }\n\n  getBuckets = () => {\n    return this.buckets\n  }\n}\n\nexport { Buckets }\nexport default Buckets\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAA6B,0BAQ7B,MAAMH,CAAQ,CAuBZ,YACEI,EACAC,EACAC,EACAC,EACAC,EACA,CA5BF,KAAQ,WAAa,UAErB,KAAQ,WAAuB,CAAC,UAAW,UAAW,SAAS,EAE/D,KAAQ,QAA0C,CAAC,EAEnD,KAAQ,aAAe,GAEvB,KAAQ,YAAc,EAEtB,KAAQ,yBAA2B,GAEnC,KAAQ,cAAgB,GAExB,KAAQ,YAAc,GAItB,KAAQ,QAA+C,CAAC,EAoBxD,KAAQ,gBAAmBH,GAA0E,CACnG,KAAK,QAA+CA,EAAW,SAAW,CAAC,EAC3E,KAAK,WAAa,KAAK,SAAS,YAAc,KAAK,WACnD,KAAK,aAAe,KAAK,SAAS,cAAgB,GAClD,KAAK,yBACH,KAAK,SAAW,KAAK,QAAQ,QACzB,KAAK,SAAS,SAAS,MAAOI,GAAW,CAACA,EAAO,KAAO,CAACA,EAAO,KAAOA,EAAO,YAAc,MAAS,EACrG,EACR,EAEA,KAAQ,YAAc,IAAM,CAC1B,KAAM,CAAE,QAAAC,CAAQ,EAAI,KAAK,QAEzB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EAEnBA,EACE,KAAK,YACH,KAAK,2BACP,KAAK,QAAUA,GAER,CAAC,KAAK,aAAe,KAAK,0BAA4B,KAAK,cACpE,KAAK,6BAA6B,EAElC,KAAK,2BAA2B,EAEzB,CAACA,GAAW,CAAC,KAAK,aAAe,KAAK,eAC/C,KAAK,6BAA6B,CAEtC,EAEA,KAAQ,2BAA6B,IAAM,CACzC,KAAK,QAAU,KAAK,QAAQ,QACxB,KAAK,QAAQ,QAAQ,IAAI,CAACD,EAAQE,KACzB,CACL,GAAG,KAAK,QAAQA,CAAC,EACjB,GAAGF,CACL,EACD,EACD,CAAC,CACP,EAMA,KAAQ,6BAA+B,IAAM,CAC3C,KAAM,CAAE,IAAAG,EAAK,IAAAC,EAAK,WAAAC,CAAW,EAAI,KAAK,0BAA0B,EAChE,IAAIC,EAAW,EACf,KAAK,QAAU,KAAK,QAAQ,IAAI,CAACN,EAAQE,IAAM,CAC7C,IAAIK,EAAWJ,EACf,OAAID,IAAM,IAAGK,EAAWD,EAAW,GACnCA,EAAWD,GAAcH,EAAI,GAAKC,EAC9BD,IAAM,KAAK,QAAQ,OAAS,IAAGI,EAAWF,GAEvC,CACL,UAAW,KAAK,SAAS,QAAU,KAAK,QAAQ,QAAQF,CAAC,GAAG,UAAYF,EAAO,UAC/E,IAAKO,EACL,IAAKD,CACP,CACF,CAAC,CACH,EAEA,KAAQ,kBAAoB,IAAM,CAChC,GAAI,KAAK,cAAgB,KAAK,cAAgB,EAC5C,KAAK,QAAU,MAAM,KAAK,IAAI,MAAM,KAAK,WAAW,CAAC,EAAE,IAAI,CAACE,EAAGN,KACtD,CACL,UAAW,KAAK,WAAWA,CAAC,CAC9B,EACD,MACI,CACL,MAAMO,EAAgB,EAAI,KAAK,YAC/B,KAAK,QAAU,MAAM,KAAK,IAAI,MAAM,KAAK,WAAW,CAAC,EAAE,IAAI,CAACD,EAAG,IAAM,CACnE,MAAME,EAAWD,GAAiB,EAAI,GACtC,MAAO,CACL,aAAW,gBAAa,KAAK,WAAYC,CAAQ,CACnD,CACF,CAAC,CACH,CACF,EAEA,KAAQ,0BAA4B,IAAM,CACxC,MAAMC,EAAS,KAAK,aAAa,IAAKC,GAAY,OAAOA,EAAQ,KAAK,QAAQ,EAAE,GAAG,CAAC,EAC9ET,EAAM,KAAK,IAAI,GAAGQ,CAAM,EACxBP,EAAM,KAAK,IAAI,GAAGO,CAAM,EACxBN,EAAa,KAAK,MAAMD,EAAMD,GAAO,KAAK,WAAW,EAE3D,MAAO,CACL,IAAAA,EACA,IAAAC,EACA,WAAAC,CACF,CACF,EAEA,KAAQ,eAAiB,IAAM,CAC7B,KAAM,CAAE,QAAAJ,CAAQ,EAAI,KAAK,QACzB,GAAI,KAAK,YACP,GAAI,KAAK,aACP,KAAK,YAAc,MACd,CACL,MAAMY,EAAoB,KAAK,aAAa,OAAO,CAACC,EAAeF,KAC7DA,EAAQ,KAAK,QAAQ,EAAE,MAAQ,QACjCE,EAAI,KAAaF,EAAQ,KAAK,QAAQ,EAAE,GAAG,EAEtCE,GACN,CAAC,CAAC,EACL,KAAK,YAAc,KAAK,IAAI,GAAGD,CAAO,EAAI,CAC5C,MACSZ,EACT,KAAK,YAAcA,EAAQ,OAE3B,KAAK,YAAc,CAEvB,EAEA,uBAAoB,CAACc,EAAeC,IAAyD,CAC3F,IAAIC,EAAS,GACTC,EAAQ,EAEZ,OAAIF,IAAa,OACR,CACL,OAAQ,KAAK,QAAQA,CAAQ,EAAE,WAAaC,EAC5C,MAAOD,CACT,GAGF,KAAK,QAAQ,QAAQ,CAAChB,EAAQmB,IAAU,CACtC,KAAM,CAAE,IAAAhB,EAAK,IAAAC,CAAI,EAAIJ,EAEjB,CAACG,GAAOC,GAAOW,GAASX,IAC1Ba,EAASjB,EAAO,WAAaiB,EAC7BC,EAAQC,GAGNhB,GAAOY,GAASZ,GAAOC,GAAOW,GAASX,IACzCa,EAASjB,EAAO,WAAaiB,EAC7BC,EAAQC,GAGNhB,GAAO,CAACC,GAAOW,GAASZ,IAC1Bc,EAASjB,EAAO,WAAaiB,EAC7BC,EAAQC,EAEZ,CAAC,EAEM,CACL,OAAAF,EACA,MAAAC,CACF,EACF,EAEA,gBAAa,IACJ,KAAK,QAjKZ,KAAK,aAAevB,EACpB,KAAK,gBAAgBC,CAAU,EAC/B,KAAK,SAAWC,EAChB,KAAK,YAAcF,EAAa,CAAC,EAAE,KAAK,QAAQ,EAAE,MAAQ,OAC1D,KAAK,cAAgB,EAAQG,EACzBC,IAAY,KAAK,WAAaA,GAClC,KAAK,YAAY,CACnB,CA4JF,CAGA,IAAOP,EAAQD",
-  "names": ["Buckets_exports", "__export", "Buckets", "Buckets_default", "__toCommonJS", "import_with_alpha_hex", "responseData", "definition", "valueKey", "autoBucketing", "ragColours", "bucket", "buckets", "i", "min", "max", "bucketSize", "maxValue", "minValue", "d", "alphaDivision", "division", "values", "resData", "allRags", "acc", "value", "ragScore", "colour", "score", "index"]
+  "sourcesContent": ["/* eslint-disable prefer-destructuring */\nimport { withAlphaHex } from 'with-alpha-hex'\nimport { DashboardDataResponse } from '../../../types/Metrics'\nimport {\n  DashboardVisualisationBucket,\n  BucketDashboardVisualisationOptions,\n} from '../../_dashboards/dashboard-visualisation/types'\nimport { components } from '../../../types/api'\n\nclass Buckets {\n  private baseColour = '#1d70b8'\n\n  private ragColours: string[] = ['#00703c', '#ffdd00', '#d4351c']\n\n  private buckets: DashboardVisualisationBucket[] = []\n\n  private useRagColour = false\n\n  private bucketCount = 0\n\n  private onlyBucketColoursDefined = false\n\n  private autoBucketing = false\n\n  private hasRagScore = false\n\n  private valueKey: string\n\n  private options: BucketDashboardVisualisationOptions = {}\n\n  responseData: DashboardDataResponse[]\n\n  constructor(\n    responseData: DashboardDataResponse[],\n    definition: components['schemas']['DashboardVisualisationDefinition'],\n    valueKey: string,\n    autoBucketing?: boolean,\n    ragColours?: string[],\n  ) {\n    this.responseData = responseData\n    this.initFromOptions(definition)\n    this.valueKey = valueKey\n    this.hasRagScore = responseData[0][this.valueKey].rag !== undefined\n    this.autoBucketing = Boolean(autoBucketing)\n    if (ragColours) this.ragColours = ragColours\n    this.initBuckets()\n  }\n\n  private initFromOptions = (definition: components['schemas']['DashboardVisualisationDefinition']) => {\n    this.options = <BucketDashboardVisualisationOptions>definition.options || {}\n    this.baseColour = this.options?.baseColour || this.baseColour\n    this.useRagColour = this.options?.useRagColour || false\n    this.onlyBucketColoursDefined =\n      this.options && this.options.buckets\n        ? this.options?.buckets?.every((bucket) => !bucket.max && !bucket.min && bucket.hexColour !== undefined)\n        : false\n  }\n\n  private initBuckets = () => {\n    const { buckets } = this.options\n\n    this.setBucketCount()\n    this.initBucketColours()\n\n    if (buckets) {\n      if (this.hasRagScore) {\n        if (this.onlyBucketColoursDefined) {\n          this.buckets = buckets\n        }\n      } else if (!this.hasRagScore && this.onlyBucketColoursDefined && this.autoBucketing) {\n        this.initAutomaticThresholdBucket()\n      } else {\n        this.initCustomThresholdBuckets()\n      }\n    } else if (!buckets && !this.hasRagScore && this.autoBucketing) {\n      this.initAutomaticThresholdBucket()\n    }\n  }\n\n  private initCustomThresholdBuckets = () => {\n    this.buckets = this.options.buckets\n      ? this.options.buckets.map((bucket, i) => {\n          return {\n            ...this.buckets[i],\n            ...bucket,\n          }\n        })\n      : []\n  }\n\n  /**\n   * Initialises the bucket thresholds by defining the range between the min and max\n   * and dividing into 3 equal parts\n   */\n  private initAutomaticThresholdBucket = () => {\n    const { min, max, bucketSize } = this.setAutomaticThresholdSize()\n    let maxValue = 0\n    this.buckets = this.buckets.map((bucket, i) => {\n      let minValue = min\n      if (i !== 0) minValue = maxValue + 1\n      maxValue = bucketSize * (i + 1) + min\n      if (i === this.buckets.length - 1) maxValue = max\n\n      return {\n        hexColour: this.options?.buckets ? this.options.buckets[i]?.hexColour : bucket.hexColour,\n        min: minValue,\n        max: maxValue,\n      }\n    })\n  }\n\n  private initBucketColours = () => {\n    if (this.useRagColour && this.bucketCount === 3) {\n      this.buckets = Array.from(new Array(this.bucketCount)).map((_d, i) => {\n        return {\n          hexColour: this.ragColours[i],\n        }\n      })\n    } else {\n      const alphaDivision = 1 / this.bucketCount\n      this.buckets = Array.from(new Array(this.bucketCount)).map((_d, i) => {\n        const division = alphaDivision * (i + 1)\n        return {\n          hexColour: withAlphaHex(this.baseColour, division),\n        }\n      })\n    }\n  }\n\n  private setAutomaticThresholdSize = () => {\n    const values = this.responseData.map((resData) => Number(resData[this.valueKey].raw))\n    const min = Math.min(...values)\n    const max = Math.max(...values)\n    const bucketSize = Math.ceil((max - min) / this.bucketCount)\n\n    return {\n      min,\n      max,\n      bucketSize,\n    }\n  }\n\n  private setBucketCount = () => {\n    const { buckets } = this.options\n    if (this.hasRagScore) {\n      if (this.useRagColour) {\n        this.bucketCount = 3\n      } else {\n        const allRags: number[] = this.responseData.reduce((acc: number[], resData: DashboardDataResponse) => {\n          if (resData[this.valueKey].rag !== undefined) {\n            acc.push(<number>resData[this.valueKey].rag)\n          }\n          return acc\n        }, [])\n        this.bucketCount = Math.max(...allRags) + 1\n      }\n    } else if (buckets) {\n      this.bucketCount = buckets.length\n    } else {\n      this.bucketCount = 3\n    }\n  }\n\n  getBucketForValue = (value: number, ragScore?: number): { colour: string; score: number } => {\n    let colour = ''\n    let score = 0\n\n    if (ragScore !== undefined) {\n      return {\n        colour: this.buckets[ragScore].hexColour || colour,\n        score: ragScore,\n      }\n    }\n\n    this.buckets.forEach((bucket, index) => {\n      const { min, max } = bucket\n      // First bucket\n      if (!min && max && value <= max) {\n        colour = bucket.hexColour || colour\n        score = index\n      }\n      // middle buckets\n      if (min && value >= min && max && value <= max) {\n        colour = bucket.hexColour || colour\n        score = index\n      }\n      // last bucket\n      if (min && !max && value >= min) {\n        colour = bucket.hexColour || colour\n        score = index\n      }\n    })\n\n    return {\n      colour,\n      score,\n    }\n  }\n\n  getBuckets = () => {\n    return this.buckets\n  }\n}\n\nexport { Buckets }\nexport default Buckets\n"],
+  "mappings": "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",
+  "names": ["Buckets_exports", "__export", "Buckets", "Buckets_default", "__toCommonJS", "import_with_alpha_hex", "responseData", "definition", "valueKey", "autoBucketing", "ragColours", "bucket", "buckets", "i", "min", "max", "bucketSize", "maxValue", "minValue", "_d", "alphaDivision", "division", "values", "resData", "allRags", "acc", "value", "ragScore", "colour", "score", "index"]
 }

package/dpr/components/_charts/chart/Buckets.ts

@@ -1,6 +1,6 @@
 /* eslint-disable prefer-destructuring */
 import { withAlphaHex } from 'with-alpha-hex'
-import { DashboardDataResponse, DashboardDataResponseWithRag } from '../../../types/Metrics'
+import { DashboardDataResponse } from '../../../types/Metrics'
 import {
   DashboardVisualisationBucket,
   BucketDashboardVisualisationOptions,
@@ -111,14 +111,14 @@ class Buckets {
 
   private initBucketColours = () => {
     if (this.useRagColour && this.bucketCount === 3) {
-      this.buckets = Array.from(new Array(this.bucketCount)).map((d, i) => {
+      this.buckets = Array.from(new Array(this.bucketCount)).map((_d, i) => {
         return {
           hexColour: this.ragColours[i],
         }
       })
     } else {
       const alphaDivision = 1 / this.bucketCount
-      this.buckets = Array.from(new Array(this.bucketCount)).map((d, i) => {
+      this.buckets = Array.from(new Array(this.bucketCount)).map((_d, i) => {
         const division = alphaDivision * (i + 1)
         return {
           hexColour: withAlphaHex(this.baseColour, division),

package/dpr/components/_charts/chart/heatmap/HeatmapChart.js

@@ -1,2 +1,2 @@
-var M=Object.create;var l=Object.defineProperty;var g=Object.getOwnPropertyDescriptor;var x=Object.getOwnPropertyNames;var V=Object.getPrototypeOf,T=Object.prototype.hasOwnProperty;var w=(e,s)=>{for(var t in s)l(e,t,{get:s[t],enumerable:!0})},D=(e,s,t,a)=>{if(s&&typeof s=="object"||typeof s=="function")for(let i of x(s))!T.call(e,i)&&i!==t&&l(e,i,{get:()=>s[i],enumerable:!(a=g(s,i))||a.enumerable});return e};var m=(e,s,t)=>(t=e!=null?M(V(e)):{},D(s||!e||!e.__esModule?l(t,"default",{value:e,enumerable:!0}):t,e)),C=e=>D(l({},"__esModule",{value:!0}),e);var F={};w(F,{HeatmapChart:()=>p,default:()=>E});module.exports=C(F);var n=m(require("dayjs")),d=require("../../../_dashboards/dashboard-visualisation/types"),y=m(require("../../../../utils/datasetHelper")),b=m(require("../../../_dashboards/dashboard-visualisation/DashboardVisualisation")),f=m(require("../Buckets"));class p extends b.default{constructor(t,a,i){super(t,i);this.data=[];this.dayDateFormat="DD/MM/YYYY";this.valueKey="";this.label="";this.buckets=[];this.initUnit=()=>{this.unit=this.columns.measures[0].unit?this.columns.measures[0].unit:void 0};this.setLabel=()=>{const{id:t,display:a}=this.columns.measures[1];this.valueKey=t,this.label=a||""};this.validateDefinition=()=>{const{id:t,columns:a,type:i}=this.definition,o=[];if(a.measures.length!==2?o.push(`Measures should only have 2 columns defined. Only found ${a.measures.length}`):i===d.DashboardVisualisationType.MATRIX_TIMESERIES&&a.measures[0].id!=="ts"&&o.push(`measure at index 0 has incorrect ID. Expected ID to be "ts". Found "${a.measures[0].id}"`),o.length){const r=`Validation: Visualisaton definition: ID: ${t}, type: ${i}, errors: ${o.join(",")}`;throw new Error(r)}};this.initTimeseriesData=()=>{const t=y.default.groupRowsByTimestamp(this.responseData);this.data=t.map(a=>{const{raw:i,rag:o}=a[0][this.valueKey],r=a[0].ts.raw,k=Number(i),v=o!==void 0?Number(a[0][this.valueKey].rag):void 0;let u=0,h=0;switch(this.granularity){case"hourly":break;case"weekly":u=(0,n.default)(r,this.dayDateFormat).format("ddd"),h=(0,n.default)(r,this.dayDateFormat).week();break;case"daily":u=(0,n.default)(r,this.dayDateFormat).format("MMM YY"),h=(0,n.default)(r,this.dayDateFormat).format("D");break;case"monthly":{const c=r.split(" ");u=c[1],h=c[0]}break;case"annually":u="year",h=r;break;default:u=(0,n.default)(r,this.dayDateFormat).format("MMM YY"),h=(0,n.default)(r,this.dayDateFormat).format("D");break}return{y:h,x:u,v:k,r:v}})};this.bucketData=()=>{this.data=this.data.map(t=>{const{v:a,r:i}=t,o=this.bucketsHelper.getBucketForValue(a,i);return{...t,c:o.colour}})};this.build=()=>(this.validateDefinition(),this.initTimeseriesData(),this.bucketData(),{type:this.type,unit:this.unit,timeseries:!0,data:{datasets:[{label:this.label,data:this.data}]}});this.granularity=a,this.isTimeseriesChart=this.type===d.DashboardVisualisationType.LINE_TIMESERIES,this.setLabel(),this.initUnit(),this.bucketsHelper=new f.default(t,this.definition,this.valueKey,!0),this.buckets=this.bucketsHelper.getBuckets()}}var E=p;0&&(module.exports={HeatmapChart});
+"use strict";var M=Object.create;var h=Object.defineProperty;var g=Object.getOwnPropertyDescriptor;var x=Object.getOwnPropertyNames;var w=Object.getPrototypeOf,F=Object.prototype.hasOwnProperty;var V=(e,s)=>{for(var t in s)h(e,t,{get:s[t],enumerable:!0})},c=(e,s,t,a)=>{if(s&&typeof s=="object"||typeof s=="function")for(let i of x(s))!F.call(e,i)&&i!==t&&h(e,i,{get:()=>s[i],enumerable:!(a=g(s,i))||a.enumerable});return e};var m=(e,s,t)=>(t=e!=null?M(w(e)):{},c(s||!e||!e.__esModule?h(t,"default",{value:e,enumerable:!0}):t,e)),C=e=>c(h({},"__esModule",{value:!0}),e);var T={};V(T,{HeatmapChart:()=>d,default:()=>Y});module.exports=C(T);var n=m(require("dayjs")),D=require("../../../_dashboards/dashboard-visualisation/types"),y=m(require("../../../../utils/datasetHelper")),b=m(require("../../../_dashboards/dashboard-visualisation/DashboardVisualisation")),f=m(require("../Buckets"));class d extends b.default{constructor(t,a,i){super(t,i);this.data=[];this.dayDateFormat="DD/MM/YYYY";this.valueKey="";this.label="";this.setLabel=()=>{const{id:t,display:a}=this.columns.measures[1];this.valueKey=t,this.label=a||""};this.validateDefinition=()=>{const{id:t,columns:a,type:i}=this.definition,o=[];if(a.measures.length!==2?o.push(`Measures should only have 2 columns defined. Only found ${a.measures.length}`):i===D.DashboardVisualisationType.MATRIX_TIMESERIES&&a.measures[0].id!=="ts"&&o.push(`measure at index 0 has incorrect ID. Expected ID to be "ts". Found "${a.measures[0].id}"`),o.length){const r=`Validation: Visualisaton definition: ID: ${t}, type: ${i}, errors: ${o.join(",")}`;throw new Error(r)}};this.initTimeseriesData=()=>{const t=y.default.groupRowsByTimestamp(this.responseData);this.data=t.map(a=>{const{raw:i,rag:o}=a[0][this.valueKey],r=a[0].ts.raw,v=Number(i),k=o!==void 0?Number(a[0][this.valueKey].rag):void 0;let l=0,u=0;switch(this.granularity){case"hourly":break;case"weekly":l=(0,n.default)(r,this.dayDateFormat).format("ddd"),u=(0,n.default)(r,this.dayDateFormat).week();break;case"daily":l=(0,n.default)(r,this.dayDateFormat).format("MMM YY"),u=(0,n.default)(r,this.dayDateFormat).format("D");break;case"monthly":{const p=r.split(" ");l=p[1],u=p[0]}break;case"annually":l="year",u=r;break;default:l=(0,n.default)(r,this.dayDateFormat).format("MMM YY"),u=(0,n.default)(r,this.dayDateFormat).format("D");break}return{y:u,x:l,v,r:k}})};this.bucketData=()=>{this.data=this.data.map(t=>{const{v:a,r:i}=t,o=this.bucketsHelper.getBucketForValue(a,i);return{...t,c:o.colour}})};this.build=()=>(this.validateDefinition(),this.initTimeseriesData(),this.bucketData(),{type:this.type,unit:this.unit,timeseries:!0,data:{datasets:[{label:this.label,data:this.data}]}});this.granularity=a,this.setLabel(),this.initUnit(),this.bucketsHelper=new f.default(t,this.definition,this.valueKey,!0)}}var Y=d;0&&(module.exports={HeatmapChart});
 //# sourceMappingURL=HeatmapChart.js.map