Merge pull request #147 from adobe/dev

Release 2021.06.17
adobe · Jun 17, 2021 · 08bba4f · 08bba4f
2 parents c2e13f7 + 27bf9fe
commit 08bba4f
Show file tree

Hide file tree

Showing 30 changed files with 846 additions and 203 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -61,13 +61,13 @@ executors:
     docker:
       - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-qp:6.4.4-azul-jdk11
         <<: *docker_auth
-      - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem-cloudready:5104-azul
+      - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem-cloudready:5343-azul
         <<: *docker_auth
   test_executor_655:
     docker:
       - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-qp:6.4.4-azul-jdk11
         <<: *docker_auth
-      - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem:6.5.7-azul
+      - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem:6.5.8-azul
         <<: *docker_auth
 
 jobs:
@@ -80,7 +80,7 @@ jobs:
           keys:
             - maven-repo-v2-cloud-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
             - maven-repo-v2-cloud
-            - maven-repo-v2-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }} 
+            - maven-repo-v2-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}
             - maven-repo-v2-
       - run:
           name: Update permissions
@@ -159,7 +159,7 @@ jobs:
     resource_class: large
     working_directory: /home/circleci/build
     <<: *integration_test_steps
-    
+
   integration-test-cloudready-with-addon:
     executor: test_executor_cloudready
     environment:

diff --git a/pom.xml b/pom.xml
@@ -50,7 +50,7 @@
         <vault.user>admin</vault.user>
         <vault.password>admin</vault.password>
         <core.wcm.components.version>2.15.0</core.wcm.components.version>
-        <core.cif.components.version>1.11.0</core.cif.components.version>
+        <core.cif.components.version>1.12.0</core.cif.components.version>
         <graphql.client.version>1.7.1</graphql.client.version>
         <magento.graphql.version>9.0.0-magento242ee</magento.graphql.version>
         <bnd.version>5.1.2</bnd.version>

diff --git a/ui.apps/src/main/content/jcr_root/apps/venia/clientlibs/clientlib-cif/.content.xml b/ui.apps/src/main/content/jcr_root/apps/venia/clientlibs/clientlib-cif/.content.xml
@@ -5,4 +5,4 @@
     cssProcessor="[default:none,min:none]"
     jsProcessor="[default:none,min:none]"
     categories="[venia.cif]" 
-    embed="[core.cif.components.product.v1,core.cif.components.productcarousel.v1,core.cif.components.productcollection.v1,core.cif.components.productteaser.v1,core.cif.components.searchbar.v1,core.cif.components.header.v1,core.cif.components.navigation.v1,core.cif.components.carousel.v1,core.cif.components.categorycarousel.v1,core.cif.components.featuredcategorylist.v1]" />
+    embed="[core.cif.components.product.v1,core.cif.components.productcarousel.v1,core.cif.components.productcollection.v1,core.cif.components.productteaser.v1,core.cif.components.searchbar.v1,core.cif.components.header.v1,core.cif.components.navigation.v1,core.cif.components.carousel.v1,core.cif.components.categorycarousel.v1,core.cif.components.featuredcategorylist.v1,core.cif.components.storefront-events.v1]" />
diff --git a/...pps/src/main/content/jcr_root/apps/venia/components/commerce/contentfragment/.content.xml b/...pps/src/main/content/jcr_root/apps/venia/components/commerce/contentfragment/.content.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:Component"
+    jcr:title="Commerce Content Fragment"
+    sling:resourceSuperType="core/cif/components/commerce/contentfragment/v1/contentfragment"
+    componentGroup="Venia - Commerce"/>
diff --git a/.../src/main/content/jcr_root/apps/venia/components/commerce/experiencefragment/.content.xml b/.../src/main/content/jcr_root/apps/venia/components/commerce/experiencefragment/.content.xml
@@ -2,6 +2,6 @@
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
     jcr:description="Commerce Experience Fragment container"
     jcr:primaryType="cq:Component"
-    jcr:title="Commerce Experience Fragment Placeholder"
+    jcr:title="Commerce Experience Fragment"
     sling:resourceSuperType="core/cif/components/commerce/experiencefragment/v1/experiencefragment"
     componentGroup="Venia - Commerce"/>
diff --git a/ui.content/src/main/content/jcr_root/conf/venia/settings/wcm/policies/.content.xml b/ui.content/src/main/content/jcr_root/conf/venia/settings/wcm/policies/.content.xml
@@ -461,6 +461,45 @@
                         </cq:styleGroups>
                     </default>
                 </teaser>
+                <contentfragment jcr:primaryType="nt:unstructured">
+                    <default
+                        jcr:lastModified="{Date}2021-06-11T11:26:16.004+02:00"
+                        jcr:lastModifiedBy="admin"
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="AEM CIF Core Components Content Fragments"
+                        sling:resourceType="wcm/core/components/policy/policy">
+                        <jcr:content jcr:primaryType="nt:unstructured" />
+                        <cq:styleGroups jcr:primaryType="nt:unstructured">
+                            <item0 cq:styleGroupLabel="Content"
+                                jcr:primaryType="nt:unstructured">
+                                <cq:styles jcr:primaryType="nt:unstructured">
+                                    <item0 cq:styleClasses="cf-style-1"
+                                        cq:styleId="1623400699511"
+                                        cq:styleLabel="Table - 1 Column"
+                                        jcr:primaryType="nt:unstructured" />
+                                    <item1 cq:styleClasses="cf-style-2"
+                                        cq:styleId="1623400707844"
+                                        cq:styleLabel="Table - 2 Columns"
+                                        jcr:primaryType="nt:unstructured" />
+                                </cq:styles>
+                            </item0>
+                            <item1 cq:styleGroupLabel="Header"
+                                cq:styleGroupMultiple="true"
+                                jcr:primaryType="nt:unstructured">
+                                <cq:styles jcr:primaryType="nt:unstructured">
+                                    <item0 cq:styleClasses="cf-style-hide-title"
+                                        cq:styleId="1623400982190"
+                                        cq:styleLabel="Hide Title"
+                                        jcr:primaryType="nt:unstructured" />
+                                    <item1 cq:styleClasses="cf-style-hide-fieldnames"
+                                        cq:styleId="1623401047939"
+                                        cq:styleLabel="Hide Field Names"
+                                        jcr:primaryType="nt:unstructured" />
+                                </cq:styles>
+                            </item1>
+                        </cq:styleGroups>
+                    </default>
+                </contentfragment>
             </commerce>
         </components>
     </venia>

