Update all remaining components to work with multiple roles

mrmir · mrmir · commit 05e93539c4ab · 2026-04-28T12:33:07.000+02:00
diff --git a/app/components/workflows/blankslate_component.html.erb b/app/components/workflows/blankslate_component.html.erb
@@ -31,9 +31,8 @@ See COPYRIGHT and LICENSE files for more details.
   render(Primer::Beta::Blankslate.new(border: true)) do |blankslate|
     blankslate.with_heading(tag: :h2).with_content(t("admin.workflows.blankslate.title"))
     blankslate.with_description_content(t("admin.workflows.blankslate.description"))
-    # TODO: pass all roles once BlankslateComponent accepts roles: and StatusDialogComponent supports multi-role natively.
     blankslate.with_primary_action(
-      href: helpers.status_dialog_workflow_tab_path(@type, @tab, role_ids: [@role.id]),
+      href: helpers.status_dialog_workflow_tab_path(@type, @tab, role_ids: @roles.map(&:id)),
       scheme: :secondary,
       data: { controller: "async-dialog" }
     ) do |button|
diff --git a/app/components/workflows/blankslate_component.rb b/app/components/workflows/blankslate_component.rb
@@ -32,9 +32,9 @@ module Workflows
   class BlankslateComponent < ApplicationComponent
     include OpPrimer::ComponentHelpers
 
-    def initialize(role:, type:, tab:)
+    def initialize(roles:, type:, tab:)
       super
-      @role = role
+      @roles = roles
       @type = type
       @tab = tab
     end
diff --git a/app/components/workflows/page_headers/edit_component.rb b/app/components/workflows/page_headers/edit_component.rb
@@ -30,7 +30,7 @@
 
 module Workflows::PageHeaders
   class EditComponent < BaseComponent
-    options :tabs, :role
+    options :tabs, :roles
 
     def type = model
 
@@ -49,7 +49,7 @@ def add_action_buttons(header)
         mobile_icon: :copy,
         mobile_label: t(:button_copy),
         size: :medium,
-        href: new_workflow_copy_path(type, source_role_id: role&.id),
+        href: new_workflow_copy_path(type, source_role_id: roles&.first&.id),
         aria: { label: helpers.t(:button_copy) },
         title: helpers.t(:button_copy)
       ) do |button|
diff --git a/app/components/workflows/status_dialog_component.html.erb b/app/components/workflows/status_dialog_component.html.erb
@@ -42,7 +42,7 @@ See COPYRIGHT and LICENSE files for more details.
         Workflows::StatusFormComponent.new(
           all_statuses: @all_statuses,
           current_statuses: @current_statuses,
-          role: @role,
+          roles: @roles,
           type: @type,
           tab: @tab
         )
diff --git a/app/components/workflows/status_dialog_component.rb b/app/components/workflows/status_dialog_component.rb
@@ -35,11 +35,11 @@ class StatusDialogComponent < ApplicationComponent
 
     DIALOG_ID = "workflows-status-dialog"
 
-    def initialize(all_statuses:, current_statuses:, role:, type:, tab:)
+    def initialize(all_statuses:, current_statuses:, roles:, type:, tab:)
       super
       @all_statuses = all_statuses
       @current_statuses = current_statuses
-      @role = role
+      @roles = roles
       @type = type
       @tab = tab
     end
diff --git a/app/components/workflows/status_form_component.html.erb b/app/components/workflows/status_form_component.html.erb
@@ -28,9 +28,8 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 
 <%=
