@ministryofjustice/hmpps-digital-prison-reporting-frontend 3.26.4 → 3.26.6

package/dpr/components/async-filters/utils.js

@@ -188,6 +188,7 @@ const getFiltersFromDefinition = (definition) => {
  * Updates the store with the request details
  *
  * @param {Request} req
+ * @param {Response} res
  * @param {Services} services
  * @param {components['schemas']['FieldDefinition'][]} fields
  * @param {querySummaryResult} querySummaryData
@@ -195,22 +196,24 @@ const getFiltersFromDefinition = (definition) => {
  * @param {string} tableId
  * @return {*}  {Promise<string>}
  */
-const updateStore = async (req, services, fields, querySummaryData, executionId, tableId) => {
+const updateStore = async (req, res, services, fields, querySummaryData, executionId, tableId) => {
+    var _a;
     const { search, variantId } = req.body;
     const { query, filterData, querySummary, sortData } = querySummaryData;
+    const userId = ((_a = res.locals.user) === null || _a === void 0 ? void 0 : _a.uuid) ? res.locals.user.uuid : 'userId';
     // 1. check for duplicate requests and remove them from the request list
-    const requestedReports = await services.asyncReportsStore.getAllReportsByVariantId(variantId);
-    const viewedReports = await services.recentlyViewedStoreService.getAllReportsByVariantId(variantId);
+    const requestedReports = await services.asyncReportsStore.getAllReportsByVariantId(variantId, userId);
+    const viewedReports = await services.recentlyViewedStoreService.getAllReportsByVariantId(variantId, userId);
     const duplicateRequestIds = (0, reportSummaryHelper_1.getDuplicateRequestIds)(search, requestedReports);
     if (duplicateRequestIds.length) {
         await Promise.all(duplicateRequestIds.map(async (id) => {
-            await await services.asyncReportsStore.removeReport(id);
+            await await services.asyncReportsStore.removeReport(id, userId);
         }));
     }
     const duplicateViewedReportIds = (0, reportSummaryHelper_1.getDuplicateRequestIds)(search, viewedReports);
     if (duplicateViewedReportIds.length) {
         await Promise.all(duplicateViewedReportIds.map(async (id) => {
-            await await services.recentlyViewedStoreService.removeReport(id);
+            await await services.recentlyViewedStoreService.removeReport(id, userId);
         }));
     }
     // 2. Add the new request data to the store
@@ -218,7 +221,7 @@ const updateStore = async (req, services, fields, querySummaryData, executionId,
         ...req.body,
         executionId,
         tableId,
-    }, filterData, sortData, query, querySummary);
+    }, filterData, sortData, query, querySummary, userId);
     return reportData.url.polling.pathname;
 };
 exports.updateStore = updateStore;
@@ -353,7 +356,7 @@ exports.default = {
         });
         let redirect = '';
         if (executionId && tableId) {
-            redirect = await (0, exports.updateStore)(req, services, fields, querySummaryData, executionId, tableId);
+            redirect = await (0, exports.updateStore)(req, res, services, fields, querySummaryData, executionId, tableId);
         }
         return redirect;
     },

package/dpr/components/async-filters/utils.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import { Request } from 'express'
+import { Request, Response } from 'express'
 import moment from 'moment'
 import dayjs from 'dayjs'
 import isBetween from 'dayjs/plugin/isBetween'
