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 { ...@@ -78,11 +78,7 @@ export default {
return `ci-badge-${escape(group.name)}`; return `ci-badge-${escape(group.name)}`;
}, },
isFadedOut(jobName) { isFadedOut(jobName) {
return ( return this.highlightedJobs.length > 1 && !this.highlightedJobs.includes(jobName);
this.jobHovered &&
this.highlightedJobs.length > 1 &&
!this.highlightedJobs.includes(jobName)
);
}, },
}, },
}; };
...@@ -126,12 +122,9 @@ export default { ...@@ -126,12 +122,9 @@ export default {
:class="{ 'gl-opacity-3': isFadedOut(group.name) }" :class="{ 'gl-opacity-3': isFadedOut(group.name) }"
@pipelineActionRequestComplete="$emit('refreshPipelineGraph')" @pipelineActionRequestComplete="$emit('refreshPipelineGraph')"
/> />
<job-group-dropdown <div v-else :class="{ 'gl-opacity-3': isFadedOut(group.name) }">
v-else <job-group-dropdown :group="group" :pipeline-id="pipelineId" />
:group="group" </div>
:pipeline-id="pipelineId"
:class="{ 'gl-opacity-3': isFadedOut(group.name) }"
/>
</div> </div>
</template> </template>
</main-graph-wrapper> </main-graph-wrapper>
......
...@@ -22,6 +22,13 @@ describe('graph component', () => { ...@@ -22,6 +22,13 @@ describe('graph component', () => {
pipeline: generateResponse(mockPipelineResponse, 'root/fungi-xoxo'), pipeline: generateResponse(mockPipelineResponse, 'root/fungi-xoxo'),
}; };
const defaultData = {
measurements: {
width: 800,
height: 800,
},
};
const createComponent = ({ const createComponent = ({
data = {}, data = {},
mountFn = shallowMount, mountFn = shallowMount,
...@@ -34,7 +41,10 @@ describe('graph component', () => { ...@@ -34,7 +41,10 @@ describe('graph component', () => {
...props, ...props,
}, },
data() { data() {
return { ...data }; return {
...defaultData,
...data,
};
}, },
provide: { provide: {
dataMethod: GRAPHQL, 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