From 5d5dbe32455c08044797fc56d1027e992c84f7f0 Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Fri, 6 Mar 2026 06:01:41 -0500
Subject: [PATCH 1/3] Add resource name, visit ID, and props filters to
 activity events

Adds three new search fields to the admin activities events page:
- Resource Name: text search on resource_title in event properties JSON
- Visit ID: integer filter on visit_id (backend existed, adds UI)
- Props: full-text search across the entire properties JSON blob

Also adds filter badges to the active filters subheader and preserves
new params in quick range links.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../admin/ahoy_activities_controller.rb       | 18 ++++++++++
 .../admin/ahoy_activities/index.html.erb      | 35 ++++++++++++++++++-
 .../shared/_active_filters_subheader.html.erb | 15 ++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admin/ahoy_activities_controller.rb b/app/controllers/admin/ahoy_activities_controller.rb
index bbde0a21f..0a912acfd 100644
--- a/app/controllers/admin/ahoy_activities_controller.rb
+++ b/app/controllers/admin/ahoy_activities_controller.rb
@@ -44,6 +44,24 @@ def index
         scope = scope.where(visit_id: params[:visit_id])
       end
 
+      # Filter by resource name (resource_title in properties JSON)
+      if params[:resource_name].present?
+        term = Ahoy::Event.sanitize_sql_like(params[:resource_name])
+        scope = scope.where(
+          "JSON_UNQUOTE(JSON_EXTRACT(ahoy_events.properties, '$.resource_title')) LIKE ?",
+          "%#{term}%"
+        )
+      end
+
+      # Filter by props (full-text search across properties JSON)
+      if params[:props].present?
+        term = Ahoy::Event.sanitize_sql_like(params[:props])
+        scope = scope.where(
+          "CAST(ahoy_events.properties AS CHAR) LIKE ?",
+          "%#{term}%"
+        )
+      end
+
       # Audience filter
       scope = apply_audience_filter(scope)
 
diff --git a/app/views/admin/ahoy_activities/index.html.erb b/app/views/admin/ahoy_activities/index.html.erb
index 40f817eb7..82879855f 100644
--- a/app/views/admin/ahoy_activities/index.html.erb
+++ b/app/views/admin/ahoy_activities/index.html.erb
@@ -31,6 +31,39 @@
                                  class: "w-full px-3 py-2 border-gray-300 rounded-md shadow-sm focus:ring-indigo-500 focus:border-indigo-500" %>
             </div>
 
+            <!-- Resource Name -->
+            <div class="flex-1 min-w-0">
+              <label class="block text-sm font-medium text-gray-600 mb-1">
+                Resource Name
+              </label>
+              <%= text_field_tag :resource_name,
+                                 params[:resource_name],
+                                 placeholder: "e.g. My Workshop",
+                                 class: "w-full px-3 py-2 border-gray-300 rounded-md shadow-sm focus:ring-indigo-500 focus:border-indigo-500" %>
+            </div>
+
+            <!-- Visit ID -->
+            <div class="flex-1 min-w-0">
+              <label class="block text-sm font-medium text-gray-600 mb-1">
+                Visit ID
+              </label>
+              <%= number_field_tag :visit_id,
+                                   params[:visit_id],
+                                   placeholder: "e.g. 42",
+                                   class: "w-full px-3 py-2 border-gray-300 rounded-md shadow-sm focus:ring-indigo-500 focus:border-indigo-500" %>
+            </div>
+
+            <!-- Props -->
+            <div class="flex-1 min-w-0">
+              <label class="block text-sm font-medium text-gray-600 mb-1">
+                Props
+              </label>
+              <%= text_field_tag :props,
+                                 params[:props],
+                                 placeholder: "Search properties...",
+                                 class: "w-full px-3 py-2 border-gray-300 rounded-md shadow-sm focus:ring-indigo-500 focus:border-indigo-500" %>
+            </div>
+
             <!-- User Filter -->
             <div class="flex-1 min-w-0">
               <label class="block text-sm font-medium text-gray-600 mb-1">
@@ -90,7 +123,7 @@
           <!-- Quick Ranges -->
           <div class="flex items-center gap-3 mt-6 text-sm">
             <span class="text-gray-500">Quick:</span>
-            <% safe_params = params.slice(:name, :user_id, :from, :to).to_unsafe_h %>
+            <% safe_params = params.slice(:name, :resource_name, :visit_id, :props, :user_id, :from, :to).to_unsafe_h %>
             <%= link_to "24h",
                         url_for(safe_params.merge(from: 1.day.ago.to_date)),
                         class: "text-indigo-600 hover:underline" %>
diff --git a/app/views/admin/shared/_active_filters_subheader.html.erb b/app/views/admin/shared/_active_filters_subheader.html.erb
index 215792cf5..37aa33a0d 100644
--- a/app/views/admin/shared/_active_filters_subheader.html.erb
+++ b/app/views/admin/shared/_active_filters_subheader.html.erb
@@ -30,5 +30,20 @@
         <%= label %>
       </span>
     <% end %>
+    <% if params[:resource_name].present? %>
+      <span class="inline-flex items-center px-3 py-1 rounded-full bg-green-100 text-green-800 font-medium">
+        Resource: <%= params[:resource_name] %>
+      </span>
+    <% end %>
+    <% if params[:visit_id].present? %>
+      <span class="inline-flex items-center px-3 py-1 rounded-full bg-yellow-100 text-yellow-800 font-medium">
+        Visit: <%= params[:visit_id] %>
+      </span>
+    <% end %>
+    <% if params[:props].present? %>
+      <span class="inline-flex items-center px-3 py-1 rounded-full bg-purple-100 text-purple-800 font-medium">
+        Props: <%= params[:props] %>
+      </span>
+    <% end %>
   </div>
 <% end %>

