From 2ab07e89ea56853863855611295fc2752da9a4e6 Mon Sep 17 00:00:00 2001 From: Chad Elliott Date: Thu, 24 Oct 2024 14:31:42 -0500 Subject: [PATCH 01/34] Ignore unhandled requests. --- web-ui/src/components/action_item/ActionItemsPanel.test.jsx | 2 +- web-ui/src/components/edit_skills/EditSkillsCard.test.jsx | 2 +- web-ui/src/components/guild-results/EditGuildModal.spec.jsx | 2 +- .../member_selector_dialog/MemberSelectorDialog.spec.jsx | 2 +- web-ui/src/pages/SettingsPage.test.jsx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web-ui/src/components/action_item/ActionItemsPanel.test.jsx b/web-ui/src/components/action_item/ActionItemsPanel.test.jsx index 5476f74548..5f00dcf947 100644 --- a/web-ui/src/components/action_item/ActionItemsPanel.test.jsx +++ b/web-ui/src/components/action_item/ActionItemsPanel.test.jsx @@ -71,7 +71,7 @@ const server = setupServer( ) ); -beforeAll(() => server.listen()); +beforeAll(() => server.listen({ onUnhandledRequest(request, print) {} })); afterEach(() => server.resetHandlers()); afterAll(() => server.close()); diff --git a/web-ui/src/components/edit_skills/EditSkillsCard.test.jsx b/web-ui/src/components/edit_skills/EditSkillsCard.test.jsx index a5c7f197bf..94ae952868 100644 --- a/web-ui/src/components/edit_skills/EditSkillsCard.test.jsx +++ b/web-ui/src/components/edit_skills/EditSkillsCard.test.jsx @@ -72,7 +72,7 @@ const server = setupServer( }) ); -beforeAll(() => server.listen()); +beforeAll(() => server.listen({ onUnhandledRequest(request, print) {} })); afterEach(() => server.resetHandlers()); afterAll(() => server.close()); diff --git a/web-ui/src/components/guild-results/EditGuildModal.spec.jsx b/web-ui/src/components/guild-results/EditGuildModal.spec.jsx index 0473bb1e01..8bd4e42c75 100644 --- a/web-ui/src/components/guild-results/EditGuildModal.spec.jsx +++ b/web-ui/src/components/guild-results/EditGuildModal.spec.jsx @@ -20,7 +20,7 @@ const server = setupServer( }) ); -beforeAll(() => server.listen()); +beforeAll(() => server.listen({ onUnhandledRequest(request, print) {} })); afterEach(() => server.resetHandlers()); afterAll(() => server.close()); diff --git a/web-ui/src/components/member_selector/member_selector_dialog/MemberSelectorDialog.spec.jsx b/web-ui/src/components/member_selector/member_selector_dialog/MemberSelectorDialog.spec.jsx index 5e5f8cc157..36b2eb3e60 100644 --- a/web-ui/src/components/member_selector/member_selector_dialog/MemberSelectorDialog.spec.jsx +++ b/web-ui/src/components/member_selector/member_selector_dialog/MemberSelectorDialog.spec.jsx @@ -77,7 +77,7 @@ const server = setupServer( ) ); -beforeAll(() => server.listen()); +beforeAll(() => server.listen({ onUnhandledRequest(request, print) {} })); afterEach(() => server.resetHandlers()); afterAll(() => server.close()); diff --git a/web-ui/src/pages/SettingsPage.test.jsx b/web-ui/src/pages/SettingsPage.test.jsx index d1d7c25022..4f114b8ce7 100644 --- a/web-ui/src/pages/SettingsPage.test.jsx +++ b/web-ui/src/pages/SettingsPage.test.jsx @@ -47,7 +47,7 @@ const server = setupServer( }), ); -beforeAll(() => server.listen()); +beforeAll(() => server.listen({ onUnhandledRequest(request, print) {} })); afterEach(() => server.resetHandlers()); afterAll(() => server.close()); From a03b85b8ef9efb0e58486d3f4fcca7549f5f8c6e Mon Sep 17 00:00:00 2001 From: Chad Elliott Date: Thu, 24 Oct 2024 14:32:07 -0500 Subject: [PATCH 02/34] Removed duplicate code. --- .../feedback_request_card/FeedbackRequestCard.jsx | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/web-ui/src/components/feedback_request_card/FeedbackRequestCard.jsx b/web-ui/src/components/feedback_request_card/FeedbackRequestCard.jsx index ae439d4ef8..7bc992bba1 100644 --- a/web-ui/src/components/feedback_request_card/FeedbackRequestCard.jsx +++ b/web-ui/src/components/feedback_request_card/FeedbackRequestCard.jsx @@ -106,9 +106,6 @@ const FeedbackRequestCard = ({ requestDate => { let oldestDate = new Date(); switch (dateRange) { - case DateRange.THREE_MONTHS: - oldestDate.setMonth(oldestDate.getMonth() - 3); - break; case DateRange.SIX_MONTHS: oldestDate.setMonth(oldestDate.getMonth() - 6); break; @@ -117,6 +114,7 @@ const FeedbackRequestCard = ({ break; case DateRange.ALL_TIME: return true; + case DateRange.THREE_MONTHS: default: oldestDate.setMonth(oldestDate.getMonth() - 3); } @@ -181,10 +179,6 @@ const FeedbackRequestCard = ({ let sortMethod; switch (sortType) { - case SortOption.SENT_DATE: - sortMethod = (a, b) => - new Date(a.sendDate) > new Date(b.sendDate) ? -1 : 1; - break; case SortOption.SUBMISSION_DATE: sortMethod = (a, b) => !a.submitDate || new Date(a.submitDate) > new Date(b.submitDate) @@ -205,6 +199,7 @@ const FeedbackRequestCard = ({ ? -1 : 1; break; + case SortOption.SENT_DATE: default: sortMethod = (a, b) => new Date(a.sendDate) > new Date(b.sendDate) ? -1 : 1; From 834f1557b5ba754b0a240bee5126b152a79a30a8 Mon Sep 17 00:00:00 2001 From: Chad Elliott Date: Thu, 24 Oct 2024 14:32:32 -0500 Subject: [PATCH 03/34] Added required props. --- .../feedback_request_card/FeedbackRequestCard.test.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web-ui/src/components/feedback_request_card/FeedbackRequestCard.test.jsx b/web-ui/src/components/feedback_request_card/FeedbackRequestCard.test.jsx index 1d78434b16..89b6087bc3 100644 --- a/web-ui/src/components/feedback_request_card/FeedbackRequestCard.test.jsx +++ b/web-ui/src/components/feedback_request_card/FeedbackRequestCard.test.jsx @@ -8,6 +8,8 @@ it('renders correctly', () => { Date: Thu, 24 Oct 2024 14:38:17 -0500 Subject: [PATCH 04/34] Fixed incorrectly named props (probably renamed). --- .../FeedbackSubmitQuestion.test.jsx | 6 +- .../FeedbackSubmitQuestion.test.jsx.snap | 235 ++++++++++++++++++ 2 files changed, 238 insertions(+), 3 deletions(-) diff --git a/web-ui/src/components/feedback_submit_question/FeedbackSubmitQuestion.test.jsx b/web-ui/src/components/feedback_submit_question/FeedbackSubmitQuestion.test.jsx index c46d8e72be..fc8df5643b 100644 --- a/web-ui/src/components/feedback_submit_question/FeedbackSubmitQuestion.test.jsx +++ b/web-ui/src/components/feedback_submit_question/FeedbackSubmitQuestion.test.jsx @@ -10,7 +10,7 @@ it('renders the feedback submit question as text', () => { id: '1', question: 'How is the project going so far?', questionNumber: 1, - questionType: 'TEXT' + inputType: 'TEXT' }} readOnly={false} answer={{ @@ -34,7 +34,7 @@ it('renders the feedback submit question as radio buttons', () => { id: '1', question: 'Do you think the project is going well so far?', questionNumber: 1, - questionType: 'RADIO' + inputType: 'RADIO' }} readOnly={false} answer={{ @@ -58,7 +58,7 @@ it('renders the feedback submit question as a slider', () => { id: '1', question: 'Do you think the project is going well so far?', questionNumber: 1, - questionType: 'SLIDER' + inputType: 'SLIDER' }} readOnly={false} answer={{ diff --git a/web-ui/src/components/feedback_submit_question/__snapshots__/FeedbackSubmitQuestion.test.jsx.snap b/web-ui/src/components/feedback_submit_question/__snapshots__/FeedbackSubmitQuestion.test.jsx.snap index 19fa4ce493..64a5a0343e 100644 --- a/web-ui/src/components/feedback_submit_question/__snapshots__/FeedbackSubmitQuestion.test.jsx.snap +++ b/web-ui/src/components/feedback_submit_question/__snapshots__/FeedbackSubmitQuestion.test.jsx.snap @@ -11,6 +11,101 @@ exports[`renders the feedback submit question as a slider 1`] = ` > Do you think the project is going well so far?

+