Stop listing UA views in Google data import flow (#4309)

* Stop listing UA views in Google data import flow

* Update CHANGELOG

* Trigger preview deploy
This commit is contained in:
Adrian Gruntkowski 2024-07-04 13:08:32 +02:00 committed by GitHub
parent 81047ba06d
commit 2f2602e316
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 34 deletions

View File

@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
### Removed
- Deprecate `ECTO_IPV6` and `ECTO_CH_IPV6` env vars in CE plausible/analytics#4245
- Remove support for importing data from no longer available Universal Analytics
### Changed

View File

@ -32,10 +32,7 @@ defmodule Plausible.Google.API do
end
def list_properties_and_views(access_token) do
with {:ok, properties} <- Plausible.Google.GA4.API.list_properties(access_token),
{:ok, views} <- Plausible.Google.UA.API.list_views(access_token) do
{:ok, properties ++ views}
end
Plausible.Google.GA4.API.list_properties(access_token)
end
def get_property_or_view(access_token, property_or_view) do

View File

@ -44,7 +44,7 @@ defmodule PlausibleWeb.GoogleAnalyticsControllerTest do
describe "GET /:website/import/google-analytics/property-or-view" do
setup [:create_user, :log_in, :create_new_site]
test "lists Google Analytics views and properties", %{conn: conn, site: site} do
test "lists Google Analytics properties WITHOUT UA views", %{conn: conn, site: site} do
expect(
Plausible.HTTPClient.Mock,
:get,
@ -54,15 +54,6 @@ defmodule PlausibleWeb.GoogleAnalyticsControllerTest do
end
)
expect(
Plausible.HTTPClient.Mock,
:get,
fn _url, _opts ->
body = "fixture/ga_list_views.json" |> File.read!() |> Jason.decode!()
{:ok, %Finch.Response{body: body, status: 200}}
end
)
response =
conn
|> get("/#{site.domain}/import/google-analytics/property-or-view", %{
@ -72,8 +63,8 @@ defmodule PlausibleWeb.GoogleAnalyticsControllerTest do
})
|> html_response(200)
assert response =~ "57238190 - one.test"
assert response =~ "54460083 - two.test"
refute response =~ "57238190 - one.test"
refute response =~ "54460083 - two.test"
assert response =~ "account.one - GA4 (properties/428685906)"
assert response =~ "GA4 - Flood-It! (properties/153293282)"
assert response =~ "GA4 - Google Merch Shop (properties/213025502)"
@ -343,15 +334,6 @@ defmodule PlausibleWeb.GoogleAnalyticsControllerTest do
end
)
expect(
Plausible.HTTPClient.Mock,
:get,
fn _url, _opts ->
body = "fixture/ga_list_views.json" |> File.read!() |> Jason.decode!()
{:ok, %Finch.Response{body: body, status: 200}}
end
)
response =
conn
|> post("/#{site.domain}/import/google-analytics/property-or-view", %{
@ -392,15 +374,6 @@ defmodule PlausibleWeb.GoogleAnalyticsControllerTest do
end
)
expect(
Plausible.HTTPClient.Mock,
:get,
fn _url, _opts ->
body = "fixture/ga_list_views.json" |> File.read!() |> Jason.decode!()
{:ok, %Finch.Response{body: body, status: 200}}
end
)
response =
conn
|> post("/#{site.domain}/import/google-analytics/property-or-view", %{