Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Streamlining support (#1723)

RobertJoonas775ae6228f53
diff --git a/lib/plausible/auth/user_admin.ex b/lib/plausible/auth/user_admin.ex
index ec4db077e1..a8a2e7d7f4 100644
--- a/lib/plausible/auth/user_admin.ex
+++ b/lib/plausible/auth/user_admin.ex
@@ -18,12 +18,42 @@ defmodule Plausible.Auth.UserAdmin do
[
name: nil,
email: nil,
- trial_expiry_date: nil,
+ inserted_at: %{name: "Created at", value: &format_date(&1.inserted_at)},
+ trial_expiry_date: %{name: "Trial expiry", value: &format_date(&1.trial_expiry_date)},
subscription_tier: %{value: &subscription_tier/1},
- subscription_status: %{value: &subscription_status/1}
+ subscription_status: %{value: &subscription_status/1},
+ grace_period: %{value: &grace_period_status/1}
]
end
+ def resource_actions(_) do
+ [
+ remove_grace_period: %{
+ name: "Remove grace period",
+ action: fn _, user -> remove_grace_period(user) end
+ }
+ ]
+ end
+
+ defp remove_grace_period(user) do
+ if user.grace_period do
+ Plausible.Auth.User.remove_grace_period(user) |> Repo.update()
+ else
+ {:error, user, "No active grace period on this user"}
+ end
+ end
+
+ defp grace_period_status(%{grace_period: nil}), do: "--"
+
+ defp grace_period_status(user) do
+ if user.grace_period.is_over do
+ "ended"
+ else
+ days_left = Timex.diff(user.grace_period.end_date, Timex.now(), :days)
+ "#{days_left} days left"
+ end
+ end
+
defp subscription_tier(user) do
if user.subscription && user.subscription.status == "active" do
quota = PlausibleWeb.AuthView.subscription_quota(user.subscription)
@@ -46,4 +76,8 @@ defmodule Plausible.Auth.UserAdmin do
"Trial expired"
end
end
+
+ defp format_date(date) do
+ Timex.format!(date, "{Mshort} {D}, {YYYY}")
+ end
end
diff --git a/lib/plausible/site/admin.ex b/lib/plausible/site/admin.ex
index 66f1fbee62..f2d2938d5b 100644
--- a/lib/plausible/site/admin.ex
+++ b/lib/plausible/site/admin.ex
@@ -23,6 +23,7 @@ defmodule Plausible.SiteAdmin do
def index(_) do
[
domain: nil,
+ inserted_at: %{name: "Created at", value: &format_date(&1.inserted_at)},
timezone: nil,
public: nil,
owner: %{value: &get_owner_email/1},
@@ -38,4 +39,8 @@ defmodule Plausible.SiteAdmin do
memberships = Enum.reject(site.memberships, fn m -> m.role == :owner end)
Enum.map(memberships, fn m -> m.user.email end) |> Enum.join(", ")
end
+
+ defp format_date(date) do
+ Timex.format!(date, "{Mshort} {D}, {YYYY}")
+ end
end