Merge branch 'development' into nishita_design_the_landing_page_for_event_pPopularity_analytics

Author: nishitag5

.circleci/config.yml

@@ -14,7 +14,7 @@ jobs:
           command: 'sudo npm install'
       - run:
           name: Run react build
-          command: 'sudo REACT_APP_APIENDPOINT=$APIENDPOINT_PROD REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD REACT_APP_SENTRY_URL=$SENTRY_URL_PROD SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS=$NODE_OPTIONS npm run build && sudo mv build/index.html build/200.html'
+          command: 'sudo REACT_APP_APIENDPOINT=$APIENDPOINT_PROD REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD REACT_APP_SENTRY_URL=$SENTRY_URL_PROD SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS="$NODE_OPTIONS --max_old_space_size=4096" npm run build --prod && sudo mv build/index.html build/200.html'
       - run:
           name: Export error log if 'Build the React client' failed
           command: |
@@ -62,7 +62,7 @@ jobs:
           command: npm install
       - run:
           name: Build the React client
-          command: export REACT_APP_APIENDPOINT=$APIENDPOINT_DEV REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD REACT_APP_SENTRY_URL=$SENTRY_URL_DEV SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS=$NODE_OPTIONS && npm run build
+          command: export REACT_APP_APIENDPOINT=$APIENDPOINT_DEV REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD REACT_APP_SENTRY_URL=$SENTRY_URL_DEV SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS="$NODE_OPTIONS --max_old_space_size=4096" && npm run build --prod
       - run:
           name: Export error log if 'Build the React client' failed
           command: |
@@ -84,7 +84,7 @@ jobs:
           name: Deploy compiled app to surge.sh on $SURGE_DOMAIN_DEV
           command: ./node_modules/.bin/surge --domain $SURGE_DOMAIN_DEV --project ./build
       - run:
-          name: Deploy compiled app to surge.sh on $SURGE_DOMAIN_DEV
+          name: Deploy compiled app to surge.sh on $SURGE_DOMAIN_DEV1
           command: ./node_modules/.bin/surge --domain $SURGE_DOMAIN_DEV1 --project ./build
       - save_cache:
           key: v1.1-dependencies-{{ checksum "package-lock.json" }}
@@ -106,7 +106,7 @@ jobs:
           command: npm install
       - run:
           name: Build the React client
-          command: export REACT_APP_APIENDPOINT=$APIENDPOINT_BETA REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS=$NODE_OPTIONS && npm run build
+          command: export REACT_APP_APIENDPOINT=$APIENDPOINT_BETA REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS="$NODE_OPTIONS --max_old_space_size=4096" && npm run build --prod
       - run:
           name: Export error log if 'Build the React client' failed
           command: |

.eslintignore

@@ -26,7 +26,6 @@ src/components/TaskEditSuggestions/**
 src/components/TeamMemberTasks/**
 src/components/Teams/**
 src/components/TeamLocations/**
-src/components/Timelog/**
 src/components/UserManagement/**
 src/components/UserProfile/**
 src/components/Announcements/**

.github/workflows/lint.yml

@@ -11,10 +11,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '14'
 

.github/workflows/test.yml

@@ -10,10 +10,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '14'
 
@@ -25,7 +25,7 @@ jobs:
 
       - name: Upload test results
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results
           path: test-results # Adjust the path to your test results if necessary

.prettierignore

@@ -27,7 +27,6 @@ src/components/TaskEditSuggestions/**
 src/components/TeamLocations/**
 src/components/TeamMemberTasks/**
 src/components/Teams/**
-src/components/Timelog/**
 src/components/UserManagement/**
 src/components/UserProfile/**
 src/components/Announcements/**

package-lock.json

@@ -16,6 +16,8 @@
     "axios": "^0.21.2",
     "axios-mock-adapter": "^1.22.0",
     "bootstrap": "^4.5.3",
+    "chart.js": "^4.4.7",
+    "chartjs-plugin-datalabels": "^2.2.0",
     "classnames": "^2.2.6",
     "d3": "^7.8.5",
     "date-fns": "^2.14.0",
@@ -37,7 +39,9 @@
     "prop-types": "^15.7.2",
     "react": "^16.14.0",
     "react-autosuggest": "^10.1.0",
+    "react-beautiful-dnd": "^13.1.1",
     "react-bootstrap": "^1.0.1",
+    "react-chartjs-2": "^5.2.0",
     "react-circular-progressbar": "^2.1.0",
     "react-collapsible": "^2.10.0",
     "react-datepicker": "^3.7.0",

package.json

@@ -74,7 +74,7 @@ export const getTimeEntriesForPeriod = (userId, fromDate, toDate) => {
 export const getTimeEndDateEntriesByPeriod = (userId, fromDate, toDate) => { //Find last week of work in date
   toDate = moment(toDate)
     .endOf('day')
-    .format('YYYY-MM-DD');
+    .format('YYYY-MM-DDTHH:mm:ss');
   const url = ENDPOINTS.TIME_ENTRIES_PERIOD(userId, fromDate,toDate);
   return async dispatch => {
     let loggedOut = false;

src/actions/timeEntries.js

@@ -78,3 +78,48 @@ export const getTotalOrgSummary = (startDate, endDate) => {
     }
   };
 };
+
+/**
+ * Action to set the 'loading' flag to true.
+ */
+export const fetchVolunteerRolesTeamStatsBegin = () => ({
+  type: actions.FETCH_VOLUNTEER_ROLES_TEAM_STATS_BEGIN
+});
+
+/**
+ * This action is used to set the Team Stats in Volunteer Roles Weekly Summary Dashboard
+ *
+ * @param {object} volunteerRoleTeamStats An Object with the count of active members in the team.
+ */
+export const fetchVolunteerRolesTeamStatsSuccess = (volunteerRoleTeamStats) => ({
+  type: actions.FETCH_VOLUNTEER_ROLES_TEAM_STATS_SUCCESS,
+  payload: { volunteerRoleTeamStats },
+});
+
+/**
+ * Handle the error case.
+ *
+ * @param {Object} error The error object.
+ */
+export const fetchVolunteerRolesTeamStatsError = error => ({
+  type: actions.FETCH_VOLUNTEER_ROLES_TEAM_STATS_ERROR,
+  payload: { error },
+});
+
+export const getTeamStatsActiveMembers = (endDate, activeMembersMinimum) =>{
+
+const url =  ENDPOINTS.VOLUNTEER_ROLES_TEAM_STATS(endDate, activeMembersMinimum);
+  return async dispatch => {
+    dispatch(fetchVolunteerRolesTeamStatsBegin());
+    try {
+      const response = await axios.get(url);
+      dispatch(fetchVolunteerRolesTeamStatsSuccess(response.data));
+      return {
+        data: response.data
+      };
+    } catch (error) {
+      dispatch(fetchVolunteerRolesTeamStatsError(error));
+      return error.response.status;
+    }
+  };
+}

src/actions/totalOrgSummary.js

@@ -228,8 +228,8 @@ export const updateUserFinalDayStatusIsSet = (user, status, finalDayDate, isSet)
     patchData.endDate = undefined;
     userProfile.endDate = undefined;
   } else {
-    userProfile.endDate = moment(finalDayDate).format('YYYY-MM-DD');
-    patchData.endDate = moment(finalDayDate).format('YYYY-MM-DD');
+    userProfile.endDate = moment(finalDayDate).add(1,'days').format('YYYY-MM-DD');
+    patchData.endDate = moment(finalDayDate).add(1,'days').format('YYYY-MM-DD');
   }
 
   const updateProfilePromise = axios.patch(ENDPOINTS.USER_PROFILE(user._id), patchData);