@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.17.1 → 4.17.3

package/dpr/components/_catalogue/catalogue/utils.js

@@ -1,2 +1,2 @@
-var C=Object.create;var a=Object.defineProperty;var f=Object.getOwnPropertyDescriptor;var k=Object.getOwnPropertyNames;var h=Object.getPrototypeOf,S=Object.prototype.hasOwnProperty;var w=(o,e)=>{for(var t in e)a(o,t,{get:e[t],enumerable:!0})},s=(o,e,t,l)=>{if(e&&typeof e=="object"||typeof e=="function")for(let n of k(e))!S.call(o,n)&&n!==t&&a(o,n,{get:()=>e[n],enumerable:!(l=f(e,n))||l.enumerable});return o};var g=(o,e,t)=>(t=o!=null?C(h(o)):{},s(e||!o||!o.__esModule?a(t,"default",{value:o,enumerable:!0}):t,o)),T=o=>s(a({},"__esModule",{value:!0}),o);var P={};w(P,{default:()=>F,init:()=>m});module.exports=T(P);var b=g(require("../catalogue-list/utils")),p=g(require("../../../utils/localsHelper"));const m=async({features:o,res:e,services:t})=>{const l=await b.default.getReportsList(e,t,o),{token:n,bookmarkingEnabled:E,dprUser:d}=p.default.getValues(e),i=(await t.productCollectionService.getProductCollections(n))?.map(u=>({value:u.id,text:u.name}));i&&i.length>0&&i.unshift({value:"RESET",text:"Full catalogue"});const r=await t.productCollectionStoreService.getSelectedProductCollectionId(d.id),c=r&&await t.productCollectionService.getProductCollection(d.id,r);return{data:l,productCollectionInfo:{productCollections:i,...c&&{selectedProductCollection:c}},features:v(E,o)}},v=(o,e)=>({filteringEnabled:e?.filteringEnabled===void 0||e.filteringEnabled,unauthorisedToggleEnabled:e?.unauthorisedToggleEnabled===void 0||e.unauthorisedToggleEnabled,howToUseEnabled:e?.howToUseEnabled===void 0||e.howToUseEnabled,bookmarkingEnabled:e?.bookmarkingEnabled!==void 0?e.bookmarkingEnabled:o});var F={init:m};0&&(module.exports={init});
+var f=Object.create;var i=Object.defineProperty;var k=Object.getOwnPropertyDescriptor;var h=Object.getOwnPropertyNames;var S=Object.getPrototypeOf,T=Object.prototype.hasOwnProperty;var w=(o,e)=>{for(var t in e)i(o,t,{get:e[t],enumerable:!0})},s=(o,e,t,l)=>{if(e&&typeof e=="object"||typeof e=="function")for(let n of h(e))!T.call(o,n)&&n!==t&&i(o,n,{get:()=>e[n],enumerable:!(l=k(e,n))||l.enumerable});return o};var g=(o,e,t)=>(t=o!=null?f(S(o)):{},s(e||!o||!o.__esModule?i(t,"default",{value:o,enumerable:!0}):t,o)),v=o=>s(i({},"__esModule",{value:!0}),o);var U={};w(U,{default:()=>P,init:()=>m});module.exports=v(U);var b=g(require("../catalogue-list/utils")),p=g(require("../../../utils/localsHelper"));const m=async({features:o,res:e,services:t})=>{const l=await b.default.getReportsList(e,t,o),{token:n,bookmarkingEnabled:E,dprUser:d,csrfToken:C}=p.default.getValues(e),a=(await t.productCollectionService.getProductCollections(n))?.map(u=>({value:u.id,text:u.name}));a&&a.length>0&&a.unshift({value:"RESET",text:"Full catalogue"});const r=await t.productCollectionStoreService.getSelectedProductCollectionId(d.id),c=r&&await t.productCollectionService.getProductCollection(d.id,r);return{data:{...l,csrfToken:C},productCollectionInfo:{productCollections:a,...c&&{selectedProductCollection:c}},features:F(E,o)}},F=(o,e)=>({filteringEnabled:e?.filteringEnabled===void 0||e.filteringEnabled,unauthorisedToggleEnabled:e?.unauthorisedToggleEnabled===void 0||e.unauthorisedToggleEnabled,howToUseEnabled:e?.howToUseEnabled===void 0||e.howToUseEnabled,bookmarkingEnabled:e?.bookmarkingEnabled!==void 0?e.bookmarkingEnabled:o});var P={init:m};0&&(module.exports={init});
 //# sourceMappingURL=utils.js.map

