Skip to content

Only show sites count in user CRM instead of full list of sites #4911

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
zoldar merged 2 commits into from
Dec 17, 2024
Merged

Only show sites count in user CRM instead of full list of sites #4911

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d11325
Only show sites count in user CRM instead of full list of sites
zoldar Dec 17, 2024
c2248c5
Make it play nice with CE
zoldar Dec 17, 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
39 changes: 22 additions & 17 deletions lib/plausible_web/controllers/admin_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@ defmodule PlausibleWeb.AdminController do

alias Plausible.Teams

alias PlausibleWeb.Router.Helpers, as: Routes

def usage(conn, params) do
user_id = String.to_integer(params["user_id"])

team =
case Teams.get_by_owner(user_id) do
{:ok, team} ->
Teams.with_subscription(team)
team
|> Teams.with_subscription()
|> Plausible.Repo.preload(:owner)

{:error, :no_team} ->
nil
Expand Down Expand Up @@ -69,19 +73,26 @@ defmodule PlausibleWeb.AdminController do
end

defp usage_and_limits_html(team, usage, limits, embed?) do
sites =
sites_row =
if team do
Plausible.Repo.preload(team, :sites).sites
else
[]
end
sites_count =
team
|> Ecto.assoc(:sites)
|> Plausible.Repo.aggregate(:count)

sites_link =
Routes.kaffy_resource_url(PlausibleWeb.Endpoint, :index, :sites, :site,
custom_search: team.owner.email
)

sites_list =
Enum.map_join(sites, "\n", fn site ->
"""
<li><a href="/crm/sites/site/#{site.id}">#{site.domain}</a></li>
<li>Owner of <a href="#{sites_link}">#{sites_count} site#{if sites_count != 1, do: "s", else: ""}</a></li>
"""
end)
else
"""
<li>Owner of 0 sites</li>
"""
end

content = """
<ul>
Expand All @@ -90,13 +101,7 @@ defmodule PlausibleWeb.AdminController do
<li>Team members: <b>#{usage.team_members}</b> / #{limits.team_members}</li>
<li>Features: #{features_usage(usage.features)}</li>
<li>Monthly pageviews: #{monthly_pageviews_usage(usage.monthly_pageviews, limits.monthly_pageviews)}</li>
<li>
Owned sites:

<ul>
#{sites_list}
</ul>
</li>
#{sites_row}
</ul>
"""

Expand Down