From e70fa293f2064e835324e01b9a4540d0a5d03b03 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Tue, 25 Jan 2022 14:34:14 -0600 Subject: [PATCH] Pr/1609 extended (#1634) * Change `Country` to `Location` in the Add filter dropdown This filter allows to select region and city too * Rename country filter group to Location Co-authored-by: RobertJoonas <56999674+RobertJoonas@users.noreply.github.com> --- assets/js/dashboard/stats/modals/filter.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/assets/js/dashboard/stats/modals/filter.js b/assets/js/dashboard/stats/modals/filter.js index 27dbcb7b2..fe96a2f45 100644 --- a/assets/js/dashboard/stats/modals/filter.js +++ b/assets/js/dashboard/stats/modals/filter.js @@ -13,7 +13,7 @@ import {apiPath, siteBasePath} from '../../util/url' export const FILTER_GROUPS = { 'page': ['page'], 'source': ['source', 'referrer'], - 'country': ['country', 'region', 'city'], + 'location': ['country', 'region', 'city'], 'screen': ['screen'], 'browser': ['browser', 'browser_version'], 'os': ['os', 'os_version'], @@ -56,9 +56,11 @@ function withIndefiniteArticle(word) { export function formatFilterGroup(filterGroup) { if (filterGroup === 'utm') { return 'UTM tags' - } + } else if (filterGroup === 'location') { + return 'Location' + } else { return formattedFilters[filterGroup] - + } } export function filterGroupForFilter(filter) { @@ -122,7 +124,7 @@ class FilterModal extends React.Component { } onSelect(filterName) { - if (this.state.selectedFilterGroup !== 'country') { + if (this.state.selectedFilterGroup !== 'location') { return () => {} } @@ -134,7 +136,7 @@ class FilterModal extends React.Component { } onInput(filterName) { - if (this.state.selectedFilterGroup === 'country') { + if (this.state.selectedFilterGroup === 'location') { return () => {} }