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

package/dpr/utils/reportListsHelper.js

@@ -1,4 +1,4 @@
-var $=Object.create;var u=Object.defineProperty;var k=Object.getOwnPropertyDescriptor;var f=Object.getOwnPropertyNames;var b=Object.getPrototypeOf,R=Object.prototype.hasOwnProperty;var y=(t,e)=>{for(var r in e)u(t,r,{get:e[r],enumerable:!0})},c=(t,e,r,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of f(e))!R.call(t,o)&&o!==r&&u(t,o,{get:()=>e[o],enumerable:!(s=k(e,o))||s.enumerable});return t};var h=(t,e,r)=>(r=t!=null?$(b(t)):{},c(e||!t||!t.__esModule?u(r,"default",{value:t,enumerable:!0}):r,t)),T=t=>c(u({},"__esModule",{value:!0}),t);var P={};y(P,{createListActions:()=>L,createListItemProduct:()=>C,createListItemProductMin:()=>x,itemActionsHtml:()=>q,setInitialHref:()=>A,toSentenceCase:()=>p});module.exports=T(P);var i=require("../types/UserReports"),v=h(require("./localsHelper"));const q=(t,e,r,s)=>{const o=s===i.RequestStatus.EXPIRED?"Refresh":"Retry";return`<div class="dpr-icon-wrapper__item-actions">
+"use strict";var $=Object.create;var u=Object.defineProperty;var k=Object.getOwnPropertyDescriptor;var f=Object.getOwnPropertyNames;var b=Object.getPrototypeOf,R=Object.prototype.hasOwnProperty;var y=(t,e)=>{for(var r in e)u(t,r,{get:e[r],enumerable:!0})},c=(t,e,r,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of f(e))!R.call(t,o)&&o!==r&&u(t,o,{get:()=>e[o],enumerable:!(s=k(e,o))||s.enumerable});return t};var h=(t,e,r)=>(r=t!=null?$(b(t)):{},c(e||!t||!t.__esModule?u(r,"default",{value:t,enumerable:!0}):r,t)),T=t=>c(u({},"__esModule",{value:!0}),t);var P={};y(P,{createListActions:()=>L,createListItemProduct:()=>C,createListItemProductMin:()=>x,itemActionsHtml:()=>q,setInitialHref:()=>A,toSentenceCase:()=>p});module.exports=T(P);var i=require("../types/UserReports"),v=h(require("./localsHelper"));const q=(t,e,r,s)=>{const o=s===i.RequestStatus.EXPIRED?"Refresh":"Retry";return`<div class="dpr-icon-wrapper__item-actions">
       <a class='dpr-user-list-action govuk-link--no-visited-state govuk-!-margin-bottom-1' href="${t}">${o}</a>
       <a class="dpr-user-list-action govuk-link--no-visited-state dpr-remove-${r}-report-button"" href="#" data-execution-id='${e}'>Remove</a>
     </div>`},d=t=>{let e="";switch(t){case i.ReportType.DASHBOARD:e="govuk-tag--purple";break;case i.ReportType.UNAVAILABLE:e="govuk-tag--grey";break;default:e="";break}return e},C=(t,e,r,s)=>{const o=s?"":"dpr-display-none",g=d(r),a=p(r);return`<div>

package/dpr/utils/reportListsHelper.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/dpr/utils/reportListsHelper.ts"],
   "sourcesContent": ["import { Response } from 'express'\nimport { LoadType, ReportType, RequestStatus } from '../types/UserReports'\nimport localsHelper from './localsHelper'\n\nexport const itemActionsHtml = (\n  retryHref: string,\n  executionId: string,\n  type: 'requested' | 'viewed',\n  status: RequestStatus,\n) => {\n  const text = status === RequestStatus.EXPIRED ? 'Refresh' : 'Retry'\n  return `<div class=\"dpr-icon-wrapper__item-actions\">\n      <a class='dpr-user-list-action govuk-link--no-visited-state govuk-!-margin-bottom-1' href=\"${retryHref}\">${text}</a>\n      <a class=\"dpr-user-list-action govuk-link--no-visited-state dpr-remove-${type}-report-button\"\" href=\"#\" data-execution-id='${executionId}'>Remove</a>\n    </div>`\n}\n\nconst getTypeTagColor = (type: ReportType) => {\n  let tagColourClass = ''\n  switch (type) {\n    case ReportType.DASHBOARD:\n      tagColourClass = 'govuk-tag--purple'\n      break\n    case ReportType.UNAVAILABLE:\n      tagColourClass = 'govuk-tag--grey'\n      break\n    default:\n      tagColourClass = ''\n      break\n  }\n  return tagColourClass\n}\n\nexport const createListItemProduct = (productName: string, reportName: string, type: ReportType, ts?: string) => {\n  const tsClass = !ts ? 'dpr-display-none' : ''\n  const tagColor = getTypeTagColor(type)\n  const reportType = toSentenceCase(type)\n  return `<div>\n  <p class=\"govuk-body govuk-!-margin-bottom-1\" aria-label=\"Report name ${reportName}\"><strong>${reportName}</strong></p>\n  <p class=\"govuk-body-s govuk-!-margin-bottom-3\" aria-label=\"Product name ${productName}\">${productName}</p>\n  <strong class=\"govuk-tag ${tagColor} dpr-request-status-tag--small govuk-!-margin-bottom-4\" aria-label=\"Report type ${reportType}\">${reportType}</strong>\n  <p class=\"govuk-body-xs govuk-!-margin-bottom-0 govuk-!-margin-top-3 ${tsClass}\" aria-label=\"Timestamp\">${ts}</p>\n</div>`\n}\n\nexport const createListItemProductMin = (reportName: string, type: ReportType) => {\n  const tagColor = getTypeTagColor(type)\n  const reportType = toSentenceCase(type)\n  return `<div>\n  <p class=\"govuk-body-s govuk-!-margin-bottom-2\"><strong>${reportName}</strong></p>\n  <strong class=\"govuk-tag ${tagColor} dpr-request-status-tag--small\">${reportType}</strong>\n</div>`\n}\n\nexport const createListActions = (\n  href: string,\n  type: ReportType,\n  loadType?: LoadType,\n  bookmarkHtml?: string,\n  authorised = true,\n  missing = false,\n) => {\n  if (!authorised) {\n    return `<strong class=\"govuk-tag govuk-tag--red dpr-request-status-tag dpr-request-status-tag--small dpr-unauthorised-report\" aria-label=\"You are unauthorised to view this report\">Unauthorised</strong>`\n  }\n\n  let requestAction\n  let actionText\n  if (missing) {\n    actionText = `Request report`\n    requestAction = `<a class='dpr-user-list-action govuk-link--no-visited-state govuk-!-margin-bottom-1' href=\"${href}\">${actionText}</a>`\n  } else {\n    actionText = `Request ${type}`\n    if (loadType && loadType === LoadType.SYNC) {\n      actionText = `Load ${type}`\n    }\n    requestAction = `<a class='dpr-user-list-action govuk-link--no-visited-state govuk-!-margin-bottom-1 dpr-live-report dpr-type__${type}' href=\"${href}\">${actionText}</a>`\n  }\n\n  if (bookmarkHtml) {\n    requestAction = `${requestAction}${bookmarkHtml}`\n  }\n\n  return requestAction\n}\n\nexport const toSentenceCase = (text: string) => {\n  return text.charAt(0).toUpperCase() + text.substring(1).toLowerCase()\n}\n\nexport const setInitialHref = (\n  loadType: LoadType,\n  type: ReportType,\n  reportId: string,\n  id: string,\n  res: Response,\n  isMissing = false,\n) => {\n  let href = ''\n  if (isMissing) {\n    href = `dpr/request-missing-report/${reportId}/${id}/form`\n  } else {\n    const { pathSuffix, dpdPathFromQuery } = localsHelper.getValues(res)\n    const dpdPathQueryParam = dpdPathFromQuery ? pathSuffix : ''\n    href = `dpr/request-report/${type}/${reportId}/${id}/filters${dpdPathQueryParam}`\n\n    if (loadType && loadType === LoadType.SYNC) {\n      href = `dpr/view-report/sync/${type}/${reportId}/${id}/load-report${dpdPathQueryParam}`\n    }\n  }\n  return href\n}\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,uBAAAE,EAAA,0BAAAC,EAAA,6BAAAC,EAAA,oBAAAC,EAAA,mBAAAC,EAAA,mBAAAC,IAAA,eAAAC,EAAAR,GACA,IAAAS,EAAoD,gCACpDC,EAAyB,6BAElB,MAAML,EAAkB,CAC7BM,EACAC,EACAC,EACAC,IACG,CACH,MAAMC,EAAOD,IAAW,gBAAc,QAAU,UAAY,QAC5D,MAAO;AAAA,mGAC0FH,CAAS,KAAKI,CAAI;AAAA,+EACtCF,CAAI,gDAAgDD,CAAW;AAAA,WAE9I,EAEMI,EAAmBH,GAAqB,CAC5C,IAAII,EAAiB,GACrB,OAAQJ,EAAM,CACZ,KAAK,aAAW,UACdI,EAAiB,oBACjB,MACF,KAAK,aAAW,YACdA,EAAiB,kBACjB,MACF,QACEA,EAAiB,GACjB,KACJ,CACA,OAAOA,CACT,EAEad,EAAwB,CAACe,EAAqBC,EAAoBN,EAAkBO,IAAgB,CAC/G,MAAMC,EAAWD,EAA0B,GAArB,mBAChBE,EAAWN,EAAgBH,CAAI,EAC/BU,EAAahB,EAAeM,CAAI,EACtC,MAAO;AAAA,0EACiEM,CAAU,aAAaA,CAAU;AAAA,6EAC9BD,CAAW,KAAKA,CAAW;AAAA,6BAC3EI,CAAQ,mFAAmFC,CAAU,KAAKA,CAAU;AAAA,yEACxEF,CAAO,4BAA4BD,CAAE;AAAA,OAE9G,EAEahB,EAA2B,CAACe,EAAoBN,IAAqB,CAChF,MAAMS,EAAWN,EAAgBH,CAAI,EAC/BU,EAAahB,EAAeM,CAAI,EACtC,MAAO;AAAA,4DACmDM,CAAU;AAAA,6BACzCG,CAAQ,mCAAmCC,CAAU;AAAA,OAElF,EAEarB,EAAoB,CAC/BsB,EACAX,EACAY,EACAC,EACAC,EAAa,GACbC,EAAU,KACP,CACH,GAAI,CAACD,EACH,MAAO,oMAGT,IAAIE,EACAC,EACJ,OAAIF,GACFE,EAAa,iBACbD,EAAgB,8FAA8FL,CAAI,KAAKM,CAAU,SAEjIA,EAAa,WAAWjB,CAAI,GACxBY,GAAYA,IAAa,WAAS,OACpCK,EAAa,QAAQjB,CAAI,IAE3BgB,EAAgB,iHAAiHhB,CAAI,WAAWW,CAAI,KAAKM,CAAU,QAGjKJ,IACFG,EAAgB,GAAGA,CAAa,GAAGH,CAAY,IAG1CG,CACT,EAEatB,EAAkBQ,GACtBA,EAAK,OAAO,CAAC,EAAE,YAAY,EAAIA,EAAK,UAAU,CAAC,EAAE,YAAY,EAGzDT,EAAiB,CAC5BmB,EACAZ,EACAkB,EACAC,EACAC,EACAC,EAAY,KACT,CACH,IAAIV,EAAO,GACX,GAAIU,EACFV,EAAO,8BAA8BO,CAAQ,IAAIC,CAAE,YAC9C,CACL,KAAM,CAAE,WAAAG,EAAY,iBAAAC,CAAiB,EAAI,EAAAC,QAAa,UAAUJ,CAAG,EAC7DK,EAAoBF,EAAmBD,EAAa,GAC1DX,EAAO,sBAAsBX,CAAI,IAAIkB,CAAQ,IAAIC,CAAE,WAAWM,CAAiB,GAE3Eb,GAAYA,IAAa,WAAS,OACpCD,EAAO,wBAAwBX,CAAI,IAAIkB,CAAQ,IAAIC,CAAE,eAAeM,CAAiB,GAEzF,CACA,OAAOd,CACT",
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,uBAAAE,EAAA,0BAAAC,EAAA,6BAAAC,EAAA,oBAAAC,EAAA,mBAAAC,EAAA,mBAAAC,IAAA,eAAAC,EAAAR,GACA,IAAAS,EAAoD,gCACpDC,EAAyB,6BAElB,MAAML,EAAkB,CAC7BM,EACAC,EACAC,EACAC,IACG,CACH,MAAMC,EAAOD,IAAW,gBAAc,QAAU,UAAY,QAC5D,MAAO;AAAA,mGAC0FH,CAAS,KAAKI,CAAI;AAAA,+EACtCF,CAAI,gDAAgDD,CAAW;AAAA,WAE9I,EAEMI,EAAmBH,GAAqB,CAC5C,IAAII,EAAiB,GACrB,OAAQJ,EAAM,CACZ,KAAK,aAAW,UACdI,EAAiB,oBACjB,MACF,KAAK,aAAW,YACdA,EAAiB,kBACjB,MACF,QACEA,EAAiB,GACjB,KACJ,CACA,OAAOA,CACT,EAEad,EAAwB,CAACe,EAAqBC,EAAoBN,EAAkBO,IAAgB,CAC/G,MAAMC,EAAWD,EAA0B,GAArB,mBAChBE,EAAWN,EAAgBH,CAAI,EAC/BU,EAAahB,EAAeM,CAAI,EACtC,MAAO;AAAA,0EACiEM,CAAU,aAAaA,CAAU;AAAA,6EAC9BD,CAAW,KAAKA,CAAW;AAAA,6BAC3EI,CAAQ,mFAAmFC,CAAU,KAAKA,CAAU;AAAA,yEACxEF,CAAO,4BAA4BD,CAAE;AAAA,OAE9G,EAEahB,EAA2B,CAACe,EAAoBN,IAAqB,CAChF,MAAMS,EAAWN,EAAgBH,CAAI,EAC/BU,EAAahB,EAAeM,CAAI,EACtC,MAAO;AAAA,4DACmDM,CAAU;AAAA,6BACzCG,CAAQ,mCAAmCC,CAAU;AAAA,OAElF,EAEarB,EAAoB,CAC/BsB,EACAX,EACAY,EACAC,EACAC,EAAa,GACbC,EAAU,KACP,CACH,GAAI,CAACD,EACH,MAAO,oMAGT,IAAIE,EACAC,EACJ,OAAIF,GACFE,EAAa,iBACbD,EAAgB,8FAA8FL,CAAI,KAAKM,CAAU,SAEjIA,EAAa,WAAWjB,CAAI,GACxBY,GAAYA,IAAa,WAAS,OACpCK,EAAa,QAAQjB,CAAI,IAE3BgB,EAAgB,iHAAiHhB,CAAI,WAAWW,CAAI,KAAKM,CAAU,QAGjKJ,IACFG,EAAgB,GAAGA,CAAa,GAAGH,CAAY,IAG1CG,CACT,EAEatB,EAAkBQ,GACtBA,EAAK,OAAO,CAAC,EAAE,YAAY,EAAIA,EAAK,UAAU,CAAC,EAAE,YAAY,EAGzDT,EAAiB,CAC5BmB,EACAZ,EACAkB,EACAC,EACAC,EACAC,EAAY,KACT,CACH,IAAIV,EAAO,GACX,GAAIU,EACFV,EAAO,8BAA8BO,CAAQ,IAAIC,CAAE,YAC9C,CACL,KAAM,CAAE,WAAAG,EAAY,iBAAAC,CAAiB,EAAI,EAAAC,QAAa,UAAUJ,CAAG,EAC7DK,EAAoBF,EAAmBD,EAAa,GAC1DX,EAAO,sBAAsBX,CAAI,IAAIkB,CAAQ,IAAIC,CAAE,WAAWM,CAAiB,GAE3Eb,GAAYA,IAAa,WAAS,OACpCD,EAAO,wBAAwBX,CAAI,IAAIkB,CAAQ,IAAIC,CAAE,eAAeM,CAAiB,GAEzF,CACA,OAAOd,CACT",
   "names": ["reportListsHelper_exports", "__export", "createListActions", "createListItemProduct", "createListItemProductMin", "itemActionsHtml", "setInitialHref", "toSentenceCase", "__toCommonJS", "import_UserReports", "import_localsHelper", "retryHref", "executionId", "type", "status", "text", "getTypeTagColor", "tagColourClass", "productName", "reportName", "ts", "tsClass", "tagColor", "reportType", "href", "loadType", "bookmarkHtml", "authorised", "missing", "requestAction", "actionText", "reportId", "id", "res", "isMissing", "pathSuffix", "dpdPathFromQuery", "localsHelper", "dpdPathQueryParam"]
 }

package/dpr/utils/reportStoreHelper.js

@@ -1,2 +1,2 @@
-var n=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var d=Object.getOwnPropertyNames;var g=Object.prototype.hasOwnProperty;var y=(t,e)=>{for(var s in e)n(t,s,{get:e[s],enumerable:!0})},v=(t,e,s,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of d(e))!g.call(t,r)&&r!==s&&n(t,r,{get:()=>e[r],enumerable:!(a=R(e,r))||a.enumerable});return t};var w=t=>v(n({},"__esModule",{value:!0}),t);var f={};y(f,{getDuplicateRequestIds:()=>l,removeDuplicates:()=>S});module.exports=w(f);const S=async({storeService:t,userId:e,id:s,search:a})=>{const r=await t.getAllReportsById(s,e),o=l(a,r);o.length&&await Promise.all(o.map(async c=>{await t.removeReport(c,e)}))},l=(t,e)=>{const s=[],a=new URLSearchParams(t);return e.forEach(r=>{const o=[],c=r.url?.request?.search||"",i=new URLSearchParams(c),{executionId:p}=r;i.entries.length===a.entries.length&&a.forEach((h,u)=>{const m=i.has(u,h);o.push(m)}),o.every(Boolean)&&p&&s.push(p)}),s};0&&(module.exports={getDuplicateRequestIds,removeDuplicates});
+"use strict";var n=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var d=Object.getOwnPropertyNames;var g=Object.prototype.hasOwnProperty;var y=(t,e)=>{for(var s in e)n(t,s,{get:e[s],enumerable:!0})},v=(t,e,s,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of d(e))!g.call(t,r)&&r!==s&&n(t,r,{get:()=>e[r],enumerable:!(a=R(e,r))||a.enumerable});return t};var w=t=>v(n({},"__esModule",{value:!0}),t);var f={};y(f,{getDuplicateRequestIds:()=>l,removeDuplicates:()=>S});module.exports=w(f);const S=async({storeService:t,userId:e,id:s,search:a})=>{const r=await t.getAllReportsById(s,e),o=l(a,r);o.length&&await Promise.all(o.map(async c=>{await t.removeReport(c,e)}))},l=(t,e)=>{const s=[],a=new URLSearchParams(t);return e.forEach(r=>{const o=[],c=r.url?.request?.search||"",i=new URLSearchParams(c),{executionId:p}=r;i.entries.length===a.entries.length&&a.forEach((h,u)=>{const m=i.has(u,h);o.push(m)}),o.every(Boolean)&&p&&s.push(p)}),s};0&&(module.exports={getDuplicateRequestIds,removeDuplicates});
 //# sourceMappingURL=reportStoreHelper.js.map

