mirror/alice-lg-alice-lg
1
0
Fork 0
mirror of https://github.com/alice-lg/alice-lg.git synced 2024-05-11 05:55:03 +00:00
Code Releases Activity

generalized props for filter editor

Browse Source
This commit is contained in:
Matthias Hannig
2018-10-23 20:11:02 +02:00
parent f2d9d99e7d
commit 9dc91f61b2
2 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
client/components/filters/editor.jsx
View File

@ -95,40 +95,32 @@ class FiltersEditor extends React.Component {
}
export default connect(
(state) => ({
(state, props) => ({
isLoading: state.lookup.isLoading,
hasRoutes: state.lookup.routesFiltered.length > 0 ||
state.lookup.routesImported.length > 0,
link: {
pageReceived: 0, // Reset pagination on filter change
pageFiltered: 0,
query: state.lookup.query,
filtersApplied: state.lookup.filtersApplied,
routing: state.routing.locationBeforeTransitions,
},
link: props.linkProps,
available: state.lookup.filtersAvailable,
applied: state.lookup.filtersApplied,
available: props.filtersAvailable,
applied: props.filtersApplied,
availableSources: state.lookup.filtersAvailable[FILTER_GROUP_SOURCES].filters,
appliedSources: state.lookup.filtersApplied[FILTER_GROUP_SOURCES].filters,
availableSources: props.filtersAvailable[FILTER_GROUP_SOURCES].filters,
appliedSources: props.filtersApplied[FILTER_GROUP_SOURCES].filters,
availableAsns: state.lookup.filtersAvailable[FILTER_GROUP_ASNS].filters,
appliedAsns: state.lookup.filtersApplied[FILTER_GROUP_ASNS].filters,
availableAsns: props.filtersAvailable[FILTER_GROUP_ASNS].filters,
appliedAsns: props.filtersApplied[FILTER_GROUP_ASNS].filters,
availableCommunities: {
communities: state.lookup.filtersAvailable[FILTER_GROUP_COMMUNITIES].filters,
ext: state.lookup.filtersAvailable[FILTER_GROUP_EXT_COMMUNITIES].filters,
large: state.lookup.filtersAvailable[FILTER_GROUP_LARGE_COMMUNITIES].filters,
communities: props.filtersAvailable[FILTER_GROUP_COMMUNITIES].filters,
ext: props.filtersAvailable[FILTER_GROUP_EXT_COMMUNITIES].filters,
large: props.filtersAvailable[FILTER_GROUP_LARGE_COMMUNITIES].filters,
},
appliedCommunities: {
communities: state.lookup.filtersApplied[FILTER_GROUP_COMMUNITIES].filters,
ext: state.lookup.filtersApplied[FILTER_GROUP_EXT_COMMUNITIES].filters,
large: state.lookup.filtersApplied[FILTER_GROUP_LARGE_COMMUNITIES].filters,
communities: props.filtersApplied[FILTER_GROUP_COMMUNITIES].filters,
ext: props.filtersApplied[FILTER_GROUP_EXT_COMMUNITIES].filters,
large: props.filtersApplied[FILTER_GROUP_LARGE_COMMUNITIES].filters,
},
})
)(FiltersEditor);

18
client/components/lookup/page.jsx
View File

@ -25,7 +25,10 @@ class _LookupView extends React.Component {
</div>
<div className="col-aside-details col-lg-3 col-md-12">
<LookupSummary />
<FiltersEditor makeLinkProps={makeLinkProps} />
<FiltersEditor makeLinkProps={makeLinkProps}
linkProps={this.props.linkProps}
filtersApplied={this.props.filtersApplied}
filtersAvailable={this.props.filtersAvailable} />
</div>
</div>
);
@ -35,7 +38,18 @@ class _LookupView extends React.Component {
const LookupView = connect(
(state) => {
return {
enabled: state.config.prefix_lookup_enabled
enabled: state.config.prefix_lookup_enabled,
filtersAvailable: state.lookup.filtersAvailable,
filtersApplied: state.lookup.filtersApplied,
linkProps: {
pageReceived: 0, // Reset pagination on filter change
pageFiltered: 0,
query: state.lookup.query,
filtersApplied: state.lookup.filtersApplied,
routing: state.routing.locationBeforeTransitions,
},
}
}
)(_LookupView);