XiaoW Add tooltip to new timer and cleanup old timer

src/__tests__/ForcePasswordUpdate.test.js

@@ -95,7 +95,6 @@ describe('When user tries to input data', () => {
 });
 
 const url = ENDPOINTS.FORCE_PASSWORD;
-const timerUrl = ENDPOINTS.TIMER(mockState.auth.user.userid);
 const userProjectsUrl = ENDPOINTS.USER_PROJECTS(mockState.auth.user.userid);
 let passwordUpdated = false;
 //When user is sent to forced Password Update they are not
@@ -158,9 +157,6 @@ const server = setupServer(
       ]),
     );
   }),
-  rest.get(timerUrl, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json({}));
-  }),
   //Any other requests error out
   rest.get('*', (req, res, ctx) => {
     console.error(

src/__tests__/Leaderboard.test.js

@@ -10,7 +10,6 @@ import { ENDPOINTS , ApiEndpoint } from '../utils/URL';
 import { render, fireEvent, waitFor, screen } from '@testing-library/react';
 import routes from './../routes';
 const url = ENDPOINTS.LEADER_BOARD(mockState.auth.user.userid);
-const timerUrl = ENDPOINTS.TIMER(mockState.auth.user.userid);
 const userProjectsUrl = ENDPOINTS.USER_PROJECTS(mockState.auth.user.userid);
 let requestedLeaderBoard = false;
 let refreshed = false;
@@ -76,9 +75,6 @@ const server = setupServer(
   rest.get(userProjectsUrl, (req, res, ctx) => {
     return res(ctx.status(200), ctx.json([]));
   }),
-  rest.get(timerUrl, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json({}));
-  }),
   rest.get('*', (req, res, ctx) => {
     console.error(
       `Please add request handler for ${req.url.toString()} in your MSW server requests.`,

src/__tests__/LoginPage.test.js

@@ -14,7 +14,6 @@ import { clearErrors } from '../actions/errorsActions';
 import { loginUser } from '../actions/authActions';
 
 const url = ENDPOINTS.LOGIN;
-const timerUrl = ENDPOINTS.TIMER(mockState.auth.user.userid);
 const userProjectsUrl = ENDPOINTS.USER_PROJECTS(mockState.auth.user.userid);
 
 const server = setupServer(
@@ -66,7 +65,6 @@ const server = setupServer(
     ),
   ),
   rest.get(userProjectsUrl, (req, res, ctx) => res(ctx.status(200), ctx.json([]))),
-  rest.get(timerUrl, (req, res, ctx) => res(ctx.status(200), ctx.json({}))),
   rest.get('*', (req, res, ctx) => {
     console.error(
       `Please add request handler for ${req.url.toString()} in your MSW server requests.`,

src/__tests__/Logout.test.js

@@ -3,7 +3,6 @@ import mockState from './mockAdminState.js';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { ApiEndpoint, ENDPOINTS } from '../utils/URL';
-const timerUrl = ENDPOINTS.TIMER(mockState.auth.user.userid);
 const userProjectsUrl = ENDPOINTS.USER_PROJECTS(mockState.auth.user.userid);
 
 window.confirm = jest.fn(() => true);
@@ -50,9 +49,6 @@ const server = setupServer(
       ]),
     );
   }),
-  rest.get(timerUrl, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json({}));
-  }),
   rest.get('http://*/hash.txt', (req, res, ctx) => {
     return res(ctx.status(200), ctx.json({}));
   }),

src/__tests__/Projects/Projects.WBS.test.js

@@ -14,7 +14,6 @@ import routes from '../../routes';
 const projectWBSUrl = ENDPOINTS.WBS('5ad91ec3590b19002asacd26');
 const userProfileUrl = ENDPOINTS.USER_PROFILE(mockState.auth.user.userid);
 const leaderboardUrl = ENDPOINTS.LEADER_BOARD(mockState.auth.user.userid);
-const timerUrl = ENDPOINTS.TIMER(mockState.auth.user.userid);
 const userProjectsUrl = ENDPOINTS.USER_PROJECTS(mockState.auth.user.userid);
 let deleteWbsCalled = false;
 let addedWBSCalled = false;
@@ -80,9 +79,6 @@ const server = setupServer(
       ]),
     );
   }),