@@ -204,6 +204,7 @@ const getFiltersFromDefinition = (definition: components['schemas']['VariantDefi
  * Updates the store with the request details
  *
  * @param {Request} req
+ * @param {Response} res
  * @param {Services} services
  * @param {components['schemas']['FieldDefinition'][]} fields
  * @param {querySummaryResult} querySummaryData
@@ -213,6 +214,7 @@ const getFiltersFromDefinition = (definition: components['schemas']['VariantDefi
  */
 export const updateStore = async (
   req: Request,
+  res: Response,
   services: Services,
   fields: components['schemas']['FieldDefinition'][],
   querySummaryData: querySummaryResult,
@@ -221,16 +223,17 @@ export const updateStore = async (
 ): Promise<string> => {
   const { search, variantId } = req.body
   const { query, filterData, querySummary, sortData } = querySummaryData
+  const userId = res.locals.user?.uuid ? res.locals.user.uuid : 'userId'
 
   // 1. check for duplicate requests and remove them from the request list
-  const requestedReports = await services.asyncReportsStore.getAllReportsByVariantId(variantId)
-  const viewedReports = await services.recentlyViewedStoreService.getAllReportsByVariantId(variantId)
+  const requestedReports = await services.asyncReportsStore.getAllReportsByVariantId(variantId, userId)
+  const viewedReports = await services.recentlyViewedStoreService.getAllReportsByVariantId(variantId, userId)
 
   const duplicateRequestIds = getDuplicateRequestIds(search, requestedReports)
   if (duplicateRequestIds.length) {
     await Promise.all(
       duplicateRequestIds.map(async (id: string) => {
-        await await services.asyncReportsStore.removeReport(id)
+        await await services.asyncReportsStore.removeReport(id, userId)
       }),
     )
   }
@@ -239,7 +242,7 @@ export const updateStore = async (
   if (duplicateViewedReportIds.length) {
     await Promise.all(
       duplicateViewedReportIds.map(async (id: string) => {
-        await await services.recentlyViewedStoreService.removeReport(id)
+        await await services.recentlyViewedStoreService.removeReport(id, userId)
       }),
     )
   }
@@ -255,6 +258,7 @@ export const updateStore = async (
     sortData,
     query,
     querySummary,
+    userId,
   )
 
   return reportData.url.polling.pathname
@@ -436,7 +440,7 @@ export default {
 
     let redirect = ''
     if (executionId && tableId) {
-      redirect = await updateStore(req, services, fields, querySummaryData, executionId, tableId)
+      redirect = await updateStore(req, res, services, fields, querySummaryData, executionId, tableId)
     }
     return redirect
   },

package/dpr/components/async-polling/utils.js

@@ -3,20 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const AsyncReport_1 = require("../../types/AsyncReport");
 exports.default = {
     cancelRequest: async ({ req, res, services }) => {
-        var _a;
+        var _a, _b;
         const token = ((_a = res.locals.user) === null || _a === void 0 ? void 0 : _a.token) ? res.locals.user.token : 'token';
+        const userId = ((_b = res.locals.user) === null || _b === void 0 ? void 0 : _b.uuid) ? res.locals.user.uuid : 'userId';
         const { reportId, variantId, executionId } = req.body;
         const response = await services.reportingService.cancelAsyncRequest(token, reportId, variantId, executionId);
         if (response && response.cancellationSucceeded) {
-            await services.asyncReportsStore.updateStatus(executionId, AsyncReport_1.RequestStatus.ABORTED);
+            await services.asyncReportsStore.updateStatus(executionId, userId, AsyncReport_1.RequestStatus.ABORTED);
         }
     },
     renderPolling: async ({ req, res, services }) => {
-        var _a;
+        var _a, _b;
         const csrfToken = res.locals.csrfToken || 'csrfToken';
+        const userId = ((_a = res.locals.user) === null || _a === void 0 ? void 0 : _a.uuid) ? res.locals.user.uuid : 'userId';
         const { dataProductDefinitionsPath: definitionPath } = req.query;
         const { reportId, variantId, executionId } = req.params;
-        const reportData = await services.asyncReportsStore.getReportByExecutionId(executionId);
+        const reportData = await services.asyncReportsStore.getReportByExecutionId(executionId, userId);
         const { reportName, name, description, status, tableId, query, timestamp, url, errorMessage } = reportData;
         return {
             pollingRenderData: {
@@ -32,7 +34,7 @@ exports.default = {
                 querySummary: query.summary,
                 requestedAt: timestamp.requested,
                 csrfToken,
-                ...(((_a = url.report) === null || _a === void 0 ? void 0 : _a.fullUrl) && { reportUrl: url.report.fullUrl }),
+                ...(((_b = url.report) === null || _b === void 0 ? void 0 : _b.fullUrl) && { reportUrl: url.report.fullUrl }),
                 ...(url.request.fullUrl && { requestUrl: url.request.fullUrl }),
                 ...(errorMessage && { errorMessage }),
             },

package/dpr/components/async-polling/utils.ts

@@ -4,20 +4,22 @@ import { AsyncReportUtilsParams } from '../../types/AsyncReportUtils'
 export default {
   cancelRequest: async ({ req, res, services }: AsyncReportUtilsParams) => {
     const token = res.locals.user?.token ? res.locals.user.token : 'token'
+    const userId = res.locals.user?.uuid ? res.locals.user.uuid : 'userId'
     const { reportId, variantId, executionId } = req.body
 
     const response = await services.reportingService.cancelAsyncRequest(token, reportId, variantId, executionId)
     if (response && response.cancellationSucceeded) {
-      await services.asyncReportsStore.updateStatus(executionId, RequestStatus.ABORTED)
+      await services.asyncReportsStore.updateStatus(executionId, userId, RequestStatus.ABORTED)
     }
   },
 
   renderPolling: async ({ req, res, services }: AsyncReportUtilsParams) => {
     const csrfToken = (res.locals.csrfToken as unknown as string) || 'csrfToken'
+    const userId = res.locals.user?.uuid ? res.locals.user.uuid : 'userId'
     const { dataProductDefinitionsPath: definitionPath } = req.query
     const { reportId, variantId, executionId } = req.params
 
-    const reportData = await services.asyncReportsStore.getReportByExecutionId(executionId)
+    const reportData = await services.asyncReportsStore.getReportByExecutionId(executionId, userId)
     const { reportName, name, description, status, tableId, query, timestamp, url, errorMessage } = reportData
 
     return {

package/dpr/components/async-request-list/utils.js

@@ -98,24 +98,30 @@ const filterReports = (report) => {
 exports.filterReports = filterReports;
 exports.default = {
     getRequestStatus: async ({ req, res, services }) => {
+        var _a;
         const { executionId, status: currentStatus } = req.body;
+        const userId = ((_a = res.locals.user) === null || _a === void 0 ? void 0 : _a.uuid) ? res.locals.user.uuid : 'userId';
         const response = await (0, reportStatusHelper_1.getStatus)({ req, res, services });
         if (currentStatus !== response.status) {
-            await services.asyncReportsStore.updateStatus(executionId, response.status, response.errorMessage);
-            response.reportData = await services.asyncReportsStore.getReportByExecutionId(executionId);
+            await services.asyncReportsStore.updateStatus(executionId, userId, response.status, response.errorMessage);
+            response.reportData = await services.asyncReportsStore.getReportByExecutionId(executionId, userId);
         }
         return response;
     },
     getExpiredStatus: async ({ req, res, services }) => {
+        var _a;
+        const userId = ((_a = res.locals.user) === null || _a === void 0 ? void 0 : _a.uuid) ? res.locals.user.uuid : 'userId';
         const report = await (0, reportStatusHelper_1.getExpiredStatus)({ req, res, services });
         if (report.isExpired) {
-            await services.asyncReportsStore.setToExpired(report.executionId);
+            await services.asyncReportsStore.setToExpired(report.executionId, userId);
         }
         return report.isExpired;
     },
     renderList: async ({ services, res, maxRows, }) => {
+        var _a;
         const csrfToken = res.locals.csrfToken || 'csrfToken';
-        const requestedReportsData = await services.asyncReportsStore.getAllReports();
+        const userId = ((_a = res.locals.user) === null || _a === void 0 ? void 0 : _a.uuid) ? res.locals.user.uuid : 'userId';
+        const requestedReportsData = await services.asyncReportsStore.getAllReports(userId);
         let cardData = await ReportListHelper.formatCards(requestedReportsData, exports.filterReports, exports.formatCardData);
         if (maxRows)
             cardData = cardData.slice(0, maxRows);

package/dpr/components/async-request-list/utils.ts

@@ -89,24 +89,27 @@ export const filterReports = (report: AsyncReportData) => {
 export default {
   getRequestStatus: async ({ req, res, services }: AsyncReportUtilsParams) => {
     const { executionId, status: currentStatus } = req.body
+    const userId = res.locals.user?.uuid ? res.locals.user.uuid : 'userId'
     const response = await getStatus({ req, res, services })
 
     if (currentStatus !== response.status) {
       await services.asyncReportsStore.updateStatus(
         executionId,
+        userId,
         response.status as RequestStatus,
         response.errorMessage,
       )
-      response.reportData = await services.asyncReportsStore.getReportByExecutionId(executionId)
+      response.reportData = await services.asyncReportsStore.getReportByExecutionId(executionId, userId)
     }
 
     return response
   },
 
   getExpiredStatus: async ({ req, res, services }: AsyncReportUtilsParams) => {
+    const userId = res.locals.user?.uuid ? res.locals.user.uuid : 'userId'
     const report = await getExpiredStatus({ req, res, services })
     if (report.isExpired) {
-      await services.asyncReportsStore.setToExpired(report.executionId)
+      await services.asyncReportsStore.setToExpired(report.executionId, userId)
     }
     return report.isExpired
   },
@@ -117,7 +120,8 @@ export default {
     maxRows,
   }: { maxRows?: number } & AsyncReportUtilsParams): Promise<RenderTableListResponse> => {
     const csrfToken = (res.locals.csrfToken as unknown as string) || 'csrfToken'
-    const requestedReportsData: AsyncReportData[] = await services.asyncReportsStore.getAllReports()
+    const userId = res.locals.user?.uuid ? res.locals.user.uuid : 'userId'
+    const requestedReportsData: AsyncReportData[] = await services.asyncReportsStore.getAllReports(userId)
 
     let cardData = await ReportListHelper.formatCards(requestedReportsData, filterReports, formatCardData)
     if (maxRows) cardData = cardData.slice(0, maxRows)

package/dpr/components/recently-viewed-list/utils.js

@@ -67,9 +67,11 @@ const filterReports = (report) => {
 exports.filterReports = filterReports;
 exports.default = {
     getExpiredStatus: async ({ req, res, services }) => {
+        var _a;
         const report = await (0, reportStatusHelper_1.getExpiredStatus)({ req, res, services });
+        const userId = ((_a = res.locals.user) === null || _a === void 0 ? void 0 : _a.uuid) ? res.locals.user.uuid : 'userId';
         if (report.isExpired) {
-            await services.recentlyViewedStoreService.setToExpired(report.executionId);
+            await services.recentlyViewedStoreService.setToExpired(report.executionId, userId);
         }
         return report.isExpired;
     },

package/dpr/components/recently-viewed-list/utils.ts

@@ -59,8 +59,10 @@ export const filterReports = (report: RecentlyViewedReportData) => {
 export default {
   getExpiredStatus: async ({ req, res, services }: AsyncReportUtilsParams) => {
     const report = await getExpiredStatus({ req, res, services })
+    const userId = res.locals.user?.uuid ? res.locals.user.uuid : 'userId'
+
     if (report.isExpired) {
-      await services.recentlyViewedStoreService.setToExpired(report.executionId)
+      await services.recentlyViewedStoreService.setToExpired(report.executionId, userId)
     }
     return report.isExpired
   },

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

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const reportsListHelper_1 = require("../../utils/reportsListHelper");
 exports.default = {
-    mapReportsList: (res, services) => {
+    mapReportsList: async (res, services) => {
+        var _a;
         const { definitions, csrfToken } = res.locals;
         const pathSuffix = res.locals.pathSuffix || '';
+        const userId = ((_a = res.locals.user) === null || _a === void 0 ? void 0 : _a.uuid) ? res.locals.user.uuid : 'userId';
         // Sort report Definitions by product name
         const sortedDefinitions = definitions.sort((a, b) => {
             if (a.name < b.name)
@@ -57,7 +59,7 @@ exports.default = {
             });
             return mergedArray;
         });
-        const rows = sortedVariants.map((v) => {
+        const rows = await Promise.all(sortedVariants.map(async (v) => {
             const { id, name, description, reportName, reportId, reportDescription, type } = v;
             const desc = description || reportDescription;
             let hrefHtml;
@@ -65,9 +67,9 @@ exports.default = {
             let listType;
             switch (type) {
                 case 'report':
-                    hrefHtml = `<a href="/async-reports/${reportId}/${id}/request${pathSuffix}">${name}</a>`;
+                    hrefHtml = `<a href='/async-reports/${reportId}/${id}/request${pathSuffix}'>${name}</a>`;
                     bookmarkColumn = {
-                        html: services.bookmarkService.createBookMarkToggleHtml(reportId, id, csrfToken, 'reports-list'),
+                        html: await services.bookmarkService.createBookMarkToggleHtml(userId, reportId, id, csrfToken, 'reports-list'),
                         attributes: {
                             tabindex: 0,
                         },
@@ -75,7 +77,7 @@ exports.default = {
                     listType = (0, reportsListHelper_1.createTag)(type);
                     break;
                 case 'dashboard':
-                    hrefHtml = `<a href="/dashboards/${reportId}/load/${id}${pathSuffix}">${name}</a>`;
+                    hrefHtml = `<a href='/dashboards/${reportId}/load/${id}${pathSuffix}'>${name}</a>`;
                     bookmarkColumn = {};
                     listType = (0, reportsListHelper_1.createTag)(type);
                     break;
@@ -93,7 +95,7 @@ exports.default = {
                     ...bookmarkColumn,
                 },
             ];
-        });
+        }));
         const head = [
             { text: 'Product', classes: 'dpr-product-head' },
             { text: 'Name', classes: 'dpr-name-head' },

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

@@ -15,12 +15,13 @@ interface definitionData {
 }
 
 export default {
-  mapReportsList: (
+  mapReportsList: async (
     res: Response,
     services: Services,
-  ): { head: { text: string }[]; rows: { text?: string; html?: string }[] } => {
+  ): Promise<{ head: { text: string }[]; rows: { text?: string; html?: string }[] }> => {
     const { definitions, csrfToken } = res.locals
     const pathSuffix = res.locals.pathSuffix || ''
+    const userId = res.locals.user?.uuid ? res.locals.user.uuid : 'userId'
 
     // Sort report Definitions by product name
     const sortedDefinitions = definitions.sort(
@@ -80,45 +81,53 @@ export default {
       },
     )
 
-    const rows = sortedVariants.map((v: definitionData) => {
-      const { id, name, description, reportName, reportId, reportDescription, type } = v
-      const desc = description || reportDescription
+    const rows = await Promise.all(
+      sortedVariants.map(async (v: definitionData) => {
+        const { id, name, description, reportName, reportId, reportDescription, type } = v
+        const desc = description || reportDescription
 
-      let hrefHtml
-      let bookmarkColumn
-      let listType
-      switch (type) {
-        case 'report':
-          hrefHtml = `<a href="/async-reports/${reportId}/${id}/request${pathSuffix}">${name}</a>`
-          bookmarkColumn = {
-            html: services.bookmarkService.createBookMarkToggleHtml(reportId, id, csrfToken, 'reports-list'),
-            attributes: {
-              tabindex: 0,
-            },
-          }
-          listType = createTag(type)
-          break
-        case 'dashboard':
-          hrefHtml = `<a href="/dashboards/${reportId}/load/${id}${pathSuffix}">${name}</a>`
-          bookmarkColumn = {}
-          listType = createTag(type)
-          break
-        default:
-          hrefHtml = ''
-          bookmarkColumn = {}
-          break
-      }
+        let hrefHtml
+        let bookmarkColumn
+        let listType
+        switch (type) {
+          case 'report':
+            hrefHtml = `<a href='/async-reports/${reportId}/${id}/request${pathSuffix}'>${name}</a>`
+            bookmarkColumn = {
+              html: await services.bookmarkService.createBookMarkToggleHtml(
+                userId,
+                reportId,
+                id,
+                csrfToken,
+                'reports-list',
+              ),
+              attributes: {
+                tabindex: 0,
+              },
+            }
+            listType = createTag(type)
+            break
+          case 'dashboard':
+            hrefHtml = `<a href='/dashboards/${reportId}/load/${id}${pathSuffix}'>${name}</a>`
+            bookmarkColumn = {}
+            listType = createTag(type)
+            break
+          default:
+            hrefHtml = ''
+            bookmarkColumn = {}
+            break
+        }
 
-      return [
-        { text: reportName },
-        { html: hrefHtml },
-        { html: createShowMoreHtml(desc) },
-        { html: listType },
-        {
-          ...bookmarkColumn,
-        },
-      ]
-    })
+        return [
+          { text: reportName },
+          { html: hrefHtml },
+          { html: createShowMoreHtml(desc) },
+          { html: listType },
+          {
+            ...bookmarkColumn,
+          },
+        ]
+      }),
+    )
 
     const head = [
       { text: 'Product', classes: 'dpr-product-head' },

package/dpr/routes/asyncReports.js

@@ -111,8 +111,10 @@ function routes({ router, services, layoutPath, templatePath = 'dpr/views/', })
         }
     };
     const removeRequestedItemHandler = async (req, res, next) => {
+        var _a;
+        const userId = ((_a = res.locals.user) === null || _a === void 0 ? void 0 : _a.uuid) ? res.locals.user.uuid : 'userId';
         try {
-            await services.asyncReportsStore.removeReport(req.body.executionId);
+            await services.asyncReportsStore.removeReport(req.body.executionId, userId);
             res.end();
         }
         catch (error) {

package/dpr/routes/asyncReports.ts

@@ -99,8 +99,10 @@ export default function routes({
   }
 
   const removeRequestedItemHandler: RequestHandler = async (req, res, next) => {
+    const userId = res.locals.user?.uuid ? res.locals.user.uuid : 'userId'
+
     try {
-      await services.asyncReportsStore.removeReport(req.body.executionId)
+      await services.asyncReportsStore.removeReport(req.body.executionId, userId)
       res.end()
     } catch (error) {
       req.body.title = 'Failed to abort request'

package/dpr/routes/bookmarks.js

@@ -7,12 +7,16 @@ exports.default = routes;
 const bookmarkListUtils_1 = __importDefault(require("../utils/bookmarkListUtils"));
 function routes({ router, services, layoutPath, templatePath = 'dpr/views/', }) {
     router.post('/addBookmark/', async (req, res) => {
+        var _a;
+        const userId = ((_a = res.locals.user) === null || _a === void 0 ? void 0 : _a.uuid) ? res.locals.user.uuid : 'userId';
         const { reportId, variantId } = req.body;
-        await services.bookmarkService.addBookmark(reportId, variantId);
+        await services.bookmarkService.addBookmark(userId, reportId, variantId);
         res.end();
     });
     router.post('/removeBookmark/', async (req, res) => {
-        await services.bookmarkService.removeBookmark(req.body.variantId);
+        var _a;
+        const userId = ((_a = res.locals.user) === null || _a === void 0 ? void 0 : _a.uuid) ? res.locals.user.uuid : 'userId';
+        await services.bookmarkService.removeBookmark(userId, req.body.variantId);
         res.end();
     });
     router.get('/async-reports/bookmarks', async (req, res) => {

package/dpr/routes/bookmarks.ts

@@ -14,13 +14,15 @@ export default function routes({
   templatePath?: string
 }) {
   router.post('/addBookmark/', async (req, res) => {
+    const userId = res.locals.user?.uuid ? res.locals.user.uuid : 'userId'
     const { reportId, variantId } = req.body
-    await services.bookmarkService.addBookmark(reportId, variantId)
+    await services.bookmarkService.addBookmark(userId, reportId, variantId)
     res.end()
   })
 
   router.post('/removeBookmark/', async (req, res) => {
-    await services.bookmarkService.removeBookmark(req.body.variantId)
+    const userId = res.locals.user?.uuid ? res.locals.user.uuid : 'userId'
+    await services.bookmarkService.removeBookmark(userId, req.body.variantId)
     res.end()
   })
 

package/dpr/routes/recentlyViewed.js

@@ -16,7 +16,9 @@ function routes({ router, services, layoutPath, templatePath = 'dpr/views/', })
         }
     };
     const removeViewedItemHandler = async (req, res, next) => {
-        await services.recentlyViewedStoreService.removeReport(req.body.executionId);
+        var _a;
+        const userId = ((_a = res.locals.user) === null || _a === void 0 ? void 0 : _a.uuid) ? res.locals.user.uuid : 'userId';
+        await services.recentlyViewedStoreService.removeReport(req.body.executionId, userId);
         res.end();
     };
     router.get('/async-reports/recently-viewed', async (req, res) => {

package/dpr/routes/recentlyViewed.ts

@@ -23,7 +23,8 @@ export default function routes({
   }
 
   const removeViewedItemHandler: RequestHandler = async (req, res, next) => {
-    await services.recentlyViewedStoreService.removeReport(req.body.executionId)
+    const userId = res.locals.user?.uuid ? res.locals.user.uuid : 'userId'
+    await services.recentlyViewedStoreService.removeReport(req.body.executionId, userId)
     res.end()
   }
 

package/dpr/services/bookmarkService.js

@@ -7,49 +7,32 @@ const userStoreService_1 = __importDefault(require("./userStoreService"));
 class BookmarkService extends userStoreService_1.default {
     constructor(userDataStore) {
         super(userDataStore);
-        this.isBookmarked = (variantId) => {
-            return this.bookmarks.filter((bookmark) => bookmark.variantId === variantId).length > 0;
+        this.isBookmarked = async (variantId, userId) => {
+            const userConfig = await this.getState(userId);
+            return userConfig.bookmarks.some((bookmark) => bookmark.variantId === variantId);
         };
     }
-    async getBookmarkState() {
-        await this.getState();
-        this.bookmarks = this.userConfig.bookmarks;
+    async getAllBookmarks(userId) {
+        const userConfig = await this.getState(userId);
+        return userConfig.bookmarks;
     }
-    async saveBookmarkState() {
-        this.userConfig.bookmarks = this.bookmarks;
-        await this.saveState();
+    async addBookmark(userId, reportId, variantId) {
+        const userConfig = await this.getState(userId);
+        if (!userConfig.bookmarks.some((bookmark) => bookmark.variantId === variantId))
+            userConfig.bookmarks.unshift({ reportId, variantId });
+        await this.saveState(userId, userConfig);
     }
-    async getBookmark(id) {
-        await this.getBookmarkState();
-        return this.bookmarks.find((report) => report.variantId === id);
-    }
-    async getAllBookmarks() {
-        await this.getBookmarkState();
-        return this.bookmarks;
-    }
-    async addBookmark(reportId, variantId) {
-        await this.getBookmarkState();
-        if (!this.isBookmarked(variantId))
-            this.bookmarks.unshift({ reportId, variantId });
-        await this.saveBookmarkState();
-    }
-    async removeBookmark(variantId) {
-        await this.getBookmarkState();
-        const index = this.bookmarks.findIndex((bookmark) => bookmark.variantId === variantId);
+    async removeBookmark(userId, variantId) {
+        const userConfig = await this.getState(userId);
+        const index = userConfig.bookmarks.findIndex((bookmark) => bookmark.variantId === variantId);
         if (index >= 0) {
-            this.bookmarks.splice(index, 1);
-        }
-        await this.saveBookmarkState();
-    }
-    async bumpBookmark(reportId, variantId) {
-        await this.getBookmarkState();
-        if (this.isBookmarked(variantId)) {
-            await this.removeBookmark(variantId);
-            await this.addBookmark(reportId, variantId);
+            userConfig.bookmarks.splice(index, 1);
         }
+        await this.saveState(userId, userConfig);
     }
-    createBookMarkToggleHtml(reportId, variantId, csrfToken, id) {
-        const checked = this.isBookmarked(variantId) ? 'checked' : null;
+    async createBookMarkToggleHtml(userId, reportId, variantId, csrfToken, id) {
+        const userConfig = await this.getState(userId);
+        const checked = userConfig.bookmarks.some((bookmark) => bookmark.variantId === variantId) ? 'checked' : null;
         const tooltip = !checked ? 'Add Bookmark' : 'Remove Bookmark';
         return `<div class='dpr-bookmark dpr-bookmark-tooltip dpr-bookmark-table' tooltip="${tooltip}" data-dpr-module="bookmark-toggle">
   <input class="bookmark-input" aria-label="bookmark toggle" type='checkbox' id='${reportId}-${variantId}-${id}' data-report-id='${reportId}' data-variant-id='${variantId}' data-csrf-token='${csrfToken}' ${checked} />