Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
ff72bba1
Commit
ff72bba1
authored
6 years ago
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add dynamic timer for delayed jobs on single job page
parent
74f22d26
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
1 deletion
+44
-1
app/assets/javascripts/jobs/components/job_app.vue
app/assets/javascripts/jobs/components/job_app.vue
+15
-1
spec/javascripts/jobs/components/job_app_spec.js
spec/javascripts/jobs/components/job_app_spec.js
+29
-0
No files found.
app/assets/javascripts/jobs/components/job_app.vue
View file @
ff72bba1
...
@@ -14,6 +14,8 @@ import Log from './job_log.vue';
...
@@ -14,6 +14,8 @@ import Log from './job_log.vue';
import
LogTopBar
from
'
./job_log_controllers.vue
'
;
import
LogTopBar
from
'
./job_log_controllers.vue
'
;
import
StuckBlock
from
'
./stuck_block.vue
'
;
import
StuckBlock
from
'
./stuck_block.vue
'
;
import
Sidebar
from
'
./sidebar.vue
'
;
import
Sidebar
from
'
./sidebar.vue
'
;
import
{
sprintf
}
from
'
~/locale
'
;
import
delayedJobMixin
from
'
../mixins/delayed_job_mixin
'
;
export
default
{
export
default
{
name
:
'
JobPageApp
'
,
name
:
'
JobPageApp
'
,
...
@@ -30,6 +32,7 @@ export default {
...
@@ -30,6 +32,7 @@ export default {
StuckBlock
,
StuckBlock
,
Sidebar
,
Sidebar
,
},
},
mixins
:
[
delayedJobMixin
],
props
:
{
props
:
{
runnerSettingsUrl
:
{
runnerSettingsUrl
:
{
type
:
String
,
type
:
String
,
...
@@ -89,6 +92,17 @@ export default {
...
@@ -89,6 +92,17 @@ export default {
shouldRenderContent
()
{
shouldRenderContent
()
{
return
!
this
.
isLoading
&&
!
this
.
hasError
;
return
!
this
.
isLoading
&&
!
this
.
hasError
;
},
},
emptyStateTitle
()
{
const
{
emptyStateIllustration
,
remainingTime
}
=
this
;
const
{
title
}
=
emptyStateIllustration
;
if
(
this
.
isDelayedJob
)
{
return
sprintf
(
title
,
{
remainingTime
});
}
return
title
;
},
},
},
watch
:
{
watch
:
{
// Once the job log is loaded,
// Once the job log is loaded,
...
@@ -250,7 +264,7 @@ export default {
...
@@ -250,7 +264,7 @@ export default {
class=
"js-job-empty-state"
class=
"js-job-empty-state"
:illustration-path=
"emptyStateIllustration.image"
:illustration-path=
"emptyStateIllustration.image"
:illustration-size-class=
"emptyStateIllustration.size"
:illustration-size-class=
"emptyStateIllustration.size"
:title=
"emptyState
Illustration.t
itle"
:title=
"emptyState
T
itle"
:content=
"emptyStateIllustration.content"
:content=
"emptyStateIllustration.content"
:action=
"emptyStateAction"
:action=
"emptyStateAction"
/>
/>
...
...
This diff is collapsed.
Click to expand it.
spec/javascripts/jobs/components/job_app_spec.js
View file @
ff72bba1
...
@@ -8,6 +8,7 @@ import { resetStore } from '../store/helpers';
...
@@ -8,6 +8,7 @@ import { resetStore } from '../store/helpers';
import
job
from
'
../mock_data
'
;
import
job
from
'
../mock_data
'
;
describe
(
'
Job App
'
,
()
=>
{
describe
(
'
Job App
'
,
()
=>
{
const
delayedJobFixture
=
getJSONFixture
(
'
jobs/delayed.json
'
);
const
Component
=
Vue
.
extend
(
jobApp
);
const
Component
=
Vue
.
extend
(
jobApp
);
let
store
;
let
store
;
let
vm
;
let
vm
;
...
@@ -420,6 +421,34 @@ describe('Job App ', () => {
...
@@ -420,6 +421,34 @@ describe('Job App ', () => {
done
();
done
();
},
0
);
},
0
);
});
});
it
(
'
displays remaining time for a delayed job
'
,
(
done
)
=>
{
const
oneHourInMilliseconds
=
3600000
;
spyOn
(
Date
,
'
now
'
).
and
.
callFake
(()
=>
new
Date
(
delayedJobFixture
.
scheduled_at
).
getTime
()
-
oneHourInMilliseconds
);
mock
.
onGet
(
props
.
endpoint
).
replyOnce
(
200
,
{
...
delayedJobFixture
});
vm
=
mountComponentWithStore
(
Component
,
{
props
,
store
,
});
store
.
subscribeAction
((
action
)
=>
{
if
(
action
.
type
!==
'
receiveJobSuccess
'
)
{
return
;
}
Vue
.
nextTick
()
.
then
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-job-empty-state
'
)).
not
.
toBeNull
();
const
title
=
vm
.
$el
.
querySelector
(
'
.js-job-empty-state-title
'
);
expect
(
title
).
toContainText
(
'
01:00:00
'
);
done
();
})
.
catch
(
done
.
fail
);
});
});
});
});
});
});
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment