@campxdev/campx-web-utils 0.1.12 → 0.1.14

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@campxdev/campx-web-utils",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "main": "./exports.ts",
   "private": false,
   "dependencies": {
-    "@campxdev/react-blueprint": "^1.1.2",
+    "@campxdev/react-blueprint": "^1.1.3",
     "@hookform/resolvers": "^3.9.0",
     "@mui/x-date-pickers": "^7.11.0",
     "@testing-library/jest-dom": "^5.14.1",

package/src/App.tsx

@@ -1,15 +1,13 @@
-import { BrowserRouter, useRoutes } from "react-router-dom";
-import Providers from "./context/Providers";
+import { useRoutes } from "react-router-dom";
+
 import { mainRoutes } from "./Pages/main";
+import { Providers } from "./context/export";
 
 export default function App() {
-  var baseName = "/";
   return (
-    <BrowserRouter basename={baseName}>
-      <Providers>
-        <AppRouter />
-      </Providers>
-    </BrowserRouter>
+    <Providers>
+      <AppRouter />
+    </Providers>
   );
 }
 const AppRouter = () => {

package/src/config/axios.ts

@@ -4,9 +4,10 @@ import { SnackbarStore } from "../context/SnackbarProvider";
 
 const isDevelopment = process.env.NODE_ENV == "development";
 
-const tenantCode = isDevelopment
-  ? Cookies.get("campx_tenant")
-  : window.location.hostname.split(".")[0];
+const tenantCode =
+  window.location.hostname === "localhost"
+    ? Cookies.get("campx_tenant")
+    : window.location.hostname.split(".")[0];
 const institutionCode = window.location.pathname.split("/")[1];
 
 export const formatParams = (params: any) => {

package/src/context/ErrorBoundary/ErrorBoundary.tsx

@@ -12,12 +12,10 @@ import { ReactNode, useState } from "react";
 import { ErrorBoundary as ReactErrorBoundary } from "react-error-boundary";
 import { QueryErrorResetBoundary } from "react-query";
 import { useLocation, useNavigate } from "react-router-dom";
-import { axios } from "../../config/axios";
 import { Login } from "./Login";
 
 export type ErrorBoundaryProps = {
   children: ReactNode;
-  resetKey?: string;
 };
 
 const StyledAlert = styled(Alert)(({ theme }) => ({
@@ -57,7 +55,7 @@ export const ErrorBoundary = (props: ErrorBoundaryProps) => {
   );
 };
 
-export const ErrorFallback = ({ error, resetErrorBoundary }: any) => {
+const ErrorFallback = ({ error, resetErrorBoundary }: any) => {
   if (error?.response?.status) {
     switch (error?.response?.status) {
       case 401:
@@ -98,20 +96,12 @@ const UnAuth = () => {
 
   const sessionCookie = Cookies.get("campx_session_key");
 
-  const appinit = async () => {
-    await axios.get("/auth/my-permissions").catch((e: any) => {
-      navigate("/auth/login");
-    });
-  };
-
   const handleLoginClick = () => {
     if (window.location.hostname == "localhost") {
       setModalOpen(true);
     } else {
       if (!sessionCookie) {
         navigate("/auth/login");
-      } else {
-        appinit();
       }
     }
   };

package/src/context/Providers.tsx

@@ -1,10 +1,20 @@
-import { MuiThemeProvider } from "@campxdev/react-blueprint";
-import { ReactNode } from "react";
+import { lightTheme, MuiThemeProvider } from "@campxdev/react-blueprint";
+import Cookies from "js-cookie";
+import { ReactNode, useEffect } from "react";
 import { QueryClient, QueryClientProvider } from "react-query";
-import { SnackbarProvider } from "./SnackbarProvider";
+import { BrowserRouter } from "react-router-dom";
 import { ErrorBoundary } from "./export";
+import { SnackbarProvider } from "./SnackbarProvider";
 
-export default function Providers({ children }: { children: ReactNode }) {
+export const Providers = ({
+  children,
+  basename,
+  theme = lightTheme,
+}: {
+  children: ReactNode;
+  basename?: string;
+  theme?: any;
+}) => {
   const queryClient = new QueryClient({
     defaultOptions: {
       queries: {
@@ -15,13 +25,30 @@ export default function Providers({ children }: { children: ReactNode }) {
     },
   });
 
+  var tenantCode =
+    window.location.hostname === "localhost"
+      ? Cookies.get("campx_tenant")
+      : window.location.hostname.split(".")[0];
+  var institutionCode =
+    window.location.pathname.split("/")[1] !== ""
+      ? window.location.pathname.split("/")[1]
+      : Cookies.get("campx_institution");
+  var baseName = tenantCode && institutionCode ? `/${institutionCode}` : "/";
+  useEffect(() => {
+    if (window.location.pathname === "/" && institutionCode && tenantCode) {
+      window.location.replace(window.location.origin + `/${institutionCode}`);
+    }
+  }, []);
+
   return (
-    <QueryClientProvider client={queryClient}>
-      <MuiThemeProvider>
-        <SnackbarProvider>
-          <ErrorBoundary>{children}</ErrorBoundary>
-        </SnackbarProvider>
-      </MuiThemeProvider>
-    </QueryClientProvider>
+    <BrowserRouter basename={basename ?? baseName}>
+      <QueryClientProvider client={queryClient}>
+        <MuiThemeProvider theme={theme}>
+          <SnackbarProvider>
+            <ErrorBoundary>{children}</ErrorBoundary>
+          </SnackbarProvider>
+        </MuiThemeProvider>
+      </QueryClientProvider>
+    </BrowserRouter>
   );
-}
+};

package/types/theme.d.ts

@@ -54,5 +54,6 @@ declare module "@mui/material/Typography" {
     label1: true;
     label2: true;
     subtitle3: true;
+    button1: true;
   }
 }