Merge branch 'develop' into PWA-3155

magento · May 25, 2023 · 4dd3177 · 4dd3177
2 parents cccfbdd + defc0c8
commit 4dd3177
Show file tree

Hide file tree

Showing 13 changed files with 75 additions and 19 deletions.
diff --git a/packages/extensions/experience-platform-connector/package.json b/packages/extensions/experience-platform-connector/package.json
@@ -13,7 +13,7 @@
   "license": "(OSL-3.0 OR AFL-3.0)",
   "dependencies": {
     "@adobe/magento-storefront-event-collector": "~1.3.1",
-    "@adobe/magento-storefront-events-sdk": "~1.1.19"
+    "@adobe/magento-storefront-events-sdk": "~1.3.1"
   },
   "devDependencies": {},
   "peerDependencies": {

diff --git a/packages/extensions/experience-platform-connector/src/handlers/signOut.js b/packages/extensions/experience-platform-connector/src/handlers/signOut.js
@@ -0,0 +1,32 @@
+const canHandle = event => event.type === 'USER_SIGN_OUT';
+
+const handle = sdk => {
+    sdk.context.setShopper({
+        shopperId: 'guest'
+    });
+
+    const accountContext = {
+        firstName: '',
+        lastName: '',
+        emailAddress: ''
+    };
+
+    const cartContext = {
+        id,
+        prices: {},
+        items: {},
+        possibleOnepageCheckout: false,
+        giftMessageSelected: false,
+        giftWrappingSelected: false
+    };
+
+    sdk.context.setShoppingCart(cartContext);
+    sdk.context.setAccount(accountContext);
+
+    sdk.publish.signOut();
+};
+
+export default {
+    canHandle,
+    handle
+};
diff --git a/packages/peregrine/lib/talons/CartPage/GiftCards/__tests__/useGiftCards.spec.js b/packages/peregrine/lib/talons/CartPage/GiftCards/__tests__/useGiftCards.spec.js
@@ -121,6 +121,7 @@ test('it returns the proper shape', () => {
         errorLoadingGiftCards: expect.any(Boolean),
         errorRemovingCard: expect.any(Boolean),
         giftCardsData: expect.any(Array),
+        handleEnterKeyPress: expect.any(Function),
         isLoadingGiftCards: expect.any(Boolean),
         isApplyingCard: expect.any(Boolean),
         isCheckingBalance: expect.any(Boolean),

diff --git a/packages/peregrine/lib/talons/CartPage/GiftCards/useGiftCards.js b/packages/peregrine/lib/talons/CartPage/GiftCards/useGiftCards.js
@@ -156,6 +156,13 @@ export const useGiftCards = props => {
         removeCardLoading,
         setIsCartUpdating
     ]);
+    const handleEnterKeyPress = useCallback(() => {
+        event => {
+            if (event.key === 'Enter') {
+                applyGiftCard();
+            }
+        };
+    }, [applyGiftCard]);
 
     const shouldDisplayCardBalance =
         mostRecentAction === actions.CHECK_BALANCE &&
@@ -178,6 +185,7 @@ export const useGiftCards = props => {
             (appliedCardsResult.data &&
                 appliedCardsResult.data.cart.applied_gift_cards) ||
             [],
+        handleEnterKeyPress,
         isLoadingGiftCards: appliedCardsResult.loading,
         isApplyingCard: applyCardLoading,
         isCheckingBalance: balanceResult.loading,

diff --git a/packages/peregrine/lib/talons/FilterModal/helpers.js b/packages/peregrine/lib/talons/FilterModal/helpers.js
@@ -143,7 +143,7 @@ export const stripHtml = html => html.replace(/(<([^>]+)>)/gi, '');
 
 /** GetFilterInput helpers below. */
 const getValueFromFilterString = keyValueString =>
-    keyValueString.split(DELIMITER)[1];
+    keyValueString.split(DELIMITER).pop();
 
 /**
  * Converts a set of values to a range filter

diff --git a/packages/peregrine/lib/talons/Link/__tests__/useLink.spec.js b/packages/peregrine/lib/talons/Link/__tests__/useLink.spec.js
@@ -76,7 +76,7 @@ const givenEmptyProps = () => {
 
 const givenValidProps = () => {
     props = {
-        prefetchType: true,
+        shouldPrefetch: true,
         innerRef: { current: 'foo' },
         to: '/bar.html'
     };
@@ -86,7 +86,7 @@ const givenFalsePrefetch = () => {
     givenValidProps();
     props = {
         ...props,
-        prefetchType: false
+        shouldPrefetch: false
     };
 };
 
@@ -175,7 +175,7 @@ describe('#useLink does not run query when', () => {
         expect(mockRunQuery).not.toHaveBeenCalled();
     });
 
-    test('should prefetch is false', async () => {
+    test('prefetch flag is false', async () => {
         givenFalsePrefetch();
 
         await act(() => {

diff --git a/packages/peregrine/lib/talons/Link/useLink.js b/packages/peregrine/lib/talons/Link/useLink.js
@@ -8,9 +8,7 @@ import DEFAULT_OPERATIONS from '../MagentoRoute/magentoRoute.gql';
 export const useLink = (props, passedOperations = {}) => {
     const { innerRef: originalRef, to } = props;
     const shouldPrefetch = props.prefetchType || props.shouldPrefetch;
-    const operations = shouldPrefetch
-        ? mergeOperations(DEFAULT_OPERATIONS, passedOperations)
-        : {};
+    const operations = mergeOperations(DEFAULT_OPERATIONS, passedOperations);
 
     const intersectionObserver = useIntersectionObserver();
     const { resolveUrlQuery } = operations;

diff --git a/packages/peregrine/lib/talons/MagentoRoute/useMagentoRoute.js b/packages/peregrine/lib/talons/MagentoRoute/useMagentoRoute.js
@@ -48,6 +48,16 @@ export const useMagentoRoute = (props = {}) => {
     const { data, error, loading } = queryResult;
     const { route } = data || {};
 
+    // redirect to external url
+    useEffect(() => {
+        if (route) {
+            const external_URL = route.relative_url;
+            if (external_URL && external_URL.startsWith('http')) {
+                window.location.replace(external_URL);
+            }
+        }
+    }, [route]);
+
     useEffect(() => {
         if (initialized.current || !getInlinedPageData()) {
             runQuery({

diff --git a/...venia-ui/lib/components/CartPage/GiftCards/__tests__/__snapshots__/giftCards.spec.js.snap b/...venia-ui/lib/components/CartPage/GiftCards/__tests__/__snapshots__/giftCards.spec.js.snap
@@ -85,7 +85,6 @@ exports[`it renders correctly when it has cards 1`] = `
             disabled={false}
             onClick={[MockFunction]}
             onDragStart={[Function]}
-            onKeyDown={[Function]}
             onKeyUp={[Function]}
             onMouseDown={[Function]}
             onMouseEnter={[Function]}
@@ -337,7 +336,6 @@ exports[`it renders correctly with no cards 1`] = `
             disabled={false}
             onClick={[MockFunction]}
             onDragStart={[Function]}
-            onKeyDown={[Function]}
             onKeyUp={[Function]}
             onMouseDown={[Function]}
             onMouseEnter={[Function]}

diff --git a/packages/venia-ui/lib/components/CartPage/GiftCards/giftCards.js b/packages/venia-ui/lib/components/CartPage/GiftCards/giftCards.js
@@ -54,6 +54,7 @@ const GiftCards = props => {
         errorLoadingGiftCards,
         errorRemovingCard,
         giftCardsData,
+        handleEnterKeyPress,
         isLoadingGiftCards,
         isApplyingCard,
         isCheckingBalance,
@@ -198,6 +199,7 @@ const GiftCards = props => {
                     data-cy="GiftCards-apply"
                     disabled={isApplyingCard}
                     onClick={applyGiftCard}
+                    onKeyDown={handleEnterKeyPress}
                 >
                     <FormattedMessage
                         id={'giftCards.apply'}

diff --git a/packages/venia-ui/lib/components/SearchBar/searchBar.js b/packages/venia-ui/lib/components/SearchBar/searchBar.js
@@ -35,13 +35,6 @@ const SearchBar = React.forwardRef((props, ref) => {
                     initialValues={initialValues}
                     onSubmit={handleSubmit}
                 >
-                    <div className={classes.autocomplete}>
-                        <Autocomplete
-                            setVisible={setIsAutoCompleteOpen}
-                            valid={valid}
-                            visible={isAutoCompleteOpen}
-                        />
-                    </div>
                     <div className={classes.search}>
                         <SearchField
                             addLabel={formatMessage({
@@ -52,6 +45,13 @@ const SearchBar = React.forwardRef((props, ref) => {
                             onChange={handleChange}
                             onFocus={handleFocus}
                         />
+                        <div className={classes.autocomplete}>
+                            <Autocomplete
+                                setVisible={setIsAutoCompleteOpen}
+                                valid={valid}
+                                visible={isAutoCompleteOpen}
+                            />
+                        </div>
                     </div>
                 </Form>
             </div>

diff --git a/packages/venia-ui/lib/components/SearchBar/searchBar.module.css b/packages/venia-ui/lib/components/SearchBar/searchBar.module.css
@@ -46,6 +46,6 @@
 
 .autocomplete {
     composes: grid from global;
-    composes: relative from global;
+    /* composes: relative from global; */
     composes: z-menu from global;
 }
diff --git a/yarn.lock b/yarn.lock
@@ -40,13 +40,20 @@
     "@snowplow/browser-plugin-performance-timing" "^3.0.1"
     "@snowplow/browser-tracker" "^3.0.1"
 
-"@adobe/magento-storefront-events-sdk@*", "@adobe/magento-storefront-events-sdk@~1.1.19":
+"@adobe/magento-storefront-events-sdk@*":
   version "1.1.19"
   resolved "https://registry.yarnpkg.com/@adobe/magento-storefront-events-sdk/-/magento-storefront-events-sdk-1.1.19.tgz#7632b873c4e913505d6176384618017315999a77"
   integrity sha512-N/FEN5kEUvLvrjVf+xjZkkOKIP+dD9D++CBwBVbpwpRwsMzVhDAJA0txfquesa/bVQIPf8MlJ43jdEoyH9/RJg==
   dependencies:
     "@adobe/adobe-client-data-layer" "^2.0.2"
 
+"@adobe/magento-storefront-events-sdk@~1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@adobe/magento-storefront-events-sdk/-/magento-storefront-events-sdk-1.3.1.tgz#efe9e5898462ef8d6b360af483919566dfadf69e"
+  integrity sha512-Ky8iovqTpaCnMPcm7ZMZAPlGsLhOnbUCNiWX13JeFKqo+T+kRoipHfDzlNiWaYmRdys1QOODn7xpoROynwUVRg==
+  dependencies:
+    "@adobe/adobe-client-data-layer" "^2.0.2"
+
 "@adobe/reactor-cookie@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@adobe/reactor-cookie/-/reactor-cookie-1.1.0.tgz#9c13201fc4dd41b7600aa911e587539b7b9e4216"