Merge branch 'master' into scroll-depth-imported-pages-migration

Author: RobertJoonas

extra/lib/plausible/help_scout.ex

@@ -106,7 +106,7 @@ defmodule Plausible.HelpScout do
          sites_count: Plausible.Teams.owned_sites_count(team),
          sites_link:
            Routes.kaffy_resource_url(PlausibleWeb.Endpoint, :index, :sites, :site,
-             search: user.email
+             custom_search: user.email
            )
        }}
     end

lib/plausible/billing/enterprise_plan_admin.ex

@@ -29,8 +29,22 @@ defmodule Plausible.Billing.EnterprisePlanAdmin do
     ]
   end
 
-  def custom_index_query(_conn, _schema, query) do
-    from(r in query, preload: [team: :owner])
+  def custom_index_query(conn, _schema, query) do
+    search =
+      (conn.params["custom_search"] || "")
+      |> String.trim()
+      |> String.replace("%", "\%")
+      |> String.replace("_", "\_")
+
+    search_term = "%#{search}%"
+
+    from(r in query,
+      inner_join: t in assoc(r, :team),
+      inner_join: o in assoc(t, :owner),
+      or_where: ilike(r.paddle_plan_id, ^search_term),
+      or_where: ilike(o.email, ^search_term) or ilike(o.name, ^search_term),
+      preload: [team: {t, owner: o}]
+    )
   end
 
   def custom_show_query(_conn, _schema, query) do

lib/plausible/crm_extensions.ex

@@ -6,6 +6,9 @@ defmodule Plausible.CrmExtensions do
   use Plausible
 
   on_ee do
+    # Kaffy uses String.to_existing_atom when listing params
+    @custom_search :custom_search
+
     def javascripts(%{assigns: %{context: "auth", resource: "user", entry: %{} = user}}) do
       [
         Phoenix.HTML.raw("""
@@ -45,6 +48,36 @@ defmodule Plausible.CrmExtensions do
       ]
     end
 
+    def javascripts(%{assigns: %{context: context}})
+        when context in ["sites", "billing"] do
+      [
+        Phoenix.HTML.raw("""
+        <script type="text/javascript">
+          (() => {
+            const publicField = document.querySelector("#kaffy-search-field")
+            const searchForm = document.querySelector("#kaffy-filters-form")
+            const searchField = document.querySelector("#kaffy-filter-search")
+
+            if (publicField && searchForm && searchField) {
+              publicField.name = "#{@custom_search}"
+              searchField.name = "#{@custom_search}"
+
+              const params = new URLSearchParams(window.location.search)
+              publicField.value = params.get("#{@custom_search}")
+
+              const searchInput = document.createElement("input")
+              searchInput.name = "search"
+              searchInput.type = "hidden"
+              searchInput.value = ""
+
+              searchForm.appendChild(searchInput)
+            }
+          })()
+        </script>
+        """)
+      ]
+    end
+
     def javascripts(%{assigns: %{context: "billing", resource: "enterprise_plan", changeset: %{}}}) do
       [
         Phoenix.HTML.raw("""

lib/plausible/site/admin.ex

@@ -13,10 +13,32 @@ defmodule Plausible.SiteAdmin do
     ]
   end
 
-  def custom_index_query(_conn, _schema, query) do
+  def custom_index_query(conn, _schema, query) do
+    search =
+      (conn.params["custom_search"] || "")
+      |> String.trim()
+      |> String.replace("%", "\%")
+      |> String.replace("_", "\_")
+
+    search_term = "%#{search}%"
+
+    member_query =
+      from s in Plausible.Site,
+        left_join: gm in assoc(s, :guest_memberships),
+        left_join: tm in assoc(gm, :team_membership),
+        left_join: u in assoc(tm, :user),
+        where: s.id == parent_as(:site).id,
+        where: ilike(u.email, ^search_term) or ilike(u.name, ^search_term),
+        select: 1
+
     from(r in query,
+      as: :site,
       inner_join: o in assoc(r, :owner),
-      preload: [owner: o, team: [team_memberships: :user]]
+      preload: [owner: o, team: [team_memberships: :user]],
+      or_where: ilike(r.domain, ^search_term),
+      or_where: ilike(o.email, ^search_term),
+      or_where: ilike(o.name, ^search_term),
+      or_where: exists(member_query)
     )
   end
 

test/plausible/help_scout_test.exs

@@ -61,7 +61,7 @@ defmodule Plausible.HelpScoutTest do
         crm_url = "#{PlausibleWeb.Endpoint.url()}/crm/auth/user/#{user_id}"
 
         owned_sites_url =
-          "#{PlausibleWeb.Endpoint.url()}/crm/sites/site?search=#{URI.encode_www_form(email)}"
+          "#{PlausibleWeb.Endpoint.url()}/crm/sites/site?custom_search=#{URI.encode_www_form(email)}"
 
         assert {:ok,
                 %{
@@ -410,7 +410,7 @@ defmodule Plausible.HelpScoutTest do
         crm_url = "#{PlausibleWeb.Endpoint.url()}/crm/auth/user/#{user_id}"
 
         owned_sites_url =
-          "#{PlausibleWeb.Endpoint.url()}/crm/sites/site?search=#{URI.encode_www_form(email)}"
+          "#{PlausibleWeb.Endpoint.url()}/crm/sites/site?custom_search=#{URI.encode_www_form(email)}"
 
         assert {:ok,
                 %{
@@ -448,7 +448,7 @@ defmodule Plausible.HelpScoutTest do
         crm_url = "#{PlausibleWeb.Endpoint.url()}/crm/auth/user/#{user2.id}"
 
         owned_sites_url =
-          "#{PlausibleWeb.Endpoint.url()}/crm/sites/site?search=#{URI.encode_www_form(user2.email)}"
+          "#{PlausibleWeb.Endpoint.url()}/crm/sites/site?custom_search=#{URI.encode_www_form(user2.email)}"
 
         assert {:ok,
                 %{