diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2234c81c..93ebef892 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,10 +3,13 @@ All notable changes to this project will be documented in this file.
## Unreleased
+### Changed
+- Always show direct traffic in sources reports plausible/analytics#2531
+
## v1.5.1 - 2022-12-06
### Fixed
-- Fallback to empty build metadata when failing to parse $BUILD_METADATA plausible/analytics#2503
+- Fallback to empty build metadata when failing to parse $BUILD_METADATA plausible/analytics#2503
## v1.5.0 - 2022-12-02
diff --git a/assets/js/dashboard/stats/modals/sources.js b/assets/js/dashboard/stats/modals/sources.js
index efdacfc6c..aa2273ef1 100644
--- a/assets/js/dashboard/stats/modals/sources.js
+++ b/assets/js/dashboard/stats/modals/sources.js
@@ -3,8 +3,8 @@ import { Link, withRouter } from 'react-router-dom'
import Modal from './modal'
import * as api from '../../api'
-import numberFormatter, {durationFormatter} from '../../util/number-formatter'
-import {parseQuery} from '../../query'
+import numberFormatter, { durationFormatter } from '../../util/number-formatter'
+import { parseQuery } from '../../query'
const TITLES = {
sources: 'Top Sources',
@@ -28,12 +28,12 @@ class SourcesModal extends React.Component {
}
loadSources() {
- const {site} = this.props
- const {query, page, sources} = this.state
+ const { site } = this.props
+ const { query, page, sources } = this.state
const detailed = this.showExtra()
- api.get(`/api/stats/${encodeURIComponent(site.domain)}/${this.currentFilter()}`, query, {limit: 100, page, detailed, show_noref: true})
- .then((res) => this.setState({loading: false, sources: sources.concat(res), moreResultsAvailable: res.length === 100}))
+ api.get(`/api/stats/${encodeURIComponent(site.domain)}/${this.currentFilter()}`, query, { limit: 100, page, detailed })
+ .then((res) => this.setState({ loading: false, sources: sources.concat(res), moreResultsAvailable: res.length === 100 }))
}
componentDidMount() {
@@ -42,7 +42,7 @@ class SourcesModal extends React.Component {
componentDidUpdate(prevProps) {
if (this.props.location.pathname !== prevProps.location.pathname) {
- this.setState({sources: [], loading: true}, this.loadSources.bind(this))
+ this.setState({ sources: [], loading: true }, this.loadSources.bind(this))
}
}
@@ -60,11 +60,11 @@ class SourcesModal extends React.Component {
}
loadMore() {
- this.setState({loading: true, page: this.state.page + 1}, this.loadSources.bind(this))
+ this.setState({ loading: true, page: this.state.page + 1 }, this.loadSources.bind(this))
}
formatBounceRate(page) {
- if (typeof(page.bounce_rate) === 'number') {
+ if (typeof (page.bounce_rate) === 'number') {
return page.bounce_rate + '%'
} else {
return '-'
@@ -72,7 +72,7 @@ class SourcesModal extends React.Component {
}
formatDuration(source) {
- if (typeof(source.visit_duration) === 'number') {
+ if (typeof (source.visit_duration) === 'number') {
return durationFormatter(source.visit_duration)
} else {
return '-'
@@ -103,14 +103,14 @@ class SourcesModal extends React.Component {
return (
|
- { this.icon(source) }
- { source.name }
+ {this.icon(source)}
+ {source.name}
|
- {this.showConversionRate() && {numberFormatter(source.total_visitors)} | }
+ {this.showConversionRate() && {numberFormatter(source.total_visitors)} | }
{numberFormatter(source.visitors)} |
- {this.showExtra() && {this.formatBounceRate(source)} | }
- {this.showExtra() && {this.formatDuration(source)} | }
- {this.showConversionRate() && {source.conversion_rate}% | }
+ {this.showExtra() && {this.formatBounceRate(source)} | }
+ {this.showExtra() && {this.formatDuration(source)} | }
+ {this.showConversionRate() && {source.conversion_rate}% | }
)
}
@@ -165,12 +165,12 @@ class SourcesModal extends React.Component {
- { this.state.sources.map(this.renderSource.bind(this)) }
+ {this.state.sources.map(this.renderSource.bind(this))}
- { this.renderLoading() }
+ {this.renderLoading()}
)
}
diff --git a/assets/js/dashboard/stats/sources/referrer-list.js b/assets/js/dashboard/stats/sources/referrer-list.js
index bf2147a29..e4918562b 100644
--- a/assets/js/dashboard/stats/sources/referrer-list.js
+++ b/assets/js/dashboard/stats/sources/referrer-list.js
@@ -13,7 +13,7 @@ function LinkOption(props) {
if (props.disabled) {
return {props.children}
} else {
- props = Object.assign({}, props, {className: props.className + ' hover:underline'})
+ props = Object.assign({}, props, { className: props.className + ' hover:underline' })
return {props.children}
}
}
@@ -21,7 +21,7 @@ function LinkOption(props) {
export default class Referrers extends React.Component {
constructor(props) {
super(props)
- this.state = {loading: true}
+ this.state = { loading: true }
this.onVisible = this.onVisible.bind(this)
}
@@ -32,30 +32,26 @@ export default class Referrers extends React.Component {
componentDidUpdate(prevProps) {
if (this.props.query !== prevProps.query) {
- this.setState({loading: true, referrers: null})
+ this.setState({ loading: true, referrers: null })
this.fetchReferrers()
}
}
- showNoRef() {
- return this.props.query.period === 'realtime'
- }
-
showConversionRate() {
return !!this.props.query.filters.goal
}
fetchReferrers() {
if (this.props.query.filters.source) {
- api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/referrers/${encodeURIComponent(this.props.query.filters.source)}`, this.props.query, {show_noref: this.showNoRef()})
+ api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/referrers/${encodeURIComponent(this.props.query.filters.source)}`, this.props.query)
.then((res) => res.search_terms || res.referrers)
- .then((referrers) => this.setState({loading: false, referrers: referrers}))
+ .then((referrers) => this.setState({ loading: false, referrers: referrers }))
} else if (this.props.query.filters.goal) {
api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/goal/referrers`, this.props.query)
- .then((res) => this.setState({loading: false, referrers: res}))
+ .then((res) => this.setState({ loading: false, referrers: res }))
} else {
- api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/referrers`, this.props.query, {show_noref: this.showNoRef()})
- .then((res) => this.setState({loading: false, referrers: res}))
+ api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/referrers`, this.props.query)
+ .then((res) => this.setState({ loading: false, referrers: res }))
}
}
@@ -71,7 +67,7 @@ export default class Referrers extends React.Component {
}
renderReferrer(referrer) {
- const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
+ const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
const query = new URLSearchParams(window.location.search)
query.set('referrer', referrer.name)
@@ -86,7 +82,7 @@ export default class Referrers extends React.Component {
- { referrer.name }
+ {referrer.name}
- { this.renderExternalLink(referrer) }
+ {this.renderExternalLink(referrer)}
{numberFormatter(referrer.visitors)}
@@ -151,7 +147,7 @@ export default class Referrers extends React.Component {
if (this.state.referrers) {
return (
- { this.renderList() }
+ {this.renderList()}
)
@@ -165,9 +161,9 @@ export default class Referrers extends React.Component {
>
Top Referrers
- { this.state.loading && }
+ {this.state.loading && }
- { this.renderContent() }
+ {this.renderContent()}
diff --git a/assets/js/dashboard/stats/sources/source-list.js b/assets/js/dashboard/stats/sources/source-list.js
index d97e1709e..ff5ce7c5f 100644
--- a/assets/js/dashboard/stats/sources/source-list.js
+++ b/assets/js/dashboard/stats/sources/source-list.js
@@ -30,16 +30,12 @@ class AllSources extends React.Component {
}
}
- showNoRef() {
- return this.props.query.period === 'realtime'
- }
-
showConversionRate() {
return !!this.props.query.filters.goal
}
fetchReferrers() {
- api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/sources`, this.props.query, { show_noref: this.showNoRef() })
+ api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/sources`, this.props.query)
.then((res) => this.setState({ loading: false, referrers: res }))
}
@@ -173,7 +169,7 @@ class UTMSources extends React.Component {
fetchReferrers() {
const endpoint = UTM_TAGS[this.props.tab].endpoint
- api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/${endpoint}`, this.props.query, { show_noref: this.showNoRef() })
+ api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/${endpoint}`, this.props.query)
.then((res) => this.setState({ loading: false, referrers: res }))
}
diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex
index acfc4cdfd..e9c22491f 100644
--- a/lib/plausible_web/controllers/api/stats_controller.ex
+++ b/lib/plausible_web/controllers/api/stats_controller.ex
@@ -371,7 +371,6 @@ defmodule PlausibleWeb.Api.StatsController do
query =
Query.from(site, params)
|> Filters.add_prefix()
- |> maybe_hide_noref("visit:source", params)
pagination = parse_pagination(params)
@@ -402,7 +401,6 @@ defmodule PlausibleWeb.Api.StatsController do
query =
Query.from(site, params)
|> Filters.add_prefix()
- |> maybe_hide_noref("visit:utm_medium", params)
pagination = parse_pagination(params)
@@ -432,7 +430,6 @@ defmodule PlausibleWeb.Api.StatsController do
query =
Query.from(site, params)
|> Filters.add_prefix()
- |> maybe_hide_noref("visit:utm_campaign", params)
pagination = parse_pagination(params)
@@ -462,7 +459,6 @@ defmodule PlausibleWeb.Api.StatsController do
query =
Query.from(site, params)
|> Filters.add_prefix()
- |> maybe_hide_noref("visit:utm_content", params)
pagination = parse_pagination(params)
metrics = [:visitors, :bounce_rate, :visit_duration]
@@ -491,7 +487,6 @@ defmodule PlausibleWeb.Api.StatsController do
query =
Query.from(site, params)
|> Filters.add_prefix()
- |> maybe_hide_noref("visit:utm_term", params)
pagination = parse_pagination(params)
metrics = [:visitors, :bounce_rate, :visit_duration]
@@ -520,7 +515,6 @@ defmodule PlausibleWeb.Api.StatsController do
query =
Query.from(site, params)
|> Filters.add_prefix()
- |> maybe_hide_noref("visit:utm_source", params)
pagination = parse_pagination(params)
@@ -1108,17 +1102,6 @@ defmodule PlausibleWeb.Api.StatsController do
end
end
- defp maybe_hide_noref(query, property, params) do
- cond do
- is_nil(query.filters[property]) and params["show_noref"] != "true" ->
- new_filters = Map.put(query.filters, property, {:is_not, "Direct / None"})
- %Query{query | filters: new_filters}
-
- true ->
- query
- end
- end
-
defp add_cr(list, list_without_goals, key_name) do
Enum.map(list, fn item ->
without_goal = Enum.find(list_without_goals, fn s -> s[key_name] === item[key_name] end)
diff --git a/test/plausible/imported/imported_test.exs b/test/plausible/imported/imported_test.exs
index 3e58aeb1d..04cd02e7f 100644
--- a/test/plausible/imported/imported_test.exs
+++ b/test/plausible/imported/imported_test.exs
@@ -236,6 +236,7 @@ defmodule Plausible.ImportedTest do
assert conn |> json_response(200) |> Enum.sort() == [
%{"name" => "A Nice Newsletter", "visitors" => 1},
+ %{"name" => "Direct / None", "visitors" => 1},
%{"name" => "DuckDuckGo", "visitors" => 2},
%{"name" => "Google", "visitors" => 4},
%{"name" => "Twitter", "visitors" => 1}
@@ -305,6 +306,12 @@ defmodule Plausible.ImportedTest do
"name" => "social",
"visit_duration" => 20,
"visitors" => 3
+ },
+ %{
+ "bounce_rate" => 100.0,
+ "name" => "Direct / None",
+ "visit_duration" => 60.0,
+ "visitors" => 1
}
]
end
@@ -388,6 +395,12 @@ defmodule Plausible.ImportedTest do
"visitors" => 2,
"bounce_rate" => 100.0,
"visit_duration" => 50.0
+ },
+ %{
+ "bounce_rate" => 0.0,
+ "name" => "Direct / None",
+ "visit_duration" => 100.0,
+ "visitors" => 1
}
]
end
@@ -472,6 +485,12 @@ defmodule Plausible.ImportedTest do
"visitors" => 2,
"bounce_rate" => 100.0,
"visit_duration" => 50.0
+ },
+ %{
+ "bounce_rate" => 0.0,
+ "name" => "Direct / None",
+ "visit_duration" => 100.0,
+ "visitors" => 1
}
]
end
@@ -555,6 +574,12 @@ defmodule Plausible.ImportedTest do
"visitors" => 2,
"bounce_rate" => 100.0,
"visit_duration" => 50.0
+ },
+ %{
+ "bounce_rate" => 0.0,
+ "name" => "Direct / None",
+ "visit_duration" => 100.0,
+ "visitors" => 1
}
]
end
diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/sources.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/sources.csv
index 854a70d52..101320e06 100644
--- a/test/plausible_web/controllers/CSVs/30d-filter-goal/sources.csv
+++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/sources.csv
@@ -1 +1,2 @@
name,conversions,conversion_rate
+Direct / None,1,33.3
diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_campaigns.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_campaigns.csv
index 854a70d52..101320e06 100644
--- a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_campaigns.csv
+++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_campaigns.csv
@@ -1 +1,2 @@
name,conversions,conversion_rate
+Direct / None,1,33.3
diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_contents.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_contents.csv
index 854a70d52..101320e06 100644
--- a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_contents.csv
+++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_contents.csv
@@ -1 +1,2 @@
name,conversions,conversion_rate
+Direct / None,1,33.3
diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_mediums.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_mediums.csv
index 854a70d52..101320e06 100644
--- a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_mediums.csv
+++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_mediums.csv
@@ -1 +1,2 @@
name,conversions,conversion_rate
+Direct / None,1,33.3
diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_sources.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_sources.csv
index 854a70d52..101320e06 100644
--- a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_sources.csv
+++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_sources.csv
@@ -1 +1,2 @@
name,conversions,conversion_rate
+Direct / None,1,33.3
diff --git a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_terms.csv b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_terms.csv
index 854a70d52..101320e06 100644
--- a/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_terms.csv
+++ b/test/plausible_web/controllers/CSVs/30d-filter-goal/utm_terms.csv
@@ -1 +1,2 @@
name,conversions,conversion_rate
+Direct / None,1,33.3
diff --git a/test/plausible_web/controllers/CSVs/30d/sources.csv b/test/plausible_web/controllers/CSVs/30d/sources.csv
index 3b22e30a0..ac9093db0 100644
--- a/test/plausible_web/controllers/CSVs/30d/sources.csv
+++ b/test/plausible_web/controllers/CSVs/30d/sources.csv
@@ -1,2 +1,3 @@
name,visitors,bounce_rate,visit_duration
+Direct / None,3,100,0
Google,1,0,60
diff --git a/test/plausible_web/controllers/CSVs/30d/utm_campaigns.csv b/test/plausible_web/controllers/CSVs/30d/utm_campaigns.csv
index 934651b6b..2279e13f7 100644
--- a/test/plausible_web/controllers/CSVs/30d/utm_campaigns.csv
+++ b/test/plausible_web/controllers/CSVs/30d/utm_campaigns.csv
@@ -1,2 +1,3 @@
name,visitors,bounce_rate,visit_duration
+Direct / None,3,67,20
ads,1,100,0
diff --git a/test/plausible_web/controllers/CSVs/30d/utm_contents.csv b/test/plausible_web/controllers/CSVs/30d/utm_contents.csv
index 6f8d1ba25..b0af67fdd 100644
--- a/test/plausible_web/controllers/CSVs/30d/utm_contents.csv
+++ b/test/plausible_web/controllers/CSVs/30d/utm_contents.csv
@@ -1,2 +1,3 @@
name,visitors,bounce_rate,visit_duration
+Direct / None,3,67,20
content,1,100,0
diff --git a/test/plausible_web/controllers/CSVs/30d/utm_mediums.csv b/test/plausible_web/controllers/CSVs/30d/utm_mediums.csv
index 1fe1c21a2..1a338d71e 100644
--- a/test/plausible_web/controllers/CSVs/30d/utm_mediums.csv
+++ b/test/plausible_web/controllers/CSVs/30d/utm_mediums.csv
@@ -1,2 +1,3 @@
name,visitors,bounce_rate,visit_duration
+Direct / None,3,67,20
search,1,100,0
diff --git a/test/plausible_web/controllers/CSVs/30d/utm_sources.csv b/test/plausible_web/controllers/CSVs/30d/utm_sources.csv
index b32c9660a..f055bafab 100644
--- a/test/plausible_web/controllers/CSVs/30d/utm_sources.csv
+++ b/test/plausible_web/controllers/CSVs/30d/utm_sources.csv
@@ -1,2 +1,3 @@
name,visitors,bounce_rate,visit_duration
+Direct / None,3,67,20
google,1,100,0
diff --git a/test/plausible_web/controllers/CSVs/30d/utm_terms.csv b/test/plausible_web/controllers/CSVs/30d/utm_terms.csv
index cbd3a7ce4..6a09a2ea4 100644
--- a/test/plausible_web/controllers/CSVs/30d/utm_terms.csv
+++ b/test/plausible_web/controllers/CSVs/30d/utm_terms.csv
@@ -1,2 +1,3 @@
name,visitors,bounce_rate,visit_duration
+Direct / None,3,67,20
term,1,100,0
diff --git a/test/plausible_web/controllers/CSVs/6m/sources.csv b/test/plausible_web/controllers/CSVs/6m/sources.csv
index 635bc508a..a1d2a9fa4 100644
--- a/test/plausible_web/controllers/CSVs/6m/sources.csv
+++ b/test/plausible_web/controllers/CSVs/6m/sources.csv
@@ -1,2 +1,3 @@
name,visitors,bounce_rate,visit_duration
+Direct / None,3,100,0
Google,2,50,30
diff --git a/test/plausible_web/controllers/CSVs/6m/utm_campaigns.csv b/test/plausible_web/controllers/CSVs/6m/utm_campaigns.csv
index 13779d3f0..86cfe278b 100644
--- a/test/plausible_web/controllers/CSVs/6m/utm_campaigns.csv
+++ b/test/plausible_web/controllers/CSVs/6m/utm_campaigns.csv
@@ -1,2 +1,3 @@
name,visitors,bounce_rate,visit_duration
+Direct / None,3,67,20
ads,2,100,0
diff --git a/test/plausible_web/controllers/CSVs/6m/utm_contents.csv b/test/plausible_web/controllers/CSVs/6m/utm_contents.csv
index 6f8d1ba25..a91b4d80e 100644
--- a/test/plausible_web/controllers/CSVs/6m/utm_contents.csv
+++ b/test/plausible_web/controllers/CSVs/6m/utm_contents.csv
@@ -1,2 +1,3 @@
name,visitors,bounce_rate,visit_duration
+Direct / None,4,75,15
content,1,100,0
diff --git a/test/plausible_web/controllers/CSVs/6m/utm_mediums.csv b/test/plausible_web/controllers/CSVs/6m/utm_mediums.csv
index 1fe1c21a2..e48dee7f9 100644
--- a/test/plausible_web/controllers/CSVs/6m/utm_mediums.csv
+++ b/test/plausible_web/controllers/CSVs/6m/utm_mediums.csv
@@ -1,2 +1,3 @@
name,visitors,bounce_rate,visit_duration
+Direct / None,4,75,15
search,1,100,0
diff --git a/test/plausible_web/controllers/CSVs/6m/utm_sources.csv b/test/plausible_web/controllers/CSVs/6m/utm_sources.csv
index b32c9660a..eb1ef6a75 100644
--- a/test/plausible_web/controllers/CSVs/6m/utm_sources.csv
+++ b/test/plausible_web/controllers/CSVs/6m/utm_sources.csv
@@ -1,2 +1,3 @@
name,visitors,bounce_rate,visit_duration
+Direct / None,4,75,15
google,1,100,0
diff --git a/test/plausible_web/controllers/CSVs/6m/utm_terms.csv b/test/plausible_web/controllers/CSVs/6m/utm_terms.csv
index cbd3a7ce4..0cbaac9a0 100644
--- a/test/plausible_web/controllers/CSVs/6m/utm_terms.csv
+++ b/test/plausible_web/controllers/CSVs/6m/utm_terms.csv
@@ -1,2 +1,3 @@
name,visitors,bounce_rate,visit_duration
+Direct / None,4,75,15
term,1,100,0
diff --git a/test/plausible_web/controllers/api/stats_controller/sources_test.exs b/test/plausible_web/controllers/api/stats_controller/sources_test.exs
index 836711b2c..4ed179d0c 100644
--- a/test/plausible_web/controllers/api/stats_controller/sources_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/sources_test.exs
@@ -16,17 +16,27 @@ defmodule PlausibleWeb.Api.StatsController.SourcesTest do
referrer_source: "Google",
referrer: "google.com"
),
+ build(:pageview,
+ referrer_source: "Google",
+ referrer: "google.com"
+ ),
build(:pageview,
referrer_source: "DuckDuckGo",
referrer: "duckduckgo.com"
- )
+ ),
+ build(:pageview,
+ referrer_source: "DuckDuckGo",
+ referrer: "duckduckgo.com"
+ ),
+ build(:pageview)
])
conn = get(conn, "/api/stats/#{site.domain}/sources")
assert json_response(conn, 200) == [
- %{"name" => "Google", "visitors" => 2},
- %{"name" => "DuckDuckGo", "visitors" => 1}
+ %{"name" => "Google", "visitors" => 3},
+ %{"name" => "DuckDuckGo", "visitors" => 2},
+ %{"name" => "Direct / None", "visitors" => 1}
]
end