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

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/view-report/async/report/utils.ts"],
-  "sourcesContent": ["import parseUrl from 'parseurl'\nimport { Url } from 'url'\nimport { Request, Response } from 'express'\n\n// Types\nimport type { Columns } from '../../../../../components/_reports/report-columns-form/types'\nimport type { AsyncReportUtilsParams } from '../../../../../types/AsyncReportUtils'\nimport type { DataTable } from '../../../../../utils/DataTableBuilder/types'\nimport type { components } from '../../../../../types/api'\nimport type { AsyncSummary, RequestedReport } from '../../../../../types/UserReports'\nimport { LoadType, ReportType } from '../../../../../types/UserReports'\nimport ReportQuery from '../../../../../types/ReportQuery'\nimport type { ChildData } from '../../../../../utils/ParentChildDataTableBuilder/types'\nimport type { ExtractedDefinitionData, ExtractedRequestData, ReportUrls } from './types'\nimport type { DownloadActionParams } from '../../../../../components/_reports/report-actions/types'\nimport { FiltersType } from '../../../../../components/_filters/filtersTypeEnum'\nimport type { Services } from '../../../../../types/Services'\n\n// Utils\nimport definitionUtils from '../../../../../utils/definitionUtils'\nimport PaginationUtils from '../../../../../components/_reports/report-pagination/utils'\nimport TotalsUtils from '../../../../../components/_reports/report-totals/utils'\nimport ReportFiltersUtils from '../../../../../components/_filters/utils'\nimport ColumnUtils from '../../../../../components/_reports/report-columns-form/utils'\nimport ReportActionsUtils from '../../../../../components/_reports/report-actions/utils'\nimport UserReportsUtils from '../../../../../components/user-reports/utils'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport DataTableUtils from '../../../../../components/_reports/report-data-table/utils'\nimport RequestedReportService from '../../../my-reports/requested-reports/service'\n\nimport CollatedSummaryBuilder from '../../../../../utils/CollatedSummaryBuilder/CollatedSummaryBuilder'\n\nexport const getData = async ({\n  res,\n  req,\n  services,\n  token,\n  userId,\n}: AsyncReportUtilsParams & { token: string; userId: string }) => {\n  const { definitionsPath: definitionPath } = LocalsHelper.getValues(res)\n  const { reportId, variantId, id, tableId } = req.params\n  const reportVariantId = variantId || id\n\n  // Get the definition\n  const definition: components['schemas']['SingleVariantReportDefinition'] =\n    await services.reportingService.getDefinition(token, reportId, reportVariantId, definitionPath)\n  const { variant } = definition\n  const { specification } = variant\n\n  if (!specification) {\n    throw new Error('No specification found in variant definition')\n  }\n\n  // Get the request data\n  const requestedReportService = <RequestedReportService>services.requestedReportService\n  const requestData: RequestedReport | undefined = await requestedReportService.getReportByTableId(tableId, userId)\n\n  // Get the columns\n  const columns = ColumnUtils.getColumns(specification, req)\n\n  // initialise report query\n  const reportQuery = await initReportQuery(definition, columns, res, req, services, requestData)\n\n  // Get the reportData\n  const reportData = await getReportData({ definition, services, token, req, res, reportQuery })\n\n  // Get the summary data, if applicable\n  const { summaries } = definition.variant\n  const summariesData = !summaries ? [] : await getSummariesData(summaries, services, token, req, res)\n\n  // Get the child data, if applicable\n  const { childVariants } = definition.variant\n  const childData: ChildData[] = !childVariants\n    ? []\n    : await getChildData(childVariants, services, token, req, res, requestData)\n\n  return {\n    definition,\n    requestData,\n    reportData,\n    summariesData,\n    childData,\n    reportQuery,\n    columns,\n  }\n}\n\nconst initReportQuery = async (\n  definition: components['schemas']['SingleVariantReportDefinition'],\n  columns: Columns,\n  res: Response,\n  req: Request,\n  services: Services,\n  requestData?: RequestedReport,\n) => {\n  const { definitionsPath } = LocalsHelper.getValues(res)\n  const fields = definitionUtils.getFields(definition)\n  const template = definitionUtils.getTemplate(definition)\n\n  const filtersData = await ReportFiltersUtils.getFilters({\n    fields,\n    req,\n    res,\n    services,\n    filtersType: FiltersType.INTERACTIVE,\n  })\n\n  // Sort\n  const sortColumn = req.query?.sortColumn || requestData?.query?.data?.sortColumn\n  const sortedAsc = req.query?.sortedAsc || requestData?.query?.data?.sortedAsc\n\n  // Pagination\n  const selectedPage = req.query?.selectedPage\n  const pageSize = req.query?.pageSize\n\n  // Filters\n  const filtersQuery = ReportFiltersUtils.setRequestQueryFromFilterValues(filtersData.filters)\n\n  const queryParams = {\n    ...(sortColumn && { sortColumn }),\n    ...(sortedAsc && { sortedAsc }),\n    ...filtersQuery,\n    ...(pageSize && { pageSize }),\n    ...(selectedPage && { pageSize }),\n    ...(columns && { columns: columns.value }),\n  }\n\n  return new ReportQuery({\n    fields,\n    template,\n    queryParams,\n    definitionsPath,\n  })\n}\n\nconst getReportData = async (args: {\n  definition: components['schemas']['SingleVariantReportDefinition']\n  services: Services\n  token: string\n  req: Request\n  res: Response\n  reportQuery: ReportQuery\n}) => {\n  const { services, token, req, reportQuery } = args\n  const { reportId, variantId, id, tableId } = req.params\n  const reportVariantId = variantId || id\n\n  return services.reportingService.getAsyncReport(\n    token,\n    reportId,\n    reportVariantId,\n    tableId,\n    reportQuery.toRecordWithFilterPrefix(true),\n  )\n}\n\nexport const getSummariesData = async (\n  summaries: components['schemas']['ReportSummary'][],\n  services: Services,\n  token: string,\n  req: Request,\n  res: Response,\n): Promise<AsyncSummary[]> => {\n  const { reportId, variantId, id, tableId } = req.params\n  const { definitionsPath: dataProductDefinitionsPath } = LocalsHelper.getValues(res)\n  const reportVariantId = variantId || id\n\n  return Promise.all(\n    summaries.map(async (summary) => {\n      const summaryReport = await services.reportingService.getAsyncSummaryReport(\n        token,\n        reportId,\n        reportVariantId,\n        tableId,\n        summary.id,\n        {\n          dataProductDefinitionsPath,\n        },\n      )\n\n      return {\n        ...summary,\n        data: summaryReport,\n      }\n    }),\n  )\n}\n\nexport const getChildData = async (\n  childVariants: components['schemas']['ChildVariantDefinition'][],\n  services: Services,\n  token: string,\n  req: Request,\n  res: Response,\n  requestData?: RequestedReport,\n): Promise<ChildData[]> => {\n  const { definitionsPath: dataProductDefinitionsPath } = LocalsHelper.getValues(res)\n  const { reportId } = req.params\n  const childExecutionData = requestData?.childExecutionData\n  if (!childExecutionData) {\n    throw new Error('getChildData: No execution data found for child variants')\n  }\n  return Promise.all(\n    childVariants.map(async (childVariant) => {\n      const { specification } = childVariant\n      if (!specification) {\n        throw new Error('getChildData: No specification found in child variant definition')\n      }\n\n      const query = new ReportQuery({\n        fields: specification?.fields || [],\n        template: specification.template,\n        queryParams: req.query,\n        definitionsPath: dataProductDefinitionsPath,\n      }).toRecordWithFilterPrefix(true)\n\n      const childData = childExecutionData.find((e) => e.variantId === childVariant.id)\n      if (!childData) {\n        throw new Error('getChildData: No matching child execution data found')\n      }\n      const { tableId: childTableId } = childData\n\n      const childReport = await services.reportingService.getAsyncReport(\n        token,\n        reportId,\n        childVariant.id,\n        childTableId,\n        query,\n      )\n\n      return {\n        id: childVariant.id,\n        data: childReport,\n      }\n    }),\n  )\n}\n\n/**\n * Entry point function to render the report\n *\n * @param {AsyncReportUtilsParams} { req, res, services }\n * @return {*}\n */\nexport const renderReport = async ({ req, res, services }: AsyncReportUtilsParams) => {\n  const { token, dprUser } = LocalsHelper.getValues(res)\n\n  // Get the report data\n  const { definition, requestData, reportData, childData, summariesData, reportQuery, columns } = await getData({\n    req,\n    res,\n    services,\n    token,\n    userId: dprUser.id,\n  })\n\n  // Get the data table\n  const dataTable: DataTable[] = DataTableUtils.createDataTable(\n    definition,\n    columns,\n    reportData,\n    childData,\n    summariesData,\n    reportQuery,\n  )\n\n  // Get the template data\n  const templateData = await getTemplateData(\n    req,\n    res,\n    services,\n    definition,\n    summariesData,\n    dataTable,\n    columns,\n    reportQuery,\n    requestData,\n  )\n\n  const renderData = {\n    ...templateData,\n    dataTable,\n  }\n\n  if (requestData && Object.keys(requestData).length) {\n    UserReportsUtils.updateLastViewed({\n      req,\n      services,\n      reportStateData: requestData,\n      userId: dprUser.id,\n      filters: templateData.filterData.filters,\n    })\n  }\n\n  return { renderData }\n}\n\nconst getTemplateData = async (\n  req: Request,\n  res: Response,\n  services: Services,\n  definition: components['schemas']['SingleVariantReportDefinition'],\n  summariesData: AsyncSummary[],\n  dataTable: DataTable[],\n  columns: Columns,\n  reportQuery: ReportQuery,\n  requestData?: RequestedReport,\n) => {\n  const { nestedBaseUrl } = LocalsHelper.getValues(res)\n\n  // get url data\n  const url = parseUrl(req)\n  if (!url) {\n    throw new Error('Unable to set url data from request')\n  }\n\n  const urls = url ? setUrls(url, req) : undefined\n\n  // get from definition\n  const definitionData = extractDataFromDefinition(definition)\n  const { fields, specification } = definitionData\n\n  // get from requestedData\n  const requestedData = requestData ? extractDataFromRequest(requestData) : undefined\n\n  // Get the count\n  const count = await getCount(definition, services, res, req, reportQuery)\n\n  // Get the filters\n  const filterData = await ReportFiltersUtils.getFilters({\n    fields,\n    req,\n    res,\n    services,\n    filtersType: FiltersType.INTERACTIVE,\n  })\n\n  // Set the features\n  const features = await setFeatures(services, res, req, columns, count, definitionData, requestedData, urls)\n\n  // Set the extra meta data\n  const meta = setMetaData(res, req)\n\n  let reportSummaries\n  if (summariesData.length) {\n    const collatedSummaryBuilder = new CollatedSummaryBuilder(specification, summariesData)\n    reportSummaries = collatedSummaryBuilder.collatePageSummaries()\n  }\n\n  let pagination\n  let totals\n  if (definitionData.template === 'list') {\n    pagination = PaginationUtils.getPaginationData(url, count, req)\n    const { pageSize, currentPage, totalRows } = pagination\n    totals = TotalsUtils.getTotals(pageSize, currentPage, totalRows, dataTable[0].rowCount)\n  }\n\n  return {\n    ...(showColumns(specification) && { columns }),\n    filterData,\n    count,\n    nestedBaseUrl,\n    ...meta,\n    ...features,\n    ...definitionData,\n    ...requestedData,\n    ...urls,\n    ...(pagination && { pagination }),\n    ...(totals && { totals }),\n    ...(reportSummaries && { reportSummaries }),\n  }\n}\n\nconst showColumns = (specification: components['schemas']['Specification']) => {\n  const { template } = specification\n\n  return !['row-section', 'row-section-child', 'summary', 'summary-section'].includes(template)\n}\n\nconst setMetaData = (res: Response, req: Request) => {\n  const { csrfToken } = LocalsHelper.getValues(res)\n  const { tableId, reportId, id } = req.params\n\n  return {\n    csrfToken,\n    loadType: LoadType.ASYNC,\n    type: ReportType.REPORT,\n    tableId,\n    reportId,\n    id,\n  }\n}\n\nconst setUrls = (url: Url, req: Request): ReportUrls => {\n  const { search } = url\n  const encodedSearch = search ? encodeURIComponent(search) : undefined\n  const pathname = search ? req.originalUrl.split(search)[0] : req.originalUrl\n  const reportUrl = pathname.replace('/download-disabled', '').replace('/download-disabled?', '')\n\n  return {\n    reportUrl,\n    reportSearch: search || undefined,\n    encodedSearch,\n    pathname,\n  }\n}\n\nconst setFeatures = async (\n  services: Services,\n  res: Response,\n  req: Request,\n  columns: Columns,\n  count: number,\n  definitionData: ExtractedDefinitionData,\n  requestData?: ExtractedRequestData,\n  urls?: ReportUrls,\n) => {\n  const { csrfToken, dprUser, bookmarkingEnabled, downloadingEnabled } = LocalsHelper.getValues(res)\n  const { reportId, id } = req.params\n  const { downloadPermissionService, bookmarkService } = services\n\n  let canDownload = false\n  if (downloadingEnabled && downloadPermissionService) {\n    canDownload = await downloadPermissionService.downloadEnabled(dprUser.id, reportId, id)\n  }\n\n  let bookmarked\n  if (bookmarkingEnabled && bookmarkService) {\n    bookmarked = await bookmarkService.isBookmarked(id, reportId, dprUser.id)\n  }\n\n  const actions = setActions(csrfToken, columns, canDownload, count, res, req, definitionData, requestData, urls)\n\n  return {\n    actions,\n    canDownload,\n    bookmarked,\n  }\n}\n\nconst getCount = async (\n  definition: components['schemas']['SingleVariantReportDefinition'],\n  services: Services,\n  res: Response,\n  req: Request,\n  reportQuery: ReportQuery,\n) => {\n  const { token } = LocalsHelper.getValues(res)\n  const { tableId, reportId, id } = req.params\n\n  return !definition.variant.interactive\n    ? services.reportingService.getAsyncCount(token, tableId)\n    : services.reportingService.getAsyncInteractiveCount(token, tableId, reportId, id, reportQuery)\n}\n\nconst extractDataFromDefinition = (\n  definition: components['schemas']['SingleVariantReportDefinition'],\n): ExtractedDefinitionData => {\n  const { variant, name: reportName, description: reportDescription } = definition\n  const { classification, printable, specification, name, description } = variant\n  if (!specification) {\n    throw new Error('No specification found in variant definition')\n  }\n  const { template, fields } = specification\n\n  return {\n    reportName,\n    name,\n    description: description || reportDescription,\n    classification,\n    printable: Boolean(printable),\n    specification,\n    template,\n    fields,\n  }\n}\n\nconst extractDataFromRequest = (requestData: RequestedReport): ExtractedRequestData => {\n  const { query, url, timestamp } = requestData\n\n  return {\n    executionId: requestData.executionId,\n    requestedTimestamp: timestamp.requested ? new Date(timestamp.requested).toLocaleString() : undefined,\n    querySummary: query?.summary || [],\n    queryData: query?.data,\n    requestUrl: url?.request,\n    defaultQuery: url?.report?.default,\n    dataProductDefinitionsPath: requestData.dataProductDefinitionsPath,\n  }\n}\n\nconst setActions = (\n  csrfToken: string,\n  columns: Columns,\n  canDownload: boolean,\n  count: number,\n  res: Response,\n  req: Request,\n  definitionData: ExtractedDefinitionData,\n  requestData?: ExtractedRequestData,\n  urls?: ReportUrls,\n) => {\n  const { reportName, name, printable } = definitionData\n  const { tableId, id, reportId } = req.params\n  const { nestedBaseUrl, definitionsPath } = LocalsHelper.getValues(res)\n\n  // DownloadActionParams\n  let downloadConfig: DownloadActionParams | undefined\n  if (urls) {\n    downloadConfig = {\n      enabled: count > 0 && canDownload !== undefined,\n      name,\n      reportName,\n      csrfToken,\n      reportId,\n      id,\n      tableId,\n      columns: columns.value,\n      definitionPath: definitionsPath,\n      loadType: LoadType.ASYNC,\n      nestedBaseUrl,\n      canDownload,\n      currentUrl: urls.pathname,\n      currentQueryParams: urls.reportSearch,\n      ...(requestData?.queryData && {\n        sortColumn: <string>requestData.queryData.sortColumn,\n        sortedAsc: <string>requestData.queryData.sortedAsc,\n      }),\n    }\n  }\n\n  let shareConfig\n  let copyConfig\n  if (requestData?.requestUrl?.fullUrl) {\n    shareConfig = {\n      reportName,\n      name,\n      url: requestData.requestUrl.fullUrl,\n    }\n    copyConfig = {\n      url: requestData.requestUrl.fullUrl,\n    }\n  }\n\n  let refreshConfig\n  if (requestData?.executionId && requestData?.requestUrl?.fullUrl) {\n    refreshConfig = {\n      url: requestData.requestUrl.fullUrl,\n      executionId: requestData.executionId,\n    }\n  }\n\n  return ReportActionsUtils.getActions({\n    ...(downloadConfig && { download: downloadConfig }),\n    ...(shareConfig && { share: shareConfig }),\n    ...(refreshConfig && { refresh: refreshConfig }),\n    ...(copyConfig && { copy: copyConfig }),\n    print: { enabled: printable },\n  })\n}\n\nexport default {\n  renderReport,\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import parseUrl from 'parseurl'\nimport { Url } from 'url'\nimport { Request, Response } from 'express'\n\n// Types\nimport type { Columns } from '../../../../../components/_reports/report-columns-form/types'\nimport type { AsyncReportUtilsParams } from '../../../../../types/AsyncReportUtils'\nimport type { DataTable } from '../../../../../utils/DataTableBuilder/types'\nimport type { components } from '../../../../../types/api'\nimport type { AsyncSummary, RequestedReport } from '../../../../../types/UserReports'\nimport { LoadType, ReportType } from '../../../../../types/UserReports'\nimport ReportQuery from '../../../../../types/ReportQuery'\nimport type { ChildData } from '../../../../../utils/ParentChildDataTableBuilder/types'\nimport type { ExtractedDefinitionData, ExtractedRequestData, ReportUrls } from './types'\nimport type { DownloadActionParams } from '../../../../../components/_reports/report-actions/types'\nimport { FiltersType } from '../../../../../components/_filters/filtersTypeEnum'\nimport type { Services } from '../../../../../types/Services'\n\n// Utils\nimport definitionUtils from '../../../../../utils/definitionUtils'\nimport PaginationUtils from '../../../../../components/_reports/report-pagination/utils'\nimport TotalsUtils from '../../../../../components/_reports/report-totals/utils'\nimport ReportFiltersUtils from '../../../../../components/_filters/utils'\nimport ColumnUtils from '../../../../../components/_reports/report-columns-form/utils'\nimport ReportActionsUtils from '../../../../../components/_reports/report-actions/utils'\nimport UserReportsUtils from '../../../../../components/user-reports/utils'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport DataTableUtils from '../../../../../components/_reports/report-data-table/utils'\nimport RequestedReportService from '../../../my-reports/requested-reports/service'\n\nimport CollatedSummaryBuilder from '../../../../../utils/CollatedSummaryBuilder/CollatedSummaryBuilder'\n\nexport const getData = async ({\n  res,\n  req,\n  services,\n  token,\n  userId,\n}: AsyncReportUtilsParams & { token: string; userId: string }) => {\n  const { definitionsPath: definitionPath } = LocalsHelper.getValues(res)\n  const { reportId, variantId, id, tableId } = req.params\n  const reportVariantId = variantId || id\n\n  // Get the definition\n  const definition: components['schemas']['SingleVariantReportDefinition'] =\n    await services.reportingService.getDefinition(token, reportId, reportVariantId, definitionPath)\n  const { variant } = definition\n  const { specification } = variant\n\n  if (!specification) {\n    throw new Error('No specification found in variant definition')\n  }\n\n  // Get the request data\n  const requestedReportService = <RequestedReportService>services.requestedReportService\n  const requestData: RequestedReport | undefined = await requestedReportService.getReportByTableId(tableId, userId)\n\n  // Get the columns\n  const columns = ColumnUtils.getColumns(specification, req)\n\n  // initialise report query\n  const reportQuery = await initReportQuery(definition, columns, res, req, services, requestData)\n\n  // Get the reportData\n  const reportData = await getReportData({ definition, services, token, req, res, reportQuery })\n\n  // Get the summary data, if applicable\n  const { summaries } = definition.variant\n  const summariesData = !summaries ? [] : await getSummariesData(summaries, services, token, req, res)\n\n  // Get the child data, if applicable\n  const { childVariants } = definition.variant\n  const childData: ChildData[] = !childVariants\n    ? []\n    : await getChildData(childVariants, services, token, req, res, requestData)\n\n  return {\n    definition,\n    requestData,\n    reportData,\n    summariesData,\n    childData,\n    reportQuery,\n    columns,\n  }\n}\n\nconst initReportQuery = async (\n  definition: components['schemas']['SingleVariantReportDefinition'],\n  columns: Columns,\n  res: Response,\n  req: Request,\n  services: Services,\n  requestData?: RequestedReport,\n) => {\n  const { definitionsPath } = LocalsHelper.getValues(res)\n  const fields = definitionUtils.getFields(definition)\n  const template = definitionUtils.getTemplate(definition)\n\n  const filtersData = await ReportFiltersUtils.getFilters({\n    fields,\n    req,\n    filtersType: FiltersType.INTERACTIVE,\n    res,\n    services,\n  })\n\n  // Sort\n  const sortColumn = req.query?.['sortColumn'] || requestData?.query?.data?.['sortColumn']\n  const sortedAsc = req.query?.['sortedAsc'] || requestData?.query?.data?.['sortedAsc']\n\n  // Pagination\n  const selectedPage = req.query?.['selectedPage']\n  const pageSize = req.query?.['pageSize']\n\n  // Filters\n  const filtersQuery = ReportFiltersUtils.setRequestQueryFromFilterValues(filtersData.filters)\n\n  const queryParams = {\n    ...(sortColumn && { sortColumn }),\n    ...(sortedAsc && { sortedAsc }),\n    ...filtersQuery,\n    ...(pageSize && { pageSize }),\n    ...(selectedPage && { pageSize }),\n    ...(columns && { columns: columns.value }),\n  }\n\n  return new ReportQuery({\n    fields,\n    template,\n    queryParams,\n    definitionsPath,\n  })\n}\n\nconst getReportData = async (args: {\n  definition: components['schemas']['SingleVariantReportDefinition']\n  services: Services\n  token: string\n  req: Request\n  res: Response\n  reportQuery: ReportQuery\n}) => {\n  const { services, token, req, reportQuery } = args\n  const { reportId, variantId, id, tableId } = req.params\n  const reportVariantId = variantId || id\n\n  return services.reportingService.getAsyncReport(\n    token,\n    reportId,\n    reportVariantId,\n    tableId,\n    reportQuery.toRecordWithFilterPrefix(true),\n  )\n}\n\nexport const getSummariesData = async (\n  summaries: components['schemas']['ReportSummary'][],\n  services: Services,\n  token: string,\n  req: Request,\n  res: Response,\n): Promise<AsyncSummary[]> => {\n  const { reportId, variantId, id, tableId } = req.params\n  const { definitionsPath: dataProductDefinitionsPath } = LocalsHelper.getValues(res)\n  const reportVariantId = variantId || id\n\n  return Promise.all(\n    summaries.map(async (summary) => {\n      const summaryReport = await services.reportingService.getAsyncSummaryReport(\n        token,\n        reportId,\n        reportVariantId,\n        tableId,\n        summary.id,\n        {\n          dataProductDefinitionsPath,\n        },\n      )\n\n      return {\n        ...summary,\n        data: summaryReport,\n      }\n    }),\n  )\n}\n\nexport const getChildData = async (\n  childVariants: components['schemas']['ChildVariantDefinition'][],\n  services: Services,\n  token: string,\n  req: Request,\n  res: Response,\n  requestData?: RequestedReport,\n): Promise<ChildData[]> => {\n  const { definitionsPath: dataProductDefinitionsPath } = LocalsHelper.getValues(res)\n  const { reportId } = req.params\n  const childExecutionData = requestData?.childExecutionData\n  if (!childExecutionData) {\n    throw new Error('getChildData: No execution data found for child variants')\n  }\n  return Promise.all(\n    childVariants.map(async (childVariant) => {\n      const { specification } = childVariant\n      if (!specification) {\n        throw new Error('getChildData: No specification found in child variant definition')\n      }\n\n      const query = new ReportQuery({\n        fields: specification?.fields || [],\n        template: specification.template,\n        queryParams: req.query,\n        definitionsPath: dataProductDefinitionsPath,\n      }).toRecordWithFilterPrefix(true)\n\n      const childData = childExecutionData.find((e) => e.variantId === childVariant.id)\n      if (!childData || !childData.tableId) {\n        throw new Error('getChildData: No matching child execution data found')\n      }\n      const { tableId: childTableId } = childData\n\n      const childReport = await services.reportingService.getAsyncReport(\n        token,\n        reportId,\n        childVariant.id,\n        childTableId,\n        query,\n      )\n\n      return {\n        id: childVariant.id,\n        data: childReport,\n      }\n    }),\n  )\n}\n\n/**\n * Entry point function to render the report\n *\n * @param {AsyncReportUtilsParams} { req, res, services }\n * @return {*}\n */\nexport const renderReport = async ({ req, res, services }: AsyncReportUtilsParams) => {\n  const { token, dprUser } = LocalsHelper.getValues(res)\n\n  // Get the report data\n  const { definition, requestData, reportData, childData, summariesData, reportQuery, columns } = await getData({\n    req,\n    res,\n    services,\n    token,\n    userId: dprUser.id,\n  })\n\n  // Get the data table\n  const dataTable: DataTable[] = DataTableUtils.createDataTable(\n    definition,\n    columns,\n    reportData,\n    childData,\n    summariesData,\n    reportQuery,\n  )\n\n  // Get the template data\n  const templateData = await getTemplateData(\n    req,\n    res,\n    services,\n    definition,\n    summariesData,\n    dataTable,\n    columns,\n    reportQuery,\n    requestData,\n  )\n\n  const renderData = {\n    ...templateData,\n    dataTable,\n  }\n\n  if (requestData && Object.keys(requestData).length) {\n    UserReportsUtils.updateLastViewed({\n      req,\n      services,\n      reportStateData: requestData,\n      userId: dprUser.id,\n      filters: templateData.filterData.filters,\n    })\n  }\n\n  return { renderData }\n}\n\nconst getTemplateData = async (\n  req: Request,\n  res: Response,\n  services: Services,\n  definition: components['schemas']['SingleVariantReportDefinition'],\n  summariesData: AsyncSummary[],\n  dataTable: DataTable[],\n  columns: Columns,\n  reportQuery: ReportQuery,\n  requestData?: RequestedReport,\n) => {\n  const { nestedBaseUrl } = LocalsHelper.getValues(res)\n\n  // get url data\n  const url = parseUrl(req)\n  if (!url) {\n    throw new Error('Unable to set url data from request')\n  }\n\n  const urls = url ? setUrls(url, req) : undefined\n\n  // get from definition\n  const definitionData = extractDataFromDefinition(definition)\n  const { fields, specification } = definitionData\n\n  // get from requestedData\n  const requestedData = requestData ? extractDataFromRequest(requestData) : undefined\n\n  // Get the count\n  const count = await getCount(definition, services, res, req, reportQuery)\n\n  // Get the filters\n  const filterData = await ReportFiltersUtils.getFilters({\n    fields,\n    req,\n    res,\n    services,\n    filtersType: FiltersType.INTERACTIVE,\n  })\n\n  // Set the features\n  const features = await setFeatures(services, res, req, columns, definitionData, requestedData, urls)\n\n  // Set the extra meta data\n  const meta = setMetaData(res, req)\n\n  let reportSummaries\n  if (summariesData.length) {\n    const collatedSummaryBuilder = new CollatedSummaryBuilder(specification, summariesData)\n    reportSummaries = collatedSummaryBuilder.collatePageSummaries()\n  }\n\n  let pagination\n  let totals\n  if (definitionData.template === 'list') {\n    pagination = PaginationUtils.getPaginationData(url, count, req)\n    const { pageSize, currentPage, totalRows } = pagination\n    totals = TotalsUtils.getTotals(pageSize, currentPage, totalRows, dataTable[0].rowCount)\n  }\n\n  return {\n    ...(showColumns(specification) && { columns }),\n    filterData,\n    count,\n    nestedBaseUrl,\n    ...meta,\n    ...features,\n    ...definitionData,\n    ...requestedData,\n    ...urls,\n    ...(pagination && { pagination }),\n    ...(totals && { totals }),\n    ...(reportSummaries && { reportSummaries }),\n  }\n}\n\nconst showColumns = (specification: components['schemas']['Specification']) => {\n  const { template } = specification\n\n  return !['row-section', 'row-section-child', 'summary', 'summary-section'].includes(template)\n}\n\nconst setMetaData = (res: Response, req: Request) => {\n  const { csrfToken } = LocalsHelper.getValues(res)\n  const { tableId, reportId, id } = req.params\n\n  return {\n    csrfToken,\n    loadType: LoadType.ASYNC,\n    type: ReportType.REPORT,\n    tableId,\n    reportId,\n    id,\n  }\n}\n\nconst setUrls = (url: Url, req: Request): ReportUrls => {\n  const { search } = url\n  const encodedSearch = search ? encodeURIComponent(search) : undefined\n  const pathname = search ? req.originalUrl.split(search)[0] : req.originalUrl\n  const reportUrl = pathname.replace('/download-disabled', '').replace('/download-disabled?', '')\n\n  return {\n    reportUrl,\n    reportSearch: search || undefined,\n    encodedSearch,\n    pathname,\n  }\n}\n\nconst setFeatures = async (\n  services: Services,\n  res: Response,\n  req: Request,\n  columns: Columns,\n  definitionData: ExtractedDefinitionData,\n  requestData?: ExtractedRequestData,\n  urls?: ReportUrls,\n) => {\n  const { csrfToken, dprUser, bookmarkingEnabled, downloadingEnabled } = LocalsHelper.getValues(res)\n  const { reportId, id } = req.params\n  const { downloadPermissionService, bookmarkService } = services\n\n  let canDownload = false\n  if (downloadingEnabled) {\n    canDownload = await downloadPermissionService.downloadEnabledForReport(dprUser.id, reportId, id)\n  }\n\n  let bookmarked\n  if (bookmarkingEnabled) {\n    bookmarked = await bookmarkService.isBookmarked(id, reportId, dprUser.id)\n  }\n\n  const actions = setActions(csrfToken, columns, canDownload, res, req, definitionData, requestData, urls)\n\n  return {\n    actions,\n    canDownload,\n    bookmarked,\n  }\n}\n\nconst getCount = async (\n  definition: components['schemas']['SingleVariantReportDefinition'],\n  services: Services,\n  res: Response,\n  req: Request,\n  reportQuery: ReportQuery,\n) => {\n  const { token } = LocalsHelper.getValues(res)\n  const { tableId, reportId, id } = req.params\n\n  return !definition.variant.interactive\n    ? services.reportingService.getAsyncCount(token, tableId)\n    : services.reportingService.getAsyncInteractiveCount(token, tableId, reportId, id, reportQuery)\n}\n\nconst extractDataFromDefinition = (\n  definition: components['schemas']['SingleVariantReportDefinition'],\n): ExtractedDefinitionData => {\n  const { variant, name: reportName, description: reportDescription } = definition\n  const { classification, printable, specification, name, description } = variant\n  if (!specification) {\n    throw new Error('No specification found in variant definition')\n  }\n  const { template, fields } = specification\n\n  return {\n    reportName,\n    name,\n    description: description || reportDescription,\n    classification,\n    printable: Boolean(printable),\n    specification,\n    template,\n    fields,\n  }\n}\n\nconst extractDataFromRequest = (requestData: RequestedReport): ExtractedRequestData => {\n  const { query, url, timestamp } = requestData\n\n  return {\n    executionId: requestData.executionId,\n    requestedTimestamp: timestamp.requested ? new Date(timestamp.requested).toLocaleString() : undefined,\n    querySummary: query?.summary || [],\n    queryData: query?.data,\n    requestUrl: url?.request,\n    defaultQuery: url?.report?.default,\n    dataProductDefinitionsPath: requestData.dataProductDefinitionsPath,\n  }\n}\n\nconst setActions = (\n  csrfToken: string,\n  columns: Columns,\n  canDownload: boolean,\n  res: Response,\n  req: Request,\n  definitionData: ExtractedDefinitionData,\n  requestData?: ExtractedRequestData,\n  urls?: ReportUrls,\n) => {\n  const { reportName, name, printable } = definitionData\n  const { tableId, id, reportId } = req.params\n  const { nestedBaseUrl, definitionsPath, downloadingEnabled } = LocalsHelper.getValues(res)\n\n  // DownloadActionParams\n  let downloadConfig: DownloadActionParams | undefined\n  if (urls && downloadingEnabled) {\n    downloadConfig = {\n      enabled: downloadingEnabled,\n      name,\n      reportName,\n      csrfToken,\n      reportId,\n      id,\n      tableId,\n      columns: columns.value,\n      definitionPath: definitionsPath,\n      loadType: LoadType.ASYNC,\n      nestedBaseUrl,\n      canDownload,\n      currentUrl: urls.pathname,\n      currentQueryParams: urls.reportSearch,\n      ...(requestData?.queryData && {\n        sortColumn: <string>requestData.queryData['sortColumn'],\n        sortedAsc: <string>requestData.queryData['sortedAsc'],\n      }),\n    }\n  }\n\n  let shareConfig\n  let copyConfig\n  if (requestData?.requestUrl?.fullUrl) {\n    shareConfig = {\n      reportName,\n      name,\n      url: requestData.requestUrl.fullUrl,\n    }\n    copyConfig = {\n      url: requestData.requestUrl.fullUrl,\n    }\n  }\n\n  let refreshConfig\n  if (requestData?.executionId && requestData?.requestUrl?.fullUrl) {\n    refreshConfig = {\n      url: requestData.requestUrl.fullUrl,\n      executionId: requestData.executionId,\n    }\n  }\n\n  return ReportActionsUtils.getActions({\n    ...(downloadConfig && { download: downloadConfig }),\n    ...(shareConfig && { share: shareConfig }),\n    ...(refreshConfig && { refresh: refreshConfig }),\n    ...(copyConfig && { copy: copyConfig }),\n    print: { enabled: printable },\n  })\n}\n\nexport default {\n  renderReport,\n}\n"],
+  "mappings": "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",
   "names": ["utils_exports", "__export", "utils_default", "getChildData", "getData", "getSummariesData", "renderReport", "__toCommonJS", "import_parseurl", "import_UserReports", "import_ReportQuery", "import_filtersTypeEnum", "import_definitionUtils", "import_utils", "import_localsHelper", "import_CollatedSummaryBuilder", "res", "req", "services", "token", "userId", "definitionPath", "LocalsHelper", "reportId", "variantId", "id", "tableId", "reportVariantId", "definition", "variant", "specification", "requestData", "columns", "ColumnUtils", "reportQuery", "initReportQuery", "reportData", "getReportData", "summaries", "summariesData", "childVariants", "childData", "definitionsPath", "fields", "definitionUtils", "template", "filtersData", "ReportFiltersUtils", "sortColumn", "sortedAsc", "selectedPage", "pageSize", "filtersQuery", "queryParams", "ReportQuery", "args", "dataProductDefinitionsPath", "summary", "summaryReport", "childExecutionData", "childVariant", "query", "e", "childTableId", "childReport", "dprUser", "dataTable", "DataTableUtils", "templateData", "getTemplateData", "renderData", "UserReportsUtils", "nestedBaseUrl", "url", "parseUrl", "urls", "setUrls", "definitionData", "extractDataFromDefinition", "requestedData", "extractDataFromRequest", "count", "getCount", "filterData", "features", "setFeatures", "meta", "setMetaData", "reportSummaries", "CollatedSummaryBuilder", "pagination", "totals", "PaginationUtils", "currentPage", "totalRows", "TotalsUtils", "showColumns", "csrfToken", "search", "encodedSearch", "pathname", "bookmarkingEnabled", "downloadingEnabled", "downloadPermissionService", "bookmarkService", "canDownload", "bookmarked", "setActions", "reportName", "reportDescription", "classification", "printable", "name", "description", "timestamp", "downloadConfig", "shareConfig", "copyConfig", "refreshConfig", "ReportActionsUtils"]
 }

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

