@ministryofjustice/hmpps-digital-prison-reporting-frontend 3.22.2 → 3.22.4

package/dpr/assets/js/all.mjs

@@ -971,7 +971,9 @@ class BookmarkToggle extends DprClientClass {
       }),
     })
       .then(() => {
-        window.location.reload();
+        if (!window.location.href.includes('/report')) {
+          window.location.reload();
+        }
       })
       .catch((error) => console.error('Error:', error));
   }

package/dpr/components/reports-list/utils.js

@@ -4,10 +4,18 @@ exports.default = {
     mapReportsList: (res, services) => {
         const { definitions, csrfToken } = res.locals;
         const pathSuffix = res.locals.pathSuffix || '';
-        const allVariants = definitions.flatMap((def) => {
+        const sortedDefinitions = definitions.sort((a, b) => {
+            if (a.name < b.name)
+                return -1;
+            if (a.name > b.name)
+                return 1;
+            return 0;
+        });
+        const sortedVariants = sortedDefinitions.flatMap((def) => {
             const { id: reportId, name: reportName, description: reportDescription } = def;
             const { variants } = def;
-            return variants.map((variant) => {
+            return variants
+                .map((variant) => {
                 const { id: variantId, name: variantName, description: variantDescription } = variant;
                 return {
                     reportName,
@@ -17,17 +25,15 @@ exports.default = {
                     variantDescription,
                     reportDescription,
                 };
+            })
+                .sort((a, b) => {
+                if (a.variantName < b.variantName)
+                    return -1;
+                if (a.variantName > b.variantName)
+                    return 1;
+                return 0;
             });
         });
-        const sortedVariants = allVariants.sort((a, b) => {
-            if (a.variantName < b.variantName) {
-                return -1;
-            }
-            if (a.variantName > b.variantName) {
-                return 1;
-            }
-            return 0;
-        });
         const rows = sortedVariants.map((v) => {
             const { variantId, variantName, variantDescription, reportName, reportId, reportDescription } = v;
             return [

package/dpr/components/reports-list/utils.ts

@@ -18,30 +18,35 @@ export default {
     const { definitions, csrfToken } = res.locals
     const pathSuffix = res.locals.pathSuffix || ''
 
-    const allVariants = definitions.flatMap((def: components['schemas']['ReportDefinitionSummary']) => {
+    const sortedDefinitions = definitions.sort(
+      (a: components['schemas']['ReportDefinitionSummary'], b: components['schemas']['ReportDefinitionSummary']) => {
+        if (a.name < b.name) return -1
+        if (a.name > b.name) return 1
+        return 0
+      },
+    )
+
+    const sortedVariants = sortedDefinitions.flatMap((def: components['schemas']['ReportDefinitionSummary']) => {
       const { id: reportId, name: reportName, description: reportDescription } = def
       const { variants } = def
-      return variants.map((variant) => {
-        const { id: variantId, name: variantName, description: variantDescription } = variant
-        return {
-          reportName,
-          reportId,
-          variantId,
-          variantName,
-          variantDescription,
-          reportDescription,
-        }
-      })
-    })
 
-    const sortedVariants = allVariants.sort((a: variantData, b: variantData) => {
-      if (a.variantName < b.variantName) {
-        return -1
-      }
-      if (a.variantName > b.variantName) {
-        return 1
-      }
-      return 0
+      return variants
+        .map((variant) => {
+          const { id: variantId, name: variantName, description: variantDescription } = variant
+          return {
+            reportName,
+            reportId,
+            variantId,
+            variantName,
+            variantDescription,
+            reportDescription,
+          }
+        })
+        .sort((a: variantData, b: variantData) => {
+          if (a.variantName < b.variantName) return -1
+          if (a.variantName > b.variantName) return 1
+          return 0
+        })
     })
 
     const rows = sortedVariants.map((v: variantData) => {

package/dpr/services/bookmarkService.js

@@ -52,8 +52,8 @@ class BookmarkService extends userStoreService_1.default {
         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}">
-  <input class="bookmark-input" aria-label="bookmark toggle" type='checkbox' id='${variantId}-${id}' data-report-id='${reportId}' data-variant-id='${variantId}' data-csrf-token='${csrfToken}' ${checked} />
-  <label id="${variantId}-${reportId}-bookmark-label" for='${variantId}-${id}'><span class="dpr-visually-hidden">Bookmark toggle</span></label>
+  <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

@@ -60,8 +60,8 @@ export default class BookmarkService extends UserStoreService {
     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}">
-  <input class="bookmark-input" aria-label="bookmark toggle" type='checkbox' id='${variantId}-${id}' data-report-id='${reportId}' data-variant-id='${variantId}' data-csrf-token='${csrfToken}' ${checked} />
-  <label id="${variantId}-${reportId}-bookmark-label" for='${variantId}-${id}'><span class="dpr-visually-hidden">Bookmark toggle</span></label>
+  <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/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.22.2",
+  "version": "3.22.4",
   "main": "dpr/assets/js/all.mjs",
   "sass": "dpr/all.scss",
   "engines": {