Merge branch 'release/16.5' into dev

Author: openprojectci

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/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] {

frontend/src/global_styles/content/_enterprise.sass

@@ -40,6 +40,9 @@
 .upsell-colored
   color: var(--enterprise-upsell-color) !important
 
+.upsell-colored-text
+  color: var(--enterprise-upsell-text-color) !important
+
 .upsell-colored-background
   background: var(--enterprise-upsell-color) !important
   color: white !important

frontend/src/global_styles/openproject/_variable_defaults.scss

@@ -133,5 +133,6 @@
   --full-view-split-right-width: 550px;
   --gantt-split-width: 50%;
   --enterprise-upsell-color: #FB8F44;
+  --enterprise-upsell-text-color: #CE4C00;
   --enterprise-upsell-border-color: #fb8f4466;
 }

spec/features/admin/scim_clients/index_spec.rb

@@ -40,7 +40,6 @@
       visit admin_scim_clients_path
 
       expect(page).to be_axe_clean.within("#content")
-                                  .skipping("color-contrast") # https://community.openproject.org/wp/65507
 
       expect(page).to have_enterprise_banner(:corporate)
       expect(page).to have_no_test_selector("Admin::ScimClients::TableComponent")

spec/models/custom_value/calculated_value_strategy_spec.rb

@@ -66,24 +66,54 @@
     subject { instance.formatted_value }
 
     context "when value is a float string" do
-      let(:value) { "3.14" }
+      let(:value) { "32400.14" }
 
-      it "is the float string" do
-        expect(subject).to eql value
+      it "is the float string with delimiters" do
+        expect(subject).to eql "32,400.14"
       end
 
-      it "is localized" do
+      it "is localized with delimiters" do
         I18n.with_locale(:de) do
-          expect(subject).to eql "3,14"
+          expect(subject).to eql "32.400,14"
         end
       end
     end
 
+    context "when value is a float string with many zeroed decimals" do
+      let(:value) { "3.0000000000000000000000000000009" }
+
+      it "is formatted as a float with a minimum precision" do
+        expect(subject).to eql "3.0"
+      end
+    end
+
+    context "when value is a float string with some zeroed decimals" do
+      let(:value) { "3.000" }
+
+      it "is formatted as a float with a minimum precision" do
+        expect(subject).to eql "3.0"
+      end
+    end
+
+    context "when value is a float string with digits after the decimal point" do
+      let(:value) { "42.87391" }
+
+      it "is formatted as a float with a precision of 3 while rounding decimal places" do
+        expect(subject).to eql "42.874"
+      end
+    end
+
     context "when value is an int string" do
-      let(:value) { "42" }
+      let(:value) { "42312" }
 
-      it "is the int string" do
-        expect(subject).to eql value
+      it "is the int string with delimiters" do
+        expect(subject).to eql "42,312"
+      end
+
+      it "is localized with delimiters" do
+        I18n.with_locale(:de) do
+          expect(subject).to eql "42.312"
+        end
       end
     end