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

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/dpr/components/report-list/utils.js

@@ -13,7 +13,7 @@ const UserReports_1 = require("../../types/UserReports");
 function isListWithWarnings(data) {
     return data.data !== undefined;
 }
-async function renderList(listData, variantDefinition, reportQuery, request, response, next, title, layoutTemplate, dynamicAutocompleteEndpoint, otherOptions, reportName) {
+async function renderList(listData, variantDefinition, reportQuery, request, response, next, title, layoutTemplate, otherOptions, reportName) {
     await Promise.all([listData.data, listData.count])
         .then(async (resolvedData) => {
         let data;
@@ -48,7 +48,7 @@ async function renderList(listData, variantDefinition, reportQuery, request, res
             renderData: {
                 ...reportRenderData,
                 reportName,
-                name: variantName,
+                name: title || variantName,
                 description,
                 count,
                 classification,
@@ -66,28 +66,30 @@ async function renderList(listData, variantDefinition, reportQuery, request, res
     })
         .catch((err) => next(err));
 }
-const renderListWithDefinition = async ({ title, definitionName, variantName, request, response, next, otherOptions, layoutTemplate, token, apiUrl, apiTimeout, dynamicAutocompleteEndpoint, definitionsPath, }) => {
+const renderListWithDefinition = async ({ title, definitionName, variantName, request, response, next, otherOptions, layoutTemplate, token, apiUrl, apiTimeout, definitionsPath, }) => {
     const reportingClient = new reportingClient_1.default({
         url: apiUrl,
         agent: {
             timeout: apiTimeout,
         },
     });
+    const { dataProductDefinitionsPath } = request.query;
+    const reportDef = dataProductDefinitionsPath || definitionsPath;
     try {
-        const reportDefinition = await reportingClient.getDefinition(token, definitionName, variantName, definitionsPath);
+        const reportDefinition = await reportingClient.getDefinition(token, definitionName, variantName, reportDef);
         const reportName = reportDefinition.name;
         const variantDefinition = reportDefinition.variant;
         const reportQuery = new ReportQuery_1.default({
             fields: variantDefinition.specification.fields,
             template: variantDefinition.specification.template,
             queryParams: request.query,
-            definitionsPath: request.query.dataProductDefinitionsPath,
+            definitionsPath: reportDef,
         });
         const getListData = {
             data: reportingClient.getListWithWarnings(variantDefinition.resourceName, token, reportQuery),
             count: reportingClient.getCount(variantDefinition.resourceName, token, reportQuery),
         };
-        await renderList(getListData, variantDefinition, reportQuery, request, response, next, title !== null && title !== void 0 ? title : `${reportName} - ${variantDefinition.name}`, layoutTemplate, dynamicAutocompleteEndpoint, otherOptions, reportName);
+        await renderList(getListData, variantDefinition, reportQuery, request, response, next, variantName || `${variantDefinition.name}`, layoutTemplate, otherOptions, title || `${reportName}`);
     }
     catch (error) {
         next(error);
@@ -95,7 +97,7 @@ const renderListWithDefinition = async ({ title, definitionName, variantName, re
 };
 exports.renderListWithDefinition = renderListWithDefinition;
 exports.default = {
-    renderListWithData: async ({ title, reportName, variantDefinition, request, response, next, getListDataSources, otherOptions, layoutTemplate, dynamicAutocompleteEndpoint, }) => {
+    renderListWithData: async ({ title, reportName, variantDefinition, request, response, next, getListDataSources, otherOptions, layoutTemplate, }) => {
         const { specification } = variantDefinition;
         const reportQuery = new ReportQuery_1.default({
             fields: specification.fields,
@@ -104,9 +106,9 @@ exports.default = {
             definitionsPath: request.query.dataProductDefinitionsPath,
         });
         const listData = getListDataSources(reportQuery);
-        await renderList(listData, variantDefinition, reportQuery, request, response, next, title, layoutTemplate, dynamicAutocompleteEndpoint, otherOptions, reportName);
+        await renderList(listData, variantDefinition, reportQuery, request, response, next, title, layoutTemplate, otherOptions, reportName);
     },
-    createReportListRequestHandler: ({ title, definitionName, variantName, apiUrl, apiTimeout, otherOptions, layoutTemplate, tokenProvider, dynamicAutocompleteEndpoint, definitionsPath, }) => {
+    createReportListRequestHandler: ({ title, definitionName, variantName, apiUrl, apiTimeout, otherOptions, layoutTemplate, tokenProvider, definitionsPath, }) => {
         return (request, response, next) => {
             (0, exports.renderListWithDefinition)({
                 title,
@@ -120,7 +122,6 @@ exports.default = {
                 token: tokenProvider(request, response, next),
                 apiUrl,
                 apiTimeout,
-                dynamicAutocompleteEndpoint,
                 definitionsPath,
             });
         };

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

@@ -30,7 +30,6 @@ export async function renderList(
   next: NextFunction,
   title: string,
   layoutTemplate: string,
-  dynamicAutocompleteEndpoint?: string,
   otherOptions?: NodeJS.Dict<object>,
   reportName?: string,
 ) {
@@ -77,7 +76,7 @@ export async function renderList(
         renderData: {
           ...reportRenderData,
           reportName,
-          name: variantName,
+          name: title || variantName,
           description,
           count,
           classification,
@@ -109,7 +108,6 @@ export const renderListWithDefinition = async ({
   token,
   apiUrl,
   apiTimeout,
-  dynamicAutocompleteEndpoint,
   definitionsPath,
 }: RenderListWithDefinitionInput) => {
   const reportingClient = new ReportingClient({
@@ -119,8 +117,11 @@ export const renderListWithDefinition = async ({
     },
   })
 
+  const { dataProductDefinitionsPath } = request.query
+  const reportDef = <string>dataProductDefinitionsPath || definitionsPath
+
   try {
-    const reportDefinition = await reportingClient.getDefinition(token, definitionName, variantName, definitionsPath)
+    const reportDefinition = await reportingClient.getDefinition(token, definitionName, variantName, reportDef)
     const reportName: string = reportDefinition.name
     const variantDefinition = reportDefinition.variant
 
@@ -128,7 +129,7 @@ export const renderListWithDefinition = async ({
       fields: variantDefinition.specification.fields,
       template: variantDefinition.specification.template as Template,
       queryParams: request.query,
-      definitionsPath: <string>request.query.dataProductDefinitionsPath,
+      definitionsPath: reportDef,
     })
 
     const getListData: ListDataSources = {
@@ -143,11 +144,10 @@ export const renderListWithDefinition = async ({
       request,
       response,
       next,
-      title ?? `${reportName} - ${variantDefinition.name}`,
+      variantName || `${variantDefinition.name}`,
       layoutTemplate,
-      dynamicAutocompleteEndpoint,
       otherOptions,
-      reportName,
+      title || `${reportName}`,
     )
   } catch (error) {
     next(error)
@@ -165,7 +165,6 @@ export default {
     getListDataSources,
     otherOptions,
     layoutTemplate,
-    dynamicAutocompleteEndpoint,
   }: RenderListWithDataInput) => {
     const { specification } = variantDefinition
     const reportQuery = new ReportQuery({
@@ -185,7 +184,6 @@ export default {
       next,
       title,
       layoutTemplate,
-      dynamicAutocompleteEndpoint,
       otherOptions,
       reportName,
     )
@@ -199,7 +197,6 @@ export default {
     otherOptions,
     layoutTemplate,
     tokenProvider,
-    dynamicAutocompleteEndpoint,
     definitionsPath,
   }: CreateRequestHandlerInput): RequestHandler => {
     return (request: Request, response: Response, next: NextFunction) => {
@@ -215,7 +212,6 @@ export default {
         token: tokenProvider(request, response, next),
         apiUrl,
         apiTimeout,
-        dynamicAutocompleteEndpoint,
         definitionsPath,
       })
     }

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