package/dpr/utils/reportStoreHelper.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/dpr/utils/reportStoreHelper.ts"],
   "sourcesContent": ["import type { RecentlyViewedStoreService, RequestedReportService } from '../services'\nimport { UserReportData } from '../types/UserReports'\n\nexport const removeDuplicates = async ({\n  storeService,\n  userId,\n  id,\n  search,\n}: {\n  storeService: RequestedReportService | RecentlyViewedStoreService\n  userId: string\n  id: string\n  search: string\n}) => {\n  const reports = await storeService.getAllReportsById(id, userId)\n  const duplicateIds = getDuplicateRequestIds(search, reports)\n  if (duplicateIds.length) {\n    await Promise.all(\n      duplicateIds.map(async (duplicateId: string) => {\n        await storeService.removeReport(duplicateId, userId)\n      }),\n    )\n  }\n}\n\n/**\n * Gets the execution IDs of duplicate requests\n * - Checks whether the request query are the same\n *\n * @param {string} newReportSearchParams\n * @param {UserReportData[]} existingReports\n * @return {string[]}  ids of the duplicate requests\n */\nexport const getDuplicateRequestIds = (newReportSearchParams: string, existingReports: UserReportData[]) => {\n  const duplicates: string[] = []\n  const newQueryParams = new URLSearchParams(newReportSearchParams)\n\n  existingReports.forEach((existingReportData: UserReportData) => {\n    const matches: boolean[] = []\n    const search = existingReportData.url?.request?.search || ''\n    const existingQueryParams = new URLSearchParams(search)\n    const { executionId } = existingReportData\n\n    if (existingQueryParams.entries.length === newQueryParams.entries.length) {\n      newQueryParams.forEach((newValue, newKey) => {\n        const match = existingQueryParams.has(newKey, newValue)\n        matches.push(match)\n      })\n    }\n    if (matches.every(Boolean) && executionId) {\n      duplicates.push(executionId)\n    }\n  })\n\n  return duplicates\n}\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,4BAAAE,EAAA,qBAAAC,IAAA,eAAAC,EAAAJ,GAGO,MAAMG,EAAmB,MAAO,CACrC,aAAAE,EACA,OAAAC,EACA,GAAAC,EACA,OAAAC,CACF,IAKM,CACJ,MAAMC,EAAU,MAAMJ,EAAa,kBAAkBE,EAAID,CAAM,EACzDI,EAAeR,EAAuBM,EAAQC,CAAO,EACvDC,EAAa,QACf,MAAM,QAAQ,IACZA,EAAa,IAAI,MAAOC,GAAwB,CAC9C,MAAMN,EAAa,aAAaM,EAAaL,CAAM,CACrD,CAAC,CACH,CAEJ,EAUaJ,EAAyB,CAACU,EAA+BC,IAAsC,CAC1G,MAAMC,EAAuB,CAAC,EACxBC,EAAiB,IAAI,gBAAgBH,CAAqB,EAEhE,OAAAC,EAAgB,QAASG,GAAuC,CAC9D,MAAMC,EAAqB,CAAC,EACtBT,EAASQ,EAAmB,KAAK,SAAS,QAAU,GACpDE,EAAsB,IAAI,gBAAgBV,CAAM,EAChD,CAAE,YAAAW,CAAY,EAAIH,EAEpBE,EAAoB,QAAQ,SAAWH,EAAe,QAAQ,QAChEA,EAAe,QAAQ,CAACK,EAAUC,IAAW,CAC3C,MAAMC,EAAQJ,EAAoB,IAAIG,EAAQD,CAAQ,EACtDH,EAAQ,KAAKK,CAAK,CACpB,CAAC,EAECL,EAAQ,MAAM,OAAO,GAAKE,GAC5BL,EAAW,KAAKK,CAAW,CAE/B,CAAC,EAEML,CACT",
+  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,4BAAAE,EAAA,qBAAAC,IAAA,eAAAC,EAAAJ,GAGO,MAAMG,EAAmB,MAAO,CACrC,aAAAE,EACA,OAAAC,EACA,GAAAC,EACA,OAAAC,CACF,IAKM,CACJ,MAAMC,EAAU,MAAMJ,EAAa,kBAAkBE,EAAID,CAAM,EACzDI,EAAeR,EAAuBM,EAAQC,CAAO,EACvDC,EAAa,QACf,MAAM,QAAQ,IACZA,EAAa,IAAI,MAAOC,GAAwB,CAC9C,MAAMN,EAAa,aAAaM,EAAaL,CAAM,CACrD,CAAC,CACH,CAEJ,EAUaJ,EAAyB,CAACU,EAA+BC,IAAsC,CAC1G,MAAMC,EAAuB,CAAC,EACxBC,EAAiB,IAAI,gBAAgBH,CAAqB,EAEhE,OAAAC,EAAgB,QAASG,GAAuC,CAC9D,MAAMC,EAAqB,CAAC,EACtBT,EAASQ,EAAmB,KAAK,SAAS,QAAU,GACpDE,EAAsB,IAAI,gBAAgBV,CAAM,EAChD,CAAE,YAAAW,CAAY,EAAIH,EAEpBE,EAAoB,QAAQ,SAAWH,EAAe,QAAQ,QAChEA,EAAe,QAAQ,CAACK,EAAUC,IAAW,CAC3C,MAAMC,EAAQJ,EAAoB,IAAIG,EAAQD,CAAQ,EACtDH,EAAQ,KAAKK,CAAK,CACpB,CAAC,EAECL,EAAQ,MAAM,OAAO,GAAKE,GAC5BL,EAAW,KAAKK,CAAW,CAE/B,CAAC,EAEML,CACT",
   "names": ["reportStoreHelper_exports", "__export", "getDuplicateRequestIds", "removeDuplicates", "__toCommonJS", "storeService", "userId", "id", "search", "reports", "duplicateIds", "duplicateId", "newReportSearchParams", "existingReports", "duplicates", "newQueryParams", "existingReportData", "matches", "existingQueryParams", "executionId", "newValue", "newKey", "match"]
 }

package/dpr/utils/reportStoreHelper.test.ts

@@ -1,3 +1,4 @@
+import { expect, jest } from '@jest/globals'
 import { RequestedReport, UserReportData } from '../types/UserReports'
 import * as ReportStoreHelper from './reportStoreHelper'
 import type { RequestedReportService, RecentlyViewedStoreService } from '../services'
@@ -62,12 +63,12 @@ describe('ReportStoreHelper', () => {
       ] as unknown as UserReportData[]
 
       recentlyViewedService = {
-        getAllReportsById: jest.fn().mockResolvedValue([...reports]),
+        getAllReportsById: jest.fn().mockReturnValueOnce([...reports]),
         removeReport: jest.fn(),
       } as unknown as RecentlyViewedStoreService
 
       requestedReportService = {
-        getAllReportsById: jest.fn().mockResolvedValue([...reports]),
+        getAllReportsById: jest.fn().mockReturnValueOnce([...reports]),
         removeReport: jest.fn(),
       } as unknown as RequestedReportService
     })

package/dpr/utils/requestStatusHelper.js

@@ -1,2 +1,2 @@
-var h=Object.create;var E=Object.defineProperty;var v=Object.getOwnPropertyDescriptor;var b=Object.getOwnPropertyNames;var U=Object.getPrototypeOf,F=Object.prototype.hasOwnProperty;var w=(e,t)=>{for(var r in t)E(e,r,{get:t[r],enumerable:!0})},A=(e,t,r,u)=>{if(t&&typeof t=="object"||typeof t=="function")for(let o of b(t))!F.call(e,o)&&o!==r&&E(e,o,{get:()=>t[o],enumerable:!(u=v(t,o))||u.enumerable});return e};var l=(e,t,r)=>(r=e!=null?h(U(e)):{},A(t||!e||!e.__esModule?E(r,"default",{value:e,enumerable:!0}):r,e)),B=e=>A(E({},"__esModule",{value:!0}),e);var X={};w(X,{default:()=>N,getExpiredStatus:()=>M,getStatus:()=>x,shouldTimeoutRequest:()=>I});module.exports=B(X);var m=l(require("dayjs")),P=l(require("dayjs/plugin/customParseFormat")),s=require("../types/UserReports"),D=l(require("./logger")),g=l(require("./localsHelper"));m.default.extend(P.default);const L=[s.RequestStatus.ABORTED,s.RequestStatus.FAILED,s.RequestStatus.EXPIRED],O=[s.RequestStatus.SUBMITTED,s.RequestStatus.STARTED,s.RequestStatus.PICKED];function H(e){return Promise.all(e).then(t=>{const r=t.find(o=>typeof o.status=="number"||L.includes(o.status));if(r)return r;const u=t.find(o=>O.includes(o.status));return u||t[0]})}const T=async(e,t,r,u,o)=>{const{definitionsPath:R}=g.default.getValues(r),{type:d,reportId:c,executionId:a,id:i,tableId:n}=t.body,S=(await e.requestedReportService.getReportByExecutionId(a,o)).childExecutionData??[];d===s.ReportType.REPORT&&S.push({executionId:a,tableId:n,variantId:i});const q=S.map(f=>e.reportingService.getAsyncReportStatus(u,c,f.variantId,f.executionId,R,f.tableId));d===s.ReportType.DASHBOARD&&q.push(e.dashboardService.getAsyncStatus(u,c,i,a,n,R));const y=await H(q);return{status:y.status,statusResponse:y}},x=async({req:e,res:t,services:r})=>{const{token:u,dprUser:o}=g.default.getValues(t),{status:R,requestedAt:d}=e.body,c=[s.RequestStatus.READY,s.RequestStatus.EXPIRED,s.RequestStatus.FAILED];let a,i,n;try{if({status:a,statusResponse:n}=await T(r,e,t,u,o.id),I({requestedAt:d,compareTime:new Date,durationMins:15})&&!c.includes(a))throw new Error("Request taking too long. Request Halted");if(a===s.RequestStatus.FAILED){D.default.error(`Error: ${JSON.stringify(n.error)}`);const{userMessage:p,developerMessage:S}=n.error;p||S?i=n.error:i={developerMessage:n.error}}}catch(p){D.default.error(`Error: ${JSON.stringify(p)}`);const{data:S}=p;i=S||{userMessage:p.message},a=R===s.RequestStatus.FINISHED?s.RequestStatus.EXPIRED:s.RequestStatus.FAILED}return typeof a=="number"&&(a=s.RequestStatus.FAILED),{status:a,...i&&{errorMessage:i}}},M=async({req:e,res:t,services:r})=>{const{token:u,dprUser:o}=g.default.getValues(t),{executionId:R,status:d}=e.body;let c,a;try{({status:a}=await T(r,e,t,u,o.id))}catch(n){const{data:p}=n;c=(p??{}).userMessage,a=d===s.RequestStatus.READY||d===s.RequestStatus.FINISHED?s.RequestStatus.EXPIRED:s.RequestStatus.FAILED}return{isExpired:{status:a,...c&&{errorMessage:c}}.status===s.RequestStatus.EXPIRED,executionId:R}},I=({requestedAt:e,compareTime:t,durationMins:r})=>{const u=(0,m.default)(t),o=(0,m.default)(e);return u.diff(o,"minutes")>=r};var N={getStatus:x,getExpiredStatus:M,shouldTimeoutRequest:I};0&&(module.exports={getExpiredStatus,getStatus,shouldTimeoutRequest});
+"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});
 //# sourceMappingURL=requestStatusHelper.js.map

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, 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"]
+  "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"]
 }

