change(ui) - update filters from url instead of applying and fetching
This commit is contained in:
parent
d0563d3fcb
commit
72e0b6ab62
2 changed files with 10 additions and 4 deletions
|
|
@ -2,12 +2,12 @@ import React, { useEffect } from 'react';
|
|||
import { useHistory } from 'react-router';
|
||||
import { connect } from 'react-redux';
|
||||
import { addFilterByKeyAndValue, addFilter } from 'Duck/search';
|
||||
import { applyFilter } from 'Duck/search';
|
||||
import { updateFilter } from 'Duck/search';
|
||||
import { createUrlQuery, getFiltersFromQuery } from 'App/utils/search';
|
||||
|
||||
interface Props {
|
||||
appliedFilter: any;
|
||||
applyFilter: any;
|
||||
updateFilter: any;
|
||||
addFilterByKeyAndValue: typeof addFilterByKeyAndValue;
|
||||
addFilter: typeof addFilter;
|
||||
}
|
||||
|
|
@ -17,7 +17,7 @@ const SessionSearchQueryParamHandler = (props: Props) => {
|
|||
|
||||
const applyFilterFromQuery = () => {
|
||||
const filter = getFiltersFromQuery(history.location.search, appliedFilter);
|
||||
props.applyFilter(filter, true);
|
||||
props.updateFilter(filter, true);
|
||||
};
|
||||
|
||||
const generateUrlQuery = () => {
|
||||
|
|
@ -35,5 +35,5 @@ export default connect(
|
|||
(state: any) => ({
|
||||
appliedFilter: state.getIn(['search', 'instance']),
|
||||
}),
|
||||
{ addFilterByKeyAndValue, addFilter, applyFilter }
|
||||
{ addFilterByKeyAndValue, addFilter, updateFilter }
|
||||
)(SessionSearchQueryParamHandler);
|
||||
|
|
|
|||
|
|
@ -243,6 +243,12 @@ export const applyFilter = reduceThenFetchResource((filter, force = false) => ({
|
|||
force,
|
||||
}));
|
||||
|
||||
export const updateFilter = (filter, force = false) => ({
|
||||
type: APPLY,
|
||||
filter,
|
||||
force,
|
||||
});
|
||||
|
||||
export const updateCurrentPage = reduceThenFetchResource((page) => ({
|
||||
type: UPDATE_CURRENT_PAGE,
|
||||
page,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue