Merge branch '196454-make-pa-group-level-default' into 'master'

Move productivity analytics to the group level

See merge request gitlab-org/gitlab!25329

doc/user/analytics/productivity_analytics.md

@@ -25,10 +25,7 @@ Productivity Analytics allows GitLab users to:
 
 ## Accessing metrics and visualizations
 
-To access the **Productivity Analytics** page:
-
-1. Go to **Analytics** from the top navigation bar.
-1. Select **Productivity Analytics** from the menu.
+To access the chart, navigate to a group's sidebar and select **Analytics > Productivity Analytics**.
 
 The following metrics and visualizations are available on a project or group level - currently only covering **merged** merge requests:
 

ee/app/controllers/analytics/analytics_controller.rb

@@ -2,7 +2,7 @@
 
 class Analytics::AnalyticsController < Analytics::ApplicationController
   def index
-    if Feature.disabled?(:group_level_productivity_analytics) && Gitlab::Analytics.productivity_analytics_enabled?
+    if Feature.disabled?(:group_level_productivity_analytics, default_enabled: true) && Gitlab::Analytics.productivity_analytics_enabled?
       redirect_to analytics_productivity_analytics_path
     elsif Gitlab::Analytics.cycle_analytics_enabled?
       redirect_to analytics_cycle_analytics_path

ee/app/helpers/ee/analytics_navbar_helper.rb

@@ -25,8 +25,8 @@ module EE
     private
 
     def productivity_analytics_navbar_link(group, current_user)
-      return unless ::Feature.enabled?(:analytics_pages_under_group_analytics_sidebar, group)
-      return unless ::Feature.enabled?(:group_level_productivity_analytics)
+      return unless ::Feature.enabled?(:analytics_pages_under_group_analytics_sidebar, group, default_enabled: true)
+      return unless ::Feature.enabled?(:group_level_productivity_analytics, default_enabled: true)
       return unless group_sidebar_link?(:productivity_analytics)
 
       navbar_sub_item(

ee/app/views/layouts/nav/sidebar/_analytics.html.haml

@@ -6,7 +6,7 @@
           = sprite_icon('chart', size: 24)
         .sidebar-context-title= _('Analytics')
     %ul.sidebar-top-level-items
-      - if Feature.disabled?(:group_level_productivity_analytics) && Gitlab::Analytics.productivity_analytics_enabled?
+      - if Feature.disabled?(:group_level_productivity_analytics, default_enabled: true) && Gitlab::Analytics.productivity_analytics_enabled?
         = nav_link(controller: :productivity_analytics) do
           = link_to analytics_productivity_analytics_path, class: 'qa-sidebar-productivity-analytics' do
             .nav-icon-container

ee/changelogs/unreleased/196454-make-pa-group-level-default.yml

+---
+title: Move Productivity Analytics page to the group level
+merge_request: 25329
+author:
+type: changed

ee/config/routes/group.rb

@@ -32,7 +32,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
       end
     end
     namespace :analytics do
-      resource :productivity_analytics, only: :show, constraints: -> (req) { Feature.enabled?(:group_level_productivity_analytics) && Gitlab::Analytics.productivity_analytics_enabled? }
+      resource :productivity_analytics, only: :show, constraints: -> (req) { Feature.enabled?(:group_level_productivity_analytics, default_enabled: true) && Gitlab::Analytics.productivity_analytics_enabled? }
     end
 
     resource :ldap, only: [] do