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

package/dpr/components/user-reports/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/dpr/components/user-reports/utils.ts"],
-  "sourcesContent": ["import { Response, Request } from 'express'\nimport dayjs from 'dayjs'\nimport { RenderTableListResponse } from './types'\nimport Dict = NodeJS.Dict\nimport {\n  FormattedUserReportData,\n  UserReportData,\n  RequestStatus,\n  ReportType,\n  RequestedReport,\n  StoredReportData,\n} from '../../types/UserReports'\nimport { FilterValue } from '../_filters/types'\nimport { Services } from '../../types/Services'\n\nimport { AsyncReportUtilsParams } from '../../types/AsyncReportUtils'\nimport { getExpiredStatus } from '../../utils/requestStatusHelper'\nimport SelectedFiltersUtils from '../_filters/filters-selected/utils'\nimport FiltersUtils from '../_filters/utils'\nimport { itemActionsHtml, createListItemProduct } from '../../utils/reportListsHelper'\nimport RequestedReportUtils from './requested/utils'\nimport RecentlyViewedCardGroupUtils from './viewed/utils'\nimport BookmarklistUtils from './bookmarks/utils'\nimport LocalsHelper from '../../utils/localsHelper'\nimport DateMapper from '../../utils/DateMapper/DateMapper'\nimport UserStoreItemBuilder from '../../utils/UserStoreItemBuilder'\n\nconst formatData = (reportData: UserReportData): FormattedUserReportData => {\n  const reportDataCopy: UserReportData = JSON.parse(JSON.stringify(reportData))\n\n  const {\n    executionId,\n    tableId,\n    variantName,\n    name,\n    reportId,\n    variantId,\n    id,\n    description,\n    query,\n    interactiveQuery,\n    status,\n    timestamp,\n    reportName,\n    dataProductDefinitionsPath,\n    type: reportType,\n    url,\n  } = reportDataCopy\n\n  let summary: { name: string; value: string }[] = []\n  if (query) {\n    summary = query.summary as { name: string; value: string }[]\n  }\n  let interactiveSummary: { name: string; value: string }[] = []\n  if (interactiveQuery) {\n    interactiveSummary = interactiveQuery.summary as { name: string; value: string }[]\n  }\n\n  const type = reportType || ReportType.REPORT\n\n  return {\n    id: executionId,\n    text: name || variantName,\n    reportName,\n    description,\n    tag: 'MIS',\n    summary,\n    interactiveSummary,\n    timestamp,\n    status,\n    type,\n    ...setDataFromStatus(status, reportDataCopy),\n    meta: {\n      reportId,\n      id: variantId || id,\n      executionId,\n      tableId,\n      status,\n      type,\n      dataProductDefinitionsPath,\n      pollingUrl: url.polling?.pathname,\n      reportUrl: url.report?.pathname,\n    },\n  }\n}\n\nconst formatTable = (data: FormattedUserReportData[], type: 'requested' | 'viewed') => {\n  const rows = data.map((card: FormattedUserReportData) => {\n    return formatTableRow(card, type)\n  })\n\n  return {\n    rows,\n    head: [\n      { text: 'Product', classes: 'dpr-req-product-head' },\n      { text: 'Filters', classes: 'dpr-req-filters-head' },\n      { text: 'Status', classes: 'dpr-req-status-head' },\n      { text: 'Actions', classes: 'dpr-req-actions-head' },\n    ],\n  }\n}\n\nconst formatTableRow = (data: FormattedUserReportData, type: 'requested' | 'viewed') => {\n  let statusClass\n  let itemActions = ''\n\n  const { href, id, reportName, text, timestamp, type: reportType, status } = data\n  switch (status) {\n    case RequestStatus.FAILED:\n      statusClass = 'govuk-tag--red'\n      itemActions = itemActionsHtml(href, id, type, status)\n      break\n    case RequestStatus.EXPIRED:\n      statusClass = 'govuk-tag--grey'\n      itemActions = itemActionsHtml(href, id, type, status)\n      break\n    case RequestStatus.ABORTED:\n      statusClass = 'govuk-tag--orange'\n      itemActions = itemActionsHtml(href, id, type, status)\n      break\n    case RequestStatus.READY:\n    case RequestStatus.FINISHED:\n      itemActions = `<a class=govuk-link govuk-link--no-visited-state dpr-type__${reportType}' href=\"${href}\">Go to ${reportType}</a>`\n      statusClass = 'govuk-tag--green'\n      break\n    case RequestStatus.PICKED:\n    case RequestStatus.SUBMITTED:\n    case RequestStatus.STARTED:\n      itemActions = `<a class='govuk-link govuk-link--no-visited-state dpr-type__${reportType}' href=\"${href}\">Go to status</a>`\n      break\n    default:\n      break\n  }\n\n  let filtersSummary = ''\n  if (data.summary || data.interactiveSummary) {\n    filtersSummary = createSummaryHtml(data)\n  }\n\n  return [\n    {\n      html: createListItemProduct(reportName, text, reportType, timestamp),\n    },\n    { html: filtersSummary },\n    {\n      html: `<strong class=\"govuk-tag dpr-request-status-tag ${statusClass}\">${status}</strong>`,\n      classes: 'dpr-req-cell dpr-req-cell__status',\n    },\n    {\n      html: `${itemActions}`,\n      classes: 'dpr-req-cell dpr-req-cell__status',\n    },\n  ]\n}\n\nconst getTotals = (formattedCount: number, maxRows: number) => {\n  return {\n    amount: formattedCount,\n    shown: formattedCount > maxRows ? maxRows : formattedCount,\n    max: maxRows,\n  }\n}\n\nconst createSummaryHtml = (data: FormattedUserReportData) => {\n  const summaryHtml = data.summary\n    ?.map((item) => `<li class=\"govuk-body-s dpr-query-summary\"><strong>${item.name}</strong>: ${item.value}</li>`)\n    .join('')\n\n  const interactiveSummaryHtml = data.interactiveSummary\n    ?.map(\n      (item) =>\n        `<li class=\"govuk-body-s dpr-interactive-query-summary\"><strong>${item.name}</strong>: ${item.value}</li>`,\n    )\n    .join('')\n\n  return `<ul class=\"dpr-card-group__item__filters-list govuk-!-margin-top-0 govuk-!-margin-bottom-0\">${summaryHtml}${interactiveSummaryHtml}</ul>`\n}\n\nconst getMeta = (formattedData: FormattedUserReportData[], res: Response) => {\n  const { nestedBaseUrl } = LocalsHelper.getValues(res)\n\n  return formattedData.map((d) => {\n    return {\n      reportId: d.meta.reportId,\n      id: d.meta.id,\n      executionId: d.meta.executionId,\n      tableId: d.meta.tableId,\n      status: d.meta.status,\n      requestedAt: d.meta.requestedAt,\n      type: d.meta.type,\n      dataProductDefinitionsPath: d.meta.dataProductDefinitionsPath,\n      pollingUrl: d.meta.pollingUrl,\n      reportUrl: d.meta.reportUrl,\n      nestedBaseUrl,\n    }\n  })\n}\n\nexport const setDataFromStatus = (status: RequestStatus, reportsData: UserReportData) => {\n  let timestamp\n  let href\n  let formattedDate\n  const { url, timestamp: time } = reportsData\n  const dateMapper = new DateMapper()\n  switch (status) {\n    case RequestStatus.FAILED: {\n      formattedDate = time.failed\n        ? dateMapper.toDateString(<string>(<unknown>time.failed), 'local-date')\n        : dayjs().format('DD/MM/YYYY')\n      href = `${url.polling.fullUrl}`\n      timestamp = `Failed at: ${formattedDate}`\n      break\n    }\n    case RequestStatus.ABORTED: {\n      href = `${url.request.fullUrl}`\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.aborted), 'local-date')\n      timestamp = `Aborted at: ${formattedDate}`\n      break\n    }\n    case RequestStatus.FINISHED:\n      href = url.report.fullUrl\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.completed), 'local-date')\n      timestamp = `Ready at: ${formattedDate}`\n      break\n    case RequestStatus.EXPIRED: {\n      href = `${url.request.fullUrl}`\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.expired), 'local-date')\n      timestamp = `Expired at: ${formattedDate}`\n      break\n    }\n    case RequestStatus.READY: {\n      href = `${url.report.fullUrl}`\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.lastViewed), 'local-date')\n      timestamp = `Last viewed: ${formattedDate}`\n      break\n    }\n    case RequestStatus.SUBMITTED:\n    case RequestStatus.STARTED:\n    case RequestStatus.PICKED:\n      href = url.polling.fullUrl\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.requested), 'local-date')\n      timestamp = `Requested at: ${formattedDate}`\n      break\n    default:\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.lastViewed), 'local-date')\n      timestamp = `Last viewed: ${formattedDate}`\n      break\n  }\n\n  return {\n    timestamp,\n    href,\n  }\n}\n\nexport const renderList = async ({\n  res,\n  reportsData,\n  maxRows,\n  filterFunction,\n  type,\n}: {\n  res: Response\n  reportsData: StoredReportData[]\n  maxRows?: number\n  filterFunction: (report: UserReportData) => boolean\n  type: 'requested' | 'viewed'\n}): Promise<RenderTableListResponse> => {\n  const { csrfToken } = LocalsHelper.getValues(res)\n\n  let formatted = reportsData.filter(filterFunction).map(formatData)\n  const formattedCount = formatted.length\n\n  if (maxRows) formatted = formatted.slice(0, maxRows)\n  const tableData = formatTable(formatted, type)\n\n  const path = type === 'requested' ? 'requested-reports' : 'recently-viewed'\n  const head = {\n    ...(formatted.length && { href: `dpr/my-reports/${path}/list` }),\n    ...(!formatted.length && { emptyMessage: `You have 0 ${type} reports` }),\n  }\n\n  const result = {\n    head,\n    tableData,\n    total: getTotals(formattedCount, maxRows),\n    meta: getMeta(formatted, res),\n    csrfToken,\n    maxRows,\n  }\n\n  return result\n}\n\nexport const updateExpiredStatus = async ({ req, res, services }: AsyncReportUtilsParams) => {\n  const { dprUser } = LocalsHelper.getValues(res)\n  const report = await getExpiredStatus({ req, res, services })\n\n  if (report && report.isExpired) {\n    await services.recentlyViewedService.setToExpired(report.executionId, dprUser.id)\n    await services.requestedReportService.setToExpired(report.executionId, dprUser.id)\n  }\n\n  return report ? report.isExpired : false\n}\n\nexport const init = async ({\n  services,\n  res,\n  req,\n  maxRows = 6,\n}: {\n  services: Services\n  res: Response\n  req: Request\n  maxRows?: number\n}) => {\n  const { requestedReports, recentlyViewedReports, bookmarkingEnabled } = LocalsHelper.getValues(res)\n  const requestedReportsList = await renderList({\n    res,\n    reportsData: requestedReports,\n    filterFunction: RequestedReportUtils.filterReports,\n    maxRows,\n    type: 'requested',\n  })\n  const viewedReportsList = await renderList({\n    res,\n    reportsData: recentlyViewedReports,\n    filterFunction: RecentlyViewedCardGroupUtils.filterReports,\n    maxRows,\n    type: 'viewed',\n  })\n\n  let bookmarks\n  if (bookmarkingEnabled) {\n    bookmarks = await BookmarklistUtils.renderBookmarkList({\n      res,\n      req,\n      services,\n      maxRows,\n    })\n  }\n\n  return {\n    requestedReports: requestedReportsList,\n    viewedReports: viewedReportsList,\n    bookmarks,\n  }\n}\n\nexport const updateLastViewed = async ({\n  req,\n  services,\n  reportStateData,\n  userId,\n  filters,\n}: {\n  req: Request\n  services: Services\n  reportStateData: RequestedReport\n  userId: string\n  filters: FilterValue[]\n}) => {\n  const { type, reportId, reportName, description, id, name, executionId, tableId, query, url } = reportStateData\n  const reportData = { type, reportId, reportName, description, id, name }\n  const executionData = { executionId, tableId }\n  const queryData = query ? { query: query.data, querySummary: query.summary } : { query: {}, querySummary: [] }\n\n  const columns = <string[]>req.query?.columns\n  const { selectedPage, pageSize, sortColumn, sortedAsc } = <Dict<string>>req.query\n  const filtersQuery = FiltersUtils.setRequestQueryFromFilterValues(filters)\n  const reqQuery = {\n    ...filtersQuery,\n    ...(columns && { columns }),\n    ...(selectedPage && { selectedPage }),\n    ...(pageSize && { pageSize }),\n    ...(sortColumn && { sortColumn }),\n    ...(sortedAsc && { sortedAsc }),\n  }\n  const interactiveQueryData: { query: Dict<string | string[]>; querySummary: Array<Dict<string>> } = {\n    query: reqQuery,\n    querySummary: SelectedFiltersUtils.getQuerySummary(filtersQuery, filters),\n  }\n\n  const recentlyViewedData = new UserStoreItemBuilder(reportData)\n    .addExecutionData(executionData)\n    .addQuery(queryData)\n    .addInteractiveQuery(interactiveQueryData)\n    .addStatus(RequestStatus.READY)\n    .addTimestamp()\n    .addAsyncUrls(url)\n    .addReportUrls(req)\n    .build()\n\n  await services.requestedReportService.updateLastViewed(reportStateData.executionId, userId)\n  await services.recentlyViewedService.setRecentlyViewed(recentlyViewedData, userId)\n}\n\nexport default {\n  renderList,\n  updateExpiredStatus,\n  init,\n  updateLastViewed,\n}\n"],
-  "mappings": "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",
-  "names": ["utils_exports", "__export", "utils_default", "init", "renderList", "setDataFromStatus", "updateExpiredStatus", "updateLastViewed", "__toCommonJS", "import_dayjs", "import_UserReports", "import_requestStatusHelper", "import_utils", "import_reportListsHelper", "import_localsHelper", "import_DateMapper", "import_UserStoreItemBuilder", "formatData", "reportData", "reportDataCopy", "executionId", "tableId", "variantName", "name", "reportId", "variantId", "id", "description", "query", "interactiveQuery", "status", "timestamp", "reportName", "dataProductDefinitionsPath", "reportType", "url", "summary", "interactiveSummary", "type", "formatTable", "data", "card", "formatTableRow", "statusClass", "itemActions", "href", "text", "filtersSummary", "createSummaryHtml", "getTotals", "formattedCount", "maxRows", "summaryHtml", "item", "interactiveSummaryHtml", "getMeta", "formattedData", "res", "nestedBaseUrl", "LocalsHelper", "d", "reportsData", "formattedDate", "time", "dateMapper", "DateMapper", "dayjs", "filterFunction", "csrfToken", "formatted", "tableData", "path", "req", "services", "dprUser", "report", "requestedReports", "recentlyViewedReports", "bookmarkingEnabled", "requestedReportsList", "RequestedReportUtils", "viewedReportsList", "RecentlyViewedCardGroupUtils", "bookmarks", "BookmarklistUtils", "reportStateData", "userId", "filters", "executionData", "queryData", "columns", "selectedPage", "pageSize", "sortColumn", "sortedAsc", "filtersQuery", "FiltersUtils", "interactiveQueryData", "SelectedFiltersUtils", "recentlyViewedData", "UserStoreItemBuilder"]
+  "sourcesContent": ["import { Response, Request } from 'express'\nimport dayjs from 'dayjs'\nimport { RenderTableListResponse } from './types'\nimport Dict = NodeJS.Dict\nimport {\n  FormattedUserReportData,\n  UserReportData,\n  RequestStatus,\n  ReportType,\n  RequestedReport,\n  StoredReportData,\n  meta,\n} from '../../types/UserReports'\nimport { FilterValue } from '../_filters/types'\nimport { Services } from '../../types/Services'\n\nimport { AsyncReportUtilsParams } from '../../types/AsyncReportUtils'\nimport { getExpiredStatus } from '../../utils/requestStatusHelper'\nimport SelectedFiltersUtils from '../_filters/filters-selected/utils'\nimport FiltersUtils from '../_filters/utils'\nimport { itemActionsHtml, createListItemProduct } from '../../utils/reportListsHelper'\nimport RequestedReportUtils from './requested/utils'\nimport RecentlyViewedCardGroupUtils from './viewed/utils'\nimport BookmarklistUtils from './bookmarks/utils'\nimport LocalsHelper from '../../utils/localsHelper'\nimport DateMapper from '../../utils/DateMapper/DateMapper'\nimport UserStoreItemBuilder from '../../utils/UserStoreItemBuilder'\n\nconst formatData = (reportData: UserReportData): FormattedUserReportData => {\n  const reportDataCopy: UserReportData = JSON.parse(JSON.stringify(reportData))\n\n  const {\n    executionId,\n    tableId,\n    variantName,\n    name,\n    reportId,\n    variantId,\n    id,\n    description,\n    query,\n    interactiveQuery,\n    status,\n    reportName,\n    dataProductDefinitionsPath,\n    type: reportType,\n    url,\n  } = reportDataCopy\n\n  let summary: { name: string; value: string }[] = []\n  if (query) {\n    summary = query.summary as { name: string; value: string }[]\n  }\n  let interactiveSummary: { name: string; value: string }[] = []\n  if (interactiveQuery) {\n    interactiveSummary = interactiveQuery.summary as { name: string; value: string }[]\n  }\n\n  const type = reportType || ReportType.REPORT\n\n  return {\n    id: executionId,\n    text: name || variantName || '',\n    reportName,\n    description,\n    tag: 'MIS',\n    summary,\n    interactiveSummary,\n    status,\n    type,\n    ...(status && setDataFromStatus(status, reportDataCopy)),\n    meta: {\n      reportId,\n      id: variantId || id,\n      executionId,\n      tableId,\n      status,\n      type,\n      dataProductDefinitionsPath,\n      pollingUrl: url?.polling?.pathname,\n      reportUrl: url?.report?.pathname,\n    },\n  }\n}\n\nconst formatTable = (data: FormattedUserReportData[], type: 'requested' | 'viewed') => {\n  const rows = data.map((card: FormattedUserReportData) => {\n    return formatTableRow(card, type)\n  })\n\n  return {\n    rows,\n    head: [\n      { text: 'Product', classes: 'dpr-req-product-head' },\n      { text: 'Filters', classes: 'dpr-req-filters-head' },\n      { text: 'Status', classes: 'dpr-req-status-head' },\n      { text: 'Actions', classes: 'dpr-req-actions-head' },\n    ],\n  }\n}\n\nconst formatTableRow = (data: FormattedUserReportData, type: 'requested' | 'viewed') => {\n  let statusClass\n  let itemActions = ''\n\n  const { href, id, reportName, text, timestamp, type: reportType, status } = data\n  if (href && id) {\n    switch (status) {\n      case RequestStatus.FAILED:\n        statusClass = 'govuk-tag--red'\n        itemActions = itemActionsHtml(href, id, type, status)\n        break\n      case RequestStatus.EXPIRED:\n        statusClass = 'govuk-tag--grey'\n        itemActions = itemActionsHtml(href, id, type, status)\n        break\n      case RequestStatus.ABORTED:\n        statusClass = 'govuk-tag--orange'\n        itemActions = itemActionsHtml(href, id, type, status)\n        break\n      case RequestStatus.READY:\n      case RequestStatus.FINISHED:\n        itemActions = `<a class=govuk-link govuk-link--no-visited-state dpr-type__${reportType}' href=\"${href}\">Go to ${reportType}</a>`\n        statusClass = 'govuk-tag--green'\n        break\n      case RequestStatus.PICKED:\n      case RequestStatus.SUBMITTED:\n      case RequestStatus.STARTED:\n        itemActions = `<a class='govuk-link govuk-link--no-visited-state dpr-type__${reportType}' href=\"${href}\">Go to status</a>`\n        break\n      default:\n        break\n    }\n  }\n\n  let filtersSummary = ''\n  if (data.summary || data.interactiveSummary) {\n    filtersSummary = createSummaryHtml(data)\n  }\n\n  return [\n    {\n      html: createListItemProduct(reportName, text, reportType, timestamp),\n    },\n    { html: filtersSummary },\n    {\n      html: `<strong class=\"govuk-tag dpr-request-status-tag ${statusClass}\">${status}</strong>`,\n      classes: 'dpr-req-cell dpr-req-cell__status',\n    },\n    {\n      html: `${itemActions}`,\n      classes: 'dpr-req-cell dpr-req-cell__status',\n    },\n  ]\n}\n\nconst getTotals = (formattedCount: number, maxRows = 20) => {\n  return {\n    amount: formattedCount,\n    shown: maxRows && formattedCount > maxRows ? maxRows : formattedCount,\n    max: maxRows,\n  }\n}\n\nconst createSummaryHtml = (data: FormattedUserReportData) => {\n  const summaryHtml = data.summary\n    ?.map((item) => `<li class=\"govuk-body-s dpr-query-summary\"><strong>${item.name}</strong>: ${item.value}</li>`)\n    .join('')\n\n  const interactiveSummaryHtml = data.interactiveSummary\n    ?.map(\n      (item) =>\n        `<li class=\"govuk-body-s dpr-interactive-query-summary\"><strong>${item.name}</strong>: ${item.value}</li>`,\n    )\n    .join('')\n\n  return `<ul class=\"dpr-card-group__item__filters-list govuk-!-margin-top-0 govuk-!-margin-bottom-0\">${summaryHtml}${interactiveSummaryHtml}</ul>`\n}\n\nconst getMeta = (formattedData: FormattedUserReportData[], res: Response): meta[] => {\n  const { nestedBaseUrl } = LocalsHelper.getValues(res)\n\n  return formattedData.map((d) => {\n    return {\n      reportId: d.meta?.reportId,\n      id: d.meta.id,\n      executionId: d.meta.executionId,\n      tableId: d.meta.tableId,\n      status: d.meta.status,\n      requestedAt: d.meta.requestedAt,\n      type: d.meta.type,\n      dataProductDefinitionsPath: d.meta.dataProductDefinitionsPath,\n      pollingUrl: d.meta.pollingUrl,\n      reportUrl: d.meta.reportUrl,\n      nestedBaseUrl,\n    }\n  })\n}\n\nexport const setDataFromStatus = (status: RequestStatus, reportsData: UserReportData) => {\n  let timestamp\n  let href\n  let formattedDate\n  const { url, timestamp: time } = reportsData\n  const polling = url?.polling\n  const request = url?.request\n  const report = url?.report\n\n  const dateMapper = new DateMapper()\n  switch (status) {\n    case RequestStatus.FAILED: {\n      formattedDate = time.failed\n        ? dateMapper.toDateString(<string>(<unknown>time.failed), 'local-date')\n        : dayjs().format('DD/MM/YYYY')\n      href = polling?.fullUrl\n      timestamp = `Failed at: ${formattedDate}`\n      break\n    }\n    case RequestStatus.ABORTED: {\n      href = request?.fullUrl\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.aborted), 'local-date')\n      timestamp = `Aborted at: ${formattedDate}`\n      break\n    }\n    case RequestStatus.FINISHED:\n      href = report?.fullUrl\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.completed), 'local-date')\n      timestamp = `Ready at: ${formattedDate}`\n      break\n    case RequestStatus.EXPIRED: {\n      href = request?.fullUrl\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.expired), 'local-date')\n      timestamp = `Expired at: ${formattedDate}`\n      break\n    }\n    case RequestStatus.READY: {\n      href = report?.fullUrl\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.lastViewed), 'local-date')\n      timestamp = `Last viewed: ${formattedDate}`\n      break\n    }\n    case RequestStatus.SUBMITTED:\n    case RequestStatus.STARTED:\n    case RequestStatus.PICKED:\n      href = polling?.fullUrl\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.requested), 'local-date')\n      timestamp = `Requested at: ${formattedDate}`\n      break\n    default:\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.lastViewed), 'local-date')\n      timestamp = `Last viewed: ${formattedDate}`\n      break\n  }\n\n  return {\n    timestamp,\n    href,\n  }\n}\n\nexport const renderList = async ({\n  res,\n  reportsData,\n  maxRows,\n  filterFunction,\n  type,\n}: {\n  res: Response\n  reportsData: StoredReportData[]\n  maxRows?: number\n  filterFunction: (report: UserReportData) => boolean\n  type: 'requested' | 'viewed'\n}): Promise<RenderTableListResponse> => {\n  const { csrfToken } = LocalsHelper.getValues(res)\n\n  let formatted = reportsData.filter(filterFunction).map(formatData)\n  const formattedCount = formatted.length\n\n  if (maxRows) formatted = formatted.slice(0, maxRows)\n  const tableData = formatTable(formatted, type)\n\n  const path = type === 'requested' ? 'requested-reports' : 'recently-viewed'\n  const head = {\n    ...(formatted.length && { href: `dpr/my-reports/${path}/list` }),\n    ...(!formatted.length && { emptyMessage: `You have 0 ${type} reports` }),\n  }\n\n  const result: RenderTableListResponse = {\n    head,\n    tableData,\n    total: getTotals(formattedCount, maxRows),\n    meta: getMeta(formatted, res),\n    csrfToken,\n    ...(maxRows && { maxRows }),\n  }\n\n  return result\n}\n\nexport const updateExpiredStatus = async ({ req, res, services }: AsyncReportUtilsParams) => {\n  const { dprUser } = LocalsHelper.getValues(res)\n  const report = await getExpiredStatus({ req, res, services })\n\n  if (report && report.isExpired) {\n    await services.recentlyViewedService.setToExpired(report.executionId, dprUser.id)\n    await services.requestedReportService.setToExpired(report.executionId, dprUser.id)\n  }\n\n  return report ? report.isExpired : false\n}\n\nexport const init = async ({ services, res, maxRows = 6 }: { services: Services; res: Response; maxRows?: number }) => {\n  const { requestedReports, recentlyViewedReports, bookmarkingEnabled } = LocalsHelper.getValues(res)\n  const requestedReportsList = await renderList({\n    res,\n    reportsData: requestedReports,\n    filterFunction: RequestedReportUtils.filterReports,\n    maxRows,\n    type: 'requested',\n  })\n  const viewedReportsList = await renderList({\n    res,\n    reportsData: recentlyViewedReports,\n    filterFunction: RecentlyViewedCardGroupUtils.filterReports,\n    maxRows,\n    type: 'viewed',\n  })\n\n  let bookmarks\n  if (bookmarkingEnabled) {\n    bookmarks = await BookmarklistUtils.renderBookmarkList({\n      res,\n      services,\n      maxRows,\n    })\n  }\n\n  return {\n    requestedReports: requestedReportsList,\n    viewedReports: viewedReportsList,\n    bookmarks,\n  }\n}\n\nexport const updateLastViewed = async ({\n  req,\n  services,\n  reportStateData,\n  userId,\n  filters,\n}: {\n  req: Request\n  services: Services\n  reportStateData: RequestedReport\n  userId: string\n  filters: FilterValue[]\n}) => {\n  const { type, reportId, reportName, description, id, name, executionId, tableId, query, url } = reportStateData\n  const reportData = { type, reportId, reportName, description, id, name }\n  const executionData = { executionId, tableId }\n  const queryData = query ? { query: query.data, querySummary: query.summary } : { query: {}, querySummary: [] }\n\n  const columns = <string[]>req.query?.['columns']\n  const { selectedPage, pageSize, sortColumn, sortedAsc } = <Dict<string>>req.query\n  const filtersQuery = FiltersUtils.setRequestQueryFromFilterValues(filters)\n  const reqQuery = {\n    ...filtersQuery,\n    ...(columns && { columns }),\n    ...(selectedPage && { selectedPage }),\n    ...(pageSize && { pageSize }),\n    ...(sortColumn && { sortColumn }),\n    ...(sortedAsc && { sortedAsc }),\n  }\n  const interactiveQueryData: { query: Dict<string | string[]>; querySummary: Array<Dict<string>> } = {\n    query: reqQuery,\n    querySummary: SelectedFiltersUtils.getQuerySummary(filtersQuery, filters),\n  }\n\n  const recentlyViewedData = new UserStoreItemBuilder(reportData)\n    .addExecutionData(executionData)\n    .addQuery(queryData)\n    .addInteractiveQuery(interactiveQueryData)\n    .addStatus(RequestStatus.READY)\n    .addTimestamp()\n    .addAsyncUrls(url)\n    .addReportUrls(req)\n    .build()\n\n  if (executionId) await services.requestedReportService.updateLastViewed(executionId, userId)\n  await services.recentlyViewedService.setRecentlyViewed(recentlyViewedData, userId)\n}\n\nexport default {\n  renderList,\n  updateExpiredStatus,\n  init,\n  updateLastViewed,\n}\n"],
+  "mappings": "0jBAAA,IAAAA,GAAA,GAAAC,EAAAD,GAAA,aAAAE,GAAA,SAAAC,EAAA,eAAAC,EAAA,sBAAAC,EAAA,wBAAAC,EAAA,qBAAAC,IAAA,eAAAC,EAAAR,IACA,IAAAS,EAAkB,oBAGlBC,EAQO,mCAKPC,EAAiC,2CACjCC,EAAiC,iDACjCA,EAAyB,gCACzBC,EAAuD,yCACvDD,EAAiC,gCACjCA,EAAyC,6BACzCA,EAA8B,gCAC9BE,EAAyB,uCACzBC,EAAuB,gDACvBC,EAAiC,+CAEjC,MAAMC,EAAcC,GAAwD,CAC1E,MAAMC,EAAiC,KAAK,MAAM,KAAK,UAAUD,CAAU,CAAC,EAEtE,CACJ,YAAAE,EACA,QAAAC,EACA,YAAAC,EACA,KAAAC,EACA,SAAAC,EACA,UAAAC,EACA,GAAAC,EACA,YAAAC,EACA,MAAAC,EACA,iBAAAC,EACA,OAAAC,EACA,WAAAC,EACA,2BAAAC,EACA,KAAMC,EACN,IAAAC,CACF,EAAIf,EAEJ,IAAIgB,EAA6C,CAAC,EAC9CP,IACFO,EAAUP,EAAM,SAElB,IAAIQ,EAAwD,CAAC,EACzDP,IACFO,EAAqBP,EAAiB,SAGxC,MAAMQ,EAAOJ,GAAc,aAAW,OAEtC,MAAO,CACL,GAAIb,EACJ,KAAMG,GAAQD,GAAe,GAC7B,WAAAS,EACA,YAAAJ,EACA,IAAK,MACL,QAAAQ,EACA,mBAAAC,EACA,OAAAN,EACA,KAAAO,EACA,GAAIP,GAAUzB,EAAkByB,EAAQX,CAAc,EACtD,KAAM,CACJ,SAAAK,EACA,GAAIC,GAAaC,EACjB,YAAAN,EACA,QAAAC,EACA,OAAAS,EACA,KAAAO,EACA,2BAAAL,EACA,WAAYE,GAAK,SAAS,SAC1B,UAAWA,GAAK,QAAQ,QAC1B,CACF,CACF,EAEMI,GAAc,CAACC,EAAiCF,KAK7C,CACL,KALWE,EAAK,IAAKC,GACdC,GAAeD,EAAMH,CAAI,CACjC,EAIC,KAAM,CACJ,CAAE,KAAM,UAAW,QAAS,sBAAuB,EACnD,CAAE,KAAM,UAAW,QAAS,sBAAuB,EACnD,CAAE,KAAM,SAAU,QAAS,qBAAsB,EACjD,CAAE,KAAM,UAAW,QAAS,sBAAuB,CACrD,CACF,GAGII,GAAiB,CAACF,EAA+BF,IAAiC,CACtF,IAAIK,EACAC,EAAc,GAElB,KAAM,CAAE,KAAAC,EAAM,GAAAlB,EAAI,WAAAK,EAAY,KAAAc,EAAM,UAAAC,EAAW,KAAMb,EAAY,OAAAH,CAAO,EAAIS,EAC5E,GAAIK,GAAQlB,EACV,OAAQI,EAAQ,CACd,KAAK,gBAAc,OACjBY,EAAc,iBACdC,KAAc,mBAAgBC,EAAMlB,EAAIW,EAAMP,CAAM,EACpD,MACF,KAAK,gBAAc,QACjBY,EAAc,kBACdC,KAAc,mBAAgBC,EAAMlB,EAAIW,EAAMP,CAAM,EACpD,MACF,KAAK,gBAAc,QACjBY,EAAc,oBACdC,KAAc,mBAAgBC,EAAMlB,EAAIW,EAAMP,CAAM,EACpD,MACF,KAAK,gBAAc,MACnB,KAAK,gBAAc,SACjBa,EAAc,8DAA8DV,CAAU,WAAWW,CAAI,WAAWX,CAAU,OAC1HS,EAAc,mBACd,MACF,KAAK,gBAAc,OACnB,KAAK,gBAAc,UACnB,KAAK,gBAAc,QACjBC,EAAc,+DAA+DV,CAAU,WAAWW,CAAI,qBACtG,MACF,QACE,KACJ,CAGF,IAAIG,EAAiB,GACrB,OAAIR,EAAK,SAAWA,EAAK,sBACvBQ,EAAiBC,GAAkBT,CAAI,GAGlC,CACL,CACE,QAAM,yBAAsBR,EAAYc,EAAMZ,EAAYa,CAAS,CACrE,EACA,CAAE,KAAMC,CAAe,EACvB,CACE,KAAM,mDAAmDL,CAAW,KAAKZ,CAAM,YAC/E,QAAS,mCACX,EACA,CACE,KAAM,GAAGa,CAAW,GACpB,QAAS,mCACX,CACF,CACF,EAEMM,GAAY,CAACC,EAAwBC,EAAU,MAC5C,CACL,OAAQD,EACR,MAAOC,GAAWD,EAAiBC,EAAUA,EAAUD,EACvD,IAAKC,CACP,GAGIH,GAAqBT,GAAkC,CAC3D,MAAMa,EAAcb,EAAK,SACrB,IAAKc,GAAS,sDAAsDA,EAAK,IAAI,cAAcA,EAAK,KAAK,OAAO,EAC7G,KAAK,EAAE,EAEJC,EAAyBf,EAAK,oBAChC,IACCc,GACC,kEAAkEA,EAAK,IAAI,cAAcA,EAAK,KAAK,OACvG,EACC,KAAK,EAAE,EAEV,MAAO,+FAA+FD,CAAW,GAAGE,CAAsB,OAC5I,EAEMC,GAAU,CAACC,EAA0CC,IAA0B,CACnF,KAAM,CAAE,cAAAC,CAAc,EAAI,EAAAC,QAAa,UAAUF,CAAG,EAEpD,OAAOD,EAAc,IAAKI,IACjB,CACL,SAAUA,EAAE,MAAM,SAClB,GAAIA,EAAE,KAAK,GACX,YAAaA,EAAE,KAAK,YACpB,QAASA,EAAE,KAAK,QAChB,OAAQA,EAAE,KAAK,OACf,YAAaA,EAAE,KAAK,YACpB,KAAMA,EAAE,KAAK,KACb,2BAA4BA,EAAE,KAAK,2BACnC,WAAYA,EAAE,KAAK,WACnB,UAAWA,EAAE,KAAK,UAClB,cAAAF,CACF,EACD,CACH,EAEarD,EAAoB,CAACyB,EAAuB+B,IAAgC,CACvF,IAAIf,EACAF,EACAkB,EACJ,KAAM,CAAE,IAAA5B,EAAK,UAAW6B,CAAK,EAAIF,EAC3BG,EAAU9B,GAAK,QACf+B,EAAU/B,GAAK,QACfgC,EAAShC,GAAK,OAEdiC,EAAa,IAAI,EAAAC,QACvB,OAAQtC,EAAQ,CACd,KAAK,gBAAc,OAAQ,CACzBgC,EAAgBC,EAAK,OACjBI,EAAW,aAA+BJ,EAAK,OAAS,YAAY,KACpE,EAAAM,SAAM,EAAE,OAAO,YAAY,EAC/BzB,EAAOoB,GAAS,QAChBlB,EAAY,cAAcgB,CAAa,GACvC,KACF,CACA,KAAK,gBAAc,QAAS,CAC1BlB,EAAOqB,GAAS,QAChBH,EAAgBK,EAAW,aAA+BJ,EAAK,QAAU,YAAY,EACrFjB,EAAY,eAAegB,CAAa,GACxC,KACF,CACA,KAAK,gBAAc,SACjBlB,EAAOsB,GAAQ,QACfJ,EAAgBK,EAAW,aAA+BJ,EAAK,UAAY,YAAY,EACvFjB,EAAY,aAAagB,CAAa,GACtC,MACF,KAAK,gBAAc,QAAS,CAC1BlB,EAAOqB,GAAS,QAChBH,EAAgBK,EAAW,aAA+BJ,EAAK,QAAU,YAAY,EACrFjB,EAAY,eAAegB,CAAa,GACxC,KACF,CACA,KAAK,gBAAc,MAAO,CACxBlB,EAAOsB,GAAQ,QACfJ,EAAgBK,EAAW,aAA+BJ,EAAK,WAAa,YAAY,EACxFjB,EAAY,gBAAgBgB,CAAa,GACzC,KACF,CACA,KAAK,gBAAc,UACnB,KAAK,gBAAc,QACnB,KAAK,gBAAc,OACjBlB,EAAOoB,GAAS,QAChBF,EAAgBK,EAAW,aAA+BJ,EAAK,UAAY,YAAY,EACvFjB,EAAY,iBAAiBgB,CAAa,GAC1C,MACF,QACEA,EAAgBK,EAAW,aAA+BJ,EAAK,WAAa,YAAY,EACxFjB,EAAY,gBAAgBgB,CAAa,GACzC,KACJ,CAEA,MAAO,CACL,UAAAhB,EACA,KAAAF,CACF,CACF,EAEaxC,EAAa,MAAO,CAC/B,IAAAqD,EACA,YAAAI,EACA,QAAAV,EACA,eAAAmB,EACA,KAAAjC,CACF,IAMwC,CACtC,KAAM,CAAE,UAAAkC,CAAU,EAAI,EAAAZ,QAAa,UAAUF,CAAG,EAEhD,IAAIe,EAAYX,EAAY,OAAOS,CAAc,EAAE,IAAIrD,CAAU,EACjE,MAAMiC,EAAiBsB,EAAU,OAE7BrB,IAASqB,EAAYA,EAAU,MAAM,EAAGrB,CAAO,GACnD,MAAMsB,EAAYnC,GAAYkC,EAAWnC,CAAI,EAEvCqC,EAAOrC,IAAS,YAAc,oBAAsB,kBAe1D,MATwC,CACtC,KANW,CACX,GAAImC,EAAU,QAAU,CAAE,KAAM,kBAAkBE,CAAI,OAAQ,EAC9D,GAAI,CAACF,EAAU,QAAU,CAAE,aAAc,cAAcnC,CAAI,UAAW,CACxE,EAIE,UAAAoC,EACA,MAAOxB,GAAUC,EAAgBC,CAAO,EACxC,KAAMI,GAAQiB,EAAWf,CAAG,EAC5B,UAAAc,EACA,GAAIpB,GAAW,CAAE,QAAAA,CAAQ,CAC3B,CAGF,EAEa7C,EAAsB,MAAO,CAAE,IAAAqE,EAAK,IAAAlB,EAAK,SAAAmB,CAAS,IAA8B,CAC3F,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAlB,QAAa,UAAUF,CAAG,EACxCS,EAAS,QAAM,oBAAiB,CAAE,IAAAS,EAAK,IAAAlB,EAAK,SAAAmB,CAAS,CAAC,EAE5D,OAAIV,GAAUA,EAAO,YACnB,MAAMU,EAAS,sBAAsB,aAAaV,EAAO,YAAaW,EAAQ,EAAE,EAChF,MAAMD,EAAS,uBAAuB,aAAaV,EAAO,YAAaW,EAAQ,EAAE,GAG5EX,EAASA,EAAO,UAAY,EACrC,EAEa/D,EAAO,MAAO,CAAE,SAAAyE,EAAU,IAAAnB,EAAK,QAAAN,EAAU,CAAE,IAA+D,CACrH,KAAM,CAAE,iBAAA2B,EAAkB,sBAAAC,EAAuB,mBAAAC,CAAmB,EAAI,EAAArB,QAAa,UAAUF,CAAG,EAC5FwB,EAAuB,MAAM7E,EAAW,CAC5C,IAAAqD,EACA,YAAaqB,EACb,eAAgB,EAAAI,QAAqB,cACrC,QAAA/B,EACA,KAAM,WACR,CAAC,EACKgC,EAAoB,MAAM/E,EAAW,CACzC,IAAAqD,EACA,YAAasB,EACb,eAAgB,EAAAK,QAA6B,cAC7C,QAAAjC,EACA,KAAM,QACR,CAAC,EAED,IAAIkC,EACJ,OAAIL,IACFK,EAAY,MAAM,EAAAC,QAAkB,mBAAmB,CACrD,IAAA7B,EACA,SAAAmB,EACA,QAAAzB,CACF,CAAC,GAGI,CACL,iBAAkB8B,EAClB,cAAeE,EACf,UAAAE,CACF,CACF,EAEa9E,EAAmB,MAAO,CACrC,IAAAoE,EACA,SAAAC,EACA,gBAAAW,EACA,OAAAC,EACA,QAAAC,CACF,IAMM,CACJ,KAAM,CAAE,KAAApD,EAAM,SAAAb,EAAU,WAAAO,EAAY,YAAAJ,EAAa,GAAAD,EAAI,KAAAH,EAAM,YAAAH,EAAa,QAAAC,EAAS,MAAAO,EAAO,IAAAM,CAAI,EAAIqD,EAC1FrE,EAAa,CAAE,KAAAmB,EAAM,SAAAb,EAAU,WAAAO,EAAY,YAAAJ,EAAa,GAAAD,EAAI,KAAAH,CAAK,EACjEmE,EAAgB,CAAE,YAAAtE,EAAa,QAAAC,CAAQ,EACvCsE,EAAY/D,EAAQ,CAAE,MAAOA,EAAM,KAAM,aAAcA,EAAM,OAAQ,EAAI,CAAE,MAAO,CAAC,EAAG,aAAc,CAAC,CAAE,EAEvGgE,EAAoBjB,EAAI,OAAQ,QAChC,CAAE,aAAAkB,EAAc,SAAAC,EAAU,WAAAC,EAAY,UAAAC,CAAU,EAAkBrB,EAAI,MACtEsB,EAAe,EAAAC,QAAa,gCAAgCT,CAAO,EASnEU,EAA8F,CAClG,MATe,CACf,GAAGF,EACH,GAAIL,GAAW,CAAE,QAAAA,CAAQ,EACzB,GAAIC,GAAgB,CAAE,aAAAA,CAAa,EACnC,GAAIC,GAAY,CAAE,SAAAA,CAAS,EAC3B,GAAIC,GAAc,CAAE,WAAAA,CAAW,EAC/B,GAAIC,GAAa,CAAE,UAAAA,CAAU,CAC/B,EAGE,aAAc,EAAAI,QAAqB,gBAAgBH,EAAcR,CAAO,CAC1E,EAEMY,EAAqB,IAAI,EAAAC,QAAqBpF,CAAU,EAC3D,iBAAiBwE,CAAa,EAC9B,SAASC,CAAS,EAClB,oBAAoBQ,CAAoB,EACxC,UAAU,gBAAc,KAAK,EAC7B,aAAa,EACb,aAAajE,CAAG,EAChB,cAAcyC,CAAG,EACjB,MAAM,EAELvD,GAAa,MAAMwD,EAAS,uBAAuB,iBAAiBxD,EAAaoE,CAAM,EAC3F,MAAMZ,EAAS,sBAAsB,kBAAkByB,EAAoBb,CAAM,CACnF,EAEA,IAAOtF,GAAQ,CACb,WAAAE,EACA,oBAAAE,EACA,KAAAH,EACA,iBAAAI,CACF",
+  "names": ["utils_exports", "__export", "utils_default", "init", "renderList", "setDataFromStatus", "updateExpiredStatus", "updateLastViewed", "__toCommonJS", "import_dayjs", "import_UserReports", "import_requestStatusHelper", "import_utils", "import_reportListsHelper", "import_localsHelper", "import_DateMapper", "import_UserStoreItemBuilder", "formatData", "reportData", "reportDataCopy", "executionId", "tableId", "variantName", "name", "reportId", "variantId", "id", "description", "query", "interactiveQuery", "status", "reportName", "dataProductDefinitionsPath", "reportType", "url", "summary", "interactiveSummary", "type", "formatTable", "data", "card", "formatTableRow", "statusClass", "itemActions", "href", "text", "timestamp", "filtersSummary", "createSummaryHtml", "getTotals", "formattedCount", "maxRows", "summaryHtml", "item", "interactiveSummaryHtml", "getMeta", "formattedData", "res", "nestedBaseUrl", "LocalsHelper", "d", "reportsData", "formattedDate", "time", "polling", "request", "report", "dateMapper", "DateMapper", "dayjs", "filterFunction", "csrfToken", "formatted", "tableData", "path", "req", "services", "dprUser", "requestedReports", "recentlyViewedReports", "bookmarkingEnabled", "requestedReportsList", "RequestedReportUtils", "viewedReportsList", "RecentlyViewedCardGroupUtils", "bookmarks", "BookmarklistUtils", "reportStateData", "userId", "filters", "executionData", "queryData", "columns", "selectedPage", "pageSize", "sortColumn", "sortedAsc", "filtersQuery", "FiltersUtils", "interactiveQueryData", "SelectedFiltersUtils", "recentlyViewedData", "UserStoreItemBuilder"]
 }

