Simplify template logic for header component

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 :wrench: **Fixes**
 
+- Remove the boolean `showNav`, `showSearch` and `transactional` options from the header component. Respective parts of the header are now shown if values for `primaryLinks`, `search` or `transactionalService` options are provided. Additionally, the `searchAction` option is renamed `search.action` and the `searchInputName` option is renamed `search.name`. Finally, the label, button and placeholder text for the search input can be updated using the new `search.visuallyHiddenLabel`, `search.visuallyHiddenButton` and `search.placeholder` options. ([PR 996](https://github.com/nhsuk/nhsuk-frontend/pull/996))
 - Update header styles so that `.nhsuk-header__search-no-nav` class is no longer needed when header contains a search field but no navigation ([PR 1046](https://github.com/nhsuk/nhsuk-frontend/pull/1046))
 - Update navigation list item padding to vertically align navigation items with width container ([PR 1033](https://github.com/nhsuk/nhsuk-frontend/pull/1033))
 

app/_templates/page.njk

@@ -38,11 +38,8 @@
   }) }}
 
   {{ header({
-    "showNav": "false",
-    "showSearch": "false",
     "homeHref": baseUrl
-    })
-  }}
+  }) }}
 {% endblock %}
 
 

app/components/all.njk

@@ -36,8 +36,7 @@
   }) }}
 
   {{ header({
-      "showNav": "true",
-      "showSearch": "true",
+      "search": true,
       "primaryLinks": [
         {
           "url"  : "https://www.nhs.uk/conditions",

app/components/header/header-logo.njk

@@ -5,10 +5,6 @@
 
 {% block body %}
 
-  {{ header({
-      "showNav": "false",
-      "showSearch": "false"
-    })
-  }}
+  {{ header() }}
 
 {% endblock %}

app/components/header/header-navigation.njk

@@ -6,8 +6,6 @@
 {% block body %}
 
   {{ header({
-      "showNav": "true",
-      "showSearch": "false",
       "primaryLinks": [
         {
           "url"  : "https://www.nhs.uk/conditions",

app/components/header/header-org-white-nav.njk

@@ -6,8 +6,6 @@
 {% block body %}
 
 {{ header({
-    "showNav": "true",
-    "showSearch": "true",
     "classes": "nhsuk-header--white nhsuk-header--white-nav",
     "organisation": {
       "name": "Anytown Anyplace",
@@ -35,7 +33,10 @@
         'url' : '#',
         'label' : 'Our research'
       }
-    ]
+    ],
+    "search": {
+      "visuallyHiddenLabel": "Search the Anytown Anyplace Anywhere website"
+    }
   })
 }}
 

app/components/header/header-org-white.njk

@@ -6,8 +6,6 @@
 {% block body %}
 
 {{ header({
-    "showNav": "true",
-    "showSearch": "true",
     "classes": "nhsuk-header--white",
     "organisation": {
       "name": "Anytown Anyplace",
@@ -35,7 +33,10 @@
         'url' : '#',
         'label' : 'Our research'
       }
-    ]
+    ],
+    "search": {
+      "visuallyHiddenLabel": "Search the Anytown Anyplace Anywhere website"
+    }
   })
 }}
 

app/components/header/header-org.njk

@@ -6,8 +6,6 @@
 {% block body %}
 
 {{ header({
-    "showNav": "true",
-    "showSearch": "true",
     "organisation": {
       "name": "Anytown Anyplace",
       "split": "Anywhere",
@@ -34,7 +32,10 @@
         'url' : '#',
         'label' : 'Our research'
       }
-    ]
+    ],
+    "search": {
+      "visuallyHiddenLabel": "Search the Anytown Anyplace Anywhere website"
+    }
   })
 }}
 

app/components/header/header-search.njk

@@ -6,35 +6,7 @@
 {% block body %}
 
   {{ header({
-      "showNav": "false",
-      "showSearch": "true",
-      "primaryLinks": [
-        {
-          "url"  : "https://www.nhs.uk/conditions",
-          "label" : "Health A-Z"
-        },
-        {
-          'url' : 'https://www.nhs.uk/live-well/',
-          'label' : 'Live Well'
-        },
-        {
-          'url' : 'https://www.nhs.uk/mental-health/',
-          'label' : 'Mental health'
-        },
-        {
-          'url'  : 'https://www.nhs.uk/conditions/social-care-and-support/',
-          'label' : 'Care and support'
-        },
-        {
-          'url'  : 'https://www.nhs.uk/pregnancy/',
-          'label' : 'Pregnancy'
-        },
-        {
-          'url' : 'https://www.nhs.uk/nhs-services/',
-          'label' : 'NHS services'
-        }
-      ]
-    })
-  }}
+    "search": true
+  }) }}
 
 {% endblock %}

app/components/header/header-service-name-with-nav.njk

@@ -9,8 +9,9 @@
     "service": {
       "name": "Digital service manual"
     },
-    "showNav": "true",
-    "showSearch": "true",
+    "search": {
+      "visuallyHiddenLabel": "Search the NHS digital service manual"
+    },
     "primaryLinks": [
         {
           "url"  : "#",

app/components/header/header-service-name.njk

@@ -6,10 +6,9 @@
 {% block body %}
 
   {{ header({
-      "service": {
-        "name": "Prototype kit"
-      }
-    })
-  }}
+    "service": {
+      "name": "Prototype kit"
+    }
+  }) }}
 
 {% endblock %}

app/components/header/header-transactional-service-name.njk

@@ -6,12 +6,9 @@
 {% block body %}
 
   {{ header({
-      "transactionalService": {
-        "name": "Find your NHS number"
-      },
-      "showNav": "false",
-      "showSearch": "false"
-    })
-  }}
+    "transactionalService": {
+      "name": "Find your NHS number"
+    }
+  }) }}
 
 {% endblock %}

app/components/header/index.njk

@@ -6,35 +6,33 @@
 {% block body %}
 
   {{ header({
-      "showNav": "true",
-      "showSearch": "true",
-      "primaryLinks": [
-        {
-          "url"  : "https://www.nhs.uk/conditions",
-          "label" : "Health A-Z"
-        },
-        {
-          'url' : 'https://www.nhs.uk/live-well/',
-          'label' : 'Live Well'
-        },
-        {
-          'url' : 'https://www.nhs.uk/mental-health/',
-          'label' : 'Mental health'
-        },
-        {
-          'url'  : 'https://www.nhs.uk/conditions/social-care-and-support/',
-          'label' : 'Care and support'
-        },
-        {
-          'url'  : 'https://www.nhs.uk/pregnancy/',
-          'label' : 'Pregnancy'
-        },
-        {
-          'url' : 'https://www.nhs.uk/nhs-services/',
-          'label' : 'NHS services'
-        }
-      ]
-    })
-  }}
+    "search": true,
+    "primaryLinks": [
+      {
+        "url"  : "https://www.nhs.uk/conditions",
+        "label" : "Health A-Z"
+      },
+      {
+        'url' : 'https://www.nhs.uk/live-well/',
+        'label' : 'Live Well'
+      },
+      {
+        'url' : 'https://www.nhs.uk/mental-health/',
+        'label' : 'Mental health'
+      },
+      {
+        'url'  : 'https://www.nhs.uk/conditions/social-care-and-support/',
+        'label' : 'Care and support'
+      },
+      {
+        'url'  : 'https://www.nhs.uk/pregnancy/',
+        'label' : 'Pregnancy'
+      },
+      {
+        'url' : 'https://www.nhs.uk/nhs-services/',
+        'label' : 'NHS services'
+      }
+    ]
+  }) }}
 
 {% endblock %}