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

package/dpr/routes/journeys/api-failures.cy.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/dpr/routes/journeys/api-failures.cy.ts"],
+  "sourcesContent": ["import {\n  executeDashboardStubs,\n  executeReportStubs,\n  stubBaseTasks,\n  stubDefinitionsTasks,\n} from 'cypress-tests/cypressUtils'\n\ncontext('Try to run the app with failing and broken api endpoints', () => {\n  const path = '/embedded/platform/'\n\n  beforeEach(() => {\n    stubBaseTasks()\n  })\n\n  describe('erroring endpoints - reports', () => {\n    it('should cope with definitions list failing', () => {\n      executeReportStubs()\n      cy.task('stubDefinitionRequestExamplesSuccess')\n      cy.task('stubRequestSuccessResult20')\n      cy.task('getDefinitionSummariesFailure')\n\n      cy.visit(path)\n\n      cy.findByRole('heading', { name: /Sorry, there is a problem with the service/ }).should('be.visible')\n    })\n\n    it('should cope with definitions list being unauthd', () => {\n      executeReportStubs()\n      cy.task('stubDefinitionRequestExamplesSuccess')\n      cy.task('stubRequestSuccessResult20')\n      cy.task('getDefinitionSummariesUnauthenticatedFailure')\n\n      cy.visit(path)\n\n      cy.findByRole('heading', { name: /Sorry, there is a problem with authenticating your request/ }).should(\n        'be.visible',\n      )\n    })\n\n    it('should cope with single definition endpoint failing', () => {\n      executeReportStubs()\n      cy.task('stubDefinitionRequestExamplesSuccess')\n      cy.task('stubRequestSuccessResult20')\n      cy.task('getSingleDefinitionFailure')\n\n      cy.visit(path)\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              Boolean(element?.textContent?.includes('Successful Report')) &&\n              Boolean(element?.textContent?.includes('this will succeed'))\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request report' }).click()\n        })\n      })\n\n      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')\n    })\n\n    it('should cope with single definition failing', () => {\n      executeReportStubs()\n      cy.task('stubDefinitionRequestExamplesSuccess')\n      cy.task('stubRequestSuccessResult20')\n      cy.task('getSingleDefinitionFailure')\n\n      cy.visit(path)\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              Boolean(element?.textContent?.includes('Successful Report')) &&\n              Boolean(element?.textContent?.includes('this will succeed'))\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request report' }).click()\n        })\n      })\n\n      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')\n    })\n\n    it('should cope with single definition variant failing', () => {\n      executeReportStubs()\n      cy.task('stubDefinitionRequestExamplesSuccess')\n      cy.task('stubRequestSuccessResult20')\n      cy.task('getSingleDefinitionVariantFailure')\n\n      cy.visit(path)\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              Boolean(element?.textContent?.includes('Successful Report')) &&\n              Boolean(element?.textContent?.includes('this will succeed'))\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request report' }).click()\n        })\n      })\n\n      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')\n    })\n\n    it('should cope with count failing', () => {\n      executeReportStubs()\n      cy.task('stubDefinitionRequestExamplesSuccess')\n      cy.task('stubRequestSuccessResult20')\n      cy.task('getAsyncCountFailure')\n\n      cy.visit(path)\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              Boolean(element?.textContent?.includes('Successful Report')) &&\n              Boolean(element?.textContent?.includes('this will succeed'))\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request report' }).click()\n        })\n      })\n      cy.findByRole('button', { name: /Request/ }).click()\n\n      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')\n    })\n\n    it('should cope with requestAsyncReport failing', () => {\n      executeReportStubs()\n      cy.task('stubDefinitionRequestExamplesSuccess')\n      cy.task('stubRequestSuccessResult20')\n      cy.task('requestAsyncReportFailure')\n\n      cy.visit(path)\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              Boolean(element?.textContent?.includes('Successful Report')) &&\n              Boolean(element?.textContent?.includes('this will succeed'))\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request report' }).click()\n        })\n      })\n      cy.findByRole('button', { name: /Request/ }).click()\n\n      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')\n    })\n\n    it('should cope with cancelAsyncRequest failing', () => {\n      stubBaseTasks()\n      stubDefinitionsTasks()\n      cy.task('stubViewAsyncReportingResults')\n      cy.task('stubRequestSuccessReportTablesCount')\n      cy.task('stubAsyncRequestSuccessReportTablesCount')\n      cy.task('stubDefinitionRequestExamplesSuccess')\n      cy.task('stubRequestSuccessResult20')\n      cy.task('cancelAsyncRequestFailure')\n\n      cy.visit(path)\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              Boolean(element?.textContent?.includes('Successful Report')) &&\n              Boolean(element?.textContent?.includes('this will succeed'))\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request report' }).click()\n        })\n      })\n      cy.findByRole('button', { name: /Request/ }).click()\n\n      cy.findByRole('button', { name: /Cancel request/ }).click()\n\n      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')\n    })\n\n    it('should cope with getAsyncReport failing', () => {\n      executeReportStubs()\n      cy.task('stubDefinitionRequestExamplesSuccess')\n      cy.task('stubRequestSuccessResult20')\n      cy.task('getAsyncReportFailure')\n\n      cy.visit(path)\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              Boolean(element?.textContent?.includes('Successful Report')) &&\n              Boolean(element?.textContent?.includes('this will succeed'))\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request report' }).click()\n        })\n      })\n      cy.findByRole('button', { name: /Request/ }).click()\n\n      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')\n    })\n\n    it('should cope with getAsyncSummaryReport failing', () => {\n      stubBaseTasks()\n      stubDefinitionsTasks()\n      cy.task('stubViewAsyncReportingResults')\n      cy.task('getAsyncSummaryReportFailure')\n\n      cy.visit(path)\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              Boolean(element?.textContent?.includes('Successful Report')) &&\n              Boolean(element?.textContent?.includes('this will succeed'))\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request report' }).click()\n        })\n      })\n      cy.findByRole('button', { name: /Request/ }).click()\n\n      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')\n    })\n\n    it('should cope with getAsyncReportStatus failing', () => {\n      executeReportStubs()\n      cy.task('stubDefinitionRequestExamplesSuccess')\n      cy.task('getAsyncReportStatusFailure')\n\n      cy.visit(path)\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return (\n              Boolean(element?.textContent?.includes('Successful Report')) &&\n              Boolean(element?.textContent?.includes('this will succeed'))\n            )\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request report' }).click()\n        })\n      })\n      cy.findByRole('button', { name: /Request/ }).click()\n\n      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')\n    })\n  })\n\n  describe('erroring endpoints - dashboards', () => {\n    it('should cope with single definition endpoint failing', () => {\n      executeDashboardStubs()\n      cy.task('stubDataQualityDashboardsResultMock')\n      cy.task('stubListExampleDashboard')\n      cy.task('stubDefinitionFeatureTestingInteractive')\n      cy.task('getSingleDashboardFailure')\n\n      cy.visit(path)\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Data quality data set'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request dashboard' }).click()\n        })\n      })\n\n      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')\n    })\n\n    it('should cope with requestAsyncDashboard failing', () => {\n      executeDashboardStubs()\n      cy.task('stubDataQualityDashboardsResultMock')\n      cy.task('stubListExampleDashboard')\n      cy.task('stubDefinitionFeatureTestingInteractive')\n      cy.task('requestAsyncDashboardFailure')\n\n      cy.visit(path)\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Data quality data set'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request dashboard' }).click()\n        })\n      })\n      cy.findByRole('button', { name: 'Request dashboard' }).click()\n\n      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')\n    })\n\n    it('should cope with getAsyncDashboard failing', () => {\n      executeDashboardStubs()\n      cy.task('stubDataQualityDashboardsResultMock')\n      cy.task('stubListExampleDashboard')\n      cy.task('stubDefinitionFeatureTestingInteractive')\n      cy.task('getAsyncDashboardFailure')\n\n      cy.visit(path)\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Data quality data set'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request dashboard' }).click()\n        })\n      })\n      cy.findByRole('button', { name: 'Request dashboard' }).click()\n\n      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')\n    })\n\n    it('should cope with getAsyncDashboardStatus failing', () => {\n      stubBaseTasks()\n      stubDefinitionsTasks()\n      cy.task('stubViewAsyncResults')\n      cy.task('stubDataQualityDashboardsResultMock')\n      cy.task('stubListExampleDashboard')\n      cy.task('stubDefinitionFeatureTestingInteractive')\n      cy.task('getAsyncDashboardStatusFailure')\n\n      cy.visit(path)\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Data quality data set'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request dashboard' }).click()\n        })\n      })\n      cy.findByRole('button', { name: 'Request dashboard' }).click()\n\n      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')\n    })\n\n    it('should cope with cancelAsyncRequest failing', () => {\n      stubBaseTasks()\n      stubDefinitionsTasks()\n      cy.task('stubReportsStartedStatus')\n      cy.task('stubMockDashboardsStatusStarted')\n      cy.task('stubViewAsyncResults')\n      cy.task('stubDataQualityDashboardsResultMock')\n      cy.task('stubListExampleDashboard')\n      cy.task('stubDefinitionFeatureTestingInteractive')\n      cy.task('cancelAsyncRequestDashboardFailure')\n\n      cy.visit(path)\n      cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n        cy.findByRole('row', {\n          name: (_, element) => {\n            return Boolean(element.textContent?.includes('Data quality data set'))\n          },\n        }).within(() => {\n          cy.findByRole('link', { name: 'Request dashboard' }).click()\n        })\n      })\n      cy.findByRole('button', { name: /Request/ }).click()\n\n      cy.findByRole('button', { name: /Cancel request/ }).click()\n      cy.task('stubMockDashboardsStatusFinished')\n      cy.findByRole('heading', { name: /Failed to abort request/ }).should('be.visible')\n    })\n  })\n})\n"],
+  "mappings": "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",
+  "names": ["import_cypressUtils", "path", "_", "element"]
+}

