@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.18.3 → 4.20.0

package/dpr/routes/journeys/view-report/sync/load-report/controller.js

@@ -1,2 +1,2 @@
-"use strict";var R=Object.create;var s=Object.defineProperty;var D=Object.getOwnPropertyDescriptor;var S=Object.getOwnPropertyNames;var w=Object.getPrototypeOf,H=Object.prototype.hasOwnProperty;var T=(e,t)=>{for(var r in t)s(e,r,{get:t[r],enumerable:!0})},p=(e,t,r,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let o of S(t))!H.call(e,o)&&o!==r&&s(e,o,{get:()=>t[o],enumerable:!(i=D(t,o))||i.enumerable});return e};var q=(e,t,r)=>(r=e!=null?R(w(e)):{},p(t||!e||!e.__esModule?s(r,"default",{value:e,enumerable:!0}):r,e)),x=e=>p(s({},"__esModule",{value:!0}),e);var L={};T(L,{LoadReportController:()=>n,default:()=>E});module.exports=x(L);var d=q(require("../../../../../utils/localsHelper")),l=require("../../../../../types/UserReports");class n{constructor(t,r){this.GET=async(t,r,i)=>{try{const{token:o}=d.default.getValues(r),{reportId:a,id:c}=t.params,{dataProductDefinitionsPath:u}=t.query,m=await this.services.reportingService.getDefinition(o,a,c,u),{name:y,variant:f,description:h}=m,{classification:v,description:P,name:g}=f;r.render("dpr/routes/journeys/view-report/sync/load-report/view",{renderData:{reportId:a,id:c,type:l.ReportType.REPORT,reportName:y,name:g,classification:v,description:P||h},layoutPath:this.layoutPath})}catch{i()}};this.layoutPath=t,this.services=r}}var E=n;0&&(module.exports={LoadReportController});
+"use strict";var w=Object.create;var a=Object.defineProperty;var H=Object.getOwnPropertyDescriptor;var T=Object.getOwnPropertyNames;var b=Object.getPrototypeOf,q=Object.prototype.hasOwnProperty;var x=(t,e)=>{for(var i in e)a(t,i,{get:e[i],enumerable:!0})},v=(t,e,i,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of T(e))!q.call(t,r)&&r!==i&&a(t,r,{get:()=>e[r],enumerable:!(n=H(e,r))||n.enumerable});return t};var E=(t,e,i)=>(i=t!=null?w(b(t)):{},v(e||!t||!t.__esModule?a(i,"default",{value:t,enumerable:!0}):i,t)),L=t=>v(a({},"__esModule",{value:!0}),t);var j={};x(j,{LoadReportController:()=>f,default:()=>V});module.exports=L(j);var y=E(require("../../../../../utils/localsHelper")),g=require("../../../../../types/UserReports");class f{constructor(e,i){this.GET=async(e,i,n)=>{try{const{token:r}=y.default.getValues(i),{reportId:s,id:c,type:u}=e.params,{dataProductDefinitionsPath:p}=e.query,D=await this.services.reportingService.getDefinitionSummary(r,s,p);let o,h,d,m;if(u===g.ReportType.REPORT){o=await this.services.reportingService.getDefinition(r,s,c,p);const{variant:l}=o;h=l.classification,d=l.description,m=l.name}else o=await this.services.dashboardService.getDefinition(r,s,c,p),d=o.description,m=o.name;const{name:S,description:P}=D,R={reportId:s,id:c,type:u,reportName:S,name:m,classification:h,description:d||P};i.render("dpr/routes/journeys/view-report/sync/load-report/view",{renderData:R,layoutPath:this.layoutPath})}catch{n()}};this.layoutPath=e,this.services=i}}var V=f;0&&(module.exports={LoadReportController});
 //# sourceMappingURL=controller.js.map

package/dpr/routes/journeys/view-report/sync/load-report/controller.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/view-report/sync/load-report/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../../types/Services'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport { ReportType } from '../../../../../types/UserReports'\n\nclass LoadReportController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  GET: RequestHandler = async (req, res, next) => {\n    try {\n      const { token } = LocalsHelper.getValues(res)\n      const { reportId, id } = req.params\n      const { dataProductDefinitionsPath } = req.query\n\n      const definition = await this.services.reportingService.getDefinition(\n        token,\n        reportId,\n        id,\n        <string | undefined>dataProductDefinitionsPath,\n      )\n      const { name: reportName, variant, description: reportDescription } = definition\n      const { classification, description, name } = variant\n\n      res.render(`dpr/routes/journeys/view-report/sync/load-report/view`, {\n        renderData: {\n          reportId,\n          id,\n          type: ReportType.REPORT,\n          reportName,\n          name,\n          classification,\n          description: description || reportDescription,\n        },\n        layoutPath: this.layoutPath,\n      })\n    } catch (error) {\n      next()\n    }\n  }\n}\n\nexport { LoadReportController }\nexport default LoadReportController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,0BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAyB,gDACzBC,EAA2B,4CAE3B,MAAMJ,CAAqB,CAKzB,YAAYK,EAAoBC,EAAoB,CAKpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,GAAI,CACF,KAAM,CAAE,MAAAC,CAAM,EAAI,EAAAC,QAAa,UAAUH,CAAG,EACtC,CAAE,SAAAI,EAAU,GAAAC,CAAG,EAAIN,EAAI,OACvB,CAAE,2BAAAO,CAA2B,EAAIP,EAAI,MAErCQ,EAAa,MAAM,KAAK,SAAS,iBAAiB,cACtDL,EACAE,EACAC,EACoBC,CACtB,EACM,CAAE,KAAME,EAAY,QAAAC,EAAS,YAAaC,CAAkB,EAAIH,EAChE,CAAE,eAAAI,EAAgB,YAAAC,EAAa,KAAAC,CAAK,EAAIJ,EAE9CT,EAAI,OAAO,wDAAyD,CAClE,WAAY,CACV,SAAAI,EACA,GAAAC,EACA,KAAM,aAAW,OACjB,WAAAG,EACA,KAAAK,EACA,eAAAF,EACA,YAAaC,GAAeF,CAC9B,EACA,WAAY,KAAK,UACnB,CAAC,CACH,MAAgB,CACdT,EAAK,CACP,CACF,EAlCE,KAAK,WAAaJ,EAClB,KAAK,SAAWC,CAClB,CAiCF,CAGA,IAAOL,EAAQD",
-  "names": ["controller_exports", "__export", "LoadReportController", "controller_default", "__toCommonJS", "import_localsHelper", "import_UserReports", "layoutPath", "services", "req", "res", "next", "token", "LocalsHelper", "reportId", "id", "dataProductDefinitionsPath", "definition", "reportName", "variant", "reportDescription", "classification", "description", "name"]
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../../types/Services'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport { ReportType } from '../../../../../types/UserReports'\nimport { components } from '../../../../../types/api'\n\nclass LoadReportController {\n  layoutPath: string\n\n  services: Services\n\n  constructor(layoutPath: string, services: Services) {\n    this.layoutPath = layoutPath\n    this.services = services\n  }\n\n  GET: RequestHandler = async (req, res, next) => {\n    try {\n      const { token } = LocalsHelper.getValues(res)\n      const { reportId, id, type } = req.params\n      const { dataProductDefinitionsPath } = req.query\n\n      const definitionSummary = await this.services.reportingService.getDefinitionSummary(\n        token,\n        reportId,\n        <string | undefined>dataProductDefinitionsPath,\n      )\n\n      let definition:\n        | components['schemas']['SingleVariantReportDefinition']\n        | components['schemas']['DashboardDefinition']\n\n      let classification\n      let description\n      let name\n      if (type === ReportType.REPORT) {\n        definition = await this.services.reportingService.getDefinition(\n          token,\n          reportId,\n          id,\n          <string | undefined>dataProductDefinitionsPath,\n        )\n        const { variant } = definition\n        classification = variant.classification\n        description = variant.description\n        name = variant.name\n      } else {\n        definition = await this.services.dashboardService.getDefinition(\n          token,\n          reportId,\n          id,\n          <string | undefined>dataProductDefinitionsPath,\n        )\n        description = definition.description\n        name = definition.name\n      }\n      const { name: reportName, description: reportDescription } = definitionSummary\n\n      const renderData = {\n        reportId,\n        id,\n        type,\n        reportName,\n        name,\n        classification,\n        description: description || reportDescription,\n      }\n\n      res.render(`dpr/routes/journeys/view-report/sync/load-report/view`, {\n        renderData,\n        layoutPath: this.layoutPath,\n      })\n    } catch (error) {\n      next()\n    }\n  }\n}\n\nexport { LoadReportController }\nexport default LoadReportController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,0BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAyB,gDACzBC,EAA2B,4CAG3B,MAAMJ,CAAqB,CAKzB,YAAYK,EAAoBC,EAAoB,CAKpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,GAAI,CACF,KAAM,CAAE,MAAAC,CAAM,EAAI,EAAAC,QAAa,UAAUH,CAAG,EACtC,CAAE,SAAAI,EAAU,GAAAC,EAAI,KAAAC,CAAK,EAAIP,EAAI,OAC7B,CAAE,2BAAAQ,CAA2B,EAAIR,EAAI,MAErCS,EAAoB,MAAM,KAAK,SAAS,iBAAiB,qBAC7DN,EACAE,EACoBG,CACtB,EAEA,IAAIE,EAIAC,EACAC,EACAC,EACJ,GAAIN,IAAS,aAAW,OAAQ,CAC9BG,EAAa,MAAM,KAAK,SAAS,iBAAiB,cAChDP,EACAE,EACAC,EACoBE,CACtB,EACA,KAAM,CAAE,QAAAM,CAAQ,EAAIJ,EACpBC,EAAiBG,EAAQ,eACzBF,EAAcE,EAAQ,YACtBD,EAAOC,EAAQ,IACjB,MACEJ,EAAa,MAAM,KAAK,SAAS,iBAAiB,cAChDP,EACAE,EACAC,EACoBE,CACtB,EACAI,EAAcF,EAAW,YACzBG,EAAOH,EAAW,KAEpB,KAAM,CAAE,KAAMK,EAAY,YAAaC,CAAkB,EAAIP,EAEvDQ,EAAa,CACjB,SAAAZ,EACA,GAAAC,EACA,KAAAC,EACA,WAAAQ,EACA,KAAAF,EACA,eAAAF,EACA,YAAaC,GAAeI,CAC9B,EAEAf,EAAI,OAAO,wDAAyD,CAClE,WAAAgB,EACA,WAAY,KAAK,UACnB,CAAC,CACH,MAAgB,CACdf,EAAK,CACP,CACF,EA/DE,KAAK,WAAaJ,EAClB,KAAK,SAAWC,CAClB,CA8DF,CAGA,IAAOL,EAAQD",
+  "names": ["controller_exports", "__export", "LoadReportController", "controller_default", "__toCommonJS", "import_localsHelper", "import_UserReports", "layoutPath", "services", "req", "res", "next", "token", "LocalsHelper", "reportId", "id", "type", "dataProductDefinitionsPath", "definitionSummary", "definition", "classification", "description", "name", "variant", "reportName", "reportDescription", "renderData"]
 }

