Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/controllers/admin/ahoy_activities_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ def index
*prefixes.map { |p| "#{p}.%" })
end

# Filter by event name
if params[:event_name].present?
scope = scope.where("ahoy_events.name LIKE ?", "%#{Ahoy::Event.sanitize_sql_like(params[:event_name])}%")
end

# Filter by user (if viewing specific user activity)
scope = scope.where(user: @users) if @users.present?

Expand Down
6 changes: 3 additions & 3 deletions app/views/admin/ahoy_activities/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
<label class="block text-sm font-medium text-gray-600 mb-1">
Event Name
</label>
<%= text_field_tag :name,
params[:name],
<%= text_field_tag :event_name,
params[:event_name],
placeholder: "e.g. Viewed Workshop",
class: "w-full px-3 py-2 border-gray-300 rounded-md shadow-sm focus:ring-indigo-500 focus:border-indigo-500" %>
</div>
Expand Down Expand Up @@ -112,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, :visit_id, :props, :user_id, :from, :to).to_unsafe_h %>
<% safe_params = params.slice(:event_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" %>
Expand Down
16 changes: 16 additions & 0 deletions spec/requests/admin/ahoy_activities_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,22 @@
expect(response.body).to include("create.bookmark")
expect(response.body).to include("auth.login")
end

it "filters by event name" do
get index_path, params: { event_name: "auth.login", time_period: "all_time" }

expect(response).to have_http_status(:ok)
expect(response.body).to include("auth.login")
expect(response.body).not_to include("create.bookmark")
end

it "filters by partial event name" do
get index_path, params: { event_name: "bookmark", time_period: "all_time" }

expect(response).to have_http_status(:ok)
expect(response.body).to include("create.bookmark")
expect(response.body).not_to include("auth.login")
end
end

describe "GET /admin/activities/visits" do
Expand Down