Merge pull request #4284 from OneCommunityGlobal/Mohan-fix-duplicate-time-logging

Mohan Fix app allowing logging of duplicate time entries

Author: one-community

src/components/Timelog/TimeEntryForm/TimeEntryForm.jsx

@@ -67,7 +67,7 @@ const customImageUploadHandler = () =>
 function TimeEntryForm(props) {
   /* ---------------- variables -------------- */
   // props from parent
- const { from, sendStop, edit, data, toggle, isOpen, tab, darkMode, userProfile, userProjects } = props;
+ const { from, sendStop, edit, data, toggle, isOpen, tab, darkMode, userProfile, userProjects, timerConnected } = props;
   // props from store
   const { authUser } = props;
   const dispatch = useDispatch();
@@ -317,6 +317,13 @@ function TimeEntryForm(props) {
   };
 
   const submitTimeEntry = async () => {
+    // Prevent submission when logging timer time but timer is disconnected
+    if (from === 'Timer' && timerConnected === false) {
+      toast.error('Cannot log time entry while timer is disconnected. Please wait for connection to be restored or refresh the page.');
+      setSubmitting(false);
+      return;
+    }
+
     const { hours: formHours, minutes: formMinutes, personId, taskId } = formValues;
     const timeEntry = { ...formValues };
     const isTimeModified = edit && (initialHours !== formHours || initialMinutes !== formMinutes);
@@ -827,6 +834,7 @@ TimeEntryForm.propTypes = {
   isOpen: PropTypes.bool.isRequired,
   data: PropTypes.any.isRequired,
   handleStop: PropTypes.func,
+  timerConnected: PropTypes.bool,
 };
 
 const mapStateToProps = state => ({