Merge branch 'duplicated-admin-sidebar' into 'master'

Remove duplicated items from admin sidebar

Closes #3260

See merge request !2769

app/views/layouts/nav/_new_admin_sidebar.html.haml

@@ -83,6 +83,7 @@
             = custom_icon('messages')
           %span.nav-item-name
             Messages
+
       = nav_link(controller: [:hooks, :hook_logs]) do
         = link_to admin_hooks_path, title: 'Hooks' do
           .nav-icon-container
@@ -116,168 +117,58 @@
         = nav_link(controller: :spam_logs) do
           = link_to admin_spam_logs_path, title: "Spam Logs" do
             .nav-icon-container
-              = custom_icon('overview')
+              = custom_icon('spam_logs')
             %span.nav-item-name
-              Overview
-
-          %ul.sidebar-sub-level-items
-            = nav_link(controller: :dashboard, html_options: {class: 'home'}) do
-              = link_to admin_root_path, title: 'Overview' do
-                %span
-                  Dashboard
-            = nav_link(controller: [:admin, :projects]) do
-              = link_to admin_projects_path, title: 'Projects' do
-                %span
-                  Projects
-            = nav_link(controller: :users) do
-              = link_to admin_users_path, title: 'Users' do
-                %span
-                  Users
-            = nav_link(controller: :groups) do
-              = link_to admin_groups_path, title: 'Groups' do
-                %span
-                  Groups
-            = nav_link path: 'jobs#index' do
-              = link_to admin_jobs_path, title: 'Jobs' do
-                %span
-                  Jobs
-            = nav_link path: ['runners#index', 'runners#show'] do
-              = link_to admin_runners_path, title: 'Runners' do
-                %span
-                  Runners
-            = nav_link path: 'cohorts#index' do
-              = link_to admin_cohorts_path, title: 'Cohorts' do
-                %span
-                  Cohorts
+              Spam Logs
 
-        = nav_link(controller: %w(conversational_development_index system_info background_jobs logs health_check requests_profiles audit_logs)) do
-          = link_to admin_conversational_development_index_path, title: 'Monitoring' do
-            .nav-icon-container
-              = custom_icon('monitoring')
-            %span.nav-item-name
-              Monitoring
-
-          %ul.sidebar-sub-level-items
-            = nav_link(controller: :conversational_development_index) do
-              = link_to admin_conversational_development_index_path, title: 'ConvDev Index' do
-                %span
-                  ConvDev Index
-            = nav_link(controller: :system_info) do
-              = link_to admin_system_info_path, title: 'System Info' do
-                %span
-                  System Info
-            = nav_link(controller: :background_jobs) do
-              = link_to admin_background_jobs_path, title: 'Background Jobs' do
-                %span
-                  Background Jobs
-            = nav_link(controller: :logs) do
-              = link_to admin_logs_path, title: 'Logs' do
-                %span
-                  Logs
-            = nav_link(controller: :health_check) do
-              = link_to admin_health_check_path, title: 'Health Check' do
-                %span
-                  Health Check
-            = nav_link(controller: :requests_profiles) do
-              = link_to admin_requests_profiles_path, title: 'Requests Profiles' do
-                %span
-                  Requests Profiles
-            = nav_link(path: 'audit_logs#index') do
-              = link_to admin_audit_logs_path, title: 'Audit Log' do
-                %span
-                  Audit Log
-
-        = nav_link(controller: :broadcast_messages) do
-          = link_to admin_broadcast_messages_path, title: 'Messages' do
-            .nav-icon-container
-              = custom_icon('messages')
-            %span.nav-item-name
-              Messages
-        = nav_link(controller: [:hooks, :hook_logs]) do
-          = link_to admin_hooks_path, title: 'Hooks' do
-            .nav-icon-container
-              = custom_icon('system_hooks')
-            %span.nav-item-name
-              System Hooks
-
-        = nav_link(controller: :applications) do
-          = link_to admin_applications_path, title: 'Applications' do
-            .nav-icon-container
-              = custom_icon('applications')
-            %span.nav-item-name
-              Applications
-
-        = nav_link(controller: :abuse_reports) do
-          = link_to admin_abuse_reports_path, title: "Abuse Reports" do
-            .nav-icon-container
-              = custom_icon('abuse_reports')
-            %span.nav-item-name
-              Abuse Reports
-            %span.badge.count= number_with_delimiter(AbuseReport.count(:all))
-
-        = nav_link(controller: :licenses) do
-          = link_to admin_license_path, title: 'License' do
-            .nav-icon-container
-              = custom_icon('license')
-            %span.nav-item-name
-              License
-
-        - if akismet_enabled?
-          = nav_link(controller: :spam_logs) do
-            = link_to admin_spam_logs_path, title: "Spam Logs" do
-              .nav-icon-container
-                = custom_icon('spam_logs')
-              %span.nav-item-name
-                Spam Logs
-
-        = nav_link(controller: :push_rules) do
-          = link_to admin_push_rule_path, title: 'Push Rules' do
-            .nav-icon-container
-              = custom_icon('push_rules')
-            %span.nav-item-name
-              Push Rules
+      = nav_link(controller: :push_rules) do
+        = link_to admin_push_rule_path, title: 'Push Rules' do
+          .nav-icon-container
+            = custom_icon('push_rules')
+          %span.nav-item-name
+            Push Rules
 
