Merge branch 'fc-correlation-downstream' into 'master'

Add name of the trigger job in title of downstream

See merge request gitlab-org/gitlab!63454

app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue

@@ -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

@@ -38033,9 +38033,6 @@ msgstr ""
 msgid "cannot merge"
 msgstr ""
 
-msgid "child-pipeline"
-msgstr ""
-
 msgid "ciReport|%{degradedNum} degraded"
 msgstr ""
 

spec/frontend/pipelines/graph/linked_pipeline_spec.js

@@ -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);