@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.18.0 → 4.18.2

package/dpr/components/_filters/utils.js

@@ -1,2 +1,2 @@
-"use strict";var j=Object.create;var V=Object.defineProperty;var N=Object.getOwnPropertyDescriptor;var M=Object.getOwnPropertyNames;var A=Object.getPrototypeOf,W=Object.prototype.hasOwnProperty;var _=(i,a)=>{for(var t in a)V(i,t,{get:a[t],enumerable:!0})},C=(i,a,t,r)=>{if(a&&typeof a=="object"||typeof a=="function")for(let e of M(a))!W.call(i,e)&&e!==t&&V(i,e,{get:()=>a[e],enumerable:!(r=N(a,e))||r.enumerable});return i};var y=(i,a,t)=>(t=i!=null?j(A(i)):{},C(a||!i||!i.__esModule?V(t,"default",{value:i,enumerable:!0}):t,i)),H=i=>C(V({},"__esModule",{value:!0}),i);var B={};_(B,{default:()=>z,getFilters:()=>U,getFiltersFromDefinition:()=>k,getPersonalisedFilters:()=>L,redirectWithDefaultFilters:()=>O,setFilterQueryFromFilterDefinition:()=>E,setFilterValuesFromRequest:()=>w,setRequestQueryFromFilterValues:()=>S});module.exports=H(B);var u=require("./filter-input/enum"),F=require("../../types/ReportQuery"),x=y(require("./filters-selected/utils")),D=y(require("../_inputs/date-range/utils")),h=y(require("../_inputs/date-input/utils")),R=y(require("../_inputs/granular-date-range/utils")),b=y(require("../_inputs/multi-select/utils")),Q=y(require("../../utils/Personalisation/personalisationUtils")),G=y(require("../../utils/urlHelper")),q=require("./filtersTypeEnum"),T=y(require("../../utils/localsHelper"));const w=(i,a,t="filters.")=>{const{preventDefault:r}=a.query;return Object.keys(a.query).every(e=>!e.includes(t))&&!r?i:i.map(e=>{let s,l;switch(e.type.toLowerCase()){case u.FilterType.dateRange.toLowerCase():s=D.default.setValueFromRequest(e,a,t);break;case u.FilterType.granularDateRange.toLowerCase():s=R.default.setValueFromRequest(e,a,t);break;case u.FilterType.date.toLowerCase():s=h.default.setValueFromRequest(e,a,t);break;case u.FilterType.multiselect.toLowerCase():({requestfilterValue:s,requestfilterValues:l}=b.default.setValueFromRequest(e,a,t));break;default:s=a.query[`${t}${e.name}`];break}let o=null;return s?o=s:r&&(o=""),{...e,value:o,...l&&{values:l}}})},E=(i,a)=>{let t=i.filter(r=>r.filter);return a&&(t=t.filter(r=>r.filter.interactive)),t.filter(r=>r.filter!==void 0).filter(r=>r.filter.defaultValue!==void 0).map(r=>{const e=r.filter;switch(e.type.toLocaleLowerCase()){case u.FilterType.dateRange.toLowerCase():return D.default.getQueryFromDefinition(e,r.name,F.DEFAULT_FILTERS_PREFIX);case u.FilterType.multiselect.toLowerCase():return b.default.getQueryFromDefinition(e,r.name,F.DEFAULT_FILTERS_PREFIX);case u.FilterType.granularDateRange.toLowerCase():{const l=D.default.getQueryFromDefinition(e,r.name,F.DEFAULT_FILTERS_PREFIX);return R.default.getQueryFromDefinition(e,r.name,F.DEFAULT_FILTERS_PREFIX,l)}default:return`${F.DEFAULT_FILTERS_PREFIX}${r.name}=${e.defaultValue}`}}).join("&")},k=(i,a)=>{const t=i.filter(e=>e.filter).filter(e=>a!==void 0?e.filter?.interactive===void 0?!a:a===e.filter.interactive:!0).map(e=>{const{display:s,name:l}=e,f=e.filter,{type:o,staticOptions:n,dynamicOptions:m,defaultValue:p,mandatory:d,pattern:I,index:P}=f,g=n?n.map($=>({value:$.name,text:$.display})):[];let c={text:s,name:l,type:o,value:p||null,mandatory:d||!1,minimumLength:m?.minimumLength,pattern:I,index:P};const v={value:"no-filter",text:"None",disabled:!1};switch(o){case u.FilterType.autocomplete.toLowerCase():c={...c,options:g};break;case u.FilterType.radio:d||g.unshift(v),c={...c,options:g};break;case u.FilterType.select:{d||g.unshift(v),g.unshift({value:"",text:"Select your option",disabled:!0,selected:!0}),c={...c,options:g};break}case u.FilterType.multiselect.toLowerCase():c={...c,options:g,values:p?p.split(","):[]};break;case u.FilterType.dateRange.toLowerCase():c=D.default.getFilterFromDefinition(f,c);break;case u.FilterType.date.toLowerCase():c=h.default.getFilterFromDefinition(f,c);break;case u.FilterType.granularDateRange.toLocaleLowerCase():{c=R.default.getFilterFromDefinition(f,c);break}default:break}return c});return X(t)},X=i=>{const a=i.filter(r=>r.index===void 0);return i.filter(r=>r.index!==void 0).forEach(r=>{r.index!==void 0&&a.splice(r.index,0,r)}),a},S=i=>i.filter(t=>t.value).reduce((t,r)=>{const{value:e,name:s}=r,l=`filters.${s}`;switch(r.type){case u.FilterType.granularDateRange.toLowerCase():{const f=e;Object.keys(f).forEach(o=>{let n=f[o];o.includes("partialDate")?t={...t}:((o.includes("granularity")||o.includes("quickFilter"))&&(n=n.value),t={...t,[`${l}.${o}`]:n})})}break;case u.FilterType.dateRange.toLowerCase():e&&Object.keys(e).forEach(f=>{t={...t,[`${l}.${f}`]:e[f]}});break;case u.FilterType.multiselect.toLowerCase():t={...t,[`${l}`]:e.split(",")};break;default:t={...t,[`${l}`]:e};break}return t},{}),O=(i,a,t,r)=>{const e={},{specification:s}=a,l=s?s.fields:[],{preventDefault:f}=r.query;if(Object.keys(i.filters).length===0&&!f&&l.filter(n=>n.filter&&n.filter.defaultValue).forEach(n=>{const{filter:m}=n;if(m)if(m.type.toLowerCase()===u.FilterType.dateRange.toLowerCase()){const{defaultValue:p}=m,d=p?p.split(" - "):"";d.length>=1&&(e[`${F.DEFAULT_FILTERS_PREFIX}${n.name}.start`]=d[0],d.length>=2&&(e[`${F.DEFAULT_FILTERS_PREFIX}${n.name}.end`]=d[1]))}else e[`${F.DEFAULT_FILTERS_PREFIX}${n.name}`]=m.defaultValue||""}),Object.keys(e).length>0){const n=(0,G.default)(i.toRecordWithFilterPrefix(),e,l);return t.redirect(`${r.baseUrl}${r.path}${n}`),!0}return!1},L=async(i,a,t,r,e)=>{const{reportId:s,id:l}=a.params,{dprUser:f}=T.default.getValues(t),o=await r.defaultFilterValuesService.get(f.id,s,l,e);let n=i;return o&&(n=Q.default.setFilterValuesFromSavedDefaults(i,[],o).filters),{filters:n,defaultFilterValues:o}},U=async({fields:i,req:a,res:t,prefix:r="filters.",services:e,filtersType:s})=>{let l=await k(i,s===q.FiltersType.INTERACTIVE),f,o=!1;if(e&&t&&t.locals.saveDefaultsEnabled){const{filters:m,defaultFilterValues:p}=await L(l,a,t,e,s);l=m,f=p&&p.length>0,o=!0}a.query&&(l=w(l,a));const n=x.default.getSelectedFilters(l,r);return{filters:l,selectedFilters:n,hasDefaults:f,canSaveDefaults:o}};var z={getFiltersFromDefinition:k,setFilterValuesFromRequest:w,getFilters:U,setFilterQueryFromFilterDefinition:E,redirectWithDefaultFilters:O,setRequestQueryFromFilterValues:S,getPersonalisedFilters:L};0&&(module.exports={getFilters,getFiltersFromDefinition,getPersonalisedFilters,redirectWithDefaultFilters,setFilterQueryFromFilterDefinition,setFilterValuesFromRequest,setRequestQueryFromFilterValues});
+"use strict";var j=Object.create;var V=Object.defineProperty;var N=Object.getOwnPropertyDescriptor;var M=Object.getOwnPropertyNames;var A=Object.getPrototypeOf,W=Object.prototype.hasOwnProperty;var _=(a,r)=>{for(var i in r)V(a,i,{get:r[i],enumerable:!0})},C=(a,r,i,e)=>{if(r&&typeof r=="object"||typeof r=="function")for(let t of M(r))!W.call(a,t)&&t!==i&&V(a,t,{get:()=>r[t],enumerable:!(e=N(r,t))||e.enumerable});return a};var y=(a,r,i)=>(i=a!=null?j(A(a)):{},C(r||!a||!a.__esModule?V(i,"default",{value:a,enumerable:!0}):i,a)),H=a=>C(V({},"__esModule",{value:!0}),a);var z={};_(z,{default:()=>X,getFilters:()=>U,getFiltersFromDefinition:()=>L,getPersonalisedFilters:()=>k,redirectWithDefaultFilters:()=>O,setFilterQueryFromFilterDefinition:()=>E,setFilterValuesFromRequest:()=>w,setRequestQueryFromFilterValues:()=>S});module.exports=H(z);var u=require("./filter-input/enum"),p=require("../../types/ReportQuery"),x=y(require("./filters-selected/utils")),D=y(require("../_inputs/date-range/utils")),h=y(require("../_inputs/date-input/utils")),R=y(require("../_inputs/granular-date-range/utils")),b=y(require("../_inputs/multi-select/utils")),Q=y(require("../../utils/Personalisation/personalisationUtils")),G=y(require("../../utils/urlHelper")),q=require("./filtersTypeEnum"),T=y(require("../../utils/localsHelper"));const w=(a,r,i="filters.")=>{const{preventDefault:e}=r.query;return Object.keys(r.query).every(t=>!t.includes(i))&&!e?a:a.map(t=>{let l,s;switch(t.type.toLowerCase()){case u.FilterType.dateRange.toLowerCase():l=D.default.setValueFromRequest(t,r,i);break;case u.FilterType.granularDateRange.toLowerCase():l=R.default.setValueFromRequest(t,r,i);break;case u.FilterType.date.toLowerCase():l=h.default.setValueFromRequest(t,r,i);break;case u.FilterType.multiselect.toLowerCase():({requestfilterValue:l,requestfilterValues:s}=b.default.setValueFromRequest(t,r,i));break;default:l=r.query[`${i}${t.name}`];break}let o=null;return l?o=l:e&&(o=""),{...t,value:o,...s&&{values:s}}})},E=(a,r)=>{let i=a.filter(e=>e.filter);return r&&(i=i.filter(e=>e.filter.interactive)),i.filter(e=>e.filter!==void 0).filter(e=>e.filter.defaultValue!==void 0).map(e=>{const t=e.filter;switch(t.type.toLocaleLowerCase()){case u.FilterType.dateRange.toLowerCase():return D.default.getQueryFromDefinition(t,e.name,p.DEFAULT_FILTERS_PREFIX);case u.FilterType.multiselect.toLowerCase():return b.default.getQueryFromDefinition(t,e.name,p.DEFAULT_FILTERS_PREFIX);case u.FilterType.granularDateRange.toLowerCase():{const s=D.default.getQueryFromDefinition(t,e.name,p.DEFAULT_FILTERS_PREFIX);return R.default.getQueryFromDefinition(t,e.name,p.DEFAULT_FILTERS_PREFIX,s)}default:return`${p.DEFAULT_FILTERS_PREFIX}${e.name}=${t.defaultValue}`}}).join("&")},L=(a,r)=>{const i=a.filter(t=>t.filter).filter(t=>r!==void 0?t.filter?.interactive===void 0?!r:r===t.filter.interactive:!0).map(t=>{const{display:l,name:s}=t,d=t.filter,{type:o,staticOptions:n,dynamicOptions:f,defaultValue:c,mandatory:F,pattern:I,index:P}=d,g=n?n.map($=>({value:$.name,text:$.display})):[];let m={text:l,name:s,type:o,value:c||null,mandatory:F||!1,minimumLength:f?.minimumLength,pattern:I,index:P};const v={value:"no-filter",text:"None",disabled:!1};switch(o){case u.FilterType.autocomplete.toLowerCase():m={...m,options:g};break;case u.FilterType.radio:F||g.unshift(v),m={...m,options:g};break;case u.FilterType.select:{F||g.unshift(v),g.unshift({value:"",text:"Select your option",disabled:!0,selected:!0}),m={...m,options:g};break}case u.FilterType.multiselect.toLowerCase():m={...m,options:g,values:c?c.split(","):[]};break;case u.FilterType.dateRange.toLowerCase():m=D.default.getFilterFromDefinition(d,m);break;case u.FilterType.date.toLowerCase():m=h.default.getFilterFromDefinition(d,m);break;case u.FilterType.granularDateRange.toLocaleLowerCase():{m=R.default.getFilterFromDefinition(d,m);break}default:break}return m});return K(i)},K=a=>{const r=a.filter(e=>e.index===void 0);return a.filter(e=>e.index!==void 0).forEach(e=>{e.index!==void 0&&r.splice(e.index,0,e)}),r},S=(a,r=!1)=>a.filter(e=>e.value).reduce((e,t)=>{const{value:l,name:s,type:d}=t,o=`filters.${s}`;switch(d){case u.FilterType.granularDateRange.toLowerCase():{const n=l;Object.keys(n).forEach(f=>{let c=n[f];f.includes("partialDate")?e={...e}:((f.includes("granularity")||f.includes("quickFilter"))&&(c=c.value),e={...e,[`${o}.${f}`]:c})})}break;case u.FilterType.dateRange.toLowerCase():l&&Object.keys(l).forEach(n=>{const f=!r&&n.includes("relative")?void 0:`${o}.${n}`,c=l[n];f&&(e={...e,[`${f}`]:c})});break;case u.FilterType.multiselect.toLowerCase():e={...e,[`${o}`]:l.split(",")};break;default:e={...e,[`${o}`]:l};break}return e},{}),O=(a,r,i,e)=>{const t={},{specification:l}=r,s=l?l.fields:[],{preventDefault:d}=e.query;if(Object.keys(a.filters).length===0&&!d&&s.filter(n=>n.filter&&n.filter.defaultValue).forEach(n=>{const{filter:f}=n;if(f)if(f.type.toLowerCase()===u.FilterType.dateRange.toLowerCase()){const{defaultValue:c}=f,F=c?c.split(" - "):"";F.length>=1&&(t[`${p.DEFAULT_FILTERS_PREFIX}${n.name}.start`]=F[0],F.length>=2&&(t[`${p.DEFAULT_FILTERS_PREFIX}${n.name}.end`]=F[1]))}else t[`${p.DEFAULT_FILTERS_PREFIX}${n.name}`]=f.defaultValue||""}),Object.keys(t).length>0){const n=(0,G.default)(a.toRecordWithFilterPrefix(),t,s);return i.redirect(`${e.baseUrl}${e.path}${n}`),!0}return!1},k=async(a,r,i,e,t)=>{const{reportId:l,id:s}=r.params,{dprUser:d}=T.default.getValues(i),o=await e.defaultFilterValuesService.get(d.id,l,s,t);let n=a;return o&&(n=Q.default.setFilterValuesFromSavedDefaults(a,[],o).filters),{filters:n,defaultFilterValues:o}},U=async({fields:a,req:r,res:i,prefix:e="filters.",services:t,filtersType:l})=>{let s=await L(a,l===q.FiltersType.INTERACTIVE),d,o=!1;if(t&&i&&i.locals.saveDefaultsEnabled){const{filters:f,defaultFilterValues:c}=await k(s,r,i,t,l);s=f,d=c&&c.length>0,o=!0}r.query&&(s=w(s,r));const n=x.default.getSelectedFilters(s,e);return{filters:s,selectedFilters:n,hasDefaults:d,canSaveDefaults:o}};var X={getFiltersFromDefinition:L,setFilterValuesFromRequest:w,getFilters:U,setFilterQueryFromFilterDefinition:E,redirectWithDefaultFilters:O,setRequestQueryFromFilterValues:S,getPersonalisedFilters:k};0&&(module.exports={getFilters,getFiltersFromDefinition,getPersonalisedFilters,redirectWithDefaultFilters,setFilterQueryFromFilterDefinition,setFilterValuesFromRequest,setRequestQueryFromFilterValues});
 //# sourceMappingURL=utils.js.map

