Commit b50ca3ea authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch '276949-click-click-tooltip' into 'master'

Pipeline Graph Structural Update: Menu Bugfix

See merge request gitlab-org/gitlab!53232
parents 4ed1e7b6 1df96350
......@@ -78,11 +78,7 @@ export default {
return `ci-badge-${escape(group.name)}`;
},
isFadedOut(jobName) {
return (
this.jobHovered &&
this.highlightedJobs.length > 1 &&
!this.highlightedJobs.includes(jobName)
);
return this.highlightedJobs.length > 1 && !this.highlightedJobs.includes(jobName);
},
},
};
......@@ -126,12 +122,9 @@ export default {
:class="{ 'gl-opacity-3': isFadedOut(group.name) }"
@pipelineActionRequestComplete="$emit('refreshPipelineGraph')"
/>
<job-group-dropdown
v-else
:group="group"
:pipeline-id="pipelineId"
:class="{ 'gl-opacity-3': isFadedOut(group.name) }"
/>
<div v-else :class="{ 'gl-opacity-3': isFadedOut(group.name) }">
<job-group-dropdown :group="group" :pipeline-id="pipelineId" />
</div>
</div>
</template>
</main-graph-wrapper>
......
......@@ -22,6 +22,13 @@ describe('graph component', () => {
pipeline: generateResponse(mockPipelineResponse, 'root/fungi-xoxo'),
};
const defaultData = {
measurements: {
width: 800,
height: 800,
},
};
const createComponent = ({
data = {},
mountFn = shallowMount,
......@@ -34,7 +41,10 @@ describe('graph component', () => {
...props,
},
data() {
return { ...data };
return {
...defaultData,
...data,
};
},
provide: {
dataMethod: GRAPHQL,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment