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

package/dpr/utils/reportListsHelper.js

@@ -1,13 +1,129 @@
-"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>
-  <p class="govuk-body govuk-!-margin-bottom-1" aria-label="Report name ${e}"><strong>${e}</strong></p>
-  <p class="govuk-body-s govuk-!-margin-bottom-3" aria-label="Product name ${t}">${t}</p>
-  <strong class="govuk-tag ${g} dpr-request-status-tag--small govuk-!-margin-bottom-4" aria-label="Report type ${a}">${a}</strong>
-  <p class="govuk-body-xs govuk-!-margin-bottom-0 govuk-!-margin-top-3 ${o}" aria-label="Timestamp">${s}</p>
-</div>`},x=(t,e)=>{const r=d(e),s=p(e);return`<div>
-  <p class="govuk-body-s govuk-!-margin-bottom-2"><strong>${t}</strong></p>
-  <strong class="govuk-tag ${r} dpr-request-status-tag--small">${s}</strong>
-</div>`},L=(t,e,r,s,o=!0,g=!1)=>{if(!o)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>';let a,n;return g?(n="Request report",a=`<a class='dpr-user-list-action govuk-link--no-visited-state govuk-!-margin-bottom-1' href="${t}">${n}</a>`):(n=`Request ${e}`,r&&r===i.LoadType.SYNC&&(n=`Load ${e}`),a=`<a class='dpr-user-list-action govuk-link--no-visited-state govuk-!-margin-bottom-1 dpr-live-report dpr-type__${e}' href="${t}">${n}</a>`),s&&(a=`${a}${s}`),a},p=t=>t.charAt(0).toUpperCase()+t.substring(1).toLowerCase(),A=(t,e,r,s,o,g=!1)=>{let a="";if(g)a=`dpr/request-missing-report/${r}/${s}/form`;else{const{pathSuffix:n,dpdPathFromQuery:m}=v.default.getValues(o),l=m?n:"";a=`dpr/request-report/${e}/${r}/${s}/filters${l}`,t&&t===i.LoadType.SYNC&&(a=`dpr/view-report/sync/${e}/${r}/${s}/load-report${l}`)}return a};0&&(module.exports={createListActions,createListItemProduct,createListItemProductMin,itemActionsHtml,setInitialHref,toSentenceCase});
+"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 reportListsHelper_exports = {};
+__export(reportListsHelper_exports, {
+  createListActions: () => createListActions,
+  createListItemProduct: () => createListItemProduct,
+  createListItemProductMin: () => createListItemProductMin,
+  itemActionsHtml: () => itemActionsHtml,
+  setInitialHref: () => setInitialHref,
+  toSentenceCase: () => toSentenceCase
+});
+module.exports = __toCommonJS(reportListsHelper_exports);
+var import_UserReports = require("../types/UserReports");
+var import_localsHelper = __toESM(require("./localsHelper"));
+const itemActionsHtml = (retryHref, executionId, type, status) => {
+  const text = status === import_UserReports.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="${retryHref}">${text}</a>
+      <a class="dpr-user-list-action govuk-link--no-visited-state dpr-remove-${type}-report-button"" href="#" data-execution-id='${executionId}'>Remove</a>
+    </div>`;
+};
+const getTypeTagColor = (type) => {
+  let tagColourClass = "";
+  switch (type) {
+    case import_UserReports.ReportType.DASHBOARD:
+      tagColourClass = "govuk-tag--purple";
+      break;
+    case import_UserReports.ReportType.UNAVAILABLE:
+      tagColourClass = "govuk-tag--grey";
+      break;
+    default:
+      tagColourClass = "";
+      break;
+  }
+  return tagColourClass;
+};
+const createListItemProduct = (productName, reportName, type, ts) => {
+  const tsClass = !ts ? "dpr-display-none" : "";
+  const tagColor = getTypeTagColor(type);
+  const reportType = toSentenceCase(type);
+  return `<div>
+  <p class="govuk-body govuk-!-margin-bottom-1" aria-label="Report name ${reportName}"><strong>${reportName}</strong></p>
+  <p class="govuk-body-s govuk-!-margin-bottom-3" aria-label="Product name ${productName}">${productName}</p>
+  <strong class="govuk-tag ${tagColor} dpr-request-status-tag--small govuk-!-margin-bottom-4" aria-label="Report type ${reportType}">${reportType}</strong>
+  <p class="govuk-body-xs govuk-!-margin-bottom-0 govuk-!-margin-top-3 ${tsClass}" aria-label="Timestamp">${ts}</p>
+</div>`;
+};
+const createListItemProductMin = (reportName, type) => {
+  const tagColor = getTypeTagColor(type);
+  const reportType = toSentenceCase(type);
+  return `<div>
+  <p class="govuk-body-s govuk-!-margin-bottom-2"><strong>${reportName}</strong></p>
+  <strong class="govuk-tag ${tagColor} dpr-request-status-tag--small">${reportType}</strong>
+</div>`;
+};
+const createListActions = (href, type, loadType, bookmarkHtml, authorised = true, missing = false) => {
+  if (!authorised) {
+    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>`;
+  }
+  let requestAction;
+  let actionText;
+  if (missing) {
+    actionText = `Request report`;
+    requestAction = `<a class='dpr-user-list-action govuk-link--no-visited-state govuk-!-margin-bottom-1' href="${href}">${actionText}</a>`;
+  } else {
+    actionText = `Request ${type}`;
+    if (loadType && loadType === import_UserReports.LoadType.SYNC) {
+      actionText = `Load ${type}`;
+    }
+    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>`;
+  }
+  if (bookmarkHtml) {
+    requestAction = `${requestAction}${bookmarkHtml}`;
+  }
+  return requestAction;
+};
+const toSentenceCase = (text) => {
+  return text.charAt(0).toUpperCase() + text.substring(1).toLowerCase();
+};
+const setInitialHref = (loadType, type, reportId, id, res, isMissing = false) => {
+  let href = "";
+  if (isMissing) {
+    href = `dpr/request-missing-report/${reportId}/${id}/form`;
+  } else {
+    const { pathSuffix, dpdPathFromQuery } = import_localsHelper.default.getValues(res);
+    const dpdPathQueryParam = dpdPathFromQuery ? pathSuffix : "";
+    href = `dpr/request-report/${type}/${reportId}/${id}/filters${dpdPathQueryParam}`;
+    if (loadType && loadType === import_UserReports.LoadType.SYNC) {
+      href = `dpr/view-report/sync/${type}/${reportId}/${id}/load-report${dpdPathQueryParam}`;
+    }
+  }
+  return href;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createListActions,
+  createListItemProduct,
+  createListItemProductMin,
+  itemActionsHtml,
+  setInitialHref,
+  toSentenceCase
+});
 //# sourceMappingURL=reportListsHelper.js.map

