@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.22.1 → 4.22.3

package/dpr/routes/journeys/request-report/filters/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/request-report/filters/utils.ts"],
-  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Request, Response, NextFunction } from 'express'\n\n// Utils\nimport { defaultFilterValue } from '../../../../utils/Personalisation/types'\nimport FiltersFormUtils from '../../../../components/_async/async-filters-form/utils'\nimport LocalsHelper from '../../../../utils/localsHelper'\nimport FiltersUtils from '../../../../components/_filters/utils'\nimport { removeDuplicates } from '../../../../utils/reportStoreHelper'\nimport UserStoreItemBuilder from '../../../../utils/UserStoreItemBuilder'\n\n// Types\nimport type ReportingService from '../../../../services/reportingService'\nimport { ReportType, RequestFormData, RequestStatus } from '../../../../types/UserReports'\nimport type { ExecutionData, ChildReportExecutionData } from '../../../../types/ExecutionData'\nimport type { AsyncReportUtilsParams, RequestDataResult, RequestReportData } from '../../../../types/AsyncReportUtils'\nimport type {\n  RenderFiltersReturnValue,\n  SetQueryFromFiltersResult,\n} from '../../../../components/_async/async-filters-form/types'\nimport type { components } from '../../../../types/api'\nimport type { Services } from '../../../../types/Services'\nimport type DashboardService from '../../../../services/dashboardService'\nimport PersonalistionUtils from '../../../../utils/Personalisation/personalisationUtils'\nimport { FiltersType } from '../../../../components/_filters/filtersTypeEnum'\n\n/**\n * Updates the store with the request details\n *\n * @param {Request} req\n * @param {Response} res\n * @param {Services} services\n * @param {SetQueryFromFiltersResult} querySummaryData\n * @param {string} executionData\n * @return {*}  {Promise<string>}\n */\nexport const updateStore = async ({\n  req,\n  res,\n  services,\n  queryData,\n  executionData,\n  childExecutionData,\n}: {\n  req: Request\n  res: Response\n  services: Services\n  queryData?: SetQueryFromFiltersResult | undefined\n  executionData: ExecutionData\n  childExecutionData: Array<ChildReportExecutionData>\n}): Promise<void> => {\n  const { search, id, type } = req.body\n  const { dprUser, definitionsPath, dpdPathFromQuery } = LocalsHelper.getValues(res)\n\n  await removeDuplicates({ storeService: services.requestedReportService, userId: dprUser.id, id, search })\n  await removeDuplicates({ storeService: services.recentlyViewedService, userId: dprUser.id, id, search })\n\n  const requestFormData: RequestFormData = req.body\n  const reportData = {\n    type: requestFormData.type as ReportType,\n    reportId: requestFormData.reportId,\n    reportName: requestFormData.reportName,\n    description: requestFormData.description,\n    id: requestFormData.id,\n    name: requestFormData.name,\n  }\n\n  let requestedReportData\n  switch (type) {\n    case ReportType.REPORT:\n      requestedReportData = new UserStoreItemBuilder(reportData, requestFormData)\n        .addExecutionData(executionData)\n        .addChildExecutionData(childExecutionData)\n        .addFilters(queryData?.filterData)\n        .addSortData(queryData?.sortData)\n        .addDefinitionsPath(definitionsPath, dpdPathFromQuery)\n        .addRequestUrls(req)\n        .addQuery(queryData)\n        .addStatus(RequestStatus.SUBMITTED)\n        .addTimestamp()\n        .build()\n      break\n    case ReportType.DASHBOARD: {\n      requestedReportData = new UserStoreItemBuilder(reportData, requestFormData)\n        .addExecutionData(executionData)\n        .addChildExecutionData(childExecutionData)\n        .addFilters(queryData?.filterData)\n        .addDefinitionsPath(definitionsPath, dpdPathFromQuery)\n        .addRequestUrls(req)\n        .addQuery(queryData)\n        .addStatus(RequestStatus.SUBMITTED)\n        .addTimestamp()\n        .addMetrics(JSON.parse(req.body.sections))\n        .build()\n      break\n    }\n    default:\n      break\n  }\n\n  if (requestedReportData) await services.requestedReportService.addReport(dprUser.id, requestedReportData)\n}\n\nasync function requestChildReports(\n  childVariants: Array<components['schemas']['ChildVariantDefinition']>,\n  reportingService: ReportingService,\n  token: string,\n  reportId: string,\n  queryData?: SetQueryFromFiltersResult,\n  dataProductDefinitionsPath?: string,\n): Promise<Array<ChildReportExecutionData>> {\n  return Promise.all(\n    childVariants.map((childVariant) =>\n      reportingService\n        .requestAsyncReport(token, reportId, childVariant.id, {\n          ...(queryData && queryData.query),\n          ...(dataProductDefinitionsPath && { dataProductDefinitionsPath }),\n        })\n        .then((response) => {\n          const { executionId, tableId } = response\n          if (!executionId || !tableId) {\n            throw new Error('requestChildReports: No execution of tableId in response')\n          }\n          return { executionId, tableId, variantId: childVariant.id }\n        }),\n    ),\n  )\n}\n\nconst requestProduct = async ({\n  req,\n  res,\n  token,\n  dashboardService,\n  reportingService,\n}: {\n  req: Request\n  res: Response\n  token: string\n  dashboardService: DashboardService\n  reportingService: ReportingService\n}): Promise<{\n  executionData: ExecutionData\n  childExecutionData: Array<ChildReportExecutionData>\n  queryData?: SetQueryFromFiltersResult | undefined\n}> => {\n  const { definitionsPath: dataProductDefinitionsPath, dpdPathFromQuery } = LocalsHelper.getValues(res)\n  const { reportId, id, type } = req.body\n\n  let fields: components['schemas']['FieldDefinition'][]\n  let queryData\n  let executionId\n  let tableId\n  let definition\n  let childVariants: components['schemas']['ChildVariantDefinition'][] = []\n\n  if (type === ReportType.REPORT) {\n    definition = await reportingService.getDefinition(token, reportId, id, dataProductDefinitionsPath)\n\n    fields = definition?.variant.specification?.fields || []\n    queryData = FiltersFormUtils.setQueryFromFilters(req, fields)\n    ;({ executionId, tableId } = await reportingService.requestAsyncReport(token, reportId, id, {\n      ...queryData.query,\n      dataProductDefinitionsPath,\n    }))\n    childVariants = definition.variant.childVariants ?? []\n  }\n\n  if (type === ReportType.DASHBOARD) {\n    definition = await dashboardService.getDefinition(token, reportId, id, dataProductDefinitionsPath)\n\n    fields = definition?.filterFields || []\n    queryData = FiltersFormUtils.setQueryFromFilters(req, fields)\n    ;({ executionId, tableId } = await dashboardService.requestAsyncDashboard(token, reportId, id, {\n      ...queryData.query,\n      dataProductDefinitionsPath,\n    }))\n  }\n\n  const childExecutionData = await requestChildReports(\n    childVariants,\n    reportingService,\n    token,\n    reportId,\n    queryData,\n    dataProductDefinitionsPath,\n  )\n\n  const executionData = {\n    executionId,\n    tableId,\n    ...(dpdPathFromQuery && { dataProductDefinitionsPath }),\n  }\n\n  return {\n    executionData,\n    childExecutionData,\n    queryData,\n  }\n}\n\nconst renderDashboardRequestData = async ({\n  token,\n  reportId,\n  definitionPath,\n  services,\n  definition,\n}: {\n  token: string\n  reportId: string\n  definitionPath: string\n  services: Services\n  definition: components['schemas']['DashboardDefinition']\n}) => {\n  const productDefinitions = await services.reportingService.getDefinitions(token, definitionPath)\n  const productDefinition = productDefinitions.find(\n    (def: components['schemas']['ReportDefinitionSummary']) => def.id === reportId,\n  )\n  const reportName = productDefinition?.name\n  const { name, description, sections, filterFields: fields } = definition\n\n  return {\n    reportName,\n    name,\n    description,\n    sections: sections || [],\n    fields: fields || [],\n  }\n}\n\nconst renderReportRequestData = async (definition: components['schemas']['SingleVariantReportDefinition']) => {\n  return {\n    definition,\n    reportName: definition.name,\n    name: definition.variant.name,\n    description: definition.variant.description || definition.description,\n    template: definition.variant.specification,\n    fields: definition?.variant?.specification?.fields || [],\n    interactive: definition?.variant?.interactive,\n  }\n}\n\nexport const getDefintionByType = async (req: Request, res: Response, _next: NextFunction, services: Services) => {\n  const { token, definitionsPath } = LocalsHelper.getValues(res)\n  const { reportId, id, variantId, type } = req.params\n\n  const service = type === ReportType.REPORT ? services.reportingService : services.dashboardService\n  const definition = await service.getDefinition(token, reportId, variantId || id, definitionsPath)\n\n  return definition\n}\n\nconst getFilterData = async (\n  req: Request,\n  res: Response,\n  fields: components['schemas']['FieldDefinition'][],\n  interactive: boolean,\n  services: Services,\n  userId: string,\n) => {\n  const { reportId, id } = req.params\n\n  // 1. Get filters from definition with default values\n  let filtersData = <RenderFiltersReturnValue>await FiltersFormUtils.renderFilters(fields, interactive)\n\n  // 2. Update filter values with user context values. eg. establishmnent code\n  filtersData.filters = PersonalistionUtils.setUserContextDefaults(res, filtersData.filters)\n\n  // 3. Update filter values with saved defaults\n  let defaultFilterValues\n  if (res.locals['saveDefaultsEnabled']) {\n    defaultFilterValues = await services.defaultFilterValuesService.get(userId, reportId, id, FiltersType.REQUEST)\n  }\n  if (defaultFilterValues) {\n    filtersData = PersonalistionUtils.setFilterValuesFromSavedDefaults(\n      filtersData.filters,\n      filtersData.sortBy || [],\n      defaultFilterValues,\n    )\n  }\n\n  // 4. Overwrite filter values with query param values\n  filtersData.filters = FiltersUtils.setFilterValuesFromRequest(filtersData.filters, req)\n\n  return { filtersData, defaultFilterValues }\n}\n\n/**\n * Sends the request for the async report\n *\n * @param {AsyncReportUtilsParams} { req, res, services }\n * @return {*}\n */\nexport const request = async ({ req, res, services }: AsyncReportUtilsParams) => {\n  const { token } = LocalsHelper.getValues(res)\n  const requestArgs = { req, res, token }\n\n  const { executionData, queryData, childExecutionData } = await requestProduct({\n    ...requestArgs,\n    dashboardService: services.dashboardService,\n    reportingService: services.reportingService,\n  })\n\n  if (executionData) {\n    await updateStore({\n      req,\n      res,\n      services,\n      queryData,\n      executionData,\n      childExecutionData,\n    })\n  }\n\n  return executionData\n}\n\nexport const cancelRequest = async ({ req, res, services }: AsyncReportUtilsParams) => {\n  const { token, dprUser, definitionsPath } = LocalsHelper.getValues(res)\n  const { reportId, id, executionId, type } = req.params\n\n  let service: ReportingService | DashboardService = services.reportingService\n  if (type === ReportType.REPORT) service = services.reportingService\n  if (type === ReportType.DASHBOARD) service = services.dashboardService\n\n  const response = await service.cancelAsyncRequest(token, reportId, id, executionId, definitionsPath)\n\n  if (response && response['cancellationSucceeded']) {\n    await services.requestedReportService.updateStatus(executionId, dprUser.id, RequestStatus.ABORTED)\n  }\n}\n\n/**\n * Returns the data required for rendering the async filters component\n *\n * @param {AsyncReportUtilsParams} { req, res, dataSources }\n * @return {*}\n */\nexport const renderRequest = async ({\n  req,\n  res,\n  services,\n  next,\n}: {\n  req: Request\n  res: Response\n  next: NextFunction\n  services: Services\n}): Promise<RequestDataResult | boolean> => {\n  try {\n    const { token, csrfToken, definitionsPath: definitionPath, dpdPathFromQuery, dprUser } = LocalsHelper.getValues(res)\n    const { reportId, type, id } = req.params\n    const { definition } = res.locals\n    const defaultsSaved = <string>req.query['defaultsSaved']\n\n    const definitionApiArgs = { token, reportId, definitionPath, services }\n\n    let name\n    let reportName\n    let description\n    let template\n    let fields: components['schemas']['FieldDefinition'][] = []\n    let sections\n    let interactive\n    let filtersData\n    let defaultFilterValues: defaultFilterValue[] = []\n\n    if (type === ReportType.REPORT) {\n      ;({ name, reportName, description, fields, interactive } = await renderReportRequestData(definition))\n    }\n\n    if (type === ReportType.DASHBOARD) {\n      ;({ name, reportName, description, sections, fields } = await renderDashboardRequestData({\n        ...definitionApiArgs,\n        definition,\n      }))\n    }\n\n    if (fields) {\n      const filterData = await getFilterData(req, res, fields, interactive || false, services, dprUser.id)\n      defaultFilterValues = filterData.defaultFilterValues || defaultFilterValues\n      filtersData = filterData.filtersData\n    }\n\n    const reportData: RequestReportData = {\n      reportName,\n      name,\n      description,\n      reportId,\n      id,\n      ...(dpdPathFromQuery && { definitionPath }),\n      csrfToken,\n      template,\n      sections,\n      hasDefaults: defaultFilterValues?.length > 0,\n      defaultsSaved,\n      type: type as ReportType,\n      saveDefaultsEnabled: res.locals['saveDefaultsEnabled'],\n    }\n\n    return {\n      title: `Request ${type}`,\n      filtersDescription: `Customise your ${type} using the filters below and submit your request.`,\n      filtersData,\n      reportData,\n    }\n  } catch (error) {\n    next(error)\n    return false\n  }\n}\n\nexport const getFiltersFromReqBody = (req: Request) => {\n  return Object.keys(req.body)\n    .filter((attr) => attr.includes('filters.'))\n    .filter((attr) => !!req.body[attr])\n    .map((attr) => {\n      return { name: attr, value: req.body[attr] }\n    })\n}\n\nexport default {\n  request,\n  cancelRequest,\n  renderRequest,\n  getFiltersFromReqBody,\n  getDefintionByType,\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Request, Response, NextFunction } from 'express'\n\n// Utils\nimport { defaultFilterValue } from '../../../../utils/Personalisation/types'\nimport FiltersFormUtils from '../../../../components/_async/async-filters-form/utils'\nimport LocalsHelper from '../../../../utils/localsHelper'\nimport FiltersUtils from '../../../../components/_filters/utils'\nimport { removeDuplicates } from '../../../../utils/reportStoreHelper'\nimport UserStoreItemBuilder from '../../../../utils/UserStoreItemBuilder'\n\n// Types\nimport type ReportingService from '../../../../services/reportingService'\nimport { ReportType, RequestFormData, RequestStatus } from '../../../../types/UserReports'\nimport type { ExecutionData, ChildReportExecutionData } from '../../../../types/ExecutionData'\nimport type { AsyncReportUtilsParams, RequestDataResult, RequestReportData } from '../../../../types/AsyncReportUtils'\nimport type {\n  RenderFiltersReturnValue,\n  SetQueryFromFiltersResult,\n} from '../../../../components/_async/async-filters-form/types'\nimport type { components } from '../../../../types/api'\nimport type { Services } from '../../../../types/Services'\nimport type DashboardService from '../../../../services/dashboardService'\nimport PersonalistionUtils from '../../../../utils/Personalisation/personalisationUtils'\nimport { FiltersType } from '../../../../components/_filters/filtersTypeEnum'\n\n/**\n * Updates the store with the request details\n *\n * @param {Request} req\n * @param {Response} res\n * @param {Services} services\n * @param {SetQueryFromFiltersResult} querySummaryData\n * @param {string} executionData\n * @return {*}  {Promise<string>}\n */\nexport const updateStore = async ({\n  req,\n  res,\n  services,\n  queryData,\n  executionData,\n  childExecutionData,\n}: {\n  req: Request\n  res: Response\n  services: Services\n  queryData?: SetQueryFromFiltersResult | undefined\n  executionData: ExecutionData\n  childExecutionData: Array<ChildReportExecutionData>\n}): Promise<void> => {\n  const { search, id, type } = req.body\n  const { dprUser, definitionsPath, dpdPathFromQuery } = LocalsHelper.getValues(res)\n\n  await removeDuplicates({ storeService: services.requestedReportService, userId: dprUser.id, id, search })\n  await removeDuplicates({ storeService: services.recentlyViewedService, userId: dprUser.id, id, search })\n\n  const requestFormData: RequestFormData = req.body\n  const reportData = {\n    type: requestFormData.type as ReportType,\n    reportId: requestFormData.reportId,\n    reportName: requestFormData.reportName,\n    description: requestFormData.description,\n    id: requestFormData.id,\n    name: requestFormData.name,\n  }\n\n  let requestedReportData\n  switch (type) {\n    case ReportType.REPORT:\n      requestedReportData = new UserStoreItemBuilder(reportData, requestFormData)\n        .addExecutionData(executionData)\n        .addChildExecutionData(childExecutionData)\n        .addFilters(queryData?.filterData)\n        .addSortData(queryData?.sortData)\n        .addDefinitionsPath(definitionsPath, dpdPathFromQuery)\n        .addRequestUrls(req)\n        .addQuery(queryData)\n        .addStatus(RequestStatus.SUBMITTED)\n        .addTimestamp()\n        .build()\n      break\n    case ReportType.DASHBOARD: {\n      requestedReportData = new UserStoreItemBuilder(reportData, requestFormData)\n        .addExecutionData(executionData)\n        .addChildExecutionData(childExecutionData)\n        .addFilters(queryData?.filterData)\n        .addDefinitionsPath(definitionsPath, dpdPathFromQuery)\n        .addRequestUrls(req)\n        .addQuery(queryData)\n        .addStatus(RequestStatus.SUBMITTED)\n        .addTimestamp()\n        .addMetrics(JSON.parse(req.body.sections))\n        .build()\n      break\n    }\n    default:\n      break\n  }\n\n  if (requestedReportData) await services.requestedReportService.addReport(dprUser.id, requestedReportData)\n}\n\nasync function requestChildReports(\n  childVariants: Array<components['schemas']['ChildVariantDefinition']>,\n  reportingService: ReportingService,\n  token: string,\n  reportId: string,\n  queryData?: SetQueryFromFiltersResult,\n  dataProductDefinitionsPath?: string,\n): Promise<Array<ChildReportExecutionData>> {\n  return Promise.all(\n    childVariants.map((childVariant) =>\n      reportingService\n        .requestAsyncReport(token, reportId, childVariant.id, {\n          ...(queryData && queryData.query),\n          ...(dataProductDefinitionsPath && { dataProductDefinitionsPath }),\n        })\n        .then((response) => {\n          const { executionId, tableId } = response\n          if (!executionId || !tableId) {\n            throw new Error('requestChildReports: No execution of tableId in response')\n          }\n          return { executionId, tableId, variantId: childVariant.id }\n        }),\n    ),\n  )\n}\n\nconst requestProduct = async ({\n  req,\n  res,\n  token,\n  dashboardService,\n  reportingService,\n}: {\n  req: Request\n  res: Response\n  token: string\n  dashboardService: DashboardService\n  reportingService: ReportingService\n}): Promise<{\n  executionData: ExecutionData\n  childExecutionData: Array<ChildReportExecutionData>\n  queryData?: SetQueryFromFiltersResult | undefined\n}> => {\n  const { definitionsPath: dataProductDefinitionsPath, dpdPathFromQuery } = LocalsHelper.getValues(res)\n  const { reportId, id, type } = req.body\n\n  let fields: components['schemas']['FieldDefinition'][]\n  let queryData\n  let executionId\n  let tableId\n  let definition\n  let childVariants: components['schemas']['ChildVariantDefinition'][] = []\n\n  if (type === ReportType.REPORT) {\n    definition = await reportingService.getDefinition(token, reportId, id, dataProductDefinitionsPath)\n\n    fields = definition?.variant.specification?.fields || []\n    queryData = FiltersFormUtils.setQueryFromFilters(req, fields)\n    ;({ executionId, tableId } = await reportingService.requestAsyncReport(token, reportId, id, {\n      ...queryData.query,\n      dataProductDefinitionsPath,\n    }))\n    childVariants = definition.variant.childVariants ?? []\n  }\n\n  if (type === ReportType.DASHBOARD) {\n    definition = await dashboardService.getDefinition(token, reportId, id, dataProductDefinitionsPath)\n\n    fields = definition?.filterFields || []\n    queryData = FiltersFormUtils.setQueryFromFilters(req, fields)\n    ;({ executionId, tableId } = await dashboardService.requestAsyncDashboard(token, reportId, id, {\n      ...queryData.query,\n      dataProductDefinitionsPath,\n    }))\n  }\n\n  const childExecutionData = await requestChildReports(\n    childVariants,\n    reportingService,\n    token,\n    reportId,\n    queryData,\n    dataProductDefinitionsPath,\n  )\n\n  const executionData = {\n    executionId,\n    tableId,\n    ...(dpdPathFromQuery && { dataProductDefinitionsPath }),\n  }\n\n  return {\n    executionData,\n    childExecutionData,\n    queryData,\n  }\n}\n\nconst renderDashboardRequestData = async ({\n  token,\n  reportId,\n  definitionPath,\n  services,\n  definition,\n}: {\n  token: string\n  reportId: string\n  definitionPath: string\n  services: Services\n  definition: components['schemas']['DashboardDefinition']\n}) => {\n  const productDefinitions = await services.reportingService.getDefinitions(token, definitionPath)\n  const productDefinition = productDefinitions.find(\n    (def: components['schemas']['ReportDefinitionSummary']) => def.id === reportId,\n  )\n  const reportName = productDefinition?.name\n  const { name, description, sections, filterFields: fields } = definition\n\n  return {\n    reportName,\n    name,\n    description,\n    sections: sections || [],\n    fields: fields || [],\n  }\n}\n\nconst renderReportRequestData = async (definition: components['schemas']['SingleVariantReportDefinition']) => {\n  return {\n    definition,\n    reportName: definition.name,\n    name: definition.variant.name,\n    description: definition.variant.description || definition.description,\n    template: definition.variant.specification,\n    fields: definition?.variant?.specification?.fields || [],\n    interactive: definition?.variant?.interactive,\n  }\n}\n\nexport const getDefintionByType = async (req: Request, res: Response, _next: NextFunction, services: Services) => {\n  const { token, definitionsPath } = LocalsHelper.getValues(res)\n  const { reportId, id, variantId, type } = req.params\n\n  const service = type === ReportType.REPORT ? services.reportingService : services.dashboardService\n  const definition = await service.getDefinition(token, reportId, variantId || id, definitionsPath)\n\n  return definition\n}\n\nconst getFilterData = async (\n  req: Request,\n  res: Response,\n  fields: components['schemas']['FieldDefinition'][],\n  interactive: boolean,\n  services: Services,\n  userId: string,\n) => {\n  const { reportId, id } = req.params\n\n  // 1. Get filters from definition with default values\n  let filtersData = <RenderFiltersReturnValue>await FiltersFormUtils.renderFilters(fields, interactive)\n\n  // 2. Update filter values with user context values. eg. establishmnent code\n  filtersData.filters = PersonalistionUtils.setUserContextDefaults(res, filtersData.filters)\n\n  // 3. Update filter values with saved defaults\n  let defaultFilterValues\n  if (res.locals['saveDefaultsEnabled']) {\n    defaultFilterValues = await services.defaultFilterValuesService.get(userId, reportId, id, FiltersType.REQUEST)\n  }\n  if (defaultFilterValues) {\n    filtersData = PersonalistionUtils.setFilterValuesFromSavedDefaults(\n      filtersData.filters,\n      filtersData.sortBy || [],\n      defaultFilterValues,\n    )\n  }\n\n  // 4. Overwrite filter values with query param values\n  filtersData.filters = FiltersUtils.setFilterValuesFromRequest(filtersData.filters, req)\n\n  return { filtersData, defaultFilterValues }\n}\n\n/**\n * Sends the request for the async report\n *\n * @param {AsyncReportUtilsParams} { req, res, services }\n * @return {*}\n */\nexport const request = async ({ req, res, services }: AsyncReportUtilsParams) => {\n  const { token } = LocalsHelper.getValues(res)\n  const requestArgs = { req, res, token }\n\n  const { executionData, queryData, childExecutionData } = await requestProduct({\n    ...requestArgs,\n    dashboardService: services.dashboardService,\n    reportingService: services.reportingService,\n  })\n\n  if (executionData.executionId && executionData.tableId) {\n    await updateStore({\n      req,\n      res,\n      services,\n      queryData,\n      executionData,\n      childExecutionData,\n    })\n  } else {\n    throw new Error('No execution data returned')\n  }\n\n  return executionData\n}\n\nexport const cancelRequest = async ({ req, res, services }: AsyncReportUtilsParams) => {\n  const { token, dprUser, definitionsPath } = LocalsHelper.getValues(res)\n  const { reportId, id, executionId, type } = req.params\n\n  let service: ReportingService | DashboardService = services.reportingService\n  if (type === ReportType.REPORT) service = services.reportingService\n  if (type === ReportType.DASHBOARD) service = services.dashboardService\n\n  const response = await service.cancelAsyncRequest(token, reportId, id, executionId, definitionsPath)\n\n  if (response && response['cancellationSucceeded']) {\n    await services.requestedReportService.updateStatus(executionId, dprUser.id, RequestStatus.ABORTED)\n  }\n}\n\n/**\n * Returns the data required for rendering the async filters component\n *\n * @param {AsyncReportUtilsParams} { req, res, dataSources }\n * @return {*}\n */\nexport const renderRequest = async ({\n  req,\n  res,\n  services,\n  next,\n}: {\n  req: Request\n  res: Response\n  next: NextFunction\n  services: Services\n}): Promise<RequestDataResult | boolean> => {\n  try {\n    const { token, csrfToken, definitionsPath: definitionPath, dpdPathFromQuery, dprUser } = LocalsHelper.getValues(res)\n    const { reportId, type, id } = req.params\n    const { definition } = res.locals\n    const defaultsSaved = <string>req.query['defaultsSaved']\n\n    const definitionApiArgs = { token, reportId, definitionPath, services }\n\n    let name\n    let reportName\n    let description\n    let template\n    let fields: components['schemas']['FieldDefinition'][] = []\n    let sections\n    let interactive\n    let filtersData\n    let defaultFilterValues: defaultFilterValue[] = []\n\n    if (type === ReportType.REPORT) {\n      ;({ name, reportName, description, fields, interactive } = await renderReportRequestData(definition))\n    }\n\n    if (type === ReportType.DASHBOARD) {\n      ;({ name, reportName, description, sections, fields } = await renderDashboardRequestData({\n        ...definitionApiArgs,\n        definition,\n      }))\n    }\n\n    if (fields) {\n      const filterData = await getFilterData(req, res, fields, interactive || false, services, dprUser.id)\n      defaultFilterValues = filterData.defaultFilterValues || defaultFilterValues\n      filtersData = filterData.filtersData\n    }\n\n    const reportData: RequestReportData = {\n      reportName,\n      name,\n      description,\n      reportId,\n      id,\n      ...(dpdPathFromQuery && { definitionPath }),\n      csrfToken,\n      template,\n      sections,\n      hasDefaults: defaultFilterValues?.length > 0,\n      defaultsSaved,\n      type: type as ReportType,\n      saveDefaultsEnabled: res.locals['saveDefaultsEnabled'],\n    }\n\n    return {\n      title: `Request ${type}`,\n      filtersDescription: `Customise your ${type} using the filters below and submit your request.`,\n      filtersData,\n      reportData,\n    }\n  } catch (error) {\n    next(error)\n    return false\n  }\n}\n\nexport const getFiltersFromReqBody = (req: Request) => {\n  return Object.keys(req.body)\n    .filter((attr) => attr.includes('filters.'))\n    .filter((attr) => !!req.body[attr])\n    .map((attr) => {\n      return { name: attr, value: req.body[attr] }\n    })\n}\n\nexport default {\n  request,\n  cancelRequest,\n  renderRequest,\n  getFiltersFromReqBody,\n  getDefintionByType,\n}\n"],
+  "mappings": "0jBAAA,IAAAA,GAAA,GAAAC,EAAAD,GAAA,mBAAAE,EAAA,YAAAC,GAAA,uBAAAC,EAAA,0BAAAC,EAAA,kBAAAC,EAAA,YAAAC,EAAA,gBAAAC,IAAA,eAAAC,EAAAT,IAKA,IAAAU,EAA6B,qEAC7BC,EAAyB,6CACzBD,EAAyB,oDACzBE,EAAiC,+CACjCC,EAAiC,qDAIjCC,EAA2D,yCAU3DC,EAAgC,qEAChCC,EAA4B,2DAYrB,MAAMR,EAAc,MAAO,CAChC,IAAAS,EACA,IAAAC,EACA,SAAAC,EACA,UAAAC,EACA,cAAAC,EACA,mBAAAC,CACF,IAOqB,CACnB,KAAM,CAAE,OAAAC,EAAQ,GAAAC,EAAI,KAAAC,CAAK,EAAIR,EAAI,KAC3B,CAAE,QAAAS,EAAS,gBAAAC,EAAiB,iBAAAC,CAAiB,EAAI,EAAAC,QAAa,UAAUX,CAAG,EAEjF,QAAM,oBAAiB,CAAE,aAAcC,EAAS,uBAAwB,OAAQO,EAAQ,GAAI,GAAAF,EAAI,OAAAD,CAAO,CAAC,EACxG,QAAM,oBAAiB,CAAE,aAAcJ,EAAS,sBAAuB,OAAQO,EAAQ,GAAI,GAAAF,EAAI,OAAAD,CAAO,CAAC,EAEvG,MAAMO,EAAmCb,EAAI,KACvCc,EAAa,CACjB,KAAMD,EAAgB,KACtB,SAAUA,EAAgB,SAC1B,WAAYA,EAAgB,WAC5B,YAAaA,EAAgB,YAC7B,GAAIA,EAAgB,GACpB,KAAMA,EAAgB,IACxB,EAEA,IAAIE,EACJ,OAAQP,EAAM,CACZ,KAAK,aAAW,OACdO,EAAsB,IAAI,EAAAC,QAAqBF,EAAYD,CAAe,EACvE,iBAAiBT,CAAa,EAC9B,sBAAsBC,CAAkB,EACxC,WAAWF,GAAW,UAAU,EAChC,YAAYA,GAAW,QAAQ,EAC/B,mBAAmBO,EAAiBC,CAAgB,EACpD,eAAeX,CAAG,EAClB,SAASG,CAAS,EAClB,UAAU,gBAAc,SAAS,EACjC,aAAa,EACb,MAAM,EACT,MACF,KAAK,aAAW,UAAW,CACzBY,EAAsB,IAAI,EAAAC,QAAqBF,EAAYD,CAAe,EACvE,iBAAiBT,CAAa,EAC9B,sBAAsBC,CAAkB,EACxC,WAAWF,GAAW,UAAU,EAChC,mBAAmBO,EAAiBC,CAAgB,EACpD,eAAeX,CAAG,EAClB,SAASG,CAAS,EAClB,UAAU,gBAAc,SAAS,EACjC,aAAa,EACb,WAAW,KAAK,MAAMH,EAAI,KAAK,QAAQ,CAAC,EACxC,MAAM,EACT,KACF,CACA,QACE,KACJ,CAEIe,GAAqB,MAAMb,EAAS,uBAAuB,UAAUO,EAAQ,GAAIM,CAAmB,CAC1G,EAEA,eAAeE,EACbC,EACAC,EACAC,EACAC,EACAlB,EACAmB,EAC0C,CAC1C,OAAO,QAAQ,IACbJ,EAAc,IAAKK,GACjBJ,EACG,mBAAmBC,EAAOC,EAAUE,EAAa,GAAI,CACpD,GAAIpB,GAAaA,EAAU,MAC3B,GAAImB,GAA8B,CAAE,2BAAAA,CAA2B,CACjE,CAAC,EACA,KAAME,GAAa,CAClB,KAAM,CAAE,YAAAC,EAAa,QAAAC,CAAQ,EAAIF,EACjC,GAAI,CAACC,GAAe,CAACC,EACnB,MAAM,IAAI,MAAM,0DAA0D,EAE5E,MAAO,CAAE,YAAAD,EAAa,QAAAC,EAAS,UAAWH,EAAa,EAAG,CAC5D,CAAC,CACL,CACF,CACF,CAEA,MAAMI,EAAiB,MAAO,CAC5B,IAAA3B,EACA,IAAAC,EACA,MAAAmB,EACA,iBAAAQ,EACA,iBAAAT,CACF,IAUM,CACJ,KAAM,CAAE,gBAAiBG,EAA4B,iBAAAX,CAAiB,EAAI,EAAAC,QAAa,UAAUX,CAAG,EAC9F,CAAE,SAAAoB,EAAU,GAAAd,EAAI,KAAAC,CAAK,EAAIR,EAAI,KAEnC,IAAI6B,EACA1B,EACAsB,EACAC,EACAI,EACAZ,EAAmE,CAAC,EAEpEV,IAAS,aAAW,SACtBsB,EAAa,MAAMX,EAAiB,cAAcC,EAAOC,EAAUd,EAAIe,CAA0B,EAEjGO,EAASC,GAAY,QAAQ,eAAe,QAAU,CAAC,EACvD3B,EAAY,EAAA4B,QAAiB,oBAAoB/B,EAAK6B,CAAM,EAC1D,CAAE,YAAAJ,EAAa,QAAAC,CAAQ,EAAI,MAAMP,EAAiB,mBAAmBC,EAAOC,EAAUd,EAAI,CAC1F,GAAGJ,EAAU,MACb,2BAAAmB,CACF,CAAC,EACDJ,EAAgBY,EAAW,QAAQ,eAAiB,CAAC,GAGnDtB,IAAS,aAAW,YACtBsB,EAAa,MAAMF,EAAiB,cAAcR,EAAOC,EAAUd,EAAIe,CAA0B,EAEjGO,EAASC,GAAY,cAAgB,CAAC,EACtC3B,EAAY,EAAA4B,QAAiB,oBAAoB/B,EAAK6B,CAAM,EAC1D,CAAE,YAAAJ,EAAa,QAAAC,CAAQ,EAAI,MAAME,EAAiB,sBAAsBR,EAAOC,EAAUd,EAAI,CAC7F,GAAGJ,EAAU,MACb,2BAAAmB,CACF,CAAC,GAGH,MAAMjB,EAAqB,MAAMY,EAC/BC,EACAC,EACAC,EACAC,EACAlB,EACAmB,CACF,EAQA,MAAO,CACL,cAPoB,CACpB,YAAAG,EACA,QAAAC,EACA,GAAIf,GAAoB,CAAE,2BAAAW,CAA2B,CACvD,EAIE,mBAAAjB,EACA,UAAAF,CACF,CACF,EAEM6B,EAA6B,MAAO,CACxC,MAAAZ,EACA,SAAAC,EACA,eAAAY,EACA,SAAA/B,EACA,WAAA4B,CACF,IAMM,CAKJ,MAAMI,GAJqB,MAAMhC,EAAS,iBAAiB,eAAekB,EAAOa,CAAc,GAClD,KAC1CE,GAA0DA,EAAI,KAAOd,CACxE,GACsC,KAChC,CAAE,KAAAe,EAAM,YAAAC,EAAa,SAAAC,EAAU,aAAcT,CAAO,EAAIC,EAE9D,MAAO,CACL,WAAAI,EACA,KAAAE,EACA,YAAAC,EACA,SAAUC,GAAY,CAAC,EACvB,OAAQT,GAAU,CAAC,CACrB,CACF,EAEMU,EAA0B,MAAOT,IAC9B,CACL,WAAAA,EACA,WAAYA,EAAW,KACvB,KAAMA,EAAW,QAAQ,KACzB,YAAaA,EAAW,QAAQ,aAAeA,EAAW,YAC1D,SAAUA,EAAW,QAAQ,cAC7B,OAAQA,GAAY,SAAS,eAAe,QAAU,CAAC,EACvD,YAAaA,GAAY,SAAS,WACpC,GAGW3C,EAAqB,MAAOa,EAAcC,EAAeuC,EAAqBtC,IAAuB,CAChH,KAAM,CAAE,MAAAkB,EAAO,gBAAAV,CAAgB,EAAI,EAAAE,QAAa,UAAUX,CAAG,EACvD,CAAE,SAAAoB,EAAU,GAAAd,EAAI,UAAAkC,EAAW,KAAAjC,CAAK,EAAIR,EAAI,OAK9C,OAFmB,MADHQ,IAAS,aAAW,OAASN,EAAS,iBAAmBA,EAAS,kBACjD,cAAckB,EAAOC,EAAUoB,GAAalC,EAAIG,CAAe,CAGlG,EAEMgC,GAAgB,MACpB1C,EACAC,EACA4B,EACAc,EACAzC,EACA0C,IACG,CACH,KAAM,CAAE,SAAAvB,EAAU,GAAAd,CAAG,EAAIP,EAAI,OAG7B,IAAI6C,EAAwC,MAAM,EAAAd,QAAiB,cAAcF,EAAQc,CAAW,EAGpGE,EAAY,QAAU,EAAAC,QAAoB,uBAAuB7C,EAAK4C,EAAY,OAAO,EAGzF,IAAIE,EACJ,OAAI9C,EAAI,OAAO,sBACb8C,EAAsB,MAAM7C,EAAS,2BAA2B,IAAI0C,EAAQvB,EAAUd,EAAI,cAAY,OAAO,GAE3GwC,IACFF,EAAc,EAAAC,QAAoB,iCAChCD,EAAY,QACZA,EAAY,QAAU,CAAC,EACvBE,CACF,GAIFF,EAAY,QAAU,EAAAG,QAAa,2BAA2BH,EAAY,QAAS7C,CAAG,EAE/E,CAAE,YAAA6C,EAAa,oBAAAE,CAAoB,CAC5C,EAQazD,EAAU,MAAO,CAAE,IAAAU,EAAK,IAAAC,EAAK,SAAAC,CAAS,IAA8B,CAC/E,KAAM,CAAE,MAAAkB,CAAM,EAAI,EAAAR,QAAa,UAAUX,CAAG,EACtCgD,EAAc,CAAE,IAAAjD,EAAK,IAAAC,EAAK,MAAAmB,CAAM,EAEhC,CAAE,cAAAhB,EAAe,UAAAD,EAAW,mBAAAE,CAAmB,EAAI,MAAMsB,EAAe,CAC5E,GAAGsB,EACH,iBAAkB/C,EAAS,iBAC3B,iBAAkBA,EAAS,gBAC7B,CAAC,EAED,GAAIE,EAAc,aAAeA,EAAc,QAC7C,MAAMb,EAAY,CAChB,IAAAS,EACA,IAAAC,EACA,SAAAC,EACA,UAAAC,EACA,cAAAC,EACA,mBAAAC,CACF,CAAC,MAED,OAAM,IAAI,MAAM,4BAA4B,EAG9C,OAAOD,CACT,EAEanB,EAAgB,MAAO,CAAE,IAAAe,EAAK,IAAAC,EAAK,SAAAC,CAAS,IAA8B,CACrF,KAAM,CAAE,MAAAkB,EAAO,QAAAX,EAAS,gBAAAC,CAAgB,EAAI,EAAAE,QAAa,UAAUX,CAAG,EAChE,CAAE,SAAAoB,EAAU,GAAAd,EAAI,YAAAkB,EAAa,KAAAjB,CAAK,EAAIR,EAAI,OAEhD,IAAIkD,EAA+ChD,EAAS,iBACxDM,IAAS,aAAW,SAAQ0C,EAAUhD,EAAS,kBAC/CM,IAAS,aAAW,YAAW0C,EAAUhD,EAAS,kBAEtD,MAAMsB,EAAW,MAAM0B,EAAQ,mBAAmB9B,EAAOC,EAAUd,EAAIkB,EAAaf,CAAe,EAE/Fc,GAAYA,EAAS,uBACvB,MAAMtB,EAAS,uBAAuB,aAAauB,EAAahB,EAAQ,GAAI,gBAAc,OAAO,CAErG,EAQapB,EAAgB,MAAO,CAClC,IAAAW,EACA,IAAAC,EACA,SAAAC,EACA,KAAAiD,CACF,IAK4C,CAC1C,GAAI,CACF,KAAM,CAAE,MAAA/B,EAAO,UAAAgC,EAAW,gBAAiBnB,EAAgB,iBAAAtB,EAAkB,QAAAF,CAAQ,EAAI,EAAAG,QAAa,UAAUX,CAAG,EAC7G,CAAE,SAAAoB,EAAU,KAAAb,EAAM,GAAAD,CAAG,EAAIP,EAAI,OAC7B,CAAE,WAAA8B,CAAW,EAAI7B,EAAI,OACrBoD,EAAwBrD,EAAI,MAAM,cAElCsD,EAAoB,CAAE,MAAAlC,EAAO,SAAAC,EAAU,eAAAY,EAAgB,SAAA/B,CAAS,EAEtE,IAAIkC,EACAF,EACAG,EACAkB,EACA1B,EAAqD,CAAC,EACtDS,EACAK,EACAE,EACAE,EAA4C,CAAC,EAajD,GAXIvC,IAAS,aAAW,SACpB,CAAE,KAAA4B,EAAM,WAAAF,EAAY,YAAAG,EAAa,OAAAR,EAAQ,YAAAc,CAAY,EAAI,MAAMJ,EAAwBT,CAAU,GAGjGtB,IAAS,aAAW,YACpB,CAAE,KAAA4B,EAAM,WAAAF,EAAY,YAAAG,EAAa,SAAAC,EAAU,OAAAT,CAAO,EAAI,MAAMG,EAA2B,CACvF,GAAGsB,EACH,WAAAxB,CACF,CAAC,GAGCD,EAAQ,CACV,MAAM2B,EAAa,MAAMd,GAAc1C,EAAKC,EAAK4B,EAAQc,GAAe,GAAOzC,EAAUO,EAAQ,EAAE,EACnGsC,EAAsBS,EAAW,qBAAuBT,EACxDF,EAAcW,EAAW,WAC3B,CAEA,MAAM1C,EAAgC,CACpC,WAAAoB,EACA,KAAAE,EACA,YAAAC,EACA,SAAAhB,EACA,GAAAd,EACA,GAAII,GAAoB,CAAE,eAAAsB,CAAe,EACzC,UAAAmB,EACA,SAAAG,EACA,SAAAjB,EACA,YAAaS,GAAqB,OAAS,EAC3C,cAAAM,EACA,KAAM7C,EACN,oBAAqBP,EAAI,OAAO,mBAClC,EAEA,MAAO,CACL,MAAO,WAAWO,CAAI,GACtB,mBAAoB,kBAAkBA,CAAI,oDAC1C,YAAAqC,EACA,WAAA/B,CACF,CACF,OAAS2C,EAAO,CACd,OAAAN,EAAKM,CAAK,EACH,EACT,CACF,EAEarE,EAAyBY,GAC7B,OAAO,KAAKA,EAAI,IAAI,EACxB,OAAQ0D,GAASA,EAAK,SAAS,UAAU,CAAC,EAC1C,OAAQA,GAAS,CAAC,CAAC1D,EAAI,KAAK0D,CAAI,CAAC,EACjC,IAAKA,IACG,CAAE,KAAMA,EAAM,MAAO1D,EAAI,KAAK0D,CAAI,CAAE,EAC5C,EAGL,IAAOxE,GAAQ,CACb,QAAAI,EACA,cAAAL,EACA,cAAAI,EACA,sBAAAD,EACA,mBAAAD,CACF",
   "names": ["utils_exports", "__export", "cancelRequest", "utils_default", "getDefintionByType", "getFiltersFromReqBody", "renderRequest", "request", "updateStore", "__toCommonJS", "import_utils", "import_localsHelper", "import_reportStoreHelper", "import_UserStoreItemBuilder", "import_UserReports", "import_personalisationUtils", "import_filtersTypeEnum", "req", "res", "services", "queryData", "executionData", "childExecutionData", "search", "id", "type", "dprUser", "definitionsPath", "dpdPathFromQuery", "LocalsHelper", "requestFormData", "reportData", "requestedReportData", "UserStoreItemBuilder", "requestChildReports", "childVariants", "reportingService", "token", "reportId", "dataProductDefinitionsPath", "childVariant", "response", "executionId", "tableId", "requestProduct", "dashboardService", "fields", "definition", "FiltersFormUtils", "renderDashboardRequestData", "definitionPath", "reportName", "def", "name", "description", "sections", "renderReportRequestData", "_next", "variantId", "getFilterData", "interactive", "userId", "filtersData", "PersonalistionUtils", "defaultFilterValues", "FiltersUtils", "requestArgs", "service", "next", "csrfToken", "defaultsSaved", "definitionApiArgs", "template", "filterData", "error", "attr"]
 }

