@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.0.0 → 4.0.2

package/dpr/assets/js/all.mjs

@@ -327,8 +327,8 @@ class DprQueryParamClass extends DprClientClass {
         if (type === 'radio' || type === 'checkbox') {
           this.setMultiSelectValue(inputs, value);
         } else if (input.classList.contains('moj-js-datepicker-input')) {
-          const formatted = dayjs(value, 'YYYY-MM-DD');
-          input.value = formatted.format('DD/MM/YYYY');
+          const formatted = dayjs(value, 'YYYY-MM-DD').format('DD/MM/YYYY');
+          input.value = formatted !== 'Invalid Date' ? formatted : '';
         } else {
           input.value = value;
         }
@@ -376,13 +376,13 @@ class DprQueryParamClass extends DprClientClass {
       } else {
         const { name } = input;
         let { value } = input;
-        let { staticOptionNameValue } = input;
-        let isDateInput = input.classList.contains('moj-js-datepicker-input');
+        const { staticOptionNameValue } = input;
+        const isDateInput = input.classList.contains('moj-js-datepicker-input');
         if (isDateInput) {
           const formatted = dayjs(value, 'D/M/YYYY').format('YYYY-MM-DD');
           value = formatted !== 'Invalid Date' ? formatted : '';
         }
-        let valueToUpdate = !isDateInput && staticOptionNameValue ? staticOptionNameValue : value;
+        const valueToUpdate = !isDateInput && staticOptionNameValue ? staticOptionNameValue : value;
         if (name) this.updateQueryParam(name, valueToUpdate);
       }
     }
