Merge pull request #22393 from opf/feature/73109-sorting-and-uniqueness-constraint-in-inbox-and-sprints

Feature/73109 sorting and uniqueness constraint in inbox and sprints

Author: ulferts

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

@@ -56,7 +56,7 @@ See COPYRIGHT and LICENSE files for more details.
            ),
            tabindex: 0
          ) do %>
-        <%= render(Backlogs::StoryComponent.new(story:, sprint:, max_position:)) %>
+        <%= render(Backlogs::StoryComponent.new(story:, project:, sprint:, max_position:)) %>
       <% end %>
     <% end %>
   <% end %>

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

@@ -30,7 +30,7 @@ See COPYRIGHT and LICENSE files for more details.
 <%= component_wrapper(tag: :section) do %>
   <%= render(Primer::Beta::BorderBox.new(**@system_arguments)) do |border_box| %>
     <% border_box.with_header(id: dom_target(sprint, :header)) do %>
-      <%= render(Backlogs::SprintHeaderComponent.new(sprint:, folded: folded?)) %>
+      <%= render(Backlogs::SprintHeaderComponent.new(sprint:, project:, folded: folded?)) %>
     <% end %>
     <% if stories.empty? %>
       <% border_box.with_row(data: { empty_list_item: true }) do %>
@@ -45,18 +45,11 @@ See COPYRIGHT and LICENSE files for more details.
     <% stories.each do |story| %>
       <% border_box.with_row(
            id: dom_id(story),
-           classes: "Box-row--hover-blue Box-row--focus-gray Box-row--clickable Box-row--draggable",
-           data: draggable_item_config(story).merge(
-             story: true,
-             controller: "backlogs--story",
-             backlogs__story_id_value: story.id,
-             backlogs__story_split_url_value: details_backlogs_project_backlogs_path(project, story),
-             backlogs__story_full_url_value: work_package_path(story),
-             backlogs__story_selected_class: "Box-row--blue"
-           ),
+           classes: story_classes_attribute,
+           data: story_data_attribute(story),
            tabindex: 0
          ) do %>
-        <%= render(Backlogs::StoryComponent.new(story:, sprint:, max_position:)) %>
+        <%= render(Backlogs::StoryComponent.new(story:, sprint:, project:, max_position:)) %>
       <% end %>
     <% end %>
   <% end %>

modules/backlogs/app/components/backlogs/sprint_component.rb

@@ -34,14 +34,13 @@ class SprintComponent < ApplicationComponent
     include OpTurbo::Streamable
     include RbCommonHelper
 
-    attr_reader :sprint, :current_user
+    attr_reader :sprint, :current_user, :project
 
-    delegate :project, to: :sprint
-
-    def initialize(sprint:, current_user: User.current, **system_arguments)
+    def initialize(sprint:, project:, current_user: User.current, **system_arguments)
       super()
 
       @sprint = sprint
+      @project = project
       @current_user = current_user
 
       @system_arguments = system_arguments
@@ -50,12 +49,13 @@ def initialize(sprint:, current_user: User.current, **system_arguments)
       @system_arguments[:padding] = :condensed
       @system_arguments[:data] = merge_data(
         @system_arguments,
-        { data: drop_target_config }
+        { data: drop_target_config },
+        { data: { test_selector: "sprint-#{sprint.id}" } }
       )
     end
 
     def stories
-      sprint.work_packages
+      sprint.work_packages.where(project:).order(:position)
     end
 
     def wrapper_uniq_by
@@ -81,12 +81,44 @@ def drop_target_config
       }
     end
 
+    def story_classes_attribute
+      classes = "Box-row--hover-blue Box-row--focus-gray Box-row--clickable"
+
+      if work_package_draggable?
+        classes += " Box-row--draggable"
+      end
+
+      classes
+    end
+
+    def story_data_attribute(story)
+      draggable_item_config(story).merge(
+        story: true,
+        controller: "backlogs--story",
+        backlogs__story_id_value: story.id,
+        backlogs__story_split_url_value: details_backlogs_project_backlogs_path(project, story),
+        backlogs__story_full_url_value: work_package_path(story),
+        backlogs__story_selected_class: "Box-row--blue",
+        test_selector: card_test_selector(story)
+      )
+    end
+
     def draggable_item_config(story)
+      return {} unless work_package_draggable?
+
       {
         draggable_id: story.id,
         draggable_type: "story",
         drop_url: move_project_sprint_story_path(project, sprint, story)
       }
     end
+
+    def card_test_selector(story)
+      "work-package-#{story.id}"
+    end
+
+    def work_package_draggable?
+      current_user.allowed_in_project?(:manage_sprint_items, project)
+    end
   end
 end

modules/backlogs/app/components/backlogs/sprint_header_component.rb

@@ -36,19 +36,20 @@ class SprintHeaderComponent < ApplicationComponent
     include Redmine::I18n
     include RbCommonHelper
 
-    attr_reader :sprint, :collapsed, :current_user
+    attr_reader :sprint, :project, :collapsed, :current_user
 
-    delegate :project, to: :sprint
     delegate :name, to: :sprint, prefix: :sprint
 
     def initialize(
       sprint:,
+      project:,
       folded: false,
       current_user: User.current
     )
       super()
 
       @sprint = sprint
+      @project = project
       @collapsed = folded
       @current_user = current_user
     end

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

@@ -29,14 +29,14 @@ See COPYRIGHT and LICENSE files for more details.
 
 <%= grid_layout("op-backlogs-story", tag: :article) do |grid| %>
   <% grid.with_area(:drag_handle, classes: "hide-when-print") do %>
-    <%=
-      render(
-        Primer::OpenProject::DragHandle.new(
-          classes: "op-backlogs-story--drag_handle_button",
-          label: t(".label_drag_story", name: story.subject)
-        )
-      )
-    %>
+    <%= if draggable?
+          render(
+            Primer::OpenProject::DragHandle.new(
+              classes: "op-backlogs-story--drag_handle_button",
+              label: t(".label_drag_story", name: story.subject)
+            )
+          )
+        end %>
   <% end %>
 
   <% grid.with_area(:info_line) do %>
@@ -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_component.rb

@@ -32,13 +32,14 @@ module Backlogs
   class StoryComponent < ApplicationComponent
     include OpPrimer::ComponentHelpers
 
-    attr_reader :story, :sprint, :max_position, :current_user
+    attr_reader :story, :sprint, :project, :max_position, :current_user
 
-    def initialize(story:, sprint:, max_position:, current_user: User.current)
+    def initialize(story:, sprint:, project:, max_position:, current_user: User.current)
       super()
 
       @story = story
       @sprint = sprint
+      @project = project
       @max_position = max_position
       @current_user = current_user
     end
@@ -48,5 +49,9 @@ def initialize(story:, sprint:, max_position:, current_user: User.current)
     def story_points
       story.story_points || 0
     end
+
+    def draggable?
+      current_user.allowed_in_project?(:manage_sprint_items, project)
+    end
   end
 end

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/projects/settings/backlogs_controller.rb

@@ -42,7 +42,11 @@ def update
   end
 
   def rebuild_positions
-    @project.rebuild_positions
+    if OpenProject::FeatureDecisions.scrum_projects_active?
+      WorkPackages::RebuildPositionsService.new(project: @project).call
+    else
+      @project.rebuild_positions
+    end
     flash[:notice] = I18n.t("backlogs.positions_rebuilt_successfully")
 
     redirect_to_backlogs_settings

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_sprints_controller.rb

@@ -155,7 +155,8 @@ def update_header_component_via_turbo_stream(state: :show)
 
   def update_sprint_header_component_via_turbo_stream(sprint:)
     update_via_turbo_stream(
-      component: Backlogs::SprintHeaderComponent.new(sprint:),
+      component: Backlogs::SprintHeaderComponent.new(sprint:,
+                                                     project: @project),
       method: :morph
     )
   end