Merge branch 'release/16.6' into implementation/68700-rename-to-weighted-item-list

Author: Kharonus

Gemfile

@@ -418,6 +418,6 @@ gemfiles.each do |file|
   send(:eval_gemfile, file) if File.readable?(file)
 end
 
-gem "openproject-octicons", "~>19.29.0"
-gem "openproject-octicons_helper", "~>19.29.0"
-gem "openproject-primer_view_components", "~>0.75.2"
+gem "openproject-octicons", "~>19.30.1"
+gem "openproject-octicons_helper", "~>19.30.1"
+gem "openproject-primer_view_components", "~>0.76.0"

Gemfile.lock

@@ -860,15 +860,15 @@ GEM
       validate_email
       validate_url
       webfinger (~> 2.0)
-    openproject-octicons (19.29.0)
-    openproject-octicons_helper (19.29.0)
+    openproject-octicons (19.30.1)
+    openproject-octicons_helper (19.30.1)
       actionview
-      openproject-octicons (= 19.29.0)
+      openproject-octicons (= 19.30.1)
       railties
-    openproject-primer_view_components (0.75.2)
+    openproject-primer_view_components (0.76.0)
       actionview (>= 7.2.0)
       activesupport (>= 7.2.0)
-      openproject-octicons (>= 19.29.0)
+      openproject-octicons (>= 19.30.1)
       view_component (>= 3.1, < 5.0)
     openproject-token (8.1.0)
       activemodel
@@ -1630,10 +1630,10 @@ DEPENDENCIES
   openproject-job_status!
   openproject-ldap_groups!
   openproject-meeting!
-  openproject-octicons (~> 19.29.0)
-  openproject-octicons_helper (~> 19.29.0)
+  openproject-octicons (~> 19.30.1)
+  openproject-octicons_helper (~> 19.30.1)
   openproject-openid_connect!
-  openproject-primer_view_components (~> 0.75.2)
+  openproject-primer_view_components (~> 0.76.0)
   openproject-recaptcha!
   openproject-reporting!
   openproject-storages!
@@ -2007,10 +2007,10 @@ CHECKSUMS
   openproject-job_status (1.0.0)
   openproject-ldap_groups (1.0.0)
   openproject-meeting (1.0.0)
-  openproject-octicons (19.29.0) sha256=9d9106a276d140a2ba975052688b0c92e404af0df5db87d322265ac5c15e8815
-  openproject-octicons_helper (19.29.0) sha256=d093d91163b27d1624841590a8e6b202186d165ad7d006ceadc8bdc3b09830e6
+  openproject-octicons (19.30.1) sha256=36ac6e91721ddddc918fba9d51ea3b9d11759d9ad76ff15c0c19c7117c76387b
+  openproject-octicons_helper (19.30.1) sha256=c1cc1cf337fa656de04b3ec58a3410cfb0e88f7c221dbda7a0b647b678398841
   openproject-openid_connect (1.0.0)
-  openproject-primer_view_components (0.75.2) sha256=7ad3d7eb15a163f67fdde42b41a0e4f08a33bb26d8aeaafd5eaf5e1bf3646915
+  openproject-primer_view_components (0.76.0) sha256=d0506243998afd6a71de73050876bc196249901635ea8d885578513081262aa2
   openproject-recaptcha (1.0.0)
   openproject-reporting (1.0.0)
   openproject-storages (1.0.0)

app/models/acts_as_customizable/calculated_value.rb

@@ -98,9 +98,23 @@ def calculated_value_fields_to_compute(custom_fields:, enabled_ids:)
     end
 
     def handle_calculation_errors!(given_cfs, enabled_ids, calculated_fields, result, errors)
+      # Skip creating error objects if the project is not persisted, because the error objects
+      # require the customized object (project) to be saved in the database.
+      return unless is_a?(Project) && persisted?
+
       remove_calculated_value_errors!(calculated_fields.map(&:id))
 
-      return unless is_a?(Project) && errors.any?
+      create_calculated_value_errors(given_cfs, enabled_ids, calculated_fields, result, errors)
+    end
+
+    def remove_calculated_value_errors!(custom_field_ids)
+      return if custom_field_ids.empty?
+
+      CalculatedValueError.where(customized: self, custom_field_id: custom_field_ids).delete_all
+    end
+
+    def create_calculated_value_errors(given_cfs, enabled_ids, calculated_fields, result, errors)
+      return if errors.empty?
 
       enabled_calculated_fields = calculated_fields.filter { it.id.in?(enabled_ids) }
 