@@ -100,18 +100,18 @@ const initReportQuery = async (
   const filtersData = await ReportFiltersUtils.getFilters({
     fields,
     req,
+    filtersType: FiltersType.INTERACTIVE,
     res,
     services,
-    filtersType: FiltersType.INTERACTIVE,
   })
 
   // Sort
-  const sortColumn = req.query?.sortColumn || requestData?.query?.data?.sortColumn
-  const sortedAsc = req.query?.sortedAsc || requestData?.query?.data?.sortedAsc
+  const sortColumn = req.query?.['sortColumn'] || requestData?.query?.data?.['sortColumn']
+  const sortedAsc = req.query?.['sortedAsc'] || requestData?.query?.data?.['sortedAsc']
 
   // Pagination
-  const selectedPage = req.query?.selectedPage
-  const pageSize = req.query?.pageSize
+  const selectedPage = req.query?.['selectedPage']
+  const pageSize = req.query?.['pageSize']
 
   // Filters
   const filtersQuery = ReportFiltersUtils.setRequestQueryFromFilterValues(filtersData.filters)
@@ -215,7 +215,7 @@ export const getChildData = async (
       }).toRecordWithFilterPrefix(true)
 
       const childData = childExecutionData.find((e) => e.variantId === childVariant.id)
-      if (!childData) {
+      if (!childData || !childData.tableId) {
         throw new Error('getChildData: No matching child execution data found')
       }
       const { tableId: childTableId } = childData
@@ -336,7 +336,7 @@ const getTemplateData = async (
   })
 
   // Set the features
