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
bb67439b
Commit
bb67439b
authored
Jun 09, 2021
by
Frédéric Caplette
Committed by
Andrew Fontaine
Jun 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add name of the trigger job in title of downstream
parent
29a04635
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue
...avascripts/pipelines/components/graph/linked_pipeline.vue
+3
-3
locale/gitlab.pot
locale/gitlab.pot
+0
-3
spec/frontend/pipelines/graph/linked_pipeline_spec.js
spec/frontend/pipelines/graph/linked_pipeline_spec.js
+6
-0
No files found.
app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue
View file @
bb67439b
...
...
@@ -58,7 +58,7 @@ export default {
},
computed
:
{
tooltipText
()
{
return
`
${
this
.
downstreamTitle
}
#
${
this
.
pipeline
.
id
}
-
${
this
.
pipelineStatus
.
label
}
return
`
${
this
.
downstreamTitle
}
#
${
this
.
pipeline
.
id
}
-
${
this
.
pipelineStatus
.
label
}
-
${
this
.
sourceJobInfo
}
`
;
},
buttonId
()
{
...
...
@@ -71,7 +71,7 @@ export default {
return
this
.
pipeline
.
project
.
name
;
},
downstreamTitle
()
{
return
this
.
childPipeline
?
__
(
'
child-pipeline
'
)
:
this
.
pipeline
.
project
.
name
;
return
this
.
childPipeline
?
this
.
sourceJobName
:
this
.
pipeline
.
project
.
name
;
},
parentPipeline
()
{
return
this
.
isUpstream
&&
this
.
isSameProject
;
...
...
@@ -163,7 +163,7 @@ export default {
/>
<div
v-else
class=
"gl-pr-2"
><gl-loading-icon
inline
/></div>
<div
class=
"gl-display-flex gl-flex-direction-column gl-w-13"
>
<span
class=
"gl-text-truncate"
>
<span
class=
"gl-text-truncate"
data-testid=
"downstream-title"
>
{{
downstreamTitle
}}
</span>
<div
class=
"gl-text-truncate"
>
...
...
locale/gitlab.pot
View file @
bb67439b
...
...
@@ -38219,9 +38219,6 @@ msgstr ""
msgid "cannot merge"
msgstr ""
msgid "child-pipeline"
msgstr ""
msgid "ciReport|%{degradedNum} degraded"
msgstr ""
...
...
spec/frontend/pipelines/graph/linked_pipeline_spec.js
View file @
bb67439b
...
...
@@ -14,6 +14,7 @@ describe('Linked pipeline', () => {
let
wrapper
;
const
findButton
=
()
=>
wrapper
.
find
(
GlButton
);
const
findDownstreamPipelineTitle
=
()
=>
wrapper
.
find
(
'
[data-testid="downstream-title"]
'
);
const
findPipelineLabel
=
()
=>
wrapper
.
find
(
'
[data-testid="downstream-pipeline-label"]
'
);
const
findLinkedPipeline
=
()
=>
wrapper
.
find
({
ref
:
'
linkedPipeline
'
});
const
findLoadingIcon
=
()
=>
wrapper
.
find
(
GlLoadingIcon
);
...
...
@@ -119,6 +120,11 @@ describe('Linked pipeline', () => {
expect
(
findPipelineLabel
().
exists
()).
toBe
(
true
);
});
it
(
'
should have the name of the trigger job on the card when it is a child pipeline
'
,
()
=>
{
createWrapper
(
downstreamProps
);
expect
(
findDownstreamPipelineTitle
().
text
()).
toBe
(
mockPipeline
.
source_job
.
name
);
});
it
(
'
should display parent label when pipeline project id is the same as triggered_by pipeline project id
'
,
()
=>
{
createWrapper
(
upstreamProps
);
expect
(
findPipelineLabel
().
exists
()).
toBe
(
true
);
...
...
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