-  # TODO: pass all roles once StatusFormComponent and confirm_statuses support multi-role natively.
   primer_form_with(
-    url: helpers.confirm_statuses_workflow_tab_path(@type, @tab, role_ids: [@role.id]),
+    url: helpers.confirm_statuses_workflow_tab_path(@type, @tab, role_ids: @roles.map(&:id)),
     method: :post,
     id: FORM_ID,
     data: { turbo_frame: "workflow-table" }
@@ -40,7 +39,6 @@ See COPYRIGHT and LICENSE files for more details.
         f,
         all_statuses: @all_statuses,
         current_statuses: @current_statuses,
-        role: @role,
         type: @type,
         tab: @tab,
         dialog_id:
diff --git a/app/components/workflows/status_form_component.rb b/app/components/workflows/status_form_component.rb
@@ -32,11 +32,11 @@ module Workflows
   class StatusFormComponent < ApplicationComponent
     FORM_ID = "status-selection-form"
 
-    def initialize(all_statuses:, current_statuses:, role:, type:, tab:)
+    def initialize(all_statuses:, current_statuses:, roles:, type:, tab:)
       super
       @all_statuses = all_statuses
       @current_statuses = current_statuses
-      @role = role
+      @roles = roles
       @type = type
       @tab = tab
     end
diff --git a/app/components/workflows/status_matrix_form_component.html.erb b/app/components/workflows/status_matrix_form_component.html.erb
@@ -44,8 +44,8 @@ See COPYRIGHT and LICENSE files for more details.
               button.with_trailing_visual_icon(icon: :"triangle-down")
               if @roles.many?
                 t("admin.workflows.role_selector.roles", count: @roles.size)
-              elsif @role
-                t("admin.workflows.role_selector.label", role: @role.name)
+              elsif @roles.one?
+                t("admin.workflows.role_selector.label", role: @roles.first.name)
               else
                 t("admin.workflows.role_selector.no_role")
               end
@@ -66,8 +66,6 @@ See COPYRIGHT and LICENSE files for more details.
         scheme: :secondary,
         leading_icon: :plus,
         label: t("admin.workflows.status_button"),
-        # TODO: status_dialog and StatusDialogComponent currently work with a single role (@role = @roles.first);
-        # update when they support multi-role natively.
         href: helpers.status_dialog_workflow_tab_path(@type, @tab, role_ids: @roles.map(&:id), status_ids: @statuses.pluck(:id).presence),
         data: { controller: "async-dialog" }
       ) do
@@ -132,6 +130,6 @@ See COPYRIGHT and LICENSE files for more details.
         %>
       <% end %>
   <% else %>
-    <%= render Workflows::BlankslateComponent.new(role: @role, type: @type, tab: @tab) %>
+    <%= render Workflows::BlankslateComponent.new(roles: @roles, type: @type, tab: @tab) %>
   <% end %>
 <% end %>
