@campxdev/shared 3.0.6 → 3.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@campxdev/shared",
-  "version": "3.0.6",
+  "version": "3.0.8",
   "main": "./exports.ts",
   "scripts": {
     "start": "react-scripts start",
@@ -55,8 +55,8 @@
     "react-toastify": "^9.0.1",
     "styled-components": "^5.3.5",
     "swiper": "^8.1.5",
-    "use-immer": "^0.11.0",
-    "yup": "^1.4.0"
+    "use-immer": "^0.8.1",
+    "yup": "^0.32.11"
   },
   "devDependencies": {
     "@storybook/addon-actions": "^6.5.14",

package/src/constants/UIConstants.ts

@@ -1,55 +1,8 @@
 import { ReactNode } from 'react'
-import { campxTenantKey } from '../contexts/Providers'
-
-// Configuration for tenant-specific batch suffixes
-const tenantBatchConfig = {
-  upes: {
-    // Configure suffixes for specific batches
-    batchConfigs: {
-      '2025 - 2026': ['_JUL', '_OCT'],
-      // Add more specific year configurations as needed
-    },
-  },
-  // Add other tenant configurations here as needed
-}
-
-export const batchOptions = (() => {
-  const baseBatches = Array.from({ length: 12 }, (_, i) => {
-    return `${new Date().getFullYear() - i} - ${
-      new Date().getFullYear() - i + 1
-    }`
-  })
-
-  // Check if current tenant has specific batch configuration
-  const tenantConfig = tenantBatchConfig[campxTenantKey]
-
-  if (tenantConfig) {
-    const { batchConfigs } = tenantConfig
-    const batchesWithSuffixes = []
-
-    baseBatches.forEach((batch) => {
-      // Check if this batch has specific configuration
-      const suffixes = batchConfigs[batch]
-
-      if (suffixes) {
-        // Add batch with each suffix
-        suffixes.forEach((suffix) => {
-          batchesWithSuffixes.push(`${batch}${suffix}`)
-        })
-      } else {
-        // Add batch without suffix
-        batchesWithSuffixes.push(batch)
-      }
-    })
-    console.log(batchesWithSuffixes, 'suffix')
-    return batchesWithSuffixes
-  }
-
-  console.log(baseBatches, 'baseBatches')
 
-  // Return standard batches for other tenants
-  return baseBatches
-})()
+export const batchOptions = Array.from({ length: 12 }, (_, i) => {
+  return `${new Date().getFullYear() - i} - ${new Date().getFullYear() - i + 1}`
+})
 
 export const getYears = () => {
   const start = 2019

package/src/contexts/Providers.tsx

@@ -11,15 +11,18 @@ import GlobalNetworkLoadingIndicator from '../components/ErrorBoundary/GlobalNet
 import ErrorModalProvider from '../components/ErrorModalWrapper/ErrorModalWrapper'
 import RootModal from './RootModal'
 
-export const isDevelopment = window.location.hostname.includes('localhost')
+const isDevelopment = process.env.NODE_ENV == 'development'
 
-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 const workspace = window.location.pathname.split('/')[2]
+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 default function Providers({ children }: { children: ReactNode }) {
   var baseName = '/'