@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.18.3 → 4.20.0

package/dpr/utils/datasetHelper.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/utils/datasetHelper.ts"],
-  "sourcesContent": ["import { DashboardDataResponse } from '../types/Metrics'\nimport { components } from '../types/api'\n\nexport const getDatasetRows = (\n  listDefinition: components['schemas']['DashboardVisualisationDefinition'],\n  dashboardData: DashboardDataResponse[],\n) => {\n  const { measures, filters, expectNulls } = listDefinition.columns\n  const keys = <Array<components['schemas']['DashboardVisualisationColumnDefinition']>>listDefinition.columns.keys\n\n  const displayColumnsIds = measures.map((col) => col.id)\n  const keyColumnsIds = keys?.map((col) => col.id) || []\n  const filterColIds = filters?.map((col) => col.id) || []\n  const hasOptionalKeys = keys?.some((key) => key.optional)\n\n  if (dashboardData.length && dashboardData[0]['ts']) keyColumnsIds.unshift('ts')\n\n  const filtered = dashboardData.filter((datasetRow: DashboardDataResponse) => {\n    const validRow: boolean[] = []\n\n    Object.keys(datasetRow).forEach((datasetField) => {\n      const value = datasetRow[datasetField].raw\n      // All rows are valid until proven otherwise\n      let valid = true\n\n      // 1. check if the column value is equal to a defined column value\n      if (filterColIds.includes(datasetField)) {\n        const filterValues = filters ? filters.filter((f) => f.id === datasetField).map((f) => f.equals) : []\n        valid = filterValues.includes(<string>value)\n\n        // 3. check keys exist in the defined columns\n      } else if (keyColumnsIds.includes(datasetField) && hasOptionalKeys) {\n        valid = true\n\n        // 3. check keys exist in the defined columns\n      } else if (keyColumnsIds.includes(datasetField) && !hasOptionalKeys) {\n        valid = value !== '' && value !== undefined && value !== null\n\n        // 2. check values exist in the defined columns\n      } else if (displayColumnsIds.includes(datasetField)) {\n        valid = value !== '' && value !== undefined && value !== null\n\n        // 3. check that all remaining columns are null.\n      } else if (expectNulls) {\n        valid = value === '' || value === undefined || value === null\n      }\n\n      validRow.push(valid)\n    })\n\n    return validRow.every((val) => val)\n  })\n\n  if (hasOptionalKeys) {\n    return filterKeys(filtered, keys || [])\n  }\n\n  return filtered\n}\n\nexport const getKeyVariations = (keys: Array<components['schemas']['DashboardVisualisationColumnDefinition']>) => {\n  const colIdVariations: string[][] = []\n  const keyColumnsIds = keys.map((col) => col.id)\n  const allOptional = keys.every((key) => key.optional)\n  const colIdCopy = [...keyColumnsIds]\n\n  keyColumnsIds.reverse().forEach((id) => {\n    const key = keys.find((k) => k.id === id)\n    colIdVariations.push([...colIdCopy])\n    if (key && key.optional) {\n      colIdCopy.pop()\n    }\n  })\n\n  if (allOptional) colIdVariations.push([])\n  return colIdVariations\n}\n\nexport const getKeyIds = (dashboardData: DashboardDataResponse[], colIdVariations: string[][]) => {\n  let validHeadIds: string[] = []\n  colIdVariations.every((ids: string[]) => {\n    const validRows = []\n\n    dashboardData.forEach((datasetRow: DashboardDataResponse) => {\n      const validRow: boolean[] = []\n\n      Object.keys(datasetRow).forEach((datasetField) => {\n        const value = datasetRow[datasetField].raw\n        let valid = true\n        if (ids.includes(datasetField)) {\n          valid = value !== '' && value !== undefined && value !== null\n        }\n        validRow.push(valid)\n      })\n\n      if (validRow.every((val) => val)) {\n        validRows.push(datasetRow)\n      }\n    })\n\n    if (validRows.length > 0) {\n      validHeadIds = ids\n      return false\n    }\n    validHeadIds = ids\n    return true\n  })\n\n  return validHeadIds\n}\n\nexport const filterKeys = (\n  dashboardData: DashboardDataResponse[],\n  keys: Array<components['schemas']['DashboardVisualisationColumnDefinition']>,\n) => {\n  const colIdVariations = getKeyVariations(keys)\n  const validHeadIds = getKeyIds(dashboardData, colIdVariations)\n\n  return dashboardData.filter((datasetRow: DashboardDataResponse) => {\n    const validRow: boolean[] = []\n    Object.keys(datasetRow).forEach((datasetField) => {\n      const value = datasetRow[datasetField].raw\n      let valid = true\n      if (validHeadIds.includes(datasetField)) {\n        valid = value !== '' && value !== undefined && value !== null\n      }\n      validRow.push(valid)\n    })\n\n    return validRow.every((val) => val)\n  })\n}\n\nexport const getLastestDataset = (dashboardData: DashboardDataResponse[]): DashboardDataResponse[] => {\n  const latestTimestamp = dashboardData[dashboardData.length - 1]?.['ts']?.raw\n  if (latestTimestamp) {\n    return dashboardData.filter((data) => data['ts'].raw === latestTimestamp)\n  }\n  return dashboardData\n}\n\nexport const getEarliestDataset = (dashboardData: DashboardDataResponse[]): DashboardDataResponse[] => {\n  const latestTimestamp = dashboardData[0]?.['ts']?.raw\n  if (latestTimestamp) {\n    return dashboardData.filter((data) => data['ts'].raw === latestTimestamp)\n  }\n  return dashboardData\n}\n\nexport const groupRowsByTimestamp = (dashboardData: DashboardDataResponse[]): DashboardDataResponse[][] => {\n  const uniqueTimestamps = [...new Set(dashboardData.map((item) => item['ts'].raw))]\n  return uniqueTimestamps.map((ts) => {\n    return dashboardData.filter((d) => d['ts'].raw === ts)\n  })\n}\n\nexport const groupRowsByKey = (dashboardData: DashboardDataResponse[], key: string): DashboardDataResponse[][] => {\n  const uniqueKeyValues = [...new Set(dashboardData.map((item) => item[key].raw))]\n  return uniqueKeyValues.map((keyValue) => {\n    return dashboardData.filter((d) => d[key].raw === keyValue)\n  })\n}\n\nexport const getGroupKey = (\n  rawData: DashboardDataResponse[],\n  keys?: Array<components['schemas']['DashboardVisualisationColumnDefinition']>,\n) => {\n  if (!keys || !keys.length || !rawData.length) {\n    return undefined\n  }\n\n  const data = rawData[0]\n  let index = keys.length - 1\n  let keyFound = false\n  while (!keyFound) {\n    const k = `${keys[index]?.id}`\n    if (k && index !== -1 && (!data[k] || !data[k].raw || data[k].raw === '' || data[k].raw === null)) {\n      index -= 1\n    } else {\n      keyFound = true\n    }\n  }\n\n  return index !== -1 ? keys[index] : undefined\n}\n\nexport const filterRowsByDisplayColumns = (\n  listDefinition: components['schemas']['DashboardVisualisationDefinition'],\n  dashboardData: DashboardDataResponse[],\n  includeKeys = false,\n) => {\n  const { keys: keyCols, measures } = listDefinition.columns\n  const keys = keyCols || []\n  let displayColumns = [...measures]\n  if (includeKeys) {\n    displayColumns = [...keys, ...measures]\n  }\n  const displayColumnsIds = displayColumns.map((col) => col.id)\n\n  return dashboardData.map((datasetRow: DashboardDataResponse) => {\n    return Object.keys(datasetRow)\n      .filter((key) => displayColumnsIds.includes(key))\n      .reduce((acc, key) => {\n        acc[key] = datasetRow[key]\n        return acc\n      }, {} as unknown as DashboardDataResponse)\n  })\n}\n\nexport default {\n  getDatasetRows,\n  getLastestDataset,\n  getEarliestDataset,\n  filterRowsByDisplayColumns,\n  groupRowsByTimestamp,\n  groupRowsByKey,\n  getGroupKey,\n  getKeyVariations,\n  getKeyIds,\n  filterKeys,\n}\n"],
-  "mappings": "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",
-  "names": ["datasetHelper_exports", "__export", "datasetHelper_default", "filterKeys", "filterRowsByDisplayColumns", "getDatasetRows", "getEarliestDataset", "getGroupKey", "getKeyIds", "getKeyVariations", "getLastestDataset", "groupRowsByKey", "groupRowsByTimestamp", "__toCommonJS", "listDefinition", "dashboardData", "measures", "filters", "expectNulls", "keys", "displayColumnsIds", "col", "keyColumnsIds", "filterColIds", "hasOptionalKeys", "key", "filtered", "datasetRow", "validRow", "datasetField", "value", "valid", "f", "val", "colIdVariations", "allOptional", "colIdCopy", "id", "k", "validHeadIds", "ids", "validRows", "latestTimestamp", "data", "item", "ts", "d", "keyValue", "rawData", "index", "keyFound", "includeKeys", "keyCols", "displayColumns", "acc"]
+  "sourcesContent": ["import { DashboardDataResponse } from '../types/Metrics'\nimport { components } from '../types/api'\n\nexport const getDatasetRows = (\n  listDefinition: components['schemas']['DashboardVisualisationDefinition'],\n  dashboardData: DashboardDataResponse[],\n) => {\n  const { measures, filters, expectNulls } = listDefinition.columns\n  const keys = <Array<components['schemas']['DashboardVisualisationColumnDefinition']>>listDefinition.columns.keys\n\n  const displayColumnsIds = measures.map((col) => col.id)\n  const keyColumnsIds = keys?.map((col) => col.id) || []\n  let filterColIds = filters?.map((col) => col.id) || []\n  filterColIds = [...new Set(filterColIds)]\n  const hasOptionalKeys = keys?.some((key) => key.optional)\n\n  if (dashboardData.length && dashboardData[0]['ts']) keyColumnsIds.unshift('ts')\n\n  const filtered = dashboardData.filter((datasetRow: DashboardDataResponse) => {\n    const validRow: boolean[] = []\n\n    Object.keys(datasetRow).forEach((fieldId) => {\n      const value = datasetRow[fieldId].raw\n      // All rows are valid until proven otherwise\n      let valid = true\n\n      // 1. check if the column value is equal to a defined column value\n      if (filterColIds.includes(fieldId) && filters) {\n        const filterValues = filters ? filters.filter((f) => f.id === fieldId).map((f) => f.equals) : []\n        const validFilters: boolean[] = []\n        filterValues.forEach((filterValue) => {\n          if (filterValue === null) {\n            validFilters.push(value === '' || value === undefined || value === null)\n          } else {\n            validFilters.push(filterValue === value)\n          }\n        })\n        valid = validFilters.some(Boolean)\n\n        // 3. check keys exist in the defined columns\n      } else if (keyColumnsIds.includes(fieldId) && hasOptionalKeys) {\n        valid = true\n\n        // 3. check keys exist in the defined columns\n      } else if (keyColumnsIds.includes(fieldId) && !hasOptionalKeys) {\n        valid = value !== '' && value !== undefined && value !== null\n\n        // 2. check values exist in the defined columns\n      } else if (displayColumnsIds.includes(fieldId)) {\n        valid = value !== '' && value !== undefined && value !== null\n\n        // 3. check that all remaining columns are null.\n      } else if (expectNulls) {\n        valid = value === '' || value === undefined || value === null\n      }\n\n      validRow.push(valid)\n    })\n\n    return validRow.every((val) => val)\n  })\n\n  if (hasOptionalKeys) {\n    return filterKeys(filtered, keys || [])\n  }\n\n  return filtered\n}\n\nexport const getKeyVariations = (keys: Array<components['schemas']['DashboardVisualisationColumnDefinition']>) => {\n  const colIdVariations: string[][] = []\n  const keyColumnsIds = keys.map((col) => col.id)\n  const allOptional = keys.every((key) => key.optional)\n  const colIdCopy = [...keyColumnsIds]\n\n  keyColumnsIds.reverse().forEach((id) => {\n    const key = keys.find((k) => k.id === id)\n    colIdVariations.push([...colIdCopy])\n    if (key && key.optional) {\n      colIdCopy.pop()\n    }\n  })\n\n  if (allOptional) colIdVariations.push([])\n  return colIdVariations\n}\n\nexport const getKeyIds = (dashboardData: DashboardDataResponse[], colIdVariations: string[][]) => {\n  let validHeadIds: string[] = []\n  colIdVariations.every((ids: string[]) => {\n    const validRows = []\n\n    dashboardData.forEach((datasetRow: DashboardDataResponse) => {\n      const validRow: boolean[] = []\n\n      Object.keys(datasetRow).forEach((datasetField) => {\n        const value = datasetRow[datasetField].raw\n        let valid = true\n        if (ids.includes(datasetField)) {\n          valid = value !== '' && value !== undefined && value !== null\n        }\n        validRow.push(valid)\n      })\n\n      if (validRow.every((val) => val)) {\n        validRows.push(datasetRow)\n      }\n    })\n\n    if (validRows.length > 0) {\n      validHeadIds = ids\n      return false\n    }\n    validHeadIds = ids\n    return true\n  })\n\n  return validHeadIds\n}\n\nexport const filterKeys = (\n  dashboardData: DashboardDataResponse[],\n  keys: Array<components['schemas']['DashboardVisualisationColumnDefinition']>,\n) => {\n  const colIdVariations = getKeyVariations(keys)\n  const validHeadIds = getKeyIds(dashboardData, colIdVariations)\n\n  return dashboardData.filter((datasetRow: DashboardDataResponse) => {\n    const validRow: boolean[] = []\n    Object.keys(datasetRow).forEach((datasetField) => {\n      const value = datasetRow[datasetField].raw\n      let valid = true\n      if (validHeadIds.includes(datasetField)) {\n        valid = value !== '' && value !== undefined && value !== null\n      }\n      validRow.push(valid)\n    })\n\n    return validRow.every((val) => val)\n  })\n}\n\nexport const getLastestDataset = (dashboardData: DashboardDataResponse[]): DashboardDataResponse[] => {\n  const latestTimestamp = dashboardData[dashboardData.length - 1]?.['ts']?.raw\n  if (latestTimestamp) {\n    return dashboardData.filter((data) => data['ts'].raw === latestTimestamp)\n  }\n  return dashboardData\n}\n\nexport const getEarliestDataset = (dashboardData: DashboardDataResponse[]): DashboardDataResponse[] => {\n  const latestTimestamp = dashboardData[0]?.['ts']?.raw\n  if (latestTimestamp) {\n    return dashboardData.filter((data) => data['ts'].raw === latestTimestamp)\n  }\n  return dashboardData\n}\n\nexport const groupRowsByTimestamp = (dashboardData: DashboardDataResponse[]): DashboardDataResponse[][] => {\n  const uniqueTimestamps = [...new Set(dashboardData.map((item) => item['ts'].raw))]\n  return uniqueTimestamps.map((ts) => {\n    return dashboardData.filter((d) => d['ts'].raw === ts)\n  })\n}\n\nexport const groupRowsByKey = (dashboardData: DashboardDataResponse[], key: string): DashboardDataResponse[][] => {\n  const uniqueKeyValues = [...new Set(dashboardData.map((item) => item[key].raw))]\n  return uniqueKeyValues.map((keyValue) => {\n    return dashboardData.filter((d) => d[key].raw === keyValue)\n  })\n}\n\nexport const getGroupKey = (\n  rawData: DashboardDataResponse[],\n  keys?: Array<components['schemas']['DashboardVisualisationColumnDefinition']>,\n) => {\n  if (!keys || !keys.length || !rawData.length) {\n    return undefined\n  }\n\n  const data = rawData[0]\n  let index = keys.length - 1\n  let keyFound = false\n  while (!keyFound) {\n    const k = `${keys[index]?.id}`\n    if (k && index !== -1 && (!data[k] || !data[k].raw || data[k].raw === '' || data[k].raw === null)) {\n      index -= 1\n    } else {\n      keyFound = true\n    }\n  }\n\n  return index !== -1 ? keys[index] : undefined\n}\n\nexport const filterRowsByDisplayColumns = (\n  listDefinition: components['schemas']['DashboardVisualisationDefinition'],\n  dashboardData: DashboardDataResponse[],\n  includeKeys = false,\n) => {\n  const { keys: keyCols, measures } = listDefinition.columns\n  const keys = keyCols || []\n  let displayColumns = [...measures]\n  if (includeKeys) {\n    displayColumns = [...keys, ...measures]\n  }\n  const displayColumnsIds = displayColumns.map((col) => col.id)\n\n  return dashboardData.map((datasetRow: DashboardDataResponse) => {\n    return Object.keys(datasetRow)\n      .filter((key) => displayColumnsIds.includes(key))\n      .reduce((acc, key) => {\n        acc[key] = datasetRow[key]\n        return acc\n      }, {} as unknown as DashboardDataResponse)\n  })\n}\n\nexport default {\n  getDatasetRows,\n  getLastestDataset,\n  getEarliestDataset,\n  filterRowsByDisplayColumns,\n  groupRowsByTimestamp,\n  groupRowsByKey,\n  getGroupKey,\n  getKeyVariations,\n  getKeyIds,\n  filterKeys,\n}\n"],
+  "mappings": "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",
+  "names": ["datasetHelper_exports", "__export", "datasetHelper_default", "filterKeys", "filterRowsByDisplayColumns", "getDatasetRows", "getEarliestDataset", "getGroupKey", "getKeyIds", "getKeyVariations", "getLastestDataset", "groupRowsByKey", "groupRowsByTimestamp", "__toCommonJS", "listDefinition", "dashboardData", "measures", "filters", "expectNulls", "keys", "displayColumnsIds", "col", "keyColumnsIds", "filterColIds", "hasOptionalKeys", "key", "filtered", "datasetRow", "validRow", "fieldId", "value", "valid", "filterValues", "f", "validFilters", "filterValue", "val", "colIdVariations", "allOptional", "colIdCopy", "id", "k", "validHeadIds", "ids", "validRows", "datasetField", "latestTimestamp", "data", "item", "ts", "d", "keyValue", "rawData", "index", "keyFound", "includeKeys", "keyCols", "displayColumns", "acc"]
 }

