@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.27.0 → 4.28.0

package/dpr/utils/requestStatusHelper.js

@@ -1,2 +1,173 @@
-"use strict";var v=Object.create;var d=Object.defineProperty;var w=Object.getOwnPropertyDescriptor;var U=Object.getOwnPropertyNames;var F=Object.getPrototypeOf,M=Object.prototype.hasOwnProperty;var B=(t,e)=>{for(var r in e)d(t,r,{get:e[r],enumerable:!0})},A=(t,e,r,u)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of U(e))!M.call(t,o)&&o!==r&&d(t,o,{get:()=>e[o],enumerable:!(u=w(e,o))||u.enumerable});return t};var S=(t,e,r)=>(r=t!=null?v(F(t)):{},A(e||!t||!t.__esModule?d(r,"default",{value:t,enumerable:!0}):r,t)),H=t=>A(d({},"__esModule",{value:!0}),t);var G={};B(G,{default:()=>_,getExpiredStatus:()=>b,getStatus:()=>P,shouldTimeoutRequest:()=>q});module.exports=H(G);var E=S(require("dayjs")),T=S(require("dayjs/plugin/customParseFormat")),s=require("../types/UserReports"),h=S(require("./logger")),l=S(require("./localsHelper")),f=S(require("./ErrorHandler"));E.default.extend(T.default);const L=[s.RequestStatus.ABORTED,s.RequestStatus.FAILED,s.RequestStatus.EXPIRED],O=[s.RequestStatus.SUBMITTED,s.RequestStatus.STARTED,s.RequestStatus.PICKED];function X(t){return Promise.all(t).then(e=>{const r=e.find(o=>typeof o.status=="number"||L.includes(o.status));if(r)return r;const u=e.find(o=>O.includes(o.status));return u||e[0]})}const x=async(t,e,r,u,o)=>{const{definitionsPath:p}=l.default.getValues(r),{type:R,reportId:i,executionId:a,id:c,tableId:n}=e.body,g=(await t.requestedReportService.getReportByExecutionId(a,o))?.childExecutionData??[];let D=[];R===s.ReportType.REPORT&&(g.push({executionId:a,tableId:n,variantId:c}),D=g.map(I=>t.reportingService.getAsyncReportStatus(u,i,I.variantId,I.executionId||"",p,I.tableId||""))),R===s.ReportType.DASHBOARD&&D.push(t.dashboardService.getAsyncStatus(u,i,c,a,n,p));const y=await X(D);return{status:y.status,statusResponse:y}},P=async({req:t,res:e,services:r})=>{const{token:u,dprUser:o}=l.default.getValues(e),{status:p,requestedAt:R}=t.body,i=[s.RequestStatus.READY,s.RequestStatus.EXPIRED,s.RequestStatus.FAILED];let a,c,n;try{const m=await x(r,t,e,u,o.id);if(n=m.statusResponse,a=m.status,q({requestedAt:R,compareTime:new Date,durationMins:15})&&!i.includes(a))throw new Error("Request taking too long. Request Halted");a===s.RequestStatus.FAILED&&(h.default.error(`Error: ${JSON.stringify(n.error)}`),c=new f.default(n.error).formatError())}catch(m){c=new f.default(m).formatError(),a=p===s.RequestStatus.FINISHED?s.RequestStatus.EXPIRED:s.RequestStatus.FAILED}return typeof a=="number"&&(a=s.RequestStatus.FAILED),{status:a,...c&&{errorMessage:c}}},b=async({req:t,res:e,services:r})=>{const{token:u,dprUser:o}=l.default.getValues(e),{executionId:p,status:R}=t.body;let i,a;try{a=(await x(r,t,e,u,o.id)).status}catch(n){i=new f.default(n).formatError(),a=R===s.RequestStatus.READY||R===s.RequestStatus.FINISHED?s.RequestStatus.EXPIRED:s.RequestStatus.FAILED}return{isExpired:{status:a,...i&&{errorMessage:i}}.status===s.RequestStatus.EXPIRED,executionId:p}},q=({requestedAt:t,compareTime:e,durationMins:r})=>{const u=(0,E.default)(e),o=(0,E.default)(t);return u.diff(o,"minutes")>=r};var _={getStatus:P,getExpiredStatus:b,shouldTimeoutRequest:q};0&&(module.exports={getExpiredStatus,getStatus,shouldTimeoutRequest});
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var requestStatusHelper_exports = {};
+__export(requestStatusHelper_exports, {
+  default: () => requestStatusHelper_default,
+  getExpiredStatus: () => getExpiredStatus,
+  getStatus: () => getStatus,
+  shouldTimeoutRequest: () => shouldTimeoutRequest
+});
+module.exports = __toCommonJS(requestStatusHelper_exports);
+var import_dayjs = __toESM(require("dayjs"));
+var import_customParseFormat = __toESM(require("dayjs/plugin/customParseFormat"));
+var import_UserReports = require("../types/UserReports");
+var import_logger = __toESM(require("./logger"));
+var import_localsHelper = __toESM(require("./localsHelper"));
+var import_ErrorHandler = __toESM(require("./ErrorHandler"));
+import_dayjs.default.extend(import_customParseFormat.default);
+const BAD_REQUEST_STATUSES = [import_UserReports.RequestStatus.ABORTED, import_UserReports.RequestStatus.FAILED, import_UserReports.RequestStatus.EXPIRED];
+const IN_PROGRESS_REQUEST_STATUSES = [
+  import_UserReports.RequestStatus.SUBMITTED,
+  import_UserReports.RequestStatus.STARTED,
+  import_UserReports.RequestStatus.PICKED
+];
+function findWorstStatusResponse(statusRequests) {
+  return Promise.all(statusRequests).then((statusResponses) => {
+    const badStatus = statusResponses.find(
+      (response) => typeof response.status === "number" || BAD_REQUEST_STATUSES.includes(response.status)
+    );
+    if (badStatus) {
+      return badStatus;
+    }
+    const inProgressStatus = statusResponses.find(
+      (response) => IN_PROGRESS_REQUEST_STATUSES.includes(response.status)
+    );
+    if (inProgressStatus) {
+      return inProgressStatus;
+    }
+    return statusResponses[0];
+  });
+}
+const getStatusByReportType = async (services, req, res, token, userId) => {
+  const { definitionsPath } = import_localsHelper.default.getValues(res);
+  const { type, reportId, executionId, id, tableId } = req.body;
+  const requestedReport = await services.requestedReportService.getReportByExecutionId(executionId, userId);
+  const reports = requestedReport?.childExecutionData ?? [];
+  let statusRequests = [];
+  if (type === import_UserReports.ReportType.REPORT) {
+    reports.push({ executionId, tableId, variantId: id });
+    statusRequests = reports.map((executionData) => {
+      return services.reportingService.getAsyncReportStatus(
+        token,
+        reportId,
+        executionData.variantId,
+        executionData.executionId || "",
+        definitionsPath,
+        executionData.tableId || ""
+      );
+    });
+  }
+  if (type === import_UserReports.ReportType.DASHBOARD) {
+    statusRequests.push(
+      services.dashboardService.getAsyncStatus(token, reportId, id, executionId, tableId, definitionsPath)
+    );
+  }
+  const statusResponse = await findWorstStatusResponse(statusRequests);
+  return {
+    status: statusResponse.status,
+    statusResponse
+  };
+};
+const getStatus = async ({
+  req,
+  res,
+  services
+}) => {
+  const { token, dprUser } = import_localsHelper.default.getValues(res);
+  const { status: currentStatus, requestedAt } = req.body;
+  const timeoutExemptStatuses = [import_UserReports.RequestStatus.READY, import_UserReports.RequestStatus.EXPIRED, import_UserReports.RequestStatus.FAILED];
+  let status;
+  let errorMessage;
+  let statusResponse;
+  try {
+    const statusResponseData = await getStatusByReportType(services, req, res, token, dprUser.id);
+    statusResponse = statusResponseData.statusResponse;
+    status = statusResponseData.status;
+    if (shouldTimeoutRequest({ requestedAt, compareTime: /* @__PURE__ */ new Date(), durationMins: 15 }) && !timeoutExemptStatuses.includes(status)) {
+      throw new Error("Request taking too long. Request Halted");
+    }
+    if (status === import_UserReports.RequestStatus.FAILED) {
+      import_logger.default.error(`Error: ${JSON.stringify(statusResponse.error)}`);
+      errorMessage = new import_ErrorHandler.default(statusResponse.error).formatError();
+    }
+  } catch (error) {
+    errorMessage = new import_ErrorHandler.default(error).formatError();
+    status = currentStatus === import_UserReports.RequestStatus.FINISHED ? import_UserReports.RequestStatus.EXPIRED : import_UserReports.RequestStatus.FAILED;
+  }
+  if (typeof status === "number") {
+    status = import_UserReports.RequestStatus.FAILED;
+  }
+  return {
+    status,
+    ...errorMessage && { errorMessage }
+  };
+};
+const getExpiredStatus = async ({ req, res, services }) => {
+  const { token, dprUser } = import_localsHelper.default.getValues(res);
+  const { executionId, status: currentStatus } = req.body;
+  let errorMessage;
+  let status;
+  try {
+    const statusData = await getStatusByReportType(services, req, res, token, dprUser.id);
+    status = statusData.status;
+  } catch (error) {
+    errorMessage = new import_ErrorHandler.default(error).formatError();
+    status = currentStatus === import_UserReports.RequestStatus.READY || currentStatus === import_UserReports.RequestStatus.FINISHED ? import_UserReports.RequestStatus.EXPIRED : import_UserReports.RequestStatus.FAILED;
+  }
+  const result = {
+    status,
+    ...errorMessage && { errorMessage }
+  };
+  return {
+    isExpired: result.status === import_UserReports.RequestStatus.EXPIRED,
+    executionId
+  };
+};
+const shouldTimeoutRequest = ({
+  requestedAt,
+  compareTime,
+  durationMins
+}) => {
+  const compareDate = (0, import_dayjs.default)(compareTime);
+  const requestDate = (0, import_dayjs.default)(requestedAt);
+  const result = compareDate.diff(requestDate, "minutes");
+  return result >= durationMins;
+};
+var requestStatusHelper_default = {
+  getStatus,
+  getExpiredStatus,
+  shouldTimeoutRequest
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getExpiredStatus,
+  getStatus,
+  shouldTimeoutRequest
+});
 //# sourceMappingURL=requestStatusHelper.js.map

