@campxdev/campx-web-utils 0.1.11 → 0.1.13

package/exports.ts

@@ -1,3 +1,2 @@
 export * from "./src/config/axios";
-export * from "./src/context/SnackbarProvider";
-export * from "./src/ErrorBoundary/export";
+export * from "./src/context/export";

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@campxdev/campx-web-utils",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "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,6 +1,7 @@
 import { useRoutes } from "react-router-dom";
-import Providers from "./context/Providers";
+
 import { mainRoutes } from "./Pages/main";
+import { Providers } from "./context/export";
 
 export default function App() {
   return (

package/src/config/axios.ts

@@ -70,13 +70,24 @@ axios.interceptors.response.use(
     return response;
   },
   function (err) {
-    if ([400, 404, 422].includes(err.response.status)) {
+    if ([400, 422].includes(err.response.status)) {
       SnackbarStore.update((s) => {
         s.open = true;
         s.message = err.response.data.message || "Bad Request";
         s.severity = "error";
       });
     }
+    if (
+      err.response.config.method &&
+      ["put", "post", "delete", "patch"].includes(err.response.config.method) &&
+      [404].includes(err.response.status)
+    ) {
+      SnackbarStore.update((s) => {
+        s.open = true;
+        s.message = err.response.data.message;
+        s.severity = "success";
+      });
+    }
 
     return Promise.reject(err);
   }

package/src/{ErrorBoundary → 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,27 +1,33 @@
-import { MuiThemeProvider } from "@campxdev/react-blueprint";
+import { lightTheme, MuiThemeProvider } from "@campxdev/react-blueprint";
 import { ReactNode } from "react";
 import { QueryClient, QueryClientProvider } from "react-query";
 import { BrowserRouter } from "react-router-dom";
-import { ErrorBoundary } from "../ErrorBoundary/ErrorBoundary";
 import { SnackbarProvider } from "./SnackbarProvider";
+import { ErrorBoundary } from "./export";
 
-export const queryClient = new QueryClient({
-  defaultOptions: {
-    queries: {
-      refetchOnWindowFocus: false,
-      retry: false,
-      useErrorBoundary: true,
+export const Providers = ({
+  children,
+  baseName = "/",
+  theme = lightTheme,
+}: {
+  children: ReactNode;
+  baseName?: string;
+  theme?: any;
+}) => {
+  const queryClient = new QueryClient({
+    defaultOptions: {
+      queries: {
+        refetchOnWindowFocus: false,
+        retry: false,
+        useErrorBoundary: true,
+      },
     },
-  },
-});
-
-export default function Providers({ children }: { children: ReactNode }) {
-  var baseName = "/";
+  });
 
   return (
     <BrowserRouter basename={baseName}>
       <QueryClientProvider client={queryClient}>
-        <MuiThemeProvider>
+        <MuiThemeProvider theme={theme}>
           <SnackbarProvider>
             <ErrorBoundary>{children}</ErrorBoundary>
           </SnackbarProvider>
@@ -29,4 +35,4 @@ export default function Providers({ children }: { children: ReactNode }) {
       </QueryClientProvider>
     </BrowserRouter>
   );
-}
+};

package/src/context/export.ts

@@ -0,0 +1,4 @@
+export * from "./application-store";
+export * from "./ErrorBoundary/ErrorBoundary";
+export * from "./Providers";
+export * from "./SnackbarProvider";

package/types/theme.d.ts

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

package/src/ErrorBoundary/GlobalNetworkLoadingIndicator.tsx

@@ -1,13 +0,0 @@
-import { LinearProgress } from "@mui/material";
-import { Store } from "pullstate";
-
-export const NetworkStore = new Store({
-  loading: false,
-});
-
-export default function GlobalNetworkLoadingIndicator() {
-  const { loading } = NetworkStore.useState();
-
-  if (loading) return <LinearProgress />;
-  if (loading) return null;
-}

package/src/ErrorBoundary/export.ts

@@ -1 +0,0 @@
-export * from "./ErrorBoundary";

package/src/context/LoginDialogProvider.tsx

@@ -1,5 +0,0 @@
-import { createContext } from "react";
-
-const LoginContext = createContext<{ openLoginDialog: () => void }>({
-  openLoginDialog: () => {},
-});