@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.14.2 → 4.15.1

package/dpr/utils/requestStatusHelper.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/utils/requestStatusHelper.ts"],
-  "sourcesContent": ["import dayjs from 'dayjs'\nimport customParse from 'dayjs/plugin/customParseFormat'\nimport { Request, Response } from 'express'\nimport { ReportType, RequestedReport, RequestStatus } from '../types/UserReports'\nimport { ChildReportExecutionData } from '../types/ExecutionData'\nimport logger from './logger'\nimport { Services } from '../types/Services'\nimport localsHelper from './localsHelper'\n\ndayjs.extend(customParse)\ninterface GetStatusUtilsResponse {\n  status: RequestStatus\n  errorMessage?: string\n  reportData?: RequestedReport | undefined\n}\n\ninterface StatusResponseError {\n  userMessage: string\n  developerMessage: string\n}\n\ninterface StatusResponse {\n  status: RequestStatus\n  error: StatusResponseError\n}\n\nconst BAD_REQUEST_STATUSES: Array<RequestStatus> = [RequestStatus.ABORTED, RequestStatus.FAILED, RequestStatus.EXPIRED]\n\nconst IN_PROGRESS_REQUEST_STATUSES: Array<RequestStatus> = [\n  RequestStatus.SUBMITTED,\n  RequestStatus.STARTED,\n  RequestStatus.PICKED,\n]\n\nfunction findWorstStatusResponse(statusRequests: Array<Promise<StatusResponse>>): Promise<StatusResponse> {\n  return Promise.all(statusRequests).then((statusResponses) => {\n    const badStatus = statusResponses.find(\n      (response) =>\n        typeof response.status === 'number' || BAD_REQUEST_STATUSES.includes(response.status as RequestStatus),\n    )\n\n    if (badStatus) {\n      return badStatus\n    }\n\n    const inProgressStatus = statusResponses.find((response) =>\n      IN_PROGRESS_REQUEST_STATUSES.includes(response.status as RequestStatus),\n    )\n\n    if (inProgressStatus) {\n      return inProgressStatus\n    }\n\n    return statusResponses[0]\n  })\n}\n\nconst getStatusByReportType = async (\n  services: Services,\n  req: Request,\n  res: Response,\n  token: string,\n  userId: string,\n) => {\n  const { definitionsPath } = localsHelper.getValues(res)\n  const { type, reportId, executionId, id, tableId } = req.body\n\n  const requestedReport = await services.requestedReportService.getReportByExecutionId(executionId, userId)\n\n  const reports = requestedReport.childExecutionData ?? []\n\n  if (type === ReportType.REPORT) {\n    reports.push({ executionId, tableId, variantId: id })\n  }\n\n  const statusRequests = reports.map((executionData: ChildReportExecutionData) =>\n    services.reportingService.getAsyncReportStatus(\n      token,\n      reportId,\n      executionData.variantId,\n      executionData.executionId,\n      definitionsPath,\n      executionData.tableId,\n    ),\n  )\n\n  if (type === ReportType.DASHBOARD) {\n    statusRequests.push(\n      services.dashboardService.getAsyncStatus(token, reportId, id, executionId, definitionsPath, tableId),\n    )\n  }\n\n  const statusResponse = await findWorstStatusResponse(statusRequests)\n\n  return {\n    status: statusResponse.status,\n    statusResponse,\n  }\n}\n\nexport const getStatus = async ({\n  req,\n  res,\n  services,\n}: {\n  req: Request\n  res: Response\n  services: Services\n}): Promise<GetStatusUtilsResponse> => {\n  const { token, dprUser } = localsHelper.getValues(res)\n  const { status: currentStatus, requestedAt } = req.body\n  const timeoutExemptStatuses = [RequestStatus.READY, RequestStatus.EXPIRED, RequestStatus.FAILED]\n\n  let status\n  let errorMessage\n  let statusResponse\n  try {\n    ;({ status, statusResponse } = await getStatusByReportType(services, req, res, token, dprUser.id))\n    if (\n      shouldTimeoutRequest({ requestedAt, compareTime: new Date(), durationMins: 15 }) &&\n      !timeoutExemptStatuses.includes(status)\n    ) {\n      throw new Error('Request taking too long. Request Halted')\n    }\n\n    if (status === RequestStatus.FAILED) {\n      logger.error(`Error: ${JSON.stringify(statusResponse.error)}`)\n      const { userMessage, developerMessage } = statusResponse.error\n      if (userMessage || developerMessage) {\n        errorMessage = statusResponse.error\n      } else {\n        errorMessage = {\n          developerMessage: statusResponse.error,\n        }\n      }\n    }\n  } catch (error) {\n    logger.error(`Error: ${JSON.stringify(error)}`)\n    const { data } = error\n    errorMessage = data || { userMessage: error.message }\n    status = currentStatus === RequestStatus.FINISHED ? RequestStatus.EXPIRED : RequestStatus.FAILED\n  }\n\n  if (typeof status === 'number') {\n    status = RequestStatus.FAILED\n  }\n\n  return {\n    status,\n    ...(errorMessage && { errorMessage }),\n  }\n}\n\n/**\n * Gets the expired status of a viewed report\n * - if reports status was READY/FINISHED\n * - And the new Status is an error status\n * - it means the report has expired\n *\n * @param {AsyncReportUtilsParams} { req, res, services }\n * @return {*}\n */\nexport const getExpiredStatus = async ({ req, res, services }: { req: Request; res: Response; services: Services }) => {\n  const { token, dprUser } = localsHelper.getValues(res)\n  const { executionId, status: currentStatus } = req.body\n\n  let errorMessage\n  let status\n  try {\n    ;({ status } = await getStatusByReportType(services, req, res, token, dprUser.id))\n  } catch (error) {\n    const { data } = error\n    errorMessage = (data ?? {}).userMessage\n    status =\n      currentStatus === RequestStatus.READY || currentStatus === RequestStatus.FINISHED\n        ? RequestStatus.EXPIRED\n        : RequestStatus.FAILED\n  }\n\n  const result: GetStatusUtilsResponse = {\n    status,\n    ...(errorMessage && { errorMessage }),\n  }\n\n  return {\n    isExpired: result.status === RequestStatus.EXPIRED,\n    executionId,\n  }\n}\n\nexport const shouldTimeoutRequest = ({\n  requestedAt,\n  compareTime,\n  durationMins,\n}: {\n  requestedAt: Date\n  compareTime: Date\n  durationMins: number\n}) => {\n  const compareDate = dayjs(compareTime)\n  const requestDate = dayjs(requestedAt)\n\n  const result = compareDate.diff(requestDate, 'minutes')\n\n  return result >= durationMins\n}\n\nexport default {\n  getStatus,\n  getExpiredStatus,\n  shouldTimeoutRequest,\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import dayjs from 'dayjs'\nimport customParse from 'dayjs/plugin/customParseFormat'\nimport { Request, Response } from 'express'\nimport { ReportType, RequestedReport, RequestStatus } from '../types/UserReports'\nimport { ChildReportExecutionData } from '../types/ExecutionData'\nimport logger from './logger'\nimport { Services } from '../types/Services'\nimport localsHelper from './localsHelper'\n\ndayjs.extend(customParse)\ninterface GetStatusUtilsResponse {\n  status: RequestStatus\n  errorMessage?: string\n  reportData?: RequestedReport | undefined\n}\n\ninterface StatusResponseError {\n  userMessage: string\n  developerMessage: string\n}\n\ninterface StatusResponse {\n  status: RequestStatus\n  error: StatusResponseError\n}\n\nconst BAD_REQUEST_STATUSES: Array<RequestStatus> = [RequestStatus.ABORTED, RequestStatus.FAILED, RequestStatus.EXPIRED]\n\nconst IN_PROGRESS_REQUEST_STATUSES: Array<RequestStatus> = [\n  RequestStatus.SUBMITTED,\n  RequestStatus.STARTED,\n  RequestStatus.PICKED,\n]\n\nfunction findWorstStatusResponse(statusRequests: Array<Promise<StatusResponse>>): Promise<StatusResponse> {\n  return Promise.all(statusRequests).then((statusResponses) => {\n    const badStatus = statusResponses.find(\n      (response) =>\n        typeof response.status === 'number' || BAD_REQUEST_STATUSES.includes(response.status as RequestStatus),\n    )\n\n    if (badStatus) {\n      return badStatus\n    }\n\n    const inProgressStatus = statusResponses.find((response) =>\n      IN_PROGRESS_REQUEST_STATUSES.includes(response.status as RequestStatus),\n    )\n\n    if (inProgressStatus) {\n      return inProgressStatus\n    }\n\n    return statusResponses[0]\n  })\n}\n\nconst getStatusByReportType = async (\n  services: Services,\n  req: Request,\n  res: Response,\n  token: string,\n  userId: string,\n) => {\n  const { definitionsPath } = localsHelper.getValues(res)\n  const { type, reportId, executionId, id, tableId } = req.body\n\n  const requestedReport = await services.requestedReportService.getReportByExecutionId(executionId, userId)\n\n  const reports = requestedReport.childExecutionData ?? []\n\n  if (type === ReportType.REPORT) {\n    reports.push({ executionId, tableId, variantId: id })\n  }\n\n  const statusRequests = reports.map((executionData: ChildReportExecutionData) =>\n    services.reportingService.getAsyncReportStatus(\n      token,\n      reportId,\n      executionData.variantId,\n      executionData.executionId,\n      definitionsPath,\n      executionData.tableId,\n    ),\n  )\n\n  if (type === ReportType.DASHBOARD) {\n    statusRequests.push(\n      services.dashboardService.getAsyncStatus(token, reportId, id, executionId, tableId, definitionsPath),\n    )\n  }\n\n  const statusResponse = await findWorstStatusResponse(statusRequests)\n\n  return {\n    status: statusResponse.status,\n    statusResponse,\n  }\n}\n\nexport const getStatus = async ({\n  req,\n  res,\n  services,\n}: {\n  req: Request\n  res: Response\n  services: Services\n}): Promise<GetStatusUtilsResponse> => {\n  const { token, dprUser } = localsHelper.getValues(res)\n  const { status: currentStatus, requestedAt } = req.body\n  const timeoutExemptStatuses = [RequestStatus.READY, RequestStatus.EXPIRED, RequestStatus.FAILED]\n\n  let status\n  let errorMessage\n  let statusResponse\n  try {\n    ;({ status, statusResponse } = await getStatusByReportType(services, req, res, token, dprUser.id))\n    if (\n      shouldTimeoutRequest({ requestedAt, compareTime: new Date(), durationMins: 15 }) &&\n      !timeoutExemptStatuses.includes(status)\n    ) {\n      throw new Error('Request taking too long. Request Halted')\n    }\n\n    if (status === RequestStatus.FAILED) {\n      logger.error(`Error: ${JSON.stringify(statusResponse.error)}`)\n      const { userMessage, developerMessage } = statusResponse.error\n      if (userMessage || developerMessage) {\n        errorMessage = statusResponse.error\n      } else {\n        errorMessage = {\n          developerMessage: statusResponse.error,\n        }\n      }\n    }\n  } catch (error) {\n    logger.error(`Error: ${JSON.stringify(error)}`)\n    const { data } = error\n    errorMessage = data || { userMessage: error.message }\n    status = currentStatus === RequestStatus.FINISHED ? RequestStatus.EXPIRED : RequestStatus.FAILED\n  }\n\n  if (typeof status === 'number') {\n    status = RequestStatus.FAILED\n  }\n\n  return {\n    status,\n    ...(errorMessage && { errorMessage }),\n  }\n}\n\n/**\n * Gets the expired status of a viewed report\n * - if reports status was READY/FINISHED\n * - And the new Status is an error status\n * - it means the report has expired\n *\n * @param {AsyncReportUtilsParams} { req, res, services }\n * @return {*}\n */\nexport const getExpiredStatus = async ({ req, res, services }: { req: Request; res: Response; services: Services }) => {\n  const { token, dprUser } = localsHelper.getValues(res)\n  const { executionId, status: currentStatus } = req.body\n\n  let errorMessage\n  let status\n  try {\n    ;({ status } = await getStatusByReportType(services, req, res, token, dprUser.id))\n  } catch (error) {\n    const { data } = error\n    errorMessage = (data ?? {}).userMessage\n    status =\n      currentStatus === RequestStatus.READY || currentStatus === RequestStatus.FINISHED\n        ? RequestStatus.EXPIRED\n        : RequestStatus.FAILED\n  }\n\n  const result: GetStatusUtilsResponse = {\n    status,\n    ...(errorMessage && { errorMessage }),\n  }\n\n  return {\n    isExpired: result.status === RequestStatus.EXPIRED,\n    executionId,\n  }\n}\n\nexport const shouldTimeoutRequest = ({\n  requestedAt,\n  compareTime,\n  durationMins,\n}: {\n  requestedAt: Date\n  compareTime: Date\n  durationMins: number\n}) => {\n  const compareDate = dayjs(compareTime)\n  const requestDate = dayjs(requestedAt)\n\n  const result = compareDate.diff(requestDate, 'minutes')\n\n  return result >= durationMins\n}\n\nexport default {\n  getStatus,\n  getExpiredStatus,\n  shouldTimeoutRequest,\n}\n"],
+  "mappings": "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",
   "names": ["requestStatusHelper_exports", "__export", "requestStatusHelper_default", "getExpiredStatus", "getStatus", "shouldTimeoutRequest", "__toCommonJS", "import_dayjs", "import_customParseFormat", "import_UserReports", "import_logger", "import_localsHelper", "dayjs", "customParse", "BAD_REQUEST_STATUSES", "IN_PROGRESS_REQUEST_STATUSES", "findWorstStatusResponse", "statusRequests", "statusResponses", "badStatus", "response", "inProgressStatus", "getStatusByReportType", "services", "req", "res", "token", "userId", "definitionsPath", "localsHelper", "type", "reportId", "executionId", "id", "tableId", "reports", "executionData", "statusResponse", "dprUser", "currentStatus", "requestedAt", "timeoutExemptStatuses", "status", "errorMessage", "logger", "userMessage", "developerMessage", "error", "data", "compareTime", "durationMins", "compareDate", "requestDate"]
 }