package/dpr/routes/journeys/view-report/sync/load-report/controller.ts

@@ -2,6 +2,7 @@ import { RequestHandler } from 'express'
 import { Services } from '../../../../../types/Services'
 import LocalsHelper from '../../../../../utils/localsHelper'
 import { ReportType } from '../../../../../types/UserReports'
+import { components } from '../../../../../types/api'
 
 class LoadReportController {
   layoutPath: string
@@ -16,28 +17,57 @@ class LoadReportController {
   GET: RequestHandler = async (req, res, next) => {
     try {
       const { token } = LocalsHelper.getValues(res)
-      const { reportId, id } = req.params
+      const { reportId, id, type } = req.params
       const { dataProductDefinitionsPath } = req.query
 
-      const definition = await this.services.reportingService.getDefinition(
+      const definitionSummary = await this.services.reportingService.getDefinitionSummary(
         token,
         reportId,
-        id,
         <string | undefined>dataProductDefinitionsPath,
       )
-      const { name: reportName, variant, description: reportDescription } = definition
-      const { classification, description, name } = variant
 
-      res.render(`dpr/routes/journeys/view-report/sync/load-report/view`, {
-        renderData: {
+      let definition:
+        | components['schemas']['SingleVariantReportDefinition']
+        | components['schemas']['DashboardDefinition']
+
+      let classification
+      let description
+      let name
+      if (type === ReportType.REPORT) {
+        definition = await this.services.reportingService.getDefinition(
+          token,
+          reportId,
+          id,
+          <string | undefined>dataProductDefinitionsPath,
+        )
+        const { variant } = definition
+        classification = variant.classification
+        description = variant.description
+        name = variant.name
+      } else {
+        definition = await this.services.dashboardService.getDefinition(
+          token,
           reportId,
           id,
-          type: ReportType.REPORT,
-          reportName,
-          name,
-          classification,
-          description: description || reportDescription,
-        },
+          <string | undefined>dataProductDefinitionsPath,
+        )
+        description = definition.description
+        name = definition.name
+      }
+      const { name: reportName, description: reportDescription } = definitionSummary
+
+      const renderData = {
+        reportId,
+        id,
+        type,
+        reportName,
+        name,
+        classification,
+        description: description || reportDescription,
+      }
+
+      res.render(`dpr/routes/journeys/view-report/sync/load-report/view`, {
+        renderData,
         layoutPath: this.layoutPath,
       })
     } catch (error) {

package/dpr/routes/journeys/view-report/sync/report/routes.js

@@ -1,2 +1,2 @@
-"use strict";var m=Object.create;var s=Object.defineProperty;var n=Object.getOwnPropertyDescriptor;var f=Object.getOwnPropertyNames;var c=Object.getPrototypeOf,d=Object.prototype.hasOwnProperty;var v=(e,r)=>{for(var t in r)s(e,t,{get:r[t],enumerable:!0})},a=(e,r,t,o)=>{if(r&&typeof r=="object"||typeof r=="function")for(let l of f(r))!d.call(e,l)&&l!==t&&s(e,l,{get:()=>r[l],enumerable:!(o=n(r,l))||o.enumerable});return e};var y=(e,r,t)=>(t=e!=null?m(c(e)):{},a(r||!e||!e.__esModule?s(t,"default",{value:e,enumerable:!0}):t,e)),g=e=>a(s({},"__esModule",{value:!0}),e);var F={};v(F,{default:()=>w,routes:()=>i});module.exports=g(F);var p=require("express"),u=y(require("./controller"));function i({layoutPath:e,services:r}){const t=(0,p.Router)({mergeParams:!0}),o=new u.default(e,r);return t.get(["/","/download-disabled"],o.GET),t.post("/apply-filters",o.applyFilters),t.post("/apply-columns",o.applyColumns),t.post("/save-defaults",o.saveDefaultFilterValues),t.post("/remove-defaults",o.removeDefaultFilterValues),t}var w=i;0&&(module.exports={routes});
+"use strict";var n=Object.create;var s=Object.defineProperty;var m=Object.getOwnPropertyDescriptor;var f=Object.getOwnPropertyNames;var c=Object.getPrototypeOf,d=Object.prototype.hasOwnProperty;var v=(e,r)=>{for(var t in r)s(e,t,{get:r[t],enumerable:!0})},a=(e,r,t,o)=>{if(r&&typeof r=="object"||typeof r=="function")for(let l of f(r))!d.call(e,l)&&l!==t&&s(e,l,{get:()=>r[l],enumerable:!(o=m(r,l))||o.enumerable});return e};var y=(e,r,t)=>(t=e!=null?n(c(e)):{},a(r||!e||!e.__esModule?s(t,"default",{value:e,enumerable:!0}):t,e)),g=e=>a(s({},"__esModule",{value:!0}),e);var F={};v(F,{default:()=>w,routes:()=>i});module.exports=g(F);var p=require("express"),u=y(require("./controller"));function i({layoutPath:e,services:r}){const t=(0,p.Router)({mergeParams:!0}),o=new u.default(e,r);return t.get(["/","/download-disabled"],o.GET),t.post("/apply-filters",o.applyFilters),t.post("/apply-columns",o.applyColumns),t.post("/save-defaults",o.saveDefaultFilterValues),t.post("/remove-defaults",o.removeDefaultFilterValues),t}var w=i;0&&(module.exports={routes});
 //# sourceMappingURL=routes.js.map

package/dpr/routes/journeys/view-report/sync/report/routes.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/view-report/sync/report/routes.ts"],
-  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport ViewReportController from './controller'\nimport { Services } from '../../../../../types/Services'\n\nexport function routes({ layoutPath, services }: { layoutPath: string; services: Services }) {\n  const router = Router({ mergeParams: true })\n  const controller = new ViewReportController(layoutPath, services)\n\n  router.get([`/`, `/download-disabled`], controller.GET)\n\n  // Interactive controls\n  router.post('/apply-filters', controller.applyFilters)\n  router.post('/apply-columns', controller.applyColumns)\n\n  // User defined defaults\n  router.post('/save-defaults', controller.saveDefaultFilterValues)\n  router.post('/remove-defaults', controller.removeDefaultFilterValues)\n\n  return router\n}\n\nexport default routes\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBACvBC,EAAiC,2BAG1B,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EACrCC,EAAa,IAAI,EAAAC,QAAqBJ,EAAYC,CAAQ,EAEhE,OAAAC,EAAO,IAAI,CAAC,IAAK,oBAAoB,EAAGC,EAAW,GAAG,EAGtDD,EAAO,KAAK,iBAAkBC,EAAW,YAAY,EACrDD,EAAO,KAAK,iBAAkBC,EAAW,YAAY,EAGrDD,EAAO,KAAK,iBAAkBC,EAAW,uBAAuB,EAChED,EAAO,KAAK,mBAAoBC,EAAW,yBAAyB,EAE7DD,CACT,CAEA,IAAOP,EAAQC",
-  "names": ["routes_exports", "__export", "routes_default", "routes", "__toCommonJS", "import_express", "import_controller", "layoutPath", "services", "router", "controller", "ViewReportController"]
+  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport ViewSyncReportController from './controller'\nimport { Services } from '../../../../../types/Services'\n\nexport function routes({ layoutPath, services }: { layoutPath: string; services: Services }) {\n  const router = Router({ mergeParams: true })\n  const controller = new ViewSyncReportController(layoutPath, services)\n\n  router.get([`/`, `/download-disabled`], controller.GET)\n\n  // Interactive controls\n  router.post('/apply-filters', controller.applyFilters)\n  router.post('/apply-columns', controller.applyColumns)\n\n  // User defined defaults\n  router.post('/save-defaults', controller.saveDefaultFilterValues)\n  router.post('/remove-defaults', controller.removeDefaultFilterValues)\n\n  return router\n}\n\nexport default routes\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBACvBC,EAAqC,2BAG9B,SAASH,EAAO,CAAE,WAAAI,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EACrCC,EAAa,IAAI,EAAAC,QAAyBJ,EAAYC,CAAQ,EAEpE,OAAAC,EAAO,IAAI,CAAC,IAAK,oBAAoB,EAAGC,EAAW,GAAG,EAGtDD,EAAO,KAAK,iBAAkBC,EAAW,YAAY,EACrDD,EAAO,KAAK,iBAAkBC,EAAW,YAAY,EAGrDD,EAAO,KAAK,iBAAkBC,EAAW,uBAAuB,EAChED,EAAO,KAAK,mBAAoBC,EAAW,yBAAyB,EAE7DD,CACT,CAEA,IAAOP,EAAQC",
+  "names": ["routes_exports", "__export", "routes_default", "routes", "__toCommonJS", "import_express", "import_controller", "layoutPath", "services", "router", "controller", "ViewSyncReportController"]
 }

package/dpr/routes/journeys/view-report/sync/report/routes.ts

@@ -1,11 +1,11 @@
 /* eslint-disable no-param-reassign */
 import { Router } from 'express'
-import ViewReportController from './controller'
+import ViewSyncReportController from './controller'
 import { Services } from '../../../../../types/Services'
 
 export function routes({ layoutPath, services }: { layoutPath: string; services: Services }) {
   const router = Router({ mergeParams: true })
-  const controller = new ViewReportController(layoutPath, services)
+  const controller = new ViewSyncReportController(layoutPath, services)
 
   router.get([`/`, `/download-disabled`], controller.GET)
 

package/dpr/routes/journeys/view-report/sync/routes.js

@@ -1,2 +1,2 @@
-"use strict";var c=Object.create;var m=Object.defineProperty;var d=Object.getOwnPropertyDescriptor;var g=Object.getOwnPropertyNames;var l=Object.getPrototypeOf,v=Object.prototype.hasOwnProperty;var x=(r,o)=>{for(var e in o)m(r,e,{get:o[e],enumerable:!0})},i=(r,o,e,u)=>{if(o&&typeof o=="object"||typeof o=="function")for(let t of g(o))!v.call(r,t)&&t!==e&&m(r,t,{get:()=>o[t],enumerable:!(u=d(o,t))||u.enumerable});return r};var p=(r,o,e)=>(e=r!=null?c(l(r)):{},i(o||!r||!r.__esModule?m(e,"default",{value:r,enumerable:!0}):e,r)),S=r=>i(m({},"__esModule",{value:!0}),r);var A={};x(A,{default:()=>w,routes:()=>a});module.exports=S(A);var s=require("express"),f=p(require("./load-report/routes")),n=p(require("./report/routes")),R=p(require("../../../../middleware/reportAuthoriser"));function a({layoutPath:r,services:o}){const e=(0,s.Router)({mergeParams:!0});return e.use("/report",(0,R.default)(o,r),(0,n.default)({layoutPath:r,services:o})),e.use("/load-report",(0,f.default)({layoutPath:r,services:o})),e}var w=a;0&&(module.exports={routes});
+"use strict";var b=Object.create;var m=Object.defineProperty;var g=Object.getOwnPropertyDescriptor;var w=Object.getOwnPropertyNames;var x=Object.getPrototypeOf,S=Object.prototype.hasOwnProperty;var c=(r,o)=>{for(var e in o)m(r,e,{get:o[e],enumerable:!0})},s=(r,o,e,i)=>{if(o&&typeof o=="object"||typeof o=="function")for(let t of w(o))!S.call(r,t)&&t!==e&&m(r,t,{get:()=>o[t],enumerable:!(i=g(o,t))||i.enumerable});return r};var p=(r,o,e)=>(e=r!=null?b(x(r)):{},s(o||!r||!r.__esModule?m(e,"default",{value:r,enumerable:!0}):e,r)),v=r=>s(m({},"__esModule",{value:!0}),r);var D={};c(D,{default:()=>A,routes:()=>a});module.exports=v(D);var f=require("express"),d=p(require("./load-report/routes")),R=p(require("./report/routes")),n=p(require("./dashboard/routes")),u=p(require("../../../../middleware/reportAuthoriser"));function a({layoutPath:r,services:o}){const e=(0,f.Router)({mergeParams:!0});return e.use("/report",(0,u.default)(o,r),(0,R.default)({layoutPath:r,services:o})),e.use("/dashboard",(0,u.default)(o,r),(0,n.default)({layoutPath:r,services:o})),e.use("/load-report",(0,d.default)({layoutPath:r,services:o})),e}var A=a;0&&(module.exports={routes});
 //# sourceMappingURL=routes.js.map

package/dpr/routes/journeys/view-report/sync/routes.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/view-report/sync/routes.ts"],
-  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport { Services } from '../../../../types/Services'\n\n// Routes\nimport loadReportRoutes from './load-report/routes'\nimport viewReportRoutes from './report/routes'\n\n// middleware\nimport reportAuthoriser from '../../../../middleware/reportAuthoriser'\n\nexport function routes({ layoutPath, services }: { layoutPath: string; services: Services }) {\n  const router = Router({ mergeParams: true })\n\n  router.use('/report', reportAuthoriser(services, layoutPath), viewReportRoutes({ layoutPath, services }))\n  router.use(`/load-report`, loadReportRoutes({ layoutPath, services }))\n\n  return router\n}\n\nexport default routes\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBAIvBC,EAA6B,mCAC7BA,EAA6B,8BAG7BC,EAA6B,sDAEtB,SAASJ,EAAO,CAAE,WAAAK,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAE3C,OAAAA,EAAO,IAAI,aAAW,EAAAC,SAAiBF,EAAUD,CAAU,KAAG,EAAAI,SAAiB,CAAE,WAAAJ,EAAY,SAAAC,CAAS,CAAC,CAAC,EACxGC,EAAO,IAAI,kBAAgB,EAAAG,SAAiB,CAAE,WAAAL,EAAY,SAAAC,CAAS,CAAC,CAAC,EAE9DC,CACT,CAEA,IAAOR,EAAQC",
-  "names": ["routes_exports", "__export", "routes_default", "routes", "__toCommonJS", "import_express", "import_routes", "import_reportAuthoriser", "layoutPath", "services", "router", "reportAuthoriser", "viewReportRoutes", "loadReportRoutes"]
+  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Router } from 'express'\nimport { Services } from '../../../../types/Services'\n\n// Routes\nimport loadReportRoutes from './load-report/routes'\nimport viewReportRoutes from './report/routes'\nimport viewDashboardRoutes from './dashboard/routes'\n\n// middleware\nimport reportAuthoriser from '../../../../middleware/reportAuthoriser'\n\nexport function routes({ layoutPath, services }: { layoutPath: string; services: Services }) {\n  const router = Router({ mergeParams: true })\n\n  router.use('/report', reportAuthoriser(services, layoutPath), viewReportRoutes({ layoutPath, services }))\n  router.use('/dashboard', reportAuthoriser(services, layoutPath), viewDashboardRoutes({ layoutPath, services }))\n  router.use(`/load-report`, loadReportRoutes({ layoutPath, services }))\n\n  return router\n}\n\nexport default routes\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,WAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAuB,mBAIvBC,EAA6B,mCAC7BA,EAA6B,8BAC7BA,EAAgC,iCAGhCC,EAA6B,sDAEtB,SAASJ,EAAO,CAAE,WAAAK,EAAY,SAAAC,CAAS,EAA+C,CAC3F,MAAMC,KAAS,UAAO,CAAE,YAAa,EAAK,CAAC,EAE3C,OAAAA,EAAO,IAAI,aAAW,EAAAC,SAAiBF,EAAUD,CAAU,KAAG,EAAAI,SAAiB,CAAE,WAAAJ,EAAY,SAAAC,CAAS,CAAC,CAAC,EACxGC,EAAO,IAAI,gBAAc,EAAAC,SAAiBF,EAAUD,CAAU,KAAG,EAAAK,SAAoB,CAAE,WAAAL,EAAY,SAAAC,CAAS,CAAC,CAAC,EAC9GC,EAAO,IAAI,kBAAgB,EAAAI,SAAiB,CAAE,WAAAN,EAAY,SAAAC,CAAS,CAAC,CAAC,EAE9DC,CACT,CAEA,IAAOR,EAAQC",
+  "names": ["routes_exports", "__export", "routes_default", "routes", "__toCommonJS", "import_express", "import_routes", "import_reportAuthoriser", "layoutPath", "services", "router", "reportAuthoriser", "viewReportRoutes", "viewDashboardRoutes", "loadReportRoutes"]
 }

package/dpr/routes/journeys/view-report/sync/routes.ts

@@ -5,6 +5,7 @@ import { Services } from '../../../../types/Services'
 // Routes
 import loadReportRoutes from './load-report/routes'
 import viewReportRoutes from './report/routes'
+import viewDashboardRoutes from './dashboard/routes'
 
 // middleware
 import reportAuthoriser from '../../../../middleware/reportAuthoriser'
@@ -13,6 +14,7 @@ export function routes({ layoutPath, services }: { layoutPath: string; services:
   const router = Router({ mergeParams: true })
 
   router.use('/report', reportAuthoriser(services, layoutPath), viewReportRoutes({ layoutPath, services }))
+  router.use('/dashboard', reportAuthoriser(services, layoutPath), viewDashboardRoutes({ layoutPath, services }))
   router.use(`/load-report`, loadReportRoutes({ layoutPath, services }))
 
   return router

package/dpr/routes/journeys/view-report/sync/tests.cy.js

@@ -1,2 +1,2 @@
-"use strict";var e=require("../../../../../../cypress-tests/cypressUtils");context("Platform sync tests",()=>{const t="/embedded/platform/";describe("Sync tests from the platform",()=>{before(()=>{(0,e.executeReportStubs)(),cy.task("stubDefinitionSyncReport"),cy.task("stubRequestSuccessResult20"),cy.task("stubSyncRequestDataSuccess"),cy.task("stubSyncRequestDataSuccessCount")}),it("should load a sync report",()=>{cy.visit(t),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(c,s)=>!!s.textContent?.includes("This is an sync report")}).within(()=>{cy.findByRole("link",{name:/Load report/}).click()})}),cy.findByRole("heading",{name:/Sync report/,level:1}).should("be.visible")})})});
+"use strict";var e=require("../../../../../../cypress-tests/cypressUtils");context("Platform sync tests",()=>{const s="/embedded/platform/";describe("Sync tests from the platform",()=>{before(()=>{(0,e.executeDashboardStubs)(),(0,e.executeReportStubs)(),cy.task("stubDefinitionSyncReport"),cy.task("stubDefinitionSyncDashboard"),cy.task("stubRequestSuccessResult20"),cy.task("stubSyncRequestDataSuccess"),cy.task("stubSyncDashboardRequestDataSuccess"),cy.task("stubSyncRequestDataSuccessCount")}),it("should load a sync report",()=>{cy.visit(s),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(n,t)=>!!t.textContent?.includes("This is an sync report")}).within(()=>{cy.findByRole("link",{name:/Load report/}).click()})}),cy.findByRole("heading",{name:/Sync report/,level:1}).should("be.visible")}),it("should load a sync dashboard",()=>{cy.visit(s),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(n,t)=>!!t.textContent?.includes("Sync Dashboard used for testing")}).within(()=>{cy.findByRole("link",{name:/Load dashboard/}).click()})}),cy.findByRole("heading",{name:/Sync Dashboard/,level:1}).should("be.visible")})})});
 //# sourceMappingURL=tests.cy.js.map