package/dpr/utils/requestStatusHelper.js.map

@@ -2,6 +2,6 @@
   "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'\nimport { components } from '../types/api'\nimport ErrorHandler from './ErrorHandler'\n\ndayjs.extend(customParse)\ninterface GetStatusUtilsResponse {\n  status: RequestStatus\n  errorMessage?: { userMessage?: string; developerMessage?: string }\n  reportData?: RequestedReport | undefined\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(\n  statusRequests: Array<Promise<components['schemas']['StatementExecutionStatus']>>,\n): Promise<components['schemas']['StatementExecutionStatus']> {\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  let statusRequests: Array<Promise<components['schemas']['StatementExecutionStatus']>> = []\n  if (type === ReportType.REPORT) {\n    reports.push({ executionId, tableId, variantId: id })\n    statusRequests = reports.map((executionData: ChildReportExecutionData) => {\n      return services.reportingService.getAsyncReportStatus(\n        token,\n        reportId,\n        executionData.variantId,\n        executionData.executionId || '',\n        definitionsPath,\n        executionData.tableId || '',\n      )\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: RequestStatus\n  let errorMessage\n  let statusResponse: components['schemas']['StatementExecutionStatus']\n  try {\n    const statusResponseData = await getStatusByReportType(services, req, res, token, dprUser.id)\n    statusResponse = statusResponseData.statusResponse\n    status = <RequestStatus>statusResponseData.status\n    if (\n      shouldTimeoutRequest({ requestedAt, compareTime: new Date(), durationMins: 15 }) &&\n      !timeoutExemptStatuses.includes(<RequestStatus>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      errorMessage = new ErrorHandler(statusResponse.error).formatError()\n    }\n  } catch (error) {\n    errorMessage = new ErrorHandler(error).formatError()\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    const statusData = await getStatusByReportType(services, req, res, token, dprUser.id)\n    status = <RequestStatus>statusData.status\n  } catch (error) {\n    errorMessage = new ErrorHandler(error).formatError()\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", "import_ErrorHandler", "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", "statusResponseData", "logger", "ErrorHandler", "error", "compareTime", "durationMins", "compareDate", "requestDate"]
