QA-15345: Handle merges of static definitions from fieldsets for prim…

…ary node type and mixins correctly. (#1768) * QA-15345: Handle merges of static definitions from fieldsets for primary node type and mixins correctly. * QA-15345: rollback plugin * QA-15345: Fix issues with Resource bundle key resolution across the board * QA-15345: Add new test to validate overrides are working as expected in Content Editor * QA-15345: fix linting * Add clean-up revisions --------- Co-authored-by: Geofrey Flores <gflores@jahia.com>
Jahia · Nov 5, 2024 · 3cfa47c · 3cfa47c
1 parent 5474c82
commit 3cfa47c
Show file tree

Hide file tree

Showing 19 changed files with 477 additions and 39 deletions.
diff --git a/pom.xml b/pom.xml
@@ -48,7 +48,7 @@
         <jahia-module-type>system</jahia-module-type>
         <yarn.arguments>build:production</yarn.arguments>
         <require-capability>osgi.extender;filter:="(osgi.extender=org.jahia.bundles.blueprint.extender.config)"</require-capability>
-        <jahia-module-signature>MCwCFD/TCIKGNSSOq8Iga3EphH2K/YE0AhQQMkqhiwmB8gZTgPTeIc7Hlkwe4Q==</jahia-module-signature>
+        <jahia-module-signature>MCwCFGsdFRDbyfvw/0eW/dPJf4Gc0KalAhQ/Vjq83ruUpHoFeVlkhyoA7R5m7Q==</jahia-module-signature>
         <jahia-depends>app-shell=2.7,graphql-dxm-provider=2.19.1,jcontent=2.9</jahia-depends>
         <jahia.plugin.version>6.9</jahia.plugin.version>
         <import-package>

diff --git a/src/main/java/org/jahia/modules/contenteditor/api/forms/EditorFormDefinition.java b/src/main/java/org/jahia/modules/contenteditor/api/forms/EditorFormDefinition.java
@@ -23,6 +23,7 @@
  */
 package org.jahia.modules.contenteditor.api.forms;
 
+import graphql.annotations.annotationTypes.GraphQLField;
 import org.jahia.services.content.nodetypes.ExtendedNodeType;
 import org.jahia.services.content.nodetypes.NodeTypeRegistry;
 import org.osgi.framework.Bundle;
@@ -55,6 +56,7 @@ public EditorFormDefinition(String nodeType, Double priority, Boolean hasPreview
         this.hasPreview = hasPreview;
     }
 
+    @GraphQLField
     public String getNodeType() {
         return nodeType;
     }
@@ -63,6 +65,7 @@ public void setNodeType(String nodeType) {
         this.nodeType = nodeType;
     }
 
+    @GraphQLField
     public Double getPriority() {
         return priority;
     }
@@ -71,6 +74,7 @@ public void setPriority(Double priority) {
         this.priority = priority;
     }
 
+    @GraphQLField
     public Boolean hasPreview() {
         return hasPreview;
     }
@@ -79,6 +83,7 @@ public void setHasPreview(Boolean hasPreview) {
         this.hasPreview = hasPreview;
     }
 
+    @GraphQLField
     public List<EditorFormSectionDefinition> getSections() {
         return sections;
     }
@@ -87,6 +92,11 @@ public void setSections(List<EditorFormSectionDefinition> sections) {
         this.sections = sections;
     }
 
+    @GraphQLField
+    public String getOriginBundleSymbolicName() {
+        return originBundle != null ? originBundle.getSymbolicName() : null;
+    }
+
     public Bundle getOriginBundle() {
         return originBundle;
     }

diff --git a/src/main/java/org/jahia/modules/contenteditor/api/forms/EditorFormFieldSet.java b/src/main/java/org/jahia/modules/contenteditor/api/forms/EditorFormFieldSet.java
@@ -315,10 +315,19 @@ public EditorFormFieldSet mergeWith(EditorFormFieldSet otherEditorFormFieldSet,
         }
 
         newEditorFormFieldSet.setRemoved(otherEditorFormFieldSet.isRemoved());
+        if (originBundle != null) {
+            newEditorFormFieldSet.setOriginBundle(getOriginBundle());
+        } else {
+            newEditorFormFieldSet.setOriginBundle(otherEditorFormFieldSet.getOriginBundle());
+        }
 
         return newEditorFormFieldSet;
     }
 