@@ -1021,7 +1021,7 @@ class Filters extends DprClientClass {
 
         if (v.match(dateRegEx)) {
           // eslint-disable-next-line no-param-reassign
-          v = dayjs(v, 'DD/MM/YYYY').format('YYYY-MM-DD');
+          v = dayjs(v, 'D/M/YYYY').format('YYYY-MM-DD');
         }
 
         serializedFormData += `&${n}=${v}`;
@@ -1067,7 +1067,7 @@ class Filters extends DprClientClass {
 
 class DprPollingStatusClass extends DprClientClass {
   getPollingFrquency() {
-    return '20' // 2 seconds
+    return '2000' // 2 seconds
   }
 
   getPollingStatuses() {

package/dpr/components/_dashboards/scorecard-group/view.njk

@@ -5,8 +5,11 @@
   {% for group in scorecardGroup %}
     {% set title = group.title %}
     {% set scorecards = group.scorecards %}
+    
+    {% if scorecardGroup.length !== 1 %}
+      <p class="govuk-heading-s"><strong>{{ title }}</strong></p>
+    {% endif %}
 
-    <p class="govuk-heading-s"><strong>{{ title }}</strong></p>
     <div class="dpr-scorecard-group">
       {% for scorecard in scorecards %}
         {{ dprScoreCard(scorecard) }}

package/dpr/components/_inputs/date-input/view.njk

@@ -35,7 +35,7 @@
   {% endif %}
 
   {% if value %}
-    {% set value = value | date %} 
+    {% set value = value | dprDate %} 
   {% endif %}
 
   <div class="dpr-date" 
@@ -58,8 +58,8 @@
       name: id,
       label: labelText,
       value: value,
-      minDate: minDate | date,
-      maxDate: maxDate | date,
+      minDate: minDate | dprDate,
+      maxDate: maxDate | dprDate,
       hint: {
         text: "For example 17/05/2024."
       },
@@ -71,22 +71,22 @@
     {% if toggleMin and minDate %}
     <a class="govuk-body-s daterange-set-to-minmax" 
       data-set-to-input='{{ id }}' 
-      data-set-min-max-value={{ minDate | date }} 
+      data-set-min-max-value={{ minDate | dprDate }} 
       data-set-min-max-trigger='true'
       href="#"
     > 
-      set to min ({{ minDate | date }})
+      set to min ({{ minDate | dprDate }})
     </a>
     {% endif %}
 
     {% if toggleMax and maxDate %}
     <a class="govuk-body-s daterange-set-to-minmax" 
       data-set-to-input='{{ id }}' 
-      data-set-min-max-value={{ maxDate | date }} 
+      data-set-min-max-value={{ maxDate | dprDate }} 
       data-set-min-max-trigger='true'
       href="#"
     >
-      set to max ({{ maxDate | date }})
+      set to max ({{ maxDate | dprDate }})
     </a>
     {% endif %}
   </div>

package/dpr/components/filters/utils.js

@@ -6,12 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const enum_1 = require("../_filters/filter-input/enum");
 const urlHelper_1 = require("../../utils/urlHelper");
 const utils_1 = __importDefault(require("../_inputs/start-end-date/utils"));
-const logger_1 = __importDefault(require("../../utils/logger"));
 const LOCALE = 'en-GB';
 const toLocaleDate = (isoDate) => {
     const date = new Date(isoDate);
-    const dateString = isoDate ? date.toLocaleDateString(LOCALE) : null;
-    logger_1.default.info('toLocaleDate:', isoDate, date, dateString);
     return isoDate ? date.toLocaleDateString(LOCALE) : null;
 };
 const filterHasValue = (value) => {
@@ -33,12 +30,6 @@ const getSelectedFilters = (format, reportQuery, createUrlForParameters) => form
         const { start, end } = utils_1.default.setDateRangeValuesWithinMinMax(f.filter, startValue, endValue);
         const localeStart = toLocaleDate(start);
         const localeEnd = toLocaleDate(end);
-        logger_1.default.info('Selected daterange filters:', {
-            start,
-            end,
-            localeStart,
-            localeEnd,
-        });
         if (localeStart && localeEnd) {
             filterValueText = `${localeStart} - ${localeEnd}`;
         }

package/dpr/components/filters/utils.ts

@@ -12,8 +12,6 @@ const LOCALE = 'en-GB'
 
 const toLocaleDate = (isoDate?: string) => {
   const date = new Date(isoDate)
-  const dateString = isoDate ? date.toLocaleDateString(LOCALE) : null
-  logger.info('toLocaleDate:', isoDate, date, dateString)
   return isoDate ? date.toLocaleDateString(LOCALE) : null
 }
 
@@ -45,12 +43,6 @@ const getSelectedFilters = (
         const { start, end } = StartEndDateUtils.setDateRangeValuesWithinMinMax(f.filter, startValue, endValue)
         const localeStart = toLocaleDate(start)
         const localeEnd = toLocaleDate(end)
-        logger.info('Selected daterange filters:', {
-          start,
-          end,
-          localeStart,
-          localeEnd,
-        })
 
         if (localeStart && localeEnd) {
           filterValueText = `${localeStart} - ${localeEnd}`

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

@@ -36,7 +36,6 @@ const reportingClient_1 = __importDefault(require("../../data/reportingClient"))
 const utils_4 = __importDefault(require("../_reports/report-actions/utils"));
 const DataTableBuilder_1 = __importDefault(require("../../utils/DataTableBuilder/DataTableBuilder"));
 const utils_5 = __importDefault(require("../_reports/report-pagination/utils"));
-const logger_1 = __importDefault(require("../../utils/logger"));
 function isListWithWarnings(data) {
     return data.data !== undefined;
 }
@@ -100,7 +99,6 @@ function renderList(listData, variantDefinition, reportQuery, request, response,
                 totals: utils_1.default.getTotals(pagination.pageSize, pagination.currentPage, pagination.totalRows, dataTable.rowCount),
             };
             const filterOptions = utils_2.default.getFilterOptions(variantDefinition, reportQuery, urlHelper_1.default, dynamicAutocompleteEndpoint);
-            logger_1.default.info(JSON.stringify({ filterOptions }, null, 2));
             const reportUrl = `${request.protocol}://${request.get('host')}${request.originalUrl}`;
             const actions = utils_4.default.getActions({
                 print: {

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

@@ -20,7 +20,6 @@ import { DataTable } from '../../utils/DataTableBuilder/types'
 import PaginationUtils from '../_reports/report-pagination/utils'
 import { FilterOptions } from '../_filters/types'
 import { Template } from '../../types/Templates'
-import logger from '../../utils/logger'
 
 function isListWithWarnings(data: Dict<string>[] | ListWithWarnings): data is ListWithWarnings {
   return (data as ListWithWarnings).data !== undefined
@@ -127,7 +126,6 @@ function renderList(
           createUrlForParameters,
           dynamicAutocompleteEndpoint,
         )
-        logger.info(JSON.stringify({ filterOptions }, null, 2))
 
         const reportUrl = `${request.protocol}://${request.get('host')}${request.originalUrl}`
         const actions = ReportActionsUtils.getActions({

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

@@ -23,6 +23,7 @@
   {% set printable = dataTableOptions.printable %}
 
   {% set accordionItems = [] %}
+
   {# Filters #}
   {% set filters = filterOptions.filters %}
   {% if filters.length > 0 %}

package/dpr/setUpNunjucksFilters.js

@@ -9,7 +9,7 @@ const setUpNunjucksFilters = (env) => {
     env.addFilter('json', stringifyJson);
     env.addFilter('capitaliseSentence', capitaliseSentence);
     nunjucks_date_1.default.setDefaultFormat('DD/MM/YYYY');
-    nunjucks_date_1.default.install(env, 'date');
+    nunjucks_date_1.default.install(env, 'dprDate');
 };
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const stringifyJson = (jsonObj) => {

package/dpr/setUpNunjucksFilters.ts

@@ -7,7 +7,7 @@ const setUpNunjucksFilters = (env: nunjucks.Environment) => {
   env.addFilter('json', stringifyJson)
   env.addFilter('capitaliseSentence', capitaliseSentence)
   nunjucksDate.setDefaultFormat('DD/MM/YYYY')
-  nunjucksDate.install(env, 'date')
+  nunjucksDate.install(env, 'dprDate')
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

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