Commit a2bcee1d authored by Sarah Groff Hennigh-Palermo's avatar Sarah Groff Hennigh-Palermo

Merge branch 'eslint-plugin-5-gitlab-ui-integration' into 'master'

Upgrade @gitlab/ui to v23.9.0

See merge request gitlab-org/gitlab!47592
parents a21038b7 58e2c28f
...@@ -402,21 +402,21 @@ export default { ...@@ -402,21 +402,21 @@ export default {
@updated="onChartUpdated" @updated="onChartUpdated"
> >
<template v-if="tooltip.type === 'deployments'"> <template v-if="tooltip.type === 'deployments'">
<template slot="tooltipTitle"> <template slot="tooltip-title">
{{ __('Deployed') }} {{ __('Deployed') }}
</template> </template>
<div slot="tooltipContent" class="d-flex align-items-center"> <div slot="tooltip-content" class="d-flex align-items-center">
<gl-icon name="commit" class="mr-2" /> <gl-icon name="commit" class="mr-2" />
<gl-link :href="tooltip.commitUrl">{{ tooltip.sha }}</gl-link> <gl-link :href="tooltip.commitUrl">{{ tooltip.sha }}</gl-link>
</div> </div>
</template> </template>
<template v-else> <template v-else>
<template slot="tooltipTitle"> <template slot="tooltip-title">
<div class="text-nowrap"> <div class="text-nowrap">
{{ tooltip.title }} {{ tooltip.title }}
</div> </div>
</template> </template>
<template slot="tooltipContent" :tooltip="tooltip"> <template slot="tooltip-content" :tooltip="tooltip">
<div <div
v-for="(content, key) in tooltip.content" v-for="(content, key) in tooltip.content"
:key="key" :key="key"
......
...@@ -153,10 +153,10 @@ export default { ...@@ -153,10 +153,10 @@ export default {
:option="chartOptions" :option="chartOptions"
:format-tooltip-text="formatTooltipText" :format-tooltip-text="formatTooltipText"
> >
<template v-if="canShowData" #tooltipTitle> <template v-if="canShowData" #tooltip-title>
{{ tooltipTitle }} {{ tooltipTitle }}
</template> </template>
<template v-if="canShowData" #tooltipContent> <template v-if="canShowData" #tooltip-content>
<gl-sprintf :message="__('Code Coverage: %{coveragePercentage}%{percentSymbol}')"> <gl-sprintf :message="__('Code Coverage: %{coveragePercentage}%{percentSymbol}')">
<template #coveragePercentage> <template #coveragePercentage>
{{ coveragePercentage }} {{ coveragePercentage }}
......
...@@ -138,8 +138,8 @@ export default { ...@@ -138,8 +138,8 @@ export default {
:width="width" :width="width"
:include-legend-avg-max="false" :include-legend-avg-max="false"
> >
<template #tooltipTitle>{{ tooltipPopoverTitle }}</template> <template #tooltip-title>{{ tooltipPopoverTitle }}</template>
<template #tooltipContent>{{ tooltipPopoverContent }}</template> <template #tooltip-content>{{ tooltipPopoverContent }}</template>
</gl-area-chart> </gl-area-chart>
</div> </div>
</template> </template>
...@@ -89,8 +89,8 @@ export default { ...@@ -89,8 +89,8 @@ export default {
:x-axis-title="xAxisTitle" :x-axis-title="xAxisTitle"
:format-tooltip-text="renderTooltip" :format-tooltip-text="renderTooltip"
> >
<div slot="tooltipTitle">{{ tooltipTitle }} ({{ xAxisTitle }})</div> <div slot="tooltip-title">{{ tooltipTitle }} ({{ xAxisTitle }})</div>
<div slot="tooltipContent" class="d-flex"> <div slot="tooltip-content" class="d-flex">
<div class="flex-grow-1">{{ yAxisTitle }}:&nbsp;</div> <div class="flex-grow-1">{{ yAxisTitle }}:&nbsp;</div>
<div class="font-weight-bold">{{ tooltipContent }}</div> <div class="font-weight-bold">{{ tooltipContent }}</div>
</div> </div>
......
...@@ -141,8 +141,8 @@ export default { ...@@ -141,8 +141,8 @@ export default {
:format-tooltip-text="formatTooltipText" :format-tooltip-text="formatTooltipText"
:include-legend-avg-max="false" :include-legend-avg-max="false"
> >
<template slot="tooltipTitle">{{ tooltip.title }}</template> <template slot="tooltip-title">{{ tooltip.title }}</template>
<template slot="tooltipContent">{{ tooltip.content }}</template> <template slot="tooltip-content">{{ tooltip.content }}</template>
</gl-line-chart> </gl-line-chart>
</resizable-chart-container> </resizable-chart-container>
</div> </div>
......
...@@ -121,8 +121,8 @@ export default { ...@@ -121,8 +121,8 @@ export default {
:format-tooltip-text="formatTooltipText" :format-tooltip-text="formatTooltipText"
:include-legend-avg-max="false" :include-legend-avg-max="false"
> >
<template slot="tooltipTitle">{{ tooltip.title }}</template> <template slot="tooltip-title">{{ tooltip.title }}</template>
<template slot="tooltipContent"> <template slot="tooltip-content">
<div>{{ tooltip.total }}</div> <div>{{ tooltip.total }}</div>
<div>{{ tooltip.completed }}</div> <div>{{ tooltip.completed }}</div>
</template> </template>
......
...@@ -105,11 +105,11 @@ export default { ...@@ -105,11 +105,11 @@ export default {
:format-tooltip-text="formatTooltipText" :format-tooltip-text="formatTooltipText"
@created="onChartCreated" @created="onChartCreated"
> >
<template #tooltipTitle> <template #tooltip-title>
<div>{{ tooltipTitle }} ({{ chartOptions.xAxis.name }})</div> <div>{{ tooltipTitle }} ({{ chartOptions.xAxis.name }})</div>
</template> </template>
<template #tooltipContent> <template #tooltip-content>
<div v-for="series in tooltipSeriesData" :key="series.seriesName" class="d-flex"> <div v-for="series in tooltipSeriesData" :key="series.seriesName" class="d-flex">
<div class="flex-grow-1 mr-5">{{ series.seriesName }}</div> <div class="flex-grow-1 mr-5">{{ series.seriesName }}</div>
<div class="font-weight-bold">{{ series.value[1] }}</div> <div class="font-weight-bold">{{ series.value[1] }}</div>
......
...@@ -133,8 +133,8 @@ describe('StatisticsHistory component', () => { ...@@ -133,8 +133,8 @@ describe('StatisticsHistory component', () => {
}, },
template: ` template: `
<div> <div>
<slot name="tooltipTitle"></slot> <slot name="tooltip-title"></slot>
<slot name="tooltipContent"></slot> <slot name="tooltip-content"></slot>
</div>`, </div>`,
}, },
}, },
......
...@@ -226,7 +226,7 @@ describe('Time series component', () => { ...@@ -226,7 +226,7 @@ describe('Time series component', () => {
]); ]);
expect( expect(
shallowWrapperContainsSlotText(wrapper.find(GlLineChart), 'tooltipContent', value), shallowWrapperContainsSlotText(wrapper.find(GlLineChart), 'tooltip-content', value),
).toBe(true); ).toBe(true);
}); });
...@@ -651,7 +651,7 @@ describe('Time series component', () => { ...@@ -651,7 +651,7 @@ describe('Time series component', () => {
return wrapper.vm.$nextTick(() => { return wrapper.vm.$nextTick(() => {
expect( expect(
shallowWrapperContainsSlotText(findChartComponent(), 'tooltipTitle', mockTitle), shallowWrapperContainsSlotText(findChartComponent(), 'tooltip-title', mockTitle),
).toBe(true); ).toBe(true);
}); });
}); });
...@@ -671,7 +671,7 @@ describe('Time series component', () => { ...@@ -671,7 +671,7 @@ describe('Time series component', () => {
it('uses deployment title', () => { it('uses deployment title', () => {
expect( expect(
shallowWrapperContainsSlotText(findChartComponent(), 'tooltipTitle', 'Deployed'), shallowWrapperContainsSlotText(findChartComponent(), 'tooltip-title', 'Deployed'),
).toBe(true); ).toBe(true);
}); });
......
...@@ -866,10 +866,10 @@ ...@@ -866,10 +866,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.175.0.tgz#734f341784af1cd1d62d160a17bcdfb61ff7b04d" resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.175.0.tgz#734f341784af1cd1d62d160a17bcdfb61ff7b04d"
integrity sha512-gXpc87TGSXIzfAr4QER1Qw1v3P47pBO6BXkma52blgwXVmcFNe3nhQzqsqt66wKNzrIrk3lAcB4GUyPHbPVXpg== integrity sha512-gXpc87TGSXIzfAr4QER1Qw1v3P47pBO6BXkma52blgwXVmcFNe3nhQzqsqt66wKNzrIrk3lAcB4GUyPHbPVXpg==
"@gitlab/ui@23.8.0": "@gitlab/ui@23.9.0":
version "23.8.0" version "23.9.0"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-23.8.0.tgz#fe1807877c191e9e38b476d2cdfc4261facbb36b" resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-23.9.0.tgz#e21966130b41e624dbe4505911a79afb731c2d6b"
integrity sha512-5CF2jU/d5EX5a1qLHzJujYOTaCze1ZvE9ovK1TbhJ7Va1O0SKB/N53XT8iPOb4MwOzj/zBWDOdsIs+xXxCeOcg== integrity sha512-IfaiIcRw6iKE9Fxx36LQ1Afa/fcdmvRQCJO9igc+wWD3MFZGU/ggsQw3SExkkYI6XYmDUr56CT/o+HYlCDjgZQ==
dependencies: dependencies:
"@babel/standalone" "^7.0.0" "@babel/standalone" "^7.0.0"
"@gitlab/vue-toasted" "^1.3.0" "@gitlab/vue-toasted" "^1.3.0"
......
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