From 172466f5d1b26396634e4bfd22ad81f09af30acf Mon Sep 17 00:00:00 2001
From: Markus Haack <mhaack@adobe.com>
Date: Wed, 18 Mar 2020 11:14:25 +0100
Subject: [PATCH 1/2] CIF-1319 - add optional title support for featured
 category component

---
 .../v1/featuredcategorylist/README.md         |  2 -
 .../_cq_dialog/.content.xml                   | 72 ++++++++++---------
 .../featuredcategorylist.html                 | 40 +++++------
 3 files changed, 56 insertions(+), 58 deletions(-)

diff --git a/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/featuredcategorylist/v1/featuredcategorylist/README.md b/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/featuredcategorylist/v1/featuredcategorylist/README.md
index b14d42b004..c35c8df235 100755
--- a/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/featuredcategorylist/v1/featuredcategorylist/README.md
+++ b/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/featuredcategorylist/v1/featuredcategorylist/README.md
@@ -58,8 +58,6 @@ BLOCK .cmp-categorylist
     ELEMENT cmp-categorylist__image
     ELEMENT cmp-categorylist__name
     ELEMENT cmp-categorylist__title 
-
-BLOCK placeholder__empty
 ```
 
 ## License information
diff --git a/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/featuredcategorylist/v1/featuredcategorylist/_cq_dialog/.content.xml b/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/featuredcategorylist/v1/featuredcategorylist/_cq_dialog/.content.xml
index 8ebf9a20ae..567805880f 100755
--- a/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/featuredcategorylist/v1/featuredcategorylist/_cq_dialog/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/featuredcategorylist/v1/featuredcategorylist/_cq_dialog/.content.xml
@@ -1,46 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="nt:unstructured"
-    jcr:title="Featured Category List"
-    sling:resourceType="cq/gui/components/authoring/dialog"
-    extraClientlibs="[core.cif.components.featuredcategorylist.v1.editor]"
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" 
+    xmlns:granite="http://www.adobe.com/jcr/granite/1.0" 
+    xmlns:cq="http://www.day.com/jcr/cq/1.0" 
+    xmlns:jcr="http://www.jcp.org/jcr/1.0" 
+    xmlns:nt="http://www.jcp.org/jcr/nt/1.0" 
+    jcr:primaryType="nt:unstructured" 
+    jcr:title="Featured Category List" 
+    sling:resourceType="cq/gui/components/authoring/dialog" 
+    extraClientlibs="[core.cif.components.featuredcategorylist.v1.editor]" 
     trackingFeature="cif-core-components:featuredcategorylist:v1">
-    <content
-        jcr:primaryType="nt:unstructured"
+    <content jcr:primaryType="nt:unstructured" 
         sling:resourceType="granite/ui/components/coral/foundation/container">
         <items jcr:primaryType="nt:unstructured">
-            <column
-                jcr:primaryType="nt:unstructured"
+            <column jcr:primaryType="nt:unstructured" 
                 sling:resourceType="granite/ui/components/coral/foundation/container">
                 <items jcr:primaryType="nt:unstructured">
-                    <content
-                        granite:class="cmp-cif-featuredcategorylist__editor"
-                        jcr:primaryType="nt:unstructured"
-                        sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
-                        composite="{Boolean}true"
+                    <title jcr:primaryType="nt:unstructured" 
+                        sling:resourceType="granite/ui/components/coral/foundation/form/textfield" 
+                        fieldDescription="Optional title text. Leave empty to hide the title." 
+                        fieldLabel="Title" 
+                        name="./jcr:title" 
+                        value="Shop by category" />
+                    <content granite:class="cmp-cif-featuredcategorylist__editor" 
+                        jcr:primaryType="nt:unstructured" 
+                        sling:resourceType="granite/ui/components/coral/foundation/form/multifield" 
+                        composite="{Boolean}true" 
                         fieldLabel="Featured Categories">
-                        <field
-                            granite:class="cmp-cif-featuredcategorylist__editor-item-multifield-composite-item coral-Well"
-                            jcr:primaryType="nt:unstructured"
-                            sling:resourceType="granite/ui/components/coral/foundation/container"
+                        <field granite:class="cmp-cif-featuredcategorylist__editor-item-multifield-composite-item coral-Well" 
+                            jcr:primaryType="nt:unstructured" 
+                            sling:resourceType="granite/ui/components/coral/foundation/container" 
                             name="./items">
                             <items jcr:primaryType="nt:unstructured">
-                                <category
-                                    jcr:primaryType="nt:unstructured"
-                                    sling:resourceType="commerce/gui/components/common/cifcategoryfield"
-                                    fieldLabel="Category"
-                                    multiple="{Boolean}false"
-                                    name="./categoryId"
-                                    selectionId="id"/>
-                                <asset
-                                    jcr:primaryType="nt:unstructured"
-                                    sling:resourceType="granite/ui/components/coral/foundation/form/pathfield"
-                                    fieldDescription="If set, the category image is replaced by the selected asset."
-                                    fieldLabel="Override Asset"
-                                    filter="hierarchy"
-                                    multiple="{Boolean}false"
-                                    name="./asset"
-                                    rootPath="/content/dam"/>
+                                <category jcr:primaryType="nt:unstructured" 
+                                    sling:resourceType="commerce/gui/components/common/cifcategoryfield" 
+                                    fieldLabel="Category" 
+                                    multiple="{Boolean}false" 
+                                    name="./categoryId" 
+                                    selectionId="id" />
+                                <asset jcr:primaryType="nt:unstructured" 
+                                    sling:resourceType="granite/ui/components/coral/foundation/form/pathfield" 
+                                    fieldDescription="If set, the category image is replaced by the selected asset." 
+                                    fieldLabel="Override Asset" 
+                                    filter="hierarchy" 
+                                    multiple="{Boolean}false" 
+                                    name="./asset" 
+                                    rootPath="/content/dam" />
                             </items>
                         </field>
                     </content>
diff --git a/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/featuredcategorylist/v1/featuredcategorylist/featuredcategorylist.html b/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/featuredcategorylist/v1/featuredcategorylist/featuredcategorylist.html
index b8cebdb5a5..001c351ae7 100755
--- a/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/featuredcategorylist/v1/featuredcategorylist/featuredcategorylist.html
+++ b/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/featuredcategorylist/v1/featuredcategorylist/featuredcategorylist.html
@@ -15,26 +15,22 @@
 */-->
 
 <sly data-sly-use.clientlib="/libs/granite/sightly/templates/clientlib.html"
-     data-sly-use.category="com.adobe.cq.commerce.core.components.models.categorylist.FeaturedCategoryList"
-     data-sly-use.templates="core/wcm/components/commons/v1/templates.html">
-    <sly data-sly-test.hasCategories="${category.categories.size}">
-    <div class="cmp-categorylist">
-        <div class="cmp-categorylist__header">
-            <h2 class="cmp-categorylist__title">
-                <span>${'Shop by category' @ i18n}</span>
-            </h2>
-        </div>
-        <div data-sly-list="${category.categories}" class="cmp-categorylist__content">
-            <a class="cmp-categorylist__anchor" href="${item.path}">
-	            <span  class="cmp-categorylist__imagewrapper" style="background-image: url(${item.image @context='uri'});" >
-	                <img data-sly-test=${item.image} class="cmp-categorylist__image" src='${item.image}' alt="${item.name}">
-	            </span>
-	            <span class="cmp-categorylist__name">${item.name}</span>
-            </a>
-        </div>
+    data-sly-use.category="com.adobe.cq.commerce.core.components.models.categorylist.FeaturedCategoryList"
+    data-sly-use.templates="core/wcm/components/commons/v1/templates.html" />
+
+<div data-sly-test.hasCategories="${category.categories.size}" class="cmp-categorylist">
+    <div data-sly-test="${properties.jcr:title}" class="cmp-categorylist__header">
+        <h2 class="cmp-categorylist__title">${properties.jcr:title}</h2>
+    </div>
+    <div data-sly-list="${category.categories}" class="cmp-categorylist__content">
+        <a class="cmp-categorylist__anchor" href="${item.path}">
+            <span class="cmp-categorylist__imagewrapper" style="background-image: url(${item.image @context='uri'});">
+                <img data-sly-test=${item.image} class="cmp-categorylist__image" src='${item.image}' alt="${item.name}">
+            </span>
+            <span class="cmp-categorylist__name">${item.name}</span>
+        </a>
     </div>
-    </sly>
-    <sly data-sly-call="${templates.placeholder @ isEmpty = !category.isConfigured}" />
-    <sly data-sly-call="${templates.placeholder @ isEmpty = category.isConfigured && !hasCategories, emptyTextAppend = 'Configured, no categories were loaded'}" />
-</sly>
-</sly>
+</div>
+
+<sly data-sly-call="${templates.placeholder @ isEmpty = !category.isConfigured}" />
+<sly data-sly-call="${templates.placeholder @ isEmpty = category.isConfigured && !hasCategories, emptyTextAppend = 'Configured, no categories were loaded'}" />
\ No newline at end of file

From 36c7dc5e4968a33986e73a5089c7cd8580a63e48 Mon Sep 17 00:00:00 2001
From: Markus Haack <mhaack@adobe.com>
Date: Wed, 18 Mar 2020 11:17:30 +0100
Subject: [PATCH 2/2] CIF-1319 - update readme

---
 .../featuredcategorylist/v1/featuredcategorylist/README.md  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/featuredcategorylist/v1/featuredcategorylist/README.md b/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/featuredcategorylist/v1/featuredcategorylist/README.md
index c35c8df235..4fad152bf0 100755
--- a/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/featuredcategorylist/v1/featuredcategorylist/README.md
+++ b/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/featuredcategorylist/v1/featuredcategorylist/README.md
@@ -34,16 +34,18 @@ Featured Category List component uses graphql query to fetch categories to displ
 This component has several dependencies on internal client-side modules.
 
 ### Usage prerequisites
-Make sure you have dispatcher running with Magento url configured. See `dispatcher/README.md`. You should have the category images configured in your Magento instance.
 
+Make sure you have dispatcher running with Magento url configured. See `dispatcher/README.md`. You should have the category images configured in your Magento instance.
 
 ### Use Object
-The Featured category list component uses the `com.adobe.cq.commerce.core.components.models.categorylist.FeaturedCategoryList` Sling model as its Use-object.
 
+The Featured category list component uses the `com.adobe.cq.commerce.core.components.models.categorylist.FeaturedCategoryList` Sling model as its Use-object.
 
 ### Edit Dialog Properties
+
 The following properties are written to JCR for this component and are expected to be available as `Resource` properties:
 
+ `./jcr:title` - Optional title text
  `./categoryIds` - Category ids in an Array of string saved by Category Picker.
 
 ### CSS API (BEM)