From 5ea25f704935fba4940ba1dfba60e2b4c562a498 Mon Sep 17 00:00:00 2001 From: Aanchal Pawar <97873570+glo82145@users.noreply.github.com> Date: Wed, 27 Mar 2024 16:41:58 +0530 Subject: [PATCH 1/4] Test branch (#4247) * PWA-3229::experience platform connector extension missing parent sku * Commiting test file * Commiting test file --- CREATE_RELEASE_NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CREATE_RELEASE_NOTES.md b/CREATE_RELEASE_NOTES.md index c1708055e2..52589fcaaa 100644 --- a/CREATE_RELEASE_NOTES.md +++ b/CREATE_RELEASE_NOTES.md @@ -14,6 +14,7 @@ Here are the steps you need to follow to create PWA Studio release notes. : **PART 2: Docs repo tasks** (`AdobeDocs/commerce-pwa-studio`): + 1. Clone the `AdobeDocs/commerce-pwa-studio` repo. 2. Create a `release` branch from `main`. 3. Replace auto-generated docs. From d8f7e841444d887923f2d75feaf74b4374124821 Mon Sep 17 00:00:00 2001 From: glo11372 <143005735+glo11372@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:41:59 +0530 Subject: [PATCH 2/4] =?UTF-8?q?PWA-3154:GraphQL=20cacheable=20requests=20a?= =?UTF-8?q?lways=20have=20Authorization=20Bearer=20=E2=80=A6=20(#4240)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * PWA-3154:GraphQL cacheable requests always have Authorization Bearer header * PWA-3154:Removing Commented lines * Update index.spec.js.snap * Update index.spec.js.snap --------- Co-authored-by: Aanchal Pawar <97873570+glo82145@users.noreply.github.com> --- .../Apollo/links/__tests__/__snapshots__/index.spec.js.snap | 1 - packages/peregrine/lib/Apollo/links/__tests__/index.spec.js | 4 ---- packages/peregrine/lib/Apollo/links/index.js | 3 --- 3 files changed, 8 deletions(-) diff --git a/packages/peregrine/lib/Apollo/links/__tests__/__snapshots__/index.spec.js.snap b/packages/peregrine/lib/Apollo/links/__tests__/__snapshots__/index.spec.js.snap index 1b3428cfe5..e9eb130057 100644 --- a/packages/peregrine/lib/Apollo/links/__tests__/__snapshots__/index.spec.js.snap +++ b/packages/peregrine/lib/Apollo/links/__tests__/__snapshots__/index.spec.js.snap @@ -4,7 +4,6 @@ exports[`returns a map with expected keys and values 1`] = ` Map { "MUTATION_QUEUE" => "mutationQueue", "RETRY" => "retry", - "AUTH" => "auth", "GQL_CACHE" => "gqlCache", "STORE" => "store", "ERROR" => "error", diff --git a/packages/peregrine/lib/Apollo/links/__tests__/index.spec.js b/packages/peregrine/lib/Apollo/links/__tests__/index.spec.js index 7185d08491..bf287a6277 100644 --- a/packages/peregrine/lib/Apollo/links/__tests__/index.spec.js +++ b/packages/peregrine/lib/Apollo/links/__tests__/index.spec.js @@ -7,10 +7,6 @@ jest.mock('@apollo/client', () => ({ __esModule: true, createHttpLink: jest.fn(() => 'http') })); -jest.mock('@magento/peregrine/lib/Apollo/links/authLink', () => ({ - __esModule: true, - default: jest.fn(() => 'auth') -})); jest.mock('@magento/peregrine/lib/Apollo/links/errorLink', () => ({ __esModule: true, default: jest.fn(() => 'error') diff --git a/packages/peregrine/lib/Apollo/links/index.js b/packages/peregrine/lib/Apollo/links/index.js index 1a6bf48b1e..3519d594d3 100644 --- a/packages/peregrine/lib/Apollo/links/index.js +++ b/packages/peregrine/lib/Apollo/links/index.js @@ -1,6 +1,5 @@ import { createHttpLink } from '@apollo/client'; -import createAuthLink from '@magento/peregrine/lib/Apollo/links/authLink'; import createErrorLink from '@magento/peregrine/lib/Apollo/links/errorLink'; import createGqlCacheLink from '@magento/peregrine/lib/Apollo/links/gqlCacheLink'; import createMutationQueueLink from '@magento/peregrine/lib/Apollo/links/mutationQueueLink'; @@ -32,7 +31,6 @@ export const customFetchToShrinkQuery = (uri, options) => { }; const getLinks = apiBase => { - const authLink = createAuthLink(); const storeLink = createStoreLink(); const errorLink = createErrorLink(); const retryLink = createRetryLink(); @@ -54,7 +52,6 @@ const getLinks = apiBase => { const links = new Map() .set('MUTATION_QUEUE', mutationQueueLink) .set('RETRY', retryLink) - .set('AUTH', authLink) .set('GQL_CACHE', gqlCacheLink) .set('STORE', storeLink) .set('ERROR', errorLink) From 812105a51d46db9b66ce67db48fd0fca976a2475 Mon Sep 17 00:00:00 2001 From: glo85315 <159006137+glo85315@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:57:51 +0530 Subject: [PATCH 3/4] =?UTF-8?q?PWA-3233=20:=20Unable=20to=20sign-In=20usin?= =?UTF-8?q?g=20TAB/=20Mouse=20Click=20button=20from=20Sign=20=E2=80=A6=20(?= =?UTF-8?q?#4231)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * PWA-3233 : Unable to sign-In using TAB/ Mouse Click button from Sign in Page * PWA-3233 :fixed the preetier issues * PWA-3233 : fixed test case coverage * PWA-3233 : fixed test case coverage * Update useSignIn.js * replacing handleTrigger with handleTriggerClick --------- Co-authored-by: rudraswamy.c Co-authored-by: Aanchal Pawar <97873570+glo82145@users.noreply.github.com> Co-authored-by: glo11372 --- .../talons/SignIn/__tests__/useSignIn.spec.js | 14 ++++++++++++ .../peregrine/lib/talons/SignIn/useSignIn.js | 22 +++++++++++-------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/packages/peregrine/lib/talons/SignIn/__tests__/useSignIn.spec.js b/packages/peregrine/lib/talons/SignIn/__tests__/useSignIn.spec.js index 2ebbc99315..63e35adb8b 100644 --- a/packages/peregrine/lib/talons/SignIn/__tests__/useSignIn.spec.js +++ b/packages/peregrine/lib/talons/SignIn/__tests__/useSignIn.spec.js @@ -227,3 +227,17 @@ test('mutation error is returned by talon', async () => { `[Error: Uh oh! There was an error signing in :(]` ); }); + +it('should call handleForgotPassword when Enter key is pressed', () => { + const { result } = renderHookWithProviders(); + const { forgotPasswordHandleEnterKeyPress } = result.current; + const enterKeyEvent = { key: 'Enter' }; + renderHook(() => forgotPasswordHandleEnterKeyPress(enterKeyEvent)); +}); + +it('should call handleEnterKeyPress when Enter key is pressed', () => { + const { result } = renderHookWithProviders(); + const { handleEnterKeyPress } = result.current; + const enterKeyEvent = { key: 'Enter' }; + renderHook(() => handleEnterKeyPress(enterKeyEvent)); +}); diff --git a/packages/peregrine/lib/talons/SignIn/useSignIn.js b/packages/peregrine/lib/talons/SignIn/useSignIn.js index d4db2026e3..0bf326e531 100644 --- a/packages/peregrine/lib/talons/SignIn/useSignIn.js +++ b/packages/peregrine/lib/talons/SignIn/useSignIn.js @@ -68,6 +68,7 @@ export const useSignIn = props => { async ({ email, password }) => { setIsSigningIn(true); handleTriggerClick(); + try { // Get source cart id (guest cart id). const sourceCartId = cartId; @@ -159,13 +160,14 @@ export const useSignIn = props => { showForgotPassword(); }, [setDefaultUsername, showForgotPassword]); - const forgotPasswordHandleEnterKeyPress = useCallback(() => { + const forgotPasswordHandleEnterKeyPress = useCallback( event => { if (event.key === 'Enter') { handleForgotPassword(); } - }; - }, [handleForgotPassword]); + }, + [handleForgotPassword] + ); const handleCreateAccount = useCallback(() => { const { current: formApi } = formApiRef; @@ -177,21 +179,23 @@ export const useSignIn = props => { showCreateAccount(); }, [setDefaultUsername, showCreateAccount]); - const handleEnterKeyPress = useCallback(() => { + const handleEnterKeyPress = useCallback( event => { if (event.key === 'Enter') { handleCreateAccount(); } - }; - }, [handleCreateAccount]); + }, + [handleCreateAccount] + ); - const signinHandleEnterKeyPress = useCallback(() => { + const signinHandleEnterKeyPress = useCallback( event => { if (event.key === 'Enter') { handleSubmit(); } - }; - }, [handleSubmit]); + }, + [handleSubmit] + ); const errors = useMemo( () => From b38b527a64351b2f33d7aeb36f211d1fe081dd91 Mon Sep 17 00:00:00 2001 From: Aanchal Pawar <97873570+glo82145@users.noreply.github.com> Date: Mon, 1 Apr 2024 18:01:04 +0530 Subject: [PATCH 4/4] PWA-3178::Order statuses are decoupled from the back-end (#4229) * PWA-3178::Order statuses are decoupled from the back-end * PWA-3178::Order statuses are decoupled from the back-end * PWA-3178::Order statuses are decoupled from the back-end * PWA-3178::Order statuses are decoupled from the back-end * PWA-3178::Order statuses are decoupled from the back-end * PWA-3178::Order statuses are decoupled from the back-end * PWA-3178::Order statuses are decoupled from the back-end * PWA-3178::Order statuses are decoupled from the back-end * PWA-3178::Order statuses are decoupled from the back-end * PWA-3178::Order statuses are decoupled from the back-end * PWA-3178::Order statuses are decoupled from the back-end * PWA-3178::Order statuses are decoupled from the back-end * Resolved issue * Resolved issue * Resolved issue --- .../OrderHistoryPage/orderHistoryPage.gql.js | 1 + packages/venia-ui/i18n/en_US.json | 10 +++-- .../__snapshots__/orderRow.spec.js.snap | 12 ++---- .../__tests__/orderRow.spec.js | 42 ------------------- .../OrderHistoryPage/orderProgressBar.js | 30 +++++++++---- .../components/OrderHistoryPage/orderRow.js | 36 +++------------- 6 files changed, 39 insertions(+), 92 deletions(-) diff --git a/packages/peregrine/lib/talons/OrderHistoryPage/orderHistoryPage.gql.js b/packages/peregrine/lib/talons/OrderHistoryPage/orderHistoryPage.gql.js index 39b551e968..026a53c68d 100644 --- a/packages/peregrine/lib/talons/OrderHistoryPage/orderHistoryPage.gql.js +++ b/packages/peregrine/lib/talons/OrderHistoryPage/orderHistoryPage.gql.js @@ -60,6 +60,7 @@ const CustomerOrdersFragment = gql` } shipping_method status + state total { discounts { amount { diff --git a/packages/venia-ui/i18n/en_US.json b/packages/venia-ui/i18n/en_US.json index d4bdea399e..a11aff2969 100644 --- a/packages/venia-ui/i18n/en_US.json +++ b/packages/venia-ui/i18n/en_US.json @@ -313,11 +313,15 @@ "orderHistoryPage.ordersCount": "You have {count} orders in your history", "orderHistoryPage.search": "Search by Order Number", "orderItems.itemsHeading": "Items", - "orderProgressBar.deliveredText": "Delivered", - "orderProgressBar.processingText": "Processing", + "orderProgressBar.deliveredText": "complete", + "orderProgressBar.processingText": "processing", + "orderProgressBar.newText": "new", + "orderProgressBar.pendingPaymentText": "Pending Payment", + "orderProgressBar.paymentReviewText": "Payment Review", "orderProgressBar.readyToShipText": "Ready to ship", "orderProgressBar.shippedText": "Shipped", - "orderRow.deliveredText": "Delivered", + "orderRow.deliveredText": "complete", + "orderProgressBar.closedText": "Closed", "orderRow.orderDateText": "Order Date", "orderRow.orderNumberText": "Order #", "orderRow.orderTotalText": "Order Total", diff --git a/packages/venia-ui/lib/components/OrderHistoryPage/__tests__/__snapshots__/orderRow.spec.js.snap b/packages/venia-ui/lib/components/OrderHistoryPage/__tests__/__snapshots__/orderRow.spec.js.snap index fb504180ff..49c8bf7e28 100644 --- a/packages/venia-ui/lib/components/OrderHistoryPage/__tests__/__snapshots__/orderRow.spec.js.snap +++ b/packages/venia-ui/lib/components/OrderHistoryPage/__tests__/__snapshots__/orderRow.spec.js.snap @@ -119,11 +119,10 @@ exports[`it does not render order details if loading is true 1`] = ` - Delivered + Complete