Update components to use meta getFallback option

hlxsites · Sep 13, 2024 · 35cd8cc · 35cd8cc
1 parent 28e345c
commit 35cd8cc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 23 deletions.
diff --git a/blocks/breadcrumbs/breadcrumbs.js b/blocks/breadcrumbs/breadcrumbs.js
@@ -28,12 +28,8 @@ export default class Breadcrumbs extends ComponentBase {
     this.classList.add('full-width');
     this.classList.add('breadcrumbs');
     const { origin, pathname } = window.location;
-    let breadcrumbRoot = getMeta(metaTags.breadcrumbRoot.metaName);
-    if (breadcrumbRoot) {
-      breadcrumbRoot = breadcrumbRoot?.starsWith('/') ? breadcrumbRoot : `/${breadcrumbRoot}`;
-    } else {
-      breadcrumbRoot = metaTags.breadcrumbRoot.fallbackContent;
-    }
+    let breadcrumbRoot = getMeta(metaTags.breadcrumbRoot.metaName, { getFallback: true });
+    breadcrumbRoot = breadcrumbRoot?.startsWith('/') ? breadcrumbRoot : `/${breadcrumbRoot}`;
 
     this.pathPages = `${origin}${pathname}`.split(`${origin}${breadcrumbRoot}`).join('/').split('/');
     this.innerHTML = `

diff --git a/blocks/footer/footer.js b/blocks/footer/footer.js
@@ -1,9 +1,7 @@
 import ComponentBase from '../../scripts/component-base.js';
 import { getMeta, metaTags } from '../../scripts/libs.js';
 
-const { metaName, fallbackContent } = metaTags.footer;
-const metaFooter = getMeta(metaName);
-const metaFragment = !!metaFooter && `${metaFooter}.plain.html`;
+const metaFooter = getMeta(metaTags.footer.metaName, { getFallback: true });
 export default class Footer extends ComponentBase {
   static loaderConfig = {
     ...ComponentBase.loaderConfig,
@@ -12,7 +10,7 @@ export default class Footer extends ComponentBase {
     },
   };
 
-  fragmentPath = metaFragment || `${fallbackContent}.plain.html`;
+  fragmentPath = `${metaFooter}.plain.html`;
 
   extendConfig() {
     return [

diff --git a/blocks/header/header.js b/blocks/header/header.js
@@ -1,9 +1,7 @@
 import ComponentBase from '../../scripts/component-base.js';
 import { eagerImage, getMeta, metaTags } from '../../scripts/libs.js';
 
-const { metaName, fallbackContent } = metaTags.header;
-const metaHeader = getMeta(metaName);
-const metaFragment = !!metaHeader && `${metaHeader}.plain.html`;
+const metaHeader = getMeta(metaTags.header.metaName, { getFallback: true });
 export default class Header extends ComponentBase {
   static loaderConfig = {
     ...ComponentBase.loaderConfig,
@@ -20,7 +18,7 @@ export default class Header extends ComponentBase {
     },
   };
 
-  fragmentPath = metaFragment || `${fallbackContent}.plain.html`;
+  fragmentPath = `${metaHeader}.plain.html`;
 
   dependencies = ['navigation', 'image'];
 

diff --git a/blocks/icon/icon.js b/blocks/icon/icon.js
@@ -1,10 +1,7 @@
 import ComponentBase from '../../scripts/component-base.js';
-import { flatAsValue, isObject, stringToJsVal , getMeta, metaTags} from '../../scripts/libs.js';
-
-const { metaName, fallbackContent } = metaTags.icons;
-const metaIcons = getMeta(metaName);
-const metaPath = !!metaIcons && `${metaIcons}`;
+import { flatAsValue, isObject, stringToJsVal, getMeta, metaTags } from '../../scripts/libs.js';
 
+const metaIcons = getMeta(metaTags.icons.metaName, { getFallback: true });
 export default class Icon extends ComponentBase {
   static observedAttributes = ['data-active', 'data-icon'];
 
@@ -50,7 +47,7 @@ export default class Icon extends ComponentBase {
   }
 
   iconUrl(iconName) {
-    const path = metaPath || fallbackContent;
+    const path = `${metaIcons}`;
     return `${path}/${iconName}.svg`;
   }
 

diff --git a/scripts/libs/external-config.js b/scripts/libs/external-config.js
@@ -16,9 +16,9 @@ export const externalConfig = {
 
   async loadConfig() {
     window.raqnComponentsConfig ??= (async () => {
-      const { metaName, fallbackContent } = metaTags.themecomponent;
-      const metaConfigPath = getMeta(metaName);
-      const configPath = (!!metaConfigPath && `${metaConfigPath}.json`) || `${fallbackContent}.json`;
+      const { metaName } = metaTags.themeConfigComponent;
+      const metaConfigPath = getMeta(metaName, { getFallback: true });
+      const configPath = `${metaConfigPath}.json`;
       let result = null;
       try {
         const response = await fetch(`${configPath}`);