package/dpr/utils/reportListsHelper.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../src/dpr/utils/reportListsHelper.ts"],
+  "sources": ["../../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": "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"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,yBAAoD;AACpD,0BAAyB;AAElB,MAAM,kBAAkB,CAC7B,WACA,aACA,MACA,WACG;AACH,QAAM,OAAO,WAAW,iCAAc,UAAU,YAAY;AAC5D,SAAO;AAAA,mGAC0F,SAAS,KAAK,IAAI;AAAA,+EACtC,IAAI,gDAAgD,WAAW;AAAA;AAE9I;AAEA,MAAM,kBAAkB,CAAC,SAAqB;AAC5C,MAAI,iBAAiB;AACrB,UAAQ,MAAM;AAAA,IACZ,KAAK,8BAAW;AACd,uBAAiB;AACjB;AAAA,IACF,KAAK,8BAAW;AACd,uBAAiB;AACjB;AAAA,IACF;AACE,uBAAiB;AACjB;AAAA,EACJ;AACA,SAAO;AACT;AAEO,MAAM,wBAAwB,CAAC,aAAqB,YAAoB,MAAkB,OAAgB;AAC/G,QAAM,UAAU,CAAC,KAAK,qBAAqB;AAC3C,QAAM,WAAW,gBAAgB,IAAI;AACrC,QAAM,aAAa,eAAe,IAAI;AACtC,SAAO;AAAA,0EACiE,UAAU,aAAa,UAAU;AAAA,6EAC9B,WAAW,KAAK,WAAW;AAAA,6BAC3E,QAAQ,mFAAmF,UAAU,KAAK,UAAU;AAAA,yEACxE,OAAO,4BAA4B,EAAE;AAAA;AAE9G;AAEO,MAAM,2BAA2B,CAAC,YAAoB,SAAqB;AAChF,QAAM,WAAW,gBAAgB,IAAI;AACrC,QAAM,aAAa,eAAe,IAAI;AACtC,SAAO;AAAA,4DACmD,UAAU;AAAA,6BACzC,QAAQ,mCAAmC,UAAU;AAAA;AAElF;AAEO,MAAM,oBAAoB,CAC/B,MACA,MACA,UACA,cACA,aAAa,MACb,UAAU,UACP;AACH,MAAI,CAAC,YAAY;AACf,WAAO;AAAA,EACT;AAEA,MAAI;AACJ,MAAI;AACJ,MAAI,SAAS;AACX,iBAAa;AACb,oBAAgB,8FAA8F,IAAI,KAAK,UAAU;AAAA,EACnI,OAAO;AACL,iBAAa,WAAW,IAAI;AAC5B,QAAI,YAAY,aAAa,4BAAS,MAAM;AAC1C,mBAAa,QAAQ,IAAI;AAAA,IAC3B;AACA,oBAAgB,iHAAiH,IAAI,WAAW,IAAI,KAAK,UAAU;AAAA,EACrK;AAEA,MAAI,cAAc;AAChB,oBAAgB,GAAG,aAAa,GAAG,YAAY;AAAA,EACjD;AAEA,SAAO;AACT;AAEO,MAAM,iBAAiB,CAAC,SAAiB;AAC9C,SAAO,KAAK,OAAO,CAAC,EAAE,YAAY,IAAI,KAAK,UAAU,CAAC,EAAE,YAAY;AACtE;AAEO,MAAM,iBAAiB,CAC5B,UACA,MACA,UACA,IACA,KACA,YAAY,UACT;AACH,MAAI,OAAO;AACX,MAAI,WAAW;AACb,WAAO,8BAA8B,QAAQ,IAAI,EAAE;AAAA,EACrD,OAAO;AACL,UAAM,EAAE,YAAY,iBAAiB,IAAI,oBAAAA,QAAa,UAAU,GAAG;AACnE,UAAM,oBAAoB,mBAAmB,aAAa;AAC1D,WAAO,sBAAsB,IAAI,IAAI,QAAQ,IAAI,EAAE,WAAW,iBAAiB;AAE/E,QAAI,YAAY,aAAa,4BAAS,MAAM;AAC1C,aAAO,wBAAwB,IAAI,IAAI,QAAQ,IAAI,EAAE,eAAe,iBAAiB;AAAA,IACvF;AAAA,EACF;AACA,SAAO;AACT;",
+  "names": ["localsHelper"]
 }