+  "mappings": "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",
+  "names": ["dayjs", "customParse", "localsHelper", "logger", "ErrorHandler"]
 }

package/dpr/utils/sanitisedError.js

@@ -1,2 +1,46 @@
-"use strict";var a=Object.defineProperty;var o=Object.getOwnPropertyDescriptor;var p=Object.getOwnPropertyNames;var d=Object.prototype.hasOwnProperty;var u=(s,e)=>{for(var n in e)a(s,n,{get:e[n],enumerable:!0})},g=(s,e,n,i)=>{if(e&&typeof e=="object"||typeof e=="function")for(let t of p(e))!d.call(s,t)&&t!==n&&a(s,t,{get:()=>e[t],enumerable:!(i=o(e,t))||i.enumerable});return s};var m=s=>g(a({},"__esModule",{value:!0}),s);var k={};u(k,{default:()=>c,sanitise:()=>r});module.exports=m(k);function r(s){return s.response?{text:s.response.text,status:s.response.status,headers:s.response.headers,data:s.response.body,message:s.message,stack:s.stack}:{message:s.message,stack:s.stack}}var c=r;0&&(module.exports={sanitise});
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var sanitisedError_exports = {};
+__export(sanitisedError_exports, {
+  default: () => sanitisedError_default,
+  sanitise: () => sanitise
+});
+module.exports = __toCommonJS(sanitisedError_exports);
+function sanitise(error) {
+  if (error.response) {
+    return {
+      text: error.response.text,
+      status: error.response.status,
+      headers: error.response.headers,
+      data: error.response.body,
+      message: error.message,
+      stack: error.stack
+    };
+  }
+  return {
+    message: error.message,
+    stack: error.stack
+  };
+}
+var sanitisedError_default = sanitise;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  sanitise
+});
 //# sourceMappingURL=sanitisedError.js.map

