@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.16.1 → 4.17.0

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

@@ -1,2 +1,2 @@
-var b=Object.create;var t=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var m=Object.getOwnPropertyNames;var E=Object.getPrototypeOf,p=Object.prototype.hasOwnProperty;var c=(o,e)=>{for(var n in e)t(o,n,{get:e[n],enumerable:!0})},r=(o,e,n,i)=>{if(e&&typeof e=="object"||typeof e=="function")for(let a of m(e))!p.call(o,a)&&a!==n&&t(o,a,{get:()=>e[a],enumerable:!(i=u(e,a))||i.enumerable});return o};var l=(o,e,n)=>(n=o!=null?b(E(o)):{},r(e||!o||!o.__esModule?t(n,"default",{value:o,enumerable:!0}):n,o)),k=o=>r(t({},"__esModule",{value:!0}),o);var T={};c(T,{default:()=>h,init:()=>g});module.exports=k(T);var d=l(require("../catalogue-list/utils")),s=l(require("../../../utils/localsHelper"));const g=async({features:o,res:e,services:n})=>({data:await d.default.getReportsList(e,n,o),features:f(e,o)}),f=(o,e)=>{const{bookmarkingEnabled:n}=s.default.getValues(o);return{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:n}};var h={init:g};0&&(module.exports={init});
+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});
 //# 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  return {\n    data,\n    features: setFeatures(res, features),\n  }\n}\n\nconst setFeatures = (res: Response, features?: CatalogueFeatures) => {\n  const { bookmarkingEnabled } = LocalsHelper.getValues(res)\n\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,KAMS,CACL,KAFW,MAAM,EAAAC,QAAmB,eAAeF,EAAKC,EAAUF,CAAQ,EAG1E,SAAUI,EAAYH,EAAKD,CAAQ,CACrC,GAGII,EAAc,CAACH,EAAeD,IAAiC,CACnE,KAAM,CAAE,mBAAAK,CAAmB,EAAI,EAAAC,QAAa,UAAUL,CAAG,EAEzD,MAAO,CACL,iBAAkBD,GAAU,mBAAqB,QAAaA,EAAS,iBACvE,0BAA2BA,GAAU,4BAA8B,QAAaA,EAAS,0BACzF,gBAAiBA,GAAU,kBAAoB,QAAaA,EAAS,gBACrE,mBAAoBA,GAAU,qBAAuB,OAAYA,EAAS,mBAAqBK,CACjG,CACF,EAEA,IAAOV,EAAQ,CACb,KAAAC,CACF",
-  "names": ["utils_exports", "__export", "utils_default", "init", "__toCommonJS", "import_utils", "import_localsHelper", "features", "res", "services", "CatalogueListUtils", "setFeatures", "bookmarkingEnabled", "LocalsHelper"]
+  "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"]
 }

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

@@ -22,7 +22,15 @@ describe('CatalogueUtils', () => {
         },
       } as unknown as Response
 
-      services = {} as unknown as Services
+      services = {
+        productCollectionService: {
+          getProductCollections: jest.fn(() => []),
+          getProductCollection: jest.fn(),
+        },
+        productCollectionStoreService: {
+          getSelectedProductCollectionId: jest.fn(),
+        },
+      } as unknown as Services
     })
 
     it('should init the catalogue with defaults', async () => {
@@ -36,6 +44,9 @@ describe('CatalogueUtils', () => {
           howToUseEnabled: true,
           unauthorisedToggleEnabled: true,
         },
+        productCollectionInfo: {
+          productCollections: [],
+        },
       })
     })
 
@@ -58,6 +69,9 @@ describe('CatalogueUtils', () => {
           howToUseEnabled: true,
           unauthorisedToggleEnabled: false,
         },
+        productCollectionInfo: {
+          productCollections: [],
+        },
       })
     })
   })

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

@@ -14,15 +14,33 @@ export const init = async ({
   services: Services
 }) => {
   const data = await CatalogueListUtils.getReportsList(res, services, features)
+  const { token, bookmarkingEnabled, dprUser } = LocalsHelper.getValues(res)
+  const productCollections = (await services.productCollectionService.getProductCollections(token))?.map(
+    (collection) => ({
+      value: collection.id,
+      text: collection.name,
+    }),
+  )
+  if (productCollections && productCollections.length > 0) {
+    productCollections.unshift({ value: 'RESET', text: 'Full catalogue' })
+  }
+  const selectedProductCollectionId = await services.productCollectionStoreService.getSelectedProductCollectionId(
+    dprUser.id,
+  )
+  const selectedProductCollection =
+    selectedProductCollectionId &&
+    (await services.productCollectionService.getProductCollection(dprUser.id, selectedProductCollectionId))
   return {
     data,
-    features: setFeatures(res, features),
+    productCollectionInfo: {
+      productCollections,
+      ...(selectedProductCollection && { selectedProductCollection }),
+    },
+    features: setFeatures(bookmarkingEnabled, features),
   }
 }
 
-const setFeatures = (res: Response, features?: CatalogueFeatures) => {
-  const { bookmarkingEnabled } = LocalsHelper.getValues(res)
-
+const setFeatures = (bookmarkingEnabled: boolean, features?: CatalogueFeatures) => {
   return {
     filteringEnabled: features?.filteringEnabled === undefined || features.filteringEnabled,
     unauthorisedToggleEnabled: features?.unauthorisedToggleEnabled === undefined || features.unauthorisedToggleEnabled,

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

@@ -5,6 +5,7 @@
 {% macro dprCatalogue(args) %}
   {% set data = args.data %}
   {% set features = args.features %}
+  {% set productCollectionInfo = args.productCollectionInfo %}
 
   {% set head = data.head %}
   {% set rows = data.rows %}
@@ -16,7 +17,7 @@
       {{ dprCatalogueHowToUse(features) }}
     {% endif %}
 
-    {{ dprCatalogueFilters(id, features) }}
+    {{ dprCatalogueFilters(id, features, productCollectionInfo) }}
     {{ 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) %}
+{% macro dprCatalogueFilters(id, features, productCollectionInfo) %}
   {% 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) }}
+        {{ dprCatalogueSearch(id, productCollectionInfo) }}
       </div> 
     </div>
     <div class='dpr-catalogue-filters--content'>

package/dpr/components/_catalogue/catalogue-search/clientClass.mjs

@@ -17,9 +17,23 @@ class DprCatalogueSearch extends DprCatalogueFilters {
       this.initSeachBoxEvents()
       this.updateTableRows()
       this.initSearchInputFromQueryParams()
+      this.initProductCollectionSelect()
     }
   }
 
+  initProductCollectionSelect() {
+    /**
+     * @type {HTMLSelectElement | undefined}
+     */
+    const productCollections = this.getElement().querySelector('#productCollection')
+    if (productCollections) {
+      productCollections.addEventListener('change', (e) => {
+        e.preventDefault()
+        productCollections.closest('form').submit()
+      })
+    }
+  }
+  
   initSeachBoxEvents() {
     this.searchBox.addEventListener('keyup', (e) => {
       this.updateTableRows(e.target.value)

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

@@ -1,6 +1,10 @@
 {% from "govuk/components/input/macro.njk" import govukInput %}
+{% from "govuk/components/select/macro.njk" import govukSelect %}
+
+{% macro dprCatalogueSearch(id, productCollectionInfo, type = 'catalogue') %}
+  {% set productCollections = productCollectionInfo.productCollections %}
+  {% set selectedProductCollection = productCollectionInfo.selectedProductCollection %}
 
-{% macro dprCatalogueSearch(id, type = 'catalogue') %}
   <div class="dpr-search" data-dpr-module="dpr-catalogue-search">
     <div class="dpr-search-inputs">
         {{ govukInput({
@@ -17,6 +21,25 @@
             "data-table-id": id
           }
         }) }}
+        {% if productCollections.length > 0 %}
+          <form method="post" action="dpr/product-collection/selected">
+            {{ govukSelect({
+              id: 'productCollection',
+              name: 'productCollection',
+              value: selectedProductCollection.id,
+              formGroup: {
+                attributes: {
+                  style: "justify-self: end;"
+                }
+              },
+              items: productCollections,
+              label: {
+                text: 'Your collections',
+                classes: "govuk-label govuk-!-font-weight-bold govuk-!-margin-bottom-2"
+              }
+          }) }}
+        </form>
+      {% endif %}
     </div>
   </div>
 {% endmacro %}

package/dpr/data/dprReportingClient.js

@@ -1,2 +1,2 @@
-var d=Object.create;var o=Object.defineProperty;var f=Object.getOwnPropertyDescriptor;var g=Object.getOwnPropertyNames;var w=Object.getPrototypeOf,D=Object.prototype.hasOwnProperty;var b=(t,e)=>{for(var r in e)o(t,r,{get:e[r],enumerable:!0})},m=(t,e,r,p)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of g(e))!D.call(t,i)&&i!==r&&o(t,i,{get:()=>e[i],enumerable:!(p=f(e,i))||p.enumerable});return t};var n=(t,e,r)=>(r=t!=null?d(w(t)):{},m(e||!t||!t.__esModule?o(r,"default",{value:t,enumerable:!0}):r,t)),h=t=>m(o({},"__esModule",{value:!0}),t);var x={};b(x,{default:()=>u,initDprReportingClients:()=>R});module.exports=h(x);var s=n(require("./reportingClient")),l=n(require("./dashboardClient")),a=n(require("./reportDataStore")),C=n(require("../services/missingReport/missingReportClient"));const R=(t,e,r)=>({reportingClient:new s.default(t),dashboardClient:new l.default(t),reportDataStore:new a.default(e,r),missingReportClient:new C.default(t)});var u=R;0&&(module.exports={initDprReportingClients});
+var R=Object.create;var i=Object.defineProperty;var f=Object.getOwnPropertyDescriptor;var w=Object.getOwnPropertyNames;var u=Object.getPrototypeOf,D=Object.prototype.hasOwnProperty;var S=(t,e)=>{for(var r in e)i(t,r,{get:e[r],enumerable:!0})},m=(t,e,r,l)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of w(e))!D.call(t,o)&&o!==r&&i(t,o,{get:()=>e[o],enumerable:!(l=f(e,o))||l.enumerable});return t};var n=(t,e,r)=>(r=t!=null?R(u(t)):{},m(e||!t||!t.__esModule?i(r,"default",{value:t,enumerable:!0}):r,t)),b=t=>m(i({},"__esModule",{value:!0}),t);var h={};S(h,{default:()=>g,initDprReportingClients:()=>c});module.exports=b(h);var p=n(require("./reportingClient")),s=n(require("./dashboardClient")),C=n(require("./reportDataStore")),a=n(require("../services/missingReport/missingReportClient")),d=require("../services/productCollection/productCollectionService");const c=(t,e,r)=>({reportingClient:new p.default(t),dashboardClient:new s.default(t),reportDataStore:new C.default(e,r),missingReportClient:new a.default(t),productCollectionService:new d.ProductCollectionService(t)});var g=c;0&&(module.exports={initDprReportingClients});
 //# sourceMappingURL=dprReportingClient.js.map

