Simplify template logic for header component

paulrobertlloyd · paulrobertlloyd · commit f36ceb3d6bc1 · 2024-10-31T15:01:57.000Z
diff --git a/app/_templates/page.njk b/app/_templates/page.njk
@@ -38,11 +38,8 @@
   }) }}
 
   {{ header({
-    "showNav": "false",
-    "showSearch": "false",
     "homeHref": baseUrl
-    })
-  }}
+  }) }}
 {% endblock %}
 
 
diff --git a/app/components/all.njk b/app/components/all.njk
@@ -36,8 +36,7 @@
   }) }}
 
   {{ header({
-      "showNav": "true",
-      "showSearch": "true",
+      "search": true,
       "primaryLinks": [
         {
           "url"  : "https://www.nhs.uk/conditions",
diff --git a/app/components/header/header-logo.njk b/app/components/header/header-logo.njk
@@ -5,10 +5,6 @@
 
 {% block body %}
 
-  {{ header({
-      "showNav": "false",
-      "showSearch": "false"
-    })
-  }}
+  {{ header() }}
 
 {% endblock %}
diff --git a/app/components/header/header-navigation.njk b/app/components/header/header-navigation.njk
@@ -6,8 +6,6 @@
 {% block body %}
 
   {{ header({
-      "showNav": "true",
-      "showSearch": "false",
       "primaryLinks": [
         {
           "url"  : "https://www.nhs.uk/conditions",
diff --git a/app/components/header/header-org-white-nav.njk b/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"
+    }
   })
 }}
 
diff --git a/app/components/header/header-org-white.njk b/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"
+    }
   })
 }}
 
diff --git a/app/components/header/header-org.njk b/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"
+    }
   })
 }}
 
diff --git a/app/components/header/header-search.njk b/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 %}
diff --git a/app/components/header/header-service-name-with-nav.njk b/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"  : "#",
diff --git a/app/components/header/header-service-name.njk b/app/components/header/header-service-name.njk
@@ -6,10 +6,9 @@
 {% block body %}
 
   {{ header({
-      "service": {
-        "name": "Prototype kit"
-      }
-    })
-  }}
+    "service": {
+      "name": "Prototype kit"
+    }
+  }) }}
 
 {% endblock %}
diff --git a/app/components/header/header-transactional-service-name.njk b/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 %}
diff --git a/app/components/header/index.njk b/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 %}
diff --git a/packages/components/header/README.md b/packages/components/header/README.md
diff --git a/packages/components/header/template.njk b/packages/components/header/template.njk

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,7 @@`
`36`	`36`	`}) }}`
`37`	`37`
`38`	`38`	`{{ header({`
`39`		`- "showNav": "true",`
`40`		`- "showSearch": "true",`
	`39`	`+ "search": true,`
`41`	`40`	`"primaryLinks": [`
`42`	`41`	`{`
`43`	`42`	`"url" : "https://www.nhs.uk/conditions",`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@`
`6`	`6`	`{% block body %}`
`7`	`7`
`8`	`8`	`{{ header({`
`9`		`- "showNav": "true",`
`10`		`- "showSearch": "false",`
`11`	`9`	`"primaryLinks": [`
`12`	`10`	`{`
`13`	`11`	`"url" : "https://www.nhs.uk/conditions",`