package/dpr/utils/sanitisedError.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/dpr/utils/sanitisedError.ts"],
   "sourcesContent": ["import type { ResponseError } from 'superagent'\n\ninterface SanitisedError {\n  text?: string\n  status?: number\n  headers?: unknown\n  data?: unknown\n  stack?: string | undefined\n  message: string\n}\n\nexport type UnsanitisedError = ResponseError\n\nexport function sanitise(error: UnsanitisedError): SanitisedError {\n  if (error.response) {\n    return {\n      text: error.response.text,\n      status: error.response.status,\n      headers: error.response.headers,\n      data: error.response.body,\n      message: error.message,\n      stack: error.stack,\n    }\n  }\n  return {\n    message: error.message,\n    stack: error.stack,\n  }\n}\n\nexport default sanitise\n"],
-  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,aAAAC,IAAA,eAAAC,EAAAJ,GAaO,SAASG,EAASE,EAAyC,CAChE,OAAIA,EAAM,SACD,CACL,KAAMA,EAAM,SAAS,KACrB,OAAQA,EAAM,SAAS,OACvB,QAASA,EAAM,SAAS,QACxB,KAAMA,EAAM,SAAS,KACrB,QAASA,EAAM,QACf,MAAOA,EAAM,KACf,EAEK,CACL,QAASA,EAAM,QACf,MAAOA,EAAM,KACf,CACF,CAEA,IAAOH,EAAQC",
-  "names": ["sanitisedError_exports", "__export", "sanitisedError_default", "sanitise", "__toCommonJS", "error"]
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAaO,SAAS,SAAS,OAAyC;AAChE,MAAI,MAAM,UAAU;AAClB,WAAO;AAAA,MACL,MAAM,MAAM,SAAS;AAAA,MACrB,QAAQ,MAAM,SAAS;AAAA,MACvB,SAAS,MAAM,SAAS;AAAA,MACxB,MAAM,MAAM,SAAS;AAAA,MACrB,SAAS,MAAM;AAAA,MACf,OAAO,MAAM;AAAA,IACf;AAAA,EACF;AACA,SAAO;AAAA,IACL,SAAS,MAAM;AAAA,IACf,OAAO,MAAM;AAAA,EACf;AACF;AAEA,IAAO,yBAAQ;",
+  "names": []
 }

package/dpr/utils/urlHelper.js

