Commit 997d70ea authored by Winnie Hellmann's avatar Winnie Hellmann

Add dynamic timer for delayed jobs in job sidebar

parent 53a28e80
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
import { GlTooltipDirective, GlLink } from '@gitlab-org/gitlab-ui'; import { GlTooltipDirective, GlLink } from '@gitlab-org/gitlab-ui';
import CiIcon from '~/vue_shared/components/ci_icon.vue'; import CiIcon from '~/vue_shared/components/ci_icon.vue';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import delayedJobMixin from '~/jobs/mixins/delayed_job_mixin';
import { sprintf } from '~/locale';
export default { export default {
components: { components: {
...@@ -12,6 +14,7 @@ export default { ...@@ -12,6 +14,7 @@ export default {
directives: { directives: {
GlTooltip: GlTooltipDirective, GlTooltip: GlTooltipDirective,
}, },
mixins: [delayedJobMixin],
props: { props: {
job: { job: {
type: Object, type: Object,
...@@ -24,7 +27,14 @@ export default { ...@@ -24,7 +27,14 @@ export default {
}, },
computed: { computed: {
tooltipText() { tooltipText() {
return `${this.job.name} - ${this.job.status.tooltip}`; const { name, status } = this.job;
const text = `${name} - ${status.tooltip}`;
if (this.isDelayedJob) {
return sprintf(text, { remainingTime: this.remainingTime })
}
return text;
}, },
}, },
}; };
......
...@@ -4,6 +4,7 @@ import mountComponent from 'spec/helpers/vue_mount_component_helper'; ...@@ -4,6 +4,7 @@ import mountComponent from 'spec/helpers/vue_mount_component_helper';
import job from '../mock_data'; import job from '../mock_data';
describe('JobContainerItem', () => { describe('JobContainerItem', () => {
const delayedJobFixture = getJSONFixture('jobs/delayed.json');
const Component = Vue.extend(JobContainerItem); const Component = Vue.extend(JobContainerItem);
let vm; let vm;
...@@ -70,4 +71,31 @@ describe('JobContainerItem', () => { ...@@ -70,4 +71,31 @@ describe('JobContainerItem', () => {
expect(vm.$el).toHaveSpriteIcon('retry'); expect(vm.$el).toHaveSpriteIcon('retry');
}); });
}); });
describe('for delayed job', () => {
beforeEach(() => {
const remainingMilliseconds = 1337000;
spyOn(Date, 'now').and.callFake(
() => new Date(delayedJobFixture.scheduled_at).getTime() - remainingMilliseconds,
);
});
it('displays remaining time in tooltip', done => {
vm = mountComponent(Component, {
job: delayedJobFixture,
isActive: false,
});
Vue.nextTick()
.then(() => {
expect(
vm.$el
.querySelector('.js-job-link')
.getAttribute('data-original-title'),
).toEqual('delayed job - delayed manual action (00:22:17)');
})
.then(done)
.catch(done.fail);
});
});
}); });
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