[#69379] When creating a subitem, return to the parents overview page

Author: EinLama

app/components/projects/project_creation_footer_component.rb

@@ -32,18 +32,19 @@ module Projects
   class ProjectCreationFooterComponent < ApplicationComponent
     include OpPrimer::ComponentHelpers
 
-    def initialize(form_identifier:, project:, template:, current_step:)
+    def initialize(form_identifier:, project:, template:, current_step:, cancel_href:)
       @form_identifier = form_identifier
       @project = project
       @template = template
       @current_step = current_step
+      @cancel_href = cancel_href
 
       super
     end
 
     def call
       render(StepWizard::FooterComponent.new(form_identifier:, total_steps:, current_step:)) do |footer|
-        footer.with_cancel_button(href: href_for_cancel_button)
+        footer.with_cancel_button(href: cancel_href)
         footer.with_continue_button(**continue_button_args)
         footer.with_submit_button(**submit_button_args)
         if show_progress_bar?
@@ -52,7 +53,7 @@ def call
       end
     end
 
-    attr_reader :form_identifier, :project, :template, :current_step
+    attr_reader :form_identifier, :project, :template, :current_step, :cancel_href
 
     private
 
@@ -78,9 +79,5 @@ def submit_button_args
     def total_steps
       template.nil? && project.available_custom_fields.required.any? ? 3 : 2
     end
-
-    def href_for_cancel_button
-      project.portfolio? ? portfolios_path : projects_path
-    end
   end
 end

app/helpers/workspace_helper.rb

@@ -42,4 +42,16 @@ def new_workspace_title(workspace)
   end
 
   def workspace_icon(type) = WORKSPACE_ICON_MAPPING[type]
+
+  # Returns a path to which the user should be redirected when cancelling the creation process of
+  # a workspace item
+  def workspace_creation_cancel_href(workspace, parent = nil)
+    if parent.present?
+      project_overview_path(parent.id)
+    elsif workspace.portfolio?
+      portfolios_path
+    else
+      projects_path
+    end
+  end
 end

app/views/projects/new.html.erb

@@ -42,6 +42,8 @@ See COPYRIGHT and LICENSE files for more details.
     )
   %>
 <% else %>
+  <% cancel_href = workspace_creation_cancel_href(@new_project, @parent) %>
+
   <%= render(StepWizard::PageLayoutComponent.new) do |layout| %>
     <%=
       layout.with_page_header do
@@ -86,7 +88,8 @@ See COPYRIGHT and LICENSE files for more details.
           form_identifier: "project-create-form",
           project: @new_project,
           template: @template,
-          current_step: params.fetch(:step, 1).to_i
+          current_step: params.fetch(:step, 1).to_i,
+          cancel_href:
         )
       end
     %>