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

package/dpr/components/_dashboards/scorecard/Scorecard.ts

@@ -1,42 +1,42 @@
 /* eslint-disable prefer-destructuring */
 import { DashboardDataResponse } from '../../../types/Metrics'
-import DashboardVisualisationClass from '../../_charts/chart/DashboardVisualisation'
-import {
-  DashboardVisualisation,
-  DashboardVisualisationBucket,
-  DashboardVisualisationColumnKey,
-  DashboardVisualisationColumnMeasure,
-} from '../dashboard/types'
+import DashboardVisualisationClass from '../dashboard-visualisation/DashboardVisualisation'
+import { DashboardVisualisationBucket } from '../dashboard-visualisation/types'
 import DatasetHelper from '../../../utils/datasetHelper'
 import { CreateScorecardDataArgs, Scorecard, ScorecardDataset, ScorecardGroup, ScorecardTrend } from './types'
 import Buckets from '../../_charts/chart/Buckets'
+import { components } from '../../../types/api'
 
 class ScorecardVisualisation extends DashboardVisualisationClass {
   private dataset: ScorecardDataset
 
-  private groupKey: DashboardVisualisationColumnKey
+  private groupKey: components['schemas']['DashboardVisualisationColumnDefinition'] | undefined
 
-  private groupKeyId: string
+  private groupKeyId: string | undefined
 
-  private groupKeyDisplay: string
+  private groupKeyDisplay: string | undefined
 
-  private bucketsHelper: Buckets
+  private bucketsHelper: Buckets | undefined
 
   private buckets: DashboardVisualisationBucket[] = []
 
-  private valueColumn: DashboardVisualisationColumnMeasure
+  private valueColumn: components['schemas']['DashboardVisualisationColumnDefinition'] | undefined
 
-  private valueKey: string
+  private valueKey = ''
 
-  private titleColumn: DashboardVisualisationColumnMeasure
+  private titleColumn: components['schemas']['DashboardVisualisationColumnDefinition'] | undefined
 
-  private titleKey: string
+  private titleKey = ''
 
   private group: boolean
 
   private ragColours: string[] = ['#cce2d8', '#fff7bf', '#f4cdc6']
 
-  constructor(responseData: DashboardDataResponse[], definition: DashboardVisualisation, group = false) {
+  constructor(
+    responseData: DashboardDataResponse[],
+    definition: components['schemas']['DashboardVisualisationDefinition'],
+    group = false,
+  ) {
     super(responseData, definition)
     this.group = group
     this.dataset = this.getDataset(definition, responseData)
@@ -51,8 +51,10 @@ class ScorecardVisualisation extends DashboardVisualisationClass {
   }
 
   private initBuckets = (responseData: DashboardDataResponse[], valueKey: string) => {
-    this.bucketsHelper = new Buckets(responseData, this.definition, valueKey, false, this.ragColours)
-    this.buckets = new Buckets(responseData, this.definition, valueKey, false, this.ragColours).getBuckets()
+    if (this.definition.options?.buckets || this.definition.options?.useRagColour) {
+      this.bucketsHelper = new Buckets(responseData, this.definition, valueKey, false, this.ragColours)
+      this.buckets = new Buckets(responseData, this.definition, valueKey, false, this.ragColours).getBuckets()
+    }
   }
 
   private initGroupVars = () => {
@@ -66,11 +68,14 @@ class ScorecardVisualisation extends DashboardVisualisationClass {
       this.titleColumn = this.measures.find((col) => {
         return col.display || col.display === ''
       })
-      this.titleKey = this.titleColumn?.id
+      this.titleKey = this.titleColumn?.id || ''
     }
   }
 
-  private getDataset = (scorecardDefinition: DashboardVisualisation, rawData: DashboardDataResponse[]) => {
+  private getDataset = (
+    scorecardDefinition: components['schemas']['DashboardVisualisationDefinition'],
+    rawData: DashboardDataResponse[],
+  ) => {
     const latestData = DatasetHelper.getLastestDataset(rawData)
     const latestDataSetRows = DatasetHelper.getDatasetRows(scorecardDefinition, latestData)
     const latestTs = latestDataSetRows[0]?.ts?.raw
@@ -90,7 +95,7 @@ class ScorecardVisualisation extends DashboardVisualisationClass {
   }
 
   private setRagScore = (value: number, rag?: number) => {
-    return this.bucketsHelper.getBucketForValue(value, rag)
+    return this.bucketsHelper?.getBucketForValue(value, rag)
   }
 
   private createScorecardData = ({
@@ -101,11 +106,14 @@ class ScorecardVisualisation extends DashboardVisualisationClass {
     valueFrom,
     prevVal,
     groupTitle,
-  }: CreateScorecardDataArgs) => {
+  }: CreateScorecardDataArgs): Scorecard => {
     return {
+      id: this.definition.id,
       title,
       value,
-      ...(!Number.isNaN(value) && this.buckets.length && { rag: this.setRagScore(<number>value, rag) }),
+      ...(!Number.isNaN(value) &&
+        this.buckets.length &&
+        this.bucketsHelper && { rag: this.setRagScore(<number>value, rag) }),
       valueFor,
       trend: this.createTrend(valueFor, valueFrom, value, prevVal),
       ...(groupTitle && {
@@ -212,8 +220,8 @@ class ScorecardVisualisation extends DashboardVisualisationClass {
   private createScorecardGroupFromListWithGroups = () => {
     const { latest, earliest } = this.dataset
 
-    let earliestGroupedByKey = DatasetHelper.groupRowsByKey(earliest, this.groupKeyId)
-    let latestGroupedByKey = DatasetHelper.groupRowsByKey(latest, this.groupKeyId)
+    let earliestGroupedByKey = DatasetHelper.groupRowsByKey(earliest, <string>this.groupKeyId)
+    let latestGroupedByKey = DatasetHelper.groupRowsByKey(latest, <string>this.groupKeyId)
     if (this.groupKeyId === this.titleKey) {
       latestGroupedByKey = [latestGroupedByKey.flat()]
       earliestGroupedByKey = [earliestGroupedByKey.flat()]
@@ -221,7 +229,7 @@ class ScorecardVisualisation extends DashboardVisualisationClass {
 
     const scorecardGroup = latestGroupedByKey.map((group, groupIndex) => {
       return {
-        title: this.createGroupTitle(group[0]),
+        title: this.groupKeyDisplay ? `By ${this.groupKeyDisplay}` : '',
         scorecards: group.map((row, rowIndex) => {
           const values = this.getScorecardValues(row)
           const comparisonRow = earliestGroupedByKey[groupIndex][rowIndex]
@@ -240,7 +248,7 @@ class ScorecardVisualisation extends DashboardVisualisationClass {
 
   private getScorecardValues = (row: DashboardDataResponse) => {
     const { latestTs, earliestTs } = this.dataset
-    const title = `${this.titleColumn.display} ${row[this.titleKey].raw}`
+    const title = `${this.titleColumn?.display} ${row[this.titleKey].raw}`
     const rowCol = row[this.valueKey]
     const { raw, rag: ragScore } = rowCol
     const value = Number(raw)
@@ -270,10 +278,10 @@ class ScorecardVisualisation extends DashboardVisualisationClass {
       const prevVal = earliest[index][this.valueKey].raw
       const valueFor = `${latestTs}`
       const valueFrom = `${earliestTs}`
-      const title = this.titleColumn.display
+      const title = this.titleColumn?.display
 
       return this.createScorecardData({
-        title,
+        title: title || '',
         value,
         rag,
         prevVal,

package/dpr/components/_dashboards/scorecard/types.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/components/_dashboards/scorecard/types.ts"],
-  "sourcesContent": ["import { DashboardDataResponse } from '../../../types/Metrics'\n\nexport interface Scorecard {\n  title: string\n  group?: string\n  value: number | string\n  trend?: ScorecardTrend\n  link?: {\n    href: '#'\n    displayName: 'View breakdown'\n  }\n  valueFor?: string\n  rag?: ScorecardRag\n}\n\nexport interface ScorecardSubGroup {\n  name: string\n  scorecards: Scorecard[]\n}\n\nexport interface ScorecardGroup {\n  title?: string\n  description?: string\n  scorecards: Scorecard[]\n}\n\nexport interface ScorecardTrend {\n  direction: number\n  value: number\n  from: string\n}\n\nexport interface ScorecardRag {\n  score: number\n  colour: string\n}\n\nexport interface ScorecardDataset {\n  earliest: DashboardDataResponse[]\n  earliestTs: string | number\n  latest: DashboardDataResponse[]\n  latestTs: string | number\n}\n\nexport interface CreateScorecardDataArgs {\n  title: string\n  value: string | number\n  rag?: number\n  valueFor: string\n  valueFrom: string\n  prevVal: string | number\n  groupTitle?: string\n}\n"],
+  "sourcesContent": ["import { DashboardDataResponse } from '../../../types/Metrics'\n\nexport interface Scorecard {\n  id: string\n  title: string\n  group?: string\n  value: number | string\n  trend?: ScorecardTrend\n  link?: {\n    href: '#'\n    displayName: 'View breakdown'\n  }\n  valueFor?: string\n  rag?: ScorecardRag\n}\n\nexport interface ScorecardSubGroup {\n  name: string\n  scorecards: Scorecard[]\n}\n\nexport interface ScorecardGroup {\n  title?: string\n  description?: string\n  scorecards: Scorecard[]\n}\n\nexport interface ScorecardTrend {\n  direction: number\n  value: number\n  from: string\n}\n\nexport interface ScorecardRag {\n  score: number\n  colour: string\n}\n\nexport interface ScorecardDataset {\n  earliest: DashboardDataResponse[]\n  earliestTs: string | number\n  latest: DashboardDataResponse[]\n  latestTs: string | number\n}\n\nexport interface CreateScorecardDataArgs {\n  title: string\n  value: string | number\n  rag?: number\n  valueFor: string\n  valueFrom: string\n  prevVal: string | number\n  groupTitle?: string\n}\n"],
   "mappings": "kWAAA,IAAAA,EAAA,kBAAAC,EAAAD",
   "names": ["types_exports", "__toCommonJS"]
 }

package/dpr/components/_dashboards/scorecard/types.ts

@@ -1,6 +1,7 @@
 import { DashboardDataResponse } from '../../../types/Metrics'
 
 export interface Scorecard {
+  id: string
   title: string
   group?: string
   value: number | string

package/dpr/components/_dashboards/scorecard/utils.js

@@ -1,2 +1,2 @@
-var d=Object.defineProperty;var p=Object.getOwnPropertyDescriptor;var u=Object.getOwnPropertyNames;var h=Object.prototype.hasOwnProperty;var l=(o,c)=>{for(var e in c)d(o,e,{get:c[e],enumerable:!0})},i=(o,c,e,t)=>{if(c&&typeof c=="object"||typeof c=="function")for(let r of u(c))!h.call(o,r)&&r!==e&&d(o,r,{get:()=>c[r],enumerable:!(t=p(c,r))||t.enumerable});return o};var m=o=>i(d({},"__esModule",{value:!0}),o);var S={};l(S,{default:()=>b,mergeScorecardsIntoGroup:()=>s});module.exports=m(S);var n=require("../dashboard/types");const s=o=>(o.reduce((e,t,r)=>(t.type===n.DashboardVisualisationType.SCORECARD&&e.push(r),e),[]).reduce((e,t)=>{const r=e[e.length-1];return(!r||r[r.length-1]!==t-1)&&e.push([]),e[e.length-1].push(t),e},[]).reverse().forEach(e=>{const t=e[0],r=e.map(a=>o[a].data).filter(a=>!!a);for(;e.length;)o.splice(e.pop(),1);r.length&&o.splice(t,0,{id:`${t}`,type:n.DashboardVisualisationType.SCORECARD_GROUP,data:[{scorecards:r}]})}),o);var b={mergeScorecardsIntoGroup:s};0&&(module.exports={mergeScorecardsIntoGroup});
+var d=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var p=Object.getOwnPropertyNames;var h=Object.prototype.hasOwnProperty;var i=(o,c)=>{for(var e in c)d(o,e,{get:c[e],enumerable:!0})},l=(o,c,e,t)=>{if(c&&typeof c=="object"||typeof c=="function")for(let r of p(c))!h.call(o,r)&&r!==e&&d(o,r,{get:()=>c[r],enumerable:!(t=u(c,r))||t.enumerable});return o};var m=o=>l(d({},"__esModule",{value:!0}),o);var f={};i(f,{default:()=>b,mergeScorecardsIntoGroup:()=>s});module.exports=m(f);var n=require("../dashboard-visualisation/types");const s=o=>(o.reduce((e,t,r)=>(t.type===n.DashboardVisualisationType.SCORECARD&&e.push(r),e),[]).reduce((e,t)=>{const r=e[e.length-1];return(!r||r[r.length-1]!==t-1)&&e.push([]),e[e.length-1].push(t),e},[]).reverse().forEach(e=>{const t=e[0],r=e.map(a=>o[a].data).filter(a=>!!a);for(;e.length;){const a=e.pop();a!==void 0&&o.splice(a,1)}r.length&&o.splice(t,0,{id:`${t}`,type:n.DashboardVisualisationType.SCORECARD_GROUP,data:[{scorecards:r}]})}),o);var b={mergeScorecardsIntoGroup:s};0&&(module.exports={mergeScorecardsIntoGroup});
 //# sourceMappingURL=utils.js.map

package/dpr/components/_dashboards/scorecard/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/components/_dashboards/scorecard/utils.ts"],
-  "sourcesContent": ["import { DashboardUIVisualisation, DashboardVisualisationType } from '../dashboard/types'\nimport { Scorecard } from './types'\n\nexport const mergeScorecardsIntoGroup = (visualisations: DashboardUIVisualisation[]) => {\n  const groupedScorecardIndexes: number[][] = visualisations\n    // get scorecard indexes\n    .reduce((acc: number[], vis: DashboardUIVisualisation, i: number) => {\n      if (vis.type === DashboardVisualisationType.SCORECARD) acc.push(i)\n      return acc\n    }, [])\n    // group adjacent indexes\n    .reduce((r, n) => {\n      const lastSubArray = r[r.length - 1]\n      if (!lastSubArray || lastSubArray[lastSubArray.length - 1] !== n - 1) r.push([])\n      r[r.length - 1].push(n)\n      return r\n    }, [])\n\n  groupedScorecardIndexes.reverse().forEach((group: number[]) => {\n    const spliceAtIndex = group[0]\n    const scorecardGroup: Scorecard[] = group\n      .map((scIndex: number) => {\n        return visualisations[scIndex].data as Scorecard\n      })\n      .filter((scorecard: Scorecard) => !!scorecard)\n\n    while (group.length) {\n      visualisations.splice(group.pop(), 1)\n    }\n\n    if (scorecardGroup.length) {\n      visualisations.splice(spliceAtIndex, 0, {\n        id: `${spliceAtIndex}`,\n        type: DashboardVisualisationType.SCORECARD_GROUP,\n        data: [{ scorecards: scorecardGroup }],\n      })\n    }\n  })\n\n  return visualisations\n}\n\nexport default {\n  mergeScorecardsIntoGroup,\n}\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,6BAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAAqE,8BAG9D,MAAMF,EAA4BG,IACKA,EAEzC,OAAO,CAACC,EAAeC,EAA+BC,KACjDD,EAAI,OAAS,6BAA2B,WAAWD,EAAI,KAAKE,CAAC,EAC1DF,GACN,CAAC,CAAC,EAEJ,OAAO,CAACG,EAAGC,IAAM,CAChB,MAAMC,EAAeF,EAAEA,EAAE,OAAS,CAAC,EACnC,OAAI,CAACE,GAAgBA,EAAaA,EAAa,OAAS,CAAC,IAAMD,EAAI,IAAGD,EAAE,KAAK,CAAC,CAAC,EAC/EA,EAAEA,EAAE,OAAS,CAAC,EAAE,KAAKC,CAAC,EACfD,CACT,EAAG,CAAC,CAAC,EAEiB,QAAQ,EAAE,QAASG,GAAoB,CAC7D,MAAMC,EAAgBD,EAAM,CAAC,EACvBE,EAA8BF,EACjC,IAAKG,GACGV,EAAeU,CAAO,EAAE,IAChC,EACA,OAAQC,GAAyB,CAAC,CAACA,CAAS,EAE/C,KAAOJ,EAAM,QACXP,EAAe,OAAOO,EAAM,IAAI,EAAG,CAAC,EAGlCE,EAAe,QACjBT,EAAe,OAAOQ,EAAe,EAAG,CACtC,GAAI,GAAGA,CAAa,GACpB,KAAM,6BAA2B,gBACjC,KAAM,CAAC,CAAE,WAAYC,CAAe,CAAC,CACvC,CAAC,CAEL,CAAC,EAEMT,GAGT,IAAOJ,EAAQ,CACb,yBAAAC,CACF",
+  "sourcesContent": ["import { DashboardVisualisation, DashboardVisualisationType } from '../dashboard-visualisation/types'\nimport { Scorecard } from './types'\n\nexport const mergeScorecardsIntoGroup = (visualisations: DashboardVisualisation[]) => {\n  const groupedScorecardIndexes: number[][] = visualisations\n    // get scorecard indexes\n    .reduce((acc: number[], vis: DashboardVisualisation, i: number) => {\n      if (vis.type === DashboardVisualisationType.SCORECARD) acc.push(i)\n      return acc\n    }, [])\n    // group adjacent indexes\n    .reduce((r: number[][], n) => {\n      const lastSubArray = r[r.length - 1]\n      if (!lastSubArray || lastSubArray[lastSubArray.length - 1] !== n - 1) r.push([])\n      r[r.length - 1].push(n)\n      return r\n    }, [])\n\n  groupedScorecardIndexes.reverse().forEach((group: number[]) => {\n    const spliceAtIndex = group[0]\n    const scorecardGroup: Scorecard[] = group\n      .map((scIndex: number) => {\n        return visualisations[scIndex].data as Scorecard\n      })\n      .filter((scorecard: Scorecard) => !!scorecard)\n\n    while (group.length) {\n      const i = group.pop()\n      if (i !== undefined) visualisations.splice(i, 1)\n    }\n\n    if (scorecardGroup.length) {\n      visualisations.splice(spliceAtIndex, 0, {\n        id: `${spliceAtIndex}`,\n        type: DashboardVisualisationType.SCORECARD_GROUP,\n        data: [{ scorecards: scorecardGroup }],\n      })\n    }\n  })\n\n  return visualisations\n}\n\nexport default {\n  mergeScorecardsIntoGroup,\n}\n"],
+  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,6BAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAAmE,4CAG5D,MAAMF,EAA4BG,IACKA,EAEzC,OAAO,CAACC,EAAeC,EAA6BC,KAC/CD,EAAI,OAAS,6BAA2B,WAAWD,EAAI,KAAKE,CAAC,EAC1DF,GACN,CAAC,CAAC,EAEJ,OAAO,CAACG,EAAeC,IAAM,CAC5B,MAAMC,EAAeF,EAAEA,EAAE,OAAS,CAAC,EACnC,OAAI,CAACE,GAAgBA,EAAaA,EAAa,OAAS,CAAC,IAAMD,EAAI,IAAGD,EAAE,KAAK,CAAC,CAAC,EAC/EA,EAAEA,EAAE,OAAS,CAAC,EAAE,KAAKC,CAAC,EACfD,CACT,EAAG,CAAC,CAAC,EAEiB,QAAQ,EAAE,QAASG,GAAoB,CAC7D,MAAMC,EAAgBD,EAAM,CAAC,EACvBE,EAA8BF,EACjC,IAAKG,GACGV,EAAeU,CAAO,EAAE,IAChC,EACA,OAAQC,GAAyB,CAAC,CAACA,CAAS,EAE/C,KAAOJ,EAAM,QAAQ,CACnB,MAAMJ,EAAII,EAAM,IAAI,EAChBJ,IAAM,QAAWH,EAAe,OAAOG,EAAG,CAAC,CACjD,CAEIM,EAAe,QACjBT,EAAe,OAAOQ,EAAe,EAAG,CACtC,GAAI,GAAGA,CAAa,GACpB,KAAM,6BAA2B,gBACjC,KAAM,CAAC,CAAE,WAAYC,CAAe,CAAC,CACvC,CAAC,CAEL,CAAC,EAEMT,GAGT,IAAOJ,EAAQ,CACb,yBAAAC,CACF",
   "names": ["utils_exports", "__export", "utils_default", "mergeScorecardsIntoGroup", "__toCommonJS", "import_types", "visualisations", "acc", "vis", "i", "r", "n", "lastSubArray", "group", "spliceAtIndex", "scorecardGroup", "scIndex", "scorecard"]
 }

package/dpr/components/_dashboards/scorecard/utils.test.ts

@@ -1,8 +1,11 @@
 import ScorecardUtils from './utils'
 import { Scorecard } from './types'
 
-import { DashboardUIVisualisation, DashboardVisualisationType } from '../dashboard/types'
-import { ChartCardData } from '../../../types/Charts'
+import {
+  DashboardVisualisation,
+  DashboardVisualisationType,
+  DashboardVisualisatonCardData,
+} from '../dashboard-visualisation/types'
 
 describe('ScorecardUtils', () => {
   let scorecardData1: Scorecard
@@ -10,6 +13,7 @@ describe('ScorecardUtils', () => {
 
   beforeEach(() => {
     scorecardData1 = {
+      id: '1',
       rag: {
         colour: 'red',
         score: 2,
@@ -25,6 +29,7 @@ describe('ScorecardUtils', () => {
     }
 
     scorecardData2 = {
+      id: '2',
       rag: {
         colour: 'red',
         score: 2,
@@ -42,7 +47,7 @@ describe('ScorecardUtils', () => {
 
   describe('mergeScorecards', () => {
     it('should merge individual scorecards into a scorecard group', () => {
-      const visualistationData: DashboardUIVisualisation[] = [
+      const visualistationData: DashboardVisualisation[] = [
         {
           id: '1',
           type: DashboardVisualisationType.SCORECARD,
@@ -56,7 +61,7 @@ describe('ScorecardUtils', () => {
         {
           id: '3',
           type: DashboardVisualisationType.BAR,
-          data: {} as unknown as ChartCardData,
+          data: {} as unknown as DashboardVisualisatonCardData,
         },
         {
           id: '4',
@@ -79,6 +84,7 @@ describe('ScorecardUtils', () => {
             {
               scorecards: [
                 {
+                  id: '1',
                   rag: {
                     colour: 'red',
                     score: 2,
@@ -93,6 +99,7 @@ describe('ScorecardUtils', () => {
                   valueFor: 'Jan 25',
                 },
                 {
+                  id: '2',
                   rag: {
                     colour: 'red',
                     score: 2,
@@ -122,6 +129,7 @@ describe('ScorecardUtils', () => {
             {
               scorecards: [
                 {
+                  id: '1',
                   rag: {
                     colour: 'red',
                     score: 2,
@@ -136,6 +144,7 @@ describe('ScorecardUtils', () => {
                   valueFor: 'Jan 25',
                 },
                 {
+                  id: '2',
                   rag: {
                     colour: 'red',
                     score: 2,

package/dpr/components/_dashboards/scorecard/utils.ts

@@ -1,15 +1,15 @@
-import { DashboardUIVisualisation, DashboardVisualisationType } from '../dashboard/types'
+import { DashboardVisualisation, DashboardVisualisationType } from '../dashboard-visualisation/types'
 import { Scorecard } from './types'
 
-export const mergeScorecardsIntoGroup = (visualisations: DashboardUIVisualisation[]) => {
+export const mergeScorecardsIntoGroup = (visualisations: DashboardVisualisation[]) => {
   const groupedScorecardIndexes: number[][] = visualisations
     // get scorecard indexes
-    .reduce((acc: number[], vis: DashboardUIVisualisation, i: number) => {
+    .reduce((acc: number[], vis: DashboardVisualisation, i: number) => {
       if (vis.type === DashboardVisualisationType.SCORECARD) acc.push(i)
       return acc
     }, [])
     // group adjacent indexes
-    .reduce((r, n) => {
+    .reduce((r: number[][], n) => {
       const lastSubArray = r[r.length - 1]
       if (!lastSubArray || lastSubArray[lastSubArray.length - 1] !== n - 1) r.push([])
       r[r.length - 1].push(n)
@@ -25,7 +25,8 @@ export const mergeScorecardsIntoGroup = (visualisations: DashboardUIVisualisatio
       .filter((scorecard: Scorecard) => !!scorecard)
 
     while (group.length) {
-      visualisations.splice(group.pop(), 1)
+      const i = group.pop()
+      if (i !== undefined) visualisations.splice(i, 1)
     }
 
     if (scorecardGroup.length) {

package/dpr/components/_dashboards/scorecard/view.njk

@@ -1,6 +1,7 @@
-{% macro dprScoreCard(scorecard) %}
+{% macro dprScoreCard(scorecard, index) %}
   {% set classes = scorecard.classes %}
 
+  {% set id = scorecard.id %}
   {% set title = scorecard.title %}
   {% set value = scorecard.value %}
   {% set rag = scorecard.rag %}
@@ -20,13 +21,13 @@
     {% set directionIcon = '◼' %}
     {% set directionDisplay = '' %}
   {% endif %}
-  <div class="dpr-scorecard" data-dpr-module="scorecard">
-    <p class="govuk-heading-s govuk-!-margin-bottom-1">
+  <div class="dpr-scorecard" data-dpr-module="scorecard" aria-labelledby="{{ id }}_title_{{index }}">
+    <p id="{{ id }}_title_{{index}}" class="govuk-heading-s govuk-!-margin-bottom-1">
       {{ title }}
     </p>
 
-    <p style="background-color: {{ rag.colour }}" class="govuk-body dpr-scorecard__value {% if rag %}govuk-tag--{{ rag.colour }}{% endif %}">{{ value }}</p>
-    {% if rag.score %}
+    <p {% if rag %}style="background-color: {{ rag.colour }}"{% endif %} class="govuk-body dpr-scorecard__value {% if rag %}govuk-tag--{{ rag.colour }}{% endif %}">{{ value }}</p>
+    {% if rag.score !== 'undefined' %}
       <p class="govuk-body dpr-scorecard__value-description">Status: {{ rag.score }}</p>
     {% endif %}
 

package/dpr/components/_dashboards/scorecard-group/view.njk

@@ -6,13 +6,13 @@
     {% set title = group.title %}
     {% set scorecards = group.scorecards %}
     
-    {% if scorecardGroup.length !== 1 %}
-      <p class="govuk-heading-s"><strong>{{ title }}</strong></p>
+   {% if title %}
+      <h4 id="{{ id }}_scorecard_group_{{ loop.index }}" class="govuk-heading-s"><strong>{{ title }}</strong></h3>
     {% endif %}
 
-    <div class="dpr-scorecard-group">
+    <div class="dpr-scorecard-group" {% if title %} aria-labelledby="{{ id }}_scorecard_group_{{ loop.index }}"{% endif %}>
       {% for scorecard in scorecards %}
-        {{ dprScoreCard(scorecard) }}
+        {{ dprScoreCard(scorecard, loop.index) }}
       {% endfor %}
     </div> 
   {% endfor %}

package/dpr/components/_reports/report-actions/types.d.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/components/_reports/report-actions/types.d.ts"],
-  "sourcesContent": ["import { LoadType } from '../../../types/UserReports'\n\nexport interface DownloadActionParams {\n  enabled: boolean\n  csrfToken: string\n  reportId: string\n  reportName: string\n  name: string\n  id: string\n  tableId?: string\n  columns: string[]\n  definitionPath: string\n  canDownload: boolean\n  loadType: LoadType\n  currentUrl: string\n  currentQueryParams: string\n  nestedBaseUrl: string\n  sortColumn?: string\n  sortedAsc?: string\n}\n\nexport interface ShareActionParams {\n  reportName: string\n  name: string\n  url: string\n}\n\nexport interface RefreshActionParams {\n  url: string\n  executionId: string\n}\n\nexport interface PrintActionParams {\n  enabled: boolean\n}\n\nexport interface CopyActionParams {\n  url: string\n}\n\nexport interface GetActionsParams {\n  refresh?: RefreshActionParams\n  print?: PrintActionParams\n  copy?: CopyActionParams\n  share?: ShareActionParams\n  download?: DownloadActionParams\n}\n\nexport interface ActionTemplate {\n  id: string\n  disabled: boolean\n  text: string\n  ariaLabelText: string\n}\n\nexport interface ActionTemplates {\n  refresh: ActionTemplate\n  printable: ActionTemplate\n  sharable: ActionTemplate\n  copy: ActionTemplate\n  downloadable: ActionTemplate\n}\n\nexport interface ReportAction {\n  id: string\n  disabled: boolean\n  text: string\n  ariaLabelText: string\n  href?: string\n  attributes?: {\n    reportId?: string\n    id?: string\n    csrfToken?: string\n    tableId?: string\n    type?: ReportType\n    reportName?: string\n    name?: string\n    columns: string[]\n    definitionPath: string\n  }\n}\n"],
+  "sourcesContent": ["import { LoadType } from '../../../types/UserReports'\n\nexport interface DownloadActionParams {\n  enabled: boolean\n  csrfToken: string\n  reportId: string\n  reportName: string\n  name: string\n  id: string\n  tableId?: string\n  columns: string[]\n  definitionPath: string\n  canDownload: boolean\n  loadType: LoadType\n  currentUrl: string\n  currentQueryParams?: string\n  nestedBaseUrl: string\n  sortColumn?: string\n  sortedAsc?: string\n}\n\nexport interface ShareActionParams {\n  reportName: string\n  name: string\n  url: string\n}\n\nexport interface RefreshActionParams {\n  url: string\n  executionId: string\n}\n\nexport interface PrintActionParams {\n  enabled: boolean\n}\n\nexport interface CopyActionParams {\n  url: string\n}\n\nexport interface GetActionsParams {\n  refresh?: RefreshActionParams\n  print?: PrintActionParams\n  copy?: CopyActionParams\n  share?: ShareActionParams\n  download?: DownloadActionParams\n}\n\nexport interface ActionTemplate {\n  id: string\n  disabled: boolean\n  text: string\n  ariaLabelText: string\n}\n\nexport interface ActionTemplates {\n  refresh: ActionTemplate\n  printable: ActionTemplate\n  sharable: ActionTemplate\n  copy: ActionTemplate\n  downloadable: ActionTemplate\n}\n\nexport interface ReportAction {\n  id: string\n  disabled: boolean\n  text: string\n  ariaLabelText: string\n  href?: string\n  attributes?: {\n    reportId?: string\n    id?: string\n    csrfToken?: string\n    tableId?: string\n    type?: ReportType\n    reportName?: string\n    name?: string\n    columns: string[]\n    definitionPath: string\n  }\n}\n"],
   "mappings": "kWAAA,IAAAA,EAAA,kBAAAC,EAAAD",
   "names": ["types_d_exports", "__toCommonJS"]
 }

package/dpr/components/_reports/report-actions/types.d.ts

@@ -13,7 +13,7 @@ export interface DownloadActionParams {
   canDownload: boolean
   loadType: LoadType
   currentUrl: string
-  currentQueryParams: string
+  currentQueryParams?: string
   nestedBaseUrl: string
   sortColumn?: string
   sortedAsc?: string

package/dpr/components/_reports/report-heading/view.njk

@@ -40,7 +40,7 @@
     {% endif %}
     <div class="dpr-report-heading">
       <div class="dpr-report-heading__title">
-        <h1 id="dpr-report-name" class="govuk-heading-l">
+        <h1 id="dpr-report-name" class="govuk-heading-xl">
           <span class="govuk-caption-l">{{ reportName }}</span>
           {{ name }}
         </h1>

package/dpr/data/dashboardClient.js

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

package/dpr/data/dashboardClient.js.map

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

package/dpr/data/dashboardClient.ts

@@ -1,8 +1,9 @@
-import { DashboardDefinition } from '../components/_dashboards/dashboard/types'
 import logger from '../utils/logger'
 import RestClient from './restClient'
 import Dict = NodeJS.Dict
 import { ApiConfig } from './types'
+import { components } from '../types/api'
+import { DashboardDataResponse } from '../types/Metrics'
 
 class DashboardClient {
   restClient: RestClient
@@ -16,7 +17,7 @@ class DashboardClient {
     dashboardId: string,
     dpdId: string,
     definitionsPath?: string,
-  ): Promise<DashboardDefinition> {
+  ): Promise<components['schemas']['DashboardDefinition']> {
     this.logInfo('Get definition:', { dpdId, dashboardId })
     const query = {
       dataProductDefinitionsPath: definitionsPath,
@@ -27,7 +28,7 @@ class DashboardClient {
         query,
         token,
       })
-      .then((response) => <DashboardDefinition>response)
+      .then((response) => <components['schemas']['DashboardDefinition']>response)
   }
 
   requestAsyncDashboard(
@@ -52,8 +53,8 @@ class DashboardClient {
     reportId: string,
     dashboardId: string,
     tableId: string,
-    query: Dict<string | number>,
-  ): Promise<Array<Dict<string>>> {
+    query: Record<string, string | string[]>,
+  ): Promise<DashboardDataResponse[][]> {
     this.logInfo('Get dashboard:', { reportId, dashboardId, tableId })
 
     return this.restClient
@@ -62,7 +63,7 @@ class DashboardClient {
         token,
         query,
       })
-      .then((response) => <Array<Dict<string>>>response)
+      .then((response) => <DashboardDataResponse[][]>response)
   }
 
   getAsyncStatus(
@@ -92,7 +93,7 @@ class DashboardClient {
     reportId: string,
     dashboardId: string,
     executionId: string,
-    dataProductDefinitionsPath: string,
+    dataProductDefinitionsPath?: string,
   ): Promise<Dict<string>> {
     this.logInfo('Cancel request:', { reportId, dashboardId, executionId })
 

package/dpr/data/dprReportingClient.js

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

package/dpr/data/dprReportingClient.js.map

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

package/dpr/data/dprReportingClient.ts

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

package/dpr/data/reportingClient.js

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