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

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

@@ -1,2 +1,2 @@
-var b=Object.create;var t=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var m=Object.getOwnPropertyNames;var E=Object.getPrototypeOf,p=Object.prototype.hasOwnProperty;var c=(o,e)=>{for(var n in e)t(o,n,{get:e[n],enumerable:!0})},r=(o,e,n,i)=>{if(e&&typeof e=="object"||typeof e=="function")for(let a of m(e))!p.call(o,a)&&a!==n&&t(o,a,{get:()=>e[a],enumerable:!(i=u(e,a))||i.enumerable});return o};var l=(o,e,n)=>(n=o!=null?b(E(o)):{},r(e||!o||!o.__esModule?t(n,"default",{value:o,enumerable:!0}):n,o)),k=o=>r(t({},"__esModule",{value:!0}),o);var T={};c(T,{default:()=>h,init:()=>g});module.exports=k(T);var d=l(require("../catalogue-list/utils")),s=l(require("../../../utils/localsHelper"));const g=async({features:o,res:e,services:n})=>({data:await d.default.getReportsList(e,n,o),features:f(e,o)}),f=(o,e)=>{const{bookmarkingEnabled:n}=s.default.getValues(o);return{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:n}};var h={init:g};0&&(module.exports={init});
+var C=Object.create;var a=Object.defineProperty;var f=Object.getOwnPropertyDescriptor;var k=Object.getOwnPropertyNames;var h=Object.getPrototypeOf,S=Object.prototype.hasOwnProperty;var w=(o,e)=>{for(var t in e)a(o,t,{get:e[t],enumerable:!0})},s=(o,e,t,l)=>{if(e&&typeof e=="object"||typeof e=="function")for(let n of k(e))!S.call(o,n)&&n!==t&&a(o,n,{get:()=>e[n],enumerable:!(l=f(e,n))||l.enumerable});return o};var g=(o,e,t)=>(t=o!=null?C(h(o)):{},s(e||!o||!o.__esModule?a(t,"default",{value:o,enumerable:!0}):t,o)),T=o=>s(a({},"__esModule",{value:!0}),o);var P={};w(P,{default:()=>F,init:()=>m});module.exports=T(P);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}=p.default.getValues(e),i=(await t.productCollectionService.getProductCollections(n))?.map(u=>({value:u.id,text:u.name}));i&&i.length>0&&i.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,productCollectionInfo:{productCollections:i,...c&&{selectedProductCollection:c}},features:v(E,o)}},v=(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 F={init:m};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  return {\n    data,\n    features: setFeatures(res, features),\n  }\n}\n\nconst setFeatures = (res: Response, features?: CatalogueFeatures) => {\n  const { bookmarkingEnabled } = LocalsHelper.getValues(res)\n\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,KAMS,CACL,KAFW,MAAM,EAAAC,QAAmB,eAAeF,EAAKC,EAAUF,CAAQ,EAG1E,SAAUI,EAAYH,EAAKD,CAAQ,CACrC,GAGII,EAAc,CAACH,EAAeD,IAAiC,CACnE,KAAM,CAAE,mBAAAK,CAAmB,EAAI,EAAAC,QAAa,UAAUL,CAAG,EAEzD,MAAO,CACL,iBAAkBD,GAAU,mBAAqB,QAAaA,EAAS,iBACvE,0BAA2BA,GAAU,4BAA8B,QAAaA,EAAS,0BACzF,gBAAiBA,GAAU,kBAAoB,QAAaA,EAAS,gBACrE,mBAAoBA,GAAU,qBAAuB,OAAYA,EAAS,mBAAqBK,CACjG,CACF,EAEA,IAAOV,EAAQ,CACb,KAAAC,CACF",
-  "names": ["utils_exports", "__export", "utils_default", "init", "__toCommonJS", "import_utils", "import_localsHelper", "features", "res", "services", "CatalogueListUtils", "setFeatures", "bookmarkingEnabled", "LocalsHelper"]
+  "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 } = 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    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,CAAQ,EAAI,EAAAC,QAAa,UAAUP,CAAG,EACnEQ,GAAsB,MAAMP,EAAS,yBAAyB,sBAAsBG,CAAK,IAAI,IAChGK,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,MAAMT,EAAS,8BAA8B,+BAC/EK,EAAQ,EACV,EACMK,EACJD,GACC,MAAMT,EAAS,yBAAyB,qBAAqBK,EAAQ,GAAII,CAA2B,EACvG,MAAO,CACL,KAAAR,EACA,sBAAuB,CACrB,mBAAAM,EACA,GAAIG,GAA6B,CAAE,0BAAAA,CAA0B,CAC/D,EACA,SAAUC,EAAYP,EAAoBN,CAAQ,CACpD,CACF,EAEMa,EAAc,CAACP,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",
+  "names": ["utils_exports", "__export", "utils_default", "init", "__toCommonJS", "import_utils", "import_localsHelper", "features", "res", "services", "data", "CatalogueListUtils", "token", "bookmarkingEnabled", "dprUser", "LocalsHelper", "productCollections", "collection", "selectedProductCollectionId", "selectedProductCollection", "setFeatures"]
 }

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

