@griddo/cx 1.67.7 → 1.67.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/cx",
   "description": "Griddo SSG based on Gatsby",
-  "version": "1.67.7",
+  "version": "1.67.10",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -64,7 +64,7 @@
     "react-helmet": "^6.0.0"
   },
   "devDependencies": {
-    "@griddo/eslint-config-back": "^1.67.7",
+    "@griddo/eslint-config-back": "^1.67.10",
     "eslint": "^7.5.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-react": "7.14.3",
@@ -96,5 +96,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1f30909d372622d6dac5eebcce131d7d6b086fd5"
+  "gitHead": "0036f6f3f22eb0d092654fe726253ef7323de09a"
 }

package/src/components/seo.js

@@ -30,6 +30,8 @@ export default function SEO(props) {
   const showMetaRobots =
     showBasicMetaRobots || metaRobots !== 'index,follow,translate';
 
+  const emptyCodeScript = { props: { dangerouslySetInnerHTML: {} } };
+
   const analyticsSrc =
     (analyticsScript &&
       analyticsScript.startsWith('UA-') &&
@@ -38,7 +40,9 @@ export default function SEO(props) {
   const analyticsCode =
     analyticsScript && !analyticsSrc && analyticsScript.includes('<script')
       ? parse(analyticsScript)
-      : { props: { dangerouslySetInnerHTML: {} } };
+      : emptyCodeScript;
+
+  const fixedAnalyticsCode = Array.isArray(analyticsCode) ? analyticsCode.find(item => item.type === 'script') || emptyCodeScript : analyticsCode;
 
   const {
     props: {
@@ -47,7 +51,7 @@ export default function SEO(props) {
       children: analyticsScriptChildren,
       ...analyticsScriptProps
     },
-  } = analyticsCode;
+  } = fixedAnalyticsCode;
 
   // Resize favicon
   // If favicon is a Griddo DAM url, returns a griddo image url with params,
@@ -107,8 +111,8 @@ export default function SEO(props) {
 
         {/* Data Layer */}
         {/* Solo cuando se ejecuta en el navegador */}
-        {typeof window !== 'undefined' && (
-          <script>{`const newDataLayer = ${analyticsDimensions};newDataLayer && window.dataLayer && window.dataLayer.push(newDataLayer);`}</script>
+        {typeof window !== 'undefined' && analyticsDimensions && (
+          <script>{`const {__HIDDEN, ...newDataLayer} = ${analyticsDimensions};newDataLayer && window.dataLayer && window.dataLayer.push(newDataLayer);`}</script>
         )}
       </Helmet>
     </>

package/src/components/template.js

@@ -32,11 +32,6 @@ export default data => {
     sitePages,
   } = data.pageContext;
 
-  const { analyticsScript, analyticsDimensions } = composeAnalytics(
-    data,
-    generateAutomaticDimensions
-  );
-
   const library = {
     components,
     templates,
@@ -44,6 +39,11 @@ export default data => {
 
   const mappedTheme = theme || 'default-theme';
 
+  const { analyticsScript, analyticsDimensions } = composeAnalytics(
+    data,
+    generateAutomaticDimensions
+  );
+
   if (!content.dimensions) content.dimensions = [];
   content.dimensions.values = analyticsDimensions;
 

package/src/services/navigation.js

@@ -15,13 +15,13 @@ class NavigationService {
   get navigations() {
     return this._navigations
   }
- 
+
   getDefaultFooters() {
     const safeFooters = [...this.navigations.footers];
     const defaultFooters = safeFooters.filter(footer => !!footer.setAsDefault);
     const defaultFootersByLang = defaultFooters.reduce((prev, footer) => {
       const { language } = footer;
-      return {...prev, [language]: footer };
+      return { ...prev, [language]: footer };
     }, {});
     return defaultFootersByLang;
   }
@@ -31,7 +31,7 @@ class NavigationService {
     const defaultHeaders = safeHeaders.filter(header => !!header.setAsDefault);
     const defaultHeadersByLang = defaultHeaders.reduce((prev, header) => {
       const { language } = header;
-      return {...prev, [language]: header };
+      return { ...prev, [language]: header };
     }, {});
     return defaultHeadersByLang;
   }
@@ -48,10 +48,10 @@ class NavigationService {
     return pageFooter;
   }
 
-  getPageNavigations (page) {
-    const { header: headerID, footer: footerID, language } = page;
-    const header = !!headerID ? this.getPageHeader(headerID): this._defaultHeaders[language];
-    const footer = !!footerID ? this.getPageFooter(footerID): this._defaultFooters[language];
+  getPageNavigations(page) {
+    const { header: headerID, footer: footerID, language } = page;
+    const header = headerID ? this.getPageHeader(headerID) : (headerID === 0 ? null : this._defaultHeaders[language]);
+    const footer = footerID ? this.getPageFooter(footerID) : (footerID === 0 ? null : this._defaultFooters[language]);
 
     return {
       header,