Revert "Merge branch '41416-making-instance-wide-data-tools-more-accessible' into 'master'"

This reverts merge request !20679

4 files changed, 12 insertions, 47 deletions

diff --git a/app/views/layouts/instance_statistics.html.haml b/app/views/layouts/instance_statistics.html.haml
deleted file mode 100644
index ec3e01600e5..00000000000
--- a/app/views/layouts/instance_statistics.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-- page_title "Instance Statistics"
-- header_title "Instance Statistics", instance_statistics_root_path
-- nav "instance_statistics"
-- @left_sidebar = true
-
-= render template: "layouts/application"
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 0bab2cf3d2a..a71a4b13a7e 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -64,15 +64,11 @@
         = link_to '#', class: 'dashboard-shortcuts-web-ide', title: _('Web IDE') do
           = _('Web IDE')
 
-  - if Gitlab::Sherlock.enabled? || can?(current_user, :read_instance_statistics)
+  - if current_user.admin? || Gitlab::Sherlock.enabled?
     %li.line-separator.d-none.d-sm-block
-  - if can?(current_user, :read_instance_statistics)
-    = nav_link(controller: [:conversational_development_index, :cohorts]) do
-      = link_to instance_statistics_root_path, title: 'Instance Statistics', aria: { label: 'Instance statistics' }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
-        = sprite_icon('chart', size: 18)
   - if current_user.admin?
     = nav_link(controller: 'admin/dashboard') do
-      = link_to admin_root_path, class: 'admin-icon qa-admin-area-link', title: _('Admin area'), aria: { label: "Admin area" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
+      = link_to admin_root_path, class: 'admin-icon qa-admin-area-link', title: _('Admin area'), aria: { label: _("Admin area") }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
         = sprite_icon('admin', size: 18)
   - if Gitlab::Sherlock.enabled?
     %li
diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml
index ff25b040913..0047efa363d 100644
--- a/app/views/layouts/nav/sidebar/_admin.html.haml
+++ b/app/views/layouts/nav/sidebar/_admin.html.haml
@@ -7,14 +7,14 @@
         .sidebar-context-title
           = _('Admin Area')
     %ul.sidebar-top-level-items
-      = nav_link(controller: %w(dashboard admin projects users groups jobs runners gitaly_servers), html_options: {class: 'home'}) do
+      = nav_link(controller: %w(dashboard admin projects users groups jobs runners gitaly_servers cohorts conversational_development_index), html_options: {class: 'home'}) do
         = link_to admin_root_path, class: 'shortcuts-tree' do
           .nav-icon-container
             = sprite_icon('overview')
           %span.nav-item-name
             = _('Overview')
         %ul.sidebar-sub-level-items
-          = nav_link(controller: %w(dashboard admin projects users groups jobs runners gitaly_servers), html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: %w(dashboard admin projects users groups jobs runners gitaly_servers cohorts conversational_development_index), html_options: { class: "fly-out-top-item" } ) do
             = link_to admin_root_path do
               %strong.fly-out-top-item-name
                 = _('Overview')
@@ -47,6 +47,14 @@
             = link_to admin_gitaly_servers_path, title: 'Gitaly Servers' do
               %span
                 = _('Gitaly Servers')
+          = nav_link path: 'cohorts#index' do
+            = link_to admin_cohorts_path, title: _('Cohorts') do
+              %span
+                = _('Cohorts')
+          = nav_link(controller: :conversational_development_index) do
+            = link_to admin_conversational_development_index_path, title: _('ConvDev Index') do
+              %span
+                = _('ConvDev Index')
 
       = nav_link(controller: %w(system_info background_jobs logs health_check requests_profiles)) do
         = link_to admin_system_info_path do
diff --git a/app/views/layouts/nav/sidebar/_instance_statistics.html.haml b/app/views/layouts/nav/sidebar/_instance_statistics.html.haml
deleted file mode 100644
index cb64c97f7b4..00000000000
--- a/app/views/layouts/nav/sidebar/_instance_statistics.html.haml
+++ /dev/null
@@ -1,33 +0,0 @@
-.nav-sidebar{ class: ("sidebar-collapsed-desktop" if collapsed_sidebar?) }
-  .nav-sidebar-inner-scroll
-    .context-header
-      = link_to instance_statistics_root_path, title: 'Instance Statistics' do
-        .avatar-container.s40.settings-avatar
-          = sprite_icon('chart', size: 24)
-        .sidebar-context-title Instance Statistics
-    %ul.sidebar-top-level-items
-      = nav_link(controller: :conversational_development_index) do
-        = link_to instance_statistics_conversational_development_index_index_path do
-          .nav-icon-container
-            = sprite_icon('comment')
-          %span.nav-item-name
-            = _('ConvDev Index')
-        %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: :conversational_development_index, html_options: { class: "fly-out-top-item" } ) do
-            = link_to instance_statistics_conversational_development_index_index_path do
-              %strong.fly-out-top-item-name
-                = _('ConvDev Index')
-
-      = nav_link(controller: :cohorts) do
-        = link_to instance_statistics_cohorts_path do
-          .nav-icon-container
-            = sprite_icon('users')
-          %span.nav-item-name
-            = _('Cohorts')
-        %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: :cohorts, html_options: { class: "fly-out-top-item" } ) do
-            = link_to instance_statistics_cohorts_path do
-              %strong.fly-out-top-item-name
-                = _('Cohorts')
-
-    = render 'shared/sidebar_toggle_button'