package/dpr/routes/journeys/api-failures.cy.ts

@@ -0,0 +1,377 @@
+import {
+  executeDashboardStubs,
+  executeReportStubs,
+  stubBaseTasks,
+  stubDefinitionsTasks,
+} from 'cypress-tests/cypressUtils'
+
+context('Try to run the app with failing and broken api endpoints', () => {
+  const path = '/embedded/platform/'
+
+  beforeEach(() => {
+    stubBaseTasks()
+  })
+
+  describe('erroring endpoints - reports', () => {
+    it('should cope with definitions list failing', () => {
+      executeReportStubs()
+      cy.task('stubDefinitionRequestExamplesSuccess')
+      cy.task('stubRequestSuccessResult20')
+      cy.task('getDefinitionSummariesFailure')
+
+      cy.visit(path)
+
+      cy.findByRole('heading', { name: /Sorry, there is a problem with the service/ }).should('be.visible')
+    })
+
+    it('should cope with definitions list being unauthd', () => {
+      executeReportStubs()
+      cy.task('stubDefinitionRequestExamplesSuccess')
+      cy.task('stubRequestSuccessResult20')
+      cy.task('getDefinitionSummariesUnauthenticatedFailure')
+
+      cy.visit(path)
+
+      cy.findByRole('heading', { name: /Sorry, there is a problem with authenticating your request/ }).should(
+        'be.visible',
+      )
+    })
+
+    it('should cope with single definition endpoint failing', () => {
+      executeReportStubs()
+      cy.task('stubDefinitionRequestExamplesSuccess')
+      cy.task('stubRequestSuccessResult20')
+      cy.task('getSingleDefinitionFailure')
+
+      cy.visit(path)
+      cy.findByLabelText(/Reports catalogue.*/i).within(() => {
+        cy.findByRole('row', {
+          name: (_, element) => {
+            return (
+              Boolean(element?.textContent?.includes('Successful Report')) &&
+              Boolean(element?.textContent?.includes('this will succeed'))
+            )
+          },
+        }).within(() => {
+          cy.findByRole('link', { name: 'Request report' }).click()
+        })
+      })
+
+      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')
+    })
+
+    it('should cope with single definition failing', () => {
+      executeReportStubs()
+      cy.task('stubDefinitionRequestExamplesSuccess')
+      cy.task('stubRequestSuccessResult20')
+      cy.task('getSingleDefinitionFailure')
+
+      cy.visit(path)
+      cy.findByLabelText(/Reports catalogue.*/i).within(() => {
+        cy.findByRole('row', {
+          name: (_, element) => {
+            return (
+              Boolean(element?.textContent?.includes('Successful Report')) &&
+              Boolean(element?.textContent?.includes('this will succeed'))
+            )
+          },
+        }).within(() => {
+          cy.findByRole('link', { name: 'Request report' }).click()
+        })
+      })
+
+      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')
+    })
+
+    it('should cope with single definition variant failing', () => {
+      executeReportStubs()
+      cy.task('stubDefinitionRequestExamplesSuccess')
+      cy.task('stubRequestSuccessResult20')
+      cy.task('getSingleDefinitionVariantFailure')
+
+      cy.visit(path)
+      cy.findByLabelText(/Reports catalogue.*/i).within(() => {
+        cy.findByRole('row', {
+          name: (_, element) => {
+            return (
+              Boolean(element?.textContent?.includes('Successful Report')) &&
+              Boolean(element?.textContent?.includes('this will succeed'))
+            )
+          },
+        }).within(() => {
+          cy.findByRole('link', { name: 'Request report' }).click()
+        })
+      })
+
+      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')
+    })
+
+    it('should cope with count failing', () => {
+      executeReportStubs()
+      cy.task('stubDefinitionRequestExamplesSuccess')
+      cy.task('stubRequestSuccessResult20')
+      cy.task('getAsyncCountFailure')
+
+      cy.visit(path)
+      cy.findByLabelText(/Reports catalogue.*/i).within(() => {
+        cy.findByRole('row', {
+          name: (_, element) => {
+            return (
+              Boolean(element?.textContent?.includes('Successful Report')) &&
+              Boolean(element?.textContent?.includes('this will succeed'))
+            )
+          },
+        }).within(() => {
+          cy.findByRole('link', { name: 'Request report' }).click()
+        })
+      })
+      cy.findByRole('button', { name: /Request/ }).click()
+
+      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')
+    })
+
+    it('should cope with requestAsyncReport failing', () => {
+      executeReportStubs()
+      cy.task('stubDefinitionRequestExamplesSuccess')
+      cy.task('stubRequestSuccessResult20')
+      cy.task('requestAsyncReportFailure')
+
+      cy.visit(path)
+      cy.findByLabelText(/Reports catalogue.*/i).within(() => {
+        cy.findByRole('row', {
+          name: (_, element) => {
+            return (
+              Boolean(element?.textContent?.includes('Successful Report')) &&
+              Boolean(element?.textContent?.includes('this will succeed'))
+            )
+          },
+        }).within(() => {
+          cy.findByRole('link', { name: 'Request report' }).click()
+        })
+      })
+      cy.findByRole('button', { name: /Request/ }).click()
+
+      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')
+    })
+
+    it('should cope with cancelAsyncRequest failing', () => {
+      stubBaseTasks()
+      stubDefinitionsTasks()
+      cy.task('stubViewAsyncReportingResults')
+      cy.task('stubRequestSuccessReportTablesCount')
+      cy.task('stubAsyncRequestSuccessReportTablesCount')
+      cy.task('stubDefinitionRequestExamplesSuccess')
+      cy.task('stubRequestSuccessResult20')
+      cy.task('cancelAsyncRequestFailure')
+
+      cy.visit(path)
+      cy.findByLabelText(/Reports catalogue.*/i).within(() => {
+        cy.findByRole('row', {
+          name: (_, element) => {
+            return (
+              Boolean(element?.textContent?.includes('Successful Report')) &&
+              Boolean(element?.textContent?.includes('this will succeed'))
+            )
+          },
+        }).within(() => {
+          cy.findByRole('link', { name: 'Request report' }).click()
+        })
+      })
+      cy.findByRole('button', { name: /Request/ }).click()
+
+      cy.findByRole('button', { name: /Cancel request/ }).click()
+
+      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')
+    })
+
+    it('should cope with getAsyncReport failing', () => {
+      executeReportStubs()
+      cy.task('stubDefinitionRequestExamplesSuccess')
+      cy.task('stubRequestSuccessResult20')
+      cy.task('getAsyncReportFailure')
+
+      cy.visit(path)
+      cy.findByLabelText(/Reports catalogue.*/i).within(() => {
+        cy.findByRole('row', {
+          name: (_, element) => {
+            return (
+              Boolean(element?.textContent?.includes('Successful Report')) &&
+              Boolean(element?.textContent?.includes('this will succeed'))
+            )
+          },
+        }).within(() => {
+          cy.findByRole('link', { name: 'Request report' }).click()
+        })
+      })
+      cy.findByRole('button', { name: /Request/ }).click()
+
+      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')
+    })
+
+    it('should cope with getAsyncSummaryReport failing', () => {
+      stubBaseTasks()
+      stubDefinitionsTasks()
+      cy.task('stubViewAsyncReportingResults')
+      cy.task('getAsyncSummaryReportFailure')
+
+      cy.visit(path)
+      cy.findByLabelText(/Reports catalogue.*/i).within(() => {
+        cy.findByRole('row', {
+          name: (_, element) => {
+            return (
+              Boolean(element?.textContent?.includes('Successful Report')) &&
+              Boolean(element?.textContent?.includes('this will succeed'))
+            )
+          },
+        }).within(() => {
+          cy.findByRole('link', { name: 'Request report' }).click()
+        })
+      })
+      cy.findByRole('button', { name: /Request/ }).click()
+
+      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')
+    })
+
+    it('should cope with getAsyncReportStatus failing', () => {
+      executeReportStubs()
+      cy.task('stubDefinitionRequestExamplesSuccess')
+      cy.task('getAsyncReportStatusFailure')
+
+      cy.visit(path)
+      cy.findByLabelText(/Reports catalogue.*/i).within(() => {
+        cy.findByRole('row', {
+          name: (_, element) => {
+            return (
+              Boolean(element?.textContent?.includes('Successful Report')) &&
+              Boolean(element?.textContent?.includes('this will succeed'))
+            )
+          },
+        }).within(() => {
+          cy.findByRole('link', { name: 'Request report' }).click()
+        })
+      })
+      cy.findByRole('button', { name: /Request/ }).click()
+
+      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')
+    })
+  })
+
+  describe('erroring endpoints - dashboards', () => {
+    it('should cope with single definition endpoint failing', () => {
+      executeDashboardStubs()
+      cy.task('stubDataQualityDashboardsResultMock')
+      cy.task('stubListExampleDashboard')
+      cy.task('stubDefinitionFeatureTestingInteractive')
+      cy.task('getSingleDashboardFailure')
+
+      cy.visit(path)
+      cy.findByLabelText(/Reports catalogue.*/i).within(() => {
+        cy.findByRole('row', {
+          name: (_, element) => {
+            return Boolean(element.textContent?.includes('Data quality data set'))
+          },
+        }).within(() => {
+          cy.findByRole('link', { name: 'Request dashboard' }).click()
+        })
+      })
+
+      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')
+    })
+
+    it('should cope with requestAsyncDashboard failing', () => {
+      executeDashboardStubs()
+      cy.task('stubDataQualityDashboardsResultMock')
+      cy.task('stubListExampleDashboard')
+      cy.task('stubDefinitionFeatureTestingInteractive')
+      cy.task('requestAsyncDashboardFailure')
+
+      cy.visit(path)
+      cy.findByLabelText(/Reports catalogue.*/i).within(() => {
+        cy.findByRole('row', {
+          name: (_, element) => {
+            return Boolean(element.textContent?.includes('Data quality data set'))
+          },
+        }).within(() => {
+          cy.findByRole('link', { name: 'Request dashboard' }).click()
+        })
+      })
+      cy.findByRole('button', { name: 'Request dashboard' }).click()
+
+      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')
+    })
+
+    it('should cope with getAsyncDashboard failing', () => {
+      executeDashboardStubs()
+      cy.task('stubDataQualityDashboardsResultMock')
+      cy.task('stubListExampleDashboard')
+      cy.task('stubDefinitionFeatureTestingInteractive')
+      cy.task('getAsyncDashboardFailure')
+
+      cy.visit(path)
+      cy.findByLabelText(/Reports catalogue.*/i).within(() => {
+        cy.findByRole('row', {
+          name: (_, element) => {
+            return Boolean(element.textContent?.includes('Data quality data set'))
+          },
+        }).within(() => {
+          cy.findByRole('link', { name: 'Request dashboard' }).click()
+        })
+      })
+      cy.findByRole('button', { name: 'Request dashboard' }).click()
+
+      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')
+    })
+
+    it('should cope with getAsyncDashboardStatus failing', () => {
+      stubBaseTasks()
+      stubDefinitionsTasks()
+      cy.task('stubViewAsyncResults')
+      cy.task('stubDataQualityDashboardsResultMock')
+      cy.task('stubListExampleDashboard')
+      cy.task('stubDefinitionFeatureTestingInteractive')
+      cy.task('getAsyncDashboardStatusFailure')
+
+      cy.visit(path)
+      cy.findByLabelText(/Reports catalogue.*/i).within(() => {
+        cy.findByRole('row', {
+          name: (_, element) => {
+            return Boolean(element.textContent?.includes('Data quality data set'))
+          },
+        }).within(() => {
+          cy.findByRole('link', { name: 'Request dashboard' }).click()
+        })
+      })
+      cy.findByRole('button', { name: 'Request dashboard' }).click()
+
+      cy.findByRole('heading', { name: /Your report has failed to generate/ }).should('be.visible')
+    })
+
+    it('should cope with cancelAsyncRequest failing', () => {
+      stubBaseTasks()
+      stubDefinitionsTasks()
+      cy.task('stubReportsStartedStatus')
+      cy.task('stubMockDashboardsStatusStarted')
+      cy.task('stubViewAsyncResults')
+      cy.task('stubDataQualityDashboardsResultMock')
+      cy.task('stubListExampleDashboard')
+      cy.task('stubDefinitionFeatureTestingInteractive')
+      cy.task('cancelAsyncRequestDashboardFailure')
+
+      cy.visit(path)
+      cy.findByLabelText(/Reports catalogue.*/i).within(() => {
+        cy.findByRole('row', {
+          name: (_, element) => {
+            return Boolean(element.textContent?.includes('Data quality data set'))
+          },
+        }).within(() => {
+          cy.findByRole('link', { name: 'Request dashboard' }).click()
+        })
+      })
+      cy.findByRole('button', { name: /Request/ }).click()
+
+      cy.findByRole('button', { name: /Cancel request/ }).click()
+      cy.task('stubMockDashboardsStatusFinished')
+      cy.findByRole('heading', { name: /Failed to abort request/ }).should('be.visible')
+    })
+  })
+})

