@asaleh37/ui-base 25.8.10 → 25.8.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asaleh37/ui-base",
-  "version": "25.8.10",
+  "version": "25.8.15",
   "description": "",
   "license": "ISC",
   "author": "Ahmed Saleh Mohamed",
@@ -113,7 +113,7 @@
     "stylis-plugin-rtl": "^2.1.1",
     "zod": "^3.24.2"
   },
-  "dependencies": {
+  "dependencies": {    
     "@rollup/plugin-json": "^6.1.0",
     "rollup-plugin-terser": "^7.0.2"
   }

package/src/components/common/Login.tsx

@@ -126,6 +126,13 @@ const Login: React.FC = () => {
   useEffect(() => {
     checkUserSession();
   }, [appInfo]);
+
+  useEffect(() => {
+    if (userSession.isAuthenticated === null) {
+      console.log("checking usersession on reload", userSession);
+      checkUserSession();
+    }
+  }, [userSession.isAuthenticated]);
   return (
     <ThemeProvider theme={loginTheme}>
       <Paper

package/src/components/common/NoLicenseComponent.tsx

@@ -0,0 +1,79 @@
+import { Box, Typography } from "@mui/material";
+import {
+  AppInfo,
+  LicenseCheckObject,
+} from "../../redux/features/common/AppInfoSlice";
+import { useSelector } from "react-redux";
+import { useEffect, useState } from "react";
+import { useAxios } from "../../hooks";
+
+const NoLicenseComponent: React.FC = () => {
+  const [licenseCheckObj, setLicenseCheckObject] = useState<LicenseCheckObject>(
+    { isLicensed: true, lastLicenseCheckMessage: "", lastLicenseCheckTime: "" }
+  );
+  const { handleGetRequest } = useAxios();
+  const appInfo: AppInfo = useSelector((state: any) => state.AppInfo.value);
+  const checkSystemLicense = async () => {
+    if (appInfo?.checkLicense?.endpoint) {
+      await handleGetRequest({
+        endPointURI: appInfo.checkLicense?.endpoint,
+        successCallBkFn: (response) => {
+          setLicenseCheckObject(response.data);
+        },
+      });
+    }
+  };
+
+  useEffect(() => {
+    if (appInfo?.checkLicense?.endpoint) {
+      const interval = appInfo?.checkLicense?.interval || 60000;
+      const intervalId = setInterval(() => {
+        checkSystemLicense();
+      }, interval);
+      return () => {
+        clearInterval(intervalId);
+        console.log("Interval cleared");
+      };
+    }
+  }, [appInfo]);
+  return !licenseCheckObj.isLicensed ? (
+    <Box
+      sx={{
+        flex: 1,
+        width: "100%",
+        height: "100%",
+        display: "flex",
+        flexDirection: "column",
+        alignItems: "center",
+        justifyContent: "center",
+        position: "fixed",
+        top: 0,
+        background: "rgba(235, 235, 235, 0.8)",
+        left: 0,
+        zIndex: 9999,
+      }}
+    >
+      <img src={appInfo.appLogo} style={{ height: 200, width: 200 }} />
+      <Typography variant="h5">
+        {appInfo.appName} - {appInfo.appVersion}
+      </Typography>
+      <Typography variant="h6" color="error">
+        Your license is missing or has expired.
+      </Typography>
+      <Typography variant="h6" color="error">
+        Please reach out to your vendor for assistance.
+      </Typography>
+      <Typography>
+        License Check @{licenseCheckObj?.lastLicenseCheckTime || "--------"}
+      </Typography>
+      <Typography>
+        License Check Result :{" "}
+        {licenseCheckObj?.lastLicenseCheckMessage || "--------"}
+      </Typography>
+    </Box>
+  ) : (
+    <></>
+  );
+};
+
+export default NoLicenseComponent;

package/src/hooks/useAxios.tsx

@@ -57,6 +57,19 @@ const useAxios = () => {
         toast.error("your session is now expired, you need to login again", {
           autoClose: false,
         });
+      } else if (
+        error
+          ? error.response
+            ? error.response.status
+              ? error.response.status === 402
+              : false
+            : false
+          : false
+      ) {
+        dispatch(UserSessionActions.setUnAuthenticated());
+        toast.error(
+          "Your license is missing or has expired,Please reach out to your vendor for assistance."
+        );
       } else if (
         error
           ? error.response

package/src/layout/Layout.tsx

@@ -8,16 +8,12 @@ import MainContent from "./MainContent";
 import { BrowserRouter } from "react-router-dom";
 import MobileDrawer from "./MobileDrawer";
 import { ToastContainer } from "react-toastify";
-import { useEffect, useState } from "react";
-import useLoadingMask from "../hooks/useLoadingMask";
 import { useIsMobile } from "../hooks/UseMobile";
-import useSession from "../hooks/UseSession";
-import useAxios from "../hooks/useAxios";
 import { DRAWER_WIDTH } from "../redux/features/common/AppLayoutSlice";
 import { UserSessionProps } from "../redux/features/common/UserSessionSlice";
 import LoadingMask from "../components/common/LoadingMask";
 import Login from "../components/common/Login";
-import { setStoreData } from "../redux/features/common/CommonStoreSlice";
+import NoLicenseComponent from "../components/common/NoLicenseComponent";
 
 const Main = styled("main", {
   shouldForwardProp: (prop) => prop !== "open",
@@ -59,12 +55,12 @@ const Main = styled("main", {
 
 export default function Layout() {
   const SideBarState = useSelector((state: any) => state.SideBar);
+
   const isMobile = useIsMobile();
   const UserSession: UserSessionProps = useSelector(
     (state: any) => state.UserSession
   );
   const AppLayout = useSelector((state: any) => state.AppLayout);
-
   return (
     <BrowserRouter>
       <ToastContainer
@@ -74,6 +70,7 @@ export default function Layout() {
       />
       <LoadingMask />
       {UserSession.value.isAuthenticated === true ? (
+        // licenseCheckObj?.isLicensed ? (
         <Main open={SideBarState.isOpened}>
           <CssBaseline />
           <TopBar />
@@ -81,6 +78,7 @@ export default function Layout() {
           {isMobile ? <MobileDrawer /> : null}
           <DrawerHeader />
           <MainContent />
+          <NoLicenseComponent />
         </Main>
       ) : (
         <Login />

package/src/main.tsx

@@ -1,10 +1,10 @@
 import { createRoot } from "react-dom/client";
 import { BaseApp } from "./components";
 
-
 createRoot(document.getElementById("root")!).render(
   <BaseApp
     apiBaseUrl="http://localhost:8080/api-base"
+    enableUINotifications={false}
     appLogo={"/logo.png"}
     appName="UI Base Library"
     appVersion="0.0"

package/src/navigationItems/Administration/adminNavigationItems.tsx

@@ -17,7 +17,7 @@ export const adminNavigationItems: TreeViewBaseItem<ExtendedTreeItemProps>[] = [
         actionPayload: { path: "admin/persons" },
       },
       {
-        id: "system_admin.devtools.roles",
+        id: "system_admin.devtools.rolesx",
         label: "ROLES",
         icon: "tag",
         action: "NAVIGATION",
@@ -200,7 +200,7 @@ export const adminNavigationItems: TreeViewBaseItem<ExtendedTreeItemProps>[] = [
       {
         id: "system_admin.followup",
         label: "SYSTEM_MONITORING",
-        authority: "SYSTEM_ADMIN",
+        authority: "DEVELOPMENT_ADMIN",
         icon: "tv",
         children: [
           {

package/src/redux/features/administration/AdministrationStoresMetaData.ts

@@ -130,19 +130,19 @@ export const ADMINISTRATION_STORES: CommonStores = {
   SystemApplicationModules: {
     autoLoad: true,
     data: [],
-    authority: "DEVELOPMENT_ADMIN",
+    authority: "SYSTEM_ADMIN",
     url: "api/v1/admin/systemapplicationmodule/application/all",
   },
   SystemApplicationAuthorities: {
     autoLoad: true,
     data: [],
-    authority: "DEVELOPMENT_ADMIN",
+    authority: "SYSTEM_ADMIN",
     url: "api/v1/admin/systemapplicationauthority/all",
   },
   SystemApplicationRoles: {
     autoLoad: true,
     data: [],
-    authority: "DEVELOPMENT_ADMIN",
+    authority: "SYSTEM_ADMIN",
     url: "api/v1/admin/systemapplicationrole/all",
   },
 };

package/src/redux/features/common/AppInfoSlice.ts

@@ -3,6 +3,12 @@ import { SystemRoute } from "../../../routes/types";
 import { ExtendedTreeItemProps } from "../../../navigationItems";
 import { StoreMetaData } from "./CommonStoreSlice";
 
+export type LicenseCheckObject = {
+  isLicensed: boolean;
+  lastLicenseCheckMessage: string;
+  lastLicenseCheckTime: string;
+};
+
 export type AppInfo = {
   documentTitle: string | null;
   apiBaseUrl: string | null;
@@ -24,6 +30,7 @@ export type AppInfo = {
     light: { primaryColor: string; secondaryColor: string };
     dark: { primaryColor: string; secondaryColor: string };
   };
+  checkLicense?: { endpoint: string; interval: number };
 };
 
 export type AppInfoProp = {

package/tsconfig.json

@@ -131,5 +131,5 @@
     "noEmit": true,
     "jsx": "react-jsx"
   },
-  "include": ["src"]
+  "include": ["src"] 
 }