diff options
author | Simon Knox <psimyn@gmail.com> | 2018-11-13 14:07:25 +1100 |
---|---|---|
committer | Simon Knox <psimyn@gmail.com> | 2018-11-13 14:07:25 +1100 |
commit | ed335291dbeda5b34ae14c47eb7f9058cd5339f6 (patch) | |
tree | 98420e96bdd3379df2777c98cee85e47b9ff078a /app/assets/javascripts/pipelines/components/graph/job_item.vue | |
parent | 2dce46e941eb55dc55f3d85984298d7a9654e2cc (diff) | |
parent | 03e46cf72babbeb1df1320524fdf34b09fe1292c (diff) | |
download | gitlab-ce-ed335291dbeda5b34ae14c47eb7f9058cd5339f6.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 49479-hide-unmerged-env-perf-stats49479-hide-unmerged-env-perf-stats
Diffstat (limited to 'app/assets/javascripts/pipelines/components/graph/job_item.vue')
-rw-r--r-- | app/assets/javascripts/pipelines/components/graph/job_item.vue | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/app/assets/javascripts/pipelines/components/graph/job_item.vue b/app/assets/javascripts/pipelines/components/graph/job_item.vue index a1504592bbc..7cdde8a53b3 100644 --- a/app/assets/javascripts/pipelines/components/graph/job_item.vue +++ b/app/assets/javascripts/pipelines/components/graph/job_item.vue @@ -2,6 +2,8 @@ import ActionComponent from './action_component.vue'; import JobNameComponent from './job_name_component.vue'; import tooltip from '../../../vue_shared/directives/tooltip'; +import { sprintf } from '~/locale'; +import delayedJobMixin from '~/jobs/mixins/delayed_job_mixin'; /** * Renders the badge for the pipeline graph and the job's dropdown. @@ -36,6 +38,7 @@ export default { directives: { tooltip, }, + mixins: [delayedJobMixin], props: { job: { type: Object, @@ -52,6 +55,7 @@ export default { default: Infinity, }, }, + computed: { status() { return this.job && this.job.status ? this.job.status : {}; @@ -59,17 +63,23 @@ export default { tooltipText() { const textBuilder = []; + const { name: jobName } = this.job; - if (this.job.name) { - textBuilder.push(this.job.name); + if (jobName) { + textBuilder.push(jobName); } - if (this.job.name && this.status.tooltip) { + const { tooltip: statusTooltip } = this.status; + if (jobName && statusTooltip) { textBuilder.push('-'); } - if (this.status.tooltip) { - textBuilder.push(this.job.status.tooltip); + if (statusTooltip) { + if (this.isDelayedJob) { + textBuilder.push(sprintf(statusTooltip, { remainingTime: this.remainingTime })); + } else { + textBuilder.push(statusTooltip); + } } return textBuilder.join(' '); @@ -88,6 +98,7 @@ export default { return this.job.status && this.job.status.action && this.job.status.action.path; }, }, + methods: { pipelineActionRequestComplete() { this.$emit('pipelineActionRequestComplete'); |