Merge pull request #3846 from OneCommunityGlobal/Anthony/Fix-Timelog-Times-Not-Totaling-Task-Time-Worked-on-Dashboard-Tasks-Tab

Anthony/Fix Timelog Times Not Totaling Task Time Worked on Dashboard Tasks Tab

Author: one-community

src/components/Timelog/TimeEntry.jsx

@@ -14,6 +14,7 @@ import DeleteModal from './DeleteModal';
 
 import { editTimeEntry, getTimeEntriesForWeek } from '../../actions/timeEntries';
 import { editTeamMemberTimeEntry } from '../../actions/task';
+import { updateIndividualTaskTime } from '../TeamMemberTasks/actions';
 
 /**
  * This component can be imported in TimeLog component's week tabs and Tasks tab
@@ -92,6 +93,13 @@ function TimeEntry(props) {
       } else if (from === 'WeeklyTab') {
         await dispatch(editTimeEntry(timeEntryId, newData));
         await dispatch(getTimeEntriesForWeek(timeEntryUserId, tab));
+        dispatch(
+            updateIndividualTaskTime({
+              newTime: { hours: newData.isTangible ? newData.hours : -newData.hours, minutes: newData.isTangible ? newData.minutes : -newData.minutes },
+              taskId: newData.taskId,
+              personId: newData.personId,
+            }),
+          );
       }
     } catch (error) {
       toast.error(`Error: ${error.message}`);

src/components/Timelog/TimeEntryForm/TimeEntryForm.jsx

@@ -346,7 +346,7 @@ function TimeEntryForm(props) {
       return;
     }
 
-    const { hours: formHours, minutes: formMinutes, personId, taskId } = formValues;
+    const { hours: formHours, minutes: formMinutes, personId, taskId, isTangible } = formValues;
     const timeEntry = { ...formValues };
     const isTimeModified = edit && (initialHours !== formHours || initialMinutes !== formMinutes);
 
@@ -403,6 +403,16 @@ function TimeEntryForm(props) {
           const offset = today.week() - date.week();
           props.getTimeEntriesForWeek(timeEntryUserId, Math.min(offset, 3));
           clearForm();
+
+          if(isTangible) {
+            dispatch(
+              updateIndividualTaskTime({
+                newTime: { hours: formHours, minutes: formMinutes },
+                taskId,
+                personId,
+              }),
+            );
+          }
           break;
         }
         case 'WeeklyTab':

src/components/Timelog/Timelog.jsx

@@ -7,6 +7,7 @@ import pdfMake from 'pdfmake/build/pdfmake';
 import 'pdfmake/build/vfs_fonts';
 import htmlToPdfmake from 'html-to-pdfmake';
 import tipStyles from './TimeEntryTooltip.module.css';
+import leaderboardStyles from '../LeaderBoard/Leaderboard.module.css';
 import TooltipPortal from "./TooltipPortal";
 import {
   Container,
@@ -809,7 +810,7 @@ return (
               </div>
             </div>
           ) : null}
-          <Row className='row' style={{ minWidth: '100%' }}>
+          <Row className={`row ${leaderboardStyles.row}`} style={{ minWidth: '100%' }}> {/* Maybe here */}
             <Col md={12} className="px-0 mx-0">
               <Card className={darkMode ? 'border-0' : ''}>
                 <CardHeader

yarn.lock

@@ -807,7 +807,7 @@
   integrity sha512-PTNtvUQihsAsDHMOP5pfobP8C6CM4JWXmP8DrEIt46c3r2bf87Ua1zoqevsMo9g+tWDwgWrFP5EIxuBx5RudAw==
   dependencies:
     "@babel/template" "^7.27.2"
-    "@babel/types" "^7.28.2"
+    "@babel/types" "^7.27.6"
 
 "@babel/helpers@^7.28.4":
   version "7.28.4"
@@ -2166,7 +2166,7 @@
   resolved "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.4.tgz"
   integrity sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==
   dependencies:
-    "@floating-ui/core" "^1.7.3"
+    "@floating-ui/core" "^1.7.2"
     "@floating-ui/utils" "^0.2.10"
 
 "@floating-ui/utils@^0.2.10":
@@ -2308,8 +2308,8 @@
   resolved "https://registry.npmjs.org/@inquirer/core/-/core-10.2.0.tgz"
   integrity sha512-NyDSjPqhSvpZEMZrLCYUquWNl+XC/moEcVFqS55IEYIYsY0a1cUCevSqk7ctOlnm/RaSBU5psFryNlxcmGrjaA==
   dependencies:
-    "@inquirer/figures" "^1.0.13"
-    "@inquirer/type" "^3.0.8"
+    "@inquirer/figures" "^1.0.12"
+    "@inquirer/type" "^3.0.7"
     ansi-escapes "^4.3.2"
     cli-width "^4.1.0"
     mute-stream "^2.0.0"
@@ -2882,7 +2882,6 @@
     "@babel/runtime" "^7.28.2"
     "@mui/utils" "^7.3.1"
     reselect "^5.1.1"
-    use-sync-external-store "^1.5.0"
 
 "@naoak/workerize-transferable@^0.1.0":
   version "0.1.0"
@@ -3388,9 +3387,9 @@
     "@babel/runtime" "^7.12.5"
     "@types/aria-query" "^5.0.1"
     aria-query "5.3.0"
+    chalk "^4.1.0"
     dom-accessibility-api "^0.5.9"
     lz-string "^1.5.0"
-    picocolors "1.1.1"
     pretty-format "^27.0.2"
 
 "@testing-library/dom@^7.22.3":
@@ -3674,6 +3673,7 @@
   resolved "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.7.tgz"
   integrity sha512-PQTyIulDkIDro8P+IHbKCsw7U2xxBYflVzW/FgWdCAePD9xGSidgA76/GeJ6lBKoblyhf9pBY763gbrN+1dI8g==
   dependencies:
+    "@types/react" "*"
     hoist-non-react-statics "^3.3.0"
 
 "@types/html-to-pdfmake@^2.4.4":
@@ -4690,7 +4690,7 @@ axios@^1.11.0:
   integrity sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==
   dependencies:
     follow-redirects "^1.15.6"
-    form-data "^4.0.4"
+    form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
 axobject-query@^4.1.0:
@@ -5344,6 +5344,11 @@ colorette@^2.0.20:
   resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
+
 combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
@@ -12124,7 +12129,7 @@ use-isomorphic-layout-effect@^1.2.0:
   resolved "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.2.1.tgz"
   integrity sha512-tpZZ+EX0gaghDAiFR37hj5MgY6ZN55kLiPkJsKxBMZ6GZdOSPJXiOzPM984oPYZ5AnehYx5WQp1+ME8I/P/pRA==
 
-use-sync-external-store@^1.4.0, use-sync-external-store@^1.5.0:
+use-sync-external-store@^1.4.0:
   version "1.5.0"
   resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.5.0.tgz"
   integrity sha512-Rb46I4cGGVBmjamjphe8L/UnvJD+uPPtTkNvX5mZgqdbavhI4EbgIWJiIHXJ8bc/i9EQGPRh4DwEURJ552Do0A==