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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (68) hide show
  1. package/dpr/all.mjs +8 -11
  2. package/dpr/all.scss +27 -27
  3. package/dpr/assets/css/all.css +1 -1
  4. package/dpr/assets/js/all.mjs +8 -11
  5. package/dpr/components/_async/async-filters-form/view.njk +4 -1
  6. package/dpr/components/_async/async-polling/utils.js +1 -2
  7. package/dpr/components/_async/async-polling/utils.ts +1 -3
  8. package/dpr/components/_async/async-report/utils.js +15 -13
  9. package/dpr/components/_async/async-report/utils.ts +15 -9
  10. package/dpr/components/_async/async-request/utils.js +17 -19
  11. package/dpr/components/_async/async-request/utils.ts +23 -29
  12. package/dpr/components/_catalogue/catalogue/types.js +2 -0
  13. package/dpr/components/_catalogue/catalogue/types.ts +6 -0
  14. package/dpr/components/_catalogue/catalogue/utils.js +26 -0
  15. package/dpr/components/_catalogue/catalogue/utils.ts +36 -0
  16. package/dpr/components/_catalogue/catalogue/view.njk +19 -0
  17. package/dpr/components/_catalogue/catalogue-how-to-use/view.njk +35 -0
  18. package/dpr/components/{reports-list → _catalogue/catalogue-list}/utils.js +9 -10
  19. package/dpr/components/{reports-list → _catalogue/catalogue-list}/utils.ts +16 -12
  20. package/dpr/components/{reports-list → _catalogue/catalogue-list}/view.njk +4 -3
  21. package/dpr/components/_catalogue/catalogue-search/view.njk +36 -0
  22. package/dpr/components/_catalogue/catalogue-unauthorised-toggle/view.njk +22 -0
  23. package/dpr/components/user-reports/bookmarks/utils.js +6 -6
  24. package/dpr/components/user-reports/bookmarks/utils.ts +8 -6
  25. package/dpr/components/user-reports/requested/utils.ts +0 -1
  26. package/dpr/components/user-reports/utils.js +3 -4
  27. package/dpr/components/user-reports/utils.ts +3 -3
  28. package/dpr/data/dashboardClient.js +17 -6
  29. package/dpr/data/dashboardClient.ts +26 -6
  30. package/dpr/data/reportDataStore.js +5 -3
  31. package/dpr/data/reportDataStore.ts +5 -3
  32. package/dpr/data/reportingClient.js +24 -12
  33. package/dpr/data/reportingClient.ts +32 -12
  34. package/dpr/data/restClient.js +10 -2
  35. package/dpr/data/restClient.ts +10 -2
  36. package/dpr/middleware/populateDefinitions.js +30 -11
  37. package/dpr/middleware/populateDefinitions.ts +47 -12
  38. package/dpr/middleware/populateRequestedReports.js +17 -12
  39. package/dpr/middleware/populateRequestedReports.ts +17 -13
  40. package/dpr/routes/download.js +2 -2
  41. package/dpr/routes/download.ts +3 -2
  42. package/dpr/services/dashboardService.js +3 -3
  43. package/dpr/services/dashboardService.ts +11 -4
  44. package/dpr/services/reportingService.js +2 -2
  45. package/dpr/services/reportingService.ts +2 -1
  46. package/dpr/services/requestedReportService.js +5 -3
  47. package/dpr/services/requestedReportService.ts +8 -6
  48. package/dpr/types/UserReports.ts +1 -0
  49. package/dpr/utils/ReportStoreServiceUtils.ts +1 -1
  50. package/dpr/utils/UserStoreItemBuilder.js +14 -8
  51. package/dpr/utils/UserStoreItemBuilder.ts +15 -9
  52. package/dpr/utils/definitionUtils.ts +2 -0
  53. package/dpr/utils/localsHelper.js +5 -2
  54. package/dpr/utils/localsHelper.ts +6 -4
  55. package/dpr/utils/logger.js +1 -1
  56. package/dpr/utils/logger.ts +1 -1
  57. package/dpr/utils/reportListsHelper.js +9 -3
  58. package/dpr/utils/reportListsHelper.ts +8 -9
  59. package/dpr/utils/requestStatusHelper.js +10 -12
  60. package/dpr/utils/requestStatusHelper.ts +17 -11
  61. package/dpr/views/async-reports.njk +2 -2
  62. package/package.json +1 -1
  63. package/package.zip +0 -0
  64. package/dpr/components/search/view.njk +0 -45
  65. package/dpr/middleware/asyncMiddleware.js +0 -8
  66. package/dpr/middleware/asyncMiddleware.ts +0 -7
  67. package/dpr/utils/AsyncReportsServiceUtils.js +0 -30
  68. package/dpr/utils/AsyncReportsServiceUtils.ts +0 -27
