Some fixes to the menu

Author: fe-lix-

blocks/cards/cards.js

@@ -2,7 +2,7 @@ import { createOptimizedPicture, getMetadata } from '../../scripts/lib-franklin.
 
 // domain to be used when not being the CDN stitching
 const edsDomain = 'main--24petwatch--hlxsites.hlx.live';
-const isCanada = window.location.pathname.startsWith('/ca/');
+const isCanada = window.location.pathname.startsWith('/ca/') || window.location.pathname === '/ca';
 
 async function getTagFilters() {
   let index = new URL(`${isCanada ? '/ca' : ''}/blog/tag-filters.json`, window.location.origin);

blocks/header/header.js

@@ -196,6 +196,24 @@ function instrumentTrackingEvents(header) {
     });
 }
 
+/**
+ * instruments the tracking in the header
+ * @param {Element} header The header block element
+ */
+function updateCountryLink(nav) {
+  const isCanada = window.location.pathname.startsWith('/ca/') || window.location.pathname === '/ca';
+  const baseDomain = !window.location.port
+    ? `${window.location.protocol}//${window.location.hostname}`
+    : `${window.location.protocol}//${window.location.hostname}:${window.location.port}`;
+  nav.querySelectorAll('a').forEach((anchor) => {
+    if (isCanada && (anchor.href.startsWith(baseDomain) || anchor.href.startsWith('/'))) {
+      const url = new URL(anchor.href);
+      url.pathname = `/ca${url.pathname}`;
+      anchor.href = url.toString();
+    }
+  });
+}
+
 /**
  * decorates the header, mainly the nav
  * @param {Element} block The header block element
@@ -280,6 +298,8 @@ export default async function decorate(block) {
     decorateButtons(nav);
     decorateLinks(nav);
     instrumentTrackingEvents(nav);
+    updateCountryLink(nav);
+
     const navWrapper = document.createElement('div');
     navWrapper.className = 'nav-wrapper';
     navWrapper.append(nav);

tools/importer/transformers/header.js

@@ -15,15 +15,23 @@ const createHeader = async (main, document) => {
 
     main.append(document.createElement('hr'));
 
-    main.append(document.querySelector('ul.cmp-navigation__group'));
+    const blog = document.createElement('li');
+
+    // Force append blog to the end of the navigation group
+    blog.innerHTML = '<a href="/blog" class="cmp-navigation__item-link">Blog</a>';
+    const navigationGroup = document.querySelector('ul.cmp-navigation__group');
+    navigationGroup.children[navigationGroup.children.length - 1].before(blog);
+
+    main.append(navigationGroup);
 
     main.append(document.createElement('hr'));
 
     const ul = document.createElement('ul');
     document.querySelectorAll('div.page-header__notificationBar > div > div').forEach((element) => {
       if (!element.classList.contains('languagenavigation')) {
         const li = document.createElement('li');
-        li.append(element);
+        const link = element.querySelector('a');
+        li.append(link);
         ul.append(li);
       }
     });

tools/importer/transformers/index.js

@@ -9,7 +9,6 @@ import createMetadata from './metadata.js';
 import cleanUpHTML from './cleanUpHTML.js';
 
 export const transformers = [
-  cleanUpHTML,
   createFullLayoutSection,
   createHero,
   createHomepage,
@@ -31,4 +30,5 @@ export const preTransformers = [
 
 export const postTransformers = [
   createMetadata,
+  cleanUpHTML,
 ];