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

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

@@ -1,8 +1,8 @@
 import parseUrl from 'parseurl'
 import { Url } from 'url'
 import { Request, Response } from 'express'
-import definitionUtils from '../../../../../utils/definitionUtils'
-import Dict = NodeJS.Dict
+
+// Types
 import type { Columns } from '../../../../../components/_reports/report-columns-form/types'
 import type { AsyncReportUtilsParams } from '../../../../../types/AsyncReportUtils'
 import type { DataTable } from '../../../../../utils/DataTableBuilder/types'
@@ -10,9 +10,14 @@ import type { components } from '../../../../../types/api'
 import type { AsyncSummary, RequestedReport } from '../../../../../types/UserReports'
 import { LoadType, ReportType } from '../../../../../types/UserReports'
 import ReportQuery from '../../../../../types/ReportQuery'
+import type { ChildData } from '../../../../../utils/ParentChildDataTableBuilder/types'
+import type { ExtractedDefinitionData, ExtractedRequestData, ReportUrls } from './types'
+import type { DownloadActionParams } from '../../../../../components/_reports/report-actions/types'
+import { FiltersType } from '../../../../../components/_filters/filtersTypeEnum'
+import type { Services } from '../../../../../types/Services'
 
-import CollatedSummaryBuilder from '../../../../../utils/CollatedSummaryBuilder/CollatedSummaryBuilder'
-
+// Utils
+import definitionUtils from '../../../../../utils/definitionUtils'
 import PaginationUtils from '../../../../../components/_reports/report-pagination/utils'
 import TotalsUtils from '../../../../../components/_reports/report-totals/utils'
 import ReportFiltersUtils from '../../../../../components/_filters/utils'
@@ -20,11 +25,10 @@ import ColumnUtils from '../../../../../components/_reports/report-columns-form/
 import ReportActionsUtils from '../../../../../components/_reports/report-actions/utils'
 import UserReportsUtils from '../../../../../components/user-reports/utils'
 import LocalsHelper from '../../../../../utils/localsHelper'
-import { DownloadActionParams } from '../../../../../components/_reports/report-actions/types'
-import { Services } from '../../../../../types/Services'
-import { ChildData } from '../../../../../utils/ParentChildDataTableBuilder/types'
 import DataTableUtils from '../../../../../components/_reports/report-data-table/utils'
