Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Add Consolidated Views tab to /cs (#5761)
RobertJoonas6825d1468648
diff --git a/extra/lib/plausible_web/live/customer_support/team.ex b/extra/lib/plausible_web/live/customer_support/team.exindex 546a6508a9..347b05ac4a 100644--- a/extra/lib/plausible_web/live/customer_support/team.ex+++ b/extra/lib/plausible_web/live/customer_support/team.ex@@ -11,6 +11,7 @@ defmodule PlausibleWeb.Live.CustomerSupport.Team doOverview,Members,Sites,+ ConsolidatedViews,Billing,SSO,Audit@@ -139,6 +140,9 @@ defmodule PlausibleWeb.Live.CustomerSupport.Team do<.tab to="sites" tab={@tab}>Sites ({number_format(@usage.sites)}/{number_format(@limits.sites)})</.tab>+ <.tab to="consolidated_views" tab={@tab}>+ Consolidated Views+ </.tab><.tab :if={has_sso_integration?(@team)} to="sso" tab={@tab}>SSO</.tab><.tab to="billing" tab={@tab}>Billing</.tab><.tab to="audit" tab={@tab}>Audit</.tab>@@ -208,6 +212,7 @@ defmodule PlausibleWeb.Live.CustomerSupport.Team dodefp tab_component("overview"), do: Overviewdefp tab_component("members"), do: Membersdefp tab_component("sites"), do: Sites+ defp tab_component("consolidated_views"), do: ConsolidatedViewsdefp tab_component("billing"), do: Billingdefp tab_component("sso"), do: SSOdefp tab_component("audit"), do: Auditdiff --git a/extra/lib/plausible_web/live/customer_support/team/components/consolidated_views.ex b/extra/lib/plausible_web/live/customer_support/team/components/consolidated_views.exnew file mode 100644index 0000000000..2f112ef342--- /dev/null+++ b/extra/lib/plausible_web/live/customer_support/team/components/consolidated_views.ex@@ -0,0 +1,95 @@+defmodule PlausibleWeb.CustomerSupport.Team.Components.ConsolidatedViews do+ @moduledoc """+ [Experimental - new feature]++ Lists ConsolidatedViews of a team and allows creating one if none exist. Current+ limitation is one consolidated view per team, which always includes all sites of+ this team.+ """+ use PlausibleWeb, :live_component+ import PlausibleWeb.CustomerSupport.Live++ def update(%{team: team}, socket) do+ cvs =+ case Plausible.ConsolidatedView.get(team) do+ nil -> []+ cv -> [cv]+ end++ {:ok, assign(socket, team: team, consolidated_views: cvs)}+ end++ def render(assigns) do+ ~H"""+ <div data-test-id="consolidated-views-tab-content" class="mt-2 mb-4">+ <%= if Enum.empty?(@consolidated_views) do %>+ <div class="mx-auto flex flex-col items-center">+ <p>This team does not have a consolidated view yet.</p>+ <.button class="mx-auto" phx-click="create-consolidated-view" phx-target={@myself}>+ Create one+ </.button>+ </div>+ <% else %>+ <.table rows={@consolidated_views}>+ <:thead>+ <.th>Domain</.th>+ <.th>Timezone</.th>+ <.th invisible>Dashboard</.th>+ <.th invisible>Settings</.th>+ <.th invisible>Delete</.th>+ </:thead>++ <:tbody :let={consolidated_view}>+ <.td>{consolidated_view.domain}</.td>+ <.td>{consolidated_view.timezone}</.td>+ <.td>+ <.styled_link+ new_tab={true}+ href={Routes.stats_path(PlausibleWeb.Endpoint, :stats, consolidated_view.domain, [])}+ >+ Dashboard+ </.styled_link>+ </.td>+ <.td>+ <.styled_link+ new_tab={true}+ href={+ Routes.site_path(+ PlausibleWeb.Endpoint,+ :settings_general,+ consolidated_view.domain,+ []+ )+ }+ >+ Settings+ </.styled_link>+ </.td>+ <.td>+ <.delete_button phx-click="delete-consolidated-view" phx-target={@myself} />+ </.td>+ </:tbody>+ </.table>+ <% end %>+ </div>+ """+ end++ def handle_event("create-consolidated-view", _, socket) do+ case Plausible.ConsolidatedView.enable(socket.assigns.team) do+ {:ok, cv} ->+ success("Consolidated view created")+ {:noreply, assign(socket, consolidated_views: [cv])}++ {:error, _} ->+ failure("Could not create consolidated View")+ {:noreply, socket}+ end+ end++ def handle_event("delete-consolidated-view", _, socket) do+ Plausible.ConsolidatedView.disable(socket.assigns.team)+ success("Deleted consolidated view")+ {:noreply, assign(socket, consolidated_views: [])}+ end+enddiff --git a/test/plausible_web/live/customer_support/teams_test.exs b/test/plausible_web/live/customer_support/teams_test.exsindex 5322770e94..d22b7d6c59 100644--- a/test/plausible_web/live/customer_support/teams_test.exs+++ b/test/plausible_web/live/customer_support/teams_test.exs@@ -174,6 +174,67 @@ defmodule PlausibleWeb.Live.CustomerSupport.TeamsTest doendend+ @create_consolidated_view_button ~s|button[phx-click="create-consolidated-view"]|+ @delete_consolidated_view_button ~s|button[phx-click="delete-consolidated-view"]|+ @consolidated_views_tab_content ~s|div[data-test-id="consolidated-views-tab-content"]|++ describe "consolidated views" do+ setup [:create_user, :log_in, :create_site]++ setup %{user: user} do+ patch_env(:super_admin_user_ids, [user.id])+ end++ test "renders button to create one inonef exist yet", %{conn: conn, user: user} do+ team = team_of(user)++ {:ok, lv, _html} = live(conn, open_team(team.id, tab: "consolidated_views"))+ html = render(lv)++ assert text_of_element(html, @consolidated_views_tab_content) =~+ "This team does not have a consolidated view yet"++ assert text_of_element(html, @create_consolidated_view_button) == "Create one"+ end++ test "can create a consolidated view for team", %{conn: conn, user: user} do+ team = team_of(user)++ {:ok, lv, _html} = live(conn, open_team(team.id, tab: "consolidated_views"))++ lv |> element(@create_consolidated_view_button) |> render_click()++ assert not is_nil(Plausible.ConsolidatedView.get(team))+ end++ test "renders existing consolidated view", %{conn: conn, user: user} do+ team = team_of(user)+ Plausible.ConsolidatedView.enable(team)++ {:ok, lv, _html} = live(conn, open_team(team.id, tab: "consolidated_views"))+ html = render(lv)++ table_text = text_of_element(html, @consolidated_views_tab_content)++ assert table_text =~ team.identifier+ assert table_text =~ "Dashboard"+ assert table_text =~ "Settings"++ assert element_exists?(html, @delete_consolidated_view_button)+ end++ test "can delete consolidated view", %{conn: conn, user: user} do+ team = team_of(user)+ Plausible.ConsolidatedView.enable(team)++ {:ok, lv, _html} = live(conn, open_team(team.id, tab: "consolidated_views"))++ lv |> element(@delete_consolidated_view_button) |> render_click()++ assert is_nil(Plausible.ConsolidatedView.get(team))+ end+ end+describe "billing" dosetup [:create_user, :log_in, :create_site]