@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.16.1 → 4.17.1

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/view-report/async/dashboard/tests.cy.ts"],
-  "sourcesContent": ["import { checkA11y } from '../../../../../../../cypress-tests/cypressUtils'\n\ncontext('Viewing a report', () => {\n  const path = '/embedded/platform/'\n\n  describe('dashboard tests', () => {\n    before(() => {\n      cy.task('resetStubs')\n      cy.task('resetRedis')\n      cy.task('stubDefinitions')\n      cy.task('stubTestDashboard8')\n      cy.task('stubMockDashboardsStatusFinished')\n      cy.task('stubViewAsyncResults')\n      cy.task('stubDashboardSuccessResult20')\n      cy.task('stubSingleSummaries')\n      cy.task('stubDefinitionUnprintable')\n      cy.task('stubDefinitionEmptyReport')\n    })\n\n    it('should mark the dashboard as recently viewed', () => {\n      // Request and run a report so we can go back to it for each test\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Viewed \\(0\\)/ }).should('be.visible')\n      checkA11y()\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              element.textContent.includes('Test Dashboard') &&\n              element.textContent.includes('Dashboard used for testing testing')\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request dashboard' }).click()\n        })\n      })\n      checkA11y()\n      cy.findByRole('button', { name: /Request/ }).click()\n      checkA11y()\n      cy.findByRole('heading', { level: 1, name: /Test Dashboard/ }).should('be.visible')\n      checkA11y()\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Viewed \\(1\\)/ }).should('be.visible')\n    })\n  })\n})\n"],
-  "mappings": "AAAA,IAAAA,EAA0B,2DAE1B,QAAQ,mBAAoB,IAAM,CAChC,MAAMC,EAAO,sBAEb,SAAS,kBAAmB,IAAM,CAChC,OAAO,IAAM,CACX,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,iBAAiB,EACzB,GAAG,KAAK,oBAAoB,EAC5B,GAAG,KAAK,kCAAkC,EAC1C,GAAG,KAAK,sBAAsB,EAC9B,GAAG,KAAK,8BAA8B,EACtC,GAAG,KAAK,qBAAqB,EAC7B,GAAG,KAAK,2BAA2B,EACnC,GAAG,KAAK,2BAA2B,CACrC,CAAC,EAED,GAAG,+CAAgD,IAAM,CAEvD,GAAG,MAAMA,CAAI,EACb,GAAG,WAAW,MAAO,CAAE,KAAM,cAAe,CAAC,EAAE,OAAO,YAAY,KAClE,aAAU,EACV,GAAG,gBAAgB,sBAAsB,EAAE,OAAO,IAAM,CACtD,GAAG,WAAW,MAAO,CACnB,KAAM,CAACC,EAAGC,IAENA,EAAQ,YAAY,SAAS,gBAAgB,GAC7CA,EAAQ,YAAY,SAAS,oCAAoC,CAGvE,CAAC,EAAE,OAAO,IAAM,CACd,GAAG,WAAW,OAAQ,CAAE,KAAM,mBAAoB,CAAC,EAAE,MAAM,CAC7D,CAAC,CACH,CAAC,KACD,aAAU,EACV,GAAG,WAAW,SAAU,CAAE,KAAM,SAAU,CAAC,EAAE,MAAM,KACnD,aAAU,EACV,GAAG,WAAW,UAAW,CAAE,MAAO,EAAG,KAAM,gBAAiB,CAAC,EAAE,OAAO,YAAY,KAClF,aAAU,EACV,GAAG,MAAMF,CAAI,EACb,GAAG,WAAW,MAAO,CAAE,KAAM,cAAe,CAAC,EAAE,OAAO,YAAY,CACpE,CAAC,CACH,CAAC,CACH,CAAC",
+  "sourcesContent": ["import { checkA11y, executeDashboardStubs } from '../../../../../../../cypress-tests/cypressUtils'\n\ncontext('Viewing a report', () => {\n  const path = '/embedded/platform/'\n\n  describe('dashboard tests', () => {\n    before(() => {\n      executeDashboardStubs()\n      cy.task('stubTestDashboard8')\n      cy.task('stubDashboardSuccessResult20')\n    })\n\n    it('should mark the dashboard as recently viewed', () => {\n      // Request and run a report so we can go back to it for each test\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Viewed \\(0\\)/ }).should('be.visible')\n      checkA11y()\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              element.textContent.includes('Test Dashboard') &&\n              element.textContent.includes('Dashboard used for testing testing')\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request dashboard' }).click()\n        })\n      })\n      checkA11y()\n      cy.findByRole('button', { name: /Request/ }).click()\n      checkA11y()\n      cy.findByRole('heading', { level: 1, name: /Test Dashboard/ }).should('be.visible')\n      checkA11y()\n      cy.visit(path)\n      cy.findByRole('tab', { name: /Viewed \\(1\\)/ }).should('be.visible')\n    })\n  })\n})\n"],
+  "mappings": "AAAA,IAAAA,EAAiD,2DAEjD,QAAQ,mBAAoB,IAAM,CAChC,MAAMC,EAAO,sBAEb,SAAS,kBAAmB,IAAM,CAChC,OAAO,IAAM,IACX,yBAAsB,EACtB,GAAG,KAAK,oBAAoB,EAC5B,GAAG,KAAK,8BAA8B,CACxC,CAAC,EAED,GAAG,+CAAgD,IAAM,CAEvD,GAAG,MAAMA,CAAI,EACb,GAAG,WAAW,MAAO,CAAE,KAAM,cAAe,CAAC,EAAE,OAAO,YAAY,KAClE,aAAU,EACV,GAAG,gBAAgB,sBAAsB,EAAE,OAAO,IAAM,CACtD,GAAG,WAAW,MAAO,CACnB,KAAM,CAACC,EAAGC,IAENA,EAAQ,YAAY,SAAS,gBAAgB,GAC7CA,EAAQ,YAAY,SAAS,oCAAoC,CAGvE,CAAC,EAAE,OAAO,IAAM,CACd,GAAG,WAAW,OAAQ,CAAE,KAAM,mBAAoB,CAAC,EAAE,MAAM,CAC7D,CAAC,CACH,CAAC,KACD,aAAU,EACV,GAAG,WAAW,SAAU,CAAE,KAAM,SAAU,CAAC,EAAE,MAAM,KACnD,aAAU,EACV,GAAG,WAAW,UAAW,CAAE,MAAO,EAAG,KAAM,gBAAiB,CAAC,EAAE,OAAO,YAAY,KAClF,aAAU,EACV,GAAG,MAAMF,CAAI,EACb,GAAG,WAAW,MAAO,CAAE,KAAM,cAAe,CAAC,EAAE,OAAO,YAAY,CACpE,CAAC,CACH,CAAC,CACH,CAAC",
   "names": ["import_cypressUtils", "path", "_", "element"]
 }

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

