@ministryofjustice/hmpps-digital-prison-reporting-frontend 3.8.2 → 3.8.4

package/dpr/components/async-card-group/utils.ts

@@ -1,12 +1,12 @@
 import AsyncReportStoreService from '../../services/requestedReportsService'
 import { AsyncReportData, RequestStatus } from '../../types/AsyncReport'
-import ReportingClient from '../../data/reportingClient'
 import { AsyncReportUtilsParams } from '../../types/AsyncReportUtils'
 import Dict = NodeJS.Dict
+import ReportingService from '../../services/reportingService'
 
 const formatCardData = async (
   requestedReportsData: AsyncReportData,
-  dataSources: ReportingClient,
+  dataSources: ReportingService,
   token: string,
   asyncReportsStore: AsyncReportStoreService,
 ): Promise<CardData> => {
@@ -71,7 +71,7 @@ const setDataFromStatus = (status: RequestStatus, requestedReportsData: AsyncRep
 
 const formatCards = async (
   asyncReportsStore: AsyncReportStoreService,
-  dataSources: ReportingClient,
+  dataSources: ReportingService,
   token: string,
 ): Promise<CardData[]> => {
   const requestedReportsData: AsyncReportData[] = await asyncReportsStore.getAllReports()

package/dpr/components/async-filters/utils.js

@@ -67,7 +67,7 @@ exports.default = {
             const { token } = res.locals.user || 'token';
             const { reportId, variantId } = req.params;
             const { dataProductDefinitionsPath: definitionPath } = req.query;
-            const definition = await dataSources.getDefinition(token, reportId, variantId);
+            const definition = await dataSources.getDefinition(token, reportId, variantId, definitionPath);
             const { name: reportName } = definition;
             const { name: variantName, description } = definition.variant;
             return {

package/dpr/components/async-filters/utils.ts

@@ -71,7 +71,7 @@ export default {
       const { token } = res.locals.user || 'token'
       const { reportId, variantId } = req.params
       const { dataProductDefinitionsPath: definitionPath } = req.query
-      const definition = await dataSources.getDefinition(token, reportId, variantId)
+      const definition = await dataSources.getDefinition(token, reportId, variantId, <string>definitionPath)
       const { name: reportName } = definition
       const { name: variantName, description } = definition.variant
 

package/dpr/components/async-report-list/utils.js

@@ -14,7 +14,7 @@ const initDataSources = ({ req, res, next, asyncReportsStore, dataSources }) =>
         const { token } = res.locals.user || 'token';
         const { reportId, reportVariantId, tableId } = req.params;
         const { selectedPage, pageSize, dataProductDefinitionsPath } = req.query;
-        const reportDefinitionPromise = dataSources.getDefinition(token, reportId, reportVariantId);
+        const reportDefinitionPromise = dataSources.getDefinition(token, reportId, reportVariantId, dataProductDefinitionsPath);
         const reportDataPromise = dataSources.getAsyncReport(token, reportId, reportVariantId, tableId, {
             selectedPage: +selectedPage,
             pageSize: +pageSize,

package/dpr/components/async-report-list/utils.ts

@@ -15,7 +15,12 @@ const initDataSources = ({ req, res, next, asyncReportsStore, dataSources }: Asy
     const { token } = res.locals.user || 'token'
     const { reportId, reportVariantId, tableId } = req.params
     const { selectedPage, pageSize, dataProductDefinitionsPath } = req.query
-    const reportDefinitionPromise = dataSources.getDefinition(token, reportId, reportVariantId)
+    const reportDefinitionPromise = dataSources.getDefinition(
+      token,
+      reportId,
+      reportVariantId,
+      <string>dataProductDefinitionsPath,
+    )
     const reportDataPromise = dataSources.getAsyncReport(token, reportId, reportVariantId, tableId, {
       selectedPage: +selectedPage,
       pageSize: +pageSize,

package/dpr/routes/asyncReports.ts

@@ -3,8 +3,8 @@ import type { Router } from 'express'
 import AsyncFiltersUtils from '../components/async-filters/utils'
 import AsyncReportListUtils from '../components/async-report-list/utils'
 import AsyncPollingUtils from '../components/async-polling/utils'
-import ReportingClient from '../data/reportingClient'
 import AsyncReportStoreService from '../services/requestedReportsService'
+import ReportingService from '../services/reportingService'
 
 export default function routes({
   router,
@@ -13,7 +13,7 @@ export default function routes({
 }: {
   router: Router
   asyncReportsStore: AsyncReportStoreService
-  dataSources: ReportingClient
+  dataSources: ReportingService
 }) {
   // 1 - get filters for the report + make request
   router.get('/async-reports/:reportId/:variantId/request', async (req, res, next) => {

package/dpr/services/reportingService.js

@@ -13,6 +13,9 @@ class ReportingService {
     async getDefinitions(token, dataProductDefinitionsPath) {
         return this.reportingClient.getDefinitions(token, dataProductDefinitionsPath);
     }
+    async getDefinition(token, reportId, variantId, dataProductDefinitionsPath) {
+        return this.reportingClient.getDefinition(token, reportId, variantId, dataProductDefinitionsPath);
+    }
     async requestAsyncReport(token, reportId, variantId, query) {
         return this.reportingClient.requestAsyncReport(token, reportId, variantId, query);
     }

package/dpr/services/reportingService.ts

@@ -21,6 +21,15 @@ export default class ReportingService {
     return this.reportingClient.getDefinitions(token, dataProductDefinitionsPath)
   }
 
+  async getDefinition(
+    token: string,
+    reportId: string,
+    variantId: string,
+    dataProductDefinitionsPath?: string,
+  ): Promise<components['schemas']['SingleVariantReportDefinition']> {
+    return this.reportingClient.getDefinition(token, reportId, variantId, dataProductDefinitionsPath)
+  }
+
   async requestAsyncReport(
     token: string,
     reportId: string,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ministryofjustice/hmpps-digital-prison-reporting-frontend",
   "description": "The Digital Prison Reporting Frontend contains templates and code to help display data effectively in UI applications.",
-  "version": "3.8.2",
+  "version": "3.8.4",
   "main": "dpr/assets/js/all.mjs",
   "sass": "dpr/all.scss",
   "engines": {