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

package/dpr/utils/DataTableBuilder/DataTableBuilder.js

@@ -1,2 +1,2 @@
-var g=Object.create;var m=Object.defineProperty;var D=Object.getOwnPropertyDescriptor;var b=Object.getOwnPropertyNames;var S=Object.getPrototypeOf,C=Object.prototype.hasOwnProperty;var w=(o,t)=>{for(var e in t)m(o,e,{get:t[e],enumerable:!0})},d=(o,t,e,r)=>{if(t&&typeof t=="object"||typeof t=="function")for(let a of b(t))!C.call(o,a)&&a!==e&&m(o,a,{get:()=>t[a],enumerable:!(r=D(t,a))||r.enumerable});return o};var h=(o,t,e)=>(e=o!=null?g(S(o)):{},d(t||!o||!o.__esModule?m(e,"default",{value:o,enumerable:!0}):e,o)),v=o=>d(m({},"__esModule",{value:!0}),o);var A={};w(A,{DataTableBuilder:()=>c,default:()=>F});module.exports=v(A);var p=h(require("../urlHelper")),y=h(require("../DateMapper/DateMapper"));class c{constructor(t,e=!1){this.columns=[];this.reportSummaries={};this.reportQuery=null;this.currentQueryParams=null;this.dateMapper=new y.default;this.fields=t,this.sortData=e}mapDate(t){return t?this.dateMapper.toDateString(t,"local-datetime-short-year"):""}mapBoolean(t){return t?t.substring(0,1).toUpperCase()+t.substring(1).toLowerCase():""}mapRow(t,e="",r=[]){return this.fields.filter(a=>this.columns.includes(a.name)).map(a=>{const s=r.find(n=>n.name===a.name)??a;return this.mapCell(s,t,e)})}mapCell(t,e,r=""){const a=this.mapCellValue(t,e[t.name]);let i="string",s=r;t.wordWrap&&(s+=` data-table-cell-wrap-${t.wordWrap.toLowerCase()}`),t.header&&(s+=" govuk-table__header"),(t.type==="double"||t.type==="long")&&(i="numeric");const n=t.type==="HTML";return{fieldName:t.name,...n?{html:a}:{text:a},format:i,classes:s.trim()}}mapCellValue(t,e){if(t.calculated)return e;switch(t.type){case"boolean":return this.mapBoolean(e);case"date":case"time":return this.mapDate(e);default:return e}}mapHeader(t=!1,e=null){return this.fields.filter(r=>this.columns.includes(r.name)).map(r=>{if(this.reportQuery&&!t&&r.sortable){let a="none",i=(0,p.default)(this.currentQueryParams||{},{sortColumn:r.name,sortedAsc:"true"});return r.name===this.reportQuery.sortColumn&&(a=this.reportQuery.sortedAsc?"ascending":"descending",this.reportQuery.sortedAsc&&(i=(0,p.default)(this.currentQueryParams||{},{sortColumn:r.name,sortedAsc:"false"}))),{html:`<a data-column="${r.name}" class="data-table-header-button data-table-header-button-sort-${a}" href="${i}">${r.display}</a>`,...e&&{classes:e}}}return{text:r.display,...e&&{classes:e}}})}mapData(t){const e=this.mapSummary("table-header"),r=this.mergeCells(t.map(i=>this.mapRow(i))),a=this.mapSummary("table-footer");return e.concat(r).concat(a)}mergeCells(t){const e=this.fields.filter(a=>a.mergeRows).map(a=>a.name);if(e.length===0)return t;const r={};return e.forEach(a=>{r[a]=t.reduce((i,s)=>{const n=this.getCellByFieldName(s,a);let l="";return n&&(l=n.text||n.html||""),{...i,[l]:(i[l]??0)+1}},{})}),t.map(a=>{let i=[...a];return e.forEach(s=>{const n=this.getCellByFieldName(a,s);let l,u;if(n&&r[s])switch(l=n.text||n.html||"",u=r[s][l],u){case-1:i=i.filter(f=>f.fieldName!==s);break;case 1:break;default:n.rowspan=u,r[s][l]=-1}}),i})}getCellByFieldName(t,e){return t.find(r=>r.fieldName===e)}mapSummary(t){return this.reportSummaries[t]?this.reportSummaries[t].flatMap(e=>e.data.map(r=>this.mapRow(r,`dpr-report-summary-cell dpr-report-summary-cell-${t}`,e.fields))):[]}sort(t){return this.appendSortKeyToData(t).sort(this.sortKeyComparison()).map(e=>({...e}))}sortKeyComparison(){return(t,e)=>{const r=t.sortKey,a=e.sortKey;return r===a?0:r<a?-1:1}}appendSortKeyToData(t,e=null){const r=e||this.fields;return t.map(a=>{const i=this.getSortKey(a,r);return{...a,sortKey:i}})}mapNamesToFields(t){return t.map(e=>this.fields.find(r=>r.name===e)).filter(e=>e!==void 0)}getSortKey(t,e){return e.map(r=>{const a=t[r.name];return a&&this.dateMapper.isDate(a)?this.dateMapper.toDateString(a,"iso"):this.mapCellValue(r,a)}).join("-").toLowerCase()}convertDataTableToHtml(t){const r=(t.head||[]).map(i=>`<th scope='col' class='govuk-table__header'>${i.html??i.text}</th>`),a=t.rows.map(i=>`<tr class='govuk-table__row'>${i.map(s=>`<td class='govuk-table__cell govuk-table__cell--${s.format} ${s.classes}'>${s.html??s.text}</td>`).join("")}</tr>`);return`<table class='govuk-table'><thead class='govuk-table__head'>${r.join("")}</thead><tbody class='govuk-table__body'>${a.join("")}</tbody></table>`}withHeaderOptions({reportQuery:t,columns:e,interactive:r}){return r&&t?this.withHeaderSortOptions(t):this.withNoHeaderOptions(e)}withHeaderSortOptions(t){return this.reportQuery=t,this.columns=t.columns,this.currentQueryParams=this.reportQuery.toRecordWithFilterPrefix(),this}withNoHeaderOptions(t){return this.columns=t,this}buildTable(t){const e=this.mapData(this.sortData?this.sort(t):t);return{head:this.mapHeader(),rows:e,rowCount:t.length,colCount:this.columns.length}}withSummaries(t){return this.reportSummaries=t,this}withSortedData(t=!0){return this.sortData=t,this}}var F=c;0&&(module.exports={DataTableBuilder});
+var g=Object.create;var m=Object.defineProperty;var D=Object.getOwnPropertyDescriptor;var b=Object.getOwnPropertyNames;var S=Object.getPrototypeOf,C=Object.prototype.hasOwnProperty;var w=(i,e)=>{for(var t in e)m(i,t,{get:e[t],enumerable:!0})},d=(i,e,t,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let a of b(e))!C.call(i,a)&&a!==t&&m(i,a,{get:()=>e[a],enumerable:!(r=D(e,a))||r.enumerable});return i};var h=(i,e,t)=>(t=i!=null?g(S(i)):{},d(e||!i||!i.__esModule?m(t,"default",{value:i,enumerable:!0}):t,i)),v=i=>d(m({},"__esModule",{value:!0}),i);var K={};w(K,{DataTableBuilder:()=>u,default:()=>F});module.exports=v(K);var p=h(require("../urlHelper")),y=h(require("../DateMapper/DateMapper"));class u{constructor(e,t=!1){this.columns=[];this.reportSummaries={};this.reportQuery=null;this.currentQueryParams=null;this.dateMapper=new y.default;this.fields=e,this.sortData=t}mapDate(e){return e?this.dateMapper.toDateString(e,"local-datetime-short-year"):""}mapBoolean(e){return e?e.substring(0,1).toUpperCase()+e.substring(1).toLowerCase():""}mapRow(e,t="",r=[]){return this.fields.filter(a=>this.columns.includes(a.name)).map(a=>{const o=r.find(n=>n.name===a.name)??a;return this.mapCell(o,e,t)})}mapCell(e,t,r=""){const a=this.mapCellValue(e,t[e.name]);let s="string",o=r;e.wordWrap&&(o+=` data-table-cell-wrap-${e.wordWrap.toLowerCase()}`),e.header&&(o+=" govuk-table__header"),(e.type==="double"||e.type==="long")&&(s="numeric");const n=e.type==="HTML";return{fieldName:e.name,...n?{html:a}:{text:a},format:s,classes:o.trim()}}mapCellValue(e,t){if(e.calculated)return t;switch(e.type){case"boolean":return this.mapBoolean(t);case"date":case"time":return this.mapDate(t);default:return t}}mapHeader(e=!1,t=null){return this.fields.filter(r=>this.columns.includes(r.name)).map(r=>{if(this.reportQuery&&!e&&r.sortable){let a="none",s=(0,p.default)(this.currentQueryParams||{},{sortColumn:r.name,sortedAsc:"true"},this.fields);return r.name===this.reportQuery.sortColumn&&(a=this.reportQuery.sortedAsc?"ascending":"descending",this.reportQuery.sortedAsc&&(s=(0,p.default)(this.currentQueryParams||{},{sortColumn:r.name,sortedAsc:"false"},this.fields))),{html:`<a data-column="${r.name}" class="data-table-header-button data-table-header-button-sort-${a}" href="${s}">${r.display}</a>`,...t&&{classes:t}}}return{text:r.display,...t&&{classes:t}}})}mapData(e){const t=this.mapSummary("table-header"),r=this.mergeCells(e.map(s=>this.mapRow(s))),a=this.mapSummary("table-footer");return t.concat(r).concat(a)}mergeCells(e){const t=this.fields.filter(a=>a.mergeRows).map(a=>a.name);if(t.length===0)return e;const r={};return t.forEach(a=>{r[a]=e.reduce((s,o)=>{const n=this.getCellByFieldName(o,a);let l="";return n&&(l=n.text||n.html||""),{...s,[l]:(s[l]??0)+1}},{})}),e.map(a=>{let s=[...a];return t.forEach(o=>{const n=this.getCellByFieldName(a,o);let l,c;if(n&&r[o])switch(l=n.text||n.html||"",c=r[o][l],c){case-1:s=s.filter(f=>f.fieldName!==o);break;case 1:break;default:n.rowspan=c,r[o][l]=-1}}),s})}getCellByFieldName(e,t){return e.find(r=>r.fieldName===t)}mapSummary(e){return this.reportSummaries[e]?this.reportSummaries[e].flatMap(t=>t.data.map(r=>this.mapRow(r,`dpr-report-summary-cell dpr-report-summary-cell-${e}`,t.fields))):[]}sort(e){return this.appendSortKeyToData(e).sort(this.sortKeyComparison()).map(t=>({...t}))}sortKeyComparison(){return(e,t)=>{const r=e.sortKey,a=t.sortKey;return r===a?0:r<a?-1:1}}appendSortKeyToData(e,t=null){const r=t||this.fields;return e.map(a=>{const s=this.getSortKey(a,r);return{...a,sortKey:s}})}mapNamesToFields(e){return e.map(t=>this.fields.find(r=>r.name===t)).filter(t=>t!==void 0)}getSortKey(e,t){return t.map(r=>{const a=e[r.name];return a&&this.dateMapper.isDate(a)?this.dateMapper.toDateString(a,"iso"):this.mapCellValue(r,a)}).join("-").toLowerCase()}convertDataTableToHtml(e){const r=(e.head||[]).map(s=>`<th scope='col' class='govuk-table__header'>${s.html??s.text}</th>`),a=e.rows.map(s=>`<tr class='govuk-table__row'>${s.map(o=>`<td class='govuk-table__cell govuk-table__cell--${o.format} ${o.classes}'>${o.html??o.text}</td>`).join("")}</tr>`);return`<table class='govuk-table'><thead class='govuk-table__head'>${r.join("")}</thead><tbody class='govuk-table__body'>${a.join("")}</tbody></table>`}withHeaderOptions({reportQuery:e,columns:t,interactive:r}){return r&&e?this.withHeaderSortOptions(e):this.withNoHeaderOptions(t)}withHeaderSortOptions(e){return this.reportQuery=e,this.columns=e.columns,this.currentQueryParams=this.reportQuery.toRecordWithFilterPrefix(),this}withNoHeaderOptions(e){return this.columns=e,this}buildTable(e){const t=this.mapData(this.sortData?this.sort(e):e);return{head:this.mapHeader(),rows:t,rowCount:e.length,colCount:this.columns.length}}withSummaries(e){return this.reportSummaries=e,this}withSortedData(e=!0){return this.sortData=e,this}}var F=u;0&&(module.exports={DataTableBuilder});
 //# sourceMappingURL=DataTableBuilder.js.map

