@asaleh37/ui-base 1.1.6 → 1.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asaleh37/ui-base",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "",
   "license": "ISC",
   "author": "Ahmed Saleh Mohamed",

package/src/components/App.tsx

@@ -10,7 +10,6 @@ import { AppInfo, AppInfoActions } from "../redux/features/common/AppInfoSlice";
 
 const App: React.FC<AppInfo> = (props: AppInfo) => {
   const dispatch = useDispatch();
-  console.log("App Info", props);
   const AppLayoutState = useSelector((state: RootState) => state.AppLayout);
   let themeOptions = { ...LightThemeOptions };
   if (AppLayoutState.themeMode === "dark") {
@@ -26,7 +25,7 @@ const App: React.FC<AppInfo> = (props: AppInfo) => {
   }, []);
   return (
     <ThemeProvider theme={theme}>
-      {props?.apiBaseUrl ? <Layout /> : <>No Info Yet</>}
+      <Layout />
     </ThemeProvider>
   );
 };

package/src/components/BaseApp.tsx

@@ -1,5 +1,5 @@
 import { Provider } from "react-redux";
-import { store } from "../redux/store";
+import { addReducer, store } from "../redux/store";
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { fab } from "@fortawesome/free-brands-svg-icons";
 import { far } from "@fortawesome/free-regular-svg-icons";
