Merge branch '52275-fix-master-to-be-hyperlink' into 'master'

Resolve "In Merge Request diff screen, master is not a hyperlink"

Closes #52275

See merge request gitlab-org/gitlab-ce!23874

7 files changed, 92 insertions, 30 deletions

diff --git a/app/assets/javascripts/diffs/components/compare_versions.vue b/app/assets/javascripts/diffs/components/compare_versions.vue
index f75345d31f8..f0a827be7e8 100644
--- a/app/assets/javascripts/diffs/components/compare_versions.vue
+++ b/app/assets/javascripts/diffs/components/compare_versions.vue
@@ -54,6 +54,9 @@ export default {
     showDropdowns() {
       return !this.commit && this.mergeRequestDiffs.length;
     },
+    baseVersionPath() {
+      return this.mergeRequestDiff.base_version_path;
+    },
   },
   methods: {
     ...mapActions('diffs', [
@@ -95,6 +98,7 @@ export default {
         and
         <compare-versions-dropdown
           :other-versions="comparableDiffs"
+          :base-version-path="baseVersionPath"
           :start-version="startVersion"
           :target-branch="targetBranch"
           class="mr-version-compare-dropdown"
diff --git a/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue b/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue
index b9b1ee02697..561188c1e8f 100644
--- a/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue
+++ b/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue
@@ -34,14 +34,13 @@ export default {
       required: false,
       default: false,
     },
+    baseVersionPath: {
+      type: String,
+      required: false,
+      default: null,
+    },
   },
   computed: {
-    baseVersion() {
-      return {
-        name: 'hii',
-        versionIndex: -1,
-      };
-    },
     targetVersions() {
       if (this.mergeRequestVersion) {
         return this.otherVersions;
@@ -62,6 +61,9 @@ export default {
       );
     },
     href(version) {
+      if (this.isBase(version)) {
+        return this.baseVersionPath;
+      }
       if (this.showCommitCount) {
         return version.version_path;
       }
diff --git a/app/serializers/merge_request_diff_entity.rb b/app/serializers/merge_request_diff_entity.rb
index 433bfe60474..7e3053e5881 100644
--- a/app/serializers/merge_request_diff_entity.rb
+++ b/app/serializers/merge_request_diff_entity.rb
@@ -24,6 +24,14 @@ class MergeRequestDiffEntity < Grape::Entity
     short_sha(merge_request_diff.head_commit_sha)
   end
 
+  expose :base_version_path do |merge_request_diff|
+    project = merge_request.target_project
+
+    next unless project
+
+    merge_request_version_path(project, merge_request, merge_request_diff)
+  end
+
   expose :version_path do |merge_request_diff|
     start_sha = options[:start_sha]
     project = merge_request.target_project
diff --git a/changelogs/unreleased/52275-fix-master-to-be-hyperlink.yml b/changelogs/unreleased/52275-fix-master-to-be-hyperlink.yml
new file mode 100644
index 00000000000..c1cde0ceff6
--- /dev/null
+++ b/changelogs/unreleased/52275-fix-master-to-be-hyperlink.yml
@@ -0,0 +1,5 @@
+---
+title: Resolve In Merge Request diff screen, master is not a hyperlink
+merge_request: 23874
+author:
+type: fixed
diff --git a/spec/javascripts/diffs/components/compare_versions_dropdown_spec.js b/spec/javascripts/diffs/components/compare_versions_dropdown_spec.js
index 7237274eb43..53b9ac22fc0 100644
--- a/spec/javascripts/diffs/components/compare_versions_dropdown_spec.js
+++ b/spec/javascripts/diffs/components/compare_versions_dropdown_spec.js
@@ -1 +1,34 @@
 // TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import CompareVersionsDropdown from '~/diffs/components/compare_versions_dropdown.vue';
+import diffsMockData from '../mock_data/merge_request_diffs';
+
+describe('CompareVersionsDropdown', () => {
+  let wrapper;
+  const targetBranch = { branchName: 'tmp-wine-dev', versionIndex: -1 };
+
+  const factory = (options = {}) => {
+    const localVue = createLocalVue();
+
+    wrapper = shallowMount(CompareVersionsDropdown, { localVue, ...options });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  it('should render a correct base version link', () => {
+    factory({
+      propsData: {
+        baseVersionPath: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37',
+        otherVersions: diffsMockData.slice(1),
+        targetBranch,
+      },
+    });
+
+    const links = wrapper.findAll('a');
+    const lastLink = links.wrappers[links.length - 1];
+
+    expect(lastLink.attributes('href')).toEqual(wrapper.props('baseVersionPath'));
+  });
+});
diff --git a/spec/javascripts/diffs/components/compare_versions_spec.js b/spec/javascripts/diffs/components/compare_versions_spec.js
index 75c66e9ca82..50135b0cf86 100644
--- a/spec/javascripts/diffs/components/compare_versions_spec.js
+++ b/spec/javascripts/diffs/components/compare_versions_spec.js
@@ -100,6 +100,12 @@ describe('CompareVersions', () => {
     });
   });
 
+  describe('baseVersionPath', () => {
+    it('should be set correctly from mergeRequestDiff', () => {
+      expect(vm.baseVersionPath).toEqual(vm.mergeRequestDiff.base_version_path);
+    });
+  });
+
   describe('isWhitespaceVisible', () => {
     const originalHref = window.location.href;
 
diff --git a/spec/javascripts/diffs/mock_data/merge_request_diffs.js b/spec/javascripts/diffs/mock_data/merge_request_diffs.js
index d72ad7818dd..4bbef146336 100644
--- a/spec/javascripts/diffs/mock_data/merge_request_diffs.js
+++ b/spec/javascripts/diffs/mock_data/merge_request_diffs.js
@@ -1,42 +1,46 @@
 export default [
   {
-    versionIndex: 4,
-    createdAt: '2018-10-23T11:49:16.611Z',
-    commitsCount: 4,
+    base_version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37',
+    version_index: 4,
+    created_at: '2018-10-23T11:49:16.611Z',
+    commits_count: 4,
     latest: true,
-    shortCommitSha: 'de7a8f7f',
-    versionPath: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37',
-    comparePath:
+    short_commit_sha: 'de7a8f7f',
+    version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37',
+    compare_path:
       '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=de7a8f7f20c3ea2e0bef3ba01cfd41c21f6b4995',
   },
   {
-    versionIndex: 3,
-    createdAt: '2018-10-23T11:46:40.617Z',
-    commitsCount: 3,
+    base_version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=36',
+    version_index: 3,
+    created_at: '2018-10-23T11:46:40.617Z',
+    commits_count: 3,
     latest: false,
-    shortCommitSha: 'e78fc18f',
-    versionPath: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=36',
-    comparePath:
+    short_commit_sha: 'e78fc18f',
+    version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=36',
+    compare_path:
       '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=e78fc18fa37acb2185c59ca94d4a964464feb50e',
   },
   {
-    versionIndex: 2,
-    createdAt: '2018-10-04T09:57:39.648Z',
-    commitsCount: 2,
+    base_version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=35',
+    version_index: 2,
+    created_at: '2018-10-04T09:57:39.648Z',
+    commits_count: 2,
     latest: false,
-    shortCommitSha: '48da7e7e',
-    versionPath: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=35',
-    comparePath:
+    short_commit_sha: '48da7e7e',
+    version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=35',
+    compare_path:
       '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=48da7e7e9a99d41c852578bd9cb541ca4d864b3e',
   },
   {
-    versionIndex: 1,
-    createdAt: '2018-09-25T20:30:39.493Z',
-    commitsCount: 1,
+    base_version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=20',
+    version_index: 1,
+    created_at: '2018-09-25T20:30:39.493Z',
+    commits_count: 1,
     latest: false,
-    shortCommitSha: '47bac2ed',
-    versionPath: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=20',
-    comparePath:
+    short_commit_sha: '47bac2ed',
+    version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=20',
+    compare_path:
       '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=47bac2ed972c5bee344c1cea159a22cd7f711dc0',
   },
 ];