@asaleh37/ui-base 25.8.10-4 → 25.8.10-7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asaleh37/ui-base",
-  "version": "25.8.10-4",
+  "version": "25.8.10-7",
   "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/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} />
+      <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/layout/Layout.tsx

@@ -8,17 +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 { useIsMobile } from "../hooks/UseMobile";
-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 {
-  AppInfo,
-  LicenseCheckObject,
-} from "../redux/features/common/AppInfoSlice";
+import NoLicenseComponent from "../components/common/NoLicenseComponent";
 
 const Main = styled("main", {
   shouldForwardProp: (prop) => prop !== "open",
@@ -60,40 +55,12 @@ const Main = styled("main", {
 
 export default function Layout() {
   const SideBarState = useSelector((state: any) => state.SideBar);
-  const [licenseCheckObj, setLicenseCheckObject] = useState<LicenseCheckObject>(
-    { isLicensed: true, lastLicenseCheckMessage: "", lastLicenseCheckTime: "" }
-  );
+
   const isMobile = useIsMobile();
-  const { handleGetRequest } = useAxios();
   const UserSession: UserSessionProps = useSelector(
     (state: any) => state.UserSession
   );
-  const appInfo: AppInfo = useSelector((state: any) => state.AppInfo.value);
   const AppLayout = useSelector((state: any) => state.AppLayout);
-  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");
-      };
-    }
-  }, []);
-
   return (
     <BrowserRouter>
       <ToastContainer
@@ -103,18 +70,16 @@ export default function Layout() {
       />
       <LoadingMask />
       {UserSession.value.isAuthenticated === true ? (
-        licenseCheckObj?.isLicensed ? (
-          <Main open={SideBarState.isOpened}>
-            <CssBaseline />
-            <TopBar />
-            {!isMobile ? <SideBar /> : null}
-            {isMobile ? <MobileDrawer /> : null}
-            <DrawerHeader />
-            <MainContent />
-          </Main>
-        ) : (
-          <>Your licsense has been expired</>
-        )
+        // licenseCheckObj?.isLicensed ? (
+        <Main open={SideBarState.isOpened}>
+          <CssBaseline />
+          <TopBar />
+          {!isMobile ? <SideBar /> : null}
+          {isMobile ? <MobileDrawer /> : null}
+          <DrawerHeader />
+          <MainContent />
+          <NoLicenseComponent />
+        </Main>
       ) : (
         <Login />
       )}

package/src/main.tsx

@@ -1,7 +1,6 @@
 import { createRoot } from "react-dom/client";
 import { BaseApp } from "./components";
 
-
 createRoot(document.getElementById("root")!).render(
   <BaseApp
     apiBaseUrl="http://localhost:8080/api-base"