package/dpr/routes/journeys/request-report/filters/utils.ts

@@ -301,7 +301,7 @@ export const request = async ({ req, res, services }: AsyncReportUtilsParams) =>
     reportingService: services.reportingService,
   })
 
-  if (executionData) {
+  if (executionData.executionId && executionData.tableId) {
     await updateStore({
       req,
       res,
@@ -310,6 +310,8 @@ export const request = async ({ req, res, services }: AsyncReportUtilsParams) =>
       executionData,
       childExecutionData,
     })
+  } else {
+    throw new Error('No execution data returned')
   }
 
   return executionData

package/dpr/routes/journeys/request-report/tests.cy.js

@@ -1,2 +1,2 @@
-"use strict";var c=require("../../../../../cypress-tests/cypressUtils");context("Requesting a report",()=>{const o="/embedded/platform/",r=()=>{cy.task("stubReportsSubmittedStatus"),cy.findByRole("strong").contains("SUBMITTED"),cy.task("stubReportsPickedStatus"),cy.findByRole("strong").contains("PICKED"),cy.task("stubReportsStartedStatus"),cy.findByRole("strong").contains("STARTED"),cy.task("stubReportsFinishedStatus")};describe("Successful request",()=>{beforeEach(()=>{(0,c.executeReportStubs)(),cy.task("stubDefinitionRequestExamplesSuccess"),cy.task("stubRequestSuccessResult20"),cy.visit(o)}),it("should succesfully request and load a report",()=>{cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(s,l)=>!!l.textContent?.includes("Successful Report")&&!!l.textContent?.includes("this will succeed")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),cy.url().should("have.string","/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters"),cy.location().should(s=>{expect(s.search).to.contain("filters.field1=value1.2"),expect(s.search).to.contain("filters.field3.start=2003-02-0"),expect(s.search).to.contain("filters.field3.end=2006-05-04"),expect(s.search).to.contain("filters.field7=2005-02-01"),expect(s.search).to.contain("filters.field8=value8.2&filters.field8=value8.3"),expect(s.search).to.contain("sortColumn=field1&sortedAsc=false")}),cy.findByRole("button",{name:"Request report"}).click(),cy.url().should("match",/.*\/embedded\/platform\/dpr\/request-report\/report\/request-examples\/request-example-success\/(.*)\/status/i),r(),cy.url().should("match",/.*\/embedded\/platform\/dpr\/view-report\/async\/report\/request-examples\/request-example-success\/(.*)\/report/i),cy.location().should(s=>{expect(s.search).to.contain("columns=field1&columns=field2&columns=field3&columns=field6&columns=field7")})}),it("should redirect the old request url to the new one",()=>{cy.visit("/embedded/platform/async/report/request-examples/request-example-success/request"),cy.url().should("have.string","/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters"),cy.location().should(l=>{expect(l.search).to.contain("filters.field1=value1.2"),expect(l.search).to.contain("filters.field3.start=2003-02-0"),expect(l.search).to.contain("filters.field3.end=2006-05-04"),expect(l.search).to.contain("filters.field7=2005-02-01"),expect(l.search).to.contain("filters.field8=value8.2&filters.field8=value8.3"),expect(l.search).to.contain("sortColumn=field1&sortedAsc=false")})})}),describe("Failed request",()=>{beforeEach(()=>{(0,c.executeReportStubs)(),cy.task("stubDefinitionRequestExamplesSuccess"),cy.task("stubRequestSuccessResult20"),cy.visit(o)});const s=()=>{cy.task("stubReportsFailedStatus"),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(e,t)=>!!t.textContent?.includes("Successful Report")&&!!t.textContent?.includes("this will succeed")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),cy.findByRole("group",{name:/Field 1/}).findByRole("radio",{checked:!0}).invoke("val").as("field1"),cy.findByRole("combobox",{name:/Field 2/}).invoke("val").as("field2"),cy.findByRole("group",{name:/Field 3/}).within(()=>{cy.findByRole("textbox",{name:/From/}).invoke("val").as("field3From"),cy.findByRole("textbox",{name:/To/}).invoke("val").as("field3To")}),cy.findByRole("combobox",{name:/Field 4/}).invoke("val").as("field4"),cy.findByRole("combobox",{name:/Field 5/}).invoke("val").as("field5"),cy.findByRole("textbox",{name:/Field 6/}).invoke("val").as("field6"),cy.findByRole("textbox",{name:/Field 7/}).invoke("val").as("field7"),cy.findByRole("group",{name:/Field 8/}).within(()=>{cy.findAllByRole("checkbox").each((e,t)=>{cy.wrap(e).invoke("val").as(`field8-${t}`)})}),cy.findByRole("button",{name:"Request report"}).click(),cy.findByRole("button",{name:"Retry"}).click(),cy.findByRole("group",{name:/Field 1/}).findByRole("radio",{checked:!0}).invoke("val").then(e=>{cy.get("@field1").should("equal",e)}),cy.findByRole("combobox",{name:/Field 2/}).invoke("val").then(e=>{cy.get("@field2").should("equal",e)}),cy.findByRole("group",{name:/Field 3/}).within(()=>{cy.findByRole("textbox",{name:/From/}).invoke("val").then(e=>{cy.get("@field3From").should("equal",e)}),cy.findByRole("textbox",{name:/To/}).invoke("val").then(e=>{cy.get("@field3To").should("equal",e)})}),cy.findByRole("combobox",{name:/Field 4/}).invoke("val").then(e=>{cy.get("@field4").should("equal",e)}),cy.findByRole("combobox",{name:/Field 5/}).invoke("val").then(e=>{cy.get("@field5").should("equal",e)}),cy.findByRole("textbox",{name:/Field 6/}).invoke("val").then(e=>{cy.get("@field6").should("equal",e)}),cy.findByRole("textbox",{name:/Field 7/}).invoke("val").then(e=>{cy.get("@field7").should("equal",e)}),cy.findByRole("group",{name:/Field 8/}).within(()=>{cy.findAllByRole("checkbox").each((e,t)=>{cy.wrap(e).invoke("val").then(n=>{cy.get(`@field8-${t}`).should("equal",n)})})})},l=()=>{cy.visit(o),cy.findByRole("tab",{name:/Requested/}).click(),cy.findByLabelText(/Requested/i).within(()=>{cy.findByRole("row",{name:(e,t)=>!!t.textContent?.includes("Successful Report")}).within(()=>{cy.findByRole("link",{name:"Retry"}).should("be.visible"),cy.findByRole("link",{name:"Remove"}).should("be.visible"),cy.findByRole("cell",{name:"FAILED"}).should("be.visible")})}),cy.findByRole("link",{name:"Retry"}).click(),cy.findByText(/Your report has failed to generate/).should("be.visible"),cy.findAllByText(/Successful Report/).should("be.visible"),cy.visit(o),cy.findByRole("tab",{name:/Requested/}).click(),cy.findByLabelText(/Requested/i).within(()=>{cy.findByRole("row",{name:(e,t)=>!!t.textContent?.includes("Successful Report")}).within(()=>{cy.findByRole("link",{name:"Retry"}).click()})}),cy.findByText(/Your report has failed to generate/).should("be.visible"),cy.findAllByText(/Successful Report/).should("be.visible")},i=()=>{cy.url().then(e=>{const t=e.split("/"),n=t[t.length-2],a=`/embedded/platform/async/report/request-examples/request-example-success/request/${n}`;cy.visit(a),cy.url().should("have.string",`/embedded/platform/dpr/request-report/report/request-examples/request-example-success/${n}/status`)})},d=()=>{cy.visit(o),cy.findByRole("tab",{name:/Requested/}).click(),cy.findByLabelText(/Requested/i).within(()=>{cy.findByRole("row",{name:(e,t)=>!!t.textContent?.includes("Successful Report")}).within(()=>{cy.findByRole("link",{name:"Remove"}).click()})}),cy.findByLabelText(/Requested/i).within(()=>{cy.findByRole("row",{name:(e,t)=>!!t.textContent?.includes("Successful Report")}).should("not.exist")})};it("should test out filters, retry/remove and old status url redirects",()=>{s(),l(),i(),d()})}),describe("Aborted request",()=>{const s="/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters?filters.field1=value1.2&filters.field3.start=2003-02-01&filters.field3.end=2006-05-04&filters.field7=2005-02-01&filters.field8=value8.2&filters.field8=value8.3&sortColumn=field1&sortedAsc=false";beforeEach(()=>{(0,c.executeReportStubs)(),cy.task("stubDefinitionRequestExamplesSuccess"),cy.task("stubRequestSuccessResult20"),cy.task("stubCancelAsyncRequest"),cy.visit(o)}),it("should be able to abort the request",()=>{cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(l,i)=>!!i.textContent?.includes("Successful Report")&&!!i.textContent?.includes("this will succeed")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),cy.url().should("have.string","/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters"),cy.findByRole("button",{name:"Request report"}).click(),cy.url().should("match",/.*\/embedded\/platform\/dpr\/request-report\/report\/request-examples\/request-example-success\/(.*)\/status/i),cy.findByRole("button",{name:/Cancel/}).click(),cy.task("stubReportsAbortedStatus"),cy.findByRole("strong").contains("ABORTED"),cy.findByRole("button",{name:/Return to request page/}).click(),cy.url().should("have.string","/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters"),cy.visit(o),cy.findByRole("tab",{name:/Requested/}).click(),cy.findByLabelText(/Requested/i).within(()=>{cy.findByRole("row",{name:(l,i)=>!!i.textContent?.includes("Successful Report")}).within(()=>{cy.findByRole("link",{name:"Retry"}).should("be.visible"),cy.findByRole("link",{name:"Remove"}).should("be.visible"),cy.findByRole("cell",{name:"ABORTED"}).should("be.visible")})}),cy.findByLabelText(/Requested/i).within(()=>{cy.findByRole("row",{name:(l,i)=>!!i.textContent?.includes("Successful Report")}).within(()=>{cy.findByRole("link",{name:"Retry"}).click()})}),cy.url().should("have.string",s),cy.visit(o),cy.findByRole("tab",{name:/Requested/}).click(),cy.findByLabelText(/Requested/i).within(()=>{cy.findByRole("row",{name:(l,i)=>!!i.textContent?.includes("Successful Report")}).within(()=>{cy.findByRole("link",{name:"Remove"}).click()})}),cy.findByLabelText(/Requested/i).within(()=>{cy.findByRole("row",{name:(l,i)=>!!i.textContent?.includes("Successful Report")}).should("not.exist")})})})});
+"use strict";var n=require("../../../../../cypress-tests/cypressUtils");context("Requesting a report",()=>{const o="/embedded/platform/",r=()=>{cy.task("stubReportsSubmittedStatus"),cy.findByRole("strong").contains("SUBMITTED"),cy.task("stubReportsPickedStatus"),cy.findByRole("strong").contains("PICKED"),cy.task("stubReportsStartedStatus"),cy.findByRole("strong").contains("STARTED"),cy.task("stubReportsFinishedStatus")};describe("Successful request",()=>{beforeEach(()=>{(0,n.executeReportStubs)(),cy.task("stubDefinitionRequestExamplesSuccess"),cy.task("stubRequestSuccessResult20"),cy.visit(o)}),it("should succesfully request and load a report",()=>{cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(i,l)=>!!l.textContent?.includes("Successful Report")&&!!l.textContent?.includes("this will succeed")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),cy.url().should("have.string","/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters"),cy.location().should(i=>{expect(i.search).to.contain("filters.field1=value1.2"),expect(i.search).to.contain("filters.field3.start=2003-02-0"),expect(i.search).to.contain("filters.field3.end=2006-05-04"),expect(i.search).to.contain("filters.field7=2005-02-01"),expect(i.search).to.contain("filters.field8=value8.2&filters.field8=value8.3"),expect(i.search).to.contain("sortColumn=field1&sortedAsc=false")}),cy.findByRole("button",{name:"Request report"}).click(),cy.url().should("match",/.*\/embedded\/platform\/dpr\/request-report\/report\/request-examples\/request-example-success\/(.*)\/status/i),r(),cy.url().should("match",/.*\/embedded\/platform\/dpr\/view-report\/async\/report\/request-examples\/request-example-success\/(.*)\/report/i),cy.location().should(i=>{expect(i.search).to.contain("columns=field1&columns=field2&columns=field3&columns=field6&columns=field7")})}),it("should redirect the old request url to the new one",()=>{cy.visit("/embedded/platform/async/report/request-examples/request-example-success/request"),cy.url().should("have.string","/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters"),cy.location().should(l=>{expect(l.search).to.contain("filters.field1=value1.2"),expect(l.search).to.contain("filters.field3.start=2003-02-0"),expect(l.search).to.contain("filters.field3.end=2006-05-04"),expect(l.search).to.contain("filters.field7=2005-02-01"),expect(l.search).to.contain("filters.field8=value8.2&filters.field8=value8.3"),expect(l.search).to.contain("sortColumn=field1&sortedAsc=false")})})}),describe("Failed request",()=>{beforeEach(()=>{(0,n.executeReportStubs)(),cy.task("stubDefinitionRequestExamplesSuccess"),cy.task("stubRequestSuccessResult20"),cy.visit(o)});const i=()=>{cy.task("stubReportsFailedStatus"),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(e,t)=>!!t.textContent?.includes("Successful Report")&&!!t.textContent?.includes("this will succeed")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),cy.findByRole("group",{name:/Field 1/}).findByRole("radio",{checked:!0}).invoke("val").as("field1"),cy.findByRole("combobox",{name:/Field 2/}).invoke("val").as("field2"),cy.findByRole("group",{name:/Field 3/}).within(()=>{cy.findByRole("textbox",{name:/From/}).invoke("val").as("field3From"),cy.findByRole("textbox",{name:/To/}).invoke("val").as("field3To")}),cy.findByRole("combobox",{name:/Field 4/}).invoke("val").as("field4"),cy.findByRole("combobox",{name:/Field 5/}).invoke("val").as("field5"),cy.findByRole("textbox",{name:/Field 6/}).invoke("val").as("field6"),cy.findByRole("textbox",{name:/Field 7/}).invoke("val").as("field7"),cy.findByRole("group",{name:/Field 8/}).within(()=>{cy.findAllByRole("checkbox").each((e,t)=>{cy.wrap(e).invoke("val").as(`field8-${t}`)})}),cy.findByRole("button",{name:"Request report"}).click(),cy.findByRole("button",{name:"Retry"}).click(),cy.findByRole("group",{name:/Field 1/}).findByRole("radio",{checked:!0}).invoke("val").then(e=>{cy.get("@field1").should("equal",e)}),cy.findByRole("combobox",{name:/Field 2/}).invoke("val").then(e=>{cy.get("@field2").should("equal",e)}),cy.findByRole("group",{name:/Field 3/}).within(()=>{cy.findByRole("textbox",{name:/From/}).invoke("val").then(e=>{cy.get("@field3From").should("equal",e)}),cy.findByRole("textbox",{name:/To/}).invoke("val").then(e=>{cy.get("@field3To").should("equal",e)})}),cy.findByRole("combobox",{name:/Field 4/}).invoke("val").then(e=>{cy.get("@field4").should("equal",e)}),cy.findByRole("combobox",{name:/Field 5/}).invoke("val").then(e=>{cy.get("@field5").should("equal",e)}),cy.findByRole("textbox",{name:/Field 6/}).invoke("val").then(e=>{cy.get("@field6").should("equal",e)}),cy.findByRole("textbox",{name:/Field 7/}).invoke("val").then(e=>{cy.get("@field7").should("equal",e)}),cy.findByRole("group",{name:/Field 8/}).within(()=>{cy.findAllByRole("checkbox").each((e,t)=>{cy.wrap(e).invoke("val").then(c=>{cy.get(`@field8-${t}`).should("equal",c)})})})},l=()=>{cy.visit(o),cy.findByRole("tab",{name:/Requested/}).click(),cy.findByLabelText(/Requested/i).within(()=>{cy.findByRole("row",{name:(e,t)=>!!t.textContent?.includes("Successful Report")}).within(()=>{cy.findByRole("link",{name:"Retry"}).should("be.visible"),cy.findByRole("link",{name:"Remove"}).should("be.visible"),cy.findByRole("cell",{name:"FAILED"}).should("be.visible")})}),cy.findByRole("link",{name:"Retry"}).click(),cy.findByText(/Your report has failed to generate/).should("be.visible"),cy.findAllByText(/Successful Report/).should("be.visible"),cy.visit(o),cy.findByRole("tab",{name:/Requested/}).click(),cy.findByLabelText(/Requested/i).within(()=>{cy.findByRole("row",{name:(e,t)=>!!t.textContent?.includes("Successful Report")}).within(()=>{cy.findByRole("link",{name:"Retry"}).click()})}),cy.findByText(/Your report has failed to generate/).should("be.visible"),cy.findAllByText(/Successful Report/).should("be.visible")},s=()=>{cy.url().then(e=>{const t=e.split("/"),c=t[t.length-2],a=`/embedded/platform/async/report/request-examples/request-example-success/request/${c}`;cy.visit(a),cy.url().should("have.string",`/embedded/platform/dpr/request-report/report/request-examples/request-example-success/${c}/status`)})},d=()=>{cy.visit(o),cy.findByRole("tab",{name:/Requested/}).click(),cy.findByLabelText(/Requested/i).within(()=>{cy.findByRole("row",{name:(e,t)=>!!t.textContent?.includes("Successful Report")}).within(()=>{cy.findByRole("link",{name:"Remove"}).click()})}),cy.findByLabelText(/Requested/i).within(()=>{cy.findByRole("row",{name:(e,t)=>!!t.textContent?.includes("Successful Report")}).should("not.exist")})};it("should test out filters, retry/remove and old status url redirects",()=>{i(),l(),s(),d()})}),describe("Aborted request",()=>{const i="/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters?filters.field1=value1.2&filters.field3.start=2003-02-01&filters.field3.end=2006-05-04&filters.field7=2005-02-01&filters.field8=value8.2&filters.field8=value8.3&sortColumn=field1&sortedAsc=false";beforeEach(()=>{(0,n.executeReportStubs)(),cy.task("stubDefinitionRequestExamplesSuccess"),cy.task("stubRequestSuccessResult20"),cy.task("stubCancelAsyncRequest"),cy.visit(o)}),it("should be able to abort the request",()=>{cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(l,s)=>!!s.textContent?.includes("Successful Report")&&!!s.textContent?.includes("this will succeed")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),cy.url().should("have.string","/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters"),cy.findByRole("button",{name:"Request report"}).click(),cy.url().should("match",/.*\/embedded\/platform\/dpr\/request-report\/report\/request-examples\/request-example-success\/(.*)\/status/i),cy.findByRole("button",{name:/Cancel/}).click(),cy.task("stubReportsAbortedStatus"),cy.findByRole("strong").contains("ABORTED"),cy.findByRole("button",{name:/Return to request page/}).click(),cy.url().should("have.string","/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters"),cy.visit(o),cy.findByRole("tab",{name:/Requested/}).click(),cy.findByLabelText(/Requested/i).within(()=>{cy.findByRole("row",{name:(l,s)=>!!s.textContent?.includes("Successful Report")}).within(()=>{cy.findByRole("link",{name:"Retry"}).should("be.visible"),cy.findByRole("link",{name:"Remove"}).should("be.visible"),cy.findByRole("cell",{name:"ABORTED"}).should("be.visible")})}),cy.findByLabelText(/Requested/i).within(()=>{cy.findByRole("row",{name:(l,s)=>!!s.textContent?.includes("Successful Report")}).within(()=>{cy.findByRole("link",{name:"Retry"}).click()})}),cy.url().should("have.string",i),cy.visit(o),cy.findByRole("tab",{name:/Requested/}).click(),cy.findByLabelText(/Requested/i).within(()=>{cy.findByRole("row",{name:(l,s)=>!!s.textContent?.includes("Successful Report")}).within(()=>{cy.findByRole("link",{name:"Remove"}).click()})}),cy.findByLabelText(/Requested/i).within(()=>{cy.findByRole("row",{name:(l,s)=>!!s.textContent?.includes("Successful Report")}).should("not.exist")})})}),describe("Exceution failed",()=>{beforeEach(()=>{(0,n.executeReportStubs)(),cy.visit(o)}),it("should error when execution data is incorrect",()=>{(0,n.requestReportByNameAndDescription)({name:"Execution data error",description:"This will return an error"}),cy.findByRole("heading",{name:/Your report has failed to generate/}).should("be.visible"),cy.visit(o),cy.findByRole("tab",{name:/Requested/}).click(),cy.findByLabelText(/Requested.*/i).within(()=>{cy.findAllByRole("paragraph").contains(/You have 0 requested reports/).should("be.visible")})})})});
 //# sourceMappingURL=tests.cy.js.map