package/dpr/utils/DataTableBuilder/DataTableBuilder.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/dpr/utils/DataTableBuilder/DataTableBuilder.ts"],
-  "sourcesContent": ["import Dict = NodeJS.Dict\nimport ReportQuery from '../../types/ReportQuery'\nimport { Cell, CellFormat, DataTable, FieldDefinition, SortKey } from './types'\nimport createUrlForParameters from '../urlHelper'\nimport type { SummaryTemplate } from '../../types/Templates'\nimport { AsyncSummary } from '../../types/UserReports'\nimport DateMapper from '../DateMapper/DateMapper'\n\nclass DataTableBuilder {\n  protected fields: Array<FieldDefinition>\n\n  private sortData: boolean\n\n  protected columns: Array<string> = []\n\n  protected reportSummaries: Dict<Array<AsyncSummary>> = {}\n\n  // Sortable headers only\n  private reportQuery: ReportQuery | null = null\n\n  private currentQueryParams: NodeJS.Dict<string | Array<string>> | null = null\n\n  private dateMapper = new DateMapper()\n\n  constructor(fields: Array<FieldDefinition>, sortData = false) {\n    this.fields = fields\n    this.sortData = sortData\n  }\n\n  private mapDate(isoDate?: string) {\n    if (!isoDate) return ''\n\n    return this.dateMapper.toDateString(isoDate, 'local-datetime-short-year')\n  }\n\n  private mapBoolean(value?: string) {\n    if (!value) return ''\n    return value.substring(0, 1).toUpperCase() + value.substring(1).toLowerCase()\n  }\n\n  protected mapRow(\n    rowData: NodeJS.Dict<string>,\n    extraClasses = '',\n    overrideFields: Array<FieldDefinition> = [],\n  ): Cell[] {\n    return this.fields\n      .filter((f) => this.columns.includes(f.name))\n      .map((f) => {\n        const overrideField = overrideFields.find((o) => o.name === f.name)\n        const field = overrideField ?? f\n        return this.mapCell(field, rowData, extraClasses)\n      })\n  }\n\n  private mapCell(field: FieldDefinition, rowData: NodeJS.Dict<string>, extraClasses = '') {\n    const textValue = this.mapCellValue(field, rowData[field.name])\n    let fieldFormat: CellFormat = 'string'\n\n    let classes = extraClasses\n\n    if (field.wordWrap) {\n      classes += ` data-table-cell-wrap-${field.wordWrap.toLowerCase()}`\n    }\n\n    if (field.header) {\n      classes += ' govuk-table__header'\n    }\n\n    if (field.type === 'double' || field.type === 'long') {\n      fieldFormat = 'numeric'\n    }\n\n    const isHtml = field.type === 'HTML'\n    const cell: Cell = {\n      fieldName: field.name,\n      ...(isHtml ? { html: textValue } : { text: textValue }),\n      format: fieldFormat,\n      classes: classes.trim(),\n    }\n\n    return cell\n  }\n\n  protected mapCellValue(field: FieldDefinition, cellData?: string) {\n    if (field.calculated) {\n      return cellData\n    }\n\n    switch (field.type) {\n      case 'boolean':\n        return this.mapBoolean(cellData)\n\n      case 'date':\n      case 'time':\n        return this.mapDate(cellData)\n\n      default:\n        return cellData\n    }\n  }\n\n  protected mapHeader(disableSort = false, extraClasses: string | null = null): Cell[] {\n    return this.fields\n      .filter((field) => this.columns.includes(field.name))\n      .map((f) => {\n        if (this.reportQuery && !disableSort) {\n          if (f.sortable) {\n            let sortDirection = 'none'\n            let url = createUrlForParameters(this.currentQueryParams || {}, {\n              sortColumn: f.name,\n              sortedAsc: 'true',\n            })\n\n            if (f.name === this.reportQuery.sortColumn) {\n              sortDirection = this.reportQuery.sortedAsc ? 'ascending' : 'descending'\n\n              if (this.reportQuery.sortedAsc) {\n                url = createUrlForParameters(this.currentQueryParams || {}, {\n                  sortColumn: f.name,\n                  sortedAsc: 'false',\n                })\n              }\n            }\n\n            return {\n              html:\n                `<a ` +\n                `data-column=\"${f.name}\" ` +\n                `class=\"data-table-header-button data-table-header-button-sort-${sortDirection}\" ` +\n                `href=\"${url}\"` +\n                `>${f.display}</a>`,\n              ...(extraClasses && { classes: extraClasses }),\n            }\n          }\n        }\n        return {\n          text: f.display,\n          ...(extraClasses && { classes: extraClasses }),\n        }\n      })\n  }\n\n  protected mapData(data: Array<Dict<string>>): Cell[][] {\n    const mappedHeaderSummary = this.mapSummary('table-header')\n    const mappedTableData = this.mergeCells(data.map((rowData) => this.mapRow(rowData)))\n    const mappedFooterSummary = this.mapSummary('table-footer')\n\n    return mappedHeaderSummary.concat(mappedTableData).concat(mappedFooterSummary)\n  }\n\n  private mergeCells(rows: Cell[][]): Cell[][] {\n    const mergeFieldNames = this.fields.filter((f) => f.mergeRows).map((f) => f.name)\n\n    if (mergeFieldNames.length === 0) {\n      return rows\n    }\n\n    const occurrences: Dict<Dict<number>> = {}\n    mergeFieldNames.forEach((f) => {\n      occurrences[f] = rows.reduce((accumulator: Dict<number>, currentRow) => {\n        const currentCell = this.getCellByFieldName(currentRow, f)\n        let cellValue = ''\n        if (currentCell) {\n          cellValue = currentCell.text || currentCell.html || ''\n        }\n\n        return {\n          ...accumulator,\n          [cellValue]: (accumulator[cellValue] ?? 0) + 1,\n        }\n      }, {})\n    })\n\n    return rows.map((row) => {\n      let mergedRow = [...row]\n\n      mergeFieldNames.forEach((mergeFieldName) => {\n        const currentRowCell = this.getCellByFieldName(row, mergeFieldName)\n        let cellValue\n        let occurrencesOfValue\n        if (currentRowCell && occurrences[mergeFieldName]) {\n          cellValue = currentRowCell.text || currentRowCell.html || ''\n          occurrencesOfValue = occurrences[mergeFieldName][cellValue]\n\n          switch (occurrencesOfValue) {\n            case -1:\n              mergedRow = mergedRow.filter((c) => c.fieldName !== mergeFieldName)\n              break\n\n            case 1:\n              break\n\n            default:\n              currentRowCell.rowspan = occurrencesOfValue\n              occurrences[mergeFieldName][cellValue] = -1\n          }\n        }\n      })\n\n      return mergedRow\n    })\n  }\n\n  private getCellByFieldName(row: Cell[], fieldName: string) {\n    return row.find((c) => c.fieldName === fieldName)\n  }\n\n  private mapSummary(template: SummaryTemplate): Cell[][] {\n    if (this.reportSummaries[template]) {\n      return this.reportSummaries[template].flatMap((reportSummary) =>\n        reportSummary.data.map((rowData) =>\n          this.mapRow(rowData, `dpr-report-summary-cell dpr-report-summary-cell-${template}`, reportSummary.fields),\n        ),\n      )\n    }\n    return []\n  }\n\n  protected sort(data: Dict<string>[]): Dict<string>[] {\n    return this.appendSortKeyToData(data)\n      .sort(this.sortKeyComparison())\n      .map((d: SortKey) => ({\n        ...d,\n      }))\n  }\n\n  protected sortKeyComparison() {\n    return (a: SortKey, b: SortKey) => {\n      const aValue = a.sortKey\n      const bValue = b.sortKey\n\n      if (aValue === bValue) {\n        return 0\n      }\n\n      if (aValue < bValue) {\n        return -1\n      }\n\n      return 1\n    }\n  }\n\n  private appendSortKeyToData(data: Dict<string>[], fields: FieldDefinition[] | null = null): SortKey[] {\n    const sortFields = fields || this.fields\n\n    return data.map((rowData) => {\n      const sortKey = this.getSortKey(rowData, sortFields)\n\n      return {\n        ...rowData,\n        sortKey,\n      }\n    })\n  }\n\n  protected mapNamesToFields(names: string[]): FieldDefinition[] {\n    return names.map((s) => this.fields.find((f) => f.name === s)).filter((n) => n !== undefined)\n  }\n\n  protected getSortKey(rowData: NodeJS.Dict<string>, sortFields: FieldDefinition[]) {\n    return sortFields\n      .map((f) => {\n        const value = rowData[f.name]\n        if (value && this.dateMapper.isDate(value)) {\n          return this.dateMapper.toDateString(value, 'iso')\n        }\n\n        return this.mapCellValue(f, value)\n      })\n      .join('-')\n      .toLowerCase()\n  }\n\n  protected convertDataTableToHtml(dataTable: DataTable): string {\n    const head = dataTable.head || []\n    const headers = head.map((h) => `<th scope='col' class='govuk-table__header'>${h.html ?? h.text}</th>`)\n    const rows = dataTable.rows.map(\n      (r) =>\n        `<tr class='govuk-table__row'>${r\n          .map(\n            (c) => `<td class='govuk-table__cell govuk-table__cell--${c.format} ${c.classes}'>${c.html ?? c.text}</td>`,\n          )\n          .join('')}</tr>`,\n    )\n\n    return (\n      \"<table class='govuk-table'>\" +\n      `<thead class='govuk-table__head'>${headers.join('')}</thead>` +\n      `<tbody class='govuk-table__body'>${rows.join('')}</tbody>` +\n      '</table>'\n    )\n  }\n\n  withHeaderOptions({\n    reportQuery,\n    columns,\n    interactive,\n  }: {\n    reportQuery?: ReportQuery\n    columns: string[]\n    interactive: boolean\n  }) {\n    if (interactive && reportQuery) {\n      return this.withHeaderSortOptions(reportQuery)\n    }\n    return this.withNoHeaderOptions(columns)\n  }\n\n  withHeaderSortOptions(reportQuery: ReportQuery) {\n    this.reportQuery = reportQuery\n    this.columns = reportQuery.columns\n    this.currentQueryParams = this.reportQuery.toRecordWithFilterPrefix()\n\n    return this\n  }\n\n  withNoHeaderOptions(columns: string[]) {\n    this.columns = columns\n    return this\n  }\n\n  buildTable(data: Array<Dict<string>>): DataTable {\n    const mappedData = this.mapData(this.sortData ? this.sort(data) : data)\n\n    return {\n      head: this.mapHeader(),\n      rows: mappedData,\n      rowCount: data.length,\n      colCount: this.columns.length,\n    }\n  }\n\n  withSummaries(reportSummaries: Dict<Array<AsyncSummary>>) {\n    this.reportSummaries = reportSummaries\n    return this\n  }\n\n  withSortedData(sortData = true) {\n    this.sortData = sortData\n    return this\n  }\n}\n\nexport { DataTableBuilder }\nexport default DataTableBuilder\n"],
-  "mappings": "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",
+  "sourcesContent": ["import Dict = NodeJS.Dict\nimport ReportQuery from '../../types/ReportQuery'\nimport { Cell, CellFormat, DataTable, SortKey } from './types'\nimport createUrlForParameters from '../urlHelper'\nimport type { SummaryTemplate } from '../../types/Templates'\nimport { AsyncSummary } from '../../types/UserReports'\nimport DateMapper from '../DateMapper/DateMapper'\nimport { components } from '../../types/api'\n\nclass DataTableBuilder {\n  protected fields: components['schemas']['FieldDefinition'][]\n\n  private sortData: boolean\n\n  protected columns: Array<string> = []\n\n  protected reportSummaries: Dict<Array<AsyncSummary>> = {}\n\n  // Sortable headers only\n  private reportQuery: ReportQuery | null = null\n\n  private currentQueryParams: NodeJS.Dict<string | Array<string>> | null = null\n\n  private dateMapper = new DateMapper()\n\n  constructor(fields: components['schemas']['FieldDefinition'][], sortData = false) {\n    this.fields = fields\n    this.sortData = sortData\n  }\n\n  private mapDate(isoDate?: string) {\n    if (!isoDate) return ''\n\n    return this.dateMapper.toDateString(isoDate, 'local-datetime-short-year')\n  }\n\n  private mapBoolean(value?: string) {\n    if (!value) return ''\n    return value.substring(0, 1).toUpperCase() + value.substring(1).toLowerCase()\n  }\n\n  protected mapRow(\n    rowData: NodeJS.Dict<string>,\n    extraClasses = '',\n    overrideFields: components['schemas']['FieldDefinition'][] = [],\n  ): Cell[] {\n    return this.fields\n      .filter((f) => this.columns.includes(f.name))\n      .map((f) => {\n        const overrideField = overrideFields.find((o) => o.name === f.name)\n        const field = overrideField ?? f\n        return this.mapCell(field, rowData, extraClasses)\n      })\n  }\n\n  private mapCell(field: components['schemas']['FieldDefinition'], rowData: NodeJS.Dict<string>, extraClasses = '') {\n    const textValue = this.mapCellValue(field, rowData[field.name])\n    let fieldFormat: CellFormat = 'string'\n\n    let classes = extraClasses\n\n    if (field.wordWrap) {\n      classes += ` data-table-cell-wrap-${field.wordWrap.toLowerCase()}`\n    }\n\n    if (field.header) {\n      classes += ' govuk-table__header'\n    }\n\n    if (field.type === 'double' || field.type === 'long') {\n      fieldFormat = 'numeric'\n    }\n\n    const isHtml = field.type === 'HTML'\n    const cell: Cell = {\n      fieldName: field.name,\n      ...(isHtml ? { html: textValue } : { text: textValue }),\n      format: fieldFormat,\n      classes: classes.trim(),\n    }\n\n    return cell\n  }\n\n  protected mapCellValue(field: components['schemas']['FieldDefinition'], cellData?: string) {\n    if (field.calculated) {\n      return cellData\n    }\n\n    switch (field.type) {\n      case 'boolean':\n        return this.mapBoolean(cellData)\n\n      case 'date':\n      case 'time':\n        return this.mapDate(cellData)\n\n      default:\n        return cellData\n    }\n  }\n\n  protected mapHeader(disableSort = false, extraClasses: string | null = null): Cell[] {\n    return this.fields\n      .filter((field) => this.columns.includes(field.name))\n      .map((f) => {\n        if (this.reportQuery && !disableSort) {\n          if (f.sortable) {\n            let sortDirection = 'none'\n            let url = createUrlForParameters(\n              this.currentQueryParams || {},\n              {\n                sortColumn: f.name,\n                sortedAsc: 'true',\n              },\n              this.fields,\n            )\n\n            if (f.name === this.reportQuery.sortColumn) {\n              sortDirection = this.reportQuery.sortedAsc ? 'ascending' : 'descending'\n\n              if (this.reportQuery.sortedAsc) {\n                url = createUrlForParameters(\n                  this.currentQueryParams || {},\n                  {\n                    sortColumn: f.name,\n                    sortedAsc: 'false',\n                  },\n                  this.fields,\n                )\n              }\n            }\n\n            return {\n              html:\n                `<a ` +\n                `data-column=\"${f.name}\" ` +\n                `class=\"data-table-header-button data-table-header-button-sort-${sortDirection}\" ` +\n                `href=\"${url}\"` +\n                `>${f.display}</a>`,\n              ...(extraClasses && { classes: extraClasses }),\n            }\n          }\n        }\n        return {\n          text: f.display,\n          ...(extraClasses && { classes: extraClasses }),\n        }\n      })\n  }\n\n  protected mapData(data: Array<Dict<string>>): Cell[][] {\n    const mappedHeaderSummary = this.mapSummary('table-header')\n    const mappedTableData = this.mergeCells(data.map((rowData) => this.mapRow(rowData)))\n    const mappedFooterSummary = this.mapSummary('table-footer')\n\n    return mappedHeaderSummary.concat(mappedTableData).concat(mappedFooterSummary)\n  }\n\n  private mergeCells(rows: Cell[][]): Cell[][] {\n    const mergeFieldNames = this.fields\n      .filter((f) => (<components['schemas']['SummaryField']>f).mergeRows)\n      .map((f) => f.name)\n\n    if (mergeFieldNames.length === 0) {\n      return rows\n    }\n\n    const occurrences: Dict<Dict<number>> = {}\n    mergeFieldNames.forEach((f) => {\n      occurrences[f] = rows.reduce((accumulator: Dict<number>, currentRow) => {\n        const currentCell = this.getCellByFieldName(currentRow, f)\n        let cellValue = ''\n        if (currentCell) {\n          cellValue = currentCell.text || currentCell.html || ''\n        }\n\n        return {\n          ...accumulator,\n          [cellValue]: (accumulator[cellValue] ?? 0) + 1,\n        }\n      }, {})\n    })\n\n    return rows.map((row) => {\n      let mergedRow = [...row]\n\n      mergeFieldNames.forEach((mergeFieldName) => {\n        const currentRowCell = this.getCellByFieldName(row, mergeFieldName)\n        let cellValue\n        let occurrencesOfValue\n        if (currentRowCell && occurrences[mergeFieldName]) {\n          cellValue = currentRowCell.text || currentRowCell.html || ''\n          occurrencesOfValue = occurrences[mergeFieldName][cellValue]\n\n          switch (occurrencesOfValue) {\n            case -1:\n              mergedRow = mergedRow.filter((c) => c.fieldName !== mergeFieldName)\n              break\n\n            case 1:\n              break\n\n            default:\n              currentRowCell.rowspan = occurrencesOfValue\n              occurrences[mergeFieldName][cellValue] = -1\n          }\n        }\n      })\n\n      return mergedRow\n    })\n  }\n\n  private getCellByFieldName(row: Cell[], fieldName: string) {\n    return row.find((c) => c.fieldName === fieldName)\n  }\n\n  private mapSummary(template: SummaryTemplate): Cell[][] {\n    if (this.reportSummaries[template]) {\n      return this.reportSummaries[template].flatMap((reportSummary) =>\n        reportSummary.data.map((rowData) =>\n          this.mapRow(\n            rowData,\n            `dpr-report-summary-cell dpr-report-summary-cell-${template}`,\n            <components['schemas']['FieldDefinition'][]>reportSummary.fields,\n          ),\n        ),\n      )\n    }\n    return []\n  }\n\n  protected sort(data: Dict<string>[]): Dict<string>[] {\n    return this.appendSortKeyToData(data)\n      .sort(this.sortKeyComparison())\n      .map((d: SortKey) => ({\n        ...d,\n      }))\n  }\n\n  protected sortKeyComparison() {\n    return (a: SortKey, b: SortKey) => {\n      const aValue = a.sortKey\n      const bValue = b.sortKey\n\n      if (aValue === bValue) {\n        return 0\n      }\n\n      if (aValue < bValue) {\n        return -1\n      }\n\n      return 1\n    }\n  }\n\n  private appendSortKeyToData(\n    data: Dict<string>[],\n    fields: components['schemas']['FieldDefinition'][] | null = null,\n  ): SortKey[] {\n    const sortFields = fields || this.fields\n\n    return data.map((rowData) => {\n      const sortKey = this.getSortKey(rowData, sortFields)\n\n      return {\n        ...rowData,\n        sortKey,\n      }\n    })\n  }\n\n  protected mapNamesToFields(names: string[]): components['schemas']['FieldDefinition'][] {\n    return names.map((s) => this.fields.find((f) => f.name === s)).filter((n) => n !== undefined)\n  }\n\n  protected getSortKey(rowData: NodeJS.Dict<string>, sortFields: components['schemas']['FieldDefinition'][]) {\n    return sortFields\n      .map((f) => {\n        const value = rowData[f.name]\n        if (value && this.dateMapper.isDate(value)) {\n          return this.dateMapper.toDateString(value, 'iso')\n        }\n\n        return this.mapCellValue(f, value)\n      })\n      .join('-')\n      .toLowerCase()\n  }\n\n  protected convertDataTableToHtml(dataTable: DataTable): string {\n    const head = dataTable.head || []\n    const headers = head.map((h) => `<th scope='col' class='govuk-table__header'>${h.html ?? h.text}</th>`)\n    const rows = dataTable.rows.map(\n      (r) =>\n        `<tr class='govuk-table__row'>${r\n          .map(\n            (c) => `<td class='govuk-table__cell govuk-table__cell--${c.format} ${c.classes}'>${c.html ?? c.text}</td>`,\n          )\n          .join('')}</tr>`,\n    )\n\n    return (\n      \"<table class='govuk-table'>\" +\n      `<thead class='govuk-table__head'>${headers.join('')}</thead>` +\n      `<tbody class='govuk-table__body'>${rows.join('')}</tbody>` +\n      '</table>'\n    )\n  }\n\n  withHeaderOptions({\n    reportQuery,\n    columns,\n    interactive,\n  }: {\n    reportQuery?: ReportQuery\n    columns: string[]\n    interactive: boolean\n  }) {\n    if (interactive && reportQuery) {\n      return this.withHeaderSortOptions(reportQuery)\n    }\n    return this.withNoHeaderOptions(columns)\n  }\n\n  withHeaderSortOptions(reportQuery: ReportQuery) {\n    this.reportQuery = reportQuery\n    this.columns = reportQuery.columns\n    this.currentQueryParams = this.reportQuery.toRecordWithFilterPrefix()\n\n    return this\n  }\n\n  withNoHeaderOptions(columns: string[]) {\n    this.columns = columns\n    return this\n  }\n\n  buildTable(data: Array<Dict<string>>): DataTable {\n    const mappedData = this.mapData(this.sortData ? this.sort(data) : data)\n\n    return {\n      head: this.mapHeader(),\n      rows: mappedData,\n      rowCount: data.length,\n      colCount: this.columns.length,\n    }\n  }\n\n  withSummaries(reportSummaries: Dict<Array<AsyncSummary>>) {\n    this.reportSummaries = reportSummaries\n    return this\n  }\n\n  withSortedData(sortData = true) {\n    this.sortData = sortData\n    return this\n  }\n}\n\nexport { DataTableBuilder }\nexport default DataTableBuilder\n"],
+  "mappings": "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",
   "names": ["DataTableBuilder_exports", "__export", "DataTableBuilder", "DataTableBuilder_default", "__toCommonJS", "import_urlHelper", "import_DateMapper", "fields", "sortData", "DateMapper", "isoDate", "value", "rowData", "extraClasses", "overrideFields", "f", "field", "o", "textValue", "fieldFormat", "classes", "isHtml", "cellData", "disableSort", "sortDirection", "url", "createUrlForParameters", "data", "mappedHeaderSummary", "mappedTableData", "mappedFooterSummary", "rows", "mergeFieldNames", "occurrences", "accumulator", "currentRow", "currentCell", "cellValue", "row", "mergedRow", "mergeFieldName", "currentRowCell", "occurrencesOfValue", "c", "fieldName", "template", "reportSummary", "d", "a", "b", "aValue", "bValue", "sortFields", "sortKey", "names", "s", "n", "dataTable", "headers", "h", "r", "reportQuery", "columns", "interactive", "mappedData", "reportSummaries"]
 }

