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
4474d1a6
Commit
4474d1a6
authored
Jun 10, 2021
by
Andrew Smith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add option to order epics by title on list page
Changelog: added EE: true
parent
24efb0b3
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
32 additions
and
4 deletions
+32
-4
doc/user/group/epics/manage_epics.md
doc/user/group/epics/manage_epics.md
+2
-0
ee/app/assets/javascripts/epics_list/constants.js
ee/app/assets/javascripts/epics_list/constants.js
+8
-0
ee/app/helpers/ee/sorting_helper.rb
ee/app/helpers/ee/sorting_helper.rb
+5
-3
ee/app/helpers/ee/sorting_titles_values_helper.rb
ee/app/helpers/ee/sorting_titles_values_helper.rb
+12
-0
ee/app/views/shared/epic/_sort_dropdown.html.haml
ee/app/views/shared/epic/_sort_dropdown.html.haml
+1
-0
ee/spec/features/groups/group_roadmap_spec.rb
ee/spec/features/groups/group_roadmap_spec.rb
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
doc/user/group/epics/manage_epics.md
View file @
4474d1a6
...
...
@@ -140,6 +140,7 @@ link in the issue sidebar.
> - 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.
> - Searching by the user's reaction emoji [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/325630) in GitLab 13.11.
> - Sorting by epic titles [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/331625) in GitLab 14.1.
You can search for an epic from the list of epics using filtered search bar (similar to
that of issues and merge requests) based on following parameters:
...
...
@@ -162,6 +163,7 @@ You can also sort epics list by:
-
Last updated
-
Start date
-
Due date
-
Title
Each option contains a button that can toggle the order between
**Ascending**
and
**Descending**
.
The sort option and order is saved and used wherever you browse epics, including the
...
...
ee/app/assets/javascripts/epics_list/constants.js
View file @
4474d1a6
...
...
@@ -18,6 +18,14 @@ export const EpicsSortOptions = [
ascending
:
'
end_date_asc
'
,
},
},
{
id
:
AvailableSortOptions
.
length
+
30
,
title
:
__
(
'
Title
'
),
sortDirection
:
{
descending
:
'
title_desc
'
,
ascending
:
'
title_asc
'
,
},
},
];
export
const
FilterStateEmptyMessage
=
{
...
...
ee/app/helpers/ee/sorting_helper.rb
View file @
4474d1a6
...
...
@@ -25,7 +25,9 @@ module EE
sort_value_start_date_later
=>
sort_title_start_date
,
sort_value_start_date_soon
=>
sort_title_start_date
,
sort_value_end_date_later
=>
sort_title_end_date
,
sort_value_end_date
=>
sort_title_end_date
sort_value_end_date
=>
sort_title_end_date
,
sort_value_title
=>
sort_title_title
,
sort_value_title_desc
=>
sort_title_title
}
end
...
...
@@ -37,8 +39,8 @@ module EE
sort_value_oldest_created
=>
sort_value_recently_created
,
sort_value_oldest_updated
=>
sort_value_recently_updated
,
sort_value_start_date_soon
=>
sort_value_start_date_later
,
sort_value_end_date
=>
sort_value_end_date_later
sort_value_end_date
=>
sort_value_end_date_later
,
sort_value_title
=>
sort_value_title_desc
}
end
...
...
ee/app/helpers/ee/sorting_titles_values_helper.rb
View file @
4474d1a6
...
...
@@ -37,6 +37,10 @@ module EE
s_
(
'SortOptions|Type'
)
end
def
sort_title_title
s_
(
'SortOptions|Title'
)
end
def
sort_value_start_date
'start_date_asc'
end
...
...
@@ -45,6 +49,14 @@ module EE
'end_date_asc'
end
def
sort_value_title
'title_asc'
end
def
sort_value_title_desc
'title_desc'
end
def
sort_value_end_date_later
'end_date_desc'
end
...
...
ee/app/views/shared/epic/_sort_dropdown.html.haml
View file @
4474d1a6
...
...
@@ -16,4 +16,5 @@
=
sortable_item
(
sort_title_recently_updated
,
page_filter_path
(
sort:
sort_value_recently_updated
),
sorted_by
)
=
sortable_item
(
sort_title_start_date
,
page_filter_path
(
sort:
sort_value_start_date_soon
),
sorted_by
)
=
sortable_item
(
sort_title_end_date
,
page_filter_path
(
sort:
sort_value_end_date
),
sorted_by
)
=
sortable_item
(
sort_title_title
,
page_filter_path
(
sort:
sort_value_title
),
sorted_by
)
=
sort_order_button
(
@sort
)
ee/spec/features/groups/group_roadmap_spec.rb
View file @
4474d1a6
...
...
@@ -60,7 +60,7 @@ RSpec.describe 'group epic roadmap', :js do
expect
(
page
).
to
have_css
(
'.filter-dropdown-container'
)
find
(
'.epics-sort-btn'
).
click
page
.
within
(
'.dropdown-menu'
)
do
expect
(
page
).
to
have_selector
(
'li a'
,
count:
2
)
expect
(
page
).
to
have_selector
(
'li a'
,
count:
3
)
expect
(
page
).
to
have_content
(
'Start date'
)
expect
(
page
).
to
have_content
(
'Due date'
)
end
...
...
locale/gitlab.pot
View file @
4474d1a6
...
...
@@ -30546,6 +30546,9 @@ msgstr ""
msgid "SortOptions|Start soon"
msgstr ""
msgid "SortOptions|Title"
msgstr ""
msgid "SortOptions|Type"
msgstr ""
...
...
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