Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7ae9d9c2
Commit
7ae9d9c2
authored
Aug 20, 2020
by
Matej Latin
Committed by
Olena Horal-Koretska
Aug 20, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace deprecated button on related items
parent
0cb7e8cb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
ee/app/assets/javascripts/related_items_tree/components/tree_item_body.vue
...ascripts/related_items_tree/components/tree_item_body.vue
+8
-7
ee/spec/frontend/related_items_tree/components/tree_item_body_spec.js
...tend/related_items_tree/components/tree_item_body_spec.js
+2
-2
No files found.
ee/app/assets/javascripts/related_items_tree/components/tree_item_body.vue
View file @
7ae9d9c2
...
...
@@ -5,7 +5,7 @@ import {
GlModalDirective
,
GlLink
,
GlIcon
,
Gl
Deprecated
Button
,
GlButton
,
GlTooltip
,
}
from
'
@gitlab/ui
'
;
import
{
isEmpty
}
from
'
lodash
'
;
...
...
@@ -30,7 +30,7 @@ export default {
GlIcon
,
GlLink
,
GlTooltip
,
Gl
Deprecated
Button
,
GlButton
,
StateTooltip
,
ItemMilestone
,
ItemAssignees
,
...
...
@@ -284,17 +284,18 @@ export default {
<
/div
>
<
/div
>
<
gl
-
deprecated
-
button
<
gl
-
button
v
-
if
=
"
parentItem.userPermissions.adminEpic
"
v
-
gl
-
tooltip
.
hover
v
-
gl
-
modal
-
directive
=
"
$options.itemRemoveModalId
"
category
=
"
tertiary
"
:
title
=
"
__('Remove')
"
:
aria
-
label
=
"
__('Remove')
"
:
disabled
=
"
itemActionInProgress
"
class
=
"
btn-svg btn-item-remove js-issue-item-remove-button qa-remove-issue-button gl-align-self-start
"
icon
=
"
close
"
class
=
"
js-issue-item-remove-button qa-remove-issue-button gl-align-self-start
"
@
click
=
"
handleRemoveClick
"
>
<
gl
-
icon
name
=
"
close
"
class
=
"
btn-item-remove-icon
"
/>
<
/gl-deprecated-button
>
/>
<
span
v
-
if
=
"
showEmptySpacer
"
class
=
"
gl-p-3
"
><
/span
>
<
/div
>
<
/div
>
...
...
ee/spec/frontend/related_items_tree/components/tree_item_body_spec.js
View file @
7ae9d9c2
import
{
shallowMount
,
createLocalVue
}
from
'
@vue/test-utils
'
;
import
Vuex
from
'
vuex
'
;
import
{
Gl
Deprecated
Button
,
GlLink
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlLink
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
ItemWeight
from
'
ee/boards/components/issue_card_weight.vue
'
;
...
...
@@ -358,7 +358,7 @@ describe('RelatedItemsTree', () => {
});
it
(
'
renders item remove button when `item.userPermissions.adminEpic` is true
'
,
()
=>
{
const
removeButton
=
wrapper
.
find
(
Gl
Deprecated
Button
);
const
removeButton
=
wrapper
.
find
(
GlButton
);
expect
(
removeButton
.
isVisible
()).
toBe
(
true
);
expect
(
removeButton
.
attributes
(
'
title
'
)).
toBe
(
'
Remove
'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment