Merge branch 'develop' into epic/ssr-error-handling

SAP · Sep 3, 2024 · eeb23f0 · eeb23f0
2 parents c6d3a7a + 274fb15
commit eeb23f0
Show file tree

Hide file tree

Showing 105 changed files with 471 additions and 365 deletions.
diff --git a/.github/workflows/update-cloud-repo.yml b/.github/workflows/update-cloud-repo.yml
@@ -78,8 +78,17 @@ jobs:
 
           # Comment out the base url in the spartacus-configuration.module.ts file
           function modify_file_to_remove_baseurl() {
-            local file_location="../spartacus-${{ github.event.inputs.version }}-${storefront_type}/apps/spartacusstore/src/app/spartacus/spartacus-configuration.module.ts"
+            local path
+            if [ "${storefront_type}" == "b2c" ]; then
+              path="spartacusstore"
+            elif [ "${storefront_type}" == "b2b" ]; then
+              path="b2bspastore"
+            else
+              echo "Invalid storefront type: ${storefront_type}"
+              exit 1
+            fi
 
+            local file_location="../spartacus-${{ github.event.inputs.version }}-${storefront_type}/apps/${path}/src/app/spartacus/spartacus-configuration.module.ts"
             if [ -f "${file_location}" ]; then
               sed -i 's/baseUrl/\/\/baseUrl/1' "${file_location}"
               echo "Modified ${file_location}."

diff --git a/core-libs/setup/tsconfig.spec.json b/core-libs/setup/tsconfig.spec.json
@@ -353,9 +353,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],

