@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.17.4 → 4.17.5

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

@@ -1,3 +1,5 @@
+import { expect, jest } from '@jest/globals'
+import { Url } from 'url'
 import { NextFunction, Request, Response } from 'express'
 import * as ReportListUtils from './utils'
 import { ListDataSources, RenderListWithDataInput, RenderListWithDefinitionInput } from './types'
@@ -14,15 +16,15 @@ jest.mock('parseurl', () => ({
   default: jest.fn().mockImplementation(() => ({ pathname: 'pathname', search: 'search' } as Url)),
 }))
 
-const getListWithWarnings = jest.fn().mockResolvedValue([''])
-const getDefinition = jest.fn().mockResolvedValue(ReportDefinition.singleVariantReport('test-variant'))
+const getListWithWarnings = jest.fn().mockImplementation(() => [''])
+const getDefinition = jest.fn().mockImplementation(() => ReportDefinition.singleVariantReport('test-variant'))
 
 jest.mock('../../data/reportingClient.ts', () => {
   return jest.fn().mockImplementation(() => {
     return {
       getDefinition,
       getListWithWarnings,
-      getCount: jest.fn().mockResolvedValue(''),
+      getCount: jest.fn().mockImplementation(() => ''),
     }
   })
 })
@@ -50,7 +52,7 @@ describe('ReportListUtils', () => {
       }),
     } as unknown as Response
 
-    next = ((error: Error) => {
+    next = ((_error: Error) => {
       //
     }) as unknown as NextFunction
   })

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

@@ -137,7 +137,7 @@ export const renderListWithDefinition = async ({
         fields,
         template: template as Template,
         queryParams: request.query,
-        definitionsPath: reportDef,
+        ...(reportDef && { definitionsPath: reportDef }),
       })
 
       if (!FiltersUtils.redirectWithDefaultFilters(reportQuery, variantDefinition, response, request)) {
@@ -184,7 +184,7 @@ export const renderListWithData = async ({
     fields,
     template: template as Template,
     queryParams: request.query,
-    definitionsPath: <string>request.query.dataProductDefinitionsPath,
+    definitionsPath: <string>request.query['dataProductDefinitionsPath'],
   })
 
   const listData = getListDataSources(reportQuery)
@@ -215,18 +215,18 @@ export const createReportListRequestHandler = ({
 }: CreateRequestHandlerInput): RequestHandler => {
   return (request: Request, response: Response, next: NextFunction) => {
     renderListWithDefinition({
-      title,
+      title: title || '',
       definitionName,
       variantName,
       request,
       response,
       next,
-      otherOptions,
       layoutTemplate,
       token: tokenProvider(request, response, next),
       apiUrl,
       apiTimeout,
-      definitionsPath,
+      ...(otherOptions && { otherOptions }),
+      ...(definitionsPath && { definitionsPath }),
     })
   }
 }

package/dpr/components/show-more/utils.js

@@ -1,4 +1,4 @@
-var n=Object.defineProperty;var d=Object.getOwnPropertyDescriptor;var i=Object.getOwnPropertyNames;var h=Object.prototype.hasOwnProperty;var c=(e,t)=>{for(var o in t)n(e,o,{get:t[o],enumerable:!0})},g=(e,t,o,s)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of i(t))!h.call(e,r)&&r!==o&&n(e,r,{get:()=>t[r],enumerable:!(s=d(t,r))||s.enumerable});return e};var l=e=>g(n({},"__esModule",{value:!0}),e);var m={};c(m,{createShowMoreHtml:()=>a,default:()=>p});module.exports=l(m);const a=(e,t)=>{const o=e?e.replace(/"/g,"'"):"";return`<div class="dpr-show-more" data-content="${o}" data-dpr-module="show-more" data-length="${t||100}">
+"use strict";var n=Object.defineProperty;var d=Object.getOwnPropertyDescriptor;var i=Object.getOwnPropertyNames;var h=Object.prototype.hasOwnProperty;var c=(e,t)=>{for(var o in t)n(e,o,{get:t[o],enumerable:!0})},g=(e,t,o,s)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of i(t))!h.call(e,r)&&r!==o&&n(e,r,{get:()=>t[r],enumerable:!(s=d(t,r))||s.enumerable});return e};var l=e=>g(n({},"__esModule",{value:!0}),e);var m={};c(m,{createShowMoreHtml:()=>a,default:()=>p});module.exports=l(m);const a=(e,t)=>{const o=e?e.replace(/"/g,"'"):"";return`<div class="dpr-show-more" data-content="${o}" data-dpr-module="show-more" data-length="${t||100}">
     <p class='dpr-show-more-content govuk-body-s'>${o}</p><a class="dpr-show-hide-button govuk-link--no-visited-state" href="#">show more</a>
 </div>`};var p={createShowMoreHtml:a};0&&(module.exports={createShowMoreHtml});
 //# sourceMappingURL=utils.js.map

package/dpr/components/show-more/utils.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../src/dpr/components/show-more/utils.ts"],
   "sourcesContent": ["export const createShowMoreHtml = (text: string, length?: number) => {\n  const sanitizedString = text ? text.replace(/\"/g, \"'\") : ''\n  const stringLength = length || 100\n\n  return `<div class=\"dpr-show-more\" data-content=\"${sanitizedString}\" data-dpr-module=\"show-more\" data-length=\"${stringLength}\">\n    <p class='dpr-show-more-content govuk-body-s'>${sanitizedString}</p><a class=\"dpr-show-hide-button govuk-link--no-visited-state\" href=\"#\">show more</a>\n</div>`\n}\n\nexport default {\n  createShowMoreHtml,\n}\n"],
-  "mappings": "4ZAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,wBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAO,MAAME,EAAqB,CAACG,EAAcC,IAAoB,CACnE,MAAMC,EAAkBF,EAAOA,EAAK,QAAQ,KAAM,GAAG,EAAI,GAGzD,MAAO,4CAA4CE,CAAe,8CAF7CD,GAAU,GAE6F;AAAA,oDAC1EC,CAAe;AAAA,OAEnE,EAEA,IAAOJ,EAAQ,CACb,mBAAAD,CACF",
+  "mappings": "yaAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,wBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAO,MAAME,EAAqB,CAACG,EAAcC,IAAoB,CACnE,MAAMC,EAAkBF,EAAOA,EAAK,QAAQ,KAAM,GAAG,EAAI,GAGzD,MAAO,4CAA4CE,CAAe,8CAF7CD,GAAU,GAE6F;AAAA,oDAC1EC,CAAe;AAAA,OAEnE,EAEA,IAAOJ,EAAQ,CACb,mBAAAD,CACF",
   "names": ["utils_exports", "__export", "createShowMoreHtml", "utils_default", "__toCommonJS", "text", "length", "sanitizedString"]
 }

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

