Merge branch 'develop' into feature/CXSPA-8633__util

SAP · Oct 23, 2024 · 7a1be00 · 7a1be00
2 parents 5cd3660 + dec2c82
commit 7a1be00
Show file tree

Hide file tree

Showing 146 changed files with 3,771 additions and 1,464 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -230,7 +230,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
       - name: Cache node_modules
         id: cache-node-modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: | 
             node_modules
@@ -277,7 +277,7 @@ jobs:
       - name: Notify the slack channel of when build conclusion failed
         env:
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_TOKEN }}
-        uses: slackapi/slack-github-action@v1.26.0
+        uses: slackapi/slack-github-action@v1.27.0
         with:
           channel-id: ${{ secrets.SLACK_NOTIFICATION_CHANNEL }}
           payload: |

diff --git a/core-libs/setup/package.json b/core-libs/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/setup",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Includes features that makes Spartacus and it's setup easier and streamlined.",
   "keywords": [
     "spartacus",
@@ -21,10 +21,10 @@
   "peerDependencies": {
     "@angular/core": "^17.0.5",
     "@angular/ssr": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/user": "2211.29.1"
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/user": "2211.30.0"
   },
   "optionalDependencies": {
     "@angular/platform-server": "^17.0.5",

diff --git a/feature-libs/asm/package.json b/feature-libs/asm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/asm",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "ASM feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,14 +32,14 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefinder": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefinder": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {

diff --git a/feature-libs/asm/styles/components/_asm-main-ui.component.scss b/feature-libs/asm/styles/components/_asm-main-ui.component.scss
@@ -89,8 +89,6 @@
 
   // Top Bar
   .asm-bar {
-    color: #fff;
-    background-color: #354a5f;
     height: 48px;
     display: flex;
     padding: 0 2rem;

diff --git a/feature-libs/asm/styles/components/_customer-selection.component.scss b/feature-libs/asm/styles/components/_customer-selection.component.scss
@@ -41,7 +41,6 @@
 
       @media (min-width: 575px) {
         margin-inline-end: 15px;
-        min-width: 20rem;
         margin-bottom: 0;
         min-width: 25rem;
       }

diff --git a/feature-libs/cart/base/assets/translations/en/cart.json b/feature-libs/cart/base/assets/translations/en/cart.json
@@ -34,6 +34,7 @@
     "coupon": "Have a coupon?",
     "coupon_other": "Coupon codes",
     "couponLabel": "Enter a promo code here",
+    "addCoupon": "Add a coupon",
     "apply": "Apply",
     "placeholder": "Promo code",
     "applyVoucherSuccess": "{{voucherCode}} has been applied.",

diff --git a/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.html b/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.html
@@ -6,9 +6,10 @@
         *ngIf="hasStock"
         [max]="maxQuantity"
         [control]="addToCartForm.get('quantity')"
+        [ariaDescribedById]="'add-to-card-stock-info'"
       ></cx-item-counter>
 
-      <span class="info">
+      <span class="info" id="add-to-card-stock-info">
         <span *ngIf="showInventory$ | async">{{ getInventory() }}</span>
         {{
           hasStock

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
@@ -25,6 +25,7 @@
       <button
         type="button"
         class="close"
+        title="{{ 'common.close' | cxTranslate }}"
         attr.aria-label="{{ 'addToCart.closeModal' | cxTranslate }}"
         (click)="dismissModal('Cross click')"
       >

diff --git a/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.html b/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.html
@@ -12,8 +12,8 @@
     </ng-container>
 
     <form (ngSubmit)="applyVoucher()" [formGroup]="couponForm">
-      <label class="cx-cart-coupon-title">
-        {{ 'voucher.coupon' | cxTranslate }}
+      <label id="card-coupon-input-label" class="cx-cart-coupon-title">
+        {{ 'voucher.addCoupon' | cxTranslate }}
         <!-- TODO: (CXSPA-7479) Remove feature flags next major -->
         <ng-container
           *cxFeature="
@@ -22,6 +22,7 @@
         >
           <abbr
             *cxFeature="'a11yRequiredAsterisks'"
+            aria-hidden="true"
             class="text-decoration-none"
             title="{{ 'common.required' | cxTranslate }}"
             >*</abbr
@@ -37,7 +38,7 @@
           "
         >
           <input
-            [attr.aria-label]="'voucher.couponLabel' | cxTranslate"
+            [attr.aria-labelledby]="'card-coupon-input-label'"
             type="text"
             class="form-control input-coupon-code"
             formControlName="couponCode"
@@ -62,7 +63,7 @@
         >
           <!-- TODO: (CXSPA-7479) Remove feature flags next major -->
           <input
-            [attr.aria-label]="'voucher.couponLabel' | cxTranslate"
+            [attr.aria-labelledby]="'card-coupon-input-label'"
             required="true"
             type="text"
             class="form-control input-coupon-code"

diff --git a/feature-libs/cart/package.json b/feature-libs/cart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cart",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "",
   "keywords": [
     "spartacus",
@@ -37,11 +37,11 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },

diff --git a/...bs/cart/quick-order/components/cart-quick-order-form/cart-quick-order-form.component.html b/...bs/cart/quick-order/components/cart-quick-order-form/cart-quick-order-form.component.html
@@ -17,6 +17,7 @@
               <!-- TODO: (CXSPA-5953) Remove feature flags next major -->
               <abbr
                 *cxFeature="'a11yRequiredAsterisks'"
+                aria-hidden="true"
                 class="text-decoration-none"
                 title="{{ 'common.required' | cxTranslate }}"
                 >*</abbr

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
@@ -223,6 +223,7 @@
                   >{{ 'savedCartDialog.savedCartName' | cxTranslate }}
                   <abbr
                     *cxFeature="'a11yRequiredAsterisks'"
+                    aria-hidden="true"
                     class="text-decoration-none"
                     title="{{ 'common.required' | cxTranslate }}"
                     >*</abbr

diff --git a/feature-libs/cart/wish-list/components/wish-list/wish-list.component.ts b/feature-libs/cart/wish-list/components/wish-list/wish-list.component.ts
@@ -7,6 +7,7 @@
 import { Component } from '@angular/core';
 import { Cart, OrderEntry } from '@spartacus/cart/base/root';
 import { WishListFacade } from '@spartacus/cart/wish-list/root';
+import { useFeatureStyles } from '@spartacus/core';
 import { Observable } from 'rxjs';
 
 @Component({
@@ -17,7 +18,9 @@ export class WishListComponent {
   wishList$: Observable<Cart> = this.wishListFacade.getWishList();
   loading$: Observable<boolean> = this.wishListFacade.getWishListLoading();
 
-  constructor(protected wishListFacade: WishListFacade) {}
+  constructor(protected wishListFacade: WishListFacade) {
+    useFeatureStyles('a11yVisibleFocusOverflows');
+  }
 
   removeEntry(item: OrderEntry) {
     this.wishListFacade.removeEntry(item);

diff --git a/feature-libs/cart/wish-list/styles/_wish-list.scss b/feature-libs/cart/wish-list/styles/_wish-list.scss
@@ -19,6 +19,12 @@
         }
       }
     }
+
+    @include forFeature('a11yVisibleFocusOverflows') {
+      .cx-remove-btn {
+        margin-top: 0.5rem;
+      }
+    }
   }
 
   .cx-empty-wish-list {

diff --git a/...onents/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.html b/...onents/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.html
@@ -305,9 +305,12 @@
                 <ng-container *ngIf="countries$ | async as countries">
                   <div *ngIf="countries.length !== 0">
                     <label>
-                      <span class="label-content required">{{
-                        'addressForm.country' | cxTranslate
-                      }}</span>
+                      <span class="label-content required">
+                        {{ 'addressForm.country' | cxTranslate }}
+                        <ng-template
+                          [ngTemplateOutlet]="requiredAsterisk"
+                        ></ng-template>
+                      </span>
                       <ng-select
                         [inputAttrs]="{ required: 'true' }"
                         [searchable]="true"
@@ -346,9 +349,12 @@
               </div>
               <div class="form-group">
                 <label>
-                  <span class="label-content required">{{
-                    'addressForm.firstName.label' | cxTranslate
-                  }}</span>
+                  <span class="label-content required">
+                    {{ 'addressForm.firstName.label' | cxTranslate }}
+                    <ng-template
+                      [ngTemplateOutlet]="requiredAsterisk"
+                    ></ng-template>
+                  </span>
                   <input
                     required="true"
                     class="form-control"
@@ -376,9 +382,12 @@
               </div>
               <div class="form-group">
                 <label>
-                  <span class="label-content required">{{
-                    'addressForm.lastName.label' | cxTranslate
-                  }}</span>
+                  <span class="label-content required">
+                    {{ 'addressForm.lastName.label' | cxTranslate }}
+                    <ng-template
+                      [ngTemplateOutlet]="requiredAsterisk"
+                    ></ng-template>
+                  </span>
                   <input
                     required="true"
                     type="text"
@@ -406,9 +415,12 @@
               </div>
               <div class="form-group">
                 <label>
-                  <span class="label-content required">{{
-                    'addressForm.address1' | cxTranslate
-                  }}</span>
+                  <span class="label-content required">
+                    {{ 'addressForm.address1' | cxTranslate }}
+                    <ng-template
+                      [ngTemplateOutlet]="requiredAsterisk"
+                    ></ng-template>
+                  </span>
                   <input
                     required="true"
                     type="text"
@@ -450,9 +462,12 @@
               <div class="row">
                 <div class="form-group col-md-6">
                   <label>
-                    <span class="label-content required">{{
-                      'addressForm.city.label' | cxTranslate
-                    }}</span>
+                    <span class="label-content required">
+                      {{ 'addressForm.city.label' | cxTranslate }}
+                      <ng-template
+                        [ngTemplateOutlet]="requiredAsterisk"
+                      ></ng-template>
+                    </span>
                     <input
                       required="true"
                       type="text"
@@ -480,9 +495,12 @@
                 </div>
                 <div class="form-group col-md-6">
                   <label>
-                    <span class="label-content required">{{
-                      'addressForm.zipCode.label' | cxTranslate
-                    }}</span>
+                    <span class="label-content required">
+                      {{ 'addressForm.zipCode.label' | cxTranslate }}
+                      <ng-template
+                        [ngTemplateOutlet]="requiredAsterisk"
+                      ></ng-template>
+                    </span>
                     <input
                       required="true"
                       type="text"
@@ -599,7 +617,9 @@
 <ng-template #requiredAsterisk>
   <abbr
     *cxFeature="'a11yRequiredAsterisks'"
+    aria-hidden="true"
     class="text-decoration-none"
+    aria-hidden="true"
     title="{{ 'common.required' | cxTranslate }}"
     >*</abbr
   >

diff --git a/...re-libs/checkout/base/components/checkout-place-order/checkout-place-order.component.html b/...re-libs/checkout/base/components/checkout-place-order/checkout-place-order.component.html
@@ -19,6 +19,7 @@
         </a>
         <abbr
           *cxFeature="'a11yRequiredAsterisks'"
+          aria-hidden="true"
           class="text-decoration-none"
           title="{{ 'common.required' | cxTranslate }}"
           >*</abbr

diff --git a/feature-libs/checkout/package.json b/feature-libs/checkout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/checkout",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Checkout feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,13 +32,13 @@
     "@angular/router": "^17.0.5",
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },

diff --git a/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap b/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap
@@ -63,7 +63,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -514,7 +514,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })