diff --git a/assets/js/dashboard/components/search-select.js b/assets/js/dashboard/components/search-select.js index 1de9b3cc9..e29bfd57f 100644 --- a/assets/js/dashboard/components/search-select.js +++ b/assets/js/dashboard/components/search-select.js @@ -10,7 +10,7 @@ function selectInputText(e) { function ChevronDown() { return ( - + ) } diff --git a/assets/js/dashboard/filters.js b/assets/js/dashboard/filters.js index ba80ede80..308ca1bc9 100644 --- a/assets/js/dashboard/filters.js +++ b/assets/js/dashboard/filters.js @@ -285,7 +285,7 @@ class Filters extends React.Component { {(this.appliedFilters.map((filter) => this.renderListFilter(history, filter, query)))} - + Filter diff --git a/assets/js/dashboard/stats/modals/filter.js b/assets/js/dashboard/stats/modals/filter.js index 98b6c85c8..cedb68309 100644 --- a/assets/js/dashboard/stats/modals/filter.js +++ b/assets/js/dashboard/stats/modals/filter.js @@ -8,18 +8,27 @@ import { parseQuery, formattedFilters, navigateToQuery } from '../../query' import Transition from "../../../transition"; import * as api from '../../api' +function getFilterValue(selectedFilter, query) { + const negated = !!query.filters[selectedFilter] && query.filters[selectedFilter][0] === '!' + let filterValue = negated ? query.filters[selectedFilter].slice(1) : (query.filters[selectedFilter] || "") + + if (selectedFilter == 'country') { + const allCountries = Datamap.prototype.worldTopo.objects.world.geometries; + const selectedCountry = allCountries.find((c) => c.id === filterValue) || { properties: { name: filterValue } }; + filterValue = selectedCountry.properties.name + } + + return {filterValue, negated} +} + + class FilterModal extends React.Component { constructor(props) { super(props) const query = parseQuery(props.location.search, props.site) const selectedFilter = this.props.match.params.field || 'page' - this.state = { - query, - selectedFilter, - negated: false, - filterValue: query.filters[selectedFilter] || '', - } + this.state = Object.assign({selectedFilter, query}, getFilterValue(selectedFilter, query)) this.handleKeydown = this.handleKeydown.bind(this) this.handleSubmit = this.handleSubmit.bind(this) @@ -29,23 +38,6 @@ class FilterModal extends React.Component { document.addEventListener("keydown", this.handleKeydown) } - componentDidUpdate(prevProps, prevState) { - const { query, selectedFilter, filterValue } = this.state - - if (prevState.selectedFilter !== selectedFilter) { - const negated = !!query.filters[selectedFilter] && query.filters[selectedFilter][0] == '!' && this.negationSupported(selectedFilter) - let filterValue = negated ? query.filters[selectedFilter].slice(1) : (query.filters[selectedFilter] || "") - - if (selectedFilter == 'country') { - const allCountries = Datamap.prototype.worldTopo.objects.world.geometries; - const selectedCountry = allCountries.find((c) => c.id === filterValue) || { properties: { name: filterValue } }; - filterValue = selectedCountry.properties.name - } - - this.setState({ filterValue, negated }) - } - } - componentWillUnmount() { document.removeEventListener("keydown", this.handleKeydown); } @@ -88,7 +80,7 @@ class FilterModal extends React.Component { ) @@ -119,6 +111,10 @@ class FilterModal extends React.Component { this.selectFilterAndCloseModal(selectedFilter, finalFilterValue) } + updateSelectedFilter(e) { + this.setState(Object.assign({selectedFilter: e.target.value}, getFilterValue(e.target.value, this.state.query))) + } + renderBody() { const { selectedFilter, negated, filterValue, query } = this.state; const editableFilters = Object.keys(this.state.query.filters).filter(filter => !['props'].includes(filter)) @@ -134,7 +130,7 @@ class FilterModal extends React.Component { value={selectedFilter} className="my-2 block w-full pr-10 border-gray-300 dark:border-gray-700 hover:border-gray-400 dark:hover:border-gray-200 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md dark:bg-gray-900 dark:text-gray-300 cursor-pointer" placeholder="Select a Filter" - onChange={(e) => this.setState({ selectedFilter: e.target.value })} + onChange={this.updateSelectedFilter.bind(this)} > {editableFilters.map(filter => )} @@ -155,7 +151,7 @@ class FilterModal extends React.Component { )} - {this.renderSearchSelector(selectedFilter)} + {this.renderSearchSelector()}