package/dpr/data/dprReportingClient.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/data/dprReportingClient.ts"],
-  "sourcesContent": ["import ReportingClient from './reportingClient'\nimport DashboardClient from './dashboardClient'\nimport ReportDataStore, { RedisClient } from './reportDataStore'\nimport { ApiConfig } from './types'\nimport MissingReportClient from '../services/missingReport/missingReportClient'\n\nexport const initDprReportingClients = (\n  reportingApiConfig: ApiConfig,\n  redisClient: RedisClient,\n  storePrefix?: string,\n) => {\n  return {\n    reportingClient: new ReportingClient(reportingApiConfig),\n    dashboardClient: new DashboardClient(reportingApiConfig),\n    reportDataStore: new ReportDataStore(redisClient, storePrefix),\n    missingReportClient: new MissingReportClient(reportingApiConfig),\n  }\n}\n\nexport default initDprReportingClients\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,4BAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAA4B,gCAC5BC,EAA4B,gCAC5BC,EAA6C,gCAE7CC,EAAgC,4DAEzB,MAAML,EAA0B,CACrCM,EACAC,EACAC,KAEO,CACL,gBAAiB,IAAI,EAAAC,QAAgBH,CAAkB,EACvD,gBAAiB,IAAI,EAAAI,QAAgBJ,CAAkB,EACvD,gBAAiB,IAAI,EAAAK,QAAgBJ,EAAaC,CAAW,EAC7D,oBAAqB,IAAI,EAAAI,QAAoBN,CAAkB,CACjE,GAGF,IAAOP,EAAQC",
-  "names": ["dprReportingClient_exports", "__export", "dprReportingClient_default", "initDprReportingClients", "__toCommonJS", "import_reportingClient", "import_dashboardClient", "import_reportDataStore", "import_missingReportClient", "reportingApiConfig", "redisClient", "storePrefix", "ReportingClient", "DashboardClient", "ReportDataStore", "MissingReportClient"]
+  "sourcesContent": ["import ReportingClient from './reportingClient'\nimport DashboardClient from './dashboardClient'\nimport ReportDataStore, { RedisClient } from './reportDataStore'\nimport { ApiConfig } from './types'\nimport MissingReportClient from '../services/missingReport/missingReportClient'\nimport { ProductCollectionService } from '../services/productCollection/productCollectionService'\n\nexport const initDprReportingClients = (\n  reportingApiConfig: ApiConfig,\n  redisClient: RedisClient,\n  storePrefix?: string,\n) => {\n  return {\n    reportingClient: new ReportingClient(reportingApiConfig),\n    dashboardClient: new DashboardClient(reportingApiConfig),\n    reportDataStore: new ReportDataStore(redisClient, storePrefix),\n    missingReportClient: new MissingReportClient(reportingApiConfig),\n    productCollectionService: new ProductCollectionService(reportingApiConfig),\n  }\n}\n\nexport default initDprReportingClients\n"],
+  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,4BAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAA4B,gCAC5BC,EAA4B,gCAC5BC,EAA6C,gCAE7CC,EAAgC,4DAChCC,EAAyC,kEAElC,MAAMN,EAA0B,CACrCO,EACAC,EACAC,KAEO,CACL,gBAAiB,IAAI,EAAAC,QAAgBH,CAAkB,EACvD,gBAAiB,IAAI,EAAAI,QAAgBJ,CAAkB,EACvD,gBAAiB,IAAI,EAAAK,QAAgBJ,EAAaC,CAAW,EAC7D,oBAAqB,IAAI,EAAAI,QAAoBN,CAAkB,EAC/D,yBAA0B,IAAI,2BAAyBA,CAAkB,CAC3E,GAGF,IAAOR,EAAQC",
+  "names": ["dprReportingClient_exports", "__export", "dprReportingClient_default", "initDprReportingClients", "__toCommonJS", "import_reportingClient", "import_dashboardClient", "import_reportDataStore", "import_missingReportClient", "import_productCollectionService", "reportingApiConfig", "redisClient", "storePrefix", "ReportingClient", "DashboardClient", "ReportDataStore", "MissingReportClient"]
 }

package/dpr/data/dprReportingClient.ts

@@ -3,6 +3,7 @@ import DashboardClient from './dashboardClient'
 import ReportDataStore, { RedisClient } from './reportDataStore'
 import { ApiConfig } from './types'
 import MissingReportClient from '../services/missingReport/missingReportClient'
+import { ProductCollectionService } from '../services/productCollection/productCollectionService'
 
 export const initDprReportingClients = (
   reportingApiConfig: ApiConfig,
@@ -14,6 +15,7 @@ export const initDprReportingClients = (
     dashboardClient: new DashboardClient(reportingApiConfig),
     reportDataStore: new ReportDataStore(redisClient, storePrefix),
     missingReportClient: new MissingReportClient(reportingApiConfig),
+    productCollectionService: new ProductCollectionService(reportingApiConfig),
   }
 }
 

package/dpr/middleware/setUpDprResources.js

@@ -1,2 +1,2 @@
-var g=Object.create;var l=Object.defineProperty;var h=Object.getOwnPropertyDescriptor;var D=Object.getOwnPropertyNames;var S=Object.getPrototypeOf,k=Object.prototype.hasOwnProperty;var y=(t,o)=>{for(var e in o)l(t,e,{get:o[e],enumerable:!0})},f=(t,o,e,r)=>{if(o&&typeof o=="object"||typeof o=="function")for(let i of D(o))!k.call(t,i)&&i!==e&&l(t,i,{get:()=>o[i],enumerable:!(r=h(o,i))||r.enumerable});return t};var u=(t,o,e)=>(e=t!=null?g(S(t)):{},f(o||!t||!t.__esModule?l(e,"default",{value:t,enumerable:!0}):e,t)),q=t=>f(l({},"__esModule",{value:!0}),t);var v={};y(v,{default:()=>b,populateDefinitions:()=>P,populateRequestedReports:()=>R,setupResources:()=>m});module.exports=q(v);var c=u(require("../utils/definitionUtils")),p=u(require("../utils/localsHelper"));const w=(t,o)=>t[o]?t[o].toString():null,C=t=>w(t,"dataProductDefinitionsPath"),Q=t=>{const o=C(t);return o||null},m=(t,o)=>async(e,r,i)=>{V(e,r);try{return await P(t,e,r,o),await R(t,r),i()}catch(a){return i(a)}},V=(t,o)=>{const e=t.flash("DPR_ERRORS");e&&e[0]&&(o.locals.validationErrors=JSON.parse(e[0]))},P=async(t,o,e,r)=>{const{token:i}=p.default.getValues(e),a=Q(o.query),d=o.body?.dataProductDefinitionsPath,n=a||d;n&&(e.locals.dpdPathFromQuery=!0);const s=r?.dataProductDefinitionsPath;s&&(e.locals.dpdPathFromConfig=!0),e.locals.definitionsPath=n||s,e.locals.pathSuffix=`?dataProductDefinitionsPath=${e.locals.definitionsPath}`,i&&t.reportingService&&(e.locals.definitions=await t.reportingService.getDefinitions(i,e.locals.definitionsPath))},R=async(t,o)=>{const{dprUser:e}=p.default.getValues(o);if(e.id){const{definitions:r,definitionsPath:i}=o.locals,a=await t.requestedReportService.getAllReports(e.id);o.locals.requestedReports=i?a.filter(n=>c.default.getCurrentVariantDefinition(r,n.reportId,n.id)):a;const d=await t.recentlyViewedService.getAllReports(e.id);if(o.locals.recentlyViewedReports=i?d.filter(n=>c.default.getCurrentVariantDefinition(r,n.reportId,n.id)):d,t.bookmarkService){o.locals.bookmarkingEnabled=!0;const n=await t.bookmarkService.getAllBookmarks(e.id);o.locals.bookmarks=i?n.filter(s=>c.default.getCurrentVariantDefinition(r,s.reportId,s.id)):n}t.downloadPermissionService&&(o.locals.downloadingEnabled=!0)}};var b=m;0&&(module.exports={populateDefinitions,populateRequestedReports,setupResources});
+var w=Object.create;var l=Object.defineProperty;var C=Object.getOwnPropertyDescriptor;var q=Object.getOwnPropertyNames;var Q=Object.getPrototypeOf,V=Object.prototype.hasOwnProperty;var b=(t,o)=>{for(var e in o)l(t,e,{get:o[e],enumerable:!0})},g=(t,o,e,i)=>{if(o&&typeof o=="object"||typeof o=="function")for(let r of q(o))!V.call(t,r)&&r!==e&&l(t,r,{get:()=>o[r],enumerable:!(i=C(o,r))||i.enumerable});return t};var S=(t,o,e)=>(e=t!=null?w(Q(t)):{},g(o||!t||!t.__esModule?l(e,"default",{value:t,enumerable:!0}):e,t)),v=t=>g(l({},"__esModule",{value:!0}),t);var B={};b(B,{default:()=>A,populateDefinitions:()=>D,populateRequestedReports:()=>k,setupResources:()=>h});module.exports=v(B);var c=S(require("../utils/definitionUtils")),f=S(require("../utils/localsHelper"));const I=(t,o)=>t[o]?t[o].toString():null,F=t=>I(t,"dataProductDefinitionsPath"),E=t=>{const o=F(t);return o||null},h=(t,o)=>async(e,i,r)=>{x(e,i);try{return await D(t,e,i,o),await k(t,i),r()}catch(a){return r(a)}},x=(t,o)=>{const e=t.flash("DPR_ERRORS");e&&e[0]&&(o.locals.validationErrors=JSON.parse(e[0]))},D=async(t,o,e,i)=>{const{token:r,dprUser:a}=f.default.getValues(e),d=E(o.query),n=o.body?.dataProductDefinitionsPath,s=d||n;s&&(e.locals.dpdPathFromQuery=!0);const m=i?.dataProductDefinitionsPath;if(m&&(e.locals.dpdPathFromConfig=!0),e.locals.definitionsPath=s||m,e.locals.pathSuffix=`?dataProductDefinitionsPath=${e.locals.definitionsPath}`,r&&t.reportingService){const P=await t.productCollectionStoreService.getSelectedProductCollectionId(a.id);e.locals.definitions=await Promise.all([t.reportingService.getDefinitions(r,e.locals.definitionsPath),P&&t.productCollectionService.getProductCollection(a.id,P)]).then(([R,p])=>{if(p&&p){const y=p.products.map(u=>u.productId);return R.filter(u=>y.includes(u.id))}return R})??[]}},k=async(t,o)=>{const{dprUser:e}=f.default.getValues(o);if(e.id){const{definitions:i,definitionsPath:r}=o.locals,a=await t.requestedReportService.getAllReports(e.id);o.locals.requestedReports=r?a.filter(n=>c.default.getCurrentVariantDefinition(i,n.reportId,n.id)):a;const d=await t.recentlyViewedService.getAllReports(e.id);if(o.locals.recentlyViewedReports=r?d.filter(n=>c.default.getCurrentVariantDefinition(i,n.reportId,n.id)):d,t.bookmarkService){o.locals.bookmarkingEnabled=!0;const n=await t.bookmarkService.getAllBookmarks(e.id);o.locals.bookmarks=r?n.filter(s=>c.default.getCurrentVariantDefinition(i,s.reportId,s.id)):n}t.downloadPermissionService&&(o.locals.downloadingEnabled=!0)}};var A=h;0&&(module.exports={populateDefinitions,populateRequestedReports,setupResources});
 //# sourceMappingURL=setUpDprResources.js.map

package/dpr/middleware/setUpDprResources.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/dpr/middleware/setUpDprResources.ts"],
-  "sourcesContent": ["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport { RequestHandler, Response, Request } from 'express'\nimport type { ParsedQs } from 'qs'\nimport { Services } from '../types/Services'\nimport { RequestedReport, StoredReportData } from '../types/UserReports'\nimport DefinitionUtils from '../utils/definitionUtils'\nimport { BookmarkStoreData } from '../types/Bookmark'\nimport { DprConfig } from '../types/DprConfig'\nimport localsHelper from '../utils/localsHelper'\n\nconst getQueryParamAsString = (query: ParsedQs, name: string) => (query[name] ? query[name].toString() : null)\nconst getDefinitionsPath = (query: ParsedQs) => getQueryParamAsString(query, 'dataProductDefinitionsPath')\n\nconst deriveDefinitionsPath = (query: ParsedQs): string | null => {\n  const definitionsPath = getDefinitionsPath(query)\n  if (definitionsPath) {\n    return definitionsPath\n  }\n\n  return null\n}\n\nexport const setupResources = (services: Services, config?: DprConfig): RequestHandler => {\n  return async (req, res, next) => {\n    populateValidationErrors(req, res)\n    try {\n      await populateDefinitions(services, req, res, config)\n      await populateRequestedReports(services, res)\n      return next()\n    } catch (error) {\n      return next(error)\n    }\n  }\n}\n\nconst populateValidationErrors = (req: Request, res: Response) => {\n  const errors = req.flash(`DPR_ERRORS`)\n  if (errors && errors[0]) {\n    res.locals.validationErrors = JSON.parse(errors[0])\n  }\n}\n\nexport const populateDefinitions = async (services: Services, req: Request, res: Response, config?: DprConfig) => {\n  // Get the DPD path from the query\n  const { token } = localsHelper.getValues(res)\n\n  const dpdPathFromQuery = deriveDefinitionsPath(req.query)\n  const dpdPathFromBody = req.body?.dataProductDefinitionsPath\n  const definitionsPathFromQuery = dpdPathFromQuery || dpdPathFromBody\n\n  if (definitionsPathFromQuery) {\n    res.locals.dpdPathFromQuery = true\n  }\n\n  // Get the DPD path from the config\n  const dpdPathFromConfig = config?.dataProductDefinitionsPath\n  if (dpdPathFromConfig) {\n    res.locals.dpdPathFromConfig = true\n  }\n\n  // query takes presedence over config\n  res.locals.definitionsPath = definitionsPathFromQuery || dpdPathFromConfig\n  res.locals.pathSuffix = `?dataProductDefinitionsPath=${res.locals.definitionsPath}`\n\n  if (token && services.reportingService) {\n    res.locals.definitions = await services.reportingService.getDefinitions(token, res.locals.definitionsPath)\n  }\n}\n\nexport const populateRequestedReports = async (services: Services, res: Response) => {\n  const { dprUser } = localsHelper.getValues(res)\n  if (dprUser.id) {\n    const { definitions, definitionsPath } = res.locals\n\n    const requested = await services.requestedReportService.getAllReports(dprUser.id)\n    res.locals.requestedReports = !definitionsPath\n      ? requested\n      : requested.filter((report: RequestedReport) => {\n          return DefinitionUtils.getCurrentVariantDefinition(definitions, report.reportId, report.id)\n        })\n\n    const recent = await services.recentlyViewedService.getAllReports(dprUser.id)\n    res.locals.recentlyViewedReports = !definitionsPath\n      ? recent\n      : recent.filter((report: StoredReportData) => {\n          return DefinitionUtils.getCurrentVariantDefinition(definitions, report.reportId, report.id)\n        })\n\n    if (services.bookmarkService) {\n      res.locals.bookmarkingEnabled = true\n\n      const bookmarks = await services.bookmarkService.getAllBookmarks(dprUser.id)\n      res.locals.bookmarks = !definitionsPath\n        ? bookmarks\n        : bookmarks.filter((bookmark: BookmarkStoreData) => {\n            return DefinitionUtils.getCurrentVariantDefinition(definitions, bookmark.reportId, bookmark.id)\n          })\n    }\n\n    if (services.downloadPermissionService) {\n      res.locals.downloadingEnabled = true\n    }\n  }\n}\n\nexport default setupResources\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,wBAAAC,EAAA,6BAAAC,EAAA,mBAAAC,IAAA,eAAAC,EAAAN,GAKA,IAAAO,EAA4B,uCAG5BC,EAAyB,oCAEzB,MAAMC,EAAwB,CAACC,EAAiBC,IAAkBD,EAAMC,CAAI,EAAID,EAAMC,CAAI,EAAE,SAAS,EAAI,KACnGC,EAAsBF,GAAoBD,EAAsBC,EAAO,4BAA4B,EAEnGG,EAAyBH,GAAmC,CAChE,MAAMI,EAAkBF,EAAmBF,CAAK,EAChD,OAAII,GAIG,IACT,EAEaT,EAAiB,CAACU,EAAoBC,IAC1C,MAAOC,EAAKC,EAAKC,IAAS,CAC/BC,EAAyBH,EAAKC,CAAG,EACjC,GAAI,CACF,aAAMf,EAAoBY,EAAUE,EAAKC,EAAKF,CAAM,EACpD,MAAMZ,EAAyBW,EAAUG,CAAG,EACrCC,EAAK,CACd,OAASE,EAAO,CACd,OAAOF,EAAKE,CAAK,CACnB,CACF,EAGID,EAA2B,CAACH,EAAcC,IAAkB,CAChE,MAAMI,EAASL,EAAI,MAAM,YAAY,EACjCK,GAAUA,EAAO,CAAC,IACpBJ,EAAI,OAAO,iBAAmB,KAAK,MAAMI,EAAO,CAAC,CAAC,EAEtD,EAEanB,EAAsB,MAAOY,EAAoBE,EAAcC,EAAeF,IAAuB,CAEhH,KAAM,CAAE,MAAAO,CAAM,EAAI,EAAAC,QAAa,UAAUN,CAAG,EAEtCO,EAAmBZ,EAAsBI,EAAI,KAAK,EAClDS,EAAkBT,EAAI,MAAM,2BAC5BU,EAA2BF,GAAoBC,EAEjDC,IACFT,EAAI,OAAO,iBAAmB,IAIhC,MAAMU,EAAoBZ,GAAQ,2BAC9BY,IACFV,EAAI,OAAO,kBAAoB,IAIjCA,EAAI,OAAO,gBAAkBS,GAA4BC,EACzDV,EAAI,OAAO,WAAa,+BAA+BA,EAAI,OAAO,eAAe,GAE7EK,GAASR,EAAS,mBACpBG,EAAI,OAAO,YAAc,MAAMH,EAAS,iBAAiB,eAAeQ,EAAOL,EAAI,OAAO,eAAe,EAE7G,EAEad,EAA2B,MAAOW,EAAoBG,IAAkB,CACnF,KAAM,CAAE,QAAAW,CAAQ,EAAI,EAAAL,QAAa,UAAUN,CAAG,EAC9C,GAAIW,EAAQ,GAAI,CACd,KAAM,CAAE,YAAAC,EAAa,gBAAAhB,CAAgB,EAAII,EAAI,OAEvCa,EAAY,MAAMhB,EAAS,uBAAuB,cAAcc,EAAQ,EAAE,EAChFX,EAAI,OAAO,iBAAoBJ,EAE3BiB,EAAU,OAAQC,GACT,EAAAC,QAAgB,4BAA4BH,EAAaE,EAAO,SAAUA,EAAO,EAAE,CAC3F,EAHDD,EAKJ,MAAMG,EAAS,MAAMnB,EAAS,sBAAsB,cAAcc,EAAQ,EAAE,EAO5E,GANAX,EAAI,OAAO,sBAAyBJ,EAEhCoB,EAAO,OAAQF,GACN,EAAAC,QAAgB,4BAA4BH,EAAaE,EAAO,SAAUA,EAAO,EAAE,CAC3F,EAHDE,EAKAnB,EAAS,gBAAiB,CAC5BG,EAAI,OAAO,mBAAqB,GAEhC,MAAMiB,EAAY,MAAMpB,EAAS,gBAAgB,gBAAgBc,EAAQ,EAAE,EAC3EX,EAAI,OAAO,UAAaJ,EAEpBqB,EAAU,OAAQC,GACT,EAAAH,QAAgB,4BAA4BH,EAAaM,EAAS,SAAUA,EAAS,EAAE,CAC/F,EAHDD,CAIN,CAEIpB,EAAS,4BACXG,EAAI,OAAO,mBAAqB,GAEpC,CACF,EAEA,IAAOhB,EAAQG",
-  "names": ["setUpDprResources_exports", "__export", "setUpDprResources_default", "populateDefinitions", "populateRequestedReports", "setupResources", "__toCommonJS", "import_definitionUtils", "import_localsHelper", "getQueryParamAsString", "query", "name", "getDefinitionsPath", "deriveDefinitionsPath", "definitionsPath", "services", "config", "req", "res", "next", "populateValidationErrors", "error", "errors", "token", "localsHelper", "dpdPathFromQuery", "dpdPathFromBody", "definitionsPathFromQuery", "dpdPathFromConfig", "dprUser", "definitions", "requested", "report", "DefinitionUtils", "recent", "bookmarks", "bookmark"]
+  "sourcesContent": ["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport { RequestHandler, Response, Request } from 'express'\nimport type { ParsedQs } from 'qs'\nimport { Services } from '../types/Services'\nimport { RequestedReport, StoredReportData } from '../types/UserReports'\nimport DefinitionUtils from '../utils/definitionUtils'\nimport { BookmarkStoreData } from '../types/Bookmark'\nimport { DprConfig } from '../types/DprConfig'\nimport localsHelper from '../utils/localsHelper'\n\nconst getQueryParamAsString = (query: ParsedQs, name: string) => (query[name] ? query[name].toString() : null)\nconst getDefinitionsPath = (query: ParsedQs) => getQueryParamAsString(query, 'dataProductDefinitionsPath')\n\nconst deriveDefinitionsPath = (query: ParsedQs): string | null => {\n  const definitionsPath = getDefinitionsPath(query)\n  if (definitionsPath) {\n    return definitionsPath\n  }\n\n  return null\n}\n\nexport const setupResources = (services: Services, config?: DprConfig): RequestHandler => {\n  return async (req, res, next) => {\n    populateValidationErrors(req, res)\n    try {\n      await populateDefinitions(services, req, res, config)\n      await populateRequestedReports(services, res)\n      return next()\n    } catch (error) {\n      return next(error)\n    }\n  }\n}\n\nconst populateValidationErrors = (req: Request, res: Response) => {\n  const errors = req.flash(`DPR_ERRORS`)\n  if (errors && errors[0]) {\n    res.locals.validationErrors = JSON.parse(errors[0])\n  }\n}\n\nexport const populateDefinitions = async (services: Services, req: Request, res: Response, config?: DprConfig) => {\n  // Get the DPD path from the query\n  const { token, dprUser } = localsHelper.getValues(res)\n\n  const dpdPathFromQuery = deriveDefinitionsPath(req.query)\n  const dpdPathFromBody = req.body?.dataProductDefinitionsPath\n  const definitionsPathFromQuery = dpdPathFromQuery || dpdPathFromBody\n\n  if (definitionsPathFromQuery) {\n    res.locals.dpdPathFromQuery = true\n  }\n\n  // Get the DPD path from the config\n  const dpdPathFromConfig = config?.dataProductDefinitionsPath\n  if (dpdPathFromConfig) {\n    res.locals.dpdPathFromConfig = true\n  }\n\n  // query takes presedence over config\n  res.locals.definitionsPath = definitionsPathFromQuery || dpdPathFromConfig\n  res.locals.pathSuffix = `?dataProductDefinitionsPath=${res.locals.definitionsPath}`\n\n  if (token && services.reportingService) {\n    const selectedProductCollectionId = await services.productCollectionStoreService.getSelectedProductCollectionId(\n      dprUser.id,\n    )\n\n    res.locals.definitions =\n      (await Promise.all([\n        services.reportingService.getDefinitions(token, res.locals.definitionsPath),\n        selectedProductCollectionId &&\n          services.productCollectionService.getProductCollection(dprUser.id, selectedProductCollectionId),\n      ]).then(([defs, selectedProductCollection]) => {\n        if (selectedProductCollection && selectedProductCollection) {\n          const productIds = selectedProductCollection.products.map((product) => product.productId)\n          return defs.filter((def) => productIds.includes(def.id))\n        }\n        return defs\n      })) ?? []\n  }\n}\n\nexport const populateRequestedReports = async (services: Services, res: Response) => {\n  const { dprUser } = localsHelper.getValues(res)\n  if (dprUser.id) {\n    const { definitions, definitionsPath } = res.locals\n\n    const requested = await services.requestedReportService.getAllReports(dprUser.id)\n    res.locals.requestedReports = !definitionsPath\n      ? requested\n      : requested.filter((report: RequestedReport) => {\n          return DefinitionUtils.getCurrentVariantDefinition(definitions, report.reportId, report.id)\n        })\n\n    const recent = await services.recentlyViewedService.getAllReports(dprUser.id)\n    res.locals.recentlyViewedReports = !definitionsPath\n      ? recent\n      : recent.filter((report: StoredReportData) => {\n          return DefinitionUtils.getCurrentVariantDefinition(definitions, report.reportId, report.id)\n        })\n\n    if (services.bookmarkService) {\n      res.locals.bookmarkingEnabled = true\n\n      const bookmarks = await services.bookmarkService.getAllBookmarks(dprUser.id)\n      res.locals.bookmarks = !definitionsPath\n        ? bookmarks\n        : bookmarks.filter((bookmark: BookmarkStoreData) => {\n            return DefinitionUtils.getCurrentVariantDefinition(definitions, bookmark.reportId, bookmark.id)\n          })\n    }\n\n    if (services.downloadPermissionService) {\n      res.locals.downloadingEnabled = true\n    }\n  }\n}\n\nexport default setupResources\n"],
+  "mappings": "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",
+  "names": ["setUpDprResources_exports", "__export", "setUpDprResources_default", "populateDefinitions", "populateRequestedReports", "setupResources", "__toCommonJS", "import_definitionUtils", "import_localsHelper", "getQueryParamAsString", "query", "name", "getDefinitionsPath", "deriveDefinitionsPath", "definitionsPath", "services", "config", "req", "res", "next", "populateValidationErrors", "error", "errors", "token", "dprUser", "localsHelper", "dpdPathFromQuery", "dpdPathFromBody", "definitionsPathFromQuery", "dpdPathFromConfig", "selectedProductCollectionId", "defs", "selectedProductCollection", "productIds", "product", "def", "definitions", "requested", "report", "DefinitionUtils", "recent", "bookmarks", "bookmark"]
 }

package/dpr/middleware/setUpDprResources.test.ts

@@ -96,6 +96,13 @@ describe('setUpDprResources', () => {
 
       services = {
         reportingService,
+        productCollectionService: {
+          getProductCollections: jest.fn(() => []),
+          getProductCollection: jest.fn(),
+        },
+        productCollectionStoreService: {
+          getSelectedProductCollectionId: jest.fn(),
+        },
       } as unknown as Services
 
       res = {

package/dpr/middleware/setUpDprResources.ts

@@ -42,7 +42,7 @@ const populateValidationErrors = (req: Request, res: Response) => {
 
 export const populateDefinitions = async (services: Services, req: Request, res: Response, config?: DprConfig) => {
   // Get the DPD path from the query
-  const { token } = localsHelper.getValues(res)
+  const { token, dprUser } = localsHelper.getValues(res)
 
   const dpdPathFromQuery = deriveDefinitionsPath(req.query)
   const dpdPathFromBody = req.body?.dataProductDefinitionsPath
@@ -63,7 +63,22 @@ export const populateDefinitions = async (services: Services, req: Request, res:
   res.locals.pathSuffix = `?dataProductDefinitionsPath=${res.locals.definitionsPath}`
 
   if (token && services.reportingService) {
-    res.locals.definitions = await services.reportingService.getDefinitions(token, res.locals.definitionsPath)
+    const selectedProductCollectionId = await services.productCollectionStoreService.getSelectedProductCollectionId(
+      dprUser.id,
+    )
+
+    res.locals.definitions =
+      (await Promise.all([
+        services.reportingService.getDefinitions(token, res.locals.definitionsPath),
+        selectedProductCollectionId &&
+          services.productCollectionService.getProductCollection(dprUser.id, selectedProductCollectionId),
+      ]).then(([defs, selectedProductCollection]) => {
+        if (selectedProductCollection && selectedProductCollection) {
+          const productIds = selectedProductCollection.products.map((product) => product.productId)
+          return defs.filter((def) => productIds.includes(def.id))
+        }
+        return defs
+      })) ?? []
   }
 }
 

package/dpr/routes/journeys/download-report/tests.cy.js

@@ -1,2 +1,2 @@
-var i=require("test-app/routes/integrationTests/redisStateTestUtils"),o=require("../../../../../cypress-tests/cypressUtils");context("Download report",()=>{const d="/embedded/platform/";let t,s;before(()=>{cy.task("resetStubs"),cy.task("resetRedis"),cy.task("stubDefinitions"),cy.task("stubDefinitionRequestExamplesSuccess"),cy.task("stubReportsFinishedStatus"),cy.task("stubRequestSuccessResult20"),cy.task("stubRequestSuccessReportTablesCount"),cy.task("stubViewAsyncReportingResults"),cy.task("stubRequestSuccessResult100"),cy.visit(d),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(e,l)=>l.textContent.includes("Successful Report")&&l.textContent.includes("this will succeed")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),(0,o.checkA11y)(),cy.findByRole("button",{name:/Request/}).click(),(0,o.checkA11y)(),cy.findByRole("heading",{level:1,name:/Successful Report/}).should("be.visible"),cy.url().then(e=>{s=e})}),beforeEach(()=>{cy.visit(s)}),describe("Enabling download",()=>{it("should show the enable download button",()=>{cy.findByLabelText(/Enable download/).should("exist").should("be.visible"),cy.findByRole("heading",{name:"To download this report"}).should("not.exist")}),it("should show the download disabled message with link to form",()=>{cy.findByLabelText(/Enable download/).click(),cy.url().should("have.string","/report/download-disabled"),cy.findByRole("heading",{name:"To download this report"}).should("be.visible"),cy.findByRole("link",{name:"Fill out a form"})}),it("should go to the request download form",()=>{cy.findByLabelText(/Enable download/).click(),cy.findByRole("link",{name:"Fill out a form"}).click(),cy.url().then(e=>{t=e}),cy.url().should("match",/\/embedded\/platform\/dpr\/download-report\/request-download\/request-examples\/request-example-success\/tableId\/tblId_[0-9]+\/form/),cy.location().should(e=>{expect(e.search).to.match(/.*reportUrl=\/embedded\/platform\/dpr\/view-report\/async\/report\/request-examples\/request-example-success\/tblId_[0-9]+\/report/)})})}),describe("Requesting download",()=>{it("should prefill the user data in the request form",()=>{cy.visit(t),cy.findByRole("textbox",{name:"What is your Full name?"}).should("have.value","Test User"),cy.findByRole("textbox",{name:"What is your Email address?"}).should("have.value","test@user.com")}),it("should validate the required fields",()=>{cy.visit(t),cy.findByRole("alert").should("not.exist"),cy.findAllByRole("paragraph").contains("Enter your Job title").should("not.exist"),cy.findAllByRole("paragraph").contains("provide information on how you will use this data").should("not.exist"),cy.get("#more-detail-error").should("not.be.visible"),cy.findByRole("button",{name:/Submit request/}).click(),cy.findByRole("alert").should("exist"),cy.findAllByRole("paragraph").contains("Enter your Job title").should("exist"),cy.findAllByRole("paragraph").contains("provide information on how you will use this data").should("exist")}),it("should submit the download request",()=>{cy.visit(t),cy.findByRole("textbox",{name:"What is your Job title?"}).type("Software engineer"),cy.findByRole("textbox",{name:"Can you provide more detail"}).type("I like this report"),cy.findByRole("button",{name:"Submit request"}).click(),cy.findByText(/You have been granted permission/).should("be.visible"),cy.url().as("downloadRequestSubmittedPage"),cy.url().and("match",/dpr\/download-report\/request-download\/request-examples\/request-example-success\/tableId\/tblId_[0-9]+\/form\/submitted/),cy.findByRole("link",{name:/Return to report to download/}).click(),cy.findAllByRole("heading").contains("Successful Report").should("exist"),cy.findByRole("button",{name:/download/}).should("be.visible"),cy.task("stubRequestSuccessResult10MissingFirstRow"),cy.findByRole("button",{name:/download/}).click(),cy.task("checkContents10RowExcelValid").should("equal",!0)}),it("should redirect on trying to download after having the permission to download removed",()=>{(0,i.updateRedisState)("downloadPermissions",[]),cy.findByRole("heading",{name:/To download this report/}).should("not.exist"),cy.findByRole("button",{name:/download/}).click(),cy.findByRole("heading",{name:/To download this report/}).should("be.visible")})})});
+var i=require("test-app/routes/integrationTests/redisStateTestUtils"),o=require("../../../../../cypress-tests/cypressUtils");context("Download report",()=>{const d="/embedded/platform/";let t,s;before(()=>{cy.task("resetStubs"),cy.task("resetRedis"),cy.task("stubDefinitions"),cy.task("stubGetProductCollections"),cy.task("stubDefinitionRequestExamplesSuccess"),cy.task("stubReportsFinishedStatus"),cy.task("stubRequestSuccessResult20"),cy.task("stubRequestSuccessReportTablesCount"),cy.task("stubViewAsyncReportingResults"),cy.task("stubRequestSuccessResult100"),cy.visit(d),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(e,l)=>l.textContent.includes("Successful Report")&&l.textContent.includes("this will succeed")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),(0,o.checkA11y)(),cy.findByRole("button",{name:/Request/}).click(),(0,o.checkA11y)(),cy.findByRole("heading",{level:1,name:/Successful Report/}).should("be.visible"),cy.url().then(e=>{s=e})}),beforeEach(()=>{cy.visit(s)}),describe("Enabling download",()=>{it("should show the enable download button",()=>{cy.findByLabelText(/Enable download/).should("exist").should("be.visible"),cy.findByRole("heading",{name:"To download this report"}).should("not.exist")}),it("should show the download disabled message with link to form",()=>{cy.findByLabelText(/Enable download/).click(),cy.url().should("have.string","/report/download-disabled"),cy.findByRole("heading",{name:"To download this report"}).should("be.visible"),cy.findByRole("link",{name:"Fill out a form"})}),it("should go to the request download form",()=>{cy.findByLabelText(/Enable download/).click(),cy.findByRole("link",{name:"Fill out a form"}).click(),cy.url().then(e=>{t=e}),cy.url().should("match",/\/embedded\/platform\/dpr\/download-report\/request-download\/request-examples\/request-example-success\/tableId\/tblId_[0-9]+\/form/),cy.location().should(e=>{expect(e.search).to.match(/.*reportUrl=\/embedded\/platform\/dpr\/view-report\/async\/report\/request-examples\/request-example-success\/tblId_[0-9]+\/report/)})})}),describe("Requesting download",()=>{it("should prefill the user data in the request form",()=>{cy.visit(t),cy.findByRole("textbox",{name:"What is your Full name?"}).should("have.value","Test User"),cy.findByRole("textbox",{name:"What is your Email address?"}).should("have.value","test@user.com")}),it("should validate the required fields",()=>{cy.visit(t),cy.findByRole("alert").should("not.exist"),cy.findAllByRole("paragraph").contains("Enter your Job title").should("not.exist"),cy.findAllByRole("paragraph").contains("provide information on how you will use this data").should("not.exist"),cy.get("#more-detail-error").should("not.be.visible"),cy.findByRole("button",{name:/Submit request/}).click(),cy.findByRole("alert").should("exist"),cy.findAllByRole("paragraph").contains("Enter your Job title").should("exist"),cy.findAllByRole("paragraph").contains("provide information on how you will use this data").should("exist")}),it("should submit the download request",()=>{cy.visit(t),cy.findByRole("textbox",{name:"What is your Job title?"}).type("Software engineer"),cy.findByRole("textbox",{name:"Can you provide more detail"}).type("I like this report"),cy.findByRole("button",{name:"Submit request"}).click(),cy.findByText(/You have been granted permission/).should("be.visible"),cy.url().as("downloadRequestSubmittedPage"),cy.url().and("match",/dpr\/download-report\/request-download\/request-examples\/request-example-success\/tableId\/tblId_[0-9]+\/form\/submitted/),cy.findByRole("link",{name:/Return to report to download/}).click(),cy.findAllByRole("heading").contains("Successful Report").should("exist"),cy.findByRole("button",{name:/download/}).should("be.visible"),cy.task("stubRequestSuccessResult10MissingFirstRow"),cy.findByRole("button",{name:/download/}).click(),cy.task("checkContents10RowExcelValid").should("equal",!0)}),it("should redirect on trying to download after having the permission to download removed",()=>{(0,i.updateRedisState)("downloadPermissions",[]),cy.findByRole("heading",{name:/To download this report/}).should("not.exist"),cy.findByRole("button",{name:/download/}).click(),cy.findByRole("heading",{name:/To download this report/}).should("be.visible")})})});
 //# sourceMappingURL=tests.cy.js.map

package/dpr/routes/journeys/download-report/tests.cy.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/routes/journeys/download-report/tests.cy.ts"],
-  "sourcesContent": ["import { updateRedisState } from 'test-app/routes/integrationTests/redisStateTestUtils'\nimport { checkA11y } from '../../../../../cypress-tests/cypressUtils'\n\ncontext('Download report', () => {\n  const path = '/embedded/platform/'\n  let downloadRequestFormPage: string\n  let viewReportUrl: string\n\n  before(() => {\n    cy.task('resetStubs')\n    cy.task('resetRedis')\n    cy.task('stubDefinitions')\n    cy.task('stubDefinitionRequestExamplesSuccess')\n    cy.task('stubReportsFinishedStatus')\n    cy.task('stubRequestSuccessResult20')\n    cy.task('stubRequestSuccessReportTablesCount')\n    cy.task('stubViewAsyncReportingResults')\n    cy.task('stubRequestSuccessResult100')\n    cy.visit(path)\n    cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n      cy.findByRole('row', {\n        name: (_, element) => {\n          return element.textContent.includes('Successful Report') && element.textContent.includes('this will succeed')\n        },\n      }).within(() => {\n        cy.findByRole('link', { name: 'Request report' }).click()\n      })\n    })\n    checkA11y()\n    cy.findByRole('button', { name: /Request/ }).click()\n    checkA11y()\n    cy.findByRole('heading', { level: 1, name: /Successful Report/ }).should('be.visible')\n    cy.url().then((url) => {\n      viewReportUrl = url\n    })\n  })\n\n  beforeEach(() => {\n    cy.visit(viewReportUrl)\n  })\n\n  describe('Enabling download', () => {\n    it('should show the enable download button', () => {\n      cy.findByLabelText(/Enable download/)\n        .should('exist')\n        .should('be.visible')\n      cy.findByRole('heading', { name: 'To download this report' }).should('not.exist')\n    })\n\n    it('should show the download disabled message with link to form', () => {\n      cy.findByLabelText(/Enable download/).click()\n      cy.url().should('have.string', '/report/download-disabled')\n      cy.findByRole('heading', { name: 'To download this report' }).should('be.visible')\n      cy.findByRole('link', { name: 'Fill out a form' })\n    })\n\n    it('should go to the request download form', () => {\n      cy.findByLabelText(/Enable download/).click()\n      cy.findByRole('link', { name: 'Fill out a form' }).click()\n\n      cy.url().then((url) => {\n        downloadRequestFormPage = url\n      })\n\n      cy.url().should(\n        'match',\n        /\\/embedded\\/platform\\/dpr\\/download-report\\/request-download\\/request-examples\\/request-example-success\\/tableId\\/tblId_[0-9]+\\/form/,\n      )\n      cy.location().should((location) => {\n        expect(location.search).to.match(\n          /.*reportUrl=\\/embedded\\/platform\\/dpr\\/view-report\\/async\\/report\\/request-examples\\/request-example-success\\/tblId_[0-9]+\\/report/,\n        )\n      })\n    })\n  })\n\n  describe('Requesting download', () => {\n    it('should prefill the user data in the request form', () => {\n      cy.visit(downloadRequestFormPage)\n      cy.findByRole('textbox', { name: 'What is your Full name?' }).should('have.value', 'Test User')\n      cy.findByRole('textbox', { name: 'What is your Email address?' }).should('have.value', 'test@user.com')\n    })\n\n    it('should validate the required fields', () => {\n      cy.visit(downloadRequestFormPage)\n      cy.findByRole('alert').should('not.exist')\n\n      cy.findAllByRole('paragraph').contains('Enter your Job title').should('not.exist')\n      cy.findAllByRole('paragraph').contains('provide information on how you will use this data').should('not.exist')\n      cy.get('#more-detail-error').should('not.be.visible')\n\n      cy.findByRole('button', { name: /Submit request/ }).click()\n\n      cy.findByRole('alert').should('exist')\n      cy.findAllByRole('paragraph').contains('Enter your Job title').should('exist')\n      cy.findAllByRole('paragraph').contains('provide information on how you will use this data').should('exist')\n    })\n\n    it('should submit the download request', () => {\n      cy.visit(downloadRequestFormPage)\n      cy.findByRole('textbox', { name: 'What is your Job title?' }).type('Software engineer')\n      cy.findByRole('textbox', { name: 'Can you provide more detail' }).type('I like this report')\n\n      cy.findByRole('button', { name: 'Submit request' }).click()\n      cy.findByText(/You have been granted permission/).should('be.visible')\n\n      cy.url().as('downloadRequestSubmittedPage')\n\n      cy.url().and(\n        'match',\n        /dpr\\/download-report\\/request-download\\/request-examples\\/request-example-success\\/tableId\\/tblId_[0-9]+\\/form\\/submitted/,\n      )\n      cy.findByRole('link', { name: /Return to report to download/ }).click()\n      cy.findAllByRole('heading').contains('Successful Report').should('exist')\n      cy.findByRole('button', { name: /download/ }).should('be.visible')\n\n      cy.task('stubRequestSuccessResult10MissingFirstRow')\n      cy.findByRole('button', { name: /download/ }).click()\n      cy.task('checkContents10RowExcelValid').should('equal', true)\n    })\n\n    it('should redirect on trying to download after having the permission to download removed', () => {\n      updateRedisState('downloadPermissions', [])\n      cy.findByRole('heading', { name: /To download this report/ }).should('not.exist')\n      cy.findByRole('button', { name: /download/ }).click()\n      cy.findByRole('heading', { name: /To download this report/ }).should('be.visible')\n    })\n  })\n})\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { updateRedisState } from 'test-app/routes/integrationTests/redisStateTestUtils'\nimport { checkA11y } from '../../../../../cypress-tests/cypressUtils'\n\ncontext('Download report', () => {\n  const path = '/embedded/platform/'\n  let downloadRequestFormPage: string\n  let viewReportUrl: string\n\n  before(() => {\n    cy.task('resetStubs')\n    cy.task('resetRedis')\n    cy.task('stubDefinitions')\n    cy.task('stubGetProductCollections')\n    cy.task('stubDefinitionRequestExamplesSuccess')\n    cy.task('stubReportsFinishedStatus')\n    cy.task('stubRequestSuccessResult20')\n    cy.task('stubRequestSuccessReportTablesCount')\n    cy.task('stubViewAsyncReportingResults')\n    cy.task('stubRequestSuccessResult100')\n    cy.visit(path)\n    cy.findByLabelText(/Reports catalogue.*/i).within(() => {\n      cy.findByRole('row', {\n        name: (_, element) => {\n          return element.textContent.includes('Successful Report') && element.textContent.includes('this will succeed')\n        },\n      }).within(() => {\n        cy.findByRole('link', { name: 'Request report' }).click()\n      })\n    })\n    checkA11y()\n    cy.findByRole('button', { name: /Request/ }).click()\n    checkA11y()\n    cy.findByRole('heading', { level: 1, name: /Successful Report/ }).should('be.visible')\n    cy.url().then((url) => {\n      viewReportUrl = url\n    })\n  })\n\n  beforeEach(() => {\n    cy.visit(viewReportUrl)\n  })\n\n  describe('Enabling download', () => {\n    it('should show the enable download button', () => {\n      cy.findByLabelText(/Enable download/)\n        .should('exist')\n        .should('be.visible')\n      cy.findByRole('heading', { name: 'To download this report' }).should('not.exist')\n    })\n\n    it('should show the download disabled message with link to form', () => {\n      cy.findByLabelText(/Enable download/).click()\n      cy.url().should('have.string', '/report/download-disabled')\n      cy.findByRole('heading', { name: 'To download this report' }).should('be.visible')\n      cy.findByRole('link', { name: 'Fill out a form' })\n    })\n\n    it('should go to the request download form', () => {\n      cy.findByLabelText(/Enable download/).click()\n      cy.findByRole('link', { name: 'Fill out a form' }).click()\n\n      cy.url().then((url) => {\n        downloadRequestFormPage = url\n      })\n\n      cy.url().should(\n        'match',\n        /\\/embedded\\/platform\\/dpr\\/download-report\\/request-download\\/request-examples\\/request-example-success\\/tableId\\/tblId_[0-9]+\\/form/,\n      )\n      cy.location().should((location) => {\n        expect(location.search).to.match(\n          /.*reportUrl=\\/embedded\\/platform\\/dpr\\/view-report\\/async\\/report\\/request-examples\\/request-example-success\\/tblId_[0-9]+\\/report/,\n        )\n      })\n    })\n  })\n\n  describe('Requesting download', () => {\n    it('should prefill the user data in the request form', () => {\n      cy.visit(downloadRequestFormPage)\n      cy.findByRole('textbox', { name: 'What is your Full name?' }).should('have.value', 'Test User')\n      cy.findByRole('textbox', { name: 'What is your Email address?' }).should('have.value', 'test@user.com')\n    })\n\n    it('should validate the required fields', () => {\n      cy.visit(downloadRequestFormPage)\n      cy.findByRole('alert').should('not.exist')\n\n      cy.findAllByRole('paragraph').contains('Enter your Job title').should('not.exist')\n      cy.findAllByRole('paragraph').contains('provide information on how you will use this data').should('not.exist')\n      cy.get('#more-detail-error').should('not.be.visible')\n\n      cy.findByRole('button', { name: /Submit request/ }).click()\n\n      cy.findByRole('alert').should('exist')\n      cy.findAllByRole('paragraph').contains('Enter your Job title').should('exist')\n      cy.findAllByRole('paragraph').contains('provide information on how you will use this data').should('exist')\n    })\n\n    it('should submit the download request', () => {\n      cy.visit(downloadRequestFormPage)\n      cy.findByRole('textbox', { name: 'What is your Job title?' }).type('Software engineer')\n      cy.findByRole('textbox', { name: 'Can you provide more detail' }).type('I like this report')\n\n      cy.findByRole('button', { name: 'Submit request' }).click()\n      cy.findByText(/You have been granted permission/).should('be.visible')\n\n      cy.url().as('downloadRequestSubmittedPage')\n\n      cy.url().and(\n        'match',\n        /dpr\\/download-report\\/request-download\\/request-examples\\/request-example-success\\/tableId\\/tblId_[0-9]+\\/form\\/submitted/,\n      )\n      cy.findByRole('link', { name: /Return to report to download/ }).click()\n      cy.findAllByRole('heading').contains('Successful Report').should('exist')\n      cy.findByRole('button', { name: /download/ }).should('be.visible')\n\n      cy.task('stubRequestSuccessResult10MissingFirstRow')\n      cy.findByRole('button', { name: /download/ }).click()\n      cy.task('checkContents10RowExcelValid').should('equal', true)\n    })\n\n    it('should redirect on trying to download after having the permission to download removed', () => {\n      updateRedisState('downloadPermissions', [])\n      cy.findByRole('heading', { name: /To download this report/ }).should('not.exist')\n      cy.findByRole('button', { name: /download/ }).click()\n      cy.findByRole('heading', { name: /To download this report/ }).should('be.visible')\n    })\n  })\n})\n"],
+  "mappings": "AAAA,IAAAA,EAAiC,gEACjCC,EAA0B,qDAE1B,QAAQ,kBAAmB,IAAM,CAC/B,MAAMC,EAAO,sBACb,IAAIC,EACAC,EAEJ,OAAO,IAAM,CACX,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,YAAY,EACpB,GAAG,KAAK,iBAAiB,EACzB,GAAG,KAAK,2BAA2B,EACnC,GAAG,KAAK,sCAAsC,EAC9C,GAAG,KAAK,2BAA2B,EACnC,GAAG,KAAK,4BAA4B,EACpC,GAAG,KAAK,qCAAqC,EAC7C,GAAG,KAAK,+BAA+B,EACvC,GAAG,KAAK,6BAA6B,EACrC,GAAG,MAAMF,CAAI,EACb,GAAG,gBAAgB,sBAAsB,EAAE,OAAO,IAAM,CACtD,GAAG,WAAW,MAAO,CACnB,KAAM,CAACG,EAAGC,IACDA,EAAQ,YAAY,SAAS,mBAAmB,GAAKA,EAAQ,YAAY,SAAS,mBAAmB,CAEhH,CAAC,EAAE,OAAO,IAAM,CACd,GAAG,WAAW,OAAQ,CAAE,KAAM,gBAAiB,CAAC,EAAE,MAAM,CAC1D,CAAC,CACH,CAAC,KACD,aAAU,EACV,GAAG,WAAW,SAAU,CAAE,KAAM,SAAU,CAAC,EAAE,MAAM,KACnD,aAAU,EACV,GAAG,WAAW,UAAW,CAAE,MAAO,EAAG,KAAM,mBAAoB,CAAC,EAAE,OAAO,YAAY,EACrF,GAAG,IAAI,EAAE,KAAMC,GAAQ,CACrBH,EAAgBG,CAClB,CAAC,CACH,CAAC,EAED,WAAW,IAAM,CACf,GAAG,MAAMH,CAAa,CACxB,CAAC,EAED,SAAS,oBAAqB,IAAM,CAClC,GAAG,yCAA0C,IAAM,CACjD,GAAG,gBAAgB,iBAAiB,EACjC,OAAO,OAAO,EACd,OAAO,YAAY,EACtB,GAAG,WAAW,UAAW,CAAE,KAAM,yBAA0B,CAAC,EAAE,OAAO,WAAW,CAClF,CAAC,EAED,GAAG,8DAA+D,IAAM,CACtE,GAAG,gBAAgB,iBAAiB,EAAE,MAAM,EAC5C,GAAG,IAAI,EAAE,OAAO,cAAe,2BAA2B,EAC1D,GAAG,WAAW,UAAW,CAAE,KAAM,yBAA0B,CAAC,EAAE,OAAO,YAAY,EACjF,GAAG,WAAW,OAAQ,CAAE,KAAM,iBAAkB,CAAC,CACnD,CAAC,EAED,GAAG,yCAA0C,IAAM,CACjD,GAAG,gBAAgB,iBAAiB,EAAE,MAAM,EAC5C,GAAG,WAAW,OAAQ,CAAE,KAAM,iBAAkB,CAAC,EAAE,MAAM,EAEzD,GAAG,IAAI,EAAE,KAAMG,GAAQ,CACrBJ,EAA0BI,CAC5B,CAAC,EAED,GAAG,IAAI,EAAE,OACP,QACA,sIACF,EACA,GAAG,SAAS,EAAE,OAAQC,GAAa,CACjC,OAAOA,EAAS,MAAM,EAAE,GAAG,MACzB,oIACF,CACF,CAAC,CACH,CAAC,CACH,CAAC,EAED,SAAS,sBAAuB,IAAM,CACpC,GAAG,mDAAoD,IAAM,CAC3D,GAAG,MAAML,CAAuB,EAChC,GAAG,WAAW,UAAW,CAAE,KAAM,yBAA0B,CAAC,EAAE,OAAO,aAAc,WAAW,EAC9F,GAAG,WAAW,UAAW,CAAE,KAAM,6BAA8B,CAAC,EAAE,OAAO,aAAc,eAAe,CACxG,CAAC,EAED,GAAG,sCAAuC,IAAM,CAC9C,GAAG,MAAMA,CAAuB,EAChC,GAAG,WAAW,OAAO,EAAE,OAAO,WAAW,EAEzC,GAAG,cAAc,WAAW,EAAE,SAAS,sBAAsB,EAAE,OAAO,WAAW,EACjF,GAAG,cAAc,WAAW,EAAE,SAAS,mDAAmD,EAAE,OAAO,WAAW,EAC9G,GAAG,IAAI,oBAAoB,EAAE,OAAO,gBAAgB,EAEpD,GAAG,WAAW,SAAU,CAAE,KAAM,gBAAiB,CAAC,EAAE,MAAM,EAE1D,GAAG,WAAW,OAAO,EAAE,OAAO,OAAO,EACrC,GAAG,cAAc,WAAW,EAAE,SAAS,sBAAsB,EAAE,OAAO,OAAO,EAC7E,GAAG,cAAc,WAAW,EAAE,SAAS,mDAAmD,EAAE,OAAO,OAAO,CAC5G,CAAC,EAED,GAAG,qCAAsC,IAAM,CAC7C,GAAG,MAAMA,CAAuB,EAChC,GAAG,WAAW,UAAW,CAAE,KAAM,yBAA0B,CAAC,EAAE,KAAK,mBAAmB,EACtF,GAAG,WAAW,UAAW,CAAE,KAAM,6BAA8B,CAAC,EAAE,KAAK,oBAAoB,EAE3F,GAAG,WAAW,SAAU,CAAE,KAAM,gBAAiB,CAAC,EAAE,MAAM,EAC1D,GAAG,WAAW,kCAAkC,EAAE,OAAO,YAAY,EAErE,GAAG,IAAI,EAAE,GAAG,8BAA8B,EAE1C,GAAG,IAAI,EAAE,IACP,QACA,2HACF,EACA,GAAG,WAAW,OAAQ,CAAE,KAAM,8BAA+B,CAAC,EAAE,MAAM,EACtE,GAAG,cAAc,SAAS,EAAE,SAAS,mBAAmB,EAAE,OAAO,OAAO,EACxE,GAAG,WAAW,SAAU,CAAE,KAAM,UAAW,CAAC,EAAE,OAAO,YAAY,EAEjE,GAAG,KAAK,2CAA2C,EACnD,GAAG,WAAW,SAAU,CAAE,KAAM,UAAW,CAAC,EAAE,MAAM,EACpD,GAAG,KAAK,8BAA8B,EAAE,OAAO,QAAS,EAAI,CAC9D,CAAC,EAED,GAAG,wFAAyF,IAAM,IAChG,oBAAiB,sBAAuB,CAAC,CAAC,EAC1C,GAAG,WAAW,UAAW,CAAE,KAAM,yBAA0B,CAAC,EAAE,OAAO,WAAW,EAChF,GAAG,WAAW,SAAU,CAAE,KAAM,UAAW,CAAC,EAAE,MAAM,EACpD,GAAG,WAAW,UAAW,CAAE,KAAM,yBAA0B,CAAC,EAAE,OAAO,YAAY,CACnF,CAAC,CACH,CAAC,CACH,CAAC",
   "names": ["import_redisStateTestUtils", "import_cypressUtils", "path", "downloadRequestFormPage", "viewReportUrl", "_", "element", "url", "location"]
 }

package/dpr/routes/journeys/download-report/tests.cy.ts

@@ -10,6 +10,7 @@ context('Download report', () => {
     cy.task('resetStubs')
     cy.task('resetRedis')
     cy.task('stubDefinitions')
+    cy.task('stubGetProductCollections')
     cy.task('stubDefinitionRequestExamplesSuccess')
     cy.task('stubReportsFinishedStatus')
     cy.task('stubRequestSuccessResult20')

package/dpr/routes/journeys/my-reports/bookmarks/tests.cy.js

@@ -1,2 +1,2 @@
-var n=require("@networkMocks/report/mockVariants/feature-testing/unprintable"),a=require("@networkMocks/report/mockVariants/feature-testing/emptyQuery");context("Bookmarks list",()=>{const i="/embedded/platform/";describe("check the default starting state",()=>{it("should have the default bookmarks from the caseload bookmark config",()=>{cy.task("resetStubs"),cy.task("resetRedis"),cy.task("stubDefinitions"),cy.task("stubDefinitionUnprintable"),cy.task("stubDefinitionEmptyReport"),cy.task("stubSingleSummaries"),cy.visit(i),cy.findByRole("tab",{name:/Bookmarks/}).click(),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2),cy.findByRole("link",{name:(t,e)=>e.href.includes(n.featureTestingUnprintable.id)}),cy.findByRole("link",{name:(t,e)=>e.href.includes(a.featureTestingEmptyQuery.id)})})})})}),describe("check other interactions",()=>{before(()=>{cy.task("resetStubs"),cy.task("stubDefinitions"),cy.task("resetRedis"),cy.task("stubSingleSummaries"),cy.task("stubDefinitionRequestExamplesSuccess"),cy.task("stubDefinitionUnprintable"),cy.task("stubDefinitionEmptyReport"),cy.task("stubListExampleDashboard"),cy.task("stubDefinitionMockReportVariant35"),cy.task("stubTestDashboard8"),cy.task("stubDefinitionFeatureTestingInteractive"),cy.task("stubDashboardSuccessResult20"),cy.task("stubRequestSuccessResult20"),cy.task("stubPollingReportEndpoint")}),beforeEach(()=>{cy.visit(i)}),describe("Bookmarking via the catalogue",()=>{describe("report",()=>{it("should add a bookmark to the bookmarks list",()=>{cy.findByRole("tab",{name:/Bookmarks/}).click(),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).click()})}),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3),cy.findAllByRole("row").contains("Interactive Report with async filters").should("exist")})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Remove bookmark/}).should("exist")})})}),it("should remove a bookmark to the bookmarks list",()=>{cy.findByRole("tab",{name:/Bookmarks/}).click(),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Remove bookmark/}).click()})}),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).should("exist")})})})}),describe("dashboard",()=>{it("should add a bookmark to the bookmarks list",()=>{cy.findByRole("tab",{name:/Bookmarks/}).click(),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Data quality data set")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).click()})}),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3),cy.findAllByRole("row").contains("Data quality data set").should("exist")})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Data quality data set")}).within(()=>{cy.findByRole("button",{name:/Remove bookmark/}).should("exist")})})}),it("should remove a bookmark from the bookmarks list",()=>{cy.findByRole("tab",{name:/Bookmarks/}).click(),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Data quality data set")}).within(()=>{cy.findByRole("button",{name:/Remove bookmark/}).click()})}),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Data quality data set")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).should("exist")})})})}),describe("missing report",()=>{it("should not be able to be bookmarked",()=>{cy.findByRole("tab",{name:/Bookmarks/}).click(),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Description for missing report 1")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).should("not.exist"),cy.findByRole("link",{name:/Request report/}).should("be.visible")})})})})}),describe("Removing via the user reports list",()=>{it("should remove a dashboard bookmark",()=>{cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Data quality data set")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).click()})}),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Data quality data set")}).within(()=>{cy.findByRole("button",{name:/Remove bookmark/}).click()})}),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2)})})}),it("should remove a report bookmark",()=>{cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).click()})}),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Remove bookmark/}).click()})}),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2)})})})}),describe("Bookmarking via the report",()=>{let t;before(()=>{cy.task("stubDefinitionFeatureTestingMissingDesc"),cy.task("stubReportsFinishedStatus"),cy.task("stubViewAsyncReportingResults"),cy.task("stubRequestSuccessReportTablesCount"),cy.visit(i),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(e,o)=>o.textContent.includes("Feature testing")&&o.textContent.includes("Missing variant description")&&o.textContent.includes("Example variants used for feature testing")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),cy.findByRole("combobox",{name:/Field 2/}).select("Value 2.1"),cy.findByRole("button",{name:/Request report/}).click(),cy.findByRole("button",{name:/Enable download/}).should("be.visible"),cy.url().then(e=>{t=e})}),it("should add a bookmark",()=>{cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2)})}),cy.visit(t),cy.findByRole("button",{name:/Add bookmark/}).click(),cy.findByRole("button",{name:/Bookmarked/}).should("be.visible"),cy.visit(i),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3)})})}),it("should remove a bookmark",()=>{cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3)})}),cy.visit(t),cy.findByRole("button",{name:/Remove bookmark/}).click(),cy.findByRole("button",{name:/Bookmark removed/}),cy.visit(i),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2)})})})}),describe("Bookmarking via the dashboard",()=>{let t;before(()=>{cy.task("stubTestDashboard8"),cy.task("stubMockDashboardsStatusFinished"),cy.task("stubViewAsyncResults"),cy.task("stubDashboardSuccessResult20"),cy.visit(i),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(e,o)=>o.textContent.includes("Test Dashboard")&&o.textContent.includes("Dashboard used for testing testing")}).within(()=>{cy.findByRole("link",{name:"Request dashboard"}).click()})}),cy.findByRole("button",{name:/Request dashboard/}).click(),cy.url().then(e=>{t=e})}),it("should add a bookmark",()=>{cy.visit(t),cy.findByRole("button",{name:/Add bookmark/}).click().contains("Bookmarked"),cy.visit(i),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3)})})}),it("should remove a bookmark",()=>{cy.visit(i),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3)})}),cy.visit(t),cy.findByRole("button",{name:/Remove bookmark/}).click().contains("Bookmark removed"),cy.visit(i),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2)})})})}),describe("bookmarking should be idempotent",()=>{it("should not change the bookmark status of an already bookmarked item",()=>{cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).click()})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.get("input").then(t=>{t.get(0).checked=!1,t.get(0).removeAttribute("checked")}),cy.get("input").invoke("attr","checked").should("equal",void 0)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Remove bookmark/}).click()})}),cy.reload(),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Remove bookmark/}).should("exist")})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Remove bookmark/}).click()})})}),it("should not change the bookmark status of an unbookmarked item",()=>{cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.get("input").then(t=>{t.get(0).checked=!0,t.get(0).setAttribute("checked","true")}),cy.get("input").invoke("attr","checked").should("not.equal",void 0).and("not.equal",!1)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).click()})}),cy.reload(),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).should("exist")})})})})})});
+var n=require("@networkMocks/report/mockVariants/feature-testing/unprintable"),a=require("@networkMocks/report/mockVariants/feature-testing/emptyQuery");context("Bookmarks list",()=>{const i="/embedded/platform/";describe("check the default starting state",()=>{it("should have the default bookmarks from the caseload bookmark config",()=>{cy.task("resetStubs"),cy.task("resetRedis"),cy.task("stubDefinitions"),cy.task("stubGetProductCollections"),cy.task("stubDefinitionUnprintable"),cy.task("stubDefinitionEmptyReport"),cy.task("stubSingleSummaries"),cy.visit(i),cy.findByRole("tab",{name:/Bookmarks/}).click(),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2),cy.findByRole("link",{name:(t,e)=>e.href.includes(n.featureTestingUnprintable.id)}),cy.findByRole("link",{name:(t,e)=>e.href.includes(a.featureTestingEmptyQuery.id)})})})})}),describe("check other interactions",()=>{before(()=>{cy.task("resetStubs"),cy.task("stubDefinitions"),cy.task("resetRedis"),cy.task("stubGetProductCollections"),cy.task("stubSingleSummaries"),cy.task("stubDefinitionRequestExamplesSuccess"),cy.task("stubDefinitionUnprintable"),cy.task("stubDefinitionEmptyReport"),cy.task("stubListExampleDashboard"),cy.task("stubDefinitionMockReportVariant35"),cy.task("stubTestDashboard8"),cy.task("stubDefinitionFeatureTestingInteractive"),cy.task("stubDashboardSuccessResult20"),cy.task("stubRequestSuccessResult20"),cy.task("stubPollingReportEndpoint")}),beforeEach(()=>{cy.visit(i)}),describe("Bookmarking via the catalogue",()=>{describe("report",()=>{it("should add a bookmark to the bookmarks list",()=>{cy.findByRole("tab",{name:/Bookmarks/}).click(),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).click()})}),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3),cy.findAllByRole("row").contains("Interactive Report with async filters").should("exist")})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Remove bookmark/}).should("exist")})})}),it("should remove a bookmark to the bookmarks list",()=>{cy.findByRole("tab",{name:/Bookmarks/}).click(),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Remove bookmark/}).click()})}),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).should("exist")})})})}),describe("dashboard",()=>{it("should add a bookmark to the bookmarks list",()=>{cy.findByRole("tab",{name:/Bookmarks/}).click(),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Data quality data set")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).click()})}),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3),cy.findAllByRole("row").contains("Data quality data set").should("exist")})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Data quality data set")}).within(()=>{cy.findByRole("button",{name:/Remove bookmark/}).should("exist")})})}),it("should remove a bookmark from the bookmarks list",()=>{cy.findByRole("tab",{name:/Bookmarks/}).click(),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Data quality data set")}).within(()=>{cy.findByRole("button",{name:/Remove bookmark/}).click()})}),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Data quality data set")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).should("exist")})})})}),describe("missing report",()=>{it("should not be able to be bookmarked",()=>{cy.findByRole("tab",{name:/Bookmarks/}).click(),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Description for missing report 1")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).should("not.exist"),cy.findByRole("link",{name:/Request report/}).should("be.visible")})})})})}),describe("Removing via the user reports list",()=>{it("should remove a dashboard bookmark",()=>{cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Data quality data set")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).click()})}),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Data quality data set")}).within(()=>{cy.findByRole("button",{name:/Remove bookmark/}).click()})}),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2)})})}),it("should remove a report bookmark",()=>{cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).click()})}),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Remove bookmark/}).click()})}),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2)})})})}),describe("Bookmarking via the report",()=>{let t;before(()=>{cy.task("stubDefinitionFeatureTestingMissingDesc"),cy.task("stubReportsFinishedStatus"),cy.task("stubViewAsyncReportingResults"),cy.task("stubRequestSuccessReportTablesCount"),cy.visit(i),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(e,o)=>o.textContent.includes("Feature testing")&&o.textContent.includes("Missing variant description")&&o.textContent.includes("Example variants used for feature testing")}).within(()=>{cy.findByRole("link",{name:"Request report"}).click()})}),cy.findByRole("combobox",{name:/Field 2/}).select("Value 2.1"),cy.findByRole("button",{name:/Request report/}).click(),cy.findByRole("button",{name:/Enable download/}).should("be.visible"),cy.url().then(e=>{t=e})}),it("should add a bookmark",()=>{cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2)})}),cy.visit(t),cy.findByRole("button",{name:/Add bookmark/}).click(),cy.findByRole("button",{name:/Bookmarked/}).should("be.visible"),cy.visit(i),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3)})})}),it("should remove a bookmark",()=>{cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3)})}),cy.visit(t),cy.findByRole("button",{name:/Remove bookmark/}).click(),cy.findByRole("button",{name:/Bookmark removed/}),cy.visit(i),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2)})})})}),describe("Bookmarking via the dashboard",()=>{let t;before(()=>{cy.task("stubTestDashboard8"),cy.task("stubMockDashboardsStatusFinished"),cy.task("stubViewAsyncResults"),cy.task("stubDashboardSuccessResult20"),cy.visit(i),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(e,o)=>o.textContent.includes("Test Dashboard")&&o.textContent.includes("Dashboard used for testing testing")}).within(()=>{cy.findByRole("link",{name:"Request dashboard"}).click()})}),cy.findByRole("button",{name:/Request dashboard/}).click(),cy.url().then(e=>{t=e})}),it("should add a bookmark",()=>{cy.visit(t),cy.findByRole("button",{name:/Add bookmark/}).click().contains("Bookmarked"),cy.visit(i),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3)})})}),it("should remove a bookmark",()=>{cy.visit(i),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",3)})}),cy.visit(t),cy.findByRole("button",{name:/Remove bookmark/}).click().contains("Bookmark removed"),cy.visit(i),cy.findByLabelText(/Bookmarks.*/i).within(()=>{cy.findAllByRole("rowgroup").eq(1).within(()=>{cy.findAllByRole("row").should("have.length",2)})})})}),describe("bookmarking should be idempotent",()=>{it("should not change the bookmark status of an already bookmarked item",()=>{cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).click()})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.get("input").then(t=>{t.get(0).checked=!1,t.get(0).removeAttribute("checked")}),cy.get("input").invoke("attr","checked").should("equal",void 0)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Remove bookmark/}).click()})}),cy.reload(),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Remove bookmark/}).should("exist")})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Remove bookmark/}).click()})})}),it("should not change the bookmark status of an unbookmarked item",()=>{cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.get("input").then(t=>{t.get(0).checked=!0,t.get(0).setAttribute("checked","true")}),cy.get("input").invoke("attr","checked").should("not.equal",void 0).and("not.equal",!1)})}),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).click()})}),cy.reload(),cy.findByLabelText(/Reports catalogue.*/i).within(()=>{cy.findByRole("row",{name:(t,e)=>e.textContent.includes("Interactive Report with async filters")}).within(()=>{cy.findByRole("button",{name:/Add bookmark/}).should("exist")})})})})})});
 //# sourceMappingURL=tests.cy.js.map