Merge branch 'feature/72239-workflows-ux-improvement-select-relevant-statuses' into feature/72924-workflows-ux-improvement-make-saving-changes-more-straightforward-and-less-error-prone

Author: mrmir

app/components/workflows/edit_sub_header_component.html.erb

@@ -50,7 +50,7 @@ See COPYRIGHT and LICENSE files for more details.
                 ),
                 form_arguments: {
                   method: :post,
-                  data: { turbo_stream: true, workflow_role_form: true }
+                  data: { turbo_stream: true, workflow_role_form: true, turbo_frame: "_top" }
                 }
               )
             end

app/components/workflows/status_dialog_component.html.erb

@@ -37,7 +37,7 @@ See COPYRIGHT and LICENSE files for more details.
   ) do |dialog|
     dialog.with_header(variant: :large)
 
-    dialog.with_body(classes: "Overlay-body_autocomplete_height") do
+    dialog.with_body(classes: "workflow-status-dialog-body") do
       render(
         Workflows::StatusFormComponent.new(
           all_statuses: @all_statuses,
@@ -61,7 +61,7 @@ See COPYRIGHT and LICENSE files for more details.
             type: :submit,
             form: Workflows::StatusFormComponent::FORM_ID
           )
-        ) { t("admin.workflows.statuses_dialog.apply") }
+        ) { t("button_apply") }
       end
     end
   end

app/components/workflows/status_form_component.html.erb

@@ -42,7 +42,7 @@ See COPYRIGHT and LICENSE files for more details.
         role: @role,
         type: @type,
         tab: @tab,
-        dialog_id: dialog_id
+        dialog_id:
       )
     )
   end

app/components/workflows/status_removal_danger_dialog_component.html.erb

@@ -41,6 +41,10 @@ See COPYRIGHT and LICENSE files for more details.
       message.with_description_content(t("admin.workflows.statuses_removal_dialog.description"))
     end
 
+    ##
+    # Do not copy unless absolutely necessary to pass params through a DangerDialog doing a GET!
+    # 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
       concat(hidden_field_tag(:role_id, @role.id))
       concat(hidden_field_tag(:tab, @tab))

app/controllers/workflows_controller.rb

@@ -137,7 +137,7 @@ def status_dialog
     current_statuses = if params[:status_ids].present?
                          Status.where(id: params[:status_ids].map(&:to_i)).order(:position)
                        elsif @type && @role
-                         role_type_statuses
+                         statuses_for_role_and_type
                        else
                          Status.none
                        end
@@ -180,18 +180,18 @@ def statuses_for_form
     @added_status_ids = []
     @statuses = if @type && params[:status_ids].present?
                   status_ids = params[:status_ids].map(&:to_i)
-                  @added_status_ids = status_ids - role_type_statuses.pluck(:id)
+                  @added_status_ids = status_ids - statuses_for_role_and_type.pluck(:id)
                   Status.where(id: status_ids).order(:position)
                 elsif @type && @role
-                  role_type_statuses
+                  statuses_for_role_and_type
                 elsif @type
                   @type.statuses
                 else
                   Status.all
                 end
   end
 
-  def role_type_statuses
+  def statuses_for_role_and_type
     @type.statuses(role: @role, tab: current_tab)
   end
 

config/locales/en.yml

@@ -410,9 +410,8 @@ en:
         title: "Statuses"
         label: "Statuses enabled for this type"
         caption: "Add or remove statuses you would like to associate with this type. Removing a status will also delete the workflow associated with it."
-        apply: "Apply"
       statuses_removal_dialog:
-        title: "Remove statuses?"
+        title: "Remove statuses"
         heading:
           one: "Remove 1 status?"
           other: "Remove %{count} statuses?"

frontend/src/global_styles/content/work_packages/_workflows.sass

@@ -76,3 +76,6 @@
   right: 0
   background: var(--body-background)
   z-index: 100
+
+.workflow-status-dialog-body
+  min-height: 480px

spec/features/workflows/edit_spec.rb

@@ -443,9 +443,9 @@ def remove_status_via_dialog(status)
 
       remove_status_via_dialog(statuses[1])
 
-      expect(page).to have_dialog("Remove statuses?")
+      expect(page).to have_dialog("Remove statuses")
 
-      within_dialog "Remove statuses?" do
+      within_dialog "Remove statuses" do
         expect(page).to have_text("Remove 1 status?")
 
         click_button "Remove"
@@ -475,11 +475,11 @@ def remove_status_via_dialog(status)
 
       remove_status_via_dialog(statuses[1])
 
-      within_dialog "Remove statuses?" do
+      within_dialog "Remove statuses" do
         click_button "Cancel"
       end
 
-      expect(page).to have_no_dialog("Remove statuses?")
+      expect(page).to have_no_dialog("Remove statuses")
 
       expect(page).to have_field workflow_checkbox(0, 1)
     end
@@ -537,7 +537,7 @@ def remove_status_via_dialog(status)
 
       remove_status_via_dialog(statuses[2])
 
-      within_dialog "Remove statuses?" do
+      within_dialog "Remove statuses" do
         click_button "Remove"
       end