Merge branch 'master' into new-upgrade-page

Author: RobertJoonas

assets/js/liveview/live_socket.js

@@ -6,6 +6,7 @@
 import 'phoenix_html'
 import { Socket } from 'phoenix'
 import { LiveSocket } from 'phoenix_live_view'
+import topbar from 'topbar'
 /* eslint-enable import/no-unresolved */
 
 import Alpine from 'alpinejs'
@@ -66,6 +67,14 @@ if (csrfToken && websocketUrl) {
     }
   })
 
+  topbar.config({
+    barColors: { 0: '#303f9f' },
+    shadowColor: 'rgba(0, 0, 0, .3)',
+    barThickness: 4
+  })
+  window.addEventListener('phx:page-loading-start', (_info) => topbar.show())
+  window.addEventListener('phx:page-loading-stop', (_info) => topbar.hide())
+
   liveSocket.connect()
   window.liveSocket = liveSocket
 }

assets/package-lock.json

@@ -38,6 +38,7 @@
     "react-popper": "^2.3.0",
     "react-router-dom": "^6.25.1",
     "react-transition-group": "^4.4.2",
+    "topbar": "^3.0.0",
     "topojson-client": "^3.1.0",
     "url-search-params-polyfill": "^8.2.5",
     "visionscarto-world-atlas": "^1.0.0"

assets/package.json

@@ -0,0 +1,89 @@
+defmodule Plausible.CustomerSupport.Resource do
+  @moduledoc """
+  Generic behaviour for CS resources and their components
+  """
+  defstruct [:id, :type, :module, :object]
+
+  @type schema() :: map()
+
+  @type t() :: %__MODULE__{
+          id: pos_integer(),
+          module: atom(),
+          object: schema(),
+          type: String.t()
+        }
+
+  @callback search(String.t(), pos_integer()) :: list(schema())
+  @callback get(pos_integer()) :: schema()
+  @callback component() :: module()
+  @callback type() :: String.t()
+  @callback dump(schema()) :: t()
+
+  defmodule Component do
+    @moduledoc false
+    @callback render_result(assigns :: Phoenix.LiveView.Socket.assigns()) ::
+                Phoenix.LiveView.Rendered.t()
+  end
+
+  defmacro __using__(:component) do
+    quote do
+      use PlausibleWeb, :live_component
+      alias Plausible.CustomerSupport.Resource
+      import PlausibleWeb.CustomerSupport.Live.Shared
+
+      @behaviour Plausible.CustomerSupport.Resource.Component
+
+      def success(socket, msg) do
+        send(socket.root_pid, {:success, msg})
+        socket
+      end
+
+      def failure(socket, msg) do
+        send(socket.root_pid, {:failure, msg})
+        socket
+      end
+    end
+  end
+
+  defmacro __using__(component: component) do
+    quote do
+      @behaviour Plausible.CustomerSupport.Resource
+      alias Plausible.CustomerSupport.Resource
+
+      import Ecto.Query
+      alias Plausible.Repo
+
+      @impl true
+      def dump(schema) do
+        Resource.new(__MODULE__, schema)
+      end
+
+      defoverridable dump: 1
+
+      @impl true
+      def type do
+        __MODULE__
+        |> Module.split()
+        |> Enum.reverse()
+        |> hd()
+        |> String.downcase()
+      end
+
+      defoverridable type: 0
+
+      @impl true
+      def component, do: unquote(component)
+
+      defoverridable component: 0
+    end
+  end
+
+  def new(module, schema) do
+    %__MODULE__{
+      id: schema.id,
+      type: module.type(),
+      module: module,
+      object: schema
+    }
+  end
+end

extra/lib/plausible/customer_support/resource.ex

@@ -0,0 +1,46 @@
+defmodule Plausible.CustomerSupport.Resource.Site do
+  @moduledoc false
+  use Plausible.CustomerSupport.Resource, component: PlausibleWeb.CustomerSupport.Live.Site
+
+  @impl true
+  def search("", limit) do
+    q =
+      from s in Plausible.Site,
+        inner_join: t in assoc(s, :team),
+        inner_join: o in assoc(t, :owners),
+        order_by: [
+          desc: :id
+        ],
+        limit: ^limit,
+        preload: [team: {t, owners: o}]
+
+    Plausible.Repo.all(q)
+  end
+
+  def search(input, limit) do
+    q =
+      from s in Plausible.Site,
+        inner_join: t in assoc(s, :team),
+        inner_join: o in assoc(t, :owners),
+        where:
+          ilike(s.domain, ^"%#{input}%") or ilike(t.name, ^"%#{input}%") or
+            ilike(o.name, ^"%#{input}%"),
+        order_by: [
+          desc: fragment("?.domain = ?", s, ^input),
+          desc: fragment("?.name = ?", t, ^input),
+          desc: fragment("?.name = ?", o, ^input),
+          asc: s.domain
+        ],
+        limit: ^limit,
+        preload: [team: {t, owners: o}]
+
+    Plausible.Repo.all(q)
+  end
+
+  @impl true
+  def get(id) do
+    Plausible.Site
+    |> Plausible.Repo.get(id)
+    |> Plausible.Repo.preload(:team)
+  end
+end

