@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.17.3 → 4.17.5

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'] & { optional: boolean }>>(\n    listDefinition.columns.keys\n  )\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 = (\n  dashboardData: DashboardDataResponse[],\n  keys: Array<components['schemas']['DashboardVisualisationColumnDefinition'] & { optional: boolean }>,\n) => {\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'] & { optional: boolean }>,\n) => {\n  const colIdVariations = getKeyVariations(dashboardData, 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  keys: Array<components['schemas']['DashboardVisualisationColumnDefinition']>,\n  rawData: DashboardDataResponse[],\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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",
+  "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": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,eAAAC,EAAA,+BAAAC,EAAA,mBAAAC,EAAA,uBAAAC,EAAA,gBAAAC,EAAA,cAAAC,EAAA,qBAAAC,EAAA,sBAAAC,EAAA,mBAAAC,EAAA,yBAAAC,IAAA,eAAAC,EAAAb,GAGO,MAAMK,EAAiB,CAC5BS,EACAC,IACG,CACH,KAAM,CAAE,SAAAC,EAAU,QAAAC,EAAS,YAAAC,CAAY,EAAIJ,EAAe,QACpDK,EAA+EL,EAAe,QAAQ,KAEtGM,EAAoBJ,EAAS,IAAKK,GAAQA,EAAI,EAAE,EAChDC,EAAgBH,GAAM,IAAKE,GAAQA,EAAI,EAAE,GAAK,CAAC,EAC/CE,EAAeN,GAAS,IAAKI,GAAQA,EAAI,EAAE,GAAK,CAAC,EACjDG,EAAkBL,GAAM,KAAMM,GAAQA,EAAI,QAAQ,EAEpDV,EAAc,QAAUA,EAAc,CAAC,EAAE,IAAOO,EAAc,QAAQ,IAAI,EAE9E,MAAMI,EAAWX,EAAc,OAAQY,GAAsC,CAC3E,MAAMC,EAAsB,CAAC,EAE7B,cAAO,KAAKD,CAAU,EAAE,QAASE,GAAiB,CAChD,MAAMC,EAAQH,EAAWE,CAAY,EAAE,IAEvC,IAAIE,EAAQ,GAGRR,EAAa,SAASM,CAAY,EAEpCE,GADqBd,EAAUA,EAAQ,OAAQe,GAAMA,EAAE,KAAOH,CAAY,EAAE,IAAKG,GAAMA,EAAE,MAAM,EAAI,CAAC,GAC/E,SAAiBF,CAAK,EAGlCR,EAAc,SAASO,CAAY,GAAKL,EACjDO,EAAQ,GAGCT,EAAc,SAASO,CAAY,GAAK,CAACL,GAIzCJ,EAAkB,SAASS,CAAY,EAHhDE,EAAQD,IAAU,IAAMA,IAAU,QAAaA,IAAU,KAOhDZ,IACTa,EAAQD,IAAU,IAAMA,IAAU,QAAaA,IAAU,MAG3DF,EAAS,KAAKG,CAAK,CACrB,CAAC,EAEMH,EAAS,MAAOK,GAAQA,CAAG,CACpC,CAAC,EAED,OAAIT,EACKrB,EAAWuB,EAAUP,GAAQ,CAAC,CAAC,EAGjCO,CACT,EAEajB,EAAoBU,GAAiF,CAChH,MAAMe,EAA8B,CAAC,EAC/BZ,EAAgBH,EAAK,IAAKE,GAAQA,EAAI,EAAE,EACxCc,EAAchB,EAAK,MAAOM,GAAQA,EAAI,QAAQ,EAC9CW,EAAY,CAAC,GAAGd,CAAa,EAEnC,OAAAA,EAAc,QAAQ,EAAE,QAASe,GAAO,CACtC,MAAMZ,EAAMN,EAAK,KAAMmB,GAAMA,EAAE,KAAOD,CAAE,EACxCH,EAAgB,KAAK,CAAC,GAAGE,CAAS,CAAC,EAC/BX,GAAOA,EAAI,UACbW,EAAU,IAAI,CAElB,CAAC,EAEGD,GAAaD,EAAgB,KAAK,CAAC,CAAC,EACjCA,CACT,EAEa1B,EAAY,CAACO,EAAwCmB,IAAgC,CAChG,IAAIK,EAAyB,CAAC,EAC9B,OAAAL,EAAgB,MAAOM,GAAkB,CACvC,MAAMC,EAAY,CAAC,EAmBnB,OAjBA1B,EAAc,QAASY,GAAsC,CAC3D,MAAMC,EAAsB,CAAC,EAE7B,OAAO,KAAKD,CAAU,EAAE,QAASE,GAAiB,CAChD,MAAMC,EAAQH,EAAWE,CAAY,EAAE,IACvC,IAAIE,EAAQ,GACRS,EAAI,SAASX,CAAY,IAC3BE,EAAQD,IAAU,IAAMA,IAAU,QAAaA,IAAU,MAE3DF,EAAS,KAAKG,CAAK,CACrB,CAAC,EAEGH,EAAS,MAAOK,GAAQA,CAAG,GAC7BQ,EAAU,KAAKd,CAAU,CAE7B,CAAC,EAEGc,EAAU,OAAS,GACrBF,EAAeC,EACR,KAETD,EAAeC,EACR,GACT,CAAC,EAEMD,CACT,EAEapC,EAAa,CACxBY,EACAI,IACG,CACH,MAAMe,EAAkBzB,EAAiBU,CAAI,EACvCoB,EAAe/B,EAAUO,EAAemB,CAAe,EAE7D,OAAOnB,EAAc,OAAQY,GAAsC,CACjE,MAAMC,EAAsB,CAAC,EAC7B,cAAO,KAAKD,CAAU,EAAE,QAASE,GAAiB,CAChD,MAAMC,EAAQH,EAAWE,CAAY,EAAE,IACvC,IAAIE,EAAQ,GACRQ,EAAa,SAASV,CAAY,IACpCE,EAAQD,IAAU,IAAMA,IAAU,QAAaA,IAAU,MAE3DF,EAAS,KAAKG,CAAK,CACrB,CAAC,EAEMH,EAAS,MAAOK,GAAQA,CAAG,CACpC,CAAC,CACH,EAEavB,EAAqBK,GAAoE,CACpG,MAAM2B,EAAkB3B,EAAcA,EAAc,OAAS,CAAC,GAAI,IAAO,IACzE,OAAI2B,EACK3B,EAAc,OAAQ4B,GAASA,EAAK,GAAM,MAAQD,CAAe,EAEnE3B,CACT,EAEaT,EAAsBS,GAAoE,CACrG,MAAM2B,EAAkB3B,EAAc,CAAC,GAAI,IAAO,IAClD,OAAI2B,EACK3B,EAAc,OAAQ4B,GAASA,EAAK,GAAM,MAAQD,CAAe,EAEnE3B,CACT,EAEaH,EAAwBG,GACV,CAAC,GAAG,IAAI,IAAIA,EAAc,IAAK6B,GAASA,EAAK,GAAM,GAAG,CAAC,CAAC,EACzD,IAAKC,GACpB9B,EAAc,OAAQ+B,GAAMA,EAAE,GAAM,MAAQD,CAAE,CACtD,EAGUlC,EAAiB,CAACI,EAAwCU,IAC7C,CAAC,GAAG,IAAI,IAAIV,EAAc,IAAK6B,GAASA,EAAKnB,CAAG,EAAE,GAAG,CAAC,CAAC,EACxD,IAAKsB,GACnBhC,EAAc,OAAQ+B,GAAMA,EAAErB,CAAG,EAAE,MAAQsB,CAAQ,CAC3D,EAGUxC,EAAc,CACzByC,EACA7B,IACG,CACH,GAAI,CAACA,GAAQ,CAACA,EAAK,QAAU,CAAC6B,EAAQ,OACpC,OAGF,MAAML,EAAOK,EAAQ,CAAC,EACtB,IAAIC,EAAQ9B,EAAK,OAAS,EACtB+B,EAAW,GACf,KAAO,CAACA,GAAU,CAChB,MAAMZ,EAAI,GAAGnB,EAAK8B,CAAK,GAAG,EAAE,GACxBX,GAAKW,IAAU,KAAO,CAACN,EAAKL,CAAC,GAAK,CAACK,EAAKL,CAAC,EAAE,KAAOK,EAAKL,CAAC,EAAE,MAAQ,IAAMK,EAAKL,CAAC,EAAE,MAAQ,MAC1FW,GAAS,EAETC,EAAW,EAEf,CAEA,OAAOD,IAAU,GAAK9B,EAAK8B,CAAK,EAAI,MACtC,EAEa7C,EAA6B,CACxCU,EACAC,EACAoC,EAAc,KACX,CACH,KAAM,CAAE,KAAMC,EAAS,SAAApC,CAAS,EAAIF,EAAe,QAC7CK,EAAOiC,GAAW,CAAC,EACzB,IAAIC,EAAiB,CAAC,GAAGrC,CAAQ,EAC7BmC,IACFE,EAAiB,CAAC,GAAGlC,EAAM,GAAGH,CAAQ,GAExC,MAAMI,EAAoBiC,EAAe,IAAKhC,GAAQA,EAAI,EAAE,EAE5D,OAAON,EAAc,IAAKY,GACjB,OAAO,KAAKA,CAAU,EAC1B,OAAQF,GAAQL,EAAkB,SAASK,CAAG,CAAC,EAC/C,OAAO,CAAC6B,EAAK7B,KACZ6B,EAAI7B,CAAG,EAAIE,EAAWF,CAAG,EAClB6B,GACN,CAAC,CAAqC,CAC5C,CACH,EAEA,IAAOpD,EAAQ,CACb,eAAAG,EACA,kBAAAK,EACA,mBAAAJ,EACA,2BAAAF,EACA,qBAAAQ,EACA,eAAAD,EACA,YAAAJ,EACA,iBAAAE,EACA,UAAAD,EACA,WAAAL,CACF",
   "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"]
 }