package/dpr/components/_filters/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/dpr/components/_filters/utils.ts"],
-  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Request, Response } from 'express'\nimport { GranularDateRangeQuickFilterValue } from './types'\nimport { FilterType } from './filter-input/enum'\nimport type { components } from '../../types/api'\nimport type { FilterOption } from './filter-input/types'\nimport type {\n  DateFilterValue,\n  FilterValueType,\n  DateRangeFilterValue,\n  FilterValue,\n  MultiselectFilterValue,\n  GranularDateRangeFilterValue,\n  GranularDateRange,\n  GranularDateRangeGranularityValue,\n} from './types'\nimport ReportQuery, { DEFAULT_FILTERS_PREFIX } from '../../types/ReportQuery'\n\nimport SelectedFiltersUtils from './filters-selected/utils'\nimport DateRangeInputUtils from '../_inputs/date-range/utils'\nimport DateInputUtils from '../_inputs/date-input/utils'\nimport GranularDateRangeInputUtils from '../_inputs/granular-date-range/utils'\nimport MultiSelectUtils from '../_inputs/multi-select/utils'\nimport { Granularity, QuickFilters } from '../_inputs/granular-date-range/types'\nimport PersonalistionUtils from '../../utils/Personalisation/personalisationUtils'\nimport createUrlForParameters from '../../utils/urlHelper'\nimport { Services } from '../../types/Services'\nimport { FiltersType } from './filtersTypeEnum'\nimport LocalsHelper from '../../utils/localsHelper'\n\n/**\n * Given a FilterValue[], will update the values to match the req.query values if present\n *\n * @param {FilterValue[]} filters\n * @param {Request} req\n * @param {string} [prefix='filters.']\n * @return {*}  {FilterValue[]}\n */\nexport const setFilterValuesFromRequest = (\n  filters: FilterValue[],\n  req: Request,\n  prefix = 'filters.',\n): FilterValue[] => {\n  const { preventDefault } = req.query\n\n  if (Object.keys(req.query).every((key) => !key.includes(prefix)) && !preventDefault) {\n    return filters\n  }\n\n  return filters.map((filter: FilterValue) => {\n    let requestfilterValue: FilterValueType\n    let requestfilterValues: string[] | undefined\n\n    const type = filter.type.toLowerCase()\n    switch (type) {\n      case FilterType.dateRange.toLowerCase():\n        requestfilterValue = DateRangeInputUtils.setValueFromRequest(<DateRangeFilterValue>filter, req, prefix)\n        break\n      case FilterType.granularDateRange.toLowerCase():\n        requestfilterValue = GranularDateRangeInputUtils.setValueFromRequest(\n          <GranularDateRangeFilterValue>filter,\n          req,\n          prefix,\n        )\n        break\n      case FilterType.date.toLowerCase():\n        requestfilterValue = DateInputUtils.setValueFromRequest(<DateFilterValue>filter, req, prefix)\n        break\n      case FilterType.multiselect.toLowerCase():\n        ;({ requestfilterValue, requestfilterValues } = MultiSelectUtils.setValueFromRequest(\n          <MultiselectFilterValue>filter,\n          req,\n          prefix,\n        ))\n        break\n      default:\n        requestfilterValue = <string>req.query[`${prefix}${filter.name}`]\n        break\n    }\n\n    let value: FilterValueType = null\n    if (requestfilterValue) {\n      value = requestfilterValue\n    } else if (preventDefault) {\n      value = ''\n    }\n\n    return {\n      ...filter,\n      value,\n      ...(requestfilterValues && { values: requestfilterValues }),\n    }\n  })\n}\n\nexport const setFilterQueryFromFilterDefinition = (\n  fields: components['schemas']['FieldDefinition'][],\n  interactive?: boolean,\n) => {\n  let filterFields: components['schemas']['FieldDefinition'][] = fields.filter((f) => f.filter)\n  if (interactive) {\n    filterFields = filterFields.filter(\n      (f) => (<components['schemas']['FilterDefinition'] & { interactive?: boolean }>f.filter).interactive,\n    )\n  }\n\n  return filterFields\n    .filter((field) => field.filter !== undefined)\n    .filter((field) => (<components['schemas']['FilterDefinition']>field.filter).defaultValue !== undefined)\n    .map((field) => {\n      const filter = <components['schemas']['FilterDefinition']>field.filter\n      const type = filter.type.toLocaleLowerCase()\n\n      switch (type) {\n        case FilterType.dateRange.toLowerCase():\n          return DateRangeInputUtils.getQueryFromDefinition(filter, field.name, DEFAULT_FILTERS_PREFIX)\n\n        case FilterType.multiselect.toLowerCase():\n          return MultiSelectUtils.getQueryFromDefinition(filter, field.name, DEFAULT_FILTERS_PREFIX)\n\n        case FilterType.granularDateRange.toLowerCase(): {\n          const startEndParams = DateRangeInputUtils.getQueryFromDefinition(filter, field.name, DEFAULT_FILTERS_PREFIX)\n          return GranularDateRangeInputUtils.getQueryFromDefinition(\n            filter as unknown as components['schemas']['FilterDefinition'] & {\n              defaultGranularity: Granularity\n              defaultQuickFilterValue: QuickFilters\n            },\n            field.name,\n            DEFAULT_FILTERS_PREFIX,\n            startEndParams,\n          )\n        }\n\n        default:\n          return `${DEFAULT_FILTERS_PREFIX}${field.name}=${filter.defaultValue}`\n      }\n    })\n    .join('&')\n}\n\nexport const getFiltersFromDefinition = (\n  fields: components['schemas']['FieldDefinition'][],\n  interactive?: boolean,\n): FilterValue[] => {\n  const filters = fields\n    .filter((f) => f.filter)\n    .filter((f) => {\n      if (interactive !== undefined) {\n        if (f.filter?.interactive === undefined) {\n          return !interactive\n        }\n        return interactive === f.filter.interactive\n      }\n      return true\n    })\n    .map((f) => {\n      const { display: text, name } = f\n      const filter = <components['schemas']['FilterDefinition']>f.filter\n      const { type, staticOptions, dynamicOptions, defaultValue, mandatory, pattern, index } = filter\n\n      const options: FilterOption[] = staticOptions\n        ? staticOptions.map((opt) => {\n            return { value: opt.name, text: opt.display }\n          })\n        : []\n\n      let filterData: FilterValue = {\n        text,\n        name,\n        type: type as FilterType,\n        value: defaultValue || null,\n        mandatory: mandatory || false,\n        minimumLength: dynamicOptions?.minimumLength,\n        pattern,\n        index,\n      }\n\n      const noFilterOption = {\n        value: 'no-filter',\n        text: 'None',\n        disabled: false,\n      }\n\n      switch (type) {\n        case FilterType.autocomplete.toLowerCase():\n          filterData = {\n            ...filterData,\n            options,\n          }\n          break\n\n        case FilterType.radio:\n          if (!mandatory) options.unshift(noFilterOption)\n          filterData = {\n            ...filterData,\n            options,\n          }\n          break\n\n        case FilterType.select: {\n          if (!mandatory) options.unshift(noFilterOption)\n          options.unshift({\n            value: '',\n            text: 'Select your option',\n            disabled: true,\n            selected: true,\n          })\n\n          filterData = {\n            ...filterData,\n            options,\n          }\n          break\n        }\n\n        case FilterType.multiselect.toLowerCase():\n          filterData = {\n            ...filterData,\n            options,\n            values: defaultValue ? defaultValue.split(',') : [],\n          }\n          break\n\n        case FilterType.dateRange.toLowerCase():\n          filterData = DateRangeInputUtils.getFilterFromDefinition(filter, filterData)\n          break\n\n        case FilterType.date.toLowerCase():\n          filterData = DateInputUtils.getFilterFromDefinition(filter, filterData)\n          break\n\n        case FilterType.granularDateRange.toLocaleLowerCase(): {\n          filterData = GranularDateRangeInputUtils.getFilterFromDefinition(filter, filterData)\n          break\n        }\n\n        default:\n          break\n      }\n\n      return filterData\n    })\n\n  const orderedFilters = orderFilters(filters)\n  return orderedFilters\n}\n\nconst orderFilters = (filterValues: FilterValue[]) => {\n  const noIndexFilters = filterValues.filter((f) => f.index === undefined)\n  const indexFilters = filterValues.filter((f) => f.index !== undefined)\n  indexFilters.forEach((f) => {\n    if (f.index !== undefined) noIndexFilters.splice(f.index, 0, f)\n  })\n  return noIndexFilters\n}\n\nexport const setRequestQueryFromFilterValues = (filterValues: FilterValue[]) => {\n  const requestQuery = filterValues\n    .filter((fv) => fv.value)\n    .reduce((acc, curr) => {\n      const { value, name } = curr\n      const filterPrefix = `filters.${name}`\n      switch (curr.type) {\n        case FilterType.granularDateRange.toLowerCase():\n          {\n            const granularDateRangeValue = <GranularDateRange>value\n            Object.keys(granularDateRangeValue).forEach((key) => {\n              let v = granularDateRangeValue[key as keyof GranularDateRange]\n              if (key.includes('partialDate')) {\n                acc = {\n                  ...acc,\n                }\n              } else {\n                if (key.includes('granularity') || key.includes('quickFilter')) {\n                  v = (<GranularDateRangeGranularityValue | GranularDateRangeQuickFilterValue>v).value\n                }\n                acc = {\n                  ...acc,\n                  [`${filterPrefix}.${key}`]: v,\n                }\n              }\n            })\n          }\n          break\n        case FilterType.dateRange.toLowerCase():\n          if (value) {\n            Object.keys(value).forEach((key) => {\n              acc = {\n                ...acc,\n                [`${filterPrefix}.${key}`]: value[key as keyof FilterValueType],\n              }\n            })\n          }\n          break\n        case FilterType.multiselect.toLowerCase():\n          acc = {\n            ...acc,\n            [`${filterPrefix}`]: (<string>value).split(','),\n          }\n          break\n        default:\n          acc = {\n            ...acc,\n            [`${filterPrefix}`]: value,\n          }\n          break\n      }\n      return acc\n    }, {})\n\n  return requestQuery\n}\n\nexport const redirectWithDefaultFilters = (\n  reportQuery: ReportQuery,\n  variantDefinition: components['schemas']['VariantDefinition'],\n  response: Response,\n  request: Request,\n) => {\n  const defaultFilters: Record<string, string> = {}\n  const { specification } = variantDefinition\n  const fields = specification ? specification.fields : []\n  const { preventDefault } = request.query\n  const hasNoQueryFilters = Object.keys(reportQuery.filters).length === 0 && !preventDefault\n  if (hasNoQueryFilters) {\n    fields\n      .filter((f) => f.filter && f.filter.defaultValue)\n      .forEach((f) => {\n        const { filter } = f\n        if (filter) {\n          if (filter.type.toLowerCase() === FilterType.dateRange.toLowerCase()) {\n            const { defaultValue } = <components['schemas']['FilterDefinition']>filter\n            const dates = defaultValue ? defaultValue.split(' - ') : ''\n\n            if (dates.length >= 1) {\n              // eslint-disable-next-line prefer-destructuring\n              defaultFilters[`${DEFAULT_FILTERS_PREFIX}${f.name}.start`] = dates[0]\n\n              if (dates.length >= 2) {\n                // eslint-disable-next-line prefer-destructuring\n                defaultFilters[`${DEFAULT_FILTERS_PREFIX}${f.name}.end`] = dates[1]\n              }\n            }\n          } else {\n            defaultFilters[`${DEFAULT_FILTERS_PREFIX}${f.name}`] = filter.defaultValue || ''\n          }\n        }\n      })\n  }\n\n  if (Object.keys(defaultFilters).length > 0) {\n    const querystring = createUrlForParameters(reportQuery.toRecordWithFilterPrefix(), defaultFilters, fields)\n    response.redirect(`${request.baseUrl}${request.path}${querystring}`)\n    return true\n  }\n\n  return false\n}\n\nexport const getPersonalisedFilters = async (\n  filters: FilterValue[],\n  req: Request,\n  res: Response,\n  services: Services,\n  filtersType: FiltersType,\n) => {\n  const { reportId, id } = req.params\n  const { dprUser } = LocalsHelper.getValues(res)\n  const defaultFilterValues = await services.defaultFilterValuesService.get(dprUser.id, reportId, id, filtersType)\n  let defaultFilters = filters\n  if (defaultFilterValues) {\n    const personalisedFilters = PersonalistionUtils.setFilterValuesFromSavedDefaults(filters, [], defaultFilterValues)\n    defaultFilters = personalisedFilters.filters\n  }\n\n  return { filters: defaultFilters, defaultFilterValues }\n}\n\nexport const getFilters = async ({\n  fields,\n  req,\n  res,\n  prefix = 'filters.',\n  services,\n  filtersType,\n}: {\n  fields: components['schemas']['FieldDefinition'][]\n  req: Request\n  res?: Response | undefined\n  prefix?: string\n  services?: Services | undefined\n  filtersType: FiltersType\n}) => {\n  // 1. Set the filters from the product definition\n  let filters = await getFiltersFromDefinition(fields, filtersType === FiltersType.INTERACTIVE)\n\n  let hasDefaults\n  let canSaveDefaults = false\n  if (services && res && res.locals['saveDefaultsEnabled']) {\n    // 2. If there are personalised filters, overwrite fiters with the personalised filter values.\n    const { filters: personalisedFilterValues, defaultFilterValues } = await getPersonalisedFilters(\n      filters,\n      req,\n      res,\n      services,\n      filtersType,\n    )\n    filters = personalisedFilterValues\n    hasDefaults = defaultFilterValues && defaultFilterValues.length > 0\n    canSaveDefaults = true\n  }\n\n  // If there is a request query, overwrite the filters with the query params\n  if (req.query) {\n    filters = setFilterValuesFromRequest(filters, req)\n  }\n\n  // Set the selected filters\n  const selectedFilters = SelectedFiltersUtils.getSelectedFilters(filters, prefix)\n\n  return {\n    filters,\n    selectedFilters,\n    hasDefaults,\n    canSaveDefaults,\n  }\n}\n\nexport default {\n  getFiltersFromDefinition,\n  setFilterValuesFromRequest,\n  getFilters,\n  setFilterQueryFromFilterDefinition,\n  redirectWithDefaultFilters,\n  setRequestQueryFromFilterValues,\n  getPersonalisedFilters,\n}\n"],
-  "mappings": "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",
-  "names": ["utils_exports", "__export", "utils_default", "getFilters", "getFiltersFromDefinition", "getPersonalisedFilters", "redirectWithDefaultFilters", "setFilterQueryFromFilterDefinition", "setFilterValuesFromRequest", "setRequestQueryFromFilterValues", "__toCommonJS", "import_enum", "import_ReportQuery", "import_utils", "import_personalisationUtils", "import_urlHelper", "import_filtersTypeEnum", "import_localsHelper", "filters", "req", "prefix", "preventDefault", "key", "filter", "requestfilterValue", "requestfilterValues", "DateRangeInputUtils", "GranularDateRangeInputUtils", "DateInputUtils", "MultiSelectUtils", "value", "fields", "interactive", "filterFields", "f", "field", "startEndParams", "text", "name", "type", "staticOptions", "dynamicOptions", "defaultValue", "mandatory", "pattern", "index", "options", "opt", "filterData", "noFilterOption", "orderFilters", "filterValues", "noIndexFilters", "fv", "acc", "curr", "filterPrefix", "granularDateRangeValue", "v", "reportQuery", "variantDefinition", "response", "request", "defaultFilters", "specification", "dates", "querystring", "createUrlForParameters", "res", "services", "filtersType", "reportId", "id", "dprUser", "LocalsHelper", "defaultFilterValues", "PersonalistionUtils", "hasDefaults", "canSaveDefaults", "personalisedFilterValues", "selectedFilters", "SelectedFiltersUtils"]
+  "sourcesContent": ["/* eslint-disable no-param-reassign */\nimport { Request, Response } from 'express'\nimport { GranularDateRangeQuickFilterValue } from './types'\nimport { FilterType } from './filter-input/enum'\nimport type { components } from '../../types/api'\nimport type { FilterOption } from './filter-input/types'\nimport type {\n  DateFilterValue,\n  FilterValueType,\n  DateRangeFilterValue,\n  FilterValue,\n  MultiselectFilterValue,\n  GranularDateRangeFilterValue,\n  GranularDateRange,\n  GranularDateRangeGranularityValue,\n} from './types'\nimport ReportQuery, { DEFAULT_FILTERS_PREFIX } from '../../types/ReportQuery'\n\nimport SelectedFiltersUtils from './filters-selected/utils'\nimport DateRangeInputUtils from '../_inputs/date-range/utils'\nimport DateInputUtils from '../_inputs/date-input/utils'\nimport GranularDateRangeInputUtils from '../_inputs/granular-date-range/utils'\nimport MultiSelectUtils from '../_inputs/multi-select/utils'\nimport { Granularity, QuickFilters } from '../_inputs/granular-date-range/types'\nimport PersonalistionUtils from '../../utils/Personalisation/personalisationUtils'\nimport createUrlForParameters from '../../utils/urlHelper'\nimport { Services } from '../../types/Services'\nimport { FiltersType } from './filtersTypeEnum'\nimport LocalsHelper from '../../utils/localsHelper'\n\n/**\n * Given a FilterValue[], will update the values to match the req.query values if present\n *\n * @param {FilterValue[]} filters\n * @param {Request} req\n * @param {string} [prefix='filters.']\n * @return {*}  {FilterValue[]}\n */\nexport const setFilterValuesFromRequest = (\n  filters: FilterValue[],\n  req: Request,\n  prefix = 'filters.',\n): FilterValue[] => {\n  const { preventDefault } = req.query\n\n  if (Object.keys(req.query).every((key) => !key.includes(prefix)) && !preventDefault) {\n    return filters\n  }\n\n  return filters.map((filter: FilterValue) => {\n    let requestfilterValue: FilterValueType\n    let requestfilterValues: string[] | undefined\n\n    const type = filter.type.toLowerCase()\n    switch (type) {\n      case FilterType.dateRange.toLowerCase():\n        requestfilterValue = DateRangeInputUtils.setValueFromRequest(<DateRangeFilterValue>filter, req, prefix)\n        break\n      case FilterType.granularDateRange.toLowerCase():\n        requestfilterValue = GranularDateRangeInputUtils.setValueFromRequest(\n          <GranularDateRangeFilterValue>filter,\n          req,\n          prefix,\n        )\n        break\n      case FilterType.date.toLowerCase():\n        requestfilterValue = DateInputUtils.setValueFromRequest(<DateFilterValue>filter, req, prefix)\n        break\n      case FilterType.multiselect.toLowerCase():\n        ;({ requestfilterValue, requestfilterValues } = MultiSelectUtils.setValueFromRequest(\n          <MultiselectFilterValue>filter,\n          req,\n          prefix,\n        ))\n        break\n      default:\n        requestfilterValue = <string>req.query[`${prefix}${filter.name}`]\n        break\n    }\n\n    let value: FilterValueType = null\n    if (requestfilterValue) {\n      value = requestfilterValue\n    } else if (preventDefault) {\n      value = ''\n    }\n\n    return {\n      ...filter,\n      value,\n      ...(requestfilterValues && { values: requestfilterValues }),\n    }\n  })\n}\n\nexport const setFilterQueryFromFilterDefinition = (\n  fields: components['schemas']['FieldDefinition'][],\n  interactive?: boolean,\n) => {\n  let filterFields: components['schemas']['FieldDefinition'][] = fields.filter((f) => f.filter)\n  if (interactive) {\n    filterFields = filterFields.filter(\n      (f) => (<components['schemas']['FilterDefinition'] & { interactive?: boolean }>f.filter).interactive,\n    )\n  }\n\n  return filterFields\n    .filter((field) => field.filter !== undefined)\n    .filter((field) => (<components['schemas']['FilterDefinition']>field.filter).defaultValue !== undefined)\n    .map((field) => {\n      const filter = <components['schemas']['FilterDefinition']>field.filter\n      const type = filter.type.toLocaleLowerCase()\n\n      switch (type) {\n        case FilterType.dateRange.toLowerCase():\n          return DateRangeInputUtils.getQueryFromDefinition(filter, field.name, DEFAULT_FILTERS_PREFIX)\n\n        case FilterType.multiselect.toLowerCase():\n          return MultiSelectUtils.getQueryFromDefinition(filter, field.name, DEFAULT_FILTERS_PREFIX)\n\n        case FilterType.granularDateRange.toLowerCase(): {\n          const startEndParams = DateRangeInputUtils.getQueryFromDefinition(filter, field.name, DEFAULT_FILTERS_PREFIX)\n          return GranularDateRangeInputUtils.getQueryFromDefinition(\n            filter as unknown as components['schemas']['FilterDefinition'] & {\n              defaultGranularity: Granularity\n              defaultQuickFilterValue: QuickFilters\n            },\n            field.name,\n            DEFAULT_FILTERS_PREFIX,\n            startEndParams,\n          )\n        }\n\n        default:\n          return `${DEFAULT_FILTERS_PREFIX}${field.name}=${filter.defaultValue}`\n      }\n    })\n    .join('&')\n}\n\nexport const getFiltersFromDefinition = (\n  fields: components['schemas']['FieldDefinition'][],\n  interactive?: boolean,\n): FilterValue[] => {\n  const filters = fields\n    .filter((f) => f.filter)\n    .filter((f) => {\n      if (interactive !== undefined) {\n        if (f.filter?.interactive === undefined) {\n          return !interactive\n        }\n        return interactive === f.filter.interactive\n      }\n      return true\n    })\n    .map((f) => {\n      const { display: text, name } = f\n      const filter = <components['schemas']['FilterDefinition']>f.filter\n      const { type, staticOptions, dynamicOptions, defaultValue, mandatory, pattern, index } = filter\n\n      const options: FilterOption[] = staticOptions\n        ? staticOptions.map((opt) => {\n            return { value: opt.name, text: opt.display }\n          })\n        : []\n\n      let filterData: FilterValue = {\n        text,\n        name,\n        type: type as FilterType,\n        value: defaultValue || null,\n        mandatory: mandatory || false,\n        minimumLength: dynamicOptions?.minimumLength,\n        pattern,\n        index,\n      }\n\n      const noFilterOption = {\n        value: 'no-filter',\n        text: 'None',\n        disabled: false,\n      }\n\n      switch (type) {\n        case FilterType.autocomplete.toLowerCase():\n          filterData = {\n            ...filterData,\n            options,\n          }\n          break\n\n        case FilterType.radio:\n          if (!mandatory) options.unshift(noFilterOption)\n          filterData = {\n            ...filterData,\n            options,\n          }\n          break\n\n        case FilterType.select: {\n          if (!mandatory) options.unshift(noFilterOption)\n          options.unshift({\n            value: '',\n            text: 'Select your option',\n            disabled: true,\n            selected: true,\n          })\n\n          filterData = {\n            ...filterData,\n            options,\n          }\n          break\n        }\n\n        case FilterType.multiselect.toLowerCase():\n          filterData = {\n            ...filterData,\n            options,\n            values: defaultValue ? defaultValue.split(',') : [],\n          }\n          break\n\n        case FilterType.dateRange.toLowerCase():\n          filterData = DateRangeInputUtils.getFilterFromDefinition(filter, filterData)\n          break\n\n        case FilterType.date.toLowerCase():\n          filterData = DateInputUtils.getFilterFromDefinition(filter, filterData)\n          break\n\n        case FilterType.granularDateRange.toLocaleLowerCase(): {\n          filterData = GranularDateRangeInputUtils.getFilterFromDefinition(filter, filterData)\n          break\n        }\n\n        default:\n          break\n      }\n\n      return filterData\n    })\n\n  const orderedFilters = orderFilters(filters)\n  return orderedFilters\n}\n\nconst orderFilters = (filterValues: FilterValue[]) => {\n  const noIndexFilters = filterValues.filter((f) => f.index === undefined)\n  const indexFilters = filterValues.filter((f) => f.index !== undefined)\n  indexFilters.forEach((f) => {\n    if (f.index !== undefined) noIndexFilters.splice(f.index, 0, f)\n  })\n  return noIndexFilters\n}\n\nexport const setRequestQueryFromFilterValues = (filterValues: FilterValue[], verbose = false) => {\n  const requestQuery = filterValues\n    .filter((fv) => fv.value)\n    .reduce((acc, curr) => {\n      const { value, name, type } = curr\n      const filterPrefix = `filters.${name}`\n      switch (type) {\n        case FilterType.granularDateRange.toLowerCase():\n          {\n            const granularDateRangeValue = <GranularDateRange>value\n            Object.keys(granularDateRangeValue).forEach((key) => {\n              let v = granularDateRangeValue[key as keyof GranularDateRange]\n              if (key.includes('partialDate')) {\n                acc = {\n                  ...acc,\n                }\n              } else {\n                if (key.includes('granularity') || key.includes('quickFilter')) {\n                  v = (<GranularDateRangeGranularityValue | GranularDateRangeQuickFilterValue>v).value\n                }\n                acc = {\n                  ...acc,\n                  [`${filterPrefix}.${key}`]: v,\n                }\n              }\n            })\n          }\n          break\n        case FilterType.dateRange.toLowerCase():\n          if (value) {\n            Object.keys(value).forEach((key) => {\n              const attrKey = !verbose && key.includes('relative') ? undefined : `${filterPrefix}.${key}`\n              const attrValue = value[key as keyof FilterValueType]\n              if (attrKey) {\n                acc = {\n                  ...acc,\n                  [`${attrKey}`]: attrValue,\n                }\n              }\n            })\n          }\n          break\n        case FilterType.multiselect.toLowerCase():\n          acc = {\n            ...acc,\n            [`${filterPrefix}`]: (<string>value).split(','),\n          }\n          break\n        default:\n          acc = {\n            ...acc,\n            [`${filterPrefix}`]: value,\n          }\n          break\n      }\n      return acc\n    }, {})\n\n  return requestQuery\n}\n\nexport const redirectWithDefaultFilters = (\n  reportQuery: ReportQuery,\n  variantDefinition: components['schemas']['VariantDefinition'],\n  response: Response,\n  request: Request,\n) => {\n  const defaultFilters: Record<string, string> = {}\n  const { specification } = variantDefinition\n  const fields = specification ? specification.fields : []\n  const { preventDefault } = request.query\n  const hasNoQueryFilters = Object.keys(reportQuery.filters).length === 0 && !preventDefault\n  if (hasNoQueryFilters) {\n    fields\n      .filter((f) => f.filter && f.filter.defaultValue)\n      .forEach((f) => {\n        const { filter } = f\n        if (filter) {\n          if (filter.type.toLowerCase() === FilterType.dateRange.toLowerCase()) {\n            const { defaultValue } = <components['schemas']['FilterDefinition']>filter\n            const dates = defaultValue ? defaultValue.split(' - ') : ''\n\n            if (dates.length >= 1) {\n              // eslint-disable-next-line prefer-destructuring\n              defaultFilters[`${DEFAULT_FILTERS_PREFIX}${f.name}.start`] = dates[0]\n\n              if (dates.length >= 2) {\n                // eslint-disable-next-line prefer-destructuring\n                defaultFilters[`${DEFAULT_FILTERS_PREFIX}${f.name}.end`] = dates[1]\n              }\n            }\n          } else {\n            defaultFilters[`${DEFAULT_FILTERS_PREFIX}${f.name}`] = filter.defaultValue || ''\n          }\n        }\n      })\n  }\n\n  if (Object.keys(defaultFilters).length > 0) {\n    const querystring = createUrlForParameters(reportQuery.toRecordWithFilterPrefix(), defaultFilters, fields)\n    response.redirect(`${request.baseUrl}${request.path}${querystring}`)\n    return true\n  }\n\n  return false\n}\n\nexport const getPersonalisedFilters = async (\n  filters: FilterValue[],\n  req: Request,\n  res: Response,\n  services: Services,\n  filtersType: FiltersType,\n) => {\n  const { reportId, id } = req.params\n  const { dprUser } = LocalsHelper.getValues(res)\n  const defaultFilterValues = await services.defaultFilterValuesService.get(dprUser.id, reportId, id, filtersType)\n  let defaultFilters = filters\n  if (defaultFilterValues) {\n    const personalisedFilters = PersonalistionUtils.setFilterValuesFromSavedDefaults(filters, [], defaultFilterValues)\n    defaultFilters = personalisedFilters.filters\n  }\n\n  return { filters: defaultFilters, defaultFilterValues }\n}\n\nexport const getFilters = async ({\n  fields,\n  req,\n  res,\n  prefix = 'filters.',\n  services,\n  filtersType,\n}: {\n  fields: components['schemas']['FieldDefinition'][]\n  req: Request\n  res?: Response | undefined\n  prefix?: string\n  services?: Services | undefined\n  filtersType: FiltersType\n}) => {\n  // 1. Set the filters from the product definition\n  let filters = await getFiltersFromDefinition(fields, filtersType === FiltersType.INTERACTIVE)\n\n  let hasDefaults\n  let canSaveDefaults = false\n  if (services && res && res.locals['saveDefaultsEnabled']) {\n    // 2. If there are personalised filters, overwrite fiters with the personalised filter values.\n    const { filters: personalisedFilterValues, defaultFilterValues } = await getPersonalisedFilters(\n      filters,\n      req,\n      res,\n      services,\n      filtersType,\n    )\n    filters = personalisedFilterValues\n    hasDefaults = defaultFilterValues && defaultFilterValues.length > 0\n    canSaveDefaults = true\n  }\n\n  // If there is a request query, overwrite the filters with the query params\n  if (req.query) {\n    filters = setFilterValuesFromRequest(filters, req)\n  }\n\n  // Set the selected filters\n  const selectedFilters = SelectedFiltersUtils.getSelectedFilters(filters, prefix)\n\n  return {\n    filters,\n    selectedFilters,\n    hasDefaults,\n    canSaveDefaults,\n  }\n}\n\nexport default {\n  getFiltersFromDefinition,\n  setFilterValuesFromRequest,\n  getFilters,\n  setFilterQueryFromFilterDefinition,\n  redirectWithDefaultFilters,\n  setRequestQueryFromFilterValues,\n  getPersonalisedFilters,\n}\n"],
+  "mappings": "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",
+  "names": ["utils_exports", "__export", "utils_default", "getFilters", "getFiltersFromDefinition", "getPersonalisedFilters", "redirectWithDefaultFilters", "setFilterQueryFromFilterDefinition", "setFilterValuesFromRequest", "setRequestQueryFromFilterValues", "__toCommonJS", "import_enum", "import_ReportQuery", "import_utils", "import_personalisationUtils", "import_urlHelper", "import_filtersTypeEnum", "import_localsHelper", "filters", "req", "prefix", "preventDefault", "key", "filter", "requestfilterValue", "requestfilterValues", "DateRangeInputUtils", "GranularDateRangeInputUtils", "DateInputUtils", "MultiSelectUtils", "value", "fields", "interactive", "filterFields", "f", "field", "startEndParams", "text", "name", "type", "staticOptions", "dynamicOptions", "defaultValue", "mandatory", "pattern", "index", "options", "opt", "filterData", "noFilterOption", "orderFilters", "filterValues", "noIndexFilters", "verbose", "fv", "acc", "curr", "filterPrefix", "granularDateRangeValue", "v", "attrKey", "attrValue", "reportQuery", "variantDefinition", "response", "request", "defaultFilters", "specification", "dates", "querystring", "createUrlForParameters", "res", "services", "filtersType", "reportId", "id", "dprUser", "LocalsHelper", "defaultFilterValues", "PersonalistionUtils", "hasDefaults", "canSaveDefaults", "personalisedFilterValues", "selectedFilters", "SelectedFiltersUtils"]
 }

package/dpr/components/_filters/utils.ts

@@ -254,13 +254,13 @@ const orderFilters = (filterValues: FilterValue[]) => {
   return noIndexFilters
 }
 
-export const setRequestQueryFromFilterValues = (filterValues: FilterValue[]) => {
+export const setRequestQueryFromFilterValues = (filterValues: FilterValue[], verbose = false) => {
   const requestQuery = filterValues
     .filter((fv) => fv.value)
     .reduce((acc, curr) => {
-      const { value, name } = curr
+      const { value, name, type } = curr
       const filterPrefix = `filters.${name}`
-      switch (curr.type) {
+      switch (type) {
         case FilterType.granularDateRange.toLowerCase():
           {
             const granularDateRangeValue = <GranularDateRange>value
@@ -285,9 +285,13 @@ export const setRequestQueryFromFilterValues = (filterValues: FilterValue[]) =>
         case FilterType.dateRange.toLowerCase():
           if (value) {
             Object.keys(value).forEach((key) => {
-              acc = {
-                ...acc,
-                [`${filterPrefix}.${key}`]: value[key as keyof FilterValueType],
+              const attrKey = !verbose && key.includes('relative') ? undefined : `${filterPrefix}.${key}`
+              const attrValue = value[key as keyof FilterValueType]
+              if (attrKey) {
+                acc = {
+                  ...acc,
+                  [`${attrKey}`]: attrValue,
+                }
               }
             })
           }

package/dpr/components/user-reports/utils.js

@@ -1,2 +1,2 @@
-"use strict";var j=Object.create;var k=Object.defineProperty;var G=Object.getOwnPropertyDescriptor;var J=Object.getOwnPropertyNames;var K=Object.getPrototypeOf,X=Object.prototype.hasOwnProperty;var z=(r,s)=>{for(var t in s)k(r,t,{get:s[t],enumerable:!0})},F=(r,s,t,e)=>{if(s&&typeof s=="object"||typeof s=="function")for(let a of J(s))!X.call(r,a)&&a!==t&&k(r,a,{get:()=>s[a],enumerable:!(e=G(s,a))||e.enumerable});return r};var c=(r,s,t)=>(t=r!=null?j(K(r)):{},F(s||!r||!r.__esModule?k(t,"default",{value:r,enumerable:!0}):t,r)),W=r=>F(k({},"__esModule",{value:!0}),r);var ie={};z(ie,{default:()=>oe,init:()=>Y,renderList:()=>U,setDataFromStatus:()=>Q,updateExpiredStatus:()=>B,updateLastViewed:()=>H});module.exports=W(ie);var $=c(require("dayjs")),i=require("../../types/UserReports"),x=require("../../utils/requestStatusHelper"),A=c(require("../_filters/filters-selected/utils")),P=c(require("../_filters/utils")),y=require("../../utils/reportListsHelper"),V=c(require("./requested/utils")),L=c(require("./viewed/utils")),_=c(require("./bookmarks/utils")),q=c(require("../../utils/localsHelper")),M=c(require("../../utils/DateMapper/DateMapper")),N=c(require("../../utils/UserStoreItemBuilder"));const Z=r=>{const s=JSON.parse(JSON.stringify(r)),{executionId:t,tableId:e,variantName:a,name:l,reportId:o,variantId:d,id:u,description:p,query:n,interactiveQuery:m,status:g,reportName:D,dataProductDefinitionsPath:b,type:w,url:S}=s;let v=[];n&&(v=n.summary);let f=[];m&&(f=m.summary);const R=w||i.ReportType.REPORT;return{id:t,text:l||a||"",reportName:D,description:p,tag:"MIS",summary:v,interactiveSummary:f,status:g,type:R,...g&&Q(g,s),meta:{reportId:o,id:d||u,executionId:t,tableId:e,status:g,type:R,dataProductDefinitionsPath:b,pollingUrl:S?.polling?.pathname,reportUrl:S?.report?.pathname}}},ee=(r,s)=>({rows:r.map(e=>te(e,s)),head:[{text:"Product",classes:"dpr-req-product-head"},{text:"Filters",classes:"dpr-req-filters-head"},{text:"Status",classes:"dpr-req-status-head"},{text:"Actions",classes:"dpr-req-actions-head"}]}),te=(r,s)=>{let t,e="";const{href:a,id:l,reportName:o,text:d,timestamp:u,type:p,status:n}=r;if(a&&l)switch(n){case i.RequestStatus.FAILED:t="govuk-tag--red",e=(0,y.itemActionsHtml)(a,l,s,n);break;case i.RequestStatus.EXPIRED:t="govuk-tag--grey",e=(0,y.itemActionsHtml)(a,l,s,n);break;case i.RequestStatus.ABORTED:t="govuk-tag--orange",e=(0,y.itemActionsHtml)(a,l,s,n);break;case i.RequestStatus.READY:case i.RequestStatus.FINISHED:e=`<a class=govuk-link govuk-link--no-visited-state dpr-type__${p}' href="${a}">Go to ${p}</a>`,t="govuk-tag--green";break;case i.RequestStatus.PICKED:case i.RequestStatus.SUBMITTED:case i.RequestStatus.STARTED:e=`<a class='govuk-link govuk-link--no-visited-state dpr-type__${p}' href="${a}">Go to status</a>`;break;default:break}let m="";return(r.summary||r.interactiveSummary)&&(m=ae(r)),[{html:(0,y.createListItemProduct)(o,d,p,u)},{html:m},{html:`<strong class="govuk-tag dpr-request-status-tag ${t}">${n}</strong>`,classes:"dpr-req-cell dpr-req-cell__status"},{html:`${e}`,classes:"dpr-req-cell dpr-req-cell__status"}]},re=(r,s=20)=>({amount:r,shown:s&&r>s?s:r,max:s}),ae=r=>{const s=r.summary?.map(e=>`<li class="govuk-body-s dpr-query-summary"><strong>${e.name}</strong>: ${e.value}</li>`).join(""),t=r.interactiveSummary?.map(e=>`<li class="govuk-body-s dpr-interactive-query-summary"><strong>${e.name}</strong>: ${e.value}</li>`).join("");return`<ul class="dpr-card-group__item__filters-list govuk-!-margin-top-0 govuk-!-margin-bottom-0">${s}${t}</ul>`},se=(r,s)=>{const{nestedBaseUrl:t}=q.default.getValues(s);return r.map(e=>({reportId:e.meta?.reportId,id:e.meta.id,executionId:e.meta.executionId,tableId:e.meta.tableId,status:e.meta.status,requestedAt:e.meta.requestedAt,type:e.meta.type,dataProductDefinitionsPath:e.meta.dataProductDefinitionsPath,pollingUrl:e.meta.pollingUrl,reportUrl:e.meta.reportUrl,nestedBaseUrl:t}))},Q=(r,s)=>{let t,e,a;const{url:l,timestamp:o}=s,d=l?.polling,u=l?.request,p=l?.report,n=new M.default;switch(r){case i.RequestStatus.FAILED:{a=o.failed?n.toDateString(o.failed,"local-date"):(0,$.default)().format("DD/MM/YYYY"),e=d?.fullUrl,t=`Failed at: ${a}`;break}case i.RequestStatus.ABORTED:{e=u?.fullUrl,a=n.toDateString(o.aborted,"local-date"),t=`Aborted at: ${a}`;break}case i.RequestStatus.FINISHED:e=p?.fullUrl,a=n.toDateString(o.completed,"local-date"),t=`Ready at: ${a}`;break;case i.RequestStatus.EXPIRED:{e=u?.fullUrl,a=n.toDateString(o.expired,"local-date"),t=`Expired at: ${a}`;break}case i.RequestStatus.READY:{e=p?.fullUrl,a=n.toDateString(o.lastViewed,"local-date"),t=`Last viewed: ${a}`;break}case i.RequestStatus.SUBMITTED:case i.RequestStatus.STARTED:case i.RequestStatus.PICKED:e=d?.fullUrl,a=n.toDateString(o.requested,"local-date"),t=`Requested at: ${a}`;break;default:a=n.toDateString(o.lastViewed,"local-date"),t=`Last viewed: ${a}`;break}return{timestamp:t,href:e}},U=async({res:r,reportsData:s,maxRows:t,filterFunction:e,type:a})=>{const{csrfToken:l}=q.default.getValues(r);let o=s.filter(e).map(Z);const d=o.length;t&&(o=o.slice(0,t));const u=ee(o,a),p=a==="requested"?"requested-reports":"recently-viewed";return{head:{...o.length&&{href:`dpr/my-reports/${p}/list`},...!o.length&&{emptyMessage:`You have 0 ${a} reports`}},tableData:u,total:re(d,t),meta:se(o,r),csrfToken:l,...t&&{maxRows:t}}},B=async({req:r,res:s,services:t})=>{const{dprUser:e}=q.default.getValues(s),a=await(0,x.getExpiredStatus)({req:r,res:s,services:t});return a&&a.isExpired&&(await t.recentlyViewedService.setToExpired(a.executionId,e.id),await t.requestedReportService.setToExpired(a.executionId,e.id)),a?a.isExpired:!1},Y=async({services:r,res:s,maxRows:t=6})=>{const{requestedReports:e,recentlyViewedReports:a,bookmarkingEnabled:l}=q.default.getValues(s),o=await U({res:s,reportsData:e,filterFunction:V.default.filterReports,maxRows:t,type:"requested"}),d=await U({res:s,reportsData:a,filterFunction:L.default.filterReports,maxRows:t,type:"viewed"});let u;return l&&(u=await _.default.renderBookmarkList({res:s,services:r,maxRows:t})),{requestedReports:o,viewedReports:d,bookmarks:u}},H=async({req:r,services:s,reportStateData:t,userId:e,filters:a})=>{const{type:l,reportId:o,reportName:d,description:u,id:p,name:n,executionId:m,tableId:g,query:D,url:b}=t,w={type:l,reportId:o,reportName:d,description:u,id:p,name:n},S={executionId:m,tableId:g},v=D?{query:D.data,querySummary:D.summary}:{query:{},querySummary:[]},f=r.query?.columns,{selectedPage:R,pageSize:I,sortColumn:h,sortedAsc:E}=r.query,T=P.default.setRequestQueryFromFilterValues(a),C={query:{...T,...f&&{columns:f},...R&&{selectedPage:R},...I&&{pageSize:I},...h&&{sortColumn:h},...E&&{sortedAsc:E}},querySummary:A.default.getQuerySummary(T,a)},O=new N.default(w).addExecutionData(S).addQuery(v).addInteractiveQuery(C).addStatus(i.RequestStatus.READY).addTimestamp().addAsyncUrls(b).addReportUrls(r).build();m&&await s.requestedReportService.updateLastViewed(m,e),await s.recentlyViewedService.setRecentlyViewed(O,e)};var oe={renderList:U,updateExpiredStatus:B,init:Y,updateLastViewed:H};0&&(module.exports={init,renderList,setDataFromStatus,updateExpiredStatus,updateLastViewed});
+"use strict";var j=Object.create;var k=Object.defineProperty;var G=Object.getOwnPropertyDescriptor;var J=Object.getOwnPropertyNames;var K=Object.getPrototypeOf,X=Object.prototype.hasOwnProperty;var z=(r,s)=>{for(var t in s)k(r,t,{get:s[t],enumerable:!0})},F=(r,s,t,e)=>{if(s&&typeof s=="object"||typeof s=="function")for(let a of J(s))!X.call(r,a)&&a!==t&&k(r,a,{get:()=>s[a],enumerable:!(e=G(s,a))||e.enumerable});return r};var c=(r,s,t)=>(t=r!=null?j(K(r)):{},F(s||!r||!r.__esModule?k(t,"default",{value:r,enumerable:!0}):t,r)),W=r=>F(k({},"__esModule",{value:!0}),r);var ie={};z(ie,{default:()=>oe,init:()=>Y,renderList:()=>U,setDataFromStatus:()=>Q,updateExpiredStatus:()=>B,updateLastViewed:()=>H});module.exports=W(ie);var $=c(require("dayjs")),i=require("../../types/UserReports"),x=require("../../utils/requestStatusHelper"),A=c(require("../_filters/filters-selected/utils")),P=c(require("../_filters/utils")),y=require("../../utils/reportListsHelper"),V=c(require("./requested/utils")),L=c(require("./viewed/utils")),_=c(require("./bookmarks/utils")),q=c(require("../../utils/localsHelper")),M=c(require("../../utils/DateMapper/DateMapper")),N=c(require("../../utils/UserStoreItemBuilder"));const Z=r=>{const s=JSON.parse(JSON.stringify(r)),{executionId:t,tableId:e,variantName:a,name:l,reportId:o,variantId:d,id:u,description:p,query:n,interactiveQuery:m,status:g,reportName:D,dataProductDefinitionsPath:b,type:w,url:S}=s;let v=[];n&&(v=n.summary);let f=[];m&&(f=m.summary);const R=w||i.ReportType.REPORT;return{id:t,text:l||a||"",reportName:D,description:p,tag:"MIS",summary:v,interactiveSummary:f,status:g,type:R,...g&&Q(g,s),meta:{reportId:o,id:d||u,executionId:t,tableId:e,status:g,type:R,dataProductDefinitionsPath:b,pollingUrl:S?.polling?.pathname,reportUrl:S?.report?.pathname}}},ee=(r,s)=>({rows:r.map(e=>te(e,s)),head:[{text:"Product",classes:"dpr-req-product-head"},{text:"Filters",classes:"dpr-req-filters-head"},{text:"Status",classes:"dpr-req-status-head"},{text:"Actions",classes:"dpr-req-actions-head"}]}),te=(r,s)=>{let t,e="";const{href:a,id:l,reportName:o,text:d,timestamp:u,type:p,status:n}=r;if(a&&l)switch(n){case i.RequestStatus.FAILED:t="govuk-tag--red",e=(0,y.itemActionsHtml)(a,l,s,n);break;case i.RequestStatus.EXPIRED:t="govuk-tag--grey",e=(0,y.itemActionsHtml)(a,l,s,n);break;case i.RequestStatus.ABORTED:t="govuk-tag--orange",e=(0,y.itemActionsHtml)(a,l,s,n);break;case i.RequestStatus.READY:case i.RequestStatus.FINISHED:e=`<a class=govuk-link govuk-link--no-visited-state dpr-type__${p}' href="${a}">Go to ${p}</a>`,t="govuk-tag--green";break;case i.RequestStatus.PICKED:case i.RequestStatus.SUBMITTED:case i.RequestStatus.STARTED:e=`<a class='govuk-link govuk-link--no-visited-state dpr-type__${p}' href="${a}">Go to status</a>`;break;default:break}let m="";return(r.summary||r.interactiveSummary)&&(m=ae(r)),[{html:(0,y.createListItemProduct)(o,d,p,u)},{html:m},{html:`<strong class="govuk-tag dpr-request-status-tag ${t}">${n}</strong>`,classes:"dpr-req-cell dpr-req-cell__status"},{html:`${e}`,classes:"dpr-req-cell dpr-req-cell__status"}]},re=(r,s=20)=>({amount:r,shown:s&&r>s?s:r,max:s}),ae=r=>{const s=r.summary?.map(e=>`<li class="govuk-body-s dpr-query-summary"><strong>${e.name}</strong>: ${e.value}</li>`).join(""),t=r.interactiveSummary?.map(e=>`<li class="govuk-body-s dpr-interactive-query-summary"><strong>${e.name}</strong>: ${e.value}</li>`).join("");return`<ul class="dpr-card-group__item__filters-list govuk-!-margin-top-0 govuk-!-margin-bottom-0">${s}${t}</ul>`},se=(r,s)=>{const{nestedBaseUrl:t}=q.default.getValues(s);return r.map(e=>({reportId:e.meta?.reportId,id:e.meta.id,executionId:e.meta.executionId,tableId:e.meta.tableId,status:e.meta.status,requestedAt:e.meta.requestedAt,type:e.meta.type,dataProductDefinitionsPath:e.meta.dataProductDefinitionsPath,pollingUrl:e.meta.pollingUrl,reportUrl:e.meta.reportUrl,nestedBaseUrl:t}))},Q=(r,s)=>{let t,e,a;const{url:l,timestamp:o}=s,d=l?.polling,u=l?.request,p=l?.report,n=new M.default;switch(r){case i.RequestStatus.FAILED:{a=o.failed?n.toDateString(o.failed,"local-date"):(0,$.default)().format("DD/MM/YYYY"),e=d?.fullUrl,t=`Failed at: ${a}`;break}case i.RequestStatus.ABORTED:{e=u?.fullUrl,a=n.toDateString(o.aborted,"local-date"),t=`Aborted at: ${a}`;break}case i.RequestStatus.FINISHED:e=p?.fullUrl,a=n.toDateString(o.completed,"local-date"),t=`Ready at: ${a}`;break;case i.RequestStatus.EXPIRED:{e=u?.fullUrl,a=n.toDateString(o.expired,"local-date"),t=`Expired at: ${a}`;break}case i.RequestStatus.READY:{e=p?.fullUrl,a=n.toDateString(o.lastViewed,"local-date"),t=`Last viewed: ${a}`;break}case i.RequestStatus.SUBMITTED:case i.RequestStatus.STARTED:case i.RequestStatus.PICKED:e=d?.fullUrl,a=n.toDateString(o.requested,"local-date"),t=`Requested at: ${a}`;break;default:a=n.toDateString(o.lastViewed,"local-date"),t=`Last viewed: ${a}`;break}return{timestamp:t,href:e}},U=async({res:r,reportsData:s,maxRows:t,filterFunction:e,type:a})=>{const{csrfToken:l}=q.default.getValues(r);let o=s.filter(e).map(Z);const d=o.length;t&&(o=o.slice(0,t));const u=ee(o,a),p=a==="requested"?"requested-reports":"recently-viewed";return{head:{...o.length&&{href:`dpr/my-reports/${p}/list`},...!o.length&&{emptyMessage:`You have 0 ${a} reports`}},tableData:u,total:re(d,t),meta:se(o,r),csrfToken:l,...t&&{maxRows:t}}},B=async({req:r,res:s,services:t})=>{const{dprUser:e}=q.default.getValues(s),a=await(0,x.getExpiredStatus)({req:r,res:s,services:t});return a&&a.isExpired&&(await t.recentlyViewedService.setToExpired(a.executionId,e.id),await t.requestedReportService.setToExpired(a.executionId,e.id)),a?a.isExpired:!1},Y=async({services:r,res:s,maxRows:t=6})=>{const{requestedReports:e,recentlyViewedReports:a,bookmarkingEnabled:l}=q.default.getValues(s),o=await U({res:s,reportsData:e,filterFunction:V.default.filterReports,maxRows:t,type:"requested"}),d=await U({res:s,reportsData:a,filterFunction:L.default.filterReports,maxRows:t,type:"viewed"});let u;return l&&(u=await _.default.renderBookmarkList({res:s,services:r,maxRows:t})),{requestedReports:o,viewedReports:d,bookmarks:u}},H=async({req:r,services:s,reportStateData:t,userId:e,filters:a})=>{const{type:l,reportId:o,reportName:d,description:u,id:p,name:n,executionId:m,tableId:g,query:D,url:b}=t,w={type:l,reportId:o,reportName:d,description:u,id:p,name:n},S={executionId:m,tableId:g},v=D?{query:D.data,querySummary:D.summary}:{query:{},querySummary:[]},f=r.query?.columns,{selectedPage:R,pageSize:I,sortColumn:h,sortedAsc:E}=r.query,T=P.default.setRequestQueryFromFilterValues(a,!0),C={query:{...T,...f&&{columns:f},...R&&{selectedPage:R},...I&&{pageSize:I},...h&&{sortColumn:h},...E&&{sortedAsc:E}},querySummary:A.default.getQuerySummary(T,a)},O=new N.default(w).addExecutionData(S).addQuery(v).addInteractiveQuery(C).addStatus(i.RequestStatus.READY).addTimestamp().addAsyncUrls(b).addReportUrls(r).build();m&&await s.requestedReportService.updateLastViewed(m,e),await s.recentlyViewedService.setRecentlyViewed(O,e)};var oe={renderList:U,updateExpiredStatus:B,init:Y,updateLastViewed:H};0&&(module.exports={init,renderList,setDataFromStatus,updateExpiredStatus,updateLastViewed});
 //# sourceMappingURL=utils.js.map

package/dpr/components/user-reports/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/dpr/components/user-reports/utils.ts"],
-  "sourcesContent": ["import { Response, Request } from 'express'\nimport dayjs from 'dayjs'\nimport { RenderTableListResponse } from './types'\nimport Dict = NodeJS.Dict\nimport {\n  FormattedUserReportData,\n  UserReportData,\n  RequestStatus,\n  ReportType,\n  RequestedReport,\n  StoredReportData,\n  meta,\n} from '../../types/UserReports'\nimport { FilterValue } from '../_filters/types'\nimport { Services } from '../../types/Services'\n\nimport { AsyncReportUtilsParams } from '../../types/AsyncReportUtils'\nimport { getExpiredStatus } from '../../utils/requestStatusHelper'\nimport SelectedFiltersUtils from '../_filters/filters-selected/utils'\nimport FiltersUtils from '../_filters/utils'\nimport { itemActionsHtml, createListItemProduct } from '../../utils/reportListsHelper'\nimport RequestedReportUtils from './requested/utils'\nimport RecentlyViewedCardGroupUtils from './viewed/utils'\nimport BookmarklistUtils from './bookmarks/utils'\nimport LocalsHelper from '../../utils/localsHelper'\nimport DateMapper from '../../utils/DateMapper/DateMapper'\nimport UserStoreItemBuilder from '../../utils/UserStoreItemBuilder'\n\nconst formatData = (reportData: UserReportData): FormattedUserReportData => {\n  const reportDataCopy: UserReportData = JSON.parse(JSON.stringify(reportData))\n\n  const {\n    executionId,\n    tableId,\n    variantName,\n    name,\n    reportId,\n    variantId,\n    id,\n    description,\n    query,\n    interactiveQuery,\n    status,\n    reportName,\n    dataProductDefinitionsPath,\n    type: reportType,\n    url,\n  } = reportDataCopy\n\n  let summary: { name: string; value: string }[] = []\n  if (query) {\n    summary = query.summary as { name: string; value: string }[]\n  }\n  let interactiveSummary: { name: string; value: string }[] = []\n  if (interactiveQuery) {\n    interactiveSummary = interactiveQuery.summary as { name: string; value: string }[]\n  }\n\n  const type = reportType || ReportType.REPORT\n\n  return {\n    id: executionId,\n    text: name || variantName || '',\n    reportName,\n    description,\n    tag: 'MIS',\n    summary,\n    interactiveSummary,\n    status,\n    type,\n    ...(status && setDataFromStatus(status, reportDataCopy)),\n    meta: {\n      reportId,\n      id: variantId || id,\n      executionId,\n      tableId,\n      status,\n      type,\n      dataProductDefinitionsPath,\n      pollingUrl: url?.polling?.pathname,\n      reportUrl: url?.report?.pathname,\n    },\n  }\n}\n\nconst formatTable = (data: FormattedUserReportData[], type: 'requested' | 'viewed') => {\n  const rows = data.map((card: FormattedUserReportData) => {\n    return formatTableRow(card, type)\n  })\n\n  return {\n    rows,\n    head: [\n      { text: 'Product', classes: 'dpr-req-product-head' },\n      { text: 'Filters', classes: 'dpr-req-filters-head' },\n      { text: 'Status', classes: 'dpr-req-status-head' },\n      { text: 'Actions', classes: 'dpr-req-actions-head' },\n    ],\n  }\n}\n\nconst formatTableRow = (data: FormattedUserReportData, type: 'requested' | 'viewed') => {\n  let statusClass\n  let itemActions = ''\n\n  const { href, id, reportName, text, timestamp, type: reportType, status } = data\n  if (href && id) {\n    switch (status) {\n      case RequestStatus.FAILED:\n        statusClass = 'govuk-tag--red'\n        itemActions = itemActionsHtml(href, id, type, status)\n        break\n      case RequestStatus.EXPIRED:\n        statusClass = 'govuk-tag--grey'\n        itemActions = itemActionsHtml(href, id, type, status)\n        break\n      case RequestStatus.ABORTED:\n        statusClass = 'govuk-tag--orange'\n        itemActions = itemActionsHtml(href, id, type, status)\n        break\n      case RequestStatus.READY:\n      case RequestStatus.FINISHED:\n        itemActions = `<a class=govuk-link govuk-link--no-visited-state dpr-type__${reportType}' href=\"${href}\">Go to ${reportType}</a>`\n        statusClass = 'govuk-tag--green'\n        break\n      case RequestStatus.PICKED:\n      case RequestStatus.SUBMITTED:\n      case RequestStatus.STARTED:\n        itemActions = `<a class='govuk-link govuk-link--no-visited-state dpr-type__${reportType}' href=\"${href}\">Go to status</a>`\n        break\n      default:\n        break\n    }\n  }\n\n  let filtersSummary = ''\n  if (data.summary || data.interactiveSummary) {\n    filtersSummary = createSummaryHtml(data)\n  }\n\n  return [\n    {\n      html: createListItemProduct(reportName, text, reportType, timestamp),\n    },\n    { html: filtersSummary },\n    {\n      html: `<strong class=\"govuk-tag dpr-request-status-tag ${statusClass}\">${status}</strong>`,\n      classes: 'dpr-req-cell dpr-req-cell__status',\n    },\n    {\n      html: `${itemActions}`,\n      classes: 'dpr-req-cell dpr-req-cell__status',\n    },\n  ]\n}\n\nconst getTotals = (formattedCount: number, maxRows = 20) => {\n  return {\n    amount: formattedCount,\n    shown: maxRows && formattedCount > maxRows ? maxRows : formattedCount,\n    max: maxRows,\n  }\n}\n\nconst createSummaryHtml = (data: FormattedUserReportData) => {\n  const summaryHtml = data.summary\n    ?.map((item) => `<li class=\"govuk-body-s dpr-query-summary\"><strong>${item.name}</strong>: ${item.value}</li>`)\n    .join('')\n\n  const interactiveSummaryHtml = data.interactiveSummary\n    ?.map(\n      (item) =>\n        `<li class=\"govuk-body-s dpr-interactive-query-summary\"><strong>${item.name}</strong>: ${item.value}</li>`,\n    )\n    .join('')\n\n  return `<ul class=\"dpr-card-group__item__filters-list govuk-!-margin-top-0 govuk-!-margin-bottom-0\">${summaryHtml}${interactiveSummaryHtml}</ul>`\n}\n\nconst getMeta = (formattedData: FormattedUserReportData[], res: Response): meta[] => {\n  const { nestedBaseUrl } = LocalsHelper.getValues(res)\n\n  return formattedData.map((d) => {\n    return {\n      reportId: d.meta?.reportId,\n      id: d.meta.id,\n      executionId: d.meta.executionId,\n      tableId: d.meta.tableId,\n      status: d.meta.status,\n      requestedAt: d.meta.requestedAt,\n      type: d.meta.type,\n      dataProductDefinitionsPath: d.meta.dataProductDefinitionsPath,\n      pollingUrl: d.meta.pollingUrl,\n      reportUrl: d.meta.reportUrl,\n      nestedBaseUrl,\n    }\n  })\n}\n\nexport const setDataFromStatus = (status: RequestStatus, reportsData: UserReportData) => {\n  let timestamp\n  let href\n  let formattedDate\n  const { url, timestamp: time } = reportsData\n  const polling = url?.polling\n  const request = url?.request\n  const report = url?.report\n\n  const dateMapper = new DateMapper()\n  switch (status) {\n    case RequestStatus.FAILED: {\n      formattedDate = time.failed\n        ? dateMapper.toDateString(<string>(<unknown>time.failed), 'local-date')\n        : dayjs().format('DD/MM/YYYY')\n      href = polling?.fullUrl\n      timestamp = `Failed at: ${formattedDate}`\n      break\n    }\n    case RequestStatus.ABORTED: {\n      href = request?.fullUrl\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.aborted), 'local-date')\n      timestamp = `Aborted at: ${formattedDate}`\n      break\n    }\n    case RequestStatus.FINISHED:\n      href = report?.fullUrl\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.completed), 'local-date')\n      timestamp = `Ready at: ${formattedDate}`\n      break\n    case RequestStatus.EXPIRED: {\n      href = request?.fullUrl\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.expired), 'local-date')\n      timestamp = `Expired at: ${formattedDate}`\n      break\n    }\n    case RequestStatus.READY: {\n      href = report?.fullUrl\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.lastViewed), 'local-date')\n      timestamp = `Last viewed: ${formattedDate}`\n      break\n    }\n    case RequestStatus.SUBMITTED:\n    case RequestStatus.STARTED:\n    case RequestStatus.PICKED:\n      href = polling?.fullUrl\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.requested), 'local-date')\n      timestamp = `Requested at: ${formattedDate}`\n      break\n    default:\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.lastViewed), 'local-date')\n      timestamp = `Last viewed: ${formattedDate}`\n      break\n  }\n\n  return {\n    timestamp,\n    href,\n  }\n}\n\nexport const renderList = async ({\n  res,\n  reportsData,\n  maxRows,\n  filterFunction,\n  type,\n}: {\n  res: Response\n  reportsData: StoredReportData[]\n  maxRows?: number\n  filterFunction: (report: UserReportData) => boolean\n  type: 'requested' | 'viewed'\n}): Promise<RenderTableListResponse> => {\n  const { csrfToken } = LocalsHelper.getValues(res)\n\n  let formatted = reportsData.filter(filterFunction).map(formatData)\n  const formattedCount = formatted.length\n\n  if (maxRows) formatted = formatted.slice(0, maxRows)\n  const tableData = formatTable(formatted, type)\n\n  const path = type === 'requested' ? 'requested-reports' : 'recently-viewed'\n  const head = {\n    ...(formatted.length && { href: `dpr/my-reports/${path}/list` }),\n    ...(!formatted.length && { emptyMessage: `You have 0 ${type} reports` }),\n  }\n\n  const result: RenderTableListResponse = {\n    head,\n    tableData,\n    total: getTotals(formattedCount, maxRows),\n    meta: getMeta(formatted, res),\n    csrfToken,\n    ...(maxRows && { maxRows }),\n  }\n\n  return result\n}\n\nexport const updateExpiredStatus = async ({ req, res, services }: AsyncReportUtilsParams) => {\n  const { dprUser } = LocalsHelper.getValues(res)\n  const report = await getExpiredStatus({ req, res, services })\n\n  if (report && report.isExpired) {\n    await services.recentlyViewedService.setToExpired(report.executionId, dprUser.id)\n    await services.requestedReportService.setToExpired(report.executionId, dprUser.id)\n  }\n\n  return report ? report.isExpired : false\n}\n\nexport const init = async ({ services, res, maxRows = 6 }: { services: Services; res: Response; maxRows?: number }) => {\n  const { requestedReports, recentlyViewedReports, bookmarkingEnabled } = LocalsHelper.getValues(res)\n  const requestedReportsList = await renderList({\n    res,\n    reportsData: requestedReports,\n    filterFunction: RequestedReportUtils.filterReports,\n    maxRows,\n    type: 'requested',\n  })\n  const viewedReportsList = await renderList({\n    res,\n    reportsData: recentlyViewedReports,\n    filterFunction: RecentlyViewedCardGroupUtils.filterReports,\n    maxRows,\n    type: 'viewed',\n  })\n\n  let bookmarks\n  if (bookmarkingEnabled) {\n    bookmarks = await BookmarklistUtils.renderBookmarkList({\n      res,\n      services,\n      maxRows,\n    })\n  }\n\n  return {\n    requestedReports: requestedReportsList,\n    viewedReports: viewedReportsList,\n    bookmarks,\n  }\n}\n\nexport const updateLastViewed = async ({\n  req,\n  services,\n  reportStateData,\n  userId,\n  filters,\n}: {\n  req: Request\n  services: Services\n  reportStateData: RequestedReport\n  userId: string\n  filters: FilterValue[]\n}) => {\n  const { type, reportId, reportName, description, id, name, executionId, tableId, query, url } = reportStateData\n  const reportData = { type, reportId, reportName, description, id, name }\n  const executionData = { executionId, tableId }\n  const queryData = query ? { query: query.data, querySummary: query.summary } : { query: {}, querySummary: [] }\n\n  const columns = <string[]>req.query?.['columns']\n  const { selectedPage, pageSize, sortColumn, sortedAsc } = <Dict<string>>req.query\n  const filtersQuery = FiltersUtils.setRequestQueryFromFilterValues(filters)\n  const reqQuery = {\n    ...filtersQuery,\n    ...(columns && { columns }),\n    ...(selectedPage && { selectedPage }),\n    ...(pageSize && { pageSize }),\n    ...(sortColumn && { sortColumn }),\n    ...(sortedAsc && { sortedAsc }),\n  }\n  const interactiveQueryData: { query: Dict<string | string[]>; querySummary: Array<Dict<string>> } = {\n    query: reqQuery,\n    querySummary: SelectedFiltersUtils.getQuerySummary(filtersQuery, filters),\n  }\n\n  const recentlyViewedData = new UserStoreItemBuilder(reportData)\n    .addExecutionData(executionData)\n    .addQuery(queryData)\n    .addInteractiveQuery(interactiveQueryData)\n    .addStatus(RequestStatus.READY)\n    .addTimestamp()\n    .addAsyncUrls(url)\n    .addReportUrls(req)\n    .build()\n\n  if (executionId) await services.requestedReportService.updateLastViewed(executionId, userId)\n  await services.recentlyViewedService.setRecentlyViewed(recentlyViewedData, userId)\n}\n\nexport default {\n  renderList,\n  updateExpiredStatus,\n  init,\n  updateLastViewed,\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { Response, Request } from 'express'\nimport dayjs from 'dayjs'\nimport { RenderTableListResponse } from './types'\nimport Dict = NodeJS.Dict\nimport {\n  FormattedUserReportData,\n  UserReportData,\n  RequestStatus,\n  ReportType,\n  RequestedReport,\n  StoredReportData,\n  meta,\n} from '../../types/UserReports'\nimport { FilterValue } from '../_filters/types'\nimport { Services } from '../../types/Services'\n\nimport { AsyncReportUtilsParams } from '../../types/AsyncReportUtils'\nimport { getExpiredStatus } from '../../utils/requestStatusHelper'\nimport SelectedFiltersUtils from '../_filters/filters-selected/utils'\nimport FiltersUtils from '../_filters/utils'\nimport { itemActionsHtml, createListItemProduct } from '../../utils/reportListsHelper'\nimport RequestedReportUtils from './requested/utils'\nimport RecentlyViewedCardGroupUtils from './viewed/utils'\nimport BookmarklistUtils from './bookmarks/utils'\nimport LocalsHelper from '../../utils/localsHelper'\nimport DateMapper from '../../utils/DateMapper/DateMapper'\nimport UserStoreItemBuilder from '../../utils/UserStoreItemBuilder'\n\nconst formatData = (reportData: UserReportData): FormattedUserReportData => {\n  const reportDataCopy: UserReportData = JSON.parse(JSON.stringify(reportData))\n\n  const {\n    executionId,\n    tableId,\n    variantName,\n    name,\n    reportId,\n    variantId,\n    id,\n    description,\n    query,\n    interactiveQuery,\n    status,\n    reportName,\n    dataProductDefinitionsPath,\n    type: reportType,\n    url,\n  } = reportDataCopy\n\n  let summary: { name: string; value: string }[] = []\n  if (query) {\n    summary = query.summary as { name: string; value: string }[]\n  }\n  let interactiveSummary: { name: string; value: string }[] = []\n  if (interactiveQuery) {\n    interactiveSummary = interactiveQuery.summary as { name: string; value: string }[]\n  }\n\n  const type = reportType || ReportType.REPORT\n\n  return {\n    id: executionId,\n    text: name || variantName || '',\n    reportName,\n    description,\n    tag: 'MIS',\n    summary,\n    interactiveSummary,\n    status,\n    type,\n    ...(status && setDataFromStatus(status, reportDataCopy)),\n    meta: {\n      reportId,\n      id: variantId || id,\n      executionId,\n      tableId,\n      status,\n      type,\n      dataProductDefinitionsPath,\n      pollingUrl: url?.polling?.pathname,\n      reportUrl: url?.report?.pathname,\n    },\n  }\n}\n\nconst formatTable = (data: FormattedUserReportData[], type: 'requested' | 'viewed') => {\n  const rows = data.map((card: FormattedUserReportData) => {\n    return formatTableRow(card, type)\n  })\n\n  return {\n    rows,\n    head: [\n      { text: 'Product', classes: 'dpr-req-product-head' },\n      { text: 'Filters', classes: 'dpr-req-filters-head' },\n      { text: 'Status', classes: 'dpr-req-status-head' },\n      { text: 'Actions', classes: 'dpr-req-actions-head' },\n    ],\n  }\n}\n\nconst formatTableRow = (data: FormattedUserReportData, type: 'requested' | 'viewed') => {\n  let statusClass\n  let itemActions = ''\n\n  const { href, id, reportName, text, timestamp, type: reportType, status } = data\n  if (href && id) {\n    switch (status) {\n      case RequestStatus.FAILED:\n        statusClass = 'govuk-tag--red'\n        itemActions = itemActionsHtml(href, id, type, status)\n        break\n      case RequestStatus.EXPIRED:\n        statusClass = 'govuk-tag--grey'\n        itemActions = itemActionsHtml(href, id, type, status)\n        break\n      case RequestStatus.ABORTED:\n        statusClass = 'govuk-tag--orange'\n        itemActions = itemActionsHtml(href, id, type, status)\n        break\n      case RequestStatus.READY:\n      case RequestStatus.FINISHED:\n        itemActions = `<a class=govuk-link govuk-link--no-visited-state dpr-type__${reportType}' href=\"${href}\">Go to ${reportType}</a>`\n        statusClass = 'govuk-tag--green'\n        break\n      case RequestStatus.PICKED:\n      case RequestStatus.SUBMITTED:\n      case RequestStatus.STARTED:\n        itemActions = `<a class='govuk-link govuk-link--no-visited-state dpr-type__${reportType}' href=\"${href}\">Go to status</a>`\n        break\n      default:\n        break\n    }\n  }\n\n  let filtersSummary = ''\n  if (data.summary || data.interactiveSummary) {\n    filtersSummary = createSummaryHtml(data)\n  }\n\n  return [\n    {\n      html: createListItemProduct(reportName, text, reportType, timestamp),\n    },\n    { html: filtersSummary },\n    {\n      html: `<strong class=\"govuk-tag dpr-request-status-tag ${statusClass}\">${status}</strong>`,\n      classes: 'dpr-req-cell dpr-req-cell__status',\n    },\n    {\n      html: `${itemActions}`,\n      classes: 'dpr-req-cell dpr-req-cell__status',\n    },\n  ]\n}\n\nconst getTotals = (formattedCount: number, maxRows = 20) => {\n  return {\n    amount: formattedCount,\n    shown: maxRows && formattedCount > maxRows ? maxRows : formattedCount,\n    max: maxRows,\n  }\n}\n\nconst createSummaryHtml = (data: FormattedUserReportData) => {\n  const summaryHtml = data.summary\n    ?.map((item) => `<li class=\"govuk-body-s dpr-query-summary\"><strong>${item.name}</strong>: ${item.value}</li>`)\n    .join('')\n\n  const interactiveSummaryHtml = data.interactiveSummary\n    ?.map(\n      (item) =>\n        `<li class=\"govuk-body-s dpr-interactive-query-summary\"><strong>${item.name}</strong>: ${item.value}</li>`,\n    )\n    .join('')\n\n  return `<ul class=\"dpr-card-group__item__filters-list govuk-!-margin-top-0 govuk-!-margin-bottom-0\">${summaryHtml}${interactiveSummaryHtml}</ul>`\n}\n\nconst getMeta = (formattedData: FormattedUserReportData[], res: Response): meta[] => {\n  const { nestedBaseUrl } = LocalsHelper.getValues(res)\n\n  return formattedData.map((d) => {\n    return {\n      reportId: d.meta?.reportId,\n      id: d.meta.id,\n      executionId: d.meta.executionId,\n      tableId: d.meta.tableId,\n      status: d.meta.status,\n      requestedAt: d.meta.requestedAt,\n      type: d.meta.type,\n      dataProductDefinitionsPath: d.meta.dataProductDefinitionsPath,\n      pollingUrl: d.meta.pollingUrl,\n      reportUrl: d.meta.reportUrl,\n      nestedBaseUrl,\n    }\n  })\n}\n\nexport const setDataFromStatus = (status: RequestStatus, reportsData: UserReportData) => {\n  let timestamp\n  let href\n  let formattedDate\n  const { url, timestamp: time } = reportsData\n  const polling = url?.polling\n  const request = url?.request\n  const report = url?.report\n\n  const dateMapper = new DateMapper()\n  switch (status) {\n    case RequestStatus.FAILED: {\n      formattedDate = time.failed\n        ? dateMapper.toDateString(<string>(<unknown>time.failed), 'local-date')\n        : dayjs().format('DD/MM/YYYY')\n      href = polling?.fullUrl\n      timestamp = `Failed at: ${formattedDate}`\n      break\n    }\n    case RequestStatus.ABORTED: {\n      href = request?.fullUrl\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.aborted), 'local-date')\n      timestamp = `Aborted at: ${formattedDate}`\n      break\n    }\n    case RequestStatus.FINISHED:\n      href = report?.fullUrl\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.completed), 'local-date')\n      timestamp = `Ready at: ${formattedDate}`\n      break\n    case RequestStatus.EXPIRED: {\n      href = request?.fullUrl\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.expired), 'local-date')\n      timestamp = `Expired at: ${formattedDate}`\n      break\n    }\n    case RequestStatus.READY: {\n      href = report?.fullUrl\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.lastViewed), 'local-date')\n      timestamp = `Last viewed: ${formattedDate}`\n      break\n    }\n    case RequestStatus.SUBMITTED:\n    case RequestStatus.STARTED:\n    case RequestStatus.PICKED:\n      href = polling?.fullUrl\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.requested), 'local-date')\n      timestamp = `Requested at: ${formattedDate}`\n      break\n    default:\n      formattedDate = dateMapper.toDateString(<string>(<unknown>time.lastViewed), 'local-date')\n      timestamp = `Last viewed: ${formattedDate}`\n      break\n  }\n\n  return {\n    timestamp,\n    href,\n  }\n}\n\nexport const renderList = async ({\n  res,\n  reportsData,\n  maxRows,\n  filterFunction,\n  type,\n}: {\n  res: Response\n  reportsData: StoredReportData[]\n  maxRows?: number\n  filterFunction: (report: UserReportData) => boolean\n  type: 'requested' | 'viewed'\n}): Promise<RenderTableListResponse> => {\n  const { csrfToken } = LocalsHelper.getValues(res)\n\n  let formatted = reportsData.filter(filterFunction).map(formatData)\n  const formattedCount = formatted.length\n\n  if (maxRows) formatted = formatted.slice(0, maxRows)\n  const tableData = formatTable(formatted, type)\n\n  const path = type === 'requested' ? 'requested-reports' : 'recently-viewed'\n  const head = {\n    ...(formatted.length && { href: `dpr/my-reports/${path}/list` }),\n    ...(!formatted.length && { emptyMessage: `You have 0 ${type} reports` }),\n  }\n\n  const result: RenderTableListResponse = {\n    head,\n    tableData,\n    total: getTotals(formattedCount, maxRows),\n    meta: getMeta(formatted, res),\n    csrfToken,\n    ...(maxRows && { maxRows }),\n  }\n\n  return result\n}\n\nexport const updateExpiredStatus = async ({ req, res, services }: AsyncReportUtilsParams) => {\n  const { dprUser } = LocalsHelper.getValues(res)\n  const report = await getExpiredStatus({ req, res, services })\n\n  if (report && report.isExpired) {\n    await services.recentlyViewedService.setToExpired(report.executionId, dprUser.id)\n    await services.requestedReportService.setToExpired(report.executionId, dprUser.id)\n  }\n\n  return report ? report.isExpired : false\n}\n\nexport const init = async ({ services, res, maxRows = 6 }: { services: Services; res: Response; maxRows?: number }) => {\n  const { requestedReports, recentlyViewedReports, bookmarkingEnabled } = LocalsHelper.getValues(res)\n  const requestedReportsList = await renderList({\n    res,\n    reportsData: requestedReports,\n    filterFunction: RequestedReportUtils.filterReports,\n    maxRows,\n    type: 'requested',\n  })\n  const viewedReportsList = await renderList({\n    res,\n    reportsData: recentlyViewedReports,\n    filterFunction: RecentlyViewedCardGroupUtils.filterReports,\n    maxRows,\n    type: 'viewed',\n  })\n\n  let bookmarks\n  if (bookmarkingEnabled) {\n    bookmarks = await BookmarklistUtils.renderBookmarkList({\n      res,\n      services,\n      maxRows,\n    })\n  }\n\n  return {\n    requestedReports: requestedReportsList,\n    viewedReports: viewedReportsList,\n    bookmarks,\n  }\n}\n\nexport const updateLastViewed = async ({\n  req,\n  services,\n  reportStateData,\n  userId,\n  filters,\n}: {\n  req: Request\n  services: Services\n  reportStateData: RequestedReport\n  userId: string\n  filters: FilterValue[]\n}) => {\n  const { type, reportId, reportName, description, id, name, executionId, tableId, query, url } = reportStateData\n  const reportData = { type, reportId, reportName, description, id, name }\n  const executionData = { executionId, tableId }\n  const queryData = query ? { query: query.data, querySummary: query.summary } : { query: {}, querySummary: [] }\n\n  const columns = <string[]>req.query?.['columns']\n  const { selectedPage, pageSize, sortColumn, sortedAsc } = <Dict<string>>req.query\n  const filtersQuery = FiltersUtils.setRequestQueryFromFilterValues(filters, true)\n  const reqQuery = {\n    ...filtersQuery,\n    ...(columns && { columns }),\n    ...(selectedPage && { selectedPage }),\n    ...(pageSize && { pageSize }),\n    ...(sortColumn && { sortColumn }),\n    ...(sortedAsc && { sortedAsc }),\n  }\n  const interactiveQueryData: { query: Dict<string | string[]>; querySummary: Array<Dict<string>> } = {\n    query: reqQuery,\n    querySummary: SelectedFiltersUtils.getQuerySummary(filtersQuery, filters),\n  }\n\n  const recentlyViewedData = new UserStoreItemBuilder(reportData)\n    .addExecutionData(executionData)\n    .addQuery(queryData)\n    .addInteractiveQuery(interactiveQueryData)\n    .addStatus(RequestStatus.READY)\n    .addTimestamp()\n    .addAsyncUrls(url)\n    .addReportUrls(req)\n    .build()\n\n  if (executionId) await services.requestedReportService.updateLastViewed(executionId, userId)\n  await services.recentlyViewedService.setRecentlyViewed(recentlyViewedData, userId)\n}\n\nexport default {\n  renderList,\n  updateExpiredStatus,\n  init,\n  updateLastViewed,\n}\n"],
+  "mappings": "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",
   "names": ["utils_exports", "__export", "utils_default", "init", "renderList", "setDataFromStatus", "updateExpiredStatus", "updateLastViewed", "__toCommonJS", "import_dayjs", "import_UserReports", "import_requestStatusHelper", "import_utils", "import_reportListsHelper", "import_localsHelper", "import_DateMapper", "import_UserStoreItemBuilder", "formatData", "reportData", "reportDataCopy", "executionId", "tableId", "variantName", "name", "reportId", "variantId", "id", "description", "query", "interactiveQuery", "status", "reportName", "dataProductDefinitionsPath", "reportType", "url", "summary", "interactiveSummary", "type", "formatTable", "data", "card", "formatTableRow", "statusClass", "itemActions", "href", "text", "timestamp", "filtersSummary", "createSummaryHtml", "getTotals", "formattedCount", "maxRows", "summaryHtml", "item", "interactiveSummaryHtml", "getMeta", "formattedData", "res", "nestedBaseUrl", "LocalsHelper", "d", "reportsData", "formattedDate", "time", "polling", "request", "report", "dateMapper", "DateMapper", "dayjs", "filterFunction", "csrfToken", "formatted", "tableData", "path", "req", "services", "dprUser", "requestedReports", "recentlyViewedReports", "bookmarkingEnabled", "requestedReportsList", "RequestedReportUtils", "viewedReportsList", "RecentlyViewedCardGroupUtils", "bookmarks", "BookmarklistUtils", "reportStateData", "userId", "filters", "executionData", "queryData", "columns", "selectedPage", "pageSize", "sortColumn", "sortedAsc", "filtersQuery", "FiltersUtils", "interactiveQueryData", "SelectedFiltersUtils", "recentlyViewedData", "UserStoreItemBuilder"]
 }

package/dpr/components/user-reports/utils.ts

@@ -362,7 +362,7 @@ export const updateLastViewed = async ({
 
   const columns = <string[]>req.query?.['columns']
   const { selectedPage, pageSize, sortColumn, sortedAsc } = <Dict<string>>req.query
-  const filtersQuery = FiltersUtils.setRequestQueryFromFilterValues(filters)
+  const filtersQuery = FiltersUtils.setRequestQueryFromFilterValues(filters, true)
   const reqQuery = {
     ...filtersQuery,
     ...(columns && { columns }),

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.18.0",
+  "version": "4.18.2",
   "main": "dpr/all.mjs",
   "sass": "dpr/all.scss",
   "engines": {