Merge branch 'ph/349566/createMRButtonForm' into 'master'

Change create merge request from issue flow

See merge request gitlab-org/gitlab!79227

app/assets/javascripts/issues/create_merge_request_dropdown.js

@@ -69,11 +69,11 @@ export default class CreateMergeRequestDropdown {
     this.regexps = {
       branch: {
         createBranchPath: new RegExp('(branch_name=)(.+?)(?=&issue)'),
-        createMrPath: new RegExp('(branch_name=)(.+?)(?=&ref)'),
+        createMrPath: new RegExp('(source_branch%5D=)(.+?)(?=&)'),
       },
       ref: {
         createBranchPath: new RegExp('(ref=)(.+?)$'),
-        createMrPath: new RegExp('(ref=)(.+?)$'),
+        createMrPath: new RegExp('(target_branch%5D=)(.+?)$'),
       },
     };
 
@@ -167,23 +167,18 @@ export default class CreateMergeRequestDropdown {
   }
 
   createMergeRequest() {
-    this.isCreatingMergeRequest = true;
-
-    return axios
-      .post(this.createMrPath, {
-        target_project_id: canCreateConfidentialMergeRequest()
-          ? confidentialMergeRequestState.selectedProject.id
-          : null,
-      })
-      .then(({ data }) => {
-        this.mergeRequestCreated = true;
-        window.location.href = data.url;
-      })
-      .catch(() =>
-        createFlash({
-          message: __('Failed to create merge request. Please try again.'),
-        }),
-      );
+    return new Promise(() => {
+      this.isCreatingMergeRequest = true;
+
+      return this.createBranch().then(() => {
+        window.location.href = canCreateConfidentialMergeRequest()
+          ? this.createMrPath.replace(
+              this.projectPath,
+              confidentialMergeRequestState.selectedProject.pathWithNamespace,
+            )
+          : this.createMrPath;
+      });
+    });
   }
 
   disable() {
@@ -562,5 +557,7 @@ export default class CreateMergeRequestDropdown {
       this.regexps[target].createMrPath,
       pathReplacement,
     );
+
+    this.wrapperEl.dataset.createMrPath = this.createMrPath;
   }
 }

app/views/projects/issues/_new_branch.html.haml

@@ -6,8 +6,8 @@
   - create_mr_text = can_create_confidential_merge_request? ? _('Create confidential merge request') : _('Create merge request')
 
   - can_create_path = can_create_branch_project_issue_path(@project, @issue)
-  - create_mr_path = create_merge_request_project_issue_path(@project, @issue, branch_name: @issue.to_branch_name, ref: @project.default_branch)
-  - create_branch_path = project_branches_path(@project, branch_name: @issue.to_branch_name, ref: @project.default_branch, issue_iid: @issue.iid)
+  - create_mr_path = project_new_merge_request_path(@project, merge_request: { source_branch: @issue.to_branch_name, target_branch: @project.default_branch })
+  - create_branch_path = project_branches_path(@project, branch_name: @issue.to_branch_name, ref: @project.default_branch, issue_iid: @issue.iid, format: :json)
   - refs_path = refs_namespace_project_path(@project.namespace, @project, search: '')
 
   .create-mr-dropdown-wrap.d-inline-block.full-width-mobile.js-create-mr{ data: { project_path: @project.full_path, project_id: @project.id, can_create_path: can_create_path, create_mr_path: create_mr_path, create_branch_path: create_branch_path, refs_path: refs_path, is_confidential: can_create_confidential_merge_request?.to_s } }

locale/gitlab.pot

@@ -14778,9 +14778,6 @@ msgstr ""
 msgid "Failed to create import label for jira import."
 msgstr ""
 
-msgid "Failed to create merge request. Please try again."
-msgstr ""
-
 msgid "Failed to create new access token: %{token_response_message}"
 msgstr ""
 

spec/features/issues/user_creates_branch_and_merge_request_spec.rb

@@ -71,16 +71,10 @@ RSpec.describe 'User creates branch and merge request on issue page', :js do
           perform_enqueued_jobs do
             select_dropdown_option('create-mr')
 
-            expect(page).to have_content('Draft: Resolve "Cherry-Coloured Funk"')
-            expect(current_path).to eq(project_merge_request_path(project, MergeRequest.first))
-
-            wait_for_requests
+            expect(page).to have_content('New merge request')
+            expect(page).to have_content("From #{issue.to_branch_name} into #{project.default_branch}")
+            expect(page).to have_current_path(project_new_merge_request_path(project, merge_request: { source_branch: issue.to_branch_name, target_branch: project.default_branch }))
           end
-
-          visit project_issue_path(project, issue)
-
-          expect(page).to have_content("created merge request !1 to address this issue")
-          expect(page).to have_content('mentioned in merge request !1')
         end
 
         it 'creates a branch' do
@@ -100,17 +94,10 @@ RSpec.describe 'User creates branch and merge request on issue page', :js do
           perform_enqueued_jobs do
             select_dropdown_option('create-mr', branch_name)
 
-            expect(page).to have_content('Draft: Resolve "Cherry-Coloured Funk"')
-            expect(page).to have_content('Request to merge custom-branch-name into')
-            expect(current_path).to eq(project_merge_request_path(project, MergeRequest.first))
-
-            wait_for_requests
+            expect(page).to have_content('New merge request')
+            expect(page).to have_content("From #{branch_name} into #{project.default_branch}")
+            expect(page).to have_current_path(project_new_merge_request_path(project, merge_request: { source_branch: branch_name, target_branch: project.default_branch }))
           end
-
-          visit project_issue_path(project, issue)
-
-          expect(page).to have_content("created merge request !1 to address this issue")
-          expect(page).to have_content('mentioned in merge request !1')
         end
 
         it 'creates a branch' do

spec/frontend/issues/create_merge_request_dropdown_spec.js

@@ -59,7 +59,7 @@ describe('CreateMergeRequestDropdown', () => {
   describe('updateCreatePaths', () => {
     it('escapes branch names correctly', () => {
       dropdown.createBranchPath = `${TEST_HOST}/branches?branch_name=some-branch&issue=42`;
-      dropdown.createMrPath = `${TEST_HOST}/create_merge_request?branch_name=some-branch&ref=main`;
+      dropdown.createMrPath = `${TEST_HOST}/create_merge_request?merge_request%5Bsource_branch%5D=test&merge_request%5Btarget_branch%5D=master`;
 
       dropdown.updateCreatePaths('branch', 'contains#hash');
 
@@ -68,7 +68,7 @@ describe('CreateMergeRequestDropdown', () => {
       );
 
       expect(dropdown.createMrPath).toBe(
-        `${TEST_HOST}/create_merge_request?branch_name=contains%23hash&ref=main`,
+        `${TEST_HOST}/create_merge_request?merge_request%5Bsource_branch%5D=contains%23hash&merge_request%5Btarget_branch%5D=master`,
       );
     });
   });