Remove obsolete feature flags (#4026)

plausible · Apr 18, 2024 · 8364345 · 8364345
1 parent 1b06bb5
commit 8364345
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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")