@@ -112,11 +126,5 @@ def handle_calculation_errors!(given_cfs, enabled_ids, calculated_fields, result
         calculated_fields: enabled_calculated_fields
       )
     end
-
-    def remove_calculated_value_errors!(custom_field_ids)
-      return if custom_field_ids.empty?
-
-      CalculatedValueError.where(customized: self, custom_field_id: custom_field_ids).delete_all
-    end
   end
 end

app/models/custom_field.rb

@@ -54,7 +54,7 @@ class CustomField < ApplicationRecord
   has_many :calculated_value_errors, dependent: :delete_all, inverse_of: "custom_field"
 
   scope :hierarchy_root_and_children, -> { includes(hierarchy_root: { children: :children }) }
-  scope :required, -> { where(is_required: true) }
+  scope :required, -> { where(is_required: true).where.not(field_format: "calculated_value") }
 
   scope :field_format_calculated_value, -> { where(field_format: "calculated_value") }
 

app/models/custom_value.rb

@@ -48,6 +48,7 @@ class CustomValue < ApplicationRecord
            :required?,
            :max_length,
            :min_length,
+           :calculated_value?,
            to: :custom_field
 
   delegate :to_s, to: :value

app/models/projects/custom_fields.rb

@@ -40,7 +40,9 @@ module Projects::CustomFields
     has_many :project_custom_fields, through: :project_custom_field_project_mappings,
                                      class_name: "ProjectCustomField"
 
-    def enabled_custom_field_ids = project_custom_field_ids
+    def enabled_custom_field_ids
+      project_custom_field_project_mappings.map(&:custom_field_id)
+    end
 
     def available_custom_fields
       return all_visible_custom_fields if new_record?

app/services/projects/concerns/new_project_service.rb

@@ -32,7 +32,7 @@ module Projects::Concerns
   module NewProjectService
     private
 
-    def after_validate(service_call)
+    def before_perform(service_call)
       super.tap do |super_call|
         build_missing_project_custom_field_project_mappings(super_call.result)
       end
@@ -98,10 +98,11 @@ def disable_custom_fields_with_empty_values(new_project)
     end
 
     def build_missing_project_custom_field_project_mappings(project)
-      # Activate custom fields for this project (via mapping table) if values have been provided
-      # for custom_fields, but no mapping exists.
+      # Activate all custom fields (via mapping table) that are required or
+      # have a value provided by the user, but no mapping exists.
+
       custom_field_ids = project.custom_values
-        .select { |cv| cv.value.present? }
+        .select { |cv| cv.value? || cv.required? }
         .pluck(:custom_field_id).uniq
       activated_custom_field_ids = project.project_custom_field_project_mappings.pluck(:custom_field_id).uniq
 
@@ -110,5 +111,25 @@ def build_missing_project_custom_field_project_mappings(project)
 
       project.project_custom_field_project_mappings.build(mappings)
     end
+
+    def update_calculated_value_custom_fields(model)
+      changed_cf_ids = model.custom_values.map(&:custom_field_id)
+
+      # Using unscope(where: :admin_only) to fix an issue when non admin user
+      # edits a custom field which is used by an admin only calculated value
+      # field. Without this unscoping, admin only value and all fields
+      # referencing it (recursively) will not be recalculated and there will
+      # even be no place for that recalculatin to be triggered unless an admin
+      # edits same value again.
+      #
+      # This may need to be handled differently to make it work for other custom
+      # field containers, like WorkPackage. User custom fields also has
+      # admin_only check.
+      affected_cfs = model.available_custom_fields.unscope(where: :admin_only).affected_calculated_fields(changed_cf_ids)
+
+      model.calculate_custom_fields(affected_cfs)
+
+      model.save if model.persisted? && model.changed_for_autosave?
+    end
   end
 end

app/services/projects/concerns/set_calculated_custom_field_values.rb

@@ -100,6 +100,7 @@ def before_perform(service_call)
     def after_perform(call)
       super.tap do |super_call|
         copy_activated_custom_fields(super_call)
+        update_calculated_value_custom_fields(super_call.result)
       end
     end
 

app/services/projects/copy_service.rb

@@ -31,5 +31,11 @@
 module Projects
   class CreateService < ::BaseServices::Create
     include Projects::Concerns::NewProjectService
+
+    def after_perform(service_call)
+      super.tap do |call|
+        update_calculated_value_custom_fields(call.result)
+      end
+    end
   end
 end