From d8469f26557ecef02f880fc4f11a94ed68ecaa69 Mon Sep 17 00:00:00 2001
From: bourquecharles <charles.bourque96@gmail.com>
Date: Tue, 18 May 2021 17:51:34 -0400
Subject: [PATCH] Reboot now button does the action

---
 src/widgets/ActionModalWidget.js | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/widgets/ActionModalWidget.js b/src/widgets/ActionModalWidget.js
index c080913..361d95f 100644
--- a/src/widgets/ActionModalWidget.js
+++ b/src/widgets/ActionModalWidget.js
@@ -24,6 +24,7 @@ const ActionModalWidget = ({ show, toggleModal, title, directions, action, extra
   const [waiting, setWaiting] = useState(false);
   const [validDate, setValidDate] = useState(true);
   const [chosenDate, setChosenDate] = useState(new Date().toString());
+  const [doingNow, setDoingNow] = useState(false);
   const [responseBody, setResponseBody] = useState('');
   const [checkingIfSure, setCheckingIfSure] = useState(false);
   const selectedDeviceId = useSelector((state) => state.selectedDeviceId);
@@ -36,11 +37,6 @@ const ActionModalWidget = ({ show, toggleModal, title, directions, action, extra
     return true;
   };
 
-  const setDateToNow = () => {
-    const now = new Date().toString();
-    setChosenDate(now);
-  };
-
   const setDateToLate = () => {
     const date = convertDateToUtc(new Date());
     if (date.getHours() >= 3) {
@@ -72,7 +68,8 @@ const ActionModalWidget = ({ show, toggleModal, title, directions, action, extra
     setCheckingIfSure(false);
   }, [show]);
 
-  const doAction = () => {
+  const doAction = (isNow) => {
+    setDoingNow(isNow);
     setHadFailure(false);
     setHadSuccess(false);
     setWaiting(true);
@@ -84,7 +81,7 @@ const ActionModalWidget = ({ show, toggleModal, title, directions, action, extra
     const parameters = {
       ...{
         serialNumber: selectedDeviceId,
-        when: utcDateString,
+        when: isNow ? 0 : utcDateString,
       },
       ...extraParameters,
     };
@@ -119,9 +116,15 @@ const ActionModalWidget = ({ show, toggleModal, title, directions, action, extra
         <h6>{directions}</h6>
         <CRow style={{ marginTop: '20px' }}>
           <CCol>
-            <CButton disabled={waiting} block color="primary" onClick={() => setDateToNow()}>
-              Now
-            </CButton>
+              <CButton 
+                onClick={() => doAction(true)} 
+                disabled={waiting} 
+                block 
+                color="primary"
+              >
+                {waiting && doingNow ? 'Loading...' : 'Do Now!'}
+                <CSpinner hidden={!waiting || !doingNow} component="span" size="sm" />
+              </CButton>
           </CCol>
           <CCol>
             <CButton disabled={waiting} block color="primary" onClick={() => setDateToLate()}>
@@ -159,6 +162,7 @@ const ActionModalWidget = ({ show, toggleModal, title, directions, action, extra
         <div hidden={!checkingIfSure}>Are you sure?</div>
         <CButton
           hidden={checkingIfSure}
+          disabled={waiting}
           color="primary"
           onClick={() => (formValidation() ? confirmingIfSure() : null)}
         >
@@ -168,10 +172,10 @@ const ActionModalWidget = ({ show, toggleModal, title, directions, action, extra
           hidden={!checkingIfSure}
           disabled={waiting}
           color="primary"
-          onClick={() => (formValidation() ? doAction() : null)}
+          onClick={() => (formValidation() ? doAction(false) : null)}
         >
-          {waiting ? 'Loading...' : 'Yes'} {'   '}
-          <CSpinner hidden={!waiting} component="span" size="sm" />
+          {waiting && !doingNow ? 'Loading...' : 'Yes'} {'   '}
+          <CSpinner hidden={!waiting || doingNow} component="span" size="sm" />
         </CButton>
         <CButton color="secondary" onClick={toggleModal}>
           Cancel