Merge remote-tracking branch 'origin/development' into bhavpreet_carousel_fix

Author: fangedShadow

.eslintignore

@@ -1,25 +1,33 @@
-*.png
-*.svg
-*.test.js
-*.test.jsx
-src/actions/**
-src/App.css
-src/config.json
-
-src/__tests__/**
+# =======================================================================
+# ⚠️ DO NOT ADD NEW ENTRIES ⚠️
+# Only the files and folders listed below are allowed to be ignored.
+# This .gitignore is locked down to maintain consistency across the team.
+# To propose changes, please open a discussion or PR with justification.
+# =======================================================================
 
+# Ignore build folders
+/node_modules/
 /public/
 /build/
-/node_modules/
+
+# Ignore test files inside /src/components
+src/__tests__/**
+/src/components/**/__test__/**/*
+/src/components/**/__tests__/**/*
+/src/reducers/**/__tests__/**/*
+
+src/components/BMDashboard/_tests_/BMDashboard.test.jsx
+src/components/Login/ForgotPassword.test.jsx
+src/components/Login/LoginPage.test.js
+src/components/PermissionsManagement/PermissionsManagement.test.js
+
+# Ignore folders in /src
 src/components/Badge/**
-src/components/common/**
+src/components/Dashboard/**
 src/components/Projects/**
 src/components/SummaryManagement/**
 src/components/TaskEditSuggestions/**
 src/components/TeamMemberTasks/**
-src/components/Timelog/**
+src/components/Teams/TeamMembersPopup.jsx
 src/components/UserManagement/**
-src/components/UserProfile/**
-src/components/EmailSubscribeForm/**
-src/components/Dashboard/**
-src/components/Teams/TeamMembersPopup.jsx
+src/components/UserProfile/**

src/actions/__tests__/allTeamsAction.js.test.js

@@ -1,10 +1,39 @@
 // Import the necessary action creators and constants from the respective files
-import { teamMembersFectchACtion, userTeamsUpdateAction, addNewTeam, teamsDeleteAction, updateTeamAction, teamUsersFetchAction, teamUsersFetchCompleteAction, teamUsersFetchErrorAction, teamMemberDeleteAction, teamMemberAddAction, updateVisibilityAction, fetchAllTeamCodeSucess, fetchAllTeamCodeFailure, getAllUserTeams, postNewTeam, deleteTeam } from '../allTeamsAction';
-import { RECEIVE_ALL_USER_TEAMS, USER_TEAMS_UPDATE, ADD_NEW_TEAM, TEAMS_DELETE, UPDATE_TEAM, FETCH_TEAM_USERS_START, RECEIVE_TEAM_USERS, FETCH_TEAM_USERS_ERROR, TEAM_MEMBER_DELETE, TEAM_MEMBER_ADD, UPDATE_TEAM_MEMBER_VISIBILITY, FETCH_ALL_TEAM_CODE_SUCCESS, FETCH_ALL_TEAM_CODE_FAILURE } from '../../constants/allTeamsConstants';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
+import {
+  RECEIVE_ALL_USER_TEAMS,
+  USER_TEAMS_UPDATE,
+  ADD_NEW_TEAM,
+  TEAMS_DELETE,
+  UPDATE_TEAM,
+  FETCH_TEAM_USERS_START,
+  RECEIVE_TEAM_USERS,
+  FETCH_TEAM_USERS_ERROR,
+  TEAM_MEMBER_DELETE,
+  TEAM_MEMBER_ADD,
+  UPDATE_TEAM_MEMBER_VISIBILITY,
+  FETCH_ALL_TEAM_CODE_SUCCESS,
+} from '../../constants/allTeamsConstants';
+import {
+  teamMembersFectchACtion,
+  userTeamsUpdateAction,
+  addNewTeam,
+  teamsDeleteAction,
+  updateTeamAction,
+  teamUsersFetchAction,
+  teamUsersFetchCompleteAction,
+  teamUsersFetchErrorAction,
+  teamMemberDeleteAction,
+  teamMemberAddAction,
+  updateVisibilityAction,
+  fetchAllTeamCodeSucess,
+  getAllUserTeams,
+  postNewTeam,
+  deleteTeam,
+} from '../allTeamsAction';
 import { ENDPOINTS } from '../../utils/URL';
 
 const middlewares = [thunk];
@@ -16,7 +45,10 @@ describe('teamMembersFectchACtion', () => {
   // Test case for creating an action to set all user teams
   it('should create an action to set all user teams', () => {
     // Define the payload for the action
-    const payload = [{ id: 1, name: 'Team 1' }, { id: 2, name: 'Team 2' }];
+    const payload = [
+      { id: 1, name: 'Team 1' },
+      { id: 2, name: 'Team 2' },
+    ];
     // Define the expected action object
     const expectedAction = {
       type: RECEIVE_ALL_USER_TEAMS,
@@ -109,7 +141,10 @@ describe('teamUsersFetchAction', () => {
 // Describe block for the teamUsersFetchCompleteAction tests
 describe('teamUsersFetchCompleteAction', () => {
   it('should create an action to set team users', () => {
-    const payload = [{ id: 1, name: 'User 1' }, { id: 2, name: 'User 2' }];
+    const payload = [
+      { id: 1, name: 'User 1' },
+      { id: 2, name: 'User 2' },
+    ];
     const expectedAction = {
       type: RECEIVE_TEAM_USERS,
       payload,
@@ -198,18 +233,18 @@ describe('fetchAllTeamCodeSucess', () => {
   });
 });
 
-
 // Describe block for the getAllUserTeams tests
 describe('getAllUserTeams', () => {
   // Test case for fetching all user teams
   it('should fetch all user teams and dispatch RECEIVE_ALL_USER_TEAMS action', async () => {
     // Mock the API response
-    const responseData = [{ id: 1, name: 'Team 1' }, { id: 2, name: 'Team 2' }];
+    const responseData = [
+      { id: 1, name: 'Team 1' },
+      { id: 2, name: 'Team 2' },
+    ];
     mock.onGet(ENDPOINTS.TEAM).reply(200, responseData);
 
-    const expectedActions = [
-      { type: RECEIVE_ALL_USER_TEAMS, payload: responseData },
-    ];
+    const expectedActions = [{ type: RECEIVE_ALL_USER_TEAMS, payload: responseData }];
 
     const store = mockStore({});
     await store.dispatch(getAllUserTeams());
@@ -225,9 +260,7 @@ describe('postNewTeam', () => {
     const responseData = { id: 3, name: 'New Team' };
     mock.onPost(ENDPOINTS.TEAM).reply(200, responseData);
 
-    const expectedActions = [
-      { type: ADD_NEW_TEAM, payload: responseData, status: true },
-    ];
+    const expectedActions = [{ type: ADD_NEW_TEAM, payload: responseData, status: true }];
 
     const store = mockStore({});
     await store.dispatch(postNewTeam('New Team', true));
@@ -243,13 +276,10 @@ describe('deleteTeam', () => {
     const teamId = 1;
     mock.onDelete(ENDPOINTS.TEAM_DATA(teamId)).reply(200);
 
-    const expectedActions = [
-      { type: TEAMS_DELETE, team: teamId },
-    ];
+    const expectedActions = [{ type: TEAMS_DELETE, team: teamId }];
 
     const store = mockStore({});
     await store.dispatch(deleteTeam(teamId));
     expect(store.getActions()).toEqual(expectedActions);
   });
 });
-

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

@@ -1,18 +1,17 @@
 import configureMockStore from 'redux-mock-store'; // Import mock store configuration
 import thunk from 'redux-thunk'; // Import thunk middleware
+import jwtDecode from 'jwt-decode'; // Import jwtDecode
+import axios from 'axios'; // Import axios
 import httpService from '../../services/httpService'; // Import httpService
 import {
   loginUser, // Import loginUser action
   loginBMUser, // Import loginBMUser action
-  getHeaderData, // Import getHeaderData action
   logoutUser, // Import logoutUser action
   refreshToken as refreshUserToken, // Import refreshToken action and rename it to avoid conflict
   setCurrentUser, // Import setCurrentUser action
   setHeaderData, // Import setHeaderData action
 } from '../authActions'; // Import actions from authActions
-import { SET_CURRENT_USER, GET_ERRORS, SET_HEADER_DATA } from '../../constants/auth'; // Import constants
-import jwtDecode from 'jwt-decode'; // Import jwtDecode
-import axios from 'axios'; // Import axios
+import { SET_CURRENT_USER, SET_HEADER_DATA } from '../../constants/auth'; // Import constants
 
 const middlewares = [thunk]; // Define middlewares
 const mockStore = configureMockStore(middlewares); // Create mock store with middlewares
@@ -106,5 +105,4 @@ describe('authActions', () => {
 
     expect(setHeaderData(data)).toEqual(expectedAction); // Assert the action
   });
-
 });

src/actions/__tests__/blueSquareEmailBCCAction.js.test.js

@@ -2,7 +2,10 @@ import axios from 'axios'; // Import axios for making HTTP requests
 import configureMockStore from 'redux-mock-store'; // Import redux-mock-store for creating a mock store
 import thunk from 'redux-thunk'; // Import redux-thunk for handling asynchronous actions
 import * as types from '../../constants/BluequareEmailBccConstants'; // Import the action type constants
-import { setBlueSquareEmailAssignement, deleteBlueSquareEmailAssignement } from '../blueSquareEmailBCCAction'; // Import the action creator
+import {
+  setBlueSquareEmailAssignement,
+  deleteBlueSquareEmailAssignement,
+} from '../blueSquareEmailBCCAction'; // Import the action creator
 
 // Mock axios to control its behavior in tests
 jest.mock('axios');

src/actions/__tests__/dashboardActions.test.js

@@ -1,7 +1,5 @@
-import {
-  incrementDashboardTaskCount,
-  INCREMENT_DASHBOARD_TASK_COUNT,
-} from '../dashboardActions';
+import { toast } from 'react-toastify';
+import { incrementDashboardTaskCount, INCREMENT_DASHBOARD_TASK_COUNT } from '../dashboardActions';
 
 describe('incrementDashboardTaskCount action creator', () => {
   it('should create an action to increment the dashboard task count', () => {
@@ -12,12 +10,12 @@ describe('incrementDashboardTaskCount action creator', () => {
     };
 
     // Spy on console.log
-    console.log = jest.fn();
+    toast.info = jest.fn();
 
     const action = incrementDashboardTaskCount(taskId);
 
     expect(action).toEqual(expectedAction);
-    expect(console.log).toHaveBeenCalledWith(
+    expect(toast.info).toHaveBeenCalledWith(
       `Dispatching incrementDashboardTaskCount for task ID: ${taskId}`,
     );
   });

src/actions/__tests__/followUpActions.test.js

@@ -57,7 +57,7 @@ describe('followUpActions', () => {
 
       expect(axios.post).toHaveBeenCalledWith(
         ENDPOINTS.SET_USER_FOLLOWUP(userId, taskId),
-        updateData
+        updateData,
       );
       expect(dispatch).toHaveBeenCalledWith({
         type: types.SET_FOLLOWUP,