Fixed incorrect breadcrumbs for project and group activity page, fixe…

…d issue with settings menu not remaining open when an item was selected on the group activity page, updated project details page to show the number of members without automation bots

app/components/project_dashboard/information_component.html.erb

@@ -30,7 +30,7 @@
   <%= viral_tooltip(title: t(:"components.project_dashboard.information.number_of_members")) do %>
     <span class="flex items-center">
       <%= viral_icon(name: :users, color: :subdued, classes: "h-5 w-5 m-0 mr-2") %>
-      <%= @project.namespace.project_members.count %>
+      <%= @project.namespace.project_members.without_automation_bots.count %>
     </span>
   <% end %>
 </span>

app/controllers/groups_controller.rb

@@ -180,6 +180,11 @@ def context_crumbs
     case action_name
     when 'new', 'create', 'show'
       @context_crumbs
+    when 'activity'
+      @context_crumbs += [{
+        name: I18n.t('groups.activity.title'),
+        path: group_activity_path
+      }]
     else
       @context_crumbs += [{
         name: I18n.t('groups.edit.title'),

app/controllers/projects_controller.rb

@@ -162,6 +162,11 @@ def context_crumbs
         name: I18n.t('projects.edit.title'),
         path: namespace_project_edit_path
       }]
+    when 'activity'
+      @context_crumbs += [{
+        name: I18n.t('projects.activity.title'),
+        path: namespace_project_activity_path
+      }]
     end
   end
 

app/models/member.rb

@@ -31,6 +31,12 @@ class Member < ApplicationRecord # rubocop:disable Metrics/ClassLength
 
   scope :not_expired, -> { where('expires_at IS NULL OR expires_at > ?', Time.zone.now.beginning_of_day) }
 
+  scope :without_automation_bots, lambda {
+                                    joins(:user).where.not(
+                                      user: { user_type: User.user_types[:project_automation_bot] }
+                                    )
+                                  }
+
   class << self
     DEFAULT_CAN_OPTIONS = {
       include_group_links: true

app/views/layouts/groups.html.erb

@@ -44,6 +44,7 @@
               selectable_pages: [
                 t(:"groups.sidebar.general"),
                 t(:"groups.sidebar.bot_accounts"),
+                t(:"groups.sidebar.history"),
               ],
               current_page: @current_page
               ) do |multi_level_menu| %>