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
b72362d6
Commit
b72362d6
authored
Jul 27, 2020
by
Jarek Ostrowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update label select vue gl button
MR:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37986
parent
9a1a4e25
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_title.vue
...d/components/sidebar/labels_select_vue/dropdown_title.vue
+4
-4
changelogs/unreleased/219870-label-select-dropdown-title.yml
changelogs/unreleased/219870-label-select-dropdown-title.yml
+5
-0
spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_title_spec.js
...mponents/sidebar/labels_select_vue/dropdown_title_spec.js
+2
-2
No files found.
app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_title.vue
View file @
b72362d6
<
script
>
<
script
>
import
{
mapState
,
mapActions
}
from
'
vuex
'
;
import
{
mapState
,
mapActions
}
from
'
vuex
'
;
import
{
Gl
Deprecated
Button
,
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
export
default
{
export
default
{
components
:
{
components
:
{
Gl
Deprecated
Button
,
GlButton
,
GlLoadingIcon
,
GlLoadingIcon
,
},
},
props
:
{
props
:
{
...
@@ -27,12 +27,12 @@ export default {
...
@@ -27,12 +27,12 @@ export default {
{{
__
(
'
Labels
'
)
}}
{{
__
(
'
Labels
'
)
}}
<template
v-if=
"allowLabelEdit"
>
<template
v-if=
"allowLabelEdit"
>
<gl-loading-icon
v-show=
"labelsSelectInProgress"
inline
/>
<gl-loading-icon
v-show=
"labelsSelectInProgress"
inline
/>
<gl-
deprecated-
button
<gl-button
variant=
"link"
variant=
"link"
class=
"pull-right js-sidebar-dropdown-toggle"
class=
"pull-right js-sidebar-dropdown-toggle"
data-qa-selector=
"labels_edit_button"
data-qa-selector=
"labels_edit_button"
@
click=
"toggleDropdownContents"
@
click=
"toggleDropdownContents"
>
{{
__
(
'
Edit
'
)
}}
</gl-
deprecated-
button
>
{{
__
(
'
Edit
'
)
}}
</gl-button
>
>
</
template
>
</
template
>
</div>
</div>
...
...
changelogs/unreleased/219870-label-select-dropdown-title.yml
0 → 100644
View file @
b72362d6
---
title
:
Update label select vue gl button
merge_request
:
37986
author
:
type
:
changed
spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_title_spec.js
View file @
b72362d6
import
Vuex
from
'
vuex
'
;
import
Vuex
from
'
vuex
'
;
import
{
shallowMount
,
createLocalVue
}
from
'
@vue/test-utils
'
;
import
{
shallowMount
,
createLocalVue
}
from
'
@vue/test-utils
'
;
import
{
Gl
Deprecated
Button
,
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
DropdownTitle
from
'
~/vue_shared/components/sidebar/labels_select_vue/dropdown_title.vue
'
;
import
DropdownTitle
from
'
~/vue_shared/components/sidebar/labels_select_vue/dropdown_title.vue
'
;
import
labelsSelectModule
from
'
~/vue_shared/components/sidebar/labels_select_vue/store
'
;
import
labelsSelectModule
from
'
~/vue_shared/components/sidebar/labels_select_vue/store
'
;
...
@@ -42,7 +42,7 @@ describe('DropdownTitle', () => {
...
@@ -42,7 +42,7 @@ describe('DropdownTitle', () => {
});
});
it
(
'
renders edit link
'
,
()
=>
{
it
(
'
renders edit link
'
,
()
=>
{
const
editBtnEl
=
wrapper
.
find
(
Gl
Deprecated
Button
);
const
editBtnEl
=
wrapper
.
find
(
GlButton
);
expect
(
editBtnEl
.
exists
()).
toBe
(
true
);
expect
(
editBtnEl
.
exists
()).
toBe
(
true
);
expect
(
editBtnEl
.
text
()).
toBe
(
'
Edit
'
);
expect
(
editBtnEl
.
text
()).
toBe
(
'
Edit
'
);
...
...
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