@@ -1,2 +1,2 @@
-var N=Object.create;var B=Object.defineProperty;var A=Object.getOwnPropertyDescriptor;var L=Object.getOwnPropertyNames;var M=Object.getPrototypeOf,O=Object.prototype.hasOwnProperty;var F=(e,t)=>{for(var o in t)B(e,o,{get:t[o],enumerable:!0})},v=(e,t,o,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of L(t))!O.call(e,r)&&r!==o&&B(e,r,{get:()=>t[r],enumerable:!(i=A(t,r))||i.enumerable});return e};var S=(e,t,o)=>(o=e!=null?N(M(e)):{},v(t||!e||!e.__esModule?B(o,"default",{value:e,enumerable:!0}):o,e)),V=e=>v(B({},"__esModule",{value:!0}),e);var $={};F($,{default:()=>_,formatBookmark:()=>x,formatBookmarks:()=>I,renderBookmarkList:()=>C});module.exports=V($);var d=require("../../../types/UserReports"),w=S(require("../../show-more/utils")),q=S(require("../../../utils/logger")),P=S(require("../../../utils/definitionUtils")),l=require("../../../utils/reportListsHelper"),b=S(require("../../../utils/localsHelper"));const I=async e=>e.map(t=>x(t)).sort((t,o)=>t.text.localeCompare(o.text)),x=e=>{const t=JSON.parse(JSON.stringify(e)),{id:o,name:i,description:r,href:m,reportName:n,type:p}=t;return{id:o,reportName:n,text:i,description:r,href:m,type:p}},E=async(e,t,o,i,r)=>{const m=await t.getState(i),n=await Promise.all(e.sort((p,a)=>p.name.localeCompare(a.name)).map(async p=>J(p,t,o,m)));return{rows:r?n.slice(0,r):n,head:[{text:"Product",classes:"dpr-req-product-head"},{text:"Description",classes:"dpr-bm-description-head"},{text:"Actions",classes:"dpr-bm-actions-head"}]}},J=async(e,t,o,i)=>{const{description:r,reportName:m,reportId:n,id:p,href:a,name:s,type:c,loadType:f}=e,u=await t.createBookMarkToggleHtml({userConfig:i,reportId:n,id:p,csrfToken:o,ctxId:"bookmark-list",reportType:c,isMissing:!1});return[{html:(0,l.createListItemProduct)(m,s,c)},{html:w.default.createShowMoreHtml(r),classes:"dpr-req-cell"},{html:(0,l.createListActions)(a,c,f,u),classes:"dpr-req-cell dpr-req-cell__status"}]},Y=async(e,t,o,i,r)=>{const m=[],{definitionsPath:n}=b.default.getValues(o);return await Promise.all(e.map(async p=>{let a;const{reportId:s,variantId:c,id:f,automatic:u,type:y}=p,k=c||f,R=y||d.ReportType.REPORT;try{let g,D,T,h=d.LoadType.ASYNC;const U=(0,l.setInitialHref)(h,R,s,k,o);if(R===d.ReportType.REPORT&&(a=await r.reportingService.getDefinition(i,s,k,n),T=a.name,g=a.variant.name,D=a.variant.description||a.description,h=a.variant.loadType||h),R===d.ReportType.DASHBOARD){const H=await P.default.getReportSummary(s,r.reportingService,i,n);a=await r.dashboardService.getDefinition(i,s,k,n),g=a.name,T=H.name,D=a.description}a&&m.push({reportId:s,id:k,reportName:T,name:g,description:D,type:R,href:U,loadType:h,automatic:u})}catch{q.default.warn(`Failed to map bookmark for: Report ${s}, variant ${k}`);const{dprUser:D}=b.default.getValues(o);await r.bookmarkService.removeBookmark(D.id,k,s)}})),m},C=async({services:e,maxRows:t=20,res:o,req:i})=>{const{token:r,csrfToken:m,dprUser:n,bookmarks:p}=b.default.getValues(o),a=await Y(p,i,o,r,e);let s=await I(a);const c=s.length;t&&(s=s.slice(0,t));const f=await E(a,e.bookmarkService,m,n.id,t),u={...s.length&&{href:"/dpr/my-reports/bookmarks/list"},...!s.length&&{emptyMessage:"You have 0 bookmarked reports"}},y={amount:c,shown:c>t?t:c,max:t};return{head:u,tableData:f,total:y,csrfToken:m,type:"bookmark"}};var _={renderBookmarkList:C};0&&(module.exports={formatBookmark,formatBookmarks,renderBookmarkList});
+"use strict";var N=Object.create;var g=Object.defineProperty;var A=Object.getOwnPropertyDescriptor;var M=Object.getOwnPropertyNames;var O=Object.getPrototypeOf,q=Object.prototype.hasOwnProperty;var F=(o,t)=>{for(var e in t)g(o,e,{get:t[e],enumerable:!0})},R=(o,t,e,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let a of M(t))!q.call(o,a)&&a!==e&&g(o,a,{get:()=>t[a],enumerable:!(i=A(t,a))||i.enumerable});return o};var B=(o,t,e)=>(e=o!=null?N(O(o)):{},R(t||!o||!o.__esModule?g(e,"default",{value:o,enumerable:!0}):e,o)),U=o=>R(g({},"__esModule",{value:!0}),o);var _={};F(_,{default:()=>Y,formatBookmark:()=>P,formatBookmarks:()=>w,renderBookmarkList:()=>x});module.exports=U(_);var l=require("../../../types/UserReports"),b=B(require("../../show-more/utils")),T=B(require("../../../utils/logger")),v=B(require("../../../utils/definitionUtils")),f=require("../../../utils/reportListsHelper"),S=B(require("../../../utils/localsHelper"));const w=async o=>o.map(t=>P(t)).sort((t,e)=>t.text.localeCompare(e.text)),P=o=>{const t=JSON.parse(JSON.stringify(o)),{id:e,name:i,description:a,href:n,reportName:p,type:r}=t;return{id:e,reportName:p,text:i,description:a,href:n,type:r}},V=async(o,t,e,i,a)=>{const n=await t.getState(i),p=await Promise.all(o.sort((r,s)=>r.name.localeCompare(s.name)).map(async r=>E(r,t,e,n)));return{rows:a?p.slice(0,a):p,head:[{text:"Product",classes:"dpr-req-product-head"},{text:"Description",classes:"dpr-bm-description-head"},{text:"Actions",classes:"dpr-bm-actions-head"}]}},E=async(o,t,e,i)=>{const{description:a,reportName:n,reportId:p,id:r,href:s,name:m,type:k,loadType:d}=o,c=await t.createBookMarkToggleHtml({userConfig:i,reportId:p,id:r,csrfToken:e,ctxId:"bookmark-list",reportType:k,isMissing:!1});return[{html:(0,f.createListItemProduct)(n,m,k)},{html:b.default.createShowMoreHtml(a),classes:"dpr-req-cell"},{html:(0,f.createListActions)(s,k,d,c),classes:"dpr-req-cell dpr-req-cell__status"}]},J=async(o,t,e,i)=>{const a=[],{definitionsPath:n}=S.default.getValues(t);return await Promise.all(o.map(async p=>{let r;const{reportId:s,id:m,automatic:k,type:d}=p,c=d||l.ReportType.REPORT;try{let y="",u="",D=l.LoadType.ASYNC;const C=(0,f.setInitialHref)(D,c,s,m,t),h=await v.default.getReportSummary(s,i.reportingService,e,n),H=h.name;if(c===l.ReportType.REPORT){const I=h.variants.find(L=>L.id===m);r=await i.reportingService.getDefinition(e,s,m,n),y=r.variant.name,u=r.variant.description||r.description||"",D=I?.loadType||D}c===l.ReportType.DASHBOARD&&(r=await i.dashboardService.getDefinition(e,s,m,n),y=r.name,u=r.description||""),r&&a.push({reportId:s,id:m,reportName:H,name:y,description:u,type:c,href:C,loadType:D,automatic:k})}catch{T.default.warn(`Failed to map bookmark for: Report ${s}, variant ${m}`);const{dprUser:u}=S.default.getValues(t);await i.bookmarkService.removeBookmark(u.id,m,s)}})),a},x=async({services:o,maxRows:t=20,res:e})=>{const{token:i,csrfToken:a,dprUser:n,bookmarks:p}=S.default.getValues(e),r=await J(p,e,i,o);let s=await w(r);const m=s.length;t&&(s=s.slice(0,t));const k=await V(r,o.bookmarkService,a,n.id,t),d={...s.length&&{href:"/dpr/my-reports/bookmarks/list"},...!s.length&&{emptyMessage:"You have 0 bookmarked reports"}},c={amount:m,shown:m>t?t:m,max:t};return{head:d,tableData:k,total:c,csrfToken:a,type:"bookmark"}};var Y={renderBookmarkList:x};0&&(module.exports={formatBookmark,formatBookmarks,renderBookmarkList});
 //# sourceMappingURL=utils.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/components/user-reports/bookmarks/utils.ts"],