-  const features = await setFeatures(services, res, req, columns, count, definitionData, requestedData, urls)
+  const features = await setFeatures(services, res, req, columns, definitionData, requestedData, urls)
 
   // Set the extra meta data
   const meta = setMetaData(res, req)
@@ -410,7 +410,6 @@ const setFeatures = async (
   res: Response,
   req: Request,
   columns: Columns,
-  count: number,
   definitionData: ExtractedDefinitionData,
   requestData?: ExtractedRequestData,
   urls?: ReportUrls,
@@ -420,16 +419,16 @@ const setFeatures = async (
   const { downloadPermissionService, bookmarkService } = services
 
   let canDownload = false
-  if (downloadingEnabled && downloadPermissionService) {
-    canDownload = await downloadPermissionService.downloadEnabled(dprUser.id, reportId, id)
+  if (downloadingEnabled) {
+    canDownload = await downloadPermissionService.downloadEnabledForReport(dprUser.id, reportId, id)
   }
 
   let bookmarked
-  if (bookmarkingEnabled && bookmarkService) {
+  if (bookmarkingEnabled) {
     bookmarked = await bookmarkService.isBookmarked(id, reportId, dprUser.id)
   }
 
-  const actions = setActions(csrfToken, columns, canDownload, count, res, req, definitionData, requestData, urls)
+  const actions = setActions(csrfToken, columns, canDownload, res, req, definitionData, requestData, urls)
 
   return {
     actions,
@@ -493,7 +492,6 @@ const setActions = (
   csrfToken: string,
   columns: Columns,
   canDownload: boolean,
-  count: number,
   res: Response,
   req: Request,
   definitionData: ExtractedDefinitionData,
@@ -502,13 +500,13 @@ const setActions = (
 ) => {
   const { reportName, name, printable } = definitionData
   const { tableId, id, reportId } = req.params
-  const { nestedBaseUrl, definitionsPath } = LocalsHelper.getValues(res)
+  const { nestedBaseUrl, definitionsPath, downloadingEnabled } = LocalsHelper.getValues(res)
 
   // DownloadActionParams
   let downloadConfig: DownloadActionParams | undefined
-  if (urls) {
+  if (urls && downloadingEnabled) {
     downloadConfig = {
-      enabled: count > 0 && canDownload !== undefined,
+      enabled: downloadingEnabled,
       name,
       reportName,
       csrfToken,
@@ -523,8 +521,8 @@ const setActions = (
       currentUrl: urls.pathname,
       currentQueryParams: urls.reportSearch,
       ...(requestData?.queryData && {
-        sortColumn: <string>requestData.queryData.sortColumn,
-        sortedAsc: <string>requestData.queryData.sortedAsc,
+        sortColumn: <string>requestData.queryData['sortColumn'],
+        sortedAsc: <string>requestData.queryData['sortedAsc'],
       }),
     }
   }

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

@@ -1,2 +1,2 @@
-var a=Object.create;var p=Object.defineProperty;var b=Object.getOwnPropertyDescriptor;var w=Object.getOwnPropertyNames;var S=Object.getPrototypeOf,g=Object.prototype.hasOwnProperty;var l=(r,o)=>{for(var e in o)p(r,e,{get:o[e],enumerable:!0})},n=(r,o,e,m)=>{if(o&&typeof o=="object"||typeof o=="function")for(let t of w(o))!g.call(r,t)&&t!==e&&p(r,t,{get:()=>o[t],enumerable:!(m=b(o,t))||m.enumerable});return r};var s=(r,o,e)=>(e=r!=null?a(S(r)):{},n(o||!r||!r.__esModule?p(e,"default",{value:r,enumerable:!0}):e,r)),x=r=>n(p({},"__esModule",{value:!0}),r);var h={};l(h,{default:()=>A,routes:()=>R});module.exports=x(h);var u=require("express"),f=s(require("./report/routes")),d=s(require("./dashboard/routes")),i=s(require("../../../../middleware/reportAuthoriser")),c=s(require("./controller"));function R({layoutPath:r,services:o}){const e=(0,u.Router)({mergeParams:!0}),m=new c.default(r,o);return e.post(["/report","/dashboard"],m.POST),e.use("/report",(0,i.default)(o,r),(0,f.default)({layoutPath:r,services:o})),e.use("/dashboard",(0,i.default)(o,r),(0,d.default)({layoutPath:r,services:o})),e}var A=R;0&&(module.exports={routes});
+"use strict";var a=Object.create;var p=Object.defineProperty;var b=Object.getOwnPropertyDescriptor;var w=Object.getOwnPropertyNames;var S=Object.getPrototypeOf,g=Object.prototype.hasOwnProperty;var l=(r,o)=>{for(var e in o)p(r,e,{get:o[e],enumerable:!0})},n=(r,o,e,m)=>{if(o&&typeof o=="object"||typeof o=="function")for(let t of w(o))!g.call(r,t)&&t!==e&&p(r,t,{get:()=>o[t],enumerable:!(m=b(o,t))||m.enumerable});return r};var s=(r,o,e)=>(e=r!=null?a(S(r)):{},n(o||!r||!r.__esModule?p(e,"default",{value:r,enumerable:!0}):e,r)),x=r=>n(p({},"__esModule",{value:!0}),r);var h={};l(h,{default:()=>A,routes:()=>R});module.exports=x(h);var u=require("express"),f=s(require("./report/routes")),d=s(require("./dashboard/routes")),i=s(require("../../../../middleware/reportAuthoriser")),c=s(require("./controller"));function R({layoutPath:r,services:o}){const e=(0,u.Router)({mergeParams:!0}),m=new c.default(r,o);return e.post(["/report","/dashboard"],m.POST),e.use("/report",(0,i.default)(o,r),(0,f.default)({layoutPath:r,services:o})),e.use("/dashboard",(0,i.default)(o,r),(0,d.default)({layoutPath:r,services:o})),e}var A=R;0&&(module.exports={routes});
 //# sourceMappingURL=routes.js.map

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/view-report/async/routes.ts"],
   "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport { Services } from '../../../../types/Services'\n\n// Routes\nimport viewReportRoutes from './report/routes'\nimport viewDashboardRoutes from './dashboard/routes'\n\n// middleware\nimport reportAuthoriser from '../../../../middleware/reportAuthoriser'\nimport AsyncController from './controller'\n\nexport function routes({ layoutPath, services }: { layoutPath: string; services: Services }) {\n  const router = Router({ mergeParams: true })\n\n  const controller = new AsyncController(layoutPath, services)\n\n  // Expired check\n  router.post(['/report', '/dashboard'], controller.POST)\n  router.use('/report', reportAuthoriser(services, layoutPath), viewReportRoutes({ layoutPath, services }))\n  router.use('/dashboard', reportAuthoriser(services, layoutPath), viewDashboardRoutes({ layoutPath, services }))\n  return router\n}\n\nexport default routes\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBAIvBC,EAA6B,8BAC7BA,EAAgC,iCAGhCC,EAA6B,sDAC7BC,EAA4B,2BAErB,SAASL,EAAO,CAAE,WAAAM,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAAgBJ,EAAYC,CAAQ,EAG3D,OAAAC,EAAO,KAAK,CAAC,UAAW,YAAY,EAAGC,EAAW,IAAI,EACtDD,EAAO,IAAI,aAAW,EAAAG,SAAiBJ,EAAUD,CAAU,KAAG,EAAAM,SAAiB,CAAE,WAAAN,EAAY,SAAAC,CAAS,CAAC,CAAC,EACxGC,EAAO,IAAI,gBAAc,EAAAG,SAAiBJ,EAAUD,CAAU,KAAG,EAAAO,SAAoB,CAAE,WAAAP,EAAY,SAAAC,CAAS,CAAC,CAAC,EACvGC,CACT,CAEA,IAAOT,EAAQC",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBAIvBC,EAA6B,8BAC7BA,EAAgC,iCAGhCC,EAA6B,sDAC7BC,EAA4B,2BAErB,SAASL,EAAO,CAAE,WAAAM,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAAgBJ,EAAYC,CAAQ,EAG3D,OAAAC,EAAO,KAAK,CAAC,UAAW,YAAY,EAAGC,EAAW,IAAI,EACtDD,EAAO,IAAI,aAAW,EAAAG,SAAiBJ,EAAUD,CAAU,KAAG,EAAAM,SAAiB,CAAE,WAAAN,EAAY,SAAAC,CAAS,CAAC,CAAC,EACxGC,EAAO,IAAI,gBAAc,EAAAG,SAAiBJ,EAAUD,CAAU,KAAG,EAAAO,SAAoB,CAAE,WAAAP,EAAY,SAAAC,CAAS,CAAC,CAAC,EACvGC,CACT,CAEA,IAAOT,EAAQC",
   "names": ["routes_exports", "__export", "routes_default", "routes", "__toCommonJS", "import_express", "import_routes", "import_reportAuthoriser", "import_controller", "layoutPath", "services", "router", "controller", "AsyncController", "reportAuthoriser", "viewReportRoutes", "viewDashboardRoutes"]
 }

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

@@ -1,2 +1,2 @@
-var p=Object.create;var s=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var y=Object.getOwnPropertyNames;var c=Object.getPrototypeOf,d=Object.prototype.hasOwnProperty;var m=(e,r)=>{for(var o in r)s(e,o,{get:r[o],enumerable:!0})},l=(e,r,o,a)=>{if(r&&typeof r=="object"||typeof r=="function")for(let t of y(r))!d.call(e,t)&&t!==o&&s(e,t,{get:()=>r[t],enumerable:!(a=u(r,t))||a.enumerable});return e};var h=(e,r,o)=>(o=e!=null?p(c(e)):{},l(r||!e||!e.__esModule?s(o,"default",{value:e,enumerable:!0}):o,e)),v=e=>l(s({},"__esModule",{value:!0}),e);var g={};m(g,{ViewReportController:()=>i,default:()=>f});module.exports=v(g);var n=h(require("../../../utils/logger"));class i{constructor(r,o){this.errorHandler=async(r,o,a)=>{n.default.error(`Error: ${JSON.stringify(r.body)}`),o.render("dpr/routes/journeys/view-report/error",{layoutPath:this.layoutPath,...r.body,...r.params,error:r.body.error,params:r.params})};this.layoutPath=r,this.services=o}}var f=i;0&&(module.exports={ViewReportController});
+"use strict";var p=Object.create;var s=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var y=Object.getOwnPropertyNames;var c=Object.getPrototypeOf,d=Object.prototype.hasOwnProperty;var m=(e,r)=>{for(var o in r)s(e,o,{get:r[o],enumerable:!0})},l=(e,r,o,a)=>{if(r&&typeof r=="object"||typeof r=="function")for(let t of y(r))!d.call(e,t)&&t!==o&&s(e,t,{get:()=>r[t],enumerable:!(a=u(r,t))||a.enumerable});return e};var h=(e,r,o)=>(o=e!=null?p(c(e)):{},l(r||!e||!e.__esModule?s(o,"default",{value:e,enumerable:!0}):o,e)),v=e=>l(s({},"__esModule",{value:!0}),e);var g={};m(g,{ViewReportController:()=>i,default:()=>f});module.exports=v(g);var n=h(require("../../../utils/logger"));class i{constructor(r,o){this.errorHandler=async(r,o,a)=>{n.default.error(`Error: ${JSON.stringify(r.body)}`),o.render("dpr/routes/journeys/view-report/error",{layoutPath:this.layoutPath,...r.body,...r.params,error:r.body.error,params:r.params})};this.layoutPath=r,this.services=o}}var f=i;0&&(module.exports={ViewReportController});
 //# sourceMappingURL=controller.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/routes/journeys/view-report/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../types/Services'\nimport logger from '../../../utils/logger'\n\nclass ViewReportController {\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  errorHandler: RequestHandler = async (req, res, next) => {\n    logger.error(`Error: ${JSON.stringify(req.body)}`)\n\n    res.render(`dpr/routes/journeys/view-report/error`, {\n      layoutPath: this.layoutPath,\n      ...req.body,\n      ...req.params,\n      error: req.body.error,\n      params: req.params,\n    })\n  }\n}\n\nexport { ViewReportController }\nexport default ViewReportController\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,0BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAmB,oCAEnB,MAAMH,CAAqB,CAKzB,YAAYI,EAAoBC,EAAoB,CAKpD,kBAA+B,MAAOC,EAAKC,EAAKC,IAAS,CACvD,EAAAC,QAAO,MAAM,UAAU,KAAK,UAAUH,EAAI,IAAI,CAAC,EAAE,EAEjDC,EAAI,OAAO,wCAAyC,CAClD,WAAY,KAAK,WACjB,GAAGD,EAAI,KACP,GAAGA,EAAI,OACP,MAAOA,EAAI,KAAK,MAChB,OAAQA,EAAI,MACd,CAAC,CACH,EAdE,KAAK,WAAaF,EAClB,KAAK,SAAWC,CAClB,CAaF,CAGA,IAAOJ,EAAQD",
-  "names": ["controller_exports", "__export", "ViewReportController", "controller_default", "__toCommonJS", "import_logger", "layoutPath", "services", "req", "res", "next", "logger"]
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../types/Services'\nimport logger from '../../../utils/logger'\n\nclass ViewReportController {\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  errorHandler: RequestHandler = async (req, res, _next) => {\n    logger.error(`Error: ${JSON.stringify(req.body)}`)\n\n    res.render(`dpr/routes/journeys/view-report/error`, {\n      layoutPath: this.layoutPath,\n      ...req.body,\n      ...req.params,\n      error: req.body.error,\n      params: req.params,\n    })\n  }\n}\n\nexport { ViewReportController }\nexport default ViewReportController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,0BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAmB,oCAEnB,MAAMH,CAAqB,CAKzB,YAAYI,EAAoBC,EAAoB,CAKpD,kBAA+B,MAAOC,EAAKC,EAAKC,IAAU,CACxD,EAAAC,QAAO,MAAM,UAAU,KAAK,UAAUH,EAAI,IAAI,CAAC,EAAE,EAEjDC,EAAI,OAAO,wCAAyC,CAClD,WAAY,KAAK,WACjB,GAAGD,EAAI,KACP,GAAGA,EAAI,OACP,MAAOA,EAAI,KAAK,MAChB,OAAQA,EAAI,MACd,CAAC,CACH,EAdE,KAAK,WAAaF,EAClB,KAAK,SAAWC,CAClB,CAaF,CAGA,IAAOJ,EAAQD",
+  "names": ["controller_exports", "__export", "ViewReportController", "controller_default", "__toCommonJS", "import_logger", "layoutPath", "services", "req", "res", "_next", "logger"]
 }

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

@@ -12,7 +12,7 @@ class ViewReportController {
     this.services = services
   }
 
-  errorHandler: RequestHandler = async (req, res, next) => {
+  errorHandler: RequestHandler = async (req, res, _next) => {
     logger.error(`Error: ${JSON.stringify(req.body)}`)
 
     res.render(`dpr/routes/journeys/view-report/error`, {

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

@@ -1,2 +1,2 @@
-var I=Object.create;var a=Object.defineProperty;var w=Object.getOwnPropertyDescriptor;var R=Object.getOwnPropertyNames;var b=Object.getPrototypeOf,g=Object.prototype.hasOwnProperty;var v=(e,r)=>{for(var t in r)a(e,t,{get:r[t],enumerable:!0})},c=(e,r,t,o)=>{if(r&&typeof r=="object"||typeof r=="function")for(let s of R(r))!g.call(e,s)&&s!==t&&a(e,s,{get:()=>r[s],enumerable:!(o=w(r,s))||o.enumerable});return e};var i=(e,r,t)=>(t=e!=null?I(b(e)):{},c(r||!e||!e.__esModule?a(t,"default",{value:e,enumerable:!0}):t,e)),f=e=>c(a({},"__esModule",{value:!0}),e);var q={};v(q,{Redirects:()=>$,Routes:()=>m,ViewReportRoutes:()=>S});module.exports=f(q);var n=require("express"),l=i(require("./controller")),u=i(require("./sync/routes")),y=i(require("./async/routes"));function m({layoutPath:e,services:r}){const t=(0,n.Router)({mergeParams:!0}),o=new l.default(e,r);return t.use("/sync/:type/:reportId/:id",(0,u.default)({layoutPath:e,services:r}),o.errorHandler),t.use("/async/:type/:reportId/:id/:tableId",(0,y.default)({layoutPath:e,services:r}),o.errorHandler),t}function $(){const e=(0,n.Router)({mergeParams:!0});return e.get(["/async/:type/:reportId/:id/request/:tableId/:type"],(r,t)=>{const{type:o,reportId:s,id:p,tableId:d}=r.params;t.redirect(`${t.locals.nestedBaseUrl}/dpr/view-report/async/${o}/${s}/${p}/${d}/${o}`)}),e.get("/async/:type/:reportId/:id/request/:tableId/report/:download",(r,t)=>{const{type:o,reportId:s,id:p,tableId:d}=r.params;t.redirect(`${t.locals.nestedBaseUrl}/dpr/view-report/async/${o}/${s}/${p}/${d}/${o}/download-disabled`)}),e.post("/async/:type/:reportId/:id/request/:tableId/:type",(r,t)=>{const{type:o,reportId:s,id:p,tableId:d}=r.params;t.redirect(308,`${t.locals.nestedBaseUrl}/dpr/view-report/async/${o}/${s}/${p}/${d}/${o}`)}),e}const S=({services:e,path:r,layoutPath:t})=>{const o=(0,n.Router)({mergeParams:!0});return o.use(r,m({services:e,layoutPath:t})),o.use("/",$()),o};0&&(module.exports={Redirects,Routes,ViewReportRoutes});
+"use strict";var I=Object.create;var a=Object.defineProperty;var w=Object.getOwnPropertyDescriptor;var R=Object.getOwnPropertyNames;var b=Object.getPrototypeOf,g=Object.prototype.hasOwnProperty;var v=(e,r)=>{for(var t in r)a(e,t,{get:r[t],enumerable:!0})},c=(e,r,t,o)=>{if(r&&typeof r=="object"||typeof r=="function")for(let s of R(r))!g.call(e,s)&&s!==t&&a(e,s,{get:()=>r[s],enumerable:!(o=w(r,s))||o.enumerable});return e};var i=(e,r,t)=>(t=e!=null?I(b(e)):{},c(r||!e||!e.__esModule?a(t,"default",{value:e,enumerable:!0}):t,e)),f=e=>c(a({},"__esModule",{value:!0}),e);var q={};v(q,{Redirects:()=>$,Routes:()=>m,ViewReportRoutes:()=>S});module.exports=f(q);var n=require("express"),l=i(require("./controller")),u=i(require("./sync/routes")),y=i(require("./async/routes"));function m({layoutPath:e,services:r}){const t=(0,n.Router)({mergeParams:!0}),o=new l.default(e,r);return t.use("/sync/:type/:reportId/:id",(0,u.default)({layoutPath:e,services:r}),o.errorHandler),t.use("/async/:type/:reportId/:id/:tableId",(0,y.default)({layoutPath:e,services:r}),o.errorHandler),t}function $(){const e=(0,n.Router)({mergeParams:!0});return e.get(["/async/:type/:reportId/:id/request/:tableId/:type"],(r,t)=>{const{type:o,reportId:s,id:p,tableId:d}=r.params;t.redirect(`${t.locals.nestedBaseUrl}/dpr/view-report/async/${o}/${s}/${p}/${d}/${o}`)}),e.get("/async/:type/:reportId/:id/request/:tableId/report/:download",(r,t)=>{const{type:o,reportId:s,id:p,tableId:d}=r.params;t.redirect(`${t.locals.nestedBaseUrl}/dpr/view-report/async/${o}/${s}/${p}/${d}/${o}/download-disabled`)}),e.post("/async/:type/:reportId/:id/request/:tableId/:type",(r,t)=>{const{type:o,reportId:s,id:p,tableId:d}=r.params;t.redirect(308,`${t.locals.nestedBaseUrl}/dpr/view-report/async/${o}/${s}/${p}/${d}/${o}`)}),e}const S=({services:e,path:r,layoutPath:t})=>{const o=(0,n.Router)({mergeParams:!0});return o.use(r,m({services:e,layoutPath:t})),o.use("/",$()),o};0&&(module.exports={Redirects,Routes,ViewReportRoutes});
 //# sourceMappingURL=routes.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/routes/journeys/view-report/routes.ts"],
-  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport { Services } from '../../../types/Services'\nimport ViewReportController from './controller'\n\n// Routes\nimport viewSyncReportRoutes from './sync/routes'\nimport viewAyncReportRoutes from './async/routes'\n\nexport function Routes({ layoutPath, services }: { services: Services; layoutPath: string }) {\n  const router = Router({ mergeParams: true })\n\n  const controller = new ViewReportController(layoutPath, services)\n  router.use(`/sync/:type/:reportId/:id`, viewSyncReportRoutes({ layoutPath, services }), controller.errorHandler)\n  router.use(\n    `/async/:type/:reportId/:id/:tableId`,\n    viewAyncReportRoutes({ layoutPath, services }),\n    controller.errorHandler,\n  )\n\n  return router\n}\n\nexport function Redirects() {\n  const router = Router({ mergeParams: true })\n\n  // View Report\n  router.get([`/async/:type/:reportId/:id/request/:tableId/:type`], (req, res) => {\n    const { type, reportId, id, tableId } = req.params\n    res.redirect(`${res.locals.nestedBaseUrl}/dpr/view-report/async/${type}/${reportId}/${id}/${tableId}/${type}`)\n  })\n\n  // Download\n  router.get(`/async/:type/:reportId/:id/request/:tableId/report/:download`, (req, res) => {\n    const { type, reportId, id, tableId } = req.params\n    res.redirect(\n      `${res.locals.nestedBaseUrl}/dpr/view-report/async/${type}/${reportId}/${id}/${tableId}/${type}/download-disabled`,\n    )\n  })\n\n  // Expired Status\n  router.post('/async/:type/:reportId/:id/request/:tableId/:type', (req, res) => {\n    const { type, reportId, id, tableId } = req.params\n    res.redirect(308, `${res.locals.nestedBaseUrl}/dpr/view-report/async/${type}/${reportId}/${id}/${tableId}/${type}`)\n  })\n\n  return router\n}\n\nexport const ViewReportRoutes = ({\n  services,\n  path,\n  layoutPath,\n}: {\n  services: Services\n  path: string\n  layoutPath: string\n}) => {\n  const router = Router({ mergeParams: true })\n  router.use(path, Routes({ services, layoutPath }))\n  router.use('/', Redirects())\n\n  return router\n}\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,eAAAE,EAAA,WAAAC,EAAA,qBAAAC,IAAA,eAAAC,EAAAL,GACA,IAAAM,EAAuB,mBAEvBC,EAAiC,2BAGjCC,EAAiC,4BACjCA,EAAiC,6BAE1B,SAASL,EAAO,CAAE,WAAAM,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAAqBJ,EAAYC,CAAQ,EAChE,OAAAC,EAAO,IAAI,+BAA6B,EAAAG,SAAqB,CAAE,WAAAL,EAAY,SAAAC,CAAS,CAAC,EAAGE,EAAW,YAAY,EAC/GD,EAAO,IACL,yCACA,EAAAI,SAAqB,CAAE,WAAAN,EAAY,SAAAC,CAAS,CAAC,EAC7CE,EAAW,YACb,EAEOD,CACT,CAEO,SAAST,GAAY,CAC1B,MAAMS,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAG3C,OAAAA,EAAO,IAAI,CAAC,mDAAmD,EAAG,CAACK,EAAKC,IAAQ,CAC9E,KAAM,CAAE,KAAAC,EAAM,SAAAC,EAAU,GAAAC,EAAI,QAAAC,CAAQ,EAAIL,EAAI,OAC5CC,EAAI,SAAS,GAAGA,EAAI,OAAO,aAAa,0BAA0BC,CAAI,IAAIC,CAAQ,IAAIC,CAAE,IAAIC,CAAO,IAAIH,CAAI,EAAE,CAC/G,CAAC,EAGDP,EAAO,IAAI,+DAAgE,CAACK,EAAKC,IAAQ,CACvF,KAAM,CAAE,KAAAC,EAAM,SAAAC,EAAU,GAAAC,EAAI,QAAAC,CAAQ,EAAIL,EAAI,OAC5CC,EAAI,SACF,GAAGA,EAAI,OAAO,aAAa,0BAA0BC,CAAI,IAAIC,CAAQ,IAAIC,CAAE,IAAIC,CAAO,IAAIH,CAAI,oBAChG,CACF,CAAC,EAGDP,EAAO,KAAK,oDAAqD,CAACK,EAAKC,IAAQ,CAC7E,KAAM,CAAE,KAAAC,EAAM,SAAAC,EAAU,GAAAC,EAAI,QAAAC,CAAQ,EAAIL,EAAI,OAC5CC,EAAI,SAAS,IAAK,GAAGA,EAAI,OAAO,aAAa,0BAA0BC,CAAI,IAAIC,CAAQ,IAAIC,CAAE,IAAIC,CAAO,IAAIH,CAAI,EAAE,CACpH,CAAC,EAEMP,CACT,CAEO,MAAMP,EAAmB,CAAC,CAC/B,SAAAM,EACA,KAAAY,EACA,WAAAb,CACF,IAIM,CACJ,MAAME,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAC3C,OAAAA,EAAO,IAAIW,EAAMnB,EAAO,CAAE,SAAAO,EAAU,WAAAD,CAAW,CAAC,CAAC,EACjDE,EAAO,IAAI,IAAKT,EAAU,CAAC,EAEpBS,CACT",
+  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport { Services } from '../../../types/Services'\nimport ViewReportController from './controller'\n\n// Routes\nimport viewSyncReportRoutes from './sync/routes'\nimport viewAyncReportRoutes from './async/routes'\n\nexport function Routes({ layoutPath, services }: { services: Services; layoutPath: string }) {\n  const router = Router({ mergeParams: true })\n\n  const controller = new ViewReportController(layoutPath, services)\n  router.use(`/sync/:type/:reportId/:id`, viewSyncReportRoutes({ layoutPath, services }), controller.errorHandler)\n  router.use(\n    `/async/:type/:reportId/:id/:tableId`,\n    viewAyncReportRoutes({ layoutPath, services }),\n    controller.errorHandler,\n  )\n\n  return router\n}\n\nexport function Redirects() {\n  const router = Router({ mergeParams: true })\n\n  // View Report\n  router.get([`/async/:type/:reportId/:id/request/:tableId/:type`], (req, res) => {\n    const { type, reportId, id, tableId } = req.params\n    res.redirect(`${res.locals['nestedBaseUrl']}/dpr/view-report/async/${type}/${reportId}/${id}/${tableId}/${type}`)\n  })\n\n  // Download\n  router.get(`/async/:type/:reportId/:id/request/:tableId/report/:download`, (req, res) => {\n    const { type, reportId, id, tableId } = req.params\n    res.redirect(\n      `${res.locals['nestedBaseUrl']}/dpr/view-report/async/${type}/${reportId}/${id}/${tableId}/${type}/download-disabled`,\n    )\n  })\n\n  // Expired Status\n  router.post('/async/:type/:reportId/:id/request/:tableId/:type', (req, res) => {\n    const { type, reportId, id, tableId } = req.params\n    res.redirect(\n      308,\n      `${res.locals['nestedBaseUrl']}/dpr/view-report/async/${type}/${reportId}/${id}/${tableId}/${type}`,\n    )\n  })\n\n  return router\n}\n\nexport const ViewReportRoutes = ({\n  services,\n  path,\n  layoutPath,\n}: {\n  services: Services\n  path: string\n  layoutPath: string\n}) => {\n  const router = Router({ mergeParams: true })\n  router.use(path, Routes({ services, layoutPath }))\n  router.use('/', Redirects())\n\n  return router\n}\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,eAAAE,EAAA,WAAAC,EAAA,qBAAAC,IAAA,eAAAC,EAAAL,GACA,IAAAM,EAAuB,mBAEvBC,EAAiC,2BAGjCC,EAAiC,4BACjCA,EAAiC,6BAE1B,SAASL,EAAO,CAAE,WAAAM,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAAqBJ,EAAYC,CAAQ,EAChE,OAAAC,EAAO,IAAI,+BAA6B,EAAAG,SAAqB,CAAE,WAAAL,EAAY,SAAAC,CAAS,CAAC,EAAGE,EAAW,YAAY,EAC/GD,EAAO,IACL,yCACA,EAAAI,SAAqB,CAAE,WAAAN,EAAY,SAAAC,CAAS,CAAC,EAC7CE,EAAW,YACb,EAEOD,CACT,CAEO,SAAST,GAAY,CAC1B,MAAMS,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAG3C,OAAAA,EAAO,IAAI,CAAC,mDAAmD,EAAG,CAACK,EAAKC,IAAQ,CAC9E,KAAM,CAAE,KAAAC,EAAM,SAAAC,EAAU,GAAAC,EAAI,QAAAC,CAAQ,EAAIL,EAAI,OAC5CC,EAAI,SAAS,GAAGA,EAAI,OAAO,aAAgB,0BAA0BC,CAAI,IAAIC,CAAQ,IAAIC,CAAE,IAAIC,CAAO,IAAIH,CAAI,EAAE,CAClH,CAAC,EAGDP,EAAO,IAAI,+DAAgE,CAACK,EAAKC,IAAQ,CACvF,KAAM,CAAE,KAAAC,EAAM,SAAAC,EAAU,GAAAC,EAAI,QAAAC,CAAQ,EAAIL,EAAI,OAC5CC,EAAI,SACF,GAAGA,EAAI,OAAO,aAAgB,0BAA0BC,CAAI,IAAIC,CAAQ,IAAIC,CAAE,IAAIC,CAAO,IAAIH,CAAI,oBACnG,CACF,CAAC,EAGDP,EAAO,KAAK,oDAAqD,CAACK,EAAKC,IAAQ,CAC7E,KAAM,CAAE,KAAAC,EAAM,SAAAC,EAAU,GAAAC,EAAI,QAAAC,CAAQ,EAAIL,EAAI,OAC5CC,EAAI,SACF,IACA,GAAGA,EAAI,OAAO,aAAgB,0BAA0BC,CAAI,IAAIC,CAAQ,IAAIC,CAAE,IAAIC,CAAO,IAAIH,CAAI,EACnG,CACF,CAAC,EAEMP,CACT,CAEO,MAAMP,EAAmB,CAAC,CAC/B,SAAAM,EACA,KAAAY,EACA,WAAAb,CACF,IAIM,CACJ,MAAME,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAC3C,OAAAA,EAAO,IAAIW,EAAMnB,EAAO,CAAE,SAAAO,EAAU,WAAAD,CAAW,CAAC,CAAC,EACjDE,EAAO,IAAI,IAAKT,EAAU,CAAC,EAEpBS,CACT",
   "names": ["routes_exports", "__export", "Redirects", "Routes", "ViewReportRoutes", "__toCommonJS", "import_express", "import_controller", "import_routes", "layoutPath", "services", "router", "controller", "ViewReportController", "viewSyncReportRoutes", "viewAyncReportRoutes", "req", "res", "type", "reportId", "id", "tableId", "path"]
 }

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

@@ -27,21 +27,24 @@ export function Redirects() {
   // View Report
   router.get([`/async/:type/:reportId/:id/request/:tableId/:type`], (req, res) => {
     const { type, reportId, id, tableId } = req.params
-    res.redirect(`${res.locals.nestedBaseUrl}/dpr/view-report/async/${type}/${reportId}/${id}/${tableId}/${type}`)
+    res.redirect(`${res.locals['nestedBaseUrl']}/dpr/view-report/async/${type}/${reportId}/${id}/${tableId}/${type}`)
   })
 
   // Download
   router.get(`/async/:type/:reportId/:id/request/:tableId/report/:download`, (req, res) => {
     const { type, reportId, id, tableId } = req.params
     res.redirect(
-      `${res.locals.nestedBaseUrl}/dpr/view-report/async/${type}/${reportId}/${id}/${tableId}/${type}/download-disabled`,
+      `${res.locals['nestedBaseUrl']}/dpr/view-report/async/${type}/${reportId}/${id}/${tableId}/${type}/download-disabled`,
     )
   })
 
   // Expired Status
   router.post('/async/:type/:reportId/:id/request/:tableId/:type', (req, res) => {
     const { type, reportId, id, tableId } = req.params
-    res.redirect(308, `${res.locals.nestedBaseUrl}/dpr/view-report/async/${type}/${reportId}/${id}/${tableId}/${type}`)
+    res.redirect(
+      308,
+      `${res.locals['nestedBaseUrl']}/dpr/view-report/async/${type}/${reportId}/${id}/${tableId}/${type}`,
+    )
   })
 
   return router

package/dpr/routes/journeys/view-report/sync/load-report/controller.js

@@ -1,2 +1,2 @@
-var g=Object.create;var s=Object.defineProperty;var D=Object.getOwnPropertyDescriptor;var S=Object.getOwnPropertyNames;var w=Object.getPrototypeOf,H=Object.prototype.hasOwnProperty;var T=(e,t)=>{for(var r in t)s(e,r,{get:t[r],enumerable:!0})},p=(e,t,r,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let o of S(t))!H.call(e,o)&&o!==r&&s(e,o,{get:()=>t[o],enumerable:!(i=D(t,o))||i.enumerable});return e};var q=(e,t,r)=>(r=e!=null?g(w(e)):{},p(t||!e||!e.__esModule?s(r,"default",{value:e,enumerable:!0}):r,e)),x=e=>p(s({},"__esModule",{value:!0}),e);var L={};T(L,{LoadReportController:()=>a,default:()=>E});module.exports=x(L);var d=q(require("../../../../../utils/localsHelper")),l=require("../../../../../types/UserReports");class a{constructor(t,r){this.GET=async(t,r,i)=>{try{const{token:o}=d.default.getValues(r),{reportId:n,id:c}=t.params,{dataProductDefinitionsPath:u}=t.query,m=await this.services.reportingService.getDefinition(o,n,c,u),{name:y,variant:h,description:v}=m,{classification:f,description:P,name:R}=h;r.render("dpr/routes/journeys/view-report/sync/load-report/view",{renderData:{reportId:n,id:c,type:l.ReportType.REPORT,reportName:y,name:R,classification:f,description:P||v},layoutPath:this.layoutPath})}catch{i()}};this.layoutPath=t,this.services=r}}var E=a;0&&(module.exports={LoadReportController});
+"use strict";var R=Object.create;var s=Object.defineProperty;var D=Object.getOwnPropertyDescriptor;var S=Object.getOwnPropertyNames;var w=Object.getPrototypeOf,H=Object.prototype.hasOwnProperty;var T=(e,t)=>{for(var r in t)s(e,r,{get:t[r],enumerable:!0})},p=(e,t,r,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let o of S(t))!H.call(e,o)&&o!==r&&s(e,o,{get:()=>t[o],enumerable:!(i=D(t,o))||i.enumerable});return e};var q=(e,t,r)=>(r=e!=null?R(w(e)):{},p(t||!e||!e.__esModule?s(r,"default",{value:e,enumerable:!0}):r,e)),x=e=>p(s({},"__esModule",{value:!0}),e);var L={};T(L,{LoadReportController:()=>n,default:()=>E});module.exports=x(L);var d=q(require("../../../../../utils/localsHelper")),l=require("../../../../../types/UserReports");class n{constructor(t,r){this.GET=async(t,r,i)=>{try{const{token:o}=d.default.getValues(r),{reportId:a,id:c}=t.params,{dataProductDefinitionsPath:u}=t.query,m=await this.services.reportingService.getDefinition(o,a,c,u),{name:y,variant:f,description:h}=m,{classification:v,description:P,name:g}=f;r.render("dpr/routes/journeys/view-report/sync/load-report/view",{renderData:{reportId:a,id:c,type:l.ReportType.REPORT,reportName:y,name:g,classification:v,description:P||h},layoutPath:this.layoutPath})}catch{i()}};this.layoutPath=t,this.services=r}}var E=n;0&&(module.exports={LoadReportController});
 //# sourceMappingURL=controller.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/view-report/sync/load-report/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../../types/Services'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport { ReportType } from '../../../../../types/UserReports'\n\nclass LoadReportController {\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    try {\n      const { token } = LocalsHelper.getValues(res)\n      const { reportId, id } = req.params\n      const { dataProductDefinitionsPath } = req.query\n\n      const definition = await this.services.reportingService.getDefinition(\n        token,\n        reportId,\n        id,\n        dataProductDefinitionsPath,\n      )\n      const { name: reportName, variant, description: reportDescription } = definition\n      const { classification, description, name } = variant\n\n      res.render(`dpr/routes/journeys/view-report/sync/load-report/view`, {\n        renderData: {\n          reportId,\n          id,\n          type: ReportType.REPORT,\n          reportName,\n          name,\n          classification,\n          description: description || reportDescription,\n        },\n        layoutPath: this.layoutPath,\n      })\n    } catch (error) {\n      next()\n    }\n  }\n}\n\nexport { LoadReportController }\nexport default LoadReportController\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,0BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAyB,gDACzBC,EAA2B,4CAE3B,MAAMJ,CAAqB,CAKzB,YAAYK,EAAoBC,EAAoB,CAKpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,GAAI,CACF,KAAM,CAAE,MAAAC,CAAM,EAAI,EAAAC,QAAa,UAAUH,CAAG,EACtC,CAAE,SAAAI,EAAU,GAAAC,CAAG,EAAIN,EAAI,OACvB,CAAE,2BAAAO,CAA2B,EAAIP,EAAI,MAErCQ,EAAa,MAAM,KAAK,SAAS,iBAAiB,cACtDL,EACAE,EACAC,EACAC,CACF,EACM,CAAE,KAAME,EAAY,QAAAC,EAAS,YAAaC,CAAkB,EAAIH,EAChE,CAAE,eAAAI,EAAgB,YAAAC,EAAa,KAAAC,CAAK,EAAIJ,EAE9CT,EAAI,OAAO,wDAAyD,CAClE,WAAY,CACV,SAAAI,EACA,GAAAC,EACA,KAAM,aAAW,OACjB,WAAAG,EACA,KAAAK,EACA,eAAAF,EACA,YAAaC,GAAeF,CAC9B,EACA,WAAY,KAAK,UACnB,CAAC,CACH,MAAgB,CACdT,EAAK,CACP,CACF,EAlCE,KAAK,WAAaJ,EAClB,KAAK,SAAWC,CAClB,CAiCF,CAGA,IAAOL,EAAQD",
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../../types/Services'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport { ReportType } from '../../../../../types/UserReports'\n\nclass LoadReportController {\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    try {\n      const { token } = LocalsHelper.getValues(res)\n      const { reportId, id } = req.params\n      const { dataProductDefinitionsPath } = req.query\n\n      const definition = await this.services.reportingService.getDefinition(\n        token,\n        reportId,\n        id,\n        <string | undefined>dataProductDefinitionsPath,\n      )\n      const { name: reportName, variant, description: reportDescription } = definition\n      const { classification, description, name } = variant\n\n      res.render(`dpr/routes/journeys/view-report/sync/load-report/view`, {\n        renderData: {\n          reportId,\n          id,\n          type: ReportType.REPORT,\n          reportName,\n          name,\n          classification,\n          description: description || reportDescription,\n        },\n        layoutPath: this.layoutPath,\n      })\n    } catch (error) {\n      next()\n    }\n  }\n}\n\nexport { LoadReportController }\nexport default LoadReportController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,0BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAyB,gDACzBC,EAA2B,4CAE3B,MAAMJ,CAAqB,CAKzB,YAAYK,EAAoBC,EAAoB,CAKpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,GAAI,CACF,KAAM,CAAE,MAAAC,CAAM,EAAI,EAAAC,QAAa,UAAUH,CAAG,EACtC,CAAE,SAAAI,EAAU,GAAAC,CAAG,EAAIN,EAAI,OACvB,CAAE,2BAAAO,CAA2B,EAAIP,EAAI,MAErCQ,EAAa,MAAM,KAAK,SAAS,iBAAiB,cACtDL,EACAE,EACAC,EACoBC,CACtB,EACM,CAAE,KAAME,EAAY,QAAAC,EAAS,YAAaC,CAAkB,EAAIH,EAChE,CAAE,eAAAI,EAAgB,YAAAC,EAAa,KAAAC,CAAK,EAAIJ,EAE9CT,EAAI,OAAO,wDAAyD,CAClE,WAAY,CACV,SAAAI,EACA,GAAAC,EACA,KAAM,aAAW,OACjB,WAAAG,EACA,KAAAK,EACA,eAAAF,EACA,YAAaC,GAAeF,CAC9B,EACA,WAAY,KAAK,UACnB,CAAC,CACH,MAAgB,CACdT,EAAK,CACP,CACF,EAlCE,KAAK,WAAaJ,EAClB,KAAK,SAAWC,CAClB,CAiCF,CAGA,IAAOL,EAAQD",
   "names": ["controller_exports", "__export", "LoadReportController", "controller_default", "__toCommonJS", "import_localsHelper", "import_UserReports", "layoutPath", "services", "req", "res", "next", "token", "LocalsHelper", "reportId", "id", "dataProductDefinitionsPath", "definition", "reportName", "variant", "reportDescription", "classification", "description", "name"]
 }

package/dpr/routes/journeys/view-report/sync/load-report/controller.ts

@@ -23,7 +23,7 @@ class LoadReportController {
         token,
         reportId,
         id,
-        dataProductDefinitionsPath,
+        <string | undefined>dataProductDefinitionsPath,
       )
       const { name: reportName, variant, description: reportDescription } = definition
       const { classification, description, name } = variant

package/dpr/routes/journeys/view-report/sync/load-report/routes.js

@@ -1,2 +1,2 @@
-var a=Object.create;var s=Object.defineProperty;var l=Object.getOwnPropertyDescriptor;var p=Object.getOwnPropertyNames;var f=Object.getPrototypeOf,g=Object.prototype.hasOwnProperty;var v=(r,e)=>{for(var o in e)s(r,o,{get:e[o],enumerable:!0})},i=(r,e,o,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let t of p(e))!g.call(r,t)&&t!==o&&s(r,t,{get:()=>e[t],enumerable:!(n=l(e,t))||n.enumerable});return r};var d=(r,e,o)=>(o=r!=null?a(f(r)):{},i(e||!r||!r.__esModule?s(o,"default",{value:r,enumerable:!0}):o,r)),x=r=>i(s({},"__esModule",{value:!0}),r);var R={};v(R,{default:()=>P,routes:()=>c});module.exports=x(R);var m=require("express"),u=d(require("./controller"));function c({layoutPath:r,services:e}){const o=(0,m.Router)({mergeParams:!0}),n=new u.default(r,e);return o.get("/",n.GET),o}var P=c;0&&(module.exports={routes});
+"use strict";var a=Object.create;var s=Object.defineProperty;var l=Object.getOwnPropertyDescriptor;var p=Object.getOwnPropertyNames;var f=Object.getPrototypeOf,g=Object.prototype.hasOwnProperty;var v=(r,e)=>{for(var o in e)s(r,o,{get:e[o],enumerable:!0})},i=(r,e,o,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let t of p(e))!g.call(r,t)&&t!==o&&s(r,t,{get:()=>e[t],enumerable:!(n=l(e,t))||n.enumerable});return r};var d=(r,e,o)=>(o=r!=null?a(f(r)):{},i(e||!r||!r.__esModule?s(o,"default",{value:r,enumerable:!0}):o,r)),x=r=>i(s({},"__esModule",{value:!0}),r);var R={};v(R,{default:()=>P,routes:()=>c});module.exports=x(R);var m=require("express"),u=d(require("./controller"));function c({layoutPath:r,services:e}){const o=(0,m.Router)({mergeParams:!0}),n=new u.default(r,e);return o.get("/",n.GET),o}var P=c;0&&(module.exports={routes});
 //# sourceMappingURL=routes.js.map

package/dpr/routes/journeys/view-report/sync/load-report/routes.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/view-report/sync/load-report/routes.ts"],
   "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport LoadReportController from './controller'\nimport { Services } from '../../../../../types/Services'\n\nexport function routes({ layoutPath, services }: { layoutPath: string; services: Services }) {\n  const router = Router({ mergeParams: true })\n\n  const controller = new LoadReportController(layoutPath, services)\n  router.get(`/`, controller.GET)\n\n  return router\n}\n\nexport default routes\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBACvBC,EAAiC,2BAG1B,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAAqBJ,EAAYC,CAAQ,EAChE,OAAAC,EAAO,IAAI,IAAKC,EAAW,GAAG,EAEvBD,CACT,CAEA,IAAOP,EAAQC",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBACvBC,EAAiC,2BAG1B,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAErCC,EAAa,IAAI,EAAAC,QAAqBJ,EAAYC,CAAQ,EAChE,OAAAC,EAAO,IAAI,IAAKC,EAAW,GAAG,EAEvBD,CACT,CAEA,IAAOP,EAAQC",
   "names": ["routes_exports", "__export", "routes_default", "routes", "__toCommonJS", "import_express", "import_controller", "layoutPath", "services", "router", "controller", "LoadReportController"]
 }

package/dpr/routes/journeys/view-report/sync/report/controller.js

@@ -1,2 +1,2 @@
-var m=Object.create;var a=Object.defineProperty;var h=Object.getOwnPropertyDescriptor;var v=Object.getOwnPropertyNames;var f=Object.getPrototypeOf,R=Object.prototype.hasOwnProperty;var b=(t,e)=>{for(var r in e)a(t,r,{get:e[r],enumerable:!0})},u=(t,e,r,o)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of v(e))!R.call(t,s)&&s!==r&&a(t,s,{get:()=>e[s],enumerable:!(o=h(e,s))||o.enumerable});return t};var i=(t,e,r)=>(r=t!=null?m(f(t)):{},u(e||!t||!t.__esModule?a(r,"default",{value:t,enumerable:!0}):r,t)),w=t=>u(a({},"__esModule",{value:!0}),t);var F={};b(F,{ViewSyncReportController:()=>y,default:()=>E});module.exports=w(F);var d=i(require("./utils")),n=require("../../../../../components/_filters/filtersTypeEnum"),l=i(require("../../../../../components/error-summary/utils")),c=i(require("../../../../../utils/Personalisation/personalisationUtils")),p=i(require("../../utils"));class y{constructor(e,r){this.GET=async(e,r,o)=>{try{const s=await d.default.getReport({req:e,res:r,services:this.services});r.render("dpr/routes/journeys/view-report/report",{layoutPath:this.layoutPath,...s})}catch(s){e.body.title="Report Failed",e.body.errorDescription="We were unable to show this report for the following reason:",e.body.error=l.default.handleError(s),o()}};this.saveDefaultFilterValues=async(e,r,o)=>{try{c.default.saveDefaults(n.FiltersType.INTERACTIVE,r,e,this.services),r.redirect(`${e.baseUrl}?defaultsSaved=true`)}catch(s){e.body={title:"Failed to save defaults",error:l.default.handleError(s,e.params.type),...e.body},o()}};this.removeDefaultFilterValues=async(e,r,o)=>{try{c.default.removeDefaults(n.FiltersType.INTERACTIVE,r,e,this.services),r.redirect(e.baseUrl)}catch(s){e.body={title:"Failed to remove defaults",error:l.default.handleError(s,e.params.type),...e.body},o()}};this.applyFilters=async(e,r,o)=>{await p.default.applyReportInteractiveQuery(e,r,this.services,"filters")};this.applyColumns=async(e,r,o)=>{await p.default.applyReportInteractiveQuery(e,r,this.services,"columns")};this.layoutPath=e,this.services=r}}var E=y;0&&(module.exports={ViewSyncReportController});
+"use strict";var m=Object.create;var a=Object.defineProperty;var f=Object.getOwnPropertyDescriptor;var v=Object.getOwnPropertyNames;var h=Object.getPrototypeOf,R=Object.prototype.hasOwnProperty;var w=(t,e)=>{for(var r in e)a(t,r,{get:e[r],enumerable:!0})},y=(t,e,r,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of v(e))!R.call(t,o)&&o!==r&&a(t,o,{get:()=>e[o],enumerable:!(s=f(e,o))||s.enumerable});return t};var i=(t,e,r)=>(r=t!=null?m(h(t)):{},y(e||!t||!t.__esModule?a(r,"default",{value:t,enumerable:!0}):r,t)),b=t=>y(a({},"__esModule",{value:!0}),t);var F={};w(F,{ViewSyncReportController:()=>u,default:()=>E});module.exports=b(F);var l=i(require("../../../../../utils/ErrorHandler")),d=i(require("./utils")),n=require("../../../../../components/_filters/filtersTypeEnum"),c=i(require("../../../../../utils/Personalisation/personalisationUtils")),p=i(require("../../utils"));class u{constructor(e,r){this.GET=async(e,r,s)=>{try{const o=await d.default.getReport({req:e,res:r,services:this.services});r.render("dpr/routes/journeys/view-report/report",{layoutPath:this.layoutPath,...o})}catch(o){e.body.title="Report Failed",e.body.errorDescription="We were unable to show this report for the following reason:",e.body.error=new l.default(o).formatError(),s()}};this.saveDefaultFilterValues=async(e,r,s)=>{try{c.default.saveDefaults(n.FiltersType.INTERACTIVE,r,e,this.services),r.redirect(`${e.baseUrl}?defaultsSaved=true`)}catch(o){e.body={title:"Failed to save defaults",error:new l.default(o).formatError(),...e.body},s()}};this.removeDefaultFilterValues=async(e,r,s)=>{try{c.default.removeDefaults(n.FiltersType.INTERACTIVE,r,e,this.services),r.redirect(e.baseUrl)}catch(o){e.body={title:"Failed to remove defaults",error:new l.default(o).formatError(),...e.body},s()}};this.applyFilters=async(e,r,s)=>{await p.default.applyReportInteractiveQuery(e,r,this.services,"filters")};this.applyColumns=async(e,r,s)=>{await p.default.applyReportInteractiveQuery(e,r,this.services,"columns")};this.layoutPath=e,this.services=r}}var E=u;0&&(module.exports={ViewSyncReportController});
 //# sourceMappingURL=controller.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/view-report/sync/report/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../../types/Services'\nimport SyncReportUtils from './utils'\nimport { FiltersType } from '../../../../../components/_filters/filtersTypeEnum'\nimport ErrorSummaryUtils from '../../../../../components/error-summary/utils'\nimport PersonalisationUtils from '../../../../../utils/Personalisation/personalisationUtils'\nimport ViewReportUtils from '../../utils'\n\nclass ViewSyncReportController {\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    try {\n      const renderData = await SyncReportUtils.getReport({ req, res, services: this.services })\n      res.render(`dpr/routes/journeys/view-report/report`, {\n        layoutPath: this.layoutPath,\n        ...renderData,\n      })\n    } catch (error) {\n      req.body.title = `Report Failed`\n      req.body.errorDescription = 'We were unable to show this report for the following reason:'\n      req.body.error = ErrorSummaryUtils.handleError(error)\n      next()\n    }\n  }\n\n  saveDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      PersonalisationUtils.saveDefaults(FiltersType.INTERACTIVE, res, req, this.services)\n      res.redirect(`${req.baseUrl}?defaultsSaved=true`)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to save defaults',\n        error: ErrorSummaryUtils.handleError(error, req.params.type),\n        ...req.body,\n      }\n      next()\n    }\n  }\n\n  removeDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      PersonalisationUtils.removeDefaults(FiltersType.INTERACTIVE, res, req, this.services)\n      res.redirect(req.baseUrl)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to remove defaults',\n        error: ErrorSummaryUtils.handleError(error, req.params.type),\n        ...req.body,\n      }\n      next()\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 { ViewSyncReportController }\nexport default ViewSyncReportController\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,8BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAA4B,sBAC5BC,EAA4B,8DAC5BD,EAA8B,4DAC9BE,EAAiC,wEACjCF,EAA4B,0BAE5B,MAAMH,CAAyB,CAK7B,YAAYM,EAAoBC,EAAoB,CAKpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,GAAI,CACF,MAAMC,EAAa,MAAM,EAAAC,QAAgB,UAAU,CAAE,IAAAJ,EAAK,IAAAC,EAAK,SAAU,KAAK,QAAS,CAAC,EACxFA,EAAI,OAAO,yCAA0C,CACnD,WAAY,KAAK,WACjB,GAAGE,CACL,CAAC,CACH,OAASE,EAAO,CACdL,EAAI,KAAK,MAAQ,gBACjBA,EAAI,KAAK,iBAAmB,+DAC5BA,EAAI,KAAK,MAAQ,EAAAM,QAAkB,YAAYD,CAAK,EACpDH,EAAK,CACP,CACF,EAEA,6BAA0C,MAAOF,EAAKC,EAAKC,IAAS,CAClE,GAAI,CACF,EAAAK,QAAqB,aAAa,cAAY,YAAaN,EAAKD,EAAK,KAAK,QAAQ,EAClFC,EAAI,SAAS,GAAGD,EAAI,OAAO,qBAAqB,CAClD,OAASK,EAAO,CACdL,EAAI,KAAO,CACT,MAAO,0BACP,MAAO,EAAAM,QAAkB,YAAYD,EAAOL,EAAI,OAAO,IAAI,EAC3D,GAAGA,EAAI,IACT,EACAE,EAAK,CACP,CACF,EAEA,+BAA4C,MAAOF,EAAKC,EAAKC,IAAS,CACpE,GAAI,CACF,EAAAK,QAAqB,eAAe,cAAY,YAAaN,EAAKD,EAAK,KAAK,QAAQ,EACpFC,EAAI,SAASD,EAAI,OAAO,CAC1B,OAASK,EAAO,CACdL,EAAI,KAAO,CACT,MAAO,4BACP,MAAO,EAAAM,QAAkB,YAAYD,EAAOL,EAAI,OAAO,IAAI,EAC3D,GAAGA,EAAI,IACT,EACAE,EAAK,CACP,CACF,EAEA,kBAA+B,MAAOF,EAAKC,EAAKC,IAAS,CACvD,MAAM,EAAAM,QAAgB,4BAA4BR,EAAKC,EAAK,KAAK,SAAU,SAAS,CACtF,EAEA,kBAA+B,MAAOD,EAAKC,EAAKC,IAAS,CACvD,MAAM,EAAAM,QAAgB,4BAA4BR,EAAKC,EAAK,KAAK,SAAU,SAAS,CACtF,EArDE,KAAK,WAAaH,EAClB,KAAK,SAAWC,CAClB,CAoDF,CAGA,IAAON,EAAQD",
-  "names": ["controller_exports", "__export", "ViewSyncReportController", "controller_default", "__toCommonJS", "import_utils", "import_filtersTypeEnum", "import_personalisationUtils", "layoutPath", "services", "req", "res", "next", "renderData", "SyncReportUtils", "error", "ErrorSummaryUtils", "PersonalisationUtils", "ViewReportUtils"]
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport ErrorHandler from '../../../../../utils/ErrorHandler'\nimport { Services } from '../../../../../types/Services'\nimport SyncReportUtils from './utils'\nimport { FiltersType } from '../../../../../components/_filters/filtersTypeEnum'\nimport PersonalisationUtils from '../../../../../utils/Personalisation/personalisationUtils'\nimport ViewReportUtils from '../../utils'\n\nclass ViewSyncReportController {\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    try {\n      const renderData = await SyncReportUtils.getReport({ req, res, services: this.services })\n      res.render(`dpr/routes/journeys/view-report/report`, {\n        layoutPath: this.layoutPath,\n        ...renderData,\n      })\n    } catch (error) {\n      req.body.title = `Report Failed`\n      req.body.errorDescription = 'We were unable to show this report for the following reason:'\n      req.body.error = new ErrorHandler(error).formatError()\n      next()\n    }\n  }\n\n  saveDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      PersonalisationUtils.saveDefaults(FiltersType.INTERACTIVE, res, req, this.services)\n      res.redirect(`${req.baseUrl}?defaultsSaved=true`)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to save defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...req.body,\n      }\n      next()\n    }\n  }\n\n  removeDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      PersonalisationUtils.removeDefaults(FiltersType.INTERACTIVE, res, req, this.services)\n      res.redirect(req.baseUrl)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to remove defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...req.body,\n      }\n      next()\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 { ViewSyncReportController }\nexport default ViewSyncReportController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,8BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAyB,gDAEzBC,EAA4B,sBAC5BC,EAA4B,8DAC5BC,EAAiC,wEACjCF,EAA4B,0BAE5B,MAAMJ,CAAyB,CAK7B,YAAYO,EAAoBC,EAAoB,CAKpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,GAAI,CACF,MAAMC,EAAa,MAAM,EAAAC,QAAgB,UAAU,CAAE,IAAAJ,EAAK,IAAAC,EAAK,SAAU,KAAK,QAAS,CAAC,EACxFA,EAAI,OAAO,yCAA0C,CACnD,WAAY,KAAK,WACjB,GAAGE,CACL,CAAC,CACH,OAASE,EAAO,CACdL,EAAI,KAAK,MAAQ,gBACjBA,EAAI,KAAK,iBAAmB,+DAC5BA,EAAI,KAAK,MAAQ,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EACrDH,EAAK,CACP,CACF,EAEA,6BAA0C,MAAOF,EAAKC,EAAKC,IAAS,CAClE,GAAI,CACF,EAAAK,QAAqB,aAAa,cAAY,YAAaN,EAAKD,EAAK,KAAK,QAAQ,EAClFC,EAAI,SAAS,GAAGD,EAAI,OAAO,qBAAqB,CAClD,OAASK,EAAO,CACdL,EAAI,KAAO,CACT,MAAO,0BACP,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAGL,EAAI,IACT,EACAE,EAAK,CACP,CACF,EAEA,+BAA4C,MAAOF,EAAKC,EAAKC,IAAS,CACpE,GAAI,CACF,EAAAK,QAAqB,eAAe,cAAY,YAAaN,EAAKD,EAAK,KAAK,QAAQ,EACpFC,EAAI,SAASD,EAAI,OAAO,CAC1B,OAASK,EAAO,CACdL,EAAI,KAAO,CACT,MAAO,4BACP,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAGL,EAAI,IACT,EACAE,EAAK,CACP,CACF,EAEA,kBAA+B,MAAOF,EAAKC,EAAKO,IAAU,CACxD,MAAM,EAAAC,QAAgB,4BAA4BT,EAAKC,EAAK,KAAK,SAAU,SAAS,CACtF,EAEA,kBAA+B,MAAOD,EAAKC,EAAKO,IAAU,CACxD,MAAM,EAAAC,QAAgB,4BAA4BT,EAAKC,EAAK,KAAK,SAAU,SAAS,CACtF,EArDE,KAAK,WAAaH,EAClB,KAAK,SAAWC,CAClB,CAoDF,CAGA,IAAOP,EAAQD",
+  "names": ["controller_exports", "__export", "ViewSyncReportController", "controller_default", "__toCommonJS", "import_ErrorHandler", "import_utils", "import_filtersTypeEnum", "import_personalisationUtils", "layoutPath", "services", "req", "res", "next", "renderData", "SyncReportUtils", "error", "ErrorHandler", "PersonalisationUtils", "_next", "ViewReportUtils"]
 }

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

