fix: add validation to set 0 on channelid when multistorefront is dis…

…abled (#858) fix: add validation to set 0 on storechannel when multistorefront is disabled
bigcommerce · Dec 27, 2023 · 1a3d944 · 1a3d944
1 parent 233a35b
commit 1a3d944
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/apps/storefront/src/components/B3StoreContainer.tsx b/apps/storefront/src/components/B3StoreContainer.tsx
@@ -78,6 +78,7 @@ export default function B3StoreContainer(props: B3StoreContainerProps) {
             b2bChannelId,
             storeName: storeBasicInfo.storeName,
             timeFormat: storeBasicInfo.timeFormat,
+            multiStorefrontEnabled: storeBasicInfo.multiStorefrontEnabled,
           },
         })
 
@@ -86,7 +87,10 @@ export default function B3StoreContainer(props: B3StoreContainerProps) {
         }
 
         if (translationVersion > 0) {
-          setGlobalTranslation({ translationVersion, channelId })
+          setGlobalTranslation({
+            translationVersion,
+            channelId: storeBasicInfo.multiStorefrontEnabled ? channelId : 0,
+          })
         }
 
         store.dispatch(setHeadLessBcUrl(bcUrl))

diff --git a/apps/storefront/src/components/layout/B3RenderRouter.tsx b/apps/storefront/src/components/layout/B3RenderRouter.tsx
@@ -66,7 +66,13 @@ export default function B3RenderRouter(props: B3RenderRouterProps) {
     const [, page] = location.pathname.split('/')
     if (!page) return
 
-    setTranslation({ channelId: globaledState.currentChannelId, page })
+    let channelId = globaledState.currentChannelId
+
+    if (!globaledState.multiStorefrontEnabled) {
+      channelId = 0
+    }
+
+    setTranslation({ channelId, page })
   }, [location.pathname])
 
   return (

diff --git a/apps/storefront/src/shared/global/context/config.ts b/apps/storefront/src/shared/global/context/config.ts
@@ -125,6 +125,7 @@ export interface GlobalState {
   blockPendingAccountOrderCreation: boolean
   quoteDetailHasNewMessages: boolean
   shoppingListClickNode: HTMLElement | null
+  multiStorefrontEnabled: boolean
 }
 
 export const initState = {
@@ -183,6 +184,7 @@ export const initState = {
   quoteDetailHasNewMessages: false,
   shoppingListClickNode: null,
   tipMessage: {},
+  multiStorefrontEnabled: false,
 }
 
 export interface GlobalAction {