package/dpr/routes/journeys/view-report/sync/tests.cy.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/view-report/sync/tests.cy.ts"],
-  "sourcesContent": ["import { executeReportStubs } from '../../../../../../cypress-tests/cypressUtils'\n\ncontext('Platform sync tests', () => {\n  const path = '/embedded/platform/'\n\n  describe('Sync tests from the platform', () => {\n    before(() => {\n      executeReportStubs()\n      cy.task('stubDefinitionSyncReport')\n      cy.task('stubRequestSuccessResult20')\n      cy.task('stubSyncRequestDataSuccess')\n      cy.task('stubSyncRequestDataSuccessCount')\n    })\n    it('should load a sync report', () => {\n      cy.visit(path)\n\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('This is an sync report'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: /Load report/ }).click()\n        })\n      })\n\n      cy.findByRole('heading', { name: /Sync report/, level: 1 }).should('be.visible')\n    })\n  })\n})\n"],
-  "mappings": "aAAA,IAAAA,EAAmC,wDAEnC,QAAQ,sBAAuB,IAAM,CACnC,MAAMC,EAAO,sBAEb,SAAS,+BAAgC,IAAM,CAC7C,OAAO,IAAM,IACX,sBAAmB,EACnB,GAAG,KAAK,0BAA0B,EAClC,GAAG,KAAK,4BAA4B,EACpC,GAAG,KAAK,4BAA4B,EACpC,GAAG,KAAK,iCAAiC,CAC3C,CAAC,EACD,GAAG,4BAA6B,IAAM,CACpC,GAAG,MAAMA,CAAI,EAEb,GAAG,gBAAgB,sBAAsB,EAAE,OAAO,IAAM,CACtD,GAAG,WAAW,MAAO,CACnB,KAAM,CAACC,EAAGC,IACD,EAAQA,EAAQ,aAAa,SAAS,wBAAwB,CAEzE,CAAC,EAAE,OAAO,IAAM,CACd,GAAG,WAAW,OAAQ,CAAE,KAAM,aAAc,CAAC,EAAE,MAAM,CACvD,CAAC,CACH,CAAC,EAED,GAAG,WAAW,UAAW,CAAE,KAAM,cAAe,MAAO,CAAE,CAAC,EAAE,OAAO,YAAY,CACjF,CAAC,CACH,CAAC,CACH,CAAC",
+  "sourcesContent": ["import { executeReportStubs, executeDashboardStubs } from '../../../../../../cypress-tests/cypressUtils'\n\ncontext('Platform sync tests', () => {\n  const path = '/embedded/platform/'\n\n  describe('Sync tests from the platform', () => {\n    before(() => {\n      executeDashboardStubs()\n      executeReportStubs()\n      cy.task('stubDefinitionSyncReport')\n      cy.task('stubDefinitionSyncDashboard')\n      cy.task('stubRequestSuccessResult20')\n      cy.task('stubSyncRequestDataSuccess')\n      cy.task('stubSyncDashboardRequestDataSuccess')\n      cy.task('stubSyncRequestDataSuccessCount')\n    })\n\n    it('should load a sync report', () => {\n      cy.visit(path)\n\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('This is an sync report'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: /Load report/ }).click()\n        })\n      })\n\n      cy.findByRole('heading', { name: /Sync report/, level: 1 }).should('be.visible')\n    })\n\n    it('should load a sync dashboard', () => {\n      cy.visit(path)\n\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Sync Dashboard used for testing'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: /Load dashboard/ }).click()\n        })\n      })\n\n      cy.findByRole('heading', { name: /Sync Dashboard/, level: 1 }).should('be.visible')\n    })\n  })\n})\n"],
+  "mappings": "aAAA,IAAAA,EAA0D,wDAE1D,QAAQ,sBAAuB,IAAM,CACnC,MAAMC,EAAO,sBAEb,SAAS,+BAAgC,IAAM,CAC7C,OAAO,IAAM,IACX,yBAAsB,KACtB,sBAAmB,EACnB,GAAG,KAAK,0BAA0B,EAClC,GAAG,KAAK,6BAA6B,EACrC,GAAG,KAAK,4BAA4B,EACpC,GAAG,KAAK,4BAA4B,EACpC,GAAG,KAAK,qCAAqC,EAC7C,GAAG,KAAK,iCAAiC,CAC3C,CAAC,EAED,GAAG,4BAA6B,IAAM,CACpC,GAAG,MAAMA,CAAI,EAEb,GAAG,gBAAgB,sBAAsB,EAAE,OAAO,IAAM,CACtD,GAAG,WAAW,MAAO,CACnB,KAAM,CAACC,EAAGC,IACD,EAAQA,EAAQ,aAAa,SAAS,wBAAwB,CAEzE,CAAC,EAAE,OAAO,IAAM,CACd,GAAG,WAAW,OAAQ,CAAE,KAAM,aAAc,CAAC,EAAE,MAAM,CACvD,CAAC,CACH,CAAC,EAED,GAAG,WAAW,UAAW,CAAE,KAAM,cAAe,MAAO,CAAE,CAAC,EAAE,OAAO,YAAY,CACjF,CAAC,EAED,GAAG,+BAAgC,IAAM,CACvC,GAAG,MAAMF,CAAI,EAEb,GAAG,gBAAgB,sBAAsB,EAAE,OAAO,IAAM,CACtD,GAAG,WAAW,MAAO,CACnB,KAAM,CAACC,EAAGC,IACD,EAAQA,EAAQ,aAAa,SAAS,iCAAiC,CAElF,CAAC,EAAE,OAAO,IAAM,CACd,GAAG,WAAW,OAAQ,CAAE,KAAM,gBAAiB,CAAC,EAAE,MAAM,CAC1D,CAAC,CACH,CAAC,EAED,GAAG,WAAW,UAAW,CAAE,KAAM,iBAAkB,MAAO,CAAE,CAAC,EAAE,OAAO,YAAY,CACpF,CAAC,CACH,CAAC,CACH,CAAC",
   "names": ["import_cypressUtils", "path", "_", "element"]
 }

