fix: bug BUN-721

bigcommerce · Mar 10, 2023 · fb050be · fb050be
1 parent 1f94633
commit fb050be
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 24 deletions.
diff --git a/apps/storefront/src/App.tsx b/apps/storefront/src/App.tsx
@@ -45,7 +45,7 @@ import {
   B3RenderRouter,
   B3MasquradeGobalTip,
   B3HoverButton,
-  CheckoutTip,
+  // CheckoutTip,
 } from '@/components'
 
 import {
@@ -273,9 +273,9 @@ export default function App() {
         productQuoteEnabled={productQuoteEnabled}
         setOpenPage={setOpenPage}
       />
-      <CheckoutTip
+      {/* <CheckoutTip
         setOpenPage={setOpenPage}
-      />
+      /> */}
     </>
 
   )

diff --git a/apps/storefront/src/components/B3HoverButton.tsx b/apps/storefront/src/components/B3HoverButton.tsx
@@ -79,7 +79,7 @@ export const B3HoverButton = (props: B3HoverButtonProps) => {
               height: '42px',
             }}
             onClick={() => {
-              // B3SStorage.set('nextPath', '/')
+              B3SStorage.set('nextPath', '/')
               setOpenPage({
                 isOpen: true,
                 openUrl: '/quoteDraft',

diff --git a/apps/storefront/src/components/layout/B3Mainheader.tsx b/apps/storefront/src/components/layout/B3Mainheader.tsx
@@ -74,7 +74,7 @@ export const B3Mainheader = ({
             color: '#333333',
           }}
         >
-          {companyInfo?.companyName || salesRepCompanyName}
+          {companyInfo?.companyName || salesRepCompanyName || 'Super admin'}
 
           {/* <B3DropDown
             title="Renteach building"

diff --git a/apps/storefront/src/pages/accountSetting/AccountSetting.tsx b/apps/storefront/src/pages/accountSetting/AccountSetting.tsx
@@ -156,12 +156,13 @@ const AccountSetting = () => {
 
   const companyId = role === 3 && isAgenting ? +salesRepCompanyId : +companyInfoId
 
+  const isBCUser = !isB2BUser || (role === 3 && !isAgenting)
+
   useEffect(() => {
     const init = async () => {
       try {
         setLoadding(true)
 
-        const isBCUser = !isB2BUser || (role === 3 && !isAgenting)
         const accountFormAllFields = await getB2BAccountFormFields(isBCUser ? 1 : 2)
 
         const fn = !isBCUser ? getB2BAccountSettings : getBCAccountSettings
@@ -188,7 +189,7 @@ const AccountSetting = () => {
           additionalInformation,
         } = accountFormFields
 
-        if (isB2BUser) {
+        if (!isBCUser) {
           contactInformation.forEach((item: Partial<Fields>) => {
             if (deCodeField(item?.name || '') === 'first_name') {
               item.default = accountSettings.firstName
@@ -283,8 +284,8 @@ const AccountSetting = () => {
 
   const validateEmailValue = async (emailValue: string) => {
     if (customer.emailAddress === trim(emailValue)) return true
-    const fn = isB2BUser ? checkUserEmail : checkUserBCEmail
-    const key = isB2BUser ? 'userEmailCheck' : 'customerEmailCheck'
+    const fn = !isBCUser ? checkUserEmail : checkUserBCEmail
+    const key = !isBCUser ? 'userEmailCheck' : 'customerEmailCheck'
 
     const {
       [key]: {
@@ -295,7 +296,7 @@ const AccountSetting = () => {
       channelId: currentChannelId,
     })
 
-    const isValid = isB2BUser ? [1].includes(userType) : ![2].includes(userType)
+    const isValid = !isBCUser ? [1].includes(userType) : ![2].includes(userType)
 
     if (!isValid) {
       setError('email', {
@@ -342,7 +343,7 @@ const AccountSetting = () => {
       setLoadding(true)
 
       try {
-        const isValid = isB2BUser ? await validateEmailValue(data.email) : true
+        const isValid = !isBCUser ? await validateEmailValue(data.email) : true
 
         const emailFlag = emailValidation(data)
 
@@ -354,7 +355,7 @@ const AccountSetting = () => {
           const param: Partial<ParamProps> = {}
           param.formFields = []
           let flag = true
-          if (isB2BUser) {
+          if (!isBCUser) {
             Object.keys(data).forEach((key: string) => {
               decryptionFields.forEach((item: Partial<Fields>) => {
                 if (key === item.name) {

diff --git a/apps/storefront/src/shared/routes/routes.ts b/apps/storefront/src/shared/routes/routes.ts
@@ -67,6 +67,15 @@ export interface RouteFirstLevelItem extends RouteItemBasic{
 }
 
 const routes: RouteItem[] = [
+  {
+    path: '/',
+    name: 'Dashboard',
+    wsKey: 'router-orders',
+    isMenuItem: true,
+    component: Dashboard,
+    permissions: [3, 4],
+    isTokenLogin: true,
+  },
   {
     path: '/orders',
     name: 'My orders',
@@ -200,15 +209,6 @@ const routes: RouteItem[] = [
     permissions: [0, 1, 2, 3, 99, 100],
     isTokenLogin: true,
   },
-  {
-    path: '/',
-    name: 'Dashboard',
-    wsKey: 'router-orders',
-    isMenuItem: true,
-    component: Dashboard,
-    permissions: [3, 4],
-    isTokenLogin: true,
-  },
 ]
 
 const firstLevelRouting: RouteFirstLevelItem[] = [
@@ -258,8 +258,6 @@ const getAllowedRoutes = (globalState: GlobalState): RouteItem[] => {
     cartQuoteEnabled,
   } = globalState
 
-  console.log(isB2BUser, role, isAgenting, storefrontConfig, productQuoteEnabled, cartQuoteEnabled)
-
   return routes.filter((item: RouteItem) => {
     const {
       permissions = [],
@@ -302,7 +300,7 @@ const gotoAllowedAppPage = (role: number, isAgenting:boolean, gotoPage: (url: st
     hash,
   } = window.location
   let url = hash.split('#')[1] || ''
-  if (!url && role !== 100) url = (role === 3 && !isAgenting) ? '/' : '/orders'
+  if (!url && role !== 100) url = role === 3 ? '/' : '/orders'
   const flag = routes.some((item: RouteItem) => matchPath(item.path, url) && item.permissions.includes(role))
 
   const isFirstLevelFlag = firstLevelRouting.some((item: RouteFirstLevelItem) => matchPath(item.path, url))