Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

[#66093] Make model responsible for only returning a single error

Tobias Dillmann92199a0b21c5
diff --git a/app/components/projects/row_component.rb b/app/components/projects/row_component.rb
index da8604afef1..ad05fe27816 100644
--- a/app/components/projects/row_component.rb
+++ b/app/components/projects/row_component.rb
@@ -94,16 +94,14 @@ module Projects
elsif custom_value.is_a?(Array)
safe_join(Array(custom_value).compact_blank, ", ")
elsif cf.calculated_value?
- calculated_value_or_error(cf, custom_value)
+ render_calculated_value(cf, custom_value)
else
custom_value
end
end
- def calculated_value_or_error(calculated_value, custom_value)
- errors = calculated_value.calculated_value_errors.where(project:)
-
- if errors.any?
+ def render_calculated_value(calculated_value, custom_value)
+ if (error = calculated_value.calculation_error(project:))
render(Primer::Alpha::Dialog.new(title: I18n.t("calculated_values.error_dialog.title"),
data: {
test_selector: "calculated-value-error-dialog-#{calculated_value.id}"
@@ -112,7 +110,7 @@ module Projects
"aria-label": I18n.t("calculated_values.error_dialog.title"),
data: { test_selector: "calculated-value-error-btn-#{calculated_value.id}" },
scheme: :invisible)
- dialog.with_body { errors.map(&:error_message).join(" ") }
+ dialog.with_body { error.error_message }
end
else
custom_value
diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index 932c92e8c5e..d48a03cdb4b 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -348,6 +348,17 @@ class CustomField < ApplicationRecord
"#{super}/#{tag}"
end
+ # If this custom field is a calculated value, return an existing calculation error.
+ # For non-calculated value custom fields, always returns `nil`.
+ #
+ # When there is at least one calculation error, will return the first one - or `nil` if there are none.
+ # Use this method when you want to present a calculation error to the user.
+ def calculation_error(project:)
+ return nil unless calculated_value?
+
+ calculated_value_errors.where(project:).first
+ end
+
private
def possible_versions(obj, options: {})
diff --git a/modules/overviews/app/components/overviews/project_custom_fields/item_component.rb b/modules/overviews/app/components/overviews/project_custom_fields/item_component.rb
index bea360d9c1e..585e4247a3c 100644
--- a/modules/overviews/app/components/overviews/project_custom_fields/item_component.rb
+++ b/modules/overviews/app/components/overviews/project_custom_fields/item_component.rb
@@ -50,12 +50,11 @@ module Overviews
end
def calculation_error?
- @project_custom_field.field_format_calculated_value? &&
- @project_custom_field.calculated_value_errors.where(project: @project).any?
+ @project_custom_field.calculation_error(project: @project).present?
end
def render_calculation_error
- errors = @project_custom_field.calculated_value_errors.where(project: @project)
+ error = @project_custom_field.calculation_error(project: @project)
render(Primer::OpenProject::FlexLayout.new(align_items: :flex_start,
data: {
@@ -66,7 +65,7 @@ module Overviews
end
container.with_column(ml: 2) do
render Primer::Beta::Text.new(color: :danger) do
- errors.map(&:error_message).join(" ")
+ error&.error_message
end
end
end