diff --git a/...ain/content/jcr_root/conf/venia/settings/wcm/templates/catalog-page/policies/.content.xml b/...ain/content/jcr_root/conf/venia/settings/wcm/templates/catalog-page/policies/.content.xml
@@ -62,6 +62,9 @@
                                 <teaser cq:policy="venia/components/commerce/teaser/default"
                                     jcr:primaryType="nt:unstructured"
                                     sling:resourceType="wcm/core/components/policies/mapping" />
+                                <contentfragment cq:policy="venia/components/commerce/contentfragment/default"
+                                    jcr:primaryType="nt:unstructured"
+                                    sling:resourceType="wcm/core/components/policies/mapping" />
                             </commerce>
                         </components>
                     </venia>

diff --git a/...in/content/jcr_root/conf/venia/settings/wcm/templates/category-page/policies/.content.xml b/...in/content/jcr_root/conf/venia/settings/wcm/templates/category-page/policies/.content.xml
@@ -65,6 +65,9 @@
                                 <teaser cq:policy="venia/components/commerce/teaser/default"
                                     jcr:primaryType="nt:unstructured"
                                     sling:resourceType="wcm/core/components/policies/mapping" />
+                                <contentfragment cq:policy="venia/components/commerce/contentfragment/default"
+                                    jcr:primaryType="nt:unstructured"
+                                    sling:resourceType="wcm/core/components/policies/mapping" />
                             </commerce>
                         </components>
                     </venia>

diff --git a/...ain/content/jcr_root/conf/venia/settings/wcm/templates/product-page/policies/.content.xml b/...ain/content/jcr_root/conf/venia/settings/wcm/templates/product-page/policies/.content.xml
@@ -62,6 +62,9 @@
                                 <teaser cq:policy="venia/components/commerce/teaser/default"
                                     jcr:primaryType="nt:unstructured"
                                     sling:resourceType="wcm/core/components/policies/mapping" />
+                                <contentfragment cq:policy="venia/components/commerce/contentfragment/default"
+                                    jcr:primaryType="nt:unstructured"
+                                    sling:resourceType="wcm/core/components/policies/mapping" />
                             </commerce>
                         </components>
                     </venia>

diff --git a/..._root/etc/map.publish/https/hostname.adobeaemcloud.com/category-page-reverse/.content.xml b/..._root/etc/map.publish/https/hostname.adobeaemcloud.com/category-page-reverse/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
     jcr:primaryType="sling:Mapping"
-    sling:internalRedirect="/content/venia/([a-z]{2})/([a-z]{2})/products/category-page\\.(\\d+)\\.html/(.+)"
+    sling:internalRedirect="/content/venia/([a-z]{2})/([a-z]{2})/products/category-page\\.([^\\.]+)\\.html/(.+)"
     sling:match="$1/$2/c/$4.$3.html" />
diff --git a/...tent/jcr_root/etc/map.publish/https/hostname.adobeaemcloud.com/category-page/.content.xml b/...tent/jcr_root/etc/map.publish/https/hostname.adobeaemcloud.com/category-page/.content.xml
@@ -2,4 +2,4 @@
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
     jcr:primaryType="sling:Mapping"
     sling:internalRedirect="/content/venia/$1/$2/products/category-page.$4.html/$3"
-    sling:match="content/venia/([a-z]{2})/([a-z]{2})/c/(.+)\\.(\\d+)\\.html" />
+    sling:match="content/venia/([a-z]{2})/([a-z]{2})/c/(.+)\\.([^\\.]+).html" />
diff --git a/ui.frontend/package-lock.json b/ui.frontend/package-lock.json
diff --git a/ui.frontend/package.json b/ui.frontend/package.json
@@ -62,7 +62,7 @@
     "webpack-merge": "^4.2.1"
   },
   "dependencies": {
-    "@adobe/aem-core-cif-react-components": "^1.11.0",
+    "@adobe/aem-core-cif-react-components": "^1.12.0",
     "i18next": "^19.5.3",
     "i18next-browser-languagedetector": "^5.0.0",
     "i18next-xhr-backend": "^3.2.2",

diff --git a/ui.frontend/src/main/components/App/App.js b/ui.frontend/src/main/components/App/App.js
@@ -35,15 +35,17 @@ import partialConfig from './config';
 import '../../site/main.scss';
 
 const App = () => {
-    const { storeView, graphqlEndpoint, graphqlMethod } = document.querySelector('body').dataset;
+    const { storeView, graphqlEndpoint, graphqlMethod, httpHeaders } = document.querySelector('body').dataset;
     const { mountingPoints, pagePaths } = partialConfig;
+
     const config = {
         ...partialConfig,
         storeView,
         graphqlEndpoint,
         // Can be GET or POST. When selecting GET, this applies to cache-able GraphQL query requests only. Mutations
         // will always be executed as POST requests.
-        graphqlMethod
+        graphqlMethod,
+        headers: JSON.parse(httpHeaders)
     };
 
     return (