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
8fa909a2
Commit
8fa909a2
authored
Mar 15, 2020
by
Gilang Gumilar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add sorting strategy
parent
6d39b715
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
16 deletions
+20
-16
app/views/layouts/nav/sidebar/_analytics_links.html.haml
app/views/layouts/nav/sidebar/_analytics_links.html.haml
+1
-0
app/views/layouts/nav/sidebar/_group.html.haml
app/views/layouts/nav/sidebar/_group.html.haml
+1
-1
ee/app/helpers/ee/analytics_navbar_helper.rb
ee/app/helpers/ee/analytics_navbar_helper.rb
+18
-15
No files found.
app/views/layouts/nav/sidebar/_analytics_links.html.haml
View file @
8fa909a2
-
navbar_links
=
links
.
sort_by
{
|
link
|
[
link
.
link_to_options
.
fetch
(
:data
,
{}).
fetch
(
:index
,
0
),
link
.
title
]
}
-
all_paths
=
navbar_links
.
map
(
&
:path
)
-
if
navbar_links
.
any?
...
...
app/views/layouts/nav/sidebar/_group.html.haml
View file @
8fa909a2
...
...
@@ -117,7 +117,7 @@
=
render_if_exists
'groups/sidebar/packages'
=
render
'layouts/nav/sidebar/analytics_links'
,
navbar_
links:
group_analytics_navbar_links
(
@group
,
current_user
)
=
render
'layouts/nav/sidebar/analytics_links'
,
links:
group_analytics_navbar_links
(
@group
,
current_user
)
-
if
group_sidebar_link?
(
:group_members
)
=
nav_link
(
path:
'group_members#index'
)
do
...
...
ee/app/helpers/ee/analytics_navbar_helper.rb
View file @
8fa909a2
...
...
@@ -16,11 +16,11 @@ module EE
override
:group_analytics_navbar_links
def
group_analytics_navbar_links
(
group
,
current_user
)
super
+
[
group_cycle_analytics_navbar_link
(
group
,
current_user
),
issues_analytics_navbar_link
(
group
,
current_user
),
contribution_analytics_navbar_link
(
group
,
current_user
),
group_insights_navbar_link
(
group
,
current_user
),
productivity_analytics_navbar_link
(
group
,
current_user
),
group_cycle_analytics_navbar_link
(
group
,
current_user
,
0
),
issues_analytics_navbar_link
(
group
,
current_user
,
1
),
contribution_analytics_navbar_link
(
group
,
current_user
,
2
),
group_insights_navbar_link
(
group
,
current_user
,
3
),
productivity_analytics_navbar_link
(
group
,
current_user
,
4
),
].
compact
end
...
...
@@ -37,55 +37,58 @@ module EE
)
end
def
group_cycle_analytics_navbar_link
(
group
,
current_user
)
def
group_cycle_analytics_navbar_link
(
group
,
current_user
,
index
=
0
)
return
unless
group_sidebar_link?
(
:cycle_analytics
)
navbar_sub_item
(
title:
_
(
'Value Stream'
),
path:
'groups/analytics/cycle_analytics#show'
,
link:
group_analytics_cycle_analytics_path
(
group
)
link:
group_analytics_cycle_analytics_path
(
group
),
link_to_options:
{
data:
{
index:
index
}
}
)
end
def
productivity_analytics_navbar_link
(
group
,
current_user
)
def
productivity_analytics_navbar_link
(
group
,
current_user
,
index
=
0
)
return
unless
group_sidebar_link?
(
:productivity_analytics
)
navbar_sub_item
(
title:
_
(
'Productivity'
),
path:
'groups/analytics/productivity_analytics#show'
,
link:
group_analytics_productivity_analytics_path
(
group
)
link:
group_analytics_productivity_analytics_path
(
group
),
link_to_options:
{
data:
{
index:
index
}
}
)
end
def
contribution_analytics_navbar_link
(
group
,
current_user
)
def
contribution_analytics_navbar_link
(
group
,
current_user
,
index
=
0
)
return
unless
group_sidebar_link?
(
:contribution_analytics
)
navbar_sub_item
(
title:
_
(
'Contribution'
),
path:
'groups/contribution_analytics#show'
,
link:
group_contribution_analytics_path
(
group
),
link_to_options:
{
data:
{
placement:
'right'
,
qa_selector:
'contribution_analytics_link'
}
}
link_to_options:
{
data:
{
placement:
'right'
,
qa_selector:
'contribution_analytics_link'
,
index:
index
}
}
)
end
def
group_insights_navbar_link
(
group
,
current_user
)
def
group_insights_navbar_link
(
group
,
current_user
,
index
=
0
)
return
unless
group_sidebar_link?
(
:group_insights
)
navbar_sub_item
(
title:
_
(
'Insights'
),
path:
'groups/insights#show'
,
link:
group_insights_path
(
group
),
link_to_options:
{
class:
'shortcuts-group-insights'
,
data:
{
qa_selector:
'group_insights_link'
}
}
link_to_options:
{
class:
'shortcuts-group-insights'
,
data:
{
qa_selector:
'group_insights_link'
,
index:
index
}
}
)
end
def
issues_analytics_navbar_link
(
group
,
current_user
)
def
issues_analytics_navbar_link
(
group
,
current_user
,
index
=
0
)
return
unless
group_sidebar_link?
(
:analytics
)
navbar_sub_item
(
title:
_
(
'Issues'
),
path:
'issues_analytics#show'
,
link:
group_issues_analytics_path
(
group
)
link:
group_issues_analytics_path
(
group
),
link_to_options:
{
data:
{
index:
index
}
}
)
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