extra/lib/plausible/customer_support/resource/site.ex

@@ -0,0 +1,41 @@
+defmodule Plausible.CustomerSupport.Resource.Team do
+  @moduledoc false
+  use Plausible.CustomerSupport.Resource, component: PlausibleWeb.CustomerSupport.Live.Team
+
+  @impl true
+  def search("", limit) do
+    q =
+      from t in Plausible.Teams.Team,
+        inner_join: o in assoc(t, :owners),
+        limit: ^limit,
+        where: not is_nil(t.trial_expiry_date),
+        order_by: [desc: :id],
+        preload: [owners: o]
+
+    Plausible.Repo.all(q)
+  end
+
+  def search(input, limit) do
+    q =
+      from t in Plausible.Teams.Team,
+        inner_join: o in assoc(t, :owners),
+        where: ilike(t.name, ^"%#{input}%") or ilike(o.name, ^"%#{input}%"),
+        limit: ^limit,
+        order_by: [
+          desc: fragment("?.name = ?", t, ^input),
+          desc: fragment("?.name = ?", o, ^input),
+          asc: t.name
+        ],
+        preload: [owners: o]
+
+    Plausible.Repo.all(q)
+  end
+
+  @impl true
+  def get(id) do
+    Plausible.Teams.Team
+    |> Repo.get(id)
+    |> Plausible.Teams.with_subscription()
+    |> Repo.preload(:owners)
+  end
+end

extra/lib/plausible/customer_support/resource/team.ex

@@ -0,0 +1,38 @@
+defmodule Plausible.CustomerSupport.Resource.User do
+  @moduledoc false
+  use Plausible.CustomerSupport.Resource, component: PlausibleWeb.CustomerSupport.Live.User
+
+  @impl true
+  def get(id) do
+    Plausible.Repo.get!(Plausible.Auth.User, id)
+    |> Plausible.Repo.preload(team_memberships: :team)
+  end
+
+  @impl true
+  def search("", limit) do
+    q =
+      from u in Plausible.Auth.User,
+        order_by: [
+          desc: :id
+        ],
+        preload: [:owned_teams],
+        limit: ^limit
+
+    Plausible.Repo.all(q)
+  end
+
+  def search(input, limit) do
+    q =
+      from u in Plausible.Auth.User,
+        where: ilike(u.email, ^"%#{input}%") or ilike(u.name, ^"%#{input}%"),
+        order_by: [
+          desc: fragment("?.name = ?", u, ^input),
+          desc: fragment("?.email = ?", u, ^input),
+          asc: u.name
+        ],
+        preload: [:owned_teams],
+        limit: ^limit
+
+    Plausible.Repo.all(q)
+  end
+end

extra/lib/plausible/customer_support/resource/user.ex

@@ -105,7 +105,14 @@ defmodule Plausible.HelpScout do
             }
           end)
 
-        user_link = Routes.kaffy_resource_url(PlausibleWeb.Endpoint, :show, :auth, :user, user.id)
+        user_link =
+          Routes.customer_support_resource_url(
+            PlausibleWeb.Endpoint,
+            :details,
+            :users,
+            :user,
+            user.id
+          )
 
         {:ok,
          %{
@@ -129,19 +136,20 @@ defmodule Plausible.HelpScout do
 
         status_link =
           if team do
-            Routes.kaffy_resource_url(PlausibleWeb.Endpoint, :show, :teams, :team, team.id)
-          else
-            Routes.kaffy_resource_url(PlausibleWeb.Endpoint, :show, :auth, :user, user.id)
-          end
-
-        sites_link =
-          if team do
-            Routes.kaffy_resource_url(PlausibleWeb.Endpoint, :index, :sites, :site,
-              custom_search: team.identifier
+            Routes.customer_support_resource_url(
+              PlausibleWeb.Endpoint,
+              :details,
+              :teams,
+              :team,
+              team.id
             )
           else
-            Routes.kaffy_resource_url(PlausibleWeb.Endpoint, :index, :sites, :site,
-              custom_search: user.email
+            Routes.customer_support_resource_url(
+              PlausibleWeb.Endpoint,
+              :details,
+              :users,
+              :user,
+              user.id
             )
           end
 
@@ -156,8 +164,7 @@ defmodule Plausible.HelpScout do
            status_link: status_link,
            plan_label: plan_label(subscription, plan),
            plan_link: plan_link(subscription),
-           sites_count: Teams.owned_sites_count(team),
-           sites_link: sites_link
+           sites_count: Teams.owned_sites_count(team)
          }}
       end
     end