package/dpr/utils/DataTableBuilder/DataTableBuilder.ts

@@ -1,13 +1,14 @@
 import Dict = NodeJS.Dict
 import ReportQuery from '../../types/ReportQuery'
-import { Cell, CellFormat, DataTable, FieldDefinition, SortKey } from './types'
+import { Cell, CellFormat, DataTable, SortKey } from './types'
 import createUrlForParameters from '../urlHelper'
 import type { SummaryTemplate } from '../../types/Templates'
 import { AsyncSummary } from '../../types/UserReports'
 import DateMapper from '../DateMapper/DateMapper'
+import { components } from '../../types/api'
 
 class DataTableBuilder {
-  protected fields: Array<FieldDefinition>
+  protected fields: components['schemas']['FieldDefinition'][]
 
   private sortData: boolean
 
@@ -22,7 +23,7 @@ class DataTableBuilder {
 
   private dateMapper = new DateMapper()
 
-  constructor(fields: Array<FieldDefinition>, sortData = false) {
+  constructor(fields: components['schemas']['FieldDefinition'][], sortData = false) {
     this.fields = fields
     this.sortData = sortData
   }
@@ -41,7 +42,7 @@ class DataTableBuilder {
   protected mapRow(
     rowData: NodeJS.Dict<string>,
     extraClasses = '',
-    overrideFields: Array<FieldDefinition> = [],
+    overrideFields: components['schemas']['FieldDefinition'][] = [],
   ): Cell[] {
     return this.fields
       .filter((f) => this.columns.includes(f.name))
@@ -52,7 +53,7 @@ class DataTableBuilder {
       })
   }
 
-  private mapCell(field: FieldDefinition, rowData: NodeJS.Dict<string>, extraClasses = '') {
+  private mapCell(field: components['schemas']['FieldDefinition'], rowData: NodeJS.Dict<string>, extraClasses = '') {
     const textValue = this.mapCellValue(field, rowData[field.name])
     let fieldFormat: CellFormat = 'string'
 
@@ -81,7 +82,7 @@ class DataTableBuilder {
     return cell
   }
 
-  protected mapCellValue(field: FieldDefinition, cellData?: string) {
+  protected mapCellValue(field: components['schemas']['FieldDefinition'], cellData?: string) {
     if (field.calculated) {
       return cellData
     }
@@ -106,19 +107,27 @@ class DataTableBuilder {
         if (this.reportQuery && !disableSort) {
           if (f.sortable) {
             let sortDirection = 'none'
-            let url = createUrlForParameters(this.currentQueryParams || {}, {
-              sortColumn: f.name,
-              sortedAsc: 'true',
-            })
+            let url = createUrlForParameters(
+              this.currentQueryParams || {},
+              {
+                sortColumn: f.name,
+                sortedAsc: 'true',
+              },
+              this.fields,
+            )
 
             if (f.name === this.reportQuery.sortColumn) {
               sortDirection = this.reportQuery.sortedAsc ? 'ascending' : 'descending'
 
               if (this.reportQuery.sortedAsc) {
-                url = createUrlForParameters(this.currentQueryParams || {}, {
-                  sortColumn: f.name,
-                  sortedAsc: 'false',
-                })
+                url = createUrlForParameters(
+                  this.currentQueryParams || {},
+                  {
+                    sortColumn: f.name,
+                    sortedAsc: 'false',
+                  },
+                  this.fields,
+                )
               }
             }
 
@@ -149,7 +158,9 @@ class DataTableBuilder {
   }
 
   private mergeCells(rows: Cell[][]): Cell[][] {
-    const mergeFieldNames = this.fields.filter((f) => f.mergeRows).map((f) => f.name)
+    const mergeFieldNames = this.fields
+      .filter((f) => (<components['schemas']['SummaryField']>f).mergeRows)
+      .map((f) => f.name)
 
     if (mergeFieldNames.length === 0) {
       return rows
@@ -209,7 +220,11 @@ class DataTableBuilder {
     if (this.reportSummaries[template]) {
       return this.reportSummaries[template].flatMap((reportSummary) =>
         reportSummary.data.map((rowData) =>
-          this.mapRow(rowData, `dpr-report-summary-cell dpr-report-summary-cell-${template}`, reportSummary.fields),
+          this.mapRow(
+            rowData,
+            `dpr-report-summary-cell dpr-report-summary-cell-${template}`,
+            <components['schemas']['FieldDefinition'][]>reportSummary.fields,
+          ),
         ),
       )
     }
@@ -241,7 +256,10 @@ class DataTableBuilder {
     }
   }
 
-  private appendSortKeyToData(data: Dict<string>[], fields: FieldDefinition[] | null = null): SortKey[] {
+  private appendSortKeyToData(
+    data: Dict<string>[],
+    fields: components['schemas']['FieldDefinition'][] | null = null,
+  ): SortKey[] {
     const sortFields = fields || this.fields
 
     return data.map((rowData) => {
@@ -254,11 +272,11 @@ class DataTableBuilder {
     })
   }
 
-  protected mapNamesToFields(names: string[]): FieldDefinition[] {
+  protected mapNamesToFields(names: string[]): components['schemas']['FieldDefinition'][] {
     return names.map((s) => this.fields.find((f) => f.name === s)).filter((n) => n !== undefined)
   }
 
-  protected getSortKey(rowData: NodeJS.Dict<string>, sortFields: FieldDefinition[]) {
+  protected getSortKey(rowData: NodeJS.Dict<string>, sortFields: components['schemas']['FieldDefinition'][]) {
     return sortFields
       .map((f) => {
         const value = rowData[f.name]

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,F=Object.prototype.hasOwnProperty;var N=(s,c)=>{for(var t in c)u(s,t,{get:c[t],enumerable:!0})},f=(s,c,t,r)=>{if(c&&typeof c=="object"||typeof c=="function")for(let e of A(c))!F.call(s,e)&&e!==t&&u(s,e,{get:()=>c[e],enumerable:!(r=v(c,e))||r.enumerable});return s};var S=(s,c,t)=>(t=s!=null?P(w(s)):{},f(c||!s||!s.__esModule?u(t,"default",{value:s,enumerable:!0}):t,s)),B=s=>f(u({},"__esModule",{value:!0}),s);var J={};N(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,[])),n=this.calculateParentChildKeys(t,i);n.forEach(a=>{e[a.sortKey]={parent:[]}}),e=this.splitParentDataIntoSections(e,t,i),e=this.splitChildDataIntoSections(n,e);const l=this.createChildDataTableBuilders();return n.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,n=[];return Object.keys(i).forEach(o=>{const a=i[o];n.push({sectionDescription:o,...this.getSectionCount(i,o),rows:this.createParentChildTable(a,r)})}),n.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,n=i?i.fields:[],l=n.filter(a=>a.visible||a.mandatory).map(a=>a.name),o=new g.default(n).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,n)=>({...i,[n.id]:this.getSortKey(e,this.mapNamesToFields(n.joinFields))}),{})})).reduce((e,i)=>e.find(n=>n.sortKey===i.sortKey)?e:e.concat(i),[])}splitParentDataIntoSections(t,r,e){return r.reduce((i,n)=>{const l=this.getSortKey(n,e),o=i[l]?i[l].parent:[];return{...i,...o&&{[l]:{parent:o.concat(n)}}}},t)}splitChildDataIntoSections(t,r){const e={...r};return this.childVariants.forEach(i=>{const n=this.mapNamesToFields(i.joinFields),l=this.childData.find(a=>a.id===i.id);(l?l.data:[]).filter(a=>{const d=this.getSortKey(a,n);return t.find(p=>p.childSortKeys[i.id]===d)}).forEach(a=>{const d=this.getSortKey(a,n),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});
+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, FieldDefinition } 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(parentData: Array<NodeJS.Dict<string>>, joinFields: FieldDefinition[]) {\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: 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": "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",
+  "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": "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",
   "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.ts

@@ -1,6 +1,6 @@
 import Dict = NodeJS.Dict
 import { components } from '../../types/api'
-import { Cell, DataTable, FieldDefinition } from '../DataTableBuilder/types'
+import { Cell, DataTable } from '../DataTableBuilder/types'
 import DataTableBuilder from '../DataTableBuilder/DataTableBuilder'
 import { distinct } from '../arrayUtils'
 import { ChildData, ParentChildSortKey } from './types'
@@ -130,7 +130,10 @@ class ParentChildDataTableBuilder extends SectionedDataTableBuilder {
     return childDataTables
   }
 
-  private calculateParentChildKeys(parentData: Array<NodeJS.Dict<string>>, joinFields: FieldDefinition[]) {
+  private calculateParentChildKeys(
+    parentData: Array<NodeJS.Dict<string>>,
+    joinFields: components['schemas']['FieldDefinition'][],
+  ) {
     return parentData
       .map(
         (rowData): ParentChildSortKey => ({
@@ -154,7 +157,7 @@ class ParentChildDataTableBuilder extends SectionedDataTableBuilder {
   private splitParentDataIntoSections(
     sectionedParentChildData: NodeJS.Dict<NodeJS.Dict<Array<NodeJS.Dict<string>>>>,
     parentData: Array<NodeJS.Dict<string>>,
-    joinFields: FieldDefinition[],
+    joinFields: components['schemas']['FieldDefinition'][],
   ) {
     return parentData.reduce((previousValue, rowData) => {
       const parentKey: string = this.getSortKey(rowData, joinFields)

package/dpr/utils/SectionedDataTableBuilder/SectionedDataTableBuilder.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/dpr/utils/SectionedDataTableBuilder/SectionedDataTableBuilder.ts"],
-  "sourcesContent": ["import Dict = NodeJS.Dict\nimport { components } from '../../types/api'\nimport { Cell, DataTable, FieldDefinition } from '../DataTableBuilder/types'\nimport type { SummaryTemplate, Template } from '../../types/Templates'\nimport DataTableBuilder from '../DataTableBuilder/DataTableBuilder'\nimport { distinct } from '../arrayUtils'\nimport SummaryDataTableBuilder from '../SummaryDataTableBuilder/SummaryDataTableBuilder'\nimport { SectionSortKey } from './types'\n\nclass SectionedDataTableBuilder extends DataTableBuilder {\n  sections: Array<string>\n\n  template: Template\n\n  constructor(specification: components['schemas']['Specification']) {\n    const { fields, sections, template } = specification\n    super(fields)\n    this.sections = sections\n    this.template = template\n  }\n\n  /**\n   * Creates the section heading strings\n   *\n   * @param {Dict<string>[]} data\n   * @param {FieldDefinition[]} sectionFields\n   * @return {*}  {string[]} array of section headings\n   */\n  private createSectionHeadings(data: Dict<string>[], sectionFields: FieldDefinition[]): string[] {\n    return data\n      .map(\n        (rowData): SectionSortKey => ({\n          description: this.mapSectionDescription(rowData),\n          sortKey: this.getSortKey(rowData, sectionFields),\n        }),\n      )\n      .sort(this.sortKeyComparison())\n      .map((s) => s.description)\n      .reduce(distinct, [])\n  }\n\n  /**\n   * Initialise section heading arrays\n   *\n   * @private\n   * @param {string[]} sectionDescriptions\n   * @return {*}\n   * @memberof SectionedDataTableBuilder\n   */\n  initSectionData(sectionDescriptions: string[]) {\n    const sectionedData: Dict<Cell[][]> | Dict<Array<Dict<string>>> = {}\n    sectionDescriptions.forEach((sectionDescription) => {\n      sectionedData[sectionDescription] = []\n    })\n    return sectionedData\n  }\n\n  /**\n   * Maps the rows to the correct section\n   *\n   * @private\n   * @param {Array<Dict<string>>} data\n   * @param {Dict<Cell[][]>} sectionedData\n   * @return {*}\n   * @memberof SectionedDataTableBuilder\n   */\n  private mapRowsToSection(data: Array<Dict<string>>, sectionedData: Dict<Cell[][]>) {\n    return data.reduce((previousValue, rowData) => {\n      const sectionDescription: string = this.mapSectionDescription(rowData)\n      const mappedData = this.mapRow(rowData)\n      const previousValueDescription = previousValue[sectionDescription]\n\n      return {\n        ...previousValue,\n        ...(previousValueDescription && {\n          [sectionDescription]: previousValueDescription.concat([mappedData]),\n        }),\n      }\n    }, sectionedData)\n  }\n\n  /**\n   * Maps the rows to the correct section\n   *\n   * @private\n   * @param {Array<Dict<string>>} data\n   * @param {Dict<Cell[][]>} sectionedData\n   * @return {*}\n   * @memberof SectionedDataTableBuilder\n   */\n  private mapDataToSection(data: Array<Dict<string>>, sectionedData: Dict<Array<Dict<string>>>) {\n    return data.reduce((previousValue, rowData) => {\n      const sectionDescription: string = this.mapSectionDescription(rowData)\n      const previousValueDescription = previousValue[sectionDescription]\n      const section = {\n        ...previousValue,\n        ...(previousValueDescription && {\n          [sectionDescription]: previousValueDescription.concat([rowData]),\n        }),\n      }\n      return section\n    }, sectionedData)\n  }\n\n  /**\n   * Gets the counts for rows in section\n   *\n   * @param {Dict<Cell[][]>} sectionedData\n   * @param {string} sectionDescription\n   * @return {*}\n   * @memberof SectionedDataTableBuilder\n   */\n  getSectionCount(sectionedData: Dict<Cell[][]> | Dict<Dict<string>[]>, sectionDescription: string) {\n    const count = sectionedData[sectionDescription] ? sectionedData[sectionDescription].length : 0\n    const countDescription = `${count} result${count === 1 ? '' : 's'}`\n\n    return {\n      count,\n      countDescription,\n    }\n  }\n\n  /**\n   * Creates the summaries and builds the table with summaries\n   *\n   * @private\n   * @param {string} sectionDescription\n   * @param {Cell[][]} mappedTableData\n   * @param {Cell[]} header\n   * @return {*}\n   * @memberof SectionedDataTableBuilder\n   */\n  private mapSummariesAndCreateTable(sectionDescription: string, mappedTableData: Cell[][], header: Cell[]) {\n    let tableContent: Cell[][] = []\n\n    let mappedSectionHeaderSummary: Cell[][] = []\n    let mappedHeaderSummary: Cell[][] = []\n    let mappedFooterSummary: Cell[][] = []\n    let mappedSectionFooterSummary: Cell[][] = []\n\n    mappedSectionHeaderSummary = this.mapSectionSummaryTables(sectionDescription, 'section-header', this.columns.length)\n    mappedHeaderSummary = this.mapSectionSummaryRows('table-header', sectionDescription)\n    mappedFooterSummary = this.mapSectionSummaryRows('table-footer', sectionDescription)\n    mappedSectionFooterSummary = this.mapSectionSummaryTables(sectionDescription, 'section-footer', this.columns.length)\n\n    tableContent = mappedSectionHeaderSummary\n      .concat(mappedTableData.length > 0 ? [header] : [])\n      .concat(mappedHeaderSummary)\n      .concat(mappedTableData)\n      .concat(mappedFooterSummary)\n      .concat(mappedSectionFooterSummary)\n\n    return tableContent\n  }\n\n  /**\n   * Creates the table data\n   * - if summaries are present, includes the summaries data\n   *\n   * @private\n   * @param {string[]} sectionDescriptions\n   * @param {Dict<Cell[][]>} sectionedData\n   * @param {Cell[]} header\n   * @return {*}\n   * @memberof SectionedDataTableBuilder\n   */\n  private createTableContent(sectionDescriptions: string[], sectionedData: Dict<Cell[][]>, header: Cell[]) {\n    return sectionDescriptions.flatMap((sectionDescription, index) => {\n      const { count, countDescription } = this.getSectionCount(sectionedData, sectionDescription)\n      const mappedTableData = sectionedData[sectionDescription]\n\n      let tableContent: Cell[][] = []\n      if (mappedTableData) {\n        if (Object.keys(this.reportSummaries).length) {\n          tableContent = this.mapSummariesAndCreateTable(sectionDescription, mappedTableData, header)\n        } else {\n          tableContent = tableContent.concat(mappedTableData.length > 0 ? [header] : []).concat(mappedTableData)\n        }\n      }\n\n      const sectionHeader = this.createSectionHeader(sectionDescription, index, count, countDescription)\n\n      return [...sectionHeader, ...tableContent]\n    })\n  }\n\n  createSectionHeader(sectionDescription: string, index: number, count?: number, countDescription?: string) {\n    const header = []\n    if (index !== 0) {\n      header.push([\n        {\n          classes: 'dpr-section-header-spacer',\n          colspan: this.columns.length,\n          text: '',\n        },\n      ])\n    }\n    header.push([\n      {\n        classes: 'dpr-section-header',\n        colspan: this.columns.length,\n        html: `<h2 class=\"govuk-heading-m\">${sectionDescription}${\n          count && count > 0 ? ` <span class='govuk-caption-m'>${countDescription}</span>` : ''\n        }</h2>`,\n      },\n    ])\n    header.push([\n      {\n        classes: 'dpr-section-header-spacer-bottom',\n        colspan: this.columns.length,\n        text: '',\n      },\n    ])\n    return header\n  }\n\n  private mapSectionSummaryRows(template: SummaryTemplate, sectionDescription: string): Cell[][] {\n    if (this.reportSummaries[template]) {\n      return this.reportSummaries[template].flatMap((reportSummary) =>\n        reportSummary.data\n          .filter((rowData) => this.mapSectionDescription(rowData) === sectionDescription)\n          .map((rowData) =>\n            this.mapRow(rowData, `dpr-report-summary-cell dpr-report-summary-cell-${template}`, reportSummary.fields),\n          ),\n      )\n    }\n    return []\n  }\n\n  private mapSectionSummaryTables(\n    sectionDescription: string,\n    summaryTemplate: SummaryTemplate,\n    columnsLength: number,\n  ): Cell[][] {\n    const summaries = this.reportSummaries[summaryTemplate]\n    if (summaries) {\n      const htmlTables = summaries.map((summary) => {\n        const data = summary.data.filter((row) => this.mapSectionDescription(row) === sectionDescription)\n\n        if (data.length > 0) {\n          const dataTable = new SummaryDataTableBuilder(summary, this.sections).buildTable(data)\n\n          const htmlTable = this.convertDataTableToHtml(dataTable)\n\n          return `<div class='dpr-summary-container'>${htmlTable}</div>`\n        }\n        return ''\n      })\n\n      const summaryContent = htmlTables.join('')\n      if (summaryContent.length > 0) {\n        return [\n          [\n            {\n              classes: 'dpr-summary-cell',\n              colspan: columnsLength,\n              html: `<div class='dpr-summary-container-group dpr-summary-container-group-${summaryTemplate}'>${summaryContent}</div>`,\n            },\n          ],\n        ]\n      }\n    }\n    return []\n  }\n\n  mapSectionDescription(rowData: NodeJS.Dict<string>): string {\n    const { sections } = this\n\n    return this.mapNamesToFields(sections)\n      .map((s) => `${s.display}: ${this.mapCellValue(s, rowData[s.name])}`)\n      .join(', ')\n  }\n\n  mapSections(data: Array<Dict<string>>) {\n    const sectionHeadings = this.initSectionedHeadings(data)\n    let { sectionedData } = sectionHeadings\n\n    // Maps data to sections\n    if (this.template !== 'summary-section') {\n      if (this.template === 'parent-child-section') {\n        sectionedData = this.mapDataToSection(data, sectionedData as Dict<Dict<string>[]>)\n      } else {\n        sectionedData = this.mapRowsToSection(data, sectionedData as Dict<Cell[][]>)\n      }\n    }\n\n    return {\n      sectionDescriptions: sectionHeadings.sectionDescriptions,\n      sectionedData,\n    }\n  }\n\n  initSectionedHeadings(data: Array<Dict<string>>) {\n    // Get the section definition data\n    const sectionFields = this.mapNamesToFields(this.sections)\n    // create the sectionHeadings\n    const sectionDescriptions = this.createSectionHeadings(data, sectionFields)\n    // init empty sections\n    const sectionedData = this.initSectionData(sectionDescriptions)\n\n    return {\n      sectionDescriptions,\n      sectionedData,\n    }\n  }\n\n  /**\n   * Creates the table rows.\n   *\n   * @private\n   * @param {Array<Dict<string>>} data\n   * @param {Cell[]} header\n   * @return {*}  {Cell[][]}\n   * @memberof SectionedDataTableBuilder\n   */\n  private mapSectionedData(data: Array<Dict<string>>, header: Cell[]): Cell[][] {\n    const { sectionDescriptions, sectionedData } = this.mapSections(data)\n    // Create the table\n    const tableContent = this.createTableContent(sectionDescriptions, sectionedData as Dict<Cell[][]>, header)\n\n    return tableContent\n  }\n\n  buildTable(data: Array<Dict<string>>): DataTable {\n    return {\n      head: null,\n      rows: this.mapSectionedData(data, this.mapHeader(true, 'govuk-table__header')),\n      rowCount: data.length,\n      colCount: this.columns.length,\n    }\n  }\n}\n\nexport { SectionedDataTableBuilder }\nexport default SectionedDataTableBuilder\n"],
-  "mappings": "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",
+  "sourcesContent": ["import Dict = NodeJS.Dict\nimport { components } from '../../types/api'\nimport { Cell, DataTable } from '../DataTableBuilder/types'\nimport type { SummaryTemplate, Template } from '../../types/Templates'\nimport DataTableBuilder from '../DataTableBuilder/DataTableBuilder'\nimport { distinct } from '../arrayUtils'\nimport SummaryDataTableBuilder from '../SummaryDataTableBuilder/SummaryDataTableBuilder'\nimport { SectionSortKey } from './types'\n\nclass SectionedDataTableBuilder extends DataTableBuilder {\n  sections: Array<string>\n\n  template: Template\n\n  constructor(specification: components['schemas']['Specification']) {\n    const { fields, sections, template } = specification\n    super(fields)\n    this.sections = sections\n    this.template = template\n  }\n\n  /**\n   * Creates the section heading strings\n   *\n   * @param {Dict<string>[]} data\n   * @param {FieldDefinition[]} sectionFields\n   * @return {*}  {string[]} array of section headings\n   */\n  private createSectionHeadings(\n    data: Dict<string>[],\n    sectionFields: components['schemas']['FieldDefinition'][],\n  ): string[] {\n    return data\n      .map(\n        (rowData): SectionSortKey => ({\n          description: this.mapSectionDescription(rowData),\n          sortKey: this.getSortKey(rowData, sectionFields),\n        }),\n      )\n      .sort(this.sortKeyComparison())\n      .map((s) => s.description)\n      .reduce(distinct, [])\n  }\n\n  /**\n   * Initialise section heading arrays\n   *\n   * @private\n   * @param {string[]} sectionDescriptions\n   * @return {*}\n   * @memberof SectionedDataTableBuilder\n   */\n  initSectionData(sectionDescriptions: string[]) {\n    const sectionedData: Dict<Cell[][]> | Dict<Array<Dict<string>>> = {}\n    sectionDescriptions.forEach((sectionDescription) => {\n      sectionedData[sectionDescription] = []\n    })\n    return sectionedData\n  }\n\n  /**\n   * Maps the rows to the correct section\n   *\n   * @private\n   * @param {Array<Dict<string>>} data\n   * @param {Dict<Cell[][]>} sectionedData\n   * @return {*}\n   * @memberof SectionedDataTableBuilder\n   */\n  private mapRowsToSection(data: Array<Dict<string>>, sectionedData: Dict<Cell[][]>) {\n    return data.reduce((previousValue, rowData) => {\n      const sectionDescription: string = this.mapSectionDescription(rowData)\n      const mappedData = this.mapRow(rowData)\n      const previousValueDescription = previousValue[sectionDescription]\n\n      return {\n        ...previousValue,\n        ...(previousValueDescription && {\n          [sectionDescription]: previousValueDescription.concat([mappedData]),\n        }),\n      }\n    }, sectionedData)\n  }\n\n  /**\n   * Maps the rows to the correct section\n   *\n   * @private\n   * @param {Array<Dict<string>>} data\n   * @param {Dict<Cell[][]>} sectionedData\n   * @return {*}\n   * @memberof SectionedDataTableBuilder\n   */\n  private mapDataToSection(data: Array<Dict<string>>, sectionedData: Dict<Array<Dict<string>>>) {\n    return data.reduce((previousValue, rowData) => {\n      const sectionDescription: string = this.mapSectionDescription(rowData)\n      const previousValueDescription = previousValue[sectionDescription]\n      const section = {\n        ...previousValue,\n        ...(previousValueDescription && {\n          [sectionDescription]: previousValueDescription.concat([rowData]),\n        }),\n      }\n      return section\n    }, sectionedData)\n  }\n\n  /**\n   * Gets the counts for rows in section\n   *\n   * @param {Dict<Cell[][]>} sectionedData\n   * @param {string} sectionDescription\n   * @return {*}\n   * @memberof SectionedDataTableBuilder\n   */\n  getSectionCount(sectionedData: Dict<Cell[][]> | Dict<Dict<string>[]>, sectionDescription: string) {\n    const count = sectionedData[sectionDescription] ? sectionedData[sectionDescription].length : 0\n    const countDescription = `${count} result${count === 1 ? '' : 's'}`\n\n    return {\n      count,\n      countDescription,\n    }\n  }\n\n  /**\n   * Creates the summaries and builds the table with summaries\n   *\n   * @private\n   * @param {string} sectionDescription\n   * @param {Cell[][]} mappedTableData\n   * @param {Cell[]} header\n   * @return {*}\n   * @memberof SectionedDataTableBuilder\n   */\n  private mapSummariesAndCreateTable(sectionDescription: string, mappedTableData: Cell[][], header: Cell[]) {\n    let tableContent: Cell[][] = []\n\n    let mappedSectionHeaderSummary: Cell[][] = []\n    let mappedHeaderSummary: Cell[][] = []\n    let mappedFooterSummary: Cell[][] = []\n    let mappedSectionFooterSummary: Cell[][] = []\n\n    mappedSectionHeaderSummary = this.mapSectionSummaryTables(sectionDescription, 'section-header', this.columns.length)\n    mappedHeaderSummary = this.mapSectionSummaryRows('table-header', sectionDescription)\n    mappedFooterSummary = this.mapSectionSummaryRows('table-footer', sectionDescription)\n    mappedSectionFooterSummary = this.mapSectionSummaryTables(sectionDescription, 'section-footer', this.columns.length)\n\n    tableContent = mappedSectionHeaderSummary\n      .concat(mappedTableData.length > 0 ? [header] : [])\n      .concat(mappedHeaderSummary)\n      .concat(mappedTableData)\n      .concat(mappedFooterSummary)\n      .concat(mappedSectionFooterSummary)\n\n    return tableContent\n  }\n\n  /**\n   * Creates the table data\n   * - if summaries are present, includes the summaries data\n   *\n   * @private\n   * @param {string[]} sectionDescriptions\n   * @param {Dict<Cell[][]>} sectionedData\n   * @param {Cell[]} header\n   * @return {*}\n   * @memberof SectionedDataTableBuilder\n   */\n  private createTableContent(sectionDescriptions: string[], sectionedData: Dict<Cell[][]>, header: Cell[]) {\n    return sectionDescriptions.flatMap((sectionDescription, index) => {\n      const { count, countDescription } = this.getSectionCount(sectionedData, sectionDescription)\n      const mappedTableData = sectionedData[sectionDescription]\n\n      let tableContent: Cell[][] = []\n      if (mappedTableData) {\n        if (Object.keys(this.reportSummaries).length) {\n          tableContent = this.mapSummariesAndCreateTable(sectionDescription, mappedTableData, header)\n        } else {\n          tableContent = tableContent.concat(mappedTableData.length > 0 ? [header] : []).concat(mappedTableData)\n        }\n      }\n\n      const sectionHeader = this.createSectionHeader(sectionDescription, index, count, countDescription)\n\n      return [...sectionHeader, ...tableContent]\n    })\n  }\n\n  createSectionHeader(sectionDescription: string, index: number, count?: number, countDescription?: string) {\n    const header = []\n    if (index !== 0) {\n      header.push([\n        {\n          classes: 'dpr-section-header-spacer',\n          colspan: this.columns.length,\n          text: '',\n        },\n      ])\n    }\n    header.push([\n      {\n        classes: 'dpr-section-header',\n        colspan: this.columns.length,\n        html: `<h2 class=\"govuk-heading-m\">${sectionDescription}${\n          count && count > 0 ? ` <span class='govuk-caption-m'>${countDescription}</span>` : ''\n        }</h2>`,\n      },\n    ])\n    header.push([\n      {\n        classes: 'dpr-section-header-spacer-bottom',\n        colspan: this.columns.length,\n        text: '',\n      },\n    ])\n    return header\n  }\n\n  private mapSectionSummaryRows(template: SummaryTemplate, sectionDescription: string): Cell[][] {\n    if (this.reportSummaries[template]) {\n      return this.reportSummaries[template].flatMap((reportSummary) =>\n        reportSummary.data\n          .filter((rowData) => this.mapSectionDescription(rowData) === sectionDescription)\n          .map((rowData) =>\n            this.mapRow(rowData, `dpr-report-summary-cell dpr-report-summary-cell-${template}`, reportSummary.fields),\n          ),\n      )\n    }\n    return []\n  }\n\n  private mapSectionSummaryTables(\n    sectionDescription: string,\n    summaryTemplate: SummaryTemplate,\n    columnsLength: number,\n  ): Cell[][] {\n    const summaries = this.reportSummaries[summaryTemplate]\n    if (summaries) {\n      const htmlTables = summaries.map((summary) => {\n        const data = summary.data.filter((row) => this.mapSectionDescription(row) === sectionDescription)\n\n        if (data.length > 0) {\n          const dataTable = new SummaryDataTableBuilder(summary, this.sections).buildTable(data)\n\n          const htmlTable = this.convertDataTableToHtml(dataTable)\n\n          return `<div class='dpr-summary-container'>${htmlTable}</div>`\n        }\n        return ''\n      })\n\n      const summaryContent = htmlTables.join('')\n      if (summaryContent.length > 0) {\n        return [\n          [\n            {\n              classes: 'dpr-summary-cell',\n              colspan: columnsLength,\n              html: `<div class='dpr-summary-container-group dpr-summary-container-group-${summaryTemplate}'>${summaryContent}</div>`,\n            },\n          ],\n        ]\n      }\n    }\n    return []\n  }\n\n  mapSectionDescription(rowData: NodeJS.Dict<string>): string {\n    const { sections } = this\n\n    return this.mapNamesToFields(sections)\n      .map((s) => `${s.display}: ${this.mapCellValue(s, rowData[s.name])}`)\n      .join(', ')\n  }\n\n  mapSections(data: Array<Dict<string>>) {\n    const sectionHeadings = this.initSectionedHeadings(data)\n    let { sectionedData } = sectionHeadings\n\n    // Maps data to sections\n    if (this.template !== 'summary-section') {\n      if (this.template === 'parent-child-section') {\n        sectionedData = this.mapDataToSection(data, sectionedData as Dict<Dict<string>[]>)\n      } else {\n        sectionedData = this.mapRowsToSection(data, sectionedData as Dict<Cell[][]>)\n      }\n    }\n\n    return {\n      sectionDescriptions: sectionHeadings.sectionDescriptions,\n      sectionedData,\n    }\n  }\n\n  initSectionedHeadings(data: Array<Dict<string>>) {\n    // Get the section definition data\n    const sectionFields = this.mapNamesToFields(this.sections)\n    // create the sectionHeadings\n    const sectionDescriptions = this.createSectionHeadings(data, sectionFields)\n    // init empty sections\n    const sectionedData = this.initSectionData(sectionDescriptions)\n\n    return {\n      sectionDescriptions,\n      sectionedData,\n    }\n  }\n\n  /**\n   * Creates the table rows.\n   *\n   * @private\n   * @param {Array<Dict<string>>} data\n   * @param {Cell[]} header\n   * @return {*}  {Cell[][]}\n   * @memberof SectionedDataTableBuilder\n   */\n  private mapSectionedData(data: Array<Dict<string>>, header: Cell[]): Cell[][] {\n    const { sectionDescriptions, sectionedData } = this.mapSections(data)\n    // Create the table\n    const tableContent = this.createTableContent(sectionDescriptions, sectionedData as Dict<Cell[][]>, header)\n\n    return tableContent\n  }\n\n  buildTable(data: Array<Dict<string>>): DataTable {\n    return {\n      head: null,\n      rows: this.mapSectionedData(data, this.mapHeader(true, 'govuk-table__header')),\n      rowCount: data.length,\n      colCount: this.columns.length,\n    }\n  }\n}\n\nexport { SectionedDataTableBuilder }\nexport default SectionedDataTableBuilder\n"],
+  "mappings": "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",
   "names": ["SectionedDataTableBuilder_exports", "__export", "SectionedDataTableBuilder", "SectionedDataTableBuilder_default", "__toCommonJS", "import_DataTableBuilder", "import_arrayUtils", "import_SummaryDataTableBuilder", "DataTableBuilder", "specification", "fields", "sections", "template", "data", "sectionFields", "rowData", "s", "sectionDescriptions", "sectionedData", "sectionDescription", "previousValue", "mappedData", "previousValueDescription", "count", "countDescription", "mappedTableData", "header", "tableContent", "mappedSectionHeaderSummary", "mappedHeaderSummary", "mappedFooterSummary", "mappedSectionFooterSummary", "index", "reportSummary", "summaryTemplate", "columnsLength", "summaries", "summaryContent", "summary", "row", "dataTable", "SummaryDataTableBuilder", "sectionHeadings"]
 }

package/dpr/utils/SectionedDataTableBuilder/SectionedDataTableBuilder.ts

@@ -1,6 +1,6 @@
 import Dict = NodeJS.Dict
 import { components } from '../../types/api'
-import { Cell, DataTable, FieldDefinition } from '../DataTableBuilder/types'
+import { Cell, DataTable } from '../DataTableBuilder/types'
 import type { SummaryTemplate, Template } from '../../types/Templates'
 import DataTableBuilder from '../DataTableBuilder/DataTableBuilder'
 import { distinct } from '../arrayUtils'
@@ -26,7 +26,10 @@ class SectionedDataTableBuilder extends DataTableBuilder {
    * @param {FieldDefinition[]} sectionFields
    * @return {*}  {string[]} array of section headings
    */
-  private createSectionHeadings(data: Dict<string>[], sectionFields: FieldDefinition[]): string[] {
+  private createSectionHeadings(
+    data: Dict<string>[],
+    sectionFields: components['schemas']['FieldDefinition'][],
+  ): string[] {
     return data
       .map(
         (rowData): SectionSortKey => ({

package/dpr/utils/SummaryDataTableBuilder/SummaryDataTableBuilder.js

@@ -1,2 +1,2 @@
-var d=Object.create;var m=Object.defineProperty;var n=Object.getOwnPropertyDescriptor;var c=Object.getOwnPropertyNames;var f=Object.getPrototypeOf,y=Object.prototype.hasOwnProperty;var b=(a,e)=>{for(var r in e)m(a,r,{get:e[r],enumerable:!0})},i=(a,e,r,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let t of c(e))!y.call(a,t)&&t!==r&&m(a,t,{get:()=>e[t],enumerable:!(s=n(e,t))||s.enumerable});return a};var p=(a,e,r)=>(r=a!=null?d(f(a)):{},i(e||!a||!a.__esModule?m(r,"default",{value:a,enumerable:!0}):r,a)),T=a=>i(m({},"__esModule",{value:!0}),a);var A={};b(A,{SummaryDataTableBuilder:()=>u,default:()=>S});module.exports=T(A);var o=p(require("../DataTableBuilder/DataTableBuilder"));class u extends o.default{constructor(e,r){const s=e.fields.filter(l=>!r||!r.includes(l.name)).map(l=>l.name),t=e.fields.map(l=>({...l,calculated:!1,sortable:!1,defaultsort:!1,mandatory:!0,visible:!0}));super(t,!0),this.summary=e,this.columns=s}buildSummaryTable(){return super.buildTable(this.summary.data)}}var S=u;0&&(module.exports={SummaryDataTableBuilder});
+var n=Object.create;var l=Object.defineProperty;var c=Object.getOwnPropertyDescriptor;var d=Object.getOwnPropertyNames;var f=Object.getPrototypeOf,p=Object.prototype.hasOwnProperty;var y=(a,e)=>{for(var r in e)l(a,r,{get:e[r],enumerable:!0})},o=(a,e,r,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let t of d(e))!p.call(a,t)&&t!==r&&l(a,t,{get:()=>e[t],enumerable:!(s=c(e,t))||s.enumerable});return a};var b=(a,e,r)=>(r=a!=null?n(f(a)):{},o(e||!a||!a.__esModule?l(r,"default",{value:a,enumerable:!0}):r,a)),T=a=>o(l({},"__esModule",{value:!0}),a);var S={};y(S,{SummaryDataTableBuilder:()=>i,default:()=>D});module.exports=T(S);var u=b(require("../DataTableBuilder/DataTableBuilder"));class i extends u.default{constructor(e,r){const s=e.fields.filter(m=>!r||!r.includes(m.name)).map(m=>m.name),t=e.fields.map(m=>({...m,calculated:!1,sortable:!1,defaultsort:!1,mandatory:!0,visible:!0}));super(t,!0),this.summary=e,this.columns=s}buildSummaryTable(){return super.buildTable(this.summary.data)}}var D=i;0&&(module.exports={SummaryDataTableBuilder});
 //# sourceMappingURL=SummaryDataTableBuilder.js.map

package/dpr/utils/SummaryDataTableBuilder/SummaryDataTableBuilder.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/dpr/utils/SummaryDataTableBuilder/SummaryDataTableBuilder.ts"],
-  "sourcesContent": ["import { AsyncSummary } from '../../types/UserReports'\nimport DataTableBuilder from '../DataTableBuilder/DataTableBuilder'\nimport { DataTable } from '../DataTableBuilder/types'\n\nclass SummaryDataTableBuilder extends DataTableBuilder {\n  private summary: AsyncSummary\n\n  constructor(summary: AsyncSummary, sections?: Array<string>) {\n    const columns = summary.fields\n      .filter((field) => !sections || !sections.includes(field.name))\n      .map((field) => field.name)\n\n    const fields = summary.fields.map((field) => ({\n      ...field,\n      calculated: false,\n      sortable: false,\n      defaultsort: false,\n      mandatory: true,\n      visible: true,\n    }))\n\n    super(fields, true)\n\n    this.summary = summary\n    this.columns = columns\n  }\n\n  buildSummaryTable(): DataTable {\n    return super.buildTable(this.summary.data)\n  }\n}\n\nexport { SummaryDataTableBuilder }\nexport default SummaryDataTableBuilder\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAA6B,mDAG7B,MAAMH,UAAgC,EAAAI,OAAiB,CAGrD,YAAYC,EAAuBC,EAA0B,CAC3D,MAAMC,EAAUF,EAAQ,OACrB,OAAQG,GAAU,CAACF,GAAY,CAACA,EAAS,SAASE,EAAM,IAAI,CAAC,EAC7D,IAAKA,GAAUA,EAAM,IAAI,EAEtBC,EAASJ,EAAQ,OAAO,IAAKG,IAAW,CAC5C,GAAGA,EACH,WAAY,GACZ,SAAU,GACV,YAAa,GACb,UAAW,GACX,QAAS,EACX,EAAE,EAEF,MAAMC,EAAQ,EAAI,EAElB,KAAK,QAAUJ,EACf,KAAK,QAAUE,CACjB,CAEA,mBAA+B,CAC7B,OAAO,MAAM,WAAW,KAAK,QAAQ,IAAI,CAC3C,CACF,CAGA,IAAON,EAAQD",
+  "sourcesContent": ["import { components } from '../../types/api'\nimport { AsyncSummary } from '../../types/UserReports'\nimport DataTableBuilder from '../DataTableBuilder/DataTableBuilder'\nimport { DataTable } from '../DataTableBuilder/types'\n\nclass SummaryDataTableBuilder extends DataTableBuilder {\n  private summary: AsyncSummary\n\n  constructor(summary: AsyncSummary, sections?: Array<string>) {\n    const columns = summary.fields\n      .filter((field) => !sections || !sections.includes(field.name))\n      .map((field) => field.name)\n\n    const fields = summary.fields.map((field) => ({\n      ...field,\n      calculated: false,\n      sortable: false,\n      defaultsort: false,\n      mandatory: true,\n      visible: true,\n    }))\n\n    super(<components['schemas']['FieldDefinition'][]>fields, true)\n\n    this.summary = summary\n    this.columns = columns\n  }\n\n  buildSummaryTable(): DataTable {\n    return super.buildTable(this.summary.data)\n  }\n}\n\nexport { SummaryDataTableBuilder }\nexport default SummaryDataTableBuilder\n"],
+  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAA6B,mDAG7B,MAAMH,UAAgC,EAAAI,OAAiB,CAGrD,YAAYC,EAAuBC,EAA0B,CAC3D,MAAMC,EAAUF,EAAQ,OACrB,OAAQG,GAAU,CAACF,GAAY,CAACA,EAAS,SAASE,EAAM,IAAI,CAAC,EAC7D,IAAKA,GAAUA,EAAM,IAAI,EAEtBC,EAASJ,EAAQ,OAAO,IAAKG,IAAW,CAC5C,GAAGA,EACH,WAAY,GACZ,SAAU,GACV,YAAa,GACb,UAAW,GACX,QAAS,EACX,EAAE,EAEF,MAAkDC,EAAQ,EAAI,EAE9D,KAAK,QAAUJ,EACf,KAAK,QAAUE,CACjB,CAEA,mBAA+B,CAC7B,OAAO,MAAM,WAAW,KAAK,QAAQ,IAAI,CAC3C,CACF,CAGA,IAAON,EAAQD",
   "names": ["SummaryDataTableBuilder_exports", "__export", "SummaryDataTableBuilder", "SummaryDataTableBuilder_default", "__toCommonJS", "import_DataTableBuilder", "DataTableBuilder", "summary", "sections", "columns", "field", "fields"]
 }

package/dpr/utils/SummaryDataTableBuilder/SummaryDataTableBuilder.ts

@@ -1,3 +1,4 @@
+import { components } from '../../types/api'
 import { AsyncSummary } from '../../types/UserReports'
 import DataTableBuilder from '../DataTableBuilder/DataTableBuilder'
 import { DataTable } from '../DataTableBuilder/types'
@@ -19,7 +20,7 @@ class SummaryDataTableBuilder extends DataTableBuilder {
       visible: true,
     }))
 
-    super(fields, true)
+    super(<components['schemas']['FieldDefinition'][]>fields, true)
 
     this.summary = summary
     this.columns = columns

package/dpr/utils/UserStoreItemBuilder.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/utils/UserStoreItemBuilder.ts"],
-  "sourcesContent": ["import type { Request } from 'express'\nimport parseUrl from 'parseurl'\nimport {\n  AsyncReportUrlData,\n  LoadType,\n  ReportType,\n  RequestedReport,\n  RequestFormData,\n  RequestStatus,\n  UserReportData,\n} from '../types/UserReports'\nimport Dict = NodeJS.Dict\nimport { ChildReportExecutionData, ExecutionData } from '../types/ExecutionData'\nimport { DashboardSection } from '../components/_dashboards/dashboard/types'\n\nclass UserStoreItemBuilder {\n  userStoreItem: UserReportData\n\n  requestFormData: RequestFormData | Record<string, never>\n\n  constructor(\n    reportData: {\n      type: ReportType\n      reportId: string\n      reportName: string\n      description: string\n      id: string\n      name: string\n    },\n    requestFormData?: RequestFormData,\n  ) {\n    this.requestFormData = requestFormData || {}\n    this.userStoreItem = this.addReportData(reportData)\n  }\n\n  build = () => {\n    return this.userStoreItem as RequestedReport\n  }\n\n  addReportData = ({\n    type,\n    reportId,\n    reportName,\n    description,\n    id,\n    name,\n  }: {\n    type: ReportType\n    reportId: string\n    reportName: string\n    description: string\n    id: string\n    name: string\n  }) => {\n    return {\n      type: type as ReportType,\n      reportId,\n      reportName,\n      description,\n      id,\n      name,\n      timestamp: {},\n    }\n  }\n\n  addExecutionData = (executionData: ExecutionData) => {\n    this.userStoreItem = {\n      ...(<UserReportData>this.userStoreItem),\n      ...executionData,\n    }\n    return this\n  }\n\n  addChildExecutionData = (childExecutionData: Array<ChildReportExecutionData>) => {\n    this.userStoreItem = {\n      ...(<UserReportData>this.userStoreItem),\n      childExecutionData,\n    }\n    return this\n  }\n\n  addFilters = (filterData?: Record<string, string>) => {\n    const filtersQueryString = new URLSearchParams(filterData).toString()\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        filters: {\n          data: filterData,\n          queryString: filtersQueryString,\n        },\n      },\n    }\n    return this\n  }\n\n  addSortData = (sortData: Record<string, string>) => {\n    const sortByQueryString = new URLSearchParams(sortData).toString()\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        sortBy: {\n          data: sortData,\n          queryString: sortByQueryString,\n        },\n      },\n    }\n    return this\n  }\n\n  addRequestUrls = (req: Request) => {\n    const { origin, pathname, search, href } = this.requestFormData\n    const { executionId, dataProductDefinitionsPath, dpdPathFromQuery } = this.userStoreItem\n\n    // Polling path\n    let pollingPath = req.baseUrl.replace('/filters', `/${executionId}/status`)\n    if (dpdPathFromQuery) {\n      pollingPath = `${pollingPath}?dataProductDefinitionsPath=${dataProductDefinitionsPath}`\n    }\n    const pollingFullUrl = `${origin}${pollingPath}`\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        url: {\n          origin,\n          request: {\n            fullUrl: href,\n            pathname,\n            search,\n          },\n          polling: {\n            fullUrl: pollingFullUrl,\n            pathname: pollingPath,\n          },\n        },\n      },\n    }\n\n    return this\n  }\n\n  addAsyncUrls = (url: AsyncReportUrlData) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        url,\n      },\n    }\n\n    return this\n  }\n\n  addReportUrls = (req: Request) => {\n    const origin = req.get('host')\n    const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`\n    const urlData = parseUrl(req)\n\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        url: {\n          origin: origin || this.userStoreItem.url?.origin || '',\n          ...(this.userStoreItem.url?.request && { request: this.userStoreItem.url.request }),\n          ...(this.userStoreItem.url?.polling && { polling: this.userStoreItem.url.polling }),\n          report: {\n            ...(this.userStoreItem.url?.report && this.userStoreItem.url.report),\n            fullUrl,\n            ...(urlData && urlData.search && { search: urlData.search }),\n          },\n        },\n      },\n    }\n\n    return this\n  }\n\n  addLoadType = (loadType: LoadType) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      loadType,\n    }\n\n    return this\n  }\n\n  addQuery = (queryData?: { query: Dict<string | string[]>; querySummary: Array<Dict<string>> }) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...(queryData && {\n        query: {\n          data: queryData.query,\n          summary: queryData.querySummary,\n        },\n      }),\n    }\n    return this\n  }\n\n  addInteractiveQuery = (queryData?: { query: Dict<string>; querySummary: Array<Dict<string>> }) => {\n    if (queryData) {\n      this.userStoreItem = {\n        ...this.userStoreItem,\n        ...{\n          interactiveQuery: {\n            data: queryData.query,\n            summary: queryData.querySummary,\n          },\n        },\n      }\n    }\n    return this\n  }\n\n  addStatus = (status: RequestStatus) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      status,\n    }\n    return this\n  }\n\n  addMetrics = (metrics: DashboardSection[]) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      metrics: metrics.filter((metric) => metric.display).map((metric) => ({ name: metric.display || '' })),\n    }\n    return this\n  }\n\n  addTimestamp = () => {\n    const { status } = this.userStoreItem\n    const ts = new Date()\n    switch (status) {\n      case RequestStatus.FAILED:\n        this.userStoreItem.timestamp.failed = ts\n        break\n      case RequestStatus.EXPIRED:\n        this.userStoreItem.timestamp.expired = ts\n        break\n      case RequestStatus.ABORTED:\n        this.userStoreItem.timestamp.aborted = ts\n        break\n      case RequestStatus.FINISHED:\n        this.userStoreItem.timestamp.completed = ts\n        break\n      case RequestStatus.SUBMITTED:\n        this.userStoreItem.timestamp.requested = ts\n        break\n      case RequestStatus.STARTED:\n      case RequestStatus.PICKED:\n        break\n      default:\n        this.userStoreItem.timestamp.lastViewed = ts\n        break\n    }\n    return this\n  }\n\n  addDefinitionsPath = (definitionsPath: string, dpdPathFromQuery: boolean) => {\n    if (definitionsPath) {\n      this.userStoreItem = {\n        ...this.userStoreItem,\n        dataProductDefinitionsPath: definitionsPath,\n        dpdPathFromQuery,\n      }\n    }\n    return this\n  }\n}\n\nexport { UserStoreItemBuilder }\nexport default UserStoreItemBuilder\n"],
+  "sourcesContent": ["import type { Request } from 'express'\nimport parseUrl from 'parseurl'\nimport {\n  AsyncReportUrlData,\n  LoadType,\n  ReportType,\n  RequestedReport,\n  RequestFormData,\n  RequestStatus,\n  UserReportData,\n} from '../types/UserReports'\nimport Dict = NodeJS.Dict\nimport { ChildReportExecutionData, ExecutionData } from '../types/ExecutionData'\nimport { DashboardSection } from '../components/_dashboards/dashboard/types'\n\nclass UserStoreItemBuilder {\n  userStoreItem: UserReportData\n\n  requestFormData: RequestFormData | Record<string, never>\n\n  constructor(\n    reportData: {\n      type: ReportType\n      reportId: string\n      reportName: string\n      description: string\n      id: string\n      name: string\n    },\n    requestFormData?: RequestFormData,\n  ) {\n    this.requestFormData = requestFormData || {}\n    this.userStoreItem = this.addReportData(reportData)\n  }\n\n  build = () => {\n    return this.userStoreItem as RequestedReport\n  }\n\n  addReportData = ({\n    type,\n    reportId,\n    reportName,\n    description,\n    id,\n    name,\n  }: {\n    type: ReportType\n    reportId: string\n    reportName: string\n    description: string\n    id: string\n    name: string\n  }) => {\n    return {\n      type: type as ReportType,\n      reportId,\n      reportName,\n      description,\n      id,\n      name,\n      timestamp: {},\n    }\n  }\n\n  addExecutionData = (executionData: ExecutionData) => {\n    this.userStoreItem = {\n      ...(<UserReportData>this.userStoreItem),\n      ...executionData,\n    }\n    return this\n  }\n\n  addChildExecutionData = (childExecutionData: Array<ChildReportExecutionData>) => {\n    this.userStoreItem = {\n      ...(<UserReportData>this.userStoreItem),\n      childExecutionData,\n    }\n    return this\n  }\n\n  addFilters = (filterData?: Record<string, string>) => {\n    const filtersQueryString = new URLSearchParams(filterData).toString()\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        filters: {\n          data: filterData,\n          queryString: filtersQueryString,\n        },\n      },\n    }\n    return this\n  }\n\n  addSortData = (sortData: Record<string, string>) => {\n    const sortByQueryString = new URLSearchParams(sortData).toString()\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        sortBy: {\n          data: sortData,\n          queryString: sortByQueryString,\n        },\n      },\n    }\n    return this\n  }\n\n  addRequestUrls = (req: Request) => {\n    const { origin, pathname, search, href } = this.requestFormData\n    const { executionId, dataProductDefinitionsPath, dpdPathFromQuery } = this.userStoreItem\n\n    // Polling path\n    let pollingPath = req.baseUrl.replace('/filters', `/${executionId}/status`)\n    if (dpdPathFromQuery) {\n      pollingPath = `${pollingPath}?dataProductDefinitionsPath=${dataProductDefinitionsPath}`\n    }\n    const pollingFullUrl = `${origin}${pollingPath}`\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        url: {\n          origin,\n          request: {\n            fullUrl: href,\n            pathname,\n            search,\n          },\n          polling: {\n            fullUrl: pollingFullUrl,\n            pathname: pollingPath,\n          },\n        },\n      },\n    }\n\n    return this\n  }\n\n  addAsyncUrls = (url: AsyncReportUrlData) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        url,\n      },\n    }\n\n    return this\n  }\n\n  addReportUrls = (req: Request) => {\n    const origin = req.get('host')\n    const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`\n    const urlData = parseUrl(req)\n\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...{\n        url: {\n          origin: origin || this.userStoreItem.url?.origin || '',\n          ...(this.userStoreItem.url?.request && { request: this.userStoreItem.url.request }),\n          ...(this.userStoreItem.url?.polling && { polling: this.userStoreItem.url.polling }),\n          report: {\n            ...(this.userStoreItem.url?.report && this.userStoreItem.url.report),\n            fullUrl,\n            ...(urlData && urlData.search && { search: urlData.search }),\n          },\n        },\n      },\n    }\n\n    return this\n  }\n\n  addLoadType = (loadType: LoadType) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      loadType,\n    }\n\n    return this\n  }\n\n  addQuery = (queryData?: { query: Dict<string | string[]>; querySummary: Array<Dict<string>> }) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      ...(queryData && {\n        query: {\n          data: queryData.query,\n          summary: queryData.querySummary,\n        },\n      }),\n    }\n    return this\n  }\n\n  addInteractiveQuery = (queryData?: { query: Dict<string | string[]>; querySummary: Array<Dict<string>> }) => {\n    if (queryData) {\n      this.userStoreItem = {\n        ...this.userStoreItem,\n        ...{\n          interactiveQuery: {\n            data: queryData.query,\n            summary: queryData.querySummary,\n          },\n        },\n      }\n    }\n    return this\n  }\n\n  addStatus = (status: RequestStatus) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      status,\n    }\n    return this\n  }\n\n  addMetrics = (metrics: DashboardSection[]) => {\n    this.userStoreItem = {\n      ...this.userStoreItem,\n      metrics: metrics.filter((metric) => metric.display).map((metric) => ({ name: metric.display || '' })),\n    }\n    return this\n  }\n\n  addTimestamp = () => {\n    const { status } = this.userStoreItem\n    const ts = new Date()\n    switch (status) {\n      case RequestStatus.FAILED:\n        this.userStoreItem.timestamp.failed = ts\n        break\n      case RequestStatus.EXPIRED:\n        this.userStoreItem.timestamp.expired = ts\n        break\n      case RequestStatus.ABORTED:\n        this.userStoreItem.timestamp.aborted = ts\n        break\n      case RequestStatus.FINISHED:\n        this.userStoreItem.timestamp.completed = ts\n        break\n      case RequestStatus.SUBMITTED:\n        this.userStoreItem.timestamp.requested = ts\n        break\n      case RequestStatus.STARTED:\n      case RequestStatus.PICKED:\n        break\n      default:\n        this.userStoreItem.timestamp.lastViewed = ts\n        break\n    }\n    return this\n  }\n\n  addDefinitionsPath = (definitionsPath: string, dpdPathFromQuery: boolean) => {\n    if (definitionsPath) {\n      this.userStoreItem = {\n        ...this.userStoreItem,\n        dataProductDefinitionsPath: definitionsPath,\n        dpdPathFromQuery,\n      }\n    }\n    return this\n  }\n}\n\nexport { UserStoreItemBuilder }\nexport default UserStoreItemBuilder\n"],
   "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,0BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAqB,uBACrBC,EAQO,gCAKP,MAAMJ,CAAqB,CAKzB,YACEK,EAQAC,EACA,CAKF,WAAQ,IACC,KAAK,cAGd,mBAAgB,CAAC,CACf,KAAAC,EACA,SAAAC,EACA,WAAAC,EACA,YAAAC,EACA,GAAAC,EACA,KAAAC,CACF,KAQS,CACL,KAAML,EACN,SAAAC,EACA,WAAAC,EACA,YAAAC,EACA,GAAAC,EACA,KAAAC,EACA,UAAW,CAAC,CACd,GAGF,sBAAoBC,IAClB,KAAK,cAAgB,CACnB,GAAoB,KAAK,cACzB,GAAGA,CACL,EACO,MAGT,2BAAyBC,IACvB,KAAK,cAAgB,CACnB,GAAoB,KAAK,cACzB,mBAAAA,CACF,EACO,MAGT,gBAAcC,GAAwC,CACpD,MAAMC,EAAqB,IAAI,gBAAgBD,CAAU,EAAE,SAAS,EACpE,YAAK,cAAgB,CACnB,GAAG,KAAK,cAEN,QAAS,CACP,KAAMA,EACN,YAAaC,CACf,CAEJ,EACO,IACT,EAEA,iBAAeC,GAAqC,CAClD,MAAMC,EAAoB,IAAI,gBAAgBD,CAAQ,EAAE,SAAS,EACjE,YAAK,cAAgB,CACnB,GAAG,KAAK,cAEN,OAAQ,CACN,KAAMA,EACN,YAAaC,CACf,CAEJ,EACO,IACT,EAEA,oBAAkBC,GAAiB,CACjC,KAAM,CAAE,OAAAC,EAAQ,SAAAC,EAAU,OAAAC,EAAQ,KAAAC,CAAK,EAAI,KAAK,gBAC1C,CAAE,YAAAC,EAAa,2BAAAC,EAA4B,iBAAAC,CAAiB,EAAI,KAAK,cAG3E,IAAIC,EAAcR,EAAI,QAAQ,QAAQ,WAAY,IAAIK,CAAW,SAAS,EACtEE,IACFC,EAAc,GAAGA,CAAW,+BAA+BF,CAA0B,IAEvF,MAAMG,EAAiB,GAAGR,CAAM,GAAGO,CAAW,GAC9C,YAAK,cAAgB,CACnB,GAAG,KAAK,cAEN,IAAK,CACH,OAAAP,EACA,QAAS,CACP,QAASG,EACT,SAAAF,EACA,OAAAC,CACF,EACA,QAAS,CACP,QAASM,EACT,SAAUD,CACZ,CACF,CAEJ,EAEO,IACT,EAEA,kBAAgBE,IACd,KAAK,cAAgB,CACnB,GAAG,KAAK,cAEN,IAAAA,CAEJ,EAEO,MAGT,mBAAiBV,GAAiB,CAChC,MAAMC,EAASD,EAAI,IAAI,MAAM,EACvBW,EAAU,GAAGX,EAAI,QAAQ,MAAMA,EAAI,IAAI,MAAM,CAAC,GAAGA,EAAI,WAAW,GAChEY,KAAU,EAAAC,SAASb,CAAG,EAE5B,YAAK,cAAgB,CACnB,GAAG,KAAK,cAEN,IAAK,CACH,OAAQC,GAAU,KAAK,cAAc,KAAK,QAAU,GACpD,GAAI,KAAK,cAAc,KAAK,SAAW,CAAE,QAAS,KAAK,cAAc,IAAI,OAAQ,EACjF,GAAI,KAAK,cAAc,KAAK,SAAW,CAAE,QAAS,KAAK,cAAc,IAAI,OAAQ,EACjF,OAAQ,CACN,GAAI,KAAK,cAAc,KAAK,QAAU,KAAK,cAAc,IAAI,OAC7D,QAAAU,EACA,GAAIC,GAAWA,EAAQ,QAAU,CAAE,OAAQA,EAAQ,MAAO,CAC5D,CACF,CAEJ,EAEO,IACT,EAEA,iBAAeE,IACb,KAAK,cAAgB,CACnB,GAAG,KAAK,cACR,SAAAA,CACF,EAEO,MAGT,cAAYC,IACV,KAAK,cAAgB,CACnB,GAAG,KAAK,cACR,GAAIA,GAAa,CACf,MAAO,CACL,KAAMA,EAAU,MAChB,QAASA,EAAU,YACrB,CACF,CACF,EACO,MAGT,yBAAuBA,IACjBA,IACF,KAAK,cAAgB,CACnB,GAAG,KAAK,cAEN,iBAAkB,CAChB,KAAMA,EAAU,MAChB,QAASA,EAAU,YACrB,CAEJ,GAEK,MAGT,eAAaC,IACX,KAAK,cAAgB,CACnB,GAAG,KAAK,cACR,OAAAA,CACF,EACO,MAGT,gBAAcC,IACZ,KAAK,cAAgB,CACnB,GAAG,KAAK,cACR,QAASA,EAAQ,OAAQC,GAAWA,EAAO,OAAO,EAAE,IAAKA,IAAY,CAAE,KAAMA,EAAO,SAAW,EAAG,EAAE,CACtG,EACO,MAGT,kBAAe,IAAM,CACnB,KAAM,CAAE,OAAAF,CAAO,EAAI,KAAK,cAClBG,EAAK,IAAI,KACf,OAAQH,EAAQ,CACd,KAAK,gBAAc,OACjB,KAAK,cAAc,UAAU,OAASG,EACtC,MACF,KAAK,gBAAc,QACjB,KAAK,cAAc,UAAU,QAAUA,EACvC,MACF,KAAK,gBAAc,QACjB,KAAK,cAAc,UAAU,QAAUA,EACvC,MACF,KAAK,gBAAc,SACjB,KAAK,cAAc,UAAU,UAAYA,EACzC,MACF,KAAK,gBAAc,UACjB,KAAK,cAAc,UAAU,UAAYA,EACzC,MACF,KAAK,gBAAc,QACnB,KAAK,gBAAc,OACjB,MACF,QACE,KAAK,cAAc,UAAU,WAAaA,EAC1C,KACJ,CACA,OAAO,IACT,EAEA,wBAAqB,CAACC,EAAyBb,KACzCa,IACF,KAAK,cAAgB,CACnB,GAAG,KAAK,cACR,2BAA4BA,EAC5B,iBAAAb,CACF,GAEK,MA1OP,KAAK,gBAAkBpB,GAAmB,CAAC,EAC3C,KAAK,cAAgB,KAAK,cAAcD,CAAU,CACpD,CA0OF,CAGA,IAAOJ,EAAQD",
   "names": ["UserStoreItemBuilder_exports", "__export", "UserStoreItemBuilder", "UserStoreItemBuilder_default", "__toCommonJS", "import_parseurl", "import_UserReports", "reportData", "requestFormData", "type", "reportId", "reportName", "description", "id", "name", "executionData", "childExecutionData", "filterData", "filtersQueryString", "sortData", "sortByQueryString", "req", "origin", "pathname", "search", "href", "executionId", "dataProductDefinitionsPath", "dpdPathFromQuery", "pollingPath", "pollingFullUrl", "url", "fullUrl", "urlData", "parseUrl", "loadType", "queryData", "status", "metrics", "metric", "ts", "definitionsPath"]
 }

package/dpr/utils/UserStoreItemBuilder.ts

@@ -195,7 +195,7 @@ class UserStoreItemBuilder {
     return this
   }
 
-  addInteractiveQuery = (queryData?: { query: Dict<string>; querySummary: Array<Dict<string>> }) => {
+  addInteractiveQuery = (queryData?: { query: Dict<string | string[]>; querySummary: Array<Dict<string>> }) => {
     if (queryData) {
       this.userStoreItem = {
         ...this.userStoreItem,