Skip to content

Conversation

@mhaack
Copy link
Contributor

@mhaack mhaack commented Dec 18, 2019

Description

Fixed the MSM rollout of multi site/store content structures of the store view property. The old property (cq:magentoStore) was excluded by MSM rollout and was changed to magentoStore. The old property still can be used (for content structures not using MSM) as fall back.

Thecq:graphqlClient property is now only editable on the site root page to not run into MSM rollout issues and not confuse authors and different properties being available at different levels.

For that, it introduces a "root" page which is the only page of the site structure that has cq:graphqlClient property. All child pages will only have magentoStore. Additionally the correct cq:allowedTemplates are set (in separate CIF Archetype PR adobe/aem-cif-project-archetype#64).

A sample content structure can look like this:

- /content/venia
    - /language-master (root page template with cq:graphqlClient prop)
        -/en (landing page template with magentoStore prop)
        -/de (landing page template with magentoStore prop)
    - /us (root page template with cq:graphqlClient prop)
        -/en (landing page template with magentoStore prop)
            -/products (any template with magentoStore prop and others)
            -/search

The wiki documenting the page properties must be updated once this is merged.

Related Issue

CIF-1149

How Has This Been Tested?

Intense manual tests.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • I have signed the Adobe Open Source CLA.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes and the overall coverage did not decrease.
  • All unit tests pass on CircleCi.
  • I ran all tests locally and they pass.

@mhaack mhaack changed the title CIF-1149 - make cq:graphqlClient property only editable on the site root page to work with MSM rollouts CIF-1149 - Fixed the MSM rollout of multi site/store content structures and make cq:graphqlClient property only editable on the site root page Dec 18, 2019
@mhaack mhaack added bug Something isn't working To Verify labels Dec 19, 2019
@codecov
Copy link

codecov bot commented Jan 6, 2020

Codecov Report

Merging #168 into master will decrease coverage by 10.99%.
The diff coverage is 77.77%.

Impacted file tree graph

@@             Coverage Diff             @@
##             master     #168     +/-   ##
===========================================
- Coverage     54.97%   43.98%    -11%     
===========================================
  Files           140       96     -44     
  Lines          3818     2601   -1217     
  Branches        667      540    -127     
===========================================
- Hits           2099     1144    -955     
+ Misses         1636     1457    -179     
+ Partials         83        0     -83
Flag Coverage Δ Complexity Δ
#jest 37.89% <77.77%> (+1.62%) 0 <0> (ø) ⬇️
#karma 93.66% <ø> (ø) 0 <ø> (ø) ⬇️
#unittests ? ?
Impacted Files Coverage Δ Complexity Δ
react-components/src/utils/hooks.js 94.44% <100%> (ø) 0 <0> (ø) ⬇️
...components/src/components/Checkout/editableForm.js 43.24% <71.42%> (+40.38%) 0 <0> (ø) ⬇️
...ts/models/retriever/AbstractCategoryRetriever.java
...mponents/internal/models/v1/product/AssetImpl.java
.../models/v1/navigation/GraphQLCategoryProvider.java
...components/models/retriever/AbstractRetriever.java
...s/internal/models/v1/product/VariantValueImpl.java
...ernal/servlets/GraphqlClientDataSourceServlet.java
...rnal/models/v1/productteaser/ProductRetriever.java
...ls/v1/storeviewexporter/StoreViewExporterImpl.java
... and 36 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 599f0aa...ab6e210. Read the comment docs.

@cjelger cjelger merged commit ecc0032 into master Jan 6, 2020
@cjelger cjelger deleted the issues/CIF-1149-2 branch January 6, 2020 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working To Verify

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants