Compare commits

...

7 Commits

Author SHA1 Message Date
Uku Taht 1ebe5b09b0 WIP: Ecto query alias attempt 4 years ago
Uku Taht 8b6738e958 Remove screen_width from ingestion completely 4 years ago
Uku Taht a0868b7e42 Remove device tooltip 4 years ago
Uku Taht c9c60e9e16 Make 'browser' the default tab in devices report 4 years ago
Uku Taht 25dc322087 Log on unhandled UAInspector device type 4 years ago
Uku Taht 39582c6937 Fix credo 4 years ago
Uku Taht a0ab655b53 Use user-agent instead of screen_width to get device type
Co-authored-by: eriknakata <erik.nakata5@gmail.com>
4 years ago

@ -84,10 +84,6 @@ function ScreenSizes({ query, site }) {
return iconFor(screenSize.name)
}
function renderTooltipText(screenSize) {
return EXPLANATION[screenSize.name]
}
return (
<ListReport
fetchData={fetchData}
@ -95,18 +91,10 @@ function ScreenSizes({ query, site }) {
keyLabel="Screen size"
query={query}
renderIcon={renderIcon}
tooltipText={renderTooltipText}
/>
)
}
const EXPLANATION = {
'Mobile': 'up to 576px',
'Tablet': '576px to 992px',
'Laptop': '992px to 1440px',
'Desktop': 'above 1440px',
}
function iconFor(screenSize) {
if (screenSize === 'Mobile') {
return (
@ -135,7 +123,7 @@ export default class Devices extends React.Component {
this.tabKey = `deviceTab__${props.site.domain}`
const storedTab = storage.getItem(this.tabKey)
this.state = {
mode: storedTab || 'size'
mode: storedTab || 'browser'
}
}
@ -200,9 +188,9 @@ export default class Devices extends React.Component {
<div className="flex justify-between w-full">
<h3 className="font-bold dark:text-gray-100">Devices</h3>
<div className="flex text-xs font-medium text-gray-500 dark:text-gray-400 space-x-2">
{this.renderPill('Size', 'size')}
{this.renderPill('Browser', 'browser')}
{this.renderPill('OS', 'os')}
{this.renderPill('Size', 'size')}
</div>
</div>
{this.renderContent()}

@ -89,7 +89,7 @@ export default function ListReport(props) {
maxWidthDeduction={maxWidthDeduction}
plot={valueKey}
>
<span className="flex px-2 py-1.5 group dark:text-gray-300 relative z-9 break-all" tooltip={props.tooltipText && props.tooltipText(listItem)}>
<span className="flex px-2 py-1.5 group dark:text-gray-300 relative z-9 break-all">
<Link onClick={props.onClick || noop} className="md:truncate block hover:underline" to={{search: query.toString()}}>
{props.renderIcon && props.renderIcon(listItem)}
{props.renderIcon && ' '}

@ -90,7 +90,6 @@ defmodule Mix.Tasks.SendPageview do
url: "http://#{domain}#{page}",
domain: domain,
referrer: referrer,
width: 1666,
props: props
}
end

@ -78,7 +78,6 @@ defmodule Plausible.Ingestion.Event do
&put_referrer/1,
&put_utm_tags/1,
&put_geolocation/1,
&put_screen_size/1,
&put_props/1,
&put_salts/1,
&put_user_id/1,
@ -128,7 +127,8 @@ defmodule Plausible.Ingestion.Event do
operating_system: os_name(user_agent),
operating_system_version: os_version(user_agent),
browser: browser_name(user_agent),
browser_version: browser_version(user_agent)
browser_version: browser_version(user_agent),
screen_size: screen_size(user_agent)
})
_any ->
@ -173,19 +173,6 @@ defmodule Plausible.Ingestion.Event do
update_attrs(event, result)
end
defp put_screen_size(%__MODULE__{} = event) do
screen_size =
case event.request.screen_width do
nil -> nil
width when width < 576 -> "Mobile"
width when width < 992 -> "Tablet"
width when width < 1440 -> "Laptop"
width when width >= 1440 -> "Desktop"
end
update_attrs(event, %{screen_size: screen_size})
end
defp put_props(%__MODULE__{request: %{props: %{} = props}} = event) do
update_attrs(event, %{
"meta.key": Map.keys(props),
@ -307,6 +294,54 @@ defmodule Plausible.Ingestion.Event do
end
end
# credo:disable-for-next-line Credo.Check.Refactor.CyclomaticComplexity
defp screen_size(ua) do
case ua.device do
%UAInspector.Result.Device{type: "smartphone"} ->
"Mobile"
%UAInspector.Result.Device{type: "feature phone"} ->
"Mobile"
%UAInspector.Result.Device{type: "portable media player"} ->
"Mobile"
%UAInspector.Result.Device{type: "phablet"} ->
"Mobile"
%UAInspector.Result.Device{type: "wearable"} ->
"Mobile"
%UAInspector.Result.Device{type: "camera"} ->
"Mobile"
%UAInspector.Result.Device{type: "car browser"} ->
"Tablet"
%UAInspector.Result.Device{type: "tablet"} ->
"Tablet"
%UAInspector.Result.Device{type: "tv"} ->
"Desktop"
%UAInspector.Result.Device{type: "console"} ->
"Desktop"
%UAInspector.Result.Device{type: "desktop"} ->
"Desktop"
%UAInspector.Result.Device{type: type} ->
Sentry.capture_message("Could not determine device type from UAInspector",
extra: %{type: type}
)
nil
_ ->
nil
end
end
defp browser_version(ua) do
case ua.client do
:unknown -> ""

@ -16,7 +16,6 @@ defmodule Plausible.Ingestion.Request do
field :hostname, :string
field :referrer, :string
field :domains, {:array, :string}
field :screen_width, :string
field :hash_mode, :string
field :pathname, :string
field :props, :map
@ -89,7 +88,6 @@ defmodule Plausible.Ingestion.Request do
changeset,
event_name: request_body["n"] || request_body["name"],
referrer: request_body["r"] || request_body["referrer"],
screen_width: request_body["w"] || request_body["screen_width"],
hash_mode: request_body["h"] || request_body["hashMode"],
props: parse_props(request_body)
)

@ -515,11 +515,18 @@ defmodule Plausible.Stats.Breakdown do
defp do_group_by(q, "visit:device") do
from(
s in q,
group_by: s.screen_size,
select_merge: %{
device: fragment("if(empty(?), ?, ?)", s.screen_size, @not_set, s.screen_size)
device:
fragment(
"multiIf(empty(?), ?, ? = 'Laptop', 'Desktop', ?) as device",
s.screen_size,
@not_set,
s.screen_size,
s.screen_size
)
},
order_by: {:asc, s.screen_size}
group_by: fragment("device"),
order_by: fragment("device ASC")
)
end

@ -142,7 +142,6 @@ defmodule Plausible.Ingestion.RequestTest do
domain: "dummy.site",
url: "http://dummy.site/index.html",
referrer: "https://example.com",
screen_width: 1024,
hashMode: 1,
props: %{
"custom1" => "property1",
@ -154,7 +153,6 @@ defmodule Plausible.Ingestion.RequestTest do
assert {:ok, request} = Request.build(conn)
assert request.referrer == "https://example.com"
assert request.screen_width == 1024
assert request.hash_mode == 1
assert request.props["custom1"] == "property1"
assert request.props["custom2"] == "property2"

@ -3,6 +3,8 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
use Plausible.ClickhouseRepo
@user_agent "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Safari/537.36"
@user_agent_mobile "Mozilla/5.0 (Linux; Android 6.0; U007 Pro Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/44.0.2403.119 Mobile Safari/537.36"
@user_agent_tablet "Mozilla/5.0 (Linux; U; Android 4.2.2; it-it; Surfing TAB B 9.7 3G Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30"
describe "POST /api/event" do
setup do
@ -15,8 +17,7 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
domain: domain,
name: "pageview",
url: "http://gigride.live/",
referrer: "http://m.facebook.com/",
screen_width: 1440
referrer: "http://m.facebook.com/"
}
conn =
@ -36,8 +37,7 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
params = %{
domain: domain,
name: "pageview",
url: "http://gigride.live/",
screen_width: 1440
url: "http://gigride.live/"
}
conn =
@ -72,8 +72,7 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
name: "pageview",
url: "http://gigride.live/",
referrer: "http://m.facebook.com/",
domain: "#{domain1},#{domain2}",
screen_width: 1440
domain: "#{domain1},#{domain2}"
}
conn =
@ -93,8 +92,7 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
domain: domain,
name: "pageview",
url: "http://gigride.live/",
referrer: "http://m.facebook.com/",
screen_width: 1440
referrer: "http://m.facebook.com/"
}
t1 = System.convert_time_unit(System.monotonic_time(), :native, :millisecond)
@ -273,8 +271,7 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
domain: domain,
name: "pageview",
url: "http://gigride.live/",
referrer: "https://www.1-best-seo.com",
screen_width: 1440
referrer: "https://www.1-best-seo.com"
}
conn =
@ -451,17 +448,16 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
assert pageview.referrer_source == ""
end
test "screen size is calculated from screen_width", %{conn: conn, domain: domain} do
test "screen size is calculated from user agent", %{conn: conn, domain: domain} do
params = %{
name: "pageview",
url: "http://gigride.live/",
screen_width: 480,
domain: domain
}
conn =
conn
|> put_req_header("user-agent", @user_agent)
|> put_req_header("user-agent", @user_agent_mobile)
|> post("/api/event", params)
pageview = get_event(domain)
@ -470,7 +466,7 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
assert pageview.screen_size == "Mobile"
end
test "screen size is nil if screen_width is missing", %{conn: conn, domain: domain} do
test "screen size is nil if user agent is unknown", %{conn: conn, domain: domain} do
params = %{
name: "pageview",
url: "http://gigride.live/",
@ -479,7 +475,7 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
conn =
conn
|> put_req_header("user-agent", @user_agent)
|> put_req_header("user-agent", "unknown UA")
|> post("/api/event", params)
pageview = get_event(domain)
@ -488,6 +484,45 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
assert pageview.screen_size == ""
end
test "screen size is calculated from user_agent when is tablet", %{conn: conn, domain: domain} do
params = %{
name: "pageview",
url: "http://gigride.live/",
domain: domain
}
conn =
conn
|> put_req_header("user-agent", @user_agent_tablet)
|> post("/api/event", params)
pageview = get_event(domain)
assert response(conn, 202) == "ok"
assert pageview.screen_size == "Tablet"
end
test "screen size is calculated from user_agent when is desktop", %{
conn: conn,
domain: domain
} do
params = %{
name: "pageview",
url: "http://gigride.live/",
domain: domain
}
conn =
conn
|> put_req_header("user-agent", @user_agent)
|> post("/api/event", params)
pageview = get_event(domain)
assert response(conn, 202) == "ok"
assert pageview.screen_size == "Desktop"
end
test "can trigger a custom event", %{conn: conn, domain: domain} do
params = %{
name: "custom event",
@ -875,8 +910,7 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
n: "pageview",
u: "http://www.example.com/opportunity",
d: domain,
r: "https://facebook.com/page",
w: 300
r: "https://facebook.com/page"
}
conn
@ -887,7 +921,6 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
assert pageview.pathname == "/opportunity"
assert pageview.referrer_source == "Facebook"
assert pageview.referrer == "facebook.com/page"
assert pageview.screen_size == "Mobile"
end
test "records hash when in hash mode", %{conn: conn, domain: domain} do

@ -8,14 +8,14 @@ defmodule PlausibleWeb.Api.StatsController.ScreenSizesTest do
populate_stats(site, [
build(:pageview, screen_size: "Desktop"),
build(:pageview, screen_size: "Desktop"),
build(:pageview, screen_size: "Laptop")
build(:pageview, screen_size: "Mobile")
])
conn = get(conn, "/api/stats/#{site.domain}/screen-sizes?period=day")
assert json_response(conn, 200) == [
%{"name" => "Desktop", "visitors" => 2, "percentage" => 67},
%{"name" => "Laptop", "visitors" => 1, "percentage" => 33}
%{"name" => "Mobile", "visitors" => 1, "percentage" => 33}
]
end
@ -119,27 +119,26 @@ defmodule PlausibleWeb.Api.StatsController.ScreenSizesTest do
populate_stats(site, [
build(:pageview, screen_size: "Desktop"),
build(:pageview, screen_size: "Desktop"),
build(:pageview, screen_size: "Laptop")
build(:pageview, screen_size: "Mobile")
])
populate_stats(site, [
build(:imported_devices, device: "Mobile"),
build(:imported_devices, device: "Laptop")
build(:imported_devices, device: "Mobile")
])
conn = get(conn, "/api/stats/#{site.domain}/screen-sizes?period=day")
assert json_response(conn, 200) == [
%{"name" => "Desktop", "visitors" => 2, "percentage" => 67},
%{"name" => "Laptop", "visitors" => 1, "percentage" => 33}
%{"name" => "Mobile", "visitors" => 1, "percentage" => 33}
]
conn = get(conn, "/api/stats/#{site.domain}/screen-sizes?period=day&with_imported=true")
assert json_response(conn, 200) == [
%{"name" => "Desktop", "visitors" => 2, "percentage" => 40},
%{"name" => "Laptop", "visitors" => 2, "percentage" => 40},
%{"name" => "Mobile", "visitors" => 1, "percentage" => 20}
%{"name" => "Mobile", "visitors" => 3, "percentage" => 20}
]
end

@ -70,7 +70,6 @@
{{/if}}
payload.d = scriptEl.getAttribute('data-domain')
payload.r = document.referrer || null
payload.w = window.innerWidth
if (options && options.meta) {
payload.m = JSON.stringify(options.meta)
}

Loading…
Cancel
Save