package/dpr/routes/journeys/view-report/sync/tests.cy.ts

@@ -1,16 +1,20 @@
-import { executeReportStubs } from '../../../../../../cypress-tests/cypressUtils'
+import { executeReportStubs, executeDashboardStubs } from '../../../../../../cypress-tests/cypressUtils'
 
 context('Platform sync tests', () => {
   const path = '/embedded/platform/'
 
   describe('Sync tests from the platform', () => {
     before(() => {
+      executeDashboardStubs()
       executeReportStubs()
       cy.task('stubDefinitionSyncReport')
+      cy.task('stubDefinitionSyncDashboard')
       cy.task('stubRequestSuccessResult20')
       cy.task('stubSyncRequestDataSuccess')
+      cy.task('stubSyncDashboardRequestDataSuccess')
       cy.task('stubSyncRequestDataSuccessCount')
     })
+
     it('should load a sync report', () => {
       cy.visit(path)
 
@@ -26,5 +30,21 @@ context('Platform sync tests', () => {
 
       cy.findByRole('heading', { name: /Sync report/, level: 1 }).should('be.visible')
     })
+
+    it('should load a sync dashboard', () => {
+      cy.visit(path)
+
+      cy.findByLabelText(/Reports catalogue.*/i).within(() => {
+        cy.findByRole('row', {
+          name: (_, element) => {
+            return Boolean(element.textContent?.includes('Sync Dashboard used for testing'))
+          },
+        }).within(() => {
+          cy.findByRole('link', { name: /Load dashboard/ }).click()
+        })
+      })
+
+      cy.findByRole('heading', { name: /Sync Dashboard/, level: 1 }).should('be.visible')
+    })
   })
 })

package/dpr/routes/serviceProblem.njk

@@ -0,0 +1,10 @@
+{% extends layoutPath %}
+
+{% block content %}
+  <h1 class="govuk-heading-xl">{{ message | default("Sorry, there is a problem with the service.") }}</h1>
+  <p>The problem has been reported to the service team.</p>
+  <p>Try again later.</p>
+  <h2 class="govuk-heading-m">Get help</h2>
+  <p>Contact the helpdesk on 0800 917 5148 or #6598 from inside an establishment.</p>
+  <p><a class="govuk-link--no-visited-state" href="{{ digitalPrisonServicesUrl }}">Go to digital services home page</a></p>
+{% endblock %}

package/dpr/services/dashboardService.js

@@ -1,2 +1,2 @@
-"use strict";var a=Object.defineProperty;var c=Object.getOwnPropertyDescriptor;var d=Object.getOwnPropertyNames;var h=Object.prototype.hasOwnProperty;var D=(i,t)=>{for(var n in t)a(i,n,{get:t[n],enumerable:!0})},m=(i,t,n,r)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of d(t))!h.call(i,s)&&s!==n&&a(i,s,{get:()=>t[s],enumerable:!(r=c(t,s))||r.enumerable});return i};var b=i=>m(a({},"__esModule",{value:!0}),i);var l={};D(l,{DashboardService:()=>o,default:()=>u});module.exports=b(l);class o{constructor(t){this.dashboardClient=t;this.dashboardClient=t}async getDefinition(t,n,r,s,e){return this.dashboardClient.getDefinition(t,r,n,s,e)}async requestAsyncDashboard(t,n,r,s){return this.dashboardClient.requestAsyncDashboard(t,n,r,s)}async cancelAsyncRequest(t,n,r,s,e){return this.dashboardClient.cancelAsyncRequest(t,n,r,s,e)}async getAsyncStatus(t,n,r,s,e,g){return this.dashboardClient.getAsyncStatus(t,n,r,s,e,g)}async getAsyncDashboard(t,n,r,s,e){return this.dashboardClient.getAsyncDashboard(t,r,n,s,e)}}var u=o;0&&(module.exports={DashboardService});
+"use strict";var a=Object.defineProperty;var c=Object.getOwnPropertyDescriptor;var d=Object.getOwnPropertyNames;var h=Object.prototype.hasOwnProperty;var D=(i,t)=>{for(var r in t)a(i,r,{get:t[r],enumerable:!0})},b=(i,t,r,n)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of d(t))!h.call(i,s)&&s!==r&&a(i,s,{get:()=>t[s],enumerable:!(n=c(t,s))||n.enumerable});return i};var m=i=>b(a({},"__esModule",{value:!0}),i);var y={};D(y,{DashboardService:()=>o,default:()=>u});module.exports=m(y);class o{constructor(t){this.dashboardClient=t;this.dashboardClient=t}async getDefinition(t,r,n,s,e){return this.dashboardClient.getDefinition(t,n,r,s,e)}async requestAsyncDashboard(t,r,n,s){return this.dashboardClient.requestAsyncDashboard(t,r,n,s)}async cancelAsyncRequest(t,r,n,s,e){return this.dashboardClient.cancelAsyncRequest(t,r,n,s,e)}async getAsyncStatus(t,r,n,s,e,g){return this.dashboardClient.getAsyncStatus(t,r,n,s,e,g)}async getAsyncDashboard(t,r,n,s,e){return this.dashboardClient.getAsyncDashboard(t,n,r,s,e)}async getSyncDashboard(t,r,n,s){return this.dashboardClient.getSyncDashboard(t,n,r,s)}}var u=o;0&&(module.exports={DashboardService});
 //# sourceMappingURL=dashboardService.js.map

