Commit 40b6f344 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'vs-use-shorthand-for-slots' into 'master'

Use shorthand slot notation for component tags

See merge request gitlab-org/gitlab!30952
parents cd9891f9 70d02711
...@@ -209,7 +209,7 @@ export default { ...@@ -209,7 +209,7 @@ export default {
:series-config="metricSeriesConfig" :series-config="metricSeriesConfig"
> >
<slot></slot> <slot></slot>
<template v-slot:tooltipContent="slotProps"> <template #tooltip-content="slotProps">
<div <div
v-for="(content, seriesIndex) in slotProps.tooltip.content" v-for="(content, seriesIndex) in slotProps.tooltip.content"
:key="seriesIndex" :key="seriesIndex"
......
...@@ -162,7 +162,7 @@ export default { ...@@ -162,7 +162,7 @@ export default {
:state="isNameValid(link)" :state="isNameValid(link)"
@change="onLinkTitleInput(link.id, $event)" @change="onLinkTitleInput(link.id, $event)"
/> />
<template v-slot:invalid-feedback> <template #invalid-feedback>
<span v-if="hasEmptyName(link)" class="invalid-feedback d-inline"> <span v-if="hasEmptyName(link)" class="invalid-feedback d-inline">
{{ __('Link title is required') }} {{ __('Link title is required') }}
</span> </span>
......
...@@ -66,7 +66,7 @@ export default { ...@@ -66,7 +66,7 @@ export default {
<template> <template>
<assignee-avatar-link <assignee-avatar-link
v-if="hasOneUser" v-if="hasOneUser"
v-slot="{ user }" #default="{ user }"
tooltip-placement="left" tooltip-placement="left"
:tooltip-has-name="false" :tooltip-has-name="false"
:user="firstUser" :user="firstUser"
......
...@@ -83,7 +83,7 @@ export default { ...@@ -83,7 +83,7 @@ export default {
:source-branch-link="branchLink" :source-branch-link="branchLink"
:troubleshooting-docs-path="mr.troubleshootingDocsPath" :troubleshooting-docs-path="mr.troubleshootingDocsPath"
/> />
<template v-slot:footer> <template #footer>
<div v-if="mr.exposedArtifactsPath" class="js-exposed-artifacts"> <div v-if="mr.exposedArtifactsPath" class="js-exposed-artifacts">
<artifacts-app :endpoint="mr.exposedArtifactsPath" /> <artifacts-app :endpoint="mr.exposedArtifactsPath" />
</div> </div>
......
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
<template> <template>
<apollo-mutation <apollo-mutation
v-slot="{ mutate, loading, error }" #default="{ mutate, loading, error }"
:mutation="$options.destroyDesignMutation" :mutation="$options.destroyDesignMutation"
:variables="{ :variables="{
filenames, filenames,
......
...@@ -113,7 +113,7 @@ export default { ...@@ -113,7 +113,7 @@ export default {
/> />
<apollo-mutation <apollo-mutation
v-else v-else
v-slot="{ mutate, loading }" #default="{ mutate, loading }"
:mutation="$options.createNoteMutation" :mutation="$options.createNoteMutation"
:variables="{ :variables="{
input: mutationPayload, input: mutationPayload,
......
...@@ -277,7 +277,7 @@ export default { ...@@ -277,7 +277,7 @@ export default {
@done="$router.push({ name: $options.DESIGNS_ROUTE_NAME })" @done="$router.push({ name: $options.DESIGNS_ROUTE_NAME })"
@error="onDesignDeleteError" @error="onDesignDeleteError"
> >
<template v-slot="{ mutate, loading }"> <template #default="{ mutate, loading }">
<toolbar <toolbar
:id="id" :id="id"
:is-deleting="loading" :is-deleting="loading"
...@@ -332,7 +332,7 @@ export default { ...@@ -332,7 +332,7 @@ export default {
/> />
<apollo-mutation <apollo-mutation
v-if="annotationCoordinates" v-if="annotationCoordinates"
v-slot="{ mutate, loading }" #default="{ mutate, loading }"
:mutation="$options.createImageDiffNoteMutation" :mutation="$options.createImageDiffNoteMutation"
:variables="{ :variables="{
input: mutationPayload, input: mutationPayload,
......
...@@ -272,7 +272,7 @@ export default { ...@@ -272,7 +272,7 @@ export default {
>{{ selectAllButtonText }}</gl-deprecated-button >{{ selectAllButtonText }}</gl-deprecated-button
> >
<design-destroyer <design-destroyer
v-slot="{ mutate, loading }" #default="{ mutate, loading }"
:filenames="selectedDesigns" :filenames="selectedDesigns"
:project-path="projectPath" :project-path="projectPath"
:iid="issueIid" :iid="issueIid"
......
...@@ -271,7 +271,7 @@ export default { ...@@ -271,7 +271,7 @@ export default {
:title="emptyStateTitle" :title="emptyStateTitle"
:svg-path="errorStateSvgPath" :svg-path="errorStateSvgPath"
> >
<template v-slot:description> <template #description>
{{ {{
s__( s__(
'FeatureFlags|Feature flags allow you to configure your code into different flavors by dynamically toggling certain functionality.', 'FeatureFlags|Feature flags allow you to configure your code into different flavors by dynamically toggling certain functionality.',
......
...@@ -117,8 +117,8 @@ export default { ...@@ -117,8 +117,8 @@ export default {
@ok="deleteItemConfirmation" @ok="deleteItemConfirmation"
@cancel="deleteItemCanceled" @cancel="deleteItemCanceled"
> >
<template v-slot:modal-title>{{ modalAction }}</template> <template #modal-title>{{ modalAction }}</template>
<template v-slot:modal-ok>{{ modalAction }}</template> <template #modal-ok>{{ modalAction }}</template>
<p v-html="deletePackageDescription"></p> <p v-html="deletePackageDescription"></p>
</gl-modal> </gl-modal>
</template> </template>
......
...@@ -103,7 +103,7 @@ export default { ...@@ -103,7 +103,7 @@ export default {
issues-list-container-class="p-0" issues-list-container-class="p-0"
issue-item-class="p-0" issue-item-class="p-0"
> >
<template v-slot:success> <template #success>
{{ __('All merge request dependencies have been merged') }} {{ __('All merge request dependencies have been merged') }}
<span class="text-secondary"> <span class="text-secondary">
{{ {{
...@@ -113,7 +113,7 @@ export default { ...@@ -113,7 +113,7 @@ export default {
}} }}
</span> </span>
</template> </template>
<template v-slot:error> <template #error>
<span v-html="blockedByText"></span> <span v-html="blockedByText"></span>
</template> </template>
</report-section> </report-section>
......
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
> >
<p v-html="bodyText"></p> <p v-html="bodyText"></p>
<p>{{ __('Are you sure you want to merge immediately?') }}</p> <p>{{ __('Are you sure you want to merge immediately?') }}</p>
<template v-slot:modal-footer> <template #modal-footer>
<gl-deprecated-button ref="cancelButton" @click="cancel">{{ <gl-deprecated-button ref="cancelButton" @click="cancel">{{
__('Cancel') __('Cancel')
}}</gl-deprecated-button> }}</gl-deprecated-button>
......
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