@ministryofjustice/hmpps-digital-prison-reporting-frontend 3.32.13 → 3.32.15

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

@@ -169,7 +169,7 @@ const getReport = async ({ req, res, services }) => {
     return { renderData };
 };
 const setActions = (csrfToken, variant, requestData, columns, canDownload, count, currentUrl, currentQueryParams) => {
-    const { reportName, name, id, variantId, reportId, executionId, dataProductDefinitionsPath, url } = requestData;
+    const { reportName, name, id, variantId, reportId, tableId, executionId, dataProductDefinitionsPath, url } = requestData;
     const requestUrl = url.request.fullUrl;
     const { printable } = variant;
     const ID = variantId || id;
@@ -180,6 +180,7 @@ const setActions = (csrfToken, variant, requestData, columns, canDownload, count
         csrfToken,
         reportId,
         id: ID,
+        tableId,
         columns: columns.value,
         definitionPath: dataProductDefinitionsPath,
         loadType: UserReports_1.LoadType.ASYNC,

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

@@ -245,7 +245,8 @@ const setActions = (
   currentUrl: string,
   currentQueryParams: string,
 ) => {
-  const { reportName, name, id, variantId, reportId, executionId, dataProductDefinitionsPath, url } = requestData
+  const { reportName, name, id, variantId, reportId, tableId, executionId, dataProductDefinitionsPath, url } =
+    requestData
   const requestUrl = url.request.fullUrl
   const { printable } = variant
   const ID = variantId || id
@@ -257,6 +258,7 @@ const setActions = (
     csrfToken,
     reportId,
     id: ID,
+    tableId,
     columns: columns.value,
     definitionPath: dataProductDefinitionsPath,
     loadType: LoadType.ASYNC,

package/dpr/components/_reports/report-actions/types.d.ts

@@ -7,6 +7,7 @@ export interface DownloadActionParams {
   reportName: string
   name: string
   id: string
+  tableId?: string
   columns: string[]
   definitionPath: string
   canDownload: boolean

package/dpr/routes/download.js

@@ -69,7 +69,9 @@ function routes({ router, layoutPath, services, templatePath = 'dpr/views/', })
         const userId = ((_a = res.locals.user) === null || _a === void 0 ? void 0 : _a.uuid) ? res.locals.user.uuid : 'userId';
         const { reportId, variantId } = req.params;
         const { reportName, variantName, reportUrl, reportSearch } = req.query;
-        const reportHref = reportSearch ? `${reportUrl}${decodeURIComponent(reportSearch)}` : `${reportUrl}`;
+        const reportHref = reportSearch
+            ? `${reportUrl}?reportSearch=${decodeURIComponent(reportSearch)}`
+            : `${reportUrl}`;
         await services.downloadPermissionService.saveDownloadPermissionData(userId, reportId, variantId);
         res.render(`${templatePath}feedback-form-success`, {
             title: 'success',

package/dpr/routes/download.ts

@@ -87,7 +87,9 @@ export default function routes({
     const userId = res.locals.user?.uuid ? res.locals.user.uuid : 'userId'
     const { reportId, variantId } = req.params
     const { reportName, variantName, reportUrl, reportSearch } = req.query
-    const reportHref = reportSearch ? `${reportUrl}${decodeURIComponent(<string>reportSearch)}` : `${reportUrl}`
+    const reportHref = reportSearch
+      ? `${reportUrl}?reportSearch=${decodeURIComponent(<string>reportSearch)}`
+      : `${reportUrl}`
 
     await services.downloadPermissionService.saveDownloadPermissionData(userId, reportId, variantId)
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ministryofjustice/hmpps-digital-prison-reporting-frontend",
   "description": "The Digital Prison Reporting Frontend contains templates and code to help display data effectively in UI applications.",
-  "version": "3.32.13",
+  "version": "3.32.15",
   "main": "dpr/assets/js/all.mjs",
   "sass": "dpr/all.scss",
   "engines": {