package/dpr/services/dashboardService.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/services/dashboardService.ts"],
-  "sourcesContent": ["import Dict = NodeJS.Dict\nimport DashboardClient from '../data/dashboardClient'\nimport { components } from '../types/api'\nimport { DashboardDataResponse } from '../types/Metrics'\n\n/* eslint-disable @typescript-eslint/no-explicit-any */\nclass DashboardService {\n  constructor(private readonly dashboardClient: DashboardClient) {\n    this.dashboardClient = dashboardClient\n  }\n\n  async getDefinition(\n    token: string,\n    dpdId: string,\n    id: string,\n    dataProductDefinitionsPath?: string,\n    query?: Dict<string | string[]> | undefined,\n  ): Promise<components['schemas']['DashboardDefinition']> {\n    return this.dashboardClient.getDefinition(token, id, dpdId, dataProductDefinitionsPath, query)\n  }\n\n  async requestAsyncDashboard(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    query: Record<string, string | boolean | number>,\n  ): Promise<Dict<string>> {\n    return this.dashboardClient.requestAsyncDashboard(token, reportId, dashboardId, query)\n  }\n\n  async cancelAsyncRequest(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    executionId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Dict<string>> {\n    return this.dashboardClient.cancelAsyncRequest(\n      token,\n      reportId,\n      dashboardId,\n      executionId,\n      dataProductDefinitionsPath,\n    )\n  }\n\n  async getAsyncStatus(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    executionId: string,\n    tableId?: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<components['schemas']['StatementExecutionStatus']> {\n    return this.dashboardClient.getAsyncStatus(\n      token,\n      reportId,\n      dashboardId,\n      executionId,\n      tableId,\n      dataProductDefinitionsPath,\n    )\n  }\n\n  async getAsyncDashboard(\n    token: string,\n    dashboardId: string,\n    reportId: string,\n    tableId: string,\n    query: Record<string, string | string[]>,\n  ): Promise<DashboardDataResponse[][]> {\n    return this.dashboardClient.getAsyncDashboard(token, reportId, dashboardId, tableId, query)\n  }\n}\n\nexport { DashboardService }\nexport default DashboardService\n"],
-  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,sBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAMA,MAAME,CAAiB,CACrB,YAA6BG,EAAkC,CAAlC,qBAAAA,EAC3B,KAAK,gBAAkBA,CACzB,CAEA,MAAM,cACJC,EACAC,EACAC,EACAC,EACAC,EACuD,CACvD,OAAO,KAAK,gBAAgB,cAAcJ,EAAOE,EAAID,EAAOE,EAA4BC,CAAK,CAC/F,CAEA,MAAM,sBACJJ,EACAK,EACAC,EACAF,EACuB,CACvB,OAAO,KAAK,gBAAgB,sBAAsBJ,EAAOK,EAAUC,EAAaF,CAAK,CACvF,CAEA,MAAM,mBACJJ,EACAK,EACAC,EACAC,EACAJ,EACuB,CACvB,OAAO,KAAK,gBAAgB,mBAC1BH,EACAK,EACAC,EACAC,EACAJ,CACF,CACF,CAEA,MAAM,eACJH,EACAK,EACAC,EACAC,EACAC,EACAL,EAC4D,CAC5D,OAAO,KAAK,gBAAgB,eAC1BH,EACAK,EACAC,EACAC,EACAC,EACAL,CACF,CACF,CAEA,MAAM,kBACJH,EACAM,EACAD,EACAG,EACAJ,EACoC,CACpC,OAAO,KAAK,gBAAgB,kBAAkBJ,EAAOK,EAAUC,EAAaE,EAASJ,CAAK,CAC5F,CACF,CAGA,IAAOP,EAAQD",
+  "sourcesContent": ["import Dict = NodeJS.Dict\nimport DashboardClient from '../data/dashboardClient'\nimport { components } from '../types/api'\nimport { DashboardDataResponse } from '../types/Metrics'\n\n/* eslint-disable @typescript-eslint/no-explicit-any */\nclass DashboardService {\n  constructor(private readonly dashboardClient: DashboardClient) {\n    this.dashboardClient = dashboardClient\n  }\n\n  async getDefinition(\n    token: string,\n    dpdId: string,\n    id: string,\n    dataProductDefinitionsPath?: string,\n    query?: Dict<string | string[]> | undefined,\n  ): Promise<components['schemas']['DashboardDefinition']> {\n    return this.dashboardClient.getDefinition(token, id, dpdId, dataProductDefinitionsPath, query)\n  }\n\n  async requestAsyncDashboard(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    query: Record<string, string | boolean | number>,\n  ): Promise<Dict<string>> {\n    return this.dashboardClient.requestAsyncDashboard(token, reportId, dashboardId, query)\n  }\n\n  async cancelAsyncRequest(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    executionId: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<Dict<string>> {\n    return this.dashboardClient.cancelAsyncRequest(\n      token,\n      reportId,\n      dashboardId,\n      executionId,\n      dataProductDefinitionsPath,\n    )\n  }\n\n  async getAsyncStatus(\n    token: string,\n    reportId: string,\n    dashboardId: string,\n    executionId: string,\n    tableId?: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<components['schemas']['StatementExecutionStatus']> {\n    return this.dashboardClient.getAsyncStatus(\n      token,\n      reportId,\n      dashboardId,\n      executionId,\n      tableId,\n      dataProductDefinitionsPath,\n    )\n  }\n\n  async getAsyncDashboard(\n    token: string,\n    dashboardId: string,\n    reportId: string,\n    tableId: string,\n    query: Record<string, string | string[]>,\n  ): Promise<DashboardDataResponse[][]> {\n    return this.dashboardClient.getAsyncDashboard(token, reportId, dashboardId, tableId, query)\n  }\n\n  async getSyncDashboard(\n    token: string,\n    dashboardId: string,\n    reportId: string,\n    query: Record<string, string | string[]>,\n  ) {\n    return this.dashboardClient.getSyncDashboard(token, reportId, dashboardId, query)\n  }\n}\n\nexport { DashboardService }\nexport default DashboardService\n"],
+  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,sBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAMA,MAAME,CAAiB,CACrB,YAA6BG,EAAkC,CAAlC,qBAAAA,EAC3B,KAAK,gBAAkBA,CACzB,CAEA,MAAM,cACJC,EACAC,EACAC,EACAC,EACAC,EACuD,CACvD,OAAO,KAAK,gBAAgB,cAAcJ,EAAOE,EAAID,EAAOE,EAA4BC,CAAK,CAC/F,CAEA,MAAM,sBACJJ,EACAK,EACAC,EACAF,EACuB,CACvB,OAAO,KAAK,gBAAgB,sBAAsBJ,EAAOK,EAAUC,EAAaF,CAAK,CACvF,CAEA,MAAM,mBACJJ,EACAK,EACAC,EACAC,EACAJ,EACuB,CACvB,OAAO,KAAK,gBAAgB,mBAC1BH,EACAK,EACAC,EACAC,EACAJ,CACF,CACF,CAEA,MAAM,eACJH,EACAK,EACAC,EACAC,EACAC,EACAL,EAC4D,CAC5D,OAAO,KAAK,gBAAgB,eAC1BH,EACAK,EACAC,EACAC,EACAC,EACAL,CACF,CACF,CAEA,MAAM,kBACJH,EACAM,EACAD,EACAG,EACAJ,EACoC,CACpC,OAAO,KAAK,gBAAgB,kBAAkBJ,EAAOK,EAAUC,EAAaE,EAASJ,CAAK,CAC5F,CAEA,MAAM,iBACJJ,EACAM,EACAD,EACAD,EACA,CACA,OAAO,KAAK,gBAAgB,iBAAiBJ,EAAOK,EAAUC,EAAaF,CAAK,CAClF,CACF,CAGA,IAAOP,EAAQD",
   "names": ["dashboardService_exports", "__export", "DashboardService", "dashboardService_default", "__toCommonJS", "dashboardClient", "token", "dpdId", "id", "dataProductDefinitionsPath", "query", "reportId", "dashboardId", "executionId", "tableId"]
 }

package/dpr/services/dashboardService.ts

@@ -71,6 +71,15 @@ class DashboardService {
   ): Promise<DashboardDataResponse[][]> {
     return this.dashboardClient.getAsyncDashboard(token, reportId, dashboardId, tableId, query)
   }
+
+  async getSyncDashboard(
+    token: string,
+    dashboardId: string,
+    reportId: string,
+    query: Record<string, string | string[]>,
+  ) {
+    return this.dashboardClient.getSyncDashboard(token, reportId, dashboardId, query)
+  }
 }
 
 export { DashboardService }

