@vonaffenfels/contentful-teasermanager 1.2.2 → 1.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vonaffenfels/contentful-teasermanager",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "main": "dist/index.js",
     "scripts": {
         "prepublish": "yarn run build",
@@ -101,7 +101,7 @@
         "contentful-resolve-response": "^1.9.2",
         "webpack": "5.88.2"
     },
-    "gitHead": "1e99cab528da01b06334b55df31f21305222e6b8",
+    "gitHead": "89b263e6c6a0b3a1bb39eeb63abf8a8c00207416",
     "publishConfig": {
         "access": "public"
     }

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

@@ -125,7 +125,7 @@ const LogicEditorInner = ({
                     return [];
                 }
 
-                const references = await sdk.cma.entry.references({entryId: response.items[0].sys.id}, {include: 7});
+                const references = await sdk.cma.entry.references({entryId: response.items[0].sys.id}, {include: 10});
                 const resolved = contentfulResolveResponse(references);
                 const allCategories = {};
 
@@ -141,7 +141,7 @@ const LogicEditorInner = ({
                     }
                 }
 
-                return Object.values(allCategories);
+                return Object.values(allCategories).filter((c) => c.tags.length > 0);
             }),
         ]).then(([tags, categories]) => {
             setLoading(false);
@@ -266,16 +266,11 @@ const LogicEditorInner = ({
                         return (
                             <Checkbox
                                 key={category.id}
-                                isChecked={selectedTags.some((t) => category.tags.some((c) => c.id === t.id) || t.id === category.id)}
+                                isChecked={selectedTags.some((t) => category.tags.some((c) => c.id === t.id))}
                                 onChange={(e) => {
                                     let newTags = [...selectedTags];
 
                                     if (e.target.checked) {
-                                        newTags.push({
-                                            label: category.title,
-                                            id: category.id,
-                                            type: "or",
-                                        });
                                         for (const tag of category.tags) {
                                             if (!selectedTags.find((t) => t.id === tag.id)) {
                                                 newTags.push({
@@ -286,8 +281,6 @@ const LogicEditorInner = ({
                                             }
                                         }
                                     } else {
-                                        newTags = newTags.filter((t) => t.id !== category.id);
-
                                         for (const tag of category.tags) {
                                             newTags = newTags.filter((t) => t.id !== tag.id);
                                         }
@@ -297,7 +290,7 @@ const LogicEditorInner = ({
                                 }}
                             >
                                 {category.title} ({selectedTags.filter((t) =>
-                                    category.tags.some((c) => c.id === t.id) || t.id === category.id).length}/{category.tags.length + 1})
+                                    category.tags.some((c) => c.id === t.id)).length}/{category.tags.length})
                             </Checkbox>
                         );
                     })}
@@ -351,15 +344,16 @@ const LogicEditorInner = ({
     </div>;
 };
 
-function getAllTagsFromCategory(categoryNode, allCategories = {}) {
+function getAllTagsFromCategory(categoryNode, allCategories = {}, parentCategoryTitle = null) {
     if (!categoryNode || !categoryNode.fields?.children) {
         return allCategories;
     }
 
     const children = categoryNode.fields.children.de || [];
+    const title = parentCategoryTitle ? `${parentCategoryTitle} > ${categoryNode.fields.title.de}` : categoryNode.fields.title.de;
 
     allCategories[categoryNode.sys.id] = {
-        title: categoryNode.fields.title.de,
+        title,
         tags: [],
         id: categoryNode.sys.id,
     };
@@ -399,7 +393,7 @@ function getAllTagsFromCategory(categoryNode, allCategories = {}) {
             }
         }
 
-        getAllTagsFromCategory(child, allCategories);
+        getAllTagsFromCategory(child, allCategories, title);
     }
 
     allCategories[categoryNode.sys.id].tags = [...new Set(allCategories[categoryNode.sys.id].tags)];