package/dpr/components/user-reports/utils.test.ts

@@ -1,3 +1,4 @@
+import { expect } from '@jest/globals'
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { Response } from 'express'
 import { RequestedReport, RequestStatus } from '../../types/UserReports'
@@ -35,7 +36,7 @@ describe('AsyncRequestListUtils', () => {
       const result = setDataFromStatus(RequestStatus.FAILED, reportData)
       const expectedResult = {
         href: 'pollingUrl',
-        timestamp: 'Failed at: null',
+        timestamp: 'Failed at: undefined',
       }
       expect(result).toEqual(expectedResult)
     })
@@ -44,7 +45,7 @@ describe('AsyncRequestListUtils', () => {
       const result = setDataFromStatus(RequestStatus.FAILED, reportData)
       const expectedResult = {
         href: 'pollingUrl',
-        timestamp: 'Failed at: null',
+        timestamp: 'Failed at: undefined',
       }
       expect(result).toEqual(expectedResult)
     })
@@ -53,7 +54,7 @@ describe('AsyncRequestListUtils', () => {
       const result = setDataFromStatus(RequestStatus.ABORTED, reportData)
       const expectedResult = {
         href: 'requestUrl',
-        timestamp: 'Aborted at: null',
+        timestamp: 'Aborted at: undefined',
       }
       expect(result).toEqual(expectedResult)
     })
