@ministryofjustice/hmpps-digital-prison-reporting-frontend 3.28.0 → 3.28.2

package/dpr/assets/js/all.mjs

@@ -1410,7 +1410,7 @@ class DprAsyncRequestList extends DprPollingStatusClass {
         meta.map(async (metaData) => {
           if (metaData.status !== 'EXPIRED') {
             const response = await this.getExpiredStatus('/getRequestedExpiredStatus/', metaData, this.csrfToken);
-            if (response.isExpired) {
+            if (response && response.isExpired) {
               window.location.reload();
             }
           }
@@ -1500,7 +1500,7 @@ class DprRecentlyViewedList extends DprPollingStatusClass {
           meta.map(async (metaData) => {
             if (metaData.status !== 'EXPIRED') {
               const response = await this.getExpiredStatus('/getExpiredStatus/', metaData, this.csrfToken);
-              if (response.isExpired) {
+              if (response && response.isExpired) {
                 window.location.reload();
               }
             }

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

@@ -112,7 +112,7 @@ exports.default = {
         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) {
+        if (report && report.isExpired) {
             await services.asyncReportsStore.setToExpired(report.executionId, userId);
         }
         return report.isExpired;

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

@@ -108,7 +108,7 @@ export default {
   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) {
+    if (report && report.isExpired) {
       await services.asyncReportsStore.setToExpired(report.executionId, userId)
     }
     return report.isExpired

package/dpr/components/async-request-list/view.njk

@@ -1,7 +1,7 @@
 {% from "../user-list-content/view.njk" import dprUserList %}
 
 {% macro dprAsyncRequestList(args) %}
-  <div id="dpr-async-request-component" data-dpr-module="async-request-list" data-request-data='{{ meta | dump | safe }}' data-csrf-token="{{ csrfToken }}">
+  <div id="dpr-async-request-component" data-dpr-module="async-request-list" data-request-data='{{ args.meta | dump | safe }}' data-csrf-token="{{ args.csrfToken }}">
     {{ dprUserList(args) }}
   </div>
 {% endmacro %}

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

@@ -135,18 +135,6 @@
         }
       }) }}
 
-      <h2 class="govuk-fieldset__legend govuk-fieldset__legend--l">Can you provide your outputs?</h2>
-
-      <p>If you have previously downloaded reports in the past, and produced any outputs from the data. e.g visualisations, combined reports, documents etc. we would be interested in seeing them.</p>
-      <p>Please email us at <a href="mailto:digitalprisonreporting@digital.justice.gov.uk?subject=DPR%20Download%20Feedback%20Documents">digitalprisonreporting@digital.justice.gov.uk</a> with your attachments.</p>
-      
-      {{ govukWarningText({
-        text: "Do not send any documents that contain sensitive data",
-        iconFallbackText: "Warning",
-        classes: 'govuk-!-margin-bottom-8'
-      }) }}
-
-
       {{ govukButton({
         text: "Submit feedback",
         classes: "govuk-button--primary govuk-!-margin-bottom-0",

package/dpr/components/download-message/view.njk

@@ -7,11 +7,11 @@
   {% set tableId = reportData.tableId %}
   {% set html %}
     <h2 class="govuk-heading-m govuk-!-margin-bottom-2">Download coming soon</h2>
-    <p class="govuk-body">Download functionality is currently disabled on all reports. However, we are working hard to provide this feature for you.</p>
+    <p class="govuk-body">You cannot download reports from this service currently. This functionality will be available very soon. You can still download reports in NOMIS in the meantime.</p>
     
     {# NOTE: 👇🏽 Below is the messaging + link to the feedback form. Uncomment once form is completed 👇🏽 #}
     <h2 class="govuk-heading-s govuk-!-margin-bottom-2">Help us improve our service</h2>
-    <p class="govuk-body">We would like to understand more about your reasons for downloading this report. Please take 5 minutes to fill out a feedback form and help us improve our service to you, and provide features that will better suit your needs.</p>
+    <p class="govuk-body">We would like to understand more about your reasons for downloading this report. Please take a moment to fill out a feedback form and help us improve our service to you, and provide features that will better suit your needs.</p>
     <a href="/download/{{reportId}}/{{variantId}}/{{tableId}}/feedback" class="govuk-button govuk-!-margin-bottom-1" data-module="govuk-button">
       Leave feedback
     </a>

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

@@ -70,7 +70,7 @@ exports.default = {
         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) {
+        if (report && report.isExpired) {
             await services.recentlyViewedStoreService.setToExpired(report.executionId, userId);
         }
         return report.isExpired;

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

@@ -61,7 +61,7 @@ export default {
     const report = await getExpiredStatus({ req, res, services })
     const userId = res.locals.user?.uuid ? res.locals.user.uuid : 'userId'
 
-    if (report.isExpired) {
+    if (report && report.isExpired) {
       await services.recentlyViewedStoreService.setToExpired(report.executionId, userId)
     }
     return report.isExpired

package/dpr/components/recently-viewed-list/view.njk

@@ -1,7 +1,7 @@
 {% from "../user-list-content/view.njk" import dprUserList %}
 
 {% macro dprRecentlyViewedList(args) %}
-  <div id="dpr-recently-viewed-component" data-dpr-module="recently-viewed-list" data-request-data='{{ meta | dump | safe }}' data-csrf-token="{{ csrfToken }}">
+  <div id="dpr-recently-viewed-component" data-dpr-module="recently-viewed-list" data-request-data='{{ args.meta | dump | safe }}' data-csrf-token="{{ args.csrfToken }}">
     {{ dprUserList(args) }}
   </div>
 {% endmacro %}

package/dpr/components/report-actions/utils.js

@@ -66,6 +66,9 @@ const initReportActions = ({ reportName, variantName, printable, url, executionI
         href: url,
     });
     // Downloadable
+    // NOTE: Temporarily disabling for release 25
+    // eslint-disable-next-line no-param-reassign
+    downloadable = false;
     actions.push({
         ...BUTTON_TEMPLATES.downloadable,
         disabled: !downloadable,

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

@@ -87,6 +87,9 @@ const initReportActions = ({
   })
 
   // Downloadable
+  // NOTE: Temporarily disabling for release 25
+  // eslint-disable-next-line no-param-reassign
+  downloadable = false
   actions.push({
     ...BUTTON_TEMPLATES.downloadable,
     disabled: !downloadable,

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.28.0",
+  "version": "3.28.2",
   "main": "dpr/assets/js/all.mjs",
   "sass": "dpr/all.scss",
   "engines": {