Skip to content

Commit

Permalink
Add a button to the settings panel to reset all settings to their def…
Browse files Browse the repository at this point in the history
…ault values. Closes #3183.
  • Loading branch information
fniessink committed Feb 1, 2022
1 parent 0c69f55 commit e2715ee
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 2 deletions.
3 changes: 2 additions & 1 deletion components/frontend/src/AppUI.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export function AppUI({
const current_report = reports.filter((report) => report.report_uuid === report_uuid)[0] || null;
const [dateInterval, setDateInterval] = useURLSearchQuery(history, "date_interval", "integer", 7);
const [dateOrder, setDateOrder] = useURLSearchQuery(history, "date_order", "string", "descending");
const [hiddenColumns, toggleHiddenColumn] = useURLSearchQuery(history, "hidden_columns", "array");
const [hiddenColumns, toggleHiddenColumn, clearHiddenColumns] = useURLSearchQuery(history, "hidden_columns", "array");
const [hideMetricsNotRequiringAction, setHideMetricsNotRequiringAction] = useURLSearchQuery(history, "hide_metrics_not_requiring_action", "boolean", false);
const [nrDates, setNrDates] = useURLSearchQuery(history, "nr_dates", "integer", 1);
const [visibleDetailsTabs, toggleVisibleDetailsTab, clearVisibleDetailsTabs] = useURLSearchQuery(history, "tabs", "array");
Expand All @@ -55,6 +55,7 @@ export function AppUI({
set_user={set_user}
user={user}
panel={<ViewPanel
clearHiddenColumns={clearHiddenColumns}
clearVisibleDetailsTabs={clearVisibleDetailsTabs}
dateInterval={dateInterval}
dateOrder={dateOrder}
Expand Down
29 changes: 28 additions & 1 deletion components/frontend/src/header_footer/ViewPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { capitalize, pluralize } from "../utils";
import './ViewPanel.css';

export function ViewPanel({
clearHiddenColumns,
clearVisibleDetailsTabs,
dateInterval,
dateOrder,
Expand All @@ -21,7 +22,7 @@ export function ViewPanel({
<Segment.Group
horizontal
className='equal width'
style={{margin: "0px", border: "0px"}}
style={{ margin: "0px", border: "0px" }}
>
<Segment inverted color="black">
<Grid padded>
Expand All @@ -36,6 +37,32 @@ export function ViewPanel({
</Button>
</Grid.Column>
</Grid.Row>
<Grid.Row>
<Grid.Column>
<Button
disabled={
visibleDetailsTabs.length === 0 &&
!hideMetricsNotRequiringAction &&
hiddenColumns.length === 0 &&
nrDates === 1 &&
dateInterval === 7 &&
dateOrder === "descending"

}
onClick={() => {
clearVisibleDetailsTabs();
setHideMetricsNotRequiringAction(false);
clearHiddenColumns();
setNrDates(1);
setDateInterval(7);
setDateOrder("descending");
}}
inverted
>
Reset all settings
</Button>
</Grid.Column>
</Grid.Row>
</Grid>
</Segment>
<Segment inverted color="black">
Expand Down
30 changes: 30 additions & 0 deletions components/frontend/src/header_footer/ViewPanel.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,36 @@ it("doesn't clear the visible details tabs if there are none", async () => {
expect(clearVisibleDetailsTabs).not.toHaveBeenCalled()
})

it('resets the settings', async () => {
const clearVisibleDetailsTabs = jest.fn();
const clearHiddenColumns = jest.fn();
const setDateInterval = jest.fn();
const setDateOrder = jest.fn();
const setHideMetricsNotRequiringAction = jest.fn();
const setNrDates = jest.fn();
await act(async () => {
render(
<ViewPanel
clearHiddenColumns={clearHiddenColumns}
clearVisibleDetailsTabs={clearVisibleDetailsTabs}
hiddenColumns={["trend"]}
setDateInterval={setDateInterval}
setDateOrder={setDateOrder}
setHideMetricsNotRequiringAction={setHideMetricsNotRequiringAction}
setNrDates={setNrDates}
visibleDetailsTabs={["tab"]}
/>
)
fireEvent.click(screen.getByText(/Reset all settings/))
});
expect(clearVisibleDetailsTabs).toHaveBeenCalled()
expect(clearHiddenColumns).toHaveBeenCalled()
expect(setDateInterval).toHaveBeenCalled()
expect(setDateOrder).toHaveBeenCalled()
expect(setNrDates).toHaveBeenCalled()
expect(setHideMetricsNotRequiringAction).toHaveBeenCalled()
})

it("hides the metrics not requiring action", async () => {
const setHideMetricsNotRequiringAction = jest.fn();
await act(async () => {
Expand Down
1 change: 1 addition & 0 deletions docs/src/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
### Added

- Add a setting to the settings panel to allow for reversing the order of the date columns in the metric tables. Closes [#2928](https://github.com/ICTU/quality-time/issues/2928).
- Add a button to the settings panel to reset all settings to their default values. Closes [#3183](https://github.com/ICTU/quality-time/issues/3183).

## v3.32.0 - 2022-01-24

Expand Down

0 comments on commit e2715ee

Please sign in to comment.