package/dpr/utils/reportStoreHelper.js

@@ -1,2 +1,66 @@
-"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});
+"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 reportStoreHelper_exports = {};
+__export(reportStoreHelper_exports, {
+  getDuplicateRequestIds: () => getDuplicateRequestIds,
+  removeDuplicates: () => removeDuplicates
+});
+module.exports = __toCommonJS(reportStoreHelper_exports);
+const removeDuplicates = async ({
+  storeService,
+  userId,
+  id,
+  search
+}) => {
+  const reports = await storeService.getAllReportsById(id, userId);
+  const duplicateIds = getDuplicateRequestIds(search, reports);
+  if (duplicateIds.length) {
+    await Promise.all(
+      duplicateIds.map(async (duplicateId) => {
+        await storeService.removeReport(duplicateId, userId);
+      })
+    );
+  }
+};
+const getDuplicateRequestIds = (newReportSearchParams, existingReports) => {
+  const duplicates = [];
+  const newQueryParams = new URLSearchParams(newReportSearchParams);
+  existingReports.forEach((existingReportData) => {
+    const matches = [];
+    const search = existingReportData.url?.request?.search || "";
+    const existingQueryParams = new URLSearchParams(search);
+    const { executionId } = existingReportData;
+    if (existingQueryParams.entries.length === newQueryParams.entries.length) {
+      newQueryParams.forEach((newValue, newKey) => {
+        const match = existingQueryParams.has(newKey, newValue);
+        matches.push(match);
+      });
+    }
+    if (matches.every(Boolean) && executionId) {
+      duplicates.push(executionId);
+    }
+  });
+  return duplicates;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getDuplicateRequestIds,
+  removeDuplicates
+});
 //# sourceMappingURL=reportStoreHelper.js.map

