summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide/components/pipelines/list.vue
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-05-25 14:13:59 +0100
committerPhil Hughes <me@iamphill.com>2018-05-25 14:13:59 +0100
commita83dd6642104faf4c8764283f5b7252a8ecd9590 (patch)
tree66cabf49dfb6049bb5e4a4c0135f9fd86b4cf62e /app/assets/javascripts/ide/components/pipelines/list.vue
parent0c0a779f4c97622ad2359a94d1c870b75a8b0e6d (diff)
downloadgitlab-ce-a83dd6642104faf4c8764283f5b7252a8ecd9590.tar.gz
refactored to use data we already have
this required moving some data store actions & mutations around
Diffstat (limited to 'app/assets/javascripts/ide/components/pipelines/list.vue')
-rw-r--r--app/assets/javascripts/ide/components/pipelines/list.vue19
1 files changed, 6 insertions, 13 deletions
diff --git a/app/assets/javascripts/ide/components/pipelines/list.vue b/app/assets/javascripts/ide/components/pipelines/list.vue
index 8eed902d4e2..124585cd331 100644
--- a/app/assets/javascripts/ide/components/pipelines/list.vue
+++ b/app/assets/javascripts/ide/components/pipelines/list.vue
@@ -15,21 +15,14 @@ export default {
JobsList,
},
computed: {
- ...mapGetters(['currentProject']),
...mapGetters('pipelines', ['jobsCount', 'failedJobsCount', 'failedStages']),
...mapState('pipelines', ['isLoadingPipeline', 'latestPipeline', 'stages', 'isLoadingJobs']),
- statusIcon() {
- return {
- group: this.latestPipeline.status,
- icon: `status_${this.latestPipeline.status}`,
- };
- },
},
created() {
- return this.fetchLatestPipeline().then(() => this.fetchStages());
+ this.fetchLatestPipeline();
},
methods: {
- ...mapActions('pipelines', ['fetchLatestPipeline', 'fetchStages']),
+ ...mapActions('pipelines', ['fetchLatestPipeline']),
},
};
</script>
@@ -46,7 +39,7 @@ export default {
class="ide-tree-header ide-pipeline-header"
>
<ci-icon
- :status="statusIcon"
+ :status="latestPipeline.details.status"
:size="24"
/>
<span class="prepend-left-8">
@@ -54,7 +47,7 @@ export default {
Pipeline
</strong>
<a
- :href="currentProject.web_url + '/pipelines/' + latestPipeline.id"
+ :href="latestPipeline.details.status.details_path"
target="_blank"
>
#{{ latestPipeline.id }}
@@ -66,7 +59,7 @@ export default {
<template slot="title">
Jobs
<span
- v-if="!isLoadingJobs || jobsCount"
+ v-if="jobsCount"
class="badge"
>
{{ jobsCount }}
@@ -81,7 +74,7 @@ export default {
<template slot="title">
Failed Jobs
<span
- v-if="!isLoadingJobs || failedJobsCount"
+ v-if="failedJobsCount"
class="badge"
>
{{ failedJobsCount }}