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

package/dpr/assets/js/all.mjs

@@ -341,12 +341,10 @@ class Filters extends DprLoadingClientClass {
     e.preventDefault();
     const filtersForm = document.getElementById('user-selected-filters-form');
     const filtersRegExp = /filters[.\w]+=[^&]*/g;
-    const pagingRegExp = /paging\.selectedPage=\d+/;
+    const pagingRegExp = /selectedPage=\d+/;
     const ampRexExp = /(&)\1+/g;
 
-    let url = decodeURI(window.location.href)
-      .replaceAll(filtersRegExp, '')
-      .replace(pagingRegExp, 'paging.selectedPage=1');
+    let url = decodeURI(window.location.href).replaceAll(filtersRegExp, '').replace(pagingRegExp, 'selectedPage=1');
     url += url.indexOf('?') === -1 ? '?' : '&';
 
     const formData = new FormData(filtersForm);

package/dpr/components/filters/utils.js

@@ -10,6 +10,31 @@ const filterHasValue = (value) => {
 const getFilterValue = (filterValues, name) => {
     return filterHasValue(filterValues[name]) ? filterValues[name] : null;
 };
+const setMinMax = (filter, startValue, endValue) => {
+    const { min, max } = filter;
+    let start;
+    if (min) {
+        const minDate = new Date(min);
+        const startDate = new Date(startValue);
+        start = startDate < minDate ? min : startValue;
+    }
+    else {
+        start = startValue;
+    }
+    let end;
+    if (max) {
+        const maxDate = new Date(max);
+        const endDate = new Date(endValue);
+        end = endDate > maxDate ? max : endValue;
+    }
+    else {
+        end = endValue;
+    }
+    return {
+        start,
+        end,
+    };
+};
 exports.default = {
     getFilters: (variantDefinition, filterValues, dynamicAutocompleteEndpoint = null) => variantDefinition.specification.fields
         .filter((f) => f.filter)
@@ -28,12 +53,15 @@ exports.default = {
                 : dynamicAutocompleteEndpoint.replace('{fieldName}', f.name),
         };
         if (f.filter.type === enum_1.FilterType.dateRange.toLowerCase()) {
+            const startValue = getFilterValue(filterValues, `${f.name}.start`);
+            const endValue = getFilterValue(filterValues, `${f.name}.end`);
+            const { start, end } = setMinMax(f.filter, startValue, endValue);
             filter = filter;
             filter = {
                 ...filter,
                 value: {
-                    start: getFilterValue(filterValues, `${f.name}.start`),
-                    end: getFilterValue(filterValues, `${f.name}.end`),
+                    start,
+                    end,
                 },
                 min: f.filter.min,
                 max: f.filter.max,
@@ -50,16 +78,19 @@ exports.default = {
         .map((f) => {
         let filterValueText = getFilterValue(reportQuery.filters, f.name);
         if (f.filter.type === enum_1.FilterType.dateRange.toLowerCase()) {
-            const start = toLocaleDate(getFilterValue(reportQuery.filters, `${f.name}.start`));
-            const end = toLocaleDate(getFilterValue(reportQuery.filters, `${f.name}.end`));
-            if (start && end) {
-                filterValueText = `${start} - ${end}`;
+            const startValue = getFilterValue(reportQuery.filters, `${f.name}.start`);
+            const endValue = getFilterValue(reportQuery.filters, `${f.name}.end`);
+            const { start, end } = setMinMax(f.filter, startValue, endValue);
+            const localeStart = toLocaleDate(start);
+            const localeEnd = toLocaleDate(end);
+            if (localeStart && localeEnd) {
+                filterValueText = `${localeStart} - ${localeEnd}`;
             }
-            else if (start) {
-                filterValueText = `From ${start}`;
+            else if (localeStart) {
+                filterValueText = `From ${localeStart}`;
             }
             else {
-                filterValueText = `Until ${end}`;
+                filterValueText = `Until ${localeEnd}`;
             }
         }
         else if (f.filter.staticOptions) {

package/dpr/components/filters/utils.ts

@@ -17,6 +17,32 @@ const getFilterValue = (filterValues: Dict<string>, name: string) => {
   return filterHasValue(filterValues[name]) ? filterValues[name] : null
 }
 
+const setMinMax = (filter: components['schemas']['FilterDefinition'], startValue: string, endValue: string) => {
+  const { min, max } = filter
+  let start
+  if (min) {
+    const minDate = new Date(min)
+    const startDate = new Date(startValue)
+    start = startDate < minDate ? min : startValue
+  } else {
+    start = startValue
+  }
+
+  let end
+  if (max) {
+    const maxDate = new Date(max)
+    const endDate = new Date(endValue)
+    end = endDate > maxDate ? max : endValue
+  } else {
+    end = endValue
+  }
+
+  return {
+    start,
+    end,
+  }
+}
+
 export default {
   getFilters: (
     variantDefinition: components['schemas']['VariantDefinition'],
@@ -42,12 +68,16 @@ export default {
         }
 
         if (f.filter.type === FilterType.dateRange.toLowerCase()) {
+          const startValue = getFilterValue(filterValues, `${f.name}.start`)
+          const endValue = getFilterValue(filterValues, `${f.name}.end`)
+          const { start, end } = setMinMax(f.filter, startValue, endValue)
+
           filter = filter as unknown as DateFilterValue
           filter = {
             ...filter,
             value: {
-              start: getFilterValue(filterValues, `${f.name}.start`),
-              end: getFilterValue(filterValues, `${f.name}.end`),
+              start,
+              end,
             },
             min: f.filter.min,
             max: f.filter.max,
@@ -75,16 +105,20 @@ export default {
       )
       .map((f) => {
         let filterValueText = getFilterValue(reportQuery.filters, f.name)
+
         if (f.filter.type === FilterType.dateRange.toLowerCase()) {
-          const start = toLocaleDate(getFilterValue(reportQuery.filters, `${f.name}.start`))
-          const end = toLocaleDate(getFilterValue(reportQuery.filters, `${f.name}.end`))
+          const startValue = getFilterValue(reportQuery.filters, `${f.name}.start`)
+          const endValue = getFilterValue(reportQuery.filters, `${f.name}.end`)
+          const { start, end } = setMinMax(f.filter, startValue, endValue)
+          const localeStart = toLocaleDate(start)
+          const localeEnd = toLocaleDate(end)
 
-          if (start && end) {
-            filterValueText = `${start} - ${end}`
-          } else if (start) {
-            filterValueText = `From ${start}`
+          if (localeStart && localeEnd) {
+            filterValueText = `${localeStart} - ${localeEnd}`
+          } else if (localeStart) {
+            filterValueText = `From ${localeStart}`
           } else {
-            filterValueText = `Until ${end}`
+            filterValueText = `Until ${localeEnd}`
           }
         } else if (f.filter.staticOptions) {
           filterValueText = f.filter.staticOptions.find((o) => o.name === filterValueText).display

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