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

package/dpr/components/show-more/style.scss

@@ -1,6 +1,6 @@
 .dpr-show-more {
   .dpr-show-hide-button {
-    display: inline-block
+    display: inline-block;
   }
 
   .dpr-show-more-content {
@@ -22,7 +22,7 @@ ul.dpr-card-group__item__filters-list {
     margin-bottom: govuk-spacing(1);
     margin-right: govuk-spacing(1);
   }
-  
+
   li.dpr-query-summary {
     background-color: govuk-colour('light-grey');
   }
@@ -32,7 +32,6 @@ ul.dpr-card-group__item__filters-list {
   }
 
   li:last-child {
-    margin-bottom: govuk-spacing(0);    
+    margin-bottom: govuk-spacing(0);
   }
 }
- 

package/dpr/data/reportingClient.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../dpr/data/reportingClient.ts"],
-  "sourcesContent": ["import { Response } from 'express'\nimport ReportQuery from '../types/ReportQuery'\nimport logger from '../utils/logger'\nimport RestClient from './restClient'\nimport Dict = NodeJS.Dict\nimport { components, operations } from '../types/api'\nimport { ApiConfig, Count, ListWithWarnings } from './types'\nimport type { ResultWithHeaders } from './restClient'\n\nclass ReportingClient {\n  restClient: RestClient\n\n  constructor(config: ApiConfig) {\n    this.restClient = new RestClient('Reporting API Client', config)\n  }\n\n  getCount(resourceName: string, token: string, countRequest: ReportQuery): Promise<number> {\n    logger.info(`Reporting client: Get count. { resourceName: ${resourceName} }`)\n\n    return this.restClient\n      .get({\n        path: `/${resourceName}/count`,\n        query: countRequest.toRecordWithFilterPrefix(true),\n        token,\n      })\n      .then((response) => (<Count>response).count)\n  }\n\n  getList(resourceName: string, token: string, listRequest: ReportQuery): Promise<Array<Dict<string>>> {\n    return this.getListWithWarnings(resourceName, token, listRequest).then((response) => response.data)\n  }\n\n  getListWithWarnings(resourceName: string, token: string, listRequest: ReportQuery): Promise<ListWithWarnings> {\n    logger.info(`Reporting client: Get list. { resourceName: ${resourceName} }`)\n\n    return this.restClient\n      .getWithHeaders<Array<Dict<string>>>({\n        path: `/${resourceName}`,\n        query: listRequest.toRecordWithFilterPrefix(true),\n        token,\n      })\n      .then((response: ResultWithHeaders<Array<Dict<string>>>) => ({\n        data: response.data,\n        warnings: {\n          noDataAvailable: response.headers['x-no-data-warning'],\n        },\n      }))\n  }\n\n  getDefinitionSummary(\n    token: string,\n    reportId: string,\n    definitionsPath?: string,\n  ): Promise<components['schemas']['ReportDefinitionSummary']> {\n    this.logInfo('Get definition summary', { reportId })\n\n    const queryParams: operations['definitionSummary']['parameters']['query'] = {\n      ...(definitionsPath && { dataProductDefinitionsPath: definitionsPath }),\n    }\n\n    return this.restClient\n      .get({\n        path: `/definitions/${reportId}`,\n        query: queryParams,\n        token,\n      })\n      .then((response) => <components['schemas']['ReportDefinitionSummary']>response)\n  }\n\n  getDefinitions(\n    token: string,\n    definitionsPath?: string,\n  ): Promise<Array<components['schemas']['ReportDefinitionSummary']>> {\n    this.logInfo('Get definitions')\n\n    const queryParams: operations['definitions_1']['parameters']['query'] = {\n      renderMethod: 'HTML',\n      ...(definitionsPath && { dataProductDefinitionsPath: definitionsPath }),\n    }\n\n    return this.restClient\n      .get({\n        path: '/definitions',\n        query: queryParams,\n        token,\n      })\n      .then((response) => <Array<components['schemas']['ReportDefinitionSummary']>>response)\n  }\n\n  getDefinition(\n    token: string,\n    reportId: string,\n    variantId: string,\n    definitionsPath?: string,\n    queryData?: Dict<string | string[]>,\n  ): Promise<components['schemas']['SingleVariantReportDefinition']> {\n    const query = {\n      ...queryData,\n      dataProductDefinitionsPath: definitionsPath,\n    }\n\n    this.logInfo('Get definition', { reportId, variantId, ...query })\n\n    return this.restClient\n      .get({\n        path: `/definitions/${reportId}/${variantId}`,\n        query,\n        token,\n      })\n      .then((response) => <components['schemas']['SingleVariantReportDefinition']>response)\n  }\n\n  requestAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    query: Record<string, string | boolean | number>,\n  ): Promise<Dict<string>> {\n    this.logInfo('Request report', { reportId, variantId })\n\n    return this.restClient\n      .get({\n        path: `/async/reports/${reportId}/${variantId}`,\n        token,\n        query,\n      })\n      .then((response) => <Dict<string>>response)\n  }\n\n  cancelAsyncRequest(\n    token: string,\n    reportId: string,\n    variantId: string,\n    executionId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Dict<string>> {\n    this.logInfo('Cancel Request', { reportId, variantId, executionId })\n\n    return this.restClient\n      .delete({\n        path: `/reports/${reportId}/${variantId}/statements/${executionId}`,\n        token,\n        query: {\n          dataProductDefinitionsPath,\n        },\n      })\n      .then((response) => <Dict<string>>response)\n  }\n\n  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    this.logInfo('Streaming download data', { reportId, variantId, tableId })\n\n    return this.restClient.getStream(\n      {\n        path: `/reports/${reportId}/${variantId}/tables/${tableId}/download`,\n        query,\n        token,\n      },\n      res,\n    )\n  }\n\n  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    this.logInfo('Get Data', { reportId, variantId, tableId })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/${variantId}/tables/${tableId}/result`,\n        token,\n        query,\n      })\n      .then((response) => <Array<Dict<string>>>response)\n  }\n\n  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    this.logInfo('Get summary data', { reportId, variantId, tableId, summaryId })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/${variantId}/tables/${tableId}/result/summary/${summaryId}`,\n        token,\n        query,\n      })\n      .then((response) => <Array<Dict<string>>>response)\n  }\n\n  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    this.logInfo('Get status', { reportId, variantId, tableId, executionId })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/${variantId}/statements/${executionId}/status`,\n        token,\n        query: {\n          dataProductDefinitionsPath,\n          tableId,\n        },\n      })\n      .then((response) => <components['schemas']['StatementExecutionStatus']>response)\n  }\n\n  getAsyncCount(token: string, tableId: string, dataProductDefinitionsPath?: string): Promise<number> {\n    this.logInfo('Get count', { tableId })\n\n    return this.restClient\n      .get({\n        path: `/report/tables/${tableId}/count`,\n        token,\n        query: {\n          dataProductDefinitionsPath,\n        },\n      })\n      .then((response) => (<Count>response).count)\n  }\n\n  getAsyncInteractiveCount(\n    token: string,\n    tableId: string,\n    reportId: string,\n    id: string,\n    filters: ReportQuery,\n  ): Promise<number> {\n    this.logInfo('Get interactive count', { tableId, reportId, id })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/${id}/tables/${tableId}/count`,\n        token,\n        query: filters.toRecordWithFilterPrefix(true),\n      })\n      .then((response) => (<Count>response).count)\n  }\n\n  logInfo(title: string, args?: Dict<string>) {\n    logger.info(`Reporting Client: ${title}:`)\n    if (args && Object.keys(args).length) logger.info(JSON.stringify(args, null, 2))\n  }\n}\n\nexport { ReportingClient }\nexport default ReportingClient\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { Response } from 'express'\nimport ReportQuery from '../types/ReportQuery'\nimport logger from '../utils/logger'\nimport RestClient from './restClient'\nimport Dict = NodeJS.Dict\nimport { components, operations } from '../types/api'\nimport { ApiConfig, Count, ListWithWarnings } from './types'\nimport type { ResultWithHeaders } from './restClient'\n\nclass ReportingClient {\n  restClient: RestClient\n\n  constructor(config: ApiConfig) {\n    this.restClient = new RestClient('Reporting API Client', config)\n  }\n\n  getCount(resourceName: string, token: string, countRequest: ReportQuery): Promise<number> {\n    logger.info(`Reporting client: Get count. { resourceName: ${resourceName} }`)\n\n    return this.restClient\n      .get({\n        path: `/${resourceName}/count`,\n        query: countRequest.toRecordWithFilterPrefix(true),\n        token,\n      })\n      .then((response) => (<Count>response).count)\n  }\n\n  getList(resourceName: string, token: string, listRequest: ReportQuery): Promise<Array<Dict<string>>> {\n    return this.getListWithWarnings(resourceName, token, listRequest).then((response) => response.data)\n  }\n\n  getListWithWarnings(resourceName: string, token: string, listRequest: ReportQuery): Promise<ListWithWarnings> {\n    logger.info(`Reporting client: Get list. { resourceName: ${resourceName} }`)\n\n    return this.restClient\n      .getWithHeaders<Array<Dict<string>>>({\n        path: `/${resourceName}`,\n        query: listRequest.toRecordWithFilterPrefix(true),\n        token,\n      })\n      .then((response: ResultWithHeaders<Array<Dict<string>>>) => ({\n        data: response.data,\n        warnings: {\n          noDataAvailable: response.headers['x-no-data-warning'],\n        },\n      }))\n  }\n\n  getDefinitionSummary(\n    token: string,\n    reportId: string,\n    definitionsPath?: string,\n  ): Promise<components['schemas']['ReportDefinitionSummary']> {\n    this.logInfo('Get definition summary', { reportId })\n\n    const queryParams: operations['definitionSummary']['parameters']['query'] = {\n      ...(definitionsPath && { dataProductDefinitionsPath: definitionsPath }),\n    }\n\n    return this.restClient\n      .get({\n        path: `/definitions/${reportId}`,\n        query: queryParams,\n        token,\n      })\n      .then((response) => <components['schemas']['ReportDefinitionSummary']>response)\n  }\n\n  getDefinitions(\n    token: string,\n    definitionsPath?: string,\n  ): Promise<Array<components['schemas']['ReportDefinitionSummary']>> {\n    this.logInfo('Get definitions')\n\n    const queryParams: operations['definitions_1']['parameters']['query'] = {\n      renderMethod: 'HTML',\n      ...(definitionsPath && { dataProductDefinitionsPath: definitionsPath }),\n    }\n\n    return this.restClient\n      .get({\n        path: '/definitions',\n        query: queryParams,\n        token,\n      })\n      .then((response) => <Array<components['schemas']['ReportDefinitionSummary']>>response)\n  }\n\n  getDefinition(\n    token: string,\n    reportId: string,\n    variantId: string,\n    definitionsPath?: string,\n    queryData?: Dict<string | string[]>,\n  ): Promise<components['schemas']['SingleVariantReportDefinition']> {\n    const query = {\n      ...queryData,\n      dataProductDefinitionsPath: definitionsPath,\n    }\n\n    this.logInfo('Get definition', { reportId, variantId, ...query })\n\n    return this.restClient\n      .get({\n        path: `/definitions/${reportId}/${variantId}`,\n        query,\n        token,\n      })\n      .then((response) => <components['schemas']['SingleVariantReportDefinition']>response)\n  }\n\n  requestAsyncReport(\n    token: string,\n    reportId: string,\n    variantId: string,\n    query: Record<string, string | boolean | number>,\n  ): Promise<Dict<string>> {\n    this.logInfo('Request report', { reportId, variantId })\n\n    return this.restClient\n      .get({\n        path: `/async/reports/${reportId}/${variantId}`,\n        token,\n        query,\n      })\n      .then((response) => <Dict<string>>response)\n  }\n\n  cancelAsyncRequest(\n    token: string,\n    reportId: string,\n    variantId: string,\n    executionId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Dict<string>> {\n    this.logInfo('Cancel Request', { reportId, variantId, executionId })\n\n    return this.restClient\n      .delete({\n        path: `/reports/${reportId}/${variantId}/statements/${executionId}`,\n        token,\n        query: {\n          dataProductDefinitionsPath,\n        },\n      })\n      .then((response) => <Dict<string>>response)\n  }\n\n  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    this.logInfo('Streaming download data', { reportId, variantId, tableId })\n\n    return this.restClient.getStream(\n      {\n        path: `/reports/${reportId}/${variantId}/tables/${tableId}/download`,\n        query,\n        token,\n      },\n      res,\n    )\n  }\n\n  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    this.logInfo('Get Data', { reportId, variantId, tableId })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/${variantId}/tables/${tableId}/result`,\n        token,\n        query,\n      })\n      .then((response) => <Array<Record<string, string>>>response)\n  }\n\n  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    this.logInfo('Get summary data', { reportId, variantId, tableId, summaryId })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/${variantId}/tables/${tableId}/result/summary/${summaryId}`,\n        token,\n        query,\n      })\n      .then((response) => <Array<Record<string, string>>>response)\n  }\n\n  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    this.logInfo('Get status', { reportId, variantId, tableId, executionId })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/${variantId}/statements/${executionId}/status`,\n        token,\n        query: {\n          dataProductDefinitionsPath,\n          tableId,\n        },\n      })\n      .then((response) => <components['schemas']['StatementExecutionStatus']>response)\n  }\n\n  getAsyncCount(token: string, tableId: string, dataProductDefinitionsPath?: string): Promise<number> {\n    this.logInfo('Get count', { tableId })\n\n    return this.restClient\n      .get({\n        path: `/report/tables/${tableId}/count`,\n        token,\n        query: {\n          dataProductDefinitionsPath,\n        },\n      })\n      .then((response) => (<Count>response).count)\n  }\n\n  getAsyncInteractiveCount(\n    token: string,\n    tableId: string,\n    reportId: string,\n    id: string,\n    filters: ReportQuery,\n  ): Promise<number> {\n    this.logInfo('Get interactive count', { tableId, reportId, id })\n\n    return this.restClient\n      .get({\n        path: `/reports/${reportId}/${id}/tables/${tableId}/count`,\n        token,\n        query: filters.toRecordWithFilterPrefix(true),\n      })\n      .then((response) => (<Count>response).count)\n  }\n\n  logInfo(title: string, args?: Dict<string>) {\n    logger.info(`Reporting Client: ${title}:`)\n    if (args && Object.keys(args).length) logger.info(JSON.stringify(args, null, 2))\n  }\n}\n\nexport { ReportingClient }\nexport default ReportingClient\n"],
+  "mappings": "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",
   "names": ["RestClient", "logger"]
 }

package/dpr/data/reportingClient.ts

@@ -173,7 +173,7 @@ class ReportingClient {
     variantId: string,
     tableId: string,
     query: Record<string, string | string[]>,
-  ): Promise<Array<Dict<string>>> {
+  ): Promise<Array<Record<string, string>>> {
     this.logInfo('Get Data', { reportId, variantId, tableId })
 
     return this.restClient
@@ -182,7 +182,7 @@ class ReportingClient {
         token,
         query,
       })
-      .then((response) => <Array<Dict<string>>>response)
+      .then((response) => <Array<Record<string, string>>>response)
   }
 
   getAsyncSummaryReport(
@@ -192,7 +192,7 @@ class ReportingClient {
     tableId: string,
     summaryId: string,
     query: Dict<string | number>,
-  ): Promise<Array<Dict<string>>> {
+  ): Promise<Array<Record<string, string>>> {
     this.logInfo('Get summary data', { reportId, variantId, tableId, summaryId })
 
     return this.restClient
@@ -201,7 +201,7 @@ class ReportingClient {
         token,
         query,
       })
-      .then((response) => <Array<Dict<string>>>response)
+      .then((response) => <Array<Record<string, string>>>response)
   }
 
   getAsyncReportStatus(

package/dpr/routes/journeys/view-report/async/dashboard/utils.js

@@ -42,7 +42,7 @@ var import_utils4 = __toESM(require("../../../../../components/_filters/utils"))
 var import_utils5 = __toESM(require("../../../../../components/_dashboards/scorecard/utils"));
 var import_Scorecard = __toESM(require("../../../../../components/_dashboards/scorecard/Scorecard"));
 var import_ScorecardGroup = __toESM(require("../../../../../components/_dashboards/scorecard-group/ScorecardGroup"));
-var import_utils6 = __toESM(require("../../../../../components/_reports/report-actions/utils"));
+var import_utils6 = __toESM(require("../../../../../components/_reports/report-heading/report-actions/utils"));
 var import_ReportQuery = __toESM(require("../../../../../types/ReportQuery"));
 var import_localsHelper = __toESM(require("../../../../../utils/localsHelper"));
 var import_filtersTypeEnum = require("../../../../../components/_filters/filtersTypeEnum");

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../dpr/routes/journeys/view-report/async/dashboard/utils.ts"],
-  "sourcesContent": ["import { Request, Response } from 'express'\nimport { Services } from '../../../../../types/Services'\nimport Dict = NodeJS.Dict\nimport {\n  DashboardSection,\n  DashboardVisualisation,\n  DashboardVisualisationType,\n} from '../../../../../components/_dashboards/dashboard-visualisation/types'\nimport type { AsyncReportUtilsParams } from '../../../../../types/AsyncReportUtils'\n\nimport type { DashboardDataResponse } from '../../../../../types/Metrics'\nimport type { RequestedReport } from '../../../../../types/UserReports'\nimport { ReportType } from '../../../../../types/UserReports'\nimport type { components } from '../../../../../types/api'\n\nimport ChartUtils from '../../../../../components/_charts/utils'\nimport DefinitionUtils from '../../../../../utils/definitionUtils'\nimport UserReportsUtils from '../../../../../components/user-reports/utils'\nimport DashboardListUtils from '../../../../../components/_dashboards/dashboard-list/utils'\nimport FilterUtils from '../../../../../components/_filters/utils'\nimport ScorecardsUtils from '../../../../../components/_dashboards/scorecard/utils'\nimport ScorecardVisualisation from '../../../../../components/_dashboards/scorecard/Scorecard'\nimport ScorecardGroupVisualisation from '../../../../../components/_dashboards/scorecard-group/ScorecardGroup'\nimport ReportActionsUtils from '../../../../../components/_reports/report-actions/utils'\nimport ReportQuery from '../../../../../types/ReportQuery'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport { FilterValue, GranularDateRangeFilterValue, PartialDate } from '../../../../../components/_filters/types'\nimport { FiltersType } from '../../../../../components/_filters/filtersTypeEnum'\nimport { FilterType } from '../../../../../components/_filters/filter-input/enum'\n\nconst setDashboardActions = (\n  dashboardDefinition: components['schemas']['DashboardDefinition'],\n  reportDefinition: components['schemas']['ReportDefinitionSummary'],\n  requestData?: RequestedReport,\n) => {\n  const reportName = reportDefinition.name\n  const { name } = dashboardDefinition\n  const actionsUrl = requestData?.url?.request?.fullUrl\n  const executionId = requestData?.executionId\n\n  let actions = {}\n  if (actionsUrl) {\n    actions = {\n      share: {\n        reportName,\n        name,\n        url: actionsUrl,\n      },\n      copy: {\n        url: actionsUrl,\n      },\n    }\n    if (executionId) {\n      actions = {\n        ...actions,\n        refresh: {\n          url: actionsUrl,\n          executionId,\n        },\n      }\n    }\n  }\n\n  return ReportActionsUtils.getActions(actions)\n}\n\nconst getDefinitionData = async ({\n  req,\n  res,\n  services,\n  queryData,\n}: {\n  req: Request\n  res: Response\n  services: Services\n  queryData?: Dict<string | string[]> | undefined\n}) => {\n  const { token } = LocalsHelper.getValues(res)\n  const { reportId, id } = req.params\n  const dataProductDefinitionsPath = <string>req.query['dataProductDefinitionsPath']\n\n  // Dashboard Definition,\n  const dashboardDefinition = await services.dashboardService.getDefinition(\n    token,\n    reportId,\n    id,\n    dataProductDefinitionsPath,\n    queryData,\n  )\n\n  // Report summary data\n  const reportDefinition = await DefinitionUtils.getReportSummary(\n    reportId,\n    services.reportingService,\n    token,\n    <string>dataProductDefinitionsPath,\n  )\n\n  // Get the filters\n  const filtersData = await FilterUtils.getFilters({\n    fields: dashboardDefinition.filterFields || [],\n    req,\n    filtersType: FiltersType.INTERACTIVE,\n  })\n\n  const filtersQuery = FilterUtils.setRequestQueryFromFilterValues(filtersData.filters)\n\n  // Create the query\n  const query = new ReportQuery({\n    fields: dashboardDefinition.filterFields || [],\n    queryParams: filtersQuery,\n    definitionsPath: <string>dataProductDefinitionsPath,\n    reportType: ReportType.DASHBOARD,\n  }).toRecordWithFilterPrefix(true)\n\n  return {\n    query,\n    filters: filtersData,\n    dashboardDefinition,\n    reportDefinition,\n  }\n}\n\nconst getSections = (\n  dashboardDefinition: components['schemas']['DashboardDefinition'],\n  dashboardData: DashboardDataResponse[],\n  query: Record<string, string | string[]>,\n  partialDate?: PartialDate,\n): DashboardSection[] => {\n  return dashboardDefinition.sections.map((section: components['schemas']['DashboardSectionDefinition']) => {\n    const { id, display: title, description } = section\n\n    let hasScorecard = false\n    const visualisations: DashboardVisualisation[] = section.visualisations.map(\n      (visDefinition: components['schemas']['DashboardVisualisationDefinition']) => {\n        const { type, display, description: visDescription, id: visId } = visDefinition\n\n        let data: DashboardVisualisation['data'] | undefined\n\n        switch (type) {\n          case DashboardVisualisationType.LIST:\n            data = DashboardListUtils.createList(visDefinition, dashboardData)\n            break\n\n          case DashboardVisualisationType.SCORECARD:\n            hasScorecard = true\n            data = new ScorecardVisualisation().withDefinition(visDefinition).withData(dashboardData).build()\n            break\n\n          case DashboardVisualisationType.SCORECARD_GROUP:\n            data = new ScorecardGroupVisualisation().withDefinition(visDefinition).withData(dashboardData).build()\n            break\n\n          case DashboardVisualisationType.BAR:\n          case DashboardVisualisationType.LINE:\n          case DashboardVisualisationType.DONUT: {\n            data = ChartUtils.createChart(visDefinition, dashboardData, type)\n            break\n          }\n          case DashboardVisualisationType.MATRIX_TIMESERIES:\n          case DashboardVisualisationType.BAR_TIMESERIES:\n          case DashboardVisualisationType.LINE_TIMESERIES: {\n            data = ChartUtils.createTimeseriesCharts(visDefinition, dashboardData, type, query, partialDate)\n            break\n          }\n          default:\n            break\n        }\n\n        return {\n          id: visId,\n          title: display || '',\n          description: visDescription || '',\n          type,\n          data,\n        }\n      },\n    )\n\n    if (hasScorecard) ScorecardsUtils.mergeScorecardsIntoGroup(visualisations)\n\n    return { id, title: title || '', description: description || '', visualisations }\n  })\n}\n\nconst updateStore = async (\n  services: Services,\n  tableId: string,\n  userId: string,\n  sections: DashboardSection[],\n  req: Request,\n  filters: FilterValue[],\n): Promise<RequestedReport | undefined> => {\n  const { requestedReportService } = services\n  const dashboardRequestData = await requestedReportService.getReportByTableId(tableId, userId)\n\n  // Add to recently viewed\n  if (sections && sections.length && dashboardRequestData) {\n    UserReportsUtils.updateLastViewed({\n      services,\n      reportStateData: dashboardRequestData,\n      userId,\n      req,\n      filters,\n    })\n  }\n\n  return dashboardRequestData\n}\n\nconst getPartialDate = (filters: FilterValue[]) => {\n  let partialDate: PartialDate | undefined\n  const granularDateRangeFilter = <GranularDateRangeFilterValue | undefined>(\n    filters.find((f) => f.type === FilterType.granularDateRange.toLowerCase())\n  )\n  if (granularDateRangeFilter) {\n    partialDate = granularDateRangeFilter.value.partialDate\n  }\n  return partialDate\n}\n\nexport const renderAsyncDashboard = async ({ req, res, services }: AsyncReportUtilsParams) => {\n  const { token, csrfToken, dprUser, nestedBaseUrl } = LocalsHelper.getValues(res)\n  const { reportId, id, tableId } = req.params\n  const { bookmarkService, requestedReportService } = services\n  const { id: userId } = dprUser\n\n  let requestData: RequestedReport | undefined = await requestedReportService.getReportByTableId(tableId, userId)\n  const queryData = requestData?.query?.data\n\n  // Get the definition Data\n  const { query, filters, reportDefinition, dashboardDefinition } = await getDefinitionData({\n    req,\n    res,\n    services,\n    queryData,\n  })\n\n  // Get the results data\n  const dashboardData: DashboardDataResponse[][] = await services.dashboardService.getAsyncDashboard(\n    token,\n    id,\n    reportId,\n    tableId,\n    query,\n  )\n\n  const flattenedData: DashboardDataResponse[] = dashboardData.flat()\n  const partialDate = getPartialDate(filters.filters)\n\n  // Get the dashboard parts\n  const sections: DashboardSection[] = getSections(dashboardDefinition, flattenedData, query, partialDate)\n\n  // Update the store\n  if (requestedReportService) {\n    requestData = await updateStore(services, tableId, dprUser.id, sections, req, filters.filters)\n  }\n\n  return {\n    dashboardData: {\n      token,\n      id,\n      reportId,\n      name: dashboardDefinition.name,\n      description: dashboardDefinition.description,\n      reportName: reportDefinition.name,\n      bookmarked: await bookmarkService.isBookmarked(id, reportId, dprUser.id),\n      nestedBaseUrl,\n      csrfToken,\n      sections,\n      filters,\n      type: ReportType.DASHBOARD,\n      actions: setDashboardActions(dashboardDefinition, reportDefinition, requestData),\n    },\n  }\n}\n\nexport default {\n  renderAsyncDashboard,\n  getDefinitionData,\n  getSections,\n  setDashboardActions,\n}\n"],
+  "sourcesContent": ["import { Request, Response } from 'express'\nimport { Services } from '../../../../../types/Services'\nimport Dict = NodeJS.Dict\nimport {\n  DashboardSection,\n  DashboardVisualisation,\n  DashboardVisualisationType,\n} from '../../../../../components/_dashboards/dashboard-visualisation/types'\nimport type { AsyncReportUtilsParams } from '../../../../../types/AsyncReportUtils'\n\nimport type { DashboardDataResponse } from '../../../../../types/Metrics'\nimport type { RequestedReport } from '../../../../../types/UserReports'\nimport { ReportType } from '../../../../../types/UserReports'\nimport type { components } from '../../../../../types/api'\n\nimport ChartUtils from '../../../../../components/_charts/utils'\nimport DefinitionUtils from '../../../../../utils/definitionUtils'\nimport UserReportsUtils from '../../../../../components/user-reports/utils'\nimport DashboardListUtils from '../../../../../components/_dashboards/dashboard-list/utils'\nimport FilterUtils from '../../../../../components/_filters/utils'\nimport ScorecardsUtils from '../../../../../components/_dashboards/scorecard/utils'\nimport ScorecardVisualisation from '../../../../../components/_dashboards/scorecard/Scorecard'\nimport ScorecardGroupVisualisation from '../../../../../components/_dashboards/scorecard-group/ScorecardGroup'\nimport ReportActionsUtils from '../../../../../components/_reports/report-heading/report-actions/utils'\nimport ReportQuery from '../../../../../types/ReportQuery'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport { FilterValue, GranularDateRangeFilterValue, PartialDate } from '../../../../../components/_filters/types'\nimport { FiltersType } from '../../../../../components/_filters/filtersTypeEnum'\nimport { FilterType } from '../../../../../components/_filters/filter-input/enum'\n\nconst setDashboardActions = (\n  dashboardDefinition: components['schemas']['DashboardDefinition'],\n  reportDefinition: components['schemas']['ReportDefinitionSummary'],\n  requestData?: RequestedReport,\n) => {\n  const reportName = reportDefinition.name\n  const { name } = dashboardDefinition\n  const actionsUrl = requestData?.url?.request?.fullUrl\n  const executionId = requestData?.executionId\n\n  let actions = {}\n  if (actionsUrl) {\n    actions = {\n      share: {\n        reportName,\n        name,\n        url: actionsUrl,\n      },\n      copy: {\n        url: actionsUrl,\n      },\n    }\n    if (executionId) {\n      actions = {\n        ...actions,\n        refresh: {\n          url: actionsUrl,\n          executionId,\n        },\n      }\n    }\n  }\n\n  return ReportActionsUtils.getActions(actions)\n}\n\nconst getDefinitionData = async ({\n  req,\n  res,\n  services,\n  queryData,\n}: {\n  req: Request\n  res: Response\n  services: Services\n  queryData?: Dict<string | string[]> | undefined\n}) => {\n  const { token } = LocalsHelper.getValues(res)\n  const { reportId, id } = req.params\n  const dataProductDefinitionsPath = <string>req.query['dataProductDefinitionsPath']\n\n  // Dashboard Definition,\n  const dashboardDefinition = await services.dashboardService.getDefinition(\n    token,\n    reportId,\n    id,\n    dataProductDefinitionsPath,\n    queryData,\n  )\n\n  // Report summary data\n  const reportDefinition = await DefinitionUtils.getReportSummary(\n    reportId,\n    services.reportingService,\n    token,\n    <string>dataProductDefinitionsPath,\n  )\n\n  // Get the filters\n  const filtersData = await FilterUtils.getFilters({\n    fields: dashboardDefinition.filterFields || [],\n    req,\n    filtersType: FiltersType.INTERACTIVE,\n  })\n\n  const filtersQuery = FilterUtils.setRequestQueryFromFilterValues(filtersData.filters)\n\n  // Create the query\n  const query = new ReportQuery({\n    fields: dashboardDefinition.filterFields || [],\n    queryParams: filtersQuery,\n    definitionsPath: <string>dataProductDefinitionsPath,\n    reportType: ReportType.DASHBOARD,\n  }).toRecordWithFilterPrefix(true)\n\n  return {\n    query,\n    filters: filtersData,\n    dashboardDefinition,\n    reportDefinition,\n  }\n}\n\nconst getSections = (\n  dashboardDefinition: components['schemas']['DashboardDefinition'],\n  dashboardData: DashboardDataResponse[],\n  query: Record<string, string | string[]>,\n  partialDate?: PartialDate,\n): DashboardSection[] => {\n  return dashboardDefinition.sections.map((section: components['schemas']['DashboardSectionDefinition']) => {\n    const { id, display: title, description } = section\n\n    let hasScorecard = false\n    const visualisations: DashboardVisualisation[] = section.visualisations.map(\n      (visDefinition: components['schemas']['DashboardVisualisationDefinition']) => {\n        const { type, display, description: visDescription, id: visId } = visDefinition\n\n        let data: DashboardVisualisation['data'] | undefined\n\n        switch (type) {\n          case DashboardVisualisationType.LIST:\n            data = DashboardListUtils.createList(visDefinition, dashboardData)\n            break\n\n          case DashboardVisualisationType.SCORECARD:\n            hasScorecard = true\n            data = new ScorecardVisualisation().withDefinition(visDefinition).withData(dashboardData).build()\n            break\n\n          case DashboardVisualisationType.SCORECARD_GROUP:\n            data = new ScorecardGroupVisualisation().withDefinition(visDefinition).withData(dashboardData).build()\n            break\n\n          case DashboardVisualisationType.BAR:\n          case DashboardVisualisationType.LINE:\n          case DashboardVisualisationType.DONUT: {\n            data = ChartUtils.createChart(visDefinition, dashboardData, type)\n            break\n          }\n          case DashboardVisualisationType.MATRIX_TIMESERIES:\n          case DashboardVisualisationType.BAR_TIMESERIES:\n          case DashboardVisualisationType.LINE_TIMESERIES: {\n            data = ChartUtils.createTimeseriesCharts(visDefinition, dashboardData, type, query, partialDate)\n            break\n          }\n          default:\n            break\n        }\n\n        return {\n          id: visId,\n          title: display || '',\n          description: visDescription || '',\n          type,\n          data,\n        }\n      },\n    )\n\n    if (hasScorecard) ScorecardsUtils.mergeScorecardsIntoGroup(visualisations)\n\n    return { id, title: title || '', description: description || '', visualisations }\n  })\n}\n\nconst updateStore = async (\n  services: Services,\n  tableId: string,\n  userId: string,\n  sections: DashboardSection[],\n  req: Request,\n  filters: FilterValue[],\n): Promise<RequestedReport | undefined> => {\n  const { requestedReportService } = services\n  const dashboardRequestData = await requestedReportService.getReportByTableId(tableId, userId)\n\n  // Add to recently viewed\n  if (sections && sections.length && dashboardRequestData) {\n    UserReportsUtils.updateLastViewed({\n      services,\n      reportStateData: dashboardRequestData,\n      userId,\n      req,\n      filters,\n    })\n  }\n\n  return dashboardRequestData\n}\n\nconst getPartialDate = (filters: FilterValue[]) => {\n  let partialDate: PartialDate | undefined\n  const granularDateRangeFilter = <GranularDateRangeFilterValue | undefined>(\n    filters.find((f) => f.type === FilterType.granularDateRange.toLowerCase())\n  )\n  if (granularDateRangeFilter) {\n    partialDate = granularDateRangeFilter.value.partialDate\n  }\n  return partialDate\n}\n\nexport const renderAsyncDashboard = async ({ req, res, services }: AsyncReportUtilsParams) => {\n  const { token, csrfToken, dprUser, nestedBaseUrl } = LocalsHelper.getValues(res)\n  const { reportId, id, tableId } = req.params\n  const { bookmarkService, requestedReportService } = services\n  const { id: userId } = dprUser\n\n  let requestData: RequestedReport | undefined = await requestedReportService.getReportByTableId(tableId, userId)\n  const queryData = requestData?.query?.data\n\n  // Get the definition Data\n  const { query, filters, reportDefinition, dashboardDefinition } = await getDefinitionData({\n    req,\n    res,\n    services,\n    queryData,\n  })\n\n  // Get the results data\n  const dashboardData: DashboardDataResponse[][] = await services.dashboardService.getAsyncDashboard(\n    token,\n    id,\n    reportId,\n    tableId,\n    query,\n  )\n\n  const flattenedData: DashboardDataResponse[] = dashboardData.flat()\n  const partialDate = getPartialDate(filters.filters)\n\n  // Get the dashboard parts\n  const sections: DashboardSection[] = getSections(dashboardDefinition, flattenedData, query, partialDate)\n\n  // Update the store\n  if (requestedReportService) {\n    requestData = await updateStore(services, tableId, dprUser.id, sections, req, filters.filters)\n  }\n\n  return {\n    dashboardData: {\n      token,\n      id,\n      reportId,\n      name: dashboardDefinition.name,\n      description: dashboardDefinition.description,\n      reportName: reportDefinition.name,\n      bookmarked: await bookmarkService.isBookmarked(id, reportId, dprUser.id),\n      nestedBaseUrl,\n      csrfToken,\n      sections,\n      filters,\n      type: ReportType.DASHBOARD,\n      actions: setDashboardActions(dashboardDefinition, reportDefinition, requestData),\n    },\n  }\n}\n\nexport default {\n  renderAsyncDashboard,\n  getDefinitionData,\n  getSections,\n  setDashboardActions,\n}\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,mBAIO;AAKP,yBAA2B;AAG3B,mBAAuB;AACvB,6BAA4B;AAC5B,IAAAA,gBAA6B;AAC7B,IAAAA,gBAA+B;AAC/B,IAAAA,gBAAwB;AACxB,IAAAA,gBAA4B;AAC5B,uBAAmC;AACnC,4BAAwC;AACxC,IAAAA,gBAA+B;AAC/B,yBAAwB;AACxB,0BAAyB;AAEzB,6BAA4B;AAC5B,kBAA2B;AAE3B,MAAM,sBAAsB,CAC1B,qBACA,kBACA,gBACG;AACH,QAAM,aAAa,iBAAiB;AACpC,QAAM,EAAE,KAAK,IAAI;AACjB,QAAM,aAAa,aAAa,KAAK,SAAS;AAC9C,QAAM,cAAc,aAAa;AAEjC,MAAI,UAAU,CAAC;AACf,MAAI,YAAY;AACd,cAAU;AAAA,MACR,OAAO;AAAA,QACL;AAAA,QACA;AAAA,QACA,KAAK;AAAA,MACP;AAAA,MACA,MAAM;AAAA,QACJ,KAAK;AAAA,MACP;AAAA,IACF;AACA,QAAI,aAAa;AACf,gBAAU;AAAA,QACR,GAAG;AAAA,QACH,SAAS;AAAA,UACP,KAAK;AAAA,UACL;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,SAAO,cAAAC,QAAmB,WAAW,OAAO;AAC9C;AAEA,MAAM,oBAAoB,OAAO;AAAA,EAC/B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAKM;AACJ,QAAM,EAAE,MAAM,IAAI,oBAAAC,QAAa,UAAU,GAAG;AAC5C,QAAM,EAAE,UAAU,GAAG,IAAI,IAAI;AAC7B,QAAM,6BAAqC,IAAI,MAAM,4BAA4B;AAGjF,QAAM,sBAAsB,MAAM,SAAS,iBAAiB;AAAA,IAC1D;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAGA,QAAM,mBAAmB,MAAM,uBAAAC,QAAgB;AAAA,IAC7C;AAAA,IACA,SAAS;AAAA,IACT;AAAA,IACQ;AAAA,EACV;AAGA,QAAM,cAAc,MAAM,cAAAC,QAAY,WAAW;AAAA,IAC/C,QAAQ,oBAAoB,gBAAgB,CAAC;AAAA,IAC7C;AAAA,IACA,aAAa,mCAAY;AAAA,EAC3B,CAAC;AAED,QAAM,eAAe,cAAAA,QAAY,gCAAgC,YAAY,OAAO;AAGpF,QAAM,QAAQ,IAAI,mBAAAC,QAAY;AAAA,IAC5B,QAAQ,oBAAoB,gBAAgB,CAAC;AAAA,IAC7C,aAAa;AAAA,IACb,iBAAyB;AAAA,IACzB,YAAY,8BAAW;AAAA,EACzB,CAAC,EAAE,yBAAyB,IAAI;AAEhC,SAAO;AAAA,IACL;AAAA,IACA,SAAS;AAAA,IACT;AAAA,IACA;AAAA,EACF;AACF;AAEA,MAAM,cAAc,CAClB,qBACA,eACA,OACA,gBACuB;AACvB,SAAO,oBAAoB,SAAS,IAAI,CAAC,YAAiE;AACxG,UAAM,EAAE,IAAI,SAAS,OAAO,YAAY,IAAI;AAE5C,QAAI,eAAe;AACnB,UAAM,iBAA2C,QAAQ,eAAe;AAAA,MACtE,CAAC,kBAA6E;AAC5E,cAAM,EAAE,MAAM,SAAS,aAAa,gBAAgB,IAAI,MAAM,IAAI;AAElE,YAAI;AAEJ,gBAAQ,MAAM;AAAA,UACZ,KAAK,wCAA2B;AAC9B,mBAAO,cAAAC,QAAmB,WAAW,eAAe,aAAa;AACjE;AAAA,UAEF,KAAK,wCAA2B;AAC9B,2BAAe;AACf,mBAAO,IAAI,iBAAAC,QAAuB,EAAE,eAAe,aAAa,EAAE,SAAS,aAAa,EAAE,MAAM;AAChG;AAAA,UAEF,KAAK,wCAA2B;AAC9B,mBAAO,IAAI,sBAAAC,QAA4B,EAAE,eAAe,aAAa,EAAE,SAAS,aAAa,EAAE,MAAM;AACrG;AAAA,UAEF,KAAK,wCAA2B;AAAA,UAChC,KAAK,wCAA2B;AAAA,UAChC,KAAK,wCAA2B,OAAO;AACrC,mBAAO,aAAAC,QAAW,YAAY,eAAe,eAAe,IAAI;AAChE;AAAA,UACF;AAAA,UACA,KAAK,wCAA2B;AAAA,UAChC,KAAK,wCAA2B;AAAA,UAChC,KAAK,wCAA2B,iBAAiB;AAC/C,mBAAO,aAAAA,QAAW,uBAAuB,eAAe,eAAe,MAAM,OAAO,WAAW;AAC/F;AAAA,UACF;AAAA,UACA;AACE;AAAA,QACJ;AAEA,eAAO;AAAA,UACL,IAAI;AAAA,UACJ,OAAO,WAAW;AAAA,UAClB,aAAa,kBAAkB;AAAA,UAC/B;AAAA,UACA;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAEA,QAAI,aAAc,eAAAC,QAAgB,yBAAyB,cAAc;AAEzE,WAAO,EAAE,IAAI,OAAO,SAAS,IAAI,aAAa,eAAe,IAAI,eAAe;AAAA,EAClF,CAAC;AACH;AAEA,MAAM,cAAc,OAClB,UACA,SACA,QACA,UACA,KACA,YACyC;AACzC,QAAM,EAAE,uBAAuB,IAAI;AACnC,QAAM,uBAAuB,MAAM,uBAAuB,mBAAmB,SAAS,MAAM;AAG5F,MAAI,YAAY,SAAS,UAAU,sBAAsB;AACvD,kBAAAC,QAAiB,iBAAiB;AAAA,MAChC;AAAA,MACA,iBAAiB;AAAA,MACjB;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAEA,SAAO;AACT;AAEA,MAAM,iBAAiB,CAAC,YAA2B;AACjD,MAAI;AACJ,QAAM,0BACJ,QAAQ,KAAK,CAAC,MAAM,EAAE,SAAS,uBAAW,kBAAkB,YAAY,CAAC;AAE3E,MAAI,yBAAyB;AAC3B,kBAAc,wBAAwB,MAAM;AAAA,EAC9C;AACA,SAAO;AACT;AAEO,MAAM,uBAAuB,OAAO,EAAE,KAAK,KAAK,SAAS,MAA8B;AAC5F,QAAM,EAAE,OAAO,WAAW,SAAS,cAAc,IAAI,oBAAAT,QAAa,UAAU,GAAG;AAC/E,QAAM,EAAE,UAAU,IAAI,QAAQ,IAAI,IAAI;AACtC,QAAM,EAAE,iBAAiB,uBAAuB,IAAI;AACpD,QAAM,EAAE,IAAI,OAAO,IAAI;AAEvB,MAAI,cAA2C,MAAM,uBAAuB,mBAAmB,SAAS,MAAM;AAC9G,QAAM,YAAY,aAAa,OAAO;AAGtC,QAAM,EAAE,OAAO,SAAS,kBAAkB,oBAAoB,IAAI,MAAM,kBAAkB;AAAA,IACxF;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC;AAGD,QAAM,gBAA2C,MAAM,SAAS,iBAAiB;AAAA,IAC/E;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAEA,QAAM,gBAAyC,cAAc,KAAK;AAClE,QAAM,cAAc,eAAe,QAAQ,OAAO;AAGlD,QAAM,WAA+B,YAAY,qBAAqB,eAAe,OAAO,WAAW;AAGvG,MAAI,wBAAwB;AAC1B,kBAAc,MAAM,YAAY,UAAU,SAAS,QAAQ,IAAI,UAAU,KAAK,QAAQ,OAAO;AAAA,EAC/F;AAEA,SAAO;AAAA,IACL,eAAe;AAAA,MACb;AAAA,MACA;AAAA,MACA;AAAA,MACA,MAAM,oBAAoB;AAAA,MAC1B,aAAa,oBAAoB;AAAA,MACjC,YAAY,iBAAiB;AAAA,MAC7B,YAAY,MAAM,gBAAgB,aAAa,IAAI,UAAU,QAAQ,EAAE;AAAA,MACvE;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,MAAM,8BAAW;AAAA,MACjB,SAAS,oBAAoB,qBAAqB,kBAAkB,WAAW;AAAA,IACjF;AAAA,EACF;AACF;AAEA,IAAO,gBAAQ;AAAA,EACb;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;",
   "names": ["import_utils", "ReportActionsUtils", "LocalsHelper", "DefinitionUtils", "FilterUtils", "ReportQuery", "DashboardListUtils", "ScorecardVisualisation", "ScorecardGroupVisualisation", "ChartUtils", "ScorecardsUtils", "UserReportsUtils"]
 }

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

@@ -21,7 +21,7 @@ import FilterUtils from '../../../../../components/_filters/utils'
 import ScorecardsUtils from '../../../../../components/_dashboards/scorecard/utils'
 import ScorecardVisualisation from '../../../../../components/_dashboards/scorecard/Scorecard'
 import ScorecardGroupVisualisation from '../../../../../components/_dashboards/scorecard-group/ScorecardGroup'
-import ReportActionsUtils from '../../../../../components/_reports/report-actions/utils'
+import ReportActionsUtils from '../../../../../components/_reports/report-heading/report-actions/utils'
 import ReportQuery from '../../../../../types/ReportQuery'
 import LocalsHelper from '../../../../../utils/localsHelper'
 import { FilterValue, GranularDateRangeFilterValue, PartialDate } from '../../../../../components/_filters/types'

package/dpr/routes/journeys/view-report/async/report/controller.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../dpr/routes/journeys/view-report/async/report/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../../types/Services'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport AsyncReportUtils from './utils'\nimport ViewReportUtils from '../../utils'\nimport ErrorHandler from '../../../../../utils/ErrorHandler'\n\nclass ViewAyncReportController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  GET: RequestHandler = async (req, res, next) => {\n    const { type } = req.params\n    try {\n      const params = { req, res, services: this.services, next }\n\n      const renderData = await AsyncReportUtils.renderReport(params)\n\n      res.render(`dpr/routes/journeys/view-report/report`, {\n        layoutPath: this.layoutPath,\n        ...renderData,\n      })\n    } catch (error) {\n      const dprError = new ErrorHandler(error).formatError()\n      let refreshLink\n      const { recentlyViewedService } = this.services\n      if (dprError.status === 'EXPIRED' && recentlyViewedService) {\n        const { dprUser } = LocalsHelper.getValues(res)\n        refreshLink = await recentlyViewedService.asyncSetToExpiredByTableId(req.params['tableId'], dprUser.id)\n      }\n      req.body ??= {}\n      req.body.title = `Failed to retrieve ${type}`\n      req.body.error = dprError\n      if (refreshLink) {\n        req.body.refreshLink = refreshLink\n      }\n      next(error)\n    }\n  }\n\n  applyFilters: RequestHandler = async (req, res, _next) => {\n    await ViewReportUtils.applyReportInteractiveQuery(req, res, this.services, 'filters')\n  }\n\n  applyColumns: RequestHandler = async (req, res, _next) => {\n    await ViewReportUtils.applyReportInteractiveQuery(req, res, this.services, 'columns')\n  }\n}\n\nexport { ViewAyncReportController }\nexport default ViewAyncReportController\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,0BAAyB;AACzB,mBAA6B;AAC7B,IAAAA,gBAA4B;AAC5B,0BAAyB;AAEzB,MAAM,yBAAyB;AAAA,EAC7B;AAAA,EAEA;AAAA,EAEA,YAAY,YAAoB,UAAoB;AAClD,SAAK,aAAa;AAClB,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,MAAsB,OAAO,KAAK,KAAK,SAAS;AAC9C,UAAM,EAAE,KAAK,IAAI,IAAI;AACrB,QAAI;AACF,YAAM,SAAS,EAAE,KAAK,KAAK,UAAU,KAAK,UAAU,KAAK;AAEzD,YAAM,aAAa,MAAM,aAAAC,QAAiB,aAAa,MAAM;AAE7D,UAAI,OAAO,0CAA0C;AAAA,QACnD,YAAY,KAAK;AAAA,QACjB,GAAG;AAAA,MACL,CAAC;AAAA,IACH,SAAS,OAAO;AACd,YAAM,WAAW,IAAI,oBAAAC,QAAa,KAAK,EAAE,YAAY;AACrD,UAAI;AACJ,YAAM,EAAE,sBAAsB,IAAI,KAAK;AACvC,UAAI,SAAS,WAAW,aAAa,uBAAuB;AAC1D,cAAM,EAAE,QAAQ,IAAI,oBAAAC,QAAa,UAAU,GAAG;AAC9C,sBAAc,MAAM,sBAAsB,2BAA2B,IAAI,OAAO,SAAS,GAAG,QAAQ,EAAE;AAAA,MACxG;AACA,UAAI,SAAS,CAAC;AACd,UAAI,KAAK,QAAQ,sBAAsB,IAAI;AAC3C,UAAI,KAAK,QAAQ;AACjB,UAAI,aAAa;AACf,YAAI,KAAK,cAAc;AAAA,MACzB;AACA,WAAK,KAAK;AAAA,IACZ;AAAA,EACF;AAAA,EAEA,eAA+B,OAAO,KAAK,KAAK,UAAU;AACxD,UAAM,cAAAC,QAAgB,4BAA4B,KAAK,KAAK,KAAK,UAAU,SAAS;AAAA,EACtF;AAAA,EAEA,eAA+B,OAAO,KAAK,KAAK,UAAU;AACxD,UAAM,cAAAA,QAAgB,4BAA4B,KAAK,KAAK,KAAK,UAAU,SAAS;AAAA,EACtF;AACF;AAGA,IAAO,qBAAQ;",
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../../types/Services'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport AsyncReportUtils from './utils'\nimport ViewReportUtils from '../../utils'\nimport ErrorHandler from '../../../../../utils/ErrorHandler'\n\nclass ViewAyncReportController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  GET: RequestHandler = async (req, res, next) => {\n    const { type } = req.params\n    try {\n      const params = { req, res, services: this.services, next }\n      const renderData = await AsyncReportUtils.renderReport(params)\n\n      res.render(`dpr/routes/journeys/view-report/report`, {\n        layoutPath: this.layoutPath,\n        ...renderData,\n      })\n    } catch (error) {\n      const dprError = new ErrorHandler(error).formatError()\n      let refreshLink\n      const { recentlyViewedService } = this.services\n      if (dprError.status === 'EXPIRED' && recentlyViewedService) {\n        const { dprUser } = LocalsHelper.getValues(res)\n        refreshLink = await recentlyViewedService.asyncSetToExpiredByTableId(req.params['tableId'], dprUser.id)\n      }\n      req.body ??= {}\n      req.body.title = `Failed to retrieve ${type}`\n      req.body.error = dprError\n      if (refreshLink) {\n        req.body.refreshLink = refreshLink\n      }\n      next(error)\n    }\n  }\n\n  applyFilters: RequestHandler = async (req, res, _next) => {\n    await ViewReportUtils.applyReportInteractiveQuery(req, res, this.services, 'filters')\n  }\n\n  applyColumns: RequestHandler = async (req, res, _next) => {\n    await ViewReportUtils.applyReportInteractiveQuery(req, res, this.services, 'columns')\n  }\n}\n\nexport { ViewAyncReportController }\nexport default ViewAyncReportController\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,0BAAyB;AACzB,mBAA6B;AAC7B,IAAAA,gBAA4B;AAC5B,0BAAyB;AAEzB,MAAM,yBAAyB;AAAA,EAC7B;AAAA,EAEA;AAAA,EAEA,YAAY,YAAoB,UAAoB;AAClD,SAAK,aAAa;AAClB,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,MAAsB,OAAO,KAAK,KAAK,SAAS;AAC9C,UAAM,EAAE,KAAK,IAAI,IAAI;AACrB,QAAI;AACF,YAAM,SAAS,EAAE,KAAK,KAAK,UAAU,KAAK,UAAU,KAAK;AACzD,YAAM,aAAa,MAAM,aAAAC,QAAiB,aAAa,MAAM;AAE7D,UAAI,OAAO,0CAA0C;AAAA,QACnD,YAAY,KAAK;AAAA,QACjB,GAAG;AAAA,MACL,CAAC;AAAA,IACH,SAAS,OAAO;AACd,YAAM,WAAW,IAAI,oBAAAC,QAAa,KAAK,EAAE,YAAY;AACrD,UAAI;AACJ,YAAM,EAAE,sBAAsB,IAAI,KAAK;AACvC,UAAI,SAAS,WAAW,aAAa,uBAAuB;AAC1D,cAAM,EAAE,QAAQ,IAAI,oBAAAC,QAAa,UAAU,GAAG;AAC9C,sBAAc,MAAM,sBAAsB,2BAA2B,IAAI,OAAO,SAAS,GAAG,QAAQ,EAAE;AAAA,MACxG;AACA,UAAI,SAAS,CAAC;AACd,UAAI,KAAK,QAAQ,sBAAsB,IAAI;AAC3C,UAAI,KAAK,QAAQ;AACjB,UAAI,aAAa;AACf,YAAI,KAAK,cAAc;AAAA,MACzB;AACA,WAAK,KAAK;AAAA,IACZ;AAAA,EACF;AAAA,EAEA,eAA+B,OAAO,KAAK,KAAK,UAAU;AACxD,UAAM,cAAAC,QAAgB,4BAA4B,KAAK,KAAK,KAAK,UAAU,SAAS;AAAA,EACtF;AAAA,EAEA,eAA+B,OAAO,KAAK,KAAK,UAAU;AACxD,UAAM,cAAAA,QAAgB,4BAA4B,KAAK,KAAK,KAAK,UAAU,SAAS;AAAA,EACtF;AACF;AAGA,IAAO,qBAAQ;",
   "names": ["import_utils", "AsyncReportUtils", "ErrorHandler", "LocalsHelper", "ViewReportUtils"]
 }

package/dpr/routes/journeys/view-report/async/report/controller.ts

@@ -19,7 +19,6 @@ class ViewAyncReportController {
     const { type } = req.params
     try {
       const params = { req, res, services: this.services, next }
-
       const renderData = await AsyncReportUtils.renderReport(params)
 
       res.render(`dpr/routes/journeys/view-report/report`, {

package/dpr/routes/journeys/view-report/async/report/report-variants.cy.js

@@ -7,70 +7,221 @@ context("Viewing a report", () => {
       (0, import_cypressUtils.stubBaseTasks)();
       (0, import_cypressUtils.executeReportStubs)();
     });
-    it("should display a list-section variant", () => {
-      cy.task("stubListSectionDefinitionRequest");
-      cy.task("stubResultSuccessResult");
-      cy.visit(path);
-      (0, import_cypressUtils.requestReportByNameAndDescription)({ name: "Successful Report", description: "this will succeed" });
-      cy.findByRole("heading", { level: 1, name: /Sectioned/ }).should("be.visible");
-      cy.findAllByRole("heading", { name: /First.*Second/ }).should("have.length", 4);
-      cy.findByRole("heading", { name: /First: One, Second: A 4 results/ }).should("be.visible");
-      cy.findByRole("heading", { name: /First: One, Second: B 6 results/ }).should("be.visible");
-      cy.findByRole("heading", { name: /First: Two, Second: A 3 results/ }).should("be.visible");
-      cy.findByRole("heading", { name: /First: Two, Second: B 7 results/ }).should("be.visible");
-    });
-    it("should display a parent-child variant", () => {
-      cy.task("stubParentChildDefinitionRequest");
-      cy.task("stubResultSuccessResultDifferentValues");
-      cy.visit(path);
-      (0, import_cypressUtils.requestReportByNameAndDescription)({ name: "Successful Report", description: "this will succeed" });
-      cy.findByRole("heading", { level: 1, name: /Parent Child Template/ }).should("be.visible");
-      cy.contains("table", "val40").within(() => {
-        cy.findAllByRole("row").should("have.length", 8);
-        [40, 41, 42, 43, 44, 45, 46].forEach((num) => {
-          cy.findByRole("row", { name: new RegExp(`val${num}$`) }).should("be.visible");
+    describe("list-section", () => {
+      const listSectionReport = {
+        name: "List-section",
+        description: "list-section template"
+      };
+      beforeEach(() => {
+        cy.task("stubListSectionDefinitionRequest");
+        cy.task("stubResultSuccessResult");
+      });
+      it("should display a list-section variant", () => {
+        cy.visit(path);
+        (0, import_cypressUtils.requestReportByNameAndDescription)(listSectionReport);
+        cy.findByRole("heading", { level: 1, name: /List-section/ });
+        cy.findAllByRole("heading", { name: /First.*Second/ }).should("have.length", 4);
+        cy.findByRole("heading", { name: /First: One, Second: A 4 results/ }).should("be.visible").scrollIntoView();
+        cy.findByRole("heading", { name: /First: One, Second: B 6 results/ }).should("be.visible").scrollIntoView();
+        cy.findByRole("heading", { name: /First: Two, Second: A 3 results/ }).should("be.visible").scrollIntoView();
+        cy.findByRole("heading", { name: /First: Two, Second: B 7 results/ }).should("be.visible").scrollIntoView();
+        cy.findAllByLabelText(/First: One, Second: A 4 results/).eq(1).within(() => {
+          cy.findAllByRole("table").should("have.length", 1);
+        });
+        cy.findAllByLabelText(/First: One, Second: B 6 results/).eq(1).within(() => {
+          cy.findAllByRole("table").should("have.length", 1);
+        });
+        cy.findAllByLabelText(/First: Two, Second: A 3 results/).eq(1).within(() => {
+          cy.findAllByRole("table").should("have.length", 1);
+        });
+        cy.findAllByLabelText(/First: Two, Second: B 7 results/).eq(1).within(() => {
+          cy.findAllByRole("table").should("have.length", 1);
         });
       });
-      cy.contains("table", "val30").within(() => {
-        cy.findAllByRole("row").should("have.length", 14);
-        [...Array(10).keys()].map((i) => i + 30).forEach((num) => {
-          cy.findByRole("row", { name: new RegExp(`val${num}$`) }).should("be.visible");
+      it("should sort the sections correctly", () => {
+        cy.visit(path);
+        (0, import_cypressUtils.startReportRequest)(listSectionReport);
+        cy.findByRole("group", { name: /Column/ }).findByRole("radio", { name: "Second" }).check();
+        cy.findByRole("button", { name: /Request/ }).click();
+        cy.findByRole("heading", { level: 1, name: /List-section/ });
+        cy.findAllByRole("heading", { name: /First.*Second/ }).should("have.length", 4).each((heading, index) => {
+          switch (index) {
+            case 0:
+              cy.wrap(heading).contains("First: One, Second: A 4 results");
+              break;
+            case 1:
+              cy.wrap(heading).contains("First: Two, Second: A 3 results");
+              break;
+            case 2:
+              cy.wrap(heading).contains("First: One, Second: B 6 results");
+              break;
+            case 3:
+              cy.wrap(heading).contains("First: Two, Second: B 7 results");
+              break;
+            default:
+              break;
+          }
+        });
+      });
+    });
+    describe("summary-section", () => {
+      it("should display a summary section variant", () => {
+        cy.task("stubSummarySectionDefinitionRequest");
+        cy.task("stubAsyncSummaryReport");
+        cy.task("stubResultSuccessResultDifferentValues");
+        cy.visit(path);
+        (0, import_cypressUtils.requestReportByNameAndDescription)({ name: "Summary-section", description: "Summary-section template" });
+        cy.findByRole("heading", { level: 1, name: /Summary-section/ }).should("be.visible");
+        cy.findAllByLabelText(/First: One, Second: A/).eq(0).within(() => {
+          cy.findAllByRole("table").should("have.length", 2).each((table) => {
+            cy.wrap(table).within(() => {
+              cy.findAllByRole("row").should("have.length", 5);
+            });
+          });
+        });
+        cy.findAllByLabelText(/First: One, Second: B/).eq(0).within(() => {
+          cy.findAllByRole("table").should("have.length", 2).each((table) => {
+            cy.wrap(table).within(() => {
+              cy.findAllByRole("row").should("have.length", 7);
+            });
+          });
+        });
+        cy.findAllByLabelText(/First: Two, Second: A/).eq(0).within(() => {
+          cy.findAllByRole("table").should("have.length", 2).each((table) => {
+            cy.wrap(table).within(() => {
+              cy.findAllByRole("row").should("have.length", 4);
+            });
+          });
+        });
+        cy.findAllByLabelText(/First: Two, Second: B/).eq(0).within(() => {
+          cy.findAllByRole("table").should("have.length", 2).each((table) => {
+            cy.wrap(table).within(() => {
+              cy.findAllByRole("row").should("have.length", 8);
+            });
+          });
         });
-        cy.findByRole("row", { name: /val330/ }).should("be.visible");
-        cy.findByRole("row", { name: /val331/ }).should("be.visible");
-        cy.findByRole("row", { name: /val332/ }).should("be.visible");
       });
     });
-    it("should display a summary section variant", () => {
-      cy.task("stubSummarySectionDefinitionRequest");
-      cy.task("stubAsyncSummaryReport");
-      cy.task("stubResultSuccessResultDifferentValues");
-      cy.visit(path);
-      (0, import_cypressUtils.requestReportByNameAndDescription)({ name: "Successful Report", description: "this will succeed" });
-      cy.findByRole("heading", { level: 1, name: /Sectioned Summaries template/ }).should("be.visible");
-      cy.findAllByRole("columnheader").should("have.length", 8 * 4);
-      cy.get(".report-template-container").within(() => {
-        cy.findAllByRole("row").should("have.length", 48);
+    describe("parent-child-section", () => {
+      const ParentChildSectionReport = {
+        name: "Parent-child-section",
+        description: "Parent-child-section template"
+      };
+      beforeEach(() => {
+        cy.task("stubParentChildSectionDefinitionRequest");
+        cy.task("stubResultSuccessResultDifferentValues");
+      });
+      it("should display a parent child section variant", () => {
+        cy.visit(path);
+        (0, import_cypressUtils.requestReportByNameAndDescription)(ParentChildSectionReport);
+        cy.findByRole("heading", { level: 1, name: /Parent-child-section/ }).should("be.visible");
+        cy.findByRole("heading", { name: /Section 1: One, Section 2: A 5 results/ }).scrollIntoView().should("be.visible");
+        cy.findByRole("heading", { name: /Section 1: One, Section 2: B 2 results/ }).scrollIntoView().should("be.visible");
+        cy.findByRole("heading", { name: /Section 1: Two, Section 2: A 8 results/ }).scrollIntoView().should("be.visible");
+        cy.findByRole("heading", { name: /Section 1: Two, Section 2: B 5 results/ }).scrollIntoView().should("be.visible");
+        cy.findAllByLabelText("Section 1: One, Section 2: A 5 results").eq(1).within(() => {
+          cy.findAllByRole("table").should("have.length", 10);
+          cy.findAllByLabelText("Parent 1").eq(0).within(() => {
+            cy.findAllByRole("table").should("have.length", 2);
+            cy.findAllByLabelText("Parent 1").eq(0).within(() => {
+              cy.findByRole("table").within(() => {
+                cy.findAllByRole("row").should("have.length", 4);
+              });
+            });
+            cy.findAllByLabelText("Child Report").eq(0).within(() => {
+              cy.findByRole("table").within(() => {
+                cy.findAllByRole("row").should("have.length", 23);
+              });
+            });
+          });
+        });
+        cy.findAllByLabelText("Section 1: Two, Section 2: A 8 results").eq(1).within(() => {
+          cy.findAllByRole("table").should("have.length", 16);
+          cy.findAllByLabelText("Parent 1").eq(0).within(() => {
+            cy.findAllByRole("table").should("have.length", 2);
+            cy.findAllByLabelText("Parent 1").eq(0).within(() => {
+              cy.findByRole("table").within(() => {
+                cy.findAllByRole("row").should("have.length", 4);
+              });
+            });
+            cy.findAllByLabelText("Child Report").eq(0).within(() => {
+              cy.findByRole("table").within(() => {
+                cy.findAllByRole("row").should("have.length", 23);
+              });
+            });
+          });
+        });
+      });
+      it("should sort the sections correctly", () => {
+        cy.visit(path);
+        (0, import_cypressUtils.startReportRequest)(ParentChildSectionReport);
+        cy.findByRole("group", { name: /Column/ }).findByRole("radio", { name: "Section 2" }).check();
+        cy.findByRole("button", { name: /Request/ }).click();
+        cy.findByRole("heading", { level: 1, name: /Parent-child-section/ }).should("be.visible");
+        cy.findAllByRole("heading", { name: /Section 1.*Section 2/ }).should("have.length", 4).each((heading, index) => {
+          switch (index) {
+            case 0:
+              cy.wrap(heading).contains("Section 1: One, Section 2: A 5 results");
+              break;
+            case 1:
+              cy.wrap(heading).contains("Section 1: Two, Section 2: A 8 results");
+              break;
+            case 2:
+              cy.wrap(heading).contains("Section 1: One, Section 2: B 2 results");
+              break;
+            case 3:
+              cy.wrap(heading).contains("Section 1: Two, Section 2: B 5 results");
+              break;
+            default:
+              break;
+          }
+        });
       });
     });
-    it("should display a parent child section variant", () => {
-      cy.task("stubParentChildSectionDefinitionRequest");
-      cy.task("stubResultSuccessResultDifferentValues");
-      cy.visit(path);
-      (0, import_cypressUtils.requestReportByNameAndDescription)({ name: "Successful Report", description: "this will succeed" });
-      cy.findByRole("heading", { level: 1, name: /Parent Child Section Template/ }).should("be.visible");
-      cy.contains("table", "val30").within(() => {
-        cy.findAllByRole("row").should("have.length", 21);
+    describe("parent-child", () => {
+      it("should display a parent-child variant", () => {
+        cy.task("stubParentChildDefinitionRequest");
+        cy.task("stubResultSuccessResultDifferentValues");
+        cy.visit(path);
+        (0, import_cypressUtils.requestReportByNameAndDescription)({ name: "Parent-child", description: "Parent-child template" });
+        cy.findByRole("heading", { level: 1, name: /Parent-child/ }).should("be.visible");
+        cy.findAllByLabelText("Parent 1").eq(0).within(() => {
+          cy.findAllByRole("table").should("have.length", 3);
+          cy.findAllByLabelText("Parent 1").eq(0).within(() => {
+            cy.findByRole("table").within(() => {
+              cy.findAllByRole("row").should("have.length", 4);
+            });
+          });
+          cy.findAllByLabelText("Child Report").eq(0).within(() => {
+            cy.findByRole("table").within(() => {
+              cy.findAllByRole("row").should("have.length", 10);
+            });
+          });
+          cy.findAllByLabelText("Child Report 2").eq(0).within(() => {
+            cy.findByRole("table").within(() => {
+              cy.findAllByRole("row").should("have.length", 10);
+            });
+          });
+        });
+        cy.findAllByLabelText("Parent 8").eq(0).within(() => {
+          cy.findAllByRole("table").should("have.length", 3);
+          cy.findAllByLabelText("Parent 8").eq(0).within(() => {
+            cy.findByRole("table").within(() => {
+              cy.findAllByRole("row").should("have.length", 4);
+            });
+          });
+          cy.findAllByLabelText("Child Report").eq(0).within(() => {
+            cy.findByRole("table").within(() => {
+              cy.findAllByRole("row").should("have.length", 16);
+            });
+          });
+          cy.findAllByLabelText("Child Report 2").eq(0).within(() => {
+            cy.findByRole("table").within(() => {
+              cy.findAllByRole("row").should("have.length", 16);
+            });
+          });
+        });
       });
-      cy.findByRole("heading", { name: /Section 1: One, Section 2: A 5 results/ }).should("be.visible");
-      cy.findByRole("heading", { name: /Section 1: One, Section 2: B 2 results/ }).should("be.visible");
-      cy.findByRole("heading", { name: /Section 1: Two, Section 2: A 8 results/ }).should("be.visible");
-      cy.findByRole("heading", { name: /Section 1: Two, Section 2: B 5 results/ }).should("be.visible");
-      cy.findAllByRole("row", {
-        name: (textContent) => {
-          return textContent.includes("val");
-        }
-      }).filter((_idx, el) => [...el.querySelectorAll("td")].length === 2).should("have.length", 100);
     });
   });
 });