Release OpenProject 16.5.1

Author: ulferts

.github/workflows/pullpreview.yml

@@ -37,6 +37,7 @@ jobs:
         echo "OPENPROJECT_ENTERPRISE__CHARGEBEE__SITE=openproject-enterprise-test" >> .env.pullpreview
         echo "OPENPROJECT_ENTERPRISE__TRIAL__CREATION__HOST=https://start.openproject-edge.com" >> .env.pullpreview
         echo "OPENPROJECT_FEATURE_BLOCK_NOTE_EDITOR=true" >> .env.pullpreview
+        echo "OPENPROJECT_FEATURE_WP_ACTIVITY_TAB_LAZY_PAGINATION_ACTIVE=true" >> .env.pullpreview
     - name: Boot as BIM edition
       if: contains(github.ref, 'bim/') || contains(github.head_ref, 'bim/')
       run: |

Gemfile

@@ -55,6 +55,7 @@ gem "request_store", "~> 1.7.0"
 gem "warden", "~> 1.2"
 gem "warden-basic_auth", "~> 0.2.1"
 
+gem "pagy"
 gem "will_paginate", "~> 4.0.0"
 
 gem "friendly_id", "~> 5.5.0"

Gemfile.lock

@@ -1119,6 +1119,7 @@ GEM
     ostruct (0.6.3)
     ox (2.14.23)
       bigdecimal (>= 3.0)
+    pagy (9.4.0)
     paper_trail (16.0.0)
       activerecord (>= 6.1)
       request_store (~> 1.4)
@@ -1710,6 +1711,7 @@ DEPENDENCIES
   opentelemetry-sdk (~> 1.9)
   overviews!
   ox
+  pagy
   paper_trail (~> 16.0.0)
   parallel_tests (~> 4.0)
   pdf-inspector (~> 1.2)
@@ -2147,6 +2149,7 @@ CHECKSUMS
   ostruct (0.6.3) sha256=95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912
   overviews (1.0.0)
   ox (2.14.23) sha256=4a9aedb4d6c78c5ebac1d7287dc7cc6808e14a8831d7adb727438f6a1b461b66
+  pagy (9.4.0) sha256=db3f2e043f684155f18f78be62a81e8d033e39b9f97b1e1a8d12ad38d7bce738
   paper_trail (16.0.0) sha256=e9b9f0fb1b8b590c8231cfa931b282ba92f90e066e393930a5e1c61ae4c5019d
   parallel (1.27.0) sha256=4ac151e1806b755fb4e2dc2332cbf0e54f2e24ba821ff2d3dcf86bf6dc4ae130
   parallel_tests (4.10.1) sha256=df05458c691462b210f7a41fc2651d4e4e8a881e8190e6d1e122c92c07735d70

app/components/admin/custom_fields/calculated_values/details_component.html.erb

@@ -28,8 +28,8 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 
 <%=
