Some more test fixing.. There is light and the end of the tunnel :fingers_crossed:

Author: HDinger

app/components/open_project/common/inplace_edit_field_component.rb

@@ -84,21 +84,7 @@ def display_field_class
       def display_field_component
         return nil if display_field_class.nil?
 
-        @display_field_component ||= begin
-          has_comment = custom_field? && custom_field&.has_comment?
-          additional_args = open_in_dialog? ? dialog_display_arguments : {}
-          display_field_class.new(
-            model:,
-            attribute:,
-            writable: writable?,
-            truncated:,
-            has_comment:,
-            # Show comment as read-only text when a non-writable user opens the dialog.
-            # enforce_edit_mode identifies the dialog context.
-            show_comment: enforce_edit_mode && !writable? && has_comment,
-            **@system_arguments.merge(additional_args)
-          )
-        end
+        @display_field_component ||= build_display_field_component
       end
 
       def wrapper_key
@@ -163,6 +149,22 @@ def model_class
 
       private
 
+      def build_display_field_component
+        has_comment = custom_field? && custom_field&.has_comment?
+        additional_args = open_in_dialog? ? dialog_display_arguments : {}
+        display_field_class.new(
+          model:,
+          attribute:,
+          writable: writable?,
+          truncated:,
+          has_comment:,
+          # Show comment as read-only text when a non-writable user opens the dialog.
+          # enforce_edit_mode identifies the dialog context.
+          show_comment: enforce_edit_mode && !writable? && has_comment,
+          **@system_arguments.merge(additional_args)
+        )
+      end
+
       def dialog_trigger_arguments
         {
           dialog_controller_name: "inplace-edit",

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

@@ -56,7 +56,9 @@ def additional_arguments
             {
               data: { controller: "inplace-edit",
                       inplace_edit_url_value: reset_url,
-                      action: "keydown.esc->inplace-edit#request change->inplace-edit#submitForm",
+                      action: "keydown.esc->inplace-edit#request " \
+                              "keydown.enter->inplace-edit#submitForm " \
+                              "change->inplace-edit#submitForm",
                       qa_field_name: }
             }
           else

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

@@ -49,7 +49,7 @@ def render_calculation_error
 
             render(Primer::OpenProject::FlexLayout.new(
                      align_items: :flex_start,
-                     data: { test_selector: "error-cf-#{custom_field.id}" }
+                     data: { test_selector: "error--custom_field_#{custom_field.id}" }
                    )) do |container|
               container.with_column do
                 render Primer::Beta::Octicon.new(icon: :"alert-fill", color: :danger)

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

@@ -41,16 +41,22 @@ def render_display_value
             value = model.public_send(attribute)
 
             if value.present? && value != [nil]
-              if custom_field?
-                formatted_custom_field_values.presence || t("placeholders.default")
-              else
-                value.is_a?(Array) ? value.map(&:to_s).join(", ") : value.to_s
-              end
+              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)
 

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

