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

Merge branch 'dev' into merge-release/16.5-20251010123254

Kabiru Mwenja22b139c8f4ea
diff --cc app/controllers/work_packages/activities_tab_controller.rb
index d8348e2ae0e,98297931976..64e91c545a1
--- a/app/controllers/work_packages/activities_tab_controller.rb
+++ b/app/controllers/work_packages/activities_tab_controller.rb
@@@ -36,45 -34,20 +36,45 @@@ class WorkPackages::ActivitiesTabContro
before_action :find_work_package
before_action :find_project
- before_action :find_journal, only: %i[edit cancel_edit update toggle_reaction]
+ before_action :find_journal, only: %i[item_actions edit cancel_edit update toggle_reaction]
before_action :set_filter
before_action :authorize
+ before_action :initialize_pagination, only: %i[page_streams]
def index
- render(
- WorkPackages::ActivitiesTab::IndexComponent.new(
- work_package: @work_package,
- filter: @filter,
- last_server_timestamp: get_current_server_timestamp,
- deferred: ActiveRecord::Type::Boolean.new.cast(params[:deferred])
- ),
- layout: false
+ index_component =
+ if OpenProject::FeatureDecisions.wp_activity_tab_lazy_pagination_active?
+ initialize_pagination
+ WorkPackages::ActivitiesTab::LazyIndexComponent.new(
+ work_package: @work_package,
+ journals: @paginated_journals,
+ paginator: @paginator,
+ filter: @filter,
+ last_server_timestamp: get_current_server_timestamp
+ )
+ else
+ WorkPackages::ActivitiesTab::IndexComponent.new(
+ work_package: @work_package,
+ filter: @filter,
+ last_server_timestamp: get_current_server_timestamp,
+ deferred: ActiveRecord::Type::Boolean.new.cast(params[:deferred])
+ )
+ end
+
+ render(index_component, layout: false)
+ end
+
+ def page_streams
+ replace_via_turbo_stream(
+ component: WorkPackages::ActivitiesTab::Journals::PageComponent.new(
+ journals: @paginated_journals,
+ emoji_reactions: wp_journals_emoji_reactions,
+ page: @paginator.page,
+ filter: @filter
+ )
)
+
+ respond_with_turbo_streams
end
def update_streams
diff --cc config/initializers/feature_decisions.rb
index e5f187ff2cd,5423e0b2b7f..bde6e50b1d9
--- a/config/initializers/feature_decisions.rb
+++ b/config/initializers/feature_decisions.rb
@@@ -76,5 -76,5 +76,8 @@@ OpenProject::FeatureDecisions.add :chan
description: "Enables a functionality to change the parent of a hierarchy item of " \
"custom fields of type hierarchy and scored list."
+ OpenProject::FeatureDecisions.add :new_project_overview,
+ description: "Enables the new project overview experience."
++
+OpenProject::FeatureDecisions.add :wp_activity_tab_lazy_pagination,
- description: "Enables lazy pagination for the activity tab."
++ description: "Enables lazy pagination for the activity tab."
diff --cc config/initializers/permissions.rb
index 8b9fe2fc7ba,9c24b0d57c5..9c50b02349c
--- a/config/initializers/permissions.rb
+++ b/config/initializers/permissions.rb
@@@ -261,7 -261,7 +261,7 @@@ Rails.application.reloader.to_prepare d
work_packages: %i[show index show_conflict_flash_message share_upsell],
work_packages_api: [:get],
"work_packages/reports": %i[report report_details],
- "work_packages/activities_tab": %i[index page_streams update_streams update_sorting update_filter],
- "work_packages/activities_tab": %i[index item_actions update_streams update_sorting update_filter],
++ "work_packages/activities_tab": %i[index page_streams item_actions update_streams update_sorting update_filter],
"work_packages/menus": %i[show],
"work_packages/hover_card": %i[show],
work_package_relations_tab: %i[index],