From 5d186702941e7854353f1da159b08b60dd07b8ac Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Fri, 6 Mar 2026 06:53:37 -0500
Subject: [PATCH 2/3] Use MySQL ->> operator for resource_title JSON search

Switches from JSON_UNQUOTE(JSON_EXTRACT(...)) to the ->> shorthand
for more reliable JSON path extraction.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 app/controllers/admin/ahoy_activities_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/admin/ahoy_activities_controller.rb b/app/controllers/admin/ahoy_activities_controller.rb
index 0a912acfd..0d967ad00 100644
--- a/app/controllers/admin/ahoy_activities_controller.rb
+++ b/app/controllers/admin/ahoy_activities_controller.rb
@@ -48,7 +48,7 @@ def index
       if params[:resource_name].present?
         term = Ahoy::Event.sanitize_sql_like(params[:resource_name])
         scope = scope.where(
-          "JSON_UNQUOTE(JSON_EXTRACT(ahoy_events.properties, '$.resource_title')) LIKE ?",
+          "ahoy_events.properties->>'$.resource_title' LIKE ?",
           "%#{term}%"
         )
       end

From 6218b15d5f416ef36f62ab65ffa9a1dd042653d1 Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Fri, 6 Mar 2026 08:12:21 -0500
Subject: [PATCH 3/3] Remove resource name filter from activity events

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 app/controllers/admin/ahoy_activities_controller.rb |  9 ---------
 app/views/admin/ahoy_activities/index.html.erb      | 13 +------------
 .../admin/shared/_active_filters_subheader.html.erb |  5 -----
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/app/controllers/admin/ahoy_activities_controller.rb b/app/controllers/admin/ahoy_activities_controller.rb
index 0d967ad00..593ff8e5e 100644
--- a/app/controllers/admin/ahoy_activities_controller.rb
+++ b/app/controllers/admin/ahoy_activities_controller.rb
@@ -44,15 +44,6 @@ def index
         scope = scope.where(visit_id: params[:visit_id])
       end
 
-      # Filter by resource name (resource_title in properties JSON)
-      if params[:resource_name].present?
-        term = Ahoy::Event.sanitize_sql_like(params[:resource_name])
-        scope = scope.where(
-          "ahoy_events.properties->>'$.resource_title' LIKE ?",
-          "%#{term}%"
-        )
-      end
-
       # Filter by props (full-text search across properties JSON)
       if params[:props].present?
         term = Ahoy::Event.sanitize_sql_like(params[:props])
diff --git a/app/views/admin/ahoy_activities/index.html.erb b/app/views/admin/ahoy_activities/index.html.erb
index 82879855f..541824be7 100644
--- a/app/views/admin/ahoy_activities/index.html.erb
+++ b/app/views/admin/ahoy_activities/index.html.erb
@@ -31,17 +31,6 @@
                                  class: "w-full px-3 py-2 border-gray-300 rounded-md shadow-sm focus:ring-indigo-500 focus:border-indigo-500" %>
             </div>
 
-            <!-- Resource Name -->
-            <div class="flex-1 min-w-0">
-              <label class="block text-sm font-medium text-gray-600 mb-1">
-                Resource Name
-              </label>
-              <%= text_field_tag :resource_name,
-                                 params[:resource_name],
-                                 placeholder: "e.g. My Workshop",
-                                 class: "w-full px-3 py-2 border-gray-300 rounded-md shadow-sm focus:ring-indigo-500 focus:border-indigo-500" %>
-            </div>
-
             <!-- Visit ID -->
             <div class="flex-1 min-w-0">
               <label class="block text-sm font-medium text-gray-600 mb-1">
@@ -123,7 +112,7 @@
           <!-- Quick Ranges -->
           <div class="flex items-center gap-3 mt-6 text-sm">
             <span class="text-gray-500">Quick:</span>
-            <% safe_params = params.slice(:name, :resource_name, :visit_id, :props, :user_id, :from, :to).to_unsafe_h %>
+            <% safe_params = params.slice(:name, :visit_id, :props, :user_id, :from, :to).to_unsafe_h %>
             <%= link_to "24h",
                         url_for(safe_params.merge(from: 1.day.ago.to_date)),
                         class: "text-indigo-600 hover:underline" %>
diff --git a/app/views/admin/shared/_active_filters_subheader.html.erb b/app/views/admin/shared/_active_filters_subheader.html.erb
index 37aa33a0d..140675308 100644
--- a/app/views/admin/shared/_active_filters_subheader.html.erb
+++ b/app/views/admin/shared/_active_filters_subheader.html.erb
@@ -30,11 +30,6 @@
         <%= label %>
       </span>
     <% end %>
-    <% if params[:resource_name].present? %>
-      <span class="inline-flex items-center px-3 py-1 rounded-full bg-green-100 text-green-800 font-medium">
-        Resource: <%= params[:resource_name] %>
-      </span>
-    <% end %>
     <% if params[:visit_id].present? %>
       <span class="inline-flex items-center px-3 py-1 rounded-full bg-yellow-100 text-yellow-800 font-medium">
         Visit: <%= params[:visit_id] %>