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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
1df96350
Commit
1df96350
authored
Feb 04, 2021
by
Sarah Groff Hennigh-Palermo
Committed by
Andrew Fontaine
Feb 04, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pipeline Graph Structural Update: Menu Bugfix
parent
f8b9cc2f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
12 deletions
+15
-12
app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
...pts/pipelines/components/graph/stage_column_component.vue
+4
-11
spec/frontend/pipelines/graph/graph_component_spec.js
spec/frontend/pipelines/graph/graph_component_spec.js
+11
-1
No files found.
app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
View file @
1df96350
...
@@ -78,11 +78,7 @@ export default {
...
@@ -78,11 +78,7 @@ export default {
return
`ci-badge-
${
escape
(
group
.
name
)}
`
;
return
`ci-badge-
${
escape
(
group
.
name
)}
`
;
},
},
isFadedOut
(
jobName
)
{
isFadedOut
(
jobName
)
{
return
(
return
this
.
highlightedJobs
.
length
>
1
&&
!
this
.
highlightedJobs
.
includes
(
jobName
);
this
.
jobHovered
&&
this
.
highlightedJobs
.
length
>
1
&&
!
this
.
highlightedJobs
.
includes
(
jobName
)
);
},
},
},
},
};
};
...
@@ -126,12 +122,9 @@ export default {
...
@@ -126,12 +122,9 @@ export default {
:class=
"
{ 'gl-opacity-3': isFadedOut(group.name) }"
:class=
"
{ 'gl-opacity-3': isFadedOut(group.name) }"
@pipelineActionRequestComplete="$emit('refreshPipelineGraph')"
@pipelineActionRequestComplete="$emit('refreshPipelineGraph')"
/>
/>
<job-group-dropdown
<div
v-else
:class=
"
{ 'gl-opacity-3': isFadedOut(group.name) }">
v-else
<job-group-dropdown
:group=
"group"
:pipeline-id=
"pipelineId"
/>
:group=
"group"
</div>
:pipeline-id=
"pipelineId"
:class=
"
{ 'gl-opacity-3': isFadedOut(group.name) }"
/>
</div>
</div>
</
template
>
</
template
>
</main-graph-wrapper>
</main-graph-wrapper>
...
...
spec/frontend/pipelines/graph/graph_component_spec.js
View file @
1df96350
...
@@ -22,6 +22,13 @@ describe('graph component', () => {
...
@@ -22,6 +22,13 @@ describe('graph component', () => {
pipeline
:
generateResponse
(
mockPipelineResponse
,
'
root/fungi-xoxo
'
),
pipeline
:
generateResponse
(
mockPipelineResponse
,
'
root/fungi-xoxo
'
),
};
};
const
defaultData
=
{
measurements
:
{
width
:
800
,
height
:
800
,
},
};
const
createComponent
=
({
const
createComponent
=
({
data
=
{},
data
=
{},
mountFn
=
shallowMount
,
mountFn
=
shallowMount
,
...
@@ -34,7 +41,10 @@ describe('graph component', () => {
...
@@ -34,7 +41,10 @@ describe('graph component', () => {
...
props
,
...
props
,
},
},
data
()
{
data
()
{
return
{
...
data
};
return
{
...
defaultData
,
...
data
,
};
},
},
provide
:
{
provide
:
{
dataMethod
:
GRAPHQL
,
dataMethod
:
GRAPHQL
,
...
...
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