Separate warning and error lists

register-dynamics · Sep 19, 2024 · c7dd752 · c7dd752
1 parent 9502656
commit c7dd752
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 49 deletions.
diff --git a/lib/importer/govuk-prototype-kit.config.json b/lib/importer/govuk-prototype-kit.config.json
@@ -83,8 +83,12 @@
       "importFrom": "importer/macros/range_selector.njk"
     },
     {
-      "macroName": "importerMappingReview",
-      "importFrom": "importer/macros/mapping_review.njk"
+      "macroName": "importerMappingWarningList",
+      "importFrom": "importer/macros/mapping_warning_list.njk"
+    },
+    {
+      "macroName": "importerMappingErrorList",
+      "importFrom": "importer/macros/mapping_error_list.njk"
     }
   ]
 }
diff --git a/lib/importer/index.js b/lib/importer/index.js
@@ -102,12 +102,17 @@ exports.Initialise = (config, router, prototypeKit) => {
   //--------------------------------------------------------------------
   // Returns warnings or errors arising from applying a mapping.
   //--------------------------------------------------------------------
-  prototypeKit.views.addFunction("importerMappingFailures", (data) => {
-    if (data[MAPPING_ERROR_KEY] || data[MAPPING_WARNING_KEY]) {
-      return {
-        warnings: data[MAPPING_WARNING_KEY],
-        errors: data[MAPPING_ERROR_KEY]
-      };
+  prototypeKit.views.addFunction("importerMappingErrors", (data) => {
+    if (data[MAPPING_ERROR_KEY]) {
+        return data[MAPPING_ERROR_KEY]
+    }
+
+    return false;
+  }, {})
+
+  prototypeKit.views.addFunction("importerMappingWarnings", (data) => {
+    if (data[MAPPING_WARNING_KEY]) {
+        return data[MAPPING_WARNING_KEY]
     }
 
     return false;

diff --git a/lib/importer/nunjucks/importer/macros/mapping_error_list.njk b/lib/importer/nunjucks/importer/macros/mapping_error_list.njk
@@ -0,0 +1,19 @@
+
+
+{#
+    Shows errors generated when attempting to
+    perform a mapping
+#}
+{% macro importerMappingErrorList(data) %}
+    {% set errors = importerMappingErrors(data) %}
+    {% if errors %}
+    <div>
+        <h2 class="govuk-heading-m">Errors</h2>
+        <ul>
+            {% for error in errors %}
+            <li>{{ error }}</li>
+            {% endfor %}
+        </ul>
+    <div>
+    {% endif %}
+{% endmacro %}
diff --git a/lib/importer/nunjucks/importer/macros/mapping_review.njk b/lib/importer/nunjucks/importer/macros/mapping_review.njk
diff --git a/lib/importer/nunjucks/importer/macros/mapping_warning_list.njk b/lib/importer/nunjucks/importer/macros/mapping_warning_list.njk
@@ -0,0 +1,19 @@
+
+
+{#
+    Shows warnings generated when attempting to
+    perform a mapping
+#}
+{% macro importerMappingWarningList(data) %}
+    {% set warnings = importerMappingWarnings(data) %}
+    {% if warnings %}
+    <div>
+        <h2 class="govuk-heading-m">Warnings</h2>
+        <ul>
+            {% for warning in warnings %}
+            <li>{{ warning }}</li>
+            {% endfor %}
+        </ul>
+    <div>
+    {% endif %}
+{% endmacro %}
diff --git a/lib/importer/templates/review.html b/lib/importer/templates/review.html
@@ -1,5 +1,6 @@
 {% extends "layouts/main.html" %}
-{% from "importer/macros/mapping_review.njk" import importerMappingReview %}
+{% from "importer/macros/mapping_warning_list.njk" import importerMappingWarningList %}
+{% from "importer/macros/mapping_error_list.njk" import importerMappingErrorList %}
 
 
 {% block pageTitle %} {{ serviceName }} – GOV.UK Prototype Kit {% endblock %}
@@ -12,7 +13,9 @@
     <div class="govuk-grid-column-two-thirds">
         <h1 class="govuk-heading-l">Review your data</h1>
 
-        {{ importerMappingReview(data) }}
+        {{ importerMappingWarningList(data) }}
+
+        {{ importerMappingErrorList(data) }}
 
     </div>
 </div>

diff --git a/prototypes/basic/app/views/review.html b/prototypes/basic/app/views/review.html
@@ -1,5 +1,6 @@
 {% extends "layouts/main.html" %}
-{% from "importer/macros/mapping_review.njk" import importerMappingReview %}
+{% from "importer/macros/mapping_warning_list.njk" import importerMappingWarningList %}
+{% from "importer/macros/mapping_error_list.njk" import importerMappingErrorList %}
 
 
 {% block pageTitle %} {{ serviceName }} – GOV.UK Prototype Kit {% endblock %}
@@ -12,13 +13,10 @@
     <div class="govuk-grid-column-two-thirds">
         <h1 class="govuk-heading-l">Review your data</h1>
 
-        {{ importerMappingReview(data) }}
+        {{ importerMappingWarningList(data) }}
+
+        {{ importerMappingErrorList(data) }}
 
-        <form action="{{ importerReviewDataPath('/success') }}" method="post">
-            <div class="govuk-button-group">
-                {{ govukButton({ text: "Submit" }) }}
-            </div>
-        </form>
     </div>
 </div>
 {% endblock %}