package/dpr/routes/journeys/request-report/tests.cy.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/routes/journeys/request-report/tests.cy.ts"],
-  "sourcesContent": ["import { executeReportStubs } from '../../../../../cypress-tests/cypressUtils'\n\ncontext('Requesting a report', () => {\n  const path = '/embedded/platform/'\n\n  const checkStatuses = () => {\n    cy.task('stubReportsSubmittedStatus')\n    cy.findByRole('strong').contains('SUBMITTED')\n    cy.task('stubReportsPickedStatus')\n    cy.findByRole('strong').contains('PICKED')\n    cy.task('stubReportsStartedStatus')\n    cy.findByRole('strong').contains('STARTED')\n    cy.task('stubReportsFinishedStatus')\n  }\n\n  describe('Successful request', () => {\n    beforeEach(() => {\n      executeReportStubs()\n      cy.task('stubDefinitionRequestExamplesSuccess')\n      cy.task('stubRequestSuccessResult20')\n      cy.visit(path)\n    })\n\n    it('should succesfully request and load a report', () => {\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              Boolean(element.textContent?.includes('Successful Report')) &&\n              Boolean(element.textContent?.includes('this will succeed'))\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request report' }).click()\n        })\n      })\n      cy.url().should(\n        'have.string',\n        '/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters',\n      )\n      cy.location().should((location) => {\n        expect(location.search).to.contain(`filters.field1=value1.2`)\n        expect(location.search).to.contain(`filters.field3.start=2003-02-0`)\n        expect(location.search).to.contain(`filters.field3.end=2006-05-04`)\n        expect(location.search).to.contain(`filters.field7=2005-02-01`)\n        expect(location.search).to.contain(`filters.field8=value8.2&filters.field8=value8.3`)\n        expect(location.search).to.contain(`sortColumn=field1&sortedAsc=false`)\n      })\n\n      cy.findByRole('button', { name: 'Request report' }).click()\n      cy.url().should(\n        'match',\n        /.*\\/embedded\\/platform\\/dpr\\/request-report\\/report\\/request-examples\\/request-example-success\\/(.*)\\/status/i,\n      )\n      checkStatuses()\n      cy.url().should(\n        'match',\n        /.*\\/embedded\\/platform\\/dpr\\/view-report\\/async\\/report\\/request-examples\\/request-example-success\\/(.*)\\/report/i,\n      )\n      cy.location().should((location) => {\n        expect(location.search).to.contain(`columns=field1&columns=field2&columns=field3&columns=field6&columns=field7`)\n      })\n    })\n\n    it('should redirect the old request url to the new one', () => {\n      const oldPath = '/embedded/platform/async/report/request-examples/request-example-success/request'\n      cy.visit(oldPath)\n      cy.url().should(\n        'have.string',\n        '/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters',\n      )\n      cy.location().should((location) => {\n        expect(location.search).to.contain(`filters.field1=value1.2`)\n        expect(location.search).to.contain(`filters.field3.start=2003-02-0`)\n        expect(location.search).to.contain(`filters.field3.end=2006-05-04`)\n        expect(location.search).to.contain(`filters.field7=2005-02-01`)\n        expect(location.search).to.contain(`filters.field8=value8.2&filters.field8=value8.3`)\n        expect(location.search).to.contain(`sortColumn=field1&sortedAsc=false`)\n      })\n    })\n  })\n\n  describe('Failed request', () => {\n    beforeEach(() => {\n      executeReportStubs()\n      cy.task('stubDefinitionRequestExamplesSuccess')\n      cy.task('stubRequestSuccessResult20')\n      cy.visit(path)\n    })\n\n    const testFilterPersistence = () => {\n      cy.task('stubReportsFailedStatus')\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              Boolean(element.textContent?.includes('Successful Report')) &&\n              Boolean(element.textContent?.includes('this will succeed'))\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request report' }).click()\n        })\n      })\n      cy.findByRole('group', { name: /Field 1/ })\n        .findByRole('radio', { checked: true })\n        .invoke('val')\n        .as('field1')\n      cy.findByRole('combobox', { name: /Field 2/ })\n        .invoke('val')\n        .as('field2')\n      cy.findByRole('group', { name: /Field 3/ }).within(() => {\n        cy.findByRole('textbox', { name: /From/ }).invoke('val').as('field3From')\n        cy.findByRole('textbox', { name: /To/ }).invoke('val').as('field3To')\n      })\n      cy.findByRole('combobox', { name: /Field 4/ })\n        .invoke('val')\n        .as('field4')\n      cy.findByRole('combobox', { name: /Field 5/ })\n        .invoke('val')\n        .as('field5')\n      cy.findByRole('textbox', { name: /Field 6/ })\n        .invoke('val')\n        .as('field6')\n      cy.findByRole('textbox', { name: /Field 7/ })\n        .invoke('val')\n        .as('field7')\n      cy.findByRole('group', { name: /Field 8/ }).within(() => {\n        cy.findAllByRole('checkbox').each((el, idx) => {\n          cy.wrap(el).invoke('val').as(`field8-${idx}`)\n        })\n      })\n      cy.findByRole('button', { name: 'Request report' }).click()\n      cy.findByRole('button', { name: 'Retry' }).click()\n\n      cy.findByRole('group', { name: /Field 1/ })\n        .findByRole('radio', { checked: true })\n        .invoke('val')\n        .then((val) => {\n          cy.get('@field1').should('equal', val)\n        })\n      cy.findByRole('combobox', { name: /Field 2/ })\n        .invoke('val')\n        .then((val) => {\n          cy.get('@field2').should('equal', val)\n        })\n      cy.findByRole('group', { name: /Field 3/ }).within(() => {\n        cy.findByRole('textbox', { name: /From/ })\n          .invoke('val')\n          .then((val) => {\n            cy.get('@field3From').should('equal', val)\n          })\n        cy.findByRole('textbox', { name: /To/ })\n          .invoke('val')\n          .then((val) => {\n            cy.get('@field3To').should('equal', val)\n          })\n      })\n      cy.findByRole('combobox', { name: /Field 4/ })\n        .invoke('val')\n        .then((val) => {\n          cy.get('@field4').should('equal', val)\n        })\n      cy.findByRole('combobox', { name: /Field 5/ })\n        .invoke('val')\n        .then((val) => {\n          cy.get('@field5').should('equal', val)\n        })\n      cy.findByRole('textbox', { name: /Field 6/ })\n        .invoke('val')\n        .then((val) => {\n          cy.get('@field6').should('equal', val)\n        })\n      cy.findByRole('textbox', { name: /Field 7/ })\n        .invoke('val')\n        .then((val) => {\n          cy.get('@field7').should('equal', val)\n        })\n      cy.findByRole('group', { name: /Field 8/ }).within(() => {\n        cy.findAllByRole('checkbox').each((el, idx) => {\n          cy.wrap(el)\n            .invoke('val')\n            .then((val) => {\n              cy.get(`@field8-${idx}`).should('equal', val)\n            })\n        })\n      })\n    }\n\n    const testCorrectLinksRetryFailure = () => {\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Requested/ }).click()\n\n      cy.findByLabelText(/Requested/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Successful Report'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Retry' }).should('be.visible')\n          cy.findByRole('link', { name: 'Remove' }).should('be.visible')\n          cy.findByRole('cell', { name: 'FAILED' }).should('be.visible')\n        })\n      })\n      cy.findByRole('link', { name: 'Retry' }).click()\n      cy.findByText(/Your report has failed to generate/).should('be.visible')\n      cy.findAllByText(/Successful Report/).should('be.visible')\n\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Requested/ }).click()\n      cy.findByLabelText(/Requested/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Successful Report'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Retry' }).click()\n        })\n      })\n      cy.findByText(/Your report has failed to generate/).should('be.visible')\n      cy.findAllByText(/Successful Report/).should('be.visible')\n    }\n    const testRedirectsOldStatusUrl = () => {\n      cy.url().then((url) => {\n        const splitUrl = url.split('/')\n        const prevExId = splitUrl[splitUrl.length - 2]\n        const oldPath = `/embedded/platform/async/report/request-examples/request-example-success/request/${prevExId}`\n        cy.visit(oldPath)\n        cy.url().should(\n          'have.string',\n          `/embedded/platform/dpr/request-report/report/request-examples/request-example-success/${prevExId}/status`,\n        )\n      })\n    }\n    const testRemoveItem = () => {\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Requested/ }).click()\n\n      cy.findByLabelText(/Requested/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Successful Report'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Remove' }).click()\n        })\n      })\n\n      cy.findByLabelText(/Requested/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Successful Report'))\n          },\n        }).should('not.exist')\n      })\n    }\n    it('should test out filters, retry/remove and old status url redirects', () => {\n      testFilterPersistence()\n      testCorrectLinksRetryFailure()\n      testRedirectsOldStatusUrl()\n      testRemoveItem()\n    })\n  })\n\n  describe('Aborted request', () => {\n    const filtersHref =\n      '/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters?filters.field1=value1.2&filters.field3.start=2003-02-01&filters.field3.end=2006-05-04&filters.field7=2005-02-01&filters.field8=value8.2&filters.field8=value8.3&sortColumn=field1&sortedAsc=false'\n\n    beforeEach(() => {\n      executeReportStubs()\n      cy.task('stubDefinitionRequestExamplesSuccess')\n      cy.task('stubRequestSuccessResult20')\n      cy.task('stubCancelAsyncRequest')\n      cy.visit(path)\n    })\n\n    it('should be able to abort the request', () => {\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              Boolean(element.textContent?.includes('Successful Report')) &&\n              Boolean(element.textContent?.includes('this will succeed'))\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request report' }).click()\n        })\n      })\n      cy.url().should(\n        'have.string',\n        '/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters',\n      )\n      cy.findByRole('button', { name: 'Request report' }).click()\n\n      cy.url().should(\n        'match',\n        /.*\\/embedded\\/platform\\/dpr\\/request-report\\/report\\/request-examples\\/request-example-success\\/(.*)\\/status/i,\n      )\n\n      cy.findByRole('button', { name: /Cancel/ }).click()\n      cy.task('stubReportsAbortedStatus')\n      cy.findByRole('strong').contains('ABORTED')\n      cy.findByRole('button', { name: /Return to request page/ }).click()\n      cy.url().should(\n        'have.string',\n        '/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters',\n      )\n\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Requested/ }).click()\n\n      cy.findByLabelText(/Requested/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Successful Report'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Retry' }).should('be.visible')\n          cy.findByRole('link', { name: 'Remove' }).should('be.visible')\n          cy.findByRole('cell', { name: 'ABORTED' }).should('be.visible')\n        })\n      })\n\n      cy.findByLabelText(/Requested/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Successful Report'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Retry' }).click()\n        })\n      })\n      cy.url().should('have.string', filtersHref)\n\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Requested/ }).click()\n\n      cy.findByLabelText(/Requested/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Successful Report'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Remove' }).click()\n        })\n      })\n\n      cy.findByLabelText(/Requested/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Successful Report'))\n          },\n        }).should('not.exist')\n      })\n    })\n  })\n})\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { executeReportStubs, requestReportByNameAndDescription } from '../../../../../cypress-tests/cypressUtils'\n\ncontext('Requesting a report', () => {\n  const path = '/embedded/platform/'\n\n  const checkStatuses = () => {\n    cy.task('stubReportsSubmittedStatus')\n    cy.findByRole('strong').contains('SUBMITTED')\n    cy.task('stubReportsPickedStatus')\n    cy.findByRole('strong').contains('PICKED')\n    cy.task('stubReportsStartedStatus')\n    cy.findByRole('strong').contains('STARTED')\n    cy.task('stubReportsFinishedStatus')\n  }\n\n  describe('Successful request', () => {\n    beforeEach(() => {\n      executeReportStubs()\n      cy.task('stubDefinitionRequestExamplesSuccess')\n      cy.task('stubRequestSuccessResult20')\n      cy.visit(path)\n    })\n\n    it('should succesfully request and load a report', () => {\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              Boolean(element.textContent?.includes('Successful Report')) &&\n              Boolean(element.textContent?.includes('this will succeed'))\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request report' }).click()\n        })\n      })\n      cy.url().should(\n        'have.string',\n        '/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters',\n      )\n      cy.location().should((location) => {\n        expect(location.search).to.contain(`filters.field1=value1.2`)\n        expect(location.search).to.contain(`filters.field3.start=2003-02-0`)\n        expect(location.search).to.contain(`filters.field3.end=2006-05-04`)\n        expect(location.search).to.contain(`filters.field7=2005-02-01`)\n        expect(location.search).to.contain(`filters.field8=value8.2&filters.field8=value8.3`)\n        expect(location.search).to.contain(`sortColumn=field1&sortedAsc=false`)\n      })\n\n      cy.findByRole('button', { name: 'Request report' }).click()\n      cy.url().should(\n        'match',\n        /.*\\/embedded\\/platform\\/dpr\\/request-report\\/report\\/request-examples\\/request-example-success\\/(.*)\\/status/i,\n      )\n      checkStatuses()\n      cy.url().should(\n        'match',\n        /.*\\/embedded\\/platform\\/dpr\\/view-report\\/async\\/report\\/request-examples\\/request-example-success\\/(.*)\\/report/i,\n      )\n      cy.location().should((location) => {\n        expect(location.search).to.contain(`columns=field1&columns=field2&columns=field3&columns=field6&columns=field7`)\n      })\n    })\n\n    it('should redirect the old request url to the new one', () => {\n      const oldPath = '/embedded/platform/async/report/request-examples/request-example-success/request'\n      cy.visit(oldPath)\n      cy.url().should(\n        'have.string',\n        '/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters',\n      )\n      cy.location().should((location) => {\n        expect(location.search).to.contain(`filters.field1=value1.2`)\n        expect(location.search).to.contain(`filters.field3.start=2003-02-0`)\n        expect(location.search).to.contain(`filters.field3.end=2006-05-04`)\n        expect(location.search).to.contain(`filters.field7=2005-02-01`)\n        expect(location.search).to.contain(`filters.field8=value8.2&filters.field8=value8.3`)\n        expect(location.search).to.contain(`sortColumn=field1&sortedAsc=false`)\n      })\n    })\n  })\n\n  describe('Failed request', () => {\n    beforeEach(() => {\n      executeReportStubs()\n      cy.task('stubDefinitionRequestExamplesSuccess')\n      cy.task('stubRequestSuccessResult20')\n      cy.visit(path)\n    })\n\n    const testFilterPersistence = () => {\n      cy.task('stubReportsFailedStatus')\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              Boolean(element.textContent?.includes('Successful Report')) &&\n              Boolean(element.textContent?.includes('this will succeed'))\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request report' }).click()\n        })\n      })\n      cy.findByRole('group', { name: /Field 1/ })\n        .findByRole('radio', { checked: true })\n        .invoke('val')\n        .as('field1')\n      cy.findByRole('combobox', { name: /Field 2/ })\n        .invoke('val')\n        .as('field2')\n      cy.findByRole('group', { name: /Field 3/ }).within(() => {\n        cy.findByRole('textbox', { name: /From/ }).invoke('val').as('field3From')\n        cy.findByRole('textbox', { name: /To/ }).invoke('val').as('field3To')\n      })\n      cy.findByRole('combobox', { name: /Field 4/ })\n        .invoke('val')\n        .as('field4')\n      cy.findByRole('combobox', { name: /Field 5/ })\n        .invoke('val')\n        .as('field5')\n      cy.findByRole('textbox', { name: /Field 6/ })\n        .invoke('val')\n        .as('field6')\n      cy.findByRole('textbox', { name: /Field 7/ })\n        .invoke('val')\n        .as('field7')\n      cy.findByRole('group', { name: /Field 8/ }).within(() => {\n        cy.findAllByRole('checkbox').each((el, idx) => {\n          cy.wrap(el).invoke('val').as(`field8-${idx}`)\n        })\n      })\n      cy.findByRole('button', { name: 'Request report' }).click()\n      cy.findByRole('button', { name: 'Retry' }).click()\n\n      cy.findByRole('group', { name: /Field 1/ })\n        .findByRole('radio', { checked: true })\n        .invoke('val')\n        .then((val) => {\n          cy.get('@field1').should('equal', val)\n        })\n      cy.findByRole('combobox', { name: /Field 2/ })\n        .invoke('val')\n        .then((val) => {\n          cy.get('@field2').should('equal', val)\n        })\n      cy.findByRole('group', { name: /Field 3/ }).within(() => {\n        cy.findByRole('textbox', { name: /From/ })\n          .invoke('val')\n          .then((val) => {\n            cy.get('@field3From').should('equal', val)\n          })\n        cy.findByRole('textbox', { name: /To/ })\n          .invoke('val')\n          .then((val) => {\n            cy.get('@field3To').should('equal', val)\n          })\n      })\n      cy.findByRole('combobox', { name: /Field 4/ })\n        .invoke('val')\n        .then((val) => {\n          cy.get('@field4').should('equal', val)\n        })\n      cy.findByRole('combobox', { name: /Field 5/ })\n        .invoke('val')\n        .then((val) => {\n          cy.get('@field5').should('equal', val)\n        })\n      cy.findByRole('textbox', { name: /Field 6/ })\n        .invoke('val')\n        .then((val) => {\n          cy.get('@field6').should('equal', val)\n        })\n      cy.findByRole('textbox', { name: /Field 7/ })\n        .invoke('val')\n        .then((val) => {\n          cy.get('@field7').should('equal', val)\n        })\n      cy.findByRole('group', { name: /Field 8/ }).within(() => {\n        cy.findAllByRole('checkbox').each((el, idx) => {\n          cy.wrap(el)\n            .invoke('val')\n            .then((val) => {\n              cy.get(`@field8-${idx}`).should('equal', val)\n            })\n        })\n      })\n    }\n\n    const testCorrectLinksRetryFailure = () => {\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Requested/ }).click()\n\n      cy.findByLabelText(/Requested/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Successful Report'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Retry' }).should('be.visible')\n          cy.findByRole('link', { name: 'Remove' }).should('be.visible')\n          cy.findByRole('cell', { name: 'FAILED' }).should('be.visible')\n        })\n      })\n      cy.findByRole('link', { name: 'Retry' }).click()\n      cy.findByText(/Your report has failed to generate/).should('be.visible')\n      cy.findAllByText(/Successful Report/).should('be.visible')\n\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Requested/ }).click()\n      cy.findByLabelText(/Requested/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Successful Report'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Retry' }).click()\n        })\n      })\n      cy.findByText(/Your report has failed to generate/).should('be.visible')\n      cy.findAllByText(/Successful Report/).should('be.visible')\n    }\n    const testRedirectsOldStatusUrl = () => {\n      cy.url().then((url) => {\n        const splitUrl = url.split('/')\n        const prevExId = splitUrl[splitUrl.length - 2]\n        const oldPath = `/embedded/platform/async/report/request-examples/request-example-success/request/${prevExId}`\n        cy.visit(oldPath)\n        cy.url().should(\n          'have.string',\n          `/embedded/platform/dpr/request-report/report/request-examples/request-example-success/${prevExId}/status`,\n        )\n      })\n    }\n    const testRemoveItem = () => {\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Requested/ }).click()\n\n      cy.findByLabelText(/Requested/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Successful Report'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Remove' }).click()\n        })\n      })\n\n      cy.findByLabelText(/Requested/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Successful Report'))\n          },\n        }).should('not.exist')\n      })\n    }\n    it('should test out filters, retry/remove and old status url redirects', () => {\n      testFilterPersistence()\n      testCorrectLinksRetryFailure()\n      testRedirectsOldStatusUrl()\n      testRemoveItem()\n    })\n  })\n\n  describe('Aborted request', () => {\n    const filtersHref =\n      '/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters?filters.field1=value1.2&filters.field3.start=2003-02-01&filters.field3.end=2006-05-04&filters.field7=2005-02-01&filters.field8=value8.2&filters.field8=value8.3&sortColumn=field1&sortedAsc=false'\n\n    beforeEach(() => {\n      executeReportStubs()\n      cy.task('stubDefinitionRequestExamplesSuccess')\n      cy.task('stubRequestSuccessResult20')\n      cy.task('stubCancelAsyncRequest')\n      cy.visit(path)\n    })\n\n    it('should be able to abort the request', () => {\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              Boolean(element.textContent?.includes('Successful Report')) &&\n              Boolean(element.textContent?.includes('this will succeed'))\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request report' }).click()\n        })\n      })\n      cy.url().should(\n        'have.string',\n        '/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters',\n      )\n      cy.findByRole('button', { name: 'Request report' }).click()\n\n      cy.url().should(\n        'match',\n        /.*\\/embedded\\/platform\\/dpr\\/request-report\\/report\\/request-examples\\/request-example-success\\/(.*)\\/status/i,\n      )\n\n      cy.findByRole('button', { name: /Cancel/ }).click()\n      cy.task('stubReportsAbortedStatus')\n      cy.findByRole('strong').contains('ABORTED')\n      cy.findByRole('button', { name: /Return to request page/ }).click()\n      cy.url().should(\n        'have.string',\n        '/embedded/platform/dpr/request-report/report/request-examples/request-example-success/filters',\n      )\n\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Requested/ }).click()\n\n      cy.findByLabelText(/Requested/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Successful Report'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Retry' }).should('be.visible')\n          cy.findByRole('link', { name: 'Remove' }).should('be.visible')\n          cy.findByRole('cell', { name: 'ABORTED' }).should('be.visible')\n        })\n      })\n\n      cy.findByLabelText(/Requested/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Successful Report'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Retry' }).click()\n        })\n      })\n      cy.url().should('have.string', filtersHref)\n\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Requested/ }).click()\n\n      cy.findByLabelText(/Requested/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Successful Report'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Remove' }).click()\n        })\n      })\n\n      cy.findByLabelText(/Requested/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Successful Report'))\n          },\n        }).should('not.exist')\n      })\n    })\n  })\n\n  describe('Exceution failed', () => {\n    beforeEach(() => {\n      executeReportStubs()\n      cy.visit(path)\n    })\n\n    it('should error when execution data is incorrect', () => {\n      requestReportByNameAndDescription({ name: 'Execution data error', description: 'This will return an error' })\n\n      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')\n\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Requested/ }).click()\n      cy.findByLabelText(/Requested.*/i).within(() => {\n        cy.findAllByRole('paragraph')\n          .contains(/You have 0 requested reports/)\n          .should('be.visible')\n      })\n    })\n  })\n})\n"],
+  "mappings": "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",
   "names": ["import_cypressUtils", "path", "checkStatuses", "_", "element", "location", "testFilterPersistence", "el", "idx", "val", "testCorrectLinksRetryFailure", "testRedirectsOldStatusUrl", "url", "splitUrl", "prevExId", "oldPath", "testRemoveItem", "filtersHref"]
 }

