@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.2.4 → 4.2.6

package/dpr/components/user-reports/bookmarks/utils.js

@@ -10,13 +10,12 @@ const logger_1 = __importDefault(require("../../../utils/logger"));
 const definitionUtils_1 = __importDefault(require("../../../utils/definitionUtils"));
 const reportListsHelper_1 = require("../../../utils/reportListsHelper");
 const localsHelper_1 = __importDefault(require("../../../utils/localsHelper"));
-const formatBookmarks = async (bookmarksData, maxRows) => {
-    const cards = bookmarksData
+const formatBookmarks = async (bookmarksData) => {
+    return bookmarksData
         .map((report) => {
         return (0, exports.formatBookmark)(report);
     })
         .sort((a, b) => a.text.localeCompare(b.text));
-    return maxRows ? cards.slice(0, maxRows) : cards;
 };
 exports.formatBookmarks = formatBookmarks;
 const formatBookmark = (bookmarkData) => {
@@ -123,15 +122,18 @@ exports.default = {
     renderBookmarkList: async ({ services, maxRows, res, req, }) => {
         const { token, csrfToken, userId, bookmarks } = localsHelper_1.default.getValues(res);
         const bookmarksData = await mapBookmarkIdsToDefinition(bookmarks, req, res, token, services);
-        const formatted = await (0, exports.formatBookmarks)(bookmarksData, maxRows);
+        let formatted = await (0, exports.formatBookmarks)(bookmarksData);
+        const formattedCount = formatted.length;
+        if (maxRows)
+            formatted = formatted.slice(0, maxRows);
         const tableData = await formatTable(bookmarksData, services.bookmarkService, csrfToken, userId, maxRows);
         const head = {
             ...(formatted.length && { href: './async-reports/bookmarks' }),
             ...(!formatted.length && { emptyMessage: 'You have 0 bookmarked reports' }),
         };
         const total = {
-            amount: formatted.length,
-            shown: formatted.length > maxRows ? maxRows : formatted.length,
+            amount: formattedCount,
+            shown: formattedCount > maxRows ? maxRows : formattedCount,
             max: maxRows,
         };
         const result = {

package/dpr/components/user-reports/bookmarks/utils.ts

@@ -9,17 +9,12 @@ import DefinitionUtils from '../../../utils/definitionUtils'
 import { createListItemProduct, createListActions, setInitialHref } from '../../../utils/reportListsHelper'
 import LocalsHelper from '../../../utils/localsHelper'
 
-export const formatBookmarks = async (
-  bookmarksData: BookmarkedReportData[],
-  maxRows?: number,
-): Promise<FormattedUserReportData[]> => {
-  const cards = bookmarksData
+export const formatBookmarks = async (bookmarksData: BookmarkedReportData[]): Promise<FormattedUserReportData[]> => {
+  return bookmarksData
     .map((report: BookmarkedReportData) => {
       return formatBookmark(report)
     })
     .sort((a, b) => a.text.localeCompare(b.text))
-
-  return maxRows ? cards.slice(0, maxRows) : cards
 }
 
 export const formatBookmark = (bookmarkData: BookmarkedReportData): FormattedUserReportData => {
@@ -181,7 +176,11 @@ export default {
   }) => {
     const { token, csrfToken, userId, bookmarks } = LocalsHelper.getValues(res)
     const bookmarksData: BookmarkedReportData[] = await mapBookmarkIdsToDefinition(bookmarks, req, res, token, services)
-    const formatted = await formatBookmarks(bookmarksData, maxRows)
+
+    let formatted = await formatBookmarks(bookmarksData)
+    const formattedCount = formatted.length
+
+    if (maxRows) formatted = formatted.slice(0, maxRows)
     const tableData = await formatTable(bookmarksData, services.bookmarkService, csrfToken, userId, maxRows)
 
     const head = {
@@ -190,8 +189,8 @@ export default {
     }
 
     const total = {
-      amount: formatted.length,
-      shown: formatted.length > maxRows ? maxRows : formatted.length,
+      amount: formattedCount,
+      shown: formattedCount > maxRows ? maxRows : formattedCount,
       max: maxRows,
     }
 

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

@@ -15,7 +15,7 @@
   <div>
     <div class="dpr-slide__header">
       {% if not emptyMessage.length and total %}
-        <p class="govuk-body-s dpr-slide__sub-text">Showing {{ total.shown }} of {{ total.amount }} {% if total.amount > total.max %} <a class="govuk-body-s" href='{{ href }}'>Show all</a>{% endif %}</p>
+        <p class="govuk-body-s dpr-slide__sub-text">Showing {{ total.shown }} of {{ total.amount }}{% if total.amount > total.max %}. <a class="govuk-body-s" href='{{ href }}'>Show all</a>{% endif %}</p>
       {% endif %}
     </div>
     {% if emptyMessage.length %}

package/dpr/data/reportingClient.js

@@ -38,7 +38,7 @@ class ReportingClient {
         }));
     }
     getDefinitions(token, definitionsPath) {
-        this.logInfo('Get definitions', { definitionsPath });
+        this.logInfo('Get definitions');
         const params = {
             query: {
                 renderMethod: 'HTML',

package/dpr/data/reportingClient.ts

@@ -50,7 +50,7 @@ export default class ReportingClient {
     token: string,
     definitionsPath?: string,
   ): Promise<Array<components['schemas']['ReportDefinitionSummary']>> {
-    this.logInfo('Get definitions', { definitionsPath })
+    this.logInfo('Get definitions')
 
     const params: operations['definitions_1']['parameters'] = {
       query: {

package/dpr/routes/bookmarks.js

@@ -23,8 +23,9 @@ function routes({ router, services, layoutPath, prefix, }) {
     });
     router.get(`${prefix}/async-reports/bookmarks`, async (req, res) => {
         res.render(`dpr/views/async-reports`, {
-            title: 'Requested Reports',
+            title: 'Bookmarks',
             layoutPath,
+            catId: 'dpr-bookmarks-list',
             ...(await utils_1.default.renderBookmarkList({ services, res, req })),
         });
     });

package/dpr/routes/bookmarks.ts

@@ -31,8 +31,9 @@ export default function routes({
 
   router.get(`${prefix}/async-reports/bookmarks`, async (req, res) => {
     res.render(`dpr/views/async-reports`, {
-      title: 'Requested Reports',
+      title: 'Bookmarks',
       layoutPath,
+      catId: 'dpr-bookmarks-list',
       ...(await BookmarklistUtils.renderBookmarkList({ services, res, req })),
     })
   })

package/dpr/routes/recentlyViewed.js

@@ -30,16 +30,16 @@ function routes({ router, services, layoutPath, prefix, }) {
         await services.recentlyViewedService.removeReport(req.body.executionId, userId);
         res.end();
     };
-    router.get(`${prefix}/async-reports/recently-viewed`, async (req, res) => {
+    router.get(`${prefix}/async-reports/viewed`, async (req, res) => {
         const { recentlyViewedReports } = localsHelper_1.default.getValues(res);
         res.render(`dpr/views/async-reports`, {
-            title: 'Requested Reports',
+            title: 'Recently viewed reports',
             layoutPath,
             ...(await utils_2.default.renderList({
                 reportsData: recentlyViewedReports,
                 filterFunction: utils_1.default.filterReports,
                 res,
-                type: 'requested',
+                type: 'viewed',
             })),
         });
     });

package/dpr/routes/recentlyViewed.ts

@@ -38,16 +38,16 @@ export default function routes({
     res.end()
   }
 
-  router.get(`${prefix}/async-reports/recently-viewed`, async (req, res) => {
+  router.get(`${prefix}/async-reports/viewed`, async (req, res) => {
     const { recentlyViewedReports } = LocalsHelper.getValues(res)
     res.render(`dpr/views/async-reports`, {
-      title: 'Requested Reports',
+      title: 'Recently viewed reports',
       layoutPath,
       ...(await UserReportsListUtils.renderList({
         reportsData: recentlyViewedReports,
         filterFunction: RecentReportslistUtils.filterReports,
         res,
-        type: 'requested',
+        type: 'viewed',
       })),
     })
   })

package/dpr/views/async-reports.njk

@@ -1,12 +1,14 @@
 {% extends layoutPath %}
 
-{% from "..components/_catalogue/catalogue-list/view.njk" import dprCatalogueList %}
+{% from "../components/_catalogue/catalogue-list/view.njk" import dprCatalogueList %}
 
 {% set mainClasses = "app-container govuk-body" %}
 
 {% block content %}
   <div class="govuk-width-container">
     <h1>{{ title }}</h1>
-    {{ dprCatalogueList(tableData.head, tableData.rows, { unauthorisedToggleEnabled: false }) }}
+    <div id="{{ catId }}">
+      {{ dprCatalogueList(tableData.head, tableData.rows, { unauthorisedToggleEnabled: false }) }}
+    </div>
   </div>
 {% endblock %}

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": "4.2.4",
+  "version": "4.2.6",
   "main": "dpr/all.mjs",
   "sass": "dpr/all.scss",
   "engines": {