@ministryofjustice/hmpps-digital-prison-reporting-frontend 3.3.6 → 3.5.0

package/dpr/components/columns/view.njk

@@ -9,21 +9,21 @@
       {{ dprLoadingAnim() }}
 
       {{ govukCheckboxes({
-      id: 'columns.' + columns.name,
-      name: 'columns.' + columns.name,
-      classes: "govuk-checkboxes--small",
-      formGroup: {
-        classes: "govuk-!-margin-bottom-3"
-      },
-      fieldset: {
-        legend: {
-          text: columns.text,
-          classes: "govuk-label govuk-!-font-weight-bold"
-        }
-      },
-      items: columns.options,
-      values: columns.value
-    }) }}
+          id: 'columns.' + columns.name,
+          name: 'columns.' + columns.name,
+          classes: "govuk-checkboxes--small",
+          formGroup: {
+            classes: "govuk-!-margin-bottom-3"
+          },
+          fieldset: {
+            legend: {
+              text: columns.text,
+              classes: "govuk-label govuk-!-font-weight-bold"
+            }
+          },
+          items: columns.options,
+          values: columns.value
+        }) }}
     </div>
 
     <div class="filter-actions">

package/dpr/components/report-list/list.njk

@@ -38,7 +38,7 @@
 }) }}
 {% endset %}
 