package/dpr/routes/journeys/request-report/tests.cy.ts

@@ -1,4 +1,4 @@
-import { executeReportStubs } from '../../../../../cypress-tests/cypressUtils'
+import { executeReportStubs, requestReportByNameAndDescription } from '../../../../../cypress-tests/cypressUtils'
 
 context('Requesting a report', () => {
   const path = '/embedded/platform/'
@@ -355,4 +355,25 @@ context('Requesting a report', () => {
       })
     })
   })
+
+  describe('Exceution failed', () => {
+    beforeEach(() => {
+      executeReportStubs()
+      cy.visit(path)
+    })
+
+    it('should error when execution data is incorrect', () => {
+      requestReportByNameAndDescription({ name: 'Execution data error', description: 'This will return an error' })
+
+      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')
+
+      cy.visit(path)
+      cy.findByRole('tab', { name: /Requested/ }).click()
+      cy.findByLabelText(/Requested.*/i).within(() => {
+        cy.findAllByRole('paragraph')
+          .contains(/You have 0 requested reports/)
+          .should('be.visible')
+      })
+    })
+  })
 })

package/dpr/types/ReportQuery.js

@@ -1,2 +1,2 @@
-"use strict";var b=Object.create;var d=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var z=Object.getOwnPropertyNames;var C=Object.getPrototypeOf,F=Object.prototype.hasOwnProperty;var T=(n,i)=>{for(var s in i)d(n,s,{get:i[s],enumerable:!0})},g=(n,i,s,t)=>{if(i&&typeof i=="object"||typeof i=="function")for(let r of z(i))!F.call(n,r)&&r!==s&&d(n,r,{get:()=>i[r],enumerable:!(t=R(i,r))||t.enumerable});return n};var A=(n,i,s)=>(s=n!=null?b(C(n)):{},g(i||!n||!n.__esModule?d(s,"default",{value:n,enumerable:!0}):s,n)),O=n=>g(d({},"__esModule",{value:!0}),n);var v={};T(v,{DEFAULT_FILTERS_PREFIX:()=>D,ReportQuery:()=>m,default:()=>j});module.exports=O(v);var h=require("../utils/urlHelper"),p=A(require("../components/_reports/report-columns-form/utils")),S=require("./UserReports");const D="filters.";class m{constructor({fields:i,template:s,queryParams:t,definitionsPath:r,filtersPrefix:P=D,reportType:x}){if(this.selectedPage=t.selectedPage?Number(t.selectedPage):1,this.pageSize=this.getPageSize(t,s,x),this.sortColumn=t.sortColumn?t.sortColumn.toString():this.getDefaultSortColumn(i),this.sortedAsc=t.sortedAsc!=="false",this.dataProductDefinitionsPath=r??(t.dataProductDefinitionsPath?t.dataProductDefinitionsPath.toString():void 0),this.filtersPrefix=P,t.columns){const e=typeof t.columns=="string"?t.columns.split(","):t.columns;this.columns=p.default.ensureMandatoryColumns(i,e)}else this.columns=i.filter(e=>e.visible).map(e=>e.name);const o=i.find(e=>e.type==="date"&&e.filter&&e.filter.type==="daterange"||e.type==="date"&&e.filter&&e.filter.type==="date");let l,f;o&&o.filter&&(l=o.filter.min,f=o.filter.max),this.filters={},Object.keys(t).filter(e=>e.startsWith(this.filtersPrefix)).filter(e=>t[e]).forEach(e=>{const a=e.replace(this.filtersPrefix,""),u=t[e];let c=u?u.toString():"";a.includes(".start")&&l&&new Date(c)<new Date(l)&&(c=l),a.includes(".end")&&f&&new Date(c)>new Date(f)&&(c=f),c!=="no-filter"&&(this.filters[a]=c)}),o&&o.filter&&o.filter.type==="daterange"&&(l&&Object.keys(t).some(e=>e.includes(this.filtersPrefix))&&Object.keys(t).every(e=>!e.includes(".start"))&&(this.filters[`${o.name}.start`]=l),f&&Object.keys(t).some(e=>e.includes(this.filtersPrefix))&&Object.keys(t).every(e=>!e.includes(".end"))&&(this.filters[`${o.name}.end`]=f)),o&&o.filter&&o.filter.type==="date"&&l&&Object.keys(t).some(e=>e.includes(this.filtersPrefix))&&Object.keys(t).every(e=>!e.includes(o.name))&&(this.filters[`${o.name}.start`]=l)}getDefaultSortColumn(i){const s=i.find(t=>t.defaultsort);return s?s.name:i.find(t=>t.sortable)?.name}getPageSize(i,s,t){let r=5e6;return(!t||t===S.ReportType.REPORT)&&(i.pageSize?r=Number(i.pageSize):s&&(r=this.getDefaultPageSize(s))),r}toRecordWithFilterPrefix(i=!1){const s={selectedPage:this.selectedPage.toString(),...this.pageSize&&{pageSize:this.pageSize.toString()},...this.sortColumn&&{sortColumn:this.sortColumn},sortedAsc:this.sortedAsc.toString(),columns:this.columns};return this.dataProductDefinitionsPath&&(s.dataProductDefinitionsPath=this.dataProductDefinitionsPath),Object.keys(this.filters).forEach(t=>{const r=this.filters[t];(r&&!i||r!==h.clearFilterValue)&&(s[`${this.filtersPrefix}${t}`]=r)}),s}getDefaultPageSize(i){switch(i){case"list-section":case"summary-section":case"row-section-child":case"parent-child":case"parent-child-section":return 5e5;default:return 20}}}var j=m;0&&(module.exports={DEFAULT_FILTERS_PREFIX,ReportQuery});
+"use strict";var b=Object.create;var d=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var z=Object.getOwnPropertyNames;var C=Object.getPrototypeOf,F=Object.prototype.hasOwnProperty;var A=(n,i)=>{for(var s in i)d(n,s,{get:i[s],enumerable:!0})},h=(n,i,s,t)=>{if(i&&typeof i=="object"||typeof i=="function")for(let r of z(i))!F.call(n,r)&&r!==s&&d(n,r,{get:()=>i[r],enumerable:!(t=R(i,r))||t.enumerable});return n};var T=(n,i,s)=>(s=n!=null?b(C(n)):{},h(i||!n||!n.__esModule?d(s,"default",{value:n,enumerable:!0}):s,n)),v=n=>h(d({},"__esModule",{value:!0}),n);var j={};A(j,{DEFAULT_FILTERS_PREFIX:()=>S,ReportQuery:()=>u,default:()=>O});module.exports=v(j);var m=require("../utils/urlHelper"),p=T(require("../components/_reports/report-columns-form/utils")),D=require("./UserReports");const S="filters.";class u{constructor({fields:i,template:s,queryParams:t,definitionsPath:r,filtersPrefix:P=S,reportType:x}){if(this.selectedPage=t.selectedPage?Number(t.selectedPage):1,this.pageSize=this.getPageSize(t,s,x),this.sortColumn=t.sortColumn?t.sortColumn.toString():this.getDefaultSortColumn(i),this.sortedAsc=t.sortedAsc!==void 0?t.sortedAsc!=="false":this.getDefaultSortDirection(i),this.dataProductDefinitionsPath=r??(t.dataProductDefinitionsPath?t.dataProductDefinitionsPath.toString():void 0),this.filtersPrefix=P,t.columns){const e=typeof t.columns=="string"?t.columns.split(","):t.columns;this.columns=p.default.ensureMandatoryColumns(i,e)}else this.columns=i.filter(e=>e.visible).map(e=>e.name);const o=i.find(e=>e.type==="date"&&e.filter&&e.filter.type==="daterange"||e.type==="date"&&e.filter&&e.filter.type==="date");let l,f;o&&o.filter&&(l=o.filter.min,f=o.filter.max),this.filters={},Object.keys(t).filter(e=>e.startsWith(this.filtersPrefix)).filter(e=>t[e]).forEach(e=>{const a=e.replace(this.filtersPrefix,""),g=t[e];let c=g?g.toString():"";a.includes(".start")&&l&&new Date(c)<new Date(l)&&(c=l),a.includes(".end")&&f&&new Date(c)>new Date(f)&&(c=f),c!=="no-filter"&&(this.filters[a]=c)}),o&&o.filter&&o.filter.type==="daterange"&&(l&&Object.keys(t).some(e=>e.includes(this.filtersPrefix))&&Object.keys(t).every(e=>!e.includes(".start"))&&(this.filters[`${o.name}.start`]=l),f&&Object.keys(t).some(e=>e.includes(this.filtersPrefix))&&Object.keys(t).every(e=>!e.includes(".end"))&&(this.filters[`${o.name}.end`]=f)),o&&o.filter&&o.filter.type==="date"&&l&&Object.keys(t).some(e=>e.includes(this.filtersPrefix))&&Object.keys(t).every(e=>!e.includes(o.name))&&(this.filters[`${o.name}.start`]=l)}getDefaultSortColumn(i){const s=i.find(t=>t.defaultsort);return s?s.name:i.find(t=>t.sortable)?.name}getDefaultSortDirection(i){const s=i.find(t=>t.defaultsort);return s&&s.sortDirection?s.sortDirection==="asc":!0}getPageSize(i,s,t){let r=5e6;return(!t||t===D.ReportType.REPORT)&&(i.pageSize?r=Number(i.pageSize):s&&(r=this.getDefaultPageSize(s))),r}toRecordWithFilterPrefix(i=!1){const s={selectedPage:this.selectedPage.toString(),...this.pageSize&&{pageSize:this.pageSize.toString()},...this.sortColumn&&{sortColumn:this.sortColumn},sortedAsc:this.sortedAsc.toString(),columns:this.columns};return this.dataProductDefinitionsPath&&(s.dataProductDefinitionsPath=this.dataProductDefinitionsPath),Object.keys(this.filters).forEach(t=>{const r=this.filters[t];(r&&!i||r!==m.clearFilterValue)&&(s[`${this.filtersPrefix}${t}`]=r)}),s}getDefaultPageSize(i){switch(i){case"list-section":case"summary-section":case"row-section-child":case"parent-child":case"parent-child-section":return 5e5;default:return 20}}}var O=u;0&&(module.exports={DEFAULT_FILTERS_PREFIX,ReportQuery});
 //# sourceMappingURL=ReportQuery.js.map

