Merge pull request #3490 from OneCommunityGlobal/revert-3373-Calvin-Fix-task-time-update

Revert "Calvin - Fix task time update so it happens immediately on the Tasks tab"

Author: one-community

src/components/Header/DarkMode.css

@@ -6,60 +6,50 @@
 
 .dark-mode .close {
   color: white;
-  opacity: 1;
+  opacity: 1; 
 }
 
 .dark-mode .close:hover {
   color: #f0f0f0;
-  opacity: 1;
+  opacity: 1; 
 }
-
 /* Custom styles for datepicker in darkMode */
 .dark-mode .react-datepicker {
   background-color: #3A506B;
   color: #ffffff;
 }
-
 .dark-mode .react-datepicker__header {
   background-color: #1C2541;
   border-bottom: 1px solid #555555;
 }
-
 .dark-mode .react-datepicker__current-month {
   color: #ffffff;
 }
-
 .dark-mode .react-datepicker__navigation--previous::before,
 .dark-mode .react-datepicker__navigation--next::before {
   border-color: #ffffff;
 }
-
 .dark-mode .react-datepicker__month-container {
   background-color: #3A506B;
 }
-
 .dark-mode .react-datepicker__day,
 .dark-mode .react-datepicker__time-name {
   color: #ffffff;
 }
-
 .dark-mode .react-datepicker__day-name {
   background-color: #1C2541;
   color: #ffffff;
 }
-
 .dark-mode .react-datepicker__day--selected,
 .dark-mode .react-datepicker__day--in-selecting-range,
 .dark-mode .react-datepicker__day--in-range,
 .dark-mode .react-datepicker__day:hover {
   background-color: #1C2541;
   color: #ffffff;
 }
-
 .dark-mode .react-datepicker__navigation {
   background: none;
 }
-
 .dark-mode .react-datepicker__navigation::before {
   border-color: #ffffff;
 }
@@ -70,52 +60,42 @@
 }
 
 .hover-effect-reports-page-dark-mode:hover {
-  background-color: #1C2541;
-  color: #ffffff;
+  background-color: #1C2541; 
+  color: #ffffff; 
 }
 
 /* Dark mode for DayPicker (AddTaskModal) */
 .dark-mode .DayPicker {
   background-color: #3A506B;
   color: #ffffff;
 }
-
 /* .dark-mode .DayPicker-wrapper {
   background-color: #1C2541;
 } */
 .dark-mode .DayPicker-Caption {
   color: #ffffff;
 }
-
 .dark-mode .DayPicker-NavButton {
   /* background: none; */
 }
-
 .dark-mode .DayPicker-Month {
   background-color: #3A506B;
 }
-
 .dark-mode .DayPicker-NavButton--prev::before,
 .dark-mode .DayPicker-NavButton--next::before {
   border-color: #ffffff;
 }
-
 .dark-mode .DayPicker-Day {
   color: #ffffff;
 }
-
 .dark-mode .DayPicker-Weekday {
   color: #ffffff;
 }
-
 .dark-mode .DayPicker-Day:hover {
-  background-color: #1C2541 !important;
-  /* Remove background color on hover */
-  color: #ffffff !important;
-  /* Ensure text color remains white */
+  background-color: #1C2541 !important; /* Remove background color on hover */
+  color: #ffffff !important; /* Ensure text color remains white */
 }
-
-.dark-mode tr:hover {
+.dark-mode tr:hover{
   background-color: #2f4157;
 }
 
@@ -133,8 +113,7 @@
   transition: background-color 1000ms ease-in-out;
 }
 
-.sunHoverIcon,
-.nightIcon {
+.sunHoverIcon, .nightIcon {
   height: 25px;
   padding: 2px;
   border-radius: 50%;
@@ -203,8 +182,7 @@
   transition: background-color 1000ms ease-in-out;
 }
 
-.sunIcon,
-.nightHoverIcon {
+.sunIcon, .nightHoverIcon {
   height: 25px;
   padding: 2px;
   border-radius: 50%;
@@ -258,9 +236,3 @@
   opacity: 1;
   transition: opacity 200ms linear 800ms;
 }
-
-/* Soft Refresh*/
-body.refreshing {
-  opacity: 0;
-  transition: opacity 0.3s ease;
-}

src/components/Timelog/TimeEntryForm/TimeEntryForm.jsx

@@ -36,7 +36,6 @@ import TimeLogConfirmationModal from './TimeLogConfirmationModal';
 import { ENDPOINTS } from '../../../utils/URL';
 import '../../Header/DarkMode.css';
 import { updateIndividualTaskTime } from '../../TeamMemberTasks/actions';
-import '../Timelog.css';
 
 // Images are not allowed in timelog
 const customImageUploadHandler = () =>
@@ -45,36 +44,6 @@ const customImageUploadHandler = () =>
     reject({ message: 'Pictures are not allowed here!', remove: true });
   });
 
