@campxdev/shared 3.1.24 → 3.1.26

package/package.json

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

package/src/components/Layout/Header/Search/SearchDialog.tsx

@@ -52,7 +52,7 @@ const RenderLink = ({ link, isActive }) => {
   return (
     <StyledLinkWrapper>
       {isProd &&
-      window.location.hostname.split('.')[0] === link?.item?.appKey ? (
+      window.location.hostname.split('.')[0].split('--')[0] === link?.item?.appKey ? (
         <Link to={link?.item?.path} ref={reactLinkRef}>
           <StyledListItem isActive={isActive}>{link?.title}</StyledListItem>
         </Link>

package/src/components/LoginForm.tsx

@@ -55,7 +55,7 @@ export function LoginForm({
     try {
       const res = await axiosBase({
         method: 'POST',
-        baseURL: process.env.REACT_APP_API_HOST,
+        baseURL: process.env.REACT_APP_API_HOST || '/api',
         url: loginUrl ? loginUrl : `/auth-server/auth/login`,
         data: {
           ...values,

package/src/config/axios.ts

@@ -13,7 +13,7 @@ declare module 'axios' {
 
 export const isDevelopment = window.location.hostname.includes('localhost')
 
-const tenantCode = window.location.hostname.split('.')[0]
+const tenantCode = window.location.hostname.split('.')[0].split('--')[0]
 const institutionCode = window.location.pathname.split('/')[1]
 
 // Workspace to API endpoint prefix mapping
@@ -51,7 +51,7 @@ export const formatParams = (params) => {
 }
 
 let axios = Axios.create({
-  baseURL: process.env.REACT_APP_API_HOST,
+  baseURL: process.env.REACT_APP_API_HOST || '/api',
   withCredentials: true,
   headers: {
     'x-tenant-id': tenantCode,

package/src/config/axiosEvaluator.ts

@@ -9,7 +9,7 @@ const clientId = window.location.pathname.split('/')[1] ?? 'campx_dev'
 const evaluatorKey = Cookies.get('campx_evaluator_key')
 
 const axiosEvaluator = Axios.create({
-  baseURL: process.env.REACT_APP_API_HOST,
+  baseURL: process.env.REACT_APP_API_HOST || '/api',
   withCredentials: true,
   headers: {
     'x-tenant-id': clientId,

package/src/config/axiosXTenant.ts

@@ -11,7 +11,7 @@ const evaluatorKey = Cookies.get('campx_evaluator_key')
 const openPaymentsKey = Cookies.get('campx_open_payments_key')
 
 const axiosTenant = Axios.create({
-  baseURL: process.env.REACT_APP_API_HOST,
+  baseURL: process.env.REACT_APP_API_HOST || '/api',
   withCredentials: true,
   headers: {
     'x-tenant-id': clientId,

package/src/constants/UIConstants.ts

@@ -27,7 +27,7 @@ export const batchOptions = (() => {
   })
 
   // Check if current tenant has specific batch configuration
-  const tenantConfig = tenantBatchConfig[window.location.hostname.split('.')[0]]
+  const tenantConfig = tenantBatchConfig[window.location.hostname.split('.')[0].split('--')[0]]
 
   if (tenantConfig) {
     const { batchConfigs } = tenantConfig

package/src/contexts/Providers.tsx

@@ -12,13 +12,13 @@ import RootModal from './RootModal'
 
 const isDevelopment = window.location.hostname.includes('localhost')
 
-export const campxTenantKey = window.location.hostname.split('.')[0]
-export const urlTenantKey = window.location.hostname.split('.')[0]
+export const campxTenantKey = window.location.hostname.split('.')[0].split('--')[0]
+export const urlTenantKey = window.location.hostname.split('.')[0].split('--')[0]
 export const instituitionKey = window.location.pathname.split('/')[1]
 
 export default function Providers({ children }: { children: ReactNode }) {
   var baseName = '/'
-  var tenantCode = window.location.hostname.split('.')[0]
+  var tenantCode = window.location.hostname.split('.')[0].split('--')[0]
   var institutionCode = window.location.pathname.split('/')[1]
 
   if (institutionCode && window.location.pathname !== '/auth/login') {

package/src/utils/logout.ts

@@ -4,7 +4,7 @@ import axios, { axiosErrorToast } from '../config/axios'
 export default function logout() {
   axios({
     method: 'POST',
-    baseURL: process.env.REACT_APP_API_HOST,
+    baseURL: process.env.REACT_APP_API_HOST || '/api',
     url: '/auth-server/auth/logout',
   })
     .then((res) => {