Initial activity pagination

Gemfile

@@ -22,6 +22,7 @@ gem 'has_scope'
 gem 'inherited_resources'
 gem 'kaminari'
 gem 'kt-paperclip'
+gem 'pagy'
 gem 'paper_trail'
 gem 'paper_trail-association_tracking'
 gem 'phonelib'

Gemfile.lock

@@ -289,6 +289,7 @@ GEM
       racc (~> 1.4)
     orm_adapter (0.5.0)
     ostruct (0.6.0)
+    pagy (9.3.3)
     paper_trail (15.2.0)
       activerecord (>= 6.1)
       request_store (~> 1.4)
@@ -545,6 +546,7 @@ DEPENDENCIES
   launchy
   listen
   ostruct
+  pagy
   paper_trail
   paper_trail-association_tracking
   pg

app/controllers/application_controller.rb

@@ -2,6 +2,8 @@ class ApplicationController < ActionController::Base
   FILTERING_REQUIRED_MSG = 'Filtering is required for this action. Please provide a filter when using this endpoint.'.freeze
   AUTH_REQUIRED_MSG = 'Authentication is required for this action. If you are using the app, you may need to confirm your account (see the email from us) or log out and back in.'.freeze
 
+  include Pagy::Backend
+
   def append_info_to_payload(payload)
     super
     payload[:user_id] = current_user&.id

app/controllers/pages_controller.rb

@@ -116,14 +116,19 @@ def profile; end
 
   def activity
     if @region
-      @recent_activity = UserSubmission.where(submission_type: %w[new_lmx remove_machine new_condition new_msx confirm_location], region_id: @region.id).order('created_at DESC').limit(200)
+      @pagy, @recent_activity = pagy_countless(UserSubmission.where(submission_type: %w[new_lmx remove_machine new_condition new_msx confirm_location], region_id: @region.id).order('created_at DESC'), limit: 10)
       @region_fullname = 'the ' + @region.full_name
       @region_name = @region.name
     else
-      @recent_activity = UserSubmission.where(submission_type: %w[new_lmx remove_machine new_condition new_msx confirm_location]).order('created_at DESC').limit(200)
+      @pagy, @recent_activity = pagy_countless(UserSubmission.where(submission_type: %w[new_lmx remove_machine new_condition new_msx confirm_location]).order('created_at DESC'), limit: 10)
       @region_fullname = ''
       @region_name = 'map'
     end
+
+    respond_to do |format|
+      format.html # GET
+      format.turbo_stream # POST
+    end
   end
 
   def contact

app/helpers/application_helper.rb

@@ -1,4 +1,5 @@
 module ApplicationHelper
+  include Pagy::Frontend
   def sortable(column, title = nil)
     title ||= column.titleize
     css_class = column == sort_column ? "current #{sort_direction}" : nil

app/views/pages/activity.html.haml

@@ -6,7 +6,7 @@
         This list contains the last 200 edits to #{@region_fullname} Pinball Map.
     .clear
 
-    .column.w_640
+    #activity.column.w_640
       - @recent_activity.each do |recent_activity|
         %div.recent_activity_container
           %div.recent_activity_icon
@@ -66,3 +66,6 @@
                 by
                 %span.bold #{recent_activity.user_name}
         .activity_hr
+
+      #next_link
+        = button_to "next", pagy_url_for(@pagy, @pagy.next)

app/views/pages/activity.turbo_stream.html.haml

@@ -0,0 +1,5 @@
+= turbo_stream.append "activity" do
+  = render partial: "activity", collection: @pages
+= turbo_stream.update "next_link" do
+  - if @pagy.next.present?
+    = button_to "next", pagy_url_for(@pagy, @pagy.next)

config/initializers/pagy.rb

@@ -0,0 +1 @@
+require 'pagy/extras/countless'

config/routes.rb

@@ -102,6 +102,7 @@
   get '/apple-app-site-association' => 'pages#apple_app_site_association'
   get '/robots.txt' => 'pages#robots'
   get '/activity' => 'pages#activity'
+  post '/activity' => 'pages#activity'
 
   scope ':region', constraints: lambda { |request| Region.where('lower(name) = ?', request.params[:region].downcase).any? } do
     get 'app' => redirect('/app')
@@ -131,6 +132,7 @@
     get '/suggest' => 'pages#suggest_new_location'
     post '/submitted_new_location' => 'pages#submitted_new_location'
     get '/activity' => 'pages#activity', as: 'region_activity'
+    post '/activity' => 'pages#activity', as: 'regio_activity'
 
     get '*page', to: 'locations#unknown_route'
   end