+    public EditorFormField getFieldByName(String name) {
+        return editorFormFieldsByName.get(name);
+    }
+
     public EditorFormFieldTarget getTarget() {
         return target;
     }

diff --git a/src/main/java/org/jahia/modules/contenteditor/api/forms/EditorFormSection.java b/src/main/java/org/jahia/modules/contenteditor/api/forms/EditorFormSection.java
@@ -135,4 +135,20 @@ public boolean expanded() {
     public void setExpanded(boolean expanded) {
         this.expanded = expanded;
     }
+
+    /**
+     *
+     * @param fieldSetName name of field set to look for in this section
+     * @return EditorFormFieldSet that matches given name, or null if not found.
+     */
+    public EditorFormFieldSet getFieldSetByName(String fieldSetName) {
+        if (fieldSetName == null || fieldSetName.isEmpty()) {
+            return null;
+        }
+
+        return getFieldSets().stream()
+            .filter(fs -> fs.getName().equals(fieldSetName))
+            .findFirst()
+            .orElse(null);
+    }
 }
diff --git a/src/main/java/org/jahia/modules/contenteditor/api/forms/EditorFormSectionDefinition.java b/src/main/java/org/jahia/modules/contenteditor/api/forms/EditorFormSectionDefinition.java
@@ -23,6 +23,8 @@
  */
 package org.jahia.modules.contenteditor.api.forms;
 
+import graphql.annotations.annotationTypes.GraphQLField;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -48,6 +50,7 @@ public EditorFormSectionDefinition(String name) {
         this.name = name;
     }
 
+    @GraphQLField
     public String getName() {
         return name;
     }
@@ -56,6 +59,7 @@ public void setName(String name) {
         this.name = name;
     }
 
+    @GraphQLField
     public String getLabelKey() {
         return labelKey;
     }
@@ -64,6 +68,7 @@ public void setLabelKey(String labelKey) {
         this.labelKey = labelKey;
     }
 
+    @GraphQLField
     public String getDescriptionKey() {
         return descriptionKey;
     }
@@ -72,6 +77,7 @@ public void setDescriptionKey(String descriptionKey) {
         this.descriptionKey = descriptionKey;
     }
 
+    @GraphQLField
     public String getRequiredPermission() {
         return requiredPermission;
     }
@@ -80,6 +86,7 @@ public void setRequiredPermission(String requiredPermission) {
         this.requiredPermission = requiredPermission;
     }
 
+    @GraphQLField
     public boolean isHide() {
         return hide;
     }
@@ -88,6 +95,7 @@ public void setHide(boolean hide) {
         this.hide = hide;
     }
 
+    @GraphQLField
     public boolean expanded() {
         return expanded;
     }
@@ -96,6 +104,7 @@ public void setExpanded(boolean expanded) {
         this.expanded = expanded;
     }
 
+    @GraphQLField
     public List<String> getDisplayModes() {
         return displayModes;
     }
@@ -104,6 +113,7 @@ public void setDisplayModes(List<String> displayModes) {
         this.displayModes = displayModes;
     }
 
+    @GraphQLField
     public List<EditorFormFieldSet> getFieldSets() {
         return fieldSets;
     }

diff --git a/src/main/java/org/jahia/modules/contenteditor/api/forms/EditorFormService.java b/src/main/java/org/jahia/modules/contenteditor/api/forms/EditorFormService.java
@@ -23,10 +23,12 @@
  */
 package org.jahia.modules.contenteditor.api.forms;
 
+import graphql.annotations.annotationTypes.GraphQLNonNull;
 import org.jahia.modules.contenteditor.graphql.api.types.ContextEntryInput;
 
 import java.util.List;
 import java.util.Locale;
+import java.util.SortedSet;
 
 /**
  * Main service to retrieve form for editing content
@@ -89,4 +91,6 @@ List<EditorFormFieldValueConstraint> getFieldConstraints(String nodeUuidOrPath,
                                                              List<ContextEntryInput> context,
                                                              Locale uiLocale,
                                                              Locale locale) throws EditorFormException;
+
+    SortedSet<EditorFormDefinition> getFormOverrides(@GraphQLNonNull String nodeType);
 }