diff options
author | Phil Hughes <me@iamphill.com> | 2018-05-24 12:11:55 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-05-24 12:11:55 +0100 |
commit | 1e48b7eec0499e44eb1dcd32393005f709b5c816 (patch) | |
tree | bc1f07f7c1aa345e6c756811a61340ed55dbcced /app/assets/javascripts/ide/components/pipelines/list.vue | |
parent | 4b4618936d0af203820be3a9392d7e555464cf3f (diff) | |
download | gitlab-ce-1e48b7eec0499e44eb1dcd32393005f709b5c816.tar.gz |
removed need for jobs component
Diffstat (limited to 'app/assets/javascripts/ide/components/pipelines/list.vue')
-rw-r--r-- | app/assets/javascripts/ide/components/pipelines/list.vue | 46 |
1 files changed, 41 insertions, 5 deletions
diff --git a/app/assets/javascripts/ide/components/pipelines/list.vue b/app/assets/javascripts/ide/components/pipelines/list.vue index d8f75d2f6a3..8eed902d4e2 100644 --- a/app/assets/javascripts/ide/components/pipelines/list.vue +++ b/app/assets/javascripts/ide/components/pipelines/list.vue @@ -2,17 +2,22 @@ import { mapActions, mapGetters, mapState } from 'vuex'; import LoadingIcon from '../../../vue_shared/components/loading_icon.vue'; import CiIcon from '../../../vue_shared/components/ci_icon.vue'; -import JobsList from './jobs.vue'; +import Tabs from '../../../vue_shared/components/tabs/tabs'; +import Tab from '../../../vue_shared/components/tabs/tab.vue'; +import JobsList from '../jobs/list.vue'; export default { components: { LoadingIcon, CiIcon, + Tabs, + Tab, JobsList, }, computed: { ...mapGetters(['currentProject']), - ...mapState('pipelines', ['isLoadingPipeline', 'latestPipeline']), + ...mapGetters('pipelines', ['jobsCount', 'failedJobsCount', 'failedStages']), + ...mapState('pipelines', ['isLoadingPipeline', 'latestPipeline', 'stages', 'isLoadingJobs']), statusIcon() { return { group: this.latestPipeline.status, @@ -21,10 +26,10 @@ export default { }, }, created() { - this.fetchLatestPipeline(); + return this.fetchLatestPipeline().then(() => this.fetchStages()); }, methods: { - ...mapActions('pipelines', ['fetchLatestPipeline']), + ...mapActions('pipelines', ['fetchLatestPipeline', 'fetchStages']), }, }; </script> @@ -56,7 +61,38 @@ export default { </a> </span> </header> - <jobs-list /> + <tabs> + <tab active> + <template slot="title"> + Jobs + <span + v-if="!isLoadingJobs || jobsCount" + class="badge" + > + {{ jobsCount }} + </span> + </template> + <jobs-list + :loading="isLoadingJobs" + :stages="stages" + /> + </tab> + <tab> + <template slot="title"> + Failed Jobs + <span + v-if="!isLoadingJobs || failedJobsCount" + class="badge" + > + {{ failedJobsCount }} + </span> + </template> + <jobs-list + :loading="isLoadingJobs" + :stages="failedStages" + /> + </tab> + </tabs> </template> </div> </template> |