Skip to content

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

Remove channels feature flag (#4972)

Uku Tahtc44151f0406c
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32ceb6f6f9..d628c12068 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ All notable changes to this project will be documented in this file.
- Dashboard shows comparisons for all reports
- UTM Medium report and API shows (gclid) and (msclkid) for paid searches when no explicit utm medium present.
- Support for `case_sensitive: false` modifiers in Stats API V2 filters for case-insensitive searches.
+- Add text version to emails plausible/analytics#4674
+- Add acquisition channels report
- Add filter `is not` for goals in dashboard plausible/analytics#4983
### Removed
diff --git a/assets/js/dashboard/stats/sources/source-list.js b/assets/js/dashboard/stats/sources/source-list.js
index ebca07f235..5b750ee6e2 100644
--- a/assets/js/dashboard/stats/sources/source-list.js
+++ b/assets/js/dashboard/stats/sources/source-list.js
@@ -199,9 +199,7 @@ export default function SourceList() {
return (
<div className="flex text-xs font-medium text-gray-500 dark:text-gray-400 space-x-2">
- {site.flags.channels &&
- <div className={currentTab === 'channels' ? activeClass : defaultClass} onClick={setTab('channels')}>Channels</div>
- }
+ <div className={currentTab === 'channels' ? activeClass : defaultClass} onClick={setTab('channels')}>Channels</div>
<div className={currentTab === 'all' ? activeClass : defaultClass} onClick={setTab('all')}>Sources</div>
<Menu as="div" className="relative inline-block text-left">
diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex
index 8d5dc4b8cb..4e273c189a 100644
--- a/lib/plausible_web/controllers/stats_controller.ex
+++ b/lib/plausible_web/controllers/stats_controller.ex
@@ -126,6 +126,7 @@ defmodule PlausibleWeb.StatsController do
csvs = %{
~c"visitors.csv" => fn -> main_graph_csv(site, query, conn.assigns[:current_user]) end,
~c"sources.csv" => fn -> Api.StatsController.sources(conn, params) end,
+ ~c"channels.csv" => fn -> Api.StatsController.channels(conn, params) end,
~c"utm_mediums.csv" => fn -> Api.StatsController.utm_mediums(conn, params) end,
~c"utm_sources.csv" => fn -> Api.StatsController.utm_sources(conn, params) end,
~c"utm_campaigns.csv" => fn -> Api.StatsController.utm_campaigns(conn, params) end,
@@ -149,15 +150,6 @@ defmodule PlausibleWeb.StatsController do
~c"custom_props.csv" => fn -> Api.StatsController.all_custom_prop_values(conn, params) end
}
- # credo:disable-for-lines:7
- csvs =
- if FunWithFlags.enabled?(:channels, for: site) ||
- FunWithFlags.enabled?(:channels, for: conn.assigns[:current_user]) do
- Map.put(csvs, ~c"channels.csv", fn -> Api.StatsController.channels(conn, params) end)
- else
- csvs
- end
-
csv_values =
Map.values(csvs)
|> Plausible.ClickhouseRepo.parallel_tasks()
@@ -392,7 +384,7 @@ defmodule PlausibleWeb.StatsController do
defp get_flags(user, site),
do:
- [:channels, :saved_segments, :scroll_depth]
+ [:saved_segments, :scroll_depth]
|> Enum.map(fn flag ->
{flag, FunWithFlags.enabled?(flag, for: user) || FunWithFlags.enabled?(flag, for: site)}
end)