@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.13.16 → 4.13.17

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 (6) hide show
  1. package/dpr/all.scss +22 -20
  2. package/dpr/components/_reports/report-columns/view.njk +2 -2
  3. package/dpr/components/_reports/report-columns-form/view.njk +3 -1
  4. package/dpr/components/_reports/report-data-table/style.scss +24 -22
  5. package/dpr/components/_reports/report-heading/view.njk +1 -1
  6. package/package.json +1 -1
package/dpr/all.scss CHANGED
@@ -900,32 +900,34 @@ ul.dpr-card-group__item__filters-list {
900
900
  padding-top: govuk-spacing(1);
901
901
  }
902
902
 
903
- .dpr-child-report {
904
- border: 1px solid govuk-colour("mid-grey");
905
- margin-bottom: govuk-spacing(3);
903
+ .govuk-table__cell {
904
+ .dpr-child-report {
905
+ border: 1px solid govuk-colour("mid-grey");
906
+ margin-bottom: govuk-spacing(3);
906
907
 
907
- h2 {
908
- background-color: govuk-colour('light-grey');
909
- padding: govuk-spacing(2);
910
- padding-left: govuk-spacing(2);
911
- margin-bottom: govuk-spacing(0);
912
- }
908
+ h2 {
909
+ background-color: govuk-colour('light-grey');
910
+ padding: govuk-spacing(2);
911
+ padding-left: govuk-spacing(2);
912
+ margin-bottom: govuk-spacing(0);
913
+ margin-top: govuk-spacing(0);
914
+ }
913
915
 
914
- .dpr-child-report_table {
915
- padding: govuk-spacing(2);
916
+ .dpr-child-report_table {
917
+ padding: govuk-spacing(2);
916
918
 
917
- table {
918
- border: 0px;
919
- margin-bottom: 0px;
920
-
921
- tr:last-child {
922
- td {
923
- border-bottom: 0px;
924
- }
919
+ table {
920
+ border: 0px;
921
+ margin-bottom: 0px;
922
+
923
+ tr:last-child {
924
+ td {
925
+ border-bottom: 0px;
926
+ }
927
+ }
925
928
  }
926
929
  }
927
930
  }
928
-
929
931
  }
930
932
 
931
933
  .dpr-overflow-gradient {
package/dpr/components/_reports/report-columns/view.njk CHANGED
@@ -1,7 +1,7 @@
1
1
  {% from "../report-columns-form/view.njk" import dprColumnsForm %}
2
2
  {% from "govuk/components/details/macro.njk" import govukDetails %}
3
3
 
4
- {% macro dprReportColumns(columns) %}
4
+ {% macro dprReportColumns(columns, csrfToken) %}
5
5
  {% if columns and columns.options.length > 0 %}
6
6
  <div class="dpr-columns-section-wrapper">
7
7
  <div class="dpr-columns-section-heading">
@@ -10,7 +10,7 @@
10
10
 
11
11
 
12
12
  {% set columnsHtml %}
13
- {{ dprColumnsForm(columns) }}
13
+ {{ dprColumnsForm(columns, csrfToken) }}
14
14
  {% endset %}
15
15
 
16
16
  <div class="dpr-interactive-filters-accordion">
package/dpr/components/_reports/report-columns-form/view.njk CHANGED
@@ -1,13 +1,15 @@
1
1
  {% from "govuk/components/checkboxes/macro.njk" import govukCheckboxes %}
2
2
  {% from "govuk/components/button/macro.njk" import govukButton %}
3
3
 
4
- {% macro dprColumnsForm(columns) %}
4
+ {% macro dprColumnsForm(columns, csrfToken) %}
5
+ {% set csrfToken = columns.csrfToken %}
5
6
  {% set items = columns.options %}
6
7
  {% set name = columns.name %}
7
8
  {% set text = columns.text %}
8
9
  {% set values = columns.value %}
9
10
 
10
11
  <form data-dpr-module="columns" class="dpr-columns-form" method="post" action="./report/apply-columns">
12
+ <input type="hidden" name="_csrf" value="{{ csrfToken }}">
11
13
  <div class="columns-container">
12
14
  {{ govukCheckboxes({
13
15
  id: name,
package/dpr/components/_reports/report-data-table/style.scss CHANGED
@@ -45,32 +45,34 @@
45
45
  padding-top: govuk-spacing(1);
46
46
  }
47
47
 
48
- .dpr-child-report {
49
- border: 1px solid govuk-colour("mid-grey");
50
- margin-bottom: govuk-spacing(3);
51
-
52
- h2 {
53
- background-color: govuk-colour('light-grey');
54
- padding: govuk-spacing(2);
55
- padding-left: govuk-spacing(2);
56
- margin-bottom: govuk-spacing(0);
57
- }
48
+ .govuk-table__cell {
49
+ .dpr-child-report {
50
+ border: 1px solid govuk-colour("mid-grey");
51
+ margin-bottom: govuk-spacing(3);
58
52
 
59
- .dpr-child-report_table {
60
- padding: govuk-spacing(2);
61
-
62
- table {
63
- border: 0px;
64
- margin-bottom: 0px;
65
-
66
- tr:last-child {
67
- td {
68
- border-bottom: 0px;
69
- }
53
+ h2 {
54
+ background-color: govuk-colour('light-grey');
55
+ padding: govuk-spacing(2);
56
+ padding-left: govuk-spacing(2);
57
+ margin-bottom: govuk-spacing(0);
58
+ margin-top: govuk-spacing(0);
59
+ }
60
+
61
+ .dpr-child-report_table {
62
+ padding: govuk-spacing(2);
63
+
64
+ table {
65
+ border: 0px;
66
+ margin-bottom: 0px;
67
+
68
+ tr:last-child {
69
+ td {
70
+ border-bottom: 0px;
71
+ }
72
+ }
70
73
  }
71
74
  }
72
75
  }
73
-
74
76
  }
75
77
 
76
78
  .dpr-overflow-gradient {
package/dpr/components/_reports/report-heading/view.njk CHANGED
@@ -75,7 +75,7 @@
75
75
 
76
76
  <div class="dpr-report-interactive-actions">
77
77
  {% if count and count > 0 %}
78
- {{ dprReportColumns(columns) }}
78
+ {{ dprReportColumns(columns, csrfToken) }}
79
79
  {% endif %}
80
80
 
81
81
  {{ dprReportFilters(filterData, defaultQuery, csrfToken) }}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@ministryofjustice/hmpps-digital-prison-reporting-frontend",
3
3
  "description": "The Digital Prison Reporting Frontend contains templates and code to help display data effectively in UI applications.",
4
- "version": "4.13.16",
4
+ "version": "4.13.17",
5
5
  "main": "dpr/all.mjs",
6
6
  "sass": "dpr/all.scss",
7
7
  "engines": {