@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.2.1 → 4.2.3

package/dpr/all.mjs

@@ -276,7 +276,7 @@ class BookmarkToggle extends DprClientClass {
   }
 
   async toggleBookmark(type, id, reportId, reportType, csrfToken) {
-    const endpoint = type === 'add' ? '/addBookmark/' : '/removeBookmark/';
+    const endpoint = type === 'add' ? '/dpr/addBookmark/' : '/dpr/removeBookmark/';
     await fetch(endpoint, {
       method: 'post',
       headers: {
@@ -1065,7 +1065,7 @@ class DprPollingStatusClass extends DprClientClass {
   }
 
   async getRequestStatus(metaData, csrfToken) {
-    return this.getStatus('/getStatus/', metaData, csrfToken)
+    return this.getStatus('/dpr/getStatus/', metaData, csrfToken)
   }
 
   async getExpiredStatus(endpoint, metaData, csrfToken) {
@@ -1161,7 +1161,7 @@ class DprAsyncPolling extends DprPollingStatusClass {
       const csrfToken = this.cancelRequestButton.getAttribute('data-csrf-token');
 
       this.cancelRequestButton.addEventListener('click', async () => {
-        await fetch('/cancelRequest/', {
+        await fetch('/dpr/cancelRequest/', {
           method: 'post',
           headers: {
             Accept: 'application/json',
@@ -1851,7 +1851,7 @@ class DprAsyncRequestList extends DprPollingStatusClass {
     await Promise.all(
       JSON.parse(this.requestData).map(async (metaData) => {
         if (!this.EXPIRED_END_STATUSES.includes(metaData.status)) {
-          const response = await this.getExpiredStatus('/getRequestedExpiredStatus/', metaData, this.csrfToken);
+          const response = await this.getExpiredStatus('/dpr/getRequestedExpiredStatus/', metaData, this.csrfToken);
 
           if (response && response.isExpired) {
             clearInterval(this.expiredInterval);
@@ -1891,7 +1891,7 @@ class DprAsyncRequestList extends DprPollingStatusClass {
 
   async removeItemFromList(executionId) {
     let response;
-    await fetch('/removeRequestedItem/', {
+    await fetch('/dpr/removeRequestedItem/', {
       method: 'post',
       headers: {
         Accept: 'application/json',
@@ -1945,7 +1945,7 @@ class DprRecentlyViewedList extends DprPollingStatusClass {
     await Promise.all(
       JSON.parse(this.viewedReportData).map(async (metaData) => {
         if (metaData.status !== 'EXPIRED') {
-          const response = await this.getExpiredStatus('/getExpiredStatus/', metaData, this.csrfToken);
+          const response = await this.getExpiredStatus('/dpr/getExpiredStatus/', metaData, this.csrfToken);
           if (response && response.isExpired) {
             window.location.reload();
             clearInterval(this.expiredViewedInterval);
@@ -1967,7 +1967,7 @@ class DprRecentlyViewedList extends DprPollingStatusClass {
 
   async removeItemFromList(executionId) {
     let response;
-    await fetch('/removeViewedItem/', {
+    await fetch('/dpr/removeViewedItem/', {
       method: 'post',
       headers: {
         Accept: 'application/json',

package/dpr/assets/js/all.mjs

@@ -249,7 +249,7 @@ class BookmarkToggle extends DprClientClass {
   }
 
   async toggleBookmark(type, id, reportId, reportType, csrfToken) {
-    const endpoint = type === 'add' ? '/addBookmark/' : '/removeBookmark/';
+    const endpoint = type === 'add' ? '/dpr/addBookmark/' : '/dpr/removeBookmark/';
     await fetch(endpoint, {
       method: 'post',
       headers: {
@@ -1038,7 +1038,7 @@ class DprPollingStatusClass extends DprClientClass {
   }
 
   async getRequestStatus(metaData, csrfToken) {
-    return this.getStatus('/getStatus/', metaData, csrfToken)
+    return this.getStatus('/dpr/getStatus/', metaData, csrfToken)
   }
 
   async getExpiredStatus(endpoint, metaData, csrfToken) {
@@ -1134,7 +1134,7 @@ class DprAsyncPolling extends DprPollingStatusClass {
       const csrfToken = this.cancelRequestButton.getAttribute('data-csrf-token');
 
       this.cancelRequestButton.addEventListener('click', async () => {
-        await fetch('/cancelRequest/', {
+        await fetch('/dpr/cancelRequest/', {
           method: 'post',
           headers: {
             Accept: 'application/json',
@@ -1824,7 +1824,7 @@ class DprAsyncRequestList extends DprPollingStatusClass {
     await Promise.all(
       JSON.parse(this.requestData).map(async (metaData) => {
         if (!this.EXPIRED_END_STATUSES.includes(metaData.status)) {
-          const response = await this.getExpiredStatus('/getRequestedExpiredStatus/', metaData, this.csrfToken);
+          const response = await this.getExpiredStatus('/dpr/getRequestedExpiredStatus/', metaData, this.csrfToken);
 
           if (response && response.isExpired) {
             clearInterval(this.expiredInterval);
@@ -1864,7 +1864,7 @@ class DprAsyncRequestList extends DprPollingStatusClass {
 
   async removeItemFromList(executionId) {
     let response;
-    await fetch('/removeRequestedItem/', {
+    await fetch('/dpr/removeRequestedItem/', {
       method: 'post',
       headers: {
         Accept: 'application/json',
@@ -1918,7 +1918,7 @@ class DprRecentlyViewedList extends DprPollingStatusClass {
     await Promise.all(
       JSON.parse(this.viewedReportData).map(async (metaData) => {
         if (metaData.status !== 'EXPIRED') {
-          const response = await this.getExpiredStatus('/getExpiredStatus/', metaData, this.csrfToken);
+          const response = await this.getExpiredStatus('/dpr/getExpiredStatus/', metaData, this.csrfToken);
           if (response && response.isExpired) {
             window.location.reload();
             clearInterval(this.expiredViewedInterval);
@@ -1940,7 +1940,7 @@ class DprRecentlyViewedList extends DprPollingStatusClass {
 
   async removeItemFromList(executionId) {
     let response;
-    await fetch('/removeViewedItem/', {
+    await fetch('/dpr/removeViewedItem/', {
       method: 'post',
       headers: {
         Accept: 'application/json',

package/dpr/components/_async/async-polling/view.njk

@@ -60,7 +60,7 @@
       {{ dprRequestDetails(data)}}
 
       {{ govukInsetText({
-        html: "<p>It can take up to 10 minutes to generate a " + type + ".</p> <p>You can close and revisit this page at anytime. Navigate to the homepage to check on its status or your  " + type + ".</p>"
+        html: "<p>It can take up to 10 minutes to generate a " + type + ".</p> <p>You can close and revisit this page at anytime. Navigate to the homepage to check on the status of your  " + type + ".</p>"
       }) }}
 
       {{ govukButton({

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

@@ -59,7 +59,6 @@ const updateStore = async ({ req, res, services, queryData, executionData, child
         default:
             break;
     }
-    console.log(JSON.stringify(requestedReportData, null, 2));
     await services.requestedReportService.addReport(userId, requestedReportData);
     return requestedReportData.url.polling.pathname;
 };

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

@@ -85,8 +85,6 @@ export const updateStore = async ({
       break
   }
 
-  console.log(JSON.stringify(requestedReportData, null, 2))
-
   await services.requestedReportService.addReport(userId, requestedReportData)
 
   return requestedReportData.url.polling.pathname

package/dpr/components/_reports/report-actions/view.njk

@@ -20,7 +20,7 @@
       } %}
 
     {% if not button.disabled %}
-      <form id="download-report-form" action="/downloadReport/" method="post">
+      <form id="download-report-form" action="/dpr/downloadReport/" method="post">
         <input type="hidden" name="dataProductDefinitionsPath" value="{{ button.attributes.definitionPath }}">
         <input type="hidden" name="_csrf" value="{{ button.attributes.csrfToken }}">
         <input type="hidden" name="reportId" value="{{ button.attributes.reportId }}">

package/dpr/components/download-feeback-form/view.njk

@@ -23,7 +23,7 @@
 
   <div class="dpr-download-feedback-form-wrapper" data-dpr-module="download-feedback-form">
 
-    <form action="/submitFeedback/" method="post" id="download-feedback-form" class="download-feedback-form--hidden">
+    <form action="/dpr/submitFeedback/" method="post" id="download-feedback-form" class="download-feedback-form--hidden">
 
       <p>To enable downloads for this report (<strong>{{ reportName}} - {{ variantName }}</strong>), take a few moments to fill out this request form.</p><p>Once you have submitted the form you the download button will be enabled immediately.</p>
 

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

@@ -70,7 +70,7 @@ const formatTableData = async (bookmarksData, bookmarkService, csrfToken, userId
 };
 const mapBookmarkIdsToDefinition = async (bookmarks, req, res, token, services) => {
     const bookmarkData = [];
-    const { pathSuffix, definitionsPath } = localsHelper_1.default.getValues(res);
+    const { definitionsPath } = localsHelper_1.default.getValues(res);
     await Promise.all(bookmarks.map(async (bookmark) => {
         var _a;
         let definition;
@@ -122,7 +122,6 @@ const mapBookmarkIdsToDefinition = async (bookmarks, req, res, token, services)
 exports.default = {
     renderBookmarkList: async ({ services, maxRows, res, req, }) => {
         const { token, csrfToken, userId, bookmarks } = localsHelper_1.default.getValues(res);
-        console.log({ bookmarks });
         const bookmarksData = await mapBookmarkIdsToDefinition(bookmarks, req, res, token, services);
         const formatted = await (0, exports.formatBookmarks)(bookmarksData, maxRows);
         const tableData = await formatTable(bookmarksData, services.bookmarkService, csrfToken, userId, maxRows);

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

@@ -96,7 +96,7 @@ const mapBookmarkIdsToDefinition = async (
   services: Services,
 ): Promise<BookmarkedReportData[]> => {
   const bookmarkData: BookmarkedReportData[] = []
-  const { pathSuffix, definitionsPath } = LocalsHelper.getValues(res)
+  const { definitionsPath } = LocalsHelper.getValues(res)
 
   await Promise.all(
     bookmarks.map(async (bookmark) => {
@@ -180,9 +180,6 @@ export default {
     req: Request
   }) => {
     const { token, csrfToken, userId, bookmarks } = LocalsHelper.getValues(res)
-
-    console.log({ bookmarks })
-
     const bookmarksData: BookmarkedReportData[] = await mapBookmarkIdsToDefinition(bookmarks, req, res, token, services)
     const formatted = await formatBookmarks(bookmarksData, maxRows)
     const tableData = await formatTable(bookmarksData, services.bookmarkService, csrfToken, userId, maxRows)

package/dpr/data/dashboardClient.js

@@ -10,7 +10,7 @@ class DashboardClient {
         this.restClient = new restClient_1.default('Dashboard API Client', config);
     }
     getDefinition(token, dashboardId, dpdId, definitionsPath) {
-        this.logInfo('Get definition:', { dpdId, dashboardId }, { definitionsPath });
+        this.logInfo('Get definition:', { dpdId, dashboardId });
         const query = {
             dataProductDefinitionsPath: definitionsPath,
         };
@@ -23,7 +23,7 @@ class DashboardClient {
             .then((response) => response);
     }
     requestAsyncDashboard(token, reportId, dashboardId, query) {
-        this.logInfo('Request dashboard:', { reportId, dashboardId }, query);
+        this.logInfo('Request dashboard:', { reportId, dashboardId });
         return this.restClient
             .get({
             path: `/async/dashboards/${reportId}/${dashboardId}`,
@@ -33,7 +33,7 @@ class DashboardClient {
             .then((response) => response);
     }
     getAsyncDashboard(token, reportId, dashboardId, tableId, query) {
-        this.logInfo('Get dashboard:', { reportId, dashboardId, tableId }, query);
+        this.logInfo('Get dashboard:', { reportId, dashboardId, tableId });
         return this.restClient
             .get({
             path: `/reports/${reportId}/dashboards/${dashboardId}/tables/${tableId}/result`,
@@ -43,7 +43,7 @@ class DashboardClient {
             .then((response) => response);
     }
     getAsyncStatus(token, reportId, dashboardId, executionId, dataProductDefinitionsPath, tableId) {
-        this.logInfo('Get status:', { reportId, dashboardId, executionId, tableId }, { dataProductDefinitionsPath });
+        this.logInfo('Get status:', { reportId, dashboardId, executionId, tableId });
         return this.restClient
             .get({
             path: `/reports/${reportId}/dashboards/${dashboardId}/statements/${executionId}/status`,
@@ -56,7 +56,7 @@ class DashboardClient {
             .then((response) => response);
     }
     cancelAsyncRequest(token, reportId, dashboardId, executionId, dataProductDefinitionsPath) {
-        this.logInfo('Cancel request:', { reportId, dashboardId, executionId }, { dataProductDefinitionsPath });
+        this.logInfo('Cancel request:', { reportId, dashboardId, executionId });
         return this.restClient
             .delete({
             path: `/reports/${reportId}/dashboards/${dashboardId}/statements/${executionId}`,
@@ -67,13 +67,10 @@ class DashboardClient {
         })
             .then((response) => response);
     }
-    logInfo(title, args, query) {
-        logger_1.default.info(`
-Dashboard client: ${title}:`);
-        logger_1.default.info(JSON.stringify(args, null, 2));
-        if (query) {
-            logger_1.default.info(JSON.stringify(query, null, 2));
-        }
+    logInfo(title, args) {
+        logger_1.default.info(`Dashboard client: ${title}:`);
+        if (args && Object.keys(args).length)
+            logger_1.default.info(JSON.stringify(args, null, 2));
     }
 }
 exports.default = DashboardClient;

package/dpr/data/dashboardClient.ts

@@ -17,7 +17,7 @@ export default class DashboardClient {
     dpdId: string,
     definitionsPath?: string,
   ): Promise<DashboardDefinition> {
-    this.logInfo('Get definition:', { dpdId, dashboardId }, { definitionsPath })
+    this.logInfo('Get definition:', { dpdId, dashboardId })
     const query = {
       dataProductDefinitionsPath: definitionsPath,
     }
@@ -36,7 +36,7 @@ export default class DashboardClient {
     dashboardId: string,
     query: Record<string, string | boolean | number>,
   ): Promise<Dict<string>> {
-    this.logInfo('Request dashboard:', { reportId, dashboardId }, query)
+    this.logInfo('Request dashboard:', { reportId, dashboardId })
 
     return this.restClient
       .get({
@@ -54,7 +54,7 @@ export default class DashboardClient {
     tableId: string,
     query: Dict<string | number>,
   ): Promise<Array<Dict<string>>> {
-    this.logInfo('Get dashboard:', { reportId, dashboardId, tableId }, query)
+    this.logInfo('Get dashboard:', { reportId, dashboardId, tableId })
 
     return this.restClient
       .get({
@@ -73,7 +73,7 @@ export default class DashboardClient {
     dataProductDefinitionsPath?: string,
     tableId?: string,
   ): Promise<Dict<string>> {
-    this.logInfo('Get status:', { reportId, dashboardId, executionId, tableId }, { dataProductDefinitionsPath })
+    this.logInfo('Get status:', { reportId, dashboardId, executionId, tableId })
 
     return this.restClient
       .get({
@@ -94,7 +94,7 @@ export default class DashboardClient {
     executionId: string,
     dataProductDefinitionsPath: string,
   ): Promise<Dict<string>> {
-    this.logInfo('Cancel request:', { reportId, dashboardId, executionId }, { dataProductDefinitionsPath })
+    this.logInfo('Cancel request:', { reportId, dashboardId, executionId })
 
     return this.restClient
       .delete({
@@ -107,12 +107,8 @@ export default class DashboardClient {
       .then((response) => <Dict<string>>response)
   }
 
-  logInfo(title: string, args?: Dict<string>, query?: Dict<string | number | boolean>) {
-    logger.info(`
-Dashboard client: ${title}:`)
-    logger.info(JSON.stringify(args, null, 2))
-    if (query) {
-      logger.info(JSON.stringify(query, null, 2))
-    }
+  logInfo(title: string, args?: Dict<string>) {
+    logger.info(`Dashboard client: ${title}:`)
+    if (args && Object.keys(args).length) logger.info(JSON.stringify(args, null, 2))
   }
 }

package/dpr/data/reportingClient.js

@@ -38,7 +38,7 @@ class ReportingClient {
         }));
     }
     getDefinitions(token, definitionsPath) {
-        this.logInfo('Get definitions:', {}, { definitionsPath });
+        this.logInfo('Get definitions', { definitionsPath });
         const params = {
             query: {
                 renderMethod: 'HTML',
@@ -54,10 +54,10 @@ class ReportingClient {
             .then((response) => response);
     }
     getDefinition(token, reportId, variantId, definitionsPath) {
-        this.logInfo('Get single variant definition:', { reportId, variantId }, { definitionsPath });
         const query = {
             dataProductDefinitionsPath: definitionsPath,
         };
+        this.logInfo('Get definition', { reportId, variantId });
         return this.restClient
             .get({
             path: `/definitions/${reportId}/${variantId}`,
@@ -71,7 +71,7 @@ class ReportingClient {
             dataProductDefinitionsPath: definitionsPath,
             prefix,
         };
-        this.logInfo('Get field values:', { definitionName, variantName, fieldName }, query);
+        this.logInfo('Get field values', { definitionName, variantName, fieldName, prefix });
         return this.restClient
             .get({
             path: `/reports/${definitionName}/${variantName}/${fieldName}`,
@@ -81,7 +81,7 @@ class ReportingClient {
             .then((response) => response);
     }
     requestAsyncReport(token, reportId, variantId, query) {
-        this.logInfo('Request report:', { reportId, variantId }, query);
+        this.logInfo('Request report', { reportId, variantId });
         return this.restClient
             .get({
             path: `/async/reports/${reportId}/${variantId}`,
@@ -91,7 +91,7 @@ class ReportingClient {
             .then((response) => response);
     }
     cancelAsyncRequest(token, reportId, variantId, executionId, dataProductDefinitionsPath) {
-        this.logInfo('Cancel request:', { reportId, variantId, executionId }, { dataProductDefinitionsPath });
+        this.logInfo('Cancel Request', { reportId, variantId, executionId });
         return this.restClient
             .delete({
             path: `/reports/${reportId}/${variantId}/statements/${executionId}`,
@@ -103,7 +103,7 @@ class ReportingClient {
             .then((response) => response);
     }
     getAsyncReport(token, reportId, variantId, tableId, query) {
-        this.logInfo('Get Data:', { reportId, variantId, tableId }, query);
+        this.logInfo('Get Data', { reportId, variantId, tableId });
         return this.restClient
             .get({
             path: `/reports/${reportId}/${variantId}/tables/${tableId}/result`,
@@ -113,7 +113,7 @@ class ReportingClient {
             .then((response) => response);
     }
     getAsyncSummaryReport(token, reportId, variantId, tableId, summaryId, query) {
-        this.logInfo('Get summary report data:', { reportId, variantId, summaryId, tableId }, query);
+        this.logInfo('Get summary data', { reportId, variantId, tableId, summaryId });
         return this.restClient
             .get({
             path: `/reports/${reportId}/${variantId}/tables/${tableId}/result/summary/${summaryId}`,
@@ -123,7 +123,7 @@ class ReportingClient {
             .then((response) => response);
     }
     getAsyncReportStatus(token, reportId, variantId, executionId, dataProductDefinitionsPath, tableId) {
-        this.logInfo('Get status:', { reportId, variantId, executionId, tableId }, { dataProductDefinitionsPath });
+        this.logInfo('Get status', { reportId, variantId, tableId, executionId });
         return this.restClient
             .get({
             path: `/reports/${reportId}/${variantId}/statements/${executionId}/status`,
@@ -136,7 +136,7 @@ class ReportingClient {
             .then((response) => response);
     }
     getAsyncCount(token, tableId, dataProductDefinitionsPath) {
-        this.logInfo('Get count:', { tableId });
+        this.logInfo('Get count', { tableId });
         return this.restClient
             .get({
             path: `/report/tables/${tableId}/count`,
@@ -148,7 +148,7 @@ class ReportingClient {
             .then((response) => response.count);
     }
     getAsyncInteractiveCount(token, tableId, reportId, id, filters) {
-        this.logInfo('Get interactive count', { tableId });
+        this.logInfo('Get interactive count', { tableId, reportId, id });
         return this.restClient
             .get({
             path: `/reports/${reportId}/${id}/tables/${tableId}/count`,
@@ -157,13 +157,10 @@ class ReportingClient {
         })
             .then((response) => response.count);
     }
-    logInfo(title, args, query) {
-        logger_1.default.info(`
-Reporting client: ${title}:`);
-        logger_1.default.info(JSON.stringify(args, null, 2));
-        if (query) {
-            logger_1.default.info(JSON.stringify(query, null, 2));
-        }
+    logInfo(title, args) {
+        logger_1.default.info(`Reporting Client: ${title}:`);
+        if (args && Object.keys(args).length)
+            logger_1.default.info(JSON.stringify(args, null, 2));
     }
 }
 exports.default = ReportingClient;

package/dpr/data/reportingClient.ts

@@ -50,7 +50,7 @@ export default class ReportingClient {
     token: string,
     definitionsPath?: string,
   ): Promise<Array<components['schemas']['ReportDefinitionSummary']>> {
-    this.logInfo('Get definitions:', {}, { definitionsPath })
+    this.logInfo('Get definitions', { definitionsPath })
 
     const params: operations['definitions_1']['parameters'] = {
       query: {
@@ -74,11 +74,11 @@ export default class ReportingClient {
     variantId: string,
     definitionsPath?: string,
   ): Promise<components['schemas']['SingleVariantReportDefinition']> {
-    this.logInfo('Get single variant definition:', { reportId, variantId }, { definitionsPath })
-
     const query = {
       dataProductDefinitionsPath: definitionsPath,
     }
+    this.logInfo('Get definition', { reportId, variantId })
+
     return this.restClient
       .get({
         path: `/definitions/${reportId}/${variantId}`,
@@ -100,7 +100,7 @@ export default class ReportingClient {
       dataProductDefinitionsPath: definitionsPath,
       prefix,
     }
-    this.logInfo('Get field values:', { definitionName, variantName, fieldName }, query)
+    this.logInfo('Get field values', { definitionName, variantName, fieldName, prefix })
 
     return this.restClient
       .get({
@@ -117,7 +117,7 @@ export default class ReportingClient {
     variantId: string,
     query: Record<string, string | boolean | number>,
   ): Promise<Dict<string>> {
-    this.logInfo('Request report:', { reportId, variantId }, query)
+    this.logInfo('Request report', { reportId, variantId })
 
     return this.restClient
       .get({
@@ -135,7 +135,7 @@ export default class ReportingClient {
     executionId: string,
     dataProductDefinitionsPath?: string,
   ): Promise<Dict<string>> {
-    this.logInfo('Cancel request:', { reportId, variantId, executionId }, { dataProductDefinitionsPath })
+    this.logInfo('Cancel Request', { reportId, variantId, executionId })
 
     return this.restClient
       .delete({
@@ -155,7 +155,7 @@ export default class ReportingClient {
     tableId: string,
     query: Dict<string | number>,
   ): Promise<Array<Dict<string>>> {
-    this.logInfo('Get Data:', { reportId, variantId, tableId }, query)
+    this.logInfo('Get Data', { reportId, variantId, tableId })
 
     return this.restClient
       .get({
@@ -174,7 +174,7 @@ export default class ReportingClient {
     summaryId: string,
     query: Dict<string | number>,
   ): Promise<Array<Dict<string>>> {
-    this.logInfo('Get summary report data:', { reportId, variantId, summaryId, tableId }, query)
+    this.logInfo('Get summary data', { reportId, variantId, tableId, summaryId })
 
     return this.restClient
       .get({
@@ -193,7 +193,8 @@ export default class ReportingClient {
     dataProductDefinitionsPath?: string,
     tableId?: string,
   ): Promise<Dict<string>> {
-    this.logInfo('Get status:', { reportId, variantId, executionId, tableId }, { dataProductDefinitionsPath })
+    this.logInfo('Get status', { reportId, variantId, tableId, executionId })
+
     return this.restClient
       .get({
         path: `/reports/${reportId}/${variantId}/statements/${executionId}/status`,
@@ -207,7 +208,7 @@ export default class ReportingClient {
   }
 
   getAsyncCount(token: string, tableId: string, dataProductDefinitionsPath?: string): Promise<number> {
-    this.logInfo('Get count:', { tableId })
+    this.logInfo('Get count', { tableId })
 
     return this.restClient
       .get({
@@ -227,7 +228,7 @@ export default class ReportingClient {
     id: string,
     filters: ReportQuery,
   ): Promise<number> {
-    this.logInfo('Get interactive count', { tableId })
+    this.logInfo('Get interactive count', { tableId, reportId, id })
 
     return this.restClient
       .get({
@@ -238,12 +239,8 @@ export default class ReportingClient {
       .then((response) => (<Count>response).count)
   }
 
-  logInfo(title: string, args?: Dict<string>, query?: Dict<string | number | boolean>) {
-    logger.info(`
-Reporting client: ${title}:`)
-    logger.info(JSON.stringify(args, null, 2))
-    if (query) {
-      logger.info(JSON.stringify(query, null, 2))
-    }
+  logInfo(title: string, args?: Dict<string>) {
+    logger.info(`Reporting Client: ${title}:`)
+    if (args && Object.keys(args).length) logger.info(JSON.stringify(args, null, 2))
   }
 }

package/dpr/middleware/setUpDprResources.js

@@ -0,0 +1,86 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.populateRequestedReports = exports.populateDefinitions = exports.setRoutePrefix = void 0;
+const definitionUtils_1 = __importDefault(require("../utils/definitionUtils"));
+const urlHelper_1 = require("../utils/urlHelper");
+const getQueryParamAsString = (query, name) => (query[name] ? query[name].toString() : null);
+const getDefinitionsPath = (query) => getQueryParamAsString(query, 'dataProductDefinitionsPath');
+const deriveDefinitionsPath = (query) => {
+    const definitionsPath = getDefinitionsPath(query);
+    if (definitionsPath) {
+        return definitionsPath;
+    }
+    return null;
+};
+exports.default = (services, config) => {
+    return async (req, res, next) => {
+        try {
+            await (0, exports.populateDefinitions)(services, req, res, config);
+            await (0, exports.populateRequestedReports)(services, res);
+            (0, exports.setRoutePrefix)(res, config);
+            return next();
+        }
+        catch (error) {
+            return next(error);
+        }
+    };
+};
+const setRoutePrefix = async (res, config) => {
+    res.locals.routePrefix = (0, urlHelper_1.getRoutePrefix)(config);
+};
+exports.setRoutePrefix = setRoutePrefix;
+const populateDefinitions = async (services, req, res, config) => {
+    // Get the DPD path from the query
+    const dpdPathFromQuery = deriveDefinitionsPath(req.query);
+    const dpdPathFromBody = req.body.dataProductDefinitionsPath;
+    const definitionsPathFromQuery = dpdPathFromQuery || dpdPathFromBody;
+    if (definitionsPathFromQuery) {
+        res.locals.dpdPathFromQuery = true;
+    }
+    // Get the DPD path from the config
+    const dpdPathFromConfig = config === null || config === void 0 ? void 0 : config.dprDataProductDefinitionPath;
+    if (dpdPathFromConfig) {
+        res.locals.dpdPathFromConfig = true;
+    }
+    // query takes presedence over config
+    res.locals.definitionsPath = definitionsPathFromQuery || dpdPathFromConfig;
+    res.locals.pathSuffix = `?dataProductDefinitionsPath=${res.locals.definitionsPath}`;
+    if (res.locals.user.token && services.reportingService) {
+        res.locals.definitions = await services.reportingService.getDefinitions(res.locals.user.token, res.locals.definitionsPath);
+    }
+};
+exports.populateDefinitions = populateDefinitions;
+const populateRequestedReports = async (services, res) => {
+    if (res.locals.user) {
+        const { uuid: userId } = res.locals.user;
+        const { definitions, definitionsPath } = res.locals;
+        const requested = await services.requestedReportService.getAllReports(userId);
+        res.locals.requestedReports = !definitionsPath
+            ? requested
+            : requested.filter((report) => {
+                return definitionUtils_1.default.getCurrentVariantDefinition(definitions, report.reportId, report.id);
+            });
+        const recent = await services.recentlyViewedService.getAllReports(userId);
+        res.locals.recentlyViewedReports = !definitionsPath
+            ? recent
+            : recent.filter((report) => {
+                return definitionUtils_1.default.getCurrentVariantDefinition(definitions, report.reportId, report.id);
+            });
+        if (services.bookmarkService) {
+            res.locals.bookmarkingEnabled = true;
+            const bookmarks = await services.bookmarkService.getAllBookmarks(userId);
+            res.locals.bookmarks = !definitionsPath
+                ? bookmarks
+                : bookmarks.filter((bookmark) => {
+                    return definitionUtils_1.default.getCurrentVariantDefinition(definitions, bookmark.reportId, bookmark.id);
+                });
+        }
+        if (services.downloadPermissionService) {
+            res.locals.downloadingEnabled = true;
+        }
+    }
+};
+exports.populateRequestedReports = populateRequestedReports;