@@ -62,7 +63,7 @@ describe('AsyncRequestListUtils', () => {
       const result = setDataFromStatus(RequestStatus.FINISHED, reportData)
       const expectedResult = {
         href: 'reportUrl',
-        timestamp: 'Ready at: null',
+        timestamp: 'Ready at: undefined',
       }
       expect(result).toEqual(expectedResult)
     })
@@ -71,7 +72,7 @@ describe('AsyncRequestListUtils', () => {
       const result = setDataFromStatus(RequestStatus.EXPIRED, reportData)
       const expectedResult = {
         href: 'requestUrl',
-        timestamp: 'Expired at: null',
+        timestamp: 'Expired at: undefined',
       }
       expect(result).toEqual(expectedResult)
     })
@@ -80,7 +81,7 @@ describe('AsyncRequestListUtils', () => {
       const result = setDataFromStatus(RequestStatus.SUBMITTED, reportData)
       const expectedResult = {
         href: 'pollingUrl',
-        timestamp: 'Requested at: null',
+        timestamp: 'Requested at: undefined',
       }
       expect(result).toEqual(expectedResult)
     })
@@ -89,7 +90,7 @@ describe('AsyncRequestListUtils', () => {
       const result = setDataFromStatus(RequestStatus.STARTED, reportData)
       const expectedResult = {
         href: 'pollingUrl',
-        timestamp: 'Requested at: null',
+        timestamp: 'Requested at: undefined',
       }
       expect(result).toEqual(expectedResult)
     })
