[Fleet] Fix incorrect count of agents in bulk actions

elastic · Jan 23, 2024 · 322e6c3 · 322e6c3
1 parent aea41ca
commit 322e6c3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/...eet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.tsx b/...eet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.tsx
@@ -38,6 +38,7 @@ export interface Props {
   shownAgents: number;
   inactiveShownAgents: number;
   totalManagedAgentIds: string[];
+  inactiveManagedAgentIds: string[];
   selectionMode: SelectionMode;
   currentQuery: string;
   selectedAgents: Agent[];
@@ -51,6 +52,7 @@ export const AgentBulkActions: React.FunctionComponent<Props> = ({
   shownAgents,
   inactiveShownAgents,
   totalManagedAgentIds,
+  inactiveManagedAgentIds,
   selectionMode,
   currentQuery,
   selectedAgents,
@@ -91,18 +93,18 @@ export const AgentBulkActions: React.FunctionComponent<Props> = ({
     }
   }, [currentQuery, totalManagedAgentIds]);
 
-  // Check if user is working with only inactive agents
-  const atLeastOneActiveAgentSelected =
-    selectionMode === 'manual'
-      ? !!selectedAgents.find((agent) => agent.active)
-      : shownAgents > inactiveShownAgents;
   const totalActiveAgents = shownAgents - inactiveShownAgents;
 
   const agentCount =
     selectionMode === 'manual'
       ? selectedAgents.length
-      : totalActiveAgents - totalManagedAgentIds?.length;
+      : totalActiveAgents - (totalManagedAgentIds?.length - inactiveManagedAgentIds?.length);
 
+  // Check if user is working with only inactive agents
+  const atLeastOneActiveAgentSelected =
+    selectionMode === 'manual'
+      ? !!selectedAgents.find((agent) => agent.active)
+      : agentCount > 0 && shownAgents > inactiveShownAgents;
   const agents = selectionMode === 'manual' ? selectedAgents : selectionQuery;
 
   const [tagsPopoverButton, setTagsPopoverButton] = useState<HTMLElement>();

diff --git a/...c/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx b/...c/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx
@@ -59,6 +59,7 @@ export interface SearchAndFilterBarProps {
   inactiveShownAgents: number;
   totalInactiveAgents: number;
   totalManagedAgentIds: string[];
+  inactiveManagedAgentIds: string[];
   selectionMode: SelectionMode;
   currentQuery: string;
   selectedAgents: Agent[];
@@ -88,6 +89,7 @@ export const SearchAndFilterBar: React.FunctionComponent<SearchAndFilterBarProps
   inactiveShownAgents,
   totalInactiveAgents,
   totalManagedAgentIds,
+  inactiveManagedAgentIds,
   selectionMode,
   currentQuery,
   selectedAgents,
@@ -340,6 +342,7 @@ export const SearchAndFilterBar: React.FunctionComponent<SearchAndFilterBarProps
                   shownAgents={shownAgents}
                   inactiveShownAgents={inactiveShownAgents}
                   totalManagedAgentIds={totalManagedAgentIds}
+                  inactiveManagedAgentIds={inactiveManagedAgentIds}
                   selectionMode={selectionMode}
                   currentQuery={currentQuery}
                   selectedAgents={selectedAgents}

diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx
@@ -188,6 +188,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
   const [inactiveShownAgents, setInactiveShownAgents] = useState(0);
   const [totalInactiveAgents, setTotalInactiveAgents] = useState(0);
   const [totalManagedAgentIds, setTotalManagedAgentIds] = useState<string[]>([]);
+  const [inactiveManagedAgentIds, setinactiveManagedAgentIds] = useState<string[]>([]);
   const [managedAgentsOnCurrentPage, setManagedAgentsOnCurrentPage] = useState(0);
   const [showAgentActivityTour, setShowAgentActivityTour] = useState({ isOpen: false });
   const getSortFieldForAPI = (field: keyof Agent): string => {
@@ -335,7 +336,11 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
             }
             const allManagedAgents = response.data?.items ?? [];
             const allManagedAgentIds = allManagedAgents?.map((agent) => agent.id);
+            const inactiveManagedIds = allManagedAgents
+              ?.filter((agent) => agent.status === 'inactive')
+              .map((agent) => agent.id);
             setTotalManagedAgentIds(allManagedAgentIds);
+            setinactiveManagedAgentIds(inactiveManagedIds);
 
             setManagedAgentsOnCurrentPage(
               agentsResponse.data.items
@@ -606,6 +611,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
         inactiveShownAgents={inactiveShownAgents}
         totalInactiveAgents={totalInactiveAgents}
         totalManagedAgentIds={totalManagedAgentIds}
+        inactiveManagedAgentIds={inactiveManagedAgentIds}
         selectionMode={selectionMode}
         currentQuery={kuery}
         selectedAgents={selectedAgents}