Merge pull request #21595 from opf/bug/fix-incorrect-meeting-section-ordering

[#70336] Sections in meeting agenda not displayed correctly when moved

Author: mrmir

modules/meeting/app/controllers/meetings_controller.rb

@@ -460,7 +460,8 @@ def find_meeting
 
     @meeting = scope
       .visible
-      .includes([:project, :author, { participants: :user }, :sections, { agenda_items: :outcomes }])
+      .includes([:project, :author, { participants: :user }, { agenda_items: :outcomes }])
+      .preload(:sections)
       .find(params[:id])
   end
 

modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb

@@ -513,5 +513,30 @@
         show_page.expect_blankslate
       end
     end
+
+    it "maintains section order when rendering" do
+      section1 = create(:meeting_section, meeting:, title: "Section A")
+      section2 = create(:meeting_section, meeting:, title: "Section B")
+      section3 = create(:meeting_section, meeting:, title: "Section C")
+
+      show_page.visit!
+      show_page.expect_section(title: "Section A")
+      show_page.expect_section(title: "Section B")
+      show_page.expect_section(title: "Section C")
+
+      show_page.select_section_action(section3, "Move up")
+
+      wait_for_network_idle
+
+      expect([section1, section2, section3].map { |s| s.reload.position }).to eq([1, 3, 2])
+
+      expect(show_page.section_headers)
+        .to eq(["Section A", "Section C", "Section B"])
+
+      show_page.reload!
+
+      expect(show_page.section_headers)
+        .to eq(["Section A", "Section C", "Section B"])
+    end
   end
 end

modules/meeting/spec/support/pages/meetings/show.rb

@@ -766,5 +766,9 @@ def wait_for_reference_changed(old_reference_value)
         element["data-reference-value"] != old_reference_value
       end
     end
+
+    def section_headers
+      page.all(".op-meeting-section-container[data-test-selector^='meeting-section-header-container-']").map(&:text)
+    end
   end
 end