package/dpr/utils/datasetHelper.test.ts

@@ -1,3 +1,4 @@
+import { expect } from '@jest/globals'
 import { components } from '../types/api'
 import { DashboardDataResponse } from '../types/Metrics'
 import DatasetHelper from './datasetHelper'
@@ -429,7 +430,7 @@ describe('DatasetHelper', () => {
             },
           ],
         },
-      } as unknown as DashboardVisualisation
+      } as unknown as components['schemas']['DashboardVisualisationDefinition']
 
       const data = [
         {
@@ -527,7 +528,7 @@ describe('DatasetHelper', () => {
         },
       ]
 
-      const result = DatasetHelper.getGroupKey(keys, data)
+      const result = DatasetHelper.getGroupKey(data, keys)
       expect(result).toEqual({ id: 'key3' })
     })
 
@@ -542,7 +543,7 @@ describe('DatasetHelper', () => {
         },
       ]
 
-      const result = DatasetHelper.getGroupKey(keys, data)
+      const result = DatasetHelper.getGroupKey(data, keys)
       expect(result).toEqual({ id: 'key2' })
     })
 
@@ -557,7 +558,7 @@ describe('DatasetHelper', () => {
         },
       ]
 
-      const result = DatasetHelper.getGroupKey(keys, data)
+      const result = DatasetHelper.getGroupKey(data, keys)
       expect(result).toEqual({ id: 'key1' })
     })
 
@@ -570,7 +571,7 @@ describe('DatasetHelper', () => {
         { measure2: { raw: 'value' } },
       ]
 
-      const result = DatasetHelper.getGroupKey(keys, data)
+      const result = DatasetHelper.getGroupKey(data, keys)
       expect(result).toEqual(undefined)
     })
 
@@ -585,7 +586,7 @@ describe('DatasetHelper', () => {
         },
       ]
 
-      const result = DatasetHelper.getGroupKey(keys, data)
+      const result = DatasetHelper.getGroupKey(data, keys)
       expect(result).toEqual({ id: 'key2' })
     })
 
@@ -600,7 +601,7 @@ describe('DatasetHelper', () => {
         },
       ]
 
-      const result = DatasetHelper.getGroupKey(keys, data)
+      const result = DatasetHelper.getGroupKey(data, keys)
       expect(result).toEqual({ id: 'key1' })
     })
 
@@ -613,7 +614,7 @@ describe('DatasetHelper', () => {
         { measure2: { raw: 'value' } },
       ]
 
-      const result = DatasetHelper.getGroupKey(keys, data)
+      const result = DatasetHelper.getGroupKey(data, keys)
       expect(result).toEqual(undefined)
     })
 
@@ -628,7 +629,7 @@ describe('DatasetHelper', () => {
         },
       ]
 
-      const result = DatasetHelper.getGroupKey(keys, data)
+      const result = DatasetHelper.getGroupKey(data, keys)
       expect(result).toEqual({ id: 'key2' })
     })
 
@@ -643,7 +644,7 @@ describe('DatasetHelper', () => {
         },
       ]
 
-      const result = DatasetHelper.getGroupKey(keys, data)
+      const result = DatasetHelper.getGroupKey(data, keys)
       expect(result).toEqual({ id: 'key1' })
     })
 
@@ -656,7 +657,7 @@ describe('DatasetHelper', () => {
         { measure2: { raw: 'value' } },
       ]
 
-      const result = DatasetHelper.getGroupKey(keys, data)
+      const result = DatasetHelper.getGroupKey(data, keys)
       expect(result).toEqual(undefined)
     })
 
@@ -670,7 +671,7 @@ describe('DatasetHelper', () => {
         },
       ]
 
-      const result = DatasetHelper.getGroupKey(keys, data)
+      const result = DatasetHelper.getGroupKey(data, keys)
       expect(result).toEqual({ id: 'key2' })
     })
 
@@ -683,51 +684,38 @@ describe('DatasetHelper', () => {
         },
       ]
 
