fixed date filtering logic and added a Leaflet api to fetch location based on lat and long

Author: sumedhkumar96

config-overrides.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
 const webpack = require('webpack');
 
 module.exports = function override(config) {

package-lock.json

@@ -8,6 +8,8 @@
   },
   "private": true,
   "dependencies": {
+    "@ant-design/charts": "^2.6.4",
+    "@ant-design/icons": "^6.0.1",
     "@babel/runtime": "^7.27.6",
     "@babel/runtime-corejs3": "^7.27.6",
     "@changey/react-leaflet-markercluster": "^4.0.0-rc1",
@@ -32,7 +34,8 @@
     "@tinymce/tinymce-react": "^6.1.0",
     "ajv": "^8.0.0",
     "ajv-keywords": "^5.1.0",
-    "antd": "^5.27.4",
+    "ant-design": "^1.0.0",
+    "antd": "^5.27.6",
     "assert": "^2.1.0",
     "axios": "^1.11.0",
     "axios-mock-adapter": "^1.22.0",

package.json

@@ -171,13 +171,21 @@ body.bm-dashboard-dark .table {
 }
 
 body.dark-mode .table th,
-body.dark-mode .table td,
+body.dark-mode .table td {
+  color: #ffffff !important;
+  border-color: #3a506b;
+}
+
 body.bm-dashboard-dark .table th,
 body.bm-dashboard-dark .table td {
   color: #ffffff !important;
   border-color: #3a506b;
 }
 
+body.bm-dashboard-dark .table th{
+  background-color: #2e5061 !important;
+}
+
 body.dark-mode .table-striped > tbody > tr:nth-of-type(odd),
 body.bm-dashboard-dark .table-striped > tbody > tr:nth-of-type(odd) {
   background-color: rgba(46, 80, 97, 0.5);
@@ -234,10 +242,6 @@ body.bm-dashboard-dark .nav-link {
   color: #ffffff !important;
 }
 
-body.dark-mode .navbar,
-body.bm-dashboard-dark .navbar {
-  background-color: #1b2a41 !important;
-}
 
 body.dark-mode .navbar-brand,
 body.bm-dashboard-dark .navbar-brand {

public/index.css

@@ -13,7 +13,7 @@ import {
   setCurrentUser, // Import setCurrentUser action
   setHeaderData, // Import setHeaderData action
 } from '../authActions'; // Import actions from authActions
-import { SET_CURRENT_USER, SET_HEADER_DATA } from '../../constants/auth'; // Import constants
+import { SET_CURRENT_USER, SET_HEADER_DATA, STOP_FORCE_LOGOUT } from '../../constants/auth'; // Import constants
 
 
 const middlewares = [thunk]; // Define middlewares
@@ -35,7 +35,10 @@ describe('authActions', () => {
     httpService.post.mockResolvedValue({ data: { token } }); // Mock the httpService post method
     jwtDecode.mockReturnValue(decodedToken); // Mock the jwtDecode function
 
-    const expectedActions = [{ type: SET_CURRENT_USER, payload: decodedToken }]; // Define expected actions
+    const expectedActions = [
+      { type: STOP_FORCE_LOGOUT }, // Ensure any existing timers are cleared
+      { type: SET_CURRENT_USER, payload: decodedToken },
+    ]; // Define expected actions
 
     await store.dispatch(loginUser(credentials)); // Dispatch the loginUser action
     expect(store.getActions()).toEqual(expectedActions); // Assert the actions
@@ -68,7 +71,10 @@ describe('authActions', () => {
 
   it('creates SET_CURRENT_USER with null when logoutUser is called', () => {
     const store = mockStore({}); // Create a mock store
-    const expectedActions = [{ type: SET_CURRENT_USER, payload: null }]; // Define expected actions
+    const expectedActions = [
+      { type: STOP_FORCE_LOGOUT }, // Clear any active force-logout timer
+      { type: SET_CURRENT_USER, payload: null },
+    ]; // Define expected actions
 
     store.dispatch(logoutUser()); // Dispatch the logoutUser action
     expect(store.getActions()).toEqual(expectedActions); // Assert the actions

src/actions/__tests__/authActions.js.test.js

@@ -14,7 +14,7 @@ const mockStore = configureMockStore(middlewares);
 
 describe('User Management Actions', () => {
   let store;
-  
+
   beforeEach(() => {
     store = mockStore({});
     vi.clearAllMocks();
@@ -46,7 +46,7 @@ describe('User Management Actions', () => {
 
     it('should update user to active status', async () => {
       const reactivationDate = null;
-      
+
       axios.patch.mockResolvedValueOnce({ data: {} });
 
       await store.dispatch(actions.updateUserStatus(mockUser, UserStatus.Active, reactivationDate));
@@ -143,7 +143,7 @@ describe('User Management Actions', () => {
       );
     });
 
-    
+
   });
 
   describe('updateUserFinalDayStatus', () => {
@@ -205,6 +205,7 @@ describe('User Management Actions', () => {
         { id: 1, name: 'John Doe', email: 'john@example.com' },
         { id: 2, name: 'Jane Smith', email: 'jane@example.com' }
       ];
+      const mockSource = 'Report';
 
       axios.get.mockResolvedValueOnce({ data: mockBasicInfo });
 
@@ -213,20 +214,20 @@ describe('User Management Actions', () => {
         { type: 'RECEIVE_USER_PROFILE_BASIC_INFO', payload: mockBasicInfo }
       ];
 
-      await store.dispatch(actions.getUserProfileBasicInfo());
+      await store.dispatch(actions.getUserProfileBasicInfo({source: mockSource}));
       expect(store.getActions()).toEqual(expectedActions);
-      expect(axios.get).toHaveBeenCalledWith(ENDPOINTS.USER_PROFILE_BASIC_INFO);
+      expect(axios.get).toHaveBeenCalledWith(ENDPOINTS.USER_PROFILE_BASIC_INFO(mockSource));
     });
 
     it('should handle errors when fetching basic info', async () => {
       axios.get.mockRejectedValueOnce(new Error('Network error'));
-
+      const mockSource = '';
       const expectedActions = [
         { type: 'FETCH_USER_PROFILE_BASIC_INFO' },
         { type: 'FETCH_USER_PROFILE_BASIC_INFO_ERROR' }
       ];
 
-      await store.dispatch(actions.getUserProfileBasicInfo());
+      await store.dispatch(actions.getUserProfileBasicInfo({ source: mockSource }));
       expect(store.getActions()).toEqual(expectedActions);
     });
   });
@@ -276,4 +277,4 @@ describe('User Management Actions', () => {
       expect(store.getActions()).toContainEqual(expectedAction);
     });
   });
-});
+});

src/actions/__tests__/userManagement.test.js

@@ -122,7 +122,6 @@ export const getAllUserTeams = () => {
       .then(res => {
         dispatch(teamMembersFectchACtion(res.data));
         return res.data;
-        // console.log("getAllUserTeams: res:", res.data)
       })
       .catch(() => {
         dispatch(teamMembersFectchACtion(undefined));

src/actions/allTeamsAction.js

@@ -8,6 +8,7 @@ import {
   SET_CURRENT_USER,
   SET_HEADER_DATA,
   START_FORCE_LOGOUT,
+  STOP_FORCE_LOGOUT,
 } from '../constants/auth';
 
 const { tokenKey } = config;
@@ -22,6 +23,21 @@ export const setHeaderData = data => ({
   payload: data,
 });
 
+/**
+ * Stops any active force logout timer and clears related state
+ */
+export const stopForceLogout = () => (dispatch, getState) => {
+  const { auth } = getState();
+  if (auth?.timerId) {
+    try {
+      clearTimeout(auth.timerId);
+    } catch (e) {
+      // Timer already cleared or invalid
+    }
+  }
+  dispatch({ type: STOP_FORCE_LOGOUT });
+};
+
 export const loginUser = credentials => dispatch => {
   return httpService
     .post(ENDPOINTS.LOGIN, credentials)
@@ -33,6 +49,8 @@ export const loginUser = credentials => dispatch => {
       localStorage.setItem(tokenKey, res.data.token);
       httpService.setjwt(res.data.token);
       const decoded = jwtDecode(res.data.token);
+      // Ensure any existing timers from a previous session are cleared
+      dispatch(stopForceLogout());
       dispatch(setCurrentUser(decoded));
       return { success: true };
     })
@@ -98,6 +116,8 @@ export const getHeaderData = userId => {
 };
 
 export const logoutUser = () => dispatch => {
+  // Clear any active force-logout timer before logging out
+  dispatch(stopForceLogout());
   localStorage.removeItem(tokenKey);
   httpService.setjwt(false);
   dispatch(setCurrentUser(null));
@@ -134,6 +154,9 @@ export const startForceLogout = (delayMs = 20000) => (dispatch, getState) => {
       // eslint-disable-next-line no-console
       console.error('Error acknowledging permissions during force logout:', error);
     } finally {
+      // Set flag to indicate user was force logged out due to permission changes
+      // This helps distinguish "force logged out" vs "first login after permission change"
+      sessionStorage.setItem('wasForceLoggedOut', 'true');
       dispatch(logoutUser());
     }
   }, delayMs);