diff --git a/web-ui/src/App.jsx b/web-ui/src/App.jsx index 95554aa2b..9b634dc38 100644 --- a/web-ui/src/App.jsx +++ b/web-ui/src/App.jsx @@ -46,7 +46,7 @@ function SchemeToggle() { const theme = createTheme({ cssVariables: { - colorSchemeSelector: 'data', + colorSchemeSelector: 'data' }, colorSchemes: { light: { diff --git a/web-ui/src/components/expand-more/ExpandMore.jsx b/web-ui/src/components/expand-more/ExpandMore.jsx index 267487370..1bdc5fe84 100644 --- a/web-ui/src/components/expand-more/ExpandMore.jsx +++ b/web-ui/src/components/expand-more/ExpandMore.jsx @@ -9,24 +9,20 @@ const ExpandMore = styled(props => { {props.children ? props.children : } ); -})(({ - theme -}) => ({ +})(({ theme }) => ({ transform: 'rotate(180deg)', marginLeft: 'auto', transition: theme.transitions.create('transform', { duration: theme.transitions.duration.shortest }), - variants: [{ - props: ( - { - expand + variants: [ + { + props: ({ expand }) => !expand, + style: { + transform: 'rotate(0deg)' } - ) => !expand, - style: { - transform: 'rotate(0deg)' } - }] + ] })); export default ExpandMore; diff --git a/web-ui/src/components/notes/Note.jsx b/web-ui/src/components/notes/Note.jsx index 4332449c8..ca16ff460 100644 --- a/web-ui/src/components/notes/Note.jsx +++ b/web-ui/src/components/notes/Note.jsx @@ -100,7 +100,7 @@ const Notes = props => { } setNote(note => { - const newNote = { ...note, description: content }; + const newNote = { ...note, description: content }; updateNote(newNote, csrf); return newNote; }); @@ -125,32 +125,39 @@ const Notes = props => { ) : ( <> -
- +
+ )} diff --git a/web-ui/src/components/notes/Note.test.jsx b/web-ui/src/components/notes/Note.test.jsx index cc1029a7e..9b9127675 100644 --- a/web-ui/src/components/notes/Note.test.jsx +++ b/web-ui/src/components/notes/Note.test.jsx @@ -65,9 +65,12 @@ const notes = [ ]; const server = setupServer( - http.get(`http://localhost:8080/services/checkin-notes?checkinid=${checkin.id}`, () => { - return HttpResponse.json(notes); - }), + http.get( + `http://localhost:8080/services/checkin-notes?checkinid=${checkin.id}`, + () => { + return HttpResponse.json(notes); + } + ) ); beforeAll(() => server.listen({ onUnhandledRequest(request, print) {} })); @@ -75,7 +78,8 @@ afterEach(() => server.resetHandlers()); afterAll(() => server.close()); it('renders correctly', async () => { - await waitForSnapshot('tiny-mce-checkin-notes', + await waitForSnapshot( + 'tiny-mce-checkin-notes', {
) : ( <> -
- +
+ - )} - - - ) - ); - }; + )} + + + ) + ); +}; - export default PrivateNote; +export default PrivateNote; diff --git a/web-ui/src/components/private-note/PrivateNote.test.jsx b/web-ui/src/components/private-note/PrivateNote.test.jsx index f6e3c8c0c..1449a252c 100644 --- a/web-ui/src/components/private-note/PrivateNote.test.jsx +++ b/web-ui/src/components/private-note/PrivateNote.test.jsx @@ -75,9 +75,12 @@ const notes = [ ]; const server = setupServer( - http.get(`http://localhost:8080/services/private-notes?checkinid=${checkin.id}`, () => { - return HttpResponse.json(notes); - }), + http.get( + `http://localhost:8080/services/private-notes?checkinid=${checkin.id}`, + () => { + return HttpResponse.json(notes); + } + ) ); beforeAll(() => server.listen({ onUnhandledRequest(request, print) {} })); @@ -85,7 +88,8 @@ afterEach(() => server.resetHandlers()); afterAll(() => server.close()); it('renders correctly', async () => { - await waitForSnapshot('tiny-mce-checkin-private-notes', + await waitForSnapshot( + 'tiny-mce-checkin-private-notes', { }; ReviewPeriods.propTypes = propTypes; ReviewPeriods.displayName = displayName; -export default ReviewPeriods; \ No newline at end of file +export default ReviewPeriods; diff --git a/web-ui/src/pages/CheckinsPage.test.jsx b/web-ui/src/pages/CheckinsPage.test.jsx index 17ec5c50b..0d6a0458c 100644 --- a/web-ui/src/pages/CheckinsPage.test.jsx +++ b/web-ui/src/pages/CheckinsPage.test.jsx @@ -81,9 +81,12 @@ const server = setupServer( http.get('http://localhost:8080/services/document/1', () => { return HttpResponse.json(mockuments); }), - http.get(`http://localhost:8080/services/checkin-notes?checkinid=${mockCheckinId}`, () => { - return HttpResponse.json(notes); - }), + http.get( + `http://localhost:8080/services/checkin-notes?checkinid=${mockCheckinId}`, + () => { + return HttpResponse.json(notes); + } + ) ); beforeAll(() => server.listen({ onUnhandledRequest(request, print) {} })); diff --git a/web-ui/src/pages/CloseWindow.jsx b/web-ui/src/pages/CloseWindow.jsx index 65ab1275c..fb3fdcf9e 100644 --- a/web-ui/src/pages/CloseWindow.jsx +++ b/web-ui/src/pages/CloseWindow.jsx @@ -1,5 +1,9 @@ -window.close(); +import React from 'react'; +import { useEffect } from 'react'; export default function CloseWindow() { + useEffect(() => { + window.close(); + }, []); return <>; } diff --git a/web-ui/src/pages/EmailPage.css b/web-ui/src/pages/EmailPage.css index 84f6b58a2..5ea0c8487 100644 --- a/web-ui/src/pages/EmailPage.css +++ b/web-ui/src/pages/EmailPage.css @@ -25,15 +25,16 @@ .email-page .email-format-container .email-format-button-selected { color: #313131; - background-color: rgba(var(--mui-palette-primary-mainChannel) / var(--mui-palette-action-selectedOpacity));; + background-color: rgba( + var(--mui-palette-primary-mainChannel) / + var(--mui-palette-action-selectedOpacity) + ); border: 2px solid green; text-align: center; margin: 0.5rem 3rem; } -.email-page - .email-format-container - .email-format-button-content { +.email-page .email-format-container .email-format-button-content { width: 250px; color: var(--mui-palette-primary-text); height: 250px; diff --git a/web-ui/src/pages/EmailPage.jsx b/web-ui/src/pages/EmailPage.jsx index c1b679273..51295363a 100644 --- a/web-ui/src/pages/EmailPage.jsx +++ b/web-ui/src/pages/EmailPage.jsx @@ -71,7 +71,11 @@ const ChooseEmailFormatStep = ({ <>