@griddo/cx 1.69.7 → 1.71.0

package/gatsby-node.js

@@ -101,6 +101,7 @@ exports.createPages = async ({ actions }) => {
     const {
       cloudinaryName,
       useMetaTitle,
+      showBasicMetaRobots,
     } = SettingsService.settings;
 
     NavService.navigations = {
@@ -121,7 +122,6 @@ exports.createPages = async ({ actions }) => {
       favicon,
     };
 
-    const showBasicMetaRobots = process.env.showBasicMetaRobots !== 'off';
     const siteScript = siteInfo.siteScript;
 
     let additionalInfo = {
@@ -134,8 +134,10 @@ exports.createPages = async ({ actions }) => {
       siteLangs,
       cloudinaryName,
       componentsVersion,
-      showBasicMetaRobots,
-      useMetaTitle,
+      siteOptions: {
+        useMetaTitle,
+        showBasicMetaRobots,
+      },
       BUILD_MODE,
       siteScript
     };

package/package.json

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

package/src/components/seo.js

@@ -13,20 +13,22 @@ export default function SEO(props) {
       title,
       index,
       follow,
+      translate,
       metasAdvanced,
       pageLanguages,
       canonical,
-      notranslate,
     },
     fullUrl,
-    showBasicMetaRobots,
     analyticsDimensions,
     analyticsScript,
-    useMetaTitle,
+    siteOptions: {
+      useMetaTitle,
+      showBasicMetaRobots,
+    },
   } = props;
 
   const metaRobots = cleanCommaSeparated(
-    `${index}, ${follow}, ${notranslate}, ${metasAdvanced}`
+    `${index},${follow},${translate},${metasAdvanced}`
   );
   const showMetaRobots =
     showBasicMetaRobots || metaRobots !== 'index,follow,translate';
@@ -120,4 +122,4 @@ export default function SEO(props) {
       </Helmet>
     </>
   );
-}
+}

package/src/components/template.js

@@ -22,10 +22,9 @@ export default data => {
     footer,
     siteMetadata,
     componentsVersion,
-    showBasicMetaRobots,
     theme,
     cloudinaryName,
-    useMetaTitle,
+    siteOptions,
     socials,
     siteLangs,
     BUILD_MODE,
@@ -75,10 +74,9 @@ export default data => {
         fullPath={content.fullPath}
         fullUrl={content.fullUrl}
         componentsVersion={componentsVersion}
-        showBasicMetaRobots={showBasicMetaRobots}
         analyticsDimensions={analyticsDimensions}
         analyticsScript={analyticsScript}
-        useMetaTitle={useMetaTitle}
+        siteOptions={siteOptions}
       />
       <RenderGriddoPage
         content={content}

package/src/utils/helpers.js

@@ -9,8 +9,7 @@ const log = (state, message, data) => {
   LOGS !== false &&
     state !== 'error' &&
     console.log(
-      `${chalk[color[state]](msg[state])} ${message} ${
-        data ? JSON.stringify(data, null, 2) : ''
+      `${chalk[color[state]](msg[state])} ${message} ${data ? JSON.stringify(data, null, 2) : ''
       }`
     );
 };
@@ -24,7 +23,7 @@ const addCloudinaryParams = (socialImage, params) => {
   return `https://${head}/${params}${fullId}`;
 };
 
-const getPageMetaData = params  => {
+const getPageMetaData = params => {
   const {
     title,
     metaTitle,
@@ -37,9 +36,14 @@ const getPageMetaData = params  => {
     metasAdvanced,
     pageLanguages,
     fullUrl,
-    noTranslate,
   } = params;
 
+  const metasAdvancedList = metasAdvanced
+    ?.split(',')
+    .filter(item => !!item)
+    .map(item => item.trim().toLowerCase())
+    || [];
+
   return {
     title: metaTitle || title,
     description: metaDescription,
@@ -47,14 +51,14 @@ const getPageMetaData = params  => {
       canonicalURL && canonicalURL !== fullUrl
         ? canonicalURL
         : isIndexed
-        ? fullUrl
-        : null,
+          ? fullUrl
+          : null,
     locale,
     url,
     index: isIndexed ? 'index' : 'noindex',
     follow: follow ? 'follow' : 'nofollow',
-    notranslate: noTranslate ? 'notranslate' : 'translate',
-    metasAdvanced,
+    translate: metasAdvancedList.includes('notranslate') ? 'notranslate' : 'translate',
+    metasAdvanced: metasAdvancedList.filter(item => item !== 'notranslate').join(),
     pageLanguages,
   };
 };

package/src/utils/pages.js

@@ -23,9 +23,8 @@ async function renderSinglePage(page, additionalInfo, createPage) {
     siteLangs,
     navigations: { header, footer },
     cloudinaryName,
-    useMetaTitle,
+    siteOptions,
     componentsVersion,
-    showBasicMetaRobots,
     BUILD_MODE,
     sitePages,
     siteScript,
@@ -72,10 +71,9 @@ async function renderSinglePage(page, additionalInfo, createPage) {
       socials,
       siteLangs,
       cloudinaryName,
-      useMetaTitle,
+      siteOptions,
       BUILD_MODE,
       componentsVersion,
-      showBasicMetaRobots,
       sitePages,
       siteScript,