Refactor selector to wrap with custom data

register-dynamics · Sep 10, 2024 · 742fba4 · 742fba4
1 parent 39f71ad
commit 742fba4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/lib/importer/govuk-prototype-kit.config.json b/lib/importer/govuk-prototype-kit.config.json
@@ -60,6 +60,10 @@
       "macroName": "importerTableView",
       "importFrom": "importer/macros/table_view.njk"
     },
+    {
+      "macroName": "importerHeaderSelector",
+      "importFrom": "importer/macros/header_selector.njk"
+    },
     {
       "macroName": "importerRangeSelector",
       "importFrom": "importer/macros/range_selector.njk"

diff --git a/lib/importer/nunjucks/importer/macros/header_selector.njk b/lib/importer/nunjucks/importer/macros/header_selector.njk
@@ -0,0 +1,8 @@
+
+{% from "importer/macros/range_selector.njk" import importerRangeSelector %}
+
+{% macro importerHeaderSelector(data, start=0, end=10) %}
+    {% set rows = importerGetRows(data, start, end) %}
+
+    {{ importerRangeSelector(rows) }}
+{% endmacro %}
diff --git a/lib/importer/nunjucks/importer/macros/range_selector.njk b/lib/importer/nunjucks/importer/macros/range_selector.njk
@@ -1,6 +1,5 @@
 
-{% macro importerRangeSelector(data, start=0, end=10) %}
-    {% set rows = importerGetRows(data, start, end) %}
+{% macro importerRangeSelector(rows, start=0, end=10) %}
 
 <div>
     <input type="hidden" name="importer:selection:TLRow" id="importer:selection:TLRow"/>

diff --git a/prototypes/basic/app/views/select_header_row.html b/prototypes/basic/app/views/select_header_row.html
@@ -10,7 +10,7 @@
 {{ govukBackLink({ text: "Back", href: "javascript:window.history.back()" }) }}
 {% endblock %}
 
-{% from "importer/macros/range_selector.njk" import importerRangeSelector %}
+{% from "importer/macros/header_selector.njk" import importerHeaderSelector %}
 
 {% block content %}
 <div class="govuk-grid-row">
@@ -23,7 +23,7 @@ <h1 class="govuk-fieldset__heading">
 
         <form action="{{ importerSelectHeaderPath('/mapping') }}" method="post">
             <div class="govuk-form-group">
-                {{ importerRangeSelector(data, 0, 10) }}
+                {{ importerHeaderSelector(data, 0, 10) }}
             </div>
 
             <div class="govuk-button-group">