From 880ea45cd9d65901c838bfadf643e5720dd413a8 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Fri, 31 Dec 2021 12:16:25 +0200 Subject: [PATCH] Remove cities feature flag --- assets/js/dashboard/mount.js | 3 +-- assets/js/dashboard/router.js | 2 +- assets/js/dashboard/stats/locations/index.js | 8 ++++---- assets/js/dashboard/stats/modals/filter.js | 7 +------ config/runtime.exs | 6 ------ lib/plausible_web/templates/stats/stats.html.eex | 2 +- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/assets/js/dashboard/mount.js b/assets/js/dashboard/mount.js index 304444734..635d2e5c4 100644 --- a/assets/js/dashboard/mount.js +++ b/assets/js/dashboard/mount.js @@ -16,8 +16,7 @@ if (container) { insertedAt: container.dataset.insertedAt, embedded: container.dataset.embedded, background: container.dataset.background, - selfhosted: container.dataset.selfhosted === 'true', - cities: container.dataset.cities === 'true' + selfhosted: container.dataset.selfhosted === 'true' } const loggedIn = container.dataset.loggedIn === 'true' diff --git a/assets/js/dashboard/router.js b/assets/js/dashboard/router.js index f96df0a58..b6d769435 100644 --- a/assets/js/dashboard/router.js +++ b/assets/js/dashboard/router.js @@ -49,7 +49,7 @@ export default function Router({site, loggedIn, currentUserRole}) { - site.cities && renderCountryIcon(row)} /> + diff --git a/assets/js/dashboard/stats/locations/index.js b/assets/js/dashboard/stats/locations/index.js index 31b3cc0cb..97a7e04c7 100644 --- a/assets/js/dashboard/stats/locations/index.js +++ b/assets/js/dashboard/stats/locations/index.js @@ -15,7 +15,7 @@ function Countries({query, site, onClick}) { } function renderIcon(country) { - return site.cities && {country.flag} + return {country.flag} } return ( @@ -61,7 +61,7 @@ function Cities({query, site}) { } function renderIcon(city) { - return site.cities && {city.country_flag} + return {city.country_flag} } return ( @@ -180,8 +180,8 @@ export default class Locations extends React.Component {
    { this.renderPill('Map', 'map') } { this.renderPill('Countries', 'countries') } - { this.props.site.cities && this.renderPill('Regions', 'regions') } - { this.props.site.cities && this.renderPill('Cities', 'cities') } + { this.renderPill('Regions', 'regions') } + { this.renderPill('Cities', 'cities') }
{ this.renderContent() } diff --git a/assets/js/dashboard/stats/modals/filter.js b/assets/js/dashboard/stats/modals/filter.js index 4ac02f1bf..27dbcb7b2 100644 --- a/assets/js/dashboard/stats/modals/filter.js +++ b/assets/js/dashboard/stats/modals/filter.js @@ -187,12 +187,7 @@ class FilterModal extends React.Component { } renderFilterInputs() { - const groups = FILTER_GROUPS[this.state.selectedFilterGroup].filter((filterName) => { - if (['city', 'region'].includes(filterName)) { - return this.props.site.cities - } - return true - }) + const groups = FILTER_GROUPS[this.state.selectedFilterGroup] return groups.map((filter) => { return ( diff --git a/config/runtime.exs b/config/runtime.exs index dbd15e877..01337b831 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -140,11 +140,6 @@ is_selfhost = |> get_var_from_path_or_env("SELFHOST", "true") |> String.to_existing_atom() -show_cities = - config_dir - |> get_var_from_path_or_env("SHOW_CITIES", "false") - |> String.to_existing_atom() - custom_script_name = config_dir |> get_var_from_path_or_env("CUSTOM_SCRIPT_NAME", "script") @@ -185,7 +180,6 @@ config :plausible, site_limit: site_limit, site_limit_exempt: site_limit_exempt, is_selfhost: is_selfhost, - show_cities: show_cities, custom_script_name: custom_script_name, domain_blacklist: domain_blacklist diff --git a/lib/plausible_web/templates/stats/stats.html.eex b/lib/plausible_web/templates/stats/stats.html.eex index 25c7d3548..58c4e108b 100644 --- a/lib/plausible_web/templates/stats/stats.html.eex +++ b/lib/plausible_web/templates/stats/stats.html.eex @@ -5,7 +5,7 @@ <% end %>
-
+
<%= if !@conn.assigns[:current_user] && @conn.assigns[:demo] do %>