package/dpr/types/ReportQuery.js

@@ -1,2 +1,2 @@
-"use strict";var b=Object.create;var d=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var z=Object.getOwnPropertyNames;var C=Object.getPrototypeOf,F=Object.prototype.hasOwnProperty;var T=(n,i)=>{for(var s in i)d(n,s,{get:i[s],enumerable:!0})},g=(n,i,s,t)=>{if(i&&typeof i=="object"||typeof i=="function")for(let r of z(i))!F.call(n,r)&&r!==s&&d(n,r,{get:()=>i[r],enumerable:!(t=R(i,r))||t.enumerable});return n};var A=(n,i,s)=>(s=n!=null?b(C(n)):{},g(i||!n||!n.__esModule?d(s,"default",{value:n,enumerable:!0}):s,n)),O=n=>g(d({},"__esModule",{value:!0}),n);var v={};T(v,{DEFAULT_FILTERS_PREFIX:()=>D,ReportQuery:()=>m,default:()=>j});module.exports=O(v);var h=require("../utils/urlHelper"),p=A(require("../components/_reports/report-columns-form/utils")),S=require("./UserReports");const D="filters.";class m{constructor({fields:i,template:s,queryParams:t,definitionsPath:r,filtersPrefix:P=D,reportType:x}){if(this.selectedPage=t.selectedPage?Number(t.selectedPage):1,this.pageSize=this.getPageSize(t,s,x),this.sortColumn=t.sortColumn?t.sortColumn.toString():this.getDefaultSortColumn(i),this.sortedAsc=t.sortedAsc!=="false",this.dataProductDefinitionsPath=r??(t.dataProductDefinitionsPath?t.dataProductDefinitionsPath.toString():void 0),this.filtersPrefix=P,t.columns){const e=typeof t.columns=="string"?t.columns.split(","):t.columns;this.columns=p.default.ensureMandatoryColumns(i,e)}else this.columns=i.filter(e=>e.visible).map(e=>e.name);const o=i.find(e=>e.type==="date"&&e.filter&&e.filter.type==="daterange"||e.type==="date"&&e.filter&&e.filter.type==="date");let l,f;o&&o.filter&&(l=o.filter.min,f=o.filter.max),this.filters={},Object.keys(t).filter(e=>e.startsWith(this.filtersPrefix)).filter(e=>t[e]).forEach(e=>{const a=e.replace(this.filtersPrefix,""),u=t[e];let c=u?u.toString():"";a.includes(".start")&&l&&new Date(c)<new Date(l)&&(c=l),a.includes(".end")&&f&&new Date(c)>new Date(f)&&(c=f),c!=="no-filter"&&(this.filters[a]=c)}),o&&o.filter&&o.filter.type==="daterange"&&(l&&Object.keys(t).some(e=>e.includes(this.filtersPrefix))&&Object.keys(t).every(e=>!e.includes(".start"))&&(this.filters[`${o.name}.start`]=l),f&&Object.keys(t).some(e=>e.includes(this.filtersPrefix))&&Object.keys(t).every(e=>!e.includes(".end"))&&(this.filters[`${o.name}.end`]=f)),o&&o.filter&&o.filter.type==="date"&&l&&Object.keys(t).some(e=>e.includes(this.filtersPrefix))&&Object.keys(t).every(e=>!e.includes(o.name))&&(this.filters[`${o.name}.start`]=l)}getDefaultSortColumn(i){const s=i.find(t=>t.defaultsort);return s?s.name:i.find(t=>t.sortable)?.name}getPageSize(i,s,t){let r=20;return(!t||t===S.ReportType.REPORT)&&(i.pageSize?r=Number(i.pageSize):s&&(r=this.getDefaultPageSize(s))),r}toRecordWithFilterPrefix(i=!1){const s={selectedPage:this.selectedPage.toString(),...this.pageSize&&{pageSize:this.pageSize.toString()},...this.sortColumn&&{sortColumn:this.sortColumn},sortedAsc:this.sortedAsc.toString(),columns:this.columns};return this.dataProductDefinitionsPath&&(s.dataProductDefinitionsPath=this.dataProductDefinitionsPath),Object.keys(this.filters).forEach(t=>{const r=this.filters[t];(r&&!i||r!==h.clearFilterValue)&&(s[`${this.filtersPrefix}${t}`]=r)}),s}getDefaultPageSize(i){switch(i){case"list-section":case"summary-section":case"row-section-child":case"parent-child":case"parent-child-section":return 5e5;default:return 20}}}var j=m;0&&(module.exports={DEFAULT_FILTERS_PREFIX,ReportQuery});
+"use strict";var b=Object.create;var d=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var z=Object.getOwnPropertyNames;var C=Object.getPrototypeOf,F=Object.prototype.hasOwnProperty;var T=(n,i)=>{for(var s in i)d(n,s,{get:i[s],enumerable:!0})},g=(n,i,s,t)=>{if(i&&typeof i=="object"||typeof i=="function")for(let r of z(i))!F.call(n,r)&&r!==s&&d(n,r,{get:()=>i[r],enumerable:!(t=R(i,r))||t.enumerable});return n};var A=(n,i,s)=>(s=n!=null?b(C(n)):{},g(i||!n||!n.__esModule?d(s,"default",{value:n,enumerable:!0}):s,n)),O=n=>g(d({},"__esModule",{value:!0}),n);var v={};T(v,{DEFAULT_FILTERS_PREFIX:()=>D,ReportQuery:()=>m,default:()=>j});module.exports=O(v);var h=require("../utils/urlHelper"),p=A(require("../components/_reports/report-columns-form/utils")),S=require("./UserReports");const D="filters.";class m{constructor({fields:i,template:s,queryParams:t,definitionsPath:r,filtersPrefix:P=D,reportType:x}){if(this.selectedPage=t.selectedPage?Number(t.selectedPage):1,this.pageSize=this.getPageSize(t,s,x),this.sortColumn=t.sortColumn?t.sortColumn.toString():this.getDefaultSortColumn(i),this.sortedAsc=t.sortedAsc!=="false",this.dataProductDefinitionsPath=r??(t.dataProductDefinitionsPath?t.dataProductDefinitionsPath.toString():void 0),this.filtersPrefix=P,t.columns){const e=typeof t.columns=="string"?t.columns.split(","):t.columns;this.columns=p.default.ensureMandatoryColumns(i,e)}else this.columns=i.filter(e=>e.visible).map(e=>e.name);const o=i.find(e=>e.type==="date"&&e.filter&&e.filter.type==="daterange"||e.type==="date"&&e.filter&&e.filter.type==="date");let l,f;o&&o.filter&&(l=o.filter.min,f=o.filter.max),this.filters={},Object.keys(t).filter(e=>e.startsWith(this.filtersPrefix)).filter(e=>t[e]).forEach(e=>{const a=e.replace(this.filtersPrefix,""),u=t[e];let c=u?u.toString():"";a.includes(".start")&&l&&new Date(c)<new Date(l)&&(c=l),a.includes(".end")&&f&&new Date(c)>new Date(f)&&(c=f),c!=="no-filter"&&(this.filters[a]=c)}),o&&o.filter&&o.filter.type==="daterange"&&(l&&Object.keys(t).some(e=>e.includes(this.filtersPrefix))&&Object.keys(t).every(e=>!e.includes(".start"))&&(this.filters[`${o.name}.start`]=l),f&&Object.keys(t).some(e=>e.includes(this.filtersPrefix))&&Object.keys(t).every(e=>!e.includes(".end"))&&(this.filters[`${o.name}.end`]=f)),o&&o.filter&&o.filter.type==="date"&&l&&Object.keys(t).some(e=>e.includes(this.filtersPrefix))&&Object.keys(t).every(e=>!e.includes(o.name))&&(this.filters[`${o.name}.start`]=l)}getDefaultSortColumn(i){const s=i.find(t=>t.defaultsort);return s?s.name:i.find(t=>t.sortable)?.name}getPageSize(i,s,t){let r=5e6;return(!t||t===S.ReportType.REPORT)&&(i.pageSize?r=Number(i.pageSize):s&&(r=this.getDefaultPageSize(s))),r}toRecordWithFilterPrefix(i=!1){const s={selectedPage:this.selectedPage.toString(),...this.pageSize&&{pageSize:this.pageSize.toString()},...this.sortColumn&&{sortColumn:this.sortColumn},sortedAsc:this.sortedAsc.toString(),columns:this.columns};return this.dataProductDefinitionsPath&&(s.dataProductDefinitionsPath=this.dataProductDefinitionsPath),Object.keys(this.filters).forEach(t=>{const r=this.filters[t];(r&&!i||r!==h.clearFilterValue)&&(s[`${this.filtersPrefix}${t}`]=r)}),s}getDefaultPageSize(i){switch(i){case"list-section":case"summary-section":case"row-section-child":case"parent-child":case"parent-child-section":return 5e5;default:return 20}}}var j=m;0&&(module.exports={DEFAULT_FILTERS_PREFIX,ReportQuery});
 //# sourceMappingURL=ReportQuery.js.map

package/dpr/types/ReportQuery.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/types/ReportQuery.ts"],
-  "sourcesContent": ["import type { ParsedQs } from 'qs'\nimport { FilteredListRequest } from './index'\nimport Dict = NodeJS.Dict\nimport { components } from './api'\nimport { clearFilterValue } from '../utils/urlHelper'\nimport ColumnUtils from '../components/_reports/report-columns-form/utils'\nimport { Template } from './Templates'\nimport { ReportType } from './UserReports'\n\nexport const DEFAULT_FILTERS_PREFIX = 'filters.'\n\nclass ReportQuery implements FilteredListRequest {\n  selectedPage: number\n\n  pageSize: number\n\n  sortColumn?: string | undefined\n\n  columns: Array<string>\n\n  sortedAsc: boolean\n\n  filters: Dict<string>\n\n  filtersPrefix: string\n\n  dataProductDefinitionsPath?: string | undefined\n\n  constructor({\n    fields,\n    template,\n    queryParams,\n    definitionsPath,\n    filtersPrefix = DEFAULT_FILTERS_PREFIX,\n    reportType,\n  }: {\n    fields: components['schemas']['FieldDefinition'][]\n    template?: Template\n    queryParams: ParsedQs\n    definitionsPath?: string\n    filtersPrefix?: string\n    reportType?: ReportType\n  }) {\n    this.selectedPage = queryParams['selectedPage'] ? Number(queryParams['selectedPage']) : 1\n    this.pageSize = this.getPageSize(queryParams, template, reportType)\n    this.sortColumn = queryParams['sortColumn']\n      ? queryParams['sortColumn'].toString()\n      : this.getDefaultSortColumn(fields)\n    this.sortedAsc = queryParams['sortedAsc'] !== 'false'\n    this.dataProductDefinitionsPath =\n      definitionsPath ??\n      (queryParams['dataProductDefinitionsPath'] ? queryParams['dataProductDefinitionsPath'].toString() : undefined)\n    this.filtersPrefix = filtersPrefix\n\n    if (queryParams['columns']) {\n      const columns =\n        typeof queryParams['columns'] === 'string'\n          ? queryParams['columns'].split(',')\n          : (queryParams['columns'] as string[])\n      this.columns = ColumnUtils.ensureMandatoryColumns(fields, columns)\n    } else {\n      this.columns = fields.filter((f) => f.visible).map((f) => f.name)\n    }\n\n    const dateField: components['schemas']['FieldDefinition'] | undefined = fields.find((f) => {\n      return (\n        (f.type === 'date' && f.filter && f.filter.type === 'daterange') ||\n        (f.type === 'date' && f.filter && f.filter.type === 'date')\n      )\n    })\n\n    let min: string | undefined\n    let max: string | undefined\n    if (dateField && dateField.filter) {\n      min = dateField.filter.min\n      max = dateField.filter.max\n    }\n\n    this.filters = {}\n\n    Object.keys(queryParams)\n      .filter((key) => key.startsWith(this.filtersPrefix))\n      .filter((key) => queryParams[key])\n      .forEach((key) => {\n        const filter = key.replace(this.filtersPrefix, '')\n        const p = queryParams[key]\n        let value = p ? p.toString() : ''\n        if (filter.includes('.start') && min) {\n          if (new Date(value) < new Date(min)) value = min\n        }\n        if (filter.includes('.end') && max) {\n          if (new Date(value) > new Date(max)) value = max\n        }\n        if (value !== 'no-filter') {\n          this.filters[filter] = value\n        }\n      })\n\n    if (dateField && dateField.filter && dateField.filter.type === 'daterange') {\n      if (\n        min &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes('.start'))\n      ) {\n        this.filters[`${dateField.name}.start`] = min\n      }\n\n      if (\n        max &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes('.end'))\n      ) {\n        this.filters[`${dateField.name}.end`] = max\n      }\n    }\n\n    if (dateField && dateField.filter && dateField.filter.type === 'date') {\n      if (\n        min &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes(dateField.name))\n      ) {\n        this.filters[`${dateField.name}.start`] = min\n      }\n    }\n  }\n\n  private getDefaultSortColumn(fields: components['schemas']['FieldDefinition'][]) {\n    const defaultSortColumn = fields.find((f) => f.defaultsort)\n    return defaultSortColumn ? defaultSortColumn.name : fields.find((f) => f.sortable)?.name\n  }\n\n  getPageSize(queryParams: ParsedQs, template?: Template, reportType?: ReportType): number {\n    let pageSize = 20\n    if (!reportType || reportType === ReportType.REPORT) {\n      if (queryParams['pageSize']) {\n        pageSize = Number(queryParams['pageSize'])\n      } else if (template) {\n        pageSize = this.getDefaultPageSize(template)\n      }\n    }\n    return pageSize\n  }\n\n  toRecordWithFilterPrefix(removeClearedFilters = false): Record<string, string | Array<string>> {\n    const record: Record<string, string | Array<string>> = {\n      selectedPage: this.selectedPage.toString(),\n      ...(this.pageSize && { pageSize: this.pageSize.toString() }),\n      ...(this.sortColumn && { sortColumn: this.sortColumn }),\n      sortedAsc: this.sortedAsc.toString(),\n      columns: this.columns,\n    }\n\n    if (this.dataProductDefinitionsPath) {\n      record['dataProductDefinitionsPath'] = this.dataProductDefinitionsPath\n    }\n\n    Object.keys(this.filters).forEach((filterName) => {\n      const value = this.filters[filterName]\n      if ((value && !removeClearedFilters) || value !== clearFilterValue) {\n        record[`${this.filtersPrefix}${filterName}`] = <string>value\n      }\n    })\n\n    return record\n  }\n\n  private getDefaultPageSize(template: Template) {\n    const maxResultsSize = 500000\n    const standardPage = 20\n\n    switch (template) {\n      case 'list-section':\n      case 'summary-section':\n      case 'row-section-child':\n      case 'parent-child':\n      case 'parent-child-section':\n        return maxResultsSize\n\n      default:\n        return standardPage\n    }\n  }\n}\n\nexport { ReportQuery }\nexport default ReportQuery\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { ParsedQs } from 'qs'\nimport { FilteredListRequest } from './index'\nimport Dict = NodeJS.Dict\nimport { components } from './api'\nimport { clearFilterValue } from '../utils/urlHelper'\nimport ColumnUtils from '../components/_reports/report-columns-form/utils'\nimport { Template } from './Templates'\nimport { ReportType } from './UserReports'\n\nexport const DEFAULT_FILTERS_PREFIX = 'filters.'\n\nclass ReportQuery implements FilteredListRequest {\n  selectedPage: number\n\n  pageSize: number\n\n  sortColumn?: string | undefined\n\n  columns: Array<string>\n\n  sortedAsc: boolean\n\n  filters: Dict<string>\n\n  filtersPrefix: string\n\n  dataProductDefinitionsPath?: string | undefined\n\n  constructor({\n    fields,\n    template,\n    queryParams,\n    definitionsPath,\n    filtersPrefix = DEFAULT_FILTERS_PREFIX,\n    reportType,\n  }: {\n    fields: components['schemas']['FieldDefinition'][]\n    template?: Template\n    queryParams: ParsedQs\n    definitionsPath?: string\n    filtersPrefix?: string\n    reportType?: ReportType\n  }) {\n    this.selectedPage = queryParams['selectedPage'] ? Number(queryParams['selectedPage']) : 1\n    this.pageSize = this.getPageSize(queryParams, template, reportType)\n    this.sortColumn = queryParams['sortColumn']\n      ? queryParams['sortColumn'].toString()\n      : this.getDefaultSortColumn(fields)\n    this.sortedAsc = queryParams['sortedAsc'] !== 'false'\n    this.dataProductDefinitionsPath =\n      definitionsPath ??\n      (queryParams['dataProductDefinitionsPath'] ? queryParams['dataProductDefinitionsPath'].toString() : undefined)\n    this.filtersPrefix = filtersPrefix\n\n    if (queryParams['columns']) {\n      const columns =\n        typeof queryParams['columns'] === 'string'\n          ? queryParams['columns'].split(',')\n          : (queryParams['columns'] as string[])\n      this.columns = ColumnUtils.ensureMandatoryColumns(fields, columns)\n    } else {\n      this.columns = fields.filter((f) => f.visible).map((f) => f.name)\n    }\n\n    const dateField: components['schemas']['FieldDefinition'] | undefined = fields.find((f) => {\n      return (\n        (f.type === 'date' && f.filter && f.filter.type === 'daterange') ||\n        (f.type === 'date' && f.filter && f.filter.type === 'date')\n      )\n    })\n\n    let min: string | undefined\n    let max: string | undefined\n    if (dateField && dateField.filter) {\n      min = dateField.filter.min\n      max = dateField.filter.max\n    }\n\n    this.filters = {}\n\n    Object.keys(queryParams)\n      .filter((key) => key.startsWith(this.filtersPrefix))\n      .filter((key) => queryParams[key])\n      .forEach((key) => {\n        const filter = key.replace(this.filtersPrefix, '')\n        const p = queryParams[key]\n        let value = p ? p.toString() : ''\n        if (filter.includes('.start') && min) {\n          if (new Date(value) < new Date(min)) value = min\n        }\n        if (filter.includes('.end') && max) {\n          if (new Date(value) > new Date(max)) value = max\n        }\n        if (value !== 'no-filter') {\n          this.filters[filter] = value\n        }\n      })\n\n    if (dateField && dateField.filter && dateField.filter.type === 'daterange') {\n      if (\n        min &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes('.start'))\n      ) {\n        this.filters[`${dateField.name}.start`] = min\n      }\n\n      if (\n        max &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes('.end'))\n      ) {\n        this.filters[`${dateField.name}.end`] = max\n      }\n    }\n\n    if (dateField && dateField.filter && dateField.filter.type === 'date') {\n      if (\n        min &&\n        Object.keys(queryParams).some((key) => key.includes(this.filtersPrefix)) &&\n        Object.keys(queryParams).every((key) => !key.includes(dateField.name))\n      ) {\n        this.filters[`${dateField.name}.start`] = min\n      }\n    }\n  }\n\n  private getDefaultSortColumn(fields: components['schemas']['FieldDefinition'][]) {\n    const defaultSortColumn = fields.find((f) => f.defaultsort)\n    return defaultSortColumn ? defaultSortColumn.name : fields.find((f) => f.sortable)?.name\n  }\n\n  getPageSize(queryParams: ParsedQs, template?: Template, reportType?: ReportType): number {\n    let pageSize = 5000000\n    if (!reportType || reportType === ReportType.REPORT) {\n      if (queryParams['pageSize']) {\n        pageSize = Number(queryParams['pageSize'])\n      } else if (template) {\n        pageSize = this.getDefaultPageSize(template)\n      }\n    }\n    return pageSize\n  }\n\n  toRecordWithFilterPrefix(removeClearedFilters = false): Record<string, string | Array<string>> {\n    const record: Record<string, string | Array<string>> = {\n      selectedPage: this.selectedPage.toString(),\n      ...(this.pageSize && { pageSize: this.pageSize.toString() }),\n      ...(this.sortColumn && { sortColumn: this.sortColumn }),\n      sortedAsc: this.sortedAsc.toString(),\n      columns: this.columns,\n    }\n\n    if (this.dataProductDefinitionsPath) {\n      record['dataProductDefinitionsPath'] = this.dataProductDefinitionsPath\n    }\n\n    Object.keys(this.filters).forEach((filterName) => {\n      const value = this.filters[filterName]\n      if ((value && !removeClearedFilters) || value !== clearFilterValue) {\n        record[`${this.filtersPrefix}${filterName}`] = <string>value\n      }\n    })\n\n    return record\n  }\n\n  private getDefaultPageSize(template: Template) {\n    const maxResultsSize = 500000\n    const standardPage = 20\n\n    switch (template) {\n      case 'list-section':\n      case 'summary-section':\n      case 'row-section-child':\n      case 'parent-child':\n      case 'parent-child-section':\n        return maxResultsSize\n\n      default:\n        return standardPage\n    }\n  }\n}\n\nexport { ReportQuery }\nexport default ReportQuery\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,4BAAAE,EAAA,gBAAAC,EAAA,YAAAC,IAAA,eAAAC,EAAAL,GAIA,IAAAM,EAAiC,8BACjCC,EAAwB,+DAExBC,EAA2B,yBAEpB,MAAMN,EAAyB,WAEtC,MAAMC,CAA2C,CAiB/C,YAAY,CACV,OAAAM,EACA,SAAAC,EACA,YAAAC,EACA,gBAAAC,EACA,cAAAC,EAAgBX,EAChB,WAAAY,CACF,EAOG,CAYD,GAXA,KAAK,aAAeH,EAAY,aAAkB,OAAOA,EAAY,YAAe,EAAI,EACxF,KAAK,SAAW,KAAK,YAAYA,EAAaD,EAAUI,CAAU,EAClE,KAAK,WAAaH,EAAY,WAC1BA,EAAY,WAAc,SAAS,EACnC,KAAK,qBAAqBF,CAAM,EACpC,KAAK,UAAYE,EAAY,YAAiB,QAC9C,KAAK,2BACHC,IACCD,EAAY,2BAAgCA,EAAY,2BAA8B,SAAS,EAAI,QACtG,KAAK,cAAgBE,EAEjBF,EAAY,QAAY,CAC1B,MAAMI,EACJ,OAAOJ,EAAY,SAAe,SAC9BA,EAAY,QAAW,MAAM,GAAG,EAC/BA,EAAY,QACnB,KAAK,QAAU,EAAAK,QAAY,uBAAuBP,EAAQM,CAAO,CACnE,MACE,KAAK,QAAUN,EAAO,OAAQQ,GAAMA,EAAE,OAAO,EAAE,IAAKA,GAAMA,EAAE,IAAI,EAGlE,MAAMC,EAAkET,EAAO,KAAMQ,GAEhFA,EAAE,OAAS,QAAUA,EAAE,QAAUA,EAAE,OAAO,OAAS,aACnDA,EAAE,OAAS,QAAUA,EAAE,QAAUA,EAAE,OAAO,OAAS,MAEvD,EAED,IAAIE,EACAC,EACAF,GAAaA,EAAU,SACzBC,EAAMD,EAAU,OAAO,IACvBE,EAAMF,EAAU,OAAO,KAGzB,KAAK,QAAU,CAAC,EAEhB,OAAO,KAAKP,CAAW,EACpB,OAAQU,GAAQA,EAAI,WAAW,KAAK,aAAa,CAAC,EAClD,OAAQA,GAAQV,EAAYU,CAAG,CAAC,EAChC,QAASA,GAAQ,CAChB,MAAMC,EAASD,EAAI,QAAQ,KAAK,cAAe,EAAE,EAC3CE,EAAIZ,EAAYU,CAAG,EACzB,IAAIG,EAAQD,EAAIA,EAAE,SAAS,EAAI,GAC3BD,EAAO,SAAS,QAAQ,GAAKH,GAC3B,IAAI,KAAKK,CAAK,EAAI,IAAI,KAAKL,CAAG,IAAGK,EAAQL,GAE3CG,EAAO,SAAS,MAAM,GAAKF,GACzB,IAAI,KAAKI,CAAK,EAAI,IAAI,KAAKJ,CAAG,IAAGI,EAAQJ,GAE3CI,IAAU,cACZ,KAAK,QAAQF,CAAM,EAAIE,EAE3B,CAAC,EAECN,GAAaA,EAAU,QAAUA,EAAU,OAAO,OAAS,cAE3DC,GACA,OAAO,KAAKR,CAAW,EAAE,KAAMU,GAAQA,EAAI,SAAS,KAAK,aAAa,CAAC,GACvE,OAAO,KAAKV,CAAW,EAAE,MAAOU,GAAQ,CAACA,EAAI,SAAS,QAAQ,CAAC,IAE/D,KAAK,QAAQ,GAAGH,EAAU,IAAI,QAAQ,EAAIC,GAI1CC,GACA,OAAO,KAAKT,CAAW,EAAE,KAAMU,GAAQA,EAAI,SAAS,KAAK,aAAa,CAAC,GACvE,OAAO,KAAKV,CAAW,EAAE,MAAOU,GAAQ,CAACA,EAAI,SAAS,MAAM,CAAC,IAE7D,KAAK,QAAQ,GAAGH,EAAU,IAAI,MAAM,EAAIE,IAIxCF,GAAaA,EAAU,QAAUA,EAAU,OAAO,OAAS,QAE3DC,GACA,OAAO,KAAKR,CAAW,EAAE,KAAMU,GAAQA,EAAI,SAAS,KAAK,aAAa,CAAC,GACvE,OAAO,KAAKV,CAAW,EAAE,MAAOU,GAAQ,CAACA,EAAI,SAASH,EAAU,IAAI,CAAC,IAErE,KAAK,QAAQ,GAAGA,EAAU,IAAI,QAAQ,EAAIC,EAGhD,CAEQ,qBAAqBV,EAAoD,CAC/E,MAAMgB,EAAoBhB,EAAO,KAAMQ,GAAMA,EAAE,WAAW,EAC1D,OAAOQ,EAAoBA,EAAkB,KAAOhB,EAAO,KAAMQ,GAAMA,EAAE,QAAQ,GAAG,IACtF,CAEA,YAAYN,EAAuBD,EAAqBI,EAAiC,CACvF,IAAIY,EAAW,IACf,OAAI,CAACZ,GAAcA,IAAe,aAAW,UACvCH,EAAY,SACde,EAAW,OAAOf,EAAY,QAAW,EAChCD,IACTgB,EAAW,KAAK,mBAAmBhB,CAAQ,IAGxCgB,CACT,CAEA,yBAAyBC,EAAuB,GAA+C,CAC7F,MAAMC,EAAiD,CACrD,aAAc,KAAK,aAAa,SAAS,EACzC,GAAI,KAAK,UAAY,CAAE,SAAU,KAAK,SAAS,SAAS,CAAE,EAC1D,GAAI,KAAK,YAAc,CAAE,WAAY,KAAK,UAAW,EACrD,UAAW,KAAK,UAAU,SAAS,EACnC,QAAS,KAAK,OAChB,EAEA,OAAI,KAAK,6BACPA,EAAO,2BAAgC,KAAK,4BAG9C,OAAO,KAAK,KAAK,OAAO,EAAE,QAASC,GAAe,CAChD,MAAML,EAAQ,KAAK,QAAQK,CAAU,GAChCL,GAAS,CAACG,GAAyBH,IAAU,sBAChDI,EAAO,GAAG,KAAK,aAAa,GAAGC,CAAU,EAAE,EAAYL,EAE3D,CAAC,EAEMI,CACT,CAEQ,mBAAmBlB,EAAoB,CAI7C,OAAQA,EAAU,CAChB,IAAK,eACL,IAAK,kBACL,IAAK,oBACL,IAAK,eACL,IAAK,uBACH,MAAO,KAET,QACE,MAAO,GACX,CACF,CACF,CAGA,IAAON,EAAQD",
   "names": ["ReportQuery_exports", "__export", "DEFAULT_FILTERS_PREFIX", "ReportQuery", "ReportQuery_default", "__toCommonJS", "import_urlHelper", "import_utils", "import_UserReports", "fields", "template", "queryParams", "definitionsPath", "filtersPrefix", "reportType", "columns", "ColumnUtils", "f", "dateField", "min", "max", "key", "filter", "p", "value", "defaultSortColumn", "pageSize", "removeClearedFilters", "record", "filterName"]
 }

