Commit f14dc430 authored by Phil Hughes's avatar Phil Hughes

Merge branch '273739-pipeline-tooltips-cover-the-entire-element' into 'master'

Resolve "pipeline tooltips cover the entire element"

See merge request gitlab-org/gitlab!46866
parents ac33abb0 05c94af5
...@@ -132,24 +132,26 @@ export default { ...@@ -132,24 +132,26 @@ export default {
<div class="ci-job-component" data-qa-selector="job_item_container"> <div class="ci-job-component" data-qa-selector="job_item_container">
<gl-link <gl-link
v-if="status.has_details" v-if="status.has_details"
v-gl-tooltip="{ boundary, placement: 'bottom' }" v-gl-tooltip="{ boundary, placement: 'bottom', customClass: 'gl-pointer-events-none' }"
:href="status.details_path" :href="status.details_path"
:title="tooltipText" :title="tooltipText"
:class="jobClasses" :class="jobClasses"
class="js-pipeline-graph-job-link qa-job-link menu-item" class="js-pipeline-graph-job-link qa-job-link menu-item"
data-testid="job-with-link" data-testid="job-with-link"
@click.stop="hideTooltips" @click.stop="hideTooltips"
@mouseout="hideTooltips"
> >
<job-name-component :name="job.name" :status="job.status" /> <job-name-component :name="job.name" :status="job.status" />
</gl-link> </gl-link>
<div <div
v-else v-else
v-gl-tooltip="{ boundary, placement: 'bottom' }" v-gl-tooltip="{ boundary, placement: 'bottom', customClass: 'gl-pointer-events-none' }"
:title="tooltipText" :title="tooltipText"
:class="jobClasses" :class="jobClasses"
class="js-job-component-tooltip non-details-job-component" class="js-job-component-tooltip non-details-job-component"
data-testid="job-without-link" data-testid="job-without-link"
@mouseout="hideTooltips"
> >
<job-name-component :name="job.name" :status="job.status" /> <job-name-component :name="job.name" :status="job.status" />
</div> </div>
......
...@@ -337,7 +337,7 @@ export default { ...@@ -337,7 +337,7 @@ export default {
:message="emptyTabMessage" :message="emptyTabMessage"
/> />
<div v-else-if="stateToRender === $options.stateMap.tableList" class="table-holder"> <div v-else-if="stateToRender === $options.stateMap.tableList">
<pipelines-table-component <pipelines-table-component
:pipelines="state.pipelines" :pipelines="state.pipelines"
:pipeline-schedule-url="pipelineScheduleUrl" :pipeline-schedule-url="pipelineScheduleUrl"
......
---
title: Better-behaved tooltips in pipeline dropdown
merge_request: 46866
author:
type: fixed
...@@ -372,7 +372,6 @@ describe('Pipelines', () => { ...@@ -372,7 +372,6 @@ describe('Pipelines', () => {
}); });
it('should render table', () => { it('should render table', () => {
expect(wrapper.find('.table-holder').exists()).toBe(true);
expect(wrapper.findAll('.gl-responsive-table-row')).toHaveLength( expect(wrapper.findAll('.gl-responsive-table-row')).toHaveLength(
pipelines.pipelines.length + 1, pipelines.pipelines.length + 1,
); );
......
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