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

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/dpr/components/_charts/chart/heatmap/HeatmapChart.ts"],
-  "sourcesContent": ["/* eslint-disable prefer-destructuring */\nimport dayjs from 'dayjs'\nimport { Granularity } from '../../../_inputs/granular-date-range/types'\nimport { DashboardDataResponse } from '../../../../types/Metrics'\nimport {\n  DashboardVisualisation,\n  DashboardVisualisationType,\n  DashboardVisualisationBucket,\n} from '../../../_dashboards/dashboard/types'\nimport { ChartData, MatrixChartData } from '../../../../types/Charts'\nimport DatasetHelper from '../../../../utils/datasetHelper'\nimport DashboardVisualisationClass from '../DashboardVisualisation'\nimport Buckets from '../Buckets'\n\nclass HeatmapChart extends DashboardVisualisationClass {\n  private granularity: Granularity\n\n  private data: MatrixChartData[] = []\n\n  private dayDateFormat = 'DD/MM/YYYY'\n\n  private valueKey: string\n\n  private label: string\n\n  private buckets: DashboardVisualisationBucket[] = []\n\n  private bucketsHelper: Buckets\n\n  constructor(responseData: DashboardDataResponse[], granularity: Granularity, definition: DashboardVisualisation) {\n    super(responseData, definition)\n\n    this.granularity = granularity\n    this.setLabel()\n    this.initUnit()\n    this.bucketsHelper = new Buckets(responseData, this.definition, this.valueKey, true)\n    this.buckets = this.bucketsHelper.getBuckets()\n  }\n\n  initUnit = () => {\n    // todo\n    this.unit = this.columns.measures[0].unit ? this.columns.measures[0].unit : undefined\n  }\n\n  private setLabel = () => {\n    const { id, display } = this.columns.measures[1]\n    this.valueKey = id\n    this.label = display\n  }\n\n  private validateDefinition = () => {\n    const { id, columns, type } = this.definition\n    const errors = []\n\n    // Validate measures\n    if (columns.measures.length !== 2) {\n      errors.push(`Measures should only have 2 columns defined. Only found ${columns.measures.length}`)\n    } else if (type === DashboardVisualisationType.MATRIX_TIMESERIES) {\n      if (columns.measures[0].id !== 'ts') {\n        errors.push(`measure at index 0 has incorrect ID. Expected ID to be \"ts\". Found \"${columns.measures[0].id}\"`)\n      }\n    }\n\n    // Throw the error\n    if (errors.length) {\n      const message = `Validation: Visualisaton definition: ID: ${id}, type: ${type}, errors: ${errors.join(',')}`\n      throw new Error(message)\n    }\n  }\n\n  private initTimeseriesData = () => {\n    const timeBlockData = DatasetHelper.groupRowsByTimestamp(this.responseData)\n\n    this.data = timeBlockData.map((tsData) => {\n      const { raw, rag } = tsData[0][this.valueKey]\n      const tsRaw = tsData[0].ts.raw\n\n      const v = Number(raw)\n      const r = rag !== undefined ? Number(tsData[0][this.valueKey].rag) : undefined\n      let x\n      let y\n\n      switch (this.granularity) {\n        case 'hourly':\n          break\n        case 'weekly':\n          x = dayjs(tsRaw, this.dayDateFormat).format('ddd')\n          y = dayjs(tsRaw, this.dayDateFormat).week()\n          break\n        case 'daily':\n          x = dayjs(tsRaw, this.dayDateFormat).format('MMM YY')\n          y = dayjs(tsRaw, this.dayDateFormat).format('D')\n          break\n        case 'monthly':\n          {\n            const ts = (<string>tsRaw).split(' ')\n            x = ts[1]\n            y = ts[0]\n          }\n          break\n        case 'annually':\n          x = 'year'\n          y = <string>tsRaw\n          break\n        default:\n          x = dayjs(tsRaw, this.dayDateFormat).format('MMM YY')\n          y = dayjs(tsRaw, this.dayDateFormat).format('D')\n          break\n      }\n      return { y, x, v, r }\n    })\n  }\n\n  private bucketData = () => {\n    this.data = this.data.map((d) => {\n      const { v, r } = d\n      const bucketData = this.bucketsHelper.getBucketForValue(v, r)\n      return { ...d, c: bucketData.colour }\n    })\n  }\n\n  build = (): ChartData => {\n    this.validateDefinition()\n    this.initTimeseriesData()\n    this.bucketData()\n\n    return {\n      type: this.type,\n      unit: this.unit,\n      timeseries: true,\n      data: {\n        datasets: [\n          {\n            label: this.label,\n            data: this.data,\n          },\n        ],\n      },\n    }\n  }\n}\n\nexport { HeatmapChart }\nexport default HeatmapChart\n"],
-  "mappings": "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",
+  "sourcesContent": ["/* eslint-disable prefer-destructuring */\nimport dayjs from 'dayjs'\nimport { Granularity } from '../../../_inputs/granular-date-range/types'\nimport { DashboardDataResponse } from '../../../../types/Metrics'\nimport {\n  DashboardVisualisationType,\n  DashboardVisualisationBucket,\n  DashboardVisualisationData,\n} from '../../../_dashboards/dashboard-visualisation/types'\nimport { MatrixChartData } from './types'\nimport DatasetHelper from '../../../../utils/datasetHelper'\nimport DashboardVisualisationClass from '../../../_dashboards/dashboard-visualisation/DashboardVisualisation'\nimport Buckets from '../Buckets'\nimport { components } from '../../../../types/api'\n\nclass HeatmapChart extends DashboardVisualisationClass {\n  private granularity: Granularity\n\n  private data: MatrixChartData[] = []\n\n  private dayDateFormat = 'DD/MM/YYYY'\n\n  private valueKey = ''\n\n  private label = ''\n\n  private buckets: DashboardVisualisationBucket[] = []\n\n  private bucketsHelper: Buckets\n\n  private isTimeseriesChart: boolean\n\n  constructor(\n    responseData: DashboardDataResponse[],\n    granularity: Granularity,\n    definition: components['schemas']['DashboardVisualisationDefinition'],\n  ) {\n    super(responseData, definition)\n\n    this.granularity = granularity\n    this.isTimeseriesChart = <DashboardVisualisationType>this.type === DashboardVisualisationType.LINE_TIMESERIES\n    this.setLabel()\n    this.initUnit()\n    this.bucketsHelper = new Buckets(responseData, this.definition, this.valueKey, true)\n    this.buckets = this.bucketsHelper.getBuckets()\n  }\n\n  initUnit = () => {\n    // todo\n    this.unit = this.columns.measures[0].unit ? this.columns.measures[0].unit : undefined\n  }\n\n  private setLabel = () => {\n    const { id, display } = this.columns.measures[1]\n    this.valueKey = id\n    this.label = display || ''\n  }\n\n  private validateDefinition = () => {\n    const { id, columns, type } = this.definition\n    const errors = []\n\n    // Validate measures\n    if (columns.measures.length !== 2) {\n      errors.push(`Measures should only have 2 columns defined. Only found ${columns.measures.length}`)\n    } else if (<DashboardVisualisationType>type === DashboardVisualisationType.MATRIX_TIMESERIES) {\n      if (columns.measures[0].id !== 'ts') {\n        errors.push(`measure at index 0 has incorrect ID. Expected ID to be \"ts\". Found \"${columns.measures[0].id}\"`)\n      }\n    }\n\n    // Throw the error\n    if (errors.length) {\n      const message = `Validation: Visualisaton definition: ID: ${id}, type: ${type}, errors: ${errors.join(',')}`\n      throw new Error(message)\n    }\n  }\n\n  private initTimeseriesData = () => {\n    const timeBlockData = DatasetHelper.groupRowsByTimestamp(this.responseData)\n\n    this.data = timeBlockData.map((tsData) => {\n      const { raw, rag } = tsData[0][this.valueKey]\n      const tsRaw = tsData[0].ts.raw\n\n      const v: MatrixChartData['v'] = Number(raw)\n      const r: MatrixChartData['r'] = rag !== undefined ? Number(tsData[0][this.valueKey].rag) : undefined\n      let x: MatrixChartData['x'] = 0\n      let y: MatrixChartData['y'] = 0\n\n      switch (this.granularity) {\n        case 'hourly':\n          break\n        case 'weekly':\n          x = dayjs(tsRaw, this.dayDateFormat).format('ddd')\n          y = dayjs(tsRaw, this.dayDateFormat).week()\n          break\n        case 'daily':\n          x = dayjs(tsRaw, this.dayDateFormat).format('MMM YY')\n          y = dayjs(tsRaw, this.dayDateFormat).format('D')\n          break\n        case 'monthly':\n          {\n            const ts = (<string>tsRaw).split(' ')\n            x = ts[1]\n            y = ts[0]\n          }\n          break\n        case 'annually':\n          x = 'year'\n          y = <string>tsRaw\n          break\n        default:\n          x = dayjs(tsRaw, this.dayDateFormat).format('MMM YY')\n          y = dayjs(tsRaw, this.dayDateFormat).format('D')\n          break\n      }\n      return { y, x, v, r }\n    })\n  }\n\n  private bucketData = () => {\n    this.data = this.data.map((d) => {\n      const { v, r } = d\n      const bucketData = this.bucketsHelper.getBucketForValue(v, r)\n      return { ...d, c: bucketData.colour }\n    })\n  }\n\n  build = (): DashboardVisualisationData => {\n    this.validateDefinition()\n    this.initTimeseriesData()\n    this.bucketData()\n\n    return {\n      type: this.type,\n      unit: this.unit,\n      timeseries: true,\n      data: {\n        datasets: [\n          {\n            label: this.label,\n            data: this.data,\n          },\n        ],\n      },\n    }\n  }\n}\n\nexport { HeatmapChart }\nexport default HeatmapChart\n"],
+  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,kBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAkB,oBAGlBC,EAIO,8DAEPC,EAA0B,8CAC1BC,EAAwC,kFACxCC,EAAoB,yBAGpB,MAAMP,UAAqB,EAAAQ,OAA4B,CAiBrD,YACEC,EACAC,EACAC,EACA,CACA,MAAMF,EAAcE,CAAU,EAnBhC,KAAQ,KAA0B,CAAC,EAEnC,KAAQ,cAAgB,aAExB,KAAQ,SAAW,GAEnB,KAAQ,MAAQ,GAEhB,KAAQ,QAA0C,CAAC,EAqBnD,cAAW,IAAM,CAEf,KAAK,KAAO,KAAK,QAAQ,SAAS,CAAC,EAAE,KAAO,KAAK,QAAQ,SAAS,CAAC,EAAE,KAAO,MAC9E,EAEA,KAAQ,SAAW,IAAM,CACvB,KAAM,CAAE,GAAAC,EAAI,QAAAC,CAAQ,EAAI,KAAK,QAAQ,SAAS,CAAC,EAC/C,KAAK,SAAWD,EAChB,KAAK,MAAQC,GAAW,EAC1B,EAEA,KAAQ,mBAAqB,IAAM,CACjC,KAAM,CAAE,GAAAD,EAAI,QAAAE,EAAS,KAAAC,CAAK,EAAI,KAAK,WAC7BC,EAAS,CAAC,EAYhB,GATIF,EAAQ,SAAS,SAAW,EAC9BE,EAAO,KAAK,2DAA2DF,EAAQ,SAAS,MAAM,EAAE,EAC3DC,IAAS,6BAA2B,mBACrED,EAAQ,SAAS,CAAC,EAAE,KAAO,MAC7BE,EAAO,KAAK,uEAAuEF,EAAQ,SAAS,CAAC,EAAE,EAAE,GAAG,EAK5GE,EAAO,OAAQ,CACjB,MAAMC,EAAU,4CAA4CL,CAAE,WAAWG,CAAI,aAAaC,EAAO,KAAK,GAAG,CAAC,GAC1G,MAAM,IAAI,MAAMC,CAAO,CACzB,CACF,EAEA,KAAQ,mBAAqB,IAAM,CACjC,MAAMC,EAAgB,EAAAC,QAAc,qBAAqB,KAAK,YAAY,EAE1E,KAAK,KAAOD,EAAc,IAAKE,GAAW,CACxC,KAAM,CAAE,IAAAC,EAAK,IAAAC,CAAI,EAAIF,EAAO,CAAC,EAAE,KAAK,QAAQ,EACtCG,EAAQH,EAAO,CAAC,EAAE,GAAG,IAErBI,EAA0B,OAAOH,CAAG,EACpCI,EAA0BH,IAAQ,OAAY,OAAOF,EAAO,CAAC,EAAE,KAAK,QAAQ,EAAE,GAAG,EAAI,OAC3F,IAAIM,EAA0B,EAC1BC,EAA0B,EAE9B,OAAQ,KAAK,YAAa,CACxB,IAAK,SACH,MACF,IAAK,SACHD,KAAI,EAAAE,SAAML,EAAO,KAAK,aAAa,EAAE,OAAO,KAAK,EACjDI,KAAI,EAAAC,SAAML,EAAO,KAAK,aAAa,EAAE,KAAK,EAC1C,MACF,IAAK,QACHG,KAAI,EAAAE,SAAML,EAAO,KAAK,aAAa,EAAE,OAAO,QAAQ,EACpDI,KAAI,EAAAC,SAAML,EAAO,KAAK,aAAa,EAAE,OAAO,GAAG,EAC/C,MACF,IAAK,UACH,CACE,MAAMM,EAAcN,EAAO,MAAM,GAAG,EACpCG,EAAIG,EAAG,CAAC,EACRF,EAAIE,EAAG,CAAC,CACV,CACA,MACF,IAAK,WACHH,EAAI,OACJC,EAAYJ,EACZ,MACF,QACEG,KAAI,EAAAE,SAAML,EAAO,KAAK,aAAa,EAAE,OAAO,QAAQ,EACpDI,KAAI,EAAAC,SAAML,EAAO,KAAK,aAAa,EAAE,OAAO,GAAG,EAC/C,KACJ,CACA,MAAO,CAAE,EAAAI,EAAG,EAAAD,EAAG,EAAAF,EAAG,EAAAC,CAAE,CACtB,CAAC,CACH,EAEA,KAAQ,WAAa,IAAM,CACzB,KAAK,KAAO,KAAK,KAAK,IAAKK,GAAM,CAC/B,KAAM,CAAE,EAAAN,EAAG,EAAAC,CAAE,EAAIK,EACXC,EAAa,KAAK,cAAc,kBAAkBP,EAAGC,CAAC,EAC5D,MAAO,CAAE,GAAGK,EAAG,EAAGC,EAAW,MAAO,CACtC,CAAC,CACH,EAEA,WAAQ,KACN,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,WAAW,EAET,CACL,KAAM,KAAK,KACX,KAAM,KAAK,KACX,WAAY,GACZ,KAAM,CACJ,SAAU,CACR,CACE,MAAO,KAAK,MACZ,KAAM,KAAK,IACb,CACF,CACF,CACF,GA3GA,KAAK,YAAcrB,EACnB,KAAK,kBAAgD,KAAK,OAAS,6BAA2B,gBAC9F,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,cAAgB,IAAI,EAAAsB,QAAQvB,EAAc,KAAK,WAAY,KAAK,SAAU,EAAI,EACnF,KAAK,QAAU,KAAK,cAAc,WAAW,CAC/C,CAuGF,CAGA,IAAOR,EAAQD",
   "names": ["HeatmapChart_exports", "__export", "HeatmapChart", "HeatmapChart_default", "__toCommonJS", "import_dayjs", "import_types", "import_datasetHelper", "import_DashboardVisualisation", "import_Buckets", "DashboardVisualisationClass", "responseData", "granularity", "definition", "id", "display", "columns", "type", "errors", "message", "timeBlockData", "DatasetHelper", "tsData", "raw", "rag", "tsRaw", "v", "r", "x", "y", "dayjs", "ts", "d", "bucketData", "Buckets"]
 }

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

