Separate upgrade service in two services

plugins/main/public/components/endpoints-summary/services/index.tsx

@@ -4,6 +4,7 @@ export { removeAgentsFromGroupService } from './remove-agents-from-group';
 export { addAgentToGroupService } from './add-agent-to-group';
 export { addAgentsToGroupService } from './add-agents-to-group';
 export { getGroupsService } from './get-groups';
+export { upgradeAgentService } from './upgrade-agent';
 export { upgradeAgentsService } from './upgrade-agents';
 export { getOutdatedAgents } from './get-outdated-agents';
 export { getTasks } from './get-tasks';

plugins/main/public/components/endpoints-summary/services/paginated-agents-request.tsx

@@ -22,7 +22,7 @@ export const paginatedAgentsRequestService = async ({
   agentIds: string[];
   groupId?: string;
   pageSize?: number;
-}): Promise<IApiResponse<string>> => {
+}): Promise<IApiResponse<any>> => {
   let offset = 0;
   let requestAgentIds: string[] = [];
   let allAffectedItems: string[] = [];

plugins/main/public/components/endpoints-summary/services/upgrade-agent.tsx

@@ -0,0 +1,11 @@
+import IApiResponse from '../../../react-services/interfaces/api-response.interface';
+import { WzRequest } from '../../../react-services/wz-request';
+import { ResponseUpgradeAgents } from '../types';
+
+export const upgradeAgentService = async (agentId: string) =>
+  (await WzRequest.apiReq('PUT', '/agents/upgrade', {
+    params: {
+      agents_list: agentId,
+      wait_for_complete: true,
+    },
+  })) as IApiResponse<ResponseUpgradeAgents>;

plugins/main/public/components/endpoints-summary/services/upgrade-agents.tsx

@@ -1,5 +1,4 @@
 import IApiResponse from '../../../react-services/interfaces/api-response.interface';
-import { WzRequest } from '../../../react-services/wz-request';
 import { ResponseUpgradeAgents } from '../types';
 import { paginatedAgentsRequestService } from './paginated-agents-request';
 
@@ -8,15 +7,8 @@ export const upgradeAgentsService = async ({
 }: {
   agentIds: string[];
 }) =>
-  (agentIds.length === 1
-    ? await WzRequest.apiReq('PUT', '/agents/upgrade', {
-        params: {
-          agents_list: agentIds.join(','),
-          wait_for_complete: true,
-        },
-      })
-    : await paginatedAgentsRequestService({
-        method: 'PUT',
-        url: '/agents/upgrade',
-        agentIds,
-      })) as IApiResponse<ResponseUpgradeAgents>;
+  (await paginatedAgentsRequestService({
+    method: 'PUT',
+    url: '/agents/upgrade',
+    agentIds,
+  })) as IApiResponse<ResponseUpgradeAgents>;

plugins/main/public/components/endpoints-summary/table/actions/upgrade-agent-modal.test.tsx

@@ -1,10 +1,10 @@
 import React from 'react';
-import { render, fireEvent, waitFor, act } from '@testing-library/react';
+import { render, fireEvent, act } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import { UpgradeAgentModal } from './upgrade-agent-modal';
 
 jest.mock('../../services', () => ({
-  upgradeAgentsService: jest.fn(),
+  upgradeAgentService: jest.fn(),
 }));
 
 jest.mock('../../../../react-services/common-services', () => ({

plugins/main/public/components/endpoints-summary/table/actions/upgrade-agent-modal.tsx

@@ -5,7 +5,7 @@ import { withErrorBoundary, withReduxProvider } from '../../../common/hocs';
 import { UI_LOGGER_LEVELS } from '../../../../../common/constants';
 import { UI_ERROR_SEVERITIES } from '../../../../react-services/error-orchestrator/types';
 import { getErrorOrchestrator } from '../../../../react-services/common-services';
-import { upgradeAgentsService } from '../../services';
+import { upgradeAgentService } from '../../services';
 import { Agent } from '../../types';
 import { getToasts } from '../../../../kibana-services';
 
@@ -45,7 +45,7 @@ export const UpgradeAgentModal = compose(
       setIsLoading(true);
 
       try {
-        await upgradeAgentsService({ agentIds: [agent.id] });
+        await upgradeAgentService(agent.id);
         showToast('success', 'Upgrade agent', 'Upgrade task in progress');
         reloadAgents();
         setIsUpgradePanelClosed(false);

plugins/main/public/components/endpoints-summary/table/global-actions/upgrade/upgrade-modal.tsx

@@ -19,8 +19,8 @@ import { UI_ERROR_SEVERITIES } from '../../../../../react-services/error-orchest
 import { getErrorOrchestrator } from '../../../../../react-services/common-services';
 import { getAgentsService, upgradeAgentsService } from '../../../services';
 import { Agent, ResponseUpgradeAgents } from '../../../types';
-import { ErrorAgent } from '../../../services/paginated-agents-group';
 import { UpgradeAgentsModalResult } from './result';
+import { ErrorAgent } from '../../../services/paginated-agents-request';
 
 export type Result = {
   successAgents?: ResponseUpgradeAgents[];