Merge branch 'epic/product-configuration' into feature/GH-8835-move-c…

…onnectors-adapters

projects/core/public_api.ts

@@ -15,7 +15,7 @@ export * from './src/global-message/index';
 export * from './src/i18n/index';
 export * from './src/kyma/index';
 export * from './src/model/index';
-export * from './src/organization/index';
+export * from './src/cost-center/index';
 export * from './src/occ/index';
 export * from './src/personalization/index';
 export * from './src/process/index';

projects/core/src/checkout/store/effects/checkout.effect.ts

@@ -16,6 +16,7 @@ import { GlobalMessageActions } from '../../../global-message/store/actions/inde
 import { OCC_USER_ID_ANONYMOUS } from '../../../occ/utils/occ-constants';
 import { SiteContextActions } from '../../../site-context/store/actions/index';
 import { UserActions } from '../../../user/store/actions/index';
+import { normalizeHttpError } from '../../../util/normalize-http-error';
 import { makeErrorSerializable } from '../../../util/serialization-utils';
 import { withdrawOn } from '../../../util/withdraw-on';
 import { CheckoutConnector } from '../../connectors/checkout/checkout.connector';
@@ -430,6 +431,7 @@ export class CheckoutEffects {
         .setCostCenter(payload.userId, payload.cartId, payload.costCenterId)
         .pipe(
           mergeMap((data) => [
+            // TODO(#8877): We should trigger load cart not already assign the data. We might have misconfiguration between this cart model and load cart model
             new CartActions.LoadCartSuccess({
               cart: data,
               cartId: payload.cartId,
@@ -446,11 +448,7 @@ export class CheckoutEffects {
             }),
           ]),
           catchError((error) =>
-            of(
-              new CheckoutActions.SetCostCenterFail(
-                makeErrorSerializable(error)
-              )
-            )
+            of(new CheckoutActions.SetCostCenterFail(normalizeHttpError(error)))
           )
         );
     }),

projects/core/src/checkout/store/effects/payment-types.effect.ts

@@ -3,7 +3,7 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Observable, of } from 'rxjs';
 import { catchError, map, mergeMap, switchMap } from 'rxjs/operators';
 import { CartActions } from '../../../cart/store/actions/index';
-import { makeErrorSerializable } from '../../../util/serialization-utils';
+import { normalizeHttpError } from '../../../util/normalize-http-error';
 import { PaymentTypeConnector } from '../../connectors/payment-type/payment-type.connector';
 import { CheckoutActions } from '../actions/index';
 
@@ -23,9 +23,7 @@ export class PaymentTypesEffects {
         ),
         catchError((error) =>
           of(
-            new CheckoutActions.LoadPaymentTypesFail(
-              makeErrorSerializable(error)
-            )
+            new CheckoutActions.LoadPaymentTypesFail(normalizeHttpError(error))
           )
         )
       );
@@ -63,9 +61,7 @@ export class PaymentTypesEffects {
           }),
           catchError((error) =>
             of(
-              new CheckoutActions.SetPaymentTypeFail(
-                makeErrorSerializable(error)
-              )
+              new CheckoutActions.SetPaymentTypeFail(normalizeHttpError(error))
             )
           )
         );

projects/core/src/organization/connectors/index.ts → projects/core/src/cost-center/connectors/index.ts

@@ -1,2 +1 @@
-export * from './budget/index';
 export * from './cost-center/index';

projects/core/src/cost-center/cost-center.module.ts

@@ -0,0 +1,11 @@
+import { ModuleWithProviders, NgModule } from '@angular/core';
+
+@NgModule({})
+export class CostCenterModule {
+  static forRoot(): ModuleWithProviders<CostCenterModule> {
+    return {
+      ngModule: CostCenterModule,
+      providers: [],
+    };
+  }
+}

projects/core/src/cost-center/index.ts

@@ -0,0 +1,2 @@
+export * from './connectors/index';
+export * from './cost-center.module';

projects/core/src/model/cart.model.ts

@@ -6,8 +6,8 @@ import {
   PickupOrderEntryGroup,
   PromotionOrderEntryConsumed,
 } from './order.model';