package/dpr/components/_catalogue/catalogue/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/components/_catalogue/catalogue/utils.ts"],
-  "sourcesContent": ["import { Response } from 'express'\nimport CatalogueListUtils from '../catalogue-list/utils'\nimport { Services } from '../../../types/Services'\nimport LocalsHelper from '../../../utils/localsHelper'\nimport { CatalogueFeatures } from './types'\n\nexport const init = async ({\n  features,\n  res,\n  services,\n}: {\n  features?: CatalogueFeatures\n  res: Response\n  services: Services\n}) => {\n  const data = await CatalogueListUtils.getReportsList(res, services, features)\n  const { token, bookmarkingEnabled, dprUser } = LocalsHelper.getValues(res)\n  const productCollections = (await services.productCollectionService.getProductCollections(token))?.map(\n    (collection) => ({\n      value: collection.id,\n      text: collection.name,\n    }),\n  )\n  if (productCollections && productCollections.length > 0) {\n    productCollections.unshift({ value: 'RESET', text: 'Full catalogue' })\n  }\n  const selectedProductCollectionId = await services.productCollectionStoreService.getSelectedProductCollectionId(\n    dprUser.id,\n  )\n  const selectedProductCollection =\n    selectedProductCollectionId &&\n    (await services.productCollectionService.getProductCollection(dprUser.id, selectedProductCollectionId))\n  return {\n    data,\n    productCollectionInfo: {\n      productCollections,\n      ...(selectedProductCollection && { selectedProductCollection }),\n    },\n    features: setFeatures(bookmarkingEnabled, features),\n  }\n}\n\nconst setFeatures = (bookmarkingEnabled: boolean, features?: CatalogueFeatures) => {\n  return {\n    filteringEnabled: features?.filteringEnabled === undefined || features.filteringEnabled,\n    unauthorisedToggleEnabled: features?.unauthorisedToggleEnabled === undefined || features.unauthorisedToggleEnabled,\n    howToUseEnabled: features?.howToUseEnabled === undefined || features.howToUseEnabled,\n    bookmarkingEnabled: features?.bookmarkingEnabled !== undefined ? features.bookmarkingEnabled : bookmarkingEnabled,\n  }\n}\n\nexport default {\n  init,\n}\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,SAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAA+B,sCAE/BC,EAAyB,0CAGlB,MAAMH,EAAO,MAAO,CACzB,SAAAI,EACA,IAAAC,EACA,SAAAC,CACF,IAIM,CACJ,MAAMC,EAAO,MAAM,EAAAC,QAAmB,eAAeH,EAAKC,EAAUF,CAAQ,EACtE,CAAE,MAAAK,EAAO,mBAAAC,EAAoB,QAAAC,CAAQ,EAAI,EAAAC,QAAa,UAAUP,CAAG,EACnEQ,GAAsB,MAAMP,EAAS,yBAAyB,sBAAsBG,CAAK,IAAI,IAChGK,IAAgB,CACf,MAAOA,EAAW,GAClB,KAAMA,EAAW,IACnB,EACF,EACID,GAAsBA,EAAmB,OAAS,GACpDA,EAAmB,QAAQ,CAAE,MAAO,QAAS,KAAM,gBAAiB,CAAC,EAEvE,MAAME,EAA8B,MAAMT,EAAS,8BAA8B,+BAC/EK,EAAQ,EACV,EACMK,EACJD,GACC,MAAMT,EAAS,yBAAyB,qBAAqBK,EAAQ,GAAII,CAA2B,EACvG,MAAO,CACL,KAAAR,EACA,sBAAuB,CACrB,mBAAAM,EACA,GAAIG,GAA6B,CAAE,0BAAAA,CAA0B,CAC/D,EACA,SAAUC,EAAYP,EAAoBN,CAAQ,CACpD,CACF,EAEMa,EAAc,CAACP,EAA6BN,KACzC,CACL,iBAAkBA,GAAU,mBAAqB,QAAaA,EAAS,iBACvE,0BAA2BA,GAAU,4BAA8B,QAAaA,EAAS,0BACzF,gBAAiBA,GAAU,kBAAoB,QAAaA,EAAS,gBACrE,mBAAoBA,GAAU,qBAAuB,OAAYA,EAAS,mBAAqBM,CACjG,GAGF,IAAOX,EAAQ,CACb,KAAAC,CACF",
-  "names": ["utils_exports", "__export", "utils_default", "init", "__toCommonJS", "import_utils", "import_localsHelper", "features", "res", "services", "data", "CatalogueListUtils", "token", "bookmarkingEnabled", "dprUser", "LocalsHelper", "productCollections", "collection", "selectedProductCollectionId", "selectedProductCollection", "setFeatures"]
+  "sourcesContent": ["import { Response } from 'express'\nimport CatalogueListUtils from '../catalogue-list/utils'\nimport { Services } from '../../../types/Services'\nimport LocalsHelper from '../../../utils/localsHelper'\nimport { CatalogueFeatures } from './types'\n\nexport const init = async ({\n  features,\n  res,\n  services,\n}: {\n  features?: CatalogueFeatures\n  res: Response\n  services: Services\n}) => {\n  const data = await CatalogueListUtils.getReportsList(res, services, features)\n  const { token, bookmarkingEnabled, dprUser, csrfToken } = LocalsHelper.getValues(res)\n  const productCollections = (await services.productCollectionService.getProductCollections(token))?.map(\n    (collection) => ({\n      value: collection.id,\n      text: collection.name,\n    }),\n  )\n  if (productCollections && productCollections.length > 0) {\n    productCollections.unshift({ value: 'RESET', text: 'Full catalogue' })\n  }\n  const selectedProductCollectionId = await services.productCollectionStoreService.getSelectedProductCollectionId(\n    dprUser.id,\n  )\n  const selectedProductCollection =\n    selectedProductCollectionId &&\n    (await services.productCollectionService.getProductCollection(dprUser.id, selectedProductCollectionId))\n  return {\n    data: {\n      ...data,\n      csrfToken,\n    },\n    productCollectionInfo: {\n      productCollections,\n      ...(selectedProductCollection && { selectedProductCollection }),\n    },\n    features: setFeatures(bookmarkingEnabled, features),\n  }\n}\n\nconst setFeatures = (bookmarkingEnabled: boolean, features?: CatalogueFeatures) => {\n  return {\n    filteringEnabled: features?.filteringEnabled === undefined || features.filteringEnabled,\n    unauthorisedToggleEnabled: features?.unauthorisedToggleEnabled === undefined || features.unauthorisedToggleEnabled,\n    howToUseEnabled: features?.howToUseEnabled === undefined || features.howToUseEnabled,\n    bookmarkingEnabled: features?.bookmarkingEnabled !== undefined ? features.bookmarkingEnabled : bookmarkingEnabled,\n  }\n}\n\nexport default {\n  init,\n}\n"],
+  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,SAAAC,IAAA,eAAAC,EAAAJ,GACA,IAAAK,EAA+B,sCAE/BC,EAAyB,0CAGlB,MAAMH,EAAO,MAAO,CACzB,SAAAI,EACA,IAAAC,EACA,SAAAC,CACF,IAIM,CACJ,MAAMC,EAAO,MAAM,EAAAC,QAAmB,eAAeH,EAAKC,EAAUF,CAAQ,EACtE,CAAE,MAAAK,EAAO,mBAAAC,EAAoB,QAAAC,EAAS,UAAAC,CAAU,EAAI,EAAAC,QAAa,UAAUR,CAAG,EAC9ES,GAAsB,MAAMR,EAAS,yBAAyB,sBAAsBG,CAAK,IAAI,IAChGM,IAAgB,CACf,MAAOA,EAAW,GAClB,KAAMA,EAAW,IACnB,EACF,EACID,GAAsBA,EAAmB,OAAS,GACpDA,EAAmB,QAAQ,CAAE,MAAO,QAAS,KAAM,gBAAiB,CAAC,EAEvE,MAAME,EAA8B,MAAMV,EAAS,8BAA8B,+BAC/EK,EAAQ,EACV,EACMM,EACJD,GACC,MAAMV,EAAS,yBAAyB,qBAAqBK,EAAQ,GAAIK,CAA2B,EACvG,MAAO,CACL,KAAM,CACJ,GAAGT,EACH,UAAAK,CACF,EACA,sBAAuB,CACrB,mBAAAE,EACA,GAAIG,GAA6B,CAAE,0BAAAA,CAA0B,CAC/D,EACA,SAAUC,EAAYR,EAAoBN,CAAQ,CACpD,CACF,EAEMc,EAAc,CAACR,EAA6BN,KACzC,CACL,iBAAkBA,GAAU,mBAAqB,QAAaA,EAAS,iBACvE,0BAA2BA,GAAU,4BAA8B,QAAaA,EAAS,0BACzF,gBAAiBA,GAAU,kBAAoB,QAAaA,EAAS,gBACrE,mBAAoBA,GAAU,qBAAuB,OAAYA,EAAS,mBAAqBM,CACjG,GAGF,IAAOX,EAAQ,CACb,KAAAC,CACF",
+  "names": ["utils_exports", "__export", "utils_default", "init", "__toCommonJS", "import_utils", "import_localsHelper", "features", "res", "services", "data", "CatalogueListUtils", "token", "bookmarkingEnabled", "dprUser", "csrfToken", "LocalsHelper", "productCollections", "collection", "selectedProductCollectionId", "selectedProductCollection", "setFeatures"]
 }

