@campxdev/shared 1.11.32-alpha.5 → 1.11.32-alpha.7

package/package.json

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

package/src/components/Institutions/InstitutionsDropdown.tsx

@@ -1,4 +1,3 @@
-import { urlTenantKey } from '../../contexts/Providers'
 import { InstitutionsStore } from '../../shared-state/InstitutionsStore'
 import { SearchSingleSelect } from '../Input/SearchSingleSelect'
 
@@ -8,9 +7,7 @@ export default function SchoolSwitch() {
   const handleChange = (value) => {
     if (value) {
       localStorage.setItem('institution_key', value?.value)
-      window.location.replace(
-        `${window.location.origin}/${urlTenantKey}/${value?.value}`,
-      )
+      window.location.replace(`${window.location.origin}/${value?.value}`)
     }
   }
   const options =

package/src/contexts/Providers.tsx

@@ -9,12 +9,11 @@ import { ToastContainer } from '../components'
 import DialogProvider from '../components/DrawerWrapper/DrawerWrapper'
 import GlobalNetworkLoadingIndicator from '../components/ErrorBoundary/GlobalNetworkLoadingIndicator'
 import ErrorModalProvider from '../components/ErrorModalWrapper/ErrorModalWrapper'
-import { isDevelopment } from '../constants'
 import RootModal from './RootModal'
 
 export const campxTenantKey = Cookies.get('campx_tenant')
-export const urlTenantKey = window.location.pathname.split('/')[1]
-export const instituitionKey = window.location.pathname.split('/')[2]
+export const urlTenantKey = window.location.hostname.split('.')[0]
+export const instituitionKey = window.location.pathname.split('/')[1]
 
 export default function Providers({ children }: { children: ReactNode }) {
   const localInstituitionKey = localStorage.getItem('institution_key')
@@ -33,26 +32,21 @@ export default function Providers({ children }: { children: ReactNode }) {
   }
 
   useEffect(() => {
-    if (!urlTenantKey) {
-      if (isDevelopment) {
-        window.location.replace(window.location.origin + `/aupulse`)
-      }
-      if (campxTenantKey)
-        window.location.replace(window.location.origin + `/${campxTenantKey}`)
-    } else {
-      if (!instituitionKey) {
-        if (localInstituitionKey) {
-          window.location.replace(
-            window.location.origin + `/${urlTenantKey}/${localInstituitionKey}`,
-          )
-        }
+    console.log(instituitionKey, localInstituitionKey)
+    if (!instituitionKey) {
+      if (localInstituitionKey) {
+        window.location.replace(
+          window.location.origin + `/${localInstituitionKey}`,
+        )
+      } else {
+        window.location.replace(window.location.origin + `/${urlTenantKey}`)
       }
     }
   }, [])
 
   const baseName = getInstituitionKey()
-    ? `${urlTenantKey}/${getInstituitionKey()}`
-    : urlTenantKey
+    ? `${getInstituitionKey()}`
+    : `${urlTenantKey}`
 
   return (
     <BrowserRouter basename={baseName}>

package/src/hooks/useAuth.ts

@@ -3,7 +3,6 @@ import { useEffect, useState } from 'react'
 import { toast } from 'react-toastify'
 import axios from '../config/axios'
 import { isDevelopment } from '../constants'
-import { urlTenantKey } from '../contexts/Providers'
 import { openRootModal } from '../contexts/RootModal'
 import { AssetsStore, PermissionsStore, UserStore } from '../shared-state'
 import { InstitutionsStore } from '../shared-state/InstitutionsStore'
@@ -64,7 +63,7 @@ const checkIsAdmin = (user) => {
   return isAdmin ? 1 : 0
 }
 const getInstitutionKey = () => {
-  const instituitionKey = window.location.pathname.split('/')[1] ?? 'campx_dev'
+  const instituitionKey = window.location.pathname.split('/')[1]
   if (!instituitionKey) {
     const localInstituitionKey = localStorage.getItem('institution_key')
     if (localInstituitionKey) {
@@ -91,12 +90,12 @@ function handleInstitutions(institutions) {
   if (institutions?.length === 1) {
     if (!insititutionKey) {
       window.location.replace(
-        `${window.location.origin}/${urlTenantKey}/${institutions[0]?.code}`,
+        `${window.location.origin}/${institutions[0]?.code}`,
       )
     }
     if (insititutionKey !== institutions[0]?.code) {
       window.location.replace(
-        `${window.location.origin}/${urlTenantKey}/${institutions[0]?.code}`,
+        `${window.location.origin}/${institutions[0]?.code}`,
       )
     }
     InstitutionsStore.update((s) => {