@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.28.8 → 4.29.0

package/dpr/routes/journeys/view-report/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../dpr/routes/journeys/view-report/utils.ts"],
-  "sourcesContent": ["import { Request, Response } from 'express'\nimport { FilterType } from '../../../components/_filters/filter-input/enum'\nimport { components } from '../../../types/api'\nimport { StoredReportData } from '../../../types/UserReports'\nimport { Services } from '../../../types/Services'\nimport LocalsHelper from '../../../utils/localsHelper'\nimport definitionUtils from '../../../utils/definitionUtils'\nimport DateMapper from '../../../utils/DateMapper/DateMapper'\nimport ColumnsUtils from '../../../components/_reports/report-columns-form/utils'\n\nexport const applyReportInteractiveQuery = async (\n  req: Request,\n  res: Response,\n  services: Services,\n  applyType: 'columns' | 'filters',\n) => {\n  const { reportId, id } = req.params\n  const { token, definitionsPath } = LocalsHelper.getValues(res)\n\n  // Get the definition\n  const definition: components['schemas']['SingleVariantReportDefinition'] =\n    await services.reportingService.getDefinition(token, reportId, id, definitionsPath)\n  const fields = definition.variant.specification?.fields || []\n\n  return applyInteractiveQuery(req, res, services, applyType, fields)\n}\n\nexport const applyDashboardInteractiveQuery = async (\n  req: Request,\n  res: Response,\n  services: Services,\n  applyType: 'columns' | 'filters',\n) => {\n  const { reportId, id } = req.params\n  const { token, definitionsPath } = LocalsHelper.getValues(res)\n\n  // Get the definition\n  const definition: components['schemas']['DashboardDefinition'] = await services.dashboardService.getDefinition(\n    token,\n    reportId,\n    id,\n    definitionsPath,\n  )\n  const fields = definition.filterFields || []\n\n  return applyInteractiveQuery(req, res, services, applyType, fields)\n}\n\nconst applyInteractiveQuery = async (\n  req: Request,\n  res: Response,\n  services: Services,\n  applyType: 'columns' | 'filters',\n  fields: components['schemas']['FieldDefinition'][],\n) => {\n  const { tableId, id } = req.params\n  const { dprUser } = LocalsHelper.getValues(res)\n\n  // get the report state\n  let reportStateData: StoredReportData | undefined\n  if (tableId) {\n    // means its an async report\n    reportStateData = await services.recentlyViewedService?.getReportByTableId(tableId, dprUser.id)\n  } else {\n    // its a sync report and can be indentified by ID as will always only be 1\n    reportStateData = await services.recentlyViewedService?.getReportById(id, dprUser.id)\n  }\n\n  // Get the stored interactive query data\n  const interactiveQueryData = reportStateData?.interactiveQuery?.data\n\n  const preventDefault = interactiveQueryData?.['preventDefault']\n  const pageSize = interactiveQueryData?.['pageSize']\n  const selectedPage = applyType === 'columns' ? interactiveQueryData?.['selectedPage'] : 1\n  const sortColumn = interactiveQueryData?.['sortColumn']\n  const sortedAsc = interactiveQueryData?.['sortedAsc']\n\n  let filters = {}\n  if (interactiveQueryData) {\n    filters = Object.keys(interactiveQueryData)\n      .filter((key) => key.includes('filters.'))\n      .reduce((acc, key) => ({ ...acc, [key]: interactiveQueryData[key] }), {})\n  }\n\n  // Create merged form data\n  let formData: Record<string, string | string[]> = {\n    ...(preventDefault && { preventDefault }),\n    ...(selectedPage && { selectedPage }),\n    ...(pageSize && { pageSize }),\n    ...(sortColumn && { sortColumn }),\n    ...(sortedAsc && { sortedAsc }),\n    ...req.body,\n  }\n\n  if (applyType === 'columns') {\n    const { columns } = req.body\n    const mandatoryCols = ColumnsUtils.mandatoryColumns(fields)\n\n    let bodyColumns = []\n    if (columns) {\n      bodyColumns = Array.isArray(columns) ? columns : [columns]\n    }\n    const columnsData = [...mandatoryCols, ...bodyColumns]\n    formData = { ...formData, columns: columnsData, ...filters }\n  } else {\n    const columns = interactiveQueryData?.['columns'] || []\n    formData = { ...formData, columns }\n  }\n\n  // Create query string\n  const filtersString = createQueryParamsFromFormData({\n    formData,\n    fields,\n  })\n\n  // Redirect back to report\n  res.redirect(`${req.baseUrl}?${filtersString}`)\n}\n\nconst createQueryParamsFromFormData = ({\n  formData,\n  fields,\n}: {\n  fields: components['schemas']['FieldDefinition'][]\n  formData: Record<string, string | string[]>\n}) => {\n  // create the query string\n  const params = new URLSearchParams()\n  Object.keys(formData).forEach((key) => {\n    const value = formData[key]\n\n    if (value && key !== '_csrf') {\n      const fieldId = key.split('.')[1] // filters are prefixed with 'filters.'\n      if (fieldId) {\n        const filter = definitionUtils.getFilter(fields, fieldId)\n        if (filter) {\n          const { type: filterType } = filter\n          switch (filterType.toLocaleLowerCase()) {\n            // DATE RANGE TYPES\n            case FilterType.date.toLocaleLowerCase():\n            case FilterType.dateRange.toLocaleLowerCase():\n            case FilterType.granularDateRange.toLocaleLowerCase():\n              {\n                let dateValue: string = <string>value\n                const dateMapper = new DateMapper()\n                const currentDateFormat = dateMapper.getDateType(dateValue)\n                if (currentDateFormat !== 'none') {\n                  dateValue = dateMapper.toDateString(dateValue, 'iso') || ''\n                }\n                if (dateValue) {\n                  params.append(key, dateValue)\n                }\n              }\n              break\n\n            // MULTIVALUE TYPES: string[] || string if only one value selected\n            case FilterType.multiselect.toLocaleLowerCase():\n              if (Array.isArray(value)) {\n                const multiselectValue = <string[]>value\n                multiselectValue.forEach((v: string) => {\n                  params.append(key, v)\n                })\n              } else {\n                params.append(key, <string>value)\n              }\n              break\n\n            // OTHER TYPES - always a string\n            default:\n              params.append(key, <string>value)\n              break\n          }\n        }\n      } else if (Array.isArray(value)) {\n        value.forEach((v: string) => {\n          params.append(key, v)\n        })\n      } else {\n        params.append(key, value)\n      }\n    }\n  })\n\n  const encodedFilters = params.toString()\n  return decodeURIComponent(encodedFilters)\n}\n\nexport default {\n  applyDashboardInteractiveQuery,\n  applyReportInteractiveQuery,\n}\n"],
+  "sourcesContent": ["import { Request, Response } from 'express'\nimport { FilterType } from '../../../components/_filters/filter-input/enum'\nimport { components } from '../../../types/api'\nimport { StoredReportData } from '../../../types/UserReports'\nimport { Services } from '../../../types/Services'\nimport LocalsHelper from '../../../utils/localsHelper'\nimport definitionUtils from '../../../utils/definitionUtils'\nimport DateMapper from '../../../utils/DateMapper/DateMapper'\nimport ColumnsUtils from '../../../components/_reports/report-heading/report-columns/report-columns-form/utils'\n\nexport const applyReportInteractiveQuery = async (\n  req: Request,\n  res: Response,\n  services: Services,\n  applyType: 'columns' | 'filters',\n) => {\n  const { reportId, id } = req.params\n  const { token, definitionsPath } = LocalsHelper.getValues(res)\n\n  // Get the definition\n  const definition: components['schemas']['SingleVariantReportDefinition'] =\n    await services.reportingService.getDefinition(token, reportId, id, definitionsPath)\n  const fields = definition.variant.specification?.fields || []\n\n  return applyInteractiveQuery(req, res, services, applyType, fields)\n}\n\nexport const applyDashboardInteractiveQuery = async (\n  req: Request,\n  res: Response,\n  services: Services,\n  applyType: 'columns' | 'filters',\n) => {\n  const { reportId, id } = req.params\n  const { token, definitionsPath } = LocalsHelper.getValues(res)\n\n  // Get the definition\n  const definition: components['schemas']['DashboardDefinition'] = await services.dashboardService.getDefinition(\n    token,\n    reportId,\n    id,\n    definitionsPath,\n  )\n  const fields = definition.filterFields || []\n\n  return applyInteractiveQuery(req, res, services, applyType, fields)\n}\n\nconst applyInteractiveQuery = async (\n  req: Request,\n  res: Response,\n  services: Services,\n  applyType: 'columns' | 'filters',\n  fields: components['schemas']['FieldDefinition'][],\n) => {\n  const { tableId, id } = req.params\n  const { dprUser } = LocalsHelper.getValues(res)\n\n  // get the report state\n  let reportStateData: StoredReportData | undefined\n  if (tableId) {\n    // means its an async report\n    reportStateData = await services.recentlyViewedService?.getReportByTableId(tableId, dprUser.id)\n  } else {\n    // its a sync report and can be indentified by ID as will always only be 1\n    reportStateData = await services.recentlyViewedService?.getReportById(id, dprUser.id)\n  }\n\n  // Get the stored interactive query data\n  const interactiveQueryData = reportStateData?.interactiveQuery?.data\n\n  const preventDefault = interactiveQueryData?.['preventDefault']\n  const pageSize = interactiveQueryData?.['pageSize']\n  const selectedPage = applyType === 'columns' ? interactiveQueryData?.['selectedPage'] : 1\n  const sortColumn = interactiveQueryData?.['sortColumn']\n  const sortedAsc = interactiveQueryData?.['sortedAsc']\n\n  let filters = {}\n  if (interactiveQueryData) {\n    filters = Object.keys(interactiveQueryData)\n      .filter((key) => key.includes('filters.'))\n      .reduce((acc, key) => ({ ...acc, [key]: interactiveQueryData[key] }), {})\n  }\n\n  // Create merged form data\n  let formData: Record<string, string | string[]> = {\n    ...(preventDefault && { preventDefault }),\n    ...(selectedPage && { selectedPage }),\n    ...(pageSize && { pageSize }),\n    ...(sortColumn && { sortColumn }),\n    ...(sortedAsc && { sortedAsc }),\n    ...req.body,\n  }\n\n  if (applyType === 'columns') {\n    const { columns } = req.body\n    const mandatoryCols = ColumnsUtils.mandatoryColumns(fields)\n\n    let bodyColumns = []\n    if (columns) {\n      bodyColumns = Array.isArray(columns) ? columns : [columns]\n    }\n    const columnsData = [...mandatoryCols, ...bodyColumns]\n    formData = { ...formData, columns: columnsData, ...filters }\n  } else {\n    const columns = interactiveQueryData?.['columns'] || []\n    formData = { ...formData, columns }\n  }\n\n  // Create query string\n  const filtersString = createQueryParamsFromFormData({\n    formData,\n    fields,\n  })\n\n  // Redirect back to report\n  res.redirect(`${req.baseUrl}?${filtersString}`)\n}\n\nconst createQueryParamsFromFormData = ({\n  formData,\n  fields,\n}: {\n  fields: components['schemas']['FieldDefinition'][]\n  formData: Record<string, string | string[]>\n}) => {\n  // create the query string\n  const params = new URLSearchParams()\n  Object.keys(formData).forEach((key) => {\n    const value = formData[key]\n\n    if (value && key !== '_csrf') {\n      const fieldId = key.split('.')[1] // filters are prefixed with 'filters.'\n      if (fieldId) {\n        const filter = definitionUtils.getFilter(fields, fieldId)\n        if (filter) {\n          const { type: filterType } = filter\n          switch (filterType.toLocaleLowerCase()) {\n            // DATE RANGE TYPES\n            case FilterType.date.toLocaleLowerCase():\n            case FilterType.dateRange.toLocaleLowerCase():\n            case FilterType.granularDateRange.toLocaleLowerCase():\n              {\n                let dateValue: string = <string>value\n                const dateMapper = new DateMapper()\n                const currentDateFormat = dateMapper.getDateType(dateValue)\n                if (currentDateFormat !== 'none') {\n                  dateValue = dateMapper.toDateString(dateValue, 'iso') || ''\n                }\n                if (dateValue) {\n                  params.append(key, dateValue)\n                }\n              }\n              break\n\n            // MULTIVALUE TYPES: string[] || string if only one value selected\n            case FilterType.multiselect.toLocaleLowerCase():\n              if (Array.isArray(value)) {\n                const multiselectValue = <string[]>value\n                multiselectValue.forEach((v: string) => {\n                  params.append(key, v)\n                })\n              } else {\n                params.append(key, <string>value)\n              }\n              break\n\n            // OTHER TYPES - always a string\n            default:\n              params.append(key, <string>value)\n              break\n          }\n        }\n      } else if (Array.isArray(value)) {\n        value.forEach((v: string) => {\n          params.append(key, v)\n        })\n      } else {\n        params.append(key, value)\n      }\n    }\n  })\n\n  const encodedFilters = params.toString()\n  return decodeURIComponent(encodedFilters)\n}\n\nexport default {\n  applyDashboardInteractiveQuery,\n  applyReportInteractiveQuery,\n}\n"],
   "mappings": "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",
   "names": ["LocalsHelper", "ColumnsUtils", "definitionUtils", "DateMapper"]
 }

