Merge branch '276949-pipeline-graph-restructure-9a' into 'master'

Pipeline Graph Structural Update: Links Cleanup MR

See merge request gitlab-org/gitlab!51688

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

@@ -39,6 +39,7 @@ export default {
   data() {
     return {
       hoveredJobName: '',
+      highlightedJobs: [],
       measurements: {
         width: 0,
         height: 0,
@@ -106,63 +107,68 @@ export default {
         jobName: expanded ? jobName : '',
       };
     },
+    updateHighlightedJobs(jobs) {
+      this.highlightedJobs = jobs;
+    },
   },
 };
 </script>
 <template>
   <div class="js-pipeline-graph">
     <div
-      :id="containerId"
-      :ref="containerId"
-      class="gl-pipeline-min-h gl-display-flex gl-position-relative gl-overflow-auto gl-bg-gray-10 gl-white-space-nowrap"
-      :class="{ 'gl-py-5': !isLinkedPipeline }"
+      class="gl-display-flex gl-position-relative gl-overflow-auto gl-bg-gray-10 gl-white-space-nowrap"
+      :class="{ 'gl-pipeline-min-h gl-py-5': !isLinkedPipeline }"
     >
-      <links-layer
-        :pipeline-data="graph"
-        :pipeline-id="pipeline.id"
-        :container-id="containerId"
-        :container-measurements="measurements"
-        :highlighted-job="hoveredJobName"
-        default-link-color="gl-stroke-transparent"
-        @error="onError"
-      >
-        <linked-graph-wrapper>
-          <template #upstream>
-            <linked-pipelines-column
-              v-if="showUpstreamPipelines"
-              :linked-pipelines="upstreamPipelines"
-              :column-title="__('Upstream')"
-              :type="$options.pipelineTypeConstants.UPSTREAM"
-              @error="onError"
-            />
-          </template>
-          <template #main>
-            <stage-column-component
-              v-for="stage in graph"
-              :key="stage.name"
-              :title="stage.name"
-              :groups="stage.groups"
-              :action="stage.status.action"
-              :job-hovered="hoveredJobName"
-              :pipeline-expanded="pipelineExpanded"
+      <linked-graph-wrapper>
+        <template #upstream>
+          <linked-pipelines-column
+            v-if="showUpstreamPipelines"
+            :linked-pipelines="upstreamPipelines"
+            :column-title="__('Upstream')"
+            :type="$options.pipelineTypeConstants.UPSTREAM"
+            @error="onError"
+          />
+        </template>
+        <template #main>
+          <div :id="containerId" :ref="containerId">
+            <links-layer
+              :pipeline-data="graph"
               :pipeline-id="pipeline.id"
-              @refreshPipelineGraph="$emit('refreshPipelineGraph')"
-              @jobHover="setJob"
-            />
-          </template>
-          <template #downstream>
-            <linked-pipelines-column
-              v-if="showDownstreamPipelines"
-              :linked-pipelines="downstreamPipelines"
-              :column-title="__('Downstream')"
-              :type="$options.pipelineTypeConstants.DOWNSTREAM"
-              @downstreamHovered="setJob"
-              @pipelineExpandToggle="togglePipelineExpanded"
+              :container-id="containerId"
+              :container-measurements="measurements"
+              :highlighted-job="hoveredJobName"
+              default-link-color="gl-stroke-transparent"
               @error="onError"
-            />
-          </template>
-        </linked-graph-wrapper>
-      </links-layer>
+              @highlightedJobsChange="updateHighlightedJobs"
+            >
+              <stage-column-component
+                v-for="stage in graph"
+                :key="stage.name"
+                :title="stage.name"
+                :groups="stage.groups"
+                :action="stage.status.action"
+                :highlighted-jobs="highlightedJobs"
+                :job-hovered="hoveredJobName"
+                :pipeline-expanded="pipelineExpanded"
+                :pipeline-id="pipeline.id"
+                @refreshPipelineGraph="$emit('refreshPipelineGraph')"
+                @jobHover="setJob"
+              />
+            </links-layer>
+          </div>
+        </template>
+        <template #downstream>
+          <linked-pipelines-column
+            v-if="showDownstreamPipelines"
+            :linked-pipelines="downstreamPipelines"
+            :column-title="__('Downstream')"
+            :type="$options.pipelineTypeConstants.DOWNSTREAM"
+            @downstreamHovered="setJob"
+            @pipelineExpandToggle="togglePipelineExpanded"
+            @error="onError"
+          />
+        </template>
+      </linked-graph-wrapper>
     </div>
   </div>
 </template>

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

@@ -42,8 +42,8 @@ export default {
   computed: {
     columnClass() {
       const positionValues = {
-        right: 'gl-ml-11',
-        left: 'gl-mr-7',
+        right: 'gl-ml-6',
+        left: 'gl-mr-6',
       };
       return `graph-position-${this.graphPosition} ${positionValues[this.graphPosition]}`;
     },

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

@@ -16,10 +16,6 @@ export default {
     MainGraphWrapper,
   },
   props: {
-    title: {
-      type: String,
-      required: true,
-    },
     groups: {
       type: Array,
       required: true,
@@ -28,11 +24,20 @@ export default {
       type: Number,
       required: true,
     },
+    title: {
+      type: String,
+      required: true,
+    },
     action: {
       type: Object,
       required: false,
       default: () => ({}),
     },
+    highlightedJobs: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
     jobHovered: {
       type: String,
       required: false,
@@ -69,11 +74,18 @@ export default {
     groupId(group) {
       return `ci-badge-${escape(group.name)}`;
     },
+    isFadedOut(jobName) {
+      return (
+        this.jobHovered &&
+        this.highlightedJobs.length > 1 &&
+        !this.highlightedJobs.includes(jobName)
+      );
+    },
   },
 };
 </script>
 <template>
-  <main-graph-wrapper>
+  <main-graph-wrapper class="gl-px-6">
     <template #stages>
       <div
         data-testid="stage-column-title"
@@ -108,9 +120,15 @@ export default {
           :pipeline-expanded="pipelineExpanded"
           :pipeline-id="pipelineId"
           css-class-job-name="gl-build-content"
+          :class="{ 'gl-opacity-3': isFadedOut(group.name) }"
           @pipelineActionRequestComplete="$emit('refreshPipelineGraph')"
         />
-        <job-group-dropdown v-else :group="group" :pipeline-id="pipelineId" />
+        <job-group-dropdown
+          v-else
+          :group="group"
+          :pipeline-id="pipelineId"
+          :class="{ 'gl-opacity-3': isFadedOut(group.name) }"
+        />
       </div>
     </template>
   </main-graph-wrapper>

app/assets/javascripts/pipelines/components/graph_shared/drawing_utils.js

@@ -64,7 +64,10 @@ export const generateLinksData = ({ links }, containerID, modifier = '') => {
 
     // Make cross-stages lines a straight line all the way
     // until we can safely draw the bezier to look nice.
-    const straightLineDestinationX = targetNodeX - 100;
+    // The adjustment number here is a magic number to make things
+    // look nice and should change if the padding changes. This goes well
+    // with gl-px-6. gl-px-8 is more like 100.
+    const straightLineDestinationX = targetNodeX - 60;
     const controlPointX = straightLineDestinationX + (targetNodeX - straightLineDestinationX) / 2;
 
     if (straightLineDestinationX > 0) {

app/assets/javascripts/pipelines/components/graph_shared/links_inner.vue

@@ -83,6 +83,9 @@ export default {
         this.needsObject = generateJobNeedsDict(jobs) ?? {};
       }
     },
+    highlightedJobs(jobs) {
+      this.$emit('highlightedJobsChange', jobs);
+    },
   },
   mounted() {
     if (!isEmpty(this.pipelineData)) {

app/assets/javascripts/pipelines/components/graph_shared/main_graph_wrapper.vue

@@ -16,14 +16,11 @@ export default {
 </script>
 <template>
   <div>
-    <div
-      class="gl-display-flex gl-align-items-center gl-w-full gl-px-8 gl-mb-5"
-      :class="stageClasses"
-    >
+    <div class="gl-display-flex gl-align-items-center gl-w-full gl-mb-5" :class="stageClasses">
       <slot name="stages"> </slot>
     </div>
     <div
-      class="gl-display-flex gl-flex-direction-column gl-align-items-center gl-w-full gl-px-8"
+      class="gl-display-flex gl-flex-direction-column gl-align-items-center gl-w-full"
       :class="jobClasses"
     >
       <slot name="jobs"> </slot>

app/assets/stylesheets/page_bundles/_pipeline_mixins.scss

@@ -148,18 +148,13 @@
 
       &:hover {
         box-shadow: inset 0 0 0 0.0625rem $dropdown-toggle-active-border-color;
-        background-color: $gray-darker;
-
-        svg {
-          fill: $gl-text-color;
-        }
+        background-color: var(--gray-50, $gray-50);
       }
 
       .spinner,
       svg {
         width: $ci-action-dropdown-svg-size;
         height: $ci-action-dropdown-svg-size;
-        fill: $gl-text-color-secondary;
         position: relative;
         top: 1px;
         vertical-align: initial;

spec/frontend/pipelines/graph/graph_component_spec.js

 import { mount, shallowMount } from '@vue/test-utils';
 import PipelineGraph from '~/pipelines/components/graph/graph_component.vue';
 import StageColumnComponent from '~/pipelines/components/graph/stage_column_component.vue';
+import JobItem from '~/pipelines/components/graph/job_item.vue';
 import LinkedPipelinesColumn from '~/pipelines/components/graph/linked_pipelines_column.vue';
 import LinksLayer from '~/pipelines/components/graph_shared/links_layer.vue';
 import { GRAPHQL } from '~/pipelines/components/graph/constants';
@@ -21,17 +22,29 @@ describe('graph component', () => {
     pipeline: generateResponse(mockPipelineResponse, 'root/fungi-xoxo'),
   };
 
-  const createComponent = ({ mountFn = shallowMount, props = {} } = {}) => {
+  const createComponent = ({
+    data = {},
+    mountFn = shallowMount,
+    props = {},
+    stubOverride = {},
+  } = {}) => {
     wrapper = mountFn(PipelineGraph, {
       propsData: {
         ...defaultProps,
         ...props,
       },
+      data() {
+        return { ...data };
+      },
       provide: {
         dataMethod: GRAPHQL,
       },
       stubs: {
         'links-inner': true,
+        'linked-pipeline': true,
+        'job-item': true,
+        'job-group-dropdown': true,
+        ...stubOverride,
       },
     });
   };
@@ -63,6 +76,23 @@ describe('graph component', () => {
         expect(wrapper.emitted().refreshPipelineGraph).toHaveLength(1);
       });
     });
+
+    describe('when links are present', () => {
+      beforeEach(async () => {
+        createComponent({
+          mountFn: mount,
+          stubOverride: { 'job-item': false },
+          data: { hoveredJobName: 'test_a' },
+        });
+        findLinksLayer().vm.$emit('highlightedJobsChange', ['test_c', 'build_c']);
+      });
+
+      it('dims unrelated jobs', () => {
+        const unrelatedJob = wrapper.find(JobItem);
+        expect(findLinksLayer().emitted().highlightedJobsChange).toHaveLength(1);
+        expect(unrelatedJob.classes('gl-opacity-3')).toBe(true);
+      });
+    });
   });
 
   describe('when linked pipelines are not present', () => {