Skip to content

Filtering Search Console keywords #4077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ukutaht merged 17 commits into from
May 14, 2024
Merged

Filtering Search Console keywords #4077

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
48c9c49
Apply filters in search console request
ukutaht May 7, 2024
6ee95c4
Remove dead code from search console modal
ukutaht May 7, 2024
ec9090f
Remove unimportant information from keyword modal
ukutaht May 8, 2024
51fc6c5
Show invalid filters from search console
ukutaht May 8, 2024
022f30c
Fix tests
ukutaht May 8, 2024
f941336
Add/Fix tests
ukutaht May 9, 2024
358a3ac
Fix typo
ukutaht May 9, 2024
b0087f6
Remove unused variable
ukutaht May 9, 2024
902ab41
Fix typo
ukutaht May 9, 2024
755f668
Changelog entry
ukutaht May 9, 2024
41e25e1
Fix Credo
ukutaht May 9, 2024
6686017
Display impressions, CTR and position in keyword modal
ukutaht May 9, 2024
4d7280b
Undo change that should not have been committed
ukutaht May 9, 2024
022e110
Fix test
ukutaht May 9, 2024
0a522e8
Fix test
ukutaht May 13, 2024
aa72c6a
filters -> search_console_filters
ukutaht May 14, 2024
7027f42
Merge branch 'master' into search-console-filtering
ukutaht May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove unimportant information from keyword modal
  • Loading branch information
@ukutaht
ukutaht committed May 9, 2024
commit ec9090fd46d65ce53d17ce535e7d152c536702f7
23 changes: 1 addition & 22 deletions assets/js/dashboard/stats/modals/google-keywords.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ class GoogleKeywordsModal extends React.Component {
.then((res) => this.setState({
loading: false,
searchTerms: res.search_terms,
totalVisitors: res.total_visitors,
notConfigured: res.not_configured,
isOwner: res.is_owner
}))
Expand All @@ -40,15 +39,7 @@ class GoogleKeywordsModal extends React.Component {
}

renderKeywords() {
if (this.state.query.filters.goal) {
return (
<div className="text-center text-gray-700 dark:text-gray-300 mt-6">
<RocketIcon />
<div className="text-lg">Sorry, we cannot show which keywords converted best for goal <b>{this.state.query.filters.goal}</b></div>
<div className="text-lg">Google does not share this information</div>
</div>
)
} else if (this.state.notConfigured) {
if (this.state.notConfigured) {
if (this.state.isOwner) {
return (
<div className="text-center text-gray-700 dark:text-gray-300 mt-6">
Expand Down Expand Up @@ -91,14 +82,6 @@ class GoogleKeywordsModal extends React.Component {
}
}

renderGoalText() {
if (this.state.query.filters.goal) {
return (
<h1 className="text-xl font-semibold text-gray-500 dark:text-gray-200 leading-none">completed {this.state.query.filters.goal}</h1>
)
}
}

renderBody() {
if (this.state.loading) {
return (
Expand All @@ -111,10 +94,6 @@ class GoogleKeywordsModal extends React.Component {

<div className="my-4 border-b border-gray-300 dark:border-gray-500"></div>
<main className="modal__content">
<h1 className="text-xl font-semibold mb-0 leading-none dark:text-gray-200">
{this.state.totalVisitors} visitors from Google<br />
</h1>
{this.renderGoalText()}
{ this.renderKeywords() }
</main>
</React.Fragment>
Expand Down
2 changes: 0 additions & 2 deletions lib/plausible/google/api.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,6 @@ defmodule Plausible.Google.API do
end

defp get_search_console_filters(property, plausible_filters) do
plausible_filters = Map.drop(plausible_filters, ["visit:source"])

search_console_filters =
Enum.reduce_while(plausible_filters, [], fn plausible_filter, search_console_filters ->
case transform_filter(property, plausible_filter) do
Expand Down
15 changes: 5 additions & 10 deletions lib/plausible_web/controllers/api/stats_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,34 +682,29 @@ defmodule PlausibleWeb.Api.StatsController do
def referrer_drilldown(conn, %{"referrer" => "Google"} = params) do
site = conn.assigns[:site] |> Repo.preload(:google_auth)

query =
Query.from(site, params)
|> Query.put_filter("visit:source", "Google")
query = Query.from(site, params)

search_terms =
if site.google_auth && site.google_auth.property && !query.filters["goal"] do
if site.google_auth && site.google_auth.property do
google_api().fetch_stats(site, query, params["limit"] || 9)
end

%{:visitors => %{value: total_visitors}} = Stats.aggregate(site, query, [:visitors])

user_id = get_session(conn, :current_user_id)
is_admin = user_id && Plausible.Sites.has_admin_access?(user_id, site)

case search_terms do
nil ->
json(conn, %{not_configured: true, is_admin: is_admin, total_visitors: total_visitors})
json(conn, %{not_configured: true, is_admin: is_admin})

{:ok, terms} ->
json(conn, %{search_terms: terms, total_visitors: total_visitors})
json(conn, %{search_terms: terms})

{:error, _} ->
conn
|> put_status(502)
|> json(%{
not_configured: true,
is_admin: is_admin,
total_visitors: total_visitors
is_admin: is_admin
})
end
end
Expand Down