Use CustomValue.formatted_value instead of formatting the values manually

Author: HDinger

app/components/open_project/common/inplace_edit_fields/display_fields/display_field_component.rb

@@ -49,16 +49,10 @@ def initialize(model:, attribute:, writable:, truncated:, has_comment: false, sh
           end
 
           def render_display_value
-            value = model.public_send(attribute)
-
-            if value.is_a?(TrueClass) || value.is_a?(FalseClass)
-              boolean_display_value(value)
-            elsif value.is_a?(Date) || value.is_a?(Time)
-              helpers.format_date(value)
-            elsif value.present? && value != [nil]
-              format_present_value(value)
+            if custom_field?
+              render_custom_field_display_value
             else
-              t("placeholders.default")
+              render_attribute_display_value
             end
           end
 
@@ -151,11 +145,22 @@ def display_field_classes
             "op-inplace-edit--display-field#{' op-inplace-edit--display-field_clickable' if clickable}"
           end
 
-          def format_present_value(value)
-            if custom_field?
-              helpers.format_value(value, custom_field)
-            else
+          def render_custom_field_display_value
+            values = custom_field_values.reject { |v| v.value.blank? }
+            values.present? ? values.map(&:formatted_value).join(", ") : t("placeholders.default")
+          end
+
+          def render_attribute_display_value
+            value = model.public_send(attribute)
+
+            if value.is_a?(TrueClass) || value.is_a?(FalseClass)
+              boolean_display_value(value)
+            elsif value.is_a?(Date) || value.is_a?(Time)
+              helpers.format_date(value)
+            elsif value.present?
               value.to_s
+            else
+              t("placeholders.default")
             end
           end
 

app/components/open_project/common/inplace_edit_fields/display_fields/hierarchy_list_component.rb

@@ -33,36 +33,13 @@ module Common
     module InplaceEditFields
       module DisplayFields
         class SelectListComponent < DisplayFieldComponent
-          include CustomFieldsHelper
-
-          attr_reader :model, :attribute, :writable
-
-          def render_display_value
-            value = model.public_send(attribute)
-
-            if value.present? && value != [nil]
-              render_value(value)
-            else
-              t("placeholders.default")
-            end
-          end
-
           private
 
-          def render_value(value)
-            if custom_field?
-              formatted_custom_field_values.presence || t("placeholders.default")
-            else
-              value.is_a?(Array) ? value.join(", ") : value.to_s
-            end
-          end
-
-          def formatted_custom_field_values
-            return @formatted_custom_field_values if defined?(@formatted_custom_field_values)
-
-            values = custom_field_values.map { |v| format_value(v.value, custom_field) }
+          def render_attribute_display_value
+            value = model.public_send(attribute)
+            return t("placeholders.default") unless value.present? && value != [nil]
 
-            @formatted_custom_field_values = custom_field&.multi_value? ? values.join(", ") : values.first
+            value.is_a?(Array) ? value.join(", ") : value.to_s
           end
         end
       end

app/components/open_project/common/inplace_edit_fields/display_fields/select_list_component.rb

@@ -33,35 +33,22 @@ module Common
     module InplaceEditFields
       module DisplayFields
         class UserSelectListComponent < SelectListComponent
-          include CustomFieldsHelper
-
-          attr_reader :model, :attribute, :writable
-
-          def formatted_custom_field_values
-            return @formatted_custom_field_values if defined?(@formatted_custom_field_values)
-
-            cf_values = custom_field_values
-
-            users = cf_values.filter_map(&:typed_value)
+          private
 
-            @formatted_custom_field_values = if custom_field.multi_value?
-                                               flex_layout do |avatar_container|
-                                                 users.each do |user|
-                                                   avatar_container.with_row do
-                                                     render_avatar(user)
-                                                   end
-                                                 end
-                                               end
-                                             else
-                                               render_avatar(users.first)
-                                             end
+          def render_custom_field_display_value
+            users = custom_field_values.filter_map(&:typed_value)
+            return t("placeholders.default") if users.empty?
+
+            if custom_field.multi_value?
+              flex_layout do |avatar_container|
+                users.each { |user| avatar_container.with_row { render_avatar(user) } }
+              end
+            else
+              render_avatar(users.first)
+            end
           end
 
-          private
-
           def render_avatar(user)
-            return unless user
-
             render(::Users::AvatarComponent.new(user:, size: :mini))
           end
         end

app/components/open_project/common/inplace_edit_fields/display_fields/user_select_list_component.rb

@@ -34,10 +34,6 @@ module InplaceEditFields
       class HierarchyListComponent < BaseFieldComponent
         include CustomFieldHierarchyTreeViewHelper
 
-        def self.display_class
-          DisplayFields::HierarchyListComponent
-        end
-
         def self.open_in_dialog?
           true
         end

app/components/open_project/common/inplace_edit_fields/hierarchy_list_component.rb

@@ -201,10 +201,6 @@ end
 class HierarchyListComponent < BaseFieldComponent
   include CustomFieldHierarchyTreeViewHelper
 
-  def self.display_class
-    DisplayFields::HierarchyListComponent
-  end
-
   def self.open_in_dialog?
     true
   end