-/*
-const TINY_MCE_INIT_OPTIONS = {
-  license_key: 'gpl',
-  menubar: false,
-  placeholder: 'Description (10-word minimum) and reference link',
-  plugins: 'advlist autolink autoresize lists link charmap table paste help wordcount',
-  toolbar:
-    // eslint-disable-next-line no-multi-str
-    'bold italic underline link removeformat bullist numlist outdent indent |\
-                    styleselect fontsizeselect | table| strikethrough forecolor backcolor |\
-                    subscript superscript charmap  | help',
-  branding: false,
-  toolbar_mode: 'sliding',
-  min_height: 180,
-  max_height: 300,
-  autoresize_bottom_margin: 1,
-  content_style: 'body { cursor: text !important; }',
-  images_upload_handler: customImageUploadHandler,
-};
-*/
-
-/* Soft Refresh */
-const softRefresh = () => {
-  document.body.classList.add('refreshing');
-  // console.log(document.body.classList);
-  setTimeout(() => {
-    window.location.reload();
-  }, 300);
-};
-
 /**
  * Modal used to submit and edit tangible and intangible time entries.
  * There are several use cases:
@@ -156,8 +125,8 @@ function TimeEntryForm(props) {
 
   const timeEntryInitialProjectOrTaskId = edit
     ? initialProjectId +
-    (initialwbsId ? `/${initialwbsId}` : '') +
-    (initialTaskId ? `/${initialTaskId}` : '')
+      (initialwbsId ? `/${initialwbsId}` : '') +
+      (initialTaskId ? `/${initialTaskId}` : '')
     : 'defaultProject';
 
   const initialReminder = {
@@ -384,17 +353,13 @@ function TimeEntryForm(props) {
           const today = moment().tz('America/Los_Angeles');
           const offset = today.week() - date.week();
           props.getTimeEntriesForWeek(timeEntryUserId, Math.min(offset, 3));
-          // Use GET_TIME_ENTRIES_WEEK, and fix offset to 0 (this week)
-          // await props.getTimeEntriesForWeek(timeEntryUserId, 0);
-          // dispatch(fetchTeamMembersTask(timeEntryUserId));
           clearForm();
           break;
         }
         case 'WeeklyTab':
           await Promise.all([
             props.getUserProfile(timeEntryUserId),
             props.getTimeEntriesForWeek(timeEntryUserId, tab),
-            // props.getTimeEntriesForPeriod(timeEntryUserId, today, today),
           ]);
           break;
         default:
@@ -407,8 +372,6 @@ function TimeEntryForm(props) {
           editLimitNotification: !r.editLimitNotification,
         }));
       }
-      // Soft Refresh
-      softRefresh();
     };
 
     try {
@@ -736,7 +699,7 @@ function TimeEntryForm(props) {
 
               {'notes' in errors && (
                 <div className="text-danger">
-                  <small>{errors.notes}</small>handlePostSubmitActions
+                  <small>{errors.notes}</small>
                 </div>
               )}
             </FormGroup>
@@ -828,7 +791,6 @@ TimeEntryForm.propTypes = {
 const mapStateToProps = state => ({
   authUser: state.auth.user,
   darkMode: state.theme.darkMode,
-  timeEntriesPeriod: state.timeEntries.period,
 });
 
 export default connect(mapStateToProps, {

src/components/Timelog/Timelog.css

@@ -278,10 +278,4 @@
   font-size: 14px;
   margin-left: 5px;
   /* Add spacing between text and icon */
-}
-
-/*Soft Refresh*/
-body.refreshing {
-  opacity: 0;
-  transition: opacity 0.3s ease;
 }