@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.1.2 → 4.1.3

package/dpr/assets/js/all.mjs

@@ -344,7 +344,7 @@ class DprQueryParamClass extends DprClientClass {
   initInputEvents(elements) {
     Array.from(elements).forEach((input) => {
       input.addEventListener('change', () => {
-        this.setQueryParamFromInput(input, true);
+        this.setQueryParamFromInput(input, true, false);
       });
     });
   }
@@ -357,7 +357,7 @@ class DprQueryParamClass extends DprClientClass {
    */
   initQueryParamsFromInputs(elements) {
     Array.from(elements).forEach((input) => {
-      if (input.type !== 'hidden') this.setQueryParamFromInput(input);
+      if (input.type !== 'hidden') this.setQueryParamFromInput(input, false, true);
     });
   }
 
@@ -368,10 +368,10 @@ class DprQueryParamClass extends DprClientClass {
    * @param {*} toggleCheckbox
    * @memberof DprQueryParamClass
    */
-  setQueryParamFromInput(input, toggleCheckbox = false) {
+  setQueryParamFromInput(input, toggleCheckbox = false, init = false) {
     const { type } = input;
     if (type === 'checkbox' || type === 'radio') {
-      this.setMultiSelectQueryParam(input, toggleCheckbox);
+      this.setMultiSelectQueryParam(input, toggleCheckbox, init);
     } else {
       const { name } = input;
       let { value } = input;
@@ -393,12 +393,15 @@ class DprQueryParamClass extends DprClientClass {
    * @param {*} toggle - adds the delete step on toggle
    * @memberof DprQueryParamClass
    */
-  setMultiSelectQueryParam(input, toggle) {
+  setMultiSelectQueryParam(input, toggle, init) {
     this.queryParams = new URLSearchParams(window.location.search);
     const { name, value, checked, type } = input;
     if (checked && !this.queryParams.has(name, value)) {
       let updateType;
-      if (type === 'checkbox') updateType = 'append';
+      if (type === 'checkbox') {
+        updateType = 'append';
+        if (!init && name !== 'columns') this.updateQueryParam('preventDefault', true);
+      }
       this.updateQueryParam(name, value, updateType);
     } else if (!checked && this.queryParams.has(name, value) && toggle) {
       this.updateQueryParam(name, value, 'delete');

package/dpr/components/_filters/filters-selected/utils.js

@@ -163,7 +163,7 @@ const disabledDateRange = (f, value, displayValue) => {
 };
 const disabledDate = (f, value, displayValue) => {
     const { min, max } = f;
-    if (value[0].includes(min) || value[1].includes(max)) {
+    if (value[0].includes(min) || value[0].includes(max)) {
         let valueType;
         if (value[0].includes(min))
             valueType = 'min';

package/dpr/components/_filters/filters-selected/utils.ts

@@ -171,7 +171,7 @@ const disabledDateRange = (f: DateFilterValue, value: (string | DateRange)[], di
 
 const disabledDate = (f: DateFilterValue, value: (string | DateRange)[], displayValue: string) => {
   const { min, max } = <DateFilterValue>f
-  if ((<string>value[0]).includes(min) || (<string>value[1]).includes(max)) {
+  if ((<string>value[0]).includes(min) || (<string>value[0]).includes(max)) {
     let valueType
     if ((<string>value[0]).includes(min)) valueType = 'min'
     if ((<string>value[0]).includes(max)) valueType = 'max'

package/dpr/components/_inputs/mulitselect/utils.js

@@ -2,14 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const setValueFromRequest = (filter, req, prefix) => {
     const { preventDefault } = req.query;
-    const valueArr = req.query[`${prefix}${filter.name}`];
-    const valueString = valueArr ? valueArr.join(',') : '';
+    const queryValue = req.query[`${prefix}${filter.name}`];
+    let valueArr;
+    let valueString;
+    if (queryValue === null || queryValue === void 0 ? void 0 : queryValue.length) {
+        valueArr = Array.isArray(queryValue) ? queryValue : [queryValue];
+        valueString = valueArr.join(',');
+    }
     const defaultValue = preventDefault ? null : filter.value;
     let defaultValues = filter.value ? filter.value.split(',') : [];
     defaultValues = preventDefault ? [] : defaultValues;
     return {
-        requestfilterValue: valueString || defaultValue,
-        requestfilterValues: valueArr || defaultValues,
+        requestfilterValue: valueString || defaultValue || null,
+        requestfilterValues: valueArr || defaultValues || [],
     };
 };
 exports.default = {

package/dpr/components/_inputs/mulitselect/utils.ts

@@ -3,17 +3,21 @@ import { FilterValue } from '../../_filters/types'
 
 const setValueFromRequest = (filter: FilterValue, req: Request, prefix: string) => {
   const { preventDefault } = req.query
+  const queryValue = <string[] | string | undefined>req.query[`${prefix}${filter.name}`]
 
-  const valueArr = <string[]>req.query[`${prefix}${filter.name}`]
-  const valueString = valueArr ? valueArr.join(',') : ''
+  let valueArr: string[]
+  let valueString: string
+  if (queryValue?.length) {
+    valueArr = Array.isArray(queryValue) ? queryValue : [queryValue]
+    valueString = valueArr.join(',')
+  }
   const defaultValue = preventDefault ? null : filter.value
-
   let defaultValues = filter.value ? (<string>filter.value).split(',') : []
   defaultValues = preventDefault ? [] : defaultValues
 
   return {
-    requestfilterValue: valueString || defaultValue,
-    requestfilterValues: valueArr || defaultValues,
+    requestfilterValue: valueString || defaultValue || null,
+    requestfilterValues: valueArr || defaultValues || [],
   }
 }
 

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