@@ -98,7 +99,7 @@ describe('AsyncRequestListUtils', () => {
       const result = setDataFromStatus(RequestStatus.PICKED, reportData)
       const expectedResult = {
         href: 'pollingUrl',
-        timestamp: 'Requested at: null',
+        timestamp: 'Requested at: undefined',
       }
       expect(result).toEqual(expectedResult)
     })
@@ -134,40 +135,40 @@ describe('AsyncRequestListUtils', () => {
           res,
           maxRows: 11,
           filterFunction: RequestedReportsUtils.filterReports,
-          reportsData: res.locals.requestedReports,
+          reportsData: res.locals['requestedReports'],
           type: 'requested',
         })
 
         expect(result.tableData.rows.length).toEqual(7)
         expect(result.tableData.head.length).toEqual(4)
-        expect(result.meta.length).toEqual(7)
+        expect(result.meta?.length).toEqual(7)
 
-        const v1Ready = result.tableData.rows[0]
-        expect(v1Ready[3].html).toContain(
+        const v1Ready = <NodeJS.Dict<string>[]>result.tableData.rows[0]
+        expect(v1Ready[3]!['html']).toContain(
           'http://localhost:3010/embedded/platform/dpr/view-report/async/report/request-examples/request-example-success/tblId_1729765628165/report',
         )
-        expect(v1Ready[2].html).toContain('FINISHED')
+        expect(v1Ready[2]!['html']).toContain('FINISHED')
 
-        const v1Failed = result.tableData.rows[1]
+        const v1Failed = <NodeJS.Dict<string>[]>result.tableData.rows[1]
         const v1FailedRetryUrl =
           'http://localhost:3010/embedded/platform/async/report/request-examples/request-example-fail-status/request/exId_238947923'
-        expect(v1Failed[2].html).toContain('FAILED')
-        expect(v1Failed[3].html).toContain(v1FailedRetryUrl)
-        expect(v1Failed[3].html).toContain('remove')
+        expect(v1Failed[2]!['html']).toContain('FAILED')
+        expect(v1Failed[3]!['html']).toContain(v1FailedRetryUrl)
+        expect(v1Failed[3]!['html']).toContain('remove')
 
-        const v1Expired = result.tableData.rows[2]
+        const v1Expired = <NodeJS.Dict<string>[]>result.tableData.rows[2]
         const v1ExpiredRetryUrl =
           'http://localhost:3010/embedded/platform/async/report/request-examples/request-example-expire/request?filters.field1=value1.3&filters.field3.start=2003-02-01&filters.field3.end=2006-05-04&sortColumn=field1&sortedAsc=true&filters.field2=value2.1'
-        expect(v1Expired[2].html).toContain('EXPIRED')
-        expect(v1Expired[3].html).toContain(v1ExpiredRetryUrl)
-        expect(v1Expired[3].html).toContain('remove')
+        expect(v1Expired[2]!['html']).toContain('EXPIRED')
+        expect(v1Expired[3]!['html']).toContain(v1ExpiredRetryUrl)
+        expect(v1Expired[3]!['html']).toContain('remove')
 
-        const v1Aborted = result.tableData.rows[3]
+        const v1Aborted = <NodeJS.Dict<string>[]>result.tableData.rows[3]
         const v1AbortedRetryUrl =
           'http://localhost:3010/embedded/platform/async/report/request-examples/request-example-success/request?filters.field1=value1.1&filters.field2=value2.3&filters.field3.start=2003-02-01&filters.field3.end=2006-05-04&filters.field7=2007-05-04&sortColumn=field1&sortedAsc=true&filters.field6=Value+6.1'
-        expect(v1Aborted[2].html).toContain('ABORTED')
-        expect(v1Aborted[3].html).toContain(v1AbortedRetryUrl)
-        expect(v1Aborted[3].html).toContain('remove')
+        expect(v1Aborted[2]!['html']).toContain('ABORTED')
+        expect(v1Aborted[3]!['html']).toContain(v1AbortedRetryUrl)
+        expect(v1Aborted[3]!['html']).toContain('remove')
       })
 
       it('should return the render list with dashboards', async () => {
@@ -175,33 +176,33 @@ describe('AsyncRequestListUtils', () => {
           res,
           maxRows: 11,
           filterFunction: RequestedReportsUtils.filterReports,
-          reportsData: res.locals.requestedReports,
+          reportsData: res.locals['requestedReports'],
           type: 'requested',
         })
 
         expect(result.tableData.rows.length).toEqual(7)
         expect(result.tableData.head.length).toEqual(4)
-        expect(result.meta.length).toEqual(7)
+        expect(result.meta?.length).toEqual(7)
 
-        const v2Ready = result.tableData.rows[4]
-        expect(v2Ready[3].html).toContain(
+        const v2Ready = <NodeJS.Dict<string>[]>result.tableData.rows[4]
+        expect(v2Ready[3]!['html']).toContain(
           'http://localhost:3010/embedded/platform/async/dashboard/request-examples/test-dashboard-1/request/exId_238947923',
         )
-        expect(v2Ready[2].html).toContain('SUBMITTED')
+        expect(v2Ready[2]!['html']).toContain('SUBMITTED')
 
-        const v2Failed = result.tableData.rows[5]
+        const v2Failed = <NodeJS.Dict<string>[]>result.tableData.rows[5]
         const v2FailedRetryUrl =
           'http://localhost:3010/embedded/platform/async/dashboard/request-examples/test-dashboard-2/request/exId_238947923'
-        expect(v2Failed[2].html).toContain('FAILED')
-        expect(v2Failed[3].html).toContain(v2FailedRetryUrl)
-        expect(v2Failed[3].html).toContain('remove')
+        expect(v2Failed[2]!['html']).toContain('FAILED')
+        expect(v2Failed[3]!['html']).toContain(v2FailedRetryUrl)
+        expect(v2Failed[3]!['html']).toContain('remove')
 
-        const v2Expired = result.tableData.rows[6]
+        const v2Expired = <NodeJS.Dict<string>[]>result.tableData.rows[6]
         const v2ExpiredRetryUrl =
           'http://localhost:3010/embedded/platform/async/dashboard/request-examples/test-dashboard-3/request'
-        expect(v2Expired[2].html).toContain('EXPIRED')
-        expect(v2Expired[3].html).toContain(v2ExpiredRetryUrl)
-        expect(v2Expired[3].html).toContain('remove')
+        expect(v2Expired[2]!['html']).toContain('EXPIRED')
+        expect(v2Expired[3]!['html']).toContain(v2ExpiredRetryUrl)
+        expect(v2Expired[3]!['html']).toContain('remove')
       })
     })
 