-      const result = DatasetHelper.getGroupKey(keys, data)
+      const result = DatasetHelper.getGroupKey(data, keys)
       expect(result).toEqual({ id: 'key1' })
     })
 
     it('should set the correct key - key is undefined - none', () => {
       const data: DashboardDataResponse[] = [{ measure1: { raw: 'value' } }, { measure2: { raw: 'value' } }]
 
-      const result = DatasetHelper.getGroupKey(keys, data)
+      const result = DatasetHelper.getGroupKey(data, keys)
       expect(result).toEqual(undefined)
     })
 
     it('should return undefined when no keys are provided', () => {
       const data: DashboardDataResponse[] = [{ measure1: { raw: 'value' } }, { measure2: { raw: 'value' } }]
 
-      const result = DatasetHelper.getGroupKey(undefined, data)
+      const result = DatasetHelper.getGroupKey(data, undefined)
       expect(result).toEqual(undefined)
     })
 
     it('should return undefined when no keys empty', () => {
       const data: DashboardDataResponse[] = [{ measure1: { raw: 'value' } }, { measure2: { raw: 'value' } }]
 
-      const result = DatasetHelper.getGroupKey([], data)
+      const result = DatasetHelper.getGroupKey(data, [])
       expect(result).toEqual(undefined)
     })
   })
 
   describe('getKeyVariations', () => {
-    let data: DashboardDataResponse[]
     let keys: components['schemas']['DashboardVisualisationColumnDefinition'][]
 
-    beforeEach(() => {
-      data = [
-        {
-          field1: { raw: 'field1' },
-          field2: { raw: 'field2' },
-          field3: { raw: 'field3' },
-          field4: { raw: 'field4' },
-          field5: { raw: 'field5' },
-        },
-      ]
-    })
-
     it('should get the key variations', () => {
       keys = [{ id: 'field1' }, { id: 'field2' }, { id: 'field3' }]
-      const result = DatasetHelper.getKeyVariations(data, keys)
+      const result = DatasetHelper.getKeyVariations(keys)
 
       expect(result).toEqual([
         ['field1', 'field2', 'field3'],
@@ -738,7 +726,7 @@ describe('DatasetHelper', () => {
 
     it('should get the key variations with optional', () => {
       keys = [{ id: 'field1' }, { id: 'field2' }, { id: 'field3', optional: true }]
-      const result = DatasetHelper.getKeyVariations(data, keys)
+      const result = DatasetHelper.getKeyVariations(keys)
 
       expect(result).toEqual([
         ['field1', 'field2', 'field3'],
@@ -749,7 +737,7 @@ describe('DatasetHelper', () => {
 
     it('should get the key variations with optional', () => {
       keys = [{ id: 'field1' }, { id: 'field2', optional: true }, { id: 'field3', optional: true }]
-      const result = DatasetHelper.getKeyVariations(data, keys)
+      const result = DatasetHelper.getKeyVariations(keys)
 
       expect(result).toEqual([['field1', 'field2', 'field3'], ['field1', 'field2'], ['field1']])
     })
@@ -760,7 +748,7 @@ describe('DatasetHelper', () => {
         { id: 'field2', optional: true },
         { id: 'field3', optional: true },
       ]
-      const result = DatasetHelper.getKeyVariations(data, keys)
+      const result = DatasetHelper.getKeyVariations(keys)
 
       expect(result).toEqual([['field1', 'field2', 'field3'], ['field1', 'field2'], ['field1'], []])
     })

package/dpr/utils/datasetHelper.ts

@@ -6,16 +6,14 @@ export const getDatasetRows = (
   dashboardData: DashboardDataResponse[],
 ) => {
   const { measures, filters, expectNulls } = listDefinition.columns
-  const keys = <Array<components['schemas']['DashboardVisualisationColumnDefinition'] & { optional: boolean }>>(
-    listDefinition.columns.keys
-  )
+  const keys = <Array<components['schemas']['DashboardVisualisationColumnDefinition']>>listDefinition.columns.keys
 
   const displayColumnsIds = measures.map((col) => col.id)
   const keyColumnsIds = keys?.map((col) => col.id) || []
   const filterColIds = filters?.map((col) => col.id) || []
   const hasOptionalKeys = keys?.some((key) => key.optional)
 
-  if (dashboardData.length && dashboardData[0].ts) keyColumnsIds.unshift('ts')
+  if (dashboardData.length && dashboardData[0]['ts']) keyColumnsIds.unshift('ts')
 
   const filtered = dashboardData.filter((datasetRow: DashboardDataResponse) => {
     const validRow: boolean[] = []
@@ -60,10 +58,7 @@ export const getDatasetRows = (
   return filtered
 }
 
-export const getKeyVariations = (
-  dashboardData: DashboardDataResponse[],
-  keys: Array<components['schemas']['DashboardVisualisationColumnDefinition'] & { optional: boolean }>,
-) => {
+export const getKeyVariations = (keys: Array<components['schemas']['DashboardVisualisationColumnDefinition']>) => {
   const colIdVariations: string[][] = []
   const keyColumnsIds = keys.map((col) => col.id)
   const allOptional = keys.every((key) => key.optional)
@@ -116,9 +111,9 @@ export const getKeyIds = (dashboardData: DashboardDataResponse[], colIdVariation
 
 export const filterKeys = (
   dashboardData: DashboardDataResponse[],
-  keys: Array<components['schemas']['DashboardVisualisationColumnDefinition'] & { optional: boolean }>,
+  keys: Array<components['schemas']['DashboardVisualisationColumnDefinition']>,
 ) => {
-  const colIdVariations = getKeyVariations(dashboardData, keys)
+  const colIdVariations = getKeyVariations(keys)
   const validHeadIds = getKeyIds(dashboardData, colIdVariations)
 
   return dashboardData.filter((datasetRow: DashboardDataResponse) => {
@@ -137,25 +132,25 @@ export const filterKeys = (
 }
 
 export const getLastestDataset = (dashboardData: DashboardDataResponse[]): DashboardDataResponse[] => {
-  const latestTimestamp = dashboardData[dashboardData.length - 1]?.ts?.raw
+  const latestTimestamp = dashboardData[dashboardData.length - 1]?.['ts']?.raw
   if (latestTimestamp) {
-    return dashboardData.filter((data) => data.ts.raw === latestTimestamp)
+    return dashboardData.filter((data) => data['ts'].raw === latestTimestamp)
   }
   return dashboardData
 }
 
 export const getEarliestDataset = (dashboardData: DashboardDataResponse[]): DashboardDataResponse[] => {
-  const latestTimestamp = dashboardData[0]?.ts?.raw
+  const latestTimestamp = dashboardData[0]?.['ts']?.raw
   if (latestTimestamp) {
-    return dashboardData.filter((data) => data.ts.raw === latestTimestamp)
+    return dashboardData.filter((data) => data['ts'].raw === latestTimestamp)
   }
   return dashboardData
 }
 
 export const groupRowsByTimestamp = (dashboardData: DashboardDataResponse[]): DashboardDataResponse[][] => {
-  const uniqueTimestamps = [...new Set(dashboardData.map((item) => item.ts.raw))]
+  const uniqueTimestamps = [...new Set(dashboardData.map((item) => item['ts'].raw))]
   return uniqueTimestamps.map((ts) => {
-    return dashboardData.filter((d) => d.ts.raw === ts)
+    return dashboardData.filter((d) => d['ts'].raw === ts)
   })
 }
 
@@ -167,8 +162,8 @@ export const groupRowsByKey = (dashboardData: DashboardDataResponse[], key: stri
 }
 
 export const getGroupKey = (
-  keys: Array<components['schemas']['DashboardVisualisationColumnDefinition']>,
   rawData: DashboardDataResponse[],
+  keys?: Array<components['schemas']['DashboardVisualisationColumnDefinition']>,
 ) => {
   if (!keys || !keys.length || !rawData.length) {
     return undefined

package/dpr/utils/definitionUtils.js

@@ -1,2 +1,2 @@
-var V=Object.create;var s=Object.defineProperty;var S=Object.getOwnPropertyDescriptor;var v=Object.getOwnPropertyNames;var R=Object.getPrototypeOf,T=Object.prototype.hasOwnProperty;var k=(e,t)=>{for(var n in t)s(e,n,{get:t[n],enumerable:!0})},p=(e,t,n,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of v(t))!T.call(e,r)&&r!==n&&s(e,r,{get:()=>t[r],enumerable:!(i=S(t,r))||i.enumerable});return e};var N=(e,t,n)=>(n=e!=null?V(R(e)):{},p(t||!e||!e.__esModule?s(n,"default",{value:e,enumerable:!0}):n,e)),$=e=>p(s({},"__esModule",{value:!0}),e);var C={};k(C,{default:()=>w,getCurrentVariantDefinition:()=>d,getField:()=>D,getFieldDisplayName:()=>g,getFields:()=>h,getFilter:()=>l,getFilters:()=>x,getFiltersDefaultsValues:()=>u,getReportSummary:()=>y,getTemplate:()=>F});module.exports=$(C);var f=N(require("./logger"));const l=(e,t)=>e.find(n=>n.name===t)?.filter,u=e=>e.filter(t=>t.filter).map(t=>{const{name:n,display:i}=t,{type:r,interactive:o,defaultValue:a,defaultGranularity:m,defaultQuickFilterValue:c}=t.filter;return{name:n,display:i,type:r,interactive:o,...a&&{defaultValue:a},...m&&{defaultGranularity:m},...c&&{defaultQuickFilterValue:c}}}),d=(e,t,n)=>{if(!e){f.default.info("No definitions");return}let i;const r=e.find(o=>o.id===t);if(r)return i=r.variants.find(o=>n===o.id),i},g=(e,t)=>{const n=t.split("."),i=e.find(r=>r.name===n[0]);return i?n[1]?`${i.display} ${n[1]}`:i.display:t},D=(e,t)=>e.find(n=>n.name===t),h=e=>e.variant.specification?.fields||[],F=e=>e.variant.specification?.template,x=e=>e.filter(t=>t.filter).map(t=>t.filter),y=(e,t,n,i)=>t.getDefinitionSummary(n,e,i);var w={getCurrentVariantDefinition:d,getFieldDisplayName:g,getField:D,getFields:h,getTemplate:F,getFilter:l,getFilters:x,getFiltersDefaultsValues:u,getReportSummary:y};0&&(module.exports={getCurrentVariantDefinition,getField,getFieldDisplayName,getFields,getFilter,getFilters,getFiltersDefaultsValues,getReportSummary,getTemplate});
+"use strict";var S=Object.create;var s=Object.defineProperty;var v=Object.getOwnPropertyDescriptor;var T=Object.getOwnPropertyNames;var k=Object.getPrototypeOf,E=Object.prototype.hasOwnProperty;var Q=(t,e)=>{for(var n in e)s(t,n,{get:e[n],enumerable:!0})},m=(t,e,n,i)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of T(e))!E.call(t,o)&&o!==n&&s(t,o,{get:()=>e[o],enumerable:!(i=v(e,o))||i.enumerable});return t};var G=(t,e,n)=>(n=t!=null?S(k(t)):{},m(e||!t||!t.__esModule?s(n,"default",{value:t,enumerable:!0}):n,t)),N=t=>m(s({},"__esModule",{value:!0}),t);var w={};Q(w,{default:()=>$,getCurrentVariantDefinition:()=>d,getField:()=>D,getFieldDisplayName:()=>g,getFields:()=>F,getFilter:()=>l,getFilters:()=>y,getFiltersDefaultsValues:()=>u,getReportSummary:()=>R,getTemplate:()=>h});module.exports=N(w);var c=require("../components/_filters/filtersTypeEnum"),p=require("../types/UserReports"),f=G(require("./logger"));const l=(t,e)=>t.find(n=>n.name===e)?.filter,u=t=>t.filter(e=>e.filter).map(e=>{const{name:n,display:i}=e,o=e.filter?.defaultValue,r=e.filter?.defaultGranularity,a=e.filter?.defaultQuickFilterValue,V=e.filter?.type||p.ReportType.REPORT,x=e.filter?.interactive||c.FiltersType.REQUEST;return{name:n,display:i,type:V,interactive:x,...o&&{defaultValue:o},...r&&{defaultGranularity:r},...a&&{defaultQuickFilterValue:a}}}),d=(t,e,n)=>{if(!t){f.default.info("No definitions");return}let i;const o=t.find(r=>r.id===e);if(o)return i=o.variants.find(r=>n===r.id),i},g=(t,e)=>{const n=e.split("."),i=t.find(o=>o.name===n[0]);return i?n[1]?`${i.display} ${n[1]}`:i.display:e},D=(t,e)=>t.find(n=>n.name===e),F=t=>t.variant.specification?.fields||[],h=t=>t.variant.specification?.template||"list",y=t=>{const e=t.filter(n=>n.filter).map(n=>n.filter);return e.length?e:[]},R=(t,e,n,i)=>e.getDefinitionSummary(n,t,i);var $={getCurrentVariantDefinition:d,getFieldDisplayName:g,getField:D,getFields:F,getTemplate:h,getFilter:l,getFilters:y,getFiltersDefaultsValues:u,getReportSummary:R};0&&(module.exports={getCurrentVariantDefinition,getField,getFieldDisplayName,getFields,getFilter,getFilters,getFiltersDefaultsValues,getReportSummary,getTemplate});
 //# sourceMappingURL=definitionUtils.js.map

package/dpr/utils/definitionUtils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/utils/definitionUtils.ts"],
-  "sourcesContent": ["import ReportingService from '../services/reportingService'\nimport { components } from '../types/api'\nimport { Template } from '../types/Templates'\nimport logger from './logger'\n\nexport const getFilter = (\n  fields: components['schemas']['FieldDefinition'][],\n  fieldId: string,\n): components['schemas']['FilterDefinition'] | undefined => {\n  return fields.find((f) => f.name === fieldId)?.filter\n}\n\nexport const getFiltersDefaultsValues = (fields: components['schemas']['FieldDefinition'][]) => {\n  return fields\n    .filter((field) => field.filter)\n    .map((field) => {\n      const { name, display } = field\n      const { type, interactive, defaultValue, defaultGranularity, defaultQuickFilterValue } = field.filter\n\n      return {\n        name,\n        display,\n        type,\n        interactive,\n        ...(defaultValue && { defaultValue }),\n        ...(defaultGranularity && { defaultGranularity }),\n        ...(defaultQuickFilterValue && { defaultQuickFilterValue }),\n      }\n    })\n}\n\nexport const getCurrentVariantDefinition = (\n  definitions: components['schemas']['ReportDefinitionSummary'][],\n  reportId: string,\n  variantId: string,\n): components['schemas']['VariantDefinition'] | undefined => {\n  if (!definitions) {\n    logger.info('No definitions')\n    return undefined\n  }\n\n  let variantDef: components['schemas']['VariantDefinition']\n  const reportDef = definitions.find(\n    (report: components['schemas']['ReportDefinitionSummary']) => report.id === reportId,\n  )\n\n  if (reportDef) {\n    // TODO: this needs fixing, we should never be using `as unknown as`, but the types are very mixed up here\n    variantDef = reportDef.variants.find(\n      (variant) => variantId === variant.id,\n    ) as unknown as components['schemas']['VariantDefinition']\n\n    return variantDef\n  }\n\n  return undefined\n}\n\nexport const getFieldDisplayName = (fields: components['schemas']['FieldDefinition'][], fieldId: string) => {\n  const ids = fieldId.split('.')\n  const field = fields.find((f) => {\n    return f.name === ids[0]\n  })\n  if (field) {\n    return ids[1] ? `${field.display} ${ids[1]}` : field.display\n  }\n  return fieldId\n}\n\nexport const getField = (fields: components['schemas']['FieldDefinition'][], fieldId: string) => {\n  return fields.find((field) => {\n    return field.name === fieldId\n  })\n}\n\nexport const getFields = (\n  definition: components['schemas']['SingleVariantReportDefinition'],\n): components['schemas']['FieldDefinition'][] => {\n  return definition.variant.specification?.fields || []\n}\n\nexport const getTemplate = (definition: components['schemas']['SingleVariantReportDefinition']): Template => {\n  return definition.variant.specification?.template\n}\n\nexport const getFilters = (\n  fields: components['schemas']['FieldDefinition'][],\n): components['schemas']['FilterDefinition'][] => {\n  return fields.filter((field) => field.filter).map((field) => field.filter)\n}\n\nexport const getReportSummary = (\n  reportId: string,\n  reportingService: ReportingService,\n  token: string,\n  definitionPath: string,\n) => reportingService.getDefinitionSummary(token, reportId, definitionPath)\n\nexport default {\n  getCurrentVariantDefinition,\n  getFieldDisplayName,\n  getField,\n  getFields,\n  getTemplate,\n  getFilter,\n  getFilters,\n  getFiltersDefaultsValues,\n  getReportSummary,\n}\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,gCAAAC,EAAA,aAAAC,EAAA,wBAAAC,EAAA,cAAAC,EAAA,cAAAC,EAAA,eAAAC,EAAA,6BAAAC,EAAA,qBAAAC,EAAA,gBAAAC,IAAA,eAAAC,EAAAZ,GAGA,IAAAa,EAAmB,uBAEZ,MAAMN,EAAY,CACvBO,EACAC,IAEOD,EAAO,KAAME,GAAMA,EAAE,OAASD,CAAO,GAAG,OAGpCN,EAA4BK,GAChCA,EACJ,OAAQG,GAAUA,EAAM,MAAM,EAC9B,IAAKA,GAAU,CACd,KAAM,CAAE,KAAAC,EAAM,QAAAC,CAAQ,EAAIF,EACpB,CAAE,KAAAG,EAAM,YAAAC,EAAa,aAAAC,EAAc,mBAAAC,EAAoB,wBAAAC,CAAwB,EAAIP,EAAM,OAE/F,MAAO,CACL,KAAAC,EACA,QAAAC,EACA,KAAAC,EACA,YAAAC,EACA,GAAIC,GAAgB,CAAE,aAAAA,CAAa,EACnC,GAAIC,GAAsB,CAAE,mBAAAA,CAAmB,EAC/C,GAAIC,GAA2B,CAAE,wBAAAA,CAAwB,CAC3D,CACF,CAAC,EAGQrB,EAA8B,CACzCsB,EACAC,EACAC,IAC2D,CAC3D,GAAI,CAACF,EAAa,CAChB,EAAAG,QAAO,KAAK,gBAAgB,EAC5B,MACF,CAEA,IAAIC,EACJ,MAAMC,EAAYL,EAAY,KAC3BM,GAA6DA,EAAO,KAAOL,CAC9E,EAEA,GAAII,EAEF,OAAAD,EAAaC,EAAU,SAAS,KAC7BE,GAAYL,IAAcK,EAAQ,EACrC,EAEOH,CAIX,EAEaxB,EAAsB,CAACS,EAAoDC,IAAoB,CAC1G,MAAMkB,EAAMlB,EAAQ,MAAM,GAAG,EACvBE,EAAQH,EAAO,KAAME,GAClBA,EAAE,OAASiB,EAAI,CAAC,CACxB,EACD,OAAIhB,EACKgB,EAAI,CAAC,EAAI,GAAGhB,EAAM,OAAO,IAAIgB,EAAI,CAAC,CAAC,GAAKhB,EAAM,QAEhDF,CACT,EAEaX,EAAW,CAACU,EAAoDC,IACpED,EAAO,KAAMG,GACXA,EAAM,OAASF,CACvB,EAGUT,EACX4B,GAEOA,EAAW,QAAQ,eAAe,QAAU,CAAC,EAGzCvB,EAAeuB,GACnBA,EAAW,QAAQ,eAAe,SAG9B1B,EACXM,GAEOA,EAAO,OAAQG,GAAUA,EAAM,MAAM,EAAE,IAAKA,GAAUA,EAAM,MAAM,EAG9DP,EAAmB,CAC9BgB,EACAS,EACAC,EACAC,IACGF,EAAiB,qBAAqBC,EAAOV,EAAUW,CAAc,EAE1E,IAAOnC,EAAQ,CACb,4BAAAC,EACA,oBAAAE,EACA,SAAAD,EACA,UAAAE,EACA,YAAAK,EACA,UAAAJ,EACA,WAAAC,EACA,yBAAAC,EACA,iBAAAC,CACF",
-  "names": ["definitionUtils_exports", "__export", "definitionUtils_default", "getCurrentVariantDefinition", "getField", "getFieldDisplayName", "getFields", "getFilter", "getFilters", "getFiltersDefaultsValues", "getReportSummary", "getTemplate", "__toCommonJS", "import_logger", "fields", "fieldId", "f", "field", "name", "display", "type", "interactive", "defaultValue", "defaultGranularity", "defaultQuickFilterValue", "definitions", "reportId", "variantId", "logger", "variantDef", "reportDef", "report", "variant", "ids", "definition", "reportingService", "token", "definitionPath"]
+  "sourcesContent": ["import { FiltersType } from '../components/_filters/filtersTypeEnum'\nimport ReportingService from '../services/reportingService'\nimport { components } from '../types/api'\nimport { Template } from '../types/Templates'\nimport { ReportType } from '../types/UserReports'\nimport logger from './logger'\n\nexport const getFilter = (\n  fields: components['schemas']['FieldDefinition'][],\n  fieldId: string,\n): components['schemas']['FilterDefinition'] | undefined => {\n  return fields.find((f) => f.name === fieldId)?.filter\n}\n\nexport const getFiltersDefaultsValues = (fields: components['schemas']['FieldDefinition'][]) => {\n  return fields\n    .filter((field) => field.filter)\n    .map((field) => {\n      const { name, display } = field\n\n      const defaultValue = field.filter?.defaultValue\n      const defaultGranularity = field.filter?.defaultGranularity\n      const defaultQuickFilterValue = field.filter?.defaultQuickFilterValue\n      const type = field.filter?.type || ReportType.REPORT\n      const interactive = field.filter?.interactive || FiltersType.REQUEST\n\n      return {\n        name,\n        display,\n        type,\n        interactive,\n        ...(defaultValue && { defaultValue }),\n        ...(defaultGranularity && { defaultGranularity }),\n        ...(defaultQuickFilterValue && { defaultQuickFilterValue }),\n      }\n    })\n}\n\nexport const getCurrentVariantDefinition = (\n  definitions: components['schemas']['ReportDefinitionSummary'][],\n  reportId: string,\n  variantId: string,\n): components['schemas']['VariantDefinition'] | undefined => {\n  if (!definitions) {\n    logger.info('No definitions')\n    return undefined\n  }\n\n  let variantDef: components['schemas']['VariantDefinition']\n  const reportDef = definitions.find(\n    (report: components['schemas']['ReportDefinitionSummary']) => report.id === reportId,\n  )\n\n  if (reportDef) {\n    // TODO: this needs fixing, we should never be using `as unknown as`, but the types are very mixed up here\n    variantDef = reportDef.variants.find(\n      (variant) => variantId === variant.id,\n    ) as unknown as components['schemas']['VariantDefinition']\n\n    return variantDef\n  }\n\n  return undefined\n}\n\nexport const getFieldDisplayName = (fields: components['schemas']['FieldDefinition'][], fieldId: string) => {\n  const ids = fieldId.split('.')\n  const field = fields.find((f) => {\n    return f.name === ids[0]\n  })\n  if (field) {\n    return ids[1] ? `${field.display} ${ids[1]}` : field.display\n  }\n  return fieldId\n}\n\nexport const getField = (fields: components['schemas']['FieldDefinition'][], fieldId: string) => {\n  return fields.find((field) => {\n    return field.name === fieldId\n  })\n}\n\nexport const getFields = (\n  definition: components['schemas']['SingleVariantReportDefinition'],\n): components['schemas']['FieldDefinition'][] => {\n  return definition.variant.specification?.fields || []\n}\n\nexport const getTemplate = (definition: components['schemas']['SingleVariantReportDefinition']): Template => {\n  return definition.variant.specification?.template || 'list'\n}\n\nexport const getFilters = (\n  fields: components['schemas']['FieldDefinition'][],\n): components['schemas']['FilterDefinition'][] => {\n  const filters: components['schemas']['FilterDefinition'][] = fields\n    .filter((field: components['schemas']['FieldDefinition']) => field.filter)\n    .map((field: components['schemas']['FieldDefinition']) => <components['schemas']['FilterDefinition']>field.filter)\n\n  return filters.length ? filters : []\n}\n\nexport const getReportSummary = (\n  reportId: string,\n  reportingService: ReportingService,\n  token: string,\n  definitionPath: string,\n) => reportingService.getDefinitionSummary(token, reportId, definitionPath)\n\nexport default {\n  getCurrentVariantDefinition,\n  getFieldDisplayName,\n  getField,\n  getFields,\n  getTemplate,\n  getFilter,\n  getFilters,\n  getFiltersDefaultsValues,\n  getReportSummary,\n}\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,gCAAAC,EAAA,aAAAC,EAAA,wBAAAC,EAAA,cAAAC,EAAA,cAAAC,EAAA,eAAAC,EAAA,6BAAAC,EAAA,qBAAAC,EAAA,gBAAAC,IAAA,eAAAC,EAAAZ,GAAA,IAAAa,EAA4B,kDAI5BC,EAA2B,gCAC3BC,EAAmB,uBAEZ,MAAMR,EAAY,CACvBS,EACAC,IAEOD,EAAO,KAAME,GAAMA,EAAE,OAASD,CAAO,GAAG,OAGpCR,EAA4BO,GAChCA,EACJ,OAAQG,GAAUA,EAAM,MAAM,EAC9B,IAAKA,GAAU,CACd,KAAM,CAAE,KAAAC,EAAM,QAAAC,CAAQ,EAAIF,EAEpBG,EAAeH,EAAM,QAAQ,aAC7BI,EAAqBJ,EAAM,QAAQ,mBACnCK,EAA0BL,EAAM,QAAQ,wBACxCM,EAAON,EAAM,QAAQ,MAAQ,aAAW,OACxCO,EAAcP,EAAM,QAAQ,aAAe,cAAY,QAE7D,MAAO,CACL,KAAAC,EACA,QAAAC,EACA,KAAAI,EACA,YAAAC,EACA,GAAIJ,GAAgB,CAAE,aAAAA,CAAa,EACnC,GAAIC,GAAsB,CAAE,mBAAAA,CAAmB,EAC/C,GAAIC,GAA2B,CAAE,wBAAAA,CAAwB,CAC3D,CACF,CAAC,EAGQrB,EAA8B,CACzCwB,EACAC,EACAC,IAC2D,CAC3D,GAAI,CAACF,EAAa,CAChB,EAAAG,QAAO,KAAK,gBAAgB,EAC5B,MACF,CAEA,IAAIC,EACJ,MAAMC,EAAYL,EAAY,KAC3BM,GAA6DA,EAAO,KAAOL,CAC9E,EAEA,GAAII,EAEF,OAAAD,EAAaC,EAAU,SAAS,KAC7BE,GAAYL,IAAcK,EAAQ,EACrC,EAEOH,CAIX,EAEa1B,EAAsB,CAACW,EAAoDC,IAAoB,CAC1G,MAAMkB,EAAMlB,EAAQ,MAAM,GAAG,EACvBE,EAAQH,EAAO,KAAME,GAClBA,EAAE,OAASiB,EAAI,CAAC,CACxB,EACD,OAAIhB,EACKgB,EAAI,CAAC,EAAI,GAAGhB,EAAM,OAAO,IAAIgB,EAAI,CAAC,CAAC,GAAKhB,EAAM,QAEhDF,CACT,EAEab,EAAW,CAACY,EAAoDC,IACpED,EAAO,KAAMG,GACXA,EAAM,OAASF,CACvB,EAGUX,EACX8B,GAEOA,EAAW,QAAQ,eAAe,QAAU,CAAC,EAGzCzB,EAAeyB,GACnBA,EAAW,QAAQ,eAAe,UAAY,OAG1C5B,EACXQ,GACgD,CAChD,MAAMqB,EAAuDrB,EAC1D,OAAQG,GAAoDA,EAAM,MAAM,EACxE,IAAKA,GAA+FA,EAAM,MAAM,EAEnH,OAAOkB,EAAQ,OAASA,EAAU,CAAC,CACrC,EAEa3B,EAAmB,CAC9BkB,EACAU,EACAC,EACAC,IACGF,EAAiB,qBAAqBC,EAAOX,EAAUY,CAAc,EAE1E,IAAOtC,EAAQ,CACb,4BAAAC,EACA,oBAAAE,EACA,SAAAD,EACA,UAAAE,EACA,YAAAK,EACA,UAAAJ,EACA,WAAAC,EACA,yBAAAC,EACA,iBAAAC,CACF",
+  "names": ["definitionUtils_exports", "__export", "definitionUtils_default", "getCurrentVariantDefinition", "getField", "getFieldDisplayName", "getFields", "getFilter", "getFilters", "getFiltersDefaultsValues", "getReportSummary", "getTemplate", "__toCommonJS", "import_filtersTypeEnum", "import_UserReports", "import_logger", "fields", "fieldId", "f", "field", "name", "display", "defaultValue", "defaultGranularity", "defaultQuickFilterValue", "type", "interactive", "definitions", "reportId", "variantId", "logger", "variantDef", "reportDef", "report", "variant", "ids", "definition", "filters", "reportingService", "token", "definitionPath"]
 }

package/dpr/utils/definitionUtils.ts

@@ -1,6 +1,8 @@
+import { FiltersType } from '../components/_filters/filtersTypeEnum'
 import ReportingService from '../services/reportingService'
 import { components } from '../types/api'
 import { Template } from '../types/Templates'
+import { ReportType } from '../types/UserReports'
 import logger from './logger'
 
 export const getFilter = (
@@ -15,7 +17,12 @@ export const getFiltersDefaultsValues = (fields: components['schemas']['FieldDef
     .filter((field) => field.filter)
     .map((field) => {
       const { name, display } = field
-      const { type, interactive, defaultValue, defaultGranularity, defaultQuickFilterValue } = field.filter
+
+      const defaultValue = field.filter?.defaultValue
+      const defaultGranularity = field.filter?.defaultGranularity
+      const defaultQuickFilterValue = field.filter?.defaultQuickFilterValue
+      const type = field.filter?.type || ReportType.REPORT
+      const interactive = field.filter?.interactive || FiltersType.REQUEST
 
       return {
         name,
@@ -80,13 +87,17 @@ export const getFields = (
 }
 
 export const getTemplate = (definition: components['schemas']['SingleVariantReportDefinition']): Template => {
-  return definition.variant.specification?.template
+  return definition.variant.specification?.template || 'list'
 }
 
 export const getFilters = (
   fields: components['schemas']['FieldDefinition'][],
 ): components['schemas']['FilterDefinition'][] => {
-  return fields.filter((field) => field.filter).map((field) => field.filter)
+  const filters: components['schemas']['FilterDefinition'][] = fields
+    .filter((field: components['schemas']['FieldDefinition']) => field.filter)
+    .map((field: components['schemas']['FieldDefinition']) => <components['schemas']['FilterDefinition']>field.filter)
+
+  return filters.length ? filters : []
 }
 
 export const getReportSummary = (

package/dpr/utils/index.js

@@ -1,2 +1,2 @@
-var e=Object.create;var i=Object.defineProperty;var k=Object.getOwnPropertyDescriptor;var n=Object.getOwnPropertyNames;var c=Object.getPrototypeOf,d=Object.prototype.hasOwnProperty;var w=(o,r)=>{for(var t in r)i(o,t,{get:r[t],enumerable:!0})},a=(o,r,t,U)=>{if(r&&typeof r=="object"||typeof r=="function")for(let m of n(r))!d.call(o,m)&&m!==t&&i(o,m,{get:()=>r[m],enumerable:!(U=k(r,m))||U.enumerable});return o};var p=(o,r,t)=>(t=o!=null?e(c(o)):{},a(r||!o||!o.__esModule?i(t,"default",{value:o,enumerable:!0}):t,o)),x=o=>a(i({},"__esModule",{value:!0}),o);var y={};w(y,{BookmarkUtils:()=>s.default,DownloadUtils:()=>f.default,SyncReportUtils:()=>l.default});module.exports=x(y);var l=p(require("../routes/journeys/view-report/sync/report/utils")),f=p(require("../routes/journeys/download-report/utils")),s=p(require("../routes/journeys/my-reports/bookmarks/utils"));0&&(module.exports={BookmarkUtils,DownloadUtils,SyncReportUtils});
+"use strict";var e=Object.create;var i=Object.defineProperty;var k=Object.getOwnPropertyDescriptor;var n=Object.getOwnPropertyNames;var c=Object.getPrototypeOf,d=Object.prototype.hasOwnProperty;var w=(o,r)=>{for(var t in r)i(o,t,{get:r[t],enumerable:!0})},a=(o,r,t,U)=>{if(r&&typeof r=="object"||typeof r=="function")for(let m of n(r))!d.call(o,m)&&m!==t&&i(o,m,{get:()=>r[m],enumerable:!(U=k(r,m))||U.enumerable});return o};var p=(o,r,t)=>(t=o!=null?e(c(o)):{},a(r||!o||!o.__esModule?i(t,"default",{value:o,enumerable:!0}):t,o)),x=o=>a(i({},"__esModule",{value:!0}),o);var y={};w(y,{BookmarkUtils:()=>s.default,DownloadUtils:()=>f.default,SyncReportUtils:()=>l.default});module.exports=x(y);var l=p(require("../routes/journeys/view-report/sync/report/utils")),f=p(require("../routes/journeys/download-report/utils")),s=p(require("../routes/journeys/my-reports/bookmarks/utils"));0&&(module.exports={BookmarkUtils,DownloadUtils,SyncReportUtils});
 //# sourceMappingURL=index.js.map

package/dpr/utils/index.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/dpr/utils/index.ts"],
   "sourcesContent": ["import SyncReportUtils from '../routes/journeys/view-report/sync/report/utils'\nimport DownloadUtils from '../routes/journeys/download-report/utils'\nimport BookmarkUtils from '../routes/journeys/my-reports/bookmarks/utils'\n\nexport { SyncReportUtils, DownloadUtils, BookmarkUtils }\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qBAAAE,QAAA,oBAAAC,QAAA,sBAAAC,UAAA,eAAAC,EAAAL,GAAA,IAAAM,EAA4B,+DAC5BA,EAA0B,uDAC1BA,EAA0B",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qBAAAE,QAAA,oBAAAC,QAAA,sBAAAC,UAAA,eAAAC,EAAAL,GAAA,IAAAM,EAA4B,+DAC5BA,EAA0B,uDAC1BA,EAA0B",
   "names": ["utils_exports", "__export", "BookmarkUtils", "DownloadUtils", "SyncReportUtils", "__toCommonJS", "import_utils"]
 }

package/dpr/utils/indexedAccesHelper.js

@@ -0,0 +1,2 @@
+"use strict";var s=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var g=Object.getOwnPropertyNames;var m=Object.prototype.hasOwnProperty;var d=(e,r)=>{for(var n in r)s(e,n,{get:r[n],enumerable:!0})},f=(e,r,n,a)=>{if(r&&typeof r=="object"||typeof r=="function")for(let t of g(r))!m.call(e,t)&&t!==n&&s(e,t,{get:()=>r[t],enumerable:!(a=u(r,t))||a.enumerable});return e};var l=e=>f(s({},"__esModule",{value:!0}),e);var q={};d(q,{getRequestParam:()=>p});module.exports=l(q);const p=({req:e,param:r,defaultValue:n,error:a,errorString:t})=>{const o=e.params[r];if(o===void 0&&a){const i=t||"Crtitical request parameter is undefined:";throw new Error(`${i}: paramname: ${r}`)}return o||n||""};0&&(module.exports={getRequestParam});
+//# sourceMappingURL=indexedAccesHelper.js.map

package/dpr/utils/indexedAccesHelper.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/dpr/utils/indexedAccesHelper.ts"],
+  "sourcesContent": ["import { Request } from 'express'\n\nexport const getRequestParam = ({\n  req,\n  param,\n  defaultValue,\n  error,\n  errorString,\n}: {\n  req: Request\n  param: string\n  defaultValue?: string\n  error?: boolean\n  errorString?: string\n}): string => {\n  const value = req.params[param]\n\n  if (value === undefined && error) {\n    const errorMessage = errorString || 'Crtitical request parameter is undefined:'\n    throw new Error(`${errorMessage}: paramname: ${param}`)\n  }\n\n  return value || defaultValue || ''\n}\n"],
+  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qBAAAE,IAAA,eAAAC,EAAAH,GAEO,MAAME,EAAkB,CAAC,CAC9B,IAAAE,EACA,MAAAC,EACA,aAAAC,EACA,MAAAC,EACA,YAAAC,CACF,IAMc,CACZ,MAAMC,EAAQL,EAAI,OAAOC,CAAK,EAE9B,GAAII,IAAU,QAAaF,EAAO,CAChC,MAAMG,EAAeF,GAAe,4CACpC,MAAM,IAAI,MAAM,GAAGE,CAAY,gBAAgBL,CAAK,EAAE,CACxD,CAEA,OAAOI,GAASH,GAAgB,EAClC",
+  "names": ["indexedAccesHelper_exports", "__export", "getRequestParam", "__toCommonJS", "req", "param", "defaultValue", "error", "errorString", "value", "errorMessage"]
+}

package/dpr/utils/indexedAccesHelper.ts

@@ -0,0 +1,24 @@
+import { Request } from 'express'
+
+export const getRequestParam = ({
+  req,
+  param,
+  defaultValue,
+  error,
+  errorString,
+}: {
+  req: Request
+  param: string
+  defaultValue?: string
+  error?: boolean
+  errorString?: string
+}): string => {
+  const value = req.params[param]
+
+  if (value === undefined && error) {
+    const errorMessage = errorString || 'Crtitical request parameter is undefined:'
+    throw new Error(`${errorMessage}: paramname: ${param}`)
+  }
+
+  return value || defaultValue || ''
+}

package/dpr/utils/localsHelper.js

@@ -1,2 +1,2 @@
-var a=Object.defineProperty;var p=Object.getOwnPropertyDescriptor;var f=Object.getOwnPropertyNames;var u=Object.prototype.hasOwnProperty;var k=(e,o)=>{for(var t in o)a(e,t,{get:o[t],enumerable:!0})},m=(e,o,t,n)=>{if(o&&typeof o=="object"||typeof o=="function")for(let s of f(o))!u.call(e,s)&&s!==t&&a(e,s,{get:()=>o[s],enumerable:!(n=p(o,s))||n.enumerable});return e};var R=e=>m(a({},"__esModule",{value:!0}),e);var P={};k(P,{default:()=>x,getValues:()=>r,setDdpPathToReqQuery:()=>d});module.exports=R(P);const r=e=>{const o=e.locals.csrfToken||"csrfToken",t=h(e);return{token:t.token,dprUser:t,...D(e),...g(e),...y(e),...b(e),csrfToken:o,nestedBaseUrl:e.locals.nestedBaseUrl}},b=e=>({definitions:e.locals.definitions||[]}),y=e=>({bookmarkingEnabled:e.locals.bookmarkingEnabled,downloadingEnabled:e.locals.downloadingEnabled}),D=e=>{const o=e.locals.requestedReports||[],t=e.locals.recentlyViewedReports||[],n=e.locals.bookmarks||[];return{requestedReports:o,recentlyViewedReports:t,bookmarks:n}},g=e=>{const{definitionsPath:o,dpdPathFromQuery:t,dpdPathFromConfig:n,pathSuffix:s}=e.locals;return{definitionsPath:o,dpdPathFromQuery:t,dpdPathFromConfig:n,pathSuffix:s||""}},h=e=>{const{dprUser:o}=e.locals,t=o?.id,n=o?.token,s=o?.activeCaseLoadId,i=o?.staffId,c=o?.emailAddress||"",l=o?.displayName||"";return{id:t,token:n,activeCaseLoadId:s,staffId:i,email:c,displayName:l}},d=(e,o)=>(o&&(e.query={...e.query,dataProductDefinitionsPath:o}),e.query);var x={getValues:r,setDdpPathToReqQuery:d};0&&(module.exports={getValues,setDdpPathToReqQuery});
+"use strict";var a=Object.defineProperty;var p=Object.getOwnPropertyDescriptor;var f=Object.getOwnPropertyNames;var u=Object.prototype.hasOwnProperty;var k=(e,o)=>{for(var t in o)a(e,t,{get:o[t],enumerable:!0})},m=(e,o,t,n)=>{if(o&&typeof o=="object"||typeof o=="function")for(let s of f(o))!u.call(e,s)&&s!==t&&a(e,s,{get:()=>o[s],enumerable:!(n=p(o,s))||n.enumerable});return e};var R=e=>m(a({},"__esModule",{value:!0}),e);var P={};k(P,{default:()=>x,getValues:()=>r,setDdpPathToReqQuery:()=>d});module.exports=R(P);const r=e=>{const o=e.locals.csrfToken||"csrfToken",t=h(e);return{token:t.token,dprUser:t,...D(e),...g(e),...y(e),...b(e),csrfToken:o,nestedBaseUrl:e.locals.nestedBaseUrl}},b=e=>({definitions:e.locals.definitions||[]}),y=e=>({bookmarkingEnabled:e.locals.bookmarkingEnabled,downloadingEnabled:e.locals.downloadingEnabled}),D=e=>{const o=e.locals.requestedReports||[],t=e.locals.recentlyViewedReports||[],n=e.locals.bookmarks||[];return{requestedReports:o,recentlyViewedReports:t,bookmarks:n}},g=e=>{const{definitionsPath:o,dpdPathFromQuery:t,dpdPathFromConfig:n,pathSuffix:s}=e.locals;return{definitionsPath:o,dpdPathFromQuery:t,dpdPathFromConfig:n,pathSuffix:s||""}},h=e=>{const{dprUser:o}=e.locals,t=o?.id,n=o?.token,s=o?.activeCaseLoadId,i=o?.staffId,c=o?.emailAddress||"",l=o?.displayName||"";return{id:t,token:n,activeCaseLoadId:s,staffId:i,email:c,displayName:l}},d=(e,o)=>(o&&(e.query={...e.query,dataProductDefinitionsPath:o}),e.query);var x={getValues:r,setDdpPathToReqQuery:d};0&&(module.exports={getValues,setDdpPathToReqQuery});
 //# sourceMappingURL=localsHelper.js.map

package/dpr/utils/localsHelper.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/utils/localsHelper.ts"],
-  "sourcesContent": ["import type { Response, Request } from 'express'\nimport { StoredReportData } from '../types/UserReports'\nimport { BookmarkStoreData } from '../types/Bookmark'\n\nexport const getValues = (res: Response) => {\n  const csrfToken = (res.locals.csrfToken as unknown as string) || 'csrfToken'\n  const dprUser = setDprUserContext(res)\n\n  return {\n    token: dprUser.token,\n    dprUser,\n    ...setUserReports(res),\n    ...setDpdPaths(res),\n    ...setFeatures(res),\n    ...setDefinitions(res),\n    csrfToken,\n    nestedBaseUrl: res.locals.nestedBaseUrl,\n  }\n}\n\nconst setDefinitions = (res: Response) => {\n  const definitions = res.locals.definitions || []\n  return {\n    definitions,\n  }\n}\n\nconst setFeatures = (res: Response) => {\n  return {\n    bookmarkingEnabled: <boolean>res.locals.bookmarkingEnabled,\n    downloadingEnabled: <boolean>res.locals.downloadingEnabled,\n  }\n}\n\nconst setUserReports = (res: Response) => {\n  const requestedReports: StoredReportData[] = res.locals.requestedReports || []\n  const recentlyViewedReports: StoredReportData[] = res.locals.recentlyViewedReports || []\n  const bookmarks: BookmarkStoreData[] = res.locals.bookmarks || []\n\n  return {\n    requestedReports,\n    recentlyViewedReports,\n    bookmarks,\n  }\n}\n\nconst setDpdPaths = (res: Response) => {\n  const { definitionsPath, dpdPathFromQuery, dpdPathFromConfig, pathSuffix } = res.locals\n  return {\n    definitionsPath,\n    dpdPathFromQuery,\n    dpdPathFromConfig,\n    pathSuffix: pathSuffix || '',\n  }\n}\n\nconst setDprUserContext = (res: Response) => {\n  const { dprUser } = res.locals\n  const id = dprUser?.id\n  const token = dprUser?.token\n  const activeCaseLoadId = dprUser?.activeCaseLoadId\n  const staffId = dprUser?.staffId\n  const email = dprUser?.emailAddress || ''\n  const displayName = dprUser?.displayName || ''\n\n  return {\n    id,\n    token,\n    activeCaseLoadId,\n    staffId,\n    email,\n    displayName,\n  }\n}\n\nexport const setDdpPathToReqQuery = (req: Request, value: string) => {\n  if (value) {\n    req.query = {\n      ...req.query,\n      dataProductDefinitionsPath: value,\n    }\n  }\n\n  return req.query\n}\n\nexport default {\n  getValues,\n  setDdpPathToReqQuery,\n}\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,cAAAC,EAAA,yBAAAC,IAAA,eAAAC,EAAAL,GAIO,MAAMG,EAAaG,GAAkB,CAC1C,MAAMC,EAAaD,EAAI,OAAO,WAAmC,YAC3DE,EAAUC,EAAkBH,CAAG,EAErC,MAAO,CACL,MAAOE,EAAQ,MACf,QAAAA,EACA,GAAGE,EAAeJ,CAAG,EACrB,GAAGK,EAAYL,CAAG,EAClB,GAAGM,EAAYN,CAAG,EAClB,GAAGO,EAAeP,CAAG,EACrB,UAAAC,EACA,cAAeD,EAAI,OAAO,aAC5B,CACF,EAEMO,EAAkBP,IAEf,CACL,YAFkBA,EAAI,OAAO,aAAe,CAAC,CAG/C,GAGIM,EAAeN,IACZ,CACL,mBAA6BA,EAAI,OAAO,mBACxC,mBAA6BA,EAAI,OAAO,kBAC1C,GAGII,EAAkBJ,GAAkB,CACxC,MAAMQ,EAAuCR,EAAI,OAAO,kBAAoB,CAAC,EACvES,EAA4CT,EAAI,OAAO,uBAAyB,CAAC,EACjFU,EAAiCV,EAAI,OAAO,WAAa,CAAC,EAEhE,MAAO,CACL,iBAAAQ,EACA,sBAAAC,EACA,UAAAC,CACF,CACF,EAEML,EAAeL,GAAkB,CACrC,KAAM,CAAE,gBAAAW,EAAiB,iBAAAC,EAAkB,kBAAAC,EAAmB,WAAAC,CAAW,EAAId,EAAI,OACjF,MAAO,CACL,gBAAAW,EACA,iBAAAC,EACA,kBAAAC,EACA,WAAYC,GAAc,EAC5B,CACF,EAEMX,EAAqBH,GAAkB,CAC3C,KAAM,CAAE,QAAAE,CAAQ,EAAIF,EAAI,OAClBe,EAAKb,GAAS,GACdc,EAAQd,GAAS,MACjBe,EAAmBf,GAAS,iBAC5BgB,EAAUhB,GAAS,QACnBiB,EAAQjB,GAAS,cAAgB,GACjCkB,EAAclB,GAAS,aAAe,GAE5C,MAAO,CACL,GAAAa,EACA,MAAAC,EACA,iBAAAC,EACA,QAAAC,EACA,MAAAC,EACA,YAAAC,CACF,CACF,EAEatB,EAAuB,CAACuB,EAAcC,KAC7CA,IACFD,EAAI,MAAQ,CACV,GAAGA,EAAI,MACP,2BAA4BC,CAC9B,GAGKD,EAAI,OAGb,IAAOzB,EAAQ,CACb,UAAAC,EACA,qBAAAC,CACF",
+  "sourcesContent": ["import type { Response, Request } from 'express'\nimport { StoredReportData } from '../types/UserReports'\nimport { BookmarkStoreData } from '../types/Bookmark'\n\nexport const getValues = (res: Response) => {\n  const csrfToken = (res.locals['csrfToken'] as unknown as string) || 'csrfToken'\n  const dprUser = setDprUserContext(res)\n\n  return {\n    token: dprUser.token,\n    dprUser,\n    ...setUserReports(res),\n    ...setDpdPaths(res),\n    ...setFeatures(res),\n    ...setDefinitions(res),\n    csrfToken,\n    nestedBaseUrl: res.locals['nestedBaseUrl'],\n  }\n}\n\nconst setDefinitions = (res: Response) => {\n  const definitions = res.locals['definitions'] || []\n  return {\n    definitions,\n  }\n}\n\nconst setFeatures = (res: Response) => {\n  return {\n    bookmarkingEnabled: <boolean>res.locals['bookmarkingEnabled'],\n    downloadingEnabled: <boolean>res.locals['downloadingEnabled'],\n  }\n}\n\nconst setUserReports = (res: Response) => {\n  const requestedReports: StoredReportData[] = res.locals['requestedReports'] || []\n  const recentlyViewedReports: StoredReportData[] = res.locals['recentlyViewedReports'] || []\n  const bookmarks: BookmarkStoreData[] = res.locals['bookmarks'] || []\n\n  return {\n    requestedReports,\n    recentlyViewedReports,\n    bookmarks,\n  }\n}\n\nconst setDpdPaths = (res: Response) => {\n  const { definitionsPath, dpdPathFromQuery, dpdPathFromConfig, pathSuffix } = res.locals\n  return {\n    definitionsPath,\n    dpdPathFromQuery,\n    dpdPathFromConfig,\n    pathSuffix: pathSuffix || '',\n  }\n}\n\nconst setDprUserContext = (res: Response) => {\n  const { dprUser } = res.locals\n  const id = dprUser?.id\n  const token = dprUser?.token\n  const activeCaseLoadId = dprUser?.activeCaseLoadId\n  const staffId = dprUser?.staffId\n  const email = dprUser?.emailAddress || ''\n  const displayName = dprUser?.displayName || ''\n\n  return {\n    id,\n    token,\n    activeCaseLoadId,\n    staffId,\n    email,\n    displayName,\n  }\n}\n\nexport const setDdpPathToReqQuery = (req: Request, value: string) => {\n  if (value) {\n    req.query = {\n      ...req.query,\n      dataProductDefinitionsPath: value,\n    }\n  }\n\n  return req.query\n}\n\nexport default {\n  getValues,\n  setDdpPathToReqQuery,\n}\n"],
+  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,cAAAC,EAAA,yBAAAC,IAAA,eAAAC,EAAAL,GAIO,MAAMG,EAAaG,GAAkB,CAC1C,MAAMC,EAAaD,EAAI,OAAO,WAAsC,YAC9DE,EAAUC,EAAkBH,CAAG,EAErC,MAAO,CACL,MAAOE,EAAQ,MACf,QAAAA,EACA,GAAGE,EAAeJ,CAAG,EACrB,GAAGK,EAAYL,CAAG,EAClB,GAAGM,EAAYN,CAAG,EAClB,GAAGO,EAAeP,CAAG,EACrB,UAAAC,EACA,cAAeD,EAAI,OAAO,aAC5B,CACF,EAEMO,EAAkBP,IAEf,CACL,YAFkBA,EAAI,OAAO,aAAkB,CAAC,CAGlD,GAGIM,EAAeN,IACZ,CACL,mBAA6BA,EAAI,OAAO,mBACxC,mBAA6BA,EAAI,OAAO,kBAC1C,GAGII,EAAkBJ,GAAkB,CACxC,MAAMQ,EAAuCR,EAAI,OAAO,kBAAuB,CAAC,EAC1ES,EAA4CT,EAAI,OAAO,uBAA4B,CAAC,EACpFU,EAAiCV,EAAI,OAAO,WAAgB,CAAC,EAEnE,MAAO,CACL,iBAAAQ,EACA,sBAAAC,EACA,UAAAC,CACF,CACF,EAEML,EAAeL,GAAkB,CACrC,KAAM,CAAE,gBAAAW,EAAiB,iBAAAC,EAAkB,kBAAAC,EAAmB,WAAAC,CAAW,EAAId,EAAI,OACjF,MAAO,CACL,gBAAAW,EACA,iBAAAC,EACA,kBAAAC,EACA,WAAYC,GAAc,EAC5B,CACF,EAEMX,EAAqBH,GAAkB,CAC3C,KAAM,CAAE,QAAAE,CAAQ,EAAIF,EAAI,OAClBe,EAAKb,GAAS,GACdc,EAAQd,GAAS,MACjBe,EAAmBf,GAAS,iBAC5BgB,EAAUhB,GAAS,QACnBiB,EAAQjB,GAAS,cAAgB,GACjCkB,EAAclB,GAAS,aAAe,GAE5C,MAAO,CACL,GAAAa,EACA,MAAAC,EACA,iBAAAC,EACA,QAAAC,EACA,MAAAC,EACA,YAAAC,CACF,CACF,EAEatB,EAAuB,CAACuB,EAAcC,KAC7CA,IACFD,EAAI,MAAQ,CACV,GAAGA,EAAI,MACP,2BAA4BC,CAC9B,GAGKD,EAAI,OAGb,IAAOzB,EAAQ,CACb,UAAAC,EACA,qBAAAC,CACF",
   "names": ["localsHelper_exports", "__export", "localsHelper_default", "getValues", "setDdpPathToReqQuery", "__toCommonJS", "res", "csrfToken", "dprUser", "setDprUserContext", "setUserReports", "setDpdPaths", "setFeatures", "setDefinitions", "requestedReports", "recentlyViewedReports", "bookmarks", "definitionsPath", "dpdPathFromQuery", "dpdPathFromConfig", "pathSuffix", "id", "token", "activeCaseLoadId", "staffId", "email", "displayName", "req", "value"]
 }

package/dpr/utils/localsHelper.ts

@@ -3,7 +3,7 @@ import { StoredReportData } from '../types/UserReports'
 import { BookmarkStoreData } from '../types/Bookmark'
 
 export const getValues = (res: Response) => {
-  const csrfToken = (res.locals.csrfToken as unknown as string) || 'csrfToken'
+  const csrfToken = (res.locals['csrfToken'] as unknown as string) || 'csrfToken'
   const dprUser = setDprUserContext(res)
 
   return {
@@ -14,12 +14,12 @@ export const getValues = (res: Response) => {
     ...setFeatures(res),
     ...setDefinitions(res),
     csrfToken,
-    nestedBaseUrl: res.locals.nestedBaseUrl,
+    nestedBaseUrl: res.locals['nestedBaseUrl'],
   }
 }
 
 const setDefinitions = (res: Response) => {
-  const definitions = res.locals.definitions || []
+  const definitions = res.locals['definitions'] || []
   return {
     definitions,
   }
@@ -27,15 +27,15 @@ const setDefinitions = (res: Response) => {
 
 const setFeatures = (res: Response) => {
   return {
-    bookmarkingEnabled: <boolean>res.locals.bookmarkingEnabled,
-    downloadingEnabled: <boolean>res.locals.downloadingEnabled,
+    bookmarkingEnabled: <boolean>res.locals['bookmarkingEnabled'],
+    downloadingEnabled: <boolean>res.locals['downloadingEnabled'],
   }
 }
 
 const setUserReports = (res: Response) => {
-  const requestedReports: StoredReportData[] = res.locals.requestedReports || []
-  const recentlyViewedReports: StoredReportData[] = res.locals.recentlyViewedReports || []
-  const bookmarks: BookmarkStoreData[] = res.locals.bookmarks || []
+  const requestedReports: StoredReportData[] = res.locals['requestedReports'] || []
+  const recentlyViewedReports: StoredReportData[] = res.locals['recentlyViewedReports'] || []
+  const bookmarks: BookmarkStoreData[] = res.locals['bookmarks'] || []
 
   return {
     requestedReports,

package/dpr/utils/logger.js

@@ -1,2 +1,2 @@
-var p=Object.create;var a=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var c=Object.getOwnPropertyNames;var f=Object.getPrototypeOf,b=Object.prototype.hasOwnProperty;var d=(o,e)=>{for(var t in e)a(o,t,{get:e[t],enumerable:!0})},g=(o,e,t,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of c(e))!b.call(o,r)&&r!==t&&a(o,r,{get:()=>e[r],enumerable:!(s=u(e,r))||s.enumerable});return o};var l=(o,e,t)=>(t=o!=null?p(f(o)):{},g(e||!o||!o.__esModule?a(t,"default",{value:o,enumerable:!0}):t,o)),L=o=>g(a({},"__esModule",{value:!0}),o);var x={};d(x,{default:()=>v,logger:()=>i});module.exports=L(x);var n=l(require("bunyan")),m=l(require("bunyan-format"));const S=(0,m.default)({outputMode:"short",color:!1}),P=process.env.SUPPRESS_LOGS,i=n.default.createLogger({name:"Digital Prison Reporting:",stream:S,level:P?n.default.FATAL+1:"debug"});var v=i;0&&(module.exports={logger});
+"use strict";var p=Object.create;var a=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var c=Object.getOwnPropertyNames;var f=Object.getPrototypeOf,b=Object.prototype.hasOwnProperty;var d=(o,e)=>{for(var t in e)a(o,t,{get:e[t],enumerable:!0})},g=(o,e,t,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of c(e))!b.call(o,r)&&r!==t&&a(o,r,{get:()=>e[r],enumerable:!(s=u(e,r))||s.enumerable});return o};var l=(o,e,t)=>(t=o!=null?p(f(o)):{},g(e||!o||!o.__esModule?a(t,"default",{value:o,enumerable:!0}):t,o)),L=o=>g(a({},"__esModule",{value:!0}),o);var x={};d(x,{default:()=>v,logger:()=>i});module.exports=L(x);var n=l(require("bunyan")),m=l(require("bunyan-format"));const S=(0,m.default)({outputMode:"short",color:!1}),P=process.env.SUPPRESS_LOGS,i=n.default.createLogger({name:"Digital Prison Reporting:",stream:S,level:P?n.default.FATAL+1:"debug"});var v=i;0&&(module.exports={logger});
 //# sourceMappingURL=logger.js.map

package/dpr/utils/logger.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/utils/logger.ts"],
-  "sourcesContent": ["import bunyan from 'bunyan'\nimport bunyanFormat from 'bunyan-format'\n\nconst formatOut = bunyanFormat({ outputMode: 'short', color: false })\n\nconst disableLogs = process.env.SUPPRESS_LOGS\nexport const logger = bunyan.createLogger({\n  name: 'Digital Prison Reporting:',\n  stream: formatOut,\n  level: disableLogs ? bunyan.FATAL + 1 : 'debug',\n})\n\nexport default logger\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAAmB,qBACnBC,EAAyB,4BAEzB,MAAMC,KAAY,EAAAC,SAAa,CAAE,WAAY,QAAS,MAAO,EAAM,CAAC,EAE9DC,EAAc,QAAQ,IAAI,cACnBN,EAAS,EAAAO,QAAO,aAAa,CACxC,KAAM,4BACN,OAAQH,EACR,MAAOE,EAAc,EAAAC,QAAO,MAAQ,EAAI,OAC1C,CAAC,EAED,IAAOR,EAAQC",
+  "sourcesContent": ["import bunyan from 'bunyan'\nimport bunyanFormat from 'bunyan-format'\n\nconst formatOut = bunyanFormat({ outputMode: 'short', color: false })\n\nconst disableLogs = process.env['SUPPRESS_LOGS']\nexport const logger = bunyan.createLogger({\n  name: 'Digital Prison Reporting:',\n  stream: formatOut,\n  level: disableLogs ? bunyan.FATAL + 1 : 'debug',\n})\n\nexport default logger\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAAmB,qBACnBC,EAAyB,4BAEzB,MAAMC,KAAY,EAAAC,SAAa,CAAE,WAAY,QAAS,MAAO,EAAM,CAAC,EAE9DC,EAAc,QAAQ,IAAI,cACnBN,EAAS,EAAAO,QAAO,aAAa,CACxC,KAAM,4BACN,OAAQH,EACR,MAAOE,EAAc,EAAAC,QAAO,MAAQ,EAAI,OAC1C,CAAC,EAED,IAAOR,EAAQC",
   "names": ["logger_exports", "__export", "logger_default", "logger", "__toCommonJS", "import_bunyan", "import_bunyan_format", "formatOut", "bunyanFormat", "disableLogs", "bunyan"]
 }

package/dpr/utils/logger.ts

@@ -3,7 +3,7 @@ import bunyanFormat from 'bunyan-format'
 
 const formatOut = bunyanFormat({ outputMode: 'short', color: false })
 
-const disableLogs = process.env.SUPPRESS_LOGS
+const disableLogs = process.env['SUPPRESS_LOGS']
 export const logger = bunyan.createLogger({
   name: 'Digital Prison Reporting:',
   stream: formatOut,