Commit df3d9361 authored by Phil Hughes's avatar Phil Hughes

Use GraphQL API to fetch last commit data for tree

parent ecb05e59
...@@ -22,7 +22,7 @@ export default (resolvers = {}, config = {}) => { ...@@ -22,7 +22,7 @@ export default (resolvers = {}, config = {}) => {
return new ApolloClient({ return new ApolloClient({
link: ApolloLink.split( link: ApolloLink.split(
operation => operation.getContext().hasUpload, operation => operation.getContext().hasUpload || operation.getContext().isSingleRequest,
createUploadLink(httpOptions), createUploadLink(httpOptions),
new BatchHttpLink(httpOptions), new BatchHttpLink(httpOptions),
), ),
......
<script> <script>
import { GlTooltipDirective, GlLink, GlButton } from '@gitlab/ui'; import { GlTooltipDirective, GlLink, GlButton, GlLoadingIcon } from '@gitlab/ui';
import { sprintf, s__ } from '~/locale'; import { sprintf, s__ } from '~/locale';
import Icon from '../../vue_shared/components/icon.vue'; import Icon from '../../vue_shared/components/icon.vue';
import UserAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; import UserAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
import TimeagoTooltip from '../../vue_shared/components/time_ago_tooltip.vue'; import TimeagoTooltip from '../../vue_shared/components/time_ago_tooltip.vue';
import CommitPipelineStatus from '../../projects/tree/components/commit_pipeline_status_component.vue';
import CiIcon from '../../vue_shared/components/ci_icon.vue'; import CiIcon from '../../vue_shared/components/ci_icon.vue';
import ClipboardButton from '../../vue_shared/components/clipboard_button.vue'; import ClipboardButton from '../../vue_shared/components/clipboard_button.vue';
import getRefMixin from '../mixins/get_ref'; import getRefMixin from '../mixins/get_ref';
...@@ -16,11 +15,11 @@ export default { ...@@ -16,11 +15,11 @@ export default {
Icon, Icon,
UserAvatarLink, UserAvatarLink,
TimeagoTooltip, TimeagoTooltip,
CommitPipelineStatus,
ClipboardButton, ClipboardButton,
CiIcon, CiIcon,
GlLink, GlLink,
GlButton, GlButton,
GlLoadingIcon,
}, },
directives: { directives: {
GlTooltip: GlTooltipDirective, GlTooltip: GlTooltipDirective,
...@@ -39,7 +38,10 @@ export default { ...@@ -39,7 +38,10 @@ export default {
path: this.currentPath.replace(/^\//, ''), path: this.currentPath.replace(/^\//, ''),
}; };
}, },
update: data => data.project.repository.tree.commit, update: data => data.project.repository.tree.lastCommit,
context: {
isSingleRequest: true,
},
}, },
}, },
props: { props: {
...@@ -59,14 +61,14 @@ export default { ...@@ -59,14 +61,14 @@ export default {
computed: { computed: {
statusTitle() { statusTitle() {
return sprintf(s__('Commits|Commit: %{commitText}'), { return sprintf(s__('Commits|Commit: %{commitText}'), {
commitText: this.commit.pipeline.detailedStatus.text, commitText: this.commit.latestPipeline.detailedStatus.text,
}); });
}, },
isLoading() { isLoading() {
return this.$apollo.queries.commit.loading; return this.$apollo.queries.commit.loading;
}, },
showCommitId() { showCommitId() {
return this.commit.id.substr(0, 8); return this.commit.sha.substr(0, 8);
}, },
}, },
methods: { methods: {
...@@ -78,7 +80,9 @@ export default { ...@@ -78,7 +80,9 @@ export default {
</script> </script>
<template> <template>
<div v-if="!isLoading" class="info-well d-none d-sm-flex project-last-commit commit p-3"> <div class="info-well d-none d-sm-flex project-last-commit commit p-3">
<gl-loading-icon v-if="isLoading" size="md" class="mx-auto" />
<template v-else>
<user-avatar-link <user-avatar-link
v-if="commit.author" v-if="commit.author"
:link-href="commit.author.webUrl" :link-href="commit.author.webUrl"
...@@ -121,25 +125,30 @@ export default { ...@@ -121,25 +125,30 @@ export default {
</div> </div>
<div class="commit-actions flex-row"> <div class="commit-actions flex-row">
<gl-link <gl-link
v-if="commit.pipeline" v-if="commit.latestPipeline"
v-gl-tooltip v-gl-tooltip
:href="commit.pipeline.detailedStatus.detailsPath" :href="commit.latestPipeline.detailedStatus.detailsPath"
:title="statusTitle" :title="statusTitle"
class="js-commit-pipeline" class="js-commit-pipeline"
> >
<ci-icon :status="commit.pipeline.detailedStatus" :size="24" :aria-label="statusTitle" /> <ci-icon
:status="commit.latestPipeline.detailedStatus"
:size="24"
:aria-label="statusTitle"
/>
</gl-link> </gl-link>
<div class="commit-sha-group d-flex"> <div class="commit-sha-group d-flex">
<div class="label label-monospace monospace"> <div class="label label-monospace monospace">
{{ showCommitId }} {{ showCommitId }}
</div> </div>
<clipboard-button <clipboard-button
:text="commit.id" :text="commit.sha"
:title="__('Copy commit SHA to clipboard')" :title="__('Copy commit SHA to clipboard')"
tooltip-placement="bottom" tooltip-placement="bottom"
/> />
</div> </div>
</div> </div>
</div> </div>
</template>
</div> </div>
</template> </template>
...@@ -50,12 +50,9 @@ export default function setupVueRepositoryList() { ...@@ -50,12 +50,9 @@ export default function setupVueRepositoryList() {
}, },
}); });
const commitEl = document.getElementById('js-last-commit');
if (commitEl) {
// eslint-disable-next-line no-new // eslint-disable-next-line no-new
new Vue({ new Vue({
el: commitEl, el: document.getElementById('js-last-commit'),
router, router,
apolloProvider, apolloProvider,
render(h) { render(h) {
...@@ -66,7 +63,6 @@ export default function setupVueRepositoryList() { ...@@ -66,7 +63,6 @@ export default function setupVueRepositoryList() {
}); });
}, },
}); });
}
return new Vue({ return new Vue({
el, el,
......
...@@ -2,8 +2,8 @@ query pathLastCommit($projectPath: ID!, $path: String, $ref: String!) { ...@@ -2,8 +2,8 @@ query pathLastCommit($projectPath: ID!, $path: String, $ref: String!) {
project(fullPath: $projectPath) { project(fullPath: $projectPath) {
repository { repository {
tree(path: $path, ref: $ref) { tree(path: $path, ref: $ref) {
commit { lastCommit {
id sha
title title
message message
webUrl webUrl
...@@ -13,7 +13,7 @@ query pathLastCommit($projectPath: ID!, $path: String, $ref: String!) { ...@@ -13,7 +13,7 @@ query pathLastCommit($projectPath: ID!, $path: String, $ref: String!) {
avatarUrl avatarUrl
webUrl webUrl
} }
pipeline { latestPipeline {
detailedStatus { detailedStatus {
detailsPath detailsPath
icon icon
......
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
.nav-block .nav-block
= render 'projects/tree/tree_header', tree: @tree = render 'projects/tree/tree_header', tree: @tree
- if commit - if vue_file_list_enabled?
#js-last-commit
- elsif commit
= render 'shared/commit_well', commit: commit, ref: ref, project: project = render 'shared/commit_well', commit: commit, ref: ref, project: project
- if is_project_overview - if is_project_overview
......
...@@ -7,6 +7,8 @@ describe 'user reads pipeline status', :js do ...@@ -7,6 +7,8 @@ describe 'user reads pipeline status', :js do
let(:x110_pipeline) { create_pipeline('x1.1.0', 'failed') } let(:x110_pipeline) { create_pipeline('x1.1.0', 'failed') }
before do before do
stub_feature_flags(vue_file_list: false)
project.add_maintainer(user) project.add_maintainer(user)
project.repository.add_tag(user, 'x1.1.0', 'v1.1.0') project.repository.add_tag(user, 'x1.1.0', 'v1.1.0')
......
...@@ -3,6 +3,10 @@ require 'spec_helper' ...@@ -3,6 +3,10 @@ require 'spec_helper'
describe 'Projects > Show > User sees last commit CI status' do describe 'Projects > Show > User sees last commit CI status' do
set(:project) { create(:project, :repository, :public) } set(:project) { create(:project, :repository, :public) }
before do
stub_feature_flags(vue_file_list: false)
end
it 'shows the project README', :js do it 'shows the project README', :js do
project.enable_ci project.enable_ci
pipeline = create(:ci_pipeline, project: project, sha: project.commit.sha, ref: 'master') pipeline = create(:ci_pipeline, project: project, sha: project.commit.sha, ref: 'master')
......
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import { GlLoadingIcon } from '@gitlab/ui';
import LastCommit from '~/repository/components/last_commit.vue'; import LastCommit from '~/repository/components/last_commit.vue';
import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
...@@ -6,7 +7,7 @@ let vm; ...@@ -6,7 +7,7 @@ let vm;
function createCommitData(data = {}) { function createCommitData(data = {}) {
return { return {
id: '123456789', sha: '123456789',
title: 'Commit title', title: 'Commit title',
message: 'Commit message', message: 'Commit message',
webUrl: 'https://test.com/commit/123', webUrl: 'https://test.com/commit/123',
...@@ -16,7 +17,7 @@ function createCommitData(data = {}) { ...@@ -16,7 +17,7 @@ function createCommitData(data = {}) {
avatarUrl: 'https://test.com', avatarUrl: 'https://test.com',
webUrl: 'https://test.com/test', webUrl: 'https://test.com/test',
}, },
pipeline: { latestPipeline: {
detailedStatus: { detailedStatus: {
detailsPath: 'https://test.com/pipeline', detailsPath: 'https://test.com/pipeline',
icon: 'failed', icon: 'failed',
...@@ -52,12 +53,12 @@ describe('Repository last commit component', () => { ...@@ -52,12 +53,12 @@ describe('Repository last commit component', () => {
it.each` it.each`
loading | label loading | label
${true} | ${'hides'} ${true} | ${'shows'}
${false} | ${'shows'} ${false} | ${'hides'}
`('$label when $loading is true', ({ loading }) => { `('$label when loading icon $loading is true', ({ loading }) => {
factory(createCommitData(), loading); factory(createCommitData(), loading);
expect(vm.isEmpty()).toBe(loading); expect(vm.find(GlLoadingIcon).exists()).toBe(loading);
}); });
it('renders commit widget', () => { it('renders commit widget', () => {
...@@ -73,11 +74,17 @@ describe('Repository last commit component', () => { ...@@ -73,11 +74,17 @@ describe('Repository last commit component', () => {
}); });
it('hides pipeline components when pipeline does not exist', () => { it('hides pipeline components when pipeline does not exist', () => {
factory(createCommitData({ pipeline: null })); factory(createCommitData({ latestPipeline: null }));
expect(vm.find('.js-commit-pipeline').exists()).toBe(false); expect(vm.find('.js-commit-pipeline').exists()).toBe(false);
}); });
it('renders pipeline components', () => {
factory();
expect(vm.find('.js-commit-pipeline').exists()).toBe(true);
});
it('hides author component when author does not exist', () => { it('hides author component when author does not exist', () => {
factory(createCommitData({ author: null })); factory(createCommitData({ author: null }));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment