@ministryofjustice/hmpps-digital-prison-reporting-frontend 3.26.13 → 3.26.14

package/dpr/components/async-filters/utils.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setDurationStartAndEnd = exports.updateStore = exports.getRelativeDateOptions = exports.calcDates = void 0;
 const dayjs_1 = __importDefault(require("dayjs"));
+const customParseFormat_1 = __importDefault(require("dayjs/plugin/customParseFormat"));
 const isBetween_1 = __importDefault(require("dayjs/plugin/isBetween"));
 const utils_1 = __importDefault(require("../filters/utils"));
 const enum_1 = require("../filter-input/enum");
@@ -261,7 +262,10 @@ const setQuerySummary = (req, fields) => {
     let querySummary = [];
     const sortData = {};
     // eslint-disable-next-line no-useless-escape
-    const dateRegEx = /^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/;
+    const isoDateRegEx = /^(\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01]))$/;
+    // eslint-disable-next-line no-useless-escape
+    const localDateRegEx = /^(0?[1-9]|[12][0-9]|3[01])[\/\-](0?[1-9]|1[012])[\/\-]\d{4}$/;
+    dayjs_1.default.extend(customParseFormat_1.default);
     Object.keys(req.body)
         .filter((name) => name !== '_csrf' && req.body[name] !== '')
         .forEach((name) => {
@@ -275,7 +279,13 @@ const setQuerySummary = (req, fields) => {
             query[name] = value;
             filterData[shortName] = value;
             let dateDisplayValue;
-            if (value.match(dateRegEx)) {
+            if (value.match(localDateRegEx)) {
+                const formatDate = (0, dayjs_1.default)(value, 'DD/MM/YYYY');
+                const isoFormatDate = formatDate.format('YYYY-MM-DD');
+                query[name] = isoFormatDate;
+                filterData[shortName] = isoFormatDate;
+            }
+            else if (value.match(isoDateRegEx)) {
                 dateDisplayValue = (0, dayjs_1.default)(value).format('DD/MM/YYYY');
             }
             const fieldDisplayName = definitionUtils_1.default.getFieldDisplayName(fields, shortName);

package/dpr/components/async-filters/utils.ts

@@ -1,6 +1,7 @@
 /* eslint-disable no-param-reassign */
 import { Request, Response } from 'express'
 import dayjs from 'dayjs'
+import customParseFormat from 'dayjs/plugin/customParseFormat'
 import isBetween from 'dayjs/plugin/isBetween'
 import Dict = NodeJS.Dict
 import { components } from '../../types/api'
@@ -318,7 +319,10 @@ const setQuerySummary = (req: Request, fields: components['schemas']['FieldDefin
   let querySummary: Array<Dict<string>> = []
   const sortData: Dict<string> = {}
   // eslint-disable-next-line no-useless-escape
-  const dateRegEx = /^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/
+  const isoDateRegEx = /^(\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01]))$/
+  // eslint-disable-next-line no-useless-escape
+  const localDateRegEx = /^(0?[1-9]|[12][0-9]|3[01])[\/\-](0?[1-9]|1[012])[\/\-]\d{4}$/
+  dayjs.extend(customParseFormat)
 
   Object.keys(req.body)
     .filter((name) => name !== '_csrf' && req.body[name] !== '')
@@ -342,9 +346,15 @@ const setQuerySummary = (req: Request, fields: components['schemas']['FieldDefin
         filterData[shortName as keyof Dict<string>] = value
 
         let dateDisplayValue
-        if (value.match(dateRegEx)) {
+        if (value.match(localDateRegEx)) {
+          const formatDate = dayjs(value, 'DD/MM/YYYY')
+          const isoFormatDate = formatDate.format('YYYY-MM-DD')
+          query[name as keyof Dict<string>] = isoFormatDate
+          filterData[shortName as keyof Dict<string>] = isoFormatDate
+        } else if (value.match(isoDateRegEx)) {
           dateDisplayValue = dayjs(value).format('DD/MM/YYYY')
         }
+
         const fieldDisplayName = DefinitionUtils.getFieldDisplayName(fields, shortName)
         querySummary.push({
           name: fieldDisplayName || shortName,

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