From 940b70bb622cc09c0375d3fbb8debfcb080e04d6 Mon Sep 17 00:00:00 2001 From: Daniel Dervishi Date: Thu, 27 Jul 2023 16:35:30 -0400 Subject: [PATCH] Rename mutateFilterData to updateFilterData --- .../Components/Modals/filter_modal.jsx | 32 +++++++++---------- .../javascripts/Components/Result/result.jsx | 2 +- .../Components/Result/submission_selector.jsx | 2 +- .../__tests__/filter_modal.test.jsx | 28 ++++++++-------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/app/assets/javascripts/Components/Modals/filter_modal.jsx b/app/assets/javascripts/Components/Modals/filter_modal.jsx index e1d3373f85..60957a8b84 100644 --- a/app/assets/javascripts/Components/Modals/filter_modal.jsx +++ b/app/assets/javascripts/Components/Modals/filter_modal.jsx @@ -8,25 +8,25 @@ export class FilterModal extends React.Component { onToggleOptionTas = user_name => { const newArray = [...this.props.filterData.tas]; if (newArray.includes(user_name)) { - this.props.mutateFilterData({ + this.props.updateFilterData({ tas: newArray.filter(item => item !== user_name), }); } else { newArray.push(user_name); - this.props.mutateFilterData({ + this.props.updateFilterData({ tas: newArray, }); } }; onClearSelectionTAs = () => { - this.props.mutateFilterData({ + this.props.updateFilterData({ tas: [], }); }; onClearSelectionTags = () => { - this.props.mutateFilterData({ + this.props.updateFilterData({ tags: [], }); }; @@ -34,12 +34,12 @@ export class FilterModal extends React.Component { onToggleOptionTags = tag => { const newArray = [...this.props.filterData.tags]; if (newArray.includes(tag)) { - this.props.mutateFilterData({ + this.props.updateFilterData({ tags: newArray.filter(item => item !== tag), }); } else { newArray.push(tag); - this.props.mutateFilterData({ + this.props.updateFilterData({ tags: newArray, }); } @@ -128,25 +128,25 @@ export class FilterModal extends React.Component { }; onTotalMarkMinChange = e => { - this.props.mutateFilterData({ + this.props.updateFilterData({ totalMarkRange: {...this.props.filterData.totalMarkRange, min: e.target.value}, }); }; onTotalMarkMaxChange = e => { - this.props.mutateFilterData({ + this.props.updateFilterData({ totalMarkRange: {...this.props.filterData.totalMarkRange, max: e.target.value}, }); }; onTotalExtraMarkMinChange = e => { - this.props.mutateFilterData({ + this.props.updateFilterData({ totalExtraMarkRange: {...this.props.filterData.totalExtraMarkRange, min: e.target.value}, }); }; onTotalExtraMarkMaxChange = e => { - this.props.mutateFilterData({ + this.props.updateFilterData({ totalExtraMarkRange: {...this.props.filterData.totalExtraMarkRange, max: e.target.value}, }); }; @@ -190,7 +190,7 @@ export class FilterModal extends React.Component { options={["group_name", "submission_date"]} selected={this.props.filterData.orderBy} onSelect={selection => { - this.props.mutateFilterData({ + this.props.updateFilterData({ orderBy: selection, }); }} @@ -202,7 +202,7 @@ export class FilterModal extends React.Component { checked={this.props.filterData.ascending} name="order" onChange={() => { - this.props.mutateFilterData({ascending: true}); + this.props.updateFilterData({ascending: true}); }} id={"Asc"} data-testid={"ascending"} @@ -213,7 +213,7 @@ export class FilterModal extends React.Component { checked={!this.props.filterData.ascending} name="order" onChange={() => { - this.props.mutateFilterData({ascending: false}); + this.props.updateFilterData({ascending: false}); }} id={"Desc"} data-testid={"descending"} @@ -233,7 +233,7 @@ export class FilterModal extends React.Component { options={["in_progress", "complete", "released", "remark_requested"]} selected={this.props.filterData.markingState} onSelect={selection => { - this.props.mutateFilterData({ + this.props.updateFilterData({ markingState: selection, }); }} @@ -251,7 +251,7 @@ export class FilterModal extends React.Component { options={this.props.sections.sort()} selected={this.props.filterData.section} onSelect={selection => { - this.props.mutateFilterData({ + this.props.updateFilterData({ section: selection, }); }} @@ -267,7 +267,7 @@ export class FilterModal extends React.Component { type={"text"} value={this.props.filterData.annotationText} onChange={e => - this.props.mutateFilterData({ + this.props.updateFilterData({ annotationText: e.target.value, }) } diff --git a/app/assets/javascripts/Components/Result/result.jsx b/app/assets/javascripts/Components/Result/result.jsx index e0101f23ee..98c8b09c4c 100644 --- a/app/assets/javascripts/Components/Result/result.jsx +++ b/app/assets/javascripts/Components/Result/result.jsx @@ -818,7 +818,7 @@ class Result extends React.Component { previousSubmission={this.nextSubmission(-1)} course_id={this.props.course_id} filterData={this.state.filterData} - mutateFilterData={this.updateFilterData} + updateFilterData={this.updateFilterData} clearAllFilters={this.resetFilterData} sections={this.state.sections} tas={this.state.tas} diff --git a/app/assets/javascripts/Components/Result/submission_selector.jsx b/app/assets/javascripts/Components/Result/submission_selector.jsx index 1191aad3e5..7466b6bc74 100644 --- a/app/assets/javascripts/Components/Result/submission_selector.jsx +++ b/app/assets/javascripts/Components/Result/submission_selector.jsx @@ -160,7 +160,7 @@ export class SubmissionSelector extends React.Component { isOpen={this.state.showFilterModal} onRequestClose={() => this.setState({showFilterModal: false})} filterData={this.props.filterData} - mutateFilterData={this.props.mutateFilterData} + updateFilterData={this.props.updateFilterData} clearAllFilters={this.props.clearAllFilters} sections={this.props.sections} tas={this.props.tas} diff --git a/app/assets/javascripts/Components/__tests__/filter_modal.test.jsx b/app/assets/javascripts/Components/__tests__/filter_modal.test.jsx index c3810b034f..965a2533e2 100644 --- a/app/assets/javascripts/Components/__tests__/filter_modal.test.jsx +++ b/app/assets/javascripts/Components/__tests__/filter_modal.test.jsx @@ -44,7 +44,7 @@ describe("FilterModal", () => { ], isOpen: true, onRequestClose: jest.fn().mockImplementation(() => (props.isOpen = false)), - mutateFilterData: jest.fn().mockImplementation(() => null), + updateFilterData: jest.fn().mockImplementation(() => null), clearAllFilters: jest.fn().mockImplementation(() => null), role: role, }; @@ -80,7 +80,7 @@ describe("FilterModal", () => { fireEvent.change(screen.getByPlaceholderText(/Type here/i), { target: {value: "JavaScript"}, }); - expect(props.mutateFilterData).toHaveBeenCalled(); + expect(props.updateFilterData).toHaveBeenCalled(); }); }); @@ -90,7 +90,7 @@ describe("FilterModal", () => { const dropdown = screen.getByTestId(test_id); const icon = within(dropdown).getByTestId("reset"); fireEvent.click(icon); - expect(props.mutateFilterData).toHaveBeenCalled(); + expect(props.updateFilterData).toHaveBeenCalled(); }); }; @@ -111,7 +111,7 @@ describe("FilterModal", () => { const option = within(dropdown).getByText(selection); fireEvent.click(option); - expect(props.mutateFilterData).toHaveBeenCalled(); + expect(props.updateFilterData).toHaveBeenCalled(); }); }; @@ -120,7 +120,7 @@ describe("FilterModal", () => { const dropdown = screen.getByTestId(test_id); fireEvent.click(within(dropdown).getByText(option)); - expect(props.mutateFilterData).toHaveBeenCalled(); + expect(props.updateFilterData).toHaveBeenCalled(); }); it("should deselect option when clicked on a selected option", () => { @@ -132,7 +132,7 @@ describe("FilterModal", () => { const selected_option = within(list).getByText(option); fireEvent.click(selected_option); - expect(props.mutateFilterData).toHaveBeenCalled(); + expect(props.updateFilterData).toHaveBeenCalled(); }); }; @@ -168,7 +168,7 @@ describe("FilterModal", () => { target: {value: 10}, }); - expect(props.mutateFilterData).toHaveBeenCalled(); + expect(props.updateFilterData).toHaveBeenCalled(); }); }; @@ -231,7 +231,7 @@ describe("FilterModal", () => { let dropdownDiv = screen.getByTestId(filterTestId); fireEvent.click(within(dropdownDiv).getByTestId("dropdown")); fireEvent.click(within(dropdownDiv).getByText(selection)); - expect(props.mutateFilterData).toHaveBeenCalled(); + expect(props.updateFilterData).toHaveBeenCalled(); }); }; @@ -245,7 +245,7 @@ describe("FilterModal", () => { // resetting the dropdown value fireEvent.click(within(dropdownDiv).getByTestId("reset-dropdown-selection")); - expect(props.mutateFilterData).toHaveBeenCalled(); + expect(props.updateFilterData).toHaveBeenCalled(); }); }; @@ -267,7 +267,7 @@ describe("FilterModal", () => { it("should save the selection on change", () => { // setting the ordering to descending fireEvent.click(within(screen.getByTestId("order-by")).getByTestId("descending")); - expect(props.mutateFilterData).toHaveBeenCalled(); + expect(props.updateFilterData).toHaveBeenCalled(); }); }); }); @@ -304,7 +304,7 @@ describe("FilterModal", () => { const dropdown = screen.getByTestId(test_id); const icon = within(dropdown).getByTestId("reset"); fireEvent.click(icon); - expect(props.mutateFilterData).toHaveBeenCalled(); + expect(props.updateFilterData).toHaveBeenCalled(); }); it("should render all selected tags", () => { @@ -319,7 +319,7 @@ describe("FilterModal", () => { const option = within(dropdown).getByText("d - D"); fireEvent.click(option); - expect(props.mutateFilterData).toHaveBeenCalled(); + expect(props.updateFilterData).toHaveBeenCalled(); }); it("should deselect option when clicked on a tag", () => { @@ -327,7 +327,7 @@ describe("FilterModal", () => { const tag = within(dropdown).getByText("a"); fireEvent.click(tag); - expect(props.mutateFilterData).toHaveBeenCalled(); + expect(props.updateFilterData).toHaveBeenCalled(); }); it("should deselect option when clicked on a selected option", () => { @@ -336,7 +336,7 @@ describe("FilterModal", () => { const selected_option = within(dropdown).getByText("a - A"); fireEvent.click(selected_option); - expect(props.mutateFilterData).toHaveBeenCalled(); + expect(props.updateFilterData).toHaveBeenCalled(); }); }); });