-  component_wrapper do
-    with_enterprise_banner_guard(:calculated_values, variant: :large, image: "enterprise/calculated-values.png") do
+  with_enterprise_banner_guard(:calculated_values, variant: :large, image: "enterprise/calculated-values.png") do
+    component_wrapper do
       settings_primer_form_with(
         model:,
         scope: :custom_field,

…package/exports/formatters/work_hours.rb …vities_tab/journal_sorting_inquirable.rbapp/models/work_package/exports/formatters/work_hours.rb renamed to app/components/concerns/work_packages/activities_tab/journal_sorting_inquirable.rb app/models/work_package/exports/formatters/work_hours.rb renamed to app/components/concerns/work_packages/activities_tab/journal_sorting_inquirable.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-#-- copyright
+# -- copyright
 # OpenProject is an open source project management software.
 # Copyright (C) the OpenProject GmbH
 #
@@ -26,17 +26,16 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 # See COPYRIGHT and LICENSE files for more details.
-#++
+# ++
 
-module WorkPackage::Exports
-  module Formatters
-    class WorkHours < ::Exports::Formatters::Default
-      def self.apply?(name, export_format)
-        %i[estimated_hours remaining_hours].include?(name.to_sym) && export_format == :csv
-      end
+module WorkPackages
+  module ActivitiesTab
+    module JournalSortingInquirable
+      extend ActiveSupport::Concern
 
-      def format_options
-        { number_format: }
+      def journal_sorting
+        ActiveSupport::StringInquirer
+          .new(User.current.preference&.comments_sorting || OpenProject::Configuration.default_comment_sort_order)
       end
     end
   end

app/components/concerns/work_packages/activities_tab/stimulus_controllers.rb

@@ -37,6 +37,7 @@ def auto_scrolling_stimulus_controller(suffix = nil) = "#{stimulus_controller_na
       def editor_stimulus_controller(suffix = nil) = "#{stimulus_controller_namespace}--editor#{suffix}"
       def index_stimulus_controller(suffix = nil) = "#{stimulus_controller_namespace}--index#{suffix}"
       def internal_comment_stimulus_controller(suffix = nil) = "#{stimulus_controller_namespace}--internal-comment#{suffix}"
+      def lazy_page_stimulus_controller(suffix = nil) = "#{stimulus_controller_namespace}--lazy-page#{suffix}"
       def polling_stimulus_controller(suffix = nil) = "#{stimulus_controller_namespace}--polling#{suffix}"
       def stems_stimulus_controller(suffix = nil) = "#{stimulus_controller_namespace}--stems#{suffix}"
       def quote_comments_stimulus_controller(suffix = nil) = "#{stimulus_controller_namespace}--quote-comment#{suffix}"

app/components/enterprise_edition/upsell_buttons_component.rb

@@ -103,7 +103,7 @@ def upgrade_now_button
     def more_info_button
       return if @feature_key == :teaser
 
-      render(Primer::Beta::Link.new(href: enterprise_link)) do |link|
+      render(Primer::Beta::Link.new(href: enterprise_link, target: "_blank")) do |link|
         link.with_trailing_visual_icon(icon: "link-external")
         link_title
       end

app/components/work_packages/activities_tab/index_component.html.erb

@@ -28,9 +28,7 @@
                 classes: "work-packages-activities-tab-index-component--journals-container work-packages-activities-tab-index-component--journals-container_with-initial-input-compensation",
                 data: { "work-packages--activities-tab--index-target": "journalsContainer" }
               ) do
-                render(
-                  WorkPackages::ActivitiesTab::Journals::IndexComponent.new(work_package:, filter:)
-                )
+                render(list_journals_component)
               end
 
               if adding_comment_allowed?

app/components/work_packages/activities_tab/index_component.rb

@@ -51,6 +51,10 @@ def self.index_content_wrapper_key = WorkPackages::ActivitiesTab::StimulusContro
       def self.add_comment_wrapper_key = "work-packages-activities-tab-add-comment-component"
       delegate :index_content_wrapper_key, :add_comment_wrapper_key, to: :class
 
+      def list_journals_component
+        WorkPackages::ActivitiesTab::Journals::IndexComponent.new(work_package:, filter:)
+      end
+
       private
 
       attr_reader :work_package, :filter, :last_server_timestamp, :deferred

app/components/work_packages/activities_tab/journals/lazy_index_component.html.erb

@@ -0,0 +1,29 @@
+<%=
+  component_wrapper(class: "work-packages-activities-tab-journals-index-component") do
+    flex_layout(data: { test_selector: "op-wp-journals-#{filter}-#{journal_sorting}" }) do |journals_index_wrapper_container|
+      journals_index_wrapper_container.with_row(
+        classes: "work-packages-activities-tab-journals-index-component--journals-inner-container",
+        mb: inner_container_margin_bottom
+      ) do
+        flex_layout(
+          data: { test_selector: "op-wp-journals-container" }
+        ) do |journals_index_container|
+          if empty_state?
+            journals_index_container.with_row(mt: 2, mb: 3) do
+              render(WorkPackages::ActivitiesTab::Journals::EmptyComponent.new)
+            end
+          else
+            journals_index_container.with_row(id: insert_target_modifier_id) do
+              pages.map { concat render(it) }
+            end
+          end
+        end
+      end
+
+      unless empty_state?
+        journals_index_wrapper_container
+          .with_row(classes: "work-packages-activities-tab-journals-index-component--stem-connection")
+      end
+    end
+  end
+%>