@@ -22,7 +22,15 @@ describe('CatalogueUtils', () => {
         },
       } as unknown as Response
 
-      services = {} as unknown as Services
+      services = {
+        productCollectionService: {
+          getProductCollections: jest.fn(() => []),
+          getProductCollection: jest.fn(),
+        },
+        productCollectionStoreService: {
+          getSelectedProductCollectionId: jest.fn(),
+        },
+      } as unknown as Services
     })
 
     it('should init the catalogue with defaults', async () => {
@@ -36,6 +44,9 @@ describe('CatalogueUtils', () => {
           howToUseEnabled: true,
           unauthorisedToggleEnabled: true,
         },
+        productCollectionInfo: {
+          productCollections: [],
+        },
       })
     })
 
@@ -58,6 +69,9 @@ describe('CatalogueUtils', () => {
           howToUseEnabled: true,
           unauthorisedToggleEnabled: false,
         },
+        productCollectionInfo: {
+          productCollections: [],
+        },
       })
     })
   })

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

@@ -14,15 +14,33 @@ export const init = async ({
   services: Services
 }) => {
   const data = await CatalogueListUtils.getReportsList(res, services, features)
+  const { token, bookmarkingEnabled, dprUser } = LocalsHelper.getValues(res)
+  const productCollections = (await services.productCollectionService.getProductCollections(token))?.map(
+    (collection) => ({
+      value: collection.id,
+      text: collection.name,
+    }),
+  )
+  if (productCollections && productCollections.length > 0) {
+    productCollections.unshift({ value: 'RESET', text: 'Full catalogue' })
+  }
+  const selectedProductCollectionId = await services.productCollectionStoreService.getSelectedProductCollectionId(
+    dprUser.id,
+  )
+  const selectedProductCollection =
+    selectedProductCollectionId &&
+    (await services.productCollectionService.getProductCollection(dprUser.id, selectedProductCollectionId))
   return {
     data,
-    features: setFeatures(res, features),
+    productCollectionInfo: {
+      productCollections,
+      ...(selectedProductCollection && { selectedProductCollection }),
+    },
+    features: setFeatures(bookmarkingEnabled, features),
   }
 }
 
