Merge pull request #2442 from objectcomputing/bugfix-pulse-report

fixes in PulsePage.jsx
objectcomputing · May 24, 2024 · f2d92e1 · f2d92e1
2 parents 11fbc64 + c296b4c
commit f2d92e1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/web-ui/src/pages/PulsePage.jsx b/web-ui/src/pages/PulsePage.jsx
@@ -1,6 +1,6 @@
 import { format } from 'date-fns';
 import React, { useContext, useEffect, useState } from 'react';
-import {useHistory} from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
 import { Button, Typography } from '@mui/material';
 
 import { resolve } from '../api/api.js';
@@ -14,6 +14,7 @@ const PulsePage = () => {
   const { state } = useContext(AppContext);
   const currentUser = selectCurrentUser(state);
   const csrf = selectCsrfToken(state);
+  const history = useHistory();
 
   const [externalComment, setExternalComment] = useState('');
   const [externalScore, setExternalScore] = useState(2); // zero-based
@@ -66,8 +67,6 @@ const PulsePage = () => {
       });
       if (res.error) throw new Error(res.error.message);
       const pulses = res.payload.data;
-      //TODO: Currently these objects only contain the comment text value,
-      //      not scores, but story 2345 will add those.
       setPulse(pulses.at(-1)); // last element is most recent
     } catch (err) {
       console.error('PulsePage.jsx loadTodayPulse:', err);
@@ -103,7 +102,7 @@ const PulsePage = () => {
       if (res.error) throw new Error(res.error.message);
 
       // Refresh browser to show that pulses where already submitted today.
-      history.push(location.pathname);
+      history.go(0);
     } catch (err) {
       console.error('PulsePage.jsx submit:', err);
     }
@@ -135,11 +134,7 @@ const PulsePage = () => {
             setScore={setExternalScore}
             title="How you feeling about life outside of work?"
           />
-          <Button
-            disabled={!internalComment}
-            onClick={submit}
-            variant="contained"
-          >
+          <Button onClick={submit} variant="contained">
             Submit
           </Button>
         </>

diff --git a/web-ui/src/pages/__snapshots__/PulsePage.test.jsx.snap b/web-ui/src/pages/__snapshots__/PulsePage.test.jsx.snap
@@ -456,12 +456,14 @@ exports[`renders correctly 1`] = `
       </div>
     </div>
     <button
-      class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary Mui-disabled MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary css-sghohy-MuiButtonBase-root-MuiButton-root"
-      disabled=""
-      tabindex="-1"
+      class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary css-sghohy-MuiButtonBase-root-MuiButton-root"
+      tabindex="0"
       type="button"
     >
       Submit
+      <span
+        class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
+      />
     </button>
   </div>
 </div>