diff --git a/docs/migration/2211_19/2211-migration.md b/docs/migration/2211_19/2211-migration.md
@@ -27,7 +27,7 @@ Follow the [Angular guidelines for upgrading from v16 to v17](https://update.ang
 Please also update other 3rd part dependencies from Angular ecosystem to versions compatible with Angular 17, e.g. `@ng-select/ng-select@12`, `@ngrx/store@17`, `ngx-infinite-scroll@17`:
 
 ```bash
-ng update @angular/core@17 @angular/cli@17 @ng-select/ng-select@12 @ngrx/store@17 ngx-infinite-scroll@17 --force
+ng update @angular/core@17 @angular/cli@17 @ng-select/ng-select@12 @ngrx/store@17 ngx-infinite-scroll@17 [email protected] --force
 git add .
 git commit -m "update angular 17 and 3rd party deps angular 17 compatible"
 ```
@@ -46,6 +46,12 @@ git add .
 git commit -m "add @angular-devkit/schematics@17 to dev dependencies"
 ```
 
+If `@angular-devkit/core` is not listed under the `devDependencies` in the `package.json` file, please execute the following commands:
+```bash
+npm i @angular-devkit/core@17 --save-dev --force             
+git add .
+git commit -m "add @angular-devkit/core@17 to dev dependencies"
+```
 ### Run Spartacus update
 
 After successfully updating the application to Angular 17, execute this command to initiate the Spartacus update process.

diff --git a/feature-libs/asm/tsconfig.schematics.json b/feature-libs/asm/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],

diff --git a/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.html b/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.html
@@ -149,7 +149,22 @@
     <!-- Modal Header -->
     <ng-container *ngIf="loaded$ | async; else loading">
       <div class="cx-dialog-header modal-header">
-        <div id="dialogTitle" class="cx-dialog-title modal-title">
+        <h3
+          *cxFeature="'a11yDialogsHeading'"
+          id="dialogTitle"
+          class="cx-dialog-title modal-title"
+        >
+          {{
+            (addedEntryWasMerged$ | async)
+              ? ('addToCart.itemsIncrementedInYourCart' | cxTranslate)
+              : ('addToCart.itemsAddedToYourCart' | cxTranslate)
+          }}
+        </h3>
+        <div
+          *cxFeature="'!a11yDialogsHeading'"
+          id="dialogTitle"
+          class="cx-dialog-title modal-title"
+        >
           {{
             (addedEntryWasMerged$ | async)
               ? ('addToCart.itemsIncrementedInYourCart' | cxTranslate)
@@ -262,7 +277,16 @@
 
     <ng-template #loading>
       <div class="cx-dialog-header modal-header">
-        <div class="cx-dialog-title modal-title">
+        <h2
+          *cxFeature="'a11yDialogsHeading'"
+          class="cx-dialog-title modal-title"
+        >
+          {{ 'addToCart.updatingCart' | cxTranslate }}
+        </h2>
+        <div
+          *cxFeature="'!a11yDialogsHeading'"
+          class="cx-dialog-title modal-title"
+        >
           {{ 'addToCart.updatingCart' | cxTranslate }}
         </div>
         <button

diff --git a/...ure-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.spec.ts b/...ure-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.spec.ts
@@ -34,10 +34,10 @@ import {
   SpinnerModule,
 } from '@spartacus/storefront';
 import { cold } from 'jasmine-marbles';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { BehaviorSubject, EMPTY, Observable, of } from 'rxjs';
 import { skip, take } from 'rxjs/operators';
 import { AddedToCartDialogComponent } from './added-to-cart-dialog.component';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 
 class MockActiveCartService implements Partial<ActiveCartFacade> {
   updateEntry(_entryNumber: number, _quantity: number): void {}

diff --git a/...e-libs/cart/base/components/clear-cart/clear-cart-dialog/clear-cart-dialog.component.html b/...e-libs/cart/base/components/clear-cart/clear-cart-dialog/clear-cart-dialog.component.html
@@ -13,7 +13,18 @@
       ></div>
       <!-- Modal Header -->
       <div class="modal-header cx-clear-cart-header">
-        <div id="dialogTitle" class="cx-clear-cart-title modal-title">
+        <h3
+          *cxFeature="'a11yDialogsHeading'"
+          id="dialogTitle"
+          class="cx-clear-cart-title modal-title"
+        >
+          {{ 'clearCart.clearCart' | cxTranslate }}
+        </h3>
+        <div
+          *cxFeature="'!a11yDialogsHeading'"
+          id="dialogTitle"
+          class="cx-clear-cart-title modal-title"
+        >
           {{ 'clearCart.clearCart' | cxTranslate }}
         </div>
 
@@ -59,7 +70,16 @@
 
 <ng-template #loading>
   <div class="modal-header cx-clear-cart-header">
-    <div class="cx-clear-cart-title modal-title">
+    <h2
+      *cxFeature="'a11yDialogsHeading'"
+      class="cx-clear-cart-title modal-title"
+    >
+      {{ 'clearCart.clearingCart' | cxTranslate }}
+    </h2>
+    <div
+      *cxFeature="'!a11yDialogsHeading'"
+      class="cx-clear-cart-title modal-title"
+    >
       {{ 'clearCart.clearingCart' | cxTranslate }}
     </div>
   </div>

diff --git a/...ibs/cart/base/components/clear-cart/clear-cart-dialog/clear-cart-dialog.component.spec.ts b/...ibs/cart/base/components/clear-cart/clear-cart-dialog/clear-cart-dialog.component.spec.ts
@@ -1,13 +1,14 @@
-import { ClearCartDialogComponentService } from './clear-cart-dialog-component.service';
+import { CommonModule } from '@angular/common';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { I18nTestingModule } from '@spartacus/core';
 import {
   IconTestingModule,
   KeyboardFocusTestingModule,
 } from '@spartacus/storefront';
-import { I18nTestingModule } from '@spartacus/core';
-import { CommonModule } from '@angular/common';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
+import { ClearCartDialogComponentService } from './clear-cart-dialog-component.service';
 import { ClearCartDialogComponent } from './clear-cart-dialog.component';
-import { By } from '@angular/platform-browser';
 
 const mockCloseReason = 'Cancel Clear Cart';
 
@@ -29,7 +30,7 @@ describe('ClearCartDialogComponent', () => {
         KeyboardFocusTestingModule,
         IconTestingModule,
       ],
-      declarations: [ClearCartDialogComponent],
+      declarations: [ClearCartDialogComponent, MockFeatureDirective],
       providers: [
         {
           provide: ClearCartDialogComponentService,

diff --git a/feature-libs/cart/base/components/clear-cart/clear-cart-dialog/clear-cart-dialog.module.ts b/feature-libs/cart/base/components/clear-cart/clear-cart-dialog/clear-cart-dialog.module.ts
@@ -6,7 +6,7 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { I18nModule } from '@spartacus/core';
+import { FeaturesConfigModule, I18nModule } from '@spartacus/core';
 import {
   IconModule,
   KeyboardFocusModule,
@@ -21,6 +21,7 @@ import { ClearCartDialogComponent } from './clear-cart-dialog.component';
     I18nModule,
     IconModule,
     KeyboardFocusModule,
+    FeaturesConfigModule,
   ],
   declarations: [ClearCartDialogComponent],
   exports: [ClearCartDialogComponent],

diff --git a/...port/components/import-to-cart/import-entries-dialog/import-entries-dialog.component.html b/...port/components/import-to-cart/import-entries-dialog/import-entries-dialog.component.html
@@ -9,7 +9,18 @@
     <!-- Modal Header -->
     <div class="modal-header cx-import-entries-header">
       <ng-container>
-        <div id="dialogTitle" class="cx-import-entries-title modal-title">
+        <h3
+          *cxFeature="'a11yDialogsHeading'"
+          id="dialogTitle"
+          class="cx-import-entries-title modal-title"
+        >
+          {{ 'importEntriesDialog.importProducts' | cxTranslate }}
+        </h3>
+        <div
+          *cxFeature="'!a11yDialogsHeading'"
+          id="dialogTitle"
+          class="cx-import-entries-title modal-title"
+        >
           {{ 'importEntriesDialog.importProducts' | cxTranslate }}
         </div>
       </ng-container>

diff --git a/...t/components/import-to-cart/import-entries-dialog/import-entries-dialog.component.spec.ts b/...t/components/import-to-cart/import-entries-dialog/import-entries-dialog.component.spec.ts
@@ -13,6 +13,7 @@ import {
   KeyboardFocusTestingModule,
   LaunchDialogService,
 } from '@spartacus/storefront';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { BehaviorSubject, Observable, of } from 'rxjs';
 import { ImportEntriesDialogComponent } from './import-entries-dialog.component';
 
@@ -71,6 +72,7 @@ describe('ImportEntriesDialogComponent', () => {
       declarations: [
         ImportEntriesDialogComponent,
         MockImportEntriesFormComponent,
+        MockFeatureDirective,
       ],
       providers: [
         { provide: LaunchDialogService, useClass: MockLaunchDialogService },

diff --git a/feature-libs/cart/import-export/components/import-to-cart/import-order-entries.module.ts b/feature-libs/cart/import-export/components/import-to-cart/import-order-entries.module.ts
@@ -10,6 +10,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import {
   CmsConfig,
   ConfigModule,
+  FeaturesConfigModule,
   I18nModule,
   provideDefaultConfig,
 } from '@spartacus/core';
@@ -43,6 +44,7 @@ import { ImportOrderEntriesComponent } from './import-entries/import-order-entri
         },
       },
     }),
+    FeaturesConfigModule,
   ],
   declarations: [
     ImportOrderEntriesComponent,

diff --git a/feature-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.component.html b/feature-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.component.html
@@ -11,7 +11,18 @@
     >
       <span>{{ 'addToSavedCart.savedCarts' | cxTranslate }}</span>
     </a>
+    <button
+      *cxFeature="'a11yUseButtonsForBtnLinks'"
+      #element
+      class="link cx-action-link"
+      [class.disabled]="disableSaveCartForLater$ | async"
+      (click)="saveCart(cart)"
+      cxAutoFocus
+    >
+      <span>{{ 'addToSavedCart.saveCartForLater' | cxTranslate }}</span>
+    </button>
     <a
+      *cxFeature="'!a11yUseButtonsForBtnLinks'"
       #element
       tabindex="0"
       class="link cx-action-link"

diff --git a/...ure-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.component.spec.ts b/...ure-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.component.spec.ts
@@ -14,6 +14,7 @@ import { take } from 'rxjs/operators';
 
 import { UrlTestingModule } from 'projects/core/src/routing/configurable-routes/url-translation/testing/url-testing.module';
 import { AddToSavedCartComponent } from './add-to-saved-cart.component';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 
 const mockCart: Cart = {
   code: '123456789',
@@ -64,7 +65,7 @@ describe('AddToSavedCartComponent', () => {
         UrlTestingModule,
         RouterTestingModule,
       ],
-      declarations: [AddToSavedCartComponent],
+      declarations: [AddToSavedCartComponent, MockFeatureDirective],
       providers: [
         { provide: ActiveCartFacade, useClass: MockActiveCartService },
         { provide: AuthService, useClass: MockAuthService },

diff --git a/feature-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.module.ts b/feature-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.module.ts
@@ -9,14 +9,21 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import {
   CmsConfig,
+  FeaturesConfigModule,
   I18nModule,
   provideDefaultConfig,
   UrlModule,
 } from '@spartacus/core';
 import { AddToSavedCartComponent } from './add-to-saved-cart.component';
 
 @NgModule({
-  imports: [CommonModule, RouterModule, I18nModule, UrlModule],
+  imports: [
+    CommonModule,
+    RouterModule,
+    I18nModule,
+    UrlModule,
+    FeaturesConfigModule,
+  ],
   providers: [
     provideDefaultConfig(<CmsConfig>{
       cmsComponents: {

diff --git a/...s/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.component.html b/...s/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.component.html
@@ -10,7 +10,29 @@
       <!-- Modal Header -->
       <div class="modal-header cx-saved-cart-form-header">
         <ng-container [ngSwitch]="layoutOption">
-          <div id="dialogTitle" class="cx-saved-cart-form-title modal-title">
+          <h3
+            *cxFeature="'a11yDialogsHeading'"
+            id="dialogTitle"
+            class="cx-saved-cart-form-title modal-title"
+          >
+            <ng-container *ngSwitchCase="savedCartFormType.EDIT">
+              {{ 'savedCartDialog.editSavedCart' | cxTranslate }}
+            </ng-container>
+            <ng-container *ngSwitchCase="savedCartFormType.DELETE">
+              {{ 'savedCartDialog.deleteSavedCart' | cxTranslate }}
+            </ng-container>
+            <ng-container *ngSwitchCase="savedCartFormType.SAVE">
+              {{ 'savedCartDialog.saveForLater' | cxTranslate }}
+            </ng-container>
+            <ng-container *ngSwitchCase="savedCartFormType.RESTORE">
+              {{ 'savedCartDialog.restoreSavedCart' | cxTranslate }}
+            </ng-container>
+          </h3>
+          <div
+            *cxFeature="'!a11yDialogsHeading'"
+            id="dialogTitle"
+            class="cx-saved-cart-form-title modal-title"
+          >
             <ng-container *ngSwitchCase="savedCartFormType.EDIT">
               {{ 'savedCartDialog.editSavedCart' | cxTranslate }}
             </ng-container>

diff --git a/feature-libs/cart/tsconfig.schematics.json b/feature-libs/cart/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],

diff --git a/feature-libs/checkout/tsconfig.schematics.json b/feature-libs/checkout/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],

diff --git a/feature-libs/customer-ticketing/tsconfig.schematics.json b/feature-libs/customer-ticketing/tsconfig.schematics.json
@@ -363,9 +363,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],

diff --git a/feature-libs/estimated-delivery-date/tsconfig.schematics.json b/feature-libs/estimated-delivery-date/tsconfig.schematics.json
@@ -363,9 +363,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],

diff --git a/feature-libs/order/tsconfig.schematics.json b/feature-libs/order/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],