-{% set subject = title | urlencode %}
+{% set subject = reportName + ' - ' + title | urlencode %}
 {% set body = (dataTableOptions.url) | urlencode %}
 {% set shareOptions = {
   title: "Share:",
@@ -109,7 +109,9 @@
   <div class="govuk-width-container {% if (dataTableOptions.printable == false) %}print-hide{% endif %} govuk-!-margin-top-3">
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-two-thirds">
-        <h1 class="govuk-heading-m">{{ title }}</h1>
+        <h1 class="govuk-heading-m">
+          {{ title }}
+        </h1>
       </div>
       <div class="govuk-grid-column-one-third">
         <div class="dpr-actions">

package/dpr/components/report-list/types.d.ts

@@ -11,6 +11,7 @@ export interface ListDataSources {
 
 export interface RenderListWithDataInput {
   title: string
+  reportName?: string
   variantDefinition: components['schemas']['VariantDefinition']
   request: Request
   response: Response

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

@@ -47,7 +47,7 @@ function redirectWithDefaultFilters(reportQuery, variantDefinition, response, re
     }
     return false;
 }
-function renderList(listData, variantDefinition, reportQuery, request, response, next, title, layoutTemplate, dynamicAutocompleteEndpoint, otherOptions) {
+function renderList(listData, variantDefinition, reportQuery, request, response, next, title, layoutTemplate, dynamicAutocompleteEndpoint, otherOptions, reportName) {
     if (!redirectWithDefaultFilters(reportQuery, variantDefinition, response, request)) {
         Promise.all([listData.data, listData.count])
             .then((resolvedData) => {
@@ -83,6 +83,7 @@ function renderList(listData, variantDefinition, reportQuery, request, response,
             };
             response.render('dpr/components/report-list/list', {
                 title,
+                reportName,
                 dataTableOptions,
                 filterOptions,
                 columnOptions,
@@ -111,7 +112,7 @@ const renderListWithDefinition = ({ title, definitionName, variantName, request,
             data: reportingClient.getListWithWarnings(variantDefinition.resourceName, token, reportQuery),
             count: reportingClient.getCount(variantDefinition.resourceName, token, reportQuery),
         };
-        renderList(getListData, variantDefinition, reportQuery, request, response, next, title !== null && title !== void 0 ? title : `${reportName} - ${variantDefinition.name}`, layoutTemplate, dynamicAutocompleteEndpoint, otherOptions);
+        renderList(getListData, variantDefinition, reportQuery, request, response, next, title !== null && title !== void 0 ? title : `${reportName} - ${variantDefinition.name}`, layoutTemplate, dynamicAutocompleteEndpoint, otherOptions, reportName);
     })
         .catch((error) => {
         next(error);
@@ -119,11 +120,11 @@ const renderListWithDefinition = ({ title, definitionName, variantName, request,
 };
 exports.default = {
     filtersQueryParameterPrefix,
-    renderListWithData: ({ title, variantDefinition, request, response, next, getListDataSources, otherOptions, layoutTemplate, dynamicAutocompleteEndpoint, }) => {
+    renderListWithData: ({ title, reportName, variantDefinition, request, response, next, getListDataSources, otherOptions, layoutTemplate, dynamicAutocompleteEndpoint, }) => {
         const { fields } = variantDefinition.specification;
         const reportQuery = new ReportQuery_1.default(fields, request.query, getDefaultSortColumn(fields), filtersQueryParameterPrefix);
         const listData = getListDataSources(reportQuery);
-        renderList(listData, variantDefinition, reportQuery, request, response, next, title, layoutTemplate, dynamicAutocompleteEndpoint, otherOptions);
+        renderList(listData, variantDefinition, reportQuery, request, response, next, title, layoutTemplate, dynamicAutocompleteEndpoint, otherOptions, reportName);
     },
     createReportListRequestHandler: ({ title, definitionName, variantName, apiUrl, apiTimeout, otherOptions, layoutTemplate, tokenProvider, dynamicAutocompleteEndpoint, }) => {
         return (request, response, next) => {

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

@@ -80,6 +80,7 @@ function renderList(
   layoutTemplate: string,
   dynamicAutocompleteEndpoint?: string,
   otherOptions?: NodeJS.Dict<object>,
+  reportName?: string,
 ) {
   if (!redirectWithDefaultFilters(reportQuery, variantDefinition, response, request)) {
     Promise.all([listData.data, listData.count])
@@ -120,6 +121,7 @@ function renderList(
 
         response.render('dpr/components/report-list/list', {
           title,
+          reportName,
           dataTableOptions,
           filterOptions,
           columnOptions,
@@ -181,6 +183,7 @@ const renderListWithDefinition = ({
         layoutTemplate,
         dynamicAutocompleteEndpoint,
         otherOptions,
+        reportName,
       )
     })
     .catch((error) => {
@@ -193,6 +196,7 @@ export default {
 
   renderListWithData: ({
     title,
+    reportName,
     variantDefinition,
     request,
     response,
@@ -222,6 +226,7 @@ export default {
       layoutTemplate,
       dynamicAutocompleteEndpoint,
       otherOptions,
+      reportName,
     )
   },
 

package/dpr/types/ReportQuery.js

@@ -20,7 +20,7 @@ class ReportQuery {
             this.columns = utils_1.default.getSelectedColumns(fields, columns);
         }
         else {
-            this.columns = fields.map((f) => f.name);
+            this.columns = fields.filter((f) => f.visible).map((f) => f.name);
         }
         this.filters = {};
         Object.keys(queryParams)

package/dpr/types/ReportQuery.ts

@@ -42,7 +42,7 @@ export default class ReportQuery implements FilteredListRequest {
         typeof queryParams.columns === 'string' ? queryParams.columns.split(',') : (queryParams.columns as string[])
       this.columns = ColumnUtils.getSelectedColumns(fields, columns)
     } else {
-      this.columns = fields.map((f) => f.name)
+      this.columns = fields.filter((f) => f.visible).map((f) => f.name)
     }
 
     this.filters = {}

package/dpr/types/api.d.ts

@@ -76,6 +76,7 @@ export interface components {
       /** @enum {string} */
       type: 'string' | 'date' | 'long' | 'time' | 'HTML'
       mandatory: boolean
+      visible: boolean
     }
     FilterDefinition: {
       /** @enum {string} */

package/dpr/utils/urlHelper.js

@@ -7,6 +7,7 @@ const createUrlForParameters = (currentQueryParams, updateQueryParams) => {
     if (updateQueryParams) {
         queryParams = {
             ...currentQueryParams,
+            selectedPage: '1',
         };
         Object.keys(updateQueryParams).forEach((q) => {
             if (updateQueryParams[q]) {

package/dpr/utils/urlHelper.ts

@@ -9,6 +9,7 @@ const createUrlForParameters = (
   if (updateQueryParams) {
     queryParams = {
       ...currentQueryParams,
+      selectedPage: '1',
     }
 
     Object.keys(updateQueryParams).forEach((q) => {

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.3.6",
+  "version": "3.5.0",
   "main": "dpr/assets/js/all.mjs",
   "sass": "dpr/all.scss",
   "engines": {