Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CIF-1464 - The FeaturedCategoryList component does not use the UrlPro… #309

Merged
merged 4 commits into from
Jun 18, 2020
Merged

CIF-1464 - The FeaturedCategoryList component does not use the UrlPro… #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ae0b2d
CIF-1464 - The FeaturedCategoryList component does not use the UrlPro…
cjelger Jun 17, 2020
bc7a9a3
CIF-1464 - The FeaturedCategoryList component does not use the UrlPro…
cjelger Jun 17, 2020
c736f2a
Merge branch 'master' into CIF-1464
cjelger Jun 17, 2020
3cf97de
Merge branch 'master' into CIF-1464
herzog31 Jun 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions ...cq/commerce/core/components/internal/models/v1/categorylist/FeaturedCategoryListImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,15 @@
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.models.annotations.Model;
import org.apache.sling.models.annotations.injectorspecific.Self;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.adobe.cq.commerce.core.components.client.MagentoGraphqlClient;
import com.adobe.cq.commerce.core.components.models.categorylist.FeaturedCategoryList;
import com.adobe.cq.commerce.core.components.models.retriever.AbstractCategoriesRetriever;
import com.adobe.cq.commerce.core.components.services.UrlProvider;
import com.adobe.cq.commerce.core.components.services.UrlProvider.ParamsBuilder;
import com.adobe.cq.commerce.core.components.utils.SiteNavigation;
import com.adobe.cq.commerce.magento.graphql.CategoryTree;
import com.day.cq.dam.api.Asset;
Expand Down Expand Up @@ -61,10 +64,14 @@ public class FeaturedCategoryListImpl implements FeaturedCategoryList {
@Inject
private Page currentPage;

private Map<String, Asset> assetOverride;
@Inject
private UrlProvider urlProvider;

private Page categoryPage;
@Self
private SlingHttpServletRequest request;

private Map<String, Asset> assetOverride;
private Page categoryPage;
private AbstractCategoriesRetriever categoriesRetriever;

@PostConstruct
Expand Down Expand Up @@ -120,7 +127,11 @@ public List<CategoryTree> getCategories() {
}
List<CategoryTree> categories = categoriesRetriever.fetchCategories();
for (CategoryTree category : categories) {
category.setPath(String.format("%s.%s.html", categoryPage.getPath(), category.getId()));
Map<String, String> params = new ParamsBuilder()
.id(category.getId().toString())
.urlPath(category.getUrlPath())
.map();
category.setPath(urlProvider.toCategoryUrl(request, categoryPage, params));

// Replace image if there is an asset override
String id = category.getId().toString();
Expand Down
6 changes: 6 additions & 0 deletions ...ommerce/core/components/internal/models/v1/categorylist/FeaturedCategoryListImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
import org.junit.Test;
import org.mockito.Mockito;

import com.adobe.cq.commerce.core.components.internal.services.MockUrlProviderConfiguration;
import com.adobe.cq.commerce.core.components.internal.services.UrlProviderImpl;
import com.adobe.cq.commerce.core.components.services.UrlProvider;
import com.adobe.cq.commerce.core.components.testing.Utils;
import com.adobe.cq.commerce.graphql.client.GraphqlClient;
import com.adobe.cq.commerce.magento.graphql.CategoryTree;
Expand Down Expand Up @@ -201,6 +204,9 @@ public void verifyIgnoreInvalidAsset() {
private AemContext createContext(String contentPath) {
return new AemContext((AemContextCallback) context -> {
context.load().json(contentPath, "/content");
UrlProviderImpl urlProvider = new UrlProviderImpl();
urlProvider.activate(new MockUrlProviderConfiguration());
context.registerService(UrlProvider.class, urlProvider);
}, ResourceResolverType.JCR_MOCK);
}
}