-import { Price, Promotion } from './product.model';
 import { CostCenter } from './org-unit.model';
+import { Price, Promotion } from './product.model';
 
 export interface PromotionResult {
   consumedEntries?: PromotionOrderEntryConsumed[];
@@ -82,11 +82,6 @@ export interface SaveCartResult {
   savedCartData?: Cart;
 }
 
-export interface B2BPaymentType {
-  code?: string;
-  displayName?: string;
-}
-
 export interface Cart {
   appliedOrderPromotions?: PromotionResult[];
   appliedProductPromotions?: PromotionResult[];
@@ -107,7 +102,7 @@ export interface Cart {
   net?: boolean;
   orderDiscounts?: Price;
   paymentInfo?: PaymentDetails;
-  paymentType?: B2BPaymentType;
+  paymentType?: PaymentType;
   pickupItemsQuantity?: number;
   pickupOrderGroups?: PickupOrderEntryGroup[];
   potentialOrderPromotions?: PromotionResult[];

projects/core/src/model/misc.model.ts

@@ -40,12 +40,7 @@ export interface User {
   uid?: string;
 }
 
-export interface ListModel {
-  ids: string[];
-  pagination?: PaginationModel;
-  sorts?: SortModel[];
-}
-
+// TODO(#8875): Do we need it here?
 export interface EntitiesModel<T> {
   values: T[];
   pagination?: PaginationModel;

projects/core/src/model/org-unit.model.ts

@@ -1,5 +1,6 @@
 import { Currency, User } from './misc.model';
 
+// TODO(#8876): Should we simplify the models only for the fields required by the B2B checkout?
 export interface CostCenter {
   active?: string;
   activeFlag?: boolean;
@@ -10,14 +11,6 @@ export interface CostCenter {
   currency?: Currency;
 }
 
-export interface B2BUnitNode {
-  active?: boolean;
-  children?: B2BUnitNode[];
-  id?: string;
-  name?: string;
-  parent?: string;
-}
-
 export interface B2BUnit {
   active?: boolean;
   addresses?: B2BAddress[];

projects/core/src/occ/adapters/checkout/occ-checkout-cost-center.adapter.ts

@@ -1,11 +1,11 @@
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { Cart } from '../../../model/cart.model';
+import { CART_NORMALIZER } from '../../../cart/connectors/cart/converters';
 import { CheckoutCostCenterAdapter } from '../../../checkout/connectors/cost-center/checkout-cost-center.adapter';
+import { Cart } from '../../../model/cart.model';
 import { ConverterService } from '../../../util/converter.service';
 import { OccEndpointsService } from '../../services/occ-endpoints.service';
-import { CART_NORMALIZER } from '../../../cart/connectors/cart/converters';
 
 @Injectable()
 export class OccCheckoutCostCenterAdapter implements CheckoutCostCenterAdapter {
@@ -26,6 +26,7 @@ export class OccCheckoutCostCenterAdapter implements CheckoutCostCenterAdapter {
       'fields',
       'DEFAULT,potentialProductPromotions,appliedProductPromotions,potentialOrderPromotions,appliedOrderPromotions,entries(totalPrice(formattedValue),product(images(FULL),stock(FULL)),basePrice(formattedValue,value),updateable),totalPrice(formattedValue),totalItems,totalPriceWithTax(formattedValue),totalDiscounts(value,formattedValue),subTotal(formattedValue),deliveryItemsQuantity,deliveryCost(formattedValue),totalTax(formattedValue, value),pickupItemsQuantity,net,appliedVouchers,productDiscounts(formattedValue),user'
     );
+    // TODO(#8877): Should we improve configurable endpoints for this use case?
 
     return this.http
       .put(

projects/core/src/occ/adapters/checkout/occ-checkout-payment-type.adapter.ts

@@ -2,13 +2,13 @@ import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { PaymentTypeAdapter } from '../../../checkout/connectors/payment-type/payment-type.adapter';
+import { CART_NORMALIZER } from '../../../cart/connectors/cart/converters';
 import { PAYMENT_TYPE_NORMALIZER } from '../../../checkout/connectors/payment-type/converters';
-import { PaymentType, Cart } from '../../../model/cart.model';
+import { PaymentTypeAdapter } from '../../../checkout/connectors/payment-type/payment-type.adapter';
+import { Cart, PaymentType } from '../../../model/cart.model';
 import { ConverterService } from '../../../util/converter.service';
 import { Occ } from '../../occ-models';
 import { OccEndpointsService } from '../../services/occ-endpoints.service';
-import { CART_NORMALIZER } from '../../../cart/connectors/cart/converters';
 
 const ENDPOINT_PAYMENT_TYPES = 'paymenttypes';
 
@@ -46,6 +46,7 @@ export class OccCheckoutPaymentTypeAdapter implements PaymentTypeAdapter {
       'fields',
       'DEFAULT,potentialProductPromotions,appliedProductPromotions,potentialOrderPromotions,appliedOrderPromotions,entries(totalPrice(formattedValue),product(images(FULL),stock(FULL)),basePrice(formattedValue,value),updateable),totalPrice(formattedValue),totalItems,totalPriceWithTax(formattedValue),totalDiscounts(value,formattedValue),subTotal(formattedValue),deliveryItemsQuantity,deliveryCost(formattedValue),totalTax(formattedValue, value),pickupItemsQuantity,net,appliedVouchers,productDiscounts(formattedValue),user'
     );
+    // TODO(#8877): Should we improve configurable endpoints for this use case?
 
     return this.http
       .put(

projects/core/src/occ/adapters/organization/converters/occ-cost-center-list-normalizer.ts → projects/core/src/occ/adapters/cost-center/converters/occ-cost-center-list-normalizer.ts

@@ -1,12 +1,12 @@
 import { Injectable } from '@angular/core';
-import { Occ } from '../../../occ-models/occ.models';
+import { COST_CENTER_NORMALIZER } from '../../../../cost-center/connectors/cost-center/converters';
+import { EntitiesModel } from '../../../../model/misc.model';
+import { CostCenter } from '../../../../model/org-unit.model';
 import {
   Converter,
   ConverterService,
 } from '../../../../util/converter.service';
-import { COST_CENTER_NORMALIZER } from '../../../../organization/connectors/cost-center/converters';
-import { EntitiesModel } from '../../../../model/misc.model';
-import { CostCenter } from '../../../../model/org-unit.model';
+import { Occ } from '../../../occ-models/occ.models';
 
 @Injectable()
 export class OccCostCenterListNormalizer

projects/core/src/occ/adapters/cost-center/cost-center-occ.module.ts

@@ -0,0 +1,18 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { ConfigModule } from '../../../config/config.module';
+import { COST_CENTERS_NORMALIZER } from '../../../cost-center/connectors/cost-center/converters';
+import { OccCostCenterListNormalizer } from './converters/occ-cost-center-list-normalizer';
+import { defaultOccCostCentersConfig } from './default-occ-cost-centers-config';
+
+@NgModule({
+  imports: [CommonModule, ConfigModule.withConfig(defaultOccCostCentersConfig)],
+  providers: [
+    {
+      provide: COST_CENTERS_NORMALIZER,
+      useClass: OccCostCenterListNormalizer,
+      multi: true,
+    },
+  ],
+})
+export class CostCenterOccModule {}

projects/core/src/occ/adapters/cost-center/default-occ-cost-centers-config.ts

@@ -0,0 +1,11 @@
+import { OccConfig } from '../../config/occ-config';
+
+export const defaultOccCostCentersConfig: OccConfig = {
+  backend: {
+    occ: {
+      endpoints: {
+        costCenters: '/costcenters',
+      },
+    },
+  },
+};

projects/core/src/occ/adapters/cost-center/index.ts

@@ -0,0 +1,2 @@
+export * from './converters/index';
+export * from './cost-center-occ.module';

projects/core/src/occ/adapters/index.ts

@@ -2,6 +2,7 @@ export * from './asm/index';
 export * from './cart/index';
 export * from './checkout/index';
 export * from './cms/index';
+export * from './cost-center/index';
 export * from './product/index';
 export * from './site-context/index';
 export * from './store-finder/index';