@@ -1,2 +1,104 @@
-"use strict";var c=Object.defineProperty;var p=Object.getOwnPropertyDescriptor;var m=Object.getOwnPropertyNames;var D=Object.prototype.hasOwnProperty;var u=(e,t)=>{for(var s in t)c(e,s,{get:t[s],enumerable:!0})},x=(e,t,s,r)=>{if(t&&typeof t=="object"||typeof t=="function")for(let o of m(t))!D.call(e,o)&&o!==s&&c(e,o,{get:()=>t[o],enumerable:!(r=p(t,o))||r.enumerable});return e};var $=e=>x(c({},"__esModule",{value:!0}),e);var R={};u(R,{clearFilterValue:()=>l,createQuerystringFromObject:()=>d,createUrlForParameters:()=>a,default:()=>S,getDpdPathSuffix:()=>h,getRoutePrefix:()=>A});module.exports=$(R);var f=require("../components/_filters/filter-input/enum");const l="~clear~",a=(e,t,s)=>{let r;t?(r={...e,selectedPage:"1"},Object.keys(t).forEach(i=>{t[i]?r[i]=t[i]:Object.keys(r).filter(n=>n===i||n.startsWith(`${i}.`)).forEach(n=>{r[n]=l})})):r={selectedPage:"1",pageSize:e.pageSize,sortColumn:e.sortColumn,sortedAsc:e.sortedAsc,dataProductDefinitionsPath:e.dataProductDefinitionsPath};const o={};return Object.keys(r).filter(i=>r[i]).forEach(i=>{o[i]=r[i]}),d(o,s)},d=(e,t)=>`?${Object.keys(e).flatMap(r=>{const o=t?.find(n=>`filters.${n.name}`===r),i=e[r]||"";return Array.isArray(i)?i.map(n=>`${encodeURI(r)}=${encodeURI(n)}`):o&&o.filter&&o.filter.type.toLowerCase()===f.FilterType.multiselect.toLowerCase()?i.split(",").map(g=>`${encodeURI(r)}=${encodeURI(g)}`):[`${encodeURI(r)}=${encodeURI(i)}`]}).join("&")}`,h=e=>e&&e!==""?`?dataProductDefinitionsPath=${e}`:"",A=e=>{let t=e?.routePrefix;return t||(t="/dpr"),t==="dpr"&&(t=""),t};var S=a;0&&(module.exports={clearFilterValue,createQuerystringFromObject,createUrlForParameters,getDpdPathSuffix,getRoutePrefix});
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var urlHelper_exports = {};
+__export(urlHelper_exports, {
+  clearFilterValue: () => clearFilterValue,
+  createQuerystringFromObject: () => createQuerystringFromObject,
+  createUrlForParameters: () => createUrlForParameters,
+  default: () => urlHelper_default,
+  getDpdPathSuffix: () => getDpdPathSuffix,
+  getRoutePrefix: () => getRoutePrefix
+});
+module.exports = __toCommonJS(urlHelper_exports);
+var import_enum = require("../components/_filters/filter-input/enum");
+const clearFilterValue = "~clear~";
+const createUrlForParameters = (currentQueryParams, updateQueryParams, fields) => {
+  let queryParams;
+  if (updateQueryParams) {
+    queryParams = {
+      ...currentQueryParams,
+      selectedPage: "1"
+    };
+    Object.keys(updateQueryParams).forEach((q) => {
+      if (updateQueryParams[q]) {
+        queryParams[q] = updateQueryParams[q];
+      } else {
+        Object.keys(queryParams).filter((key) => key === q || key.startsWith(`${q}.`)).forEach((key) => {
+          queryParams[key] = clearFilterValue;
+        });
+      }
+    });
+  } else {
+    queryParams = {
+      selectedPage: "1",
+      pageSize: currentQueryParams["pageSize"],
+      sortColumn: currentQueryParams["sortColumn"],
+      sortedAsc: currentQueryParams["sortedAsc"],
+      dataProductDefinitionsPath: currentQueryParams["dataProductDefinitionsPath"]
+    };
+  }
+  const nonEmptyQueryParams = {};
+  Object.keys(queryParams).filter((key) => queryParams[key]).forEach((key) => {
+    nonEmptyQueryParams[key] = queryParams[key];
+  });
+  return createQuerystringFromObject(nonEmptyQueryParams, fields);
+};
+const createQuerystringFromObject = (source, fields) => {
+  const querystring = Object.keys(source).flatMap((key) => {
+    const fieldDef = fields?.find((f) => `filters.${f.name}` === key);
+    const value = source[key] || "";
+    if (Array.isArray(value)) {
+      return value.map((v) => `${encodeURI(key)}=${encodeURI(v)}`);
+    }
+    if (fieldDef && fieldDef.filter && fieldDef.filter.type.toLowerCase() === import_enum.FilterType.multiselect.toLowerCase()) {
+      const values = value.split(",");
+      return values.map((v) => {
+        return `${encodeURI(key)}=${encodeURI(v)}`;
+      });
+    }
+    return [`${encodeURI(key)}=${encodeURI(value)}`];
+  }).join("&");
+  return `?${querystring}`;
+};
+const getDpdPathSuffix = (dpdsPath) => {
+  if (dpdsPath && dpdsPath !== "") {
+    return `?dataProductDefinitionsPath=${dpdsPath}`;
+  }
+  return "";
+};
+const getRoutePrefix = (config) => {
+  let prefix = config?.routePrefix;
+  if (!prefix) {
+    prefix = "/dpr";
+  }
+  if (prefix === "dpr") {
+    prefix = "";
+  }
+  return prefix;
+};
+var urlHelper_default = createUrlForParameters;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  clearFilterValue,
+  createQuerystringFromObject,
+  createUrlForParameters,
+  getDpdPathSuffix,
+  getRoutePrefix
+});
 //# sourceMappingURL=urlHelper.js.map

package/dpr/utils/urlHelper.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/dpr/utils/urlHelper.ts"],
   "sourcesContent": ["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport { FilterType } from '../components/_filters/filter-input/enum'\nimport { components } from '../types/api'\nimport { DprConfig } from '../types/DprConfig'\n\nexport const clearFilterValue = '~clear~'\n\nexport const createUrlForParameters = (\n  currentQueryParams: NodeJS.Dict<string | Array<string>>,\n  updateQueryParams: NodeJS.Dict<string>,\n  fields?: components['schemas']['FieldDefinition'][],\n) => {\n  let queryParams: NodeJS.Dict<string | Array<string>>\n\n  if (updateQueryParams) {\n    queryParams = {\n      ...currentQueryParams,\n      selectedPage: '1',\n    }\n\n    Object.keys(updateQueryParams).forEach((q) => {\n      if (updateQueryParams[q]) {\n        queryParams[q] = updateQueryParams[q]\n      } else {\n        Object.keys(queryParams)\n          .filter((key) => key === q || key.startsWith(`${q}.`))\n          .forEach((key) => {\n            queryParams[key] = clearFilterValue\n          })\n      }\n    })\n  } else {\n    queryParams = {\n      selectedPage: '1',\n      pageSize: currentQueryParams['pageSize'],\n      sortColumn: currentQueryParams['sortColumn'],\n      sortedAsc: currentQueryParams['sortedAsc'],\n      dataProductDefinitionsPath: currentQueryParams['dataProductDefinitionsPath'],\n    }\n  }\n\n  const nonEmptyQueryParams: NodeJS.Dict<string | Array<string>> = {}\n\n  Object.keys(queryParams)\n    .filter((key) => queryParams[key])\n    .forEach((key) => {\n      nonEmptyQueryParams[key] = queryParams[key]\n    })\n\n  return createQuerystringFromObject(nonEmptyQueryParams, fields)\n}\n\nexport const createQuerystringFromObject = (\n  source: NodeJS.Dict<string | Array<string>>,\n  fields?: components['schemas']['FieldDefinition'][],\n) => {\n  const querystring = Object.keys(source)\n    .flatMap((key: string) => {\n      const fieldDef = fields?.find((f) => `filters.${f.name}` === key)\n      const value = source[key] || ''\n\n      if (Array.isArray(value)) {\n        return value.map((v) => `${encodeURI(key)}=${encodeURI(v)}`)\n      }\n\n      if (fieldDef && fieldDef.filter && fieldDef.filter.type.toLowerCase() === FilterType.multiselect.toLowerCase()) {\n        const values = value.split(',')\n        return values.map((v) => {\n          return `${encodeURI(key)}=${encodeURI(v)}`\n        })\n      }\n\n      return [`${encodeURI(key)}=${encodeURI(value)}`]\n    })\n    .join('&')\n\n  return `?${querystring}`\n}\n\nexport const getDpdPathSuffix = (dpdsPath: string) => {\n  if (dpdsPath && dpdsPath !== '') {\n    return `?dataProductDefinitionsPath=${dpdsPath}`\n  }\n\n  return ''\n}\n\nexport const getRoutePrefix = (config?: DprConfig) => {\n  let prefix = config?.routePrefix\n  if (!prefix) {\n    prefix = '/dpr'\n  }\n  if (prefix === 'dpr') {\n    prefix = ''\n  }\n  return prefix\n}\n\nexport default createUrlForParameters\n"],