diff --git a/app/components/workflows/status_matrix_form_component.rb b/app/components/workflows/status_matrix_form_component.rb
@@ -37,7 +37,6 @@ def initialize(tab:, roles:, type:, available_roles:, statuses:, has_status_chan
       super
       @tab = tab
       @roles = roles
-      @role = @roles.first
       @type = type
       @available_roles = available_roles
       @statuses = statuses
diff --git a/app/components/workflows/status_removal_danger_dialog_component.html.erb b/app/components/workflows/status_removal_danger_dialog_component.html.erb
@@ -46,8 +46,7 @@ See COPYRIGHT and LICENSE files for more details.
     # The reason this is done here is because the submit is not a DELETE, and GET form submissions
     # strip url params
     dialog.with_additional_details do
-      # TODO: pass all roles once StatusRemovalDangerDialogComponent supports multi-role natively.
-      concat(hidden_field_tag("role_ids[]", @role.id))
+      @roles.each { |role| concat(hidden_field_tag("role_ids[]", role.id)) }
       @status_ids.each { |id| concat(hidden_field_tag("status_ids[]", id)) }
     end
   end
diff --git a/app/components/workflows/status_removal_danger_dialog_component.rb b/app/components/workflows/status_removal_danger_dialog_component.rb
@@ -35,9 +35,9 @@ class StatusRemovalDangerDialogComponent < ApplicationComponent
 
     DIALOG_ID = "workflows-status-removal-dialog"
 
-    def initialize(role:, type:, tab:, status_ids:, removed_count:)
+    def initialize(roles:, type:, tab:, status_ids:, removed_count:)
       super
-      @role = role
+      @roles = roles
       @type = type
       @tab = tab
       @status_ids = Array(status_ids).flatten.map(&:to_i)
diff --git a/app/controllers/workflows/tabs_controller.rb b/app/controllers/workflows/tabs_controller.rb
@@ -102,7 +102,7 @@ def status_dialog
     all_statuses = Status.order(:position)
     current_statuses = if params[:status_ids].present?
                          Status.where(id: params[:status_ids].map(&:to_i)).order(:position)
-                       elsif @type && @role
+                       elsif @type && @roles.any?
                          statuses_for_roles_and_type
                        else
                          Status.none
@@ -111,7 +111,7 @@ def status_dialog
     respond_with_dialog Workflows::StatusDialogComponent.new(
       all_statuses:,
       current_statuses:,
-      role: @role,
+      roles: @roles,
       type: @type,
       tab: @tab
     )
@@ -124,7 +124,7 @@ def confirm_statuses # rubocop:disable Metrics/AbcSize
 
     if removed_count > 0
       respond_with_dialog Workflows::StatusRemovalDangerDialogComponent.new(
-        role: @role,
+        roles: @roles,
         type: @type,
         tab: @tab,
         status_ids: current_status_ids,
@@ -162,9 +162,6 @@ def set_eligible_roles
 
   def set_roles
     @roles = @eligible_roles.where(id: params[:role_ids])
-    # TODO: remove @role once the matrix form and all dependent components
-    # (dialogs, status selectors, page headers) work natively with @roles (multi-role).
-    @role = @roles.first
   end
 
   def statuses_for_form
diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb
@@ -68,9 +68,6 @@ def find_optional_roles
     ordered = eligible_roles.order(:builtin, :position)
     @roles = ordered.where(id: params[:role_ids])
     @roles = [ordered.first] if @roles.empty?
-    # TODO: remove @role once the matrix form and all dependent components
-    # (dialogs, status selectors, page headers) work natively with @roles (multi-role).
-    @role = @roles.first
   end
 
   def eligible_roles
diff --git a/app/forms/workflows/status_select_form.rb b/app/forms/workflows/status_select_form.rb
@@ -30,18 +30,16 @@
 
 module Workflows
   class StatusSelectForm < ApplicationForm
-    def initialize(all_statuses:, current_statuses:, role:, type:, tab:, dialog_id:)
+    def initialize(all_statuses:, current_statuses:, type:, tab:, dialog_id:)
       super()
       @all_statuses = all_statuses
       @current_statuses = current_statuses
-      @role = role
       @type = type
       @tab = tab
       @dialog_id = dialog_id
     end
 
     form do |f|
-      f.hidden(name: :role_id, value: @role.id)
       f.hidden(name: :type_id, value: @type.id)
       f.hidden(name: :tab, value: @tab || "always")
       @current_statuses.each { |status| f.hidden(name: "original_status_ids[]", value: status.id) }
diff --git a/app/views/workflows/edit.html.erb b/app/views/workflows/edit.html.erb
@@ -28,7 +28,7 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 <% html_title t(:label_administration), t(:label_workflow_plural), @type.name -%>
 <% content_for :content_header do %>
-  <%= render Workflows::PageHeaders::EditComponent.new(@type, role: @role, tabs: workflow_tabs(@type)) %>
+  <%= render Workflows::PageHeaders::EditComponent.new(@type, roles: @roles, tabs: workflow_tabs(@type)) %>
 <% end %>
 
 <% if @type && @roles.any? %>
diff --git a/app/views/workflows/tabs/edit.html.erb b/app/views/workflows/tabs/edit.html.erb
@@ -30,6 +30,6 @@ See COPYRIGHT and LICENSE files for more details.
 <%= turbo_frame_tag "workflow-table", data: { turbo_cache: false } do %>
   <%= render Workflows::StatusMatrixFormComponent.new(tab: @tab, roles: @roles, type: @type, available_roles: @eligible_roles, statuses: @statuses, has_status_changes: @has_status_changes) %>
   <%= turbo_stream.replace(Workflows::PageHeaders::EditComponent.wrapper_key) do %>
-    <%= render Workflows::PageHeaders::EditComponent.new(@type, role: @role, tabs: workflow_tabs(@type)) %>
+    <%= render Workflows::PageHeaders::EditComponent.new(@type, roles: @roles, tabs: workflow_tabs(@type)) %>
   <% end %>
 <% end %>
diff --git a/spec/features/workflows/edit_multi_role_spec.rb b/spec/features/workflows/edit_multi_role_spec.rb
@@ -251,4 +251,22 @@
       expect_flash(message: "Successful update.")
     end
   end
+
+  context "when modifying statuses" do
+    before { visit_workflow_edit(roles: [role, role2]) }
+
+    it "preserves all selected roles after adding a status" do
+      add_status_via_dialog(statuses[2])
+
+      expect(page).to have_text("2 roles selected")
+    end
+
+    it "preserves all selected roles after removing a status via the danger dialog" do
+      remove_status_via_dialog(statuses[1])
+
+      within_dialog("Remove statuses") { click_button "Remove" }
+
+      expect(page).to have_text("2 roles selected")
+    end
+  end
 end

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ See COPYRIGHT and LICENSE files for more details.`
`42`	`42`	`Workflows::StatusFormComponent.new(`
`43`	`43`	`all_statuses: @all_statuses,`
`44`	`44`	`current_statuses: @current_statuses,`
`45`		`- role: @role,`
	`45`	`+ roles: @roles,`
`46`	`46`	`type: @type,`
`47`	`47`	`tab: @tab`
`48`	`48`	`)`