Commit a128ce5f authored by Tim Zallmann's avatar Tim Zallmann

Merge branch '219776-suggestion-diff-header' into 'master'

Convert deprecated buttons in suggestion_diff_header.vue

Closes #219776

See merge request gitlab-org/gitlab!38832
parents 1d87f668 a6d2beaa
<script> <script>
import { GlDeprecatedButton, GlLoadingIcon, GlTooltipDirective, GlIcon } from '@gitlab/ui'; import { GlButton, GlLoadingIcon, GlTooltipDirective, GlIcon } from '@gitlab/ui';
import { __ } from '~/locale'; import { __ } from '~/locale';
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
export default { export default {
components: { GlIcon, GlDeprecatedButton, GlLoadingIcon }, components: { GlIcon, GlButton, GlLoadingIcon },
directives: { 'gl-tooltip': GlTooltipDirective }, directives: { 'gl-tooltip': GlTooltipDirective },
mixins: [glFeatureFlagsMixin()], mixins: [glFeatureFlagsMixin()],
props: { props: {
...@@ -105,14 +105,14 @@ export default { ...@@ -105,14 +105,14 @@ export default {
<span>{{ applyingSuggestionsMessage }}</span> <span>{{ applyingSuggestionsMessage }}</span>
</div> </div>
<div v-else-if="canApply && canBeBatched && isBatched" class="d-flex align-items-center"> <div v-else-if="canApply && canBeBatched && isBatched" class="d-flex align-items-center">
<gl-deprecated-button <gl-button
class="btn-inverted js-remove-from-batch-btn btn-grouped" class="btn-inverted js-remove-from-batch-btn btn-grouped"
:disabled="isApplying" :disabled="isApplying"
@click="removeSuggestionFromBatch" @click="removeSuggestionFromBatch"
> >
{{ __('Remove from batch') }} {{ __('Remove from batch') }}
</gl-deprecated-button> </gl-button>
<gl-deprecated-button <gl-button
v-gl-tooltip.viewport="__('This also resolves all related threads')" v-gl-tooltip.viewport="__('This also resolves all related threads')"
class="btn-inverted js-apply-batch-btn btn-grouped" class="btn-inverted js-apply-batch-btn btn-grouped"
:disabled="isApplying" :disabled="isApplying"
...@@ -123,26 +123,26 @@ export default { ...@@ -123,26 +123,26 @@ export default {
<span class="badge badge-pill badge-pill-success"> <span class="badge badge-pill badge-pill-success">
{{ batchSuggestionsCount }} {{ batchSuggestionsCount }}
</span> </span>
</gl-deprecated-button> </gl-button>
</div> </div>
<div v-else class="d-flex align-items-center"> <div v-else class="d-flex align-items-center">
<gl-deprecated-button <gl-button
v-if="canBeBatched && !isDisableButton" v-if="canBeBatched && !isDisableButton"
class="btn-inverted js-add-to-batch-btn btn-grouped" class="btn-inverted js-add-to-batch-btn btn-grouped"
:disabled="isDisableButton" :disabled="isDisableButton"
@click="addSuggestionToBatch" @click="addSuggestionToBatch"
> >
{{ __('Add suggestion to batch') }} {{ __('Add suggestion to batch') }}
</gl-deprecated-button> </gl-button>
<span v-gl-tooltip.viewport="tooltipMessage" tabindex="0"> <span v-gl-tooltip.viewport="tooltipMessage" tabindex="0">
<gl-deprecated-button <gl-button
class="btn-inverted js-apply-btn btn-grouped" class="btn-inverted js-apply-btn btn-grouped"
:disabled="isDisableButton" :disabled="isDisableButton"
variant="success" variant="success"
@click="applySuggestion" @click="applySuggestion"
> >
{{ __('Apply suggestion') }} {{ __('Apply suggestion') }}
</gl-deprecated-button> </gl-button>
</span> </span>
</div> </div>
</div> </div>
......
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