Commit 14612d2e authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'eread/migrate-badge-list-row-buttons-to-new-buttons' into 'master'

Migrate badge list row buttons to new buttons

Closes #229311

See merge request gitlab-org/gitlab!43072
parents 6c5c5331 27e26d94
<script> <script>
import { mapActions, mapState } from 'vuex'; import { mapActions, mapState } from 'vuex';
import { GlLoadingIcon, GlIcon } from '@gitlab/ui'; import { GlLoadingIcon, GlButton } from '@gitlab/ui';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import { PROJECT_BADGE } from '../constants'; import { PROJECT_BADGE } from '../constants';
import Badge from './badge.vue'; import Badge from './badge.vue';
...@@ -9,8 +9,8 @@ export default { ...@@ -9,8 +9,8 @@ export default {
name: 'BadgeListRow', name: 'BadgeListRow',
components: { components: {
Badge, Badge,
GlIcon,
GlLoadingIcon, GlLoadingIcon,
GlButton,
}, },
props: { props: {
badge: { badge: {
...@@ -51,24 +51,25 @@ export default { ...@@ -51,24 +51,25 @@ export default {
<span class="table-section section-30 str-truncated">{{ badge.linkUrl }}</span> <span class="table-section section-30 str-truncated">{{ badge.linkUrl }}</span>
<div class="table-section section-10 table-button-footer"> <div class="table-section section-10 table-button-footer">
<div v-if="canEditBadge" class="table-action-buttons"> <div v-if="canEditBadge" class="table-action-buttons">
<button <gl-button
:disabled="badge.isDeleting" :disabled="badge.isDeleting"
class="btn btn-default gl-mr-3" class="gl-mr-3"
type="button" variant="default"
icon="pencil"
size="medium"
:aria-label="__('Edit')"
@click="editBadge(badge)" @click="editBadge(badge)"
> />
<gl-icon :size="16" :aria-label="__('Edit')" name="pencil" /> <gl-button
</button>
<button
:disabled="badge.isDeleting" :disabled="badge.isDeleting"
class="btn btn-danger" variant="danger"
type="button"
data-toggle="modal" data-toggle="modal"
data-target="#delete-badge-modal" data-target="#delete-badge-modal"
icon="remove"
size="medium"
:aria-label="__('Delete')"
@click="updateBadgeInModal(badge)" @click="updateBadgeInModal(badge)"
> />
<gl-icon :size="16" :aria-label="__('Delete')" name="remove" />
</button>
<gl-loading-icon v-show="badge.isDeleting" :inline="true" /> <gl-loading-icon v-show="badge.isDeleting" :inline="true" />
</div> </div>
</div> </div>
......
---
title: Migrate badge list row buttons to new buttons
merge_request: 43072
author:
type: other
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