-  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,sBAAAE,EAAA,gCAAAC,EAAA,2BAAAC,EAAA,YAAAC,EAAA,qBAAAC,EAAA,mBAAAC,IAAA,eAAAC,EAAAR,GACA,IAAAS,EAA2B,oDAIpB,MAAMP,EAAmB,UAEnBE,EAAyB,CACpCM,EACAC,EACAC,IACG,CACH,IAAIC,EAEAF,GACFE,EAAc,CACZ,GAAGH,EACH,aAAc,GAChB,EAEA,OAAO,KAAKC,CAAiB,EAAE,QAASG,GAAM,CACxCH,EAAkBG,CAAC,EACrBD,EAAYC,CAAC,EAAIH,EAAkBG,CAAC,EAEpC,OAAO,KAAKD,CAAW,EACpB,OAAQE,GAAQA,IAAQD,GAAKC,EAAI,WAAW,GAAGD,CAAC,GAAG,CAAC,EACpD,QAASC,GAAQ,CAChBF,EAAYE,CAAG,EAAIb,CACrB,CAAC,CAEP,CAAC,GAEDW,EAAc,CACZ,aAAc,IACd,SAAUH,EAAmB,SAC7B,WAAYA,EAAmB,WAC/B,UAAWA,EAAmB,UAC9B,2BAA4BA,EAAmB,0BACjD,EAGF,MAAMM,EAA2D,CAAC,EAElE,cAAO,KAAKH,CAAW,EACpB,OAAQE,GAAQF,EAAYE,CAAG,CAAC,EAChC,QAASA,GAAQ,CAChBC,EAAoBD,CAAG,EAAIF,EAAYE,CAAG,CAC5C,CAAC,EAEIZ,EAA4Ba,EAAqBJ,CAAM,CAChE,EAEaT,EAA8B,CACzCc,EACAL,IAsBO,IApBa,OAAO,KAAKK,CAAM,EACnC,QAASF,GAAgB,CACxB,MAAMG,EAAWN,GAAQ,KAAMO,GAAM,WAAWA,EAAE,IAAI,KAAOJ,CAAG,EAC1DK,EAAQH,EAAOF,CAAG,GAAK,GAE7B,OAAI,MAAM,QAAQK,CAAK,EACdA,EAAM,IAAKC,GAAM,GAAG,UAAUN,CAAG,CAAC,IAAI,UAAUM,CAAC,CAAC,EAAE,EAGzDH,GAAYA,EAAS,QAAUA,EAAS,OAAO,KAAK,YAAY,IAAM,aAAW,YAAY,YAAY,EAC5FE,EAAM,MAAM,GAAG,EAChB,IAAKC,GACV,GAAG,UAAUN,CAAG,CAAC,IAAI,UAAUM,CAAC,CAAC,EACzC,EAGI,CAAC,GAAG,UAAUN,CAAG,CAAC,IAAI,UAAUK,CAAK,CAAC,EAAE,CACjD,CAAC,EACA,KAAK,GAAG,CAEW,GAGXd,EAAoBgB,GAC3BA,GAAYA,IAAa,GACpB,+BAA+BA,CAAQ,GAGzC,GAGIf,EAAkBgB,GAAuB,CACpD,IAAIC,EAASD,GAAQ,YACrB,OAAKC,IACHA,EAAS,QAEPA,IAAW,QACbA,EAAS,IAEJA,CACT,EAEA,IAAOnB,EAAQD",
-  "names": ["urlHelper_exports", "__export", "clearFilterValue", "createQuerystringFromObject", "createUrlForParameters", "urlHelper_default", "getDpdPathSuffix", "getRoutePrefix", "__toCommonJS", "import_enum", "currentQueryParams", "updateQueryParams", "fields", "queryParams", "q", "key", "nonEmptyQueryParams", "source", "fieldDef", "f", "value", "v", "dpdsPath", "config", "prefix"]
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAA2B;AAIpB,MAAM,mBAAmB;AAEzB,MAAM,yBAAyB,CACpC,oBACA,mBACA,WACG;AACH,MAAI;AAEJ,MAAI,mBAAmB;AACrB,kBAAc;AAAA,MACZ,GAAG;AAAA,MACH,cAAc;AAAA,IAChB;AAEA,WAAO,KAAK,iBAAiB,EAAE,QAAQ,CAAC,MAAM;AAC5C,UAAI,kBAAkB,CAAC,GAAG;AACxB,oBAAY,CAAC,IAAI,kBAAkB,CAAC;AAAA,MACtC,OAAO;AACL,eAAO,KAAK,WAAW,EACpB,OAAO,CAAC,QAAQ,QAAQ,KAAK,IAAI,WAAW,GAAG,CAAC,GAAG,CAAC,EACpD,QAAQ,CAAC,QAAQ;AAChB,sBAAY,GAAG,IAAI;AAAA,QACrB,CAAC;AAAA,MACL;AAAA,IACF,CAAC;AAAA,EACH,OAAO;AACL,kBAAc;AAAA,MACZ,cAAc;AAAA,MACd,UAAU,mBAAmB,UAAU;AAAA,MACvC,YAAY,mBAAmB,YAAY;AAAA,MAC3C,WAAW,mBAAmB,WAAW;AAAA,MACzC,4BAA4B,mBAAmB,4BAA4B;AAAA,IAC7E;AAAA,EACF;AAEA,QAAM,sBAA2D,CAAC;AAElE,SAAO,KAAK,WAAW,EACpB,OAAO,CAAC,QAAQ,YAAY,GAAG,CAAC,EAChC,QAAQ,CAAC,QAAQ;AAChB,wBAAoB,GAAG,IAAI,YAAY,GAAG;AAAA,EAC5C,CAAC;AAEH,SAAO,4BAA4B,qBAAqB,MAAM;AAChE;AAEO,MAAM,8BAA8B,CACzC,QACA,WACG;AACH,QAAM,cAAc,OAAO,KAAK,MAAM,EACnC,QAAQ,CAAC,QAAgB;AACxB,UAAM,WAAW,QAAQ,KAAK,CAAC,MAAM,WAAW,EAAE,IAAI,OAAO,GAAG;AAChE,UAAM,QAAQ,OAAO,GAAG,KAAK;AAE7B,QAAI,MAAM,QAAQ,KAAK,GAAG;AACxB,aAAO,MAAM,IAAI,CAAC,MAAM,GAAG,UAAU,GAAG,CAAC,IAAI,UAAU,CAAC,CAAC,EAAE;AAAA,IAC7D;AAEA,QAAI,YAAY,SAAS,UAAU,SAAS,OAAO,KAAK,YAAY,MAAM,uBAAW,YAAY,YAAY,GAAG;AAC9G,YAAM,SAAS,MAAM,MAAM,GAAG;AAC9B,aAAO,OAAO,IAAI,CAAC,MAAM;AACvB,eAAO,GAAG,UAAU,GAAG,CAAC,IAAI,UAAU,CAAC,CAAC;AAAA,MAC1C,CAAC;AAAA,IACH;AAEA,WAAO,CAAC,GAAG,UAAU,GAAG,CAAC,IAAI,UAAU,KAAK,CAAC,EAAE;AAAA,EACjD,CAAC,EACA,KAAK,GAAG;AAEX,SAAO,IAAI,WAAW;AACxB;AAEO,MAAM,mBAAmB,CAAC,aAAqB;AACpD,MAAI,YAAY,aAAa,IAAI;AAC/B,WAAO,+BAA+B,QAAQ;AAAA,EAChD;AAEA,SAAO;AACT;AAEO,MAAM,iBAAiB,CAAC,WAAuB;AACpD,MAAI,SAAS,QAAQ;AACrB,MAAI,CAAC,QAAQ;AACX,aAAS;AAAA,EACX;AACA,MAAI,WAAW,OAAO;AACpB,aAAS;AAAA,EACX;AACA,SAAO;AACT;AAEA,IAAO,oBAAQ;",
+  "names": []
 }

