refactor: remove not needed personalization status checks within effects

intershop · Aug 21, 2023 · 5dad199 · 5dad199
1 parent 601cf28
commit 5dad199
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 39 deletions.
diff --git a/src/app/core/store/content/pages/pages.effects.ts b/src/app/core/store/content/pages/pages.effects.ts
@@ -7,14 +7,8 @@ import { concatMap, map, mergeMap, switchMap } 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,
-  useCombinedObservableOnAction,
-  whenTruthy,
-} from 'ish-core/utils/operators';
+import { mapErrorToAction, mapToPayloadProperty, whenTruthy } from 'ish-core/utils/operators';
 
 import {
   loadContentPage,
@@ -35,7 +29,7 @@ export class PagesEffects {
 
   loadContentPage$ = createEffect(() =>
     this.actions$.pipe(
-      useCombinedObservableOnAction(this.actions$.pipe(ofType(loadContentPage)), personalizationStatusDetermined),
+      ofType(loadContentPage),
       mapToPayloadProperty('contentPageId'),
       mergeMap(contentPageId =>
         this.cmsService

diff --git a/src/app/core/store/core/server-config/server-config.effects.spec.ts b/src/app/core/store/core/server-config/server-config.effects.spec.ts
@@ -6,7 +6,7 @@ import { cold, hot } from 'jasmine-marbles';
 import { Observable, of, throwError } from 'rxjs';
 import { instance, mock, when } from 'ts-mockito';
 
-import { FeatureToggleModule } from 'ish-core/feature-toggle.module';
+import { FeatureToggleModule, FeatureToggleService } from 'ish-core/feature-toggle.module';
 import { ConfigurationService } from 'ish-core/services/configuration/configuration.service';
 import { CoreStoreModule } from 'ish-core/store/core/core-store.module';
 import { serverConfigError } from 'ish-core/store/core/error';
@@ -32,6 +32,7 @@ describe('Server Config Effects', () => {
       ],
       providers: [
         { provide: ConfigurationService, useFactory: () => instance(configurationServiceMock) },
+        { provide: FeatureToggleService, useFactory: () => instance(mock(FeatureToggleService)) },
         provideStoreSnapshots(),
       ],
     });

diff --git a/src/app/core/store/core/server-config/server-config.effects.ts b/src/app/core/store/core/server-config/server-config.effects.ts
@@ -11,8 +11,7 @@ import { ConfigurationService } from 'ish-core/services/configuration/configurat
 import { applyConfiguration } from 'ish-core/store/core/configuration';
 import { ConfigurationState } from 'ish-core/store/core/configuration/configuration.reducer';
 import { serverConfigError } from 'ish-core/store/core/error';
-import { personalizationStatusDetermined } from 'ish-core/store/customer/user';
-import { delayUntil, mapErrorToAction, mapToPayloadProperty, whenFalsy, whenTruthy } from 'ish-core/utils/operators';
+import { mapErrorToAction, mapToPayloadProperty, whenFalsy, whenTruthy } from 'ish-core/utils/operators';
 
 import {
   loadExtraConfigFail,
@@ -63,7 +62,6 @@ export class ServerConfigEffects {
       takeWhile(() => this.featureToggleService.enabled('extraConfiguration')),
       switchMap(() => this.store.pipe(select(isExtraConfigurationLoaded))),
       whenFalsy(),
-      delayUntil(this.actions$.pipe(ofType(personalizationStatusDetermined))),
       concatMap(() =>
         this.configService.getExtraConfiguration().pipe(
           map(extra => loadExtraConfigSuccess({ extra })),

diff --git a/src/app/core/store/shopping/categories/categories.effects.ts b/src/app/core/store/shopping/categories/categories.effects.ts
@@ -11,16 +11,10 @@ import { ofCategoryUrl } from 'ish-core/routing/category/category.route';
 import { CategoriesService } from 'ish-core/services/categories/categories.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 { loadMoreProducts } from 'ish-core/store/shopping/product-listing';
 import { HttpStatusCodeService } from 'ish-core/utils/http-status-code/http-status-code.service';
 import { InjectSingle } from 'ish-core/utils/injection';
-import {
-  mapErrorToAction,
-  mapToPayloadProperty,
-  useCombinedObservableOnAction,
-  whenTruthy,
-} from 'ish-core/utils/operators';
+import { mapErrorToAction, mapToPayloadProperty, whenTruthy } from 'ish-core/utils/operators';
 
 import {
   loadCategory,
@@ -54,11 +48,8 @@ export class CategoriesEffects {
    * when the requested {@link Category} is not available, yet
    */
   selectedCategory$ = createEffect(() =>
-    this.actions$.pipe(
-      useCombinedObservableOnAction(
-        this.store.pipe(select(selectRouteParam('categoryUniqueId'))),
-        personalizationStatusDetermined
-      ),
+    this.store.pipe(
+      select(selectRouteParam('categoryUniqueId')),
       whenTruthy(),
       withLatestFrom(this.store.pipe(select(getCategoryEntities))),
       filter(([id, entities]) => !CategoryHelper.isCategoryCompletelyLoaded(entities[id])),
@@ -71,11 +62,8 @@ export class CategoriesEffects {
    * when the requested ref in {@link getCategoryRefs} is not available, yet
    */
   selectedCategoryRef$ = createEffect(() =>
-    this.actions$.pipe(
-      useCombinedObservableOnAction(
-        this.store.pipe(select(selectRouteParam('categoryRefId'))),
-        personalizationStatusDetermined
-      ),
+    this.store.pipe(
+      select(selectRouteParam('categoryRefId')),
       whenTruthy(),
       withLatestFrom(this.store.pipe(select(getCategoryRefs)), this.store.pipe(select(getCategoryEntities))),
       filter(
@@ -104,10 +92,7 @@ export class CategoriesEffects {
 
   loadTopLevelCategories$ = createEffect(() =>
     this.actions$.pipe(
-      useCombinedObservableOnAction(
-        this.actions$.pipe(ofType(loadTopLevelCategories)),
-        personalizationStatusDetermined
-      ),
+      ofType(loadTopLevelCategories),
       switchMap(() =>
         this.categoryService.getTopLevelCategories(this.mainNavigationMaxSubCategoriesDepth).pipe(
           map(categories => loadTopLevelCategoriesSuccess({ categories })),

diff --git a/src/app/core/store/shopping/filter/filter.effects.ts b/src/app/core/store/shopping/filter/filter.effects.ts
@@ -3,8 +3,7 @@ import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { map, mergeMap, switchMap } from 'rxjs/operators';
 
 import { FilterService } from 'ish-core/services/filter/filter.service';
-import { personalizationStatusDetermined } from 'ish-core/store/customer/user';
-import { delayUntil, mapErrorToAction, mapToPayload } from 'ish-core/utils/operators';
+import { mapErrorToAction, mapToPayload } from 'ish-core/utils/operators';
 
 import {
   applyFilter,
@@ -24,7 +23,6 @@ export class FilterEffects {
   loadAvailableFilters$ = createEffect(() =>
     this.actions$.pipe(
       ofType(loadFilterForCategory, loadFilterForSearch, loadFilterForMaster),
-      delayUntil(this.actions$.pipe(ofType(personalizationStatusDetermined))),
       map(action => {
         switch (action.type) {
           case loadFilterForCategory.type:

diff --git a/src/app/core/store/shopping/products/products.effects.ts b/src/app/core/store/shopping/products/products.effects.ts
@@ -25,13 +25,11 @@ import { ofProductUrl } from 'ish-core/routing/product/product.route';
 import { ProductsService } from 'ish-core/services/products/products.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 { loadCategory } from 'ish-core/store/shopping/categories';
 import { loadProductsForFilter } from 'ish-core/store/shopping/filter';
 import { getProductListingItemsPerPage, setProductListingPages } from 'ish-core/store/shopping/product-listing';
 import { HttpStatusCodeService } from 'ish-core/utils/http-status-code/http-status-code.service';
 import {
-  delayUntil,
   mapErrorToAction,
   mapToPayload,
   mapToPayloadProperty,
@@ -80,7 +78,6 @@ export class ProductsEffects {
   loadProduct$ = createEffect(() =>
     this.actions$.pipe(
       ofType(loadProduct),
-      delayUntil(this.actions$.pipe(ofType(personalizationStatusDetermined))),
       mapToPayloadProperty('sku'),
       groupBy(identity),
       mergeMap(group$ =>