package/dpr/types/ReportQuery.ts

@@ -131,7 +131,7 @@ class ReportQuery implements FilteredListRequest {
   }
 
   getPageSize(queryParams: ParsedQs, template?: Template, reportType?: ReportType): number {
-    let pageSize = 20
+    let pageSize = 5000000
     if (!reportType || reportType === ReportType.REPORT) {
       if (queryParams['pageSize']) {
         pageSize = Number(queryParams['pageSize'])

package/dpr/types/api.d.js

@@ -1,2 +1,2 @@
-"use strict";var o=Object.defineProperty;var a=Object.getOwnPropertyDescriptor;var i=Object.getOwnPropertyNames;var p=Object.prototype.hasOwnProperty;var c=(n,e,s,t)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of i(e))!p.call(n,r)&&r!==s&&o(n,r,{get:()=>e[r],enumerable:!(t=a(e,r))||t.enumerable});return n};var d=n=>c(o({},"__esModule",{value:!0}),n);var m={};module.exports=d(m);
+"use strict";var s=Object.defineProperty;var a=Object.getOwnPropertyDescriptor;var i=Object.getOwnPropertyNames;var p=Object.prototype.hasOwnProperty;var c=(n,e,o,t)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of i(e))!p.call(n,r)&&r!==o&&s(n,r,{get:()=>e[r],enumerable:!(t=a(e,r))||t.enumerable});return n};var d=n=>c(s({},"__esModule",{value:!0}),n);var m={};module.exports=d(m);
 //# sourceMappingURL=api.d.js.map