package/dpr/routes/journeys/view-report/utils.ts

@@ -6,7 +6,7 @@ import { Services } from '../../../types/Services'
 import LocalsHelper from '../../../utils/localsHelper'
 import definitionUtils from '../../../utils/definitionUtils'
 import DateMapper from '../../../utils/DateMapper/DateMapper'
-import ColumnsUtils from '../../../components/_reports/report-columns-form/utils'
+import ColumnsUtils from '../../../components/_reports/report-heading/report-columns/report-columns-form/utils'
 
 export const applyReportInteractiveQuery = async (
   req: Request,

package/dpr/services/reportingService.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../dpr/services/reportingService.ts"],
-  "sourcesContent": ["import { Response } from 'express'\nimport { components } from '../types/api'\nimport type ReportingClient from '../data/reportingClient'\nimport ReportQuery from '../types/ReportQuery'\nimport Dict = NodeJS.Dict\nimport { ListWithWarnings } from '../data/types'\n\nclass ReportingService {\n  constructor(private readonly reportingClient: ReportingClient) {\n    this.reportingClient = reportingClient\n  }\n\n  async getCount(resourceName: string, token: string, listRequest: ReportQuery): Promise<number> {\n    return this.reportingClient.getCount(resourceName, token, listRequest)\n  }\n\n  async getList(resourceName: string, token: string, listRequest: ReportQuery): Promise<Array<NodeJS.Dict<string>>> {\n    return this.reportingClient.getList(resourceName, token, listRequest)\n  }\n\n  async getListWithWarnings(resourceName: string, token: string, listRequest: ReportQuery): Promise<ListWithWarnings> {\n    return this.reportingClient.getListWithWarnings(resourceName, token, listRequest)\n  }\n\n  async getDefinitionSummary(\n    token: string,\n    reportId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<components['schemas']['ReportDefinitionSummary']> {\n    return this.reportingClient.getDefinitionSummary(token, reportId, dataProductDefinitionsPath)\n  }\n\n  async getDefinitions(\n    token: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Array<components['schemas']['ReportDefinitionSummary']>> {\n    return this.reportingClient.getDefinitions(token, dataProductDefinitionsPath)\n  }\n\n  async getDefinition(\n    token: string,\n    reportId: string,\n    variantId: string,\n    dataProductDefinitionsPath?: string,\n    query?: Dict<string | string[]>,\n  ): Promise<components['schemas']['SingleVariantReportDefinition']> {\n    return this.reportingClient.getDefinition(token, reportId, variantId, dataProductDefinitionsPath, query)\n  }\n\n  async requestAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    query: Record<string, string | boolean | number>,\n  ): Promise<Dict<string>> {\n    return this.reportingClient.requestAsyncReport(token, reportId, variantId, query)\n  }\n\n  async cancelAsyncRequest(\n    token: string,\n    reportId: string,\n    variantId: string,\n    executionId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Dict<string>> {\n    return this.reportingClient.cancelAsyncRequest(token, reportId, variantId, executionId, dataProductDefinitionsPath)\n  }\n\n  async downloadAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    tableId: string,\n    query: Record<string, string | string[]>,\n    res: Response,\n  ): Promise<void> {\n    return this.reportingClient.downloadAsyncReport(token, reportId, variantId, tableId, query, res)\n  }\n\n  async getAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    tableId: string,\n    query: Record<string, string | string[]>,\n  ): Promise<Array<Dict<string>>> {\n    return this.reportingClient.getAsyncReport(token, reportId, variantId, tableId, query)\n  }\n\n  async getAsyncSummaryReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    tableId: string,\n    summaryId: string,\n    query: Dict<string | number>,\n  ): Promise<Array<Dict<string>>> {\n    return this.reportingClient.getAsyncSummaryReport(token, reportId, variantId, tableId, summaryId, query)\n  }\n\n  async getAsyncReportStatus(\n    token: string,\n    reportId: string,\n    variantId: string,\n    executionId: string,\n    dataProductDefinitionsPath: string,\n    tableId: string,\n  ): Promise<components['schemas']['StatementExecutionStatus']> {\n    return this.reportingClient.getAsyncReportStatus(\n      token,\n      reportId,\n      variantId,\n      executionId,\n      dataProductDefinitionsPath,\n      tableId,\n    )\n  }\n\n  async getAsyncCount(token: string, tableId: string, dataProductDefinitionsPath?: string): Promise<number> {\n    return this.reportingClient.getAsyncCount(token, tableId, dataProductDefinitionsPath)\n  }\n\n  async getAsyncInteractiveCount(\n    token: string,\n    tableId: string,\n    reportId: string,\n    id: string,\n    filters: ReportQuery,\n  ): Promise<number> {\n    return this.reportingClient.getAsyncInteractiveCount(token, tableId, reportId, id, filters)\n  }\n}\n\nexport { ReportingService }\nexport default ReportingService\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,MAAM,iBAAiB;AAAA,EACrB,YAA6B,iBAAkC;AAAlC;AAC3B,SAAK,kBAAkB;AAAA,EACzB;AAAA,EAEA,MAAM,SAAS,cAAsB,OAAe,aAA2C;AAC7F,WAAO,KAAK,gBAAgB,SAAS,cAAc,OAAO,WAAW;AAAA,EACvE;AAAA,EAEA,MAAM,QAAQ,cAAsB,OAAe,aAA+D;AAChH,WAAO,KAAK,gBAAgB,QAAQ,cAAc,OAAO,WAAW;AAAA,EACtE;AAAA,EAEA,MAAM,oBAAoB,cAAsB,OAAe,aAAqD;AAClH,WAAO,KAAK,gBAAgB,oBAAoB,cAAc,OAAO,WAAW;AAAA,EAClF;AAAA,EAEA,MAAM,qBACJ,OACA,UACA,4BAC2D;AAC3D,WAAO,KAAK,gBAAgB,qBAAqB,OAAO,UAAU,0BAA0B;AAAA,EAC9F;AAAA,EAEA,MAAM,eACJ,OACA,4BACkE;AAClE,WAAO,KAAK,gBAAgB,eAAe,OAAO,0BAA0B;AAAA,EAC9E;AAAA,EAEA,MAAM,cACJ,OACA,UACA,WACA,4BACA,OACiE;AACjE,WAAO,KAAK,gBAAgB,cAAc,OAAO,UAAU,WAAW,4BAA4B,KAAK;AAAA,EACzG;AAAA,EAEA,MAAM,mBACJ,OACA,UACA,WACA,OACuB;AACvB,WAAO,KAAK,gBAAgB,mBAAmB,OAAO,UAAU,WAAW,KAAK;AAAA,EAClF;AAAA,EAEA,MAAM,mBACJ,OACA,UACA,WACA,aACA,4BACuB;AACvB,WAAO,KAAK,gBAAgB,mBAAmB,OAAO,UAAU,WAAW,aAAa,0BAA0B;AAAA,EACpH;AAAA,EAEA,MAAM,oBACJ,OACA,UACA,WACA,SACA,OACA,KACe;AACf,WAAO,KAAK,gBAAgB,oBAAoB,OAAO,UAAU,WAAW,SAAS,OAAO,GAAG;AAAA,EACjG;AAAA,EAEA,MAAM,eACJ,OACA,UACA,WACA,SACA,OAC8B;AAC9B,WAAO,KAAK,gBAAgB,eAAe,OAAO,UAAU,WAAW,SAAS,KAAK;AAAA,EACvF;AAAA,EAEA,MAAM,sBACJ,OACA,UACA,WACA,SACA,WACA,OAC8B;AAC9B,WAAO,KAAK,gBAAgB,sBAAsB,OAAO,UAAU,WAAW,SAAS,WAAW,KAAK;AAAA,EACzG;AAAA,EAEA,MAAM,qBACJ,OACA,UACA,WACA,aACA,4BACA,SAC4D;AAC5D,WAAO,KAAK,gBAAgB;AAAA,MAC1B;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAM,cAAc,OAAe,SAAiB,4BAAsD;AACxG,WAAO,KAAK,gBAAgB,cAAc,OAAO,SAAS,0BAA0B;AAAA,EACtF;AAAA,EAEA,MAAM,yBACJ,OACA,SACA,UACA,IACA,SACiB;AACjB,WAAO,KAAK,gBAAgB,yBAAyB,OAAO,SAAS,UAAU,IAAI,OAAO;AAAA,EAC5F;AACF;AAGA,IAAO,2BAAQ;",
+  "sourcesContent": ["import { Response } from 'express'\nimport { components } from '../types/api'\nimport type ReportingClient from '../data/reportingClient'\nimport ReportQuery from '../types/ReportQuery'\nimport Dict = NodeJS.Dict\nimport { ListWithWarnings } from '../data/types'\n\nclass ReportingService {\n  constructor(private readonly reportingClient: ReportingClient) {\n    this.reportingClient = reportingClient\n  }\n\n  async getCount(resourceName: string, token: string, listRequest: ReportQuery): Promise<number> {\n    return this.reportingClient.getCount(resourceName, token, listRequest)\n  }\n\n  async getList(resourceName: string, token: string, listRequest: ReportQuery): Promise<Array<NodeJS.Dict<string>>> {\n    return this.reportingClient.getList(resourceName, token, listRequest)\n  }\n\n  async getListWithWarnings(resourceName: string, token: string, listRequest: ReportQuery): Promise<ListWithWarnings> {\n    return this.reportingClient.getListWithWarnings(resourceName, token, listRequest)\n  }\n\n  async getDefinitionSummary(\n    token: string,\n    reportId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<components['schemas']['ReportDefinitionSummary']> {\n    return this.reportingClient.getDefinitionSummary(token, reportId, dataProductDefinitionsPath)\n  }\n\n  async getDefinitions(\n    token: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Array<components['schemas']['ReportDefinitionSummary']>> {\n    return this.reportingClient.getDefinitions(token, dataProductDefinitionsPath)\n  }\n\n  async getDefinition(\n    token: string,\n    reportId: string,\n    variantId: string,\n    dataProductDefinitionsPath?: string,\n    query?: Dict<string | string[]>,\n  ): Promise<components['schemas']['SingleVariantReportDefinition']> {\n    return this.reportingClient.getDefinition(token, reportId, variantId, dataProductDefinitionsPath, query)\n  }\n\n  async requestAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    query: Record<string, string | boolean | number>,\n  ): Promise<Dict<string>> {\n    return this.reportingClient.requestAsyncReport(token, reportId, variantId, query)\n  }\n\n  async cancelAsyncRequest(\n    token: string,\n    reportId: string,\n    variantId: string,\n    executionId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Dict<string>> {\n    return this.reportingClient.cancelAsyncRequest(token, reportId, variantId, executionId, dataProductDefinitionsPath)\n  }\n\n  async downloadAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    tableId: string,\n    query: Record<string, string | string[]>,\n    res: Response,\n  ): Promise<void> {\n    return this.reportingClient.downloadAsyncReport(token, reportId, variantId, tableId, query, res)\n  }\n\n  async getAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    tableId: string,\n    query: Record<string, string | string[]>,\n  ): Promise<Array<Record<string, string>>> {\n    return this.reportingClient.getAsyncReport(token, reportId, variantId, tableId, query)\n  }\n\n  async getAsyncSummaryReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    tableId: string,\n    summaryId: string,\n    query: Dict<string | number>,\n  ): Promise<Array<Record<string, string>>> {\n    return this.reportingClient.getAsyncSummaryReport(token, reportId, variantId, tableId, summaryId, query)\n  }\n\n  async getAsyncReportStatus(\n    token: string,\n    reportId: string,\n    variantId: string,\n    executionId: string,\n    dataProductDefinitionsPath: string,\n    tableId: string,\n  ): Promise<components['schemas']['StatementExecutionStatus']> {\n    return this.reportingClient.getAsyncReportStatus(\n      token,\n      reportId,\n      variantId,\n      executionId,\n      dataProductDefinitionsPath,\n      tableId,\n    )\n  }\n\n  async getAsyncCount(token: string, tableId: string, dataProductDefinitionsPath?: string): Promise<number> {\n    return this.reportingClient.getAsyncCount(token, tableId, dataProductDefinitionsPath)\n  }\n\n  async getAsyncInteractiveCount(\n    token: string,\n    tableId: string,\n    reportId: string,\n    id: string,\n    filters: ReportQuery,\n  ): Promise<number> {\n    return this.reportingClient.getAsyncInteractiveCount(token, tableId, reportId, id, filters)\n  }\n}\n\nexport { ReportingService }\nexport default ReportingService\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,MAAM,iBAAiB;AAAA,EACrB,YAA6B,iBAAkC;AAAlC;AAC3B,SAAK,kBAAkB;AAAA,EACzB;AAAA,EAEA,MAAM,SAAS,cAAsB,OAAe,aAA2C;AAC7F,WAAO,KAAK,gBAAgB,SAAS,cAAc,OAAO,WAAW;AAAA,EACvE;AAAA,EAEA,MAAM,QAAQ,cAAsB,OAAe,aAA+D;AAChH,WAAO,KAAK,gBAAgB,QAAQ,cAAc,OAAO,WAAW;AAAA,EACtE;AAAA,EAEA,MAAM,oBAAoB,cAAsB,OAAe,aAAqD;AAClH,WAAO,KAAK,gBAAgB,oBAAoB,cAAc,OAAO,WAAW;AAAA,EAClF;AAAA,EAEA,MAAM,qBACJ,OACA,UACA,4BAC2D;AAC3D,WAAO,KAAK,gBAAgB,qBAAqB,OAAO,UAAU,0BAA0B;AAAA,EAC9F;AAAA,EAEA,MAAM,eACJ,OACA,4BACkE;AAClE,WAAO,KAAK,gBAAgB,eAAe,OAAO,0BAA0B;AAAA,EAC9E;AAAA,EAEA,MAAM,cACJ,OACA,UACA,WACA,4BACA,OACiE;AACjE,WAAO,KAAK,gBAAgB,cAAc,OAAO,UAAU,WAAW,4BAA4B,KAAK;AAAA,EACzG;AAAA,EAEA,MAAM,mBACJ,OACA,UACA,WACA,OACuB;AACvB,WAAO,KAAK,gBAAgB,mBAAmB,OAAO,UAAU,WAAW,KAAK;AAAA,EAClF;AAAA,EAEA,MAAM,mBACJ,OACA,UACA,WACA,aACA,4BACuB;AACvB,WAAO,KAAK,gBAAgB,mBAAmB,OAAO,UAAU,WAAW,aAAa,0BAA0B;AAAA,EACpH;AAAA,EAEA,MAAM,oBACJ,OACA,UACA,WACA,SACA,OACA,KACe;AACf,WAAO,KAAK,gBAAgB,oBAAoB,OAAO,UAAU,WAAW,SAAS,OAAO,GAAG;AAAA,EACjG;AAAA,EAEA,MAAM,eACJ,OACA,UACA,WACA,SACA,OACwC;AACxC,WAAO,KAAK,gBAAgB,eAAe,OAAO,UAAU,WAAW,SAAS,KAAK;AAAA,EACvF;AAAA,EAEA,MAAM,sBACJ,OACA,UACA,WACA,SACA,WACA,OACwC;AACxC,WAAO,KAAK,gBAAgB,sBAAsB,OAAO,UAAU,WAAW,SAAS,WAAW,KAAK;AAAA,EACzG;AAAA,EAEA,MAAM,qBACJ,OACA,UACA,WACA,aACA,4BACA,SAC4D;AAC5D,WAAO,KAAK,gBAAgB;AAAA,MAC1B;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAM,cAAc,OAAe,SAAiB,4BAAsD;AACxG,WAAO,KAAK,gBAAgB,cAAc,OAAO,SAAS,0BAA0B;AAAA,EACtF;AAAA,EAEA,MAAM,yBACJ,OACA,SACA,UACA,IACA,SACiB;AACjB,WAAO,KAAK,gBAAgB,yBAAyB,OAAO,SAAS,UAAU,IAAI,OAAO;AAAA,EAC5F;AACF;AAGA,IAAO,2BAAQ;",
   "names": []
 }

package/dpr/services/reportingService.ts

@@ -83,7 +83,7 @@ class ReportingService {
     variantId: string,
     tableId: string,
     query: Record<string, string | string[]>,
-  ): Promise<Array<Dict<string>>> {
+  ): Promise<Array<Record<string, string>>> {
     return this.reportingClient.getAsyncReport(token, reportId, variantId, tableId, query)
   }
 
@@ -94,7 +94,7 @@ class ReportingService {
     tableId: string,
     summaryId: string,
     query: Dict<string | number>,
-  ): Promise<Array<Dict<string>>> {
+  ): Promise<Array<Record<string, string>>> {
     return this.reportingClient.getAsyncSummaryReport(token, reportId, variantId, tableId, summaryId, query)
   }
 

package/dpr/types/ReportQuery.js

@@ -34,7 +34,7 @@ __export(ReportQuery_exports, {
 });
 module.exports = __toCommonJS(ReportQuery_exports);
 var import_urlHelper = require("../utils/urlHelper");
-var import_utils = __toESM(require("../components/_reports/report-columns-form/utils"));
+var import_utils = __toESM(require("../components/_reports/report-heading/report-columns/report-columns-form/utils"));
 var import_UserReports = require("./UserReports");
 const DEFAULT_FILTERS_PREFIX = "filters.";
 class ReportQuery {

package/dpr/types/ReportQuery.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../dpr/types/ReportQuery.ts"],
-  "sourcesContent": ["import type { ParsedQs } from 'qs'\nimport { FilteredListRequest } from './index'\nimport Dict = NodeJS.Dict\nimport { components } from './api'\nimport { clearFilterValue } from '../utils/urlHelper'\nimport ColumnUtils from '../components/_reports/report-columns-form/utils'\nimport { Template } from './Templates'\nimport { ReportType } from './UserReports'\n\nexport const DEFAULT_FILTERS_PREFIX = 'filters.'\n\nclass ReportQuery implements FilteredListRequest {\n  selectedPage: number\n\n  pageSize: number\n\n  sortColumn?: string | undefined\n\n  columns: Array<string>\n\n  sortedAsc: boolean\n\n  filters: Dict<string>\n\n  filtersPrefix: string\n\n  dataProductDefinitionsPath?: string | undefined\n\n  constructor({\n    fields,\n    template,\n    queryParams,\n    definitionsPath,\n    filtersPrefix = DEFAULT_FILTERS_PREFIX,\n    reportType,\n  }: {\n    fields: components['schemas']['FieldDefinition'][]\n    template?: Template\n    queryParams: ParsedQs\n    definitionsPath?: string\n    filtersPrefix?: string\n    reportType?: ReportType\n  }) {\n    this.selectedPage = queryParams['selectedPage'] ? Number(queryParams['selectedPage']) : 1\n    this.pageSize = this.getPageSize(queryParams, template, reportType)\n\n    this.sortColumn = queryParams['sortColumn']\n      ? queryParams['sortColumn'].toString()\n      : this.getDefaultSortColumn(fields)\n\n    this.sortedAsc =\n      queryParams['sortedAsc'] !== undefined\n        ? queryParams['sortedAsc'] !== 'false'\n        : this.getDefaultSortDirection(fields)\n\n    this.dataProductDefinitionsPath =\n      definitionsPath ??\n      (queryParams['dataProductDefinitionsPath'] ? queryParams['dataProductDefinitionsPath'].toString() : undefined)\n\n    this.filtersPrefix = filtersPrefix\n\n    if (queryParams['columns']) {\n      const columns =\n        typeof queryParams['columns'] === 'string'\n          ? queryParams['columns'].split(',')\n          : (queryParams['columns'] as string[])\n      this.columns = ColumnUtils.ensureMandatoryColumns(fields, columns)\n    } else {\n      this.columns = fields.filter((f) => f.visible).map((f) => f.name)\n    }\n\n    const dateField: components['schemas']['FieldDefinition'] | undefined = fields.find((f) => {\n      return (\n        (f.type === 'date' && f.filter && f.filter.type === 'daterange') ||\n        (f.type === 'date' && f.filter && f.filter.type === 'date')\n      )\n    })\n\n    let min: string | undefined\n    let max: string | undefined\n    if (dateField && dateField.filter) {\n      min = dateField.filter.min\n      max = dateField.filter.max\n    }\n\n    this.filters = {}\n\n    Object.keys(queryParams)\n      .filter((key) => key.startsWith(this.filtersPrefix))\n      .filter((key) => queryParams[key])\n      .forEach((key) => {\n        const filter = key.replace(this.filtersPrefix, '')\n        const p = queryParams[key]\n        let value = p ? p.toString() : ''\n        if (filter.includes('.start') && min) {\n          if (new Date(value) < new Date(min)) value = min\n        }\n        if (filter.includes('.end') && max) {\n          if (new Date(value) > new Date(max)) value = max\n        }\n        if (value !== 'no-filter') {\n          this.filters[filter] = value\n        }\n      })\n\n    if (dateField && dateField.filter && dateField.filter.type === 'daterange') {\n      if (\n        min &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes('.start'))\n      ) {\n        this.filters[`${dateField.name}.start`] = min\n      }\n\n      if (\n        max &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes('.end'))\n      ) {\n        this.filters[`${dateField.name}.end`] = max\n      }\n    }\n\n    if (dateField && dateField.filter && dateField.filter.type === 'date') {\n      if (\n        min &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes(dateField.name))\n      ) {\n        this.filters[`${dateField.name}.start`] = min\n      }\n    }\n  }\n\n  private getDefaultSortColumn(fields: components['schemas']['FieldDefinition'][]) {\n    const defaultSortColumn = fields.find((f) => f.defaultsort)\n    return defaultSortColumn ? defaultSortColumn.name : fields.find((f) => f.sortable)?.name\n  }\n\n  private getDefaultSortDirection(fields: components['schemas']['FieldDefinition'][]) {\n    const field = fields.find((f) => f.defaultsort)\n    if (field) {\n      return field.sortDirection ? field.sortDirection === 'asc' : true\n    }\n    return true\n  }\n\n  getPageSize(queryParams: ParsedQs, template?: Template, reportType?: ReportType): number {\n    let pageSize = 5000000\n    if (!reportType || reportType === ReportType.REPORT) {\n      if (queryParams['pageSize']) {\n        pageSize = Number(queryParams['pageSize'])\n      } else if (template) {\n        pageSize = this.getDefaultPageSize(template)\n      }\n    }\n    return pageSize\n  }\n\n  toRecordWithFilterPrefix(removeClearedFilters = false): Record<string, string | Array<string>> {\n    const record: Record<string, string | Array<string>> = {\n      selectedPage: this.selectedPage.toString(),\n      ...(this.pageSize && { pageSize: this.pageSize.toString() }),\n      ...(this.sortColumn && { sortColumn: this.sortColumn }),\n      sortedAsc: this.sortedAsc.toString(),\n      columns: this.columns,\n    }\n\n    if (this.dataProductDefinitionsPath) {\n      record['dataProductDefinitionsPath'] = this.dataProductDefinitionsPath\n    }\n\n    Object.keys(this.filters).forEach((filterName) => {\n      const value = this.filters[filterName]\n      if ((value && !removeClearedFilters) || value !== clearFilterValue) {\n        record[`${this.filtersPrefix}${filterName}`] = <string>value\n      }\n    })\n\n    return record\n  }\n\n  private getDefaultPageSize(template: Template) {\n    const maxResultsSize = 500000\n    const standardPage = 20\n\n    switch (template) {\n      case 'list-section':\n      case 'summary-section':\n      case 'row-section-child':\n      case 'parent-child':\n      case 'parent-child-section':\n        return maxResultsSize\n\n      default:\n        return standardPage\n    }\n  }\n}\n\nexport { ReportQuery }\nexport default ReportQuery\n"],
+  "sourcesContent": ["import type { ParsedQs } from 'qs'\nimport { FilteredListRequest } from './index'\nimport Dict = NodeJS.Dict\nimport { components } from './api'\nimport { clearFilterValue } from '../utils/urlHelper'\nimport ColumnUtils from '../components/_reports/report-heading/report-columns/report-columns-form/utils'\nimport { Template } from './Templates'\nimport { ReportType } from './UserReports'\n\nexport const DEFAULT_FILTERS_PREFIX = 'filters.'\n\nclass ReportQuery implements FilteredListRequest {\n  selectedPage: number\n\n  pageSize: number\n\n  sortColumn?: string | undefined\n\n  columns: Array<string>\n\n  sortedAsc: boolean\n\n  filters: Dict<string>\n\n  filtersPrefix: string\n\n  dataProductDefinitionsPath?: string | undefined\n\n  constructor({\n    fields,\n    template,\n    queryParams,\n    definitionsPath,\n    filtersPrefix = DEFAULT_FILTERS_PREFIX,\n    reportType,\n  }: {\n    fields: components['schemas']['FieldDefinition'][]\n    template?: Template\n    queryParams: ParsedQs\n    definitionsPath?: string\n    filtersPrefix?: string\n    reportType?: ReportType\n  }) {\n    this.selectedPage = queryParams['selectedPage'] ? Number(queryParams['selectedPage']) : 1\n    this.pageSize = this.getPageSize(queryParams, template, reportType)\n\n    this.sortColumn = queryParams['sortColumn']\n      ? queryParams['sortColumn'].toString()\n      : this.getDefaultSortColumn(fields)\n\n    this.sortedAsc =\n      queryParams['sortedAsc'] !== undefined\n        ? queryParams['sortedAsc'] !== 'false'\n        : this.getDefaultSortDirection(fields)\n\n    this.dataProductDefinitionsPath =\n      definitionsPath ??\n      (queryParams['dataProductDefinitionsPath'] ? queryParams['dataProductDefinitionsPath'].toString() : undefined)\n\n    this.filtersPrefix = filtersPrefix\n\n    if (queryParams['columns']) {\n      const columns =\n        typeof queryParams['columns'] === 'string'\n          ? queryParams['columns'].split(',')\n          : (queryParams['columns'] as string[])\n      this.columns = ColumnUtils.ensureMandatoryColumns(fields, columns)\n    } else {\n      this.columns = fields.filter((f) => f.visible).map((f) => f.name)\n    }\n\n    const dateField: components['schemas']['FieldDefinition'] | undefined = fields.find((f) => {\n      return (\n        (f.type === 'date' && f.filter && f.filter.type === 'daterange') ||\n        (f.type === 'date' && f.filter && f.filter.type === 'date')\n      )\n    })\n\n    let min: string | undefined\n    let max: string | undefined\n    if (dateField && dateField.filter) {\n      min = dateField.filter.min\n      max = dateField.filter.max\n    }\n\n    this.filters = {}\n\n    Object.keys(queryParams)\n      .filter((key) => key.startsWith(this.filtersPrefix))\n      .filter((key) => queryParams[key])\n      .forEach((key) => {\n        const filter = key.replace(this.filtersPrefix, '')\n        const p = queryParams[key]\n        let value = p ? p.toString() : ''\n        if (filter.includes('.start') && min) {\n          if (new Date(value) < new Date(min)) value = min\n        }\n        if (filter.includes('.end') && max) {\n          if (new Date(value) > new Date(max)) value = max\n        }\n        if (value !== 'no-filter') {\n          this.filters[filter] = value\n        }\n      })\n\n    if (dateField && dateField.filter && dateField.filter.type === 'daterange') {\n      if (\n        min &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes('.start'))\n      ) {\n        this.filters[`${dateField.name}.start`] = min\n      }\n\n      if (\n        max &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes('.end'))\n      ) {\n        this.filters[`${dateField.name}.end`] = max\n      }\n    }\n\n    if (dateField && dateField.filter && dateField.filter.type === 'date') {\n      if (\n        min &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes(dateField.name))\n      ) {\n        this.filters[`${dateField.name}.start`] = min\n      }\n    }\n  }\n\n  private getDefaultSortColumn(fields: components['schemas']['FieldDefinition'][]) {\n    const defaultSortColumn = fields.find((f) => f.defaultsort)\n    return defaultSortColumn ? defaultSortColumn.name : fields.find((f) => f.sortable)?.name\n  }\n\n  private getDefaultSortDirection(fields: components['schemas']['FieldDefinition'][]) {\n    const field = fields.find((f) => f.defaultsort)\n    if (field) {\n      return field.sortDirection ? field.sortDirection === 'asc' : true\n    }\n    return true\n  }\n\n  getPageSize(queryParams: ParsedQs, template?: Template, reportType?: ReportType): number {\n    let pageSize = 5000000\n    if (!reportType || reportType === ReportType.REPORT) {\n      if (queryParams['pageSize']) {\n        pageSize = Number(queryParams['pageSize'])\n      } else if (template) {\n        pageSize = this.getDefaultPageSize(template)\n      }\n    }\n    return pageSize\n  }\n\n  toRecordWithFilterPrefix(removeClearedFilters = false): Record<string, string | Array<string>> {\n    const record: Record<string, string | Array<string>> = {\n      selectedPage: this.selectedPage.toString(),\n      ...(this.pageSize && { pageSize: this.pageSize.toString() }),\n      ...(this.sortColumn && { sortColumn: this.sortColumn }),\n      sortedAsc: this.sortedAsc.toString(),\n      columns: this.columns,\n    }\n\n    if (this.dataProductDefinitionsPath) {\n      record['dataProductDefinitionsPath'] = this.dataProductDefinitionsPath\n    }\n\n    Object.keys(this.filters).forEach((filterName) => {\n      const value = this.filters[filterName]\n      if ((value && !removeClearedFilters) || value !== clearFilterValue) {\n        record[`${this.filtersPrefix}${filterName}`] = <string>value\n      }\n    })\n\n    return record\n  }\n\n  private getDefaultPageSize(template: Template) {\n    const maxResultsSize = 500000\n    const standardPage = 20\n\n    switch (template) {\n      case 'list-section':\n      case 'summary-section':\n      case 'row-section-child':\n      case 'parent-child':\n      case 'parent-child-section':\n        return maxResultsSize\n\n      default:\n        return standardPage\n    }\n  }\n}\n\nexport { ReportQuery }\nexport default ReportQuery\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAIA,uBAAiC;AACjC,mBAAwB;AAExB,yBAA2B;AAEpB,MAAM,yBAAyB;AAEtC,MAAM,YAA2C;AAAA,EAC/C;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA,YAAY;AAAA,IACV;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,gBAAgB;AAAA,IAChB;AAAA,EACF,GAOG;AACD,SAAK,eAAe,YAAY,cAAc,IAAI,OAAO,YAAY,cAAc,CAAC,IAAI;AACxF,SAAK,WAAW,KAAK,YAAY,aAAa,UAAU,UAAU;AAElE,SAAK,aAAa,YAAY,YAAY,IACtC,YAAY,YAAY,EAAE,SAAS,IACnC,KAAK,qBAAqB,MAAM;AAEpC,SAAK,YACH,YAAY,WAAW,MAAM,SACzB,YAAY,WAAW,MAAM,UAC7B,KAAK,wBAAwB,MAAM;AAEzC,SAAK,6BACH,oBACC,YAAY,4BAA4B,IAAI,YAAY,4BAA4B,EAAE,SAAS,IAAI;AAEtG,SAAK,gBAAgB;AAErB,QAAI,YAAY,SAAS,GAAG;AAC1B,YAAM,UACJ,OAAO,YAAY,SAAS,MAAM,WAC9B,YAAY,SAAS,EAAE,MAAM,GAAG,IAC/B,YAAY,SAAS;AAC5B,WAAK,UAAU,aAAAA,QAAY,uBAAuB,QAAQ,OAAO;AAAA,IACnE,OAAO;AACL,WAAK,UAAU,OAAO,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI;AAAA,IAClE;AAEA,UAAM,YAAkE,OAAO,KAAK,CAAC,MAAM;AACzF,aACG,EAAE,SAAS,UAAU,EAAE,UAAU,EAAE,OAAO,SAAS,eACnD,EAAE,SAAS,UAAU,EAAE,UAAU,EAAE,OAAO,SAAS;AAAA,IAExD,CAAC;AAED,QAAI;AACJ,QAAI;AACJ,QAAI,aAAa,UAAU,QAAQ;AACjC,YAAM,UAAU,OAAO;AACvB,YAAM,UAAU,OAAO;AAAA,IACzB;AAEA,SAAK,UAAU,CAAC;AAEhB,WAAO,KAAK,WAAW,EACpB,OAAO,CAAC,QAAQ,IAAI,WAAW,KAAK,aAAa,CAAC,EAClD,OAAO,CAAC,QAAQ,YAAY,GAAG,CAAC,EAChC,QAAQ,CAAC,QAAQ;AAChB,YAAM,SAAS,IAAI,QAAQ,KAAK,eAAe,EAAE;AACjD,YAAM,IAAI,YAAY,GAAG;AACzB,UAAI,QAAQ,IAAI,EAAE,SAAS,IAAI;AAC/B,UAAI,OAAO,SAAS,QAAQ,KAAK,KAAK;AACpC,YAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,GAAG,EAAG,SAAQ;AAAA,MAC/C;AACA,UAAI,OAAO,SAAS,MAAM,KAAK,KAAK;AAClC,YAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,GAAG,EAAG,SAAQ;AAAA,MAC/C;AACA,UAAI,UAAU,aAAa;AACzB,aAAK,QAAQ,MAAM,IAAI;AAAA,MACzB;AAAA,IACF,CAAC;AAEH,QAAI,aAAa,UAAU,UAAU,UAAU,OAAO,SAAS,aAAa;AAC1E,UACE,OACA,OAAO,KAAK,WAAW,EAAE,KAAK,CAAC,QAAQ,IAAI,SAAS,KAAK,aAAa,CAAC,KACvE,OAAO,KAAK,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,SAAS,QAAQ,CAAC,GAC/D;AACA,aAAK,QAAQ,GAAG,UAAU,IAAI,QAAQ,IAAI;AAAA,MAC5C;AAEA,UACE,OACA,OAAO,KAAK,WAAW,EAAE,KAAK,CAAC,QAAQ,IAAI,SAAS,KAAK,aAAa,CAAC,KACvE,OAAO,KAAK,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,SAAS,MAAM,CAAC,GAC7D;AACA,aAAK,QAAQ,GAAG,UAAU,IAAI,MAAM,IAAI;AAAA,MAC1C;AAAA,IACF;AAEA,QAAI,aAAa,UAAU,UAAU,UAAU,OAAO,SAAS,QAAQ;AACrE,UACE,OACA,OAAO,KAAK,WAAW,EAAE,KAAK,CAAC,QAAQ,IAAI,SAAS,KAAK,aAAa,CAAC,KACvE,OAAO,KAAK,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,SAAS,UAAU,IAAI,CAAC,GACrE;AACA,aAAK,QAAQ,GAAG,UAAU,IAAI,QAAQ,IAAI;AAAA,MAC5C;AAAA,IACF;AAAA,EACF;AAAA,EAEQ,qBAAqB,QAAoD;AAC/E,UAAM,oBAAoB,OAAO,KAAK,CAAC,MAAM,EAAE,WAAW;AAC1D,WAAO,oBAAoB,kBAAkB,OAAO,OAAO,KAAK,CAAC,MAAM,EAAE,QAAQ,GAAG;AAAA,EACtF;AAAA,EAEQ,wBAAwB,QAAoD;AAClF,UAAM,QAAQ,OAAO,KAAK,CAAC,MAAM,EAAE,WAAW;AAC9C,QAAI,OAAO;AACT,aAAO,MAAM,gBAAgB,MAAM,kBAAkB,QAAQ;AAAA,IAC/D;AACA,WAAO;AAAA,EACT;AAAA,EAEA,YAAY,aAAuB,UAAqB,YAAiC;AACvF,QAAI,WAAW;AACf,QAAI,CAAC,cAAc,eAAe,8BAAW,QAAQ;AACnD,UAAI,YAAY,UAAU,GAAG;AAC3B,mBAAW,OAAO,YAAY,UAAU,CAAC;AAAA,MAC3C,WAAW,UAAU;AACnB,mBAAW,KAAK,mBAAmB,QAAQ;AAAA,MAC7C;AAAA,IACF;AACA,WAAO;AAAA,EACT;AAAA,EAEA,yBAAyB,uBAAuB,OAA+C;AAC7F,UAAM,SAAiD;AAAA,MACrD,cAAc,KAAK,aAAa,SAAS;AAAA,MACzC,GAAI,KAAK,YAAY,EAAE,UAAU,KAAK,SAAS,SAAS,EAAE;AAAA,MAC1D,GAAI,KAAK,cAAc,EAAE,YAAY,KAAK,WAAW;AAAA,MACrD,WAAW,KAAK,UAAU,SAAS;AAAA,MACnC,SAAS,KAAK;AAAA,IAChB;AAEA,QAAI,KAAK,4BAA4B;AACnC,aAAO,4BAA4B,IAAI,KAAK;AAAA,IAC9C;AAEA,WAAO,KAAK,KAAK,OAAO,EAAE,QAAQ,CAAC,eAAe;AAChD,YAAM,QAAQ,KAAK,QAAQ,UAAU;AACrC,UAAK,SAAS,CAAC,wBAAyB,UAAU,mCAAkB;AAClE,eAAO,GAAG,KAAK,aAAa,GAAG,UAAU,EAAE,IAAY;AAAA,MACzD;AAAA,IACF,CAAC;AAED,WAAO;AAAA,EACT;AAAA,EAEQ,mBAAmB,UAAoB;AAC7C,UAAM,iBAAiB;AACvB,UAAM,eAAe;AAErB,YAAQ,UAAU;AAAA,MAChB,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AACH,eAAO;AAAA,MAET;AACE,eAAO;AAAA,IACX;AAAA,EACF;AACF;AAGA,IAAO,sBAAQ;",
   "names": ["ColumnUtils"]
 }

package/dpr/types/ReportQuery.ts

@@ -3,7 +3,7 @@ import { FilteredListRequest } from './index'
 import Dict = NodeJS.Dict
 import { components } from './api'
 import { clearFilterValue } from '../utils/urlHelper'
-import ColumnUtils from '../components/_reports/report-columns-form/utils'
+import ColumnUtils from '../components/_reports/report-heading/report-columns/report-columns-form/utils'
 import { Template } from './Templates'
 import { ReportType } from './UserReports'
 

package/dpr/types/UserReports.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../dpr/types/UserReports.ts"],
-  "sourcesContent": ["import Dict = NodeJS.Dict\nimport { SummaryTemplate, Template } from './Templates'\nimport { FieldDefinition } from '../utils/DataTableBuilder/types'\nimport { ChildReportExecutionData } from './ExecutionData'\n\nexport interface StoredReportData {\n  reportId: string\n  variantId?: string // NOTE variant ID exists fir V1 async routes\n  id: string\n  executionId?: string | undefined\n  tableId?: string | undefined\n  reportName: string\n  variantName?: string\n  name: string\n  description: string\n  status?: RequestStatus\n  timestamp: AsyncReportsTimestamp\n  dataProductDefinitionsPath?: string\n  dpdPathFromQuery?: boolean\n  query?: AsyncReportQueryData\n  interactiveQuery?: AsyncReportQueryData\n  url?: AsyncReportUrlData\n  type: ReportType\n  loadType?: LoadType\n  childExecutionData?: Array<ChildReportExecutionData>\n}\n\nexport interface RequestedReport extends StoredReportData {\n  template: Template\n  errorMessage?: string\n  filters: ParamsConfig\n  sortBy: ParamsConfig\n}\n\nexport interface RequestedDashboard extends StoredReportData {\n  metrics: { name: string }[]\n}\n\nexport type RecentlyViewedReport = StoredReportData\nexport type UserReportData = RequestedReport | RecentlyViewedReport | StoredReportData | RequestedDashboard\n\nexport interface AsyncReportUrlData {\n  origin: string\n  request?: AsyncReportUrlItemData\n  report?: AsyncReportUrlItemData\n  polling?: AsyncReportUrlItemData\n}\n\nexport interface AsyncReportUrlItemData {\n  pathname?: string | undefined\n  fullUrl?: string | undefined\n  search?: string\n  default?: string\n}\n\nexport interface AsyncReportQueryData {\n  data: Dict<string | string[]>\n  summary: Array<Dict<string>>\n}\n\nexport interface ParamsConfig {\n  data: Dict<string>\n  queryString: string\n}\n\nexport enum RequestStatus {\n  SUBMITTED = 'SUBMITTED',\n  STARTED = 'STARTED',\n  PICKED = 'PICKED',\n  FINISHED = 'FINISHED',\n  FAILED = 'FAILED',\n  ABORTED = 'ABORTED',\n  EXPIRED = 'EXPIRED',\n  READY = 'READY',\n  ALL = 'ALL',\n}\n\nexport enum ReportType {\n  REPORT = 'report',\n  DASHBOARD = 'dashboard',\n  UNAVAILABLE = 'unavailable',\n}\n\nexport interface AsyncReportsTimestamp {\n  lastViewed?: Date\n  requested?: Date\n  completed?: Date\n  expired?: Date\n  failed?: Date\n  retried?: Date\n  aborted?: Date\n  refresh?: Date\n}\n\nexport interface AsyncSummary {\n  id: string\n  template: SummaryTemplate\n  fields: Array<FieldDefinition>\n  data: Array<Dict<string>>\n}\n\nexport interface FormattedUserReportData {\n  id?: string | undefined\n  href?: string | undefined\n  text: string\n  reportName: string\n  description: string\n  timestamp?: string\n  tag?: string\n  status?: string | undefined\n  type: ReportType\n  summary?: { name: string; value: string }[]\n  interactiveSummary?: { name: string; value: string }[]\n  meta: meta\n}\n\nexport interface FormattedBookmarkData {\n  id?: string\n  href?: string\n  text: string\n  reportName: string\n  description: string\n  timestamp?: string\n  tag?: string\n  status?: string\n  type: ReportType\n  summary?: { name: string; value: string }[]\n  interactiveSummary?: { name: string; value: string }[]\n}\n\nexport interface meta {\n  reportId: string\n  id: string\n  executionId?: string | undefined\n  tableId?: string | undefined\n  status?: string | undefined\n  type: ReportType\n  requestedAt?: Date | undefined\n  dataProductDefinitionsPath?: string | undefined\n  pollingUrl?: string | undefined\n  reportUrl?: string | undefined\n}\n\nexport interface RequestFormData {\n  dataProductDefinitionsPath: string\n  _csrf: string\n  reportId: string\n  name: string\n  reportName: string\n  description: string\n  type: string\n  pathname: string\n  origin: string\n  href: string\n  search: string\n  id: string\n  variantId?: string\n  template?: string\n  metrics?: { name: string }[]\n}\n\nexport enum LoadType {\n  SYNC = 'sync',\n  ASYNC = 'async',\n  SCHEDULED = 'scheduled',\n}\n\nexport interface DefinitionData {\n  reportName: string\n  reportId: string\n  id: string\n  name: string\n  description?: string\n  type: ReportType\n  reportDescription?: string\n  loadType: LoadType\n  authorised: boolean\n  isMissing?: boolean\n}\n"],
+  "sourcesContent": ["import Dict = NodeJS.Dict\nimport { SummaryTemplate, Template } from './Templates'\nimport { ChildReportExecutionData } from './ExecutionData'\nimport { components } from './api'\n\nexport interface StoredReportData {\n  reportId: string\n  variantId?: string // NOTE variant ID exists fir V1 async routes\n  id: string\n  executionId?: string | undefined\n  tableId?: string | undefined\n  reportName: string\n  variantName?: string\n  name: string\n  description: string\n  status?: RequestStatus\n  timestamp: AsyncReportsTimestamp\n  dataProductDefinitionsPath?: string\n  dpdPathFromQuery?: boolean\n  query?: AsyncReportQueryData\n  interactiveQuery?: AsyncReportQueryData\n  url?: AsyncReportUrlData\n  type: ReportType\n  loadType?: LoadType\n  childExecutionData?: Array<ChildReportExecutionData>\n}\n\nexport interface RequestedReport extends StoredReportData {\n  template: Template\n  errorMessage?: string\n  filters: ParamsConfig\n  sortBy: ParamsConfig\n}\n\nexport interface RequestedDashboard extends StoredReportData {\n  metrics: { name: string }[]\n}\n\nexport type RecentlyViewedReport = StoredReportData\nexport type UserReportData = RequestedReport | RecentlyViewedReport | StoredReportData | RequestedDashboard\n\nexport interface AsyncReportUrlData {\n  origin: string\n  request?: AsyncReportUrlItemData\n  report?: AsyncReportUrlItemData\n  polling?: AsyncReportUrlItemData\n}\n\nexport interface AsyncReportUrlItemData {\n  pathname?: string | undefined\n  fullUrl?: string | undefined\n  search?: string\n  default?: string\n}\n\nexport interface AsyncReportQueryData {\n  data: Dict<string | string[]>\n  summary: Array<Dict<string>>\n}\n\nexport interface ParamsConfig {\n  data: Dict<string>\n  queryString: string\n}\n\nexport enum RequestStatus {\n  SUBMITTED = 'SUBMITTED',\n  STARTED = 'STARTED',\n  PICKED = 'PICKED',\n  FINISHED = 'FINISHED',\n  FAILED = 'FAILED',\n  ABORTED = 'ABORTED',\n  EXPIRED = 'EXPIRED',\n  READY = 'READY',\n  ALL = 'ALL',\n}\n\nexport enum ReportType {\n  REPORT = 'report',\n  DASHBOARD = 'dashboard',\n  UNAVAILABLE = 'unavailable',\n}\n\nexport interface AsyncReportsTimestamp {\n  lastViewed?: Date\n  requested?: Date\n  completed?: Date\n  expired?: Date\n  failed?: Date\n  retried?: Date\n  aborted?: Date\n  refresh?: Date\n}\n\nexport interface AsyncSummary {\n  id: string\n  template: SummaryTemplate\n  fields: Array<components['schemas']['SummaryField']>\n  data: Array<Record<string, string>>\n}\n\nexport interface FormattedUserReportData {\n  id?: string | undefined\n  href?: string | undefined\n  text: string\n  reportName: string\n  description: string\n  timestamp?: string\n  tag?: string\n  status?: string | undefined\n  type: ReportType\n  summary?: { name: string; value: string }[]\n  interactiveSummary?: { name: string; value: string }[]\n  meta: meta\n}\n\nexport interface FormattedBookmarkData {\n  id?: string\n  href?: string\n  text: string\n  reportName: string\n  description: string\n  timestamp?: string\n  tag?: string\n  status?: string\n  type: ReportType\n  summary?: { name: string; value: string }[]\n  interactiveSummary?: { name: string; value: string }[]\n}\n\nexport interface meta {\n  reportId: string\n  id: string\n  executionId?: string | undefined\n  tableId?: string | undefined\n  status?: string | undefined\n  type: ReportType\n  requestedAt?: Date | undefined\n  dataProductDefinitionsPath?: string | undefined\n  pollingUrl?: string | undefined\n  reportUrl?: string | undefined\n}\n\nexport interface RequestFormData {\n  dataProductDefinitionsPath: string\n  _csrf: string\n  reportId: string\n  name: string\n  reportName: string\n  description: string\n  type: string\n  pathname: string\n  origin: string\n  href: string\n  search: string\n  id: string\n  variantId?: string\n  template?: string\n  metrics?: { name: string }[]\n}\n\nexport enum LoadType {\n  SYNC = 'sync',\n  ASYNC = 'async',\n  SCHEDULED = 'scheduled',\n}\n\nexport interface DefinitionData {\n  reportName: string\n  reportId: string\n  id: string\n  name: string\n  description?: string\n  type: ReportType\n  reportDescription?: string\n  loadType: LoadType\n  authorised: boolean\n  isMissing?: boolean\n}\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAiEO,IAAK,gBAAL,kBAAKA,mBAAL;AACL,EAAAA,eAAA,eAAY;AACZ,EAAAA,eAAA,aAAU;AACV,EAAAA,eAAA,YAAS;AACT,EAAAA,eAAA,cAAW;AACX,EAAAA,eAAA,YAAS;AACT,EAAAA,eAAA,aAAU;AACV,EAAAA,eAAA,aAAU;AACV,EAAAA,eAAA,WAAQ;AACR,EAAAA,eAAA,SAAM;AATI,SAAAA;AAAA,GAAA;AAYL,IAAK,aAAL,kBAAKC,gBAAL;AACL,EAAAA,YAAA,YAAS;AACT,EAAAA,YAAA,eAAY;AACZ,EAAAA,YAAA,iBAAc;AAHJ,SAAAA;AAAA,GAAA;AAoFL,IAAK,WAAL,kBAAKC,cAAL;AACL,EAAAA,UAAA,UAAO;AACP,EAAAA,UAAA,WAAQ;AACR,EAAAA,UAAA,eAAY;AAHF,SAAAA;AAAA,GAAA;",
   "names": ["RequestStatus", "ReportType", "LoadType"]
 }

package/dpr/types/UserReports.ts

@@ -1,7 +1,7 @@
 import Dict = NodeJS.Dict
 import { SummaryTemplate, Template } from './Templates'
-import { FieldDefinition } from '../utils/DataTableBuilder/types'
 import { ChildReportExecutionData } from './ExecutionData'
+import { components } from './api'
 
 export interface StoredReportData {
   reportId: string
@@ -95,8 +95,8 @@ export interface AsyncReportsTimestamp {
 export interface AsyncSummary {
   id: string
   template: SummaryTemplate
-  fields: Array<FieldDefinition>
-  data: Array<Dict<string>>
+  fields: Array<components['schemas']['SummaryField']>
+  data: Array<Record<string, string>>
 }
 
 export interface FormattedUserReportData {

package/dpr/utils/TemplateBuilder/ParentChildDataBuilder/ParentChildDataBuilder.js

@@ -0,0 +1,193 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var ParentChildDataBuilder_exports = {};
+__export(ParentChildDataBuilder_exports, {
+  ParentChildDataBuilder: () => ParentChildDataBuilder
+});
+module.exports = __toCommonJS(ParentChildDataBuilder_exports);
+var import_DataTableBuilder = __toESM(require("../../DataTableBuilder/DataTableBuilder"));
+var import_SectionedDataHelper = require("../SectionedDataHelper/SectionedDataHelper");
+var import_TemplateBuilder = require("../TemplateBuilder");
+class ParentChildDataBuilder extends import_TemplateBuilder.TemplateBuilder {
+  childColumns = [];
+  childVariants = [];
+  childData = [];
+  joinFields = [];
+  childFields = [];
+  parentChildDatasets = [];
+  dataTableBuilder;
+  constructor(variant) {
+    super(variant);
+    this.childVariants = this.variant.childVariants || [];
+  }
+  getChildVariant(childId) {
+    return this.childVariants.find((cv) => cv.id === childId);
+  }
+  /**
+   * Exracts the relevant data from the child variant definition
+   * to generate the child table
+   *
+   * @param {string} childId
+   * @return { fields: components['schemas']['FieldDefinition'][], joinFields: string[], columns: string[], name: string }
+   * @memberof ParentChildDataBuilder
+   */
+  getChildVariantDefinitionData(childId) {
+    const childVariant = this.getChildVariant(childId);
+    let fields = [];
+    let joinFields = [];
+    let columns = [];
+    let name = "Child report";
+    if (childVariant && childVariant.specification) {
+      fields = childVariant.specification.fields;
+      joinFields = childVariant && childVariant.specification ? childVariant.joinFields : [];
+      columns = fields.filter((f) => f.visible).map((f) => f.name);
+      name = childVariant.name;
+    }
+    return {
+      fields,
+      joinFields,
+      columns,
+      name
+    };
+  }
+  /**
+   * Maps the parent child rows.
+   * Splits into sections that will become the parent table
+   *
+   * @return {*}  {GroupedParentChildDataset[]}
+   * @memberof ParentChildDataBuilder
+   */
+  mergeParentChildAndGroup(parentData) {
+    const groups = [];
+    let pendingParents = [];
+    parentData.forEach((parentRow) => {
+      const dataset = {
+        parent: parentRow,
+        children: []
+      };
+      this.childData.forEach((child) => {
+        const { joinFields } = this.getChildVariantDefinitionData(child.id);
+        const matchedChildren = [];
+        child.data.forEach((childRow) => {
+          const isMatch = joinFields.every((col) => {
+            return parentRow[col] === childRow[col];
+          });
+          if (isMatch) matchedChildren.push(childRow);
+        });
+        if (matchedChildren.length) {
+          dataset.children.push({
+            id: child.id,
+            data: matchedChildren
+          });
+        }
+      });
+      pendingParents.push(dataset.parent);
+      if (dataset.children.length > 0) {
+        groups.push({
+          parent: pendingParents,
+          children: dataset.children
+        });
+        pendingParents = [];
+      }
+    });
+    if (pendingParents.length > 0) {
+      groups.push({
+        parent: pendingParents,
+        children: []
+      });
+    }
+    return groups;
+  }
+  /**
+   * Maps the parent child data to a table data
+   *
+   * @param {GroupedParentChildDataset[]} parentChildGroups
+   * @return {*}  {ParentChildData[]}
+   * @memberof ParentChildDataBuilder
+   */
+  mapToTableData(parentChildGroups) {
+    const parentTableBuilder = new import_DataTableBuilder.default(this.fields);
+    return parentChildGroups.map((group) => {
+      const parentTable = parentTableBuilder.withNoHeaderOptions(this.columns).buildTable(group.parent);
+      const children = this.mapChildDataToTableData(group);
+      return {
+        parent: parentTable,
+        children
+      };
+    });
+  }
+  /**
+   * Maps the grouped child data to table data
+   *
+   * @param {GroupedParentChildDataset} group
+   * @return {*}
+   * @memberof ParentChildDataBuilder
+   */
+  mapChildDataToTableData(group) {
+    return group.children.map((child) => {
+      const { fields: childFields, columns: childColumns, name } = this.getChildVariantDefinitionData(child.id);
+      const childTableBuilder = new import_DataTableBuilder.default(childFields);
+      const childTable = childTableBuilder.withNoHeaderOptions(childColumns).buildTable(child.data);
+      return {
+        title: name,
+        ...childTable
+      };
+    });
+  }
+  withChildData(childData) {
+    this.childData = childData;
+    return this;
+  }
+  withChildColumns(childColumns) {
+    this.childColumns = childColumns;
+    return this;
+  }
+  build() {
+    const sectionData = new import_SectionedDataHelper.SectionedDataHelper().withSections(this.sections).withData(this.data).withFields(this.fields).withReportQuery(this.reportQuery).build();
+    const { sections } = sectionData;
+    const mappedSections = sections.map((section) => {
+      const groups = this.mergeParentChildAndGroup(section.data);
+      const table = this.mapToTableData(groups);
+      return {
+        ...section,
+        summaries: [],
+        data: table
+      };
+    });
+    return {
+      rowCount: this.data.length,
+      sections: mappedSections
+    };
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ParentChildDataBuilder
+});
+//# sourceMappingURL=ParentChildDataBuilder.js.map

package/dpr/utils/TemplateBuilder/ParentChildDataBuilder/ParentChildDataBuilder.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../dpr/utils/TemplateBuilder/ParentChildDataBuilder/ParentChildDataBuilder.ts"],
+  "sourcesContent": ["import { components } from '../../../types/api'\nimport DataTableBuilder from '../../DataTableBuilder/DataTableBuilder'\nimport { DataTable } from '../../DataTableBuilder/types'\nimport { SectionedDataHelper } from '../SectionedDataHelper/SectionedDataHelper'\nimport { ReportTemplateData, SectionData } from '../SectionedDataHelper/types'\nimport { TemplateBuilder } from '../TemplateBuilder'\nimport { ChildData, GroupedParentChildDataset, ParentChildTableData, ParentChildDataset } from './types'\n\nexport class ParentChildDataBuilder extends TemplateBuilder {\n  childColumns: Array<string> = []\n\n  childVariants: components['schemas']['ChildVariantDefinition'][] = []\n\n  childData: Array<ChildData> = []\n\n  joinFields: Array<components['schemas']['FieldDefinition']> = []\n\n  childFields: Array<components['schemas']['FieldDefinition']> = []\n\n  parentChildDatasets: ParentChildDataset[] = []\n\n  dataTableBuilder!: DataTableBuilder\n\n  constructor(variant: components['schemas']['VariantDefinition']) {\n    super(variant)\n\n    this.childVariants = this.variant.childVariants || []\n  }\n\n  getChildVariant(childId: string) {\n    return this.childVariants.find((cv) => cv.id === childId)\n  }\n\n  /**\n   * Exracts the relevant data from the child variant definition\n   * to generate the child table\n   *\n   * @param {string} childId\n   * @return { fields: components['schemas']['FieldDefinition'][], joinFields: string[], columns: string[], name: string }\n   * @memberof ParentChildDataBuilder\n   */\n  getChildVariantDefinitionData(childId: string) {\n    const childVariant = this.getChildVariant(childId)\n\n    let fields: components['schemas']['FieldDefinition'][] = []\n    let joinFields: string[] = []\n    let columns: string[] = []\n    let name = 'Child report'\n\n    if (childVariant && childVariant.specification) {\n      fields = childVariant.specification.fields\n      joinFields = childVariant && childVariant.specification ? childVariant.joinFields : []\n      columns = fields.filter((f) => f.visible).map((f) => f.name)\n      name = childVariant.name\n    }\n\n    return {\n      fields,\n      joinFields,\n      columns,\n      name,\n    }\n  }\n\n  /**\n   * Maps the parent child rows.\n   * Splits into sections that will become the parent table\n   *\n   * @return {*}  {GroupedParentChildDataset[]}\n   * @memberof ParentChildDataBuilder\n   */\n  mergeParentChildAndGroup(parentData: Record<string, string>[]): GroupedParentChildDataset[] {\n    const groups: GroupedParentChildDataset[] = []\n    let pendingParents: Array<Record<string, string>> = []\n\n    parentData.forEach((parentRow) => {\n      // Build a dataset for this parent\n      const dataset: ParentChildDataset = {\n        parent: parentRow,\n        children: [],\n      }\n\n      // Match against each child dataset\n      this.childData.forEach((child) => {\n        const { joinFields } = this.getChildVariantDefinitionData(child.id)\n        const matchedChildren: Record<string, string>[] = []\n\n        // Compare join fields\n        child.data.forEach((childRow) => {\n          const isMatch = joinFields.every((col) => {\n            return parentRow[col] === childRow[col]\n          })\n          if (isMatch) matchedChildren.push(childRow)\n        })\n\n        if (matchedChildren.length) {\n          dataset.children.push({\n            id: child.id,\n            data: matchedChildren,\n          })\n        }\n      })\n\n      // Always collect the parent\n      pendingParents.push(dataset.parent)\n\n      // If dataset has children \u2192 close the group\n      if (dataset.children.length > 0) {\n        groups.push({\n          parent: pendingParents,\n          children: dataset.children,\n        })\n        pendingParents = []\n      }\n    })\n\n    // If leftover parents exist, make a final group (empty children)\n    if (pendingParents.length > 0) {\n      groups.push({\n        parent: pendingParents,\n        children: [],\n      })\n    }\n\n    return groups\n  }\n\n  /**\n   * Maps the parent child data to a table data\n   *\n   * @param {GroupedParentChildDataset[]} parentChildGroups\n   * @return {*}  {ParentChildData[]}\n   * @memberof ParentChildDataBuilder\n   */\n  mapToTableData(parentChildGroups: GroupedParentChildDataset[]): ParentChildTableData[] {\n    const parentTableBuilder = new DataTableBuilder(this.fields)\n    return parentChildGroups.map((group: GroupedParentChildDataset) => {\n      const parentTable = parentTableBuilder.withNoHeaderOptions(this.columns).buildTable(group.parent)\n      const children: ParentChildTableData['children'] = this.mapChildDataToTableData(group)\n\n      return {\n        parent: parentTable,\n        children,\n      }\n    })\n  }\n\n  /**\n   * Maps the grouped child data to table data\n   *\n   * @param {GroupedParentChildDataset} group\n   * @return {*}\n   * @memberof ParentChildDataBuilder\n   */\n  mapChildDataToTableData(group: GroupedParentChildDataset) {\n    return group.children.map((child) => {\n      const { fields: childFields, columns: childColumns, name } = this.getChildVariantDefinitionData(child.id)\n      const childTableBuilder = new DataTableBuilder(childFields)\n      const childTable = childTableBuilder.withNoHeaderOptions(childColumns).buildTable(child.data)\n\n      return {\n        title: name,\n        ...childTable,\n      }\n    })\n  }\n\n  withChildData(childData: Array<ChildData>) {\n    this.childData = childData\n    return this\n  }\n\n  withChildColumns(childColumns: string[]) {\n    this.childColumns = childColumns\n    return this\n  }\n\n  build(): ReportTemplateData {\n    const sectionData = new SectionedDataHelper()\n      .withSections(this.sections)\n      .withData(this.data)\n      .withFields(this.fields)\n      .withReportQuery(this.reportQuery)\n      .build()\n\n    const { sections } = sectionData\n    const mappedSections = sections.map((section: SectionData) => {\n      const groups = this.mergeParentChildAndGroup(<Array<Record<string, string>>>section.data)\n      const table = this.mapToTableData(groups)\n\n      return {\n        ...section,\n        summaries: [] as unknown as Record<string, DataTable[]>,\n        data: table,\n      }\n    })\n\n    return {\n      rowCount: this.data.length,\n      sections: mappedSections,\n    }\n  }\n}\n"],
+  "mappings": "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",
+  "names": ["DataTableBuilder"]
+}