@companieshouse/ch-node-utils 1.3.21 → 1.3.23

package/README.md

@@ -110,6 +110,7 @@ The macro requires the following parameters:
 - `displayYourCompanies`: A flag for displaying the "Your companies" menu item. It should be set to `'yes` if this menu iten needs to be displayed.
 - `displayUserManagementAdmin`: A flag for displaying the "User management admin" menu item. It should be set to `'yes` if this menu iten needs to be displayed.
 - `pageLanguage`: The language code for the page. (e.g. `'en'` or `'cy'`). This allows the language to be kept after navigating to the new service.
+- `accountUrl`: base URL to account service - ACCOUNT_URL
 
 #### Localization
 
@@ -123,6 +124,6 @@ The navbar also requires the use of styles provided in the [ch.gov.uk.css](https
 
 `<link href="{{ cdnHost }}/stylesheets/ch.gov.uk.css" rel="stylesheet"/>`
 
-It also requires the [navbar.js](https://github.com/companieshouse/cdn.ch.gov.uk/blob/master/app/assets/javascripts/lib/navbar.js) script to be added to the footer to make the navbar work in mobile mode
+It also requires the [navbar.js](https://github.com/companieshouse/cdn.ch.gov.uk/blob/master/app/assets/javascripts/lib/navbar.js) script to be added to the footer to make the navbar work in mobile mode (make sure it's the latest version).
 
 `<script src="{{ cdnHost }}/javascripts/lib/navbar.js"></script>`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@companieshouse/ch-node-utils",
-  "version": "1.3.21",
+  "version": "1.3.23",
   "author": "companieshouse",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

package/templates/navbar.njk

@@ -32,7 +32,8 @@ It receives:
     <div class="js-toggle-nav" id="global-nav">
         <nav role="navigation" class="content" aria-label="{{ lang.mainNavbar }}">
             {% if userDisplayText %}
-                <a href="#navigation" class="js-header-toggle menu">{{ userDisplayText }}
+                <a href="#navigation" role="button" aria-expanded="false" class="js-header-toggle menu">
+                    {{ userDisplayText }}
                     <span class="govuk-visually-hidden">{{ lang.clickToExpandOrCollapse }}</span>
                 </a>
             {% else %}
@@ -63,8 +64,9 @@ It receives:
 - displayYourCompanies: a flag indicating whether to display the 'Your companies' menu item
 - displayUserManagementAdmin: a flag indicating whether to display the 'User management admin' menu item
 - pageLanguage: the language code for the page (e.g. 'en', 'cy')
+- accountUrl: base URL to account service - ACCOUNT_URL
 #}
-{% macro addPredefinedNavbar(userDisplayText, chsMonitorGuiUrl, lang, displayAuthorisedAgent, displayYourCompanies, displayUserManagementAdmin, pageLanguage="en") %}
+{% macro addPredefinedNavbar(userDisplayText, chsMonitorGuiUrl, lang, displayAuthorisedAgent, displayYourCompanies, displayUserManagementAdmin, pageLanguage = "en", accountUrl) %}
     {% set menuItems = [
         { id: "user-management-admin", href: "/identity-verification?lang=" + pageLanguage, displayText: lang.userManagementAdmin or "User management admin" } if displayUserManagementAdmin === "yes",
         { id: "authorised-agent", href: "/authorised-agent?lang=" + pageLanguage, displayText: lang.authorisedAgent or "Authorised agent" } if displayAuthorisedAgent === "yes",
@@ -72,7 +74,7 @@ It receives:
         { id: "your-filings", href: "/user/transactions?lang=" + pageLanguage, displayText: lang.yourFilings or "Your filings" },
         { id: "companies-you-follow", href: chsMonitorGuiUrl, displayText: lang.companiesYouFollow or "Companies you follow" },
         { id: "basket", href: "/basket?lang=" + pageLanguage, displayText: lang.basket or "Basket" },
-        { id: "your-details", href: "/user/account?lang=" + pageLanguage, displayText: lang.manageAccount or "Manage account" },
+        { id: "your-details", href: accountUrl + "/user/account?lang=" + pageLanguage, displayText: lang.manageAccount or "Manage account" },
         { id: "user-signout", href: "/signout", displayText: lang.signOut or "Sign out" }
     ] | reject("falsy") %}