@ministryofjustice/hmpps-digital-prison-reporting-frontend 6.2.0 → 6.2.2

package/_networkMocks/report/mockVariants/mockAsyncData.d.ts

@@ -7,7 +7,7 @@ export declare const createMockData: (amount: number) => {
     field4: string;
     field5: string;
     field6: string;
-    field7: string;
+    field7: string | null;
     field8: string;
     field9: string;
     field10: string;

package/all.bundle.js

@@ -538,7 +538,6 @@ class ReportActions extends DprClientClass {
     printButton;
     shareButton;
     copyButton;
-    downloadButton;
     static getModuleName() {
         return 'report-actions';
     }
@@ -546,7 +545,6 @@ class ReportActions extends DprClientClass {
         this.refreshButton = document.getElementById('dpr-button-refresh');
         this.printButton = document.getElementById('dpr-button-printable');
         this.shareButton = document.getElementById('dpr-button-sharable');
-        this.downloadButton = document.getElementById('dpr-button-downloadable');
         this.copyButton = document.getElementById('dpr-button-copy');
         this.initRefreshEvent();
         this.initPrintButtonEvent();
@@ -1299,9 +1297,7 @@ class DprReportStatus extends PollingClientClass {
             if (!fragment)
                 return;
             // Get the redirect to the report, if present it means the status is finished
-            if (this.redirectToReport(fragment)) {
-                return;
-            }
+            const redirectUrl = this.redirectToReport(fragment);
             // Set the new container
             const newContainer = fragment.querySelector('#dpr-current-status__content');
             if (!newContainer)
@@ -1309,6 +1305,11 @@ class DprReportStatus extends PollingClientClass {
             // Replace the old container
             this.container.replaceWith(newContainer);
             this.container = newContainer;
+            if (!!redirectUrl) {
+                setTimeout(() => {
+                    window.location.replace(redirectUrl);
+                }, 1000);
+            }
         }
         catch (error) {
             console.error('Polling error', error);
@@ -1325,13 +1326,7 @@ class DprReportStatus extends PollingClientClass {
     }
     redirectToReport(fragment) {
         const redirectEl = fragment.querySelector('[data-redirect]');
-        if (!redirectEl)
-            return false;
-        const url = redirectEl.getAttribute('data-redirect');
-        if (!url)
-            return false;
-        window.location.replace(url);
-        return true;
+        return redirectEl?.getAttribute('data-redirect') ?? null;
     }
 }
 
@@ -2178,8 +2173,10 @@ class DprMyReports extends PollingClientClass {
                 headers: {
                     'X-Requested-With': 'XMLHttpRequest',
                     'Content-Type': 'application/json',
+                    'CSRF-Token': this.csrfToken,
                 },
                 body: JSON.stringify(body),
+                credentials: 'same-origin',
             });
             if (!res.ok) {
                 console.error('Remove failed');