Replace on cancel

Author: oliverguenther

modules/meeting/app/components/meeting_agenda_items/edit_component.rb

@@ -46,7 +46,7 @@ def wrapper_uniq_by
     end
 
     def call
-      component_wrapper do
+      component_wrapper(tag: :li, class: "Box-row") do
         render(
           MeetingAgendaItems::FormComponent.new(
             meeting: @meeting_agenda_item.meeting,

modules/meeting/app/components/meeting_agenda_items/form_component.html.erb

@@ -6,7 +6,7 @@
       url: @submit_path,
       namespace: "form_#{wrapper_uniq_by}"
     ) do |f|
-      grid_layout("op-meeting-agenda-item-form", tag: :div, pl: 3) do |grid|
+      grid_layout("op-meeting-agenda-item-form", tag: :div) do |grid|
         grid.with_area(:title) do
           case @type
           when :simple

modules/meeting/app/controllers/concerns/meetings/agenda_component_streams.rb

@@ -207,7 +207,7 @@ def update_list_via_turbo_stream(meeting: @meeting, form_hidden: true, form_type
       def update_item_via_turbo_stream(meeting_agenda_item: @meeting_agenda_item)
         update_via_turbo_stream(
           component: MeetingAgendaItems::ItemComponent.new(
-            meeting_agenda_item:,
+            meeting_agenda_item:
           )
         )
         update_show_items_via_turbo_stream
@@ -223,8 +223,14 @@ def edit_item_via_turbo_stream(meeting_agenda_item: @meeting_agenda_item, displa
         )
       end
 
-      def add_item_via_turbo_stream(meeting_agenda_item: @meeting_agenda_item, clear_slate: false)
-        # rubocop:disable Metrics/AbcSize
+      def replace_edit_item_via_turbo_stream(meeting_agenda_item: @meeting_agenda_item)
+        replace_via_turbo_stream(
+          component: MeetingAgendaItems::ItemComponent.new(meeting_agenda_item: @meeting_agenda_item),
+          target: MeetingAgendaItems::EditComponent.component_id(@meeting_agenda_item)
+        )
+      end
+
+      def add_item_via_turbo_stream(meeting_agenda_item: @meeting_agenda_item, clear_slate: false) # rubocop:disable Metrics/AbcSize
         if clear_slate
           update_list_via_turbo_stream(form_hidden: false, form_type: @agenda_item_type)
         elsif meeting_agenda_item.meeting.agenda_items.count == 1 && meeting_agenda_item.meeting.sections.present?

modules/meeting/app/controllers/meeting_agenda_items_controller.rb

@@ -121,7 +121,7 @@ def create # rubocop:disable Metrics/AbcSize
   end
 
   def cancel_edit
-    update_item_via_turbo_stream
+    replace_edit_item_via_turbo_stream
     respond_with_turbo_streams
   end
 
@@ -136,7 +136,7 @@ def update # rubocop:disable Metrics/AbcSize
         update_header_component_via_turbo_stream
         update_sidebar_details_component_via_turbo_stream
       end
-      update_item_via_turbo_stream
+      replace_edit_item_via_turbo_stream
       update_section_header_via_turbo_stream(meeting_section: @meeting_agenda_item.meeting_section)
     else
       # show errors