@campxdev/shared 1.8.49-alpha.1 → 1.8.49-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@campxdev/shared",
-  "version": "1.8.49-alpha.1",
+  "version": "1.8.49-alpha.3",
   "main": "./exports.ts",
   "scripts": {
     "start": "react-scripts start",

package/src/contexts/Providers.tsx

@@ -10,6 +10,7 @@ import DialogProvider from '../components/DrawerWrapper/DrawerWrapper'
 import GlobalNetworkLoadingIndicator from '../components/ErrorBoundary/GlobalNetworkLoadingIndicator'
 import FreshChatButton from '../components/Layout/Header/HeaderActions/FreshChatButton'
 import RootModal from './RootModal'
+import { isDevelopment } from '../constants'
 
 export const campxTenantKey = Cookies.get('campx_tenant')
 export const urlTenantKey = window.location.pathname.split('/')[1]
@@ -18,14 +19,24 @@ export const instituitionKey = window.location.pathname.split('/')[2]
 export default function Providers({ children }: { children: ReactNode }) {
   const localInstituitionKey = localStorage.getItem('institution_key')
 
-  const insititutionCode = instituitionKey
-    ? instituitionKey
-    : localInstituitionKey
-    ? localInstituitionKey
-    : null
+  const getInstituitionKey = () => {
+    if (instituitionKey) {
+      return instituitionKey
+    } else {
+      if (!urlTenantKey) return null
+      if (localInstituitionKey) {
+        return localInstituitionKey
+      } else {
+        return null
+      }
+    }
+  }
 
   useEffect(() => {
     if (!urlTenantKey) {
+      if (isDevelopment) {
+        window.location.replace(window.location.origin + `/campx_dev`)
+      }
       if (campxTenantKey)
         window.location.replace(window.location.origin + `/${campxTenantKey}`)
     } else {
@@ -39,7 +50,9 @@ export default function Providers({ children }: { children: ReactNode }) {
     }
   }, [])
 
-  const baseName = `${urlTenantKey}/${insititutionCode}`
+  const baseName = getInstituitionKey()
+    ? `${urlTenantKey}/${getInstituitionKey()}`
+    : urlTenantKey
 
   return (
     <BrowserRouter basename={baseName}>