Merge remote-tracking branch 'origin/release/16.5' into housekeeping/merge-release-into-dev

Author: HDinger

Gemfile

@@ -419,4 +419,4 @@ end
 
 gem "openproject-octicons", "~>19.29.0"
 gem "openproject-octicons_helper", "~>19.29.0"
-gem "openproject-primer_view_components", "~>0.73.0"
+gem "openproject-primer_view_components", "~>0.73.1"

Gemfile.lock

@@ -879,7 +879,7 @@ GEM
       actionview
       openproject-octicons (= 19.29.0)
       railties
-    openproject-primer_view_components (0.73.0)
+    openproject-primer_view_components (0.73.1)
       actionview (>= 7.2.0)
       activesupport (>= 7.2.0)
       openproject-octicons (>= 19.29.0)
@@ -1697,7 +1697,7 @@ DEPENDENCIES
   openproject-octicons (~> 19.29.0)
   openproject-octicons_helper (~> 19.29.0)
   openproject-openid_connect!
-  openproject-primer_view_components (~> 0.73.0)
+  openproject-primer_view_components (~> 0.73.1)
   openproject-recaptcha!
   openproject-reporting!
   openproject-storages!
@@ -2076,7 +2076,7 @@ CHECKSUMS
   openproject-octicons (19.29.0) sha256=9d9106a276d140a2ba975052688b0c92e404af0df5db87d322265ac5c15e8815
   openproject-octicons_helper (19.29.0) sha256=d093d91163b27d1624841590a8e6b202186d165ad7d006ceadc8bdc3b09830e6
   openproject-openid_connect (1.0.0)
-  openproject-primer_view_components (0.73.0) sha256=cd0f25ce22107e5a72745f5e69b599a633263275c78cbc25fb6c40ff75f0c610
+  openproject-primer_view_components (0.73.1) sha256=591d1803255a8d02b6a53a846efd67535cb1739d44ba20b124d0e2707a20932f
   openproject-recaptcha (1.0.0)
   openproject-reporting (1.0.0)
   openproject-storages (1.0.0)

app/assets/images/16_4_features.svg

@@ -17,17 +17,26 @@
         end
         flex.with_row(mt: 2) do
           content_tag :div, class: "onboarding--video" do
-            render(Primer::BaseComponent.new(
-              my: 2,
-              tag: :video,
-              frameborder: "0",
-              height: "430",
-              width: "100%",
-              autoplay: "autoplay",
-              controls: true,
-              src: OpenProject::Static::Links.url_for(:enterprise_welcome_video),
-              allowfullscreen: true
-            ))
+            render(
+              Primer::BaseComponent.new(
+                my: 2,
+                tag: :video,
+                height: "430",
+                width: "100%",
+                controls: true,
+                preload: "none",
+                allowfullscreen: true,
+                data: { "media-dialog-target": "video" }
+              )
+            ) do
+              render(
+                Primer::BaseComponent.new(
+                  tag: :source,
+                  src: OpenProject::Static::Links.url_for(:enterprise_welcome_video),
+                  type: "video/mp4"
+                )
+              )
+            end
           end
         end
       end

app/assets/images/16_5_features.svg

@@ -6,6 +6,7 @@
         controller: "media-dialog"
       },
       title:,
+      classes: "Overlay--size-large-portrait",
       size: :xlarge
     )
   ) do |dialog|
@@ -21,15 +22,22 @@
               Primer::BaseComponent.new(
                 my: 2,
                 tag: :video,
-                frameborder: "0",
                 height: "430",
                 width: "100%",
-                autoplay: "autoplay",
                 controls: true,
-                src: video_src,
-                allowfullscreen: true
+                preload: "none",
+                allowfullscreen: true,
+                data: { "media-dialog-target": "video" }
               )
-            )
+            ) do
+              render(
+                Primer::BaseComponent.new(
+                  tag: :source,
+                  src: video_src,
+                  type: "video/mp4"
+                )
+              )
+            end
           end
         )
       end

app/components/enterprise_trials/welcome_dialog_component.html.erb

@@ -106,7 +106,7 @@ def delete_button
             "aria-label": I18n.t(:button_revoke),
             data: {
               turbo_method: :delete,
-              turbo_confirm: I18n.t(:text_are_you_sure),
+              turbo_confirm: I18n.t("users.sessions.deletion_warning"),
               turbo_submits_with: I18n.t(:label_loading)
             }
           )

app/components/onboarding/video_dialog_component.html.erb

@@ -55,9 +55,10 @@ def create # rubocop:disable Metrics/AbcSize
           .call(get_custom_field_params.merge(type: permitted_params.custom_field_type))
 
         if call.success?
+          custom_field = call.result
           flash[:notice] = t(:notice_successful_create)
-          call_hook(:controller_custom_fields_new_after_save, custom_field: call.result)
-          redirect_to index_path(call.result, tab: call.result.class.name)
+          call_hook(:controller_custom_fields_new_after_save, custom_field:)
+          redirect_to edit_path(custom_field, id: custom_field.id)
         else
           @custom_field = call.result || new_custom_field
           render action: :new, status: :unprocessable_entity
@@ -142,7 +143,7 @@ def prepare_custom_option_position
 
         index = 0
 
-        params[:custom_field][:custom_options_attributes].each do |_id, attributes|
+        params[:custom_field][:custom_options_attributes].each_value do |attributes|
           attributes[:position] = (index = index + 1)
         end
       end

app/components/users/sessions/row_component.rb

@@ -61,7 +61,7 @@ class WorkPackageCustomField < CustomField
   }
 
   scope :usable_as_custom_action, -> {
-    where.not(field_format: %w[hierarchy])
+    where.not(field_format: %w[hierarchy scored_list])
          .order(:name)
   }
 

app/controllers/concerns/custom_fields/shared_actions.rb

@@ -643,6 +643,7 @@ af:
       title: "Session management"
       instructions: "You are logged in to your account through the following devices. Revoke sessions that you do not recognise or from devices you do not control."
       may_not_delete_current: "You cannot delete your current session."
+      deletion_warning: "Are you sure you want to revoke this session? You will be logged out on this device."
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
@@ -2581,22 +2582,15 @@ af:
         header: "Read about new features and product updates."
         learn_about: "Learn more about all new features"
         #We need to include the version to invalidate outdated translations in other locales
-        "16_4":
-          new_features_title: >
-            The release contains various new features and improvements, such as:
-          new_features_list:
-            line_0: Option to auto-sync system color + contrast mode.
-            line_1: Dark high contrast mode for improved accessibility.
-            line_2: PDF export of project lists.
-            line_3: Custom font for all PDF exports (Enterprise add-on).
-            line_4: Improved meeting participants dialog.
-            line_5: Improved budget handling in project queries and budget planning.
-            line_6: Updated Home and Project overview page.
         "16_5":
           new_features_title: >
             The release contains various new features and improvements, such as:
           new_features_list:
-            line_0: New features and improvements coming soon. Keep checking back!
+            line_0: Add work packages to a meeting section in the Meetings tab.
+            line_1: Choose color mode more conveniently with “Increase contrast” checkboxes.
+            line_2: Filter projects by last update.
+            line_3: Jump to highlighted target elements from deep links.
+            line_4: Confirm critical actions with more accessible danger dialogs.
     links:
       upgrade_enterprise_edition: "Upgrade to Enterprise edition"
       postgres_migration: "Migrating your installation to PostgreSQL"