Merge branch 'remove-downstream-node-lines' into 'master'

Remove downstream pipeline connecting lines (1/3)

See merge request gitlab-org/gitlab!21196

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

@@ -100,9 +100,6 @@ export default {
     hasOnlyOneJob(stage) {
       return stage.groups.length === 1;
     },
-    hasDownstream(index, length) {
-      return index === length - 1 && this.hasTriggered;
-    },
     hasUpstream(index) {
       return index === 0 && this.hasTriggeredBy;
     },
@@ -160,7 +157,6 @@ export default {
             :key="stage.name"
             :class="{
               'has-upstream prepend-left-64': hasUpstream(index),
-              'has-downstream': hasDownstream(index, graph.length),
               'has-only-one-job': hasOnlyOneJob(stage),
               'append-right-46': shouldAddRightMargin(index),
             }"

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

 <script>
 import LinkedPipeline from './linked_pipeline.vue';
+import { __ } from '~/locale';
 
 export default {
   components: {
@@ -27,6 +28,9 @@ export default {
       };
       return `graph-position-${this.graphPosition} ${positionValues[this.graphPosition]}`;
     },
+    isUpstream() {
+      return this.columnTitle === __('Upstream');
+    },
   },
 };
 </script>
@@ -34,13 +38,12 @@ export default {
 <template>
   <div :class="columnClass" class="stage-column linked-pipelines-column">
     <div class="stage-name linked-pipelines-column-title">{{ columnTitle }}</div>
-    <div class="cross-project-triangle"></div>
+    <div v-if="isUpstream" class="cross-project-triangle"></div>
     <ul>
       <linked-pipeline
         v-for="(pipeline, index) in linkedPipelines"
         :key="pipeline.id"
         :class="{
-          'flat-connector-before': index === 0 && graphPosition === 'right',
           active: pipeline.isExpanded,
           'left-connector': pipeline.isExpanded && graphPosition === 'left',
         }"

changelogs/unreleased/remove-downstream-node-lines.yml

+---
+title: Remove downstream pipeline connecting lines
+merge_request: 21196
+author:
+type: removed

spec/javascripts/pipelines/graph/linked_pipelines_column_spec.js

@@ -35,4 +35,8 @@ describe('Linked Pipelines Column', () => {
 
     expect(linkedPipelineElements.length).toBe(props.linkedPipelines.length);
   });
+
+  it('renders cross project triangle when column is upstream', () => {
+    expect(vm.$el.querySelector('.cross-project-triangle')).toBeDefined();
+  });
 });