@vonaffenfels/contentful-teasermanager 1.2.19 → 1.2.22

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vonaffenfels/contentful-teasermanager",
-    "version": "1.2.19",
+    "version": "1.2.22",
     "main": "dist/index.js",
     "scripts": {
         "prepublish": "yarn run build",
@@ -102,7 +102,7 @@
         "contentful-resolve-response": "^1.9.2",
         "webpack": "5.88.2"
     },
-    "gitHead": "aa2e077d950ae577347ebe01cd13860321b5141b",
+    "gitHead": "1914d362b401e249ed1c116aef8e12d94311b4c7",
     "publishConfig": {
         "access": "public"
     }

package/src/components/Contentful/Dialog/LogicEditor.js

@@ -162,21 +162,28 @@ const LogicEditorInner = ({
                 if (!response?.items?.[0]) {
                     return [];
                 }
-
-                const references = await sdk.cma.entry.references({entryId: response.items[0].sys.id}, {include: 10});
-                const resolved = contentfulResolveResponse(references);
                 const allCategories = {};
 
-                for (const category of resolved) {
-                    if (!category?.fields?.children?.de) {
-                        continue;
-                    }
+                try {
+                // Use different include levels based on portal to avoid multilingual content bloat
+                    const includeLevel = portal === 'YACHT' ? 1 : 2;
+                    const references = await sdk.cma.entry.references({entryId: response.items[0].sys.id, include: includeLevel});
+                    const resolved = contentfulResolveResponse(references);
 
-                    const children = category.fields.children.de || [];
+                    for (const category of resolved) {
+                        if (!category?.fields?.children?.de) {
+                            continue;
+                        }
 
-                    for (const child of children) {
-                        getAllTagsFromCategory(child, allCategories);
+                        const children = category.fields.children.de || [];
+
+                        for (const child of children) {
+                            await getAllTagsFromCategory(child, allCategories, null, portal, sdk);
+                        }
                     }
+                } catch (e) {
+                    console.error("Error getting categories and tags from references: ", e);
+                    return [];
                 }
 
                 return Object.values(allCategories).filter((c) => c.tags.length > 0);
@@ -440,7 +447,7 @@ const LogicEditorInner = ({
     </div>;
 };
 
-function getAllTagsFromCategory(categoryNode, allCategories = {}, parentCategoryTitle = null) {
+async function getAllTagsFromCategory(categoryNode, allCategories = {}, parentCategoryTitle = null, portal = null, sdk = null) {
     if (!categoryNode || !categoryNode.fields?.children) {
         return allCategories;
     }
@@ -455,16 +462,47 @@ function getAllTagsFromCategory(categoryNode, allCategories = {}, parentCategory
     };
 
     if (categoryNode?.fields?.tags?.de) {
-        for (const tag of categoryNode.fields.tags.de) {
-            if (!tag?.fields?.title) {
-                continue;
+        const tagRefs = categoryNode.fields.tags.de;
+
+        if (portal === 'YACHT') {
+            // For YACHT portal, fetch all tag titles at once for better performance
+            const tagIds = tagRefs.map(tag => tag.sys.id).filter(id => id);
+
+            if (tagIds.length > 0) {
+                try {
+                    const tagPromises = tagIds.map(tagId =>
+                        sdk.cma.entry.get({entryId: tagId}).catch(() => null),
+                    );
+                    const fetchedTags = await Promise.all(tagPromises);
+
+                    fetchedTags.forEach((fetchedTag, index) => {
+                        if (fetchedTag?.fields?.title?.de) {
+                            const tagId = tagIds[index];
+                            if (!allCategories[categoryNode.sys.id].tags.find((c) => c.id === tagId)) {
+                                allCategories[categoryNode.sys.id].tags.push({
+                                    label: fetchedTag.fields.title.de,
+                                    id: tagId,
+                                });
+                            }
+                        }
+                    });
+                } catch (e) {
+                    console.error("Error fetching tags for YACHT portal:", e);
+                }
             }
+        } else {
+            // For non-YACHT portals, tags should have fields already included
+            for (const tag of tagRefs) {
+                if (!tag?.fields?.title) {
+                    continue;
+                }
 
-            if (!allCategories[categoryNode.sys.id].tags.find((c) => c.id === tag.sys.id)) {
-                allCategories[categoryNode.sys.id].tags.push({
-                    label: tag.fields.title.de,
-                    id: tag.sys.id,
-                });
+                if (!allCategories[categoryNode.sys.id].tags.find((c) => c.id === tag.sys.id)) {
+                    allCategories[categoryNode.sys.id].tags.push({
+                        label: tag.fields.title.de,
+                        id: tag.sys.id,
+                    });
+                }
             }
         }
     }
@@ -475,21 +513,52 @@ function getAllTagsFromCategory(categoryNode, allCategories = {}, parentCategory
         }
 
         if (child?.fields?.tags?.de) {
-            for (const tag of child.fields.tags.de) {
-                if (!allCategories[categoryNode.sys.id].tags.find((c) => c.id === tag.sys.id)) {
-                    if (!tag?.fields?.title) {
-                        continue;
-                    }
+            const childTagRefs = child.fields.tags.de;
 
-                    allCategories[categoryNode.sys.id].tags.push({
-                        label: tag.fields.title.de,
-                        id: tag.sys.id,
-                    });
+            if (portal === 'YACHT') {
+                // For YACHT portal, fetch child tag titles
+                const childTagIds = childTagRefs.map(tag => tag.sys.id).filter(id => id);
+
+                if (childTagIds.length > 0) {
+                    try {
+                        const childTagPromises = childTagIds.map(tagId =>
+                            sdk.cma.entry.get({entryId: tagId}).catch(() => null),
+                        );
+                        const fetchedChildTags = await Promise.all(childTagPromises);
+
+                        fetchedChildTags.forEach((fetchedTag, index) => {
+                            if (fetchedTag?.fields?.title?.de) {
+                                const tagId = childTagIds[index];
+                                if (!allCategories[categoryNode.sys.id].tags.find((c) => c.id === tagId)) {
+                                    allCategories[categoryNode.sys.id].tags.push({
+                                        label: fetchedTag.fields.title.de,
+                                        id: tagId,
+                                    });
+                                }
+                            }
+                        });
+                    } catch (e) {
+                        console.error("Error fetching child tags for YACHT portal:", e);
+                    }
+                }
+            } else {
+                // For non-YACHT portals, child tags should have fields already included
+                for (const tag of childTagRefs) {
+                    if (!allCategories[categoryNode.sys.id].tags.find((c) => c.id === tag.sys.id)) {
+                        if (!tag?.fields?.title) {
+                            continue;
+                        }
+
+                        allCategories[categoryNode.sys.id].tags.push({
+                            label: tag.fields.title.de,
+                            id: tag.sys.id,
+                        });
+                    }
                 }
             }
         }
 
-        getAllTagsFromCategory(child, allCategories, title);
+        await getAllTagsFromCategory(child, allCategories, title, portal, sdk);
     }
 
     allCategories[categoryNode.sys.id].tags = [...new Set(allCategories[categoryNode.sys.id].tags)];