Hook up workflows submit to wizard continue button

Author: mrmir

app/components/work_package_types/wizard/footer_component.html.erb

@@ -30,8 +30,9 @@
     <%= render(
           Primer::Beta::Button.new(
             type: :submit,
-            form: WorkPackageTypes::Wizard::FooterComponent::FORM_IDENTIFIER,
-            scheme: :primary
+            form: primary_action_form,
+            scheme: :primary,
+            **primary_action_arguments
           )
         ) { primary_action_label } %>
   </div>

app/components/work_package_types/wizard/footer_component.rb

@@ -55,6 +55,27 @@ def first_step? = current_step == Steps.first
 
       def last_step? = current_step == Steps.last
 
+      # The workflows step embeds the shared matrix form, which persists in place through
+      # its own endpoint. Continue submits that form with the next step, so the endpoint
+      # persists and then redirects to advance the wizard (see Workflows::TabsController).
+      # Escaping the matrix's turbo frame turns that redirect into a full navigation.
+      # Other steps submit the wizard form directly.
+      def primary_action_form
+        workflows_step? ? Workflows::StatusMatrixFormComponent::FORM_ID : FORM_IDENTIFIER
+      end
+
+      def primary_action_arguments
+        return {} unless workflows_step?
+
+        {
+          name: "advance_to_step",
+          value: Steps.next_after(current_step),
+          data: { turbo_frame: "_top" }
+        }
+      end
+
+      def workflows_step? = current_step == :workflows
+
       def current_number = Steps.index(current_step) + 1
 
       def total_steps = Steps.all.size

app/components/work_package_types/wizard/page_component.html.erb

@@ -31,14 +31,16 @@
             <% end %>
           <% end %>
         <% else %>
-          <%# Self-persisting editor: this form only advances to the next step on submit. %>
           <%= render(step_body) %>
-          <%= primer_form_with(
-                url: step_url,
-                method: :patch,
-                html: { id: WorkPackageTypes::Wizard::FooterComponent::FORM_IDENTIFIER }
-              ) do %>
-            <%= tag.input(type: :hidden, name: :step, value: current_step) %>
+          <% unless step_submits_own_form? %>
+            <%# Self-persisting editor: this form only advances to the next step on submit. %>
+            <%= primer_form_with(
+                  url: step_url,
+                  method: :patch,
+                  html: { id: WorkPackageTypes::Wizard::FooterComponent::FORM_IDENTIFIER }
+                ) do %>
+              <%= tag.input(type: :hidden, name: :step, value: current_step) %>
+            <% end %>
           <% end %>
         <% end %>
       <% end %>

app/components/work_package_types/wizard/page_component.rb

@@ -121,6 +121,8 @@ def reuse_mode_banner
         render(WorkPackageTypes::ReuseModeBannerComponent.new(type:, aspect: step_editor.aspect))
       end
 
+      def step_submits_own_form? = current_step == :workflows
+
       # Editors that self-persist through their own turbo endpoints.
       def step_body
         case current_step

app/components/work_package_types/wizard/page_component.sass

@@ -54,3 +54,7 @@
 
     &--sidebar
       display: none
+
+  // The wizard footer's Continue button persists the workflow matrix
+  .workflow-save-bar
+    display: none

app/components/workflows/status_matrix_form_component.html.erb

@@ -186,5 +186,6 @@ See COPYRIGHT and LICENSE files for more details.
       <% end %>
   <% else %>
     <%= render Workflows::BlankslateComponent.new(roles: @roles, type: @type, tab: @tab) %>
+    <%= form_tag(type_creation_wizard_path(@type, step: :workflows), id: form_id, method: :patch) do %><% end %>
   <% end %>
 <% end %>

app/controllers/workflows/tabs_controller.rb

@@ -54,18 +54,10 @@ def edit
   end
 
   def update # rubocop:disable Metrics/AbcSize
-    success = false
-    Workflow.transaction do
-      success = true
-      base_params = permitted_status_params
-      indeterminate = permitted_indeterminate_params
-      @roles.each do |role|
-        role_params = indeterminate.empty? ? base_params : role_specific_params(base_params, indeterminate, role)
-        result = Workflows::BulkUpdateService.new(role:, type: @type, tab: @tab)
-                                             .call(role_params)
-        success = false unless result.success?
-      end
-      raise ActiveRecord::Rollback unless success
+    success = persist_matrix
+
+    if success && params[:advance_to_step].present?
+      return redirect_to type_creation_wizard_path(@type, step: params[:advance_to_step]), status: :see_other
     end
 
     if success
@@ -199,6 +191,27 @@ def workflows_for_form
     @workflows["assignee"] = workflows.select(&:assignee)
   end
 
+  # A linked type reuses its source's transitions and must never have its own
+  # rewritten, so it persists nothing and simply reports success.
+  def persist_matrix
+    return true if @type.linked?(Type::ConfigurationLink::WORKFLOWS)
+
+    success = false
+    Workflow.transaction do
+      success = true
+      base_params = permitted_status_params
+      indeterminate = permitted_indeterminate_params
+      @roles.each do |role|
+        role_params = indeterminate.empty? ? base_params : role_specific_params(base_params, indeterminate, role)
+        result = Workflows::BulkUpdateService.new(role:, type: @type, tab: @tab)
+                                             .call(role_params)
+        success = false unless result.success?
+      end
+      raise ActiveRecord::Rollback unless success
+    end
+    success
+  end
+
   def permitted_status_params
     status_params("status")
   end

spec/features/types/creation_wizard_spec.rb

@@ -33,6 +33,7 @@
 RSpec.describe "Variant creation wizard", :js, with_flag: { type_variants: true } do
   shared_let(:admin) { create(:admin) }
   shared_let(:bug_type) { create(:type, name: "Bug", color: create(:color)) }
+  shared_let(:project_role) { create(:project_role) }
 
   before { login_as(admin) }
 
@@ -98,6 +99,7 @@ def complete_details_step(name)
     expect_step_saved(:project_attributes)
 
     # Step 5 - Workflow
+    expect(page).to have_css("#workflow_form", visible: :all)
     click_on I18n.t(:button_continue)
     expect_step_saved(:workflows)
 

spec/features/types/creation_wizard_workflows_spec.rb

@@ -63,21 +63,18 @@ def visit_workflow_wizard(roles: [], tab: nil)
     visit type_creation_wizard_path(type, **params)
   end
 
-  it "allows adding another workflow" do
+  it "persists the matrix and advances when clicking 'Continue'" do
     visit_workflow_wizard(roles: [role])
 
     expect(page).to have_field workflow_checkbox(1, 0), checked: false
     expect(Workflow.where(type_id: type.id, role_id: role.id).count).to be 1
 
     check workflow_checkbox(1, 0)
 
-    click_button "Save"
-
-    expect_flash(message: "Successful update.")
-
-    expect(page).to have_field workflow_checkbox(0, 1), checked: true
-    expect(page).to have_field workflow_checkbox(1, 0), checked: true
+    expect(page).to have_no_button "Save"
+    click_on I18n.t(:button_continue)
 
+    expect(page).to have_current_path(type_creation_wizard_path(type, step: :projects))
     expect(Workflow.where(type_id: type.id, role_id: role.id).count).to be 2
   end