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
4b461893
Commit
4b461893
authored
May 24, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improve design of job items
allow ci icon to have a different size & be borderless
parent
d61a27d5
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
137 additions
and
23 deletions
+137
-23
app/assets/javascripts/ide/components/jobs/item.vue
app/assets/javascripts/ide/components/jobs/item.vue
+39
-7
app/assets/javascripts/ide/components/jobs/list.vue
app/assets/javascripts/ide/components/jobs/list.vue
+18
-5
app/assets/javascripts/ide/components/jobs/stage.vue
app/assets/javascripts/ide/components/jobs/stage.vue
+35
-4
app/assets/javascripts/ide/components/panes/right.vue
app/assets/javascripts/ide/components/panes/right.vue
+1
-1
app/assets/javascripts/ide/components/pipelines/jobs.vue
app/assets/javascripts/ide/components/pipelines/jobs.vue
+15
-3
app/assets/javascripts/ide/components/pipelines/list.vue
app/assets/javascripts/ide/components/pipelines/list.vue
+1
-0
app/assets/javascripts/ide/stores/modules/pipelines/getters.js
...ssets/javascripts/ide/stores/modules/pipelines/getters.js
+6
-2
app/assets/javascripts/vue_shared/components/ci_icon.vue
app/assets/javascripts/vue_shared/components/ci_icon.vue
+22
-1
No files found.
app/assets/javascripts/ide/components/jobs/item.vue
View file @
4b461893
...
...
@@ -11,16 +11,48 @@ export default {
required
:
true
,
},
},
computed
:
{
jobId
()
{
return
`#
${
this
.
job
.
id
}
`
;
},
},
};
</
script
>
<
template
>
<div>
<ci-icon
:status=
"job.status"
/>
<div
class=
"ide-job-item"
>
<ci-icon
:status=
"job.status"
:borderless=
"true"
:size=
"24"
/>
<span
class=
"prepend-left-8"
>
{{
job
.
name
}}
<a
:href=
"job.build_path"
target=
"_blank"
>
#
{{
job
.
id
}}
</a>
v-text=
"jobId"
>
</a>
</span>
</div>
</
template
>
<
style
scoped
>
.ide-job-item
{
display
:
flex
;
padding
:
16px
;
}
.ide-job-item
:not
(
:last-child
)
{
border-bottom
:
1px
solid
#e5e5e5
;
}
.ide-job-item
.ci-status-icon
{
display
:
flex
;
justify-content
:
center
;
height
:
20px
;
margin-top
:
-2px
;
overflow
:
hidden
;
}
</
style
>
app/assets/javascripts/ide/components/jobs/list.vue
View file @
4b461893
<
script
>
import
{
mapState
}
from
'
vuex
'
;
import
LoadingIcon
from
'
../../../vue_shared/components/loading_icon.vue
'
;
import
Stage
from
'
./stage.vue
'
;
export
default
{
components
:
{
LoadingIcon
,
Stage
,
},
props
:
{
...
...
@@ -11,15 +14,25 @@ export default {
required
:
true
,
},
},
computed
:
{
...
mapState
(
'
pipelines
'
,
[
'
isLoadingJobs
'
]),
},
};
</
script
>
<
template
>
<div
style=
"overflow: auto;"
>
<div>
<loading-icon
v-if=
"isLoadingJobs && !stages.length"
class=
"prepend-top-default"
size=
"2"
/>
<template
v-else
>
<stage
v-for=
"stage in stages"
:key=
"stage.id"
:stage=
"stage"
/>
</
template
>
</div>
</template>
app/assets/javascripts/ide/components/jobs/stage.vue
View file @
4b461893
<
script
>
import
{
mapActions
}
from
'
vuex
'
;
import
tooltip
from
'
../../../vue_shared/directives/tooltip
'
;
import
Icon
from
'
../../../vue_shared/components/icon.vue
'
;
import
CiIcon
from
'
../../../vue_shared/components/ci_icon.vue
'
;
import
LoadingIcon
from
'
../../../vue_shared/components/loading_icon.vue
'
;
import
Item
from
'
./item.vue
'
;
export
default
{
directives
:
{
tooltip
,
},
components
:
{
Icon
,
CiIcon
,
...
...
@@ -18,6 +22,11 @@ export default {
required
:
true
,
},
},
data
()
{
return
{
showTooltip
:
false
,
};
},
computed
:
{
collapseIcon
()
{
return
this
.
stage
.
isCollapsed
?
'
angle-left
'
:
'
angle-down
'
;
...
...
@@ -26,6 +35,11 @@ export default {
created
()
{
this
.
fetchJobs
(
this
.
stage
);
},
mounted
()
{
const
{
stageTitle
}
=
this
.
$refs
;
this
.
showTooltip
=
stageTitle
.
scrollWidth
>
stageTitle
.
offsetWidth
;
},
methods
:
{
...
mapActions
(
'
pipelines
'
,
[
'
fetchJobs
'
]),
},
...
...
@@ -42,11 +56,18 @@ export default {
>
<ci-icon
:status=
"stage.status"
:size=
"24"
/>
<span
class=
"prepend-left-8"
>
{{
stage
.
title
}}
</span>
<div>
<strong
v-tooltip=
"showTooltip"
:title=
"showTooltip ? stage.name : null"
data-container=
"body"
class=
"prepend-left-8 ide-stage-title"
ref=
"stageTitle"
>
{{
stage
.
name
}}
</strong>
<div
class=
"append-right-8"
>
<span
class=
"badge"
>
{{
stage
.
jobs
.
length
}}
</span>
...
...
@@ -87,4 +108,14 @@ export default {
.panel-heading
.pull-right
{
margin
:
auto
0
auto
auto
;
}
.panel-body
{
padding
:
0
;
}
.ide-stage-title
{
white-space
:
nowrap
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
}
</
style
>
app/assets/javascripts/ide/components/panes/right.vue
View file @
4b461893
...
...
@@ -70,7 +70,7 @@ export default {
}
.ide-right-sidebar
.multi-file-commit-panel-inner
{
width
:
3
0
0px
;
width
:
3
5
0px
;
padding
:
8px
16px
;
background-color
:
#fff
;
border-left
:
1px
solid
#eaeaea
;
...
...
app/assets/javascripts/ide/components/pipelines/jobs.vue
View file @
4b461893
...
...
@@ -12,7 +12,7 @@ export default {
},
computed
:
{
...
mapGetters
(
'
pipelines
'
,
[
'
jobsCount
'
,
'
failedJobsCount
'
,
'
failedStages
'
]),
...
mapState
(
'
pipelines
'
,
[
'
stages
'
]),
...
mapState
(
'
pipelines
'
,
[
'
stages
'
,
'
isLoadingJobs
'
]),
},
created
()
{
this
.
fetchStages
();
...
...
@@ -28,7 +28,13 @@ export default {
<tabs>
<tab
active
>
<template
slot=
"title"
>
Jobs
<span
class=
"badge"
>
{{
jobsCount
}}
</span>
Jobs
<span
v-if=
"!isLoadingJobs || jobsCount"
class=
"badge"
>
{{
jobsCount
}}
</span>
</
template
>
<jobs-list
:stages=
"stages"
...
...
@@ -36,7 +42,13 @@ export default {
</tab>
<tab>
<
template
slot=
"title"
>
Failed Jobs
<span
class=
"badge"
>
{{
failedJobsCount
}}
</span>
Failed Jobs
<span
v-if=
"!isLoadingJobs || failedJobsCount"
class=
"badge"
>
{{
failedJobsCount
}}
</span>
</
template
>
<jobs-list
:stages=
"failedStages"
...
...
app/assets/javascripts/ide/components/pipelines/list.vue
View file @
4b461893
...
...
@@ -42,6 +42,7 @@ export default {
>
<ci-icon
:status=
"statusIcon"
:size=
"24"
/>
<span
class=
"prepend-left-8"
>
<strong>
...
...
app/assets/javascripts/ide/stores/modules/pipelines/getters.js
View file @
4b461893
export
const
hasLatestPipeline
=
state
=>
!
state
.
isLoadingPipeline
&&
!!
state
.
latestPipeline
;
export
const
failedStages
=
state
=>
state
.
stages
.
filter
(
stage
=>
stage
.
status
.
label
===
'
failed
'
);
export
const
failedStages
=
state
=>
state
.
stages
.
filter
(
stage
=>
stage
.
status
.
text
===
'
failed
'
).
map
(
stage
=>
({
...
stage
,
jobs
:
stage
.
jobs
.
filter
(
job
=>
job
.
status
.
text
===
'
failed
'
),
}));
export
const
failedJobsCount
=
state
=>
state
.
stages
.
reduce
(
(
acc
,
stage
)
=>
acc
+
stage
.
jobs
.
filter
(
j
=>
j
.
status
.
label
===
'
failed
'
).
length
,
(
acc
,
stage
)
=>
acc
+
stage
.
jobs
.
filter
(
j
=>
j
.
status
.
text
===
'
failed
'
).
length
,
0
,
);
...
...
app/assets/javascripts/vue_shared/components/ci_icon.vue
View file @
4b461893
...
...
@@ -22,6 +22,8 @@ import Icon from '../../vue_shared/components/icon.vue';
* - Jobs show view header
* - Jobs show view sidebar
*/
const
validSizes
=
[
8
,
12
,
16
,
18
,
24
,
32
,
48
,
72
];
export
default
{
components
:
{
Icon
,
...
...
@@ -31,17 +33,36 @@ export default {
type
:
Object
,
required
:
true
,
},
size
:
{
type
:
Number
,
required
:
false
,
default
:
16
,
validator
(
value
)
{
return
validSizes
.
includes
(
value
);
},
},
borderless
:
{
type
:
Boolean
,
required
:
false
,
default
:
false
,
},
},
computed
:
{
cssClass
()
{
const
status
=
this
.
status
.
group
;
return
`ci-status-icon ci-status-icon-
${
status
}
js-ci-status-icon-
${
status
}
`
;
},
icon
()
{
return
this
.
borderless
?
`
${
this
.
status
.
icon
}
_borderless`
:
this
.
status
.
icon
;
},
},
};
</
script
>
<
template
>
<span
:class=
"cssClass"
>
<icon
:name=
"status.icon"
/>
<icon
:name=
"icon"
:size=
"size"
/>
</span>
</
template
>
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