@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.15.0 → 4.15.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ministryofjustice/hmpps-digital-prison-reporting-frontend",
   "description": "The Digital Prison Reporting Frontend contains templates and code to help display data effectively in UI applications.",
-  "version": "4.15.0",
+  "version": "4.15.2",
   "main": "dpr/all.mjs",
   "sass": "dpr/all.scss",
   "engines": {

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

@@ -1,2 +0,0 @@
-var y=Object.create;var m=Object.defineProperty;var Y=Object.getOwnPropertyDescriptor;var C=Object.getOwnPropertyNames;var g=Object.getPrototypeOf,x=Object.prototype.hasOwnProperty;var w=(a,r)=>{for(var s in r)m(a,s,{get:r[s],enumerable:!0})},p=(a,r,s,e)=>{if(r&&typeof r=="object"||typeof r=="function")for(let t of C(r))!x.call(a,t)&&t!==s&&m(a,t,{get:()=>r[t],enumerable:!(e=Y(r,t))||e.enumerable});return a};var D=(a,r,s)=>(s=a!=null?y(g(a)):{},p(r||!a||!a.__esModule?m(s,"default",{value:a,enumerable:!0}):s,a)),k=a=>p(m({},"__esModule",{value:!0}),a);var S={};w(S,{createTimeseriesMatrixChart:()=>z});module.exports=k(S);var c=D(require("dayjs")),M=require("with-alpha-hex"),b=require("../../../_dashboards/dashboard/types"),f=D(require("../../../../utils/datasetHelper"));const V=(a,r,s)=>{const{measures:e}=s;return a.map(t=>{const{raw:o,rag:n}=t[0][e[1].id],u=Number(o),d=n!==void 0?Number(t[0][e[1].id].rag):void 0;let i,l;switch(r){case"hourly":break;case"weekly":i=(0,c.default)(t[0].ts.raw,"DD/MM/YYYY").format("ddd"),l=(0,c.default)(t[0].ts.raw,"DD/MM/YYYY").week();break;case"daily":i=(0,c.default)(t[0].ts.raw,"DD/MM/YYYY").format("MMM YY"),l=(0,c.default)(t[0].ts.raw,"DD/MM/YYYY").format("D");break;case"monthly":{const h=t[0].ts.raw.split(" ");i=h[1],l=h[0]}break;case"annually":i="year",l=t[0].ts.raw;break;default:i=(0,c.default)(t[0].ts.raw,"DD/MM/YYYY").format("MMM YY"),l=(0,c.default)(t[0].ts.raw,"DD/MM/YYYY").format("D");break}return{y:l,x:i,v:u,r:d}})},R=(a,r,s,e)=>{const{columns:t}=s;v(s);const o=T(t);let n=V(a,r,t);return n=A(n,e),[{label:o,data:n}]},v=a=>{const{id:r,columns:s,type:e}=a,t=[];if(s.measures.length!==2?t.push(`Measures should only have 2 columns defined. Only found ${s.measures.length}`):e===b.DashboardVisualisationType.MATRIX_TIMESERIES&&s.measures[0].id!=="ts"&&t.push(`measure at index 0 has incorrect ID. Expected ID to be "ts". Found "${s.measures[0].id}"`),t.length){const o=`Validation: Visualisaton definition: ID: ${r}, type: ${e}, errors: ${t.join(",")}`;throw new Error(o)}},T=a=>a.measures[1].display,A=(a,r)=>{const{useRagColours:s}=r,e=G(a),t=e?$(a):3,o=I(t,s);return e?E(a,o):B(a,o)},B=(a,r)=>{const s=N(a,r.length),e=r.slice().reverse();return a.map(t=>{let o=0;return s.forEach((n,u)=>{t.v<=n&&(o=u)}),{...t,r:o,c:e[o]}})},E=(a,r)=>a.map(s=>({...s,c:r[s.r]})),I=(a,r)=>r?["#00703c","#ffdd00","	#d4351c"]:O(a),O=a=>{const r="#1d70b8",s=1/a;return Array.from(Array(a)).map((e,t)=>{const o=s*(t+1);return(0,M.withAlphaHex)(r,o)})},$=a=>Math.max(...a.map(r=>r.r))+1,G=a=>a[0].r!==void 0,N=(a,r)=>{const s=a.map(n=>n.v),e=Math.min(...s),t=Math.max(...s),o=Math.ceil((t-e)/r);return Array.from(Array(r)).map((n,u)=>o*(u+1)).reverse()},z=(a,r,s)=>{const{columns:e,options:t}=a,{measures:o}=e,n=o[0].unit?o[0].unit:void 0,u=a.type.split("-")[0],d=f.default.groupRowsByTimestamp(r),i=R(d,s,a,t);return{type:u,unit:n,timeseries:!0,data:{datasets:i}}};0&&(module.exports={createTimeseriesMatrixChart});
-//# sourceMappingURL=utils.js.map

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

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../../../src/dpr/components/_charts/chart/heatmap/utils.ts"],
-  "sourcesContent": ["/* eslint-disable prefer-destructuring */\nimport dayjs from 'dayjs'\nimport { withAlphaHex } from 'with-alpha-hex'\nimport {\n  DashboardVisualisation,\n  DashboardVisualisationColumns,\n  DashboardVisualisationType,\n  MatrixDashboardVisualisationOptions,\n} from '../../../_dashboards/dashboard/types'\nimport { Granularity } from '../../../_inputs/granular-date-range/types'\nimport { ChartData, ChartDataset, ChartType, MatrixChartData } from '../../../../types/Charts'\nimport { DashboardDataResponse } from '../../../../types/Metrics'\nimport DatasetHelper from '../../../../utils/datasetHelper'\n\nconst initTimeseriesMatrixAxis = (\n  timeBlockData: DashboardDataResponse[][],\n  granularity: Granularity,\n  columns: DashboardVisualisationColumns,\n): MatrixChartData[] => {\n  const { measures } = columns\n  return timeBlockData.map((tsData) => {\n    const { raw, rag } = tsData[0][measures[1].id]\n    const v = Number(raw)\n    const r = rag !== undefined ? Number(tsData[0][measures[1].id].rag) : undefined\n    let x\n    let y\n    switch (granularity) {\n      case 'hourly':\n        break\n      case 'weekly':\n        x = dayjs(tsData[0].ts.raw, 'DD/MM/YYYY').format('ddd')\n        y = dayjs(tsData[0].ts.raw, 'DD/MM/YYYY').week()\n        break\n      case 'daily':\n        x = dayjs(tsData[0].ts.raw, 'DD/MM/YYYY').format('MMM YY')\n        y = dayjs(tsData[0].ts.raw, 'DD/MM/YYYY').format('D')\n        break\n      case 'monthly':\n        {\n          const ts = (<string>tsData[0].ts.raw).split(' ')\n          x = ts[1]\n          y = ts[0]\n        }\n        break\n      case 'annually':\n        x = 'year'\n        y = <string>tsData[0].ts.raw\n        break\n      default:\n        x = dayjs(tsData[0].ts.raw, 'DD/MM/YYYY').format('MMM YY')\n        y = dayjs(tsData[0].ts.raw, 'DD/MM/YYYY').format('D')\n        break\n    }\n\n    return { y, x, v, r }\n  })\n}\n\nconst createMatrixDataSet = (\n  timeBlockData: DashboardDataResponse[][],\n  granularity: Granularity,\n  chartDefinition: DashboardVisualisation,\n  options: MatrixDashboardVisualisationOptions,\n) => {\n  const { columns } = chartDefinition\n  validateDefinition(chartDefinition)\n  const label = getLabel(columns)\n  let data: MatrixChartData[] = initTimeseriesMatrixAxis(timeBlockData, granularity, columns)\n  data = addBucketData(data, options)\n\n  return [{ label, data }]\n}\n\nconst validateDefinition = (chartDefinition: DashboardVisualisation) => {\n  const { id, columns, type } = chartDefinition\n\n  const errors = []\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  if (errors.length) {\n    const message = `Validation: Visualisaton definition: ID: ${id}, type: ${type}, errors: ${errors.join(',')}`\n    throw new Error(message)\n  }\n}\n\nconst getLabel = (columns: DashboardVisualisationColumns) => {\n  return columns.measures[1].display\n}\n\nconst addBucketData = (matrixDataSets: MatrixChartData[], options: MatrixDashboardVisualisationOptions) => {\n  const { useRagColours } = options\n  const hasRag = hasRagNumber(matrixDataSets)\n  const bucketCount = hasRag ? getBucketCount(matrixDataSets) : 3\n  const bucketColours = createRagColours(bucketCount, useRagColours)\n  return hasRag ? setColoursForRag(matrixDataSets, bucketColours) : setColoursWithoutRag(matrixDataSets, bucketColours)\n}\n\nconst setColoursWithoutRag = (matrixDataSets: MatrixChartData[], bucketColours: string[]) => {\n  const bucketSizes = getBucketSizes(matrixDataSets, bucketColours.length)\n  const colours = bucketColours.slice().reverse()\n\n  return matrixDataSets.map((dataPoint) => {\n    let bucketNumber = 0\n    bucketSizes.forEach((bucket, i) => {\n      if (dataPoint.v <= bucket) bucketNumber = i\n    })\n    return { ...dataPoint, r: bucketNumber, c: colours[bucketNumber] }\n  })\n}\n\nconst setColoursForRag = (matrixDataSets: MatrixChartData[], bucketColours: string[]) => {\n  return matrixDataSets.map((dataPoint) => {\n    return { ...dataPoint, c: bucketColours[dataPoint.r] }\n  })\n}\n\nconst createRagColours = (bucketCount: number, useRagColours: boolean) => {\n  const ragColours = ['#00703c', '#ffdd00', '\t#d4351c']\n  return useRagColours ? ragColours : generateBucketColours(bucketCount)\n}\n\nconst generateBucketColours = (bucketCount: number) => {\n  const baseColour = '#1d70b8'\n  const alphaDivision = 1 / bucketCount\n  return Array.from(Array(bucketCount)).map((d, i) => {\n    const division = alphaDivision * (i + 1)\n    return withAlphaHex(baseColour, division)\n  })\n}\n\nconst getBucketCount = (matrixDataSets: MatrixChartData[]) => {\n  return Math.max(...matrixDataSets.map((o) => o.r)) + 1\n}\n\nconst hasRagNumber = (matrixDataSets: MatrixChartData[]) => {\n  return matrixDataSets[0].r !== undefined\n}\n\nconst getBucketSizes = (matrixDataSets: MatrixChartData[], bucketCount: number) => {\n  const values = matrixDataSets.map((dataPoint) => dataPoint.v)\n  const min = Math.min(...values)\n  const max = Math.max(...values)\n  const threshholdSize = Math.ceil((max - min) / bucketCount)\n  return Array.from(Array(bucketCount))\n    .map((d, i) => {\n      return threshholdSize * (i + 1)\n    })\n    .reverse()\n}\n\nexport const createTimeseriesMatrixChart = (\n  chartDefinition: DashboardVisualisation,\n  timeseriesData: DashboardDataResponse[],\n  granularity: Granularity,\n): ChartData => {\n  const { columns, options } = chartDefinition\n  const { measures } = columns\n\n  const unit = measures[0].unit ? measures[0].unit : undefined\n  const type = chartDefinition.type.split('-')[0]\n  const timeBlockData = DatasetHelper.groupRowsByTimestamp(timeseriesData)\n  const matrixDataSets: ChartDataset[] = createMatrixDataSet(\n    timeBlockData,\n    granularity,\n    chartDefinition,\n    <MatrixDashboardVisualisationOptions>options,\n  )\n\n  return {\n    type: type as unknown as ChartType,\n    unit,\n    timeseries: true,\n    data: {\n      datasets: matrixDataSets,\n    },\n  }\n}\n"],
-  "mappings": "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",
-  "names": ["utils_exports", "__export", "createTimeseriesMatrixChart", "__toCommonJS", "import_dayjs", "import_with_alpha_hex", "import_types", "import_datasetHelper", "initTimeseriesMatrixAxis", "timeBlockData", "granularity", "columns", "measures", "tsData", "raw", "rag", "v", "r", "x", "y", "dayjs", "ts", "createMatrixDataSet", "chartDefinition", "options", "validateDefinition", "label", "getLabel", "data", "addBucketData", "id", "type", "errors", "message", "matrixDataSets", "useRagColours", "hasRag", "hasRagNumber", "bucketCount", "getBucketCount", "bucketColours", "createRagColours", "setColoursForRag", "setColoursWithoutRag", "bucketSizes", "getBucketSizes", "colours", "dataPoint", "bucketNumber", "bucket", "i", "generateBucketColours", "baseColour", "alphaDivision", "d", "division", "o", "values", "min", "max", "threshholdSize", "timeseriesData", "unit", "DatasetHelper"]
-}

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

