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
afbc1b22
Commit
afbc1b22
authored
Feb 03, 2021
by
Sarah GP
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix sliding issues
parent
5a539704
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
16 deletions
+13
-16
app/assets/javascripts/pipelines/components/graph/linked_pipelines_column.vue
...ts/pipelines/components/graph/linked_pipelines_column.vue
+13
-16
No files found.
app/assets/javascripts/pipelines/components/graph/linked_pipelines_column.vue
View file @
afbc1b22
...
...
@@ -28,7 +28,6 @@ export default {
return
{
currentPipeline
:
null
,
loadingPipelineId
:
null
,
minWidth
:
0
,
pipelineExpanded
:
false
,
};
},
...
...
@@ -40,6 +39,7 @@ export default {
'
gl-pl-3
'
,
'
gl-mb-5
'
,
],
minWidth
:
`
${
ONE_COL_WIDTH
}
px`
,
computed
:
{
columnClass
()
{
const
positionValues
=
{
...
...
@@ -48,12 +48,6 @@ export default {
};
return
`graph-position-
${
this
.
graphPosition
}
${
positionValues
[
this
.
graphPosition
]}
`
;
},
graphPosition
()
{
return
this
.
isUpstream
?
'
left
'
:
'
right
'
;
},
isUpstream
()
{
return
this
.
type
===
UPSTREAM
;
},
computedTitleClasses
()
{
const
positionalClasses
=
this
.
isUpstream
?
[
'
gl-w-full
'
,
'
gl-text-right
'
,
'
gl-linked-pipeline-padding
'
]
...
...
@@ -61,6 +55,12 @@ export default {
return
[...
this
.
$options
.
titleClasses
,
...
positionalClasses
];
},
graphPosition
()
{
return
this
.
isUpstream
?
'
left
'
:
'
right
'
;
},
isUpstream
()
{
return
this
.
type
===
UPSTREAM
;
},
},
methods
:
{
getPipelineData
(
pipeline
)
{
...
...
@@ -105,7 +105,6 @@ export default {
if
(
this
.
currentPipeline
?.
id
===
pipeline
.
id
)
{
this
.
pipelineExpanded
=
false
;
this
.
currentPipeline
=
null
;
this
.
minWidth
=
0
;
return
;
}
...
...
@@ -120,11 +119,6 @@ export default {
*/
this
.
pipelineExpanded
=
true
;
/*
Min-width is set manually for timing reasons.
*/
this
.
minWidth
=
`
${
ONE_COL_WIDTH
}
px`
;
this
.
getPipelineData
(
pipeline
);
},
onDownstreamHovered
(
jobName
)
{
...
...
@@ -138,6 +132,9 @@ export default {
this
.
$emit
(
'
pipelineExpandToggle
'
,
jobName
,
expanded
);
},
showDownstreamContainer
(
id
)
{
return
!
this
.
isUpstream
&&
(
this
.
isExpanded
(
id
)
||
this
.
isLoadingPipeline
(
id
));
},
},
};
</
script
>
...
...
@@ -167,12 +164,12 @@ export default {
@
pipelineExpandToggle=
"onPipelineExpandToggle"
/>
<div
v-if=
"
isExpanded(pipeline.id) && !isUpstream
"
:style=
"
{ minWidth }"
v-if=
"
showDownstreamContainer(pipeline.id)
"
:style=
"
{ minWidth
: $options.minWidth
}"
class="gl-display-inline-block"
>
<pipeline-graph
v-if=
"
currentPipeline
"
v-if=
"
isExpanded(pipeline.id)
"
:type=
"type"
class=
"d-inline-block gl-mt-n2"
:pipeline=
"currentPipeline"
...
...
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