CIF-2612 - Fix CIF config for https://dev.aemcomponents.dev (#777)

* cloudManagerTarget config for examples deployment
* deploy samples via all incl. bundles
* reverse package-lock.json
* disable CatalogPageNotFoundFilter for examples library
* move product & productlist to seperate pages to work with the not found filter
* don't commit package-lock.json
* fix code format
* fix failing ITs & UI Tests
* fix category display

Author: mhaack

all/pom.xml

@@ -94,9 +94,6 @@
                             <filter>true</filter>
                         </subPackage>
                     </subPackages>
-                    <properties>
-                        <cloudManagerTarget>none</cloudManagerTarget>
-                    </properties>
                 </configuration>
             </plugin>
             <plugin>

examples/all/pom.xml

@@ -59,18 +59,9 @@
                 <configuration>
                     <group>cif-components-library</group>
                     <packageType>container</packageType>
-                    <properties>
-                        <cloudManagerTarget>none</cloudManagerTarget>
-                    </properties>
                     <allowIndexDefinitions>true</allowIndexDefinitions> 
                     <embeddedTarget>/apps/core/cif/install</embeddedTarget>                 
                     <embeddeds>
-                        <embedded>
-                            <groupId>com.adobe.commerce.cif</groupId>
-                            <artifactId>graphql-client</artifactId>
-                            <filter>true</filter>
-                            <target>/apps/core/cif/install</target>
-                        </embedded>
                         <embedded>
                             <groupId>com.adobe.commerce.cif</groupId>
                             <artifactId>magento-graphql</artifactId>
@@ -91,16 +82,6 @@
                         </embedded>
                     </embeddeds>
                     <subPackages>
-                        <subPackage>
-                            <groupId>com.adobe.commerce.cif</groupId>
-                            <artifactId>core-cif-components-apps</artifactId>
-                            <filter>true</filter>
-                        </subPackage>
-                        <subPackage>
-                            <groupId>com.adobe.commerce.cif</groupId>
-                            <artifactId>core-cif-components-config</artifactId>
-                            <filter>true</filter>
-                        </subPackage>
                         <subPackage>
                             <groupId>com.adobe.commerce.cif</groupId>
                             <artifactId>core-cif-components-examples-apps</artifactId>

examples/bundle/src/main/java/com/adobe/cq/commerce/core/examples/servlets/GraphqlServlet.java

