Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Remove obsolete feature flags (#4026)

hq183643450c43f
diff --git a/assets/js/dashboard/util/filters.js b/assets/js/dashboard/util/filters.js
index c7b8bf9047..3f97beb2e0 100644
--- a/assets/js/dashboard/util/filters.js
+++ b/assets/js/dashboard/util/filters.js
@@ -1,5 +1,3 @@
-const flags = JSON.parse(document.getElementById('stats-react-container').dataset.flags)
-
export const FILTER_GROUPS = {
'page': ['page', 'entry_page', 'exit_page'],
'source': ['source', 'referrer'],
@@ -10,8 +8,7 @@ export const FILTER_GROUPS = {
'utm': ['utm_medium', 'utm_source', 'utm_campaign', 'utm_term', 'utm_content'],
'goal': ['goal'],
'props': ['prop_key', 'prop_value'],
- ...(flags.hostname_filter ? { 'hostname': ['hostname'] } : {})
-
+ 'hostname': ['hostname']
}
export const NO_CONTAINS_OPERATOR = new Set(['goal', 'screen'].concat(FILTER_GROUPS['location']))
diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex
index 28655501ea..c360c26bf7 100644
--- a/lib/plausible_web/controllers/stats_controller.ex
+++ b/lib/plausible_web/controllers/stats_controller.ex
@@ -353,13 +353,7 @@ defmodule PlausibleWeb.StatsController do
defp shared_link_cookie_name(slug), do: "shared-link-" <> slug
- defp get_flags(user, site) do
- %{
- hostname_filter:
- FunWithFlags.enabled?(:hostname_filter, for: user) ||
- FunWithFlags.enabled?(:hostname_filter, for: site)
- }
- end
+ defp get_flags(_user, _site), do: %{}
defp is_dbip() do
on_full_build do
diff --git a/lib/plausible_web/views/layout_view.ex b/lib/plausible_web/views/layout_view.ex
index b291234850..ca93c07eae 100644
--- a/lib/plausible_web/views/layout_view.ex
+++ b/lib/plausible_web/views/layout_view.ex
@@ -70,9 +70,7 @@ defmodule PlausibleWeb.LayoutView do
%{key: "IP Addresses", value: "shields/ip_addresses"},
%{key: "Countries", value: "shields/countries"},
%{key: "Pages", value: "shields/pages"},
- if FunWithFlags.enabled?(:shield_hostnames, for: conn.assigns[:site]) do
- %{key: "Hostnames", value: "shields/hostnames"}
- end
+ %{key: "Hostnames", value: "shields/hostnames"}
]
|> Enum.reject(&is_nil/1)
},
diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs
index 5fb79c9944..db634bcfd6 100644
--- a/priv/repo/seeds.exs
+++ b/priv/repo/seeds.exs
@@ -12,8 +12,6 @@
FunWithFlags.enable(:imports_exports)
FunWithFlags.enable(:csv_imports_exports)
-FunWithFlags.enable(:hostname_filter)
-FunWithFlags.enable(:shield_hostnames)
user = Plausible.Factory.insert(:user, email: "[email protected]", password: "plausible")