package/dpr/validation/validate.js

@@ -1,2 +1,53 @@
-"use strict";var d=Object.create;var n=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var R=Object.getOwnPropertyNames;var m=Object.getPrototypeOf,p=Object.prototype.hasOwnProperty;var y=(r,e)=>{for(var t in e)n(r,t,{get:e[t],enumerable:!0})},i=(r,e,t,o)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of R(e))!p.call(r,s)&&s!==t&&n(r,s,{get:()=>e[s],enumerable:!(o=u(e,s))||o.enumerable});return r};var b=(r,e,t)=>(t=r!=null?d(m(r)):{},i(e||!r||!r.__esModule?n(t,"default",{value:r,enumerable:!0}):t,r)),E=r=>i(n({},"__esModule",{value:!0}),r);var g={};y(g,{validate:()=>O});module.exports=E(g);var f=b(require("zod"));const O=r=>(e,t,o)=>{const s=r.safeParse(e.body);if(s.success)return o();const l=Object.entries(f.default.flattenError(s.error).fieldErrors).map(([c,a])=>({href:`#${c}`,text:Array.isArray(a)?a[0]:a}));return e.flash("DPR_ERRORS",JSON.stringify(l)),t.redirect(`${e.baseUrl}#`)};0&&(module.exports={validate});
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var validate_exports = {};
+__export(validate_exports, {
+  validate: () => validate
+});
+module.exports = __toCommonJS(validate_exports);
+var import_zod = __toESM(require("zod"));
+const validate = (schema) => (req, res, next) => {
+  const result = schema.safeParse(req.body);
+  if (result.success) {
+    return next();
+  }
+  const errors = Object.entries(import_zod.default.flattenError(result.error).fieldErrors).map(
+    ([fieldName, err]) => ({
+      href: `#${fieldName}`,
+      text: Array.isArray(err) ? err[0] : err
+    })
+  );
+  req.flash(`DPR_ERRORS`, JSON.stringify(errors));
+  return res.redirect(`${req.baseUrl}#`);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  validate
+});
 //# sourceMappingURL=validate.js.map