@@ -3,14 +3,15 @@ import dayjs from 'dayjs'
 import { Granularity } from '../../../_inputs/granular-date-range/types'
 import { DashboardDataResponse } from '../../../../types/Metrics'
 import {
-  DashboardVisualisation,
   DashboardVisualisationType,
   DashboardVisualisationBucket,
-} from '../../../_dashboards/dashboard/types'
-import { ChartData, MatrixChartData } from '../../../../types/Charts'
+  DashboardVisualisationData,
+} from '../../../_dashboards/dashboard-visualisation/types'
+import { MatrixChartData } from './types'
 import DatasetHelper from '../../../../utils/datasetHelper'
-import DashboardVisualisationClass from '../DashboardVisualisation'
+import DashboardVisualisationClass from '../../../_dashboards/dashboard-visualisation/DashboardVisualisation'
 import Buckets from '../Buckets'
+import { components } from '../../../../types/api'
 
 class HeatmapChart extends DashboardVisualisationClass {
   private granularity: Granularity
@@ -19,18 +20,25 @@ class HeatmapChart extends DashboardVisualisationClass {
 
   private dayDateFormat = 'DD/MM/YYYY'
 
-  private valueKey: string
+  private valueKey = ''
 
-  private label: string
+  private label = ''
 
   private buckets: DashboardVisualisationBucket[] = []
 
   private bucketsHelper: Buckets
 
-  constructor(responseData: DashboardDataResponse[], granularity: Granularity, definition: DashboardVisualisation) {
+  private isTimeseriesChart: boolean
+
+  constructor(
+    responseData: DashboardDataResponse[],
+    granularity: Granularity,
+    definition: components['schemas']['DashboardVisualisationDefinition'],
+  ) {
     super(responseData, definition)
 
     this.granularity = granularity
+    this.isTimeseriesChart = <DashboardVisualisationType>this.type === DashboardVisualisationType.LINE_TIMESERIES
     this.setLabel()
     this.initUnit()
     this.bucketsHelper = new Buckets(responseData, this.definition, this.valueKey, true)
@@ -45,7 +53,7 @@ class HeatmapChart extends DashboardVisualisationClass {
   private setLabel = () => {
     const { id, display } = this.columns.measures[1]
     this.valueKey = id
-    this.label = display
+    this.label = display || ''
   }
 
   private validateDefinition = () => {
@@ -55,7 +63,7 @@ class HeatmapChart extends DashboardVisualisationClass {
     // Validate measures
     if (columns.measures.length !== 2) {
       errors.push(`Measures should only have 2 columns defined. Only found ${columns.measures.length}`)
-    } else if (type === DashboardVisualisationType.MATRIX_TIMESERIES) {
+    } else if (<DashboardVisualisationType>type === DashboardVisualisationType.MATRIX_TIMESERIES) {
       if (columns.measures[0].id !== 'ts') {
         errors.push(`measure at index 0 has incorrect ID. Expected ID to be "ts". Found "${columns.measures[0].id}"`)
       }
@@ -75,10 +83,10 @@ class HeatmapChart extends DashboardVisualisationClass {
       const { raw, rag } = tsData[0][this.valueKey]
       const tsRaw = tsData[0].ts.raw
 
-      const v = Number(raw)
-      const r = rag !== undefined ? Number(tsData[0][this.valueKey].rag) : undefined
-      let x
-      let y
+      const v: MatrixChartData['v'] = Number(raw)
+      const r: MatrixChartData['r'] = rag !== undefined ? Number(tsData[0][this.valueKey].rag) : undefined
+      let x: MatrixChartData['x'] = 0
+      let y: MatrixChartData['y'] = 0
 
       switch (this.granularity) {
         case 'hourly':
@@ -119,7 +127,7 @@ class HeatmapChart extends DashboardVisualisationClass {
     })
   }
 
-  build = (): ChartData => {
+  build = (): DashboardVisualisationData => {
     this.validateDefinition()
     this.initTimeseriesData()
     this.bucketData()

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

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

package/dpr/components/_charts/chart/heatmap/types.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../src/dpr/components/_charts/chart/heatmap/types.ts"],
+  "sourcesContent": ["export interface MatrixChartData {\n  x: number | string\n  y: number | string\n  r?: number\n  v: number\n}\n"],
+  "mappings": "kWAAA,IAAAA,EAAA,kBAAAC,EAAAD",
+  "names": ["types_exports", "__toCommonJS"]
+}

package/dpr/components/_charts/chart/heatmap/types.ts

@@ -0,0 +1,6 @@
+export interface MatrixChartData {
+  x: number | string
+  y: number | string
+  r?: number
+  v: number
+}

package/dpr/components/_charts/utils.js

@@ -1,2 +1,2 @@
-var G=Object.create;var b=Object.defineProperty;var $=Object.getOwnPropertyDescriptor;var A=Object.getOwnPropertyNames;var F=Object.getPrototypeOf,H=Object.prototype.hasOwnProperty;var j=(a,t)=>{for(var e in t)b(a,e,{get:t[e],enumerable:!0})},w=(a,t,e,s)=>{if(t&&typeof t=="object"||typeof t=="function")for(let o of A(t))!H.call(a,o)&&o!==e&&b(a,o,{get:()=>t[o],enumerable:!(s=$(t,o))||s.enumerable});return a};var p=(a,t,e)=>(e=a!=null?G(F(a)):{},w(t||!a||!a.__esModule?b(e,"default",{value:a,enumerable:!0}):e,a)),v=a=>w(b({},"__esModule",{value:!0}),a);var Q={};j(Q,{createChart:()=>M,createMatrixChart:()=>S,createTimeseriesCharts:()=>L,default:()=>P});module.exports=v(Q);var T=p(require("dayjs")),x=p(require("dayjs/plugin/weekOfYear")),D=p(require("../../utils/datasetHelper")),f=p(require("../_dashboards/dashboard-list/utils")),B=require("../_inputs/granular-date-range/types"),k=p(require("./chart/heatmap/HeatmapChart"));T.default.extend(x.default);const M=(a,t)=>{let e,s,o;const{dataSetRows:r,snapshotData:l}=O(a,t);return r.length&&(s=Y(a,l),e=z(a,r),o=R(a,r)),{details:o,table:e,chart:s}},L=(a,t)=>{let e,s,o;const{latestData:r,dataSetRows:l,timeseriesData:u}=g(a,t);return l.length&&(s=N(a,u),e=V(a,u),o=R(a,r,!0)),{details:o,table:e,chart:s}},S=(a,t,e)=>{let s,o,r,l=B.Granularity.DAILY;Object.keys(e).forEach(h=>{h.includes("granularity")&&(l=e[h])});const{latestData:u,dataSetRows:n,timeseriesData:i}=g(a,t);return n.length&&(o=new k.default(i,l,a).build(),s=V(a,i),r=R(a,u,!0)),{details:r,table:s,chart:o}},O=(a,t)=>{const e=D.default.getLastestDataset(t),s=D.default.getDatasetRows(a,e),o=D.default.filterRowsByDisplayColumns(a,s,!0);return{dataSetRows:s,snapshotData:o}},g=(a,t)=>{const e=D.default.getLastestDataset(t),s=D.default.getDatasetRows(a,t),o=D.default.filterRowsByDisplayColumns(a,s,!0);return{latestData:e,dataSetRows:s,timeseriesData:o}},R=(a,t,e=!1)=>{const s=[],o=W(a,t,e);return t[0]?.ts&&s.push({label:"Values for:",value:t[0]?.ts.raw}),{meta:s,headlines:o}},W=(a,t,e=!1)=>{const s=[],{columns:o}=a,{measures:r}=o,l=!!r.find(d=>d.axis);let u,n,i,h;return e?(n=r.find(d=>d.id!=="ts"),n&&(h=`${t[0].ts.raw}`,i=+t[0][n.id].raw,u={label:h,value:i})):(n=l?r.find(d=>d.axis&&d.axis==="y"):r[0],n&&(h=`Total ${n.display.toLowerCase()}`,i=t.reduce((d,c)=>d+ +c[n.id].raw,0),u={label:h,value:i})),s.push(u),s},Y=(a,t)=>{const{type:e,columns:s}=a,{measures:o}=s,r=!!o.find(i=>i.axis);let l,u,n;return r?{labels:l,unit:u,datasets:n}=U(s,t):{labels:l,unit:u,datasets:n}=E(s,t),{type:e,unit:u,data:{labels:l,datasets:n}}},E=(a,t)=>{const{keys:e,measures:s}=a,o=s.map(n=>n.display),r=e[e.length-1]?.id,l=s[0].unit?s[0].unit:void 0,u=t.map(n=>{const i=n[r]?`${n[r].raw}`:"All",h=s.map(c=>{const m=c.id;return n[m]?+n[m].raw:0}),d=h.reduce((c,m)=>c+m,0);return{label:i,data:h,total:d}});return{labels:o,unit:l,datasets:u}},U=(a,t)=>{const{measures:e,keys:s}=a,o=e.find(d=>d.axis==="x"),r=e.find(d=>d.axis==="y"),l=r?.unit||void 0,u=D.default.getGroupKey(s,t),n=u?D.default.groupRowsByKey(t,u.id):[t],i=n[0]?.map(d=>`${d[o.id].raw}`),h=n.map(d=>{const c=d.map(m=>+m[r.id].raw);return{label:u?`${d[0][u.id].raw}`:r.display,data:c,total:c.reduce((m,C)=>m+C,0)}});return{labels:i,unit:l,datasets:h}},z=(a,t)=>{const{columns:e}=a,{keys:s,measures:o}=e,l=[...s,...o].map(i=>({text:i.display})),u=D.default.filterRowsByDisplayColumns(a,t,!0),n=f.default.createTableRows(u);return{head:l,rows:n}},N=(a,t)=>{const{columns:e}=a,{keys:s,measures:o}=e,r=o[0].unit?o[0].unit:void 0,l=a.type.split("-")[0],n=D.default.getGroupKey(s,t).id,i=D.default.groupRowsByTimestamp(t),h=i.map(m=>m[0].ts.raw),d=i[0].length,c=[];for(let m=0;m<d;m+=1){const C=i.map(y=>+y[m][o[1].id].raw),J=C.reduce((y,K)=>y+K,0),I=i[0][m][n].raw;c.push({data:C,label:I,total:J})}return{type:l,unit:r,timeseries:!0,data:{labels:h,datasets:c}}},V=(a,t)=>{const{columns:e}=a,{keys:s,measures:o}=e;let r=t.flat(),l=[...o];if(t.length>1){const i=l.findIndex(c=>c.id==="ts"),h=l[i];l.splice(i,1),l=[...s.filter(c=>c.id!=="ts"),...l],l.unshift(h)}else r=D.default.filterRowsByDisplayColumns(a,r);const u=l.map(i=>({text:i.display})),n=f.default.createTableRows(r);return{head:u,rows:n}};var P={createChart:M,createTimeseriesCharts:L,createMatrixChart:S};0&&(module.exports={createChart,createMatrixChart,createTimeseriesCharts});
+var G=Object.create;var f=Object.defineProperty;var $=Object.getOwnPropertyDescriptor;var A=Object.getOwnPropertyNames;var F=Object.getPrototypeOf,H=Object.prototype.hasOwnProperty;var j=(a,s)=>{for(var e in s)f(a,e,{get:s[e],enumerable:!0})},V=(a,s,e,t)=>{if(s&&typeof s=="object"||typeof s=="function")for(let o of A(s))!H.call(a,o)&&o!==e&&f(a,o,{get:()=>s[o],enumerable:!(t=$(s,o))||t.enumerable});return a};var p=(a,s,e)=>(e=a!=null?G(F(a)):{},V(s||!a||!a.__esModule?f(e,"default",{value:a,enumerable:!0}):e,a)),v=a=>V(f({},"__esModule",{value:!0}),a);var Q={};j(Q,{createChart:()=>S,createMatrixChart:()=>B,createTimeseriesCharts:()=>L,default:()=>P});module.exports=v(Q);var x=p(require("dayjs")),T=p(require("dayjs/plugin/weekOfYear")),h=p(require("../../utils/datasetHelper")),R=p(require("../_dashboards/dashboard-list/utils")),k=require("../_inputs/granular-date-range/types"),M=p(require("./chart/heatmap/HeatmapChart"));x.default.extend(T.default);const S=(a,s)=>{let e,t,o;const{dataSetRows:n,snapshotData:r}=O(a,s);return n.length&&(t=Y(a,r),e=z(a,n),o=C(a,n)),{details:o,table:e,chart:t}},L=(a,s)=>{let e,t,o;const{latestData:n,dataSetRows:r,timeseriesData:u}=g(a,s);return r.length&&(t=N(a,u),e=w(a,u),o=C(a,n,!0)),{details:o,table:e,chart:t}},B=(a,s,e)=>{let t,o,n,r=k.Granularity.DAILY;Object.keys(e).forEach(c=>{c.includes("granularity")&&(r=e[c])});const{latestData:u,dataSetRows:i,timeseriesData:l}=g(a,s);return i.length&&(o=new M.default(l,r,a).build(),t=w(a,l),n=C(a,u,!0)),{details:n,table:t,chart:o}},O=(a,s)=>{const e=h.default.getLastestDataset(s),t=h.default.getDatasetRows(a,e),o=h.default.filterRowsByDisplayColumns(a,t,!0);return{dataSetRows:t,snapshotData:o}},g=(a,s)=>{const e=h.default.getLastestDataset(s),t=h.default.getDatasetRows(a,s),o=h.default.filterRowsByDisplayColumns(a,t,!0);return{latestData:e,dataSetRows:t,timeseriesData:o}},C=(a,s,e=!1)=>{const t=[],o=W(a,s,e);return s[0]?.ts&&t.push({label:"Values for:",value:s[0]?.ts.raw}),{meta:t,headlines:o}},W=(a,s,e=!1)=>{const t=[],{columns:o}=a,{measures:n}=o,r=!!n.find(d=>d.axis);let u,i,l,c;return e?(i=n.find(d=>d.id!=="ts"),i&&(c=`${s[0].ts.raw}`,l=+s[0][i.id].raw,u={label:c,value:l})):(i=r?n.find(d=>d.axis&&d.axis==="y"):n[0],i&&(c=`Total ${i.display.toLowerCase()}`,l=s.reduce((d,D)=>d+ +D[i.id].raw,0),u={label:c,value:l})),t.push(u),t},Y=(a,s)=>{const{type:e,columns:t}=a,{measures:o}=t,n=!!o.find(l=>l.axis);let r,u,i;return n?{labels:r,unit:u,datasets:i}=U(t,s):{labels:r,unit:u,datasets:i}=E(t,s),{type:e,unit:u,data:{labels:r,datasets:i}}},E=(a,s)=>{const{keys:e,measures:t}=a,o=t.map(i=>i.display),n=e[e.length-1]?.id,r=t[0].unit?t[0].unit:void 0,u=s.map(i=>{const l=i[n]?`${i[n].raw}`:"All",c=t.map(D=>{const m=D.id;return i[m]?+i[m].raw:0}),d=c.reduce((D,m)=>D+m,0);return{label:l,data:c,total:d}});return{labels:o,unit:r,datasets:u}},U=(a,s)=>{const{measures:e,keys:t}=a,o=e.find(d=>d.axis==="x"),n=e.find(d=>d.axis==="y"),r=n?.unit||void 0,u=h.default.getGroupKey(t,s),i=u?h.default.groupRowsByKey(s,u.id):[s],l=i[0]?.map(d=>`${d[o.id].raw}`),c=i.map(d=>{const D=d.map(m=>+m[n.id].raw);return{label:u?`${d[0][u.id].raw}`:n.display,data:D,total:D.reduce((m,b)=>m+b,0)}});return{labels:l,unit:r,datasets:c}},z=(a,s)=>{const{columns:e}=a,{keys:t,measures:o}=e,r=[...t,...o].map(l=>({text:l.display})),u=h.default.filterRowsByDisplayColumns(a,s,!0),i=R.default.createTableRows(u);return{head:r,rows:i}},N=(a,s)=>{const{columns:e}=a,{keys:t,measures:o}=e,n=o[0].unit?o[0].unit:void 0,r=a.type.split("-")[0],i=h.default.getGroupKey(t,s).id,l=h.default.groupRowsByTimestamp(s),c=l.map(m=>m[0].ts.raw),d=l[0].length,D=[];for(let m=0;m<d;m+=1){const b=l.map(y=>+y[m][o[1].id].raw),J=b.reduce((y,K)=>y+K,0),I=l[0][m][i].raw;D.push({data:b,label:I,total:J})}return{type:r,unit:n,timeseries:!0,data:{labels:c,datasets:D}}},w=(a,s)=>{const{columns:e}=a,{keys:t,measures:o}=e;let n=s.flat(),r=[...o];if(s.length>1){const l=r.findIndex(D=>D.id==="ts"),c=r[l];r.splice(l,1),r=[...t.filter(D=>D.id!=="ts"),...r],r.unshift(c)}else n=h.default.filterRowsByDisplayColumns(a,n);const u=r.map(l=>({text:l.display})),i=R.default.createTableRows(n);return{head:u,rows:i}};var P={createChart:S,createTimeseriesCharts:L,createMatrixChart:B};0&&(module.exports={createChart,createMatrixChart,createTimeseriesCharts});
 //# sourceMappingURL=utils.js.map

package/dpr/components/_charts/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/dpr/components/_charts/utils.ts"],
-  "sourcesContent": ["import dayjs from 'dayjs'\nimport weekOfYear from 'dayjs/plugin/weekOfYear'\nimport {\n  ChartData,\n  MoJTable,\n  ChartCardData,\n  ChartDataset,\n  ChartType,\n  ChartDetails,\n  ChartMetaData,\n} from '../../types/Charts'\nimport { DashboardDataResponse } from '../../types/Metrics'\nimport {\n  BarChartVisualisationColumn,\n  DashboardVisualisation,\n  DashboardVisualisationColumns,\n} from '../_dashboards/dashboard/types'\nimport DatasetHelper from '../../utils/datasetHelper'\nimport DashboardListUtils from '../_dashboards/dashboard-list/utils'\nimport { Granularity } from '../_inputs/granular-date-range/types'\nimport HeatmapChart from './chart/heatmap/HeatmapChart'\n\ndayjs.extend(weekOfYear)\n\nexport const createChart = (\n  chartDefinition: DashboardVisualisation,\n  rawData: DashboardDataResponse[],\n): ChartCardData => {\n  let table: MoJTable\n  let chart: ChartData\n  let details: ChartDetails\n\n  const { dataSetRows, snapshotData } = getDataForSnapshotCharts(chartDefinition, rawData)\n  if (dataSetRows.length) {\n    chart = createSnapshotChart(chartDefinition, snapshotData)\n    table = createSnapshotTable(chartDefinition, dataSetRows)\n    details = getChartDetails(chartDefinition, dataSetRows)\n  }\n\n  return {\n    details,\n    table,\n    chart,\n  }\n}\n\nexport const createTimeseriesCharts = (\n  chartDefinition: DashboardVisualisation,\n  rawData: DashboardDataResponse[],\n): ChartCardData => {\n  let table: MoJTable\n  let chart: ChartData\n  let details: ChartDetails\n\n  const { latestData, dataSetRows, timeseriesData } = getDataForTimeseriesCharts(chartDefinition, rawData)\n  if (dataSetRows.length) {\n    chart = createTimeseriesChart(chartDefinition, timeseriesData)\n    table = createTimeseriesTable(chartDefinition, timeseriesData)\n    details = getChartDetails(chartDefinition, latestData, true)\n  }\n  return {\n    details,\n    table,\n    chart,\n  }\n}\n\nexport const createMatrixChart = (\n  chartDefinition: DashboardVisualisation,\n  rawData: DashboardDataResponse[],\n  query: Record<string, string | string[]>,\n) => {\n  let table: MoJTable\n  let chart: ChartData\n  let details: ChartDetails\n  let granularity: Granularity = Granularity.DAILY\n\n  Object.keys(query).forEach((key) => {\n    if (key.includes('granularity')) {\n      granularity = <Granularity>query[key]\n    }\n  })\n\n  const { latestData, dataSetRows, timeseriesData } = getDataForTimeseriesCharts(chartDefinition, rawData)\n  if (dataSetRows.length) {\n    chart = new HeatmapChart(timeseriesData, granularity, chartDefinition).build()\n    table = createTimeseriesTable(chartDefinition, timeseriesData)\n    details = getChartDetails(chartDefinition, latestData, true)\n  }\n  return {\n    details,\n    table,\n    chart,\n  }\n}\n\nconst getDataForSnapshotCharts = (chartDefinition: DashboardVisualisation, rawData: DashboardDataResponse[]) => {\n  const data = DatasetHelper.getLastestDataset(rawData)\n  const dataSetRows = DatasetHelper.getDatasetRows(chartDefinition, data)\n  const snapshotData = DatasetHelper.filterRowsByDisplayColumns(chartDefinition, dataSetRows, true)\n\n  return {\n    dataSetRows,\n    snapshotData,\n  }\n}\n\nconst getDataForTimeseriesCharts = (chartDefinition: DashboardVisualisation, rawData: DashboardDataResponse[]) => {\n  const latestData = DatasetHelper.getLastestDataset(rawData)\n  const dataSetRows = DatasetHelper.getDatasetRows(chartDefinition, rawData)\n  const timeseriesData = DatasetHelper.filterRowsByDisplayColumns(chartDefinition, dataSetRows, true)\n\n  return {\n    latestData,\n    dataSetRows,\n    timeseriesData,\n  }\n}\n\nconst getChartDetails = (\n  chartDefinition: DashboardVisualisation,\n  data: DashboardDataResponse[],\n  timeseries = false,\n): ChartDetails => {\n  const meta: ChartMetaData[] = []\n  const headlines: ChartMetaData[] = createHeadlines(chartDefinition, data, timeseries)\n\n  if (data[0]?.ts) {\n    meta.push({\n      label: 'Values for:',\n      value: data[0]?.ts.raw,\n    })\n  }\n\n  return {\n    meta,\n    headlines,\n  }\n}\n\nconst createHeadlines = (\n  chartDefinition: DashboardVisualisation,\n  data: DashboardDataResponse[],\n  timeseries = false,\n) => {\n  const headlines: ChartMetaData[] = []\n  const { columns } = chartDefinition\n  const { measures } = columns\n  const isListChart = !!(<BarChartVisualisationColumn[]>measures).find((col) => col.axis)\n  let headline: ChartMetaData\n\n  let headlineColumn: BarChartVisualisationColumn\n  let value: number\n  let label: string\n\n  if (timeseries) {\n    headlineColumn = <BarChartVisualisationColumn>measures.find((col) => col.id !== 'ts')\n    if (headlineColumn) {\n      label = `${data[0].ts.raw}`\n      value = +data[0][headlineColumn.id].raw\n\n      headline = {\n        label,\n        value,\n      }\n    }\n  } else {\n    headlineColumn = !isListChart\n      ? <BarChartVisualisationColumn>measures[0]\n      : measures.find((col: BarChartVisualisationColumn) => col.axis && col.axis === 'y')\n\n    if (headlineColumn) {\n      label = `Total ${headlineColumn.display.toLowerCase()}`\n      value = data.reduce((acc: number, d: DashboardDataResponse) => acc + +d[headlineColumn.id].raw, 0)\n\n      headline = {\n        label,\n        value,\n      }\n    }\n  }\n\n  headlines.push(headline)\n\n  return headlines\n}\n\nconst createSnapshotChart = (\n  chartDefinition: DashboardVisualisation,\n  snapshotData: DashboardDataResponse[],\n): ChartData => {\n  const { type, columns } = chartDefinition\n  const { measures } = columns\n  const isListChart = !!(<BarChartVisualisationColumn[]>measures).find((col) => col.axis)\n\n  let labels: string[]\n  let unit\n  let datasets: ChartDataset[]\n\n  if (!isListChart) {\n    ;({ labels, unit, datasets } = buildChart(columns, snapshotData))\n  } else {\n    ;({ labels, unit, datasets } = buildChartFromListData(columns, snapshotData))\n  }\n\n  return {\n    type: type as unknown as ChartType,\n    unit,\n    data: {\n      labels,\n      datasets,\n    },\n  }\n}\n\nconst buildChart = (columns: DashboardVisualisationColumns, rawData: DashboardDataResponse[]) => {\n  const { keys, measures } = columns\n  const labels = measures.map((col) => col.display)\n  const labelId = keys[keys.length - 1]?.id as keyof DashboardDataResponse\n  const unit = measures[0].unit ? measures[0].unit : undefined\n\n  const datasets = rawData.map((row) => {\n    const label = row[labelId] ? `${row[labelId].raw}` : 'All'\n    const data = measures.map((c) => {\n      const rowId = c.id as keyof DashboardDataResponse\n      return row[rowId] ? +row[rowId].raw : 0\n    })\n    const total = data.reduce((acc: number, val: number) => acc + val, 0)\n    return { label, data, total } as ChartDataset\n  })\n\n  return {\n    labels,\n    unit,\n    datasets,\n  }\n}\n\nconst buildChartFromListData = (columns: DashboardVisualisationColumns, rawData: DashboardDataResponse[]) => {\n  const { measures, keys } = columns\n\n  const xAxisColumn = (<BarChartVisualisationColumn[]>measures).find((col) => col.axis === 'x')\n  const yAxisColumn = (<BarChartVisualisationColumn[]>measures).find((col) => col.axis === 'y')\n\n  const unit = yAxisColumn?.unit || undefined\n  const groupKey = DatasetHelper.getGroupKey(keys, rawData)\n  const groupsData = groupKey ? DatasetHelper.groupRowsByKey(rawData, groupKey.id) : [rawData]\n\n  const labels = groupsData[0]?.map((row) => {\n    return `${row[xAxisColumn.id].raw}`\n  })\n\n  const datasets: ChartDataset[] = groupsData.map((groupData) => {\n    const data = groupData.map((row) => +row[yAxisColumn.id].raw)\n    return {\n      label: groupKey ? `${groupData[0][groupKey.id].raw}` : yAxisColumn.display,\n      data,\n      total: data.reduce((acc: number, val: number) => acc + val, 0),\n    }\n  })\n\n  return {\n    labels,\n    unit,\n    datasets,\n  }\n}\n\nconst createSnapshotTable = (chartDefinition: DashboardVisualisation, data: DashboardDataResponse[]): MoJTable => {\n  const { columns } = chartDefinition\n  const { keys, measures } = columns\n\n  const headerColumns = [...keys, ...measures]\n  const head = headerColumns.map((column) => {\n    return { text: column.display }\n  })\n\n  const filteredRowData = DatasetHelper.filterRowsByDisplayColumns(chartDefinition, data, true)\n  const rows = DashboardListUtils.createTableRows(filteredRowData)\n\n  return {\n    head,\n    rows,\n  }\n}\n\nconst createTimeseriesChart = (\n  chartDefinition: DashboardVisualisation,\n  timeseriesData: DashboardDataResponse[],\n): ChartData => {\n  const { columns } = chartDefinition\n  const { keys, measures } = columns\n\n  const unit = measures[0].unit ? measures[0].unit : undefined\n  const type = chartDefinition.type.split('-')[0]\n  const groupKey = DatasetHelper.getGroupKey(keys, timeseriesData)\n  const labelId = groupKey.id as keyof DashboardDataResponse\n\n  const timeBlockData = DatasetHelper.groupRowsByTimestamp(timeseriesData)\n  const labels = timeBlockData.map((d: DashboardDataResponse[]) => d[0].ts.raw as unknown as string)\n  const datasetCount = timeBlockData[0].length\n\n  const datasets: ChartDataset[] = []\n  for (let index = 0; index < datasetCount; index += 1) {\n    const data = timeBlockData.map((timeperiod) => {\n      return +timeperiod[index][measures[1].id].raw\n    })\n    const total = data.reduce((a, c) => a + c, 0)\n    const label = timeBlockData[0][index][labelId].raw as string\n\n    datasets.push({\n      data,\n      label,\n      total,\n    })\n  }\n\n  return {\n    type: type as unknown as ChartType,\n    unit,\n    timeseries: true,\n    data: {\n      labels,\n      datasets,\n    },\n  }\n}\n\nconst createTimeseriesTable = (\n  chartDefinition: DashboardVisualisation,\n  timeseriesData: DashboardDataResponse[],\n): MoJTable => {\n  const { columns } = chartDefinition\n  const { keys, measures } = columns\n\n  let flatTimeseriesData = timeseriesData.flat()\n  let headerColumns = [...measures]\n\n  if (timeseriesData.length > 1) {\n    // Add keys as columns as well as measures, and put TS first:\n    // Get TS column an remove it from headings\n    const timestampIndex = headerColumns.findIndex((m) => m.id === 'ts')\n    const timestampCol = headerColumns[timestampIndex]\n    headerColumns.splice(timestampIndex, 1)\n    // Remove duplicate TS from keys if present and add keys to headings\n    const keysWithoutTs = keys.filter((k) => k.id !== 'ts')\n    headerColumns = [...keysWithoutTs, ...headerColumns]\n    // Add TS column to the start\n    headerColumns.unshift(timestampCol)\n  } else {\n    flatTimeseriesData = DatasetHelper.filterRowsByDisplayColumns(chartDefinition, flatTimeseriesData)\n  }\n\n  const head = headerColumns.map((column) => {\n    return { text: column.display }\n  })\n\n  const rows = DashboardListUtils.createTableRows(flatTimeseriesData)\n\n  return {\n    head,\n    rows,\n  } as MoJTable\n}\n\nexport default {\n  createChart,\n  createTimeseriesCharts,\n  createMatrixChart,\n}\n"],
-  "mappings": "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",
-  "names": ["utils_exports", "__export", "createChart", "createMatrixChart", "createTimeseriesCharts", "utils_default", "__toCommonJS", "import_dayjs", "import_weekOfYear", "import_datasetHelper", "import_utils", "import_types", "import_HeatmapChart", "dayjs", "weekOfYear", "chartDefinition", "rawData", "table", "chart", "details", "dataSetRows", "snapshotData", "getDataForSnapshotCharts", "createSnapshotChart", "createSnapshotTable", "getChartDetails", "latestData", "timeseriesData", "getDataForTimeseriesCharts", "createTimeseriesChart", "createTimeseriesTable", "query", "granularity", "key", "HeatmapChart", "data", "DatasetHelper", "timeseries", "meta", "headlines", "createHeadlines", "columns", "measures", "isListChart", "col", "headline", "headlineColumn", "value", "label", "acc", "d", "type", "labels", "unit", "datasets", "buildChartFromListData", "buildChart", "keys", "labelId", "row", "rowId", "total", "val", "xAxisColumn", "yAxisColumn", "groupKey", "groupsData", "groupData", "head", "column", "filteredRowData", "rows", "DashboardListUtils", "timeBlockData", "datasetCount", "index", "timeperiod", "a", "c", "flatTimeseriesData", "headerColumns", "timestampIndex", "m", "timestampCol", "k"]
+  "sourcesContent": ["import dayjs from 'dayjs'\nimport weekOfYear from 'dayjs/plugin/weekOfYear'\nimport { ChartDetails, ChartMetaData } from '../../types/Charts'\nimport { DashboardDataResponse } from '../../types/Metrics'\nimport DatasetHelper from '../../utils/datasetHelper'\nimport DashboardListUtils from '../_dashboards/dashboard-list/utils'\nimport { Granularity } from '../_inputs/granular-date-range/types'\nimport HeatmapChart from './chart/heatmap/HeatmapChart'\nimport { components } from '../../types/api'\nimport {\n  DashboardVisualisationData,\n  DashboardVisualisationDataSet,\n  DashboardVisualisatonCardData,\n  MoJTable,\n} from '../_dashboards/dashboard-visualisation/types'\n\ndayjs.extend(weekOfYear)\n\nexport const createChart = (\n  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],\n  rawData: DashboardDataResponse[],\n): DashboardVisualisatonCardData => {\n  let table: MoJTable\n  let chart: DashboardVisualisationData\n  let details: ChartDetails\n\n  const { dataSetRows, snapshotData } = getDataForSnapshotCharts(chartDefinition, rawData)\n  if (dataSetRows.length) {\n    chart = createSnapshotChart(chartDefinition, snapshotData)\n    table = createSnapshotTable(chartDefinition, dataSetRows)\n    details = getChartDetails(chartDefinition, dataSetRows)\n  }\n\n  return {\n    details,\n    table,\n    chart,\n  }\n}\n\nexport const createTimeseriesCharts = (\n  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],\n  rawData: DashboardDataResponse[],\n): DashboardVisualisatonCardData => {\n  let table: MoJTable\n  let chart: DashboardVisualisationData\n  let details: ChartDetails\n\n  const { latestData, dataSetRows, timeseriesData } = getDataForTimeseriesCharts(chartDefinition, rawData)\n  if (dataSetRows.length) {\n    chart = createTimeseriesChart(chartDefinition, timeseriesData)\n    table = createTimeseriesTable(chartDefinition, timeseriesData)\n    details = getChartDetails(chartDefinition, latestData, true)\n  }\n  return {\n    details,\n    table,\n    chart,\n  }\n}\n\nexport const createMatrixChart = (\n  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],\n  rawData: DashboardDataResponse[],\n  query: Record<string, string | string[]>,\n) => {\n  let table: MoJTable\n  let chart: DashboardVisualisationData\n  let details: ChartDetails\n  let granularity: Granularity = Granularity.DAILY\n\n  Object.keys(query).forEach((key) => {\n    if (key.includes('granularity')) {\n      granularity = <Granularity>query[key]\n    }\n  })\n\n  const { latestData, dataSetRows, timeseriesData } = getDataForTimeseriesCharts(chartDefinition, rawData)\n  if (dataSetRows.length) {\n    chart = new HeatmapChart(timeseriesData, granularity, chartDefinition).build()\n    table = createTimeseriesTable(chartDefinition, timeseriesData)\n    details = getChartDetails(chartDefinition, latestData, true)\n  }\n  return {\n    details,\n    table,\n    chart,\n  }\n}\n\nconst getDataForSnapshotCharts = (\n  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],\n  rawData: DashboardDataResponse[],\n) => {\n  const data = DatasetHelper.getLastestDataset(rawData)\n  const dataSetRows = DatasetHelper.getDatasetRows(chartDefinition, data)\n  const snapshotData = DatasetHelper.filterRowsByDisplayColumns(chartDefinition, dataSetRows, true)\n\n  return {\n    dataSetRows,\n    snapshotData,\n  }\n}\n\nconst getDataForTimeseriesCharts = (\n  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],\n  rawData: DashboardDataResponse[],\n) => {\n  const latestData = DatasetHelper.getLastestDataset(rawData)\n  const dataSetRows = DatasetHelper.getDatasetRows(chartDefinition, rawData)\n  const timeseriesData = DatasetHelper.filterRowsByDisplayColumns(chartDefinition, dataSetRows, true)\n\n  return {\n    latestData,\n    dataSetRows,\n    timeseriesData,\n  }\n}\n\nconst getChartDetails = (\n  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],\n  data: DashboardDataResponse[],\n  timeseries = false,\n): ChartDetails => {\n  const meta: ChartMetaData[] = []\n  const headlines: ChartMetaData[] = createHeadlines(chartDefinition, data, timeseries)\n\n  if (data[0]?.ts) {\n    meta.push({\n      label: 'Values for:',\n      value: data[0]?.ts.raw,\n    })\n  }\n\n  return {\n    meta,\n    headlines,\n  }\n}\n\nconst createHeadlines = (\n  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],\n  data: DashboardDataResponse[],\n  timeseries = false,\n) => {\n  const headlines: ChartMetaData[] = []\n  const { columns } = chartDefinition\n  const { measures } = columns\n  const isListChart = !!measures.find((col) => col.axis)\n  let headline: ChartMetaData\n\n  let headlineColumn: components['schemas']['DashboardVisualisationColumnDefinition']\n  let value: number\n  let label: string\n\n  if (timeseries) {\n    headlineColumn = measures.find((col) => col.id !== 'ts')\n    if (headlineColumn) {\n      label = `${data[0].ts.raw}`\n      value = +data[0][headlineColumn.id].raw\n\n      headline = {\n        label,\n        value,\n      }\n    }\n  } else {\n    headlineColumn = !isListChart ? measures[0] : measures.find((col) => col.axis && col.axis === 'y')\n\n    if (headlineColumn) {\n      label = `Total ${headlineColumn.display.toLowerCase()}`\n      value = data.reduce((acc: number, d: DashboardDataResponse) => acc + +d[headlineColumn.id].raw, 0)\n\n      headline = {\n        label,\n        value,\n      }\n    }\n  }\n\n  headlines.push(headline)\n\n  return headlines\n}\n\nconst createSnapshotChart = (\n  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],\n  snapshotData: DashboardDataResponse[],\n): DashboardVisualisationData => {\n  const { type, columns } = chartDefinition\n  const { measures } = columns\n  const isListChart = !!measures.find((col) => col.axis)\n\n  let labels: string[]\n  let unit\n  let datasets: DashboardVisualisationDataSet[]\n\n  if (!isListChart) {\n    ;({ labels, unit, datasets } = buildChart(columns, snapshotData))\n  } else {\n    ;({ labels, unit, datasets } = buildChartFromListData(columns, snapshotData))\n  }\n\n  return {\n    type,\n    unit,\n    data: {\n      labels,\n      datasets,\n    },\n  }\n}\n\nconst buildChart = (\n  columns: components['schemas']['DashboardVisualisationColumnsDefinition'],\n  rawData: DashboardDataResponse[],\n) => {\n  const { keys, measures } = columns\n  const labels = measures.map((col) => col.display)\n  const labelId = keys[keys.length - 1]?.id as keyof DashboardDataResponse\n  const unit = measures[0].unit ? measures[0].unit : undefined\n\n  const datasets = rawData.map((row) => {\n    const label = row[labelId] ? `${row[labelId].raw}` : 'All'\n    const data = measures.map((c) => {\n      const rowId = c.id as keyof DashboardDataResponse\n      return row[rowId] ? +row[rowId].raw : 0\n    })\n    const total = data.reduce((acc: number, val: number) => acc + val, 0)\n    return { label, data, total } as DashboardVisualisationDataSet\n  })\n\n  return {\n    labels,\n    unit,\n    datasets,\n  }\n}\n\nconst buildChartFromListData = (\n  columns: components['schemas']['DashboardVisualisationColumnsDefinition'],\n  rawData: DashboardDataResponse[],\n) => {\n  const { measures, keys } = columns\n\n  const xAxisColumn = measures.find((col) => col.axis === 'x')\n  const yAxisColumn = measures.find((col) => col.axis === 'y')\n\n  const unit = yAxisColumn?.unit || undefined\n  const groupKey = DatasetHelper.getGroupKey(keys, rawData)\n  const groupsData = groupKey ? DatasetHelper.groupRowsByKey(rawData, groupKey.id) : [rawData]\n\n  const labels = groupsData[0]?.map((row) => {\n    return `${row[xAxisColumn.id].raw}`\n  })\n\n  const datasets: DashboardVisualisationDataSet[] = groupsData.map((groupData) => {\n    const data = groupData.map((row) => +row[yAxisColumn.id].raw)\n    return {\n      label: groupKey ? `${groupData[0][groupKey.id].raw}` : yAxisColumn.display,\n      data,\n      total: data.reduce((acc: number, val: number) => acc + val, 0),\n    }\n  })\n\n  return {\n    labels,\n    unit,\n    datasets,\n  }\n}\n\nconst createSnapshotTable = (\n  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],\n  data: DashboardDataResponse[],\n): MoJTable => {\n  const { columns } = chartDefinition\n  const { keys, measures } = columns\n\n  const headerColumns = [...keys, ...measures]\n  const head = headerColumns.map((column) => {\n    return { text: column.display }\n  })\n\n  const filteredRowData = DatasetHelper.filterRowsByDisplayColumns(chartDefinition, data, true)\n  const rows = DashboardListUtils.createTableRows(filteredRowData)\n\n  return {\n    head,\n    rows,\n  }\n}\n\nconst createTimeseriesChart = (\n  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],\n  timeseriesData: DashboardDataResponse[],\n): DashboardVisualisationData => {\n  const { columns } = chartDefinition\n  const { keys, measures } = columns\n\n  const unit = measures[0].unit ? measures[0].unit : undefined\n  const type = <components['schemas']['DashboardVisualisationDefinition']['type']>chartDefinition.type.split('-')[0]\n  const groupKey = DatasetHelper.getGroupKey(keys, timeseriesData)\n  const labelId = groupKey.id as keyof DashboardDataResponse\n\n  const timeBlockData = DatasetHelper.groupRowsByTimestamp(timeseriesData)\n  const labels = timeBlockData.map((d: DashboardDataResponse[]) => d[0].ts.raw as unknown as string)\n  const datasetCount = timeBlockData[0].length\n\n  const datasets: DashboardVisualisationDataSet[] = []\n  for (let index = 0; index < datasetCount; index += 1) {\n    const data = timeBlockData.map((timeperiod) => {\n      return +timeperiod[index][measures[1].id].raw\n    })\n    const total = data.reduce((a, c) => a + c, 0)\n    const label = timeBlockData[0][index][labelId].raw as string\n\n    datasets.push({\n      data,\n      label,\n      total,\n    })\n  }\n\n  return {\n    type,\n    unit,\n    timeseries: true,\n    data: {\n      labels,\n      datasets,\n    },\n  }\n}\n\nconst createTimeseriesTable = (\n  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],\n  timeseriesData: DashboardDataResponse[],\n): MoJTable => {\n  const { columns } = chartDefinition\n  const { keys, measures } = columns\n\n  let flatTimeseriesData = timeseriesData.flat()\n  let headerColumns = [...measures]\n\n  if (timeseriesData.length > 1) {\n    // Add keys as columns as well as measures, and put TS first:\n    // Get TS column an remove it from headings\n    const timestampIndex = headerColumns.findIndex((m) => m.id === 'ts')\n    const timestampCol = headerColumns[timestampIndex]\n    headerColumns.splice(timestampIndex, 1)\n    // Remove duplicate TS from keys if present and add keys to headings\n    const keysWithoutTs = keys.filter((k) => k.id !== 'ts')\n    headerColumns = [...keysWithoutTs, ...headerColumns]\n    // Add TS column to the start\n    headerColumns.unshift(timestampCol)\n  } else {\n    flatTimeseriesData = DatasetHelper.filterRowsByDisplayColumns(chartDefinition, flatTimeseriesData)\n  }\n\n  const head = headerColumns.map((column) => {\n    return { text: column.display }\n  })\n\n  const rows = DashboardListUtils.createTableRows(flatTimeseriesData)\n\n  return {\n    head,\n    rows,\n  } as MoJTable\n}\n\nexport default {\n  createChart,\n  createTimeseriesCharts,\n  createMatrixChart,\n}\n"],
+  "mappings": "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",
+  "names": ["utils_exports", "__export", "createChart", "createMatrixChart", "createTimeseriesCharts", "utils_default", "__toCommonJS", "import_dayjs", "import_weekOfYear", "import_datasetHelper", "import_utils", "import_types", "import_HeatmapChart", "dayjs", "weekOfYear", "chartDefinition", "rawData", "table", "chart", "details", "dataSetRows", "snapshotData", "getDataForSnapshotCharts", "createSnapshotChart", "createSnapshotTable", "getChartDetails", "latestData", "timeseriesData", "getDataForTimeseriesCharts", "createTimeseriesChart", "createTimeseriesTable", "query", "granularity", "key", "HeatmapChart", "data", "DatasetHelper", "timeseries", "meta", "headlines", "createHeadlines", "columns", "measures", "isListChart", "col", "headline", "headlineColumn", "value", "label", "acc", "d", "type", "labels", "unit", "datasets", "buildChartFromListData", "buildChart", "keys", "labelId", "row", "c", "rowId", "total", "val", "xAxisColumn", "yAxisColumn", "groupKey", "groupsData", "groupData", "head", "column", "filteredRowData", "rows", "DashboardListUtils", "timeBlockData", "datasetCount", "index", "timeperiod", "a", "flatTimeseriesData", "headerColumns", "timestampIndex", "m", "timestampCol", "k"]
 }

package/dpr/components/_charts/utils.test.ts

@@ -14,19 +14,22 @@ import {
   dataQualityEthnicityHistoricLine,
   dietTotalsByEstablishmentBar,
 } from '../../../../test-app/mocks/mockClients/dashboards/definitions/examples/visualisations/charts'
-import { DashboardVisualisation } from '../_dashboards/dashboard/types'
+import { components } from '../../types/api'
 
 describe('ChartCard Utils', () => {
   let dashboardMetricsData: DashboardDataResponse[][]
   let dashboardMockDietData: DashboardDataResponse[]
-  let snapshotVisualisationDefinition: DashboardVisualisation
-  let snapshotVisualisationFromListDefinition: DashboardVisualisation
-  let timeseriesVisualisationDefinition: DashboardVisualisation
+  let snapshotVisualisationDefinition: components['schemas']['DashboardVisualisationDefinition']
+  let snapshotVisualisationFromListDefinition: components['schemas']['DashboardVisualisationDefinition']
+  let timeseriesVisualisationDefinition: components['schemas']['DashboardVisualisationDefinition']
 
   beforeEach(() => {
-    snapshotVisualisationDefinition = mockEthnicityBarChart as unknown as DashboardVisualisation
-    timeseriesVisualisationDefinition = dataQualityEthnicityHistoricLine as unknown as DashboardVisualisation
-    snapshotVisualisationFromListDefinition = dietTotalsByEstablishmentBar as unknown as DashboardVisualisation
+    snapshotVisualisationDefinition =
+      mockEthnicityBarChart as unknown as components['schemas']['DashboardVisualisationDefinition']
+    timeseriesVisualisationDefinition =
+      dataQualityEthnicityHistoricLine as unknown as components['schemas']['DashboardVisualisationDefinition']
+    snapshotVisualisationFromListDefinition =
+      dietTotalsByEstablishmentBar as unknown as components['schemas']['DashboardVisualisationDefinition']
     dashboardMetricsData = mockTimeSeriesDataLastSixMonths
     dashboardMockDietData = mockDietDataLastSixMonths
   })

package/dpr/components/_charts/utils.ts

@@ -1,33 +1,27 @@
 import dayjs from 'dayjs'
 import weekOfYear from 'dayjs/plugin/weekOfYear'
-import {
-  ChartData,
-  MoJTable,
-  ChartCardData,
-  ChartDataset,
-  ChartType,
-  ChartDetails,
-  ChartMetaData,
-} from '../../types/Charts'
+import { ChartDetails, ChartMetaData } from '../../types/Charts'
 import { DashboardDataResponse } from '../../types/Metrics'
-import {
-  BarChartVisualisationColumn,
-  DashboardVisualisation,
-  DashboardVisualisationColumns,
-} from '../_dashboards/dashboard/types'
 import DatasetHelper from '../../utils/datasetHelper'
 import DashboardListUtils from '../_dashboards/dashboard-list/utils'
 import { Granularity } from '../_inputs/granular-date-range/types'
 import HeatmapChart from './chart/heatmap/HeatmapChart'
+import { components } from '../../types/api'
+import {
+  DashboardVisualisationData,
+  DashboardVisualisationDataSet,
+  DashboardVisualisatonCardData,
+  MoJTable,
+} from '../_dashboards/dashboard-visualisation/types'
 
 dayjs.extend(weekOfYear)
 
 export const createChart = (
-  chartDefinition: DashboardVisualisation,
+  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],
   rawData: DashboardDataResponse[],
-): ChartCardData => {
+): DashboardVisualisatonCardData => {
   let table: MoJTable
-  let chart: ChartData
+  let chart: DashboardVisualisationData
   let details: ChartDetails
 
   const { dataSetRows, snapshotData } = getDataForSnapshotCharts(chartDefinition, rawData)
@@ -45,11 +39,11 @@ export const createChart = (
 }
 
 export const createTimeseriesCharts = (
-  chartDefinition: DashboardVisualisation,
+  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],
   rawData: DashboardDataResponse[],
-): ChartCardData => {
+): DashboardVisualisatonCardData => {
   let table: MoJTable
-  let chart: ChartData
+  let chart: DashboardVisualisationData
   let details: ChartDetails
 
   const { latestData, dataSetRows, timeseriesData } = getDataForTimeseriesCharts(chartDefinition, rawData)
@@ -66,12 +60,12 @@ export const createTimeseriesCharts = (
 }
 
 export const createMatrixChart = (
-  chartDefinition: DashboardVisualisation,
+  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],
   rawData: DashboardDataResponse[],
   query: Record<string, string | string[]>,
 ) => {
   let table: MoJTable
-  let chart: ChartData
+  let chart: DashboardVisualisationData
   let details: ChartDetails
   let granularity: Granularity = Granularity.DAILY
 
@@ -94,7 +88,10 @@ export const createMatrixChart = (
   }
 }
 
-const getDataForSnapshotCharts = (chartDefinition: DashboardVisualisation, rawData: DashboardDataResponse[]) => {
+const getDataForSnapshotCharts = (
+  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],
+  rawData: DashboardDataResponse[],
+) => {
   const data = DatasetHelper.getLastestDataset(rawData)
   const dataSetRows = DatasetHelper.getDatasetRows(chartDefinition, data)
   const snapshotData = DatasetHelper.filterRowsByDisplayColumns(chartDefinition, dataSetRows, true)
@@ -105,7 +102,10 @@ const getDataForSnapshotCharts = (chartDefinition: DashboardVisualisation, rawDa
   }
 }
 
-const getDataForTimeseriesCharts = (chartDefinition: DashboardVisualisation, rawData: DashboardDataResponse[]) => {
+const getDataForTimeseriesCharts = (
+  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],
+  rawData: DashboardDataResponse[],
+) => {
   const latestData = DatasetHelper.getLastestDataset(rawData)
   const dataSetRows = DatasetHelper.getDatasetRows(chartDefinition, rawData)
   const timeseriesData = DatasetHelper.filterRowsByDisplayColumns(chartDefinition, dataSetRows, true)
@@ -118,7 +118,7 @@ const getDataForTimeseriesCharts = (chartDefinition: DashboardVisualisation, raw
 }
 
 const getChartDetails = (
-  chartDefinition: DashboardVisualisation,
+  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],
   data: DashboardDataResponse[],
   timeseries = false,
 ): ChartDetails => {
@@ -139,22 +139,22 @@ const getChartDetails = (
 }
 
 const createHeadlines = (
-  chartDefinition: DashboardVisualisation,
+  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],
   data: DashboardDataResponse[],
   timeseries = false,
 ) => {
   const headlines: ChartMetaData[] = []
   const { columns } = chartDefinition
   const { measures } = columns
-  const isListChart = !!(<BarChartVisualisationColumn[]>measures).find((col) => col.axis)
+  const isListChart = !!measures.find((col) => col.axis)
   let headline: ChartMetaData
 
-  let headlineColumn: BarChartVisualisationColumn
+  let headlineColumn: components['schemas']['DashboardVisualisationColumnDefinition']
   let value: number
   let label: string
 
   if (timeseries) {
-    headlineColumn = <BarChartVisualisationColumn>measures.find((col) => col.id !== 'ts')
+    headlineColumn = measures.find((col) => col.id !== 'ts')
     if (headlineColumn) {
       label = `${data[0].ts.raw}`
       value = +data[0][headlineColumn.id].raw
@@ -165,9 +165,7 @@ const createHeadlines = (
       }
     }
   } else {
-    headlineColumn = !isListChart
-      ? <BarChartVisualisationColumn>measures[0]
-      : measures.find((col: BarChartVisualisationColumn) => col.axis && col.axis === 'y')
+    headlineColumn = !isListChart ? measures[0] : measures.find((col) => col.axis && col.axis === 'y')
 
     if (headlineColumn) {
       label = `Total ${headlineColumn.display.toLowerCase()}`
@@ -186,16 +184,16 @@ const createHeadlines = (
 }
 
 const createSnapshotChart = (
-  chartDefinition: DashboardVisualisation,
+  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],
   snapshotData: DashboardDataResponse[],
-): ChartData => {
+): DashboardVisualisationData => {
   const { type, columns } = chartDefinition
   const { measures } = columns
-  const isListChart = !!(<BarChartVisualisationColumn[]>measures).find((col) => col.axis)
+  const isListChart = !!measures.find((col) => col.axis)
 
   let labels: string[]
   let unit
-  let datasets: ChartDataset[]
+  let datasets: DashboardVisualisationDataSet[]
 
   if (!isListChart) {
     ;({ labels, unit, datasets } = buildChart(columns, snapshotData))
@@ -204,7 +202,7 @@ const createSnapshotChart = (
   }
 
   return {
-    type: type as unknown as ChartType,
+    type,
     unit,
     data: {
       labels,
@@ -213,7 +211,10 @@ const createSnapshotChart = (
   }
 }
 
-const buildChart = (columns: DashboardVisualisationColumns, rawData: DashboardDataResponse[]) => {
+const buildChart = (
+  columns: components['schemas']['DashboardVisualisationColumnsDefinition'],
+  rawData: DashboardDataResponse[],
+) => {
   const { keys, measures } = columns
   const labels = measures.map((col) => col.display)
   const labelId = keys[keys.length - 1]?.id as keyof DashboardDataResponse
@@ -226,7 +227,7 @@ const buildChart = (columns: DashboardVisualisationColumns, rawData: DashboardDa
       return row[rowId] ? +row[rowId].raw : 0
     })
     const total = data.reduce((acc: number, val: number) => acc + val, 0)
-    return { label, data, total } as ChartDataset
+    return { label, data, total } as DashboardVisualisationDataSet
   })
 
   return {
@@ -236,11 +237,14 @@ const buildChart = (columns: DashboardVisualisationColumns, rawData: DashboardDa
   }
 }
 
-const buildChartFromListData = (columns: DashboardVisualisationColumns, rawData: DashboardDataResponse[]) => {
+const buildChartFromListData = (
+  columns: components['schemas']['DashboardVisualisationColumnsDefinition'],
+  rawData: DashboardDataResponse[],
+) => {
   const { measures, keys } = columns
 
-  const xAxisColumn = (<BarChartVisualisationColumn[]>measures).find((col) => col.axis === 'x')
-  const yAxisColumn = (<BarChartVisualisationColumn[]>measures).find((col) => col.axis === 'y')
+  const xAxisColumn = measures.find((col) => col.axis === 'x')
+  const yAxisColumn = measures.find((col) => col.axis === 'y')
 
   const unit = yAxisColumn?.unit || undefined
   const groupKey = DatasetHelper.getGroupKey(keys, rawData)
@@ -250,7 +254,7 @@ const buildChartFromListData = (columns: DashboardVisualisationColumns, rawData:
     return `${row[xAxisColumn.id].raw}`
   })
 
-  const datasets: ChartDataset[] = groupsData.map((groupData) => {
+  const datasets: DashboardVisualisationDataSet[] = groupsData.map((groupData) => {
     const data = groupData.map((row) => +row[yAxisColumn.id].raw)
     return {
       label: groupKey ? `${groupData[0][groupKey.id].raw}` : yAxisColumn.display,
@@ -266,7 +270,10 @@ const buildChartFromListData = (columns: DashboardVisualisationColumns, rawData:
   }
 }
 
-const createSnapshotTable = (chartDefinition: DashboardVisualisation, data: DashboardDataResponse[]): MoJTable => {
+const createSnapshotTable = (
+  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],
+  data: DashboardDataResponse[],
+): MoJTable => {
   const { columns } = chartDefinition
   const { keys, measures } = columns
 
@@ -285,14 +292,14 @@ const createSnapshotTable = (chartDefinition: DashboardVisualisation, data: Dash
 }
 
 const createTimeseriesChart = (
-  chartDefinition: DashboardVisualisation,
+  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],
   timeseriesData: DashboardDataResponse[],
-): ChartData => {
+): DashboardVisualisationData => {
   const { columns } = chartDefinition
   const { keys, measures } = columns
 
   const unit = measures[0].unit ? measures[0].unit : undefined
-  const type = chartDefinition.type.split('-')[0]
+  const type = <components['schemas']['DashboardVisualisationDefinition']['type']>chartDefinition.type.split('-')[0]
   const groupKey = DatasetHelper.getGroupKey(keys, timeseriesData)
   const labelId = groupKey.id as keyof DashboardDataResponse
 
@@ -300,7 +307,7 @@ const createTimeseriesChart = (
   const labels = timeBlockData.map((d: DashboardDataResponse[]) => d[0].ts.raw as unknown as string)
   const datasetCount = timeBlockData[0].length
 
-  const datasets: ChartDataset[] = []
+  const datasets: DashboardVisualisationDataSet[] = []
   for (let index = 0; index < datasetCount; index += 1) {
     const data = timeBlockData.map((timeperiod) => {
       return +timeperiod[index][measures[1].id].raw
@@ -316,7 +323,7 @@ const createTimeseriesChart = (
   }
 
   return {
-    type: type as unknown as ChartType,
+    type,
     unit,
     timeseries: true,
     data: {
@@ -327,7 +334,7 @@ const createTimeseriesChart = (
 }
 
 const createTimeseriesTable = (
-  chartDefinition: DashboardVisualisation,
+  chartDefinition: components['schemas']['DashboardVisualisationDefinition'],
   timeseriesData: DashboardDataResponse[],
 ): MoJTable => {
   const { columns } = chartDefinition

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

@@ -17,7 +17,7 @@
 
     <div class="dashboard-content">
       {{ dprReportHeading(data) }}
-      {{ dprDashboardFilters(data.filters) }}
+      {{ dprDashboardFilters(data.filters, { csrfToken: data.csrfToken }) }}
 
       {% for section in data.sections %}
         {{ dprDashboardSection(section) }}