package/dpr/utils/requestStatusHelper.ts

@@ -86,7 +86,7 @@ const getStatusByReportType = async (
 
   if (type === ReportType.DASHBOARD) {
     statusRequests.push(
-      services.dashboardService.getAsyncStatus(token, reportId, id, executionId, definitionsPath, tableId),
+      services.dashboardService.getAsyncStatus(token, reportId, id, executionId, tableId, definitionsPath),
     )
   }
 

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.14.2",
+  "version": "4.15.1",
   "main": "dpr/all.mjs",
   "sass": "dpr/all.scss",
   "engines": {
@@ -138,11 +138,13 @@
     ]
   },
   "dependencies": {
-    "@ministryofjustice/frontend": "^3.0.3",
+    "@ministryofjustice/frontend": "^6.0.0",
     "agentkeepalive": "^4.5.0",
     "bunyan": "^1.8.15",
     "bunyan-format": "^0.2.1",
     "chart.js": "^3.9.1",
+    "chartjs-adapter-dayjs-3": "^1.2.3",
+    "chartjs-chart-matrix": "^3.0.0",
     "chartjs-plugin-datalabels": "^2.2.0",
     "chokidar": "^3.6.0",
     "concurrently": "^9.2.0",
@@ -161,6 +163,7 @@
     "parseurl": "^1.3.3",
     "redis": "^5.8.3",
     "superagent": "^10.1.1",
+    "with-alpha-hex": "^1.0.6",
     "zod": "^4.1.11"
   },
   "devDependencies": {