@@ -1,182 +0,0 @@
-/* eslint-disable prefer-destructuring */
-import dayjs from 'dayjs'
-import { withAlphaHex } from 'with-alpha-hex'
-import {
-  DashboardVisualisation,
-  DashboardVisualisationColumns,
-  DashboardVisualisationType,
-  MatrixDashboardVisualisationOptions,
-} from '../../../_dashboards/dashboard/types'
-import { Granularity } from '../../../_inputs/granular-date-range/types'
-import { ChartData, ChartDataset, ChartType, MatrixChartData } from '../../../../types/Charts'
-import { DashboardDataResponse } from '../../../../types/Metrics'
-import DatasetHelper from '../../../../utils/datasetHelper'
-
-const initTimeseriesMatrixAxis = (
-  timeBlockData: DashboardDataResponse[][],
-  granularity: Granularity,
-  columns: DashboardVisualisationColumns,
-): MatrixChartData[] => {
-  const { measures } = columns
-  return timeBlockData.map((tsData) => {
-    const { raw, rag } = tsData[0][measures[1].id]
-    const v = Number(raw)
-    const r = rag !== undefined ? Number(tsData[0][measures[1].id].rag) : undefined
-    let x
-    let y
-    switch (granularity) {
-      case 'hourly':
-        break
-      case 'weekly':
-        x = dayjs(tsData[0].ts.raw, 'DD/MM/YYYY').format('ddd')
-        y = dayjs(tsData[0].ts.raw, 'DD/MM/YYYY').week()
-        break
-      case 'daily':
-        x = dayjs(tsData[0].ts.raw, 'DD/MM/YYYY').format('MMM YY')
-        y = dayjs(tsData[0].ts.raw, 'DD/MM/YYYY').format('D')
-        break
-      case 'monthly':
-        {
-          const ts = (<string>tsData[0].ts.raw).split(' ')
-          x = ts[1]
-          y = ts[0]
-        }
-        break
-      case 'annually':
-        x = 'year'
-        y = <string>tsData[0].ts.raw
-        break
-      default:
-        x = dayjs(tsData[0].ts.raw, 'DD/MM/YYYY').format('MMM YY')
-        y = dayjs(tsData[0].ts.raw, 'DD/MM/YYYY').format('D')
-        break
-    }
-
-    return { y, x, v, r }
-  })
-}
-
-const createMatrixDataSet = (
-  timeBlockData: DashboardDataResponse[][],
-  granularity: Granularity,
-  chartDefinition: DashboardVisualisation,
-  options: MatrixDashboardVisualisationOptions,
-) => {
-  const { columns } = chartDefinition
-  validateDefinition(chartDefinition)
-  const label = getLabel(columns)
-  let data: MatrixChartData[] = initTimeseriesMatrixAxis(timeBlockData, granularity, columns)
-  data = addBucketData(data, options)
-
-  return [{ label, data }]
-}
-
-const validateDefinition = (chartDefinition: DashboardVisualisation) => {
-  const { id, columns, type } = chartDefinition
-
-  const errors = []
-  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) {
-    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}"`)
-    }
-  }
-  if (errors.length) {
-    const message = `Validation: Visualisaton definition: ID: ${id}, type: ${type}, errors: ${errors.join(',')}`
-    throw new Error(message)
-  }
-}
-
-const getLabel = (columns: DashboardVisualisationColumns) => {
-  return columns.measures[1].display
-}
-
-const addBucketData = (matrixDataSets: MatrixChartData[], options: MatrixDashboardVisualisationOptions) => {
-  const { useRagColours } = options
-  const hasRag = hasRagNumber(matrixDataSets)
-  const bucketCount = hasRag ? getBucketCount(matrixDataSets) : 3
-  const bucketColours = createRagColours(bucketCount, useRagColours)
-  return hasRag ? setColoursForRag(matrixDataSets, bucketColours) : setColoursWithoutRag(matrixDataSets, bucketColours)
-}
-
-const setColoursWithoutRag = (matrixDataSets: MatrixChartData[], bucketColours: string[]) => {
-  const bucketSizes = getBucketSizes(matrixDataSets, bucketColours.length)
-  const colours = bucketColours.slice().reverse()
-
-  return matrixDataSets.map((dataPoint) => {
-    let bucketNumber = 0
-    bucketSizes.forEach((bucket, i) => {
-      if (dataPoint.v <= bucket) bucketNumber = i
-    })
-    return { ...dataPoint, r: bucketNumber, c: colours[bucketNumber] }
-  })
-}
-
-const setColoursForRag = (matrixDataSets: MatrixChartData[], bucketColours: string[]) => {
-  return matrixDataSets.map((dataPoint) => {
-    return { ...dataPoint, c: bucketColours[dataPoint.r] }
-  })
-}
-
-const createRagColours = (bucketCount: number, useRagColours: boolean) => {
-  const ragColours = ['#00703c', '#ffdd00', '	#d4351c']
-  return useRagColours ? ragColours : generateBucketColours(bucketCount)
-}
-
-const generateBucketColours = (bucketCount: number) => {
-  const baseColour = '#1d70b8'
-  const alphaDivision = 1 / bucketCount
-  return Array.from(Array(bucketCount)).map((d, i) => {
-    const division = alphaDivision * (i + 1)
-    return withAlphaHex(baseColour, division)
-  })
-}
-
-const getBucketCount = (matrixDataSets: MatrixChartData[]) => {
-  return Math.max(...matrixDataSets.map((o) => o.r)) + 1
-}
-
-const hasRagNumber = (matrixDataSets: MatrixChartData[]) => {
-  return matrixDataSets[0].r !== undefined
-}
-
-const getBucketSizes = (matrixDataSets: MatrixChartData[], bucketCount: number) => {
-  const values = matrixDataSets.map((dataPoint) => dataPoint.v)
-  const min = Math.min(...values)
-  const max = Math.max(...values)
-  const threshholdSize = Math.ceil((max - min) / bucketCount)
-  return Array.from(Array(bucketCount))
-    .map((d, i) => {
-      return threshholdSize * (i + 1)
-    })
-    .reverse()
-}
-
-export const createTimeseriesMatrixChart = (
-  chartDefinition: DashboardVisualisation,
-  timeseriesData: DashboardDataResponse[],
-  granularity: Granularity,
-): ChartData => {
-  const { columns, options } = chartDefinition
-  const { measures } = columns
-
-  const unit = measures[0].unit ? measures[0].unit : undefined
-  const type = chartDefinition.type.split('-')[0]
-  const timeBlockData = DatasetHelper.groupRowsByTimestamp(timeseriesData)
-  const matrixDataSets: ChartDataset[] = createMatrixDataSet(
-    timeBlockData,
-    granularity,
-    chartDefinition,
-    <MatrixDashboardVisualisationOptions>options,
-  )
-
-  return {
-    type: type as unknown as ChartType,
-    unit,
-    timeseries: true,
-    data: {
-      datasets: matrixDataSets,
-    },
-  }
-}