package/dpr/validation/validate.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/dpr/validation/validate.ts"],
   "sourcesContent": ["import { RequestHandler } from 'express'\nimport z from 'zod'\n\nexport const validate =\n  (schema: z.ZodType): RequestHandler =>\n  (req, res, next) => {\n    const result = schema.safeParse(req.body)\n    if (result.success) {\n      return next()\n    }\n\n    const errors = Object.entries(z.flattenError(result.error).fieldErrors).map(\n      ([fieldName, err]: [string, unknown]) => ({\n        href: `#${fieldName}`,\n        text: Array.isArray(err) ? err[0] : err,\n      }),\n    )\n    req.flash(`DPR_ERRORS`, JSON.stringify(errors))\n    return res.redirect(`${req.baseUrl}#`)\n  }\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,cAAAE,IAAA,eAAAC,EAAAH,GACA,IAAAI,EAAc,kBAEP,MAAMF,EACVG,GACD,CAACC,EAAKC,EAAKC,IAAS,CAClB,MAAMC,EAASJ,EAAO,UAAUC,EAAI,IAAI,EACxC,GAAIG,EAAO,QACT,OAAOD,EAAK,EAGd,MAAME,EAAS,OAAO,QAAQ,EAAAC,QAAE,aAAaF,EAAO,KAAK,EAAE,WAAW,EAAE,IACtE,CAAC,CAACG,EAAWC,CAAG,KAA0B,CACxC,KAAM,IAAID,CAAS,GACnB,KAAM,MAAM,QAAQC,CAAG,EAAIA,EAAI,CAAC,EAAIA,CACtC,EACF,EACA,OAAAP,EAAI,MAAM,aAAc,KAAK,UAAUI,CAAM,CAAC,EACvCH,EAAI,SAAS,GAAGD,EAAI,OAAO,GAAG,CACvC",
-  "names": ["validate_exports", "__export", "validate", "__toCommonJS", "import_zod", "schema", "req", "res", "next", "result", "errors", "z", "fieldName", "err"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,iBAAc;AAEP,MAAM,WACX,CAAC,WACD,CAAC,KAAK,KAAK,SAAS;AAClB,QAAM,SAAS,OAAO,UAAU,IAAI,IAAI;AACxC,MAAI,OAAO,SAAS;AAClB,WAAO,KAAK;AAAA,EACd;AAEA,QAAM,SAAS,OAAO,QAAQ,WAAAA,QAAE,aAAa,OAAO,KAAK,EAAE,WAAW,EAAE;AAAA,IACtE,CAAC,CAAC,WAAW,GAAG,OAA0B;AAAA,MACxC,MAAM,IAAI,SAAS;AAAA,MACnB,MAAM,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI;AAAA,IACtC;AAAA,EACF;AACA,MAAI,MAAM,cAAc,KAAK,UAAU,MAAM,CAAC;AAC9C,SAAO,IAAI,SAAS,GAAG,IAAI,OAAO,GAAG;AACvC;",
+  "names": ["z"]
 }

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.27.0",
+  "version": "4.28.0",
   "main": "dpr/all.mjs",
   "sass": "dpr/all.scss",
   "engines": {