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/boolean_input_component.rb

@@ -46,8 +46,8 @@ def call
 
         private
 
-        def submit_url
-          inplace_edit_field_submit_path(
+        def reset_url
+          inplace_edit_field_reset_path(
             model: model.class.name,
             id: model.id,
             attribute:,
@@ -59,6 +59,7 @@ def additional_arguments
           if show_action_buttons
             {
               data: { controller: "inplace-edit",
+                      inplace_edit_url_value: reset_url,
                       action: "click->inplace-edit#submitForm keydown.esc->inplace-edit#request",
                       qa_field_name: }
             }

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/display_field_component.rb

@@ -193,18 +193,22 @@ def custom_field_values
           def dialog_controller_actions
             return "" unless writable? || @has_comment
 
-            "click->inplace-edit#openDialog " \
-              "keydown.enter->inplace-edit#openDialog " \
-              "keydown.space->inplace-edit#openDialog " \
+            [
+              "click->inplace-edit#openDialog",
+              "keydown.enter->inplace-edit#openDialog",
+              "keydown.space->inplace-edit#openDialog",
               "inplace-edit:open-dialog->async-dialog#handleOpenDialog"
+            ].join(" ")
           end
 
           def inline_controller_actions
             return "" unless writable?
 
-            "click->inplace-edit#request " \
-              "keydown.enter->inplace-edit#request " \
+            [
+              "click->inplace-edit#request",
+              "keydown.enter->inplace-edit#request",
               "keydown.space->inplace-edit#request"
+            ].join(" ")
           end
         end
       end

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