fix: content page not found when reloading a page with an authenticat…

…ed user (#1198)
intershop · Jun 29, 2022 · 1e7af60 · 1e7af60
1 parent 8c74111
commit 1e7af60
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/app/core/store/content/pages/pages.effects.spec.ts b/src/app/core/store/content/pages/pages.effects.spec.ts
@@ -13,6 +13,7 @@ import { CMSService } from 'ish-core/services/cms/cms.service';
 import { ContentStoreModule } from 'ish-core/store/content/content-store.module';
 import { loadContentPageTreeSuccess } from 'ish-core/store/content/page-tree';
 import { CoreStoreModule } from 'ish-core/store/core/core-store.module';
+import { personalizationStatusDetermined } from 'ish-core/store/customer/user';
 import { makeHttpError } from 'ish-core/utils/dev/api-service-utils';
 import { pageTree } from 'ish-core/utils/dev/test-data-utils';
 import { HttpStatusCodeService } from 'ish-core/utils/http-status-code/http-status-code.service';
@@ -57,7 +58,9 @@ describe('Pages Effects', () => {
     it('should send fail action when loading action via service is unsuccessful', done => {
       when(cmsServiceMock.getContentPage('dummy')).thenReturn(throwError(() => makeHttpError({ message: 'ERROR' })));
 
-      actions$ = of(loadContentPage({ contentPageId: 'dummy' }));
+      const action = loadContentPage({ contentPageId: 'dummy' });
+
+      actions$ = of(personalizationStatusDetermined, action);
 
       effects.loadContentPage$.subscribe(action => {
         verify(cmsServiceMock.getContentPage('dummy')).once();
@@ -72,10 +75,10 @@ describe('Pages Effects', () => {
     it('should not die when encountering an error', () => {
       when(cmsServiceMock.getContentPage('dummy')).thenReturn(throwError(() => makeHttpError({ message: 'ERROR' })));
 
-      actions$ = hot('a-a-a-a', { a: loadContentPage({ contentPageId: 'dummy' }) });
+      actions$ = hot('b-a-a', { a: loadContentPage({ contentPageId: 'dummy' }), b: personalizationStatusDetermined });
 
       expect(effects.loadContentPage$).toBeObservable(
-        cold('a-a-a-a', { a: loadContentPageFail({ error: makeHttpError({ message: 'ERROR' }) }) })
+        cold('--a-a', { a: loadContentPageFail({ error: makeHttpError({ message: 'ERROR' }) }) })
       );
     });
   });

diff --git a/src/app/core/store/content/pages/pages.effects.ts b/src/app/core/store/content/pages/pages.effects.ts
@@ -7,8 +7,14 @@ import { concatMap, map, mergeMap } from 'rxjs/operators';
 import { CMSService } from 'ish-core/services/cms/cms.service';
 import { selectRouteParam } from 'ish-core/store/core/router';
 import { setBreadcrumbData } from 'ish-core/store/core/viewconf';
+import { personalizationStatusDetermined } from 'ish-core/store/customer/user';
 import { HttpStatusCodeService } from 'ish-core/utils/http-status-code/http-status-code.service';
-import { mapErrorToAction, mapToPayloadProperty, whenTruthy } from 'ish-core/utils/operators';
+import {
+  mapErrorToAction,
+  mapToPayloadProperty,
+  useCombinedObservableOnAction,
+  whenTruthy,
+} from 'ish-core/utils/operators';
 
 import { loadContentPage, loadContentPageFail, loadContentPageSuccess } from './pages.actions';
 import { getBreadcrumbForContentPage } from './pages.selectors';
@@ -24,7 +30,7 @@ export class PagesEffects {
 
   loadContentPage$ = createEffect(() =>
     this.actions$.pipe(
-      ofType(loadContentPage),
+      useCombinedObservableOnAction(this.actions$.pipe(ofType(loadContentPage)), personalizationStatusDetermined),
       mapToPayloadProperty('contentPageId'),
       mergeMap(contentPageId =>
         this.cmsService