@campxdev/campx-web-utils 0.3.6 → 0.3.8

package/package.json

@@ -1,19 +1,20 @@
 {
   "name": "@campxdev/campx-web-utils",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "main": "./export.ts",
   "private": false,
   "peerDependencies": {
-    "@campxdev/react-blueprint": ">=^1.5.8",
+    "@campxdev/react-blueprint": ">=^1.5.9",
     "@emotion/react": ">=^11.13.3",
     "@emotion/styled": ">=^11.13.0",
     "@mui/icons-material": ">=6.1.5",
     "@mui/material": ">=6.1.5",
     "@mui/x-data-grid": ">=7.22.1",
-    "@mui/x-date-pickers": ">=7.22.1"
+    "@mui/x-date-pickers": ">=7.22.1",
+    "react-redux":"=>9.1.2"
   },
   "dependencies": {
-    "@campxdev/react-blueprint": "1.5.8",
+    "@campxdev/react-blueprint": "1.5.9",
     "@hookform/resolvers": "^3.9.0",
     "@mui/x-date-pickers": "^7.22.1",
     "axios": "^1.7.2",
@@ -26,6 +27,7 @@
     "react-dom": "^18.3.1",
     "react-hook-form": "^7.52.1",
     "react-query": "^3.39.3",
+    "react-redux": "^9.1.2",
     "react-scripts": "5.0.1",
     "react-toastify": "^9.0.1",
     "typescript": "^5.5.2",
@@ -36,23 +38,23 @@
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@craco/craco": "^7.1.0",
+    "@testing-library/jest-dom": "^5.14.1",
+    "@testing-library/react": "^13.0.0",
+    "@testing-library/user-event": "^13.2.1",
     "@types/babel__core": "^7.20.5",
     "@types/babel__generator": "^7.6.8",
     "@types/babel__template": "^7.4.4",
     "@types/babel__traverse": "^7.20.6",
     "@types/bonjour": "^3.5.13",
+    "@types/jest": "^27.0.1",
     "@types/js-cookie": "^3.0.2",
     "@types/lodash": "^4.17.5",
+    "@types/node": "^16.7.13",
     "@types/prettier": "^3.0.0",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "@types/react-query": "^1.2.9",
-    "@types/react-router-dom": "^5.3.3",
-    "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^13.0.0",
-    "@testing-library/user-event": "^13.2.1",
-    "@types/jest": "^27.0.1",
-    "@types/node": "^16.7.13"
+    "@types/react-router-dom": "^5.3.3"
   },
   "scripts": {
     "start": "craco start",

package/src/AppContent.tsx

@@ -4,6 +4,7 @@ import { EmployeesSelector } from './selectors/EmployeesSelector';
 
 function AppContent() {
   const [value, setValue] = useState('63b810ee995d6d64f4a248de');
+
   return (
     <>
       <Button variant="contained" onClick={() => {}}>

package/src/context/Providers.tsx

@@ -1,9 +1,10 @@
-import { lightTheme, MuiThemeProvider } from '@campxdev/react-blueprint';
+import { lightTheme, MuiThemeProvider, store } from '@campxdev/react-blueprint';
 import { LocalizationProvider } from '@mui/x-date-pickers';
 import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFnsV3';
 import Cookies from 'js-cookie';
 import { ReactNode, useEffect } from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
+import { Provider } from 'react-redux';
 import { BrowserRouter } from 'react-router-dom';
 import { ConfirmDialogProvider } from './ConfirmDialogProvider';
 import { SnackbarProvider } from './SnackbarProvider';
@@ -43,16 +44,18 @@ export const Providers = ({
   }, [institutionCode, tenantCode]);
 
   return (
-    <BrowserRouter basename={basename ?? baseName}>
-      <QueryClientProvider client={queryClient}>
-        <MuiThemeProvider theme={theme}>
-          <SnackbarProvider>
-            <LocalizationProvider dateAdapter={AdapterDateFns}>
-              <ConfirmDialogProvider>{children}</ConfirmDialogProvider>
-            </LocalizationProvider>
-          </SnackbarProvider>
-        </MuiThemeProvider>
-      </QueryClientProvider>
-    </BrowserRouter>
+    <Provider store={store}>
+      <BrowserRouter basename={basename ?? baseName}>
+        <QueryClientProvider client={queryClient}>
+          <MuiThemeProvider theme={theme}>
+            <SnackbarProvider>
+              <LocalizationProvider dateAdapter={AdapterDateFns}>
+                <ConfirmDialogProvider>{children}</ConfirmDialogProvider>
+              </LocalizationProvider>
+            </SnackbarProvider>
+          </MuiThemeProvider>
+        </QueryClientProvider>
+      </BrowserRouter>
+    </Provider>
   );
 };

package/src/layout/AppLayout.tsx

@@ -5,13 +5,15 @@ import { motion } from 'framer-motion';
 import Cookies from 'js-cookie';
 import { Suspense, useState } from 'react';
 import { axios } from '../config/axios';
-import { ApplicationStore, ErrorBoundary } from '../context/export';
+import { ErrorBoundary } from '../context/export';
 
 interface Props {
   children?: React.ReactNode;
   menu: SideMenuItemProps[];
   mainContainerSx?: any;
   handleLogout?: any;
+  userName?: string;
+  designation?: string;
 }
 
 export const AppLayout: React.FC<Props> = ({
@@ -19,12 +21,12 @@ export const AppLayout: React.FC<Props> = ({
   menu,
   mainContainerSx,
   handleLogout,
+  userName = '',
+  designation = '',
 }) => {
   const [collapsed, setCollapsed] = useState(true);
   const theme = useTheme();
 
-  const user = ApplicationStore.useState((s) => s.user);
-
   function logout() {
     axios
       .post('/auth-server/auth/logout')
@@ -62,8 +64,8 @@ export const AppLayout: React.FC<Props> = ({
             showActiveDevices={false}
             onLogoutClick={handleLogout ?? logout}
             clientName={''}
-            userFullName={user ? user?.fullName : ''}
-            designation={user?.email}
+            userFullName={userName}
+            designation={designation}
           />
           <Box
             sx={{