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
a6f5392c
Commit
a6f5392c
authored
Mar 24, 2021
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make epics searchable by my reaction emoji
Review feedback
parent
1e260d86
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
20 deletions
+34
-20
doc/user/group/epics/img/epics_search_v13_11.png
doc/user/group/epics/img/epics_search_v13_11.png
+0
-0
doc/user/group/epics/manage_epics.md
doc/user/group/epics/manage_epics.md
+3
-2
ee/app/views/shared/epic/_search_bar.html.haml
ee/app/views/shared/epic/_search_bar.html.haml
+1
-1
ee/spec/features/epics/filtered_search/visual_tokens_spec.rb
ee/spec/features/epics/filtered_search/visual_tokens_spec.rb
+30
-17
No files found.
doc/user/group/epics/img/epics_search.png
→
doc/user/group/epics/img/epics_search
_v13_11
.png
View file @
a6f5392c
File moved
doc/user/group/epics/manage_epics.md
View file @
a6f5392c
...
@@ -110,16 +110,17 @@ link in the issue sidebar.
...
@@ -110,16 +110,17 @@ link in the issue sidebar.
> - Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.5.
> - Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.5.
> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/37081) to the [Premium](https://about.gitlab.com/pricing/) tier in GitLab 12.8.
> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/37081) to the [Premium](https://about.gitlab.com/pricing/) tier in GitLab 12.8.
> - Searching by the user's reaction emoji [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/325630) in GitLab 13.11.
You can search for an epic from the list of epics using filtered search bar (similar to
You can search for an epic from the list of epics using filtered search bar (similar to
that of
Issues and Merge R
equests) based on following parameters:
that of
issues and merge r
equests) based on following parameters:
-
Title or description
-
Title or description
-
Author name / username
-
Author name / username
-
Labels
-
Labels
-
Reaction emoji
-
Reaction emoji
![
epics search
](
img/epics_search.png
)
![
epics search
](
img/epics_search
_v13_11
.png
)
To search, go to the list of epics and select the field
**Search or filter results**
.
To search, go to the list of epics and select the field
**Search or filter results**
.
It displays a dropdown menu, from which you can add an author. You can also enter plain
It displays a dropdown menu, from which you can add an author. You can also enter plain
...
...
ee/app/views/shared/epic/_search_bar.html.haml
View file @
a6f5392c
...
@@ -93,7 +93,7 @@
...
@@ -93,7 +93,7 @@
%button
.btn.btn-link
{
type:
'button'
}
%button
.btn.btn-link
{
type:
'button'
}
%gl-emoji
%gl-emoji
%span
.js-data-value.gl-ml-3
%span
.js-data-value.gl-ml-3
{{
name
}}
{{
name
}}
%button
.clear-search.hidden
{
type:
'button'
}
%button
.clear-search.hidden
{
type:
'button'
}
=
sprite_icon
(
'close'
,
size:
16
,
css_class:
'clear-search-icon'
)
=
sprite_icon
(
'close'
,
size:
16
,
css_class:
'clear-search-icon'
)
...
...
ee/spec/features/epics/filtered_search/visual_tokens_spec.rb
View file @
a6f5392c
...
@@ -5,10 +5,10 @@ require 'spec_helper'
...
@@ -5,10 +5,10 @@ require 'spec_helper'
RSpec
.
describe
'epics list'
,
:js
do
RSpec
.
describe
'epics list'
,
:js
do
include
FilteredSearchHelpers
include
FilteredSearchHelpers
let
(
:user
)
{
create
(
:user
)
}
let
_it_be
(
:user
)
{
create
(
:user
)
}
let
(
:group
)
{
create
(
:group
,
:public
)
}
let
_it_be
(
:group
)
{
create
(
:group
,
:public
)
}
let
(
:label
)
{
create
(
:group_label
,
group:
group
,
title:
'bug'
)
}
let
_it_be
(
:label
)
{
create
(
:group_label
,
group:
group
,
title:
'bug'
)
}
let
!
(
:epic
)
{
create
(
:epic
,
group:
group
,
start_date:
10
.
days
.
ago
,
due_date:
5
.
days
.
ago
)
}
let
_it_be
(
:epic
)
{
create
(
:epic
,
group:
group
,
start_date:
10
.
days
.
ago
,
due_date:
5
.
days
.
ago
)
}
let
(
:filtered_search
)
{
find
(
'.filtered-search'
)
}
let
(
:filtered_search
)
{
find
(
'.filtered-search'
)
}
let
(
:filter_author_dropdown
)
{
find
(
"#js-dropdown-author .filter-dropdown"
)
}
let
(
:filter_author_dropdown
)
{
find
(
"#js-dropdown-author .filter-dropdown"
)
}
...
@@ -16,7 +16,7 @@ RSpec.describe 'epics list', :js do
...
@@ -16,7 +16,7 @@ RSpec.describe 'epics list', :js do
let
(
:js_dropdown_my_reaction
)
{
'#js-dropdown-my-reaction'
}
let
(
:js_dropdown_my_reaction
)
{
'#js-dropdown-my-reaction'
}
let
(
:filter_emoji_dropdown
)
{
find
(
"#js-dropdown-my-reaction .filter-dropdown"
)
}
let
(
:filter_emoji_dropdown
)
{
find
(
"#js-dropdown-my-reaction .filter-dropdown"
)
}
let
!
(
:award_emoji_star
)
{
create
(
:award_emoji
,
name:
'star'
,
user:
user
,
awardable:
epic
)
}
let
_it_be
(
:award_emoji_star
)
{
create
(
:award_emoji
,
name:
'star'
,
user:
user
,
awardable:
epic
)
}
before
do
before
do
stub_licensed_features
(
epics:
true
)
stub_licensed_features
(
epics:
true
)
...
@@ -89,29 +89,42 @@ RSpec.describe 'epics list', :js do
...
@@ -89,29 +89,42 @@ RSpec.describe 'epics list', :js do
end
end
context
'editing reaction emoji token'
do
context
'editing reaction emoji token'
do
before
do
before_all
do
group
.
add_maintainer
(
user
)
create_list
(
:award_emoji
,
2
,
user:
user
,
name:
'thumbsup'
)
create_list
(
:award_emoji
,
2
,
user:
user
,
name:
'thumbsup'
)
create_list
(
:award_emoji
,
1
,
user:
user
,
name:
'thumbsdown'
)
create_list
(
:award_emoji
,
1
,
user:
user
,
name:
'thumbsdown'
)
create_list
(
:award_emoji
,
3
,
user:
user
,
name:
'star'
)
create_list
(
:award_emoji
,
3
,
user:
user
,
name:
'star'
)
end
end
it
'opens when the search bar has my-reaction='
do
context
'when user is not logged in'
do
filtered_search
.
set
(
'my-reaction:='
)
it
'does not open when the search bar has my-reaction='
do
filtered_search
.
set
(
'my-reaction='
)
expect
(
page
).
to
have_css
(
js_dropdown_my_reaction
,
visible:
true
)
expect
(
page
).
not_to
have_css
(
js_dropdown_my_reaction
)
end
end
end
it
'loads all the emojis when opened'
do
context
'when user is logged in'
do
input_filtered_search
(
'my-reaction:='
,
submit:
false
,
extra_space:
false
)
before_all
do
group
.
add_maintainer
(
user
)
end
expect_filtered_search_dropdown_results
(
filter_emoji_dropdown
,
3
)
it
'opens when the search bar has my-reaction='
do
end
filtered_search
.
set
(
'my-reaction:='
)
expect
(
page
).
to
have_css
(
js_dropdown_my_reaction
,
visible:
true
)
end
it
'loads all the emojis when opened'
do
input_filtered_search
(
'my-reaction:='
,
submit:
false
,
extra_space:
false
)
it
'shows the most populated emoji at top of dropdown'
do
expect_filtered_search_dropdown_results
(
filter_emoji_dropdown
,
3
)
input_filtered_search
(
'my-reaction:='
,
submit:
false
,
extra_space:
false
)
end
expect
(
first
(
"
#{
js_dropdown_my_reaction
}
.filter-dropdown li"
)).
to
have_content
(
award_emoji_star
.
name
)
it
'shows the most populated emoji at top of dropdown'
do
input_filtered_search
(
'my-reaction:='
,
submit:
false
,
extra_space:
false
)
expect
(
first
(
"
#{
js_dropdown_my_reaction
}
.filter-dropdown li"
)).
to
have_content
(
award_emoji_star
.
name
)
end
end
end
end
end
end
end
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