@@ -1,8 +1,8 @@
 import { RequestHandler } from 'express'
+import ErrorHandler from '../../../../../utils/ErrorHandler'
 import { Services } from '../../../../../types/Services'
 import SyncReportUtils from './utils'
 import { FiltersType } from '../../../../../components/_filters/filtersTypeEnum'
-import ErrorSummaryUtils from '../../../../../components/error-summary/utils'
 import PersonalisationUtils from '../../../../../utils/Personalisation/personalisationUtils'
 import ViewReportUtils from '../../utils'
 
@@ -26,7 +26,7 @@ class ViewSyncReportController {
     } catch (error) {
       req.body.title = `Report Failed`
       req.body.errorDescription = 'We were unable to show this report for the following reason:'
-      req.body.error = ErrorSummaryUtils.handleError(error)
+      req.body.error = new ErrorHandler(error).formatError()
       next()
     }
   }
@@ -38,7 +38,7 @@ class ViewSyncReportController {
     } catch (error) {
       req.body = {
         title: 'Failed to save defaults',
-        error: ErrorSummaryUtils.handleError(error, req.params.type),
+        error: new ErrorHandler(error).formatError(),
         ...req.body,
       }
       next()
@@ -52,18 +52,18 @@ class ViewSyncReportController {
     } catch (error) {
       req.body = {
         title: 'Failed to remove defaults',
-        error: ErrorSummaryUtils.handleError(error, req.params.type),
+        error: new ErrorHandler(error).formatError(),
         ...req.body,
       }
       next()
     }
   }
 
