Merge branch 'develop' into bugfix/CXSPA-8567

Author: kpawelczak

Diff for: feature-libs/checkout/b2b/components/checkout-delivery-address/checkout-delivery-address.component.html

@@ -48,6 +48,7 @@ <h2 class="cx-checkout-title d-none d-lg-block d-xl-block">
               [fitToContainer]="true"
               [content]="card.card"
               (sendCard)="selectAddress(card.address)"
+              [role]="'group'"
             ></cx-card>
           </div>
         </div>

Diff for: feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.html

@@ -58,6 +58,7 @@ <h2 class="cx-checkout-title d-none d-lg-block d-xl-block">
                 [fitToContainer]="true"
                 [content]="card.card"
                 (sendCard)="selectAddress(card.address)"
+                [role]="'group'"
               ></cx-card>
             </div>
           </div>

Diff for: feature-libs/product/image-zoom/styles/_product-image-zoom-view.scss

@@ -157,6 +157,7 @@ cx-product-image-zoom-view {
     .cx-image-container .cx-zoom-btn {
       background-color: var(--cx-color-dark);
       color: var(--cx-color-light);
+      --cx-color-visual-focus: #1f3a93;
     }
   }
 }

Diff for: projects/assets/src/translations/en/common.json

@@ -27,6 +27,7 @@
     "loaded": "Loaded",
     "results": "Results",
     "of": "of",
+    "ngSelectDropdownOptionsList": "Options",
     "required": "required",
     "zoomIn": "Zoom in",
     "zoomOut": "Zoom out",

Diff for: projects/core/src/features-config/feature-toggles/config/feature-toggles.ts