-  rest.get(timerUrl, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json({}));
-  }),
   rest.get('*', (req, res, ctx) => {
     console.error(
       `Please add request handler for ${req.url.toString()} in your MSW server requests.`,

src/components/BMDashboard/BMHeader/BMHeader.jsx

@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from 'react';
 // import { getUserProfile } from '../../actions/userProfile'
 import { getHeaderData } from '../../../actions/authActions';
-import { getTimerData } from '../../../actions/timer';
 import { getAllRoles } from '../../../actions/role';
 import { Link } from 'react-router-dom';
 import { connect, useDispatch } from 'react-redux';
@@ -90,7 +89,6 @@ export const Header = props => {
   useEffect(() => {
     if (props.auth.isAuthenticated) {
       props.getHeaderData(props.auth.user.userid);
-      props.getTimerData(props.auth.user.userid);
       if (props.auth.user.role === 'Administrator') {
         dispatch(fetchTaskEditSuggestions());
       }
@@ -321,7 +319,6 @@ const mapStateToProps = state => ({
 });
 export default connect(mapStateToProps, {
   getHeaderData,
-  getTimerData,
   getAllRoles,
   hasPermission,
 })(Header);

src/components/Header/Header.jsx

@@ -1,12 +1,10 @@
 import React, { useState, useEffect } from 'react';
 // import { getUserProfile } from '../../actions/userProfile'
 import { getHeaderData } from '../../actions/authActions';
-import { getTimerData } from '../../actions/timer';
 import { getAllRoles } from '../../actions/role';
 import { Link } from 'react-router-dom';
 import { connect, useDispatch } from 'react-redux';
-import Timer from '../Timer/NewTimer';
-// import OldTimer from '../Timer/Timer';
+import Timer from '../Timer/Timer';
 import OwnerMessage from '../OwnerMessage/OwnerMessage';
 import {
   LOGO,
@@ -79,7 +77,6 @@ export const Header = props => {
   useEffect(() => {
     if (props.auth.isAuthenticated) {
       props.getHeaderData(props.auth.user.userid);
-      props.getTimerData(props.auth.user.userid);
       if (props.auth.user.role === 'Administrator') {
         dispatch(fetchTaskEditSuggestions());
       }
@@ -110,7 +107,6 @@ export const Header = props => {
           style={user.role == 'Owner' ? { marginRight: '6rem' } : { marginRight: '10rem' }}
         >
           {isAuthenticated && <Timer />}
-          {/* {isAuthenticated && <OldTimer />} */}
           {isAuthenticated && (
             <div className="owner-message">
               <OwnerMessage />
@@ -270,7 +266,6 @@ const mapStateToProps = state => ({
 });
 export default connect(mapStateToProps, {
   getHeaderData,
-  getTimerData,
   getAllRoles,
   hasPermission,
 })(Header);

src/components/Timelog/TimeEntryForm/TimeEntryForm.jsx

@@ -23,7 +23,6 @@ import { getUserProjects } from '../../../actions/userProjects';
 import { getUserProfile } from 'actions/userProfile';
 import { updateUserProfile } from 'actions/userProfile';
 
-import { stopTimer } from '../../../actions/timer';
 import AboutModal from './AboutModal';
 import TangibleInfoModal from './TangibleInfoModal';
 import ReminderModal from './ReminderModal';
@@ -45,14 +44,13 @@ import { boxStyle } from 'styles';
  * @param {*} props.timer
  * @param {boolean} props.data.isTangible
  * @param {*} props.userProfile
- * @param {function} props.resetTimer
  * @param {string} props.LoggedInuserId
  * @param {string} props.curruserId
  * @returns
  */
 const TimeEntryForm = props => {
 
-  const { userId, edit, data, isOpen, toggle, timer, LoggedInuserId, curruserId, resetTimer = () => {}, sendClear = () => {}, sendStop  = () => {} } = props;
+  const { userId, edit, data, isOpen, toggle, timer, LoggedInuserId, curruserId, sendStop } = props;
   const canEditTimeEntry = props.hasPermission('editTimeEntry');
   const canPutUserProfileImportantInfo = props.hasPermission('putUserProfileImportantInfo');
 
@@ -504,30 +502,6 @@ const TimeEntryForm = props => {
       }
     }
 
-    //Clear the form and clean up.
-    if (fromTimer) {
-      const timerStatus = await dispatch(stopTimer(userId));
-      if (timerStatus === 200 || timerStatus === 201) {
-        resetTimer();
-      } else {
-        alert(
-          'Your time entry was successfully recorded, but an error occurred while asking the server to reset your timer. There is no need to submit your hours a second time, and doing so will result in a duplicate time entry.',
-        );
-      }
-      sendClear();
-    } else if (!reminder.notice) {
-      setReminder(reminder => ({
-        ...reminder,
-        editNotice: !reminder.editNotice,
-      }));
-    }
-
-    if (fromTimer) {
-      sendStop();
-      clearForm();
-    }
-    setReminder(initialReminder);
-
     if (!props.edit) setInputs(initialFormValues);
 
     await getUserProfile(userId)(dispatch);
@@ -538,6 +512,19 @@ const TimeEntryForm = props => {
 
     await dispatch(getUserProfile(curruserId));
     await dispatch(getTimeEntriesForWeek(curruserId, 0));
+
+    //Clear the form and clean up.
+    if (fromTimer) {
+      sendStop();
+      clearForm();
+    } else if (!reminder.notice) {
+      setReminder(reminder => ({
+        ...reminder,
+        editNotice: !reminder.editNotice,
+      }));
+    }
+
+    setReminder(initialReminder);
     if (isOpen) toggle();
   };
 
@@ -810,8 +797,6 @@ TimeEntryForm.propTypes = {
   isOpen: PropTypes.bool.isRequired,
   timer: PropTypes.any,
   data: PropTypes.any.isRequired,
-  userProfile: PropTypes.any.isRequired,
-  resetTimer: PropTypes.func,
   LoggedInuserId: PropTypes.string,
   curruserId: PropTypes.string,
   handleStop: PropTypes.func,