package/dpr/types/ReportQuery.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/types/ReportQuery.ts"],
-  "sourcesContent": ["import type { ParsedQs } from 'qs'\nimport { FilteredListRequest } from './index'\nimport Dict = NodeJS.Dict\nimport { components } from './api'\nimport { clearFilterValue } from '../utils/urlHelper'\nimport ColumnUtils from '../components/_reports/report-columns-form/utils'\nimport { Template } from './Templates'\nimport { ReportType } from './UserReports'\n\nexport const DEFAULT_FILTERS_PREFIX = 'filters.'\n\nclass ReportQuery implements FilteredListRequest {\n  selectedPage: number\n\n  pageSize: number\n\n  sortColumn?: string | undefined\n\n  columns: Array<string>\n\n  sortedAsc: boolean\n\n  filters: Dict<string>\n\n  filtersPrefix: string\n\n  dataProductDefinitionsPath?: string | undefined\n\n  constructor({\n    fields,\n    template,\n    queryParams,\n    definitionsPath,\n    filtersPrefix = DEFAULT_FILTERS_PREFIX,\n    reportType,\n  }: {\n    fields: components['schemas']['FieldDefinition'][]\n    template?: Template\n    queryParams: ParsedQs\n    definitionsPath?: string\n    filtersPrefix?: string\n    reportType?: ReportType\n  }) {\n    this.selectedPage = queryParams['selectedPage'] ? Number(queryParams['selectedPage']) : 1\n    this.pageSize = this.getPageSize(queryParams, template, reportType)\n    this.sortColumn = queryParams['sortColumn']\n      ? queryParams['sortColumn'].toString()\n      : this.getDefaultSortColumn(fields)\n    this.sortedAsc = queryParams['sortedAsc'] !== 'false'\n    this.dataProductDefinitionsPath =\n      definitionsPath ??\n      (queryParams['dataProductDefinitionsPath'] ? queryParams['dataProductDefinitionsPath'].toString() : undefined)\n    this.filtersPrefix = filtersPrefix\n\n    if (queryParams['columns']) {\n      const columns =\n        typeof queryParams['columns'] === 'string'\n          ? queryParams['columns'].split(',')\n          : (queryParams['columns'] as string[])\n      this.columns = ColumnUtils.ensureMandatoryColumns(fields, columns)\n    } else {\n      this.columns = fields.filter((f) => f.visible).map((f) => f.name)\n    }\n\n    const dateField: components['schemas']['FieldDefinition'] | undefined = fields.find((f) => {\n      return (\n        (f.type === 'date' && f.filter && f.filter.type === 'daterange') ||\n        (f.type === 'date' && f.filter && f.filter.type === 'date')\n      )\n    })\n\n    let min: string | undefined\n    let max: string | undefined\n    if (dateField && dateField.filter) {\n      min = dateField.filter.min\n      max = dateField.filter.max\n    }\n\n    this.filters = {}\n\n    Object.keys(queryParams)\n      .filter((key) => key.startsWith(this.filtersPrefix))\n      .filter((key) => queryParams[key])\n      .forEach((key) => {\n        const filter = key.replace(this.filtersPrefix, '')\n        const p = queryParams[key]\n        let value = p ? p.toString() : ''\n        if (filter.includes('.start') && min) {\n          if (new Date(value) < new Date(min)) value = min\n        }\n        if (filter.includes('.end') && max) {\n          if (new Date(value) > new Date(max)) value = max\n        }\n        if (value !== 'no-filter') {\n          this.filters[filter] = value\n        }\n      })\n\n    if (dateField && dateField.filter && dateField.filter.type === 'daterange') {\n      if (\n        min &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes('.start'))\n      ) {\n        this.filters[`${dateField.name}.start`] = min\n      }\n\n      if (\n        max &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes('.end'))\n      ) {\n        this.filters[`${dateField.name}.end`] = max\n      }\n    }\n\n    if (dateField && dateField.filter && dateField.filter.type === 'date') {\n      if (\n        min &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes(dateField.name))\n      ) {\n        this.filters[`${dateField.name}.start`] = min\n      }\n    }\n  }\n\n  private getDefaultSortColumn(fields: components['schemas']['FieldDefinition'][]) {\n    const defaultSortColumn = fields.find((f) => f.defaultsort)\n    return defaultSortColumn ? defaultSortColumn.name : fields.find((f) => f.sortable)?.name\n  }\n\n  getPageSize(queryParams: ParsedQs, template?: Template, reportType?: ReportType): number {\n    let pageSize = 5000000\n    if (!reportType || reportType === ReportType.REPORT) {\n      if (queryParams['pageSize']) {\n        pageSize = Number(queryParams['pageSize'])\n      } else if (template) {\n        pageSize = this.getDefaultPageSize(template)\n      }\n    }\n    return pageSize\n  }\n\n  toRecordWithFilterPrefix(removeClearedFilters = false): Record<string, string | Array<string>> {\n    const record: Record<string, string | Array<string>> = {\n      selectedPage: this.selectedPage.toString(),\n      ...(this.pageSize && { pageSize: this.pageSize.toString() }),\n      ...(this.sortColumn && { sortColumn: this.sortColumn }),\n      sortedAsc: this.sortedAsc.toString(),\n      columns: this.columns,\n    }\n\n    if (this.dataProductDefinitionsPath) {\n      record['dataProductDefinitionsPath'] = this.dataProductDefinitionsPath\n    }\n\n    Object.keys(this.filters).forEach((filterName) => {\n      const value = this.filters[filterName]\n      if ((value && !removeClearedFilters) || value !== clearFilterValue) {\n        record[`${this.filtersPrefix}${filterName}`] = <string>value\n      }\n    })\n\n    return record\n  }\n\n  private getDefaultPageSize(template: Template) {\n    const maxResultsSize = 500000\n    const standardPage = 20\n\n    switch (template) {\n      case 'list-section':\n      case 'summary-section':\n      case 'row-section-child':\n      case 'parent-child':\n      case 'parent-child-section':\n        return maxResultsSize\n\n      default:\n        return standardPage\n    }\n  }\n}\n\nexport { ReportQuery }\nexport default ReportQuery\n"],
-  "mappings": "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",
-  "names": ["ReportQuery_exports", "__export", "DEFAULT_FILTERS_PREFIX", "ReportQuery", "ReportQuery_default", "__toCommonJS", "import_urlHelper", "import_utils", "import_UserReports", "fields", "template", "queryParams", "definitionsPath", "filtersPrefix", "reportType", "columns", "ColumnUtils", "f", "dateField", "min", "max", "key", "filter", "p", "value", "defaultSortColumn", "pageSize", "removeClearedFilters", "record", "filterName"]
+  "sourcesContent": ["import type { ParsedQs } from 'qs'\nimport { FilteredListRequest } from './index'\nimport Dict = NodeJS.Dict\nimport { components } from './api'\nimport { clearFilterValue } from '../utils/urlHelper'\nimport ColumnUtils from '../components/_reports/report-columns-form/utils'\nimport { Template } from './Templates'\nimport { ReportType } from './UserReports'\n\nexport const DEFAULT_FILTERS_PREFIX = 'filters.'\n\nclass ReportQuery implements FilteredListRequest {\n  selectedPage: number\n\n  pageSize: number\n\n  sortColumn?: string | undefined\n\n  columns: Array<string>\n\n  sortedAsc: boolean\n\n  filters: Dict<string>\n\n  filtersPrefix: string\n\n  dataProductDefinitionsPath?: string | undefined\n\n  constructor({\n    fields,\n    template,\n    queryParams,\n    definitionsPath,\n    filtersPrefix = DEFAULT_FILTERS_PREFIX,\n    reportType,\n  }: {\n    fields: components['schemas']['FieldDefinition'][]\n    template?: Template\n    queryParams: ParsedQs\n    definitionsPath?: string\n    filtersPrefix?: string\n    reportType?: ReportType\n  }) {\n    this.selectedPage = queryParams['selectedPage'] ? Number(queryParams['selectedPage']) : 1\n    this.pageSize = this.getPageSize(queryParams, template, reportType)\n\n    this.sortColumn = queryParams['sortColumn']\n      ? queryParams['sortColumn'].toString()\n      : this.getDefaultSortColumn(fields)\n\n    this.sortedAsc =\n      queryParams['sortedAsc'] !== undefined\n        ? queryParams['sortedAsc'] !== 'false'\n        : this.getDefaultSortDirection(fields)\n\n    this.dataProductDefinitionsPath =\n      definitionsPath ??\n      (queryParams['dataProductDefinitionsPath'] ? queryParams['dataProductDefinitionsPath'].toString() : undefined)\n\n    this.filtersPrefix = filtersPrefix\n\n    if (queryParams['columns']) {\n      const columns =\n        typeof queryParams['columns'] === 'string'\n          ? queryParams['columns'].split(',')\n          : (queryParams['columns'] as string[])\n      this.columns = ColumnUtils.ensureMandatoryColumns(fields, columns)\n    } else {\n      this.columns = fields.filter((f) => f.visible).map((f) => f.name)\n    }\n\n    const dateField: components['schemas']['FieldDefinition'] | undefined = fields.find((f) => {\n      return (\n        (f.type === 'date' && f.filter && f.filter.type === 'daterange') ||\n        (f.type === 'date' && f.filter && f.filter.type === 'date')\n      )\n    })\n\n    let min: string | undefined\n    let max: string | undefined\n    if (dateField && dateField.filter) {\n      min = dateField.filter.min\n      max = dateField.filter.max\n    }\n\n    this.filters = {}\n\n    Object.keys(queryParams)\n      .filter((key) => key.startsWith(this.filtersPrefix))\n      .filter((key) => queryParams[key])\n      .forEach((key) => {\n        const filter = key.replace(this.filtersPrefix, '')\n        const p = queryParams[key]\n        let value = p ? p.toString() : ''\n        if (filter.includes('.start') && min) {\n          if (new Date(value) < new Date(min)) value = min\n        }\n        if (filter.includes('.end') && max) {\n          if (new Date(value) > new Date(max)) value = max\n        }\n        if (value !== 'no-filter') {\n          this.filters[filter] = value\n        }\n      })\n\n    if (dateField && dateField.filter && dateField.filter.type === 'daterange') {\n      if (\n        min &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes('.start'))\n      ) {\n        this.filters[`${dateField.name}.start`] = min\n      }\n\n      if (\n        max &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes('.end'))\n      ) {\n        this.filters[`${dateField.name}.end`] = max\n      }\n    }\n\n    if (dateField && dateField.filter && dateField.filter.type === 'date') {\n      if (\n        min &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes(dateField.name))\n      ) {\n        this.filters[`${dateField.name}.start`] = min\n      }\n    }\n  }\n\n  private getDefaultSortColumn(fields: components['schemas']['FieldDefinition'][]) {\n    const defaultSortColumn = fields.find((f) => f.defaultsort)\n    return defaultSortColumn ? defaultSortColumn.name : fields.find((f) => f.sortable)?.name\n  }\n\n  private getDefaultSortDirection(fields: components['schemas']['FieldDefinition'][]) {\n    const field = fields.find((f) => f.defaultsort)\n    if (field) {\n      return field.sortDirection ? field.sortDirection === 'asc' : true\n    }\n    return true\n  }\n\n  getPageSize(queryParams: ParsedQs, template?: Template, reportType?: ReportType): number {\n    let pageSize = 5000000\n    if (!reportType || reportType === ReportType.REPORT) {\n      if (queryParams['pageSize']) {\n        pageSize = Number(queryParams['pageSize'])\n      } else if (template) {\n        pageSize = this.getDefaultPageSize(template)\n      }\n    }\n    return pageSize\n  }\n\n  toRecordWithFilterPrefix(removeClearedFilters = false): Record<string, string | Array<string>> {\n    const record: Record<string, string | Array<string>> = {\n      selectedPage: this.selectedPage.toString(),\n      ...(this.pageSize && { pageSize: this.pageSize.toString() }),\n      ...(this.sortColumn && { sortColumn: this.sortColumn }),\n      sortedAsc: this.sortedAsc.toString(),\n      columns: this.columns,\n    }\n\n    if (this.dataProductDefinitionsPath) {\n      record['dataProductDefinitionsPath'] = this.dataProductDefinitionsPath\n    }\n\n    Object.keys(this.filters).forEach((filterName) => {\n      const value = this.filters[filterName]\n      if ((value && !removeClearedFilters) || value !== clearFilterValue) {\n        record[`${this.filtersPrefix}${filterName}`] = <string>value\n      }\n    })\n\n    return record\n  }\n\n  private getDefaultPageSize(template: Template) {\n    const maxResultsSize = 500000\n    const standardPage = 20\n\n    switch (template) {\n      case 'list-section':\n      case 'summary-section':\n      case 'row-section-child':\n      case 'parent-child':\n      case 'parent-child-section':\n        return maxResultsSize\n\n      default:\n        return standardPage\n    }\n  }\n}\n\nexport { ReportQuery }\nexport default ReportQuery\n"],
+  "mappings": "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",
+  "names": ["ReportQuery_exports", "__export", "DEFAULT_FILTERS_PREFIX", "ReportQuery", "ReportQuery_default", "__toCommonJS", "import_urlHelper", "import_utils", "import_UserReports", "fields", "template", "queryParams", "definitionsPath", "filtersPrefix", "reportType", "columns", "ColumnUtils", "f", "dateField", "min", "max", "key", "filter", "p", "value", "defaultSortColumn", "field", "pageSize", "removeClearedFilters", "record", "filterName"]
 }

