Activity log loads as you scroll

The activity log stopped at 200 events. It now loads 50 at a time, the
next page coming in a lazy frame as it scrolls into view (as Oil & Fuel
does), keeping the category filter.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
rickyandClaude Opus 5.5 committed 2026-11-15 13:15:33 -05:00
1 parent e4c27c6ff7
commit 2e8d789975
5 files changed
+60 -3

No files matched your search

+10 -2
View File
@@ -1,10 +1,18 @@
class EventsController < ApplicationController class EventsController < ApplicationController
include AircraftScoped include AircraftScoped
EVENTS_PER_PAGE = 50
# A page at a time; the rest load as you scroll (each page ends in a lazy
# frame that fetches the next).
def index def index
@category = params[:category].presence_in(AircraftEvent::CATEGORIES.keys) @category = params[:category].presence_in(AircraftEvent::CATEGORIES.keys)
scope = @aircraft.events.includes(:user) @page = [ params[:page].to_i, 1 ].max
scope = @aircraft.events.includes(:user).reorder(created_at: :desc, id: :desc)
scope = scope.where(category: @category) if @category scope = scope.where(category: @category) if @category
@events = scope.limit(200) rows = scope.offset((@page - 1) * EVENTS_PER_PAGE).limit(EVENTS_PER_PAGE + 1).to_a
@more = rows.size > EVENTS_PER_PAGE
@events = rows.first(EVENTS_PER_PAGE)
render(partial: "events/page", locals: { events: @events, page: @page, more: @more, category: @category }) if turbo_frame_request?
end end
end end
+13
View File
@@ -0,0 +1,13 @@
<%# One page of the activity log, in its own frame; a lazy frame after it
loads the next page when it scrolls into view. Links open in the whole page. %>
<%= turbo_frame_tag "events-#{page}", target: "_top", class: ["block", ("border-t border-slate-100" if page > 1)] do %>
<%= render "events/list", events: events, full: true %>
<% if more %>
<% next_page = aircraft_events_path(@aircraft, category: category, page: page + 1) %>
<%= turbo_frame_tag "events-#{page + 1}", src: next_page, loading: :lazy, target: "_top", class: "block border-t border-slate-100" do %>
<p class="px-4 py-4 text-center text-sm text-slate-500">
<%= t(".loading_earlier_activity_html", link: (link_to t(".load_more"), next_page, class: "link", data: { turbo_frame: "events-#{page + 1}" })) %>
</p>
<% end %>
<% end %>
<% end %>
+1 -1
View File
@@ -10,5 +10,5 @@
<% end %> <% end %>
</div> </div>
</div> </div>
<%= render "events/list", events: @events, full: true %> <%= render "events/page", events: @events, page: @page, more: @more, category: @category %>
</section> </section>
+3
View File
@@ -2271,6 +2271,9 @@ en:
ago_html: "%{who} · %{created_at} ago" ago_html: "%{who} · %{created_at} ago"
no_activity_yet: No activity yet. no_activity_yet: No activity yet.
system: System system: System
page:
load_more: Load more
loading_earlier_activity_html: Loading earlier activity… %{link}
flight_imports: flight_imports:
new: new:
import_flights: Import Flights import_flights: Import Flights
+33
View File
@@ -0,0 +1,33 @@
require "test_helper"
# The activity log loads a page at a time (no more hidden events past 200).
class EventsPagingTest < ActionDispatch::IntegrationTest
setup do
@owner = create_user("owner@example.com")
@a = create_aircraft(owner: @owner, tail_number: "N12345")
per = EventsController::EVENTS_PER_PAGE
(per + 7).times do |i|
@a.events.create!(category: i.even? ? "note" : "oil", event_name: "Event #{i}", created_at: Time.zone.local(2026, 1, 1) + i.hours)
end
end
test "the first page has a page of events; the next page comes in a lazy frame" do
sign_in @owner
get aircraft_events_path(@a)
assert_select "turbo-frame#events-1[target=_top] li", EventsController::EVENTS_PER_PAGE
assert_select "turbo-frame#events-2[loading=lazy][src=?]", aircraft_events_path(@a, page: 2)
get aircraft_events_path(@a, page: 2), headers: { "Turbo-Frame" => "events-2" }
assert_select "turbo-frame#events-2 li", 7
assert_select "turbo-frame#events-3", 0
assert_select "h2", 0
assert_includes response.body, "Event 0" # the oldest event is reachable
end
test "the next page keeps the category filter" do
sign_in @owner
get aircraft_events_path(@a, category: "note")
assert_select "turbo-frame#events-1 li", 29
assert_select "turbo-frame#events-2", 0
end
end