moving call to removeSiteLocaleFromPath into use-navigation hook

SalesforceCommerceCloud · Mar 18, 2023 · c8a3ff6 · c8a3ff6
1 parent 020a8af
commit c8a3ff6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/packages/template-retail-react-app/app/hooks/use-navigation.js b/packages/template-retail-react-app/app/hooks/use-navigation.js
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2021, salesforce.com, inc.
+ * Copyright (c) 2023, Salesforce, Inc.
  * All rights reserved.
  * SPDX-License-Identifier: BSD-3-Clause
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import {useCallback} from 'react'
 import {useHistory} from 'react-router'
 import useMultiSite from './use-multi-site'
+import {removeSiteLocaleFromPath} from '../utils/url'
 
 /**
  * A convenience hook for programmatic navigation uses history's `push` or `replace`. The proper locale
@@ -26,7 +27,7 @@ const useNavigation = () => {
          * @param  {...any} args - additional args passed to `.push` or `.replace`
          */
         (path, action = 'push', ...args) => {
-            const updatedHref = buildUrl(path)
+            const updatedHref = buildUrl(removeSiteLocaleFromPath(path))
             history[action](path === '/' ? '/' : updatedHref, ...args)
         },
         [localeShortCode, site]

diff --git a/packages/template-retail-react-app/app/pages/login/index.jsx b/packages/template-retail-react-app/app/pages/login/index.jsx
@@ -15,7 +15,7 @@ import Seo from '../../components/seo'
 import {useForm} from 'react-hook-form'
 import {useLocation} from 'react-router-dom'
 import useEinstein from '../../commerce-api/hooks/useEinstein'
-import {removeSiteLocaleFromPath} from '../../utils/url'
+
 import LoginForm from '../../components/login'
 
 const Login = () => {
@@ -45,7 +45,7 @@ const Login = () => {
     useEffect(() => {
         if (customer.authType != null && customer.isRegistered) {
             if (location?.state?.directedFrom) {
-                navigate(removeSiteLocaleFromPath(location.state.directedFrom))
+                navigate(location.state.directedFrom)
             } else {
                 navigate('/account')
             }

diff --git a/packages/template-retail-react-app/app/utils/url.js b/packages/template-retail-react-app/app/utils/url.js
@@ -271,7 +271,7 @@ export const removeQueryParamsFromPath = (path, keys) => {
  * removeSiteLocaleFromPath(/RefArch/en-US/account/wishlist)
  * // returns '/account/wishlist'
  */
-export const removeSiteLocaleFromPath = (pathName) => {
+export const removeSiteLocaleFromPath = (pathName = '') => {
     let {siteRef, localeRef} = getParamsFromPath(`${pathName}`)
 
     // remove the site alias from the current pathName