From 3463bb7f4d799591e7b9cce6768483f8efee5b1a Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Tue, 21 Mar 2023 17:58:42 +0100 Subject: [PATCH] Fixed some bugs in importers and in the Categorization step --- ccm-cms/package-lock.json | 4 +-- ccm-cms/package.json | 2 +- .../documents/CategorizationStep.java | 7 +++++ .../documents/CategorizationTreeNode.java | 26 +++++++++---------- .../categorization/CategoryImExporter.java | 11 ++++---- .../categorization/DomainImExporter.java | 3 +-- 6 files changed, 29 insertions(+), 24 deletions(-) diff --git a/ccm-cms/package-lock.json b/ccm-cms/package-lock.json index a9dd1a8e3..97fea6b7a 100644 --- a/ccm-cms/package-lock.json +++ b/ccm-cms/package-lock.json @@ -1,12 +1,12 @@ { "name": "@librecms/ccm-cms", - "version": "7.0.0-SNAPSHOT.2023-03-20T173612", + "version": "7.0.0-SNAPSHOT.2023-03-21T165148", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@librecms/ccm-cms", - "version": "7.0.0-SNAPSHOT.2023-03-20T173612", + "version": "7.0.0-SNAPSHOT.2023-03-21T165148", "license": "LGPL-3.0-or-later", "dependencies": { "@tiptap/core": "^2.0.0-beta.127", diff --git a/ccm-cms/package.json b/ccm-cms/package.json index 03b3ecc07..488caad80 100644 --- a/ccm-cms/package.json +++ b/ccm-cms/package.json @@ -1,6 +1,6 @@ { "name": "@librecms/ccm-cms", - "version": "7.0.0-SNAPSHOT.2023-03-20T173612", + "version": "7.0.0-SNAPSHOT.2023-03-21T165148", "description": "JavaScript stuff for ccm-cms", "main": "target/generated-resources/assets/@content-sections/cms-admin.js", "types": "target/generated-resources/assets/@content-sections/cms-admin.d.ts", diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CategorizationStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CategorizationStep.java index 5cdceb408..d7f26a40c 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CategorizationStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CategorizationStep.java @@ -359,6 +359,13 @@ public class CategorizationStep extends AbstractMvcAuthoringStep { .map(this::buildCategorizationTreeNode) .collect(Collectors.toList()) ); + node.setSubCategoryAssigned( + node + .getSubCategories() + .stream() + .map(subNode -> subNode.isAssigned() || subNode.isSubCategoryAssigned()) + .reduce(false, (value1, value2) -> value1 || value2) + ); // node.setSubCategoryAssigned( // isSubCategoryAssigned(category) //// category diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CategorizationTreeNode.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CategorizationTreeNode.java index 0f5909d05..b467b7a0a 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CategorizationTreeNode.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CategorizationTreeNode.java @@ -71,11 +71,11 @@ public class CategorizationTreeNode { */ private boolean assigned; -// /** -// * Is any subcategory of the category represented by this node assigned to -// * the current content item? -// */ -// private boolean subCategoryAssigned; + /** + * Is any subcategory of the category represented by this node assigned to + * the current content item? + */ + private boolean subCategoryAssigned; /** * Nodes for the subcategories of the category represented by this node. @@ -139,16 +139,16 @@ public class CategorizationTreeNode { } public boolean isSubCategoryAssigned() { -// return subCategoryAssigned; - return subCategories - .stream() - .map(CategorizationTreeNode::isAssigned) - .reduce(false, (value1, value2) -> value1 || value2); + return subCategoryAssigned; +// return subCategories +// .stream() +// .map(CategorizationTreeNode::isAssigned) +// .reduce(false, (value1, value2) -> value1 || value2); } -// public void setSubCategoryAssigned(final boolean subCategoryAssigned) { -// this.subCategoryAssigned = subCategoryAssigned; -// } + public void setSubCategoryAssigned(final boolean subCategoryAssigned) { + this.subCategoryAssigned = subCategoryAssigned; + } public List getSubCategories() { return Collections.unmodifiableList(subCategories); diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryImExporter.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryImExporter.java index 1ae43bcf3..47475f5b0 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryImExporter.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryImExporter.java @@ -24,7 +24,6 @@ import org.libreccm.imexport.Processes; import java.util.Objects; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; @@ -48,11 +47,11 @@ public class CategoryImExporter extends AbstractEntityImExporter { @Override @PostConstruct protected void init() { - addRequiredEntities( - Set.of( - Domain.class - ) - ); +// addRequiredEntities( +// Set.of( +// Domain.class +// ) +// ); } @Override diff --git a/ccm-core/src/main/java/org/libreccm/categorization/DomainImExporter.java b/ccm-core/src/main/java/org/libreccm/categorization/DomainImExporter.java index 417bab8a0..9693f0740 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/DomainImExporter.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/DomainImExporter.java @@ -24,7 +24,6 @@ import org.libreccm.imexport.Processes; import java.util.Objects; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; @@ -48,7 +47,7 @@ public class DomainImExporter extends AbstractEntityImExporter { @Override @PostConstruct protected void init() { - //Nothing + addRequiredEntities(Set.of(Category.class)); } @Override