@@ -211,26 +212,26 @@ describe('AsyncRequestListUtils', () => {
           res,
           maxRows: 11,
           filterFunction: ViewedReportsUtils.filterReports,
-          reportsData: res.locals.recentlyViewedReports,
+          reportsData: res.locals['recentlyViewedReports'],
           type: 'viewed',
         })
 
         expect(result.tableData.rows.length).toEqual(2)
         expect(result.tableData.head.length).toEqual(4)
-        expect(result.meta.length).toEqual(2)
+        expect(result.meta?.length).toEqual(2)
 
-        const v1Ready = result.tableData.rows[0]
-        expect(v1Ready[3].html).toContain(
+        const v1Ready = <NodeJS.Dict<string>[]>result.tableData.rows[0]
+        expect(v1Ready[3]!['html']).toContain(
           'http://localhost:3010/embedded/platform/async/report/request-examples/request-example-success/request/tblId_1729766362362/report',
         )
-        expect(v1Ready[2].html).toContain('READY')
+        expect(v1Ready[2]!['html']).toContain('READY')
 
-        const v1Expired = result.tableData.rows[1]
+        const v1Expired = <NodeJS.Dict<string>[]>result.tableData.rows[1]
         const v1ExpiredRetryUrl =
           'http://localhost:3010/embedded/platform/async/report/request-examples/request-example-success/request?filters.field2=value2.3&filters.field3.start=2003-09-05&filters.field3.end=2007-05-01&filters.field7=2007-05-04&sortColumn=field1&sortedAsc=true&filters.field4=Inigo+Montoya'
-        expect(v1Expired[2].html).toContain('EXPIRED')
-        expect(v1Expired[3].html).toContain(v1ExpiredRetryUrl)
-        expect(v1Expired[3].html).toContain('remove')
+        expect(v1Expired[2]!['html']).toContain('EXPIRED')
+        expect(v1Expired[3]!['html']).toContain(v1ExpiredRetryUrl)
+        expect(v1Expired[3]!['html']).toContain('remove')
       })
     })
   })

