Merge branch 'release/15.3' into dev

app/components/shares/invite_user_form_component.html.erb

@@ -10,7 +10,7 @@
       ) do |form|
         grid_layout('invite-user-form', tag: :div) do |invite_form|
           invite_form.with_area('invitee') do
-            render(Shares::Invitee.new(form, allow_hover_cards:))
+            render(Shares::Invitee.new(form))
           end
 
           invite_form.with_area('permission') do

app/components/shares/invite_user_form_component.rb

@@ -32,15 +32,14 @@ class InviteUserFormComponent < ApplicationComponent # rubocop:disable OpenProje
     include OpTurbo::Streamable
     include OpPrimer::ComponentHelpers
 
-    attr_reader :entity, :strategy, :errors, :allow_hover_cards
+    attr_reader :entity, :strategy, :errors
 
-    def initialize(strategy:, errors: nil, allow_hover_cards: false)
+    def initialize(strategy:, errors: nil)
       super
 
       @strategy = strategy
       @entity = strategy.entity
       @errors = errors
-      @allow_hover_cards = allow_hover_cards
     end
 
     def new_share

app/components/shares/manage_shares_component.html.erb

@@ -1,7 +1,7 @@
 <%=
   if strategy.manageable?
     modal_content.with_row do
-      render(Shares::InviteUserFormComponent.new(strategy:, errors:, allow_hover_cards:))
+      render(Shares::InviteUserFormComponent.new(strategy:, errors:))
     end
   end
 
@@ -100,15 +100,9 @@
         end
       else
         strategy.shares.each do |share|
-          render(Shares::ShareRowComponent.new(share:, strategy:, container: border_box, allow_hover_cards:))
+          render(Shares::ShareRowComponent.new(share:, strategy:, container: border_box))
         end
       end
     end
   end
-
-  if allow_hover_cards
-    modal_content.with_row do
-      helpers.angular_component_tag 'opce-custom-modal-overlay', class: 'op-user-share-modal-overlay'
-    end
-  end
 %>

app/components/shares/manage_shares_component.rb

@@ -36,7 +36,6 @@ class ManageSharesComponent < ApplicationComponent # rubocop:disable OpenProject
     attr_reader :strategy,
                 :entity,
                 :errors,
-                :allow_hover_cards,
                 :modal_content
 
     def initialize(strategy:, modal_content:, errors: nil)
@@ -46,7 +45,6 @@ def initialize(strategy:, modal_content:, errors: nil)
       @entity = strategy.entity
       @errors = errors
       @modal_content = modal_content
-      @allow_hover_cards = strategy.allow_hover_cards?
     end
 
     def self.wrapper_key

app/components/shares/share_row_component.html.erb

@@ -14,7 +14,7 @@
 
       user_row_grid.with_area(:avatar, tag: :div) do
         render(Users::AvatarComponent.new(user: principal, show_name: false, size: :medium,
-                                          hover_card: { active: allow_hover_cards, target: :custom }))
+                                          hover_card: { active: true }))
       end
 
       user_row_grid.with_area(:user_details, tag: :div, classes: 'ellipsis') do

app/components/shares/share_row_component.rb

@@ -36,7 +36,7 @@ class ShareRowComponent < ApplicationComponent # rubocop:disable OpenProject/Add
     include OpTurbo::Streamable
     include OpPrimer::ComponentHelpers
 
-    def initialize(share:, strategy:, container: nil, allow_hover_cards: false)
+    def initialize(share:, strategy:, container: nil)
       super
 
       @share = share
@@ -45,7 +45,6 @@ def initialize(share:, strategy:, container: nil, allow_hover_cards: false)
       @principal = share.principal
       @available_roles = strategy.available_roles
       @container = container
-      @allow_hover_cards = allow_hover_cards
     end
 
     def wrapper_uniq_by
@@ -54,7 +53,7 @@ def wrapper_uniq_by
 
     private
 
-    attr_reader :share, :entity, :principal, :container, :available_roles, :strategy, :allow_hover_cards
+    attr_reader :share, :entity, :principal, :container, :available_roles, :strategy
 
     def share_editable?
       @share_editable ||= User.current != share.principal && sharing_manageable?

app/components/shares/user_details_component.html.erb

@@ -1,12 +1,8 @@
-<%= component_wrapper do
+<%=
+component_wrapper do
   flex_layout do |flex|
     flex.with_row do
-      render(
-        Primer::Beta::Link.new(
-          font_weight: :semibold,
-          href: principal_show_path,
-        )
-      ) { user.name }
+      helpers.primer_link_to_user(user, font_weight: :semibold, href: principal_show_path)
     end
 
     flex.with_row(classes: "ellipsis") do
@@ -24,7 +20,8 @@
               concat(
                 form_with(url: resend_invite_path, method: :post) do
                   render(Primer::Beta::Button.new(type: :submit, px: 0, scheme: :link)) { I18n.t("sharing.user_details.resend_invite") }
-                end)
+                end
+              )
             end
           end
         else
@@ -35,4 +32,5 @@
       end
     end
   end
-end %>
+end
+%>

app/components/users/avatar_component.rb

@@ -33,7 +33,7 @@ class AvatarComponent < ApplicationComponent
     include OpPrimer::ComponentHelpers
 
     def initialize(user:, show_name: true, link: true, size: "default", classes: "", title: nil, name_classes: "",
-                   hover_card: { active: true, target: :default })
+                   hover_card: { active: true })
       super
 
       @user = user

app/controllers/work_package_relations_controller.rb

@@ -60,6 +60,15 @@ def create
                                              .call(create_relation_params)
 
     respond_with_relations_tab_update(service_result, relation_to_scroll_to: service_result.result)
+
+    if service_result.failure?
+      update_via_turbo_stream(
+        component: WorkPackageRelationsTab::WorkPackageRelationFormComponent.new(work_package: @work_package,
+                                                                                 relation: service_result.result,
+                                                                                 base_errors: service_result.errors[:base]),
+        status: :bad_request
+      )
+    end
   end
 
   def update
@@ -69,6 +78,14 @@ def update
       .call(update_relation_params)
 
     respond_with_relations_tab_update(service_result)
+    if service_result.failure?
+      update_via_turbo_stream(
+        component: WorkPackageRelationsTab::WorkPackageRelationFormComponent.new(work_package: @work_package,
+                                                                                 relation: service_result.result,
+                                                                                 base_errors: service_result.errors[:base]),
+        status: :bad_request
+      )
+    end
   end
 
   def destroy

app/forms/shares/invitee.rb

@@ -53,15 +53,14 @@ class Invitee < ApplicationForm
           appendToComponent: true,
           disabled: @disabled,
           isOpenedInModal: true,
-          hoverCards: @allow_hover_cards
+          hoverCards: true
         }
       )
     end
 
-    def initialize(disabled: false, allow_hover_cards: false)
+    def initialize(disabled: false)
       super()
       @disabled = disabled
-      @allow_hover_cards = allow_hover_cards
     end
   end
 end

app/helpers/application_helper.rb

