Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Allow pagy options in paginator for overrides in test

Kabiru Mwenjafeb364e55ead
diff --git a/app/services/work_packages/activities_tab/paginator.rb b/app/services/work_packages/activities_tab/paginator.rb
index eccb65d2dec..21d1ee9ca5d 100644
--- a/app/services/work_packages/activities_tab/paginator.rb
+++ b/app/services/work_packages/activities_tab/paginator.rb
@@ -48,7 +48,7 @@ class WorkPackages::ActivitiesTab::Paginator
if anchor_type && target_record_id
pagy_array_for_target_journal(anchor_type, target_record_id)
else
- pagy_array(base_journals)
+ pagy_array(base_journals, **pagy_options)
end
# For UI display: if user wants "oldest first" UI, reverse the array
@@ -61,6 +61,10 @@ class WorkPackages::ActivitiesTab::Paginator
attr_reader :work_package, :params
+ def pagy_options
+ { page: params[:page] || 1, limit: params[:limit] || Pagy::DEFAULT[:limit], max_pages: 100 }.compact
+ end
+
def extract_target_record_id
anchor = params[:anchor] # e.g., "comment-78758" (without #)
return nil unless anchor
@@ -83,11 +87,12 @@ class WorkPackages::ActivitiesTab::Paginator
end
if target_index
- target_page = (target_index / Pagy::DEFAULT[:limit]) + 1
- pagy_array(journals, page: target_page)
+ limit = pagy_options[:limit]
+ target_page = (target_index / limit) + 1
+ pagy_array(journals, **pagy_options, page: target_page)
else
# Journal might be filtered out or deleted - fallback to page 1
- pagy_array(journals, page: 1)
+ pagy_array(journals, **pagy_options, page: 1)
end
end
diff --git a/spec/services/work_packages/activities_tab/paginator_spec.rb b/spec/services/work_packages/activities_tab/paginator_spec.rb
index 583a7697c3e..cb2c7240389 100644
--- a/spec/services/work_packages/activities_tab/paginator_spec.rb
+++ b/spec/services/work_packages/activities_tab/paginator_spec.rb
@@ -127,20 +127,26 @@ RSpec.describe WorkPackages::ActivitiesTab::Paginator do
end
context "with pagination" do
- # Create enough journals to span multiple pages (default limit is 20)
- 25.times do |i|
+ # Create enough journals to span multiple pages (using limit of 5 for testing)
+ let(:test_limit) { 5 }
+
+ 10.times do |i|
let!(:"journal_#{i + 1}") do
create(:work_package_journal, user:, notes: "Comment #{i + 1}", journable: work_package, version: i + 2)
end
end
- it "returns the first page with default limit" do
+ before do
+ params[:limit] = test_limit
+ end
+
+ it "returns the first page with specified limit" do
pagy, records = paginator.call
expect(pagy.page).to eq(1)
- expect(pagy.count).to eq(26) # 25 journals + 1 initial
- expect(pagy.pages).to eq(2)
- expect(records.size).to eq(20) # Default Pagy limit
+ expect(pagy.count).to eq(11) # 10 journals + 1 initial
+ expect(pagy.pages).to eq(3)
+ expect(records.size).to eq(test_limit)
end
it "returns the second page when requested" do
@@ -148,7 +154,7 @@ RSpec.describe WorkPackages::ActivitiesTab::Paginator do
pagy, records = paginator.call
expect(pagy.page).to eq(2)
- expect(records.size).to eq(6) # Remaining items
+ expect(records.size).to eq(test_limit)
end
context "with anchor to target journal" do