From e54be34a38c1985e08bdf00de12c28f31044d4eb Mon Sep 17 00:00:00 2001 From: petarmarkov9449 <166535589+petarmarkov9449@users.noreply.github.com> Date: Mon, 27 Jan 2025 17:40:39 +0100 Subject: [PATCH 1/2] fix: (CXSPA-8997 & 8988) - Resolve Aria Issues in NavigationUIComponent (#19938) --- .../regression/user_access/navigation-login-a11y.e2e.cy.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/user_access/navigation-login-a11y.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/user_access/navigation-login-a11y.e2e.cy.ts index ee4545f8143..927610b6b0f 100644 --- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/user_access/navigation-login-a11y.e2e.cy.ts +++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/user_access/navigation-login-a11y.e2e.cy.ts @@ -11,8 +11,8 @@ function assertNavigationButtonsAttributes(buttonsSelector: string) { cy.get(buttonsSelector).each(($btn) => { const btnAriaControl = $btn.attr('aria-controls'); cy.wrap($btn) - .should('have.attr', 'title', `${btnAriaControl} Menu`) - .should('have.attr', 'aria-label', btnAriaControl); + .should('have.attr', 'aria-label', btnAriaControl) + .and('have.attr', 'aria-controls', btnAriaControl); }); } From c66d4f9e74d7910f4306959041abb570c195b44f Mon Sep 17 00:00:00 2001 From: Hak Woo Kim Date: Mon, 27 Jan 2025 17:32:13 -0500 Subject: [PATCH 2/2] feat: remove duplicate i18n key (CXSPA-9287) (#19914) Co-authored-by: Hakwoo Kim Co-authored-by: Krzysztof Platis --- .../pickup-in-store/assets/translations/cs/pickupInStore.json | 3 --- .../pickup-in-store/assets/translations/de/pickupInStore.json | 3 --- .../pickup-in-store/assets/translations/en/pickupInStore.json | 3 --- .../pickup-in-store/assets/translations/es/pickupInStore.json | 3 --- .../assets/translations/es_CO/pickupInStore.json | 3 --- .../pickup-in-store/assets/translations/fr/pickupInStore.json | 3 --- .../pickup-in-store/assets/translations/hi/pickupInStore.json | 3 --- .../pickup-in-store/assets/translations/hu/pickupInStore.json | 3 --- .../pickup-in-store/assets/translations/id/pickupInStore.json | 3 --- .../pickup-in-store/assets/translations/it/pickupInStore.json | 3 --- .../pickup-in-store/assets/translations/ja/pickupInStore.json | 3 --- .../pickup-in-store/assets/translations/ko/pickupInStore.json | 3 --- .../pickup-in-store/assets/translations/pl/pickupInStore.json | 3 --- .../pickup-in-store/assets/translations/pt/pickupInStore.json | 3 --- .../pickup-in-store/assets/translations/ru/pickupInStore.json | 3 --- .../pickup-in-store/assets/translations/zh/pickupInStore.json | 3 --- .../assets/translations/zh_TW/pickupInStore.json | 4 +--- 17 files changed, 1 insertion(+), 51 deletions(-) diff --git a/feature-libs/pickup-in-store/assets/translations/cs/pickupInStore.json b/feature-libs/pickup-in-store/assets/translations/cs/pickupInStore.json index dea03498fe4..7a6b1b9d78b 100644 --- a/feature-libs/pickup-in-store/assets/translations/cs/pickupInStore.json +++ b/feature-libs/pickup-in-store/assets/translations/cs/pickupInStore.json @@ -52,9 +52,6 @@ "heading": "Položky, které mají být vyzvednuty", "storeItemHeading": "Adresa prodejny pro vyzvednutí" }, - "cartItems": { - "item": "Položka" - }, "cardActions": { "getDirections": "Získat popis cesty – tento odkaz otevře nové okno" }, diff --git a/feature-libs/pickup-in-store/assets/translations/de/pickupInStore.json b/feature-libs/pickup-in-store/assets/translations/de/pickupInStore.json index e94de5139bf..bbfffc35fe3 100644 --- a/feature-libs/pickup-in-store/assets/translations/de/pickupInStore.json +++ b/feature-libs/pickup-in-store/assets/translations/de/pickupInStore.json @@ -52,9 +52,6 @@ "heading": "Abzuholende Positionen", "storeItemHeading": "Adresse der Filiale für Abholung" }, - "cartItems": { - "item": "Position" - }, "cardActions": { "getDirections": "Wegbeschreibung abrufen, dieser Link öffnet sich in einem neuen Fenster" }, diff --git a/feature-libs/pickup-in-store/assets/translations/en/pickupInStore.json b/feature-libs/pickup-in-store/assets/translations/en/pickupInStore.json index 906cf435b31..dba4f4e3fb1 100644 --- a/feature-libs/pickup-in-store/assets/translations/en/pickupInStore.json +++ b/feature-libs/pickup-in-store/assets/translations/en/pickupInStore.json @@ -52,9 +52,6 @@ "heading": "Items to be Picked Up", "storeItemHeading": "Pick Up Store Address" }, - "cartItems": { - "item": "Item" - }, "cardActions": { "getDirections": "Get Directions, this link opens in a new window" }, diff --git a/feature-libs/pickup-in-store/assets/translations/es/pickupInStore.json b/feature-libs/pickup-in-store/assets/translations/es/pickupInStore.json index caa581c8ee0..d5269c1b365 100644 --- a/feature-libs/pickup-in-store/assets/translations/es/pickupInStore.json +++ b/feature-libs/pickup-in-store/assets/translations/es/pickupInStore.json @@ -52,9 +52,6 @@ "heading": "Artículos para recoger", "storeItemHeading": "Dirección de la tienda de recogida" }, - "cartItems": { - "item": "Artículo" - }, "cardActions": { "getDirections": "Obtener direcciones, este enlace se abre en una ventana nueva" }, diff --git a/feature-libs/pickup-in-store/assets/translations/es_CO/pickupInStore.json b/feature-libs/pickup-in-store/assets/translations/es_CO/pickupInStore.json index 85df20b104f..e10baa18ba7 100644 --- a/feature-libs/pickup-in-store/assets/translations/es_CO/pickupInStore.json +++ b/feature-libs/pickup-in-store/assets/translations/es_CO/pickupInStore.json @@ -52,9 +52,6 @@ "heading": "Artículos para recoger", "storeItemHeading": "Dirección de la tienda de recogida" }, - "cartItems": { - "item": "Artículo" - }, "cardActions": { "getDirections": "Obtener direcciones, este enlace se abre en una ventana nueva" }, diff --git a/feature-libs/pickup-in-store/assets/translations/fr/pickupInStore.json b/feature-libs/pickup-in-store/assets/translations/fr/pickupInStore.json index 6873e6b7b83..2e437f34bca 100644 --- a/feature-libs/pickup-in-store/assets/translations/fr/pickupInStore.json +++ b/feature-libs/pickup-in-store/assets/translations/fr/pickupInStore.json @@ -52,9 +52,6 @@ "heading": "Articles à retirer", "storeItemHeading": "Adresse du point de vente pour le retrait" }, - "cartItems": { - "item": "Article" - }, "cardActions": { "getDirections": "Obtenir un itinéraire, ce lien s'ouvre dans une nouvelle fenêtre" }, diff --git a/feature-libs/pickup-in-store/assets/translations/hi/pickupInStore.json b/feature-libs/pickup-in-store/assets/translations/hi/pickupInStore.json index 4b7289f21e3..dd066e4172d 100644 --- a/feature-libs/pickup-in-store/assets/translations/hi/pickupInStore.json +++ b/feature-libs/pickup-in-store/assets/translations/hi/pickupInStore.json @@ -52,9 +52,6 @@ "heading": "पिकअप किए जाने वाले आइटम", "storeItemHeading": "पिकअप स्टोर का पता" }, - "cartItems": { - "item": "आइटम" - }, "cardActions": { "getDirections": "निर्देश प्राप्त करें, यह लिंक नई विंडो में खुलती है" }, diff --git a/feature-libs/pickup-in-store/assets/translations/hu/pickupInStore.json b/feature-libs/pickup-in-store/assets/translations/hu/pickupInStore.json index 1e72228025d..d063d8b4d64 100644 --- a/feature-libs/pickup-in-store/assets/translations/hu/pickupInStore.json +++ b/feature-libs/pickup-in-store/assets/translations/hu/pickupInStore.json @@ -52,9 +52,6 @@ "heading": "Átveendő tételek", "storeItemHeading": "Átvételi üzlet címe" }, - "cartItems": { - "item": "Tétel" - }, "cardActions": { "getDirections": "Útvonal tervezése; ez a hivatkozás új ablakban nyílik meg" }, diff --git a/feature-libs/pickup-in-store/assets/translations/id/pickupInStore.json b/feature-libs/pickup-in-store/assets/translations/id/pickupInStore.json index 627145ea1b7..0b08a7c931f 100644 --- a/feature-libs/pickup-in-store/assets/translations/id/pickupInStore.json +++ b/feature-libs/pickup-in-store/assets/translations/id/pickupInStore.json @@ -52,9 +52,6 @@ "heading": "Item yang Akan Diambil", "storeItemHeading": "Alamat Toko Pengambilan" }, - "cartItems": { - "item": "Item" - }, "cardActions": { "getDirections": "Dapatkan Petunjuk Arah, tautan ini akan terbuka di jendela baru." }, diff --git a/feature-libs/pickup-in-store/assets/translations/it/pickupInStore.json b/feature-libs/pickup-in-store/assets/translations/it/pickupInStore.json index 6230a8601b4..e510339239b 100644 --- a/feature-libs/pickup-in-store/assets/translations/it/pickupInStore.json +++ b/feature-libs/pickup-in-store/assets/translations/it/pickupInStore.json @@ -52,9 +52,6 @@ "heading": "Articoli da ritirare", "storeItemHeading": "Indirizzo del punto vendita di ritiro" }, - "cartItems": { - "item": "Articolo" - }, "cardActions": { "getDirections": "Ottieni indicazioni stradali; questo collegamento aprirà una nuova finestra" }, diff --git a/feature-libs/pickup-in-store/assets/translations/ja/pickupInStore.json b/feature-libs/pickup-in-store/assets/translations/ja/pickupInStore.json index c5c0623c748..92cb1506acd 100644 --- a/feature-libs/pickup-in-store/assets/translations/ja/pickupInStore.json +++ b/feature-libs/pickup-in-store/assets/translations/ja/pickupInStore.json @@ -52,9 +52,6 @@ "heading": "受け取るアイテム", "storeItemHeading": "受け取り店舗の住所" }, - "cartItems": { - "item": "アイテム" - }, "cardActions": { "getDirections": "ルート案内取得 (このリンクをクリックすると新しいウィンドウが開きます)" }, diff --git a/feature-libs/pickup-in-store/assets/translations/ko/pickupInStore.json b/feature-libs/pickup-in-store/assets/translations/ko/pickupInStore.json index ca53b31bc0a..6e7baea8ddc 100644 --- a/feature-libs/pickup-in-store/assets/translations/ko/pickupInStore.json +++ b/feature-libs/pickup-in-store/assets/translations/ko/pickupInStore.json @@ -52,9 +52,6 @@ "heading": "픽업할 품목", "storeItemHeading": "픽업 매장 주소" }, - "cartItems": { - "item": "품목" - }, "cardActions": { "getDirections": "오시는 길, 이 링크를 클릭하면 새 창이 열립니다." }, diff --git a/feature-libs/pickup-in-store/assets/translations/pl/pickupInStore.json b/feature-libs/pickup-in-store/assets/translations/pl/pickupInStore.json index fbb844dee51..9cd75af6692 100644 --- a/feature-libs/pickup-in-store/assets/translations/pl/pickupInStore.json +++ b/feature-libs/pickup-in-store/assets/translations/pl/pickupInStore.json @@ -52,9 +52,6 @@ "heading": "Pozycje do odbioru", "storeItemHeading": "Adres punktu odbioru" }, - "cartItems": { - "item": "Pozycja" - }, "cardActions": { "getDirections": "Jak dojechać. Ten link otwiera się w nowym oknie." }, diff --git a/feature-libs/pickup-in-store/assets/translations/pt/pickupInStore.json b/feature-libs/pickup-in-store/assets/translations/pt/pickupInStore.json index 03209c93869..322737cf5d9 100644 --- a/feature-libs/pickup-in-store/assets/translations/pt/pickupInStore.json +++ b/feature-libs/pickup-in-store/assets/translations/pt/pickupInStore.json @@ -52,9 +52,6 @@ "heading": "Itens a serem retirados", "storeItemHeading": "Endereço de loja de retirada" }, - "cartItems": { - "item": "Item" - }, "cardActions": { "getDirections": "Obter indicações, este link se abre em uma nova janela" }, diff --git a/feature-libs/pickup-in-store/assets/translations/ru/pickupInStore.json b/feature-libs/pickup-in-store/assets/translations/ru/pickupInStore.json index 1fb158b35cb..3e51d612550 100644 --- a/feature-libs/pickup-in-store/assets/translations/ru/pickupInStore.json +++ b/feature-libs/pickup-in-store/assets/translations/ru/pickupInStore.json @@ -52,9 +52,6 @@ "heading": "Позиции для самовывоза", "storeItemHeading": "Адрес магазина самовывоза" }, - "cartItems": { - "item": "Позиция" - }, "cardActions": { "getDirections": "Получить маршрут, эта ссылка откроется в новом окне" }, diff --git a/feature-libs/pickup-in-store/assets/translations/zh/pickupInStore.json b/feature-libs/pickup-in-store/assets/translations/zh/pickupInStore.json index a8d6c05d57e..54c4d32e676 100644 --- a/feature-libs/pickup-in-store/assets/translations/zh/pickupInStore.json +++ b/feature-libs/pickup-in-store/assets/translations/zh/pickupInStore.json @@ -52,9 +52,6 @@ "heading": "待提货商品", "storeItemHeading": "提货店铺地址" }, - "cartItems": { - "item": "商品" - }, "cardActions": { "getDirections": "获取方位，此链接将在新窗口中打开" }, diff --git a/feature-libs/pickup-in-store/assets/translations/zh_TW/pickupInStore.json b/feature-libs/pickup-in-store/assets/translations/zh_TW/pickupInStore.json index 2a7d9c7e4a0..dfaafa5e85e 100644 --- a/feature-libs/pickup-in-store/assets/translations/zh_TW/pickupInStore.json +++ b/feature-libs/pickup-in-store/assets/translations/zh_TW/pickupInStore.json @@ -52,9 +52,7 @@ "heading": "要取貨的項目", "storeItemHeading": "取貨商店地址" }, - "cartItems": { - "item": "項目" - }, + "cardActions": { "getDirections": "規劃路線，此連結會在新視窗中開啟" },