-        = nav_link(controller: :geo_nodes) do
-          = link_to admin_geo_nodes_path, title: 'Geo Nodes' do
-            .nav-icon-container
-              = custom_icon('geo_nodes')
-            %span.nav-item-name
-              Geo Nodes
+      = nav_link(controller: :geo_nodes) do
+        = link_to admin_geo_nodes_path, title: 'Geo Nodes' do
+          .nav-icon-container
+            = custom_icon('geo_nodes')
+          %span.nav-item-name
+            Geo Nodes
 
-        = nav_link(controller: :deploy_keys) do
-          = link_to admin_deploy_keys_path, title: 'Deploy Keys' do
-            .nav-icon-container
-              = custom_icon('key')
-            %span.nav-item-name
-              Deploy Keys
+      = nav_link(controller: :deploy_keys) do
+        = link_to admin_deploy_keys_path, title: 'Deploy Keys' do
+          .nav-icon-container
+            = custom_icon('key')
+          %span.nav-item-name
+            Deploy Keys
 
-        = nav_link(controller: :services) do
-          = link_to admin_application_settings_services_path, title: 'Service Templates' do
-            .nav-icon-container
-              = custom_icon('service_templates')
-            %span.nav-item-name
-              Service Templates
+      = nav_link(controller: :services) do
+        = link_to admin_application_settings_services_path, title: 'Service Templates' do
+          .nav-icon-container
+            = custom_icon('service_templates')
+          %span.nav-item-name
+            Service Templates
 
-        = nav_link(controller: :labels) do
-          = link_to admin_labels_path, title: 'Labels' do
-            .nav-icon-container
-              = custom_icon('labels')
-            %span.nav-item-name
-              Labels
+      = nav_link(controller: :labels) do
+        = link_to admin_labels_path, title: 'Labels' do
+          .nav-icon-container
+            = custom_icon('labels')
+          %span.nav-item-name
+            Labels
 
-        = nav_link(controller: :appearances) do
-          = link_to admin_appearances_path, title: 'Appearances' do
-            .nav-icon-container
-              = custom_icon('appearance')
-            %span.nav-item-name
-              Appearance
+      = nav_link(controller: :appearances) do
+        = link_to admin_appearances_path, title: 'Appearances' do
+          .nav-icon-container
+            = custom_icon('appearance')
+          %span.nav-item-name
+            Appearance
 
-        %li.divider
-        = nav_link(controller: :application_settings) do
-          = link_to admin_application_settings_path, title: 'Settings' do
-            .nav-icon-container
-              = custom_icon('settings')
-            %span.nav-item-name
-              Settings
+      %li.divider
+      = nav_link(controller: :application_settings) do
+        = link_to admin_application_settings_path, title: 'Settings' do
+          .nav-icon-container
+            = custom_icon('settings')
+          %span.nav-item-name
+            Settings
 
-      = render 'shared/sidebar_toggle_button'
+    = render 'shared/sidebar_toggle_button'