Skip to content

fix: return empty products without strategy EP in ssr #21672

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

Open
shashirekhayps wants to merge 2 commits into
base: develop
Choose a base branch
from
+35 −4
Open

fix: return empty products without strategy EP in ssr #21672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95a4f68
CXCDS-18446: For ssr return empty products without strategy EP and us…
shashirekhayps Jun 30, 2026
60334a9
Merge branch 'develop' into bugfix/CXCDS-18446-fix-cds-ssr-strategy-s…
FollowTheFlo Jul 3, 2026
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
27 changes: 26 additions & 1 deletion ...n-libs/cds/src/merchandising/adapters/strategy/cds-merchandising-strategy.adapter.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { CdsEndpointsService } from '../../../services/cds-endpoints.service';
import { StrategyProducts } from '../../model/strategy-products.model';
import { CdsMerchandisingStrategyAdapter } from './cds-merchandising-strategy.adapter';
import createSpy = jasmine.createSpy;
import { BaseSiteService } from '@spartacus/core';
import { BaseSiteService, WindowRef } from '@spartacus/core';
import { of } from 'rxjs';

const STRATEGY_ID = 'test-strategy-id';
Expand Down Expand Up @@ -67,12 +67,19 @@ class MockBaseSiteService {
);
}

class MockWindowRef {
isBrowser = createSpy('MockWindowRef.isBrowser').and.returnValue(true);
}

describe('MerchandisingStrategyAdapter', () => {
let strategyAdapter: CdsMerchandisingStrategyAdapter;
let httpMock: HttpTestingController;
let cdsEndpointsService: CdsEndpointsService;
let mockWindowRef: MockWindowRef;

beforeEach(() => {
mockWindowRef = new MockWindowRef();

TestBed.configureTestingModule({
providers: [
{
Expand All @@ -83,6 +90,10 @@ describe('MerchandisingStrategyAdapter', () => {
provide: BaseSiteService,
useClass: MockBaseSiteService,
},
{
provide: WindowRef,
useValue: mockWindowRef,
},
CdsMerchandisingStrategyAdapter,
provideHttpClient(withInterceptorsFromDi()),
provideHttpClientTesting(),
Expand All @@ -102,6 +113,20 @@ describe('MerchandisingStrategyAdapter', () => {
expect(strategyAdapter).toBeTruthy();
});

describe('SSR (non-browser) environment', () => {
it('should return empty products and not make an HTTP call when not in browser', () => {
mockWindowRef.isBrowser.and.returnValue(false);

strategyAdapter
.loadProductsForStrategy(STRATEGY_ID)
.subscribe((products) => {
expect(products).toEqual({ products: [] });
});

httpMock.expectNone(STRATEGY_PRODUCTS_ENDPOINT_KEY);
});
});

describe('load products for strategy', () => {
it('should load products for the given strategy id', () => {
strategyAdapter
Expand Down
12 changes: 9 additions & 3 deletions ...ration-libs/cds/src/merchandising/adapters/strategy/cds-merchandising-strategy.adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,22 @@
*/

import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable, switchMap, take } from 'rxjs';
import { inject, Injectable } from '@angular/core';
import { Observable, of, switchMap, take } from 'rxjs';
import { CdsEndpointsService } from '../../../services/cds-endpoints.service';
import { MerchandisingStrategyAdapter } from '../../connectors/strategy/merchandising-strategy.adapter';
import { StrategyProducts } from '../../model/strategy-products.model';
import { StrategyRequest } from './../../../cds-models/cds-strategy-request.model';
import { BaseSiteService } from '@spartacus/core';
import { BaseSiteService, WindowRef } from '@spartacus/core';

const STRATEGY_PRODUCTS_ENDPOINT_KEY = 'strategyProducts';

@Injectable()
export class CdsMerchandisingStrategyAdapter
implements MerchandisingStrategyAdapter
{
protected windowRef = inject(WindowRef);

constructor(
private cdsEndpointsService: CdsEndpointsService,
private baseSiteService: BaseSiteService,
Expand All @@ -29,6 +31,10 @@ export class CdsMerchandisingStrategyAdapter
strategyId: string,
strategyRequest: StrategyRequest = {}
): Observable<StrategyProducts> {
if (!this.windowRef.isBrowser()) {
return of({ products: [] });
}

let headers: HttpHeaders = new HttpHeaders();
if (strategyRequest.headers && strategyRequest.headers.consentReference) {
headers = headers.set(
Expand Down
Loading