package/dpr/utils/reportStoreHelper.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../src/dpr/utils/reportStoreHelper.ts"],
+  "sources": ["../../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": "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"]
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGO,MAAM,mBAAmB,OAAO;AAAA,EACrC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAKM;AACJ,QAAM,UAAU,MAAM,aAAa,kBAAkB,IAAI,MAAM;AAC/D,QAAM,eAAe,uBAAuB,QAAQ,OAAO;AAC3D,MAAI,aAAa,QAAQ;AACvB,UAAM,QAAQ;AAAA,MACZ,aAAa,IAAI,OAAO,gBAAwB;AAC9C,cAAM,aAAa,aAAa,aAAa,MAAM;AAAA,MACrD,CAAC;AAAA,IACH;AAAA,EACF;AACF;AAUO,MAAM,yBAAyB,CAAC,uBAA+B,oBAAsC;AAC1G,QAAM,aAAuB,CAAC;AAC9B,QAAM,iBAAiB,IAAI,gBAAgB,qBAAqB;AAEhE,kBAAgB,QAAQ,CAAC,uBAAuC;AAC9D,UAAM,UAAqB,CAAC;AAC5B,UAAM,SAAS,mBAAmB,KAAK,SAAS,UAAU;AAC1D,UAAM,sBAAsB,IAAI,gBAAgB,MAAM;AACtD,UAAM,EAAE,YAAY,IAAI;AAExB,QAAI,oBAAoB,QAAQ,WAAW,eAAe,QAAQ,QAAQ;AACxE,qBAAe,QAAQ,CAAC,UAAU,WAAW;AAC3C,cAAM,QAAQ,oBAAoB,IAAI,QAAQ,QAAQ;AACtD,gBAAQ,KAAK,KAAK;AAAA,MACpB,CAAC;AAAA,IACH;AACA,QAAI,QAAQ,MAAM,OAAO,KAAK,aAAa;AACzC,iBAAW,KAAK,WAAW;AAAA,IAC7B;AAAA,EACF,CAAC;AAED,SAAO;AACT;",
+  "names": []
 }

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../src/dpr/utils/requestStatusHelper.ts"],
+  "sources": ["../../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": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAClB,+BAAwB;AAExB,yBAA2D;AAE3D,oBAAmB;AAEnB,0BAAyB;AAEzB,0BAAyB;AAEzB,aAAAA,QAAM,OAAO,yBAAAC,OAAW;AAOxB,MAAM,uBAA6C,CAAC,iCAAc,SAAS,iCAAc,QAAQ,iCAAc,OAAO;AAEtH,MAAM,+BAAqD;AAAA,EACzD,iCAAc;AAAA,EACd,iCAAc;AAAA,EACd,iCAAc;AAChB;AAEA,SAAS,wBACP,gBAC4D;AAC5D,SAAO,QAAQ,IAAI,cAAc,EAAE,KAAK,CAAC,oBAAoB;AAC3D,UAAM,YAAY,gBAAgB;AAAA,MAChC,CAAC,aACC,OAAO,SAAS,WAAW,YAAY,qBAAqB,SAAS,SAAS,MAAuB;AAAA,IACzG;AAEA,QAAI,WAAW;AACb,aAAO;AAAA,IACT;AAEA,UAAM,mBAAmB,gBAAgB;AAAA,MAAK,CAAC,aAC7C,6BAA6B,SAAS,SAAS,MAAuB;AAAA,IACxE;AAEA,QAAI,kBAAkB;AACpB,aAAO;AAAA,IACT;AAEA,WAAO,gBAAgB,CAAC;AAAA,EAC1B,CAAC;AACH;AAEA,MAAM,wBAAwB,OAC5B,UACA,KACA,KACA,OACA,WACG;AACH,QAAM,EAAE,gBAAgB,IAAI,oBAAAC,QAAa,UAAU,GAAG;AACtD,QAAM,EAAE,MAAM,UAAU,aAAa,IAAI,QAAQ,IAAI,IAAI;AAEzD,QAAM,kBAAkB,MAAM,SAAS,uBAAuB,uBAAuB,aAAa,MAAM;AAExG,QAAM,UAAU,iBAAiB,sBAAsB,CAAC;AAExD,MAAI,iBAAoF,CAAC;AACzF,MAAI,SAAS,8BAAW,QAAQ;AAC9B,YAAQ,KAAK,EAAE,aAAa,SAAS,WAAW,GAAG,CAAC;AACpD,qBAAiB,QAAQ,IAAI,CAAC,kBAA4C;AACxE,aAAO,SAAS,iBAAiB;AAAA,QAC/B;AAAA,QACA;AAAA,QACA,cAAc;AAAA,QACd,cAAc,eAAe;AAAA,QAC7B;AAAA,QACA,cAAc,WAAW;AAAA,MAC3B;AAAA,IACF,CAAC;AAAA,EACH;AAEA,MAAI,SAAS,8BAAW,WAAW;AACjC,mBAAe;AAAA,MACb,SAAS,iBAAiB,eAAe,OAAO,UAAU,IAAI,aAAa,SAAS,eAAe;AAAA,IACrG;AAAA,EACF;AAEA,QAAM,iBAAiB,MAAM,wBAAwB,cAAc;AAEnE,SAAO;AAAA,IACL,QAAQ,eAAe;AAAA,IACvB;AAAA,EACF;AACF;AAEO,MAAM,YAAY,OAAO;AAAA,EAC9B;AAAA,EACA;AAAA,EACA;AACF,MAIuC;AACrC,QAAM,EAAE,OAAO,QAAQ,IAAI,oBAAAA,QAAa,UAAU,GAAG;AACrD,QAAM,EAAE,QAAQ,eAAe,YAAY,IAAI,IAAI;AACnD,QAAM,wBAAwB,CAAC,iCAAc,OAAO,iCAAc,SAAS,iCAAc,MAAM;AAE/F,MAAI;AACJ,MAAI;AACJ,MAAI;AACJ,MAAI;AACF,UAAM,qBAAqB,MAAM,sBAAsB,UAAU,KAAK,KAAK,OAAO,QAAQ,EAAE;AAC5F,qBAAiB,mBAAmB;AACpC,aAAwB,mBAAmB;AAC3C,QACE,qBAAqB,EAAE,aAAa,aAAa,oBAAI,KAAK,GAAG,cAAc,GAAG,CAAC,KAC/E,CAAC,sBAAsB,SAAwB,MAAM,GACrD;AACA,YAAM,IAAI,MAAM,yCAAyC;AAAA,IAC3D;AAEA,QAAI,WAAW,iCAAc,QAAQ;AACnC,oBAAAC,QAAO,MAAM,UAAU,KAAK,UAAU,eAAe,KAAK,CAAC,EAAE;AAC7D,qBAAe,IAAI,oBAAAC,QAAa,eAAe,KAAK,EAAE,YAAY;AAAA,IACpE;AAAA,EACF,SAAS,OAAO;AACd,mBAAe,IAAI,oBAAAA,QAAa,KAAK,EAAE,YAAY;AACnD,aAAS,kBAAkB,iCAAc,WAAW,iCAAc,UAAU,iCAAc;AAAA,EAC5F;AAEA,MAAI,OAAO,WAAW,UAAU;AAC9B,aAAS,iCAAc;AAAA,EACzB;AAEA,SAAO;AAAA,IACL;AAAA,IACA,GAAI,gBAAgB,EAAE,aAAa;AAAA,EACrC;AACF;AAWO,MAAM,mBAAmB,OAAO,EAAE,KAAK,KAAK,SAAS,MAA2D;AACrH,QAAM,EAAE,OAAO,QAAQ,IAAI,oBAAAF,QAAa,UAAU,GAAG;AACrD,QAAM,EAAE,aAAa,QAAQ,cAAc,IAAI,IAAI;AAEnD,MAAI;AACJ,MAAI;AACJ,MAAI;AACF,UAAM,aAAa,MAAM,sBAAsB,UAAU,KAAK,KAAK,OAAO,QAAQ,EAAE;AACpF,aAAwB,WAAW;AAAA,EACrC,SAAS,OAAO;AACd,mBAAe,IAAI,oBAAAE,QAAa,KAAK,EAAE,YAAY;AACnD,aACE,kBAAkB,iCAAc,SAAS,kBAAkB,iCAAc,WACrE,iCAAc,UACd,iCAAc;AAAA,EACtB;AAEA,QAAM,SAAiC;AAAA,IACrC;AAAA,IACA,GAAI,gBAAgB,EAAE,aAAa;AAAA,EACrC;AAEA,SAAO;AAAA,IACL,WAAW,OAAO,WAAW,iCAAc;AAAA,IAC3C;AAAA,EACF;AACF;AAEO,MAAM,uBAAuB,CAAC;AAAA,EACnC;AAAA,EACA;AAAA,EACA;AACF,MAIM;AACJ,QAAM,kBAAc,aAAAJ,SAAM,WAAW;AACrC,QAAM,kBAAc,aAAAA,SAAM,WAAW;AAErC,QAAM,SAAS,YAAY,KAAK,aAAa,SAAS;AAEtD,SAAO,UAAU;AACnB;AAEA,IAAO,8BAAQ;AAAA,EACb;AAAA,EACA;AAAA,EACA;AACF;",
+  "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

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../src/dpr/utils/sanitisedError.ts"],
+  "sources": ["../../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": []
 }