From 81d32ca6fe6d9693b51597877f66351b47e5dc6a Mon Sep 17 00:00:00 2001 From: Mark Volkmann Date: Fri, 24 May 2024 13:22:29 -0500 Subject: [PATCH 1/2] fixes in PulsePage.jsx --- web-ui/src/pages/PulsePage.jsx | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/web-ui/src/pages/PulsePage.jsx b/web-ui/src/pages/PulsePage.jsx index 0ef363c636..9d7be267c4 100644 --- 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?" /> - From 6b9e47bb7ce41f64b7ce3cb90eeb44ae4913bbdf Mon Sep 17 00:00:00 2001 From: Mark Volkmann Date: Fri, 24 May 2024 14:11:06 -0500 Subject: [PATCH 2/2] updated a snapshot test --- web-ui/src/pages/__snapshots__/PulsePage.test.jsx.snap | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/web-ui/src/pages/__snapshots__/PulsePage.test.jsx.snap b/web-ui/src/pages/__snapshots__/PulsePage.test.jsx.snap index 3b97d4b3bf..d9288265b7 100644 --- 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`] = `