diff options
Diffstat (limited to 'app/views/layouts/nav/sidebar')
5 files changed, 39 insertions, 19 deletions
diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml index e72535b8824..7fb5fff1e05 100644 --- a/app/views/layouts/nav/sidebar/_admin.html.haml +++ b/app/views/layouts/nav/sidebar/_admin.html.haml @@ -223,7 +223,7 @@ %span.nav-item-name.qa-admin-settings-item = _('Settings') - %ul.sidebar-sub-level-items.qa-admin-sidebar-settings-submenu + %ul.sidebar-sub-level-items{ data: { qa_selector: 'admin_sidebar_settings_submenu_content' } } = nav_link(controller: [:application_settings, :integrations], html_options: { class: "fly-out-top-item" } ) do = link_to general_admin_application_settings_path do %strong.fly-out-top-item-name diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml index 909d72edb31..47dad21edd7 100644 --- a/app/views/layouts/nav/sidebar/_group.html.haml +++ b/app/views/layouts/nav/sidebar/_group.html.haml @@ -1,7 +1,7 @@ - issues_count = group_issues_count(state: 'opened') - merge_requests_count = group_merge_requests_count(state: 'opened') -.nav-sidebar{ class: ("sidebar-collapsed-desktop" if collapsed_sidebar?) } +.nav-sidebar{ class: ("sidebar-collapsed-desktop" if collapsed_sidebar?), **tracking_attrs('groups_side_navigation', 'render', 'groups_side_navigation') } .nav-sidebar-inner-scroll .context-header = link_to group_path(@group), title: @group.name do @@ -85,7 +85,7 @@ %span = _('Milestones') - = render_if_exists 'layouts/nav/sidebar/iterations_link' + = render_if_exists 'layouts/nav/sidebar/group_iterations_link' - if group_sidebar_link?(:merge_requests) = nav_link(path: 'groups#merge_requests') do diff --git a/app/views/layouts/nav/sidebar/_profile.html.haml b/app/views/layouts/nav/sidebar/_profile.html.haml index 95d66786984..dadab554c02 100644 --- a/app/views/layouts/nav/sidebar/_profile.html.haml +++ b/app/views/layouts/nav/sidebar/_profile.html.haml @@ -1,4 +1,4 @@ -.nav-sidebar{ class: ("sidebar-collapsed-desktop" if collapsed_sidebar?) } +.nav-sidebar{ class: ("sidebar-collapsed-desktop" if collapsed_sidebar?), **tracking_attrs('user_side_navigation', 'render', 'user_side_navigation') } .nav-sidebar-inner-scroll .context-header = link_to profile_path, title: _('Profile Settings') do @@ -18,7 +18,7 @@ %strong.fly-out-top-item-name = _('Profile') = nav_link(controller: [:accounts, :two_factor_auths]) do - = link_to profile_account_path do + = link_to profile_account_path, data: { qa_selector: 'profile_account_link' } do .nav-icon-container = sprite_icon('account') %span.nav-item-name diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index d59c75de6d2..054311214ab 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -1,6 +1,5 @@ -.nav-sidebar{ class: ("sidebar-collapsed-desktop" if collapsed_sidebar?) } +.nav-sidebar{ class: ("sidebar-collapsed-desktop" if collapsed_sidebar?), **tracking_attrs('projects_side_navigation', 'render', 'projects_side_navigation') } .nav-sidebar-inner-scroll - - can_edit = can?(current_user, :admin_project, @project) .context-header = link_to project_path(@project), title: @project.name do .avatar-container.rect-avatar.s40.project-avatar @@ -121,6 +120,8 @@ %span = _('Milestones') + = render_if_exists 'layouts/nav/sidebar/project_iterations_link' + - if project_nav_tab?(:external_issue_tracker) - issue_tracker = @project.external_issue_tracker - if issue_tracker.is_a?(JiraService) && project_jira_issues_integration? @@ -221,17 +222,23 @@ %li.divider.fly-out-top-item - if project_nav_tab? :metrics_dashboards - = nav_link(controller: :environments, action: [:metrics, :metrics_redirect]) do - = link_to metrics_project_environments_path(@project), title: _('Metrics'), class: 'shortcuts-metrics', data: { qa_selector: 'operations_metrics_link' } do + = nav_link(controller: :metrics_dashboard, action: [:show]) do + = link_to project_metrics_dashboard_path(@project), title: _('Metrics'), class: 'shortcuts-metrics', data: { qa_selector: 'operations_metrics_link' } do %span = _('Metrics') - if project_nav_tab?(:alert_management) = nav_link(controller: :alert_management) do - = link_to project_alert_management_index_path(@project), title: _('Alerts'), class: 'shortcuts-tracking qa-operations-tracking-link' do + = link_to project_alert_management_index_path(@project), title: _('Alerts') do %span = _('Alerts') + - if project_nav_tab?(:incidents) + = nav_link(controller: :incidents) do + = link_to project_incidents_path(@project), title: _('Incidents'), data: { qa_selector: 'operations_incidents_link' } do + %span + = _('Incidents') + - if project_nav_tab? :environments = render_if_exists "layouts/nav/sidebar/tracing_link" @@ -242,10 +249,16 @@ - if project_nav_tab?(:error_tracking) = nav_link(controller: :error_tracking) do - = link_to project_error_tracking_index_path(@project), title: _('Error Tracking'), class: 'shortcuts-tracking qa-operations-tracking-link' do + = link_to project_error_tracking_index_path(@project), title: _('Error Tracking') do %span = _('Error Tracking') + - if project_nav_tab?(:product_analytics) + = nav_link(controller: :product_analytics) do + = link_to project_product_analytics_path(@project), title: _('Product Analytics') do + %span + = _('Product Analytics') + - if project_nav_tab? :serverless = nav_link(controller: :functions) do = link_to project_serverless_functions_path(@project), title: _('Serverless') do diff --git a/app/views/layouts/nav/sidebar/_project_packages_link.html.haml b/app/views/layouts/nav/sidebar/_project_packages_link.html.haml index 0931ccdf637..e9989abe5a0 100644 --- a/app/views/layouts/nav/sidebar/_project_packages_link.html.haml +++ b/app/views/layouts/nav/sidebar/_project_packages_link.html.haml @@ -1,16 +1,23 @@ -- if project_nav_tab? :container_registry - = nav_link controller: :repositories do - = link_to project_container_registry_index_path(@project) do +- packages_link = project_nav_tab?(:packages) ? project_packages_path(@project) : project_container_registry_index_path(@project) + +- if (project_nav_tab?(:packages) || project_nav_tab?(:container_registry)) + = nav_link controller: [:packages, :repositories] do + = link_to packages_link, data: { qa_selector: 'packages_link' } do .nav-icon-container = sprite_icon('package') %span.nav-item-name = _('Packages & Registries') %ul.sidebar-sub-level-items - = nav_link(controller: :repositories, html_options: { class: "fly-out-top-item" } ) do - = link_to project_container_registry_index_path(@project) do + = nav_link(controller: [:packages, :repositories], html_options: { class: "fly-out-top-item" } ) do + = link_to packages_link do %strong.fly-out-top-item-name = _('Packages & Registries') %li.divider.fly-out-top-item - = nav_link controller: :repositories do - = link_to project_container_registry_index_path(@project), class: 'shortcuts-container-registry', title: _('Container Registry') do - %span= _('Container Registry') + - if project_nav_tab? :packages + = nav_link controller: :packages do + = link_to project_packages_path(@project), title: _('Package Registry') do + %span= _('Package Registry') + - if project_nav_tab? :container_registry + = nav_link controller: :repositories do + = link_to project_container_registry_index_path(@project), class: 'shortcuts-container-registry', title: _('Container Registry') do + %span= _('Container Registry') |