package/dpr/utils/requestStatusHelper.ts

@@ -6,24 +6,16 @@ import { ChildReportExecutionData } from '../types/ExecutionData'
 import logger from './logger'
 import { Services } from '../types/Services'
 import localsHelper from './localsHelper'
+import { components } from '../types/api'
+import ErrorHandler from './ErrorHandler'
 
 dayjs.extend(customParse)
 interface GetStatusUtilsResponse {
   status: RequestStatus
-  errorMessage?: string
+  errorMessage?: { userMessage?: string; developerMessage?: string }
   reportData?: RequestedReport | undefined
 }
 
-interface StatusResponseError {
-  userMessage: string
-  developerMessage: string
-}
-
-interface StatusResponse {
-  status: RequestStatus
-  error: StatusResponseError
-}
-
 const BAD_REQUEST_STATUSES: Array<RequestStatus> = [RequestStatus.ABORTED, RequestStatus.FAILED, RequestStatus.EXPIRED]
 
 const IN_PROGRESS_REQUEST_STATUSES: Array<RequestStatus> = [
@@ -32,7 +24,9 @@ const IN_PROGRESS_REQUEST_STATUSES: Array<RequestStatus> = [
   RequestStatus.PICKED,
 ]
 
-function findWorstStatusResponse(statusRequests: Array<Promise<StatusResponse>>): Promise<StatusResponse> {
+function findWorstStatusResponse(
+  statusRequests: Array<Promise<components['schemas']['StatementExecutionStatus']>>,
+): Promise<components['schemas']['StatementExecutionStatus']> {
   return Promise.all(statusRequests).then((statusResponses) => {
     const badStatus = statusResponses.find(
       (response) =>
@@ -67,23 +61,23 @@ const getStatusByReportType = async (
 
   const requestedReport = await services.requestedReportService.getReportByExecutionId(executionId, userId)
 
-  const reports = requestedReport.childExecutionData ?? []
+  const reports = requestedReport?.childExecutionData ?? []
 
+  let statusRequests: Array<Promise<components['schemas']['StatementExecutionStatus']>> = []
   if (type === ReportType.REPORT) {
     reports.push({ executionId, tableId, variantId: id })
+    statusRequests = reports.map((executionData: ChildReportExecutionData) => {
+      return services.reportingService.getAsyncReportStatus(
+        token,
+        reportId,
+        executionData.variantId,
+        executionData.executionId || '',
+        definitionsPath,
+        executionData.tableId || '',
+      )
+    })
   }
 
-  const statusRequests = reports.map((executionData: ChildReportExecutionData) =>
-    services.reportingService.getAsyncReportStatus(
-      token,
-      reportId,
-      executionData.variantId,
-      executionData.executionId,
-      definitionsPath,
-      executionData.tableId,
-    ),
-  )
-
   if (type === ReportType.DASHBOARD) {
     statusRequests.push(
       services.dashboardService.getAsyncStatus(token, reportId, id, executionId, tableId, definitionsPath),
@@ -111,33 +105,26 @@ export const getStatus = async ({
   const { status: currentStatus, requestedAt } = req.body
   const timeoutExemptStatuses = [RequestStatus.READY, RequestStatus.EXPIRED, RequestStatus.FAILED]
 
-  let status
+  let status: RequestStatus
   let errorMessage
-  let statusResponse
+  let statusResponse: components['schemas']['StatementExecutionStatus']
   try {
-    ;({ status, statusResponse } = await getStatusByReportType(services, req, res, token, dprUser.id))
+    const statusResponseData = await getStatusByReportType(services, req, res, token, dprUser.id)
+    statusResponse = statusResponseData.statusResponse
+    status = <RequestStatus>statusResponseData.status
     if (
       shouldTimeoutRequest({ requestedAt, compareTime: new Date(), durationMins: 15 }) &&
-      !timeoutExemptStatuses.includes(status)
+      !timeoutExemptStatuses.includes(<RequestStatus>status)
     ) {
       throw new Error('Request taking too long. Request Halted')
     }
 
     if (status === RequestStatus.FAILED) {
       logger.error(`Error: ${JSON.stringify(statusResponse.error)}`)
-      const { userMessage, developerMessage } = statusResponse.error
-      if (userMessage || developerMessage) {
-        errorMessage = statusResponse.error
-      } else {
-        errorMessage = {
-          developerMessage: statusResponse.error,
-        }
-      }
+      errorMessage = new ErrorHandler(statusResponse.error).formatError()
     }
   } catch (error) {
-    logger.error(`Error: ${JSON.stringify(error)}`)
-    const { data } = error
-    errorMessage = data || { userMessage: error.message }
+    errorMessage = new ErrorHandler(error).formatError()
     status = currentStatus === RequestStatus.FINISHED ? RequestStatus.EXPIRED : RequestStatus.FAILED
   }
 
@@ -167,10 +154,10 @@ export const getExpiredStatus = async ({ req, res, services }: { req: Request; r
   let errorMessage
   let status
   try {
-    ;({ status } = await getStatusByReportType(services, req, res, token, dprUser.id))
+    const statusData = await getStatusByReportType(services, req, res, token, dprUser.id)
+    status = <RequestStatus>statusData.status
   } catch (error) {
-    const { data } = error
-    errorMessage = (data ?? {}).userMessage
+    errorMessage = new ErrorHandler(error).formatError()
     status =
       currentStatus === RequestStatus.READY || currentStatus === RequestStatus.FINISHED
         ? RequestStatus.EXPIRED

package/dpr/utils/sanitisedError.js

@@ -1,2 +1,2 @@
-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 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});
 //# sourceMappingURL=sanitisedError.js.map

package/dpr/utils/sanitisedError.js.map

@@ -1,7 +1,7 @@
 {
   "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\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": "4ZAAA,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",
+  "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"]
 }

package/dpr/utils/sanitisedError.ts

@@ -5,7 +5,7 @@ interface SanitisedError {
   status?: number
   headers?: unknown
   data?: unknown
-  stack?: string
+  stack?: string | undefined
   message: string
 }
 

package/dpr/utils/urlHelper.js

@@ -1,2 +1,2 @@
-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 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});
 //# sourceMappingURL=urlHelper.js.map

package/dpr/utils/urlHelper.js.map

@@ -1,7 +1,7 @@
 {
   "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": "4ZAAA,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",
+  "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"]
 }

package/dpr/utils/urlHelper.ts

@@ -32,10 +32,10 @@ export const createUrlForParameters = (
   } else {
     queryParams = {
       selectedPage: '1',
-      pageSize: currentQueryParams.pageSize,
-      sortColumn: currentQueryParams.sortColumn,
-      sortedAsc: currentQueryParams.sortedAsc,
-      dataProductDefinitionsPath: currentQueryParams.dataProductDefinitionsPath,
+      pageSize: currentQueryParams['pageSize'],
+      sortColumn: currentQueryParams['sortColumn'],
+      sortedAsc: currentQueryParams['sortedAsc'],
+      dataProductDefinitionsPath: currentQueryParams['dataProductDefinitionsPath'],
     }
   }
 

package/dpr/validation/validate.js

@@ -1,2 +1,2 @@
-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 g=(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)),y=r=>i(n({},"__esModule",{value:!0}),r);var O={};g(O,{validate:()=>E});module.exports=y(O);var a=b(require("zod"));const E=r=>(e,t,o)=>{const s=r.safeParse(e.body);if(s.success)return o();const f=Object.entries(a.default.flattenError(s.error).fieldErrors).map(([l,c])=>({href:`#${l}`,text:c[0]}));return e.flash("DPR_ERRORS",JSON.stringify(f)),t.redirect(`${e.baseUrl}#`)};0&&(module.exports={validate});
+"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});
 //# sourceMappingURL=validate.js.map

package/dpr/validation/validate.js.map

@@ -1,7 +1,7 @@
 {
   "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, string | string[]]) => ({\n        href: `#${fieldName}`,\n        text: err[0],\n      }),\n    )\n    req.flash(`DPR_ERRORS`, JSON.stringify(errors))\n    return res.redirect(`${req.baseUrl}#`)\n  }\n"],
-  "mappings": "6iBAAA,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,KAAoC,CAClD,KAAM,IAAID,CAAS,GACnB,KAAMC,EAAI,CAAC,CACb,EACF,EACA,OAAAP,EAAI,MAAM,aAAc,KAAK,UAAUI,CAAM,CAAC,EACvCH,EAAI,SAAS,GAAGD,EAAI,OAAO,GAAG,CACvC",
+  "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"]
 }

package/dpr/validation/validate.ts

@@ -10,9 +10,9 @@ export const validate =
     }
 
     const errors = Object.entries(z.flattenError(result.error).fieldErrors).map(
-      ([fieldName, err]: [string, string | string[]]) => ({
+      ([fieldName, err]: [string, unknown]) => ({
         href: `#${fieldName}`,
-        text: err[0],
+        text: Array.isArray(err) ? err[0] : err,
       }),
     )
     req.flash(`DPR_ERRORS`, JSON.stringify(errors))

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.17.4",
+  "version": "4.17.5",
   "main": "dpr/all.mjs",
   "sass": "dpr/all.scss",
   "engines": {
@@ -64,7 +64,8 @@
     "lint:fix": "./node_modules/.bin/eslint . --fix",
     "axe_tests": "axe --exit --save axe_results.json $npm_package_config_home_url, $npm_package_config_request_url, $npm_package_config_polling_url, $npm_package_config_report_url",
     "accessibility_tests": "npm run axe_tests && npm run pa11y_tests",
-    "generate-api-types": "openapi-typescript https://digital-prison-reporting-mi-dev.hmpps.service.justice.gov.uk/v3/api-docs --output src/dpr/types/api.d.ts && npm run lint:fix"
+    "generate-api-types": "openapi-typescript https://digital-prison-reporting-mi-dev.hmpps.service.justice.gov.uk/v3/api-docs --output src/dpr/types/api.d.ts && npm run lint:fix",
+    "typecheck": "tsc"
   },
   "jest": {
     "transform": {
@@ -172,6 +173,7 @@
     "@axe-core/cli": "^4.10.0",
     "@badeball/cypress-cucumber-preprocessor": "^22.2.0",
     "@bahmutov/cypress-esbuild-preprocessor": "^2.2.5",
+    "@jest/globals": "^30.2.0",
     "@semantic-release/git": "^10.0.1",
     "@semantic-release/npm": "^11.0.0",
     "@testing-library/cypress": "^10.0.3",

package/dpr/components/error-summary/utils.js

@@ -1,2 +0,0 @@
-var o=Object.defineProperty;var E=Object.getOwnPropertyDescriptor;var i=Object.getOwnPropertyNames;var g=Object.prototype.hasOwnProperty;var D=(r,e)=>{for(var s in e)o(r,s,{get:e[s],enumerable:!0})},u=(r,e,s,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let t of i(e))!g.call(r,t)&&t!==s&&o(r,t,{get:()=>e[t],enumerable:!(a=E(e,t))||a.enumerable});return r};var d=r=>u(o({},"__esModule",{value:!0}),r);var l={};D(l,{default:()=>f,handleError:()=>p});module.exports=d(l);const p=(r,e)=>{const s=n(r);return c(s,e)},c=(r,e)=>{const s=n(r);let a="FAILED",t;return s.userMessage.includes("TypeError:")&&(t="There is an issue in the client. This has been reported to admin staff"),s.userMessage.includes("The stored report or dashboard was not found.")&&(a="EXPIRED",t=`This ${e} has expired`),{status:a,developerMessage:s.developerMessage,userMessage:t||s.userMessage}},n=r=>{if(r&&r.data)return r.data;if(r&&r.message){const e=r;return{status:500,userMessage:`${e.name}: ${e.message}`,developerMessage:e.stack}}return r};var f={handleError:p};0&&(module.exports={handleError});
-//# sourceMappingURL=utils.js.map

package/dpr/components/error-summary/utils.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../src/dpr/components/error-summary/utils.ts"],
-  "sourcesContent": ["export const handleError = (error: DprError | DprErrorData | Error, reportType?: string) => {\n  const dprError: DprError = formatError(error)\n  return mapError(dprError, reportType)\n}\n\nconst mapError = (error: DprError | DprErrorData | Error, reportType?: string): DprUIError => {\n  const dprError: DprError = formatError(error)\n\n  let status = 'FAILED'\n  let message\n\n  if (dprError.userMessage.includes('TypeError:')) {\n    message = 'There is an issue in the client. This has been reported to admin staff'\n  }\n\n  if (dprError.userMessage.includes('The stored report or dashboard was not found.')) {\n    status = 'EXPIRED'\n    message = `This ${reportType} has expired`\n  }\n\n  return {\n    status,\n    developerMessage: dprError.developerMessage,\n    userMessage: message || dprError.userMessage,\n  }\n}\n\nconst formatError = (error: DprError | DprErrorData | Error) => {\n  if (error && (<DprErrorData>error).data) {\n    return (<DprErrorData>error).data\n  }\n\n  if (error && (<Error>error).message) {\n    const e: Error = error as Error\n    return {\n      status: 500,\n      userMessage: `${e.name}: ${e.message}`,\n      developerMessage: e.stack,\n    }\n  }\n\n  return error as DprError\n}\n\nexport interface DprErrorData {\n  data: DprError\n}\n\nexport interface DprError {\n  status: number | string\n  errorCode?: number\n  userMessage: string\n  developerMessage?: string\n  moreInfo?: string\n}\n\ninterface DprUIError {\n  status: string\n  userMessage: string\n  developerMessage?: string\n}\n\nexport default {\n  handleError,\n}\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,gBAAAC,IAAA,eAAAC,EAAAJ,GAAO,MAAMG,EAAc,CAACE,EAAwCC,IAAwB,CAC1F,MAAMC,EAAqBC,EAAYH,CAAK,EAC5C,OAAOI,EAASF,EAAUD,CAAU,CACtC,EAEMG,EAAW,CAACJ,EAAwCC,IAAoC,CAC5F,MAAMC,EAAqBC,EAAYH,CAAK,EAE5C,IAAIK,EAAS,SACTC,EAEJ,OAAIJ,EAAS,YAAY,SAAS,YAAY,IAC5CI,EAAU,0EAGRJ,EAAS,YAAY,SAAS,+CAA+C,IAC/EG,EAAS,UACTC,EAAU,QAAQL,CAAU,gBAGvB,CACL,OAAAI,EACA,iBAAkBH,EAAS,iBAC3B,YAAaI,GAAWJ,EAAS,WACnC,CACF,EAEMC,EAAeH,GAA2C,CAC9D,GAAIA,GAAwBA,EAAO,KACjC,OAAsBA,EAAO,KAG/B,GAAIA,GAAiBA,EAAO,QAAS,CACnC,MAAM,EAAWA,EACjB,MAAO,CACL,OAAQ,IACR,YAAa,GAAG,EAAE,IAAI,KAAK,EAAE,OAAO,GACpC,iBAAkB,EAAE,KACtB,CACF,CAEA,OAAOA,CACT,EAoBA,IAAOH,EAAQ,CACb,YAAAC,CACF",
-  "names": ["utils_exports", "__export", "utils_default", "handleError", "__toCommonJS", "error", "reportType", "dprError", "formatError", "mapError", "status", "message"]
-}

package/dpr/components/error-summary/utils.test.ts

@@ -1,54 +0,0 @@
-import ErrorSummaryUtils, { DprError, DprErrorData } from './utils'
-
-describe('ErrorSummaryUtils', () => {
-  describe('handleError', () => {
-    let dprError: DprError
-    let dprErrorData: DprErrorData
-    let error: Error
-
-    beforeEach(() => {
-      dprError = {
-        status: 404,
-        errorCode: 404,
-        userMessage: 'TypeError:',
-        developerMessage: 'stack trace',
-      }
-
-      dprErrorData = {
-        data: dprError,
-      }
-
-      error = {
-        name: 'TypeError',
-        message: 'error message',
-        stack: 'stack',
-      }
-    })
-
-    it('should handle a dpr error and map it to friendly message', () => {
-      const mappedError = ErrorSummaryUtils.handleError(dprError)
-
-      expect(mappedError.userMessage).toEqual('There is an issue in the client. This has been reported to admin staff')
-    })
-
-    it('should handle a dpr data error and map it to friendly message', () => {
-      const mappedError = ErrorSummaryUtils.handleError(dprErrorData)
-
-      expect(mappedError.userMessage).toEqual('There is an issue in the client. This has been reported to admin staff')
-    })
-
-    it('should handle a generic data and map it to friendly message', () => {
-      const mappedError = ErrorSummaryUtils.handleError(error)
-
-      expect(mappedError.userMessage).toEqual('There is an issue in the client. This has been reported to admin staff')
-    })
-
-    it('should handle a dpr error and map it to an expired message', () => {
-      dprError.userMessage = 'The stored report or dashboard was not found.'
-      const mappedError = ErrorSummaryUtils.handleError(dprError, 'report')
-
-      expect(mappedError.userMessage).toEqual('This report has expired')
-      expect(mappedError.status).toEqual('EXPIRED')
-    })
-  })
-})

package/dpr/components/error-summary/utils.ts

@@ -1,65 +0,0 @@
-export const handleError = (error: DprError | DprErrorData | Error, reportType?: string) => {
-  const dprError: DprError = formatError(error)
-  return mapError(dprError, reportType)
-}
-
-const mapError = (error: DprError | DprErrorData | Error, reportType?: string): DprUIError => {
-  const dprError: DprError = formatError(error)
-
-  let status = 'FAILED'
-  let message
-
-  if (dprError.userMessage.includes('TypeError:')) {
-    message = 'There is an issue in the client. This has been reported to admin staff'
-  }
-
-  if (dprError.userMessage.includes('The stored report or dashboard was not found.')) {
-    status = 'EXPIRED'
-    message = `This ${reportType} has expired`
-  }
-
-  return {
-    status,
-    developerMessage: dprError.developerMessage,
-    userMessage: message || dprError.userMessage,
-  }
-}
-
-const formatError = (error: DprError | DprErrorData | Error) => {
-  if (error && (<DprErrorData>error).data) {
-    return (<DprErrorData>error).data
-  }
-
-  if (error && (<Error>error).message) {
-    const e: Error = error as Error
-    return {
-      status: 500,
-      userMessage: `${e.name}: ${e.message}`,
-      developerMessage: e.stack,
-    }
-  }
-
-  return error as DprError
-}
-
-export interface DprErrorData {
-  data: DprError
-}
-
-export interface DprError {
-  status: number | string
-  errorCode?: number
-  userMessage: string
-  developerMessage?: string
-  moreInfo?: string
-}
-
-interface DprUIError {
-  status: string
-  userMessage: string
-  developerMessage?: string
-}
-
-export default {
-  handleError,
-}

package/dpr/services/missingReport/missingReportClient.js

@@ -1,2 +0,0 @@
-var g=Object.create;var r=Object.defineProperty;var l=Object.getOwnPropertyDescriptor;var C=Object.getOwnPropertyNames;var a=Object.getPrototypeOf,c=Object.prototype.hasOwnProperty;var f=(t,i)=>{for(var s in i)r(t,s,{get:i[s],enumerable:!0})},p=(t,i,s,n)=>{if(i&&typeof i=="object"||typeof i=="function")for(let e of C(i))!c.call(t,e)&&e!==s&&r(t,e,{get:()=>i[e],enumerable:!(n=l(i,e))||n.enumerable});return t};var u=(t,i,s)=>(s=t!=null?g(a(t)):{},p(i||!t||!t.__esModule?r(s,"default",{value:t,enumerable:!0}):s,t)),R=t=>p(r({},"__esModule",{value:!0}),t);var M={};f(M,{MissingReportClient:()=>o,default:()=>h});module.exports=R(M);var m=u(require("../../data/restClient"));class o{constructor(i){this.restClient=new m.default("Missing report API Client",i)}submitMissingReportEntry(i,s,n,e){return this.restClient.post({path:`/missingRequest/${s}/${n}`,data:e},i)}}var h=o;0&&(module.exports={MissingReportClient});
-//# sourceMappingURL=missingReportClient.js.map