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
c914e755
Commit
c914e755
authored
Aug 26, 2020
by
Robert Hunt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace epics add clear button FA icon with GlIcon close
parent
a8ce0ddb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
15 deletions
+12
-15
ee/app/assets/javascripts/vue_shared/components/sidebar/epics_select/dropdown_header.vue
...hared/components/sidebar/epics_select/dropdown_header.vue
+4
-3
ee/app/assets/javascripts/vue_shared/components/sidebar/epics_select/dropdown_search_input.vue
...components/sidebar/epics_select/dropdown_search_input.vue
+5
-4
ee/spec/frontend/vue_shared/components/sidebar/epics_select/dropdown_search_input_spec.js
...onents/sidebar/epics_select/dropdown_search_input_spec.js
+3
-8
No files found.
ee/app/assets/javascripts/vue_shared/components/sidebar/epics_select/dropdown_header.vue
View file @
c914e755
...
@@ -9,12 +9,13 @@ export default {
...
@@ -9,12 +9,13 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<div
class=
"dropdown-title"
>
<div
class=
"dropdown-title
gl-display-flex gl-align-items-center
"
>
<span>
{{
__
(
'
Assign epic
'
)
}}
</span>
<span
class=
"gl-ml-auto"
>
{{
__
(
'
Assign epic
'
)
}}
</span>
<gl-button
<gl-button
:aria-label=
"__('Close')"
:aria-label=
"__('Close')"
category=
"tertiary"
category=
"tertiary"
class=
"dropdown-title-button dropdown-menu-close"
class=
"dropdown-title-button dropdown-menu-close gl-ml-auto"
size=
"small"
icon=
"close"
icon=
"close"
/>
/>
</div>
</div>
...
...
ee/app/assets/javascripts/vue_shared/components/sidebar/epics_select/dropdown_search_input.vue
View file @
c914e755
<
script
>
<
script
>
import
{
debounce
}
from
'
lodash
'
;
import
{
debounce
}
from
'
lodash
'
;
import
{
Gl
Deprecated
Button
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
autofocusonshow
from
'
~/vue_shared/directives/autofocusonshow
'
;
import
autofocusonshow
from
'
~/vue_shared/directives/autofocusonshow
'
;
export
default
{
export
default
{
components
:
{
components
:
{
Gl
Deprecated
Button
,
GlButton
,
GlIcon
,
GlIcon
,
},
},
directives
:
{
directives
:
{
...
@@ -40,9 +40,10 @@ export default {
...
@@ -40,9 +40,10 @@ export default {
@
keyup=
"handleKeyUp"
@
keyup=
"handleKeyUp"
/>
/>
<gl-icon
v-show=
"!query"
name=
"search"
/>
<gl-icon
v-show=
"!query"
name=
"search"
/>
<gl-
deprecated-
button
<gl-button
variant=
"link"
variant=
"link"
class=
"fa fa-times dropdown-input-clear js-dropdown-input-clear"
icon=
"close"
class=
"dropdown-input-clear js-dropdown-input-clear"
data-hidden=
"true"
data-hidden=
"true"
@
click.stop=
"handleInputClear"
@
click.stop=
"handleInputClear"
/>
/>
...
...
ee/spec/frontend/vue_shared/components/sidebar/epics_select/dropdown_search_input_spec.js
View file @
c914e755
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
Gl
Deprecated
Button
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
DropdownSearchInput
from
'
ee/vue_shared/components/sidebar/epics_select/dropdown_search_input.vue
'
;
import
DropdownSearchInput
from
'
ee/vue_shared/components/sidebar/epics_select/dropdown_search_input.vue
'
;
const
createComponent
=
()
=>
const
createComponent
=
()
=>
...
@@ -96,16 +96,11 @@ describe('EpicsSelect', () => {
...
@@ -96,16 +96,11 @@ describe('EpicsSelect', () => {
});
});
it
(
'
should render input clear button
'
,
()
=>
{
it
(
'
should render input clear button
'
,
()
=>
{
const
clearButtonEl
=
wrapper
.
find
(
Gl
Deprecated
Button
);
const
clearButtonEl
=
wrapper
.
find
(
GlButton
);
expect
(
clearButtonEl
.
exists
()).
toBe
(
true
);
expect
(
clearButtonEl
.
exists
()).
toBe
(
true
);
expect
(
clearButtonEl
.
classes
()).
toEqual
(
expect
(
clearButtonEl
.
classes
()).
toEqual
(
expect
.
arrayContaining
([
expect
.
arrayContaining
([
'
dropdown-input-clear
'
,
'
js-dropdown-input-clear
'
]),
'
fa
'
,
'
fa-times
'
,
'
dropdown-input-clear
'
,
'
js-dropdown-input-clear
'
,
]),
);
);
});
});
});
});
...
...
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