package/dpr/all.mjs CHANGED
@@ -98,9 +98,9 @@ class CardGroup extends DprClientClass {
98
98
 
99
99
  /* eslint-disable class-methods-use-this */
100
100
 
101
- class Search extends DprClientClass {
101
+ class DprCatalogueSearch extends DprClientClass {
102
102
  static getModuleName() {
103
- return 'search'
103
+ return 'dpr-catalogue-search'
104
104
  }
105
105
 
106
106
  initialise() {
@@ -473,18 +473,15 @@ class DprQueryParamClass extends DprClientClass {
473
473
  * @memberof DprQueryParamClass
474
474
  */
475
475
  clearQueryParams(type) {
476
- const sacredParams = ['dataProductDefinitionsPath'];
477
476
  this.queryParams = new URLSearchParams(window.location.search);
478
477
  const params = Array.from(this.queryParams);
479
478
 
480
479
  params.forEach((p) => {
481
- if (!sacredParams.includes(p[0])) {
482
- if (type && p[0].includes(type)) {
483
- this.queryParams.delete(p[0], p[1]);
484
- }
485
- if (type === 'filters') {
486
- this.queryParams.delete('preventDefault');
487
- }
480
+ if (type && p[0].includes(type)) {
481
+ this.queryParams.delete(p[0], p[1]);
482
+ }
483
+ if (type === 'filters') {
484
+ this.queryParams.delete('preventDefault');
488
485
  }
489
486
  });
490
487
  window.history.replaceState(null, null, `?${this.queryParams.toString()}`);
@@ -2640,7 +2637,7 @@ function initAll() {
2640
2637
  Pagination,
2641
2638
  DataTable,
2642
2639
  DprAsyncPolling,
2643
- Search,
2640
+ DprCatalogueSearch,
2644
2641
  BookmarkToggle,
2645
2642
  DateInput,
2646
2643
  DprAsyncRequestList,
package/dpr/all.scss CHANGED
@@ -551,33 +551,6 @@ $moj-images-path: '/assets/images/';
551
551
  }
552
552
  }
553
553
 
554
- .dpr-search-table {
555
- .dpr-product-head, .dpr-name-head {
556
- min-width: 200px;
557
- }
558
- td.govuk-table__cell {
559
- font-size: 16px;
560
- padding: 20px 20px 20px 0
561
- }
562
-
563
- .govuk-table__cell:last-child {
564
- padding-right: 0px !important;
565
- text-align: right;
566
- }
567
- }
568
-
569
- .search-option-hide {
570
- display: none;
571
- }
572
-
573
- .dpr-search-inputs {
574
- position: relative;
575
- display: grid;
576
- grid-template-columns: 2fr 1fr;
577
- column-gap: govuk-spacing(3);
578
- row-gap: govuk-spacing(3);
579
- }
580
-
581
554
  .dpr-show-more {
582
555
  .dpr-show-hide-button {
583
556
  display: inline-block
@@ -804,6 +777,33 @@ ul.dpr-card-group__item__filters-list {
804
777
  font-size: 14px;
805
778
  }
806
779
 
780
+ .dpr-search-table {
781
+ .dpr-product-head, .dpr-name-head {
782
+ min-width: 200px;
783
+ }
784
+ td.govuk-table__cell {
785
+ font-size: 16px;
786
+ padding: 20px 20px 20px 0
787
+ }
788
+
789
+ .govuk-table__cell:last-child {
790
+ padding-right: 0px !important;
791
+ text-align: right;
792
+ }
793
+ }
794
+
795
+ .search-option-hide {
796
+ display: none;
797
+ }
798
+
799
+ .dpr-search-inputs {
800
+ position: relative;
801
+ display: grid;
802
+ grid-template-columns: 2fr 1fr;
803
+ column-gap: govuk-spacing(3);
804
+ row-gap: govuk-spacing(3);
805
+ }
806
+
807
807
  .chart-canvas {
808
808
  height: 100% !important;
809
809
  width: 100% !important;