get reordering via menu to work

Author: ulferts

modules/backlogs/app/components/backlogs/story_component.html.erb

@@ -51,7 +51,7 @@ See COPYRIGHT and LICENSE files for more details.
   <% end %>
 
   <% grid.with_area(:menu) do %>
-    <%= render(Backlogs::StoryMenuComponent.new(story:, sprint:, max_position:)) %>
+    <%= render(Backlogs::StoryMenuComponent.new(story:, sprint:, project:, max_position:)) %>
   <% end %>
 
   <% grid.with_area(:subject) do %>

modules/backlogs/app/components/backlogs/story_menu_component.rb

@@ -32,12 +32,12 @@ module Backlogs
   class StoryMenuComponent < ApplicationComponent
     attr_reader :story, :sprint, :project, :max_position, :current_user
 
-    def initialize(story:, sprint:, max_position:, current_user: User.current, **system_arguments)
+    def initialize(story:, sprint:, project:, max_position:, current_user: User.current, **system_arguments)
       super()
 
       @story = story
       @sprint = sprint
-      @project = sprint.project
+      @project = project
       @max_position = max_position
       @current_user = current_user
 

modules/backlogs/app/controllers/rb_application_controller.rb

@@ -43,17 +43,24 @@ class RbApplicationController < ApplicationController
   def load_sprint_and_project
     load_project
 
-    # because of strong params, we want to pluck this variable out right now,
-    # otherwise it causes issues where we are doing `attributes=`.
-    if (@sprint_id = params.delete(:sprint_id))
-      @sprint = Sprint.visible.apply_to(@project).find(@sprint_id)
-    end
+    load_sprint
   end
 
   def load_project
     @project = Project.visible.find(params[:project_id])
   end
 
+  def load_sprint
+    @sprint_id = params.delete(:sprint_id)
+    return unless @sprint_id
+
+    @sprint = if OpenProject::FeatureDecisions.scrum_projects_active?
+                Agile::Sprint.for_project(@project).visible.find(@sprint_id)
+              else
+                Sprint.visible.apply_to(@project).find(@sprint_id)
+              end
+  end
+
   def check_if_plugin_is_configured
     return if OpenProject::FeatureDecisions.scrum_projects_active?
 

modules/backlogs/app/controllers/rb_stories_controller.rb

@@ -31,12 +31,7 @@
 class RbStoriesController < RbApplicationController
   include OpTurbo::ComponentStream
 
-  NEW_SPRINT_ACTIONS = %i[move].freeze
-
-  skip_before_action :load_sprint_and_project, :authorize, only: NEW_SPRINT_ACTIONS
-
-  before_action :legacy_load_story, except: NEW_SPRINT_ACTIONS
-  before_action :load_project, :authorize, :load_sprint, :load_story, only: NEW_SPRINT_ACTIONS
+  before_action :load_story
 
   # Move a story from a Sprint to another Sprint or an Agile::Sprint.
   def move_legacy
@@ -90,7 +85,7 @@ def reorder
       return respond_with_turbo_streams(status: :unprocessable_entity)
     end
 
-    replace_backlog_component_via_turbo_stream(sprint: @sprint)
+    replace_typed_component_via_turbo_stream(sprint: @sprint)
 
     respond_with_turbo_streams
   end
@@ -184,19 +179,16 @@ def replace_backlog_component_via_turbo_stream(sprint:)
   end
 
   def replace_sprint_component_via_turbo_stream(sprint:)
-    replace_via_turbo_stream(component: Backlogs::SprintComponent.new(sprint: sprint, project: @project))
-  end
-
-  def legacy_load_story
-    @story = Story.visible.find(params[:id])
+    replace_via_turbo_stream(component: Backlogs::SprintComponent.new(sprint: sprint, project: @project),
+                             method: :morph)
   end
 
   def load_story
-    @story = WorkPackage.visible.find(params[:id])
-  end
-
-  def load_sprint
-    @sprint = Agile::Sprint.for_project(@project).visible.find(params[:sprint_id])
+    @story = if OpenProject::FeatureDecisions.scrum_projects_active?
+               WorkPackage.visible.find(params[:id])
+             else
+               Story.visible.find(params[:id])
+             end
   end
 
   def move_params

modules/backlogs/spec/controllers/rb_stories_controller_spec.rb

@@ -221,7 +221,7 @@
     end
   end
 
-  describe "PUT #move" do
+  describe "PUT #move", with_flag: { scrum_projects: true } do
     let(:agile_sprint) { create(:agile_sprint, name: "Agile Sprint 1", project:) }
     let(:story_in_agile_sprint) { create(:work_package, status:, sprint: agile_sprint, project:) }