package/dpr/utils/datasetHelper.ts

@@ -10,7 +10,8 @@ export const getDatasetRows = (
 
   const displayColumnsIds = measures.map((col) => col.id)
   const keyColumnsIds = keys?.map((col) => col.id) || []
-  const filterColIds = filters?.map((col) => col.id) || []
+  let filterColIds = filters?.map((col) => col.id) || []
+  filterColIds = [...new Set(filterColIds)]
   const hasOptionalKeys = keys?.some((key) => key.optional)
 
   if (dashboardData.length && dashboardData[0]['ts']) keyColumnsIds.unshift('ts')
@@ -18,26 +19,34 @@ export const getDatasetRows = (
   const filtered = dashboardData.filter((datasetRow: DashboardDataResponse) => {
     const validRow: boolean[] = []
 
-    Object.keys(datasetRow).forEach((datasetField) => {
-      const value = datasetRow[datasetField].raw
+    Object.keys(datasetRow).forEach((fieldId) => {
+      const value = datasetRow[fieldId].raw
       // All rows are valid until proven otherwise
       let valid = true
 
       // 1. check if the column value is equal to a defined column value
-      if (filterColIds.includes(datasetField)) {
-        const filterValues = filters ? filters.filter((f) => f.id === datasetField).map((f) => f.equals) : []
-        valid = filterValues.includes(<string>value)
+      if (filterColIds.includes(fieldId) && filters) {
+        const filterValues = filters ? filters.filter((f) => f.id === fieldId).map((f) => f.equals) : []
+        const validFilters: boolean[] = []
+        filterValues.forEach((filterValue) => {
+          if (filterValue === null) {
+            validFilters.push(value === '' || value === undefined || value === null)
+          } else {
+            validFilters.push(filterValue === value)
+          }
+        })
+        valid = validFilters.some(Boolean)
 
         // 3. check keys exist in the defined columns
-      } else if (keyColumnsIds.includes(datasetField) && hasOptionalKeys) {
+      } else if (keyColumnsIds.includes(fieldId) && hasOptionalKeys) {
         valid = true
 
         // 3. check keys exist in the defined columns
-      } else if (keyColumnsIds.includes(datasetField) && !hasOptionalKeys) {
+      } else if (keyColumnsIds.includes(fieldId) && !hasOptionalKeys) {
         valid = value !== '' && value !== undefined && value !== null
 
         // 2. check values exist in the defined columns
-      } else if (displayColumnsIds.includes(datasetField)) {
+      } else if (displayColumnsIds.includes(fieldId)) {
         valid = value !== '' && value !== undefined && value !== null
 
         // 3. check that all remaining columns are null.

package/package.json

@@ -1,12 +1,12 @@
 {
   "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.18.3",
+  "version": "4.20.0",
   "main": "dpr/all.mjs",
   "sass": "dpr/all.scss",
   "engines": {
     "node": "^22",
-    "npm": "^11"
+    "npm": ">=10 <12"
   },
   "repository": {
     "type": "git",
@@ -63,9 +63,9 @@
     "clean": "rm -rf dist && rm -rf dist-docs && rm -rf dist-test-app && rm -rf node_modules",
     "lint:fix": "./node_modules/.bin/eslint . --fix",
     "axe_tests": "axe --exit --save axe_results.json $npm_package_config_home_url, $npm_package_config_request_url, $npm_package_config_polling_url, $npm_package_config_report_url",
-    "accessibility_tests": "npm run axe_tests && npm run pa11y_tests",
     "generate-api-types": "openapi-typescript https://digital-prison-reporting-mi-dev.hmpps.service.justice.gov.uk/v3/api-docs --output src/dpr/types/api.d.ts && npm run lint:fix",
-    "typecheck": "tsc"
+    "typecheck": "tsc",
+    "setup": "npm ci && hmpps-npm-script-run-allowlist"
   },
   "jest": {
     "transform": {
@@ -170,10 +170,10 @@
   },
   "devDependencies": {
     "@11ty/eleventy": "^2.0.1",
-    "@axe-core/cli": "^4.10.0",
     "@badeball/cypress-cucumber-preprocessor": "^22.2.0",
     "@bahmutov/cypress-esbuild-preprocessor": "^2.2.5",
     "@jest/globals": "^30.2.0",
+    "@ministryofjustice/hmpps-npm-script-allowlist": "0.0.3",
     "@semantic-release/git": "^10.0.1",
     "@semantic-release/npm": "^11.0.0",
     "@testing-library/cypress": "^10.0.3",
@@ -232,7 +232,6 @@
     "node-html-parser": "^6.1.5",
     "npm-run-all": "^4.1.5",
     "openapi-typescript": "^7.8.0",
-    "pa11y": "^9.0.0",
     "prettier": "^2.8.7",
     "prettier-plugin-jinja-template": "^0.5.0",
     "require-dir": "^1.2.0",
@@ -250,4 +249,4 @@
   "peerDependencies": {
     "jquery": "^3.7.1"
   }
-}
+}