@ministryofjustice/hmpps-digital-prison-reporting-frontend 3.37.0 → 3.37.2

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

@@ -66,7 +66,7 @@ const initDataSources = ({ req, services, token, userId, }) => {
             }).toRecordWithFilterPrefix(true);
             const { tableId: childTableId } = requestedReport.childExecutionData.find((e) => e.variantId === childVariant.id);
             return services.reportingService
-                .getAsyncReport(token, reportId, reportVariantId, childTableId, query)
+                .getAsyncReport(token, reportId, childVariant.id, childTableId, query)
                 .then((data) => ({
                 id: childVariant.id,
                 data,

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

@@ -102,7 +102,7 @@ export const initDataSources = ({
         )
 
         return services.reportingService
-          .getAsyncReport(token, reportId, reportVariantId, childTableId, query)
+          .getAsyncReport(token, reportId, childVariant.id, childTableId, query)
           .then((data: Array<Dict<string>>) => ({
             id: childVariant.id,
             data,

package/dpr/utils/RequestReportUtils.ts

@@ -38,7 +38,7 @@ export const updateStore = async ({
   services: Services
   queryData?: SetQueryFromFiltersResult
   executionData: ExecutionData
-  childExecutionData: Array<ExecutionData>
+  childExecutionData: Array<ChildReportExecutionData>
 }): Promise<string> => {
   const { search, id, type } = req.body
   const userId = res.locals.user?.uuid ? res.locals.user.uuid : 'userId'
@@ -129,7 +129,7 @@ const requestReport = async ({
   reportingService: ReportingService
 }): Promise<{
   executionData: ExecutionData
-  childExecutionData: Array<ExecutionData>
+  childExecutionData: Array<ChildReportExecutionData>
   queryData: SetQueryFromFiltersResult
 }> => {
   const { reportId, id, dataProductDefinitionsPath } = req.body
@@ -183,7 +183,7 @@ const requestDashboard = async ({
   token: string
   dashboardService: DashboardService
   reportingService: ReportingService
-}): Promise<{ executionData: ExecutionData; childExecutionData: Array<ExecutionData> }> => {
+}): Promise<{ executionData: ExecutionData; childExecutionData: Array<ChildReportExecutionData> }> => {
   const { reportId, id, dataProductDefinitionsPath } = req.body
   const { executionId, tableId } = await dashboardService.requestAsyncDashboard(token, reportId, id, {
     dataProductDefinitionsPath,
@@ -260,7 +260,7 @@ export default {
     const { type } = req.body
 
     let executionData: ExecutionData
-    let childExecutionData: Array<ExecutionData>
+    let childExecutionData: Array<ChildReportExecutionData>
     let queryData: SetQueryFromFiltersResult
 
     const requestArgs = {

package/dpr/utils/UserStoreItemBuilder.ts

@@ -11,7 +11,7 @@ import Dict = NodeJS.Dict
 import { getDpdPathSuffix } from './urlHelper'
 import { SetQueryFromFiltersResult } from '../components/_async/async-filters-form/types'
 import { DashboardMetricDefinition } from '../types/Dashboards'
-import { ExecutionData } from '../types/ExecutionData'
+import { ChildReportExecutionData, ExecutionData } from '../types/ExecutionData'
 
 export default class UserStoreItemBuilder {
   userStoreItem: UserReportData
@@ -79,7 +79,7 @@ export default class UserStoreItemBuilder {
     return this
   }
 
-  addChildExecutionData = (childExecutionData: Array<ExecutionData>) => {
+  addChildExecutionData = (childExecutionData: Array<ChildReportExecutionData>) => {
     this.userStoreItem = {
       ...this.userStoreItem,
       childExecutionData,

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.37.0",
+  "version": "3.37.2",
   "main": "dpr/assets/js/all.mjs",
   "sass": "dpr/all.scss",
   "engines": {