@@ -1,20 +1,13 @@
-import { checkA11y } from '../../../../../../../cypress-tests/cypressUtils'
+import { checkA11y, executeDashboardStubs } from '../../../../../../../cypress-tests/cypressUtils'
 
 context('Viewing a report', () => {
   const path = '/embedded/platform/'
 
   describe('dashboard tests', () => {
     before(() => {
-      cy.task('resetStubs')
-      cy.task('resetRedis')
-      cy.task('stubDefinitions')
+      executeDashboardStubs()
       cy.task('stubTestDashboard8')
-      cy.task('stubMockDashboardsStatusFinished')
-      cy.task('stubViewAsyncResults')
       cy.task('stubDashboardSuccessResult20')
-      cy.task('stubSingleSummaries')
-      cy.task('stubDefinitionUnprintable')
-      cy.task('stubDefinitionEmptyReport')
     })
 
     it('should mark the dashboard as recently viewed', () => {

package/dpr/routes/journeys/view-report/async/dashboard/utils.js

@@ -1,2 +1,2 @@
-var M=Object.create;var b=Object.defineProperty;var N=Object.getOwnPropertyDescriptor;var O=Object.getOwnPropertyNames;var _=Object.getPrototypeOf,H=Object.prototype.hasOwnProperty;var Q=(t,e)=>{for(var r in e)b(t,r,{get:e[r],enumerable:!0})},T=(t,e,r,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let a of O(e))!H.call(t,a)&&a!==r&&b(t,a,{get:()=>e[a],enumerable:!(s=N(e,a))||s.enumerable});return t};var p=(t,e,r)=>(r=t!=null?M(_(t)):{},T(e||!t||!t.__esModule?b(r,"default",{value:t,enumerable:!0}):r,t)),G=t=>T(b({},"__esModule",{value:!0}),t);var J={};Q(J,{default:()=>z,renderAsyncDashboard:()=>P});module.exports=G(J);var k=p(require("parseurl")),c=require("../../../../../components/_dashboards/dashboard/types"),S=require("../../../../../types/UserReports"),h=p(require("../../../../../components/_charts/utils")),E=p(require("../../../../../utils/definitionUtils")),V=p(require("../../../../../components/user-reports/utils")),w=p(require("../../../../../components/_dashboards/dashboard-list/utils")),U=p(require("../../../../../components/_filters/utils")),F=p(require("../../../../../components/_dashboards/scorecard/utils")),I=p(require("../../../../../components/_dashboards/scorecard/Scorecard")),q=p(require("../../../../../components/_reports/report-actions/utils")),C=p(require("../../../../../types/ReportQuery")),g=p(require("../../../../../utils/localsHelper")),L=require("../../../../../components/_filters/filtersTypeEnum");const X=(t,e,r)=>{const s=e.name,{name:a}=t,i=r.url.request.fullUrl,{executionId:d}=r;return q.default.getActions({share:{reportName:s,name:a,url:i},refresh:{url:i,executionId:d},copy:{url:i}})},W=async({req:t,res:e,services:r,next:s})=>{const{token:a}=g.default.getValues(e),{reportId:i,id:d}=t.params,{dataProductDefinitionsPath:n}=t.query,l=await r.dashboardService.getDefinition(a,i,d,n),o=await E.default.getReportSummary(i,r.reportingService,a,n),u=await U.default.getFilters({fields:l.filterFields||[],req:t,filtersType:L.FiltersType.INTERACTIVE}),f=U.default.setRequestQueryFromFilterValues(u.filters);return{query:new C.default({fields:l.filterFields||[],queryParams:f,definitionsPath:n,reportType:S.ReportType.DASHBOARD}).toRecordWithFilterPrefix(!0),filters:u,dashboardDefinition:l,reportDefinition:o}},j=(t,e,r)=>t.sections.map(s=>{const{id:a,display:i,description:d}=s;let n=!1;const l=s.visualisations.map(o=>{const{type:u,display:f,description:D,id:R}=o;let m;switch(u){case c.DashboardVisualisationType.LIST:m=w.default.createList(o,e);break;case c.DashboardVisualisationType.SCORECARD:n=!0,m=new I.default(e,o).build();break;case c.DashboardVisualisationType.SCORECARD_GROUP:m=new I.default(e,o,!0).build();break;case c.DashboardVisualisationType.BAR:case c.DashboardVisualisationType.LINE:case c.DashboardVisualisationType.DONUT:{m=h.default.createChart(o,e);break}case c.DashboardVisualisationType.MATRIX:case c.DashboardVisualisationType.MATRIX_TIMESERIES:{m=h.default.createMatrixChart(o,e,r);break}case c.DashboardVisualisationType.BAR_TIMESERIES:case c.DashboardVisualisationType.LINE_TIMESERIES:{m=h.default.createTimeseriesCharts(o,e);break}default:break}return{id:R,title:f,description:D,type:u,data:m}});return n&&F.default.mergeScorecardsIntoGroup(l),{id:a,title:i,description:d,visualisations:l}}),v=async(t,e,r,s,a,i,d)=>{const n=await t.requestedReportService.getReportByTableId(e,r);return s&&s.length&&n&&V.default.updateLastViewed({services:t,reportStateData:n,userId:r,req:i,filters:d}),n},P=async({req:t,res:e,services:r,next:s})=>{const{token:a,csrfToken:i,dprUser:d,nestedBaseUrl:n}=g.default.getValues(e),{reportId:l,id:o,tableId:u}=t.params,f=(0,k.default)(t),{query:D,filters:R,reportDefinition:m,dashboardDefinition:y}=await W({req:t,res:e,services:r}),x=(await r.dashboardService.getAsyncDashboard(a,o,l,u,D)).flat(),A=j(y,x,D),B=await v(r,u,d.id,A,f,t,R.filters);return{dashboardData:{token:a,id:o,reportId:l,name:y.name,description:y.description,reportName:m.name,bookmarked:await r.bookmarkService.isBookmarked(o,l,d.id),nestedBaseUrl:n,csrfToken:i,sections:A,filters:R,type:S.ReportType.DASHBOARD,actions:X(y,m,B)}}};var z={renderAsyncDashboard:P};0&&(module.exports={renderAsyncDashboard});
+var O=Object.create;var h=Object.defineProperty;var _=Object.getOwnPropertyDescriptor;var H=Object.getOwnPropertyNames;var Q=Object.getPrototypeOf,G=Object.prototype.hasOwnProperty;var v=(t,e)=>{for(var r in e)h(t,r,{get:e[r],enumerable:!0})},w=(t,e,r,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of H(e))!G.call(t,s)&&s!==r&&h(t,s,{get:()=>e[s],enumerable:!(n=_(e,s))||n.enumerable});return t};var p=(t,e,r)=>(r=t!=null?O(Q(t)):{},w(e||!t||!t.__esModule?h(r,"default",{value:t,enumerable:!0}):r,t)),W=t=>w(h({},"__esModule",{value:!0}),t);var Y={};v(Y,{default:()=>K,renderAsyncDashboard:()=>M});module.exports=W(Y);var V=p(require("parseurl")),l=require("../../../../../components/_dashboards/dashboard-visualisation/types"),y=require("../../../../../types/UserReports"),b=p(require("../../../../../components/_charts/utils")),P=p(require("../../../../../utils/definitionUtils")),q=p(require("../../../../../components/user-reports/utils")),F=p(require("../../../../../components/_dashboards/dashboard-list/utils")),S=p(require("../../../../../components/_filters/utils")),C=p(require("../../../../../components/_dashboards/scorecard/utils")),g=p(require("../../../../../components/_dashboards/scorecard/Scorecard")),x=p(require("../../../../../components/_reports/report-actions/utils")),B=p(require("../../../../../types/ReportQuery")),U=p(require("../../../../../utils/localsHelper")),L=require("../../../../../components/_filters/filtersTypeEnum");const X=(t,e,r)=>{const n=e.name,{name:s}=t,a=r?.url?.request?.fullUrl,c=r?.executionId;let o={};return a&&(o={share:{reportName:n,name:s,url:a},copy:{url:a}},c&&(o={...o,refresh:{url:a,executionId:c}})),x.default.getActions(o)},j=async({req:t,res:e,services:r,next:n})=>{const{token:s}=U.default.getValues(e),{reportId:a,id:c}=t.params,o=t.query.dataProductDefinitionsPath,d=await r.dashboardService.getDefinition(s,a,c,o),i=await P.default.getReportSummary(a,r.reportingService,s,o),u=await S.default.getFilters({fields:d.filterFields||[],req:t,filtersType:L.FiltersType.INTERACTIVE}),f=S.default.setRequestQueryFromFilterValues(u.filters);return{query:new B.default({fields:d.filterFields||[],queryParams:f,definitionsPath:o,reportType:y.ReportType.DASHBOARD}).toRecordWithFilterPrefix(!0),filters:u,dashboardDefinition:d,reportDefinition:i}},z=(t,e,r)=>t.sections.map(n=>{const{id:s,display:a,description:c}=n;let o=!1;const d=n.visualisations.map(i=>{const{type:u,display:f,description:D,id:A}=i;let m;switch(u){case l.DashboardVisualisationType.LIST:m=F.default.createList(i,e);break;case l.DashboardVisualisationType.SCORECARD:o=!0,m=new g.default(e,i).build();break;case l.DashboardVisualisationType.SCORECARD_GROUP:m=new g.default(e,i,!0).build();break;case l.DashboardVisualisationType.BAR:case l.DashboardVisualisationType.LINE:case l.DashboardVisualisationType.DONUT:{m=b.default.createChart(i,e);break}case l.DashboardVisualisationType.MATRIX_TIMESERIES:{m=b.default.createMatrixChart(i,e,r);break}case l.DashboardVisualisationType.BAR_TIMESERIES:case l.DashboardVisualisationType.LINE_TIMESERIES:{m=b.default.createTimeseriesCharts(i,e);break}default:break}return{id:A,title:f,description:D,type:u,data:m}});return o&&C.default.mergeScorecardsIntoGroup(d),{id:s,title:a,description:c,visualisations:d}}),J=async(t,e,r,n,s,a)=>{const{requestedReportService:c}=t,o=c?await c.getReportByTableId(e,r):void 0;return n&&n.length&&o&&q.default.updateLastViewed({services:t,reportStateData:o,userId:r,req:s,filters:a}),o},M=async({req:t,res:e,services:r,next:n})=>{const{token:s,csrfToken:a,dprUser:c,nestedBaseUrl:o}=U.default.getValues(e),{reportId:d,id:i,tableId:u}=t.params,{bookmarkService:f,requestedReportService:D}=r,A=(0,V.default)(t),{query:m,filters:I,reportDefinition:k,dashboardDefinition:R}=await j({req:t,res:e,services:r}),N=(await r.dashboardService.getAsyncDashboard(s,i,d,u,m)).flat(),T=z(R,N,m);let E;return D&&(E=await J(r,u,c.id,T,t,I.filters)),{dashboardData:{token:s,id:i,reportId:d,name:R.name,description:R.description,reportName:k.name,bookmarked:f?await f.isBookmarked(i,d,c.id):!1,nestedBaseUrl:o,csrfToken:a,sections:T,filters:I,type:y.ReportType.DASHBOARD,actions:X(R,k,E)}}};var K={renderAsyncDashboard:M};0&&(module.exports={renderAsyncDashboard});
 //# sourceMappingURL=utils.js.map

package/dpr/routes/journeys/view-report/async/dashboard/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/view-report/async/dashboard/utils.ts"],
-  "sourcesContent": ["import parseUrl from 'parseurl'\nimport { Url } from 'url'\nimport { Request } from 'express'\nimport type { AsyncReportUtilsParams } from '../../../../../types/AsyncReportUtils'\n\nimport {\n  DashboardUIVisualisation,\n  DashboardVisualisationType,\n  ListVisualisation,\n  type DashboardDefinition,\n  type DashboardSection,\n  type DashboardUISection,\n  type DashboardVisualisation,\n} from '../../../../../components/_dashboards/dashboard/types'\nimport type { DashboardDataResponse } from '../../../../../types/Metrics'\nimport type { RequestedReport } from '../../../../../types/UserReports'\nimport { ReportType } from '../../../../../types/UserReports'\nimport type { components } from '../../../../../types/api'\n\nimport ChartUtils from '../../../../../components/_charts/utils'\nimport DefinitionUtils from '../../../../../utils/definitionUtils'\nimport UserReportsUtils from '../../../../../components/user-reports/utils'\nimport DashboardListUtils from '../../../../../components/_dashboards/dashboard-list/utils'\nimport FilterUtils from '../../../../../components/_filters/utils'\nimport ScorecardsUtils from '../../../../../components/_dashboards/scorecard/utils'\nimport ScorecardVisualisation from '../../../../../components/_dashboards/scorecard/Scorecard'\nimport ReportActionsUtils from '../../../../../components/_reports/report-actions/utils'\nimport ReportQuery from '../../../../../types/ReportQuery'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport { Services } from '../../../../../types/Services'\nimport { FilterValue } from '../../../../../components/_filters/types'\nimport { FiltersType } from '../../../../../components/_filters/filtersTypeEnum'\n\nconst setDashboardActions = (\n  dashboardDefinition: DashboardDefinition,\n  reportDefinition: components['schemas']['ReportDefinitionSummary'],\n  requestData: RequestedReport,\n) => {\n  const reportName = reportDefinition.name\n  const { name } = dashboardDefinition\n  const actionsUrl = requestData.url.request.fullUrl\n  const { executionId } = requestData\n\n  return ReportActionsUtils.getActions({\n    share: {\n      reportName,\n      name,\n      url: actionsUrl,\n    },\n    refresh: {\n      url: actionsUrl,\n      executionId,\n    },\n    copy: {\n      url: actionsUrl,\n    },\n  })\n}\n\nconst getDefinitionData = async ({ req, res, services, next }: AsyncReportUtilsParams) => {\n  const { token } = LocalsHelper.getValues(res)\n  const { reportId, id } = req.params\n  const { dataProductDefinitionsPath } = req.query\n\n  // Dashboard Definition,\n  const dashboardDefinition: DashboardDefinition = await services.dashboardService.getDefinition(\n    token,\n    reportId,\n    id,\n    dataProductDefinitionsPath,\n  )\n\n  // Report summary data\n  const reportDefinition = await DefinitionUtils.getReportSummary(\n    reportId,\n    services.reportingService,\n    token,\n    <string>dataProductDefinitionsPath,\n  )\n\n  // Get the filters\n  const filtersData = await FilterUtils.getFilters({\n    fields: dashboardDefinition.filterFields || [],\n    req,\n    filtersType: FiltersType.INTERACTIVE,\n  })\n\n  const filtersQuery = FilterUtils.setRequestQueryFromFilterValues(filtersData.filters)\n\n  // Create the query\n  const query = new ReportQuery({\n    fields: dashboardDefinition.filterFields || [],\n    queryParams: filtersQuery,\n    definitionsPath: <string>dataProductDefinitionsPath,\n    reportType: ReportType.DASHBOARD,\n  }).toRecordWithFilterPrefix(true)\n\n  return {\n    query,\n    filters: filtersData,\n    dashboardDefinition,\n    reportDefinition,\n  }\n}\n\nconst getSections = (\n  dashboardDefinition: DashboardDefinition,\n  dashboardData: DashboardDataResponse[],\n  query: Record<string, string | string[]>,\n): DashboardUISection[] => {\n  return dashboardDefinition.sections.map((section: DashboardSection) => {\n    const { id, display: title, description } = section\n\n    let hasScorecard = false\n    const visualisations = section.visualisations.map((visDefinition: DashboardVisualisation) => {\n      const { type, display, description: visDescription, id: visId } = visDefinition\n\n      let data: DashboardUIVisualisation['data']\n\n      switch (type) {\n        case DashboardVisualisationType.LIST:\n          data = DashboardListUtils.createList(visDefinition as ListVisualisation, dashboardData)\n          break\n\n        case DashboardVisualisationType.SCORECARD:\n          hasScorecard = true\n          data = new ScorecardVisualisation(dashboardData, visDefinition).build()\n          break\n\n        case DashboardVisualisationType.SCORECARD_GROUP:\n          data = new ScorecardVisualisation(dashboardData, visDefinition, true).build()\n          break\n\n        case DashboardVisualisationType.BAR:\n        case DashboardVisualisationType.LINE:\n        case DashboardVisualisationType.DONUT: {\n          data = ChartUtils.createChart(visDefinition, dashboardData)\n          break\n        }\n        case DashboardVisualisationType.MATRIX:\n        case DashboardVisualisationType.MATRIX_TIMESERIES: {\n          data = ChartUtils.createMatrixChart(visDefinition, dashboardData, query)\n          break\n        }\n        case DashboardVisualisationType.BAR_TIMESERIES:\n        case DashboardVisualisationType.LINE_TIMESERIES: {\n          data = ChartUtils.createTimeseriesCharts(visDefinition, dashboardData)\n          break\n        }\n        default:\n          break\n      }\n\n      return {\n        id: visId,\n        title: display,\n        description: visDescription,\n        type,\n        data,\n      }\n    })\n\n    if (hasScorecard) ScorecardsUtils.mergeScorecardsIntoGroup(visualisations)\n\n    return { id, title, description, visualisations }\n  })\n}\n\nconst updateStore = async (\n  services: Services,\n  tableId: string,\n  userId: string,\n  sections: DashboardUISection[],\n  url: Url,\n  req: Request,\n  filters: FilterValue[],\n) => {\n  const dashboardRequestData: RequestedReport = await services.requestedReportService.getReportByTableId(\n    tableId,\n    userId,\n  )\n\n  // Add to recently viewed\n  if (sections && sections.length && dashboardRequestData) {\n    UserReportsUtils.updateLastViewed({\n      services,\n      reportStateData: dashboardRequestData,\n      userId,\n      req,\n      filters,\n    })\n  }\n\n  return dashboardRequestData\n}\n\nexport const renderAsyncDashboard = async ({ req, res, services, next }: AsyncReportUtilsParams) => {\n  const { token, csrfToken, dprUser, nestedBaseUrl } = LocalsHelper.getValues(res)\n  const { reportId, id, tableId } = req.params\n  const url = parseUrl(req)\n\n  // Get the definition Data\n  const { query, filters, reportDefinition, dashboardDefinition } = await getDefinitionData({\n    req,\n    res,\n    services,\n  })\n\n  // Get the results data\n  const dashboardData: DashboardDataResponse[][] = await services.dashboardService.getAsyncDashboard(\n    token,\n    id,\n    reportId,\n    tableId,\n    query,\n  )\n\n  const flattenedData: DashboardDataResponse[] = dashboardData.flat()\n\n  // Get the dashboard parts\n  const sections: DashboardUISection[] = getSections(dashboardDefinition, flattenedData, query)\n\n  // Update the store\n  const dashboardRequestData = await updateStore(services, tableId, dprUser.id, sections, url, req, filters.filters)\n\n  return {\n    dashboardData: {\n      token,\n      id,\n      reportId,\n      name: dashboardDefinition.name,\n      description: dashboardDefinition.description,\n      reportName: reportDefinition.name,\n      bookmarked: await services.bookmarkService.isBookmarked(id, reportId, dprUser.id),\n      nestedBaseUrl,\n      csrfToken,\n      sections,\n      filters,\n      type: ReportType.DASHBOARD,\n      actions: setDashboardActions(dashboardDefinition, reportDefinition, dashboardRequestData),\n    },\n  }\n}\n\nexport default {\n  renderAsyncDashboard,\n}\n"],
-  "mappings": "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",
-  "names": ["utils_exports", "__export", "utils_default", "renderAsyncDashboard", "__toCommonJS", "import_parseurl", "import_types", "import_UserReports", "import_utils", "import_definitionUtils", "import_Scorecard", "import_ReportQuery", "import_localsHelper", "import_filtersTypeEnum", "setDashboardActions", "dashboardDefinition", "reportDefinition", "requestData", "reportName", "name", "actionsUrl", "executionId", "ReportActionsUtils", "getDefinitionData", "req", "res", "services", "next", "token", "LocalsHelper", "reportId", "id", "dataProductDefinitionsPath", "DefinitionUtils", "filtersData", "FilterUtils", "filtersQuery", "ReportQuery", "getSections", "dashboardData", "query", "section", "title", "description", "hasScorecard", "visualisations", "visDefinition", "type", "display", "visDescription", "visId", "data", "DashboardListUtils", "ScorecardVisualisation", "ChartUtils", "ScorecardsUtils", "updateStore", "tableId", "userId", "sections", "url", "filters", "dashboardRequestData", "UserReportsUtils", "csrfToken", "dprUser", "nestedBaseUrl", "parseUrl", "flattenedData"]
+  "sourcesContent": ["import parseUrl from 'parseurl'\nimport { Request } from 'express'\nimport { Services } from '../../../../../types/Services'\nimport {\n  DashboardSection,\n  DashboardVisualisation,\n  DashboardVisualisationType,\n} from '../../../../../components/_dashboards/dashboard-visualisation/types'\nimport type { AsyncReportUtilsParams } from '../../../../../types/AsyncReportUtils'\n\nimport type { DashboardDataResponse } from '../../../../../types/Metrics'\nimport type { RequestedReport } from '../../../../../types/UserReports'\nimport { ReportType } from '../../../../../types/UserReports'\nimport type { components } from '../../../../../types/api'\n\nimport ChartUtils from '../../../../../components/_charts/utils'\nimport DefinitionUtils from '../../../../../utils/definitionUtils'\nimport UserReportsUtils from '../../../../../components/user-reports/utils'\nimport DashboardListUtils from '../../../../../components/_dashboards/dashboard-list/utils'\nimport FilterUtils from '../../../../../components/_filters/utils'\nimport ScorecardsUtils from '../../../../../components/_dashboards/scorecard/utils'\nimport ScorecardVisualisation from '../../../../../components/_dashboards/scorecard/Scorecard'\nimport ReportActionsUtils from '../../../../../components/_reports/report-actions/utils'\nimport ReportQuery from '../../../../../types/ReportQuery'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport { FilterValue } from '../../../../../components/_filters/types'\nimport { FiltersType } from '../../../../../components/_filters/filtersTypeEnum'\n\nconst setDashboardActions = (\n  dashboardDefinition: components['schemas']['DashboardDefinition'],\n  reportDefinition: components['schemas']['ReportDefinitionSummary'],\n  requestData?: RequestedReport,\n) => {\n  const reportName = reportDefinition.name\n  const { name } = dashboardDefinition\n  const actionsUrl = requestData?.url?.request?.fullUrl\n  const executionId = requestData?.executionId\n\n  let actions = {}\n  if (actionsUrl) {\n    actions = {\n      share: {\n        reportName,\n        name,\n        url: actionsUrl,\n      },\n      copy: {\n        url: actionsUrl,\n      },\n    }\n    if (executionId) {\n      actions = {\n        ...actions,\n        refresh: {\n          url: actionsUrl,\n          executionId,\n        },\n      }\n    }\n  }\n\n  return ReportActionsUtils.getActions(actions)\n}\n\nconst getDefinitionData = async ({ req, res, services, next }: AsyncReportUtilsParams) => {\n  const { token } = LocalsHelper.getValues(res)\n  const { reportId, id } = req.params\n  const dataProductDefinitionsPath = <string>req.query.dataProductDefinitionsPath\n\n  // Dashboard Definition,\n  const dashboardDefinition: components['schemas']['DashboardDefinition'] =\n    await services.dashboardService.getDefinition(token, reportId, id, dataProductDefinitionsPath)\n\n  // Report summary data\n  const reportDefinition = await DefinitionUtils.getReportSummary(\n    reportId,\n    services.reportingService,\n    token,\n    <string>dataProductDefinitionsPath,\n  )\n\n  // Get the filters\n  const filtersData = await FilterUtils.getFilters({\n    fields: dashboardDefinition.filterFields || [],\n    req,\n    filtersType: FiltersType.INTERACTIVE,\n  })\n\n  const filtersQuery = FilterUtils.setRequestQueryFromFilterValues(filtersData.filters)\n\n  // Create the query\n  const query = new ReportQuery({\n    fields: dashboardDefinition.filterFields || [],\n    queryParams: filtersQuery,\n    definitionsPath: <string>dataProductDefinitionsPath,\n    reportType: ReportType.DASHBOARD,\n  }).toRecordWithFilterPrefix(true)\n\n  return {\n    query,\n    filters: filtersData,\n    dashboardDefinition,\n    reportDefinition,\n  }\n}\n\nconst getSections = (\n  dashboardDefinition: components['schemas']['DashboardDefinition'],\n  dashboardData: DashboardDataResponse[],\n  query: Record<string, string | string[]>,\n): DashboardSection[] => {\n  return dashboardDefinition.sections.map((section: components['schemas']['DashboardSectionDefinition']) => {\n    const { id, display: title, description } = section\n\n    let hasScorecard = false\n    const visualisations: DashboardVisualisation[] = section.visualisations.map(\n      (visDefinition: components['schemas']['DashboardVisualisationDefinition']) => {\n        const { type, display, description: visDescription, id: visId } = visDefinition\n\n        let data: DashboardVisualisation['data'] | undefined\n\n        switch (type) {\n          case DashboardVisualisationType.LIST:\n            data = DashboardListUtils.createList(visDefinition, dashboardData)\n            break\n\n          case DashboardVisualisationType.SCORECARD:\n            hasScorecard = true\n            data = new ScorecardVisualisation(dashboardData, visDefinition).build()\n            break\n\n          case DashboardVisualisationType.SCORECARD_GROUP:\n            data = new ScorecardVisualisation(dashboardData, visDefinition, true).build()\n            break\n\n          case DashboardVisualisationType.BAR:\n          case DashboardVisualisationType.LINE:\n          case DashboardVisualisationType.DONUT: {\n            data = ChartUtils.createChart(visDefinition, dashboardData)\n            break\n          }\n          case DashboardVisualisationType.MATRIX_TIMESERIES: {\n            data = ChartUtils.createMatrixChart(visDefinition, dashboardData, query)\n            break\n          }\n          case DashboardVisualisationType.BAR_TIMESERIES:\n          case DashboardVisualisationType.LINE_TIMESERIES: {\n            data = ChartUtils.createTimeseriesCharts(visDefinition, dashboardData)\n            break\n          }\n          default:\n            break\n        }\n\n        return {\n          id: visId,\n          title: display,\n          description: visDescription,\n          type,\n          data,\n        }\n      },\n    )\n\n    if (hasScorecard) ScorecardsUtils.mergeScorecardsIntoGroup(visualisations)\n\n    return { id, title, description, visualisations }\n  })\n}\n\nconst updateStore = async (\n  services: Services,\n  tableId: string,\n  userId: string,\n  sections: DashboardSection[],\n  req: Request,\n  filters: FilterValue[],\n): Promise<RequestedReport | undefined> => {\n  const { requestedReportService } = services\n  const dashboardRequestData = requestedReportService\n    ? await requestedReportService.getReportByTableId(tableId, userId)\n    : undefined\n\n  // Add to recently viewed\n  if (sections && sections.length && dashboardRequestData) {\n    UserReportsUtils.updateLastViewed({\n      services,\n      reportStateData: dashboardRequestData,\n      userId,\n      req,\n      filters,\n    })\n  }\n\n  return dashboardRequestData\n}\n\nexport const renderAsyncDashboard = async ({ req, res, services, next }: AsyncReportUtilsParams) => {\n  const { token, csrfToken, dprUser, nestedBaseUrl } = LocalsHelper.getValues(res)\n  const { reportId, id, tableId } = req.params\n  const { bookmarkService, requestedReportService } = services\n  const url = parseUrl(req)\n\n  // Get the definition Data\n  const { query, filters, reportDefinition, dashboardDefinition } = await getDefinitionData({\n    req,\n    res,\n    services,\n  })\n\n  // Get the results data\n  const dashboardData: DashboardDataResponse[][] = await services.dashboardService.getAsyncDashboard(\n    token,\n    id,\n    reportId,\n    tableId,\n    query,\n  )\n\n  const flattenedData: DashboardDataResponse[] = dashboardData.flat()\n\n  // Get the dashboard parts\n  const sections: DashboardSection[] = getSections(dashboardDefinition, flattenedData, query)\n\n  // Update the store\n  let dashboardRequestData\n  if (requestedReportService) {\n    dashboardRequestData = await updateStore(services, tableId, dprUser.id, sections, req, filters.filters)\n  }\n\n  return {\n    dashboardData: {\n      token,\n      id,\n      reportId,\n      name: dashboardDefinition.name,\n      description: dashboardDefinition.description,\n      reportName: reportDefinition.name,\n      bookmarked: bookmarkService ? await bookmarkService.isBookmarked(id, reportId, dprUser.id) : false,\n      nestedBaseUrl,\n      csrfToken,\n      sections,\n      filters,\n      type: ReportType.DASHBOARD,\n      actions: setDashboardActions(dashboardDefinition, reportDefinition, dashboardRequestData),\n    },\n  }\n}\n\nexport default {\n  renderAsyncDashboard,\n}\n"],
+  "mappings": "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",
+  "names": ["utils_exports", "__export", "utils_default", "renderAsyncDashboard", "__toCommonJS", "import_parseurl", "import_types", "import_UserReports", "import_utils", "import_definitionUtils", "import_Scorecard", "import_ReportQuery", "import_localsHelper", "import_filtersTypeEnum", "setDashboardActions", "dashboardDefinition", "reportDefinition", "requestData", "reportName", "name", "actionsUrl", "executionId", "actions", "ReportActionsUtils", "getDefinitionData", "req", "res", "services", "next", "token", "LocalsHelper", "reportId", "id", "dataProductDefinitionsPath", "DefinitionUtils", "filtersData", "FilterUtils", "filtersQuery", "ReportQuery", "getSections", "dashboardData", "query", "section", "title", "description", "hasScorecard", "visualisations", "visDefinition", "type", "display", "visDescription", "visId", "data", "DashboardListUtils", "ScorecardVisualisation", "ChartUtils", "ScorecardsUtils", "updateStore", "tableId", "userId", "sections", "filters", "requestedReportService", "dashboardRequestData", "UserReportsUtils", "csrfToken", "dprUser", "nestedBaseUrl", "bookmarkService", "url", "parseUrl", "flattenedData"]
 }

package/dpr/routes/journeys/view-report/async/dashboard/utils.ts

@@ -1,17 +1,13 @@
 import parseUrl from 'parseurl'
-import { Url } from 'url'
 import { Request } from 'express'
-import type { AsyncReportUtilsParams } from '../../../../../types/AsyncReportUtils'
-
+import { Services } from '../../../../../types/Services'
 import {
-  DashboardUIVisualisation,
+  DashboardSection,
+  DashboardVisualisation,
   DashboardVisualisationType,
-  ListVisualisation,
-  type DashboardDefinition,
-  type DashboardSection,
-  type DashboardUISection,
-  type DashboardVisualisation,
-} from '../../../../../components/_dashboards/dashboard/types'
+} from '../../../../../components/_dashboards/dashboard-visualisation/types'
+import type { AsyncReportUtilsParams } from '../../../../../types/AsyncReportUtils'
+
 import type { DashboardDataResponse } from '../../../../../types/Metrics'
 import type { RequestedReport } from '../../../../../types/UserReports'
 import { ReportType } from '../../../../../types/UserReports'
@@ -27,48 +23,53 @@ import ScorecardVisualisation from '../../../../../components/_dashboards/scorec
 import ReportActionsUtils from '../../../../../components/_reports/report-actions/utils'
 import ReportQuery from '../../../../../types/ReportQuery'
 import LocalsHelper from '../../../../../utils/localsHelper'
-import { Services } from '../../../../../types/Services'
 import { FilterValue } from '../../../../../components/_filters/types'
 import { FiltersType } from '../../../../../components/_filters/filtersTypeEnum'
 
 const setDashboardActions = (
-  dashboardDefinition: DashboardDefinition,
+  dashboardDefinition: components['schemas']['DashboardDefinition'],
   reportDefinition: components['schemas']['ReportDefinitionSummary'],
-  requestData: RequestedReport,
+  requestData?: RequestedReport,
 ) => {
   const reportName = reportDefinition.name
   const { name } = dashboardDefinition
-  const actionsUrl = requestData.url.request.fullUrl
-  const { executionId } = requestData
-
-  return ReportActionsUtils.getActions({
-    share: {
-      reportName,
-      name,
-      url: actionsUrl,
-    },
-    refresh: {
-      url: actionsUrl,
-      executionId,
-    },
-    copy: {
-      url: actionsUrl,
-    },
-  })
+  const actionsUrl = requestData?.url?.request?.fullUrl
+  const executionId = requestData?.executionId
+
+  let actions = {}
+  if (actionsUrl) {
+    actions = {
+      share: {
+        reportName,
+        name,
+        url: actionsUrl,
+      },
+      copy: {
+        url: actionsUrl,
+      },
+    }
+    if (executionId) {
+      actions = {
+        ...actions,
+        refresh: {
+          url: actionsUrl,
+          executionId,
+        },
+      }
+    }
+  }
+
+  return ReportActionsUtils.getActions(actions)
 }
 
 const getDefinitionData = async ({ req, res, services, next }: AsyncReportUtilsParams) => {
   const { token } = LocalsHelper.getValues(res)
   const { reportId, id } = req.params
-  const { dataProductDefinitionsPath } = req.query
+  const dataProductDefinitionsPath = <string>req.query.dataProductDefinitionsPath
 
   // Dashboard Definition,
-  const dashboardDefinition: DashboardDefinition = await services.dashboardService.getDefinition(
-    token,
-    reportId,
-    id,
-    dataProductDefinitionsPath,
-  )
+  const dashboardDefinition: components['schemas']['DashboardDefinition'] =
+    await services.dashboardService.getDefinition(token, reportId, id, dataProductDefinitionsPath)
 
   // Report summary data
   const reportDefinition = await DefinitionUtils.getReportSummary(
@@ -104,61 +105,62 @@ const getDefinitionData = async ({ req, res, services, next }: AsyncReportUtilsP
 }
 
 const getSections = (
-  dashboardDefinition: DashboardDefinition,
+  dashboardDefinition: components['schemas']['DashboardDefinition'],
   dashboardData: DashboardDataResponse[],
   query: Record<string, string | string[]>,
-): DashboardUISection[] => {
-  return dashboardDefinition.sections.map((section: DashboardSection) => {
+): DashboardSection[] => {
+  return dashboardDefinition.sections.map((section: components['schemas']['DashboardSectionDefinition']) => {
     const { id, display: title, description } = section
 
     let hasScorecard = false
-    const visualisations = section.visualisations.map((visDefinition: DashboardVisualisation) => {
-      const { type, display, description: visDescription, id: visId } = visDefinition
-
-      let data: DashboardUIVisualisation['data']
-
-      switch (type) {
-        case DashboardVisualisationType.LIST:
-          data = DashboardListUtils.createList(visDefinition as ListVisualisation, dashboardData)
-          break
-
-        case DashboardVisualisationType.SCORECARD:
-          hasScorecard = true
-          data = new ScorecardVisualisation(dashboardData, visDefinition).build()
-          break
-
-        case DashboardVisualisationType.SCORECARD_GROUP:
-          data = new ScorecardVisualisation(dashboardData, visDefinition, true).build()
-          break
-
-        case DashboardVisualisationType.BAR:
-        case DashboardVisualisationType.LINE:
-        case DashboardVisualisationType.DONUT: {
-          data = ChartUtils.createChart(visDefinition, dashboardData)
-          break
-        }
-        case DashboardVisualisationType.MATRIX:
-        case DashboardVisualisationType.MATRIX_TIMESERIES: {
-          data = ChartUtils.createMatrixChart(visDefinition, dashboardData, query)
-          break
+    const visualisations: DashboardVisualisation[] = section.visualisations.map(
+      (visDefinition: components['schemas']['DashboardVisualisationDefinition']) => {
+        const { type, display, description: visDescription, id: visId } = visDefinition
+
+        let data: DashboardVisualisation['data'] | undefined
+
+        switch (type) {
+          case DashboardVisualisationType.LIST:
+            data = DashboardListUtils.createList(visDefinition, dashboardData)
+            break
+
+          case DashboardVisualisationType.SCORECARD:
+            hasScorecard = true
+            data = new ScorecardVisualisation(dashboardData, visDefinition).build()
+            break
+
+          case DashboardVisualisationType.SCORECARD_GROUP:
+            data = new ScorecardVisualisation(dashboardData, visDefinition, true).build()
+            break
+
+          case DashboardVisualisationType.BAR:
+          case DashboardVisualisationType.LINE:
+          case DashboardVisualisationType.DONUT: {
+            data = ChartUtils.createChart(visDefinition, dashboardData)
+            break
+          }
+          case DashboardVisualisationType.MATRIX_TIMESERIES: {
+            data = ChartUtils.createMatrixChart(visDefinition, dashboardData, query)
+            break
+          }
+          case DashboardVisualisationType.BAR_TIMESERIES:
+          case DashboardVisualisationType.LINE_TIMESERIES: {
+            data = ChartUtils.createTimeseriesCharts(visDefinition, dashboardData)
+            break
+          }
+          default:
+            break
         }
-        case DashboardVisualisationType.BAR_TIMESERIES:
-        case DashboardVisualisationType.LINE_TIMESERIES: {
-          data = ChartUtils.createTimeseriesCharts(visDefinition, dashboardData)
-          break
-        }
-        default:
-          break
-      }
 
-      return {
-        id: visId,
-        title: display,
-        description: visDescription,
-        type,
-        data,
-      }
-    })
+        return {
+          id: visId,
+          title: display,
+          description: visDescription,
+          type,
+          data,
+        }
+      },
+    )
 
     if (hasScorecard) ScorecardsUtils.mergeScorecardsIntoGroup(visualisations)
 
@@ -170,15 +172,14 @@ const updateStore = async (
   services: Services,
   tableId: string,
   userId: string,
-  sections: DashboardUISection[],
-  url: Url,
+  sections: DashboardSection[],
   req: Request,
   filters: FilterValue[],
-) => {
-  const dashboardRequestData: RequestedReport = await services.requestedReportService.getReportByTableId(
-    tableId,
-    userId,
-  )
+): Promise<RequestedReport | undefined> => {
+  const { requestedReportService } = services
+  const dashboardRequestData = requestedReportService
+    ? await requestedReportService.getReportByTableId(tableId, userId)
+    : undefined
 
   // Add to recently viewed
   if (sections && sections.length && dashboardRequestData) {
@@ -197,6 +198,7 @@ const updateStore = async (
 export const renderAsyncDashboard = async ({ req, res, services, next }: AsyncReportUtilsParams) => {
   const { token, csrfToken, dprUser, nestedBaseUrl } = LocalsHelper.getValues(res)
   const { reportId, id, tableId } = req.params
+  const { bookmarkService, requestedReportService } = services
   const url = parseUrl(req)
 
   // Get the definition Data
@@ -218,10 +220,13 @@ export const renderAsyncDashboard = async ({ req, res, services, next }: AsyncRe
   const flattenedData: DashboardDataResponse[] = dashboardData.flat()
 
   // Get the dashboard parts
-  const sections: DashboardUISection[] = getSections(dashboardDefinition, flattenedData, query)
+  const sections: DashboardSection[] = getSections(dashboardDefinition, flattenedData, query)
 
   // Update the store
-  const dashboardRequestData = await updateStore(services, tableId, dprUser.id, sections, url, req, filters.filters)
+  let dashboardRequestData
+  if (requestedReportService) {
+    dashboardRequestData = await updateStore(services, tableId, dprUser.id, sections, req, filters.filters)
+  }
 
   return {
     dashboardData: {
@@ -231,7 +236,7 @@ export const renderAsyncDashboard = async ({ req, res, services, next }: AsyncRe
       name: dashboardDefinition.name,
       description: dashboardDefinition.description,
       reportName: reportDefinition.name,
-      bookmarked: await services.bookmarkService.isBookmarked(id, reportId, dprUser.id),
+      bookmarked: bookmarkService ? await bookmarkService.isBookmarked(id, reportId, dprUser.id) : false,
       nestedBaseUrl,
       csrfToken,
       sections,

package/dpr/routes/journeys/view-report/async/report/controller.js

@@ -1,2 +1,2 @@
-var f=Object.create;var o=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var w=Object.getOwnPropertyNames;var E=Object.getPrototypeOf,S=Object.prototype.hasOwnProperty;var b=(t,e)=>{for(var r in e)o(t,r,{get:e[r],enumerable:!0})},d=(t,e,r,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let a of w(e))!S.call(t,a)&&a!==r&&o(t,a,{get:()=>e[a],enumerable:!(s=R(e,a))||s.enumerable});return t};var p=(t,e,r)=>(r=t!=null?f(E(t)):{},d(e||!t||!t.__esModule?o(r,"default",{value:t,enumerable:!0}):r,t)),H=t=>d(o({},"__esModule",{value:!0}),t);var P={};b(P,{ViewAyncReportController:()=>y,default:()=>I});module.exports=H(P);var m=p(require("../../../../../components/error-summary/utils")),u=p(require("../../../../../utils/localsHelper")),h=p(require("./utils")),n=p(require("../../utils"));class y{constructor(e,r){this.GET=async(e,r,s)=>{const{type:a}=e.params;try{const l={req:e,res:r,services:this.services,next:s},i=await h.default.renderReport(l);r.render("dpr/routes/journeys/view-report/report",{layoutPath:this.layoutPath,...i})}catch(l){const i=m.default.handleError(l,e.params.type);let c;if(i.status==="EXPIRED"){const{dprUser:v}=u.default.getValues(r);c=await this.services.recentlyViewedService.asyncSetToExpiredByTableId(e.params.tableId,v.id)}e.body.title=`Failed to retrieve ${a}`,e.body.error=i,c&&(e.body.refreshLink=c),s()}};this.applyFilters=async(e,r,s)=>{await n.default.applyReportInteractiveQuery(e,r,this.services,"filters")};this.applyColumns=async(e,r,s)=>{await n.default.applyReportInteractiveQuery(e,r,this.services,"columns")};this.layoutPath=e,this.services=r}}var I=y;0&&(module.exports={ViewAyncReportController});
+var R=Object.create;var i=Object.defineProperty;var w=Object.getOwnPropertyDescriptor;var E=Object.getOwnPropertyNames;var S=Object.getPrototypeOf,b=Object.prototype.hasOwnProperty;var H=(t,r)=>{for(var e in r)i(t,e,{get:r[e],enumerable:!0})},m=(t,r,e,s)=>{if(r&&typeof r=="object"||typeof r=="function")for(let o of E(r))!b.call(t,o)&&o!==e&&i(t,o,{get:()=>r[o],enumerable:!(s=w(r,o))||s.enumerable});return t};var p=(t,r,e)=>(e=t!=null?R(S(t)):{},m(r||!t||!t.__esModule?i(e,"default",{value:t,enumerable:!0}):e,t)),I=t=>m(i({},"__esModule",{value:!0}),t);var x={};H(x,{ViewAyncReportController:()=>y,default:()=>P});module.exports=I(x);var u=p(require("../../../../../components/error-summary/utils")),h=p(require("../../../../../utils/localsHelper")),v=p(require("./utils")),n=p(require("../../utils"));class y{constructor(r,e){this.GET=async(r,e,s)=>{const{type:o}=r.params;try{const c={req:r,res:e,services:this.services,next:s},a=await v.default.renderReport(c);e.render("dpr/routes/journeys/view-report/report",{layoutPath:this.layoutPath,...a})}catch(c){const a=u.default.handleError(c,r.params.type);let l;const{recentlyViewedService:d}=this.services;if(a.status==="EXPIRED"&&d){const{dprUser:f}=h.default.getValues(e);l=await d.asyncSetToExpiredByTableId(r.params.tableId,f.id)}r.body.title=`Failed to retrieve ${o}`,r.body.error=a,l&&(r.body.refreshLink=l),s()}};this.applyFilters=async(r,e,s)=>{await n.default.applyReportInteractiveQuery(r,e,this.services,"filters")};this.applyColumns=async(r,e,s)=>{await n.default.applyReportInteractiveQuery(r,e,this.services,"columns")};this.layoutPath=r,this.services=e}}var P=y;0&&(module.exports={ViewAyncReportController});
 //# sourceMappingURL=controller.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/dpr/routes/journeys/view-report/async/report/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../../types/Services'\nimport ErrorSummaryUtils from '../../../../../components/error-summary/utils'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport AsyncReportUtils from './utils'\nimport ViewReportUtils from '../../utils'\n\nclass ViewAyncReportController {\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    const { type } = req.params\n    try {\n      const params = { req, res, services: this.services, next }\n\n      const renderData = await AsyncReportUtils.renderReport(params)\n\n      res.render(`dpr/routes/journeys/view-report/report`, {\n        layoutPath: this.layoutPath,\n        ...renderData,\n      })\n    } catch (error) {\n      const dprError = ErrorSummaryUtils.handleError(error, req.params.type)\n      let refreshLink\n      if (dprError.status === 'EXPIRED') {\n        const { dprUser } = LocalsHelper.getValues(res)\n        refreshLink = await this.services.recentlyViewedService.asyncSetToExpiredByTableId(\n          req.params.tableId,\n          dprUser.id,\n        )\n      }\n      req.body.title = `Failed to retrieve ${type}`\n      req.body.error = dprError\n      if (refreshLink) {\n        req.body.refreshLink = refreshLink\n      }\n      next()\n    }\n  }\n\n  applyFilters: RequestHandler = async (req, res, next) => {\n    await ViewReportUtils.applyReportInteractiveQuery(req, res, this.services, 'filters')\n  }\n\n  applyColumns: RequestHandler = async (req, res, next) => {\n    await ViewReportUtils.applyReportInteractiveQuery(req, res, this.services, 'columns')\n  }\n}\n\nexport { ViewAyncReportController }\nexport default ViewAyncReportController\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,8BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAA8B,4DAC9BC,EAAyB,gDACzBD,EAA6B,sBAC7BA,EAA4B,0BAE5B,MAAMH,CAAyB,CAK7B,YAAYK,EAAoBC,EAAoB,CAKpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,KAAM,CAAE,KAAAC,CAAK,EAAIH,EAAI,OACrB,GAAI,CACF,MAAMI,EAAS,CAAE,IAAAJ,EAAK,IAAAC,EAAK,SAAU,KAAK,SAAU,KAAAC,CAAK,EAEnDG,EAAa,MAAM,EAAAC,QAAiB,aAAaF,CAAM,EAE7DH,EAAI,OAAO,yCAA0C,CACnD,WAAY,KAAK,WACjB,GAAGI,CACL,CAAC,CACH,OAASE,EAAO,CACd,MAAMC,EAAW,EAAAC,QAAkB,YAAYF,EAAOP,EAAI,OAAO,IAAI,EACrE,IAAIU,EACJ,GAAIF,EAAS,SAAW,UAAW,CACjC,KAAM,CAAE,QAAAG,CAAQ,EAAI,EAAAC,QAAa,UAAUX,CAAG,EAC9CS,EAAc,MAAM,KAAK,SAAS,sBAAsB,2BACtDV,EAAI,OAAO,QACXW,EAAQ,EACV,CACF,CACAX,EAAI,KAAK,MAAQ,sBAAsBG,CAAI,GAC3CH,EAAI,KAAK,MAAQQ,EACbE,IACFV,EAAI,KAAK,YAAcU,GAEzBR,EAAK,CACP,CACF,EAEA,kBAA+B,MAAOF,EAAKC,EAAKC,IAAS,CACvD,MAAM,EAAAW,QAAgB,4BAA4Bb,EAAKC,EAAK,KAAK,SAAU,SAAS,CACtF,EAEA,kBAA+B,MAAOD,EAAKC,EAAKC,IAAS,CACvD,MAAM,EAAAW,QAAgB,4BAA4Bb,EAAKC,EAAK,KAAK,SAAU,SAAS,CACtF,EAxCE,KAAK,WAAaH,EAClB,KAAK,SAAWC,CAClB,CAuCF,CAGA,IAAOL,EAAQD",
-  "names": ["controller_exports", "__export", "ViewAyncReportController", "controller_default", "__toCommonJS", "import_utils", "import_localsHelper", "layoutPath", "services", "req", "res", "next", "type", "params", "renderData", "AsyncReportUtils", "error", "dprError", "ErrorSummaryUtils", "refreshLink", "dprUser", "LocalsHelper", "ViewReportUtils"]
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../../types/Services'\nimport ErrorSummaryUtils from '../../../../../components/error-summary/utils'\nimport LocalsHelper from '../../../../../utils/localsHelper'\nimport AsyncReportUtils from './utils'\nimport ViewReportUtils from '../../utils'\n\nclass ViewAyncReportController {\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    const { type } = req.params\n    try {\n      const params = { req, res, services: this.services, next }\n\n      const renderData = await AsyncReportUtils.renderReport(params)\n\n      res.render(`dpr/routes/journeys/view-report/report`, {\n        layoutPath: this.layoutPath,\n        ...renderData,\n      })\n    } catch (error) {\n      const dprError = ErrorSummaryUtils.handleError(<Error>error, req.params.type)\n      let refreshLink\n      const { recentlyViewedService } = this.services\n      if (dprError.status === 'EXPIRED' && recentlyViewedService) {\n        const { dprUser } = LocalsHelper.getValues(res)\n        refreshLink = await recentlyViewedService.asyncSetToExpiredByTableId(req.params.tableId, dprUser.id)\n      }\n      req.body.title = `Failed to retrieve ${type}`\n      req.body.error = dprError\n      if (refreshLink) {\n        req.body.refreshLink = refreshLink\n      }\n      next()\n    }\n  }\n\n  applyFilters: RequestHandler = async (req, res, next) => {\n    await ViewReportUtils.applyReportInteractiveQuery(req, res, this.services, 'filters')\n  }\n\n  applyColumns: RequestHandler = async (req, res, next) => {\n    await ViewReportUtils.applyReportInteractiveQuery(req, res, this.services, 'columns')\n  }\n}\n\nexport { ViewAyncReportController }\nexport default ViewAyncReportController\n"],
+  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,8BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAA8B,4DAC9BC,EAAyB,gDACzBD,EAA6B,sBAC7BA,EAA4B,0BAE5B,MAAMH,CAAyB,CAK7B,YAAYK,EAAoBC,EAAoB,CAKpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,KAAM,CAAE,KAAAC,CAAK,EAAIH,EAAI,OACrB,GAAI,CACF,MAAMI,EAAS,CAAE,IAAAJ,EAAK,IAAAC,EAAK,SAAU,KAAK,SAAU,KAAAC,CAAK,EAEnDG,EAAa,MAAM,EAAAC,QAAiB,aAAaF,CAAM,EAE7DH,EAAI,OAAO,yCAA0C,CACnD,WAAY,KAAK,WACjB,GAAGI,CACL,CAAC,CACH,OAASE,EAAO,CACd,MAAMC,EAAW,EAAAC,QAAkB,YAAmBF,EAAOP,EAAI,OAAO,IAAI,EAC5E,IAAIU,EACJ,KAAM,CAAE,sBAAAC,CAAsB,EAAI,KAAK,SACvC,GAAIH,EAAS,SAAW,WAAaG,EAAuB,CAC1D,KAAM,CAAE,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUZ,CAAG,EAC9CS,EAAc,MAAMC,EAAsB,2BAA2BX,EAAI,OAAO,QAASY,EAAQ,EAAE,CACrG,CACAZ,EAAI,KAAK,MAAQ,sBAAsBG,CAAI,GAC3CH,EAAI,KAAK,MAAQQ,EACbE,IACFV,EAAI,KAAK,YAAcU,GAEzBR,EAAK,CACP,CACF,EAEA,kBAA+B,MAAOF,EAAKC,EAAKC,IAAS,CACvD,MAAM,EAAAY,QAAgB,4BAA4Bd,EAAKC,EAAK,KAAK,SAAU,SAAS,CACtF,EAEA,kBAA+B,MAAOD,EAAKC,EAAKC,IAAS,CACvD,MAAM,EAAAY,QAAgB,4BAA4Bd,EAAKC,EAAK,KAAK,SAAU,SAAS,CACtF,EAtCE,KAAK,WAAaH,EAClB,KAAK,SAAWC,CAClB,CAqCF,CAGA,IAAOL,EAAQD",
+  "names": ["controller_exports", "__export", "ViewAyncReportController", "controller_default", "__toCommonJS", "import_utils", "import_localsHelper", "layoutPath", "services", "req", "res", "next", "type", "params", "renderData", "AsyncReportUtils", "error", "dprError", "ErrorSummaryUtils", "refreshLink", "recentlyViewedService", "dprUser", "LocalsHelper", "ViewReportUtils"]
 }

package/dpr/routes/journeys/view-report/async/report/controller.ts

@@ -27,14 +27,12 @@ class ViewAyncReportController {
         ...renderData,
       })
     } catch (error) {
-      const dprError = ErrorSummaryUtils.handleError(error, req.params.type)
+      const dprError = ErrorSummaryUtils.handleError(<Error>error, req.params.type)
       let refreshLink
-      if (dprError.status === 'EXPIRED') {
+      const { recentlyViewedService } = this.services
+      if (dprError.status === 'EXPIRED' && recentlyViewedService) {
         const { dprUser } = LocalsHelper.getValues(res)
-        refreshLink = await this.services.recentlyViewedService.asyncSetToExpiredByTableId(
-          req.params.tableId,
-          dprUser.id,
-        )
+        refreshLink = await recentlyViewedService.asyncSetToExpiredByTableId(req.params.tableId, dprUser.id)
       }
       req.body.title = `Failed to retrieve ${type}`
       req.body.error = dprError