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

package/dpr/utils/DateMapper/DateMapper.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/dpr/utils/DateMapper/DateMapper.ts"],
-  "sourcesContent": ["import dayjs, { Dayjs } from 'dayjs'\nimport customParseFormat from 'dayjs/plugin/customParseFormat'\nimport { DateType } from './types'\nimport logger from '../logger'\n\nclass DateMapper {\n  private isoDateRegEx = /^(\\d{4}[/-](0?[1-9]|1[012])[/-](0?[1-9]|[12][0-9]|3[01]))/\n\n  private localDateRegEx = /^(0?[1-9]|[12][0-9]|3[01])[/-](0?[1-9]|1[012])[/-]\\d{4}$/\n\n  private localDateShortYearRegEx = /^(0?[1-9]|[12][0-9]|3[01])[/-](0?[1-9]|1[012])[/-]\\d{2}$/\n\n  private localDateTimeRegEx = /^(0?[1-9]|[12][0-9]|3[01])[/-](0?[1-9]|1[012])[/-]\\d{4} [0-2]\\d:[0-5]\\d$/\n\n  private localDateTimeShortYearRegEx = /^(0?[1-9]|[12][0-9]|3[01])[/-](0?[1-9]|1[012])[/-]\\d{2} [0-2]\\d:[0-5]\\d$/\n\n  private isoFormat = 'YYYY-MM-DD'\n\n  private localDateFormatInput = 'D/M/YYYY'\n\n  private localDateFormatOutput = 'DD/MM/YYYY'\n\n  private localDateShortYearFormatInput = 'D/M/YY'\n\n  private localDateShortYearFormatOutput = 'DD/MM/YY'\n\n  private localDateTimeFormatInput = 'D/M/YYYY HH:mm'\n\n  private localDateTimeFormatOutput = 'DD/MM/YYYY HH:mm'\n\n  private localDateTimeShortYearFormatInput = 'D/M/YY HH:mm'\n\n  private localDateTimeShortYearFormatOutput = 'DD/MM/YY HH:mm'\n\n  private localDateFormatMonthYear = 'MMM YY'\n\n  private localDateFormatYear = 'YYYY'\n\n  getDateType(value: string): DateType {\n    if (value && value.match) {\n      if (value.match(this.isoDateRegEx)) {\n        return 'iso'\n      }\n\n      if (value.match(this.localDateRegEx)) {\n        return 'local-date'\n      }\n\n      if (value.match(this.localDateShortYearRegEx)) {\n        return 'local-date-short-year'\n      }\n\n      if (value.match(this.localDateTimeRegEx)) {\n        return 'local-datetime'\n      }\n\n      if (value.match(this.localDateTimeShortYearRegEx)) {\n        return 'local-datetime-short-year'\n      }\n    }\n\n    return 'none'\n  }\n\n  getDateWrapper(value: string): Dayjs | null {\n    dayjs.extend(customParseFormat)\n\n    switch (this.getDateType(value)) {\n      case 'iso':\n        return dayjs(value)\n      case 'local-date':\n        return dayjs(value, this.localDateFormatInput)\n      case 'local-date-short-year':\n        return dayjs(value, this.localDateShortYearFormatInput)\n      case 'local-datetime':\n        return dayjs(value, this.localDateTimeFormatInput)\n      case 'local-datetime-short-year':\n        return dayjs(value, this.localDateTimeShortYearFormatInput)\n      default:\n        return null\n    }\n  }\n\n  isDate(value: string): boolean {\n    return this.getDateType(value) !== 'none'\n  }\n\n  toDateString(value: string, type: DateType): string | null {\n    const dateWrapper = this.getDateWrapper(value)\n\n    if (dateWrapper) {\n      switch (type) {\n        case 'iso':\n          return dateWrapper.format(this.isoFormat)\n        case 'local-date':\n          return dateWrapper.format(this.localDateFormatOutput)\n        case 'local-date-short-year':\n          return dateWrapper.format(this.localDateShortYearFormatOutput)\n        case 'local-datetime':\n          return dateWrapper.format(this.localDateTimeFormatOutput)\n        case 'local-datetime-short-year':\n          return dateWrapper.format(this.localDateTimeShortYearFormatOutput)\n        default:\n          logger.warn(`Invalid date type: ${type}`)\n          return null\n      }\n    }\n\n    if (value) {\n      logger.warn(`Could not map non-date value : ${value}`)\n    }\n    return null\n  }\n}\n\nexport { DateMapper }\nexport default DateMapper\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,gBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAA6B,oBAC7BC,EAA8B,6CAE9BC,EAAmB,wBAEnB,MAAML,CAAW,CAAjB,cACE,KAAQ,aAAe,4DAEvB,KAAQ,eAAiB,2DAEzB,KAAQ,wBAA0B,2DAElC,KAAQ,mBAAqB,2EAE7B,KAAQ,4BAA8B,2EAEtC,KAAQ,UAAY,aAEpB,KAAQ,qBAAuB,WAE/B,KAAQ,sBAAwB,aAEhC,KAAQ,8BAAgC,SAExC,KAAQ,+BAAiC,WAEzC,KAAQ,yBAA2B,iBAEnC,KAAQ,0BAA4B,mBAEpC,KAAQ,kCAAoC,eAE5C,KAAQ,mCAAqC,iBAE7C,KAAQ,yBAA2B,SAEnC,KAAQ,oBAAsB,OAE9B,YAAYM,EAAyB,CACnC,GAAIA,GAASA,EAAM,MAAO,CACxB,GAAIA,EAAM,MAAM,KAAK,YAAY,EAC/B,MAAO,MAGT,GAAIA,EAAM,MAAM,KAAK,cAAc,EACjC,MAAO,aAGT,GAAIA,EAAM,MAAM,KAAK,uBAAuB,EAC1C,MAAO,wBAGT,GAAIA,EAAM,MAAM,KAAK,kBAAkB,EACrC,MAAO,iBAGT,GAAIA,EAAM,MAAM,KAAK,2BAA2B,EAC9C,MAAO,2BAEX,CAEA,MAAO,MACT,CAEA,eAAeA,EAA6B,CAG1C,OAFA,EAAAC,QAAM,OAAO,EAAAC,OAAiB,EAEtB,KAAK,YAAYF,CAAK,EAAG,CAC/B,IAAK,MACH,SAAO,EAAAC,SAAMD,CAAK,EACpB,IAAK,aACH,SAAO,EAAAC,SAAMD,EAAO,KAAK,oBAAoB,EAC/C,IAAK,wBACH,SAAO,EAAAC,SAAMD,EAAO,KAAK,6BAA6B,EACxD,IAAK,iBACH,SAAO,EAAAC,SAAMD,EAAO,KAAK,wBAAwB,EACnD,IAAK,4BACH,SAAO,EAAAC,SAAMD,EAAO,KAAK,iCAAiC,EAC5D,QACE,OAAO,IACX,CACF,CAEA,OAAOA,EAAwB,CAC7B,OAAO,KAAK,YAAYA,CAAK,IAAM,MACrC,CAEA,aAAaA,EAAeG,EAA+B,CACzD,MAAMC,EAAc,KAAK,eAAeJ,CAAK,EAE7C,GAAII,EACF,OAAQD,EAAM,CACZ,IAAK,MACH,OAAOC,EAAY,OAAO,KAAK,SAAS,EAC1C,IAAK,aACH,OAAOA,EAAY,OAAO,KAAK,qBAAqB,EACtD,IAAK,wBACH,OAAOA,EAAY,OAAO,KAAK,8BAA8B,EAC/D,IAAK,iBACH,OAAOA,EAAY,OAAO,KAAK,yBAAyB,EAC1D,IAAK,4BACH,OAAOA,EAAY,OAAO,KAAK,kCAAkC,EACnE,QACE,SAAAC,QAAO,KAAK,sBAAsBF,CAAI,EAAE,EACjC,IACX,CAGF,OAAIH,GACF,EAAAK,QAAO,KAAK,kCAAkCL,CAAK,EAAE,EAEhD,IACT,CACF,CAGA,IAAOL,EAAQD",
+  "sourcesContent": ["import dayjs, { Dayjs } from 'dayjs'\nimport customParseFormat from 'dayjs/plugin/customParseFormat'\nimport { DateType } from './types'\nimport logger from '../logger'\n\nclass DateMapper {\n  private isoDateRegEx = /^(\\d{4}[/-](0?[1-9]|1[012])[/-](0?[1-9]|[12][0-9]|3[01]))/\n\n  private localDateRegEx = /^(0?[1-9]|[12][0-9]|3[01])[/-](0?[1-9]|1[012])[/-]\\d{4}$/\n\n  private localDateShortYearRegEx = /^(0?[1-9]|[12][0-9]|3[01])[/-](0?[1-9]|1[012])[/-]\\d{2}$/\n\n  private localDateTimeRegEx = /^(0?[1-9]|[12][0-9]|3[01])[/-](0?[1-9]|1[012])[/-]\\d{4} [0-2]\\d:[0-5]\\d$/\n\n  private localDateTimeShortYearRegEx = /^(0?[1-9]|[12][0-9]|3[01])[/-](0?[1-9]|1[012])[/-]\\d{2} [0-2]\\d:[0-5]\\d$/\n\n  private isoFormat = 'YYYY-MM-DD'\n\n  private localDateFormatInput = 'D/M/YYYY'\n\n  private localDateFormatOutput = 'DD/MM/YYYY'\n\n  private localDateShortYearFormatInput = 'D/M/YY'\n\n  private localDateShortYearFormatOutput = 'DD/MM/YY'\n\n  private localDateTimeFormatInput = 'D/M/YYYY HH:mm'\n\n  private localDateTimeFormatOutput = 'DD/MM/YYYY HH:mm'\n\n  private localDateTimeShortYearFormatInput = 'D/M/YY HH:mm'\n\n  private localDateTimeShortYearFormatOutput = 'DD/MM/YY HH:mm'\n\n  getDateType(value: string | null): DateType {\n    if (value && value.match) {\n      if (value.match(this.isoDateRegEx)) {\n        return 'iso'\n      }\n\n      if (value.match(this.localDateRegEx)) {\n        return 'local-date'\n      }\n\n      if (value.match(this.localDateShortYearRegEx)) {\n        return 'local-date-short-year'\n      }\n\n      if (value.match(this.localDateTimeRegEx)) {\n        return 'local-datetime'\n      }\n\n      if (value.match(this.localDateTimeShortYearRegEx)) {\n        return 'local-datetime-short-year'\n      }\n    }\n\n    return 'none'\n  }\n\n  getDateWrapper(value: string | null): Dayjs | null {\n    dayjs.extend(customParseFormat)\n    if (!value) {\n      return null\n    }\n    switch (this.getDateType(value)) {\n      case 'iso':\n        return dayjs(value)\n      case 'local-date':\n        return dayjs(value, this.localDateFormatInput)\n      case 'local-date-short-year':\n        return dayjs(value, this.localDateShortYearFormatInput)\n      case 'local-datetime':\n        return dayjs(value, this.localDateTimeFormatInput)\n      case 'local-datetime-short-year':\n        return dayjs(value, this.localDateTimeShortYearFormatInput)\n      default:\n        return null\n    }\n  }\n\n  isDate(value: string | null): boolean {\n    return this.getDateType(value) !== 'none'\n  }\n\n  toDateString(value: string | null, type: DateType): string | undefined {\n    const dateWrapper = this.getDateWrapper(value)\n\n    if (dateWrapper) {\n      switch (type) {\n        case 'iso':\n          return dateWrapper.format(this.isoFormat)\n        case 'local-date':\n          return dateWrapper.format(this.localDateFormatOutput)\n        case 'local-date-short-year':\n          return dateWrapper.format(this.localDateShortYearFormatOutput)\n        case 'local-datetime':\n          return dateWrapper.format(this.localDateTimeFormatOutput)\n        case 'local-datetime-short-year':\n          return dateWrapper.format(this.localDateTimeShortYearFormatOutput)\n        default:\n          logger.warn(`Invalid date type: ${type}`)\n          return undefined\n      }\n    }\n\n    if (value) {\n      logger.warn(`Could not map non-date value : ${value}`)\n    }\n    return undefined\n  }\n}\n\nexport { DateMapper }\nexport default DateMapper\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,gBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAA6B,oBAC7BC,EAA8B,6CAE9BC,EAAmB,wBAEnB,MAAML,CAAW,CAAjB,cACE,KAAQ,aAAe,4DAEvB,KAAQ,eAAiB,2DAEzB,KAAQ,wBAA0B,2DAElC,KAAQ,mBAAqB,2EAE7B,KAAQ,4BAA8B,2EAEtC,KAAQ,UAAY,aAEpB,KAAQ,qBAAuB,WAE/B,KAAQ,sBAAwB,aAEhC,KAAQ,8BAAgC,SAExC,KAAQ,+BAAiC,WAEzC,KAAQ,yBAA2B,iBAEnC,KAAQ,0BAA4B,mBAEpC,KAAQ,kCAAoC,eAE5C,KAAQ,mCAAqC,iBAE7C,YAAYM,EAAgC,CAC1C,GAAIA,GAASA,EAAM,MAAO,CACxB,GAAIA,EAAM,MAAM,KAAK,YAAY,EAC/B,MAAO,MAGT,GAAIA,EAAM,MAAM,KAAK,cAAc,EACjC,MAAO,aAGT,GAAIA,EAAM,MAAM,KAAK,uBAAuB,EAC1C,MAAO,wBAGT,GAAIA,EAAM,MAAM,KAAK,kBAAkB,EACrC,MAAO,iBAGT,GAAIA,EAAM,MAAM,KAAK,2BAA2B,EAC9C,MAAO,2BAEX,CAEA,MAAO,MACT,CAEA,eAAeA,EAAoC,CAEjD,GADA,EAAAC,QAAM,OAAO,EAAAC,OAAiB,EAC1B,CAACF,EACH,OAAO,KAET,OAAQ,KAAK,YAAYA,CAAK,EAAG,CAC/B,IAAK,MACH,SAAO,EAAAC,SAAMD,CAAK,EACpB,IAAK,aACH,SAAO,EAAAC,SAAMD,EAAO,KAAK,oBAAoB,EAC/C,IAAK,wBACH,SAAO,EAAAC,SAAMD,EAAO,KAAK,6BAA6B,EACxD,IAAK,iBACH,SAAO,EAAAC,SAAMD,EAAO,KAAK,wBAAwB,EACnD,IAAK,4BACH,SAAO,EAAAC,SAAMD,EAAO,KAAK,iCAAiC,EAC5D,QACE,OAAO,IACX,CACF,CAEA,OAAOA,EAA+B,CACpC,OAAO,KAAK,YAAYA,CAAK,IAAM,MACrC,CAEA,aAAaA,EAAsBG,EAAoC,CACrE,MAAMC,EAAc,KAAK,eAAeJ,CAAK,EAE7C,GAAII,EACF,OAAQD,EAAM,CACZ,IAAK,MACH,OAAOC,EAAY,OAAO,KAAK,SAAS,EAC1C,IAAK,aACH,OAAOA,EAAY,OAAO,KAAK,qBAAqB,EACtD,IAAK,wBACH,OAAOA,EAAY,OAAO,KAAK,8BAA8B,EAC/D,IAAK,iBACH,OAAOA,EAAY,OAAO,KAAK,yBAAyB,EAC1D,IAAK,4BACH,OAAOA,EAAY,OAAO,KAAK,kCAAkC,EACnE,QACE,EAAAC,QAAO,KAAK,sBAAsBF,CAAI,EAAE,EACxC,MACJ,CAGEH,GACF,EAAAK,QAAO,KAAK,kCAAkCL,CAAK,EAAE,CAGzD,CACF,CAGA,IAAOL,EAAQD",
   "names": ["DateMapper_exports", "__export", "DateMapper", "DateMapper_default", "__toCommonJS", "import_dayjs", "import_customParseFormat", "import_logger", "value", "dayjs", "customParseFormat", "type", "dateWrapper", "logger"]
 }

package/dpr/utils/DateMapper/DateMapper.test.ts

@@ -1,3 +1,4 @@
+import { expect } from '@jest/globals'
 import DateMapper from './DateMapper'
 
 const dateMapper = new DateMapper()
@@ -40,27 +41,39 @@ describe('getDateType', () => {
 
 describe('getDateWrapper', () => {
   it('Iso Date', () => {
-    expect(dateMapper.getDateWrapper('2001-02-03').format('YYYY-MM-DD')).toEqual('2001-02-03')
+    const date = dateMapper.getDateWrapper('2001-02-03')
+    const formattedDate = date ? date.format('YYYY-MM-DD') : ''
+    expect(formattedDate).toEqual('2001-02-03')
   })
 
   it('Local Date', () => {
-    expect(dateMapper.getDateWrapper('01/02/2003').format('YYYY-MM-DD')).toEqual('2003-02-01')
+    const date = dateMapper.getDateWrapper('01/02/2003')
+    const formattedDate = date ? date.format('YYYY-MM-DD') : ''
+    expect(formattedDate).toEqual('2003-02-01')
   })
 
   it('Picker Local Date', () => {
-    expect(dateMapper.getDateWrapper('1/2/2003').format('YYYY-MM-DD')).toEqual('2003-02-01')
+    const date = dateMapper.getDateWrapper('1/2/2003')
+    const formattedDate = date ? date.format('YYYY-MM-DD') : ''
+    expect(formattedDate).toEqual('2003-02-01')
   })
 
   it('Local Date Short Year', () => {
-    expect(dateMapper.getDateWrapper('01/02/03').format('YYYY-MM-DD')).toEqual('2003-02-01')
+    const date = dateMapper.getDateWrapper('01/02/03')
+    const formattedDate = date ? date.format('YYYY-MM-DD') : ''
+    expect(formattedDate).toEqual('2003-02-01')
   })
 
   it('Local Date Time', () => {
-    expect(dateMapper.getDateWrapper('01/02/2003 04:05').format('YYYY-MM-DD')).toEqual('2003-02-01')
+    const date = dateMapper.getDateWrapper('01/02/2003 04:05')
+    const formattedDate = date ? date.format('YYYY-MM-DD') : ''
+    expect(formattedDate).toEqual('2003-02-01')
   })
 
   it('Local Date Time Short Year', () => {
-    expect(dateMapper.getDateWrapper('01/02/03 04:05').format('YYYY-MM-DD')).toEqual('2003-02-01')
+    const date = dateMapper.getDateWrapper('01/02/03 04:05')
+    const formattedDate = date ? date.format('YYYY-MM-DD') : ''
+    expect(formattedDate).toEqual('2003-02-01')
   })
 
   it('No value', () => {
@@ -124,14 +137,14 @@ describe('toDateString', () => {
   })
 
   it('No value', () => {
-    expect(dateMapper.toDateString(null, 'iso')).toBeNull()
+    expect(dateMapper.toDateString(null, 'iso')).toBeUndefined()
   })
 
   it('Non-date value', () => {
-    expect(dateMapper.toDateString('Not a date', 'iso')).toBeNull()
+    expect(dateMapper.toDateString('Not a date', 'iso')).toBeUndefined()
   })
 
   it('Invalid type', () => {
-    expect(dateMapper.toDateString('2001-02-03T04:05:06Z', 'none')).toBeNull()
+    expect(dateMapper.toDateString('2001-02-03T04:05:06Z', 'none')).toBeUndefined()
   })
 })

package/dpr/utils/DateMapper/DateMapper.ts

@@ -32,11 +32,7 @@ class DateMapper {
 
   private localDateTimeShortYearFormatOutput = 'DD/MM/YY HH:mm'
 
-  private localDateFormatMonthYear = 'MMM YY'
-
-  private localDateFormatYear = 'YYYY'
-
-  getDateType(value: string): DateType {
+  getDateType(value: string | null): DateType {
     if (value && value.match) {
       if (value.match(this.isoDateRegEx)) {
         return 'iso'
@@ -62,9 +58,11 @@ class DateMapper {
     return 'none'
   }
 
-  getDateWrapper(value: string): Dayjs | null {
+  getDateWrapper(value: string | null): Dayjs | null {
     dayjs.extend(customParseFormat)
-
+    if (!value) {
+      return null
+    }
     switch (this.getDateType(value)) {
       case 'iso':
         return dayjs(value)
@@ -81,11 +79,11 @@ class DateMapper {
     }
   }
 
-  isDate(value: string): boolean {
+  isDate(value: string | null): boolean {
     return this.getDateType(value) !== 'none'
   }
 
-  toDateString(value: string, type: DateType): string | null {
+  toDateString(value: string | null, type: DateType): string | undefined {
     const dateWrapper = this.getDateWrapper(value)
 
     if (dateWrapper) {
@@ -102,14 +100,14 @@ class DateMapper {
           return dateWrapper.format(this.localDateTimeShortYearFormatOutput)
         default:
           logger.warn(`Invalid date type: ${type}`)
-          return null
+          return undefined
       }
     }
 
     if (value) {
       logger.warn(`Could not map non-date value : ${value}`)
     }
-    return null
+    return undefined
   }
 }
 

package/dpr/utils/DateMapper/types.d.js

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

package/dpr/utils/DateMapper/types.d.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../src/dpr/utils/DateMapper/types.d.ts"],
   "sourcesContent": ["export type DateType =\n  | 'iso'\n  | 'local-date'\n  | 'local-date-short-year'\n  | 'local-datetime'\n  | 'local-datetime-short-year'\n  | 'none'\n"],
-  "mappings": "kWAAA,IAAAA,EAAA,kBAAAC,EAAAD",
+  "mappings": "+WAAA,IAAAA,EAAA,kBAAAC,EAAAD",
   "names": ["types_d_exports", "__toCommonJS"]
 }

package/dpr/utils/ErrorHandler.js

@@ -0,0 +1,2 @@
+"use strict";var h=Object.create;var o=Object.defineProperty;var p=Object.getOwnPropertyDescriptor;var u=Object.getOwnPropertyNames;var d=Object.getPrototypeOf,f=Object.prototype.hasOwnProperty;var c=(s,e)=>{for(var r in e)o(s,r,{get:e[r],enumerable:!0})},g=(s,e,r,i)=>{if(e&&typeof e=="object"||typeof e=="function")for(let t of u(e))!f.call(s,t)&&t!==r&&o(s,t,{get:()=>e[t],enumerable:!(i=p(e,t))||i.enumerable});return s};var m=(s,e,r)=>(r=s!=null?h(d(s)):{},g(e||!s||!s.__esModule?o(r,"default",{value:s,enumerable:!0}):r,s)),l=s=>g(o({},"__esModule",{value:!0}),s);var E={};c(E,{ErrorHandler:()=>n,default:()=>M});module.exports=l(E);var a=m(require("./logger"));class n{constructor(e){this.formatError=()=>this.handleError();this.handleError=()=>{if(typeof this.error=="string")this.developerMessage=this.error;else if(this.error.data){const r=this.error.data;this.developerMessage=r.developerMessage,this.userMessage=r.userMessage,this.moreInfo=r.moreInfo,this.status=r.status}else if(Object.prototype.hasOwnProperty.call(this.error,"message")){const r=this.error;this.userMessage=r.message,this.stack=r.stack,this.status=500}else if(Object.prototype.hasOwnProperty.call(this.error,"developerMessage")){const r=this.error;this.developerMessage=r.developerMessage,this.userMessage=r.userMessage,this.moreInfo=r.moreInfo,this.status=r.status}const e={...this.developerMessage&&{developerMessage:this.developerMessage},...this.userMessage&&{userMessage:this.userMessage},...this.moreInfo&&{moreInfo:this.moreInfo},...this.stack&&{stack:this.stack},...this.status&&{status:this.status}};return a.default.error(JSON.stringify(e,null,2)),e};this.error=e,a.default.error(`Error: ${JSON.stringify(e)}`)}}var M=n;0&&(module.exports={ErrorHandler});
+//# sourceMappingURL=ErrorHandler.js.map

package/dpr/utils/ErrorHandler.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/dpr/utils/ErrorHandler.ts"],
+  "sourcesContent": ["import { components } from '../types/api'\nimport logger from './logger'\n\ninterface DprErrorMessage {\n  userMessage?: string\n  developerMessage?: string\n  stack?: string\n  moreInfo?: string\n  status?: string | number\n}\n\ninterface DprErrorData {\n  data: components['schemas']['ErrorResponse']\n}\n\nclass ErrorHandler {\n  error: Error | components['schemas']['ErrorResponse'] | string | undefined | unknown | DprErrorData\n\n  developerMessage?: string | undefined\n\n  userMessage?: string | undefined\n\n  moreInfo?: string | undefined\n\n  stack?: string | undefined\n\n  status?: number | string | undefined\n\n  constructor(error: Error | components['schemas']['ErrorResponse'] | string | undefined | unknown) {\n    this.error = error\n    logger.error(`Error: ${JSON.stringify(error)}`)\n  }\n\n  formatError = (): DprErrorMessage => {\n    return this.handleError()\n  }\n\n  private handleError = (): DprErrorMessage => {\n    // status: FAILED\n    if (typeof this.error === 'string') {\n      this.developerMessage = this.error\n    }\n\n    // Error response\n    else if ((<DprErrorData>this.error).data) {\n      const error = (<DprErrorData>this.error).data\n      this.developerMessage = error.developerMessage\n      this.userMessage = error.userMessage\n      this.moreInfo = error.moreInfo\n      this.status = error.status\n    }\n\n    // client side error\n    else if (Object.prototype.hasOwnProperty.call(this.error, 'message')) {\n      const error = <Error>this.error\n      this.userMessage = error.message\n      this.stack = error.stack\n      this.status = 500\n    }\n\n    // Server response error\n    else if (Object.prototype.hasOwnProperty.call(this.error, 'developerMessage')) {\n      const error = <components['schemas']['ErrorResponse']>this.error\n      this.developerMessage = error.developerMessage\n      this.userMessage = error.userMessage\n      this.moreInfo = error.moreInfo\n      this.status = error.status\n    }\n\n    const formattedError = {\n      ...(this.developerMessage && { developerMessage: this.developerMessage }),\n      ...(this.userMessage && { userMessage: this.userMessage }),\n      ...(this.moreInfo && { moreInfo: this.moreInfo }),\n      ...(this.stack && { stack: this.stack }),\n      ...(this.status && { status: this.status }),\n    }\n\n    logger.error(JSON.stringify(formattedError, null, 2))\n\n    return formattedError\n  }\n}\n\nexport { ErrorHandler }\nexport default ErrorHandler\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,kBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAmB,uBAcnB,MAAMH,CAAa,CAajB,YAAYI,EAAsF,CAKlG,iBAAc,IACL,KAAK,YAAY,EAG1B,KAAQ,YAAc,IAAuB,CAE3C,GAAI,OAAO,KAAK,OAAU,SACxB,KAAK,iBAAmB,KAAK,cAIP,KAAK,MAAO,KAAM,CACxC,MAAMA,EAAuB,KAAK,MAAO,KACzC,KAAK,iBAAmBA,EAAM,iBAC9B,KAAK,YAAcA,EAAM,YACzB,KAAK,SAAWA,EAAM,SACtB,KAAK,OAASA,EAAM,MACtB,SAGS,OAAO,UAAU,eAAe,KAAK,KAAK,MAAO,SAAS,EAAG,CACpE,MAAMA,EAAe,KAAK,MAC1B,KAAK,YAAcA,EAAM,QACzB,KAAK,MAAQA,EAAM,MACnB,KAAK,OAAS,GAChB,SAGS,OAAO,UAAU,eAAe,KAAK,KAAK,MAAO,kBAAkB,EAAG,CAC7E,MAAMA,EAAgD,KAAK,MAC3D,KAAK,iBAAmBA,EAAM,iBAC9B,KAAK,YAAcA,EAAM,YACzB,KAAK,SAAWA,EAAM,SACtB,KAAK,OAASA,EAAM,MACtB,CAEA,MAAMC,EAAiB,CACrB,GAAI,KAAK,kBAAoB,CAAE,iBAAkB,KAAK,gBAAiB,EACvE,GAAI,KAAK,aAAe,CAAE,YAAa,KAAK,WAAY,EACxD,GAAI,KAAK,UAAY,CAAE,SAAU,KAAK,QAAS,EAC/C,GAAI,KAAK,OAAS,CAAE,MAAO,KAAK,KAAM,EACtC,GAAI,KAAK,QAAU,CAAE,OAAQ,KAAK,MAAO,CAC3C,EAEA,SAAAC,QAAO,MAAM,KAAK,UAAUD,EAAgB,KAAM,CAAC,CAAC,EAE7CA,CACT,EAnDE,KAAK,MAAQD,EACb,EAAAE,QAAO,MAAM,UAAU,KAAK,UAAUF,CAAK,CAAC,EAAE,CAChD,CAkDF,CAGA,IAAOH,EAAQD",
+  "names": ["ErrorHandler_exports", "__export", "ErrorHandler", "ErrorHandler_default", "__toCommonJS", "import_logger", "error", "formattedError", "logger"]
+}

package/dpr/utils/ErrorHandler.ts

@@ -0,0 +1,85 @@
+import { components } from '../types/api'
+import logger from './logger'
+
+interface DprErrorMessage {
+  userMessage?: string
+  developerMessage?: string
+  stack?: string
+  moreInfo?: string
+  status?: string | number
+}
+
+interface DprErrorData {
+  data: components['schemas']['ErrorResponse']
+}
+
+class ErrorHandler {
+  error: Error | components['schemas']['ErrorResponse'] | string | undefined | unknown | DprErrorData
+
+  developerMessage?: string | undefined
+
+  userMessage?: string | undefined
+
+  moreInfo?: string | undefined
+
+  stack?: string | undefined
+
+  status?: number | string | undefined
+
+  constructor(error: Error | components['schemas']['ErrorResponse'] | string | undefined | unknown) {
+    this.error = error
+    logger.error(`Error: ${JSON.stringify(error)}`)
+  }
+
+  formatError = (): DprErrorMessage => {
+    return this.handleError()
+  }
+
+  private handleError = (): DprErrorMessage => {
+    // status: FAILED
+    if (typeof this.error === 'string') {
+      this.developerMessage = this.error
+    }
+
+    // Error response
+    else if ((<DprErrorData>this.error).data) {
+      const error = (<DprErrorData>this.error).data
+      this.developerMessage = error.developerMessage
+      this.userMessage = error.userMessage
+      this.moreInfo = error.moreInfo
+      this.status = error.status
+    }
+
+    // client side error
+    else if (Object.prototype.hasOwnProperty.call(this.error, 'message')) {
+      const error = <Error>this.error
+      this.userMessage = error.message
+      this.stack = error.stack
+      this.status = 500
+    }
+
+    // Server response error
+    else if (Object.prototype.hasOwnProperty.call(this.error, 'developerMessage')) {
+      const error = <components['schemas']['ErrorResponse']>this.error
+      this.developerMessage = error.developerMessage
+      this.userMessage = error.userMessage
+      this.moreInfo = error.moreInfo
+      this.status = error.status
+    }
+
+    const formattedError = {
+      ...(this.developerMessage && { developerMessage: this.developerMessage }),
+      ...(this.userMessage && { userMessage: this.userMessage }),
+      ...(this.moreInfo && { moreInfo: this.moreInfo }),
+      ...(this.stack && { stack: this.stack }),
+      ...(this.status && { status: this.status }),
+    }
+
+    logger.error(JSON.stringify(formattedError, null, 2))
+
+    return formattedError
+  }
+}
+
+export { ErrorHandler }
+export default ErrorHandler

package/dpr/utils/ParentChildDataTableBuilder/ParentChildDataTableBuilder.js

@@ -1,2 +1,2 @@
-var P=Object.create;var u=Object.defineProperty;var v=Object.getOwnPropertyDescriptor;var A=Object.getOwnPropertyNames;var w=Object.getPrototypeOf,N=Object.prototype.hasOwnProperty;var F=(n,c)=>{for(var t in c)u(n,t,{get:c[t],enumerable:!0})},f=(n,c,t,r)=>{if(c&&typeof c=="object"||typeof c=="function")for(let e of A(c))!N.call(n,e)&&e!==t&&u(n,e,{get:()=>c[e],enumerable:!(r=v(c,e))||r.enumerable});return n};var S=(n,c,t)=>(t=n!=null?P(w(n)):{},f(c||!n||!n.__esModule?u(t,"default",{value:n,enumerable:!0}):t,n)),B=n=>f(u({},"__esModule",{value:!0}),n);var J={};F(J,{ParentChildDataTableBuilder:()=>C,default:()=>H});module.exports=B(J);var g=S(require("../DataTableBuilder/DataTableBuilder")),b=require("../arrayUtils"),T=S(require("../SectionedDataTableBuilder/SectionedDataTableBuilder"));class C extends T.default{constructor(t){const{specification:r}=t,{sections:e,template:i}=r;super(r);this.childData=[];this.sections=e,this.template=i,this.variant=t,this.childVariants=this.variant.childVariants||[]}createParentChildTable(t,r){let e={};const i=this.mapNamesToFields(this.childVariants.flatMap(a=>a.joinFields).reduce(b.distinct,[])),s=this.calculateParentChildKeys(t,i);s.forEach(a=>{e[a.sortKey]={parent:[]}}),e=this.splitParentDataIntoSections(e,t,i),e=this.splitChildDataIntoSections(s,e);const l=this.createChildDataTableBuilders();return s.flatMap(a=>{const d=e[a.sortKey]||{};let p=[];return d&&(p=d.parent?d.parent:[]),[r].concat(p.map(h=>this.mapRow(h,"dpr-parent-cell"))).concat(this.childVariants.filter(h=>d&&d[h.id]).map(h=>{const D=l[h.id],m=d[h.id],y=D&&m?D.buildTable(m):void 0,K=y?this.convertDataTableToHtml(y):"";return[{classes:"dpr-child-report-cell",format:"string",html:`<div class='dpr-child-report'><h2 class="govuk-heading-s">${h.name}</h2><div class="dpr-child-report_table">${K}</div></div>`,colspan:this.columns.length}]}))})}createParentChildSectionRows(t,r){const i=this.mapSections(t).sectionedData,s=[];return Object.keys(i).forEach(o=>{const a=i[o];s.push({sectionDescription:o,...this.getSectionCount(i,o),rows:this.createParentChildTable(a,r)})}),s.flatMap((o,a)=>[...this.createSectionHeader(o.sectionDescription,a,o.count,o.countDescription),...o.rows])}mapParentChildData(t,r){return this.sections?.length?this.createParentChildSectionRows(t,r):this.createParentChildTable(t,r)}createChildDataTableBuilders(){return this.childVariants.reduce((r,e)=>{const{specification:i}=e,s=i?i.fields:[],l=s.filter(a=>a.visible||a.mandatory).map(a=>a.name),o=new g.default(s).withNoHeaderOptions(l).withSortedData();return{...r,[e.id]:o}},{})}calculateParentChildKeys(t,r){return t.map(e=>({sortKey:this.getSortKey(e,r),childSortKeys:this.childVariants.reduce((i,s)=>({...i,[s.id]:this.getSortKey(e,this.mapNamesToFields(s.joinFields))}),{})})).reduce((e,i)=>e.find(s=>s.sortKey===i.sortKey)?e:e.concat(i),[])}splitParentDataIntoSections(t,r,e){return r.reduce((i,s)=>{const l=this.getSortKey(s,e),o=i[l]?i[l].parent:[];return{...i,...o&&{[l]:{parent:o.concat(s)}}}},t)}splitChildDataIntoSections(t,r){const e={...r};return this.childVariants.forEach(i=>{const s=this.mapNamesToFields(i.joinFields),l=this.childData.find(a=>a.id===i.id);(l?l.data:[]).filter(a=>{const d=this.getSortKey(a,s);return t.find(p=>p.childSortKeys[i.id]===d)}).forEach(a=>{const d=this.getSortKey(a,s),p=t.find(m=>m.childSortKeys[i.id]===d),h=p?p.sortKey:"",D=e[h];if(D){const m=D[i.id]||[];D[i.id]=m.concat(a)}})}),e}withChildData(t){return this.childData=t,this}buildTable(t){return{head:null,rows:this.mapParentChildData(t,this.mapHeader(!0,"govuk-table__header")),rowCount:t.length,colCount:this.columns.length}}}var H=C;0&&(module.exports={ParentChildDataTableBuilder});
+"use strict";var P=Object.create;var u=Object.defineProperty;var v=Object.getOwnPropertyDescriptor;var A=Object.getOwnPropertyNames;var w=Object.getPrototypeOf,N=Object.prototype.hasOwnProperty;var F=(n,c)=>{for(var t in c)u(n,t,{get:c[t],enumerable:!0})},f=(n,c,t,r)=>{if(c&&typeof c=="object"||typeof c=="function")for(let e of A(c))!N.call(n,e)&&e!==t&&u(n,e,{get:()=>c[e],enumerable:!(r=v(c,e))||r.enumerable});return n};var S=(n,c,t)=>(t=n!=null?P(w(n)):{},f(c||!n||!n.__esModule?u(t,"default",{value:n,enumerable:!0}):t,n)),B=n=>f(u({},"__esModule",{value:!0}),n);var J={};F(J,{ParentChildDataTableBuilder:()=>C,default:()=>H});module.exports=B(J);var g=S(require("../DataTableBuilder/DataTableBuilder")),b=require("../arrayUtils"),T=S(require("../SectionedDataTableBuilder/SectionedDataTableBuilder"));class C extends T.default{constructor(t){const{specification:r}=t,{sections:e,template:i}=r;super(r);this.childData=[];this.sections=e,this.template=i,this.variant=t,this.childVariants=this.variant.childVariants||[]}createParentChildTable(t,r){let e={};const i=this.mapNamesToFields(this.childVariants.flatMap(a=>a.joinFields).reduce(b.distinct,[])),s=this.calculateParentChildKeys(t,i);s.forEach(a=>{e[a.sortKey]={parent:[]}}),e=this.splitParentDataIntoSections(e,t,i),e=this.splitChildDataIntoSections(s,e);const l=this.createChildDataTableBuilders();return s.flatMap(a=>{const d=e[a.sortKey]||{};let p=[];return d&&(p=d.parent?d.parent:[]),[r].concat(p.map(h=>this.mapRow(h,"dpr-parent-cell"))).concat(this.childVariants.filter(h=>d&&d[h.id]).map(h=>{const D=l[h.id],m=d[h.id],y=D&&m?D.buildTable(m):void 0,K=y?this.convertDataTableToHtml(y):"";return[{classes:"dpr-child-report-cell",format:"string",html:`<div class='dpr-child-report'><h2 class="govuk-heading-s">${h.name}</h2><div class="dpr-child-report_table">${K}</div></div>`,colspan:this.columns.length}]}))})}createParentChildSectionRows(t,r){const i=this.mapSections(t).sectionedData,s=[];return Object.keys(i).forEach(o=>{const a=i[o];s.push({sectionDescription:o,...this.getSectionCount(i,o),rows:this.createParentChildTable(a,r)})}),s.flatMap((o,a)=>[...this.createSectionHeader(o.sectionDescription,a,o.count,o.countDescription),...o.rows])}mapParentChildData(t,r){return this.sections?.length?this.createParentChildSectionRows(t,r):this.createParentChildTable(t,r)}createChildDataTableBuilders(){return this.childVariants.reduce((r,e)=>{const{specification:i}=e,s=i?i.fields:[],l=s.filter(a=>a.visible||a.mandatory).map(a=>a.name),o=new g.default(s).withNoHeaderOptions(l).withSortedData();return{...r,[e.id]:o}},{})}calculateParentChildKeys(t,r){return t.map(e=>({sortKey:this.getSortKey(e,r),childSortKeys:this.childVariants.reduce((i,s)=>({...i,[s.id]:this.getSortKey(e,this.mapNamesToFields(s.joinFields))}),{})})).reduce((e,i)=>e.find(s=>s.sortKey===i.sortKey)?e:e.concat(i),[])}splitParentDataIntoSections(t,r,e){return r.reduce((i,s)=>{const l=this.getSortKey(s,e),o=i[l]?i[l].parent:[];return{...i,...o&&{[l]:{parent:o.concat(s)}}}},t)}splitChildDataIntoSections(t,r){const e={...r};return this.childVariants.forEach(i=>{const s=this.mapNamesToFields(i.joinFields),l=this.childData.find(a=>a.id===i.id);(l?l.data:[]).filter(a=>{const d=this.getSortKey(a,s);return t.find(p=>p.childSortKeys[i.id]===d)}).forEach(a=>{const d=this.getSortKey(a,s),p=t.find(m=>m.childSortKeys[i.id]===d),h=p?p.sortKey:"",D=e[h];if(D){const m=D[i.id]||[];D[i.id]=m.concat(a)}})}),e}withChildData(t){return this.childData=t,this}buildTable(t){return{head:null,rows:this.mapParentChildData(t,this.mapHeader(!0,"govuk-table__header")),rowCount:t.length,colCount:this.columns.length}}}var H=C;0&&(module.exports={ParentChildDataTableBuilder});
 //# sourceMappingURL=ParentChildDataTableBuilder.js.map

package/dpr/utils/ParentChildDataTableBuilder/ParentChildDataTableBuilder.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/dpr/utils/ParentChildDataTableBuilder/ParentChildDataTableBuilder.ts"],
-  "sourcesContent": ["import Dict = NodeJS.Dict\nimport { components } from '../../types/api'\nimport { Cell, DataTable } from '../DataTableBuilder/types'\nimport DataTableBuilder from '../DataTableBuilder/DataTableBuilder'\nimport { distinct } from '../arrayUtils'\nimport { ChildData, ParentChildSortKey } from './types'\nimport SectionedDataTableBuilder from '../SectionedDataTableBuilder/SectionedDataTableBuilder'\n\nclass ParentChildDataTableBuilder extends SectionedDataTableBuilder {\n  variant: components['schemas']['VariantDefinition']\n\n  childVariants: components['schemas']['ChildVariantDefinition'][]\n\n  childData: Array<ChildData> = []\n\n  constructor(variant: components['schemas']['VariantDefinition']) {\n    const { specification } = variant\n    const { sections, template } = <components['schemas']['Specification']>specification\n    super(<components['schemas']['Specification']>specification)\n\n    this.sections = sections\n    this.template = template\n    this.variant = variant\n    this.childVariants = this.variant.childVariants || []\n  }\n\n  private createParentChildTable(parentData: Array<Dict<string>>, header: Cell[]) {\n    let sectionedParentChildData: Dict<Dict<Array<Dict<string>>>> = {}\n    const joinFields = this.mapNamesToFields(this.childVariants.flatMap((c) => c.joinFields).reduce(distinct, []))\n    // Get the parent-child joins definition data\n\n    // Create the section keys and\n    const parentChildKeys = this.calculateParentChildKeys(parentData, joinFields)\n    parentChildKeys.forEach((parentKey) => {\n      sectionedParentChildData[parentKey.sortKey] = {\n        parent: [],\n      }\n    })\n\n    sectionedParentChildData = this.splitParentDataIntoSections(sectionedParentChildData, parentData, joinFields)\n    sectionedParentChildData = this.splitChildDataIntoSections(parentChildKeys, sectionedParentChildData)\n\n    const childDataTableBuilders = this.createChildDataTableBuilders()\n\n    const parentChildTable = parentChildKeys.flatMap((key) => {\n      const sectionData = sectionedParentChildData[key.sortKey] || {}\n\n      let parentSectionData: Dict<string>[] = []\n      if (sectionData) {\n        parentSectionData = sectionData.parent ? sectionData.parent : []\n      }\n\n      return [header].concat(parentSectionData.map((r) => this.mapRow(r, 'dpr-parent-cell'))).concat(\n        this.childVariants\n          .filter((childVariant) => sectionData && sectionData[childVariant.id])\n          .map((childVariant) => {\n            const builder = childDataTableBuilders[childVariant.id]\n            const section = sectionData[childVariant.id]\n            const dataTable = builder && section ? builder.buildTable(section) : undefined\n            const dataTableHtml = dataTable ? this.convertDataTableToHtml(dataTable) : ''\n\n            return [\n              {\n                classes: 'dpr-child-report-cell',\n                format: 'string',\n                html: `<div class='dpr-child-report'><h2 class=\"govuk-heading-s\">${childVariant.name}</h2><div class=\"dpr-child-report_table\">${dataTableHtml}</div></div>`,\n                colspan: this.columns.length,\n              },\n            ]\n          }),\n      )\n    })\n\n    return parentChildTable\n  }\n\n  private createParentChildSectionRows(parentData: Array<Dict<string>>, header: Cell[]) {\n    const sectionsDetails = this.mapSections(parentData)\n    const sectionedData = sectionsDetails.sectionedData as Dict<Array<Dict<string>>>\n    const sectionedParentChildSectionedRows: {\n      sectionDescription: string\n      rows: Cell[][]\n      count: number\n      countDescription: string\n    }[] = []\n\n    Object.keys(sectionedData).forEach((sectionDescription) => {\n      const data = sectionedData[sectionDescription] as Array<Dict<string>>\n\n      sectionedParentChildSectionedRows.push({\n        sectionDescription,\n        ...this.getSectionCount(sectionedData, sectionDescription),\n        rows: this.createParentChildTable(data, header),\n      })\n    })\n\n    const rows = sectionedParentChildSectionedRows.flatMap((section, index) => {\n      const sectionHeader = this.createSectionHeader(\n        section.sectionDescription,\n        index,\n        section.count,\n        section.countDescription,\n      )\n      return [...sectionHeader, ...section.rows]\n    })\n\n    return rows\n  }\n\n  private mapParentChildData(parentData: Array<Dict<string>>, header: Cell[]): Cell[][] {\n    if (this.sections?.length) {\n      return this.createParentChildSectionRows(parentData, header)\n    }\n    return this.createParentChildTable(parentData, header)\n  }\n\n  private createChildDataTableBuilders() {\n    const childDataTables: Dict<DataTableBuilder> = this.childVariants.reduce((previousValue, childVariant) => {\n      const { specification } = childVariant\n      const fields = specification ? specification.fields : []\n      const fieldNamesToDisplay = fields.filter((f) => f.visible || f.mandatory).map((f) => f.name)\n\n      const dataTableBuilder = new DataTableBuilder(fields).withNoHeaderOptions(fieldNamesToDisplay).withSortedData()\n\n      return {\n        ...previousValue,\n        [childVariant.id]: dataTableBuilder,\n      }\n    }, {})\n    return childDataTables\n  }\n\n  private calculateParentChildKeys(\n    parentData: Array<NodeJS.Dict<string>>,\n    joinFields: components['schemas']['FieldDefinition'][],\n  ) {\n    return parentData\n      .map(\n        (rowData): ParentChildSortKey => ({\n          sortKey: this.getSortKey(rowData, joinFields),\n          childSortKeys: this.childVariants.reduce((previousValue, childVariant) => {\n            return {\n              ...previousValue,\n              [childVariant.id]: this.getSortKey(rowData, this.mapNamesToFields(childVariant.joinFields)),\n            }\n          }, {}),\n        }),\n      )\n      .reduce((previousValue: ParentChildSortKey[], sortKey: ParentChildSortKey) => {\n        if (previousValue.find((v) => v.sortKey === sortKey.sortKey)) {\n          return previousValue\n        }\n        return previousValue.concat(sortKey)\n      }, [])\n  }\n\n  private splitParentDataIntoSections(\n    sectionedParentChildData: NodeJS.Dict<NodeJS.Dict<Array<NodeJS.Dict<string>>>>,\n    parentData: Array<NodeJS.Dict<string>>,\n    joinFields: components['schemas']['FieldDefinition'][],\n  ) {\n    return parentData.reduce((previousValue, rowData) => {\n      const parentKey: string = this.getSortKey(rowData, joinFields)\n      const previousParentValue = previousValue[parentKey] ? previousValue[parentKey].parent : []\n\n      return {\n        ...previousValue,\n        ...(previousParentValue && {\n          [parentKey]: {\n            parent: previousParentValue.concat(rowData),\n          },\n        }),\n      }\n    }, sectionedParentChildData)\n  }\n\n  private splitChildDataIntoSections(\n    parentKeys: ParentChildSortKey[],\n    sectionedParentChildData: Dict<Dict<Array<Dict<string>>>>,\n  ): Dict<Dict<Array<Dict<string>>>> {\n    const sectionedParentChildDataWithChildren = { ...sectionedParentChildData }\n\n    this.childVariants.forEach((childVariant) => {\n      const childFields = this.mapNamesToFields(childVariant.joinFields)\n      const matchingChildData = this.childData.find((d) => d.id === childVariant.id)\n      const data = matchingChildData ? matchingChildData.data : []\n\n      data\n        .filter((rowData) => {\n          const sortKey = this.getSortKey(rowData, childFields)\n          return parentKeys.find((p) => p.childSortKeys[childVariant.id] === sortKey)\n        })\n        .forEach((rowData) => {\n          const sortKey = this.getSortKey(rowData, childFields)\n          const parent = parentKeys.find((p) => p.childSortKeys[childVariant.id] === sortKey)\n          const parentSortKey = parent ? parent.sortKey : ''\n          const parentSection = sectionedParentChildDataWithChildren[parentSortKey]\n          if (parentSection) {\n            const existingChildData = parentSection[childVariant.id] || []\n            parentSection[childVariant.id] = existingChildData.concat(rowData)\n          }\n        })\n    })\n\n    return sectionedParentChildDataWithChildren\n  }\n\n  withChildData(childData: Array<ChildData>) {\n    this.childData = childData\n    return this\n  }\n\n  buildTable(data: Array<Dict<string>>): DataTable {\n    return {\n      head: null,\n      rows: this.mapParentChildData(data, this.mapHeader(true, 'govuk-table__header')),\n      rowCount: data.length,\n      colCount: this.columns.length,\n    }\n  }\n}\n\nexport { ParentChildDataTableBuilder }\nexport default ParentChildDataTableBuilder\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,iCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAGA,IAAAK,EAA6B,mDAC7BC,EAAyB,yBAEzBC,EAAsC,qEAEtC,MAAML,UAAoC,EAAAM,OAA0B,CAOlE,YAAYC,EAAqD,CAC/D,KAAM,CAAE,cAAAC,CAAc,EAAID,EACpB,CAAE,SAAAE,EAAU,SAAAC,CAAS,EAA4CF,EACvE,MAA8CA,CAAa,EAL7D,eAA8B,CAAC,EAO7B,KAAK,SAAWC,EAChB,KAAK,SAAWC,EAChB,KAAK,QAAUH,EACf,KAAK,cAAgB,KAAK,QAAQ,eAAiB,CAAC,CACtD,CAEQ,uBAAuBI,EAAiCC,EAAgB,CAC9E,IAAIC,EAA4D,CAAC,EACjE,MAAMC,EAAa,KAAK,iBAAiB,KAAK,cAAc,QAASC,GAAMA,EAAE,UAAU,EAAE,OAAO,WAAU,CAAC,CAAC,CAAC,EAIvGC,EAAkB,KAAK,yBAAyBL,EAAYG,CAAU,EAC5EE,EAAgB,QAASC,GAAc,CACrCJ,EAAyBI,EAAU,OAAO,EAAI,CAC5C,OAAQ,CAAC,CACX,CACF,CAAC,EAEDJ,EAA2B,KAAK,4BAA4BA,EAA0BF,EAAYG,CAAU,EAC5GD,EAA2B,KAAK,2BAA2BG,EAAiBH,CAAwB,EAEpG,MAAMK,EAAyB,KAAK,6BAA6B,EA+BjE,OA7ByBF,EAAgB,QAASG,GAAQ,CACxD,MAAMC,EAAcP,EAAyBM,EAAI,OAAO,GAAK,CAAC,EAE9D,IAAIE,EAAoC,CAAC,EACzC,OAAID,IACFC,EAAoBD,EAAY,OAASA,EAAY,OAAS,CAAC,GAG1D,CAACR,CAAM,EAAE,OAAOS,EAAkB,IAAKC,GAAM,KAAK,OAAOA,EAAG,iBAAiB,CAAC,CAAC,EAAE,OACtF,KAAK,cACF,OAAQC,GAAiBH,GAAeA,EAAYG,EAAa,EAAE,CAAC,EACpE,IAAKA,GAAiB,CACrB,MAAMC,EAAUN,EAAuBK,EAAa,EAAE,EAChDE,EAAUL,EAAYG,EAAa,EAAE,EACrCG,EAAYF,GAAWC,EAAUD,EAAQ,WAAWC,CAAO,EAAI,OAC/DE,EAAgBD,EAAY,KAAK,uBAAuBA,CAAS,EAAI,GAE3E,MAAO,CACL,CACE,QAAS,wBACT,OAAQ,SACR,KAAM,6DAA6DH,EAAa,IAAI,4CAA4CI,CAAa,eAC7I,QAAS,KAAK,QAAQ,MACxB,CACF,CACF,CAAC,CACL,CACF,CAAC,CAGH,CAEQ,6BAA6BhB,EAAiCC,EAAgB,CAEpF,MAAMgB,EADkB,KAAK,YAAYjB,CAAU,EACb,cAChCkB,EAKA,CAAC,EAEP,cAAO,KAAKD,CAAa,EAAE,QAASE,GAAuB,CACzD,MAAMC,EAAOH,EAAcE,CAAkB,EAE7CD,EAAkC,KAAK,CACrC,mBAAAC,EACA,GAAG,KAAK,gBAAgBF,EAAeE,CAAkB,EACzD,KAAM,KAAK,uBAAuBC,EAAMnB,CAAM,CAChD,CAAC,CACH,CAAC,EAEYiB,EAAkC,QAAQ,CAACJ,EAASO,IAOxD,CAAC,GANc,KAAK,oBACzBP,EAAQ,mBACRO,EACAP,EAAQ,MACRA,EAAQ,gBACV,EAC0B,GAAGA,EAAQ,IAAI,CAC1C,CAGH,CAEQ,mBAAmBd,EAAiCC,EAA0B,CACpF,OAAI,KAAK,UAAU,OACV,KAAK,6BAA6BD,EAAYC,CAAM,EAEtD,KAAK,uBAAuBD,EAAYC,CAAM,CACvD,CAEQ,8BAA+B,CAarC,OAZgD,KAAK,cAAc,OAAO,CAACqB,EAAeV,IAAiB,CACzG,KAAM,CAAE,cAAAf,CAAc,EAAIe,EACpBW,EAAS1B,EAAgBA,EAAc,OAAS,CAAC,EACjD2B,EAAsBD,EAAO,OAAQE,GAAMA,EAAE,SAAWA,EAAE,SAAS,EAAE,IAAKA,GAAMA,EAAE,IAAI,EAEtFC,EAAmB,IAAI,EAAAC,QAAiBJ,CAAM,EAAE,oBAAoBC,CAAmB,EAAE,eAAe,EAE9G,MAAO,CACL,GAAGF,EACH,CAACV,EAAa,EAAE,EAAGc,CACrB,CACF,EAAG,CAAC,CAAC,CAEP,CAEQ,yBACN1B,EACAG,EACA,CACA,OAAOH,EACJ,IACE4B,IAAiC,CAChC,QAAS,KAAK,WAAWA,EAASzB,CAAU,EAC5C,cAAe,KAAK,cAAc,OAAO,CAACmB,EAAeV,KAChD,CACL,GAAGU,EACH,CAACV,EAAa,EAAE,EAAG,KAAK,WAAWgB,EAAS,KAAK,iBAAiBhB,EAAa,UAAU,CAAC,CAC5F,GACC,CAAC,CAAC,CACP,EACF,EACC,OAAO,CAACU,EAAqCO,IACxCP,EAAc,KAAMQ,GAAMA,EAAE,UAAYD,EAAQ,OAAO,EAClDP,EAEFA,EAAc,OAAOO,CAAO,EAClC,CAAC,CAAC,CACT,CAEQ,4BACN3B,EACAF,EACAG,EACA,CACA,OAAOH,EAAW,OAAO,CAACsB,EAAeM,IAAY,CACnD,MAAMtB,EAAoB,KAAK,WAAWsB,EAASzB,CAAU,EACvD4B,EAAsBT,EAAchB,CAAS,EAAIgB,EAAchB,CAAS,EAAE,OAAS,CAAC,EAE1F,MAAO,CACL,GAAGgB,EACH,GAAIS,GAAuB,CACzB,CAACzB,CAAS,EAAG,CACX,OAAQyB,EAAoB,OAAOH,CAAO,CAC5C,CACF,CACF,CACF,EAAG1B,CAAwB,CAC7B,CAEQ,2BACN8B,EACA9B,EACiC,CACjC,MAAM+B,EAAuC,CAAE,GAAG/B,CAAyB,EAE3E,YAAK,cAAc,QAASU,GAAiB,CAC3C,MAAMsB,EAAc,KAAK,iBAAiBtB,EAAa,UAAU,EAC3DuB,EAAoB,KAAK,UAAU,KAAMC,GAAMA,EAAE,KAAOxB,EAAa,EAAE,GAChEuB,EAAoBA,EAAkB,KAAO,CAAC,GAGxD,OAAQP,GAAY,CACnB,MAAMC,EAAU,KAAK,WAAWD,EAASM,CAAW,EACpD,OAAOF,EAAW,KAAM,GAAM,EAAE,cAAcpB,EAAa,EAAE,IAAMiB,CAAO,CAC5E,CAAC,EACA,QAASD,GAAY,CACpB,MAAMC,EAAU,KAAK,WAAWD,EAASM,CAAW,EAC9CG,EAASL,EAAW,KAAMM,GAAMA,EAAE,cAAc1B,EAAa,EAAE,IAAMiB,CAAO,EAC5EU,EAAgBF,EAASA,EAAO,QAAU,GAC1CG,EAAgBP,EAAqCM,CAAa,EACxE,GAAIC,EAAe,CACjB,MAAMC,EAAoBD,EAAc5B,EAAa,EAAE,GAAK,CAAC,EAC7D4B,EAAc5B,EAAa,EAAE,EAAI6B,EAAkB,OAAOb,CAAO,CACnE,CACF,CAAC,CACL,CAAC,EAEMK,CACT,CAEA,cAAcS,EAA6B,CACzC,YAAK,UAAYA,EACV,IACT,CAEA,WAAWtB,EAAsC,CAC/C,MAAO,CACL,KAAM,KACN,KAAM,KAAK,mBAAmBA,EAAM,KAAK,UAAU,GAAM,qBAAqB,CAAC,EAC/E,SAAUA,EAAK,OACf,SAAU,KAAK,QAAQ,MACzB,CACF,CACF,CAGA,IAAO9B,EAAQD",
+  "sourcesContent": ["import Dict = NodeJS.Dict\nimport { components } from '../../types/api'\nimport { Cell, DataTable } from '../DataTableBuilder/types'\nimport DataTableBuilder from '../DataTableBuilder/DataTableBuilder'\nimport { distinct } from '../arrayUtils'\nimport { ChildData, ParentChildSortKey } from './types'\nimport SectionedDataTableBuilder from '../SectionedDataTableBuilder/SectionedDataTableBuilder'\n\nclass ParentChildDataTableBuilder extends SectionedDataTableBuilder {\n  variant: components['schemas']['VariantDefinition']\n\n  childVariants: components['schemas']['ChildVariantDefinition'][]\n\n  childData: Array<ChildData> = []\n\n  constructor(variant: components['schemas']['VariantDefinition']) {\n    const { specification } = variant\n    const { sections, template } = <components['schemas']['Specification']>specification\n    super(<components['schemas']['Specification']>specification)\n\n    this.sections = sections\n    this.template = template\n    this.variant = variant\n    this.childVariants = this.variant.childVariants || []\n  }\n\n  private createParentChildTable(parentData: Array<Dict<string>>, header: Cell[]) {\n    let sectionedParentChildData: Dict<Dict<Array<Dict<string>>>> = {}\n    const joinFields = this.mapNamesToFields(this.childVariants.flatMap((c) => c.joinFields).reduce(distinct, []))\n    // Get the parent-child joins definition data\n\n    // Create the section keys and\n    const parentChildKeys = this.calculateParentChildKeys(parentData, joinFields)\n    parentChildKeys.forEach((parentKey) => {\n      sectionedParentChildData[parentKey.sortKey] = {\n        parent: [],\n      }\n    })\n\n    sectionedParentChildData = this.splitParentDataIntoSections(sectionedParentChildData, parentData, joinFields)\n    sectionedParentChildData = this.splitChildDataIntoSections(parentChildKeys, sectionedParentChildData)\n\n    const childDataTableBuilders = this.createChildDataTableBuilders()\n\n    const parentChildTable = parentChildKeys.flatMap((key) => {\n      const sectionData = sectionedParentChildData[key.sortKey] || {}\n\n      let parentSectionData: Dict<string>[] = []\n      if (sectionData) {\n        parentSectionData = sectionData['parent'] ? sectionData['parent'] : []\n      }\n\n      return [header].concat(parentSectionData.map((r) => this.mapRow(r, 'dpr-parent-cell'))).concat(\n        this.childVariants\n          .filter((childVariant) => sectionData && sectionData[childVariant.id])\n          .map((childVariant) => {\n            const builder = childDataTableBuilders[childVariant.id]\n            const section = sectionData[childVariant.id]\n            const dataTable = builder && section ? builder.buildTable(section) : undefined\n            const dataTableHtml = dataTable ? this.convertDataTableToHtml(dataTable) : ''\n\n            return [\n              {\n                classes: 'dpr-child-report-cell',\n                format: 'string',\n                html: `<div class='dpr-child-report'><h2 class=\"govuk-heading-s\">${childVariant.name}</h2><div class=\"dpr-child-report_table\">${dataTableHtml}</div></div>`,\n                colspan: this.columns.length,\n              },\n            ]\n          }),\n      )\n    })\n\n    return parentChildTable\n  }\n\n  private createParentChildSectionRows(parentData: Array<Dict<string>>, header: Cell[]) {\n    const sectionsDetails = this.mapSections(parentData)\n    const sectionedData = sectionsDetails.sectionedData as Dict<Array<Dict<string>>>\n    const sectionedParentChildSectionedRows: {\n      sectionDescription: string\n      rows: Cell[][]\n      count: number\n      countDescription: string\n    }[] = []\n\n    Object.keys(sectionedData).forEach((sectionDescription) => {\n      const data = sectionedData[sectionDescription] as Array<Dict<string>>\n\n      sectionedParentChildSectionedRows.push({\n        sectionDescription,\n        ...this.getSectionCount(sectionedData, sectionDescription),\n        rows: this.createParentChildTable(data, header),\n      })\n    })\n\n    const rows = sectionedParentChildSectionedRows.flatMap((section, index) => {\n      const sectionHeader = this.createSectionHeader(\n        section.sectionDescription,\n        index,\n        section.count,\n        section.countDescription,\n      )\n      return [...sectionHeader, ...section.rows]\n    })\n\n    return rows\n  }\n\n  private mapParentChildData(parentData: Array<Dict<string>>, header: Cell[]): Cell[][] {\n    if (this.sections?.length) {\n      return this.createParentChildSectionRows(parentData, header)\n    }\n    return this.createParentChildTable(parentData, header)\n  }\n\n  private createChildDataTableBuilders() {\n    const childDataTables: Dict<DataTableBuilder> = this.childVariants.reduce((previousValue, childVariant) => {\n      const { specification } = childVariant\n      const fields = specification ? specification.fields : []\n      const fieldNamesToDisplay = fields.filter((f) => f.visible || f.mandatory).map((f) => f.name)\n\n      const dataTableBuilder = new DataTableBuilder(fields).withNoHeaderOptions(fieldNamesToDisplay).withSortedData()\n\n      return {\n        ...previousValue,\n        [childVariant.id]: dataTableBuilder,\n      }\n    }, {})\n    return childDataTables\n  }\n\n  private calculateParentChildKeys(\n    parentData: Array<NodeJS.Dict<string>>,\n    joinFields: components['schemas']['FieldDefinition'][],\n  ) {\n    return parentData\n      .map(\n        (rowData): ParentChildSortKey => ({\n          sortKey: this.getSortKey(rowData, joinFields),\n          childSortKeys: this.childVariants.reduce((previousValue, childVariant) => {\n            return {\n              ...previousValue,\n              [childVariant.id]: this.getSortKey(rowData, this.mapNamesToFields(childVariant.joinFields)),\n            }\n          }, {}),\n        }),\n      )\n      .reduce((previousValue: ParentChildSortKey[], sortKey: ParentChildSortKey) => {\n        if (previousValue.find((v) => v.sortKey === sortKey.sortKey)) {\n          return previousValue\n        }\n        return previousValue.concat(sortKey)\n      }, [])\n  }\n\n  private splitParentDataIntoSections(\n    sectionedParentChildData: NodeJS.Dict<NodeJS.Dict<Array<NodeJS.Dict<string>>>>,\n    parentData: Array<NodeJS.Dict<string>>,\n    joinFields: components['schemas']['FieldDefinition'][],\n  ) {\n    return parentData.reduce((previousValue, rowData) => {\n      const parentKey: string = this.getSortKey(rowData, joinFields)\n      const previousParentValue = previousValue[parentKey] ? previousValue[parentKey]['parent'] : []\n\n      return {\n        ...previousValue,\n        ...(previousParentValue && {\n          [parentKey]: {\n            parent: previousParentValue.concat(rowData),\n          },\n        }),\n      }\n    }, sectionedParentChildData)\n  }\n\n  private splitChildDataIntoSections(\n    parentKeys: ParentChildSortKey[],\n    sectionedParentChildData: Dict<Dict<Array<Dict<string>>>>,\n  ): Dict<Dict<Array<Dict<string>>>> {\n    const sectionedParentChildDataWithChildren = { ...sectionedParentChildData }\n\n    this.childVariants.forEach((childVariant) => {\n      const childFields = this.mapNamesToFields(childVariant.joinFields)\n      const matchingChildData = this.childData.find((d) => d.id === childVariant.id)\n      const data = matchingChildData ? matchingChildData.data : []\n\n      data\n        .filter((rowData) => {\n          const sortKey = this.getSortKey(rowData, childFields)\n          return parentKeys.find((p) => p.childSortKeys[childVariant.id] === sortKey)\n        })\n        .forEach((rowData) => {\n          const sortKey = this.getSortKey(rowData, childFields)\n          const parent = parentKeys.find((p) => p.childSortKeys[childVariant.id] === sortKey)\n          const parentSortKey = parent ? parent.sortKey : ''\n          const parentSection = sectionedParentChildDataWithChildren[parentSortKey]\n          if (parentSection) {\n            const existingChildData = parentSection[childVariant.id] || []\n            parentSection[childVariant.id] = existingChildData.concat(rowData)\n          }\n        })\n    })\n\n    return sectionedParentChildDataWithChildren\n  }\n\n  withChildData(childData: Array<ChildData>) {\n    this.childData = childData\n    return this\n  }\n\n  override buildTable(data: Array<Dict<string>>): DataTable {\n    return {\n      head: null,\n      rows: this.mapParentChildData(data, this.mapHeader(true, 'govuk-table__header')),\n      rowCount: data.length,\n      colCount: this.columns.length,\n    }\n  }\n}\n\nexport { ParentChildDataTableBuilder }\nexport default ParentChildDataTableBuilder\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,iCAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAGA,IAAAK,EAA6B,mDAC7BC,EAAyB,yBAEzBC,EAAsC,qEAEtC,MAAML,UAAoC,EAAAM,OAA0B,CAOlE,YAAYC,EAAqD,CAC/D,KAAM,CAAE,cAAAC,CAAc,EAAID,EACpB,CAAE,SAAAE,EAAU,SAAAC,CAAS,EAA4CF,EACvE,MAA8CA,CAAa,EAL7D,eAA8B,CAAC,EAO7B,KAAK,SAAWC,EAChB,KAAK,SAAWC,EAChB,KAAK,QAAUH,EACf,KAAK,cAAgB,KAAK,QAAQ,eAAiB,CAAC,CACtD,CAEQ,uBAAuBI,EAAiCC,EAAgB,CAC9E,IAAIC,EAA4D,CAAC,EACjE,MAAMC,EAAa,KAAK,iBAAiB,KAAK,cAAc,QAASC,GAAMA,EAAE,UAAU,EAAE,OAAO,WAAU,CAAC,CAAC,CAAC,EAIvGC,EAAkB,KAAK,yBAAyBL,EAAYG,CAAU,EAC5EE,EAAgB,QAASC,GAAc,CACrCJ,EAAyBI,EAAU,OAAO,EAAI,CAC5C,OAAQ,CAAC,CACX,CACF,CAAC,EAEDJ,EAA2B,KAAK,4BAA4BA,EAA0BF,EAAYG,CAAU,EAC5GD,EAA2B,KAAK,2BAA2BG,EAAiBH,CAAwB,EAEpG,MAAMK,EAAyB,KAAK,6BAA6B,EA+BjE,OA7ByBF,EAAgB,QAASG,GAAQ,CACxD,MAAMC,EAAcP,EAAyBM,EAAI,OAAO,GAAK,CAAC,EAE9D,IAAIE,EAAoC,CAAC,EACzC,OAAID,IACFC,EAAoBD,EAAY,OAAYA,EAAY,OAAY,CAAC,GAGhE,CAACR,CAAM,EAAE,OAAOS,EAAkB,IAAKC,GAAM,KAAK,OAAOA,EAAG,iBAAiB,CAAC,CAAC,EAAE,OACtF,KAAK,cACF,OAAQC,GAAiBH,GAAeA,EAAYG,EAAa,EAAE,CAAC,EACpE,IAAKA,GAAiB,CACrB,MAAMC,EAAUN,EAAuBK,EAAa,EAAE,EAChDE,EAAUL,EAAYG,EAAa,EAAE,EACrCG,EAAYF,GAAWC,EAAUD,EAAQ,WAAWC,CAAO,EAAI,OAC/DE,EAAgBD,EAAY,KAAK,uBAAuBA,CAAS,EAAI,GAE3E,MAAO,CACL,CACE,QAAS,wBACT,OAAQ,SACR,KAAM,6DAA6DH,EAAa,IAAI,4CAA4CI,CAAa,eAC7I,QAAS,KAAK,QAAQ,MACxB,CACF,CACF,CAAC,CACL,CACF,CAAC,CAGH,CAEQ,6BAA6BhB,EAAiCC,EAAgB,CAEpF,MAAMgB,EADkB,KAAK,YAAYjB,CAAU,EACb,cAChCkB,EAKA,CAAC,EAEP,cAAO,KAAKD,CAAa,EAAE,QAASE,GAAuB,CACzD,MAAMC,EAAOH,EAAcE,CAAkB,EAE7CD,EAAkC,KAAK,CACrC,mBAAAC,EACA,GAAG,KAAK,gBAAgBF,EAAeE,CAAkB,EACzD,KAAM,KAAK,uBAAuBC,EAAMnB,CAAM,CAChD,CAAC,CACH,CAAC,EAEYiB,EAAkC,QAAQ,CAACJ,EAASO,IAOxD,CAAC,GANc,KAAK,oBACzBP,EAAQ,mBACRO,EACAP,EAAQ,MACRA,EAAQ,gBACV,EAC0B,GAAGA,EAAQ,IAAI,CAC1C,CAGH,CAEQ,mBAAmBd,EAAiCC,EAA0B,CACpF,OAAI,KAAK,UAAU,OACV,KAAK,6BAA6BD,EAAYC,CAAM,EAEtD,KAAK,uBAAuBD,EAAYC,CAAM,CACvD,CAEQ,8BAA+B,CAarC,OAZgD,KAAK,cAAc,OAAO,CAACqB,EAAeV,IAAiB,CACzG,KAAM,CAAE,cAAAf,CAAc,EAAIe,EACpBW,EAAS1B,EAAgBA,EAAc,OAAS,CAAC,EACjD2B,EAAsBD,EAAO,OAAQE,GAAMA,EAAE,SAAWA,EAAE,SAAS,EAAE,IAAKA,GAAMA,EAAE,IAAI,EAEtFC,EAAmB,IAAI,EAAAC,QAAiBJ,CAAM,EAAE,oBAAoBC,CAAmB,EAAE,eAAe,EAE9G,MAAO,CACL,GAAGF,EACH,CAACV,EAAa,EAAE,EAAGc,CACrB,CACF,EAAG,CAAC,CAAC,CAEP,CAEQ,yBACN1B,EACAG,EACA,CACA,OAAOH,EACJ,IACE4B,IAAiC,CAChC,QAAS,KAAK,WAAWA,EAASzB,CAAU,EAC5C,cAAe,KAAK,cAAc,OAAO,CAACmB,EAAeV,KAChD,CACL,GAAGU,EACH,CAACV,EAAa,EAAE,EAAG,KAAK,WAAWgB,EAAS,KAAK,iBAAiBhB,EAAa,UAAU,CAAC,CAC5F,GACC,CAAC,CAAC,CACP,EACF,EACC,OAAO,CAACU,EAAqCO,IACxCP,EAAc,KAAMQ,GAAMA,EAAE,UAAYD,EAAQ,OAAO,EAClDP,EAEFA,EAAc,OAAOO,CAAO,EAClC,CAAC,CAAC,CACT,CAEQ,4BACN3B,EACAF,EACAG,EACA,CACA,OAAOH,EAAW,OAAO,CAACsB,EAAeM,IAAY,CACnD,MAAMtB,EAAoB,KAAK,WAAWsB,EAASzB,CAAU,EACvD4B,EAAsBT,EAAchB,CAAS,EAAIgB,EAAchB,CAAS,EAAE,OAAY,CAAC,EAE7F,MAAO,CACL,GAAGgB,EACH,GAAIS,GAAuB,CACzB,CAACzB,CAAS,EAAG,CACX,OAAQyB,EAAoB,OAAOH,CAAO,CAC5C,CACF,CACF,CACF,EAAG1B,CAAwB,CAC7B,CAEQ,2BACN8B,EACA9B,EACiC,CACjC,MAAM+B,EAAuC,CAAE,GAAG/B,CAAyB,EAE3E,YAAK,cAAc,QAASU,GAAiB,CAC3C,MAAMsB,EAAc,KAAK,iBAAiBtB,EAAa,UAAU,EAC3DuB,EAAoB,KAAK,UAAU,KAAMC,GAAMA,EAAE,KAAOxB,EAAa,EAAE,GAChEuB,EAAoBA,EAAkB,KAAO,CAAC,GAGxD,OAAQP,GAAY,CACnB,MAAMC,EAAU,KAAK,WAAWD,EAASM,CAAW,EACpD,OAAOF,EAAW,KAAM,GAAM,EAAE,cAAcpB,EAAa,EAAE,IAAMiB,CAAO,CAC5E,CAAC,EACA,QAASD,GAAY,CACpB,MAAMC,EAAU,KAAK,WAAWD,EAASM,CAAW,EAC9CG,EAASL,EAAW,KAAMM,GAAMA,EAAE,cAAc1B,EAAa,EAAE,IAAMiB,CAAO,EAC5EU,EAAgBF,EAASA,EAAO,QAAU,GAC1CG,EAAgBP,EAAqCM,CAAa,EACxE,GAAIC,EAAe,CACjB,MAAMC,EAAoBD,EAAc5B,EAAa,EAAE,GAAK,CAAC,EAC7D4B,EAAc5B,EAAa,EAAE,EAAI6B,EAAkB,OAAOb,CAAO,CACnE,CACF,CAAC,CACL,CAAC,EAEMK,CACT,CAEA,cAAcS,EAA6B,CACzC,YAAK,UAAYA,EACV,IACT,CAES,WAAWtB,EAAsC,CACxD,MAAO,CACL,KAAM,KACN,KAAM,KAAK,mBAAmBA,EAAM,KAAK,UAAU,GAAM,qBAAqB,CAAC,EAC/E,SAAUA,EAAK,OACf,SAAU,KAAK,QAAQ,MACzB,CACF,CACF,CAGA,IAAO9B,EAAQD",
   "names": ["ParentChildDataTableBuilder_exports", "__export", "ParentChildDataTableBuilder", "ParentChildDataTableBuilder_default", "__toCommonJS", "import_DataTableBuilder", "import_arrayUtils", "import_SectionedDataTableBuilder", "SectionedDataTableBuilder", "variant", "specification", "sections", "template", "parentData", "header", "sectionedParentChildData", "joinFields", "c", "parentChildKeys", "parentKey", "childDataTableBuilders", "key", "sectionData", "parentSectionData", "r", "childVariant", "builder", "section", "dataTable", "dataTableHtml", "sectionedData", "sectionedParentChildSectionedRows", "sectionDescription", "data", "index", "previousValue", "fields", "fieldNamesToDisplay", "f", "dataTableBuilder", "DataTableBuilder", "rowData", "sortKey", "v", "previousParentValue", "parentKeys", "sectionedParentChildDataWithChildren", "childFields", "matchingChildData", "d", "parent", "p", "parentSortKey", "parentSection", "existingChildData", "childData"]
 }

package/dpr/utils/ParentChildDataTableBuilder/ParentChildDataTableBuilder.test.ts

@@ -1,3 +1,4 @@
+import { expect } from '@jest/globals'
 import Dict = NodeJS.Dict
 import { components } from '../../types/api'
 import ParentChildDataTableBuilder from './ParentChildDataTableBuilder'
@@ -58,6 +59,7 @@ const childData: Array<Dict<string>> = [
 
 const parentFields: Array<components['schemas']['FieldDefinition']> = [
   {
+    header: false,
     name: 'sectionOne',
     display: 'Section One',
     sortable: true,
@@ -68,6 +70,7 @@ const parentFields: Array<components['schemas']['FieldDefinition']> = [
     calculated: false,
   },
   {
+    header: false,
     name: 'sectionTwo',
     display: 'Section Two',
     sortable: true,
@@ -78,6 +81,7 @@ const parentFields: Array<components['schemas']['FieldDefinition']> = [
     calculated: false,
   },
   {
+    header: false,
     name: 'oranges',
     display: 'Oranges!',
     sortable: true,
@@ -88,6 +92,7 @@ const parentFields: Array<components['schemas']['FieldDefinition']> = [
     calculated: false,
   },
   {
+    header: false,
     name: 'lemons',
     display: 'Lemons?!',
     sortable: true,
@@ -98,6 +103,7 @@ const parentFields: Array<components['schemas']['FieldDefinition']> = [
     calculated: false,
   },
   {
+    header: false,
     name: 'section',
     display: 'Section',
     sortable: true,
@@ -111,6 +117,7 @@ const parentFields: Array<components['schemas']['FieldDefinition']> = [
 
 const childFields: Array<components['schemas']['FieldDefinition']> = [
   {
+    header: false,
     name: 'sectionOne',
     display: 'Section One',
     sortable: true,
@@ -121,6 +128,7 @@ const childFields: Array<components['schemas']['FieldDefinition']> = [
     calculated: false,
   },
   {
+    header: false,
     name: 'sectionTwo',
     display: 'Section Two',
     sortable: true,
@@ -131,6 +139,7 @@ const childFields: Array<components['schemas']['FieldDefinition']> = [
     calculated: false,
   },
   {
+    header: false,
     name: 'cheese',
     display: 'Cheese',
     sortable: true,
@@ -373,8 +382,10 @@ describe('ParentChildDataTableBuilder', () => {
   })
 
   it('sections added correctly', () => {
-    parentVariant.specification.sections = ['section']
-    parentVariant.specification.template = 'parent-child-section'
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    parentVariant.specification!.sections = ['section']
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    parentVariant.specification!.template = 'parent-child-section'
     const mapped = new ParentChildDataTableBuilder(parentVariant)
       .withNoHeaderOptions(['sectionOne', 'sectionTwo', 'oranges', 'lemons'])
       .withChildData([

package/dpr/utils/ParentChildDataTableBuilder/ParentChildDataTableBuilder.ts

@@ -47,7 +47,7 @@ class ParentChildDataTableBuilder extends SectionedDataTableBuilder {
 
       let parentSectionData: Dict<string>[] = []
       if (sectionData) {
-        parentSectionData = sectionData.parent ? sectionData.parent : []
+        parentSectionData = sectionData['parent'] ? sectionData['parent'] : []
       }
 
       return [header].concat(parentSectionData.map((r) => this.mapRow(r, 'dpr-parent-cell'))).concat(
@@ -161,7 +161,7 @@ class ParentChildDataTableBuilder extends SectionedDataTableBuilder {
   ) {
     return parentData.reduce((previousValue, rowData) => {
       const parentKey: string = this.getSortKey(rowData, joinFields)
-      const previousParentValue = previousValue[parentKey] ? previousValue[parentKey].parent : []
+      const previousParentValue = previousValue[parentKey] ? previousValue[parentKey]['parent'] : []
 
       return {
         ...previousValue,
@@ -210,7 +210,7 @@ class ParentChildDataTableBuilder extends SectionedDataTableBuilder {
     return this
   }
 
-  buildTable(data: Array<Dict<string>>): DataTable {
+  override buildTable(data: Array<Dict<string>>): DataTable {
     return {
       head: null,
       rows: this.mapParentChildData(data, this.mapHeader(true, 'govuk-table__header')),

package/dpr/utils/ParentChildDataTableBuilder/types.d.js

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

package/dpr/utils/ParentChildDataTableBuilder/types.d.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../src/dpr/utils/ParentChildDataTableBuilder/types.d.ts"],
   "sourcesContent": ["import { SortKey } from '../DataTableBuilder/types'\n\nexport interface ParentChildSortKey extends SortKey {\n  childSortKeys: Dict<string>\n}\n\nexport interface ChildData {\n  id: string\n  data: Array<Dict<string>>\n}\n"],
-  "mappings": "kWAAA,IAAAA,EAAA,kBAAAC,EAAAD",
+  "mappings": "+WAAA,IAAAA,EAAA,kBAAAC,EAAAD",
   "names": ["types_d_exports", "__toCommonJS"]
 }

package/dpr/utils/Personalisation/personalisationUtils.js

@@ -1,2 +1,2 @@
-var k=Object.create;var v=Object.defineProperty;var O=Object.getOwnPropertyDescriptor;var A=Object.getOwnPropertyNames;var G=Object.getPrototypeOf,M=Object.prototype.hasOwnProperty;var P=(e,t)=>{for(var l in t)v(e,l,{get:t[l],enumerable:!0})},C=(e,t,l,s)=>{if(t&&typeof t=="object"||typeof t=="function")for(let n of A(t))!M.call(e,n)&&n!==l&&v(e,n,{get:()=>t[n],enumerable:!(s=O(t,n))||s.enumerable});return e};var m=(e,t,l)=>(l=e!=null?k(G(e)):{},C(t||!e||!e.__esModule?v(l,"default",{value:e,enumerable:!0}):l,e)),j=e=>C(v({},"__esModule",{value:!0}),e);var B={};P(B,{default:()=>W,removeDefaults:()=>T,saveDefaults:()=>x,setFilterValuesFromSavedDefaults:()=>I,setUserContextDefaults:()=>U});module.exports=j(B);var V=m(require("../localsHelper")),b=require("../../types/UserReports"),f=require("../../components/_filters/filter-input/enum"),R=m(require("../../components/_inputs/date-range/utils")),y=m(require("../../components/_inputs/granular-date-range/utils")),h=m(require("../../components/_inputs/multi-select/utils")),S=m(require("../../components/_inputs/date-input/utils"));const x=async(e,t,l,s)=>{const n=await E(l,t,s,e),{dprUser:u}=V.default.getValues(t),{reportId:i,id:a}=l.params,{defaultFilterValuesService:r}=s;return r?r.save(u.id,i,a,n):void 0},T=async(e,t,l,s)=>{const{dprUser:n}=V.default.getValues(t),{reportId:u,id:i}=l.params,{defaultFilterValuesService:a}=s;return a?a.delete(n.id,u,i,e):void 0},E=async(e,t,l,s)=>{const{token:n,definitionsPath:u}=V.default.getValues(t),{reportId:i,id:a,type:r}=e.params;let p,c=[];r===b.ReportType.REPORT?(p=await l.reportingService.getDefinition(n,i,a,u),c=p.variant.specification?.fields||[]):(p=await l.dashboardService.getDefinition(n,i,a,u),c=p.filterFields||[]);const g=Object.keys(e.body).filter(o=>o.includes("filters.")||o.includes("sortColumn")||o.includes("sortedAsc")).map(o=>({name:o.replace("filters.",""),value:e.body[o]})).map(o=>{const D=o.name.split(".")[0],L=c.find(w=>w.name===D);let{value:F,name:d}=o;if(L)switch(L.filter?.type.toLocaleLowerCase()){case f.FilterType.multiselect.toLocaleLowerCase():F=Array.isArray(o.value)?o.value.join(","):o.value;break;case f.FilterType.dateRange.toLocaleLowerCase():({value:F,name:d}=R.default.setDefaultValue(e,d));break;case f.FilterType.granularDateRange.toLocaleLowerCase():({name:d,value:F}=y.default.setDefaultValue(e,d));break;default:break}return{name:d,value:F,type:s}});return Array.from(new Set(g.map(o=>o.name))).map(o=>g.find(D=>D.name===o)).filter(o=>o!==void 0).filter(o=>o?o.value!=="":!1)},I=(e,t,l)=>{const s=e.some(i=>l.findIndex(r=>r.name===i.name)!==-1),n=e.map(i=>{const a=l.find(c=>c.name===i.name);let r={...i};switch(i.type.toLocaleLowerCase()){case f.FilterType.multiselect.toLocaleLowerCase():r=h.default.setFilterValuesFromSavedDefault(r,s,a);break;case f.FilterType.date.toLocaleLowerCase():s&&(r.value=""),a&&(r=S.default.setFilterValueFromDefault(a,r));break;case f.FilterType.dateRange.toLocaleLowerCase():s&&(r.value={start:"",end:"",relative:void 0}),a&&(r=R.default.setFilterValueFromDefault(a,r));break;case f.FilterType.granularDateRange.toLocaleLowerCase():s&&(r.value={start:"",end:"",granularity:void 0,quickFilter:void 0}),a&&(r=y.default.setFilterValueFromDefault(a,r));break;default:{let c=s?"":r.value;c=a?a.value:c,r={...i,value:c}}break}return r}),u=t.map(i=>{const a=l.find(r=>r.name===i.name);return{...i,...a&&{value:a.value}}});return{filters:n,sortBy:u}},U=(e,t)=>{const{dprUser:l}=V.default.getValues(e),{activeCaseLoadId:s}=l;return t.forEach(n=>{if(n.type.toLocaleLowerCase()===f.FilterType.autocomplete.toLocaleLowerCase()&&n.text.toLocaleLowerCase().includes("establishment")&&s?.length){const u=n,i=u.options.find(a=>a.value===s);i&&(u.value=i.text,u.staticOptionNameValue=s)}}),t};var W={saveDefaults:x,removeDefaults:T,setFilterValuesFromSavedDefaults:I,setUserContextDefaults:U};0&&(module.exports={removeDefaults,saveDefaults,setFilterValuesFromSavedDefaults,setUserContextDefaults});
+"use strict";var O=Object.create;var v=Object.defineProperty;var A=Object.getOwnPropertyDescriptor;var P=Object.getOwnPropertyNames;var G=Object.getPrototypeOf,M=Object.prototype.hasOwnProperty;var j=(e,t)=>{for(var a in t)v(e,a,{get:t[a],enumerable:!0})},b=(e,t,a,s)=>{if(t&&typeof t=="object"||typeof t=="function")for(let n of P(t))!M.call(e,n)&&n!==a&&v(e,n,{get:()=>t[n],enumerable:!(s=A(t,n))||s.enumerable});return e};var m=(e,t,a)=>(a=e!=null?O(G(e)):{},b(t||!e||!e.__esModule?v(a,"default",{value:e,enumerable:!0}):a,e)),E=e=>b(v({},"__esModule",{value:!0}),e);var H={};j(H,{default:()=>B,removeDefaults:()=>T,saveDefaults:()=>I,setFilterValuesFromSavedDefaults:()=>U,setUserContextDefaults:()=>k});module.exports=E(H);var V=m(require("../localsHelper")),h=require("../../types/UserReports"),f=require("../../components/_filters/filter-input/enum"),D=m(require("../../components/_inputs/date-range/utils")),y=m(require("../../components/_inputs/granular-date-range/utils")),S=m(require("../../components/_inputs/multi-select/utils")),x=m(require("../../components/_inputs/date-input/utils")),g=require("../indexedAccesHelper");const I=async(e,t,a,s)=>{const n=await W(a,t,s,e),{dprUser:u}=V.default.getValues(t),i=(0,g.getRequestParam)({req:a,param:"id"}),r=(0,g.getRequestParam)({req:a,param:"reportId"}),{defaultFilterValuesService:l}=s;return l?l.save(u.id,r,i,n):void 0},T=async(e,t,a,s)=>{const{dprUser:n}=V.default.getValues(t),{reportId:u,id:i}=a.params,{defaultFilterValuesService:r}=s;return r?r.delete(n.id,u,i,e):void 0},W=async(e,t,a,s)=>{const{token:n,definitionsPath:u}=V.default.getValues(t),{reportId:i,id:r,type:l}=e.params;let p,c=[];l===h.ReportType.REPORT?(p=await a.reportingService.getDefinition(n,i,r,u),c=p.variant.specification?.fields||[]):(p=await a.dashboardService.getDefinition(n,i,r,u),c=p.filterFields||[]);const L=Object.keys(e.body).filter(o=>o.includes("filters.")||o.includes("sortColumn")||o.includes("sortedAsc")).map(o=>({name:o.replace("filters.",""),value:e.body[o]})).map(o=>{const R=o.name.split(".")[0],w=c.find(C=>C.name===R);let{value:F,name:d}=o;if(w)switch(w.filter?.type.toLocaleLowerCase()){case f.FilterType.multiselect.toLocaleLowerCase():F=Array.isArray(o.value)?o.value.join(","):o.value;break;case f.FilterType.dateRange.toLocaleLowerCase():({value:F,name:d}=D.default.setDefaultValue(e,d));break;case f.FilterType.granularDateRange.toLocaleLowerCase():({name:d,value:F}=y.default.setDefaultValue(e,d));break;default:break}return{name:d,value:F,type:s}});return Array.from(new Set(L.map(o=>o.name))).map(o=>L.find(R=>R.name===o)).filter(o=>o!==void 0).filter(o=>o?o.value!=="":!1)},U=(e,t,a)=>{const s=e.some(i=>a.findIndex(l=>l.name===i.name)!==-1),n=e.map(i=>{const r=a.find(c=>c.name===i.name);let l={...i};switch(i.type.toLocaleLowerCase()){case f.FilterType.multiselect.toLocaleLowerCase():l=S.default.setFilterValuesFromSavedDefault(l,s,r);break;case f.FilterType.date.toLocaleLowerCase():s&&(l.value=""),r&&(l=x.default.setFilterValueFromDefault(r,l));break;case f.FilterType.dateRange.toLocaleLowerCase():s&&(l.value={start:"",end:"",relative:void 0}),r&&(l=D.default.setFilterValueFromDefault(r,l));break;case f.FilterType.granularDateRange.toLocaleLowerCase():s&&(l.value={start:"",end:"",granularity:void 0,quickFilter:void 0}),r&&(l=y.default.setFilterValueFromDefault(r,l));break;default:{let c=s?"":l.value;c=r?r.value:c,l={...i,value:c}}break}return l}),u=t.map(i=>{const r=a.find(l=>l.name===i.name);return{...i,...r&&{value:r.value}}});return{filters:n,sortBy:u}},k=(e,t)=>{const{dprUser:a}=V.default.getValues(e),{activeCaseLoadId:s}=a;return t.forEach(n=>{if(n.type.toLocaleLowerCase()===f.FilterType.autocomplete.toLocaleLowerCase()&&n.text.toLocaleLowerCase().includes("establishment")&&s?.length){const u=n,i=u.options.find(r=>r.value===s);i&&(u.value=i.text,u.staticOptionNameValue=s)}}),t};var B={saveDefaults:I,removeDefaults:T,setFilterValuesFromSavedDefaults:U,setUserContextDefaults:k};0&&(module.exports={removeDefaults,saveDefaults,setFilterValuesFromSavedDefaults,setUserContextDefaults});
 //# sourceMappingURL=personalisationUtils.js.map

package/dpr/utils/Personalisation/personalisationUtils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/dpr/utils/Personalisation/personalisationUtils.ts"],
-  "sourcesContent": ["import { Request, Response } from 'express'\nimport { Services } from '../../types/Services'\nimport localsHelper from '../localsHelper'\nimport { ReportType } from '../../types/UserReports'\nimport { components } from '../../types/api'\nimport { FilterType } from '../../components/_filters/filter-input/enum'\nimport DateRangeInputUtils from '../../components/_inputs/date-range/utils'\nimport GranularDateRangeInputUtils from '../../components/_inputs/granular-date-range/utils'\nimport MultiSelectUtils from '../../components/_inputs/multi-select/utils'\nimport DateInputUtils from '../../components/_inputs/date-input/utils'\nimport { RenderFiltersReturnValue } from '../../components/_async/async-filters-form/types'\nimport {\n  DateFilterValue,\n  DateRangeFilterValue,\n  FilterValue,\n  FilterValueWithOptions,\n  GranularDateRangeFilterValue,\n  MultiselectFilterValue,\n} from '../../components/_filters/types'\nimport { defaultFilterValue } from './types'\nimport { FiltersType } from '../../components/_filters/filtersTypeEnum'\n\nexport const saveDefaults = async (type: FiltersType, res: Response, req: Request, services: Services) => {\n  const defaultValuesForReport = await getDefaultValues(req, res, services, type)\n  const { dprUser } = localsHelper.getValues(res)\n  const { reportId, id } = req.params\n  const { defaultFilterValuesService } = services\n  return defaultFilterValuesService\n    ? defaultFilterValuesService.save(dprUser.id, reportId, id, defaultValuesForReport)\n    : undefined\n}\n\nexport const removeDefaults = async (type: FiltersType, res: Response, req: Request, services: Services) => {\n  const { dprUser } = localsHelper.getValues(res)\n  const { reportId, id } = req.params\n  const { defaultFilterValuesService } = services\n  return defaultFilterValuesService ? defaultFilterValuesService.delete(dprUser.id, reportId, id, type) : undefined\n}\n\nconst getDefaultValues = async (\n  req: Request,\n  res: Response,\n  services: Services,\n  filtersType: FiltersType,\n): Promise<defaultFilterValue[]> => {\n  const { token, definitionsPath } = localsHelper.getValues(res)\n  const { reportId, id, type } = req.params\n\n  let definition: components['schemas']['SingleVariantReportDefinition'] | components['schemas']['DashboardDefinition']\n  let fields = []\n  if (type === ReportType.REPORT) {\n    definition = await services.reportingService.getDefinition(token, reportId, id, definitionsPath)\n    fields = definition.variant.specification?.fields || []\n  } else {\n    definition = await services.dashboardService.getDefinition(token, reportId, id, definitionsPath)\n    fields = definition.filterFields || []\n  }\n\n  const bodyFilterValues = Object.keys(req.body)\n    .filter((k) => {\n      return k.includes('filters.') || k.includes('sortColumn') || k.includes('sortedAsc')\n    })\n    .map((k) => {\n      return { name: k.replace('filters.', ''), value: req.body[k] }\n    })\n    .map((k) => {\n      const n = k.name.split('.')[0]\n      const field = fields.find((f) => f.name === n)\n      let { value, name } = k\n\n      if (field) {\n        const filterType = field.filter?.type.toLocaleLowerCase()\n\n        switch (filterType) {\n          case FilterType.multiselect.toLocaleLowerCase():\n            value = Array.isArray(k.value) ? k.value.join(',') : k.value\n            break\n\n          case FilterType.dateRange.toLocaleLowerCase():\n            ;({ value, name } = DateRangeInputUtils.setDefaultValue(req, name))\n            break\n\n          case FilterType.granularDateRange.toLocaleLowerCase():\n            ;({ name, value } = GranularDateRangeInputUtils.setDefaultValue(req, name))\n            break\n\n          default:\n            break\n        }\n      }\n\n      return {\n        name,\n        value,\n        type: filtersType,\n      }\n    })\n\n  const defaultValuesConfig = Array.from(new Set(bodyFilterValues.map((a) => a.name)))\n    .map((name) => {\n      return bodyFilterValues.find((a) => a.name === name)\n    })\n    .filter((c) => c !== undefined)\n\n  return defaultValuesConfig.filter((defaultValue) => {\n    return defaultValue ? defaultValue.value !== '' : false\n  })\n}\n\nexport const setFilterValuesFromSavedDefaults = (\n  filters: FilterValue[],\n  sortBy: FilterValue[],\n  defaultValues: defaultFilterValue[],\n): RenderFiltersReturnValue => {\n  const hasDefaults = filters.some((f) => {\n    const defaultValue = defaultValues.findIndex((v) => v.name === f.name)\n    return defaultValue !== -1\n  })\n\n  const filterValues = filters.map((filter) => {\n    const defaultValue = defaultValues.find((v) => v.name === filter.name)\n    let updatedFilter = {\n      ...filter,\n    }\n    const type = filter.type.toLocaleLowerCase()\n\n    switch (type) {\n      case FilterType.multiselect.toLocaleLowerCase():\n        updatedFilter = MultiSelectUtils.setFilterValuesFromSavedDefault(\n          <MultiselectFilterValue>updatedFilter,\n          hasDefaults,\n          defaultValue,\n        )\n        break\n      case FilterType.date.toLocaleLowerCase():\n        if (hasDefaults) {\n          updatedFilter.value = ''\n        }\n        if (defaultValue) {\n          updatedFilter = <DateFilterValue>DateInputUtils.setFilterValueFromDefault(defaultValue, updatedFilter)\n        }\n        break\n      case FilterType.dateRange.toLocaleLowerCase():\n        if (hasDefaults) {\n          updatedFilter.value = { start: '', end: '', relative: undefined }\n        }\n        if (defaultValue) {\n          updatedFilter = <DateRangeFilterValue>(\n            DateRangeInputUtils.setFilterValueFromDefault(defaultValue, updatedFilter)\n          )\n        }\n        break\n      case FilterType.granularDateRange.toLocaleLowerCase():\n        if (hasDefaults) {\n          updatedFilter.value = { start: '', end: '', granularity: undefined, quickFilter: undefined }\n        }\n        if (defaultValue) {\n          updatedFilter = <GranularDateRangeFilterValue>(\n            GranularDateRangeInputUtils.setFilterValueFromDefault(defaultValue, updatedFilter)\n          )\n        }\n        break\n      default:\n        {\n          let value = hasDefaults ? '' : updatedFilter.value\n          value = defaultValue ? defaultValue.value : value\n          updatedFilter = {\n            ...filter,\n            value,\n          }\n        }\n\n        break\n    }\n\n    return updatedFilter\n  })\n\n  const sortValues = sortBy.map((sortFilter) => {\n    const defaultValue = defaultValues.find((v) => v.name === sortFilter.name)\n    return {\n      ...sortFilter,\n      ...(defaultValue && { value: defaultValue.value }),\n    }\n  })\n\n  return {\n    filters: filterValues,\n    sortBy: sortValues,\n  }\n}\n\nexport const setUserContextDefaults = (res: Response, filters: FilterValue[]) => {\n  const { dprUser } = localsHelper.getValues(res)\n  const { activeCaseLoadId } = dprUser\n\n  filters.forEach((filter) => {\n    if (\n      filter.type.toLocaleLowerCase() === FilterType.autocomplete.toLocaleLowerCase() &&\n      filter.text.toLocaleLowerCase().includes('establishment') &&\n      activeCaseLoadId?.length\n    ) {\n      const f = <FilterValueWithOptions>filter\n      const option = f.options.find((opt) => opt.value === activeCaseLoadId)\n\n      if (option) {\n        f.value = option.text\n        f.staticOptionNameValue = activeCaseLoadId\n      }\n    }\n  })\n\n  return filters\n}\n\nexport default { saveDefaults, removeDefaults, setFilterValuesFromSavedDefaults, setUserContextDefaults }\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,mBAAAC,EAAA,iBAAAC,EAAA,qCAAAC,EAAA,2BAAAC,IAAA,eAAAC,EAAAP,GAEA,IAAAQ,EAAyB,8BACzBC,EAA2B,mCAE3BC,EAA2B,uDAC3BC,EAAgC,wDAChCA,EAAwC,iEACxCA,EAA6B,0DAC7BA,EAA2B,wDAapB,MAAMP,EAAe,MAAOQ,EAAmBC,EAAeC,EAAcC,IAAuB,CACxG,MAAMC,EAAyB,MAAMC,EAAiBH,EAAKD,EAAKE,EAAUH,CAAI,EACxE,CAAE,QAAAM,CAAQ,EAAI,EAAAC,QAAa,UAAUN,CAAG,EACxC,CAAE,SAAAO,EAAU,GAAAC,CAAG,EAAIP,EAAI,OACvB,CAAE,2BAAAQ,CAA2B,EAAIP,EACvC,OAAOO,EACHA,EAA2B,KAAKJ,EAAQ,GAAIE,EAAUC,EAAIL,CAAsB,EAChF,MACN,EAEab,EAAiB,MAAOS,EAAmBC,EAAeC,EAAcC,IAAuB,CAC1G,KAAM,CAAE,QAAAG,CAAQ,EAAI,EAAAC,QAAa,UAAUN,CAAG,EACxC,CAAE,SAAAO,EAAU,GAAAC,CAAG,EAAIP,EAAI,OACvB,CAAE,2BAAAQ,CAA2B,EAAIP,EACvC,OAAOO,EAA6BA,EAA2B,OAAOJ,EAAQ,GAAIE,EAAUC,EAAIT,CAAI,EAAI,MAC1G,EAEMK,EAAmB,MACvBH,EACAD,EACAE,EACAQ,IACkC,CAClC,KAAM,CAAE,MAAAC,EAAO,gBAAAC,CAAgB,EAAI,EAAAN,QAAa,UAAUN,CAAG,EACvD,CAAE,SAAAO,EAAU,GAAAC,EAAI,KAAAT,CAAK,EAAIE,EAAI,OAEnC,IAAIY,EACAC,EAAS,CAAC,EACVf,IAAS,aAAW,QACtBc,EAAa,MAAMX,EAAS,iBAAiB,cAAcS,EAAOJ,EAAUC,EAAII,CAAe,EAC/FE,EAASD,EAAW,QAAQ,eAAe,QAAU,CAAC,IAEtDA,EAAa,MAAMX,EAAS,iBAAiB,cAAcS,EAAOJ,EAAUC,EAAII,CAAe,EAC/FE,EAASD,EAAW,cAAgB,CAAC,GAGvC,MAAME,EAAmB,OAAO,KAAKd,EAAI,IAAI,EAC1C,OAAQe,GACAA,EAAE,SAAS,UAAU,GAAKA,EAAE,SAAS,YAAY,GAAKA,EAAE,SAAS,WAAW,CACpF,EACA,IAAKA,IACG,CAAE,KAAMA,EAAE,QAAQ,WAAY,EAAE,EAAG,MAAOf,EAAI,KAAKe,CAAC,CAAE,EAC9D,EACA,IAAKA,GAAM,CACV,MAAMC,EAAID,EAAE,KAAK,MAAM,GAAG,EAAE,CAAC,EACvBE,EAAQJ,EAAO,KAAMK,GAAMA,EAAE,OAASF,CAAC,EAC7C,GAAI,CAAE,MAAAG,EAAO,KAAAC,CAAK,EAAIL,EAEtB,GAAIE,EAGF,OAFmBA,EAAM,QAAQ,KAAK,kBAAkB,EAEpC,CAClB,KAAK,aAAW,YAAY,kBAAkB,EAC5CE,EAAQ,MAAM,QAAQJ,EAAE,KAAK,EAAIA,EAAE,MAAM,KAAK,GAAG,EAAIA,EAAE,MACvD,MAEF,KAAK,aAAW,UAAU,kBAAkB,GACxC,CAAE,MAAAI,EAAO,KAAAC,CAAK,EAAI,EAAAC,QAAoB,gBAAgBrB,EAAKoB,CAAI,GACjE,MAEF,KAAK,aAAW,kBAAkB,kBAAkB,GAChD,CAAE,KAAAA,EAAM,MAAAD,CAAM,EAAI,EAAAG,QAA4B,gBAAgBtB,EAAKoB,CAAI,GACzE,MAEF,QACE,KACJ,CAGF,MAAO,CACL,KAAAA,EACA,MAAAD,EACA,KAAMV,CACR,CACF,CAAC,EAQH,OAN4B,MAAM,KAAK,IAAI,IAAIK,EAAiB,IAAKS,GAAMA,EAAE,IAAI,CAAC,CAAC,EAChF,IAAKH,GACGN,EAAiB,KAAMS,GAAMA,EAAE,OAASH,CAAI,CACpD,EACA,OAAQI,GAAMA,IAAM,MAAS,EAEL,OAAQC,GAC1BA,EAAeA,EAAa,QAAU,GAAK,EACnD,CACH,EAEalC,EAAmC,CAC9CmC,EACAC,EACAC,IAC6B,CAC7B,MAAMC,EAAcH,EAAQ,KAAMR,GACXU,EAAc,UAAWE,GAAMA,EAAE,OAASZ,EAAE,IAAI,IAC7C,EACzB,EAEKa,EAAeL,EAAQ,IAAKM,GAAW,CAC3C,MAAMP,EAAeG,EAAc,KAAME,GAAMA,EAAE,OAASE,EAAO,IAAI,EACrE,IAAIC,EAAgB,CAClB,GAAGD,CACL,EAGA,OAFaA,EAAO,KAAK,kBAAkB,EAE7B,CACZ,KAAK,aAAW,YAAY,kBAAkB,EAC5CC,EAAgB,EAAAC,QAAiB,gCACPD,EACxBJ,EACAJ,CACF,EACA,MACF,KAAK,aAAW,KAAK,kBAAkB,EACjCI,IACFI,EAAc,MAAQ,IAEpBR,IACFQ,EAAiC,EAAAE,QAAe,0BAA0BV,EAAcQ,CAAa,GAEvG,MACF,KAAK,aAAW,UAAU,kBAAkB,EACtCJ,IACFI,EAAc,MAAQ,CAAE,MAAO,GAAI,IAAK,GAAI,SAAU,MAAU,GAE9DR,IACFQ,EACE,EAAAZ,QAAoB,0BAA0BI,EAAcQ,CAAa,GAG7E,MACF,KAAK,aAAW,kBAAkB,kBAAkB,EAC9CJ,IACFI,EAAc,MAAQ,CAAE,MAAO,GAAI,IAAK,GAAI,YAAa,OAAW,YAAa,MAAU,GAEzFR,IACFQ,EACE,EAAAX,QAA4B,0BAA0BG,EAAcQ,CAAa,GAGrF,MACF,QACE,CACE,IAAId,EAAQU,EAAc,GAAKI,EAAc,MAC7Cd,EAAQM,EAAeA,EAAa,MAAQN,EAC5Cc,EAAgB,CACd,GAAGD,EACH,MAAAb,CACF,CACF,CAEA,KACJ,CAEA,OAAOc,CACT,CAAC,EAEKG,EAAaT,EAAO,IAAKU,GAAe,CAC5C,MAAMZ,EAAeG,EAAc,KAAME,GAAMA,EAAE,OAASO,EAAW,IAAI,EACzE,MAAO,CACL,GAAGA,EACH,GAAIZ,GAAgB,CAAE,MAAOA,EAAa,KAAM,CAClD,CACF,CAAC,EAED,MAAO,CACL,QAASM,EACT,OAAQK,CACV,CACF,EAEa5C,EAAyB,CAACO,EAAe2B,IAA2B,CAC/E,KAAM,CAAE,QAAAtB,CAAQ,EAAI,EAAAC,QAAa,UAAUN,CAAG,EACxC,CAAE,iBAAAuC,CAAiB,EAAIlC,EAE7B,OAAAsB,EAAQ,QAASM,GAAW,CAC1B,GACEA,EAAO,KAAK,kBAAkB,IAAM,aAAW,aAAa,kBAAkB,GAC9EA,EAAO,KAAK,kBAAkB,EAAE,SAAS,eAAe,GACxDM,GAAkB,OAClB,CACA,MAAMpB,EAA4Bc,EAC5BO,EAASrB,EAAE,QAAQ,KAAMsB,GAAQA,EAAI,QAAUF,CAAgB,EAEjEC,IACFrB,EAAE,MAAQqB,EAAO,KACjBrB,EAAE,sBAAwBoB,EAE9B,CACF,CAAC,EAEMZ,CACT,EAEA,IAAOtC,EAAQ,CAAE,aAAAE,EAAc,eAAAD,EAAgB,iCAAAE,EAAkC,uBAAAC,CAAuB",
-  "names": ["personalisationUtils_exports", "__export", "personalisationUtils_default", "removeDefaults", "saveDefaults", "setFilterValuesFromSavedDefaults", "setUserContextDefaults", "__toCommonJS", "import_localsHelper", "import_UserReports", "import_enum", "import_utils", "type", "res", "req", "services", "defaultValuesForReport", "getDefaultValues", "dprUser", "localsHelper", "reportId", "id", "defaultFilterValuesService", "filtersType", "token", "definitionsPath", "definition", "fields", "bodyFilterValues", "k", "n", "field", "f", "value", "name", "DateRangeInputUtils", "GranularDateRangeInputUtils", "a", "c", "defaultValue", "filters", "sortBy", "defaultValues", "hasDefaults", "v", "filterValues", "filter", "updatedFilter", "MultiSelectUtils", "DateInputUtils", "sortValues", "sortFilter", "activeCaseLoadId", "option", "opt"]
+  "sourcesContent": ["import { Request, Response } from 'express'\nimport { Services } from '../../types/Services'\nimport localsHelper from '../localsHelper'\nimport { ReportType } from '../../types/UserReports'\nimport { components } from '../../types/api'\nimport { FilterType } from '../../components/_filters/filter-input/enum'\nimport DateRangeInputUtils from '../../components/_inputs/date-range/utils'\nimport GranularDateRangeInputUtils from '../../components/_inputs/granular-date-range/utils'\nimport MultiSelectUtils from '../../components/_inputs/multi-select/utils'\nimport DateInputUtils from '../../components/_inputs/date-input/utils'\nimport { RenderFiltersReturnValue } from '../../components/_async/async-filters-form/types'\nimport {\n  DateFilterValue,\n  DateRangeFilterValue,\n  FilterValue,\n  FilterValueWithOptions,\n  GranularDateRangeFilterValue,\n  MultiselectFilterValue,\n} from '../../components/_filters/types'\nimport { defaultFilterValue } from './types'\nimport { FiltersType } from '../../components/_filters/filtersTypeEnum'\nimport { getRequestParam } from '../indexedAccesHelper'\n\nexport const saveDefaults = async (type: FiltersType, res: Response, req: Request, services: Services) => {\n  const defaultValuesForReport = await getDefaultValues(req, res, services, type)\n  const { dprUser } = localsHelper.getValues(res)\n  const id = getRequestParam({ req, param: 'id' })\n  const reportId = getRequestParam({ req, param: 'reportId' })\n  const { defaultFilterValuesService } = services\n  return defaultFilterValuesService\n    ? defaultFilterValuesService.save(dprUser.id, reportId, id, defaultValuesForReport)\n    : undefined\n}\n\nexport const removeDefaults = async (type: FiltersType, res: Response, req: Request, services: Services) => {\n  const { dprUser } = localsHelper.getValues(res)\n  const { reportId, id } = req.params\n  const { defaultFilterValuesService } = services\n  return defaultFilterValuesService ? defaultFilterValuesService.delete(dprUser.id, reportId, id, type) : undefined\n}\n\nconst getDefaultValues = async (\n  req: Request,\n  res: Response,\n  services: Services,\n  filtersType: FiltersType,\n): Promise<defaultFilterValue[]> => {\n  const { token, definitionsPath } = localsHelper.getValues(res)\n  const { reportId, id, type } = req.params\n\n  let definition: components['schemas']['SingleVariantReportDefinition'] | components['schemas']['DashboardDefinition']\n  let fields = []\n  if (type === ReportType.REPORT) {\n    definition = await services.reportingService.getDefinition(token, reportId, id, definitionsPath)\n    fields = definition.variant.specification?.fields || []\n  } else {\n    definition = await services.dashboardService.getDefinition(token, reportId, id, definitionsPath)\n    fields = definition.filterFields || []\n  }\n\n  const bodyFilterValues = Object.keys(req.body)\n    .filter((k) => {\n      return k.includes('filters.') || k.includes('sortColumn') || k.includes('sortedAsc')\n    })\n    .map((k) => {\n      return { name: k.replace('filters.', ''), value: req.body[k] }\n    })\n    .map((k) => {\n      const n = k.name.split('.')[0]\n      const field = fields.find((f) => f.name === n)\n      let { value, name } = k\n\n      if (field) {\n        const filterType = field.filter?.type.toLocaleLowerCase()\n\n        switch (filterType) {\n          case FilterType.multiselect.toLocaleLowerCase():\n            value = Array.isArray(k.value) ? k.value.join(',') : k.value\n            break\n\n          case FilterType.dateRange.toLocaleLowerCase():\n            ;({ value, name } = DateRangeInputUtils.setDefaultValue(req, name))\n            break\n\n          case FilterType.granularDateRange.toLocaleLowerCase():\n            ;({ name, value } = GranularDateRangeInputUtils.setDefaultValue(req, name))\n            break\n\n          default:\n            break\n        }\n      }\n\n      return {\n        name,\n        value,\n        type: filtersType,\n      }\n    })\n\n  const defaultValuesConfig = Array.from(new Set(bodyFilterValues.map((a) => a.name)))\n    .map((name) => {\n      return bodyFilterValues.find((a) => a.name === name)\n    })\n    .filter((c) => c !== undefined)\n\n  const result = defaultValuesConfig.filter((defaultValue) => {\n    return defaultValue ? defaultValue.value !== '' : false\n  })\n\n  return result\n}\n\nexport const setFilterValuesFromSavedDefaults = (\n  filters: FilterValue[],\n  sortBy: FilterValue[],\n  defaultValues: defaultFilterValue[],\n): RenderFiltersReturnValue => {\n  const hasDefaults = filters.some((f) => {\n    const defaultValue = defaultValues.findIndex((v) => v.name === f.name)\n    return defaultValue !== -1\n  })\n\n  const filterValues = filters.map((filter) => {\n    const defaultValue = defaultValues.find((v) => v.name === filter.name)\n    let updatedFilter = {\n      ...filter,\n    }\n    const type = filter.type.toLocaleLowerCase()\n\n    switch (type) {\n      case FilterType.multiselect.toLocaleLowerCase():\n        updatedFilter = MultiSelectUtils.setFilterValuesFromSavedDefault(\n          <MultiselectFilterValue>updatedFilter,\n          hasDefaults,\n          defaultValue,\n        )\n        break\n      case FilterType.date.toLocaleLowerCase():\n        if (hasDefaults) {\n          updatedFilter.value = ''\n        }\n        if (defaultValue) {\n          updatedFilter = <DateFilterValue>DateInputUtils.setFilterValueFromDefault(defaultValue, updatedFilter)\n        }\n        break\n      case FilterType.dateRange.toLocaleLowerCase():\n        if (hasDefaults) {\n          updatedFilter.value = { start: '', end: '', relative: undefined }\n        }\n        if (defaultValue) {\n          updatedFilter = <DateRangeFilterValue>(\n            DateRangeInputUtils.setFilterValueFromDefault(defaultValue, updatedFilter)\n          )\n        }\n        break\n      case FilterType.granularDateRange.toLocaleLowerCase():\n        if (hasDefaults) {\n          updatedFilter.value = { start: '', end: '', granularity: undefined, quickFilter: undefined }\n        }\n        if (defaultValue) {\n          updatedFilter = <GranularDateRangeFilterValue>(\n            GranularDateRangeInputUtils.setFilterValueFromDefault(defaultValue, updatedFilter)\n          )\n        }\n        break\n      default:\n        {\n          let value = hasDefaults ? '' : updatedFilter.value\n          value = defaultValue ? defaultValue.value : value\n          updatedFilter = {\n            ...filter,\n            value,\n          }\n        }\n\n        break\n    }\n\n    return updatedFilter\n  })\n\n  const sortValues = sortBy.map((sortFilter) => {\n    const defaultValue = defaultValues.find((v) => v.name === sortFilter.name)\n    return {\n      ...sortFilter,\n      ...(defaultValue && { value: defaultValue.value }),\n    }\n  })\n\n  return {\n    filters: filterValues,\n    sortBy: sortValues,\n  }\n}\n\nexport const setUserContextDefaults = (res: Response, filters: FilterValue[]) => {\n  const { dprUser } = localsHelper.getValues(res)\n  const { activeCaseLoadId } = dprUser\n\n  filters.forEach((filter) => {\n    if (\n      filter.type.toLocaleLowerCase() === FilterType.autocomplete.toLocaleLowerCase() &&\n      filter.text.toLocaleLowerCase().includes('establishment') &&\n      activeCaseLoadId?.length\n    ) {\n      const f = <FilterValueWithOptions>filter\n      const option = f.options.find((opt) => opt.value === activeCaseLoadId)\n\n      if (option) {\n        f.value = option.text\n        f.staticOptionNameValue = activeCaseLoadId\n      }\n    }\n  })\n\n  return filters\n}\n\nexport default { saveDefaults, removeDefaults, setFilterValuesFromSavedDefaults, setUserContextDefaults }\n"],
+  "mappings": "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",
+  "names": ["personalisationUtils_exports", "__export", "personalisationUtils_default", "removeDefaults", "saveDefaults", "setFilterValuesFromSavedDefaults", "setUserContextDefaults", "__toCommonJS", "import_localsHelper", "import_UserReports", "import_enum", "import_utils", "import_indexedAccesHelper", "type", "res", "req", "services", "defaultValuesForReport", "getDefaultValues", "dprUser", "localsHelper", "id", "reportId", "defaultFilterValuesService", "filtersType", "token", "definitionsPath", "definition", "fields", "bodyFilterValues", "k", "n", "field", "f", "value", "name", "DateRangeInputUtils", "GranularDateRangeInputUtils", "a", "c", "defaultValue", "filters", "sortBy", "defaultValues", "hasDefaults", "v", "filterValues", "filter", "updatedFilter", "MultiSelectUtils", "DateInputUtils", "sortValues", "sortFilter", "activeCaseLoadId", "option", "opt"]
 }