-  "sourcesContent": ["import { Response, Request } from 'express'\nimport { BookmarkService } from '../../../services'\nimport { BookmarkedReportData, BookmarkStoreData } from '../../../types/Bookmark'\nimport { FormattedUserReportData, LoadType, ReportType } from '../../../types/UserReports'\nimport { Services } from '../../../types/Services'\nimport ShowMoreUtils from '../../show-more/utils'\nimport logger from '../../../utils/logger'\nimport DefinitionUtils from '../../../utils/definitionUtils'\nimport { createListItemProduct, createListActions, setInitialHref } from '../../../utils/reportListsHelper'\nimport LocalsHelper from '../../../utils/localsHelper'\nimport { ReportStoreConfig } from '../../../types/ReportStore'\n\nexport const formatBookmarks = async (bookmarksData: BookmarkedReportData[]): Promise<FormattedUserReportData[]> => {\n  return bookmarksData\n    .map((report: BookmarkedReportData) => {\n      return formatBookmark(report)\n    })\n    .sort((a, b) => a.text.localeCompare(b.text))\n}\n\nexport const formatBookmark = (bookmarkData: BookmarkedReportData): FormattedUserReportData => {\n  const reportData: BookmarkedReportData = JSON.parse(JSON.stringify(bookmarkData))\n  const { id, name, description, href, reportName, type } = reportData\n\n  return {\n    id,\n    reportName,\n    text: name,\n    description,\n    href,\n    type: type as ReportType,\n  }\n}\n\nconst formatTable = async (\n  bookmarksData: BookmarkedReportData[],\n  bookmarkService: BookmarkService,\n  csrfToken: string,\n  userId: string,\n  maxRows?: number,\n) => {\n  const userConfig = await bookmarkService.getState(userId)\n  const rows = await Promise.all(\n    bookmarksData\n      .sort((a, b) => a.name.localeCompare(b.name))\n      .map(async (bookmark: BookmarkedReportData) => {\n        return formatTableData(bookmark, bookmarkService, csrfToken, userConfig)\n      }),\n  )\n\n  return {\n    rows: maxRows ? rows.slice(0, maxRows) : rows,\n    head: [\n      { text: 'Product', classes: 'dpr-req-product-head' },\n      { text: 'Description', classes: 'dpr-bm-description-head' },\n      { text: 'Actions', classes: 'dpr-bm-actions-head' },\n    ],\n  }\n}\n\nconst formatTableData = async (\n  bookmarksData: BookmarkedReportData,\n  bookmarkService: BookmarkService,\n  csrfToken: string,\n  userConfig: ReportStoreConfig,\n) => {\n  const { description, reportName, reportId, id, href, name, type, loadType } = bookmarksData\n  const bookmarkHtml = await bookmarkService.createBookMarkToggleHtml({\n    userConfig,\n    reportId,\n    id,\n    csrfToken,\n    ctxId: 'bookmark-list',\n    reportType: type,\n    // We don't have the data here, and missing reports should never get into bookmarked, viewed or requested\n    isMissing: false,\n  })\n  return [\n    {\n      html: createListItemProduct(reportName, name, type),\n    },\n    { html: ShowMoreUtils.createShowMoreHtml(description), classes: 'dpr-req-cell' },\n    {\n      html: createListActions(href, type, loadType, bookmarkHtml),\n      classes: 'dpr-req-cell dpr-req-cell__status',\n    },\n  ]\n}\n\nconst mapBookmarkIdsToDefinition = async (\n  bookmarks: BookmarkStoreData[],\n  req: Request,\n  res: Response,\n  token: string,\n  services: Services,\n): Promise<BookmarkedReportData[]> => {\n  const bookmarkData: BookmarkedReportData[] = []\n  const { definitionsPath } = LocalsHelper.getValues(res)\n\n  await Promise.all(\n    bookmarks.map(async (bookmark) => {\n      let definition\n      const { reportId, variantId, id, automatic, type } = bookmark\n      const bookmarkId = variantId || id\n      const reportType: ReportType = type ? (type as ReportType) : ReportType.REPORT\n\n      try {\n        let name\n        let description\n        let reportName\n        let loadType = LoadType.ASYNC\n        const href = setInitialHref(loadType, reportType, reportId, bookmarkId, res)\n\n        if (reportType === ReportType.REPORT) {\n          definition = await services.reportingService.getDefinition(token, reportId, bookmarkId, definitionsPath)\n          reportName = definition.name\n          name = definition.variant.name\n          description = definition.variant.description || definition.description\n          loadType = definition.variant.loadType || loadType\n        }\n\n        if (reportType === ReportType.DASHBOARD) {\n          const reportDefinition = await DefinitionUtils.getReportSummary(\n            reportId,\n            services.reportingService,\n            token,\n            definitionsPath,\n          )\n\n          definition = await services.dashboardService.getDefinition(token, reportId, bookmarkId, definitionsPath)\n          name = definition.name\n          reportName = reportDefinition.name\n          description = definition.description\n        }\n\n        if (definition) {\n          bookmarkData.push({\n            reportId,\n            id: bookmarkId,\n            reportName,\n            name,\n            description,\n            type: reportType,\n            href,\n            loadType,\n            automatic,\n          })\n        }\n      } catch (error) {\n        // DPD has been deleted so API throws error\n        logger.warn(`Failed to map bookmark for: Report ${reportId}, variant ${bookmarkId}`)\n        const { dprUser } = LocalsHelper.getValues(res)\n        await services.bookmarkService.removeBookmark(dprUser.id, bookmarkId, reportId)\n      }\n    }),\n  )\n  return bookmarkData\n}\n\nexport const renderBookmarkList = async ({\n  services,\n  maxRows = 20,\n  res,\n  req,\n}: {\n  services: Services\n  maxRows?: number\n  res: Response\n  req: Request\n}) => {\n  const { token, csrfToken, dprUser, bookmarks } = LocalsHelper.getValues(res)\n  const bookmarksData: BookmarkedReportData[] = await mapBookmarkIdsToDefinition(bookmarks, req, res, token, services)\n\n  let formatted = await formatBookmarks(bookmarksData)\n  const formattedCount = formatted.length\n\n  if (maxRows) formatted = formatted.slice(0, maxRows)\n  const tableData = await formatTable(bookmarksData, services.bookmarkService, csrfToken, dprUser.id, maxRows)\n\n  const head = {\n    ...(formatted.length && { href: '/dpr/my-reports/bookmarks/list' }),\n    ...(!formatted.length && { emptyMessage: 'You have 0 bookmarked reports' }),\n  }\n\n  const total = {\n    amount: formattedCount,\n    shown: formattedCount > maxRows ? maxRows : formattedCount,\n    max: maxRows,\n  }\n\n  const result = {\n    head,\n    tableData,\n    total,\n    csrfToken,\n    type: 'bookmark',\n  }\n\n  return result\n}\n\nexport default {\n  renderBookmarkList,\n}\n"],
-  "mappings": "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",
-  "names": ["utils_exports", "__export", "utils_default", "formatBookmark", "formatBookmarks", "renderBookmarkList", "__toCommonJS", "import_UserReports", "import_utils", "import_logger", "import_definitionUtils", "import_reportListsHelper", "import_localsHelper", "bookmarksData", "report", "a", "b", "bookmarkData", "reportData", "id", "name", "description", "href", "reportName", "type", "formatTable", "bookmarkService", "csrfToken", "userId", "maxRows", "userConfig", "rows", "bookmark", "formatTableData", "reportId", "loadType", "bookmarkHtml", "ShowMoreUtils", "mapBookmarkIdsToDefinition", "bookmarks", "req", "res", "token", "services", "definitionsPath", "LocalsHelper", "definition", "variantId", "automatic", "bookmarkId", "reportType", "reportDefinition", "DefinitionUtils", "logger", "dprUser", "formatted", "formattedCount", "tableData", "head", "total"]
+  "sourcesContent": ["import { Response } from 'express'\nimport { BookmarkService } from '../../../services'\nimport { BookmarkedReportData, BookmarkStoreData } from '../../../types/Bookmark'\nimport { FormattedBookmarkData, LoadType, ReportType } from '../../../types/UserReports'\nimport { Services } from '../../../types/Services'\nimport ShowMoreUtils from '../../show-more/utils'\nimport logger from '../../../utils/logger'\nimport DefinitionUtils from '../../../utils/definitionUtils'\nimport { createListItemProduct, createListActions, setInitialHref } from '../../../utils/reportListsHelper'\nimport LocalsHelper from '../../../utils/localsHelper'\nimport { ReportStoreConfig } from '../../../types/ReportStore'\n\nexport const formatBookmarks = async (bookmarksData: BookmarkedReportData[]): Promise<FormattedBookmarkData[]> => {\n  return bookmarksData\n    .map((report: BookmarkedReportData) => {\n      return formatBookmark(report)\n    })\n    .sort((a, b) => a.text.localeCompare(b.text))\n}\n\nexport const formatBookmark = (bookmarkData: BookmarkedReportData): FormattedBookmarkData => {\n  const reportData: BookmarkedReportData = JSON.parse(JSON.stringify(bookmarkData))\n  const { id, name, description, href, reportName, type } = reportData\n\n  return {\n    id,\n    reportName,\n    text: name,\n    description,\n    href,\n    type: type as ReportType,\n  }\n}\n\nconst formatTable = async (\n  bookmarksData: BookmarkedReportData[],\n  bookmarkService: BookmarkService,\n  csrfToken: string,\n  userId: string,\n  maxRows?: number,\n) => {\n  const userConfig = await bookmarkService.getState(userId)\n  const rows = await Promise.all(\n    bookmarksData\n      .sort((a, b) => a.name.localeCompare(b.name))\n      .map(async (bookmark: BookmarkedReportData) => {\n        return formatTableData(bookmark, bookmarkService, csrfToken, userConfig)\n      }),\n  )\n\n  return {\n    rows: maxRows ? rows.slice(0, maxRows) : rows,\n    head: [\n      { text: 'Product', classes: 'dpr-req-product-head' },\n      { text: 'Description', classes: 'dpr-bm-description-head' },\n      { text: 'Actions', classes: 'dpr-bm-actions-head' },\n    ],\n  }\n}\n\nconst formatTableData = async (\n  bookmarksData: BookmarkedReportData,\n  bookmarkService: BookmarkService,\n  csrfToken: string,\n  userConfig: ReportStoreConfig,\n) => {\n  const { description, reportName, reportId, id, href, name, type, loadType } = bookmarksData\n  const bookmarkHtml = await bookmarkService.createBookMarkToggleHtml({\n    userConfig,\n    reportId,\n    id,\n    csrfToken,\n    ctxId: 'bookmark-list',\n    reportType: type,\n    // We don't have the data here, and missing reports should never get into bookmarked, viewed or requested\n    isMissing: false,\n  })\n  return [\n    {\n      html: createListItemProduct(reportName, name, type),\n    },\n    { html: ShowMoreUtils.createShowMoreHtml(description), classes: 'dpr-req-cell' },\n    {\n      html: createListActions(href, type, loadType, bookmarkHtml),\n      classes: 'dpr-req-cell dpr-req-cell__status',\n    },\n  ]\n}\n\nconst mapBookmarkIdsToDefinition = async (\n  bookmarks: BookmarkStoreData[],\n  res: Response,\n  token: string,\n  services: Services,\n): Promise<BookmarkedReportData[]> => {\n  const bookmarkData: BookmarkedReportData[] = []\n  const { definitionsPath } = LocalsHelper.getValues(res)\n\n  await Promise.all(\n    bookmarks.map(async (bookmark) => {\n      let definition\n      const { reportId, id, automatic, type } = bookmark\n      const reportType: ReportType = type ? (type as ReportType) : ReportType.REPORT\n\n      try {\n        let name = ''\n        let description = ''\n        let loadType = LoadType.ASYNC\n        const href = setInitialHref(loadType, reportType, reportId, id, res)\n\n        const procuctSummary = await DefinitionUtils.getReportSummary(\n          reportId,\n          services.reportingService,\n          token,\n          definitionsPath,\n        )\n        const reportName = procuctSummary.name\n\n        if (reportType === ReportType.REPORT) {\n          const variantSummary = procuctSummary.variants.find((v) => v.id === id)\n          definition = await services.reportingService.getDefinition(token, reportId, id, definitionsPath)\n          name = definition.variant.name\n          description = definition.variant.description || definition.description || ''\n          loadType = (variantSummary?.loadType as LoadType) || loadType\n        }\n\n        if (reportType === ReportType.DASHBOARD) {\n          definition = await services.dashboardService.getDefinition(token, reportId, id, definitionsPath)\n          name = definition.name\n          description = definition.description || ''\n        }\n\n        if (definition) {\n          bookmarkData.push({\n            reportId,\n            id,\n            reportName,\n            name,\n            description,\n            type: reportType,\n            href,\n            loadType,\n            automatic,\n          })\n        }\n      } catch (error) {\n        // DPD has been deleted so API throws error\n        logger.warn(`Failed to map bookmark for: Report ${reportId}, variant ${id}`)\n        const { dprUser } = LocalsHelper.getValues(res)\n        await services.bookmarkService.removeBookmark(dprUser.id, id, reportId)\n      }\n    }),\n  )\n  return bookmarkData\n}\n\nexport const renderBookmarkList = async ({\n  services,\n  maxRows = 20,\n  res,\n}: {\n  services: Services\n  maxRows?: number\n  res: Response\n}) => {\n  const { token, csrfToken, dprUser, bookmarks } = LocalsHelper.getValues(res)\n  const bookmarksData: BookmarkedReportData[] = await mapBookmarkIdsToDefinition(bookmarks, res, token, services)\n\n  let formatted = await formatBookmarks(bookmarksData)\n  const formattedCount = formatted.length\n\n  if (maxRows) formatted = formatted.slice(0, maxRows)\n  const tableData = await formatTable(bookmarksData, services.bookmarkService, csrfToken, dprUser.id, maxRows)\n\n  const head = {\n    ...(formatted.length && { href: '/dpr/my-reports/bookmarks/list' }),\n    ...(!formatted.length && { emptyMessage: 'You have 0 bookmarked reports' }),\n  }\n\n  const total = {\n    amount: formattedCount,\n    shown: formattedCount > maxRows ? maxRows : formattedCount,\n    max: maxRows,\n  }\n\n  const result = {\n    head,\n    tableData,\n    total,\n    csrfToken,\n    type: 'bookmark',\n  }\n\n  return result\n}\n\nexport default {\n  renderBookmarkList,\n}\n"],
+  "mappings": "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",
+  "names": ["utils_exports", "__export", "utils_default", "formatBookmark", "formatBookmarks", "renderBookmarkList", "__toCommonJS", "import_UserReports", "import_utils", "import_logger", "import_definitionUtils", "import_reportListsHelper", "import_localsHelper", "bookmarksData", "report", "a", "b", "bookmarkData", "reportData", "id", "name", "description", "href", "reportName", "type", "formatTable", "bookmarkService", "csrfToken", "userId", "maxRows", "userConfig", "rows", "bookmark", "formatTableData", "reportId", "loadType", "bookmarkHtml", "ShowMoreUtils", "mapBookmarkIdsToDefinition", "bookmarks", "res", "token", "services", "definitionsPath", "LocalsHelper", "definition", "automatic", "reportType", "procuctSummary", "DefinitionUtils", "variantSummary", "v", "logger", "dprUser", "formatted", "formattedCount", "tableData", "head", "total"]
 }

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