package/dpr/components/_catalogue/catalogue/utils.test.ts

@@ -37,7 +37,7 @@ describe('CatalogueUtils', () => {
       const result = await CatalogueUtils.init({ features: {}, res, services })
 
       expect(result).toEqual({
-        data: { head: [], rows: [] },
+        data: { head: [], rows: [], csrfToken: 'csrfToken' },
         features: {
           bookmarkingEnabled: undefined,
           filteringEnabled: true,
@@ -62,7 +62,7 @@ describe('CatalogueUtils', () => {
       })
 
       expect(result).toEqual({
-        data: { head: [], rows: [] },
+        data: { head: [], rows: [], csrfToken: 'csrfToken' },
         features: {
           bookmarkingEnabled: false,
           filteringEnabled: false,

package/dpr/components/_catalogue/catalogue/utils.ts

@@ -14,7 +14,7 @@ export const init = async ({
   services: Services
 }) => {
   const data = await CatalogueListUtils.getReportsList(res, services, features)
-  const { token, bookmarkingEnabled, dprUser } = LocalsHelper.getValues(res)
+  const { token, bookmarkingEnabled, dprUser, csrfToken } = LocalsHelper.getValues(res)
   const productCollections = (await services.productCollectionService.getProductCollections(token))?.map(
     (collection) => ({
       value: collection.id,
@@ -31,7 +31,10 @@ export const init = async ({
     selectedProductCollectionId &&
     (await services.productCollectionService.getProductCollection(dprUser.id, selectedProductCollectionId))
   return {
-    data,
+    data: {
+      ...data,
+      csrfToken,
+    },
     productCollectionInfo: {
       productCollections,
       ...(selectedProductCollection && { selectedProductCollection }),

package/dpr/components/_catalogue/catalogue/view.njk

@@ -4,6 +4,7 @@
 
 {% macro dprCatalogue(args) %}
   {% set data = args.data %}
+  {% set csrfToken = data.csrfToken %}
   {% set features = args.features %}
   {% set productCollectionInfo = args.productCollectionInfo %}
 
@@ -17,7 +18,7 @@
       {{ dprCatalogueHowToUse(features) }}
     {% endif %}
 
-    {{ dprCatalogueFilters(id, features, productCollectionInfo) }}
+    {{ dprCatalogueFilters(id, features, productCollectionInfo, csrfToken) }}
     {{ dprCatalogueList(head, rows, id) }}
   <div>
 {% endmacro %}

package/dpr/components/_catalogue/catalogue-filters/view.njk

@@ -3,14 +3,14 @@
 {% from "../catalogue-search/view.njk" import dprCatalogueSearch %}
 {% from "../catalogue-unauthorised-toggle/view.njk" import dprUnauthorisedToggle %}
 
-{% macro dprCatalogueFilters(id, features, productCollectionInfo) %}
+{% macro dprCatalogueFilters(id, features, productCollectionInfo, csrfToken) %}
   {% set filteringEnabled = features.filteringEnabled %}
   {% set unauthorisedToggleEnabled = features.unauthorisedToggleEnabled %}
 
   <div class='dpr-catalogue-filters' data-dpr-module='dpr-catalogue-filters'>
     <div class='dpr-catalogue-filters--heading'>
       <div class="dpr-catalogue-filters__search">
-        {{ dprCatalogueSearch(id, productCollectionInfo) }}
+        {{ dprCatalogueSearch(id, productCollectionInfo, csrfToken) }}
       </div> 
     </div>
     <div class='dpr-catalogue-filters--content'>

package/dpr/components/_catalogue/catalogue-search/view.njk

@@ -1,7 +1,7 @@
 {% from "govuk/components/input/macro.njk" import govukInput %}
 {% from "govuk/components/select/macro.njk" import govukSelect %}
 
-{% macro dprCatalogueSearch(id, productCollectionInfo, type = 'catalogue') %}
+{% macro dprCatalogueSearch(id, productCollectionInfo, csrfToken, type = 'catalogue') %}
   {% set productCollections = productCollectionInfo.productCollections %}
   {% set selectedProductCollection = productCollectionInfo.selectedProductCollection %}
 
@@ -23,6 +23,7 @@
         }) }}
         {% if productCollections.length > 0 %}
           <form method="post" action="dpr/product-collection/selected">
+            <input type="hidden" name="_csrf" value="{{ csrfToken }}">
             {{ govukSelect({
               id: 'productCollection',
               name: 'productCollection',

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