-  applyFilters: RequestHandler = async (req, res, next) => {
+  applyFilters: RequestHandler = async (req, res, _next) => {
     await ViewReportUtils.applyReportInteractiveQuery(req, res, this.services, 'filters')
   }
 
-  applyColumns: RequestHandler = async (req, res, next) => {
+  applyColumns: RequestHandler = async (req, res, _next) => {
     await ViewReportUtils.applyReportInteractiveQuery(req, res, this.services, 'columns')
   }
 }

package/dpr/routes/journeys/view-report/sync/report/routes.js

@@ -1,2 +1,2 @@
-var m=Object.create;var s=Object.defineProperty;var n=Object.getOwnPropertyDescriptor;var f=Object.getOwnPropertyNames;var c=Object.getPrototypeOf,d=Object.prototype.hasOwnProperty;var v=(e,r)=>{for(var t in r)s(e,t,{get:r[t],enumerable:!0})},a=(e,r,t,o)=>{if(r&&typeof r=="object"||typeof r=="function")for(let l of f(r))!d.call(e,l)&&l!==t&&s(e,l,{get:()=>r[l],enumerable:!(o=n(r,l))||o.enumerable});return e};var y=(e,r,t)=>(t=e!=null?m(c(e)):{},a(r||!e||!e.__esModule?s(t,"default",{value:e,enumerable:!0}):t,e)),g=e=>a(s({},"__esModule",{value:!0}),e);var F={};v(F,{default:()=>w,routes:()=>i});module.exports=g(F);var p=require("express"),u=y(require("./controller"));function i({layoutPath:e,services:r}){const t=(0,p.Router)({mergeParams:!0}),o=new u.default(e,r);return t.get(["/","/download-disabled"],o.GET),t.post("/apply-filters",o.applyFilters),t.post("/apply-columns",o.applyColumns),t.post("/save-defaults",o.saveDefaultFilterValues),t.post("/remove-defaults",o.removeDefaultFilterValues),t}var w=i;0&&(module.exports={routes});
+"use strict";var m=Object.create;var s=Object.defineProperty;var n=Object.getOwnPropertyDescriptor;var f=Object.getOwnPropertyNames;var c=Object.getPrototypeOf,d=Object.prototype.hasOwnProperty;var v=(e,r)=>{for(var t in r)s(e,t,{get:r[t],enumerable:!0})},a=(e,r,t,o)=>{if(r&&typeof r=="object"||typeof r=="function")for(let l of f(r))!d.call(e,l)&&l!==t&&s(e,l,{get:()=>r[l],enumerable:!(o=n(r,l))||o.enumerable});return e};var y=(e,r,t)=>(t=e!=null?m(c(e)):{},a(r||!e||!e.__esModule?s(t,"default",{value:e,enumerable:!0}):t,e)),g=e=>a(s({},"__esModule",{value:!0}),e);var F={};v(F,{default:()=>w,routes:()=>i});module.exports=g(F);var p=require("express"),u=y(require("./controller"));function i({layoutPath:e,services:r}){const t=(0,p.Router)({mergeParams:!0}),o=new u.default(e,r);return t.get(["/","/download-disabled"],o.GET),t.post("/apply-filters",o.applyFilters),t.post("/apply-columns",o.applyColumns),t.post("/save-defaults",o.saveDefaultFilterValues),t.post("/remove-defaults",o.removeDefaultFilterValues),t}var w=i;0&&(module.exports={routes});
 //# sourceMappingURL=routes.js.map

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/view-report/sync/report/routes.ts"],
   "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport ViewReportController from './controller'\nimport { Services } from '../../../../../types/Services'\n\nexport function routes({ layoutPath, services }: { layoutPath: string; services: Services }) {\n  const router = Router({ mergeParams: true })\n  const controller = new ViewReportController(layoutPath, services)\n\n  router.get([`/`, `/download-disabled`], controller.GET)\n\n  // Interactive controls\n  router.post('/apply-filters', controller.applyFilters)\n  router.post('/apply-columns', controller.applyColumns)\n\n  // User defined defaults\n  router.post('/save-defaults', controller.saveDefaultFilterValues)\n  router.post('/remove-defaults', controller.removeDefaultFilterValues)\n\n  return router\n}\n\nexport default routes\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBACvBC,EAAiC,2BAG1B,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EACrCC,EAAa,IAAI,EAAAC,QAAqBJ,EAAYC,CAAQ,EAEhE,OAAAC,EAAO,IAAI,CAAC,IAAK,oBAAoB,EAAGC,EAAW,GAAG,EAGtDD,EAAO,KAAK,iBAAkBC,EAAW,YAAY,EACrDD,EAAO,KAAK,iBAAkBC,EAAW,YAAY,EAGrDD,EAAO,KAAK,iBAAkBC,EAAW,uBAAuB,EAChED,EAAO,KAAK,mBAAoBC,EAAW,yBAAyB,EAE7DD,CACT,CAEA,IAAOP,EAAQC",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBACvBC,EAAiC,2BAG1B,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EACrCC,EAAa,IAAI,EAAAC,QAAqBJ,EAAYC,CAAQ,EAEhE,OAAAC,EAAO,IAAI,CAAC,IAAK,oBAAoB,EAAGC,EAAW,GAAG,EAGtDD,EAAO,KAAK,iBAAkBC,EAAW,YAAY,EACrDD,EAAO,KAAK,iBAAkBC,EAAW,YAAY,EAGrDD,EAAO,KAAK,iBAAkBC,EAAW,uBAAuB,EAChED,EAAO,KAAK,mBAAoBC,EAAW,yBAAyB,EAE7DD,CACT,CAEA,IAAOP,EAAQC",
   "names": ["routes_exports", "__export", "routes_default", "routes", "__toCommonJS", "import_express", "import_controller", "layoutPath", "services", "router", "controller", "ViewReportController"]
 }