Merge branch 'release/16.5' into oidc-provider-create-message

Author: ba1ash

.github/dependabot.yml

@@ -39,7 +39,7 @@ updates:
         patterns:
           - "aws-*"
     ignore:
-      - dependency_name: "openproject-octicons"
+      - dependency-name: "openproject-octicons"
       - dependency-name: "openproject-octicons_helper"
       - dependency-name: "openproject-primer_view_components"
   - package-ecosystem: "github-actions"

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

@@ -880,7 +880,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)
@@ -1696,7 +1696,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/components/enterprise_edition/plan_for_feature.rb

@@ -81,7 +81,7 @@ def plan
     end
 
     def plan_text
-      plan_name = render(Primer::Beta::Text.new(font_weight: :bold, classes: "upsell-colored")) do
+      plan_name = render(Primer::Beta::Text.new(font_weight: :bold, classes: "upsell-colored-text")) do
         I18n.t("ee.upsell.plan_name", plan: plan.capitalize)
       end
 

app/components/enterprise_edition/trial_teaser_component.rb

@@ -69,7 +69,7 @@ def description
     end
 
     def plan_name
-      render(Primer::Beta::Text.new(font_weight: :bold, classes: "upsell-colored")) do
+      render(Primer::Beta::Text.new(font_weight: :bold, classes: "upsell-colored-text")) do
         I18n.t("ee.upsell.plan_name", plan: token.plan.capitalize)
       end
     end

app/controllers/concerns/custom_fields/shared_actions.rb

@@ -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/models/custom_value/calculated_value_strategy.rb

@@ -38,7 +38,26 @@ def typed_value
   end
 
   def formatted_value
-    integer_value? ? value.to_s : number_with_delimiter(value.to_s)
+    return "" if value.blank?
+
+    if integer_value?
+      number_with_delimiter(value.to_i)
+    else
+      delimiter = I18n.t("number.format.delimiter")
+      separator = I18n.t("number.format.separator")
+      formatted = number_with_precision(value.to_f,
+                                        precision: 3,
+                                        strip_insignificant_zeros: true,
+                                        delimiter:,
+                                        separator:)
+
+      # Ensure at least one decimal place for floats
+      if formatted.exclude?(separator)
+        "#{formatted}#{separator}0"
+      else
+        formatted
+      end
+    end
   end
 
   def validate_type_of_value
@@ -51,6 +70,6 @@ def validate_type_of_value
   private
 
   def integer_value?
-    value && value =~ /\A\d+\z/
+    value =~ /\A[-+]?\d+\z/
   end
 end

app/models/custom_value/float_strategy.rb

@@ -38,6 +38,8 @@ def typed_value
   end
 
   def formatted_value
+    return "" if value.blank?
+
     number_with_delimiter(value.to_s)
   end
 

app/models/custom_value/int_strategy.rb

@@ -29,10 +29,16 @@
 #++
 
 class CustomValue::IntStrategy < CustomValue::FormatStrategy
+  include ActionView::Helpers::NumberHelper
+
   def typed_value
-    if value.present?
-      value.to_i
-    end
+    value.to_i if value.present?
+  end
+
+  def formatted_value
+    return "" if value.blank?
+
+    number_with_delimiter(value.to_s)
   end
 
   def validate_type_of_value

app/views/custom_styles/_primer_color_mapping.erb

@@ -91,6 +91,7 @@
       --ck-color-button-on-disabled-background: var(--button-default-bgColor-disabled);
       --ck-color-labeled-field-label-background: var(--overlay-bgColor);
       --ck-color-input-disabled-background: var(--bgColor-disabled);
+      --enterprise-upsell-text-color: var(--enterprise-upsell-color);
   }
 
   [data-dark-theme=dark_high_contrast] {