-import { FiltersType } from '../../../../../components/_filters/filtersTypeEnum'
+import RequestedReportService from '../../../my-reports/requested-reports/service'
+
+import CollatedSummaryBuilder from '../../../../../utils/CollatedSummaryBuilder/CollatedSummaryBuilder'
 
 export const getData = async ({
   res,
@@ -40,28 +44,35 @@ export const getData = async ({
   // Get the definition
   const definition: components['schemas']['SingleVariantReportDefinition'] =
     await services.reportingService.getDefinition(token, reportId, reportVariantId, definitionPath)
+  const { variant } = definition
+  const { specification } = variant
+
+  if (!specification) {
+    throw new Error('No specification found in variant definition')
+  }
 
   // Get the request data
-  const requestData: RequestedReport = await services.requestedReportService.getReportByTableId(tableId, userId)
+  const requestedReportService = <RequestedReportService>services.requestedReportService
+  const requestData: RequestedReport | undefined = await requestedReportService.getReportByTableId(tableId, userId)
 
   // Get the columns
-  const columns = ColumnUtils.getColumns(definition.variant.specification, req)
+  const columns = ColumnUtils.getColumns(specification, req)
 
   // initialise report query
-  const reportQuery = await initReportQuery(definition, columns, res, req, requestData, services)
+  const reportQuery = await initReportQuery(definition, columns, res, req, services, requestData)
 
   // Get the reportData
-  const reportData = await getReportData({ definition, services, token, req, res, requestData, reportQuery })
+  const reportData = await getReportData({ definition, services, token, req, res, reportQuery })
 
   // Get the summary data, if applicable
-  const summariesData = !definition.variant.summaries
-    ? []
-    : await getSummariesData(definition, services, token, req, res)
+  const { summaries } = definition.variant
+  const summariesData = !summaries ? [] : await getSummariesData(summaries, services, token, req, res)
 
   // Get the child data, if applicable
-  const childData: ChildData[] = !definition.variant.childVariants
+  const { childVariants } = definition.variant
+  const childData: ChildData[] = !childVariants
     ? []
-    : await getChildData(definition, services, token, req, res, requestData)
+    : await getChildData(childVariants, services, token, req, res, requestData)
 
   return {
     definition,
@@ -79,8 +90,8 @@ const initReportQuery = async (
   columns: Columns,
   res: Response,
   req: Request,
-  requestData: RequestedReport,
   services: Services,
+  requestData?: RequestedReport,
 ) => {
   const { definitionsPath } = LocalsHelper.getValues(res)
   const fields = definitionUtils.getFields(definition)
@@ -95,8 +106,8 @@ const initReportQuery = async (
   })
 
   // Sort
-  const sortColumn = req.query?.sortColumn || requestData.query?.data?.sortColumn
-  const sortedAsc = req.query?.sortedAsc || requestData.query?.data?.sortedAsc
+  const sortColumn = req.query?.sortColumn || requestData?.query?.data?.sortColumn
+  const sortedAsc = req.query?.sortedAsc || requestData?.query?.data?.sortedAsc
 
   // Pagination
   const selectedPage = req.query?.selectedPage
@@ -128,7 +139,6 @@ const getReportData = async (args: {
   token: string
   req: Request
   res: Response
-  requestData: RequestedReport
   reportQuery: ReportQuery
 }) => {
   const { services, token, req, reportQuery } = args
@@ -145,7 +155,7 @@ const getReportData = async (args: {
 }
 
 export const getSummariesData = async (
-  reportDefinition: components['schemas']['SingleVariantReportDefinition'],
+  summaries: components['schemas']['ReportSummary'][],
   services: Services,
   token: string,
   req: Request,
@@ -156,7 +166,7 @@ export const getSummariesData = async (
   const reportVariantId = variantId || id
 
   return Promise.all(
-    reportDefinition.variant.summaries.map(async (summary) => {
+    summaries.map(async (summary) => {
       const summaryReport = await services.reportingService.getAsyncSummaryReport(
         token,
         reportId,
@@ -177,28 +187,38 @@ export const getSummariesData = async (
 }
 
 export const getChildData = async (
-  reportDefinition: components['schemas']['SingleVariantReportDefinition'],
+  childVariants: components['schemas']['ChildVariantDefinition'][],
   services: Services,
   token: string,
   req: Request,
   res: Response,
-  requestData: RequestedReport,
+  requestData?: RequestedReport,
 ): Promise<ChildData[]> => {
   const { definitionsPath: dataProductDefinitionsPath } = LocalsHelper.getValues(res)
   const { reportId } = req.params
-
+  const childExecutionData = requestData?.childExecutionData
+  if (!childExecutionData) {
+    throw new Error('getChildData: No execution data found for child variants')
+  }
   return Promise.all(
-    reportDefinition.variant.childVariants.map(async (childVariant) => {
+    childVariants.map(async (childVariant) => {
       const { specification } = childVariant
+      if (!specification) {
+        throw new Error('getChildData: No specification found in child variant definition')
+      }
 
       const query = new ReportQuery({
-        fields: specification.fields,
-        template: reportDefinition.variant.specification.template,
+        fields: specification?.fields || [],
+        template: specification.template,
         queryParams: req.query,
         definitionsPath: dataProductDefinitionsPath,
       }).toRecordWithFilterPrefix(true)
 
-      const { tableId: childTableId } = requestData.childExecutionData.find((e) => e.variantId === childVariant.id)
+      const childData = childExecutionData.find((e) => e.variantId === childVariant.id)
+      if (!childData) {
+        throw new Error('getChildData: No matching child execution data found')
+      }
+      const { tableId: childTableId } = childData
 
       const childReport = await services.reportingService.getAsyncReport(
         token,
@@ -250,11 +270,11 @@ export const renderReport = async ({ req, res, services }: AsyncReportUtilsParam
     res,
     services,
     definition,
-    requestData,
     summariesData,
     dataTable,
     columns,
     reportQuery,
+    requestData,
   )
 
   const renderData = {
@@ -262,7 +282,7 @@ export const renderReport = async ({ req, res, services }: AsyncReportUtilsParam
     dataTable,
   }
 
-  if (Object.keys(requestData).length) {
+  if (requestData && Object.keys(requestData).length) {
     UserReportsUtils.updateLastViewed({
       req,
       services,
@@ -280,19 +300,33 @@ const getTemplateData = async (
   res: Response,
   services: Services,
   definition: components['schemas']['SingleVariantReportDefinition'],
-  requestData: RequestedReport,
   summariesData: AsyncSummary[],
   dataTable: DataTable[],
   columns: Columns,
   reportQuery: ReportQuery,
+  requestData?: RequestedReport,
 ) => {
   const { nestedBaseUrl } = LocalsHelper.getValues(res)
+
+  // get url data
   const url = parseUrl(req)
-  const urls = setUrls(url, req)
+  if (!url) {
+    throw new Error('Unable to set url data from request')
+  }
+
+  const urls = url ? setUrls(url, req) : undefined
+
+  // get from definition
   const definitionData = extractDataFromDefinition(definition)
   const { fields, specification } = definitionData
-  const requestedData = extractDataFromRequest(requestData)
-  const count = await getCount(definition, requestData, services, res, reportQuery)
+
+  // get from requestedData
+  const requestedData = requestData ? extractDataFromRequest(requestData) : undefined
+
+  // Get the count
+  const count = await getCount(definition, services, res, req, reportQuery)
+
+  // Get the filters
   const filterData = await ReportFiltersUtils.getFilters({
     fields,
     req,
@@ -300,8 +334,12 @@ const getTemplateData = async (
     services,
     filtersType: FiltersType.INTERACTIVE,
   })
-  const features = await setFeatures(services, res, requestData, definition, columns, count, urls)
-  const meta = setMetaData(definition, res)
+
+  // Set the features
+  const features = await setFeatures(services, res, req, columns, count, definitionData, requestedData, urls)
+
+  // Set the extra meta data
+  const meta = setMetaData(res, req)
 
   let reportSummaries
   if (summariesData.length) {
@@ -311,7 +349,7 @@ const getTemplateData = async (
 
   let pagination
   let totals
-  if (meta.template === 'list') {
+  if (definitionData.template === 'list') {
     pagination = PaginationUtils.getPaginationData(url, count, req)
     const { pageSize, currentPage, totalRows } = pagination
     totals = TotalsUtils.getTotals(pageSize, currentPage, totalRows, dataTable[0].rowCount)
@@ -324,6 +362,7 @@ const getTemplateData = async (
     nestedBaseUrl,
     ...meta,
     ...features,
+    ...definitionData,
     ...requestedData,
     ...urls,
     ...(pagination && { pagination }),
@@ -338,32 +377,30 @@ const showColumns = (specification: components['schemas']['Specification']) => {
   return !['row-section', 'row-section-child', 'summary', 'summary-section'].includes(template)
 }
 
-const setMetaData = (definition: components['schemas']['SingleVariantReportDefinition'], res: Response) => {
-  const { classification } = definition.variant
-  const { template } = definition.variant.specification
+const setMetaData = (res: Response, req: Request) => {
   const { csrfToken } = LocalsHelper.getValues(res)
+  const { tableId, reportId, id } = req.params
 
   return {
     csrfToken,
-    classification,
-    template,
     loadType: LoadType.ASYNC,
     type: ReportType.REPORT,
+    tableId,
+    reportId,
+    id,
   }
 }
 
-const setUrls = (url: Url, req: Request) => {
+const setUrls = (url: Url, req: Request): ReportUrls => {
   const { search } = url
-  const pathname = url.search ? req.originalUrl.split(url.search)[0] : req.originalUrl
-  const reportUrl = pathname.replace('/download-disabled', '').replace('/download-disabled?', '')
-  const reportSearch = search
   const encodedSearch = search ? encodeURIComponent(search) : undefined
+  const pathname = search ? req.originalUrl.split(search)[0] : req.originalUrl
+  const reportUrl = pathname.replace('/download-disabled', '').replace('/download-disabled?', '')
 
   return {
     reportUrl,
-    reportSearch,
+    reportSearch: search || undefined,
     encodedSearch,
-    search,
     pathname,
   }
 }
@@ -371,154 +408,154 @@ const setUrls = (url: Url, req: Request) => {
 const setFeatures = async (
   services: Services,
   res: Response,
-  requestData: RequestedReport,
-  definition: components['schemas']['SingleVariantReportDefinition'],
+  req: Request,
   columns: Columns,
   count: number,
-  urls: Dict<string>,
+  definitionData: ExtractedDefinitionData,
+  requestData?: ExtractedRequestData,
+  urls?: ReportUrls,
 ) => {
   const { csrfToken, dprUser, bookmarkingEnabled, downloadingEnabled } = LocalsHelper.getValues(res)
-  const { reportId } = requestData
-  const id = requestData.variantId || requestData.id
-  const { variant } = definition
+  const { reportId, id } = req.params
+  const { downloadPermissionService, bookmarkService } = services
 
-  let canDownload
-  if (downloadingEnabled) {
-    canDownload = await services.downloadPermissionService.downloadEnabled(dprUser.id, reportId, id)
+  let canDownload = false
+  if (downloadingEnabled && downloadPermissionService) {
+    canDownload = await downloadPermissionService.downloadEnabled(dprUser.id, reportId, id)
   }
 
   let bookmarked
-  if (bookmarkingEnabled) {
-    bookmarked = await services.bookmarkService.isBookmarked(id, reportId, dprUser.id)
+  if (bookmarkingEnabled && bookmarkService) {
+    bookmarked = await bookmarkService.isBookmarked(id, reportId, dprUser.id)
   }
 
-  const actions = setActions(
-    csrfToken,
-    variant,
-    requestData,
-    columns,
-    canDownload,
-    count,
-    urls.pathname,
-    urls.search,
-    res,
-  )
-  const { printable } = variant
+  const actions = setActions(csrfToken, columns, canDownload, count, res, req, definitionData, requestData, urls)
 
   return {
     actions,
     canDownload,
     bookmarked,
-    printable,
   }
 }
 
 const getCount = async (
   definition: components['schemas']['SingleVariantReportDefinition'],
-  requestData: RequestedReport,
   services: Services,
   res: Response,
+  req: Request,
   reportQuery: ReportQuery,
 ) => {
   const { token } = LocalsHelper.getValues(res)
-  const { tableId, reportId } = requestData
-  const id = requestData.variantId || requestData.id
+  const { tableId, reportId, id } = req.params
 
   return !definition.variant.interactive
     ? services.reportingService.getAsyncCount(token, tableId)
     : services.reportingService.getAsyncInteractiveCount(token, tableId, reportId, id, reportQuery)
 }
 
-const extractDataFromDefinition = (definition: components['schemas']['SingleVariantReportDefinition']) => {
-  const { variant } = definition
-  const { classification, printable, specification } = variant
+const extractDataFromDefinition = (
+  definition: components['schemas']['SingleVariantReportDefinition'],
+): ExtractedDefinitionData => {
+  const { variant, name: reportName, description: reportDescription } = definition
+  const { classification, printable, specification, name, description } = variant
+  if (!specification) {
+    throw new Error('No specification found in variant definition')
+  }
   const { template, fields } = specification
-  const { interactive } = <components['schemas']['VariantDefinition'] & { interactive?: boolean }>variant
 
   return {
+    reportName,
+    name,
+    description: description || reportDescription,
     classification,
-    printable,
+    printable: Boolean(printable),
     specification,
     template,
-    interactive,
     fields,
-    variant,
   }
 }
 
-const extractDataFromRequest = (requestData: RequestedReport) => {
+const extractDataFromRequest = (requestData: RequestedReport): ExtractedRequestData => {
+  const { query, url, timestamp } = requestData
+
   return {
-    reportName: requestData.reportName,
-    name: requestData.name,
-    description: requestData.description,
-    requestedTimestamp: new Date(requestData.timestamp.requested).toLocaleString(),
-    reportId: requestData.reportId,
-    tableId: requestData.tableId,
-    id: requestData.variantId || requestData.id,
     executionId: requestData.executionId,
-    querySummary: requestData.query.summary,
-    requestUrl: requestData.url.request,
-    defaultQuery: requestData.url.report.default,
+    requestedTimestamp: timestamp.requested ? new Date(timestamp.requested).toLocaleString() : undefined,
+    querySummary: query?.summary || [],
+    queryData: query?.data,
+    requestUrl: url?.request,
+    defaultQuery: url?.report?.default,
     dataProductDefinitionsPath: requestData.dataProductDefinitionsPath,
   }
 }
 
 const setActions = (
   csrfToken: string,
-  variant: components['schemas']['VariantDefinition'],
-  requestData: RequestedReport,
   columns: Columns,
   canDownload: boolean,
   count: number,
-  currentUrl: string,
-  currentQueryParams: string,
   res: Response,
+  req: Request,
+  definitionData: ExtractedDefinitionData,
+  requestData?: ExtractedRequestData,
+  urls?: ReportUrls,
 ) => {
-  const { reportName, name, id, variantId, reportId, tableId, executionId, dataProductDefinitionsPath, url, query } =
-    requestData
-  const { nestedBaseUrl } = LocalsHelper.getValues(res)
-  const requestUrl = url.request.fullUrl
-  const { printable } = variant
-  const ID = variantId || id
-
-  const downloadConfig: DownloadActionParams = {
-    enabled: count > 0 && canDownload !== undefined,
-    name,
-    reportName,
-    csrfToken,
-    reportId,
-    id: ID,
-    tableId,
-    columns: columns.value,
-    definitionPath: dataProductDefinitionsPath,
-    loadType: LoadType.ASYNC,
-    canDownload,
-    currentUrl,
-    currentQueryParams,
-    nestedBaseUrl,
-    ...(query?.data && {
-      sortColumn: <string>query.data.sortColumn,
-      sortedAsc: <string>query.data.sortedAsc,
-    }),
+  const { reportName, name, printable } = definitionData
+  const { tableId, id, reportId } = req.params
+  const { nestedBaseUrl, definitionsPath } = LocalsHelper.getValues(res)
+
+  // DownloadActionParams
+  let downloadConfig: DownloadActionParams | undefined
+  if (urls) {
+    downloadConfig = {
+      enabled: count > 0 && canDownload !== undefined,
+      name,
+      reportName,
+      csrfToken,
+      reportId,
+      id,
+      tableId,
+      columns: columns.value,
+      definitionPath: definitionsPath,
+      loadType: LoadType.ASYNC,
+      nestedBaseUrl,
+      canDownload,
+      currentUrl: urls.pathname,
+      currentQueryParams: urls.reportSearch,
+      ...(requestData?.queryData && {
+        sortColumn: <string>requestData.queryData.sortColumn,
+        sortedAsc: <string>requestData.queryData.sortedAsc,
+      }),
+    }
   }
 
-  const shareConfig = {
-    reportName,
-    name,
-    url: requestUrl,
+  let shareConfig
+  let copyConfig
+  if (requestData?.requestUrl?.fullUrl) {
+    shareConfig = {
+      reportName,
+      name,
+      url: requestData.requestUrl.fullUrl,
+    }
+    copyConfig = {
+      url: requestData.requestUrl.fullUrl,
+    }
   }
 
-  const refreshConfig = {
-    url: requestUrl,
-    executionId,
+  let refreshConfig
+  if (requestData?.executionId && requestData?.requestUrl?.fullUrl) {
+    refreshConfig = {
+      url: requestData.requestUrl.fullUrl,
+      executionId: requestData.executionId,
+    }
   }
 
   return ReportActionsUtils.getActions({
-    download: downloadConfig,
+    ...(downloadConfig && { download: downloadConfig }),
+    ...(shareConfig && { share: shareConfig }),
+    ...(refreshConfig && { refresh: refreshConfig }),
+    ...(copyConfig && { copy: copyConfig }),
     print: { enabled: printable },
-    share: shareConfig,
-    refresh: refreshConfig,
-    copy: { url: requestUrl },
   })
 }
 

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

@@ -1,2 +1,2 @@
-context("Platform sync tests",()=>{const t="/embedded/platform/";describe("Sync tests from the platform",()=>{before(()=>{cy.task("resetStubs"),cy.task("resetRedis"),cy.task("stubDefinitions"),cy.task("stubGetProductCollections"),cy.task("stubDefinitionSyncReport"),cy.task("stubRequestSuccessResult20"),cy.task("stubReportsFinishedStatus"),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:(s,e)=>e.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")})})});
+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")})})});
 //# 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": ["context('Platform sync tests', () => {\n  const path = '/embedded/platform/'\n\n  describe('Sync tests from the platform', () => {\n    before(() => {\n      cy.task('resetStubs')\n      cy.task('resetRedis')\n      cy.task('stubDefinitions')\n      cy.task('stubGetProductCollections')\n      cy.task('stubDefinitionSyncReport')\n      cy.task('stubRequestSuccessResult20')\n      cy.task('stubReportsFinishedStatus')\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 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,QAAQ,sBAAuB,IAAM,CACnC,MAAMA,EAAO,sBAEb,SAAS,+BAAgC,IAAM,CAC7C,OAAO,IAAM,CACX,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,iBAAiB,EACzB,GAAG,KAAK,2BAA2B,EACnC,GAAG,KAAK,0BAA0B,EAClC,GAAG,KAAK,4BAA4B,EACpC,GAAG,KAAK,2BAA2B,EACnC,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,IACDA,EAAQ,YAAY,SAAS,wBAAwB,CAEhE,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",
-  "names": ["path", "_", "element"]
+  "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 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,IACDA,EAAQ,YAAY,SAAS,wBAAwB,CAEhE,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",
+  "names": ["import_cypressUtils", "path", "_", "element"]
 }

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

@@ -1,15 +1,13 @@
+import { executeReportStubs } from '../../../../../../cypress-tests/cypressUtils'
+
 context('Platform sync tests', () => {
   const path = '/embedded/platform/'
 
   describe('Sync tests from the platform', () => {
     before(() => {
-      cy.task('resetStubs')
-      cy.task('resetRedis')
-      cy.task('stubDefinitions')
-      cy.task('stubGetProductCollections')
+      executeReportStubs()
       cy.task('stubDefinitionSyncReport')
       cy.task('stubRequestSuccessResult20')
-      cy.task('stubReportsFinishedStatus')
       cy.task('stubSyncRequestDataSuccess')
       cy.task('stubSyncRequestDataSuccessCount')
     })

package/dpr/services/dashboardService.js

@@ -1,2 +1,2 @@
-var h=Object.create;var a=Object.defineProperty;var D=Object.getOwnPropertyDescriptor;var b=Object.getOwnPropertyNames;var y=Object.getPrototypeOf,u=Object.prototype.hasOwnProperty;var l=(s,r)=>{for(var t in r)a(s,t,{get:r[t],enumerable:!0})},g=(s,r,t,n)=>{if(r&&typeof r=="object"||typeof r=="function")for(let i of b(r))!u.call(s,i)&&i!==t&&a(s,i,{get:()=>r[i],enumerable:!(n=D(r,i))||n.enumerable});return s};var m=(s,r,t)=>(t=s!=null?h(y(s)):{},g(r||!s||!s.__esModule?a(t,"default",{value:s,enumerable:!0}):t,s)),A=s=>g(a({},"__esModule",{value:!0}),s);var p={};l(p,{DashboardService:()=>o,default:()=>f});module.exports=A(p);var c=m(require("../utils/logger"));class o{constructor(r){this.dashboardClient=r;this.dashboardClient=r,c.default.info("Service created: DashboardService")}async getDefinition(r,t,n,i){return this.dashboardClient.getDefinition(r,n,t,i)}async requestAsyncDashboard(r,t,n,i){return this.dashboardClient.requestAsyncDashboard(r,t,n,i)}async cancelAsyncRequest(r,t,n,i,e){return this.dashboardClient.cancelAsyncRequest(r,t,n,i,e)}async getAsyncStatus(r,t,n,i,e,d){return this.dashboardClient.getAsyncStatus(r,t,n,i,e,d)}async getAsyncDashboard(r,t,n,i,e){return this.dashboardClient.getAsyncDashboard(r,n,t,i,e)}}var f=o;0&&(module.exports={DashboardService});
+var h=Object.create;var a=Object.defineProperty;var D=Object.getOwnPropertyDescriptor;var b=Object.getOwnPropertyNames;var m=Object.getPrototypeOf,l=Object.prototype.hasOwnProperty;var u=(t,s)=>{for(var r in s)a(t,r,{get:s[r],enumerable:!0})},g=(t,s,r,i)=>{if(s&&typeof s=="object"||typeof s=="function")for(let n of b(s))!l.call(t,n)&&n!==r&&a(t,n,{get:()=>s[n],enumerable:!(i=D(s,n))||i.enumerable});return t};var y=(t,s,r)=>(r=t!=null?h(m(t)):{},g(s||!t||!t.__esModule?a(r,"default",{value:t,enumerable:!0}):r,t)),p=t=>g(a({},"__esModule",{value:!0}),t);var A={};u(A,{DashboardService:()=>o,default:()=>f});module.exports=p(A);var c=y(require("../utils/logger"));class o{constructor(s){this.dashboardClient=s;this.dashboardClient=s,c.default.info("Service created: DashboardService")}async getDefinition(s,r,i,n){return this.dashboardClient.getDefinition(s,i,r,n)}async requestAsyncDashboard(s,r,i,n){return this.dashboardClient.requestAsyncDashboard(s,r,i,n)}async cancelAsyncRequest(s,r,i,n,e){return this.dashboardClient.cancelAsyncRequest(s,r,i,n,e)}async getAsyncStatus(s,r,i,n,e,d){return this.dashboardClient.getAsyncStatus(s,r,i,n,e,d)}async getAsyncDashboard(s,r,i,n,e){return this.dashboardClient.getAsyncDashboard(s,i,r,n,e)}}var f=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 { DashboardDefinition } from '../components/_dashboards/dashboard/types'\nimport Dict = NodeJS.Dict\nimport logger from '../utils/logger'\n\n/* eslint-disable @typescript-eslint/no-explicit-any */\nclass DashboardService {\n  constructor(private readonly dashboardClient: any) {\n    this.dashboardClient = dashboardClient\n    logger.info('Service created: DashboardService')\n  }\n\n  async getDefinition(\n    token: string,\n    dpdId: string,\n    id: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<DashboardDefinition> {\n    return this.dashboardClient.getDefinition(token, id, dpdId, dataProductDefinitionsPath)\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<Dict<string>> {\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: Dict<string | number>,\n  ): Promise<Array<Dict<string>>> {\n    return this.dashboardClient.getAsyncDashboard(token, reportId, dashboardId, tableId, query)\n  }\n}\n\nexport { DashboardService }\nexport default DashboardService\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,sBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAmB,8BAGnB,MAAMH,CAAiB,CACrB,YAA6BI,EAAsB,CAAtB,qBAAAA,EAC3B,KAAK,gBAAkBA,EACvB,EAAAC,QAAO,KAAK,mCAAmC,CACjD,CAEA,MAAM,cACJC,EACAC,EACAC,EACAC,EAC8B,CAC9B,OAAO,KAAK,gBAAgB,cAAcH,EAAOE,EAAID,EAAOE,CAA0B,CACxF,CAEA,MAAM,sBACJH,EACAI,EACAC,EACAC,EACuB,CACvB,OAAO,KAAK,gBAAgB,sBAAsBN,EAAOI,EAAUC,EAAaC,CAAK,CACvF,CAEA,MAAM,mBACJN,EACAI,EACAC,EACAE,EACAJ,EACuB,CACvB,OAAO,KAAK,gBAAgB,mBAC1BH,EACAI,EACAC,EACAE,EACAJ,CACF,CACF,CAEA,MAAM,eACJH,EACAI,EACAC,EACAE,EACAC,EACAL,EACuB,CACvB,OAAO,KAAK,gBAAgB,eAC1BH,EACAI,EACAC,EACAE,EACAC,EACAL,CACF,CACF,CAEA,MAAM,kBACJH,EACAK,EACAD,EACAI,EACAF,EAC8B,CAC9B,OAAO,KAAK,gBAAgB,kBAAkBN,EAAOI,EAAUC,EAAaG,EAASF,CAAK,CAC5F,CACF,CAGA,IAAOX,EAAQD",
+  "sourcesContent": ["import Dict = NodeJS.Dict\nimport logger from '../utils/logger'\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    logger.info('Service created: DashboardService')\n  }\n\n  async getDefinition(\n    token: string,\n    dpdId: string,\n    id: string,\n    dataProductDefinitionsPath?: string,\n  ): Promise<components['schemas']['DashboardDefinition']> {\n    return this.dashboardClient.getDefinition(token, id, dpdId, dataProductDefinitionsPath)\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<Dict<string>> {\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": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,sBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAAmB,8BAMnB,MAAMH,CAAiB,CACrB,YAA6BI,EAAkC,CAAlC,qBAAAA,EAC3B,KAAK,gBAAkBA,EACvB,EAAAC,QAAO,KAAK,mCAAmC,CACjD,CAEA,MAAM,cACJC,EACAC,EACAC,EACAC,EACuD,CACvD,OAAO,KAAK,gBAAgB,cAAcH,EAAOE,EAAID,EAAOE,CAA0B,CACxF,CAEA,MAAM,sBACJH,EACAI,EACAC,EACAC,EACuB,CACvB,OAAO,KAAK,gBAAgB,sBAAsBN,EAAOI,EAAUC,EAAaC,CAAK,CACvF,CAEA,MAAM,mBACJN,EACAI,EACAC,EACAE,EACAJ,EACuB,CACvB,OAAO,KAAK,gBAAgB,mBAC1BH,EACAI,EACAC,EACAE,EACAJ,CACF,CACF,CAEA,MAAM,eACJH,EACAI,EACAC,EACAE,EACAC,EACAL,EACuB,CACvB,OAAO,KAAK,gBAAgB,eAC1BH,EACAI,EACAC,EACAE,EACAC,EACAL,CACF,CACF,CAEA,MAAM,kBACJH,EACAK,EACAD,EACAI,EACAF,EACoC,CACpC,OAAO,KAAK,gBAAgB,kBAAkBN,EAAOI,EAAUC,EAAaG,EAASF,CAAK,CAC5F,CACF,CAGA,IAAOX,EAAQD",
   "names": ["dashboardService_exports", "__export", "DashboardService", "dashboardService_default", "__toCommonJS", "import_logger", "dashboardClient", "logger", "token", "dpdId", "id", "dataProductDefinitionsPath", "reportId", "dashboardId", "query", "executionId", "tableId"]
 }