@vonaffenfels/contentful-teasermanager 1.2.1 → 1.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vonaffenfels/contentful-teasermanager",
-    "version": "1.2.1",
+    "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": "b06b79ed032fecf1dfeef2e7e312eb0d42f2e84e",
+    "gitHead": "89b263e6c6a0b3a1bb39eeb63abf8a8c00207416",
     "publishConfig": {
         "access": "public"
     }

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

@@ -53,10 +53,7 @@ export const LogicEditor = (props) => {
 const LogicEditorInner = ({
     onSave = () => alert("onSave missing"),
     sdk,
-    logicData = {
-        timepoints: [7, 12, 18],
-        tags: [],
-    },
+    logicData,
     selectedTags,
     setSelectedTags,
 }) => {
@@ -69,8 +66,12 @@ const LogicEditorInner = ({
     const debouncedSearch = useDebounce(searchQuery, 500);
     const [selectedTimepoints, setSelectedTimepoints] = useState([]);
     useEffect(() => {
-        setSelectedTimepoints(logicData?.timepoints || []);
-    }, [logicData?.timepoints]);
+        if (logicData?.timepoints) {
+            setSelectedTimepoints(logicData?.timepoints);
+        } else {
+            setSelectedTimepoints([7, 12, 18]);
+        }
+    }, [logicData]);
     const {
         setNodeRef: setOrNodeRef,
         isOver: isOrOver,
@@ -124,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 = {};
 
@@ -140,7 +141,7 @@ const LogicEditorInner = ({
                     }
                 }
 
-                return Object.values(allCategories);
+                return Object.values(allCategories).filter((c) => c.tags.length > 0);
             }),
         ]).then(([tags, categories]) => {
             setLoading(false);
@@ -288,7 +289,8 @@ const LogicEditorInner = ({
                                     setSelectedTags(newTags);
                                 }}
                             >
-                                {category.title} ({selectedTags.filter((t) => category.tags.some((c) => c.id === t.id)).length}/{category.tags.length})
+                                {category.title} ({selectedTags.filter((t) =>
+                                    category.tags.some((c) => c.id === t.id)).length}/{category.tags.length})
                             </Checkbox>
                         );
                     })}
@@ -342,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,
     };
@@ -390,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)];