Update the primary nav for sections

Author: Demotive

app/views/_includes/primary-navigation.html

@@ -1,47 +1,55 @@
-{{ header({
-  account: {
-    items: [
-      {
-        text: "West Berkshire BSO"
-      },
-      {
-        href: "#",
-        text: "Thomas Pynchon",
-        icon: true
-      },
-      {
-        href: "/",
-        text: "Log out"
-      }
-    ]
-  },
-  service: {
-    text: serviceName,
-    href: "/"
-  },
-  navigation: {
-    items: [
-      {
-        href: "#",
-        text: "Dashboard"
-      },
-      {
-        href: "#",
-        text: "Manage batches"
-      },
-      {
-        href: "#",
-        text: "Manage clinics"
-      },
-      {
-        href: "#",
-        text: "Manage other stuff",
-        active: true
-      },
-      {
-        href: "#",
-        text: "Reports"
-      }
-    ]
-  }
-}) }}
+{% from 'header/macro.njk' import header %}
+
+{% macro primaryNavigation(activeItem, serviceName) %}
+  {{ header({
+    account: {
+      items: [
+        {
+          text: "West Berkshire BSO"
+        },
+        {
+          href: "#",
+          text: "Thomas Pynchon",
+          icon: true
+        },
+        {
+          href: "/",
+          text: "Log out"
+        }
+      ]
+    },
+    service: {
+      text: serviceName,
+      href: "/"
+    },
+    navigation: {
+      items: [
+        {
+          href: "#",
+          text: "Dashboard",
+          active: activeItem === "Dashboard"
+        },
+        {
+          href: "#",
+          text: "Manage batches",
+          active: activeItem === "Manage batches"
+        },
+        {
+          href: "#",
+          text: "Manage clinics",
+          active: activeItem === "Manage clinics"
+        },
+        {
+          href: "#",
+          text: "Manage other stuff",
+          active: activeItem === "Manage other stuff"
+        },
+        {
+          href: "#",
+          text: "Reports",
+          active: activeItem === "Reports"
+        }
+      ]
+    }
+  }) }}
+{% endmacro %}

app/views/batches/batch-new.html

@@ -19,8 +19,9 @@
 -->
 {% set pageName = "West Berks mobile screening unit name" %}
 
+{% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {% include "_includes/primary-navigation.html" %}
+  {{ primaryNavigation("Manage batches", serviceName) }}
 {% endblock %}
 
 <!-- For adding a breadcrumb or back link -->

app/views/bso-objects/bso/bso-internal-details.html

@@ -25,8 +25,9 @@
   <link rel="stylesheet" href="https://unpkg.com/maplibre-gl@5.3.0/dist/maplibre-gl.css" />
 {% endblock %}
 
+{% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {% include "_includes/primary-navigation.html" %}
+  {{ primaryNavigation("Manage other stuff", serviceName) }}
 {% endblock %}
 
 <!-- For adding a breadcrumb or back link -->

app/views/bso-objects/bso/bso-public-details.html

@@ -19,8 +19,9 @@
 -->
 {% set pageName = "West Berkshire Screening Service" %}
 
+{% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {% include "_includes/primary-navigation.html" %}
+  {{ primaryNavigation("Manage other stuff", serviceName) }}
 {% endblock %}
 
 <!-- For adding a breadcrumb or back link -->

app/views/bso-objects/index.html

@@ -19,8 +19,9 @@
 -->
 {% set pageName = "Manage other stuff" %}
 
+{% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {% include "_includes/primary-navigation.html" %}
+  {{ primaryNavigation("Manage other stuff", serviceName) }}
 {% endblock %}
 
 <!-- For adding a breadcrumb or back link -->

app/views/bso-objects/location/location-listing.html

@@ -19,8 +19,9 @@
 -->
 {% set pageName = "Units" %}
 
+{% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {% include "_includes/primary-navigation.html" %}
+  {{ primaryNavigation("Manage other stuff", serviceName) }}
 {% endblock %}
 
 <!-- For adding a breadcrumb or back link -->

app/views/bso-objects/location/location-location-details.html

@@ -25,8 +25,9 @@
   <link rel="stylesheet" href="https://unpkg.com/maplibre-gl@5.3.0/dist/maplibre-gl.css" />
 {% endblock %}
 
+{% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {% include "_includes/primary-navigation.html" %}
+  {{ primaryNavigation("Manage other stuff", serviceName) }}
 {% endblock %}
 
 <!-- For adding a breadcrumb or back link -->

app/views/bso-objects/location/location-travel-and-transport.html

@@ -19,8 +19,9 @@
 -->
 {% set pageName = "Camberwell Building" %}
 
+{% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {% include "_includes/primary-navigation.html" %}
+  {{ primaryNavigation("Manage other stuff", serviceName) }}
 {% endblock %}
 
 <!-- For adding a breadcrumb or back link -->

app/views/bso-objects/unit/unit-internal-details.html

@@ -19,8 +19,9 @@
 -->
 {% set pageName = "West Berks mobile screening unit name" %}
 
+{% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {% include "_includes/primary-navigation.html" %}
+  {{ primaryNavigation("Manage other stuff", serviceName) }}
 {% endblock %}
 
 <!-- For adding a breadcrumb or back link -->

app/views/bso-objects/unit/unit-listing.html

@@ -19,8 +19,9 @@
 -->
 {% set pageName = "Units" %}
 
+{% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {% include "_includes/primary-navigation.html" %}
+  {{ primaryNavigation("Manage other stuff", serviceName) }}
 {% endblock %}
 
 <!-- For adding a breadcrumb or back link -->