@asaleh37/ui-base 1.1.9 → 1.2.1

package/src/layout/NavigationTree.tsx

@@ -232,9 +232,7 @@ const CustomTreeItem = React.forwardRef(function CustomTreeItem(
 export default function NavigationTree() {
   const navigate = useNavigate();
   const appLayoutState = useSelector((state: RootState) => state.AppLayout);
-  const businessNavigationItems = useSelector(
-    (state: RootState) => state.AppInfo.value.businessNavigationItems
-  );
+  const AppInfo = useSelector((state: RootState) => state.AppInfo.value);
   const dispatch = useDispatch();
   const isMobile = useIsMobile();
   const { isUserAuthorized } = useSession();
@@ -254,18 +252,21 @@ export default function NavigationTree() {
       });
   };
 
-  const mergedNavigationItems = [
-    ...NavigationItems,
-    ...businessNavigationItems,
-  ];
-
+  const mergedNavigationItems = [];
+  if (AppInfo.enableAdministrationModule) {
+    mergedNavigationItems.push(...NavigationItems);
+  }
+  mergedNavigationItems.push(...AppInfo.businessNavigationItems);
   const authoriedNavigationItems = filterData(mergedNavigationItems);
 
   return (
     <RichTreeView
       items={authoriedNavigationItems}
       onItemClick={(event, itemId) => {
-        const navigationItem = findNavigationItemById(itemId, NavigationItems);
+        const navigationItem = findNavigationItemById(
+          itemId,
+          mergedNavigationItems
+        );
         if (
           navigationItem?.action === "NAVIGATION" &&
           navigationItem?.actionPayload != null &&

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

@@ -14,6 +14,11 @@ export type AppInfo = {
   businessReduxReducers: { [key: string]: Reducer<any> };
   businessCommonStoresMetaData: { [key: string]: StoreMetaData };
   muiPremiumKey: string;
+  enableAdministrationModule: boolean;
+  appTheme: {
+    light: { primaryColor: string; secondaryColor: string };
+    dark: { primaryColor: string; secondaryColor: string };
+  };
 };
 
 export type AppInfoProp = {
@@ -28,10 +33,15 @@ const initialState: AppInfoProp = {
     appVersion: null,
     appLogo: null,
     muiPremiumKey: null,
+    enableAdministrationModule: false,
     businessRoutes: [],
     businessNavigationItems: [],
     businessReduxReducers: {},
     businessCommonStoresMetaData: {},
+    appTheme: {
+      light: { primaryColor: "#37505C", secondaryColor: "#ff6d00" },
+      dark: { primaryColor: "#ea690e", secondaryColor: "#74776B" },
+    },
   },
 };
 

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

@@ -1,5 +1,4 @@
 import { createSlice, PayloadAction } from "@reduxjs/toolkit";
-import { ADMINISTRATION_STORES } from "../administration/AdministrationStoresMetaData";
 
 export interface CommonStoresInterface {
   [key: string]: StoreMetaData;
@@ -17,9 +16,7 @@ export interface StoreMetaData {
   authority?: string;
 }
 
-export const commonStoresInitialState: CommonStoresInterface = {
-  ...ADMINISTRATION_STORES,
-};
+export const commonStoresInitialState: CommonStoresInterface = {};
 
 const commonStoreSlice = createSlice({
   name: "loadingMask",

package/src/theme/DarkThemeOptions.ts

@@ -1,30 +0,0 @@
-import { ThemeOptions } from "@mui/material";
-
-export const DarkThemeOptions: ThemeOptions = {
-  components: {
-    MuiCssBaseline: {
-      styleOverrides: `
-      /* Custom Scrollbar */
-      * {
-        scrollbar-width: thin;
-        scrollbar-color: #ea690e #121212;
-      }
-
-      /* Webkit Browsers */
-      *::-webkit-scrollbar {
-        width: 12px;
-        height: 10px;
-      }   
-    `,
-    },
-  },
-  palette: {
-    mode: "dark",
-    primary: {
-      main: "#ea690e",
-    },
-    secondary: {
-      main: "#74776B",
-    },
-  },
-};

package/src/theme/LightThemeOptions.ts

@@ -1,34 +0,0 @@
-import { ThemeOptions } from "@mui/material";
-
-export const LightThemeOptions: ThemeOptions = {
-  components: {
-    MuiCssBaseline: {
-      styleOverrides: `
-      /* Custom Scrollbar */
-      * {
-        scrollbar-width: thin;
-        scrollbar-color: #37505C #ffffff;
-      }
-
-      /* Webkit Browsers */
-      *::-webkit-scrollbar {
-        width: 12px;
-        height: 10px;
-      }   
-    `,
-    },
-  },
-  palette: {
-    mode: "light",
-    primary: {
-      main: "#37505C",
-    },
-    secondary: {
-      main: "#ff6d00",
-    },
-    background: {
-      default: "#f5f5f5",
-      paper: "#f5f5f5",
-    },
-  },
-};