package/dpr/routes/journeys/my-reports/bookmarks/service.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/my-reports/bookmarks/service.ts"],
-  "sourcesContent": ["import ReportStoreService from '../../../../services/reportStoreService'\nimport ReportDataStore from '../../../../data/reportDataStore'\nimport { ReportType } from '../../../../types/UserReports'\nimport { ReportStoreConfig } from '../../../../types/ReportStore'\nimport logger from '../../../../utils/logger'\nimport { BookmarkStoreData } from '../../../../types/Bookmark'\nimport { ServiceFeatureConfig } from '../../../../types/DprConfig'\n\nclass BookmarkService extends ReportStoreService {\n  enabled: boolean\n\n  constructor(reportDataStore: ReportDataStore, serviceFeatureConfig: ServiceFeatureConfig) {\n    super(reportDataStore)\n    this.enabled = Boolean(serviceFeatureConfig.bookmarking)\n    if (!this.enabled) logger.info(`Bookmarking: disabled `)\n  }\n\n  async getAllBookmarks(userId: string): Promise<BookmarkStoreData[]> {\n    if (!this.enabled) return []\n\n    const userConfig = await this.getState(userId)\n    return userConfig.bookmarks\n  }\n\n  async addBookmark(\n    userId: string,\n    reportId: string,\n    id: string,\n    type: ReportType,\n    automatic?: boolean,\n  ): Promise<void> {\n    if (!this.enabled) return\n\n    const userConfig = await this.getState(userId)\n    if (!this.isBookmarkedCheck(userConfig, id, reportId)) {\n      userConfig.bookmarks.unshift({ reportId, id, type, automatic })\n    }\n    await this.saveState(userId, userConfig)\n  }\n\n  async removeBookmark(userId: string, id: string, reportId: string): Promise<void> {\n    if (!this.enabled) return\n\n    const userConfig = await this.getState(userId)\n    const index = userConfig.bookmarks.findIndex((bookmark) => {\n      const bmVarId = bookmark.id\n      return bmVarId === id && bookmark.reportId === reportId\n    })\n    if (index >= 0) {\n      userConfig.bookmarks.splice(index, 1)\n    }\n    await this.saveState(userId, userConfig)\n  }\n\n  isBookmarked = async (id: string, reportId: string, userId: string): Promise<boolean | undefined> => {\n    if (!this.enabled) return false\n\n    const userConfig = await this.getState(userId)\n    const isBookmarked = this.isBookmarkedCheck(userConfig, id, reportId)\n    let bookmark\n    if (isBookmarked) {\n      bookmark = this.getBookmark(userConfig, id, reportId)\n    }\n    return bookmark?.automatic ? undefined : isBookmarked\n  }\n\n  private isBookmarkedCheck = (userConfig: ReportStoreConfig, id: string, reportId: string): boolean => {\n    return userConfig.bookmarks.some((bookmark) => {\n      const bmVarId = bookmark.id\n      return bmVarId === id && bookmark.reportId === reportId\n    })\n  }\n\n  private getBookmark = (userConfig: ReportStoreConfig, id: string, reportId: string) => {\n    return userConfig.bookmarks.find((bookmark) => {\n      const bmVarId = bookmark.id\n      return bmVarId === id && bookmark.reportId === reportId\n    })\n  }\n\n  async createBookMarkToggleHtml({\n    userConfig,\n    reportId,\n    id,\n    csrfToken,\n    ctxId,\n    reportType,\n    isMissing,\n  }: {\n    userConfig: ReportStoreConfig\n    reportId: string\n    id: string\n    csrfToken: string\n    ctxId: string\n    reportType: ReportType\n    isMissing: boolean\n  }) {\n    let tooltip = 'Add bookmark'\n    let automatic = false\n    let checked = null\n    if (userConfig?.bookmarks) {\n      const bookmark = this.getBookmark(userConfig, id, reportId)\n      if (bookmark) {\n        checked = 'checked'\n        tooltip = 'Remove bookmark'\n        automatic = Boolean(bookmark.automatic)\n      }\n    }\n\n    return automatic || isMissing\n      ? ''\n      : `<button class='dpr-bookmark dpr-bookmark-table' data-dpr-module='bookmark-toggle'>\n  <input class='bookmark-input' type='checkbox' id='${reportId}-${id}-${ctxId}' data-report-id='${reportId}' data-id='${id}' data-report-type='${reportType}' data-csrf-token='${csrfToken}' ${checked} />\n  <label tabindex='0' id='${id}-${reportId}-${ctxId}-bookmark-label' for='${reportId}-${id}-${ctxId}'><span class='dpr-bookmark-label govuk-body-s'>${tooltip}</span></label>\n</button>`\n  }\n}\n\nexport { BookmarkService }\nexport default BookmarkService\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAA+B,sDAI/BC,EAAmB,uCAInB,MAAMJ,UAAwB,EAAAK,OAAmB,CAG/C,YAAYC,EAAkCC,EAA4C,CACxF,MAAMD,CAAe,EA0CvB,kBAAe,MAAOE,EAAYC,EAAkBC,IAAiD,CACnG,GAAI,CAAC,KAAK,QAAS,MAAO,GAE1B,MAAMC,EAAa,MAAM,KAAK,SAASD,CAAM,EACvCE,EAAe,KAAK,kBAAkBD,EAAYH,EAAIC,CAAQ,EACpE,IAAII,EACJ,OAAID,IACFC,EAAW,KAAK,YAAYF,EAAYH,EAAIC,CAAQ,GAE/CI,GAAU,UAAY,OAAYD,CAC3C,EAEA,KAAQ,kBAAoB,CAACD,EAA+BH,EAAYC,IAC/DE,EAAW,UAAU,KAAME,GAChBA,EAAS,KACNL,GAAMK,EAAS,WAAaJ,CAChD,EAGH,KAAQ,YAAc,CAACE,EAA+BH,EAAYC,IACzDE,EAAW,UAAU,KAAME,GAChBA,EAAS,KACNL,GAAMK,EAAS,WAAaJ,CAChD,EAhED,KAAK,QAAU,EAAQF,EAAqB,YACvC,KAAK,SAAS,EAAAO,QAAO,KAAK,wBAAwB,CACzD,CAEA,MAAM,gBAAgBJ,EAA8C,CAClE,OAAK,KAAK,SAES,MAAM,KAAK,SAASA,CAAM,GAC3B,UAHQ,CAAC,CAI7B,CAEA,MAAM,YACJA,EACAD,EACAD,EACAO,EACAC,EACe,CACf,GAAI,CAAC,KAAK,QAAS,OAEnB,MAAML,EAAa,MAAM,KAAK,SAASD,CAAM,EACxC,KAAK,kBAAkBC,EAAYH,EAAIC,CAAQ,GAClDE,EAAW,UAAU,QAAQ,CAAE,SAAAF,EAAU,GAAAD,EAAI,KAAAO,EAAM,UAAAC,CAAU,CAAC,EAEhE,MAAM,KAAK,UAAUN,EAAQC,CAAU,CACzC,CAEA,MAAM,eAAeD,EAAgBF,EAAYC,EAAiC,CAChF,GAAI,CAAC,KAAK,QAAS,OAEnB,MAAME,EAAa,MAAM,KAAK,SAASD,CAAM,EACvCO,EAAQN,EAAW,UAAU,UAAWE,GAC5BA,EAAS,KACNL,GAAMK,EAAS,WAAaJ,CAChD,EACGQ,GAAS,GACXN,EAAW,UAAU,OAAOM,EAAO,CAAC,EAEtC,MAAM,KAAK,UAAUP,EAAQC,CAAU,CACzC,CA4BA,MAAM,yBAAyB,CAC7B,WAAAA,EACA,SAAAF,EACA,GAAAD,EACA,UAAAU,EACA,MAAAC,EACA,WAAAC,EACA,UAAAC,CACF,EAQG,CACD,IAAIC,EAAU,eACVN,EAAY,GACZO,EAAU,KACd,GAAIZ,GAAY,UAAW,CACzB,MAAME,EAAW,KAAK,YAAYF,EAAYH,EAAIC,CAAQ,EACtDI,IACFU,EAAU,UACVD,EAAU,kBACVN,EAAY,EAAQH,EAAS,UAEjC,CAEA,OAAOG,GAAaK,EAChB,GACA;AAAA,sDAC8CZ,CAAQ,IAAID,CAAE,IAAIW,CAAK,qBAAqBV,CAAQ,cAAcD,CAAE,uBAAuBY,CAAU,sBAAsBF,CAAS,KAAKK,CAAO;AAAA,4BAC1Kf,CAAE,IAAIC,CAAQ,IAAIU,CAAK,yBAAyBV,CAAQ,IAAID,CAAE,IAAIW,CAAK,mDAAmDG,CAAO;AAAA,UAE3J,CACF,CAGA,IAAOrB,EAAQD",
+  "sourcesContent": ["import ReportStoreService from '../../../../services/reportStoreService'\nimport ReportDataStore from '../../../../data/reportDataStore'\nimport { ReportType } from '../../../../types/UserReports'\nimport { ReportStoreConfig } from '../../../../types/ReportStore'\nimport logger from '../../../../utils/logger'\nimport { BookmarkStoreData } from '../../../../types/Bookmark'\nimport { ServiceFeatureConfig } from '../../../../types/DprConfig'\n\nclass BookmarkService extends ReportStoreService {\n  enabled: boolean\n\n  constructor(reportDataStore: ReportDataStore, serviceFeatureConfig: ServiceFeatureConfig) {\n    super(reportDataStore)\n    this.enabled = Boolean(serviceFeatureConfig.bookmarking)\n    if (!this.enabled) logger.info(`Bookmarking: disabled `)\n  }\n\n  async getAllBookmarks(userId: string): Promise<BookmarkStoreData[]> {\n    if (!this.enabled) return []\n\n    const userConfig = await this.getState(userId)\n    return userConfig.bookmarks\n  }\n\n  async addBookmark(\n    userId: string,\n    reportId: string,\n    id: string,\n    type: ReportType,\n    automatic?: boolean,\n  ): Promise<void> {\n    if (!this.enabled) return\n\n    const userConfig = await this.getState(userId)\n    if (!this.isBookmarkedCheck(userConfig, id, reportId)) {\n      userConfig.bookmarks.unshift({ reportId, id, type, automatic })\n    }\n    await this.saveState(userId, userConfig)\n  }\n\n  async removeBookmark(userId: string, id: string, reportId: string): Promise<void> {\n    if (!this.enabled) return\n\n    const userConfig = await this.getState(userId)\n    const index = userConfig.bookmarks.findIndex((bookmark) => {\n      const bmVarId = bookmark.id\n      return bmVarId === id && bookmark.reportId === reportId\n    })\n    if (index >= 0) {\n      userConfig.bookmarks.splice(index, 1)\n    }\n    await this.saveState(userId, userConfig)\n  }\n\n  isBookmarked = async (id: string, reportId: string, userId: string): Promise<boolean | undefined> => {\n    if (!this.enabled) return false\n\n    const userConfig = await this.getState(userId)\n    const isBookmarked = this.isBookmarkedCheck(userConfig, id, reportId)\n    let bookmark\n    if (isBookmarked) {\n      bookmark = this.getBookmark(userConfig, id, reportId)\n    }\n\n    return bookmark?.automatic ? undefined : isBookmarked\n  }\n\n  private isBookmarkedCheck = (userConfig: ReportStoreConfig, id: string, reportId: string): boolean => {\n    return userConfig.bookmarks.some((bookmark) => {\n      const bmVarId = bookmark.id\n      return bmVarId === id && bookmark.reportId === reportId\n    })\n  }\n\n  private getBookmark = (userConfig: ReportStoreConfig, id: string, reportId: string) => {\n    return userConfig.bookmarks.find((bookmark) => {\n      const bmVarId = bookmark.id\n      return bmVarId === id && bookmark.reportId === reportId\n    })\n  }\n\n  async createBookMarkToggleHtml({\n    userConfig,\n    reportId,\n    id,\n    csrfToken,\n    ctxId,\n    reportType,\n    isMissing,\n  }: {\n    userConfig: ReportStoreConfig\n    reportId: string\n    id: string\n    csrfToken: string\n    ctxId: string\n    reportType: ReportType\n    isMissing: boolean\n  }) {\n    let tooltip = 'Add bookmark'\n    let automatic = false\n    let checked = null\n    if (userConfig?.bookmarks) {\n      const bookmark = this.getBookmark(userConfig, id, reportId)\n      if (bookmark) {\n        checked = 'checked'\n        tooltip = 'Remove bookmark'\n        automatic = Boolean(bookmark.automatic)\n      }\n    }\n\n    return automatic || isMissing\n      ? ''\n      : `<button class='dpr-bookmark dpr-bookmark-table' data-dpr-module='bookmark-toggle'>\n  <input class='bookmark-input' type='checkbox' id='${reportId}-${id}-${ctxId}' data-report-id='${reportId}' data-id='${id}' data-report-type='${reportType}' data-csrf-token='${csrfToken}' ${checked} />\n  <label tabindex='0' id='${id}-${reportId}-${ctxId}-bookmark-label' for='${reportId}-${id}-${ctxId}'><span class='dpr-bookmark-label govuk-body-s'>${tooltip}</span></label>\n</button>`\n  }\n}\n\nexport { BookmarkService }\nexport default BookmarkService\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,qBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAA+B,sDAI/BC,EAAmB,uCAInB,MAAMJ,UAAwB,EAAAK,OAAmB,CAG/C,YAAYC,EAAkCC,EAA4C,CACxF,MAAMD,CAAe,EA0CvB,kBAAe,MAAOE,EAAYC,EAAkBC,IAAiD,CACnG,GAAI,CAAC,KAAK,QAAS,MAAO,GAE1B,MAAMC,EAAa,MAAM,KAAK,SAASD,CAAM,EACvCE,EAAe,KAAK,kBAAkBD,EAAYH,EAAIC,CAAQ,EACpE,IAAII,EACJ,OAAID,IACFC,EAAW,KAAK,YAAYF,EAAYH,EAAIC,CAAQ,GAG/CI,GAAU,UAAY,OAAYD,CAC3C,EAEA,KAAQ,kBAAoB,CAACD,EAA+BH,EAAYC,IAC/DE,EAAW,UAAU,KAAME,GAChBA,EAAS,KACNL,GAAMK,EAAS,WAAaJ,CAChD,EAGH,KAAQ,YAAc,CAACE,EAA+BH,EAAYC,IACzDE,EAAW,UAAU,KAAME,GAChBA,EAAS,KACNL,GAAMK,EAAS,WAAaJ,CAChD,EAjED,KAAK,QAAU,EAAQF,EAAqB,YACvC,KAAK,SAAS,EAAAO,QAAO,KAAK,wBAAwB,CACzD,CAEA,MAAM,gBAAgBJ,EAA8C,CAClE,OAAK,KAAK,SAES,MAAM,KAAK,SAASA,CAAM,GAC3B,UAHQ,CAAC,CAI7B,CAEA,MAAM,YACJA,EACAD,EACAD,EACAO,EACAC,EACe,CACf,GAAI,CAAC,KAAK,QAAS,OAEnB,MAAML,EAAa,MAAM,KAAK,SAASD,CAAM,EACxC,KAAK,kBAAkBC,EAAYH,EAAIC,CAAQ,GAClDE,EAAW,UAAU,QAAQ,CAAE,SAAAF,EAAU,GAAAD,EAAI,KAAAO,EAAM,UAAAC,CAAU,CAAC,EAEhE,MAAM,KAAK,UAAUN,EAAQC,CAAU,CACzC,CAEA,MAAM,eAAeD,EAAgBF,EAAYC,EAAiC,CAChF,GAAI,CAAC,KAAK,QAAS,OAEnB,MAAME,EAAa,MAAM,KAAK,SAASD,CAAM,EACvCO,EAAQN,EAAW,UAAU,UAAWE,GAC5BA,EAAS,KACNL,GAAMK,EAAS,WAAaJ,CAChD,EACGQ,GAAS,GACXN,EAAW,UAAU,OAAOM,EAAO,CAAC,EAEtC,MAAM,KAAK,UAAUP,EAAQC,CAAU,CACzC,CA6BA,MAAM,yBAAyB,CAC7B,WAAAA,EACA,SAAAF,EACA,GAAAD,EACA,UAAAU,EACA,MAAAC,EACA,WAAAC,EACA,UAAAC,CACF,EAQG,CACD,IAAIC,EAAU,eACVN,EAAY,GACZO,EAAU,KACd,GAAIZ,GAAY,UAAW,CACzB,MAAME,EAAW,KAAK,YAAYF,EAAYH,EAAIC,CAAQ,EACtDI,IACFU,EAAU,UACVD,EAAU,kBACVN,EAAY,EAAQH,EAAS,UAEjC,CAEA,OAAOG,GAAaK,EAChB,GACA;AAAA,sDAC8CZ,CAAQ,IAAID,CAAE,IAAIW,CAAK,qBAAqBV,CAAQ,cAAcD,CAAE,uBAAuBY,CAAU,sBAAsBF,CAAS,KAAKK,CAAO;AAAA,4BAC1Kf,CAAE,IAAIC,CAAQ,IAAIU,CAAK,yBAAyBV,CAAQ,IAAID,CAAE,IAAIW,CAAK,mDAAmDG,CAAO;AAAA,UAE3J,CACF,CAGA,IAAOrB,EAAQD",
   "names": ["service_exports", "__export", "BookmarkService", "service_default", "__toCommonJS", "import_reportStoreService", "import_logger", "ReportStoreService", "reportDataStore", "serviceFeatureConfig", "id", "reportId", "userId", "userConfig", "isBookmarked", "bookmark", "logger", "type", "automatic", "index", "csrfToken", "ctxId", "reportType", "isMissing", "tooltip", "checked"]
 }

package/dpr/routes/journeys/my-reports/bookmarks/service.ts

@@ -61,6 +61,7 @@ class BookmarkService extends ReportStoreService {
     if (isBookmarked) {
       bookmark = this.getBookmark(userConfig, id, reportId)
     }
+
     return bookmark?.automatic ? undefined : isBookmarked
   }
 

package/dpr/routes/journeys/request-report/controller.js

@@ -1,2 +1,2 @@
-"use strict";var p=Object.create;var s=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var y=Object.getOwnPropertyNames;var c=Object.getPrototypeOf,d=Object.prototype.hasOwnProperty;var m=(e,r)=>{for(var o in r)s(e,o,{get:r[o],enumerable:!0})},l=(e,r,o,a)=>{if(r&&typeof r=="object"||typeof r=="function")for(let t of y(r))!d.call(e,t)&&t!==o&&s(e,t,{get:()=>r[t],enumerable:!(a=u(r,t))||a.enumerable});return e};var h=(e,r,o)=>(o=e!=null?p(c(e)):{},l(r||!e||!e.__esModule?s(o,"default",{value:e,enumerable:!0}):o,e)),v=e=>l(s({},"__esModule",{value:!0}),e);var g={};m(g,{RequestReportController:()=>i,default:()=>f});module.exports=v(g);var n=h(require("../../../utils/logger"));class i{constructor(r,o){this.errorHandler=async(r,o,a)=>{n.default.error(`Error: ${JSON.stringify(r.body)}`),o.render("dpr/routes/journeys/view-report/error",{layoutPath:this.layoutPath,...r.body,...r.params,error:r.body.error,params:r.params})};this.layoutPath=r,this.services=o}}var f=i;0&&(module.exports={RequestReportController});
+"use strict";var d=Object.create;var a=Object.defineProperty;var y=Object.getOwnPropertyDescriptor;var R=Object.getOwnPropertyNames;var p=Object.getPrototypeOf,f=Object.prototype.hasOwnProperty;var h=(t,r)=>{for(var e in r)a(t,e,{get:r[e],enumerable:!0})},l=(t,r,e,s)=>{if(r&&typeof r=="object"||typeof r=="function")for(let o of R(r))!f.call(t,o)&&o!==e&&a(t,o,{get:()=>r[o],enumerable:!(s=y(r,o))||s.enumerable});return t};var n=(t,r,e)=>(e=t!=null?d(p(t)):{},l(r||!t||!t.__esModule?a(e,"default",{value:t,enumerable:!0}):e,t)),m=t=>l(a({},"__esModule",{value:!0}),t);var g={};h(g,{RequestReportController:()=>i,default:()=>b});module.exports=m(g);var c=n(require("./filters/utils")),u=n(require("../../../utils/ErrorHandler"));class i{constructor(r,e){this.errorHandler=async(r,e,s,o)=>{s.render("dpr/routes/journeys/view-report/error",{layoutPath:this.layoutPath,...e.body,...e.params,error:e.body.error,params:e.params})};this.CANCEL=async(r,e,s)=>{try{await c.default.cancelRequest({req:r,res:e,services:this.services})}catch(o){return r.body.title="Failed to abort request",r.body.errorDescription="We were unable to abort the report request for the following reason:",r.body.error=new u.default(o).formatError(),r.flash("ERROR_BODY",JSON.stringify(r.body)),r.flash("ERROR_PARAMS",JSON.stringify(r.params)),r.flash("ERROR",JSON.stringify(r.body.error)),e.redirect(`${r.originalUrl}/failed`)}return e.redirect(r.originalUrl.replace("/cancel","/status"))};this.layoutPath=r,this.services=e}}var b=i;0&&(module.exports={RequestReportController});
 //# sourceMappingURL=controller.js.map

package/dpr/routes/journeys/request-report/controller.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/routes/journeys/request-report/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../types/Services'\nimport logger from '../../../utils/logger'\n\nclass RequestReportController {\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  errorHandler: RequestHandler = async (req, res, _next) => {\n    logger.error(`Error: ${JSON.stringify(req.body)}`)\n\n    res.render(`dpr/routes/journeys/view-report/error`, {\n      layoutPath: this.layoutPath,\n      ...req.body,\n      ...req.params,\n      error: req.body.error,\n      params: req.params,\n    })\n  }\n}\n\nexport { RequestReportController }\nexport default RequestReportController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAAmB,oCAEnB,MAAMH,CAAwB,CAK5B,YAAYI,EAAoBC,EAAoB,CAKpD,kBAA+B,MAAOC,EAAKC,EAAKC,IAAU,CACxD,EAAAC,QAAO,MAAM,UAAU,KAAK,UAAUH,EAAI,IAAI,CAAC,EAAE,EAEjDC,EAAI,OAAO,wCAAyC,CAClD,WAAY,KAAK,WACjB,GAAGD,EAAI,KACP,GAAGA,EAAI,OACP,MAAOA,EAAI,KAAK,MAChB,OAAQA,EAAI,MACd,CAAC,CACH,EAdE,KAAK,WAAaF,EAClB,KAAK,SAAWC,CAClB,CAaF,CAGA,IAAOJ,EAAQD",
-  "names": ["controller_exports", "__export", "RequestReportController", "controller_default", "__toCommonJS", "import_logger", "layoutPath", "services", "req", "res", "_next", "logger"]
+  "sourcesContent": ["import { ErrorRequestHandler, RequestHandler } from 'express'\nimport { Services } from '../../../types/Services'\nimport AsyncRequestUtils from './filters/utils'\nimport ErrorHandler from '../../../utils/ErrorHandler'\n\nclass RequestReportController {\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  errorHandler: ErrorRequestHandler = async (_error, req, res, _next) => {\n    res.render(`dpr/routes/journeys/view-report/error`, {\n      layoutPath: this.layoutPath,\n      ...req.body,\n      ...req.params,\n      error: req.body.error,\n      params: req.params,\n    })\n  }\n\n  CANCEL: RequestHandler = async (req, res, _next) => {\n    try {\n      await AsyncRequestUtils.cancelRequest({\n        req,\n        res,\n        services: this.services,\n      })\n    } catch (error) {\n      req.body.title = 'Failed to abort request'\n      req.body.errorDescription = 'We were unable to abort the report request for the following reason:'\n      req.body.error = new ErrorHandler(error).formatError()\n\n      req.flash('ERROR_BODY', JSON.stringify(req.body))\n      req.flash('ERROR_PARAMS', JSON.stringify(req.params))\n      req.flash('ERROR', JSON.stringify(req.body.error))\n\n      return res.redirect(`${req.originalUrl}/failed`)\n    }\n    return res.redirect(req.originalUrl.replace('/cancel', '/status'))\n  }\n}\n\nexport { RequestReportController }\nexport default RequestReportController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAEA,IAAAK,EAA8B,8BAC9BC,EAAyB,0CAEzB,MAAMJ,CAAwB,CAK5B,YAAYK,EAAoBC,EAAoB,CAKpD,kBAAoC,MAAOC,EAAQC,EAAKC,EAAKC,IAAU,CACrED,EAAI,OAAO,wCAAyC,CAClD,WAAY,KAAK,WACjB,GAAGD,EAAI,KACP,GAAGA,EAAI,OACP,MAAOA,EAAI,KAAK,MAChB,OAAQA,EAAI,MACd,CAAC,CACH,EAEA,YAAyB,MAAOA,EAAKC,EAAKC,IAAU,CAClD,GAAI,CACF,MAAM,EAAAC,QAAkB,cAAc,CACpC,IAAAH,EACA,IAAAC,EACA,SAAU,KAAK,QACjB,CAAC,CACH,OAASG,EAAO,CACd,OAAAJ,EAAI,KAAK,MAAQ,0BACjBA,EAAI,KAAK,iBAAmB,uEAC5BA,EAAI,KAAK,MAAQ,IAAI,EAAAK,QAAaD,CAAK,EAAE,YAAY,EAErDJ,EAAI,MAAM,aAAc,KAAK,UAAUA,EAAI,IAAI,CAAC,EAChDA,EAAI,MAAM,eAAgB,KAAK,UAAUA,EAAI,MAAM,CAAC,EACpDA,EAAI,MAAM,QAAS,KAAK,UAAUA,EAAI,KAAK,KAAK,CAAC,EAE1CC,EAAI,SAAS,GAAGD,EAAI,WAAW,SAAS,CACjD,CACA,OAAOC,EAAI,SAASD,EAAI,YAAY,QAAQ,UAAW,SAAS,CAAC,CACnE,EAjCE,KAAK,WAAaH,EAClB,KAAK,SAAWC,CAClB,CAgCF,CAGA,IAAOL,EAAQD",
+  "names": ["controller_exports", "__export", "RequestReportController", "controller_default", "__toCommonJS", "import_utils", "import_ErrorHandler", "layoutPath", "services", "_error", "req", "res", "_next", "AsyncRequestUtils", "error", "ErrorHandler"]
 }

package/dpr/routes/journeys/request-report/controller.ts

@@ -1,6 +1,7 @@
-import { RequestHandler } from 'express'
+import { ErrorRequestHandler, RequestHandler } from 'express'
 import { Services } from '../../../types/Services'
-import logger from '../../../utils/logger'
+import AsyncRequestUtils from './filters/utils'
+import ErrorHandler from '../../../utils/ErrorHandler'
 
 class RequestReportController {
   layoutPath: string
@@ -12,9 +13,7 @@ class RequestReportController {
     this.services = services
   }
 
-  errorHandler: RequestHandler = async (req, res, _next) => {
-    logger.error(`Error: ${JSON.stringify(req.body)}`)
-
+  errorHandler: ErrorRequestHandler = async (_error, req, res, _next) => {
     res.render(`dpr/routes/journeys/view-report/error`, {
       layoutPath: this.layoutPath,
       ...req.body,
@@ -23,6 +22,27 @@ class RequestReportController {
       params: req.params,
     })
   }
+
+  CANCEL: RequestHandler = async (req, res, _next) => {
+    try {
+      await AsyncRequestUtils.cancelRequest({
+        req,
+        res,
+        services: this.services,
+      })
+    } catch (error) {
+      req.body.title = 'Failed to abort request'
+      req.body.errorDescription = 'We were unable to abort the report request for the following reason:'
+      req.body.error = new ErrorHandler(error).formatError()
+
+      req.flash('ERROR_BODY', JSON.stringify(req.body))
+      req.flash('ERROR_PARAMS', JSON.stringify(req.params))
+      req.flash('ERROR', JSON.stringify(req.body.error))
+
+      return res.redirect(`${req.originalUrl}/failed`)
+    }
+    return res.redirect(req.originalUrl.replace('/cancel', '/status'))
+  }
 }
 
 export { RequestReportController }

package/dpr/routes/journeys/request-report/filters/controller.js

@@ -1,2 +1,2 @@
-"use strict";var p=Object.create;var l=Object.defineProperty;var v=Object.getOwnPropertyDescriptor;var R=Object.getOwnPropertyNames;var D=Object.getPrototypeOf,b=Object.prototype.hasOwnProperty;var E=(s,e)=>{for(var t in e)l(s,t,{get:e[t],enumerable:!0})},m=(s,e,t,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of R(e))!b.call(s,r)&&r!==t&&l(s,r,{get:()=>e[r],enumerable:!(a=v(e,r))||a.enumerable});return s};var c=(s,e,t)=>(t=s!=null?p(D(s)):{},m(e||!s||!s.__esModule?l(t,"default",{value:s,enumerable:!0}):t,s)),P=s=>m(l({},"__esModule",{value:!0}),s);var F={};E(F,{RequestReportController:()=>y,default:()=>w});module.exports=P(F);var u=c(require("./utils")),d=c(require("../../../../utils/Personalisation/personalisationUtils")),n=require("../../../../components/_filters/filtersTypeEnum"),i=c(require("../../../../utils/ErrorHandler"));class y{constructor(e,t){this.GET=async(e,t,a)=>{try{const r=await u.default.renderRequest({req:e,res:t,services:this.services,next:a});t.render("dpr/routes/journeys/request-report/filters/view",{layoutPath:this.layoutPath,...r})}catch(r){e.body.title="Request failed",e.body.errorDescription=`Your ${e.params.type} has failed to generate.`,e.body.error=new i.default(r).formatError(),a()}};this.POST=async(e,t,a)=>{try{const r=await u.default.request({req:e,res:t,services:this.services,next:a}),{executionId:o,dataProductDefinitionsPath:f}=r;if(o){const h=f?`${o}/status?dataProductDefinitionsPath=${f}`:`${o}/status`;t.redirect(h)}else t.end()}catch(r){const o=u.default.getFiltersFromReqBody(e);e.body={title:"Request Failed",errorDescription:`Your ${e.params.type} has failed to generate.`,error:new i.default(r).formatError(),retry:!0,filters:o,...e.body},a()}};this.saveDefaultFilterValues=async(e,t,a)=>{try{await d.default.saveDefaults(n.FiltersType.REQUEST,t,e,this.services),t.redirect(`${e.baseUrl}?defaultsSaved=true`)}catch(r){e.body={title:"Failed to save defaults",error:new i.default(r).formatError(),...e.body},a()}};this.removeDefaultFilterValues=async(e,t,a)=>{try{await d.default.removeDefaults(n.FiltersType.REQUEST,t,e,this.services),t.redirect(e.baseUrl)}catch(r){e.body={title:"Failed to remove defaults",error:new i.default(r).formatError(),...e.body},a()}};this.layoutPath=e,this.services=t}}var w=y;0&&(module.exports={RequestReportController});
+"use strict";var p=Object.create;var l=Object.defineProperty;var v=Object.getOwnPropertyDescriptor;var R=Object.getOwnPropertyNames;var D=Object.getPrototypeOf,b=Object.prototype.hasOwnProperty;var E=(s,e)=>{for(var t in e)l(s,t,{get:e[t],enumerable:!0})},m=(s,e,t,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of R(e))!b.call(s,r)&&r!==t&&l(s,r,{get:()=>e[r],enumerable:!(a=v(e,r))||a.enumerable});return s};var c=(s,e,t)=>(t=s!=null?p(D(s)):{},m(e||!s||!s.__esModule?l(t,"default",{value:s,enumerable:!0}):t,s)),P=s=>m(l({},"__esModule",{value:!0}),s);var F={};E(F,{RequestReportController:()=>y,default:()=>w});module.exports=P(F);var u=c(require("./utils")),d=c(require("../../../../utils/Personalisation/personalisationUtils")),n=require("../../../../components/_filters/filtersTypeEnum"),i=c(require("../../../../utils/ErrorHandler"));class y{constructor(e,t){this.GET=async(e,t,a)=>{try{const r=await u.default.renderRequest({req:e,res:t,services:this.services,next:a});t.render("dpr/routes/journeys/request-report/filters/view",{layoutPath:this.layoutPath,...r})}catch(r){e.body.title="Request failed",e.body.errorDescription=`Your ${e.params.type} has failed to generate.`,e.body.error=new i.default(r).formatError(),a()}};this.POST=async(e,t,a)=>{try{const r=await u.default.request({req:e,res:t,services:this.services,next:a}),{executionId:o,dataProductDefinitionsPath:f}=r;if(o){const h=f?`${o}/status?dataProductDefinitionsPath=${f}`:`${o}/status`;t.redirect(h)}else t.end()}catch(r){const o=u.default.getFiltersFromReqBody(e);e.body={title:"Request Failed",errorDescription:`Your ${e.params.type} has failed to generate.`,error:new i.default(r).formatError(),retry:!0,filters:o,...e.body},a(r)}};this.saveDefaultFilterValues=async(e,t,a)=>{try{await d.default.saveDefaults(n.FiltersType.REQUEST,t,e,this.services),t.redirect(`${e.baseUrl}?defaultsSaved=true`)}catch(r){e.body={title:"Failed to save defaults",error:new i.default(r).formatError(),...e.body},a()}};this.removeDefaultFilterValues=async(e,t,a)=>{try{await d.default.removeDefaults(n.FiltersType.REQUEST,t,e,this.services),t.redirect(e.baseUrl)}catch(r){e.body={title:"Failed to remove defaults",error:new i.default(r).formatError(),...e.body},a()}};this.layoutPath=e,this.services=t}}var w=y;0&&(module.exports={RequestReportController});
 //# sourceMappingURL=controller.js.map

package/dpr/routes/journeys/request-report/filters/controller.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/dpr/routes/journeys/request-report/filters/controller.ts"],
-  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../types/Services'\nimport { RequestDataResult } from '../../../../types/AsyncReportUtils'\nimport AysncRequestUtils from './utils'\nimport PersonalisationUtils from '../../../../utils/Personalisation/personalisationUtils'\nimport { FiltersType } from '../../../../components/_filters/filtersTypeEnum'\nimport ErrorHandler from '../../../../utils/ErrorHandler'\n\nclass RequestReportController {\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  // Render request page\n  GET: RequestHandler = async (req, res, next) => {\n    try {\n      const requestRenderData = <RequestDataResult>await AysncRequestUtils.renderRequest({\n        req,\n        res,\n        services: this.services,\n        next,\n      })\n\n      res.render(`dpr/routes/journeys/request-report/filters/view`, {\n        layoutPath: this.layoutPath,\n        ...requestRenderData,\n      })\n    } catch (error) {\n      req.body.title = 'Request failed'\n      req.body.errorDescription = `Your ${req.params['type']} has failed to generate.`\n      req.body.error = new ErrorHandler(error).formatError()\n      next()\n    }\n  }\n\n  // Request report\n  POST: RequestHandler = async (req, res, next) => {\n    try {\n      const executionData = await AysncRequestUtils.request({\n        req,\n        res,\n        services: this.services,\n        next,\n      })\n\n      const { executionId, dataProductDefinitionsPath } = executionData\n\n      if (executionId) {\n        const redirect = dataProductDefinitionsPath\n          ? `${executionId}/status?dataProductDefinitionsPath=${dataProductDefinitionsPath}`\n          : `${executionId}/status`\n        res.redirect(redirect)\n      } else {\n        res.end()\n      }\n    } catch (error) {\n      const filters = AysncRequestUtils.getFiltersFromReqBody(req)\n\n      req.body = {\n        title: 'Request Failed',\n        errorDescription: `Your ${req.params['type']} has failed to generate.`,\n        error: new ErrorHandler(error).formatError(),\n        retry: true,\n        filters,\n        ...req.body,\n      }\n      next()\n    }\n  }\n\n  saveDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      await PersonalisationUtils.saveDefaults(FiltersType.REQUEST, res, req, this.services)\n      res.redirect(`${req.baseUrl}?defaultsSaved=true`)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to save defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...req.body,\n      }\n      next()\n    }\n  }\n\n  removeDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      await PersonalisationUtils.removeDefaults(FiltersType.REQUEST, res, req, this.services)\n      res.redirect(req.baseUrl)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to remove defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...req.body,\n      }\n      next()\n    }\n  }\n}\n\nexport { RequestReportController }\nexport default RequestReportController\n"],
-  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAGA,IAAAK,EAA8B,sBAC9BC,EAAiC,qEACjCC,EAA4B,2DAC5BC,EAAyB,6CAEzB,MAAMN,CAAwB,CAK5B,YAAYO,EAAoBC,EAAoB,CAMpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,GAAI,CACF,MAAMC,EAAuC,MAAM,EAAAC,QAAkB,cAAc,CACjF,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,SACf,KAAAC,CACF,CAAC,EAEDD,EAAI,OAAO,kDAAmD,CAC5D,WAAY,KAAK,WACjB,GAAGE,CACL,CAAC,CACH,OAASE,EAAO,CACdL,EAAI,KAAK,MAAQ,iBACjBA,EAAI,KAAK,iBAAmB,QAAQA,EAAI,OAAO,IAAO,2BACtDA,EAAI,KAAK,MAAQ,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EACrDH,EAAK,CACP,CACF,EAGA,UAAuB,MAAOF,EAAKC,EAAKC,IAAS,CAC/C,GAAI,CACF,MAAMK,EAAgB,MAAM,EAAAH,QAAkB,QAAQ,CACpD,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,SACf,KAAAC,CACF,CAAC,EAEK,CAAE,YAAAM,EAAa,2BAAAC,CAA2B,EAAIF,EAEpD,GAAIC,EAAa,CACf,MAAME,EAAWD,EACb,GAAGD,CAAW,sCAAsCC,CAA0B,GAC9E,GAAGD,CAAW,UAClBP,EAAI,SAASS,CAAQ,CACvB,MACET,EAAI,IAAI,CAEZ,OAASI,EAAO,CACd,MAAMM,EAAU,EAAAP,QAAkB,sBAAsBJ,CAAG,EAE3DA,EAAI,KAAO,CACT,MAAO,iBACP,iBAAkB,QAAQA,EAAI,OAAO,IAAO,2BAC5C,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,MAAO,GACP,QAAAM,EACA,GAAGX,EAAI,IACT,EACAE,EAAK,CACP,CACF,EAEA,6BAA0C,MAAOF,EAAKC,EAAKC,IAAS,CAClE,GAAI,CACF,MAAM,EAAAU,QAAqB,aAAa,cAAY,QAASX,EAAKD,EAAK,KAAK,QAAQ,EACpFC,EAAI,SAAS,GAAGD,EAAI,OAAO,qBAAqB,CAClD,OAASK,EAAO,CACdL,EAAI,KAAO,CACT,MAAO,0BACP,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAGL,EAAI,IACT,EACAE,EAAK,CACP,CACF,EAEA,+BAA4C,MAAOF,EAAKC,EAAKC,IAAS,CACpE,GAAI,CACF,MAAM,EAAAU,QAAqB,eAAe,cAAY,QAASX,EAAKD,EAAK,KAAK,QAAQ,EACtFC,EAAI,SAASD,EAAI,OAAO,CAC1B,OAASK,EAAO,CACdL,EAAI,KAAO,CACT,MAAO,4BACP,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAGL,EAAI,IACT,EACAE,EAAK,CACP,CACF,EAvFE,KAAK,WAAaJ,EAClB,KAAK,SAAWC,CAClB,CAsFF,CAGA,IAAOP,EAAQD",
+  "sourcesContent": ["import { RequestHandler } from 'express'\nimport { Services } from '../../../../types/Services'\nimport { RequestDataResult } from '../../../../types/AsyncReportUtils'\nimport AysncRequestUtils from './utils'\nimport PersonalisationUtils from '../../../../utils/Personalisation/personalisationUtils'\nimport { FiltersType } from '../../../../components/_filters/filtersTypeEnum'\nimport ErrorHandler from '../../../../utils/ErrorHandler'\n\nclass RequestReportController {\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  // Render request page\n  GET: RequestHandler = async (req, res, next) => {\n    try {\n      const requestRenderData = <RequestDataResult>await AysncRequestUtils.renderRequest({\n        req,\n        res,\n        services: this.services,\n        next,\n      })\n\n      res.render(`dpr/routes/journeys/request-report/filters/view`, {\n        layoutPath: this.layoutPath,\n        ...requestRenderData,\n      })\n    } catch (error) {\n      req.body.title = 'Request failed'\n      req.body.errorDescription = `Your ${req.params['type']} has failed to generate.`\n      req.body.error = new ErrorHandler(error).formatError()\n      next()\n    }\n  }\n\n  // Request report\n  POST: RequestHandler = async (req, res, next) => {\n    try {\n      const executionData = await AysncRequestUtils.request({\n        req,\n        res,\n        services: this.services,\n        next,\n      })\n\n      const { executionId, dataProductDefinitionsPath } = executionData\n\n      if (executionId) {\n        const redirect = dataProductDefinitionsPath\n          ? `${executionId}/status?dataProductDefinitionsPath=${dataProductDefinitionsPath}`\n          : `${executionId}/status`\n        res.redirect(redirect)\n      } else {\n        res.end()\n      }\n    } catch (error) {\n      const filters = AysncRequestUtils.getFiltersFromReqBody(req)\n\n      req.body = {\n        title: 'Request Failed',\n        errorDescription: `Your ${req.params['type']} has failed to generate.`,\n        error: new ErrorHandler(error).formatError(),\n        retry: true,\n        filters,\n        ...req.body,\n      }\n      next(error)\n    }\n  }\n\n  saveDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      await PersonalisationUtils.saveDefaults(FiltersType.REQUEST, res, req, this.services)\n      res.redirect(`${req.baseUrl}?defaultsSaved=true`)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to save defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...req.body,\n      }\n      next()\n    }\n  }\n\n  removeDefaultFilterValues: RequestHandler = async (req, res, next) => {\n    try {\n      await PersonalisationUtils.removeDefaults(FiltersType.REQUEST, res, req, this.services)\n      res.redirect(req.baseUrl)\n    } catch (error) {\n      req.body = {\n        title: 'Failed to remove defaults',\n        error: new ErrorHandler(error).formatError(),\n        ...req.body,\n      }\n      next()\n    }\n  }\n}\n\nexport { RequestReportController }\nexport default RequestReportController\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,6BAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAGA,IAAAK,EAA8B,sBAC9BC,EAAiC,qEACjCC,EAA4B,2DAC5BC,EAAyB,6CAEzB,MAAMN,CAAwB,CAK5B,YAAYO,EAAoBC,EAAoB,CAMpD,SAAsB,MAAOC,EAAKC,EAAKC,IAAS,CAC9C,GAAI,CACF,MAAMC,EAAuC,MAAM,EAAAC,QAAkB,cAAc,CACjF,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,SACf,KAAAC,CACF,CAAC,EAEDD,EAAI,OAAO,kDAAmD,CAC5D,WAAY,KAAK,WACjB,GAAGE,CACL,CAAC,CACH,OAASE,EAAO,CACdL,EAAI,KAAK,MAAQ,iBACjBA,EAAI,KAAK,iBAAmB,QAAQA,EAAI,OAAO,IAAO,2BACtDA,EAAI,KAAK,MAAQ,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EACrDH,EAAK,CACP,CACF,EAGA,UAAuB,MAAOF,EAAKC,EAAKC,IAAS,CAC/C,GAAI,CACF,MAAMK,EAAgB,MAAM,EAAAH,QAAkB,QAAQ,CACpD,IAAAJ,EACA,IAAAC,EACA,SAAU,KAAK,SACf,KAAAC,CACF,CAAC,EAEK,CAAE,YAAAM,EAAa,2BAAAC,CAA2B,EAAIF,EAEpD,GAAIC,EAAa,CACf,MAAME,EAAWD,EACb,GAAGD,CAAW,sCAAsCC,CAA0B,GAC9E,GAAGD,CAAW,UAClBP,EAAI,SAASS,CAAQ,CACvB,MACET,EAAI,IAAI,CAEZ,OAASI,EAAO,CACd,MAAMM,EAAU,EAAAP,QAAkB,sBAAsBJ,CAAG,EAE3DA,EAAI,KAAO,CACT,MAAO,iBACP,iBAAkB,QAAQA,EAAI,OAAO,IAAO,2BAC5C,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,MAAO,GACP,QAAAM,EACA,GAAGX,EAAI,IACT,EACAE,EAAKG,CAAK,CACZ,CACF,EAEA,6BAA0C,MAAOL,EAAKC,EAAKC,IAAS,CAClE,GAAI,CACF,MAAM,EAAAU,QAAqB,aAAa,cAAY,QAASX,EAAKD,EAAK,KAAK,QAAQ,EACpFC,EAAI,SAAS,GAAGD,EAAI,OAAO,qBAAqB,CAClD,OAASK,EAAO,CACdL,EAAI,KAAO,CACT,MAAO,0BACP,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAGL,EAAI,IACT,EACAE,EAAK,CACP,CACF,EAEA,+BAA4C,MAAOF,EAAKC,EAAKC,IAAS,CACpE,GAAI,CACF,MAAM,EAAAU,QAAqB,eAAe,cAAY,QAASX,EAAKD,EAAK,KAAK,QAAQ,EACtFC,EAAI,SAASD,EAAI,OAAO,CAC1B,OAASK,EAAO,CACdL,EAAI,KAAO,CACT,MAAO,4BACP,MAAO,IAAI,EAAAM,QAAaD,CAAK,EAAE,YAAY,EAC3C,GAAGL,EAAI,IACT,EACAE,EAAK,CACP,CACF,EAvFE,KAAK,WAAaJ,EAClB,KAAK,SAAWC,CAClB,CAsFF,CAGA,IAAOP,EAAQD",
   "names": ["controller_exports", "__export", "RequestReportController", "controller_default", "__toCommonJS", "import_utils", "import_personalisationUtils", "import_filtersTypeEnum", "import_ErrorHandler", "layoutPath", "services", "req", "res", "next", "requestRenderData", "AysncRequestUtils", "error", "ErrorHandler", "executionData", "executionId", "dataProductDefinitionsPath", "redirect", "filters", "PersonalisationUtils"]
 }

package/dpr/routes/journeys/request-report/filters/controller.ts

@@ -69,7 +69,7 @@ class RequestReportController {
         filters,
         ...req.body,
       }
-      next()
+      next(error)
     }
   }