From c18ea92dc0d4834fc6a594ff446081f3c1a83118 Mon Sep 17 00:00:00 2001 From: glo82145 Date: Thu, 18 Jul 2024 15:12:14 +0530 Subject: [PATCH 1/4] PWA-3307::[Cloud] Language translating giving errors --- .../venia-ui/lib/RootComponents/Category/categoryContent.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/venia-ui/lib/RootComponents/Category/categoryContent.js b/packages/venia-ui/lib/RootComponents/Category/categoryContent.js index a79fc4150a..2c473a8f52 100644 --- a/packages/venia-ui/lib/RootComponents/Category/categoryContent.js +++ b/packages/venia-ui/lib/RootComponents/Category/categoryContent.js @@ -151,6 +151,7 @@ const CategoryContent = props => { return ( +
{categoryName}
@@ -190,6 +191,7 @@ const CategoryContent = props => {
+ ); }; From 06217341f7c684c612f93f3564ad22979db2cbf8 Mon Sep 17 00:00:00 2001 From: glo82145 Date: Fri, 19 Jul 2024 14:03:35 +0530 Subject: [PATCH 2/4] PWA-3307::[Cloud] Language translating giving errors --- .../lib/RootComponents/Category/categoryContent.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/venia-ui/lib/RootComponents/Category/categoryContent.js b/packages/venia-ui/lib/RootComponents/Category/categoryContent.js index 2c473a8f52..97ad149b63 100644 --- a/packages/venia-ui/lib/RootComponents/Category/categoryContent.js +++ b/packages/venia-ui/lib/RootComponents/Category/categoryContent.js @@ -101,15 +101,15 @@ const CategoryContent = props => { const categoryResultsHeading = totalCount > 0 ? ( - + /> ) : isLoading ? ( - + ) : null; const categoryDescriptionElement = categoryDescription ? ( @@ -161,7 +161,7 @@ const CategoryContent = props => { className={classes.categoryTitle} data-cy="CategoryContent-categoryTitle" > - {categoryTitle} +
{categoryTitle}
{categoryDescriptionElement} From 4448d78223883ad70f97664ec5f8ae789d3a28e4 Mon Sep 17 00:00:00 2001 From: glo82145 Date: Fri, 19 Jul 2024 14:22:34 +0530 Subject: [PATCH 3/4] PWA-3307::[Cloud] Language translating giving errors --- .../__tests__/useCustomerWishlistSkus.spec.js | 1 + .../categoryContent.spec.js.snap | 126 ++++++++++-------- .../Category/categoryContent.js | 88 ++++++------ 3 files changed, 120 insertions(+), 95 deletions(-) diff --git a/packages/peregrine/lib/hooks/useCustomerWishlistSkus/__tests__/useCustomerWishlistSkus.spec.js b/packages/peregrine/lib/hooks/useCustomerWishlistSkus/__tests__/useCustomerWishlistSkus.spec.js index 9afb2c60bb..5b08e766d1 100644 --- a/packages/peregrine/lib/hooks/useCustomerWishlistSkus/__tests__/useCustomerWishlistSkus.spec.js +++ b/packages/peregrine/lib/hooks/useCustomerWishlistSkus/__tests__/useCustomerWishlistSkus.spec.js @@ -49,6 +49,7 @@ test('pre-caches wishlist items', async () => { Object { "customerWishlistProducts": Array [ "Dress", + "Shirt", ], } `); diff --git a/packages/venia-ui/lib/RootComponents/Category/__tests__/__snapshots__/categoryContent.spec.js.snap b/packages/venia-ui/lib/RootComponents/Category/__tests__/__snapshots__/categoryContent.spec.js.snap index 5de4b6d5a3..976f91340f 100644 --- a/packages/venia-ui/lib/RootComponents/Category/__tests__/__snapshots__/categoryContent.spec.js.snap +++ b/packages/venia-ui/lib/RootComponents/Category/__tests__/__snapshots__/categoryContent.spec.js.snap @@ -1,11 +1,11 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`filter button/modal does not render if there are no filters 1`] = ` -Array [ +
, - "Title", + /> + Title
@@ -19,7 +19,9 @@ Array [
- Name +
+ Name +
@@ -94,16 +96,16 @@ Array [ - , -] + + `; exports[`filter button/modal renders when there are filters 1`] = ` -Array [ +
, - "Title", + /> + Title
@@ -117,7 +119,9 @@ Array [
- Name +
+ Name +
@@ -206,16 +210,16 @@ Array [ /> - , -] + + `; exports[`filter sidebar does not render if not in viewport 1`] = ` -Array [ +
, - "Title", + /> + Title
@@ -229,7 +233,9 @@ Array [
- Name +
+ Name +
@@ -318,16 +324,16 @@ Array [ /> - , -] + + `; exports[`filter sidebar renders when in viewport 1`] = ` -Array [ +
, - "Title", + /> + Title
@@ -341,7 +347,9 @@ Array [
- Name +
+ Name +
@@ -438,16 +446,16 @@ Array [ /> - , -] + + `; exports[`renders empty page 1`] = ` -Array [ +
, - "Title", + /> + Title
@@ -461,7 +469,9 @@ Array [
- Empty Name +
+ Empty Name +
@@ -489,16 +499,16 @@ Array [ /> - , -] + + `; exports[`renders loading indicator if no data and loading 1`] = ` -Array [ +
, - "Title", + /> + Title
@@ -512,7 +522,9 @@ Array [
- Name +
+ Name +
@@ -558,16 +570,16 @@ Array [ /> - , -] + + `; exports[`renders the correct tree 1`] = ` -Array [ +
, - "Title", + /> + Title
@@ -581,7 +593,9 @@ Array [
- Name +
+ Name +
@@ -656,16 +670,16 @@ Array [ - , -] + + `; exports[`sort button/container does not render if there are no products 1`] = ` -Array [ +
, - "Title", + /> + Title
@@ -679,7 +693,9 @@ Array [
- Name +
+ Name +
@@ -707,16 +723,16 @@ Array [ /> - , -] + + `; exports[`sort button/container renders when there are products 1`] = ` -Array [ +
, - "Title", + /> + Title
@@ -730,7 +746,9 @@ Array [
- Name +
+ Name +
@@ -805,6 +823,6 @@ Array [ - , -] + + `; diff --git a/packages/venia-ui/lib/RootComponents/Category/categoryContent.js b/packages/venia-ui/lib/RootComponents/Category/categoryContent.js index 97ad149b63..c3cbd4eb2e 100644 --- a/packages/venia-ui/lib/RootComponents/Category/categoryContent.js +++ b/packages/venia-ui/lib/RootComponents/Category/categoryContent.js @@ -101,15 +101,18 @@ const CategoryContent = props => { const categoryResultsHeading = totalCount > 0 ? ( -
+
+ {' '} + {' '} +
) : isLoading ? ( - + ) : null; const categoryDescriptionElement = categoryDescription ? ( @@ -152,45 +155,48 @@ const CategoryContent = props => { return (
- - {categoryName} -
-
-

-
-
{categoryTitle}
-
-

- {categoryDescriptionElement} -
-
-
- }> - {shouldRenderSidebarContent ? sidebar : null} - -
-
-
+ + {categoryName} +
+
+

- {categoryResultsHeading} +
{categoryTitle}
-
- {maybeFilterButtons} - {maybeSortButton} +

+ {categoryDescriptionElement} +
+
+
+ }> + {shouldRenderSidebarContent ? sidebar : null} + +
+
+
+
+ {categoryResultsHeading} +
+
+ {maybeFilterButtons} + {maybeSortButton} +
+ {maybeSortContainer}
- {maybeSortContainer} + {content} + {filtersModal}
- {content} - {filtersModal}
-
-
+
); From e2777dc051c6fc8d6a16302e96d24087fb9c7d0f Mon Sep 17 00:00:00 2001 From: glo82145 Date: Fri, 19 Jul 2024 14:41:43 +0530 Subject: [PATCH 4/4] PWA-3307::[Cloud] Language translating giving errors --- .../__tests__/useCustomerWishlistSkus.spec.js | 56 ------------------- 1 file changed, 56 deletions(-) delete mode 100644 packages/peregrine/lib/hooks/useCustomerWishlistSkus/__tests__/useCustomerWishlistSkus.spec.js diff --git a/packages/peregrine/lib/hooks/useCustomerWishlistSkus/__tests__/useCustomerWishlistSkus.spec.js b/packages/peregrine/lib/hooks/useCustomerWishlistSkus/__tests__/useCustomerWishlistSkus.spec.js deleted file mode 100644 index 5b08e766d1..0000000000 --- a/packages/peregrine/lib/hooks/useCustomerWishlistSkus/__tests__/useCustomerWishlistSkus.spec.js +++ /dev/null @@ -1,56 +0,0 @@ -import React from 'react'; -import { InMemoryCache } from '@apollo/client'; -import { MockedProvider } from '@apollo/client/testing'; -import { renderHook } from '@testing-library/react-hooks'; - -import typePolicies from '@magento/peregrine/lib/Apollo/policies'; - -import operations from '../customerWishlist.gql.ee'; -import { - mockGetWishlistItemsPage1, - mockGetWishlistItemsPage2 -} from '../__fixtures__/apolloMocks'; -import { useCustomerWishlistSkus } from '../useCustomerWishlistSkus'; - -jest.mock('../../../context/user', () => ({ - useUserContext: jest.fn().mockReturnValue([{ isSignedIn: true }]) -})); - -const cache = new InMemoryCache({ - typePolicies -}); - -const renderHookWithProviders = ({ - renderHookOptions = {}, - mocks = [mockGetWishlistItemsPage1, mockGetWishlistItemsPage2] -} = {}) => { - const wrapper = ({ children }) => ( - - {children} - - ); - - return renderHook(useCustomerWishlistSkus, { - wrapper, - ...renderHookOptions - }); -}; - -test('pre-caches wishlist items', async () => { - const { waitForNextUpdate } = renderHookWithProviders(); - - await waitForNextUpdate(); - - const preCacheData = cache.readQuery({ - query: operations.getProductsInWishlistsQuery - }); - - expect(preCacheData).toMatchInlineSnapshot(` - Object { - "customerWishlistProducts": Array [ - "Dress", - "Shirt", - ], - } - `); -});