@@ -13,12 +13,29 @@ LicenseInfo.setLicenseKey(
 import "react-toastify/dist/ReactToastify.css";
 import App from "./App";
 import { AppInfo } from "../redux/features/common/AppInfoSlice";
+import { commonStoresInitialState } from "../redux/features/common/CommonStoreSlice";
 
 library.add(fab);
 library.add(far);
 library.add(fas);
 
 export const BaseApp: React.FC<AppInfo> = (props) => {
+  if (props?.businessCommonStoresMetaData) {
+    for (let businessStoreKey of Object.keys(
+      props.businessCommonStoresMetaData
+    )) {
+      commonStoresInitialState[businessStoreKey] =
+        props.businessCommonStoresMetaData[businessStoreKey];
+    }
+  }
+  if (props?.businessReduxReducers) {
+    for (let businessReducerKey of Object.keys(props.businessReduxReducers)) {
+      addReducer(
+        businessReducerKey,
+        props.businessReduxReducers[businessReducerKey]
+      );
+    }
+  }
   return (
     <Provider store={store}>
       <App {...props} />

package/src/components/common/Login.tsx

@@ -36,8 +36,6 @@ const Login: React.FC = () => {
     }
     setIsLoginInProcess(true);
     let response: any = null;
-    console.log("login appinfo", appInfo);
-    debugger;
     try {
       response = await axios.post(
         `${appInfo.apiBaseUrl}/api/auth/login`,
@@ -71,32 +69,34 @@ const Login: React.FC = () => {
   );
   const loginTheme = createTheme(DarkThemeOptions);
   const checkUserSession = async () => {
-    if (userSession.isAuthenticated == null) {
-      try {
-        let response = await axios.get(
-          `${appInfo.apiBaseUrl}/api/auth/userInfo`,
-          {
-            withCredentials: true,
+    if (appInfo?.apiBaseUrl) {
+      if (userSession.isAuthenticated == null) {
+        try {
+          let response = await axios.get(
+            `${appInfo.apiBaseUrl}/api/auth/userInfo`,
+            {
+              withCredentials: true,
+            }
+          );
+          if (response != null && response.data != null) {
+            const UserSession = {
+              isAuthenticated: true,
+              authorities: response.data.authorities,
+              userProfile: response.data,
+            };
+            dispatch(UserSessionActions.setAuthenticated(UserSession));
+          } else {
+            dispatch(UserSessionActions.setUnAuthenticated());
           }
-        );
-        if (response != null && response.data != null) {
-          const UserSession = {
-            isAuthenticated: true,
-            authorities: response.data.authorities,
-            userProfile: response.data,
-          };
-          dispatch(UserSessionActions.setAuthenticated(UserSession));
-        } else {
+        } catch (error) {
           dispatch(UserSessionActions.setUnAuthenticated());
         }
-      } catch (error) {
-        dispatch(UserSessionActions.setUnAuthenticated());
       }
     }
   };
   useEffect(() => {
     checkUserSession();
-  }, []);
+  }, [appInfo]);
   return (
     <ThemeProvider theme={loginTheme}>
       <Paper

package/src/components/index.ts

@@ -4,3 +4,4 @@ export * from "zod";
 export { toast } from "react-toastify";
 export { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 export type { FontAwesomeIconProps } from "@fortawesome/react-fontawesome";
+export * from "./templates";

package/src/components/templates/DataEntryTemplates/useApiActions.ts

@@ -1,8 +1,8 @@
 import { useDispatch, useSelector } from "react-redux";
 import { RootState } from "../../../redux/store";
-import { setStoreData } from "../../../redux/features/business/CommonStoreSlice";
 import useSession from "../../../hooks/UseSession";
 import useAxios from "../../../hooks/useAxios";
+import { setStoreData } from "../../../redux/features/common/CommonStoreSlice";
 
 export type ApiActionsProps = {
   findAll?: string;

package/src/components/templates/TransferList.tsx

@@ -23,7 +23,7 @@ function union(a, b) {
   return [...a, ...not(b, a)];
 }
 
-type TransferListProps = {
+export type TransferListProps = {
   valueField: string;
   displayField: string;
   options: Array<any>;

package/src/components/templates/index.ts

@@ -0,0 +1,19 @@
+export { default as TransferList } from "./TransferList";
+export { default as TemplateDashboard } from "./visuals/TemplateDashboard";
+export { default as TemplateBarChart } from "./visuals/charts/TemplateBarChart";
+export { default as TemplateDataCard } from "./visuals/charts/TemplateDataCard";
+export { default as TemplateGauge } from "./visuals/charts/TemplateGauge";
+export { default as TemplateLineChart } from "./visuals/charts/TemplateLineChart";
+export { default as TemplateLineProgress } from "./visuals/charts/TemplateLineProgress";
+export { default as TemplatePieChart } from "./visuals/charts/TemplatePieChart";
+export { default as CheckBox } from "./DataEntryTemplates/TemplateDataForm/FormFields/CheckBox";
+export { default as ComboBox } from "./DataEntryTemplates/TemplateDataForm/FormFields/ComboBox";
+export { default as Datefield } from "./DataEntryTemplates/TemplateDataForm/FormFields/Datefield";
+export { default as DatetimeField } from "./DataEntryTemplates/TemplateDataForm/FormFields/DatetimeField";
+export { default as TemplateTextField } from "./DataEntryTemplates/TemplateDataForm/FormFields/TemplateTextField";
+export { default as TemplateForm } from "./DataEntryTemplates/TemplateDataForm/TemplateForm";
+export { default as TemplateGrid } from "./DataEntryTemplates/TemplateDataGrid/TemplateGrid";
+
+export type * from "./DataEntryTemplates/DataEntryTypes";
+export type { DashboardProps } from "./visuals/TemplateDashboard";
+export type { TransferListProps } from "./TransferList";

package/src/components/templates/visuals/TemplateDashboard.tsx

@@ -27,7 +27,7 @@ export interface SingleRecordWidgetProps {
   labelField: string;
 }
 
-interface DashboardProps {
+export interface DashboardProps {
   dashboardTitle: string;
   dashboardWidgets: Array<WidgetProps>;
 }

package/src/hooks/index.ts

@@ -0,0 +1,6 @@
+export { default as useAxios } from "./useAxios";
+export { useConfirmationWindow } from "./UseConfirmationWindow";
+export { default as useLoadingMask } from "./useLoadingMask";
+export { useIsMobile } from "./UseMobile";
+export { default as useSession } from "./UseSession";
+export { useWindow } from "./UseWindow";

package/src/index.ts

@@ -1,3 +1,3 @@
-// export { default as MyComponent1 } from "./MyComponent1";
-// export type { MyComponent1Props } from "./MyComponent1";
 export * from "./components";
+export * from "./hooks";
+export * from "./util";

package/src/layout/Layout.tsx

@@ -14,12 +14,11 @@ import useLoadingMask from "../hooks/useLoadingMask";
 import { useIsMobile } from "../hooks/UseMobile";
 import useSession from "../hooks/UseSession";
 import useAxios from "../hooks/useAxios";
-import { setStoreData } from "../redux/features/business/CommonStoreSlice";
 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";
 
 const Main = styled("main", {
   shouldForwardProp: (prop) => prop !== "open",
@@ -104,7 +103,7 @@ export default function Layout() {
   return (
     <BrowserRouter>
       <ToastContainer draggable={true} position="bottom-center" />
-      <LoadingMask />      
+      <LoadingMask />
       {UserSession.value.isAuthenticated === true ? (
         <Main open={AppLayoutState.sideBarOpened}>
           <CssBaseline />

package/src/layout/MainContent.tsx

@@ -9,6 +9,9 @@ import { SystemRoute } from "../routes/types";
 
 const MainContent: React.FC = () => {
   const AppLayoutState = useSelector((state: RootState) => state.AppLayout);
+  const businessRoutes = useSelector(
+    (state: RootState) => state.AppInfo.value.businessRoutes
+  );
   return (
     <CacheProvider
       value={AppLayoutState.appDirection === "ltr" ? cacheLtr : cacheRtl}
@@ -19,7 +22,7 @@ const MainContent: React.FC = () => {
           flexDirection: "column",
           // alignItems: "center",
           justifyContent: "flex-start",
-          flex: 1,          
+          flex: 1,
           overflow: "hidden",
           padding: 3,
         }}
@@ -28,7 +31,16 @@ const MainContent: React.FC = () => {
           {SYSTEM_ROUTES.map((route: SystemRoute, index) => {
             return (
               <Route
-                key={index}
+                key={"adm" + index}
+                path={route.path}
+                Component={route.component}
+              />
+            );
+          })}
+          {businessRoutes.map((route: SystemRoute, index) => {
+            return (
+              <Route
+                key={"bs" + index}
                 path={route.path}
                 Component={route.component}
               />

package/src/layout/NavigationTree.tsx

@@ -232,6 +232,9 @@ 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 dispatch = useDispatch();
   const isMobile = useIsMobile();
   const { isUserAuthorized } = useSession();
@@ -251,7 +254,12 @@ export default function NavigationTree() {
       });
   };
 
-  const authoriedNavigationItems = filterData(NavigationItems);
+  const mergedNavigationItems = [
+    ...NavigationItems,
+    ...businessNavigationItems,
+  ];
+
+  const authoriedNavigationItems = filterData(mergedNavigationItems);
 
   return (
     <RichTreeView

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

@@ -1,4 +1,4 @@
-import { CommonStoresInterface } from "../business/CommonStoreSlice";
+import { CommonStoresInterface } from "../common/CommonStoreSlice";
 
 export const ADMINISTRATION_STORES: CommonStoresInterface = {
   SystemDataSourceType: {

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

@@ -1,4 +1,7 @@
-import { createSlice } from "@reduxjs/toolkit";
+import { createSlice, Reducer } from "@reduxjs/toolkit";
+import { SystemRoute } from "../../../routes/types";
+import { ExtendedTreeItemProps } from "../../../navigationItems";
+import { StoreMetaData } from "./CommonStoreSlice";
 
 export type AppInfo = {
   documentTitle: string | null;
@@ -6,6 +9,10 @@ export type AppInfo = {
   appName: string | null;
   appVersion: string | null;
   appLogo: any | null;
+  businessRoutes: Array<SystemRoute>;
+  businessNavigationItems: Array<ExtendedTreeItemProps>;
+  businessReduxReducers: { [key: string]: Reducer<any> };
+  businessCommonStoresMetaData: { [key: string]: StoreMetaData };
 };
 
 export type AppInfoProp = {
@@ -19,6 +26,10 @@ const initialState: AppInfoProp = {
     appName: null,
     appVersion: null,
     appLogo: null,
+    businessRoutes: [],
+    businessNavigationItems: [],
+    businessReduxReducers: {},
+    businessCommonStoresMetaData: {},
   },
 };
 

package/src/redux/features/{business → common}/CommonStoreSlice.ts

@@ -1,5 +1,4 @@
 import { createSlice, PayloadAction } from "@reduxjs/toolkit";
-import { BUSINESS_STORES } from "./BusinessStoresMetaData";
 import { ADMINISTRATION_STORES } from "../administration/AdministrationStoresMetaData";
 
 export interface CommonStoresInterface {
@@ -18,14 +17,13 @@ export interface StoreMetaData {
   authority?: string;
 }
 
-const initialState: CommonStoresInterface = {
-  ...BUSINESS_STORES,
+export const commonStoresInitialState: CommonStoresInterface = {
   ...ADMINISTRATION_STORES,
 };
 
 const commonStoreSlice = createSlice({
   name: "loadingMask",
-  initialState,
+  initialState: commonStoresInitialState,
   reducers: {
     setStoreData(state, action: PayloadAction<setStoreDataProps>) {
       state[action.payload.storeKey].data = action.payload.data;

package/src/redux/store.ts

@@ -1,18 +1,26 @@
-import { configureStore } from "@reduxjs/toolkit";
+import { configureStore, Reducer } from "@reduxjs/toolkit";
 import AppLayoutReducer from "./features/common/AppLayoutSlice";
 import UserSessionReducer from "./features/common/UserSessionSlice";
 import LoadingMaskReducer from "./features/common/LoadingMaskSlice";
-import CommonStoreReducer from "./features/business/CommonStoreSlice";
+import CommonStoreReducer from "./features/common/CommonStoreSlice";
 import AppInfoReducer from "./features/common/AppInfoSlice";
 
+const reducers = {
+  AppLayout: AppLayoutReducer,
+  UserSession: UserSessionReducer,
+  loadingMask: LoadingMaskReducer,
+  commonStores: CommonStoreReducer,
+  AppInfo: AppInfoReducer,
+};
+
+export function addReducer(key: string, reducer: Reducer<any>) {
+  if (!reducers[key]) {
+    reducers[key] = reducer;
+  }
+}
+
 export const store = configureStore({
-  reducer: {
-    AppLayout: AppLayoutReducer,
-    UserSession: UserSessionReducer,
-    loadingMask: LoadingMaskReducer,
-    commonStores: CommonStoreReducer,
-    AppInfo: AppInfoReducer,
-  },
+  reducer: reducers,
 });
 
 // Infer the `RootState` and `AppDispatch` types from the store itself

package/src/util/index.ts

@@ -0,0 +1,2 @@
+export * from "./AppUtils";
+export * from "./constants";

package/src/redux/features/business/BusinessStoresMetaData.ts

@@ -1,3 +0,0 @@
-import { CommonStoresInterface } from "./CommonStoreSlice";
-
-export const BUSINESS_STORES: CommonStoresInterface = {};