fix(cms-base): prevent displaying empty elements (NTR)

shopware · Feb 20, 2023 · da2f689 · da2f689
1 parent 75877f9
commit da2f689
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/.changeset/poor-laws-bathe.md b/.changeset/poor-laws-bathe.md
@@ -0,0 +1,5 @@
+---
+"@shopware-pwa/cms-base": patch
+---
+
+Prevent displaying not mapped texts & images elements with no URL
diff --git a/.changeset/soft-seahorses-mate.md b/.changeset/soft-seahorses-mate.md
@@ -0,0 +1,5 @@
+---
+"@shopware-pwa/composables-next": patch
+---
+
+Prevent using mapped field configurations directly
diff --git a/packages/cms-base/components/public/cms/element/CmsElementImage.vue b/packages/cms-base/components/public/cms/element/CmsElementImage.vue
@@ -20,6 +20,7 @@ const {
 <template>
   <!-- TODO: using a tag only works with externalLink, need to improve this element to deal with both internalLink & externalLink -->
   <component
+    v-if="imageAttrs.src"
     class="cms-element-image relative"
     :is="imageLink.url ? 'a' : 'div'"
     :style="containerStyle"

diff --git a/packages/cms-base/components/public/cms/element/CmsElementText.vue b/packages/cms-base/components/public/cms/element/CmsElementText.vue
@@ -74,7 +74,7 @@ const CmsTextRender = () => {
       },
     },
   };
-  const rawHtml = mappedContent.value || "<div></div>";
+  const rawHtml = mappedContent.value?.length > 0 ? mappedContent.value : "<div></div>";
   return renderHtml(rawHtml, config, h, context);
 };
 </script>

diff --git a/packages/composables/src/cms/useCmsElementConfig.ts b/packages/composables/src/cms/useCmsElementConfig.ts
@@ -13,7 +13,9 @@ export function useCmsElementConfig<
   const getConfigValue = <ELEMENT_CONFIG extends keyof T["config"]>(
     key: ELEMENT_CONFIG
   ): typeof element.config[ELEMENT_CONFIG]["value"] => {
-    return element.config[key]?.value;
+    return (
+      element.config[key]?.source !== "mapped" && element.config[key]?.value
+    );
   };
 
   return {