@@ -614,6 +614,12 @@ export interface FeatureTogglesInterface {
    */
   a11yNgSelectCloseDropdownOnEscape?: boolean;
 
+  /**
+   * 'NgSelectA11yDirective' will customize a ng-select dropdowns by setting custom
+   * ariaLabelDropdown ng-select attribute value to provided common.ngSelectDropdownOptionsList translation
+   */
+  a11yNgSelectAriaLabelDropdownCustomized?: boolean;
+
   /**
    * Removes duplicated error message from 'CancelOrderComponent'.
    */
@@ -992,8 +998,8 @@ export interface FeatureTogglesInterface {
 export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   showDeliveryOptionsTranslation: false,
   formErrorsDescriptiveMessages: true,
-  showSearchingCustomerByOrderInASM: false,
-  showStyleChangesInASM: false,
+  showSearchingCustomerByOrderInASM: true,
+  showStyleChangesInASM: true,
   shouldHideAddToCartForUnpurchasableProducts: true,
   useExtractedBillingAddressComponent: true,
   showBillingAddressInDigitalPayments: true,
@@ -1070,23 +1076,24 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   a11yTabComponent: false,
   a11yCarouselArrowKeysNavigation: false,
   a11yPickupOptionsTabs: false,
-  a11yNotificationsOnConsentChange: false,
+  a11yNotificationsOnConsentChange: true,
   a11yDisabledCouponAndQuickOrderActionButtonsInsteadOfRequiredFields: true,
   a11yFacetsDialogFocusHandling: true,
   a11yResetFocusAfterNavigating: false,
   headerLayoutForSmallerViewports: false,
-  a11yStoreFinderAlerts: false,
+  a11yStoreFinderAlerts: true,
   a11yStoreFinderLabel: false,
-  a11yFormErrorMuteIcon: false,
-  a11yCxMessageFocus: false,
+  a11yFormErrorMuteIcon: true,
+  a11yCxMessageFocus: true,
   a11yLinkBtnsToTertiaryBtns: false,
   a11yRepeatedPageTitleFix: false,
-  a11yDeliveryModeRadiogroup: false,
+  a11yDeliveryModeRadiogroup: true,
   a11yNgSelectOptionsCount: false,
   a11yNgSelectCloseDropdownOnEscape: false,
+  a11yNgSelectAriaLabelDropdownCustomized: false,
   a11yRepeatedCancelOrderError: false,
   a11yAddedToCartActiveDialog: false,
-  a11yNgSelectMobileReadout: false,
+  a11yNgSelectMobileReadout: true,
   a11yDeliveryMethodFieldset: false,
   a11yShowMoreReviewsBtnFocus: false,
   a11yQuickOrderAriaControls: false,
@@ -1127,8 +1134,8 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   a11yRepeatingButtonsUniqueLabels: false,
   a11yHighContrastBorders: false,
   a11yRegionAssociatedHeaders: false,
-  occCartNameAndDescriptionInHttpRequestBody: false,
-  cmsBottomHeaderSlotUsingFlexStyles: false,
+  occCartNameAndDescriptionInHttpRequestBody: true,
+  cmsBottomHeaderSlotUsingFlexStyles: true,
   useSiteThemeService: false,
   enableConsecutiveCharactersPasswordRequirement: false,
   enablePasswordsCannotMatchInPasswordUpdateForm: false,

Diff for: projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts

@@ -389,6 +389,7 @@ if (environment.cpq) {
          */
         a11yNgSelectOptionsCount: false,
         a11yNgSelectCloseDropdownOnEscape: true,
+        a11yNgSelectAriaLabelDropdownCustomized: true,
         a11yRepeatedCancelOrderError: true,
         a11yAddedToCartActiveDialog: true,
         a11yNgSelectMobileReadout: true,

Diff for: projects/storefrontlib/shared/components/card/card.component.html

@@ -2,6 +2,7 @@
   *ngIf="content"
   class="cx-card"
   [tabindex]="border ? 0 : -1"
+  [attr.role]="role"
   [attr.aria-labelledby]="getLabel('content-header')"
   [attr.aria-describedby]="ariaDescribedBy"
   [class.cx-card-border]="border"

Diff for: projects/storefrontlib/shared/components/card/card.component.ts

@@ -80,6 +80,9 @@ export class CardComponent implements OnInit {
   @Input()
   index: number;
 
+  @Input()
+  role?: string;
+
   // ACTIONS
 
   setEditMode(): void {

Diff for: projects/storefrontlib/shared/components/ng-select-a11y/ng-select-a11y.directive.ts

@@ -41,10 +41,6 @@ export class NgSelectA11yDirective implements AfterViewInit {
    */
   @Input() cxNgSelectA11y: { ariaLabel?: string; ariaControls?: string };
 
-  //TODO: CXSPA-9005: Remove this property in next major release
-  /**
-   * @deprecated since 2211.33
-   */
   protected translationService = inject(TranslationService);
   protected domSanitizer = inject(DomSanitizer);
   protected selectComponent = inject(NgSelectComponent);
@@ -105,6 +101,13 @@ export class NgSelectA11yDirective implements AfterViewInit {
 
     this.renderer.setAttribute(inputCombobox, 'role', 'combobox');
     this.renderer.setAttribute(inputCombobox, 'aria-expanded', 'false');
+    if (
+      this.featureConfigService?.isEnabled(
+        'a11yNgSelectAriaLabelDropdownCustomized'
+      )
+    ) {
+      this.customizeNgSelectAriaLabelDropdown();
+    }
 
     const isOpened$ = this.selectComponent.openEvent.pipe(map(() => 'true'));
     const isClosed$ = this.selectComponent.closeEvent.pipe(map(() => 'false'));
@@ -202,4 +205,13 @@ export class NgSelectA11yDirective implements AfterViewInit {
     }
     observer.disconnect();
   }
+
+  customizeNgSelectAriaLabelDropdown() {
+    this.translationService
+      .translate('common.ngSelectDropdownOptionsList')
+      .pipe(take(1))
+      .subscribe((translation) => {
+        this.selectComponent.ariaLabelDropdown = translation;
+      });
+  }
 }

Diff for: tools/schematics/testing.ts

@@ -84,6 +84,20 @@ const commands = [
 ] as const;
 type Command = (typeof commands)[number];
 
+const isVoiceNotifyEnabled = process.argv.includes('--voice-notify');
+if (isVoiceNotifyEnabled) {
+  console.log('Voice notifications enabled');
+}
+function voiceAlert(message: string): void {
+  if (isVoiceNotifyEnabled) {
+    try {
+      execSync(`say "${message}"`);
+    } catch (error) {
+      console.warn('Voice notification failed:', error);
+    }
+  }
+}
+
 const buildLibRegEx = new RegExp('build (.*?)/schematics');
 const verdaccioRegistryUrl = 'http://localhost:4873/';
 const originalRegistryUrl = execSync('npm config get @spartacus:registry')
@@ -204,9 +218,11 @@ async function executeCommand(command: Command): Promise<void> {
   switch (command) {
     case 'publish':
       publishLibs();
+      voiceAlert('Publishing completed');
       break;
     case 'build projects/schematics':
       buildSchematics({ publish: true });
+      voiceAlert('Schematics build completed');
       break;
     case 'build asm/schematics':
     case 'build cart/schematics':
@@ -240,12 +256,15 @@ async function executeCommand(command: Command): Promise<void> {
       const lib =
         buildLibRegEx.exec(command)?.pop() ?? 'LIB-REGEX-DOES-NOT-MATCH';
       buildSchematicsAndPublish(`npm run build:${lib}`);
+      voiceAlert(`Schematics build of lib ${lib} completed`);
       break;
     case 'build all libs':
       buildLibs();
+      voiceAlert('All libraries build completed');
       break;
     case 'test all schematics':
       testAllSchematics();
+      voiceAlert('All schematics tests completed');
       break;
     case 'exit':
       beforeExit();