@@ -1,4 +1,5 @@
-import { Response, Request } from 'express'
+import { expect, jest } from '@jest/globals'
+import { Response } from 'express'
 import { Services } from '../../../types/Services'
 import BookmarkUtils from './utils'
 import type BookmarkService from '../../../routes/journeys/my-reports/bookmarks/service'
@@ -11,7 +12,6 @@ import dashboardDefinitions from '../../../../../test-app/mocks/mockClients/dash
 describe('BookmarkUtils', () => {
   let services: Services
   let res: Response
-  let req: Request
   let bookmarkService: BookmarkService
   let reportingService: ReportingService
   let dashboardService: DashboardService
@@ -30,13 +30,9 @@ describe('BookmarkUtils', () => {
         },
       } as unknown as Response
 
-      req = {
-        query: {},
-      } as unknown as Request
-
       bookmarkService = {
-        getAllBookmarks: jest.fn().mockResolvedValue([{ reportId: 'test-report-1', variantId: 'test-variant-1' }]),
-        createBookMarkToggleHtml: jest.fn().mockResolvedValue('<p>Bookmark toggle</p>'),
+        getAllBookmarks: jest.fn().mockReturnValueOnce([{ reportId: 'test-report-1', variantId: 'test-variant-1' }]),
+        createBookMarkToggleHtml: jest.fn().mockReturnValueOnce('<p>Bookmark toggle</p>'),
         getState: jest.fn(),
       } as unknown as BookmarkService
 
@@ -48,11 +44,19 @@ describe('BookmarkUtils', () => {
       }
 
       reportingService = {
-        getDefinition: jest.fn().mockResolvedValue(mockDefinition),
+        getDefinition: jest.fn().mockReturnValueOnce(mockDefinition),
+        getDefinitionSummary: jest.fn().mockReturnValueOnce({
+          id: 'reportId',
+          name: 'reportName',
+          description: 'description',
+          variants: [variant1],
+        }),
       } as unknown as ReportingService
 
       dashboardService = {
-        getDefinition: jest.fn().mockResolvedValue(dashboardDefinitions[0]),
+        getDefinition: jest
+          .fn()
+          .mockReturnValueOnce(<components['schemas']['DashboardDefinition']>dashboardDefinitions.mockDashboards[0]),
       } as unknown as DashboardService
 
       services = {
@@ -67,7 +71,6 @@ describe('BookmarkUtils', () => {
         services,
         maxRows: 10,
         res,
-        req,
       })
 
       expect(result.tableData.rows.length).toEqual(1)

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

@@ -1,7 +1,7 @@
-import { Response, Request } from 'express'
+import { Response } from 'express'
 import { BookmarkService } from '../../../services'
 import { BookmarkedReportData, BookmarkStoreData } from '../../../types/Bookmark'
-import { FormattedUserReportData, LoadType, ReportType } from '../../../types/UserReports'
+import { FormattedBookmarkData, LoadType, ReportType } from '../../../types/UserReports'
 import { Services } from '../../../types/Services'
 import ShowMoreUtils from '../../show-more/utils'
 import logger from '../../../utils/logger'
@@ -10,7 +10,7 @@ import { createListItemProduct, createListActions, setInitialHref } from '../../
 import LocalsHelper from '../../../utils/localsHelper'
 import { ReportStoreConfig } from '../../../types/ReportStore'
 
-export const formatBookmarks = async (bookmarksData: BookmarkedReportData[]): Promise<FormattedUserReportData[]> => {
+export const formatBookmarks = async (bookmarksData: BookmarkedReportData[]): Promise<FormattedBookmarkData[]> => {
   return bookmarksData
     .map((report: BookmarkedReportData) => {
       return formatBookmark(report)
@@ -18,7 +18,7 @@ export const formatBookmarks = async (bookmarksData: BookmarkedReportData[]): Pr
     .sort((a, b) => a.text.localeCompare(b.text))
 }
 
-export const formatBookmark = (bookmarkData: BookmarkedReportData): FormattedUserReportData => {
+export const formatBookmark = (bookmarkData: BookmarkedReportData): FormattedBookmarkData => {
   const reportData: BookmarkedReportData = JSON.parse(JSON.stringify(bookmarkData))
   const { id, name, description, href, reportName, type } = reportData
 
@@ -89,7 +89,6 @@ const formatTableData = async (
 
 const mapBookmarkIdsToDefinition = async (
   bookmarks: BookmarkStoreData[],
-  req: Request,
   res: Response,
   token: string,
   services: Services,
@@ -100,43 +99,41 @@ const mapBookmarkIdsToDefinition = async (
   await Promise.all(
     bookmarks.map(async (bookmark) => {
       let definition
-      const { reportId, variantId, id, automatic, type } = bookmark
-      const bookmarkId = variantId || id
+      const { reportId, id, automatic, type } = bookmark
       const reportType: ReportType = type ? (type as ReportType) : ReportType.REPORT
 
       try {
-        let name
-        let description
-        let reportName
+        let name = ''
+        let description = ''
         let loadType = LoadType.ASYNC
-        const href = setInitialHref(loadType, reportType, reportId, bookmarkId, res)
+        const href = setInitialHref(loadType, reportType, reportId, id, res)
+
+        const procuctSummary = await DefinitionUtils.getReportSummary(
+          reportId,
+          services.reportingService,
+          token,
+          definitionsPath,
+        )
+        const reportName = procuctSummary.name
 
         if (reportType === ReportType.REPORT) {
-          definition = await services.reportingService.getDefinition(token, reportId, bookmarkId, definitionsPath)
-          reportName = definition.name
+          const variantSummary = procuctSummary.variants.find((v) => v.id === id)
+          definition = await services.reportingService.getDefinition(token, reportId, id, definitionsPath)
           name = definition.variant.name
-          description = definition.variant.description || definition.description
-          loadType = definition.variant.loadType || loadType
+          description = definition.variant.description || definition.description || ''
+          loadType = (variantSummary?.loadType as LoadType) || loadType
         }
 
         if (reportType === ReportType.DASHBOARD) {
-          const reportDefinition = await DefinitionUtils.getReportSummary(
-            reportId,
-            services.reportingService,
-            token,
-            definitionsPath,
-          )
-
-          definition = await services.dashboardService.getDefinition(token, reportId, bookmarkId, definitionsPath)
+          definition = await services.dashboardService.getDefinition(token, reportId, id, definitionsPath)
           name = definition.name
-          reportName = reportDefinition.name
-          description = definition.description
+          description = definition.description || ''
         }
 
         if (definition) {
           bookmarkData.push({
             reportId,
-            id: bookmarkId,
+            id,
             reportName,
             name,
             description,
@@ -148,9 +145,9 @@ const mapBookmarkIdsToDefinition = async (
         }
       } catch (error) {
         // DPD has been deleted so API throws error
-        logger.warn(`Failed to map bookmark for: Report ${reportId}, variant ${bookmarkId}`)
+        logger.warn(`Failed to map bookmark for: Report ${reportId}, variant ${id}`)
         const { dprUser } = LocalsHelper.getValues(res)
-        await services.bookmarkService.removeBookmark(dprUser.id, bookmarkId, reportId)
+        await services.bookmarkService.removeBookmark(dprUser.id, id, reportId)
       }
     }),
   )
@@ -161,15 +158,13 @@ export const renderBookmarkList = async ({
   services,
   maxRows = 20,
   res,
-  req,
 }: {
   services: Services
   maxRows?: number
   res: Response
-  req: Request
 }) => {
   const { token, csrfToken, dprUser, bookmarks } = LocalsHelper.getValues(res)
-  const bookmarksData: BookmarkedReportData[] = await mapBookmarkIdsToDefinition(bookmarks, req, res, token, services)
+  const bookmarksData: BookmarkedReportData[] = await mapBookmarkIdsToDefinition(bookmarks, res, token, services)
 
   let formatted = await formatBookmarks(bookmarksData)
   const formattedCount = formatted.length

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

@@ -1,2 +1,2 @@
-var d=Object.create;var u=Object.defineProperty;var S=Object.getOwnPropertyDescriptor;var f=Object.getOwnPropertyNames;var q=Object.getPrototypeOf,l=Object.prototype.hasOwnProperty;var g=(e,t)=>{for(var s in t)u(e,s,{get:t[s],enumerable:!0})},i=(e,t,s,o)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of f(t))!l.call(e,r)&&r!==s&&u(e,r,{get:()=>t[r],enumerable:!(o=S(t,r))||o.enumerable});return e};var x=(e,t,s)=>(s=e!=null?d(q(e)):{},i(t||!e||!e.__esModule?u(s,"default",{value:e,enumerable:!0}):s,e)),w=e=>i(u({},"__esModule",{value:!0}),e);var y={};g(y,{default:()=>v,filterReports:()=>c,getRequestStatus:()=>n});module.exports=w(y);var R=require("../../../utils/requestStatusHelper"),m=x(require("../../../utils/localsHelper"));const n=async({req:e,res:t,services:s})=>{const{executionId:o,status:r}=e.body,{dprUser:p}=m.default.getValues(t),a=await(0,R.getStatus)({req:e,res:t,services:s});return r!==a.status&&(await s.requestedReportService.updateStatus(o,p.id,a.status,a.errorMessage),a.reportData=await s.requestedReportService.getReportByExecutionId(o,p.id)),a},c=e=>e.timestamp?!e.timestamp.lastViewed:!1;var v={getRequestStatus:n,filterReports:c};0&&(module.exports={filterReports,getRequestStatus});
+"use strict";var f=Object.create;var u=Object.defineProperty;var S=Object.getOwnPropertyDescriptor;var g=Object.getOwnPropertyNames;var l=Object.getPrototypeOf,q=Object.prototype.hasOwnProperty;var x=(e,t)=>{for(var s in t)u(e,s,{get:t[s],enumerable:!0})},p=(e,t,s,a)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of g(t))!q.call(e,r)&&r!==s&&u(e,r,{get:()=>t[r],enumerable:!(a=S(t,r))||a.enumerable});return e};var w=(e,t,s)=>(s=e!=null?f(l(e)):{},p(t||!e||!e.__esModule?u(s,"default",{value:e,enumerable:!0}):s,e)),y=e=>p(u({},"__esModule",{value:!0}),e);var D={};x(D,{default:()=>v,filterReports:()=>d,getRequestStatus:()=>m});module.exports=y(D);var n=require("../../../utils/requestStatusHelper"),c=w(require("../../../utils/localsHelper"));const m=async({req:e,res:t,services:s})=>{const{executionId:a,status:r}=e.body,{dprUser:i}=c.default.getValues(t),o=await(0,n.getStatus)({req:e,res:t,services:s}),R=o.errorMessage?JSON.stringify(o.errorMessage):void 0;return r!==o.status&&(await s.requestedReportService.updateStatus(a,i.id,o.status,R),o.reportData=await s.requestedReportService.getReportByExecutionId(a,i.id)),o},d=e=>e.timestamp?!e.timestamp.lastViewed:!1;var v={getRequestStatus:m,filterReports:d};0&&(module.exports={filterReports,getRequestStatus});
 //# sourceMappingURL=utils.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/dpr/components/user-reports/requested/utils.ts"],
-  "sourcesContent": ["import { Response, Request } from 'express'\nimport { RequestedReport, RequestStatus } from '../../../types/UserReports'\nimport { getStatus } from '../../../utils/requestStatusHelper'\nimport LocalsHelper from '../../../utils/localsHelper'\nimport { Services } from '../../../types/Services'\n\nexport const getRequestStatus = async ({ req, res, services }: { req: Request; res: Response; services: Services }) => {\n  const { executionId, status: currentStatus } = req.body\n  const { dprUser } = LocalsHelper.getValues(res)\n  const response = await getStatus({ req, res, services })\n\n  if (currentStatus !== response.status) {\n    await services.requestedReportService.updateStatus(\n      executionId,\n      dprUser.id,\n      response.status as RequestStatus,\n      response.errorMessage,\n    )\n    response.reportData = await services.requestedReportService.getReportByExecutionId(executionId, dprUser.id)\n  }\n  return response\n}\n\nexport const filterReports = (report: RequestedReport) => {\n  return report.timestamp ? !report.timestamp.lastViewed : false\n}\n\nexport default {\n  getRequestStatus,\n  filterReports,\n}\n"],
-  "mappings": "6iBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,kBAAAC,EAAA,qBAAAC,IAAA,eAAAC,EAAAL,GAEA,IAAAM,EAA0B,8CAC1BC,EAAyB,0CAGlB,MAAMH,EAAmB,MAAO,CAAE,IAAAI,EAAK,IAAAC,EAAK,SAAAC,CAAS,IAA2D,CACrH,KAAM,CAAE,YAAAC,EAAa,OAAQC,CAAc,EAAIJ,EAAI,KAC7C,CAAE,QAAAK,CAAQ,EAAI,EAAAC,QAAa,UAAUL,CAAG,EACxCM,EAAW,QAAM,aAAU,CAAE,IAAAP,EAAK,IAAAC,EAAK,SAAAC,CAAS,CAAC,EAEvD,OAAIE,IAAkBG,EAAS,SAC7B,MAAML,EAAS,uBAAuB,aACpCC,EACAE,EAAQ,GACRE,EAAS,OACTA,EAAS,YACX,EACAA,EAAS,WAAa,MAAML,EAAS,uBAAuB,uBAAuBC,EAAaE,EAAQ,EAAE,GAErGE,CACT,EAEaZ,EAAiBa,GACrBA,EAAO,UAAY,CAACA,EAAO,UAAU,WAAa,GAG3D,IAAOd,EAAQ,CACb,iBAAAE,EACA,cAAAD,CACF",
-  "names": ["utils_exports", "__export", "utils_default", "filterReports", "getRequestStatus", "__toCommonJS", "import_requestStatusHelper", "import_localsHelper", "req", "res", "services", "executionId", "currentStatus", "dprUser", "LocalsHelper", "response", "report"]
+  "sourcesContent": ["import { Response, Request } from 'express'\nimport { RequestStatus, UserReportData } from '../../../types/UserReports'\nimport { getStatus } from '../../../utils/requestStatusHelper'\nimport LocalsHelper from '../../../utils/localsHelper'\nimport { Services } from '../../../types/Services'\n\nexport const getRequestStatus = async ({ req, res, services }: { req: Request; res: Response; services: Services }) => {\n  const { executionId, status: currentStatus } = req.body\n  const { dprUser } = LocalsHelper.getValues(res)\n  const response = await getStatus({ req, res, services })\n  const errorMessage = response.errorMessage ? JSON.stringify(response.errorMessage) : undefined\n\n  if (currentStatus !== response.status) {\n    await services.requestedReportService.updateStatus(\n      executionId,\n      dprUser.id,\n      response.status as RequestStatus,\n      errorMessage,\n    )\n    response.reportData = await services.requestedReportService.getReportByExecutionId(executionId, dprUser.id)\n  }\n  return response\n}\n\nexport const filterReports = (report: UserReportData) => {\n  return report.timestamp ? !report.timestamp.lastViewed : false\n}\n\nexport default {\n  getRequestStatus,\n  filterReports,\n}\n"],
+  "mappings": "0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,aAAAE,EAAA,kBAAAC,EAAA,qBAAAC,IAAA,eAAAC,EAAAL,GAEA,IAAAM,EAA0B,8CAC1BC,EAAyB,0CAGlB,MAAMH,EAAmB,MAAO,CAAE,IAAAI,EAAK,IAAAC,EAAK,SAAAC,CAAS,IAA2D,CACrH,KAAM,CAAE,YAAAC,EAAa,OAAQC,CAAc,EAAIJ,EAAI,KAC7C,CAAE,QAAAK,CAAQ,EAAI,EAAAC,QAAa,UAAUL,CAAG,EACxCM,EAAW,QAAM,aAAU,CAAE,IAAAP,EAAK,IAAAC,EAAK,SAAAC,CAAS,CAAC,EACjDM,EAAeD,EAAS,aAAe,KAAK,UAAUA,EAAS,YAAY,EAAI,OAErF,OAAIH,IAAkBG,EAAS,SAC7B,MAAML,EAAS,uBAAuB,aACpCC,EACAE,EAAQ,GACRE,EAAS,OACTC,CACF,EACAD,EAAS,WAAa,MAAML,EAAS,uBAAuB,uBAAuBC,EAAaE,EAAQ,EAAE,GAErGE,CACT,EAEaZ,EAAiBc,GACrBA,EAAO,UAAY,CAACA,EAAO,UAAU,WAAa,GAG3D,IAAOf,EAAQ,CACb,iBAAAE,EACA,cAAAD,CACF",
+  "names": ["utils_exports", "__export", "utils_default", "filterReports", "getRequestStatus", "__toCommonJS", "import_requestStatusHelper", "import_localsHelper", "req", "res", "services", "executionId", "currentStatus", "dprUser", "LocalsHelper", "response", "errorMessage", "report"]
 }

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

@@ -1,3 +1,4 @@
+import { expect, jest } from '@jest/globals'
 import { Response, Request } from 'express'
 import UserReportRequestListUtils from './utils'
 import type { RequestedReportService, ReportingService } from '../../../services'
@@ -34,12 +35,12 @@ describe('UserReportRequestListUtils', () => {
 
       requestedReportService = {
         updateStatus: jest.fn(),
-        getReportByExecutionId: jest.fn().mockResolvedValue(mockRequested.requestedReady),
+        getReportByExecutionId: jest.fn().mockImplementation(() => mockRequested.requestedReady),
       } as unknown as RequestedReportService
 
       reportingService = {
-        getAsyncReportStatus: jest.fn().mockResolvedValue({
-          status: RequestStatus.FINISHED,
+        getAsyncReportStatus: jest.fn().mockImplementation(() => {
+          return { status: RequestStatus.FINISHED }
         }),
       } as unknown as ReportingService
 

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

@@ -1,5 +1,5 @@
 import { Response, Request } from 'express'
-import { RequestedReport, RequestStatus } from '../../../types/UserReports'
+import { RequestStatus, UserReportData } from '../../../types/UserReports'
 import { getStatus } from '../../../utils/requestStatusHelper'
 import LocalsHelper from '../../../utils/localsHelper'
 import { Services } from '../../../types/Services'
@@ -8,20 +8,21 @@ export const getRequestStatus = async ({ req, res, services }: { req: Request; r
   const { executionId, status: currentStatus } = req.body
   const { dprUser } = LocalsHelper.getValues(res)
   const response = await getStatus({ req, res, services })
+  const errorMessage = response.errorMessage ? JSON.stringify(response.errorMessage) : undefined
 
   if (currentStatus !== response.status) {
     await services.requestedReportService.updateStatus(
       executionId,
       dprUser.id,
       response.status as RequestStatus,
-      response.errorMessage,
+      errorMessage,
     )
     response.reportData = await services.requestedReportService.getReportByExecutionId(executionId, dprUser.id)
   }
   return response
 }
 
-export const filterReports = (report: RequestedReport) => {
+export const filterReports = (report: UserReportData) => {
   return report.timestamp ? !report.timestamp.lastViewed : false
 }
 

package/dpr/components/user-reports/types.d.js

@@ -1,2 +1,2 @@
-var a=Object.defineProperty;var m=Object.getOwnPropertyDescriptor;var i=Object.getOwnPropertyNames;var o=Object.prototype.hasOwnProperty;var p=(t,e,n,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of i(e))!o.call(t,r)&&r!==n&&a(t,r,{get:()=>e[r],enumerable:!(s=m(e,r))||s.enumerable});return t};var b=t=>p(a({},"__esModule",{value:!0}),t);var c={};module.exports=b(c);
+"use strict";var a=Object.defineProperty;var m=Object.getOwnPropertyDescriptor;var i=Object.getOwnPropertyNames;var o=Object.prototype.hasOwnProperty;var p=(t,e,n,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of i(e))!o.call(t,r)&&r!==n&&a(t,r,{get:()=>e[r],enumerable:!(s=m(e,r))||s.enumerable});return t};var b=t=>p(a({},"__esModule",{value:!0}),t);var c={};module.exports=b(c);
 //# sourceMappingURL=types.d.js.map

package/dpr/components/user-reports/types.d.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/dpr/components/user-reports/types.d.ts"],
-  "sourcesContent": ["import Dict = NodeJS.Dict\nimport type { meta } from '../../types/UserReports'\n\nexport interface RenderTableListResponse {\n  head: {\n    emptyMessage?: string\n    href?: string\n  }\n  tableData: {\n    rows: Dict<string>[][]\n    head: Dict<string>[]\n  }\n  total: {\n    amount: number\n    shown: number\n    max: number\n  }\n  meta?: meta[]\n  csrfToken?: string\n  maxRows: number\n}\n"],
-  "mappings": "kWAAA,IAAAA,EAAA,kBAAAC,EAAAD",
+  "sourcesContent": ["import Dict = NodeJS.Dict\nimport type { meta } from '../../types/UserReports'\n\nexport interface RenderTableListResponse {\n  head: {\n    emptyMessage?: string\n    href?: string\n  }\n  tableData: {\n    rows: Dict<string>[][]\n    head: Dict<string>[]\n  }\n  total: {\n    amount: number\n    shown: number\n    max: number\n  }\n  meta?: meta[]\n  csrfToken?: string\n  maxRows?: number\n}\n"],
+  "mappings": "+WAAA,IAAAA,EAAA,kBAAAC,EAAAD",
   "names": ["types_d_exports", "__toCommonJS"]
 }

package/dpr/components/user-reports/types.d.ts

@@ -17,5 +17,5 @@ export interface RenderTableListResponse {
   }
   meta?: meta[]
   csrfToken?: string
-  maxRows: number
+  maxRows?: number
 }

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

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