@ministryofjustice/hmpps-digital-prison-reporting-frontend 3.3.6 → 3.4.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/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.4.0",
   "main": "dpr/assets/js/all.mjs",
   "sass": "dpr/all.scss",
   "engines": {