@campxdev/shared 3.1.2 → 3.1.3-alpha1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@campxdev/shared",
-  "version": "3.1.2",
+  "version": "3.1.3-alpha1",
   "main": "./exports.ts",
   "scripts": {
     "start": "react-scripts start",

package/src/config/axios.ts

@@ -3,14 +3,29 @@ import Cookies from 'js-cookie'
 import { toast } from 'react-toastify'
 import { NetworkStore } from '../components/ErrorBoundary/GlobalNetworkLoadingIndicator'
 
-const isDevelopment = process.env.NODE_ENV == 'development'
+// Declare the extended axios types to include our custom property
+declare module 'axios' {
+  export interface AxiosRequestConfig {
+    workspace?: boolean
+  }
+}
+
+export const isDevelopment = window.location.hostname.includes('localhost')
 
-const tenantCode =
-  isDevelopment || window.location.hostname === 'localhost'
-    ? Cookies.get('campx_tenant')
-    : window.location.hostname.split('.')[0]
+const tenantCode = window.location.hostname.split('.')[0]
 const institutionCode = window.location.pathname.split('/')[1]
 
+// Workspace to API endpoint prefix mapping
+const workspaceApiMapping: Record<string, string> = {
+  'student-workspace': '/student-api',
+  'faculty-workspace': '/faculty-api',
+  'department-workspace': '/department-api',
+  'academic-coordinator-workspace': '/academic-coordinator-api',
+  'academic-admin-workspace': '/academic-admin-api',
+  'hostel-admin-workspace': '/hostel-admin-api',
+  'transport-coordinator-workspace': '/transport-coordinator-api',
+}
+
 export const formatParams = (params) => {
   return Object.fromEntries(
     Object.entries(params ?? {})?.map((i) => [
@@ -35,6 +50,19 @@ axios.interceptors.request.use(
     NetworkStore.update((s) => {
       s.loading = true
     })
+
+    // Handle workspace routing (default: true)
+    if (
+      config.workspace !== false &&
+      window.location.pathname.split('/')[2] &&
+      window.location.pathname.split('/')[2] !== 'common-workspace' &&
+      workspaceApiMapping[window.location.pathname.split('/')[2]]
+    ) {
+      const workspacePrefix = workspaceApiMapping[window.location.pathname.split('/')[2]]
+      config.url = `${workspacePrefix}${config.url}`
+    }
+
+    // Add session keys from cookies if available
     const sessionKey = Cookies.get('campx_session_key')
     const openPaymentsKey = Cookies.get('campx_open_payments_key')
 
@@ -73,6 +101,7 @@ axios.interceptors.response.use(
 
     // Check if the error is an unauthorized error (401)
     if (err?.response && err?.response?.status === 401) {
+      // Clear session keys from cookies on unauthorized error
       Cookies.remove('campx_session_key')
       Cookies.remove('campx_tenant')
       Cookies.remove('campx_institution')

package/src/constants/UIConstants.ts

@@ -11,6 +11,8 @@ const tenantBatchConfig = {
       '2022 - 2023': ['_JUL', '_JAN'],
       '2023 - 2024': ['_JAN', '_JUL'],
       '2024 - 2025': ['_JUL', '_JAN'],
+      '2025 - 2026': ['_JAN', '_JUL'],
+
       // Add more specific year configurations as needed
     },
   },

package/src/contexts/Providers.tsx

@@ -3,7 +3,6 @@ import ConfirmContextProvider from '../components/PopupConfirm/ConfirmContextPro
 import MuiThemeProvider from '../theme/MuiThemeProvider'
 import QueryClientProvider from './QueryClientProvider'
 
-import Cookies from 'js-cookie'
 import { ReactNode, useEffect } from 'react'
 import { ToastContainer } from '../components'
 import DialogProvider from '../components/DrawerWrapper/DrawerWrapper'
@@ -11,41 +10,19 @@ import GlobalNetworkLoadingIndicator from '../components/ErrorBoundary/GlobalNet
 import ErrorModalProvider from '../components/ErrorModalWrapper/ErrorModalWrapper'
 import RootModal from './RootModal'
 
-const isDevelopment = process.env.NODE_ENV == 'development'
+const isDevelopment = window.location.hostname.includes('localhost')
 
-export const campxTenantKey = isDevelopment
-  ? Cookies.get('campx_tenant')
-  : window.location.hostname.split('.')[0]
-export const urlTenantKey = isDevelopment
-  ? Cookies.get('campx_tenant')
-  : window.location.hostname.split('.')[0]
-export const instituitionKey =
-  window.location.pathname.split('/')[1] != ''
-    ? window.location.pathname.split('/')[1]
-    : Cookies.get('campx_institution')
+export const campxTenantKey = window.location.hostname.split('.')[0]
+export const urlTenantKey = window.location.hostname.split('.')[0]
+export const instituitionKey = window.location.pathname.split('/')[1]
 
 export default function Providers({ children }: { children: ReactNode }) {
   var baseName = '/'
-  var tenantCode
-  var institutionCode =
-    window.location.pathname.split('/')[1] != ''
-      ? window.location.pathname.split('/')[1]
-      : Cookies.get('campx_institution')
+  var tenantCode = window.location.hostname.split('.')[0]
+  var institutionCode = window.location.pathname.split('/')[1]
 
-  if (isDevelopment) {
-    tenantCode = Cookies.get('campx_tenant')
-    if (
-      tenantCode &&
-      institutionCode &&
-      window.location.pathname !== '/auth/login'
-    ) {
-      baseName = `/${institutionCode}`
-    }
-  } else {
-    tenantCode = window.location.hostname.split('.')[0]
-    if (institutionCode && window.location.pathname !== '/auth/login') {
-      baseName = `/${institutionCode}`
-    }
+  if (institutionCode && window.location.pathname !== '/auth/login') {
+    baseName = `/${institutionCode}`
   }
 
   useEffect(() => {