frontend-plus-react 0.1.16 → 0.1.18

package/dist/index.js

@@ -2527,8 +2527,8 @@ var GenericDataGrid = ({
 var GenericDataGrid_default = GenericDataGrid;
 
 // src/App.tsx
-import React11, { useEffect as useEffect7 } from "react";
-import { BrowserRouter, Routes, Route, useLocation as useLocation4, Navigate as Navigate2 } from "react-router-dom";
+import React12, { useEffect as useEffect7 } from "react";
+import { BrowserRouter, Routes, Route, useLocation as useLocation5, Navigate as Navigate2, Outlet as Outlet2 } from "react-router-dom";
 
 // src/components/MainLayout.tsx
 import { useEffect as useEffect3 } from "react";
@@ -2547,8 +2547,8 @@ import {
 } from "@mui/material";
 
 // src/contexts/AppContext.tsx
-import { createContext as createContext2, useContext as useContext2, useState as useState6, useEffect as useEffect2, useCallback as useCallback5, useMemo as useMemo3 } from "react";
-import { useNavigate } from "react-router-dom";
+import { createContext as createContext2, useContext as useContext2, useState as useState6, useEffect as useEffect2, useCallback as useCallback5, useMemo as useMemo3, useRef as useRef2 } from "react";
+import { useLocation, useNavigate } from "react-router-dom";
 import { useSelector as useSelector2, useDispatch as useDispatch2 } from "react-redux";
 import { jsx as jsx15 } from "react/jsx-runtime";
 var AuthContext = createContext2(void 0);
@@ -2560,16 +2560,33 @@ var useApp = () => {
   const clientContext = useSelector2((state) => state.clientContext);
   return { ...context, clientContext };
 };
-var AppProvider = ({ children }) => {
+var AppProvider = ({ children, publicPaths = [] }) => {
   console.log("AppProvider rendered/re-rendered");
   const [isLoggedIn, setIsLoggedIn] = useState6(false);
   const [showSessionExpiredMessage, setShowSessionExpiredMessage] = useState6(false);
+  const isRedirectingRef = useRef2(false);
   const dispatch = useDispatch2();
   const clientContext = useSelector2((state) => state.clientContext);
   const navigate = useNavigate();
+  const handleExpiredSessionRedirect = useCallback5(() => {
+    isRedirectingRef.current = true;
+    setShowSessionExpiredMessage(false);
+    setIsLoggedIn(false);
+    navigate("/login", { replace: true });
+    setTimeout(() => {
+      isRedirectingRef.current = false;
+    }, 2e3);
+  }, [navigate]);
+  const location = useLocation();
+  const isCurrentPathPublic = useCallback5(() => {
+    const current = location.pathname;
+    return publicPaths.some((path) => current === path || current.startsWith(`${path}/`));
+  }, [location.pathname, publicPaths]);
   const checkSession = useCallback5(async () => {
+    if (isRedirectingRef.current) return;
     try {
       const response = await fetchApi("/keep-alive.json", { method: "GET" });
+      if (isRedirectingRef.current) return;
       if (response.ok) {
         setIsLoggedIn(true);
         setShowSessionExpiredMessage(false);
@@ -2585,15 +2602,19 @@ var AppProvider = ({ children }) => {
       } else {
         setIsLoggedIn(false);
         dispatch(clearClientContext());
-        if (!showSessionExpiredMessage && window.location.pathname !== "/login") {
+        if (!showSessionExpiredMessage && !isCurrentPathPublic()) {
+          console.warn("Sesi\xF3n inv\xE1lida en ruta protegida. Mostrando modal.");
           setShowSessionExpiredMessage(true);
+        } else {
+          console.log("Sesi\xF3n inv\xE1lida, pero estamos en ruta p\xFAblica. Todo bien.");
         }
       }
     } catch (error) {
       console.error("Error checking session:", error);
       setIsLoggedIn(false);
       dispatch(clearClientContext());
-      if (!showSessionExpiredMessage && window.location.pathname !== "/login") {
+      const isPublic = publicPaths.some((p) => location.pathname === p || location.pathname.startsWith(p + "/"));
+      if (!showSessionExpiredMessage && !isCurrentPathPublic()) {
         setShowSessionExpiredMessage(true);
       }
     }
@@ -2610,13 +2631,15 @@ var AppProvider = ({ children }) => {
     setIsLoggedIn,
     checkSession,
     showSessionExpiredMessage,
-    setShowSessionExpiredMessage
+    setShowSessionExpiredMessage,
+    handleExpiredSessionRedirect
   }), [
     isLoggedIn,
     setIsLoggedIn,
     checkSession,
     showSessionExpiredMessage,
-    setShowSessionExpiredMessage
+    setShowSessionExpiredMessage,
+    handleExpiredSessionRedirect
   ]);
   return /* @__PURE__ */ jsx15(AuthContext.Provider, { value: authContextValue, children });
 };
@@ -2638,7 +2661,7 @@ import WarningAmberIcon3 from "@mui/icons-material/WarningAmber";
 import DesktopWindowsIcon from "@mui/icons-material/DesktopWindows";
 import UnfoldMoreIcon from "@mui/icons-material/UnfoldMore";
 import UnfoldLessIcon from "@mui/icons-material/UnfoldLess";
-import { useNavigate as useNavigate2, useLocation } from "react-router-dom";
+import { useNavigate as useNavigate2, useLocation as useLocation2 } from "react-router-dom";
 import { blue, orange, teal, red, grey } from "@mui/material/colors";
 
 // src/pages/WScreens.tsx
@@ -2682,7 +2705,7 @@ var extendWScreens = (newWScreens) => {
 import { Fragment as Fragment2, jsx as jsx17, jsxs as jsxs8 } from "react/jsx-runtime";
 var MenuListItem = ({ item, level, onMenuItemClick }) => {
   const navigate = useNavigate2();
-  const location = useLocation();
+  const location = useLocation2();
   const open = useSubMenuOpenState(item.name);
   const dispatch = useAppDispatch();
   const handleClick = () => {
@@ -2770,7 +2793,7 @@ var MenuListItem = ({ item, level, onMenuItemClick }) => {
 var SideMenu = ({ onMenuItemClick }) => {
   const { clientContext } = useApp();
   const navigate = useNavigate2();
-  const location = useLocation();
+  const location = useLocation2();
   const dispatch = useAppDispatch();
   const subMenuOpenStates = useAppSelector((state) => state.menuUi.subMenuOpenStates);
   const allSubMenusKeys = Object.keys(subMenuOpenStates);
@@ -2991,7 +3014,6 @@ var MainLayout_default = MainLayout;
 
 // src/components/SessionExpiredMessage.tsx
 import { Box as Box12, Typography as Typography9, Button as Button5, Modal } from "@mui/material";
-import { useNavigate as useNavigate4 } from "react-router-dom";
 import { jsx as jsx19, jsxs as jsxs10 } from "react/jsx-runtime";
 var style = {
   position: "absolute",
@@ -3007,12 +3029,9 @@ var style = {
   borderRadius: 2
 };
 var SessionExpiredMessage = () => {
-  const { showSessionExpiredMessage, setShowSessionExpiredMessage, setIsLoggedIn } = useApp();
-  const navigate = useNavigate4();
+  const { showSessionExpiredMessage, setShowSessionExpiredMessage, setIsLoggedIn, handleExpiredSessionRedirect } = useApp();
   const handleClose = () => {
-    setShowSessionExpiredMessage(false);
-    setIsLoggedIn(false);
-    navigate("/login", { replace: true });
+    handleExpiredSessionRedirect();
   };
   return /* @__PURE__ */ jsx19(
     Modal,
@@ -3085,7 +3104,7 @@ import { Button as Button6, TextField, Typography as Typography12, Alert as Aler
 import { useForm, Controller } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import * as z from "zod";
-import { useNavigate as useNavigate5 } from "react-router-dom";
+import { useNavigate as useNavigate4 } from "react-router-dom";
 import { useDispatch as useDispatch4 } from "react-redux";
 import { Fragment as Fragment3, jsx as jsx22, jsxs as jsxs13 } from "react/jsx-runtime";
 var loginSchema = z.object({
@@ -3095,7 +3114,7 @@ var loginSchema = z.object({
   // Añadir validación básica
 });
 var LoginPage = () => {
-  const navigate = useNavigate5();
+  const navigate = useNavigate4();
   const [loginError, setLoginError] = useState7(null);
   const [isSubmitting, setIsSubmitting] = useState7(false);
   const { setIsLoggedIn, checkSession } = useApp();
@@ -3695,10 +3714,10 @@ import { PersistGate } from "redux-persist/integration/react";
 
 // src/components/PrivateRoute.tsx
 import { useEffect as useEffect5 } from "react";
-import { Navigate, useLocation as useLocation2 } from "react-router-dom";
+import { Navigate, useLocation as useLocation3 } from "react-router-dom";
 import { Fragment as Fragment4, jsx as jsx25 } from "react/jsx-runtime";
 var PrivateRoute = ({ children }) => {
-  const location = useLocation2();
+  const location = useLocation3();
   const dispatch = useAppDispatch();
   const clientContextStatus = useClientContextStatus();
   const isAuthenticated = clientContextStatus === "succeeded";
@@ -3733,10 +3752,10 @@ var PrivateRoute_default = PrivateRoute;
 
 // src/components/InitialRedirectHandler.tsx
 import { useEffect as useEffect6 } from "react";
-import { useLocation as useLocation3, useNavigate as useNavigate6 } from "react-router-dom";
+import { useLocation as useLocation4, useNavigate as useNavigate5 } from "react-router-dom";
 var InitialRedirectHandler = () => {
-  const location = useLocation3();
-  const navigate = useNavigate6();
+  const location = useLocation4();
+  const navigate = useNavigate5();
   const dispatch = useAppDispatch();
   const redirectPath = useRedirectPath();
   const clientContextStatus = useClientContextStatus();
@@ -3838,19 +3857,40 @@ var MenuTablePage_default = MenuTablePage;
 
 // src/App.tsx
 import { Box as Box20 } from "@mui/material";
+
+// src/utils/routeUtils.ts
+import { Children, isValidElement } from "react";
+var extractPathsFromRoutes = (node) => {
+  const paths = [];
+  Children.forEach(node, (child) => {
+    if (!isValidElement(child)) return;
+    if (child.props.path) {
+      paths.push(child.props.path);
+    }
+    if (child.props.children) {
+      paths.push(...extractPathsFromRoutes(child.props.children));
+    }
+  });
+  return paths;
+};
+
+// src/App.tsx
 import { jsx as jsx28, jsxs as jsxs18 } from "react/jsx-runtime";
 var LocationTracker = () => {
-  const location = useLocation4();
+  const location = useLocation5();
   const dispatch = useAppDispatch();
   useEffect7(() => {
     dispatch(setCurrentPath(location.pathname + location.search));
   }, [location, dispatch]);
   return null;
 };
-function FrontendPlusReactRoutes({ myRoutes, layout: Layout = MainLayout_default }) {
+function FrontendPlusReactRoutes({ myRoutes, myUnloggedRoutes, layout: Layout = MainLayout_default, unloggedLayout: UnloggedLayout }) {
   return /* @__PURE__ */ jsxs18(Routes, { children: [
-    /* @__PURE__ */ jsx28(Route, { path: "/login", element: /* @__PURE__ */ jsx28(LoginPage_default, {}) }),
-    /* @__PURE__ */ jsx28(Route, { path: "/logout", element: /* @__PURE__ */ jsx28(LogoutPage_default, {}) }),
+    /* @__PURE__ */ jsxs18(Route, { element: UnloggedLayout ? /* @__PURE__ */ jsx28(UnloggedLayout, {}) : /* @__PURE__ */ jsx28(Outlet2, {}), children: [
+      /* @__PURE__ */ jsx28(Route, { path: "/login", element: /* @__PURE__ */ jsx28(LoginPage_default, {}) }),
+      /* @__PURE__ */ jsx28(Route, { path: "/logout", element: /* @__PURE__ */ jsx28(LogoutPage_default, {}) }),
+      myUnloggedRoutes
+    ] }),
     /* @__PURE__ */ jsxs18(Route, { element: /* @__PURE__ */ jsxs18(PrivateRoute_default, { children: [
       /* @__PURE__ */ jsx28(InitialRedirectHandler_default, {}),
       /* @__PURE__ */ jsx28(Layout, {})
@@ -3864,12 +3904,12 @@ function FrontendPlusReactRoutes({ myRoutes, layout: Layout = MainLayout_default
         Route,
         {
           path: `/wScreens/${screenName}`,
-          element: React11.createElement(
+          element: React12.createElement(
             Box20,
             {
               sx: { pt: 3, pl: 4 }
             },
-            React11.createElement(wScreens[screenName], { screenName })
+            React12.createElement(wScreens[screenName], { screenName })
           )
         },
         screenName
@@ -3881,17 +3921,17 @@ function FrontendPlusReactRoutes({ myRoutes, layout: Layout = MainLayout_default
           element: /* @__PURE__ */ jsx28(Box20, { sx: { p: 3 }, children: /* @__PURE__ */ jsx28(FallbackWScreen, { screenName: ":screenName" }) })
         }
       ),
+      myRoutes,
       /* @__PURE__ */ jsx28(Route, { path: "*", element: /* @__PURE__ */ jsx28("div", { style: { marginTop: "20px", marginLeft: "10px" }, children: "404 - Recurso No Encontrado" }) })
     ] }),
-    myRoutes,
     /* @__PURE__ */ jsx28(Route, { path: "*", element: /* @__PURE__ */ jsx28(Navigate2, { to: "/", replace: true }) })
   ] });
 }
-var FrontendPlusProviders = ({ children }) => {
+var FrontendPlusProviders = ({ children, publicPaths }) => {
   return /* @__PURE__ */ jsx28(Provider, { store, children: /* @__PURE__ */ jsx28(PersistGate, { loading: null, persistor, children: /* @__PURE__ */ jsxs18(BrowserRouter, { children: [
     /* @__PURE__ */ jsx28(LocationTracker, {}),
     " ",
-    /* @__PURE__ */ jsx28(AppProvider, { children: /* @__PURE__ */ jsxs18(SnackbarProvider, { children: [
+    /* @__PURE__ */ jsx28(AppProvider, { publicPaths, children: /* @__PURE__ */ jsxs18(SnackbarProvider, { children: [
       children,
       /* @__PURE__ */ jsx28(SessionExpiredMessage_default, {})
     ] }) })
@@ -3899,6 +3939,8 @@ var FrontendPlusProviders = ({ children }) => {
 };
 var App = ({
   myRoutes,
+  myUnloggedRoutes,
+  unloggedLayout,
   myWScreens,
   myClientSides,
   myResultsOk
@@ -3914,7 +3956,18 @@ var App = ({
       extendWScreens(myWScreens);
     }
   }, [myClientSides, myResultsOk, myWScreens]);
-  return /* @__PURE__ */ jsx28(FrontendPlusProviders, { children: /* @__PURE__ */ jsx28(FrontendPlusReactRoutes, { myRoutes }) });
+  const safePaths = React12.useMemo(() => {
+    const extracted = extractPathsFromRoutes(myUnloggedRoutes);
+    return ["/login", "/logout", ...extracted];
+  }, [myUnloggedRoutes]);
+  return /* @__PURE__ */ jsx28(FrontendPlusProviders, { publicPaths: safePaths, children: /* @__PURE__ */ jsx28(
+    FrontendPlusReactRoutes,
+    {
+      myRoutes,
+      myUnloggedRoutes,
+      unloggedLayout
+    }
+  ) });
 };
 var App_default = App;
 export {
@@ -3931,6 +3984,7 @@ export {
   extendClientSides,
   extendResultsOk,
   extendWScreens,
+  extractPathsFromRoutes,
   resultsOk as resultComponents,
   useApiCall,
   useApiCallWithoutSnackbar,