@@ -54,29 +54,36 @@ def initialize(form:, attribute:, model:, show_action_buttons: true, **system_ar
 
         def call
           form.rich_text_area(name: attribute,
-                              wrapper_data_attributes: {
-                                controller: "ckeditor-focus",
-                                ckeditor_focus_target: "editor",
-                                ckeditor_focus_autofocus_value: true
-                              },
+                              wrapper_data_attributes: ckeditor_wrapper_data,
                               **@system_arguments)
 
           comment_field_if_enabled(form)
+          render_action_buttons if show_action_buttons
+        end
+
+        private
+
+        def ckeditor_wrapper_data
+          {
+            controller: "ckeditor-focus",
+            ckeditor_focus_target: "editor",
+            ckeditor_focus_autofocus_value: true
+          }
+        end
 
-          if show_action_buttons
-            form.group(layout: :horizontal, justify_content: :flex_end) do |button_group|
-              button_group.submit(name: :reset,
-                                  type: :submit,
-                                  label: I18n.t(:button_cancel),
-                                  scheme: :default,
-                                  formaction: inplace_edit_field_reset_path(model: model.class.name, id: model.id, attribute:),
-                                  formmethod: :get,
-                                  test_selector: "op-inplace-edit-field--textarea-cancel")
-              button_group.submit(name: :submit,
-                                  label: I18n.t(:button_save),
-                                  scheme: :primary,
-                                  test_selector: "op-inplace-edit-field--textarea-save")
-            end
+        def render_action_buttons
+          form.group(layout: :horizontal, justify_content: :flex_end) do |button_group|
+            button_group.submit(name: :reset,
+                                type: :submit,
+                                label: I18n.t(:button_cancel),
+                                scheme: :default,
+                                formaction: inplace_edit_field_reset_path(model: model.class.name, id: model.id, attribute:),
+                                formmethod: :get,
+                                test_selector: "op-inplace-edit-field--textarea-cancel")
+            button_group.submit(name: :submit,
+                                label: I18n.t(:button_save),
+                                scheme: :primary,
+                                test_selector: "op-inplace-edit-field--textarea-save")
           end
         end
       end

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

@@ -40,17 +40,7 @@ def initialize(form:, attribute:, model:, show_action_buttons: true, **system_ar
           super
 
           @system_arguments[:autocomplete_options] ||= {}
-          @system_arguments[:autocomplete_options][:model] ||= { id: model.id, name: model.name }
-          @system_arguments[:autocomplete_options][:inputName] ||= attribute
-          @system_arguments[:autocomplete_options][:wrapper_id] ||= @system_arguments[:wrapper_id]
-          if @system_arguments[:autocomplete_options][:focusDirectly].nil?
-            @system_arguments[:autocomplete_options][:focusDirectly] =
-              true
-          end
-          if @system_arguments[:autocomplete_options][:closeOnSelect].nil?
-            @system_arguments[:autocomplete_options][:closeOnSelect] =
-              false
-          end
+          set_autocomplete_defaults(model, attribute)
         end
 
         def call
@@ -61,24 +51,34 @@ def call
           end
 
           comment_field_if_enabled(form)
-
-          if show_action_buttons
-            form.group(layout: :horizontal, justify_content: :flex_end) do |button_group|
-              button_group.submit(name: :reset,
-                                  type: :submit,
-                                  label: I18n.t(:button_cancel),
-                                  scheme: :default,
-                                  formaction: inplace_edit_field_reset_path(model: model.class.name, id: model.id, attribute:),
-                                  formmethod: :get)
-              button_group.submit(name: :submit,
-                                  label: I18n.t(:button_save),
-                                  scheme: :primary)
-            end
-          end
+          render_action_buttons if show_action_buttons
         end
 
         private
 
+        def set_autocomplete_defaults(model, attribute)
+          opts = @system_arguments[:autocomplete_options]
+          opts[:model] ||= { id: model.id, name: model.name }
+          opts[:inputName] ||= attribute
+          opts[:wrapper_id] ||= @system_arguments[:wrapper_id]
+          opts[:focusDirectly] = true if opts[:focusDirectly].nil?
+          opts[:closeOnSelect] = false if opts[:closeOnSelect].nil?
+        end
+
+        def render_action_buttons
+          form.group(layout: :horizontal, justify_content: :flex_end) do |button_group|
+            button_group.submit(name: :reset,
+                                type: :submit,
+                                label: I18n.t(:button_cancel),
+                                scheme: :default,
+                                formaction: inplace_edit_field_reset_path(model: model.class.name, id: model.id, attribute:),
+                                formmethod: :get)
+            button_group.submit(name: :submit,
+                                label: I18n.t(:button_save),
+                                scheme: :primary)
+          end
+        end
+
         def render_custom_field_input
           input_class = if custom_field.multi_value?
                           CustomFields::Inputs::MultiSelectList

app/controllers/inplace_edit_fields_controller.rb

@@ -45,17 +45,7 @@ def edit
   end
 
   def update
-    handler = update_registry.fetch_handler(@model)
-
-    if handler.present?
-      success = handler.call(
-        model: @model,
-        params: permitted_params,
-        user: current_user
-      )
-    else
-      raise ArgumentError, "Missing update handler for #{@model}"
-    end
+    success = invoke_update_handler
 
     if success
       render_success_flash_message_via_turbo_stream(
@@ -65,10 +55,17 @@ def update
       refresh_calculated_dependents
     end
 
-    replace_via_turbo_stream(
-      component: component(enforce_edit_mode: !success),
-      status: success ? :ok : :unprocessable_entity
-    )
+    if !success && dialog_id
+      replace_via_turbo_stream(
+        component: dialog_field_component,
+        status: :unprocessable_entity
+      )
+    else
+      replace_via_turbo_stream(
+        component: component(enforce_edit_mode: !success),
+        status: success ? :ok : :unprocessable_entity
+      )
+    end
 
     respond_with_turbo_streams
   rescue ArgumentError
@@ -92,6 +89,13 @@ def dialog
 
   private
 
+  def invoke_update_handler
+    handler = update_registry.fetch_handler(@model)
+    raise ArgumentError, "Missing update handler for #{@model}" if handler.blank?
+
+    handler.call(model: @model, params: permitted_params, user: current_user)
+  end
+
   def find_model
     model_class = resolve_model_class(params[:model])
     @model = model_class.visible.find(params[:id])
@@ -158,19 +162,18 @@ def transform_custom_field_values_params
     cf_values = params.dig(model_key, :custom_field_values)
     raw_value = cf_values.is_a?(Array) ? cf_values : cf_values&.dig(custom_field_id)
 
-    # Handle both single-select and multi-select
-    processed_value = if raw_value.is_a?(Array)
-                        # Remove empty strings from the hidden field, then extract the actual value.
-                        # FilterableTreeView encodes each selected item as a JSON payload
-                        # {"path":[...],"value":"<id>"} — extract only the "value" field.
-                        cleaned_values = raw_value.compact_blank.filter_map { |v| extract_tree_view_value(v) }
-                        # For single-select, unwrap the array to get the single value
-                        cleaned_values.size <= 1 ? cleaned_values.first : cleaned_values
-                      else
-                        raw_value
-                      end
-
-    { @attribute => processed_value }
+    { @attribute => process_cf_raw_value(raw_value) }
+  end
+
+  def process_cf_raw_value(raw_value)
+    return raw_value unless raw_value.is_a?(Array)
+
+    # Remove empty strings from the hidden field, then extract the actual value.
+    # FilterableTreeView encodes each selected item as a JSON payload
+    # {"path":[...],"value":"<id>"} — extract only the "value" field.
+    cleaned_values = raw_value.compact_blank.filter_map { |v| extract_tree_view_value(v) }
+    # For single-select, unwrap the array to get the single value
+    cleaned_values.size <= 1 ? cleaned_values.first : cleaned_values
   end
 
   def extract_tree_view_value(raw)
@@ -198,6 +201,25 @@ def component(enforce_edit_mode: false)
     )
   end
 
+  # Builds the edit-mode component targeting the field *inside* the dialog.
+  # Used when an update fails while submitting from a dialog: the error state
+  # should be shown within the dialog, not at the page trigger location.
+  # Keeps the dialog field's own :id (not page_component_id) so the Turbo
+  # Stream targets the correct wrapper inside the dialog, and preserves
+  # :wrapper_id / :form_id so the re-rendered form still submits via the dialog.
+  def dialog_field_component
+    args = system_arguments.to_h.symbolize_keys
+
+    OpenProject::Common::InplaceEditFieldComponent.new(
+      model: @model,
+      attribute: @attribute,
+      enforce_edit_mode: true,
+      show_action_buttons: false,
+      update_registry:,
+      **args
+    )
+  end
+
   def dialog_id
     wrapper_id = system_arguments.to_h["wrapper_id"]
     wrapper_id&.delete_prefix("#")
@@ -244,14 +266,16 @@ def calculated_field_turbo_stream(custom_field)
   end
 
   def stable_key_system_arguments
-    @stable_key_system_arguments ||= begin
-      raw = params[:stable_key_system_arguments]
-      return {} if raw.blank?
+    @stable_key_system_arguments ||= parse_stable_key_system_arguments
+  end
 
-      JSON.parse(raw)
-    rescue JSON::ParserError
-      {}
-    end
+  def parse_stable_key_system_arguments
+    raw = params[:stable_key_system_arguments]
+    return {} if raw.blank?
+
+    JSON.parse(raw)
+  rescue JSON::ParserError
+    {}
   end
 
   def update_registry

spec/features/projects/project_custom_fields/overview_page/inputs_spec.rb

@@ -158,15 +158,15 @@ def dialog = overview_page.open_modal_for_custom_field(custom_field).dialog
       shared_examples "a rich text custom field input" do
         it "shows the correct value if given" do
           dialog.within_async_content(close_after_yield: true) do
-            field.expect_value(expected_initial_value)
+            form_field.expect_value(expected_initial_value)
           end
         end
 
         it "shows a blank input if no value or default value is given" do
           custom_field.custom_values.destroy_all
 
           dialog.within_async_content(close_after_yield: true) do
-            field.expect_value(expected_blank_value)
+            form_field.expect_value(expected_blank_value)
           end
         end
 
@@ -175,7 +175,7 @@ def dialog = overview_page.open_modal_for_custom_field(custom_field).dialog
           custom_field.update!(default_value:)
 
           dialog.within_async_content(close_after_yield: true) do
-            field.expect_value(default_value)
+            form_field.expect_value(default_value)
           end
         end
 
@@ -244,7 +244,7 @@ def dialog = overview_page.open_modal_for_custom_field(custom_field).dialog
         let(:default_value) { "https://openproject.org" }
         let(:expected_blank_value) { "" }
         let(:expected_initial_value) { "https://www.openproject.org" }
-        let(:field) { FormFields::Primerized::InputField.new(custom_field) }
+        let(:form_field) { FormFields::Primerized::InputField.new(custom_field) }
 
         it_behaves_like "a custom field input"