Merge branch 'fix_default_path_when_creating_project_from_group_template' into 'master'

Fix default path when creating project from group template

Closes #26563

See merge request gitlab-org/gitlab!30597

changelogs/unreleased/fix_default_path_when_creating_project_from_group_template.yml

+---
+title: Fix default path when creating project from group template
+merge_request: 30597
+author: Lee Tickett
+type: fixed

ee/app/assets/javascripts/projects/custom_project_templates.js

@@ -56,11 +56,12 @@ const bindEvents = () => {
 
   function chooseTemplate() {
     const subgroupId = $(this).data('subgroup-id');
+    const groupId = $(this).data('parent-group-id');
     const templateName = $(this).data('template-name');
 
     if (subgroupId) {
       $subgroupWithTemplatesIdInput.val(subgroupId);
-      $namespaceSelect.val(subgroupId).trigger('change');
+      $namespaceSelect.val(groupId).trigger('change');
 
       hideNonRootParentPathOptions();
 
@@ -102,7 +103,7 @@ const bindEvents = () => {
     $projectFieldsForm
       .find('.js-select-namespace')
       .first()
-      .val(subgroupId);
+      .val(groupId);
   }
 
   $useCustomTemplateBtn.on('change', chooseTemplate);

ee/app/views/users/_custom_project_templates_from_groups.html.haml

@@ -33,7 +33,7 @@
               %a.btn.btn-default.append-right-10{ href: project_path(project), rel: 'noopener noreferrer', target: '_blank' }
                 = _('Preview')
               %label.btn.btn-success.custom-template-button.choose-template.gl-mb-0{ for: project.name }
-                %input{ type: "radio", autocomplete: "off", name: "project[template_project_id]", id: project.name, value: project.id, data: { subgroup_id: project.namespace_id, template_name: project.name } }
+                %input{ type: "radio", autocomplete: "off", name: "project[template_project_id]", id: project.name, value: project.id, data: { subgroup_id: project.namespace_id, template_name: project.name, parent_group_id: namespace_id || group.parent_id } }
                 %span.qa-use-template-button
                   = _('Use template')
 

ee/app/views/users/available_group_templates.js.haml

 :plain
   var target = $(".project-templates-buttons#custom-group-project-templates");
   target.empty();
-  target.html("#{escape_javascript(render('custom_project_templates_from_groups', groups_with_project_templates: @groups_with_project_templates))}");
+  target.html("#{escape_javascript(render('custom_project_templates_from_groups', groups_with_project_templates: @groups_with_project_templates, namespace_id: params[:group_id]))}");
   target.trigger("ajax:success");

ee/spec/features/projects_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Project' do
+  describe 'when creating from group template' do
+    let(:user) { create(:user) }
+    let(:group) { create(:group, name: 'parent-group') }
+    let(:template_subgroup) { create(:group, parent: group, name: 'template-subgroup') }
+    let(:other_subgroup) { create(:group, parent: group, name: 'other-subgroup') }
+    let(:template) { create(:project, namespace: template_subgroup) }
+
+    before do
+      stub_licensed_features(custom_project_templates: true)
+      group.add_owner(user)
+      group.update!(custom_project_templates_group_id: template_subgroup.id)
+      sign_in user
+    end
+
+    it "defaults to correct namespace", :js do
+      visit new_project_path
+      find('#create-from-template-tab').click
+      find('.custom-group-project-templates-tab').click
+      find("label[for=#{template.name}]").click
+
+      expect(find('.js-select-namespace')).to have_content group.name
+    end
+
+    it "uses supplied namespace", :js do
+      visit new_project_path(namespace_id: other_subgroup.id)
+      find('#create-from-template-tab').click
+      find('.custom-group-project-templates-tab').click
+      find("label[for=#{template.name}]").click
+
+      expect(find('.js-select-namespace')).to have_content other_subgroup.name
+    end
+  end
+end