package/dpr/types/ReportQuery.ts

@@ -43,13 +43,20 @@ class ReportQuery implements FilteredListRequest {
   }) {
     this.selectedPage = queryParams['selectedPage'] ? Number(queryParams['selectedPage']) : 1
     this.pageSize = this.getPageSize(queryParams, template, reportType)
+
     this.sortColumn = queryParams['sortColumn']
       ? queryParams['sortColumn'].toString()
       : this.getDefaultSortColumn(fields)
-    this.sortedAsc = queryParams['sortedAsc'] !== 'false'
+
+    this.sortedAsc =
+      queryParams['sortedAsc'] !== undefined
+        ? queryParams['sortedAsc'] !== 'false'
+        : this.getDefaultSortDirection(fields)
+
     this.dataProductDefinitionsPath =
       definitionsPath ??
       (queryParams['dataProductDefinitionsPath'] ? queryParams['dataProductDefinitionsPath'].toString() : undefined)
+
     this.filtersPrefix = filtersPrefix
 
     if (queryParams['columns']) {
@@ -130,6 +137,14 @@ class ReportQuery implements FilteredListRequest {
     return defaultSortColumn ? defaultSortColumn.name : fields.find((f) => f.sortable)?.name
   }
 
+  private getDefaultSortDirection(fields: components['schemas']['FieldDefinition'][]) {
+    const field = fields.find((f) => f.defaultsort)
+    if (field) {
+      return field.sortDirection ? field.sortDirection === 'asc' : true
+    }
+    return true
+  }
+
   getPageSize(queryParams: ParsedQs, template?: Template, reportType?: ReportType): number {
     let pageSize = 5000000
     if (!reportType || reportType === ReportType.REPORT) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ministryofjustice/hmpps-digital-prison-reporting-frontend",
   "description": "The Digital Prison Reporting Frontend contains templates and code to help display data effectively in UI applications.",
-  "version": "4.22.1",
+  "version": "4.22.3",
   "main": "dpr/all.mjs",
   "sass": "dpr/all.scss",
   "engines": {