-const setFeatures = (res: Response, features?: CatalogueFeatures) => {
-  const { bookmarkingEnabled } = LocalsHelper.getValues(res)
-
+const setFeatures = (bookmarkingEnabled: boolean, features?: CatalogueFeatures) => {
   return {
     filteringEnabled: features?.filteringEnabled === undefined || features.filteringEnabled,
     unauthorisedToggleEnabled: features?.unauthorisedToggleEnabled === undefined || features.unauthorisedToggleEnabled,

package/dpr/components/_catalogue/catalogue/view.njk

@@ -5,6 +5,7 @@
 {% macro dprCatalogue(args) %}
   {% set data = args.data %}
   {% set features = args.features %}
+  {% set productCollectionInfo = args.productCollectionInfo %}
 
   {% set head = data.head %}
   {% set rows = data.rows %}
@@ -16,7 +17,7 @@
       {{ dprCatalogueHowToUse(features) }}
     {% endif %}
 
-    {{ dprCatalogueFilters(id, features) }}
+    {{ dprCatalogueFilters(id, features, productCollectionInfo) }}
     {{ dprCatalogueList(head, rows, id) }}
   <div>
 {% endmacro %}

package/dpr/components/_catalogue/catalogue-filters/view.njk

@@ -3,14 +3,14 @@
 {% from "../catalogue-search/view.njk" import dprCatalogueSearch %}
 {% from "../catalogue-unauthorised-toggle/view.njk" import dprUnauthorisedToggle %}
 
-{% macro dprCatalogueFilters(id, features) %}
+{% macro dprCatalogueFilters(id, features, productCollectionInfo) %}
   {% set filteringEnabled = features.filteringEnabled %}
   {% set unauthorisedToggleEnabled = features.unauthorisedToggleEnabled %}
 
   <div class='dpr-catalogue-filters' data-dpr-module='dpr-catalogue-filters'>
     <div class='dpr-catalogue-filters--heading'>
       <div class="dpr-catalogue-filters__search">
-        {{ dprCatalogueSearch(id) }}
+        {{ dprCatalogueSearch(id, productCollectionInfo) }}
       </div> 
     </div>
     <div class='dpr-catalogue-filters--content'>

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

@@ -1,2 +1,2 @@
-var P=Object.create;var S=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)S(e,o,{get:t[o],enumerable:!0})},R=(e,t,o,D)=>{if(t&&typeof t=="object"||typeof t=="function")for(let a of E(t))!F.call(e,a)&&a!==o&&S(e,a,{get:()=>t[a],enumerable:!(D=B(t,a))||D.enumerable});return e};var M=(e,t,o)=>(o=e!=null?P(V(e)):{},R(t||!e||!e.__esModule?S(o,"default",{value:e,enumerable:!0}):o,e)),U=e=>R(S({},"__esModule",{value:!0}),e);var $={};O($,{default:()=>Y,getReportsList:()=>A});module.exports=U($);var c=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:a,bookmarkingEnabled:H,dprUser:v}=x.default.getValues(e),C=D.sort((s,i)=>s.name<i.name?-1:s.name>i.name?1:0).flatMap(s=>{const{id:i,name:g,description:m,variants:T,dashboards:f,authorised:k}=s,p=T.map(r=>{const{id:n,name:u,description:d,isMissing:b}=r,N=r.loadType||c.LoadType.ASYNC;return{reportName:g,reportId:i,id:n,name:u,description:d,type:c.ReportType.REPORT,loadType:N,authorised:k,isMissing:b,...m&&m.length&&{reportDescription:m}}});let h=[];f&&(h=f.map(r=>{const{id:n,name:u,description:d,isMissing:b}=r;return{reportName:g,reportId:i,id:n,name:u,description:d,type:c.ReportType.DASHBOARD,reportDescription:m,authorised:k,isMissing:b,loadType:c.LoadType.ASYNC}}));const y=[...h,...p];return y.sort((r,n)=>r.name<n.name?-1:r.name>n.name?1:0),y}),I=await t.bookmarkService.getState(v.id),L=await Promise.all(C.map(async s=>{const{id:i,name:g,description:m,reportName:T,reportId:f,reportDescription:k,type:p,loadType:h,authorised:y,isMissing:r}=s,n=m||k||"",u=(0,l.setInitialHref)(h,p,f,i,e,r);let d;return(o?.bookmarkingEnabled!==void 0?o?.bookmarkingEnabled:H)&&(d=await t.bookmarkService.createBookMarkToggleHtml({userConfig:I,reportId:f,id:i,csrfToken:a,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(n)},{html:(0,l.createListActions)(u,p,h,d,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});
+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});
 //# 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 { DashboardDefinition } from '../../_dashboards/dashboard/types'\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: 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: DashboardDefinition) => {\n          const { id, name, description, isMissing } = dashboard\n          return {\n            reportName,\n            reportId,\n            id,\n            name,\n            description,\n            type: ReportType.DASHBOARD,\n            reportDescription,\n            authorised,\n            isMissing,\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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",
-  "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", "a", "b", "def", "reportId", "reportName", "reportDescription", "variants", "dashboards", "authorised", "variantsArray", "variant", "id", "name", "description", "isMissing", "loadType", "dashboardsArray", "dashboard", "mergedArray", "userConfig", "rows", "v", "type", "desc", "href", "bookmarkHtml", "ShowMoreUtils"]
+  "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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",
+  "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.ts

@@ -1,7 +1,6 @@
 import { Response } from 'express'
 import { components } from '../../../types/api'
 import { Services } from '../../../types/Services'
-import { DashboardDefinition } from '../../_dashboards/dashboard/types'
 import { DefinitionData, LoadType, ReportType } from '../../../types/UserReports'
 import ShowMoreUtils from '../../show-more/utils'
 import { createListItemProductMin, createListActions, setInitialHref } from '../../../utils/reportListsHelper'
@@ -28,7 +27,7 @@ export const getReportsList = async (
   const sortedVariants = sortedDefinitions.flatMap(
     (
       def: components['schemas']['ReportDefinitionSummary'] & {
-        dashboards: DashboardDefinition[]
+        dashboards: components['schemas']['DashboardDefinition'][]
         authorised: boolean
       },
     ) => {
@@ -58,8 +57,8 @@ export const getReportsList = async (
 
       let dashboardsArray: DefinitionData[] = []
       if (dashboards) {
-        dashboardsArray = dashboards.map((dashboard: DashboardDefinition) => {
-          const { id, name, description, isMissing } = dashboard
+        dashboardsArray = dashboards.map((dashboard: components['schemas']['DashboardDefinition']) => {
+          const { id, name, description } = dashboard
           return {
             reportName,
             reportId,
@@ -69,7 +68,7 @@ export const getReportsList = async (
             type: ReportType.DASHBOARD,
             reportDescription,
             authorised,
-            isMissing,
+            isMissing: false,
             loadType: LoadType.ASYNC,
           }
         })

package/dpr/components/_catalogue/catalogue-search/clientClass.mjs

@@ -17,9 +17,23 @@ class DprCatalogueSearch extends DprCatalogueFilters {
       this.initSeachBoxEvents()
       this.updateTableRows()
       this.initSearchInputFromQueryParams()
+      this.initProductCollectionSelect()
     }
   }
 
+  initProductCollectionSelect() {
+    /**
+     * @type {HTMLSelectElement | undefined}
+     */
+    const productCollections = this.getElement().querySelector('#productCollection')
+    if (productCollections) {
+      productCollections.addEventListener('change', (e) => {
+        e.preventDefault()
+        productCollections.closest('form').submit()
+      })
+    }
+  }
+  
   initSeachBoxEvents() {
     this.searchBox.addEventListener('keyup', (e) => {
       this.updateTableRows(e.target.value)

package/dpr/components/_catalogue/catalogue-search/view.njk

@@ -1,6 +1,10 @@
 {% from "govuk/components/input/macro.njk" import govukInput %}
+{% from "govuk/components/select/macro.njk" import govukSelect %}
+
+{% macro dprCatalogueSearch(id, productCollectionInfo, type = 'catalogue') %}
+  {% set productCollections = productCollectionInfo.productCollections %}
+  {% set selectedProductCollection = productCollectionInfo.selectedProductCollection %}
 
-{% macro dprCatalogueSearch(id, type = 'catalogue') %}
   <div class="dpr-search" data-dpr-module="dpr-catalogue-search">
     <div class="dpr-search-inputs">
         {{ govukInput({
@@ -17,6 +21,25 @@
             "data-table-id": id
           }
         }) }}
+        {% if productCollections.length > 0 %}
+          <form method="post" action="dpr/product-collection/selected">
+            {{ govukSelect({
+              id: 'productCollection',
+              name: 'productCollection',
+              value: selectedProductCollection.id,
+              formGroup: {
+                attributes: {
+                  style: "justify-self: end;"
+                }
+              },
+              items: productCollections,
+              label: {
+                text: 'Your collections',
+                classes: "govuk-label govuk-!-font-weight-bold govuk-!-margin-bottom-2"
+              }
+          }) }}
+        </form>
+      {% endif %}
     </div>
   </div>
 {% endmacro %}

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=(a,t)=>{for(var s in t)h(a,s,{get:t[s],enumerable:!0})},C=(a,t,s,e)=>{if(t&&typeof t=="object"||typeof t=="function")for(let i of k(t))!b.call(a,i)&&i!==s&&h(a,i,{get:()=>t[i],enumerable:!(e=p(t,i))||e.enumerable});return a};var d=a=>C(h({},"__esModule",{value:!0}),a);var g={};m(g,{Buckets:()=>c,default:()=>f});module.exports=d(g);var l=require("with-alpha-hex");class c{constructor(t,s,e,i,o){this.baseColour="#1d70b8";this.ragColours=["#00703c","#ffdd00","#d4351c"];this.buckets=[];this.hasRagScore=!1;this.initFromOptions=t=>{this.options=t.options||{},this.baseColour=this.options?.baseColour||this.baseColour,this.useRagColours=this.options?.useRagColours||!1,this.onlyBucketColoursDefined=this.options?.buckets?.every(s=>!s.max&&!s.min&&s.hexColour!==void 0)};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.map((t,s)=>({...this.buckets[s],...t}))};this.initAutomaticThresholdBucket=()=>{const{min:t,max:s,bucketSize:e}=this.setAutomaticThresholdSize();let i=0;this.buckets=this.buckets.map((o,u)=>{let r=t;return u!==0&&(r=i+1),i=e*(u+1)+t,u===this.buckets.length-1&&(i=s),{hexColour:this.options?.buckets?this.options.buckets[u]?.hexColour:o.hexColour,min:r,max:i}})};this.initBucketColours=()=>{if(this.useRagColours&&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,e)=>{const i=t*(e+1);return{hexColour:(0,l.withAlphaHex)(this.baseColour,i)}})}};this.setAutomaticThresholdSize=()=>{const t=this.responseData.map(o=>Number(o[this.valueKey].raw)),s=Math.min(...t),e=Math.max(...t),i=Math.ceil((e-s)/this.bucketCount);return{min:s,max:e,bucketSize:i}};this.setBucketCount=()=>{const{buckets:t}=this.options;this.hasRagScore?this.useRagColours?this.bucketCount=3:this.bucketCount=Math.max(...this.responseData.map(s=>s[this.valueKey].rag))+1:t?this.bucketCount=t.length:this.bucketCount=3};this.getBucketForValue=(t,s)=>{let e,i;return s!==void 0?{colour:this.buckets[s].hexColour,score:s}:(this.buckets.forEach((o,u)=>{const{min:r,max:n}=o;!r&&n&&t<=n&&(e=o.hexColour,i=u.toString()),r&&t>=o.min&&n&&t<=o.max&&(e=o.hexColour,i=u.toString()),r&&!n&&t>=r&&(e=o.hexColour,i=u.toString())}),{colour:e,score:i})};this.getBuckets=()=>this.buckets;this.responseData=t,this.initFromOptions(s),this.valueKey=e,this.hasRagScore=t[0][this.valueKey].rag!==void 0,this.autoBucketing=i,o&&(this.ragColours=o),this.initBuckets()}}var f=c;0&&(module.exports={Buckets});
+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 } from '../../../types/Metrics'\nimport {\n  DashboardVisualisation,\n  DashboardVisualisationBucket,\n  BucketDashboardVisualisationOptions,\n} from '../../_dashboards/dashboard/types'\n\nclass Buckets {\n  private baseColour = '#1d70b8'\n\n  private ragColours: string[] = ['#00703c', '#ffdd00', '#d4351c']\n\n  private buckets: DashboardVisualisationBucket[] = []\n\n  private useRagColours: boolean\n\n  private bucketCount: number\n\n  private onlyBucketColoursDefined: boolean\n\n  private autoBucketing: boolean\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: DashboardVisualisation,\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 = autoBucketing\n    if (ragColours) this.ragColours = ragColours\n    this.initBuckets()\n  }\n\n  private initFromOptions = (definition: DashboardVisualisation) => {\n    this.options = <BucketDashboardVisualisationOptions>definition.options || {}\n    this.baseColour = this.options?.baseColour || this.baseColour\n    this.useRagColours = this.options?.useRagColours || false\n    this.onlyBucketColoursDefined = this.options?.buckets?.every(\n      (bucket) => !bucket.max && !bucket.min && bucket.hexColour !== undefined,\n    )\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.map((bucket, i) => {\n      return {\n        ...this.buckets[i],\n        ...bucket,\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.useRagColours && 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.useRagColours) {\n        this.bucketCount = 3\n      } else {\n        this.bucketCount =\n          Math.max(...this.responseData.map((resData: DashboardDataResponse) => resData[this.valueKey].rag)) + 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) => {\n    let colour\n    let score\n\n    if (ragScore !== undefined) {\n      return {\n        colour: this.buckets[ragScore].hexColour,\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\n        score = index.toString()\n      }\n      // middle buckets\n      if (min && value >= bucket.min && max && value <= bucket.max) {\n        colour = bucket.hexColour\n        score = index.toString()\n      }\n      // last bucket\n      if (min && !max && value >= min) {\n        colour = bucket.hexColour\n        score = index.toString()\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", "value", "ragScore", "colour", "score", "index"]
+  "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": "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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,11 +1,11 @@
 /* eslint-disable prefer-destructuring */
 import { withAlphaHex } from 'with-alpha-hex'
-import { DashboardDataResponse } from '../../../types/Metrics'
+import { DashboardDataResponse, DashboardDataResponseWithRag } from '../../../types/Metrics'
 import {
-  DashboardVisualisation,
   DashboardVisualisationBucket,
   BucketDashboardVisualisationOptions,
-} from '../../_dashboards/dashboard/types'
+} from '../../_dashboards/dashboard-visualisation/types'
+import { components } from '../../../types/api'
 
 class Buckets {
   private baseColour = '#1d70b8'
@@ -14,25 +14,25 @@ class Buckets {
 
   private buckets: DashboardVisualisationBucket[] = []
 
-  private useRagColours: boolean
+  private useRagColour = false
 
-  private bucketCount: number
+  private bucketCount = 0
 
-  private onlyBucketColoursDefined: boolean
+  private onlyBucketColoursDefined = false
 
-  private autoBucketing: boolean
+  private autoBucketing = false
 
   private hasRagScore = false
 
   private valueKey: string
 
-  private options: BucketDashboardVisualisationOptions
+  private options: BucketDashboardVisualisationOptions = {}
 
   responseData: DashboardDataResponse[]
 
   constructor(
     responseData: DashboardDataResponse[],
-    definition: DashboardVisualisation,
+    definition: components['schemas']['DashboardVisualisationDefinition'],
     valueKey: string,
     autoBucketing?: boolean,
     ragColours?: string[],
@@ -41,18 +41,19 @@ class Buckets {
     this.initFromOptions(definition)
     this.valueKey = valueKey
     this.hasRagScore = responseData[0][this.valueKey].rag !== undefined
-    this.autoBucketing = autoBucketing
+    this.autoBucketing = Boolean(autoBucketing)
     if (ragColours) this.ragColours = ragColours
     this.initBuckets()
   }
 
-  private initFromOptions = (definition: DashboardVisualisation) => {
+  private initFromOptions = (definition: components['schemas']['DashboardVisualisationDefinition']) => {
     this.options = <BucketDashboardVisualisationOptions>definition.options || {}
     this.baseColour = this.options?.baseColour || this.baseColour
-    this.useRagColours = this.options?.useRagColours || false
-    this.onlyBucketColoursDefined = this.options?.buckets?.every(
-      (bucket) => !bucket.max && !bucket.min && bucket.hexColour !== undefined,
-    )
+    this.useRagColour = this.options?.useRagColour || false
+    this.onlyBucketColoursDefined =
+      this.options && this.options.buckets
+        ? this.options?.buckets?.every((bucket) => !bucket.max && !bucket.min && bucket.hexColour !== undefined)
+        : false
   }
 
   private initBuckets = () => {
@@ -77,12 +78,14 @@ class Buckets {
   }
 
   private initCustomThresholdBuckets = () => {
-    this.buckets = this.options.buckets.map((bucket, i) => {
-      return {
-        ...this.buckets[i],
-        ...bucket,
-      }
-    })
+    this.buckets = this.options.buckets
+      ? this.options.buckets.map((bucket, i) => {
+          return {
+            ...this.buckets[i],
+            ...bucket,
+          }
+        })
+      : []
   }
 
   /**
@@ -107,7 +110,7 @@ class Buckets {
   }
 
   private initBucketColours = () => {
-    if (this.useRagColours && this.bucketCount === 3) {
+    if (this.useRagColour && this.bucketCount === 3) {
       this.buckets = Array.from(new Array(this.bucketCount)).map((d, i) => {
         return {
           hexColour: this.ragColours[i],
@@ -140,11 +143,16 @@ class Buckets {
   private setBucketCount = () => {
     const { buckets } = this.options
     if (this.hasRagScore) {
-      if (this.useRagColours) {
+      if (this.useRagColour) {
         this.bucketCount = 3
       } else {
-        this.bucketCount =
-          Math.max(...this.responseData.map((resData: DashboardDataResponse) => resData[this.valueKey].rag)) + 1
+        const allRags: number[] = this.responseData.reduce((acc: number[], resData: DashboardDataResponse) => {
+          if (resData[this.valueKey].rag !== undefined) {
+            acc.push(<number>resData[this.valueKey].rag)
+          }
+          return acc
+        }, [])
+        this.bucketCount = Math.max(...allRags) + 1
       }
     } else if (buckets) {
       this.bucketCount = buckets.length
@@ -153,13 +161,13 @@ class Buckets {
     }
   }
 
-  getBucketForValue = (value: number, ragScore?: number) => {
-    let colour
-    let score
+  getBucketForValue = (value: number, ragScore?: number): { colour: string; score: number } => {
+    let colour = ''
+    let score = 0
 
     if (ragScore !== undefined) {
       return {
-        colour: this.buckets[ragScore].hexColour,
+        colour: this.buckets[ragScore].hexColour || colour,
         score: ragScore,
       }
     }
@@ -168,18 +176,18 @@ class Buckets {
       const { min, max } = bucket
       // First bucket
       if (!min && max && value <= max) {
-        colour = bucket.hexColour
-        score = index.toString()
+        colour = bucket.hexColour || colour
+        score = index
       }
       // middle buckets
-      if (min && value >= bucket.min && max && value <= bucket.max) {
-        colour = bucket.hexColour
-        score = index.toString()
+      if (min && value >= min && max && value <= max) {
+        colour = bucket.hexColour || colour
+        score = index
       }
       // last bucket
       if (min && !max && value >= min) {
-        colour = bucket.hexColour
-        score = index.toString()
+        colour = bucket.hexColour || colour
+        score = index
       }
     })
 

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

@@ -1,2 +1,2 @@
-var g=Object.create;var h=Object.defineProperty;var M=Object.getOwnPropertyDescriptor;var w=Object.getOwnPropertyNames;var F=Object.getPrototypeOf,V=Object.prototype.hasOwnProperty;var x=(e,i)=>{for(var t in i)h(e,t,{get:i[t],enumerable:!0})},p=(e,i,t,a)=>{if(i&&typeof i=="object"||typeof i=="function")for(let s of w(i))!V.call(e,s)&&s!==t&&h(e,s,{get:()=>i[s],enumerable:!(a=M(i,s))||a.enumerable});return e};var d=(e,i,t)=>(t=e!=null?g(F(e)):{},p(i||!e||!e.__esModule?h(t,"default",{value:e,enumerable:!0}):t,e)),B=e=>p(h({},"__esModule",{value:!0}),e);var C={};x(C,{HeatmapChart:()=>m,default:()=>Y});module.exports=B(C);var n=d(require("dayjs")),y=require("../../../_dashboards/dashboard/types"),D=d(require("../../../../utils/datasetHelper")),b=d(require("../DashboardVisualisation")),f=d(require("../Buckets"));class m extends b.default{constructor(t,a,s){super(t,s);this.data=[];this.dayDateFormat="DD/MM/YYYY";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:s}=this.definition,o=[];if(a.measures.length!==2?o.push(`Measures should only have 2 columns defined. Only found ${a.measures.length}`):s===y.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: ${s}, errors: ${o.join(",")}`;throw new Error(r)}};this.initTimeseriesData=()=>{const t=D.default.groupRowsByTimestamp(this.responseData);this.data=t.map(a=>{const{raw:s,rag:o}=a[0][this.valueKey],r=a[0].ts.raw,k=Number(s),v=o!==void 0?Number(a[0][this.valueKey].rag):void 0;let u,l;switch(this.granularity){case"hourly":break;case"weekly":u=(0,n.default)(r,this.dayDateFormat).format("ddd"),l=(0,n.default)(r,this.dayDateFormat).week();break;case"daily":u=(0,n.default)(r,this.dayDateFormat).format("MMM YY"),l=(0,n.default)(r,this.dayDateFormat).format("D");break;case"monthly":{const c=r.split(" ");u=c[1],l=c[0]}break;case"annually":u="year",l=r;break;default:u=(0,n.default)(r,this.dayDateFormat).format("MMM YY"),l=(0,n.default)(r,this.dayDateFormat).format("D");break}return{y:l,x:u,v:k,r:v}})};this.bucketData=()=>{this.data=this.data.map(t=>{const{v:a,r:s}=t,o=this.bucketsHelper.getBucketForValue(a,s);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),this.buckets=this.bucketsHelper.getBuckets()}}var Y=m;0&&(module.exports={HeatmapChart});
+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});
 //# sourceMappingURL=HeatmapChart.js.map