@ministryofjustice/hmpps-digital-prison-reporting-frontend 3.23.0 → 3.23.2

package/dpr/assets/js/all.mjs

@@ -752,8 +752,8 @@ class DprPollingStatusClass extends DprClientClass {
     return this.getStatus('/getStatus/', metaData, csrfToken)
   }
 
-  async getExpiredStatus(metaData, csrfToken) {
-    return this.getStatus('/getExpiredStatus/', metaData, csrfToken)
+  async getExpiredStatus(endpoint, metaData, csrfToken) {
+    return this.getStatus(endpoint, metaData, csrfToken)
   }
 
   async getStatus(endpoint, body, csrfToken) {
@@ -922,7 +922,8 @@ class BookmarkToggle extends DprClientClass {
   }
 
   initToggles() {
-    document.querySelectorAll('.bookmark-input[type=checkbox]').forEach((bookmarkToggle) => {
+    const element = this.getElement();
+    element.querySelectorAll('.bookmark-input[type=checkbox]').forEach((bookmarkToggle) => {
       const csrfToken = bookmarkToggle.getAttribute('data-csrf-token');
       const reportId = bookmarkToggle.getAttribute('data-report-id');
       const variantId = bookmarkToggle.getAttribute('data-variant-id');
@@ -1092,7 +1093,7 @@ class DprAsyncRequestList extends DprPollingStatusClass {
         await Promise.all(
           meta.map(async (metaData) => {
             if (metaData.status !== 'EXPIRED') {
-              const response = await this.getExpiredStatus(metaData, this.csrfToken);
+              const response = await this.getExpiredStatus('/getRequestedExpiredStatus/', metaData, this.csrfToken);
               if (response.isExpired) {
                 window.location.reload();
               }
@@ -1100,7 +1101,7 @@ class DprAsyncRequestList extends DprPollingStatusClass {
           }),
         );
       }
-    }, 60000); // 1 minute
+    }, '60000'); // 1 minute
   }
 
   initStatusPollingStatus() {
@@ -1127,7 +1128,8 @@ class DprAsyncRequestList extends DprPollingStatusClass {
   initItemActions() {
     this.removeActions.forEach((button) => {
       const id = button.getAttribute('data-execution-id');
-      button.addEventListener('click', async () => {
+      button.addEventListener('click', async (e) => {
+        e.preventDefault();
         await this.removeItemFromList(id);
       });
     });
@@ -1182,7 +1184,7 @@ class DprRecentlyViewedList extends DprPollingStatusClass {
         await Promise.all(
           meta.map(async (metaData) => {
             if (metaData.status !== 'EXPIRED') {
-              const response = await this.getExpiredStatus(metaData, this.csrfToken);
+              const response = await this.getExpiredStatus('/getExpiredStatus/', metaData, this.csrfToken);
               if (response.isExpired) {
                 window.location.reload();
               }
@@ -1196,7 +1198,8 @@ class DprRecentlyViewedList extends DprPollingStatusClass {
   initItemActions() {
     this.removeActions.forEach((button) => {
       const id = button.getAttribute('data-execution-id');
-      button.addEventListener('click', async () => {
+      button.addEventListener('click', async (e) => {
+        e.preventDefault();
         await this.removeItemFromList(id);
       });
     });

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

@@ -105,6 +105,13 @@ exports.default = {
         }
         return response;
     },
+    getExpiredStatus: async ({ req, res, services }) => {
+        const report = await (0, reportStatusHelper_1.getExpiredStatus)({ req, res, services });
+        if (report.isExpired) {
+            await services.asyncReportsStore.setToExpired(report.executionId);
+        }
+        return report.isExpired;
+    },
     renderList: async ({ services, res, maxRows, }) => {
         const csrfToken = res.locals.csrfToken || 'csrfToken';
         const requestedReportsData = await services.asyncReportsStore.getAllReports();

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

@@ -1,7 +1,7 @@
 import { CardData, RenderTableListResponse } from '../table-card-group/types'
 import { AsyncReportUtilsParams } from '../../types/AsyncReportUtils'
 import { AsyncReportData, RequestStatus } from '../../types/AsyncReport'
-import { getStatus } from '../../utils/reportStatusHelper'
+import { getStatus, getExpiredStatus } from '../../utils/reportStatusHelper'
 import * as ReportListHelper from '../../utils/reportsListHelper'
 
 export const formatCardData = (requestedReportsData: AsyncReportData): CardData => {
@@ -101,6 +101,14 @@ export default {
     return response
   },
 
+  getExpiredStatus: async ({ req, res, services }: AsyncReportUtilsParams) => {
+    const report = await getExpiredStatus({ req, res, services })
+    if (report.isExpired) {
+      await services.asyncReportsStore.setToExpired(report.executionId)
+    }
+    return report.isExpired
+  },
+
   renderList: async ({
     services,
     res,

package/dpr/components/reports-list/view.njk

@@ -4,14 +4,12 @@
 {% macro dprReportsList(head, rows, id = 'reports-search') %}
 
   {% set tableHtml %}
-  <div data-dpr-module="bookmark-toggle">
     {{ govukTable({
       captionClasses: "govuk-table__caption--m",
       head: head,
       rows: rows,
       classes: "dpr-search-table"
     }) }}
-  </div>
   {% endset %}
 
   {{ dprSearch(id, tableHtml) }}

package/dpr/routes/asyncReports.js

@@ -131,6 +131,15 @@ function routes({ router, services, layoutPath, templatePath = 'dpr/views/', })
             res.send({ status: 'FAILED' });
         }
     };
+    const getExpiredStatus = async (req, res, next) => {
+        try {
+            const response = await utils_3.default.getExpiredStatus({ req, res, services });
+            res.send({ isExpired: response });
+        }
+        catch (error) {
+            res.send({ status: 'FAILED' });
+        }
+    };
     const pollingHandler = async (req, res, next) => {
         try {
             const pollingRenderData = await utils_2.default.renderPolling({
@@ -177,6 +186,7 @@ function routes({ router, services, layoutPath, templatePath = 'dpr/views/', })
     router.post('/cancelRequest/', cancelRequestHandler, asyncErrorHandler);
     router.post('/removeRequestedItem/', removeRequestedItemHandler, asyncErrorHandler);
     router.post('/getStatus/', getStatusHandler);
+    router.post('/getRequestedExpiredStatus/', getExpiredStatus);
     router.get('/async-reports/:reportId/:variantId/request/:executionId', pollingHandler, asyncErrorHandler);
     router.get('/async-reports/:reportId/:variantId/request/:tableId/report', getReportHandler, asyncErrorHandler);
     router.get('/async-reports/requested', async (req, res) => {

package/dpr/routes/asyncReports.ts

@@ -119,6 +119,15 @@ export default function routes({
     }
   }
 
+  const getExpiredStatus: RequestHandler = async (req, res, next) => {
+    try {
+      const response = await AsyncRequestListUtils.getExpiredStatus({ req, res, services })
+      res.send({ isExpired: response })
+    } catch (error) {
+      res.send({ status: 'FAILED' })
+    }
+  }
+
   const pollingHandler: RequestHandler = async (req, res, next) => {
     try {
       const pollingRenderData = await AsyncPollingUtils.renderPolling({
@@ -165,6 +174,7 @@ export default function routes({
   router.post('/cancelRequest/', cancelRequestHandler, asyncErrorHandler)
   router.post('/removeRequestedItem/', removeRequestedItemHandler, asyncErrorHandler)
   router.post('/getStatus/', getStatusHandler)
+  router.post('/getRequestedExpiredStatus/', getExpiredStatus)
   router.get('/async-reports/:reportId/:variantId/request/:executionId', pollingHandler, asyncErrorHandler)
   router.get('/async-reports/:reportId/:variantId/request/:tableId/report', getReportHandler, asyncErrorHandler)
   router.get('/async-reports/requested', async (req, res) => {

package/dpr/services/bookmarkService.js

@@ -51,7 +51,7 @@ class BookmarkService extends userStoreService_1.default {
     createBookMarkToggleHtml(reportId, variantId, csrfToken, id) {
         const checked = this.isBookmarked(variantId) ? 'checked' : null;
         const tooltip = !checked ? 'Add Bookmark' : 'Remove Bookmark';
-        return `<div class='dpr-bookmark dpr-bookmark-tooltip dpr-bookmark-table' tooltip="${tooltip}">
+        return `<div class='dpr-bookmark dpr-bookmark-tooltip dpr-bookmark-table' tooltip="${tooltip}" data-dpr-module="bookmark-toggle">
   <input class="bookmark-input" aria-label="bookmark toggle" type='checkbox' id='${reportId}-${variantId}-${id}' data-report-id='${reportId}' data-variant-id='${variantId}' data-csrf-token='${csrfToken}' ${checked} />
   <label id="${variantId}-${reportId}-bookmark-label" for='${reportId}-${variantId}-${id}'><span class="dpr-visually-hidden">Bookmark toggle</span></label>
 </div>`;

package/dpr/services/bookmarkService.ts

@@ -59,7 +59,7 @@ export default class BookmarkService extends UserStoreService {
   createBookMarkToggleHtml(reportId: string, variantId: string, csrfToken: string, id: string) {
     const checked = this.isBookmarked(variantId) ? 'checked' : null
     const tooltip = !checked ? 'Add Bookmark' : 'Remove Bookmark'
-    return `<div class='dpr-bookmark dpr-bookmark-tooltip dpr-bookmark-table' tooltip="${tooltip}">
+    return `<div class='dpr-bookmark dpr-bookmark-tooltip dpr-bookmark-table' tooltip="${tooltip}" data-dpr-module="bookmark-toggle">
   <input class="bookmark-input" aria-label="bookmark toggle" type='checkbox' id='${reportId}-${variantId}-${id}' data-report-id='${reportId}' data-variant-id='${variantId}' data-csrf-token='${csrfToken}' ${checked} />
   <label id="${variantId}-${reportId}-bookmark-label" for='${reportId}-${variantId}-${id}'><span class="dpr-visually-hidden">Bookmark toggle</span></label>
 </div>`

package/dpr/services/requestedReportsService.js

@@ -130,6 +130,23 @@ class AsyncReportStoreService extends userStoreService_1.default {
         this.requestedReports[index] = report;
         await this.saveRequestedReportState();
     }
+    async setToExpired(id) {
+        await this.getRequestedReportsState();
+        const index = this.findIndexByExecutionId(id, this.requestedReports);
+        let report = this.requestedReports[index];
+        if (report) {
+            report = {
+                ...report,
+                status: AsyncReport_1.RequestStatus.EXPIRED,
+                timestamp: {
+                    ...report.timestamp,
+                    expired: new Date(),
+                },
+            };
+        }
+        this.requestedReports[index] = report;
+        await this.saveRequestedReportState();
+    }
     updateDataByStatus(report, status, errorMessage) {
         const ts = new Date();
         const { tableId } = report;

package/dpr/services/requestedReportsService.ts

@@ -166,6 +166,24 @@ export default class AsyncReportStoreService extends UserStoreService {
     await this.saveRequestedReportState()
   }
 
+  async setToExpired(id: string) {
+    await this.getRequestedReportsState()
+    const index = this.findIndexByExecutionId(id, this.requestedReports)
+    let report: AsyncReportData = this.requestedReports[index]
+    if (report) {
+      report = {
+        ...report,
+        status: RequestStatus.EXPIRED,
+        timestamp: {
+          ...report.timestamp,
+          expired: new Date(),
+        },
+      }
+    }
+    this.requestedReports[index] = report
+    await this.saveRequestedReportState()
+  }
+
   updateDataByStatus(report: AsyncReportData, status?: RequestStatus | undefined, errorMessage?: string) {
     const ts = new Date()
     const { tableId } = report

package/package.json

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