@@ -290,7 +290,7 @@ def theme_options_for_select
 
   def body_data_attributes(local_assigns)
     {
-      controller: "application",
+      controller: "application hover-card-trigger",
       relative_url_root: root_path,
       overflowing_identifier: ".__overflowing_body",
       rendered_at: Time.zone.now.iso8601,

app/models/relation.rb

@@ -103,7 +103,11 @@ class Relation < ApplicationRecord
   scope :follows_with_lag,
         -> { follows.where("lag > 0") }
 
-  validates :lag, numericality: { allow_nil: true }
+  validates :lag, numericality: {
+    allow_nil: true,
+    less_than_or_equal_to: 2_147_483_647,
+    greater_than_or_equal_to: 0
+  }
 
   validates :to, uniqueness: { scope: :from }
 

app/models/sharing_strategies/base_strategy.rb

@@ -50,10 +50,6 @@ def manageable?
       raise NotImplementedError, "Override in a subclass and return true if the current user can manage sharing"
     end
 
-    def allow_hover_cards?
-      raise NotImplementedError, "Override in a subclass and return true if hover cards should appear hovering users"
-    end
-
     def create_contract_class
       raise NotImplementedError, "Override in a subclass and return the contract class for creating a share"
     end

app/models/sharing_strategies/project_query_strategy.rb

@@ -54,10 +54,6 @@ def viewable?
       @entity.visible?
     end
 
-    def allow_hover_cards?
-      true
-    end
-
     def create_contract_class
       Shares::ProjectQueries::CreateContract
     end

app/models/sharing_strategies/work_package_strategy.rb

@@ -53,13 +53,6 @@ def viewable?
       user.allowed_in_project?(:view_shared_work_packages, @entity.project)
     end
 
-    # Since the work package share dialog is embedded into an angular page, hover cards would compete for the
-    # portal outlet when rendering, causing bugs. Until the work package share dialog is refactored to be an
-    # async-dialog, we must disable hover cards for it.
-    def allow_hover_cards?
-      false
-    end
-
     def share_description(share) # rubocop:disable Metrics/PerceivedComplexity,Metrics/AbcSize
       scope = %i[sharing user_details]
 

config/database.production.yml

@@ -34,15 +34,26 @@ DATABASE_OPTIONS = %w[
   pool
   username
   password
+  passfile
   sslmode
   sslcompression
   sslcert
   sslkey
   sslpassword
   sslrootcert
   sslcrl
+  ssl_min_protocol_version
   application_name
   statement_timeout
+  channel_binding
+  connect_timeout
+  client_encoding
+  keepalives
+  keepalives_idle
+  keepalives_interval
+  keepalives_count
+  gssencmode
+  replication
 ].freeze
 
 DATABASE_VARIABLES = %w[

config/initializers/permissions.rb

@@ -136,14 +136,16 @@
       map.permission :view_project_stages_and_gates,
                      {},
                      permissible_on: :project,
-                     dependencies: :view_project
+                     dependencies: :view_project,
+                     visible: -> { OpenProject::FeatureDecisions.stages_and_gates_active? }
 
       map.permission :edit_project_stages_and_gates,
                      {},
                      permissible_on: :project,
                      require: :member,
                      dependencies: :view_project_stages_and_gates,
-                     contract_actions: { projects: %i[update] }
+                     contract_actions: { projects: %i[update] },
+                     visible: -> { OpenProject::FeatureDecisions.stages_and_gates_active? }
 
       map.permission :select_project_life_cycle,
                      {

config/locales/crowdin/af.yml

@@ -1227,6 +1227,10 @@ af:
             from:
               error_not_found: "work package in `from` position not found or not visible"
               error_readonly: "an existing relation's `from` link is immutable"
+            lag:
+              greater_than_or_equal_to:
+                zero: "cannot be negative."
+              less_than_or_equal_to: "is too high."
         repository:
           not_available: "SCM vendor is not available"
           not_whitelisted: "is not allowed by the configuration."

config/locales/crowdin/ar.yml

@@ -1263,6 +1263,10 @@ ar:
             from:
               error_not_found: "work package in `from` position not found or not visible"
               error_readonly: "علاقة الارتباط هذه غير ممكن تغييرها"
+            lag:
+              greater_than_or_equal_to:
+                zero: "cannot be negative."
+              less_than_or_equal_to: "is too high."
         repository:
           not_available: "بائع SCM غير متاح"
           not_whitelisted: "غير مسموح بالتكوين."

config/locales/crowdin/az.yml

@@ -1227,6 +1227,10 @@ az:
             from:
               error_not_found: "work package in `from` position not found or not visible"
               error_readonly: "an existing relation's `from` link is immutable"
+            lag:
+              greater_than_or_equal_to:
+                zero: "cannot be negative."
+              less_than_or_equal_to: "is too high."
         repository:
           not_available: "SCM vendor is not available"
           not_whitelisted: "is not allowed by the configuration."

config/locales/crowdin/be.yml

@@ -1245,6 +1245,10 @@ be:
             from:
               error_not_found: "work package in `from` position not found or not visible"
               error_readonly: "an existing relation's `from` link is immutable"
+            lag:
+              greater_than_or_equal_to:
+                zero: "cannot be negative."
+              less_than_or_equal_to: "is too high."
         repository:
           not_available: "SCM vendor is not available"
           not_whitelisted: "is not allowed by the configuration."

config/locales/crowdin/bg.yml

@@ -1227,6 +1227,10 @@ bg:
             from:
               error_not_found: "work package in `from` position not found or not visible"
               error_readonly: "an existing relation's `from` link is immutable"
+            lag:
+              greater_than_or_equal_to:
+                zero: "cannot be negative."
+              less_than_or_equal_to: "is too high."
         repository:
           not_available: "SCM доставчик не е наличен"
           not_whitelisted: "не е позволено от конфигурацията."

config/locales/crowdin/ca.yml

@@ -1224,6 +1224,10 @@ ca:
             from:
               error_not_found: "paquet de treball en posició \"des de\" no trobada o no visible"
               error_readonly: "una relació d'enllaç existent \"des de\" és inamovible"
+            lag:
+              greater_than_or_equal_to:
+                zero: "cannot be negative."
+              less_than_or_equal_to: "is too high."
         repository:
           not_available: "El proveïdor SCM no està disponible"
           not_whitelisted: "no està permès per la configuració."

config/locales/crowdin/ckb-IR.yml

@@ -1227,6 +1227,10 @@ ckb-IR:
             from:
               error_not_found: "work package in `from` position not found or not visible"
               error_readonly: "an existing relation's `from` link is immutable"
+            lag:
+              greater_than_or_equal_to:
+                zero: "cannot be negative."
+              less_than_or_equal_to: "is too high."
         repository:
           not_available: "SCM vendor is not available"
           not_whitelisted: "is not allowed by the configuration."

config/locales/crowdin/cs.yml

@@ -1245,6 +1245,10 @@ cs:
             from:
               error_not_found: "pracovní balíček v pozici `od` nebyl nalezen nebo není viditelný"
               error_readonly: "existující odkaz `od` je neměnný"
+            lag:
+              greater_than_or_equal_to:
+                zero: "cannot be negative."
+              less_than_or_equal_to: "is too high."
         repository:
           not_available: "Prodejce SCM není k dispozici"
           not_whitelisted: "není povoleno konfigurací."

config/locales/crowdin/da.yml

@@ -1225,6 +1225,10 @@ da:
             from:
               error_not_found: "work package in `from` position not found or not visible"
               error_readonly: "an existing relation's `from` link is immutable"
+            lag:
+              greater_than_or_equal_to:
+                zero: "cannot be negative."
+              less_than_or_equal_to: "is too high."
         repository:
           not_available: "SCM-leverandør utilgængelig"
           not_whitelisted: "tillades ikke af opsætningen."