@@ -484,6 +484,8 @@ private List<CategoryTree> readCategoryListResponse(DataFetchingEnvironment env)
             } else if (filters.get("url_key").get("eq").equals("unknown-category")) {
                 // return empty response
                 graphqlResponse = readGraphqlResponse(UNKNOWN_CATEGORY_JSON);
+            } else {
+                graphqlResponse = readGraphqlResponse(CATEGORY_UID_JSON);
             }
         } else if (filters.containsKey("category_uid")) {
             if (filters.get("category_uid").containsKey("in") && (((List<String>) (filters.get("category_uid").get("in"))).size() == 4)) {

examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/commerce/.content.xml

@@ -3,8 +3,8 @@
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:allowedTemplates="[/conf/core-components-examples/settings/wcm/templates/.*]"
-        cq:cifCategoryPage="/content/core-components-examples/library/commerce/productlist"
-        cq:cifProductPage="/content/core-components-examples/library/commerce/product"
+        cq:cifCategoryPage="/content/core-components-examples/library/commerce/productlist/sample-productlist"
+        cq:cifProductPage="/content/core-components-examples/library/commerce/product/sample-product"
         cq:cifSearchResultsPage="/content/core-components-examples/library/commerce/search"
         cq:conf="/conf/core-components-examples"
         cq:deviceGroups="[/etc/mobile/groups/responsive]"

examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/commerce/breadcrumb/.content.xml

@@ -79,7 +79,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     sling:resourceType="core-components-examples/components/text"
-                    text="<p>The component is configured to display all the AEM pages under the "root" of the library. In addition to displaying content pages, the component will display commerce data when used on a product or category page. Check the examples at the bottom of the following pages:</p>
<ul>
<li><a href="/content/core-components-examples/library/commerce/product.html/chaz-kangeroo-hoodie.html">Product page with sample data.</a></li>
<li><a href="/content/core-components-examples/library/commerce/productlist.html/outdoor.html">Category page with sample data.</a><br>
</li>
</ul>
"
+                    text="<p>The component is configured to display all the AEM pages under the "root" of the library. In addition to displaying content pages, the component will display commerce data when used on a product or category page. Check the examples at the bottom of the following pages:</p>
<ul>
<li><a href="/content/core-components-examples/library/commerce/product/sample-product.html/chaz-kangeroo-hoodie.html">Product page with sample data.</a></li>
<li><a href="/content/core-components-examples/library/commerce/productlist/sample-productlist.html/outdoor.html">Category page with sample data.</a><br>
</li>
</ul>
"
                     textIsRich="true"/>
                 <demo
                     jcr:created="{Date}2018-12-07T12:55:03.496+01:00"

examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/commerce/contentfragment/.content.xml

@@ -34,7 +34,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     sling:resourceType="core-components-examples/components/text"
-                    text="<p>The Commerce Content Fragment component is a server-side component written in HTL, allowing to dynamically display a content fragment based on:</p>
<ul>
<li>the SKU of the product currently being displayed on the product page</li>
<li>the product SKU provided in each content fragment</li>
<li>the content fragment model provided for the component</li>
</ul>
<p>To demonstrate the use of this component, a Commerce Content Fragment component is defined at the bottom of the demo product page, and is configured to be only rendered for the <a href="/content/core-components-examples/library/commerce/product.html/chaz-kangeroo-hoodie.html">"Chaz Kangeroo Hoodie" product</a>, that is when the SKU matches "MH01". Note that this Commerce Content Fragment component is not rendered when the product SKU does not match (on the other demo product pages).<br>
</p>
"
+                    text="<p>The Commerce Content Fragment component is a server-side component written in HTL, allowing to dynamically display a content fragment based on:</p>
<ul>
<li>the SKU of the product currently being displayed on the product page</li>
<li>the product SKU provided in each content fragment</li>
<li>the content fragment model provided for the component</li>
</ul>
<p>To demonstrate the use of this component, a Commerce Content Fragment component is defined at the bottom of the demo product page, and is configured to be only rendered for the <a href="/content/core-components-examples/library/commerce/product/sample-product.html/chaz-kangeroo-hoodie.html">"Chaz Kangeroo Hoodie" product</a>, that is when the SKU matches "MH01". Note that this Commerce Content Fragment component is not rendered when the product SKU does not match (on the other demo product pages).<br>
</p>
"
                     textIsRich="true"/>
                 <teaser
                     cq:styleIds="[1550165685463]"

examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/commerce/experiencefragment/.content.xml

@@ -34,7 +34,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     sling:resourceType="core-components-examples/components/text"
-                    text="<p>The Commerce Experience Fragment component is a server-side component written in HTL, allowing to dynamically display an experience fragment based on:</p>
<ul>
<li>the SKU of the product currently being displayed on the product page</li>
<li>the product SKU defined in each experience fragment</li>
<li>the target location defined in each experience fragment</li>
</ul>
<p>The location matching is based on a specific property defined on the one hand in the experience fragment content, and on the other hand in the Commerce Experience Fragment component(s) defined on the product page.</p>
<p>To demonstrate the use of this component, a Commerce Experience Fragment component is defined at the bottom of the demo product page, and is configured to be only rendered for the <a href="/content/core-components-examples/library/commerce/product.html/chaz-kangeroo-hoodie.html">"Chaz Kangeroo Hoodie" product</a>, that is when the SKU matches "MH01". Note that this Commerce Experience Fragment component is not rendered when the product SKU does not match (on the other demo product pages).<br>
</p>
"
+                    text="<p>The Commerce Experience Fragment component is a server-side component written in HTL, allowing to dynamically display an experience fragment based on:</p>
<ul>
<li>the SKU of the product currently being displayed on the product page</li>
<li>the product SKU defined in each experience fragment</li>
<li>the target location defined in each experience fragment</li>
</ul>
<p>The location matching is based on a specific property defined on the one hand in the experience fragment content, and on the other hand in the Commerce Experience Fragment component(s) defined on the product page.</p>
<p>To demonstrate the use of this component, a Commerce Experience Fragment component is defined at the bottom of the demo product page, and is configured to be only rendered for the <a href="/content/core-components-examples/library/commerce/product/sample-product.html/chaz-kangeroo-hoodie.html">"Chaz Kangeroo Hoodie" product</a>, that is when the SKU matches "MH01". Note that this Commerce Experience Fragment component is not rendered when the product SKU does not match (on the other demo product pages).<br>
</p>
"
                     textIsRich="true"/>
                 <teaser
                     cq:styleIds="[1550165685463]"