From 1deee72560c7ba69c4ba6888313e466f684b1d13 Mon Sep 17 00:00:00 2001 From: Mark Volkmann Date: Tue, 30 Apr 2024 09:44:52 -0500 Subject: [PATCH 1/2] fixed a failing UI test --- .../reviews/periods/ReviewPeriods.jsx | 24 ++++++++++++++++++- .../ViewFeedbackPage.test.jsx.snap | 1 - 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/web-ui/src/components/reviews/periods/ReviewPeriods.jsx b/web-ui/src/components/reviews/periods/ReviewPeriods.jsx index e9067e68b7..661ffd175e 100644 --- a/web-ui/src/components/reviews/periods/ReviewPeriods.jsx +++ b/web-ui/src/components/reviews/periods/ReviewPeriods.jsx @@ -1,4 +1,10 @@ -import React, { useCallback, useContext, useEffect, useState } from 'react'; +import React, { + useCallback, + useContext, + useEffect, + useRef, + useState +} from 'react'; import PropTypes from 'prop-types'; import ArchiveIcon from '@mui/icons-material/Archive'; @@ -9,6 +15,7 @@ import WorkIcon from '@mui/icons-material/Work'; import Box from '@mui/material/Box'; import Avatar from '@mui/material/Avatar'; import Button from '@mui/material/Button'; +import { DatePicker } from '@mui/x-date-pickers'; import Dialog from '@mui/material/Dialog'; import DialogActions from '@mui/material/DialogActions'; import DialogContent from '@mui/material/DialogContent'; @@ -124,6 +131,15 @@ const ReviewPeriods = ({ onPeriodSelected, mode }) => { const userProfile = selectUserProfile(state); const isAdmin = userProfile?.role?.includes('ADMIN'); + const launchDatePickerRef = useRef(null); + useEffect(() => { + const { current } = launchDatePickerRef; + if (current) { + const button = current.querySelector('button'); + button?.click(); + } + }, [launchDatePickerRef.current]); + const handleOpen = useCallback(() => setOpen(true), [setOpen]); const handleClose = useCallback(() => setOpen(false), [setOpen]); @@ -248,6 +264,7 @@ const ReviewPeriods = ({ onPeriodSelected, mode }) => { !res.error ? res.payload.data : null; + // console.log('ReviewPeriods.jsx useEffect: data =', data); if (data) { dispatch({ type: UPDATE_REVIEW_PERIODS, payload: data }); setLoading(false); @@ -412,6 +429,11 @@ const ReviewPeriods = ({ onPeriodSelected, mode }) => { primary={name + (open ? ' - Open' : '')} secondary={getSecondaryLabel(id)} /> +
+ + + +
)) diff --git a/web-ui/src/pages/__snapshots__/ViewFeedbackPage.test.jsx.snap b/web-ui/src/pages/__snapshots__/ViewFeedbackPage.test.jsx.snap index 90464268f1..0d18c0c7ec 100644 --- a/web-ui/src/pages/__snapshots__/ViewFeedbackPage.test.jsx.snap +++ b/web-ui/src/pages/__snapshots__/ViewFeedbackPage.test.jsx.snap @@ -110,7 +110,6 @@ exports[`renders correctly 1`] = `
Date: Tue, 30 Apr 2024 09:47:34 -0500 Subject: [PATCH 2/2] restored previous version of ReviewPeriods.jsx --- .../reviews/periods/ReviewPeriods.jsx | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/web-ui/src/components/reviews/periods/ReviewPeriods.jsx b/web-ui/src/components/reviews/periods/ReviewPeriods.jsx index 661ffd175e..e9067e68b7 100644 --- a/web-ui/src/components/reviews/periods/ReviewPeriods.jsx +++ b/web-ui/src/components/reviews/periods/ReviewPeriods.jsx @@ -1,10 +1,4 @@ -import React, { - useCallback, - useContext, - useEffect, - useRef, - useState -} from 'react'; +import React, { useCallback, useContext, useEffect, useState } from 'react'; import PropTypes from 'prop-types'; import ArchiveIcon from '@mui/icons-material/Archive'; @@ -15,7 +9,6 @@ import WorkIcon from '@mui/icons-material/Work'; import Box from '@mui/material/Box'; import Avatar from '@mui/material/Avatar'; import Button from '@mui/material/Button'; -import { DatePicker } from '@mui/x-date-pickers'; import Dialog from '@mui/material/Dialog'; import DialogActions from '@mui/material/DialogActions'; import DialogContent from '@mui/material/DialogContent'; @@ -131,15 +124,6 @@ const ReviewPeriods = ({ onPeriodSelected, mode }) => { const userProfile = selectUserProfile(state); const isAdmin = userProfile?.role?.includes('ADMIN'); - const launchDatePickerRef = useRef(null); - useEffect(() => { - const { current } = launchDatePickerRef; - if (current) { - const button = current.querySelector('button'); - button?.click(); - } - }, [launchDatePickerRef.current]); - const handleOpen = useCallback(() => setOpen(true), [setOpen]); const handleClose = useCallback(() => setOpen(false), [setOpen]); @@ -264,7 +248,6 @@ const ReviewPeriods = ({ onPeriodSelected, mode }) => { !res.error ? res.payload.data : null; - // console.log('ReviewPeriods.jsx useEffect: data =', data); if (data) { dispatch({ type: UPDATE_REVIEW_PERIODS, payload: data }); setLoading(false); @@ -429,11 +412,6 @@ const ReviewPeriods = ({ onPeriodSelected, mode }) => { primary={name + (open ? ' - Open' : '')} secondary={getSecondaryLabel(id)} /> -
- - - -
))