Skip to content
Snippets Groups Projects
Commit 7c540670 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas :palm_tree:
Browse files

Merge branch '222346-fix-delete-button-spinner' into 'master' 

Fix vulnerability comment delete button spinner position

See merge request !40681
parents 4b56bc52 93b7ce26
No related branches found
No related tags found
1 merge request!40681Fix vulnerability comment delete button spinner position
Pipeline #183248425 passed with warnings
Stage: sync
Stage: prepare
Stage: build-images
Stage: fixtures
Stage: test
Stage: post-test
Stage: review-prepare
Stage: review
Stage: qa
Stage: pages
Stage: deploy
Hide whitespace changes
Inline Side-by-side
ee/app/assets/javascripts/vulnerabilities/components/history_comment.vue
+ 2
− 4
View file @ 7c540670
<script>
/* eslint-disable vue/no-v-html */
import { GlDeprecatedButton, GlButton, GlLoadingIcon } from '@gitlab/ui';
import { GlDeprecatedButton, GlButton } from '@gitlab/ui';
import EventItem from 'ee/vue_shared/security_reports/components/event_item.vue';
import { deprecatedCreateFlash as createFlash } from '~/flash';
import { __, s__ } from '~/locale';
......@@ -13,7 +13,6 @@ export default {
GlButton,
EventItem,
HistoryCommentEditor,
GlLoadingIcon,
},
props: {
......@@ -161,10 +160,9 @@ export default {
<gl-button
ref="confirmDeleteButton"
variant="danger"
:disabled="isDeletingComment"
:loading="isDeletingComment"
@click="deleteComment"
>
<gl-loading-icon v-if="isDeletingComment" class="mr-1" />
{{ __('Delete') }}
</gl-button>
<gl-button
......
ee/changelogs/unreleased/222346-fix-delete-button-spinner.yml 0 → 100644
+ 5
− 0
View file @ 7c540670
---
title: Fix vulnerability comment delete button spinner position
merge_request: 40681
author:
type: fixed
ee/spec/frontend/vulnerabilities/history_comment_spec.js
+ 2
− 2
View file @ 7c540670
......@@ -196,8 +196,8 @@ describe('History Comment', () => {
return wrapper.vm.$nextTick();
})
.then(() => {
expect(confirmDeleteButton().attributes('disabled')).toBeTruthy();
expect(cancelDeleteButton().attributes('disabled')).toBeTruthy();
expect(confirmDeleteButton().props('loading')).toBe(true);
expect(cancelDeleteButton().props('disabled')).toBe(true);
return axios.waitForAll();
})
.then(() => {
......
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