Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change the API url path of changing type filter #130

Merged
merged 3 commits into from
Apr 19, 2019
Merged

Change the API url path of changing type filter #130

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8ccd5c
Change the API url path of changing type filter
Apr 18, 2019
d08fa5b
Reset page to 1 when type filter is changed
Apr 18, 2019
05ffec4
Show type filter box when url gives filter
Apr 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 25 additions & 12 deletions src/pages/Transactions/Transactions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ interface State {
redirect: boolean;
redirectPage?: number;
redirectItemsPerPage?: number;
selectedTypes: string[];
redirectFilter: string[];
showTypeFilter: boolean;
}

Expand All @@ -53,7 +53,7 @@ class Transactions extends React.Component<Props, State> {
redirect: false,
redirectItemsPerPage: undefined,
redirectPage: undefined,
selectedTypes: [],
redirectFilter: [],
showTypeFilter: false
};
}
Expand All @@ -65,14 +65,18 @@ class Transactions extends React.Component<Props, State> {
const {
location: { search: nextSearch }
} = props;
const typeFilter = new URLSearchParams(search).get("filter") !== undefined;
if (nextSearch !== search) {
this.setState({
transactions: [],
isTransactionRequested: false,
redirect: false,
redirectPage: undefined,
redirectItemsPerPage: undefined
redirectItemsPerPage: undefined,
showTypeFilter: typeFilter
});
} else {
this.setState({ showTypeFilter: typeFilter });
}
}

Expand All @@ -84,22 +88,26 @@ class Transactions extends React.Component<Props, State> {
const params = new URLSearchParams(search);
const currentPage = params.get("page") ? parseInt(params.get("page") as string, 10) : 1;
const itemsPerPage = params.get("itemsPerPage") ? parseInt(params.get("itemsPerPage") as string, 10) : 25;
const selectedTypes = params.get("filter") ? params.get("filter")!.split(",") : [];

const {
transactions,
totalTransactionCount,
isTransactionRequested,
redirect,
redirectItemsPerPage,
redirectPage,
showTypeFilter,
selectedTypes
redirectFilter,
showTypeFilter
} = this.state;

if (redirect) {
return (
<Redirect
push={true}
to={`/txs?page=${redirectPage || currentPage}&itemsPerPage=${redirectItemsPerPage || itemsPerPage}`}
to={`/txs?page=${redirectPage || currentPage}&itemsPerPage=${redirectItemsPerPage || itemsPerPage}${
selectedTypes || redirectFilter ? `&filter=${redirectFilter.sort().join(",")}` : ""
}`}
/>
);
}
Expand Down Expand Up @@ -157,7 +165,8 @@ class Transactions extends React.Component<Props, State> {
id={type}
checked={_.includes(selectedTypes, type)}
value={type}
onChange={this.handleFilterChange}
// tslint:disable-next-line:jsx-no-lambda
onChange={event => this.handleFilterChange(event, selectedTypes)}
/>
<label className="form-check-label" htmlFor={`${type}`}>
{type}
Expand Down Expand Up @@ -312,16 +321,20 @@ class Transactions extends React.Component<Props, State> {
this.setState({ showTypeFilter: false });
};

private handleFilterChange = (event: React.ChangeEvent<HTMLInputElement>) => {
private handleFilterChange = (event: React.ChangeEvent<HTMLInputElement>, selectedTypes: string[]) => {
if (event.target.checked) {
this.setState({
selectedTypes: [...this.state.selectedTypes, event.target.value],
isTransactionRequested: false
redirectFilter: [...selectedTypes, event.target.value],
isTransactionRequested: false,
redirect: true,
redirectPage: 1
});
} else {
this.setState({
selectedTypes: this.state.selectedTypes.filter(type => type !== event.target.value),
isTransactionRequested: false
redirectFilter: selectedTypes.filter(type => type !== event.target.value),
isTransactionRequested: false,
redirect: true,
redirectPage: 1
});
}
};
Expand Down