package/dpr/components/user-reports/utils.ts

@@ -9,6 +9,7 @@ import {
   ReportType,
   RequestedReport,
   StoredReportData,
+  meta,
 } from '../../types/UserReports'
 import { FilterValue } from '../_filters/types'
 import { Services } from '../../types/Services'
@@ -40,7 +41,6 @@ const formatData = (reportData: UserReportData): FormattedUserReportData => {
     query,
     interactiveQuery,
     status,
-    timestamp,
     reportName,
     dataProductDefinitionsPath,
     type: reportType,
@@ -60,16 +60,15 @@ const formatData = (reportData: UserReportData): FormattedUserReportData => {
 
   return {
     id: executionId,
-    text: name || variantName,
+    text: name || variantName || '',
     reportName,
     description,
     tag: 'MIS',
     summary,
     interactiveSummary,
-    timestamp,
     status,
     type,
-    ...setDataFromStatus(status, reportDataCopy),
+    ...(status && setDataFromStatus(status, reportDataCopy)),
     meta: {
       reportId,
       id: variantId || id,
@@ -78,8 +77,8 @@ const formatData = (reportData: UserReportData): FormattedUserReportData => {
       status,
       type,
       dataProductDefinitionsPath,
-      pollingUrl: url.polling?.pathname,
-      reportUrl: url.report?.pathname,
+      pollingUrl: url?.polling?.pathname,
+      reportUrl: url?.report?.pathname,
     },
   }
 }
@@ -105,31 +104,33 @@ const formatTableRow = (data: FormattedUserReportData, type: 'requested' | 'view
   let itemActions = ''
 
   const { href, id, reportName, text, timestamp, type: reportType, status } = data
-  switch (status) {
-    case RequestStatus.FAILED:
-      statusClass = 'govuk-tag--red'
-      itemActions = itemActionsHtml(href, id, type, status)
-      break
-    case RequestStatus.EXPIRED:
-      statusClass = 'govuk-tag--grey'
-      itemActions = itemActionsHtml(href, id, type, status)
-      break
-    case RequestStatus.ABORTED:
-      statusClass = 'govuk-tag--orange'
-      itemActions = itemActionsHtml(href, id, type, status)
-      break
-    case RequestStatus.READY:
-    case RequestStatus.FINISHED:
-      itemActions = `<a class=govuk-link govuk-link--no-visited-state dpr-type__${reportType}' href="${href}">Go to ${reportType}</a>`
-      statusClass = 'govuk-tag--green'
-      break
-    case RequestStatus.PICKED:
-    case RequestStatus.SUBMITTED:
-    case RequestStatus.STARTED:
-      itemActions = `<a class='govuk-link govuk-link--no-visited-state dpr-type__${reportType}' href="${href}">Go to status</a>`
-      break
-    default:
-      break
+  if (href && id) {
+    switch (status) {
+      case RequestStatus.FAILED:
+        statusClass = 'govuk-tag--red'
+        itemActions = itemActionsHtml(href, id, type, status)
+        break
+      case RequestStatus.EXPIRED:
+        statusClass = 'govuk-tag--grey'
+        itemActions = itemActionsHtml(href, id, type, status)
+        break
+      case RequestStatus.ABORTED:
+        statusClass = 'govuk-tag--orange'
+        itemActions = itemActionsHtml(href, id, type, status)
+        break
+      case RequestStatus.READY:
+      case RequestStatus.FINISHED:
+        itemActions = `<a class=govuk-link govuk-link--no-visited-state dpr-type__${reportType}' href="${href}">Go to ${reportType}</a>`
+        statusClass = 'govuk-tag--green'
+        break
+      case RequestStatus.PICKED:
+      case RequestStatus.SUBMITTED:
+      case RequestStatus.STARTED:
+        itemActions = `<a class='govuk-link govuk-link--no-visited-state dpr-type__${reportType}' href="${href}">Go to status</a>`
+        break
+      default:
+        break
+    }
   }
 
   let filtersSummary = ''
@@ -153,10 +154,10 @@ const formatTableRow = (data: FormattedUserReportData, type: 'requested' | 'view
   ]
 }
 
-const getTotals = (formattedCount: number, maxRows: number) => {
+const getTotals = (formattedCount: number, maxRows = 20) => {
   return {
     amount: formattedCount,
-    shown: formattedCount > maxRows ? maxRows : formattedCount,
+    shown: maxRows && formattedCount > maxRows ? maxRows : formattedCount,
     max: maxRows,
   }
 }
@@ -176,12 +177,12 @@ const createSummaryHtml = (data: FormattedUserReportData) => {
   return `<ul class="dpr-card-group__item__filters-list govuk-!-margin-top-0 govuk-!-margin-bottom-0">${summaryHtml}${interactiveSummaryHtml}</ul>`
 }
 
-const getMeta = (formattedData: FormattedUserReportData[], res: Response) => {
+const getMeta = (formattedData: FormattedUserReportData[], res: Response): meta[] => {
   const { nestedBaseUrl } = LocalsHelper.getValues(res)
 
   return formattedData.map((d) => {
     return {
-      reportId: d.meta.reportId,
+      reportId: d.meta?.reportId,
       id: d.meta.id,
       executionId: d.meta.executionId,
       tableId: d.meta.tableId,
@@ -201,35 +202,39 @@ export const setDataFromStatus = (status: RequestStatus, reportsData: UserReport
   let href
   let formattedDate
   const { url, timestamp: time } = reportsData
+  const polling = url?.polling
+  const request = url?.request
+  const report = url?.report
+
   const dateMapper = new DateMapper()
   switch (status) {
     case RequestStatus.FAILED: {
       formattedDate = time.failed
         ? dateMapper.toDateString(<string>(<unknown>time.failed), 'local-date')
         : dayjs().format('DD/MM/YYYY')
-      href = `${url.polling.fullUrl}`
+      href = polling?.fullUrl
       timestamp = `Failed at: ${formattedDate}`
       break
     }
     case RequestStatus.ABORTED: {
-      href = `${url.request.fullUrl}`
+      href = request?.fullUrl
       formattedDate = dateMapper.toDateString(<string>(<unknown>time.aborted), 'local-date')
       timestamp = `Aborted at: ${formattedDate}`
       break
     }
     case RequestStatus.FINISHED:
-      href = url.report.fullUrl
+      href = report?.fullUrl
       formattedDate = dateMapper.toDateString(<string>(<unknown>time.completed), 'local-date')
       timestamp = `Ready at: ${formattedDate}`
       break
     case RequestStatus.EXPIRED: {
-      href = `${url.request.fullUrl}`
+      href = request?.fullUrl
       formattedDate = dateMapper.toDateString(<string>(<unknown>time.expired), 'local-date')
       timestamp = `Expired at: ${formattedDate}`
       break
     }
     case RequestStatus.READY: {
-      href = `${url.report.fullUrl}`
+      href = report?.fullUrl
       formattedDate = dateMapper.toDateString(<string>(<unknown>time.lastViewed), 'local-date')
       timestamp = `Last viewed: ${formattedDate}`
       break
@@ -237,7 +242,7 @@ export const setDataFromStatus = (status: RequestStatus, reportsData: UserReport
     case RequestStatus.SUBMITTED:
     case RequestStatus.STARTED:
     case RequestStatus.PICKED:
-      href = url.polling.fullUrl
+      href = polling?.fullUrl
       formattedDate = dateMapper.toDateString(<string>(<unknown>time.requested), 'local-date')
       timestamp = `Requested at: ${formattedDate}`
       break
@@ -280,13 +285,13 @@ export const renderList = async ({
     ...(!formatted.length && { emptyMessage: `You have 0 ${type} reports` }),
   }
 
-  const result = {
+  const result: RenderTableListResponse = {
     head,
     tableData,
     total: getTotals(formattedCount, maxRows),
     meta: getMeta(formatted, res),
     csrfToken,
-    maxRows,
+    ...(maxRows && { maxRows }),
   }
 
   return result
@@ -304,17 +309,7 @@ export const updateExpiredStatus = async ({ req, res, services }: AsyncReportUti
   return report ? report.isExpired : false
 }
 
-export const init = async ({
-  services,
-  res,
-  req,
-  maxRows = 6,
-}: {
-  services: Services
-  res: Response
-  req: Request
-  maxRows?: number
-}) => {
+export const init = async ({ services, res, maxRows = 6 }: { services: Services; res: Response; maxRows?: number }) => {
   const { requestedReports, recentlyViewedReports, bookmarkingEnabled } = LocalsHelper.getValues(res)
   const requestedReportsList = await renderList({
     res,
@@ -335,7 +330,6 @@ export const init = async ({
   if (bookmarkingEnabled) {
     bookmarks = await BookmarklistUtils.renderBookmarkList({
       res,
-      req,
       services,
       maxRows,
     })
@@ -366,7 +360,7 @@ export const updateLastViewed = async ({
   const executionData = { executionId, tableId }
   const queryData = query ? { query: query.data, querySummary: query.summary } : { query: {}, querySummary: [] }
 
-  const columns = <string[]>req.query?.columns
+  const columns = <string[]>req.query?.['columns']
   const { selectedPage, pageSize, sortColumn, sortedAsc } = <Dict<string>>req.query
   const filtersQuery = FiltersUtils.setRequestQueryFromFilterValues(filters)
   const reqQuery = {
@@ -392,7 +386,7 @@ export const updateLastViewed = async ({
     .addReportUrls(req)
     .build()
 
-  await services.requestedReportService.updateLastViewed(reportStateData.executionId, userId)
+  if (executionId) await services.requestedReportService.updateLastViewed(executionId, userId)
   await services.recentlyViewedService.setRecentlyViewed(recentlyViewedData, userId)
 }
 

package/dpr/components/user-reports/viewed/utils.js

@@ -1,2 +1,2 @@
-var o=Object.defineProperty;var i=Object.getOwnPropertyDescriptor;var l=Object.getOwnPropertyNames;var a=Object.prototype.hasOwnProperty;var c=(e,t)=>{for(var R in t)o(e,R,{get:t[R],enumerable:!0})},d=(e,t,R,n)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of l(t))!a.call(e,s)&&s!==R&&o(e,s,{get:()=>t[s],enumerable:!(n=i(t,s))||n.enumerable});return e};var p=e=>d(o({},"__esModule",{value:!0}),e);var x={};c(x,{default:()=>f,filterReports:()=>r});module.exports=p(x);var u=require("../../../types/UserReports");const r=e=>e.status===u.RequestStatus.READY||e.executionId?.length&&e.status===u.RequestStatus.EXPIRED;var f={filterReports:r};0&&(module.exports={filterReports});
+"use strict";var s=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var l=Object.getOwnPropertyNames;var p=Object.prototype.hasOwnProperty;var D=(t,e)=>{for(var a in e)s(t,a,{get:e[a],enumerable:!0})},f=(t,e,a,u)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of l(e))!p.call(t,o)&&o!==a&&s(t,o,{get:()=>e[o],enumerable:!(u=R(e,o))||u.enumerable});return t};var i=t=>f(s({},"__esModule",{value:!0}),t);var E={};D(E,{default:()=>x,filterReports:()=>n});module.exports=i(E);var r=require("../../../types/UserReports");const n=t=>!!(t.status===r.RequestStatus.READY||t.executionId?.length&&t.status===r.RequestStatus.EXPIRED);var x={filterReports:n};0&&(module.exports={filterReports});
 //# sourceMappingURL=utils.js.map

package/dpr/components/user-reports/viewed/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/components/user-reports/viewed/utils.ts"],
-  "sourcesContent": ["import { RecentlyViewedReport, RequestStatus } from '../../../types/UserReports'\n\nexport const filterReports = (report: RecentlyViewedReport) => {\n  return (\n    report.status === RequestStatus.READY || (report.executionId?.length && report.status === RequestStatus.EXPIRED)\n  )\n}\n\nexport default {\n  filterReports,\n}\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,kBAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAAoD,sCAE7C,MAAMF,EAAiBG,GAE1BA,EAAO,SAAW,gBAAc,OAAUA,EAAO,aAAa,QAAUA,EAAO,SAAW,gBAAc,QAI5G,IAAOJ,EAAQ,CACb,cAAAC,CACF",
+  "sourcesContent": ["import { RequestStatus, UserReportData } from '../../../types/UserReports'\n\nexport const filterReports = (report: UserReportData) => {\n  return Boolean(\n    report.status === RequestStatus.READY ||\n      Boolean(report.executionId?.length && report.status === RequestStatus.EXPIRED),\n  )\n}\n\nexport default {\n  filterReports,\n}\n"],
+  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,kBAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAA8C,sCAEvC,MAAMF,EAAiBG,GACrB,GACLA,EAAO,SAAW,gBAAc,OACtBA,EAAO,aAAa,QAAUA,EAAO,SAAW,gBAAc,SAI5E,IAAOJ,EAAQ,CACb,cAAAC,CACF",
   "names": ["utils_exports", "__export", "utils_default", "filterReports", "__toCommonJS", "import_UserReports", "report"]
 }

package/dpr/components/user-reports/viewed/utils.ts

@@ -1,8 +1,9 @@
-import { RecentlyViewedReport, RequestStatus } from '../../../types/UserReports'
+import { RequestStatus, UserReportData } from '../../../types/UserReports'
 
-export const filterReports = (report: RecentlyViewedReport) => {
-  return (
-    report.status === RequestStatus.READY || (report.executionId?.length && report.status === RequestStatus.EXPIRED)
+export const filterReports = (report: UserReportData) => {
+  return Boolean(
+    report.status === RequestStatus.READY ||
+      Boolean(report.executionId?.length && report.status === RequestStatus.EXPIRED),
   )
 }
 

package/dpr/data/agentConfig.js

@@ -1,2 +1,2 @@
-var u=Object.defineProperty;var s=Object.getOwnPropertyDescriptor;var c=Object.getOwnPropertyNames;var m=Object.prototype.hasOwnProperty;var a=(e,t)=>{for(var r in t)u(e,r,{get:t[r],enumerable:!0})},f=(e,t,r,n)=>{if(t&&typeof t=="object"||typeof t=="function")for(let o of c(t))!m.call(e,o)&&o!==r&&u(e,o,{get:()=>t[o],enumerable:!(n=s(t,o))||n.enumerable});return e};var g=e=>f(u({},"__esModule",{value:!0}),e);var p={};a(p,{AgentConfig:()=>i,default:()=>l});module.exports=g(p);class i{constructor(t=8e3){this.timeout=t}}var l=i;0&&(module.exports={AgentConfig});
+"use strict";var u=Object.defineProperty;var s=Object.getOwnPropertyDescriptor;var c=Object.getOwnPropertyNames;var m=Object.prototype.hasOwnProperty;var a=(e,t)=>{for(var r in t)u(e,r,{get:t[r],enumerable:!0})},f=(e,t,r,n)=>{if(t&&typeof t=="object"||typeof t=="function")for(let o of c(t))!m.call(e,o)&&o!==r&&u(e,o,{get:()=>t[o],enumerable:!(n=s(t,o))||n.enumerable});return e};var g=e=>f(u({},"__esModule",{value:!0}),e);var p={};a(p,{AgentConfig:()=>i,default:()=>l});module.exports=g(p);class i{constructor(t=8e3){this.timeout=t}}var l=i;0&&(module.exports={AgentConfig});
 //# sourceMappingURL=agentConfig.js.map

package/dpr/data/agentConfig.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/dpr/data/agentConfig.ts"],
   "sourcesContent": ["class AgentConfig {\n  timeout: number\n\n  constructor(timeout = 8000) {\n    this.timeout = timeout\n  }\n}\n\nexport { AgentConfig }\nexport default AgentConfig\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,iBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,MAAME,CAAY,CAGhB,YAAYG,EAAU,IAAM,CAC1B,KAAK,QAAUA,CACjB,CACF,CAGA,IAAOF,EAAQD",
+  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,iBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,MAAME,CAAY,CAGhB,YAAYG,EAAU,IAAM,CAC1B,KAAK,QAAUA,CACjB,CACF,CAGA,IAAOF,EAAQD",
   "names": ["agentConfig_exports", "__export", "AgentConfig", "agentConfig_default", "__toCommonJS", "timeout"]
 }