SITES-13771 Content Fragment List component : Property Name is gettin…

…g displayed to users rather than Field Label (#2546) * Content Fragment List component : Property Name is getting displayed to users rather than Field Label For multi text field look for cfm-element key or fallback on the default value. * fix tests
adobe · Jul 14, 2023 · 530f26c · 530f26c
1 parent 312e3d6
commit 530f26c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/...wcm/core/components/internal/servlets/contentfragment/ModelElementsDataSourceServlet.java b/...wcm/core/components/internal/servlets/contentfragment/ModelElementsDataSourceServlet.java
@@ -116,6 +116,9 @@ protected void doGet(@NotNull SlingHttpServletRequest request, @NotNull SlingHtt
                     ValueMap valueMap = elementResource.getValueMap();
                     String valueValue = valueMap.get("name", "");
                     String textValue = valueMap.get("fieldLabel", valueValue);
+                    if (textValue.equals(valueValue)) {
+                        textValue = valueMap.get("cfm-element", valueValue);
+                    }
                     if (isOrderBy && StringUtils.isNotEmpty(valueValue)) {
                         valueValue = "jcr:content/data/master/" + valueValue;
                     }

diff --git a/...core/components/internal/servlets/contentfragment/ModelElementsDataSourceServletTest.java b/...core/components/internal/servlets/contentfragment/ModelElementsDataSourceServletTest.java
@@ -86,7 +86,7 @@ public void verifyDataSourceWhenOrderByIsGivenV1() {
                 hasItem(resourceWithPropertiesTextAndValue("Created", "jcr:created")),
                 hasItem(resourceWithPropertiesTextAndValue("Last Modified", "jcr:content/jcr:lastModified")),
                 hasItem(resourceWithPropertiesTextAndValue("textFieldLabel", "jcr:content/data/master/textField")),
-                hasItem(resourceWithPropertiesTextAndValue("multiTextField", "jcr:content/data/master/multiTextField"))));
+                hasItem(resourceWithPropertiesTextAndValue("Multi Text Field", "jcr:content/data/master/multiTextField"))));
     }
 
     @Test
@@ -111,7 +111,7 @@ public void verifyDataSourceWhenOrderByIsGivenV2() {
                 hasItem(resourceWithPropertiesTextAndValue("Created", "jcr:created")),
                 hasItem(resourceWithPropertiesTextAndValue("Last Modified", "jcr:content/jcr:lastModified")),
                 hasItem(resourceWithPropertiesTextAndValue("textFieldLabel", "jcr:content/data/master/textField")),
-                hasItem(resourceWithPropertiesTextAndValue("multiTextField", "jcr:content/data/master/multiTextField")),
+                hasItem(resourceWithPropertiesTextAndValue("Multi Text Field", "jcr:content/data/master/multiTextField")),
                 hasItem(resourceWithPropertiesTextAndValue("dateAndTimeFieldLabel", "jcr:content/data/master/dateAndTimeField")),
                 hasItem(resourceWithPropertiesTextAndValue("numberFieldLabel", "jcr:content/data/master/numberField"))));
     }
@@ -135,7 +135,7 @@ public void verifyDataSourceWhenModelParameterIsGiven() {
         assertThat(resourceList, allOf(
                 hasItem(resourceWithPropertiesTextAndValue("textFieldLabel", "textField")),
                 // Multi text field doesn't have the 'fieldLabel' property, instead label is stored as 'cfm-element':
-                hasItem(resourceWithPropertiesTextAndValue("multiTextField", "multiTextField")),
+                hasItem(resourceWithPropertiesTextAndValue("Multi Text Field", "multiTextField")),
                 hasItem(resourceWithPropertiesTextAndValue("numberFieldLabel", "numberField")),
                 // Boolean field is a checkbox and therefore doesn't have a 'fieldLabel', instead there is a 'text' property
                 hasItem(resourceWithPropertiesTextAndValue("booleanField", "booleanField")),

diff --git a/...rces/com/adobe/cq/wcm/core/components/internal/servlets/contentfragment/test-content.json b/...rces/com/adobe/cq/wcm/core/components/internal/servlets/contentfragment/test-content.json
@@ -54,7 +54,7 @@
                             "valueType": "string",
                             "showEmptyInReadOnly": "true",
                             "metaType": "text-multi",
-                            "cfm-element": "multiTextFieldLabel",
+                            "cfm-element": "Multi Text Field",
                             "name": "multiTextField",
                             "sling:resourceType": "dam/cfm/admin/components/authoring/contenteditor/multieditor",
                             "renderReadOnly": "false"