)}
- {(!agent || !agent.os) && (
-
- )}
);
}
diff --git a/plugins/main/public/components/common/welcome/agents-welcome.js b/plugins/main/public/components/common/welcome/agents-welcome.js
index c050965e29..7f5c9c5ac7 100644
--- a/plugins/main/public/components/common/welcome/agents-welcome.js
+++ b/plugins/main/public/components/common/welcome/agents-welcome.js
@@ -24,7 +24,6 @@ import {
EuiToolTip,
EuiButtonIcon,
EuiPageBody,
- EuiLink,
} from '@elastic/eui';
import {
FimEventsTable,
@@ -43,10 +42,7 @@ import { withErrorBoundary, withGlobalBreadcrumb, withGuard } from '../hocs';
import { compose } from 'redux';
import { API_NAME_AGENT_STATUS } from '../../../../common/constants';
import { WAZUH_MODULES } from '../../../../common/wazuh-modules';
-import {
- PromptAgentNeverConnected,
- PromptNoSelectedAgent,
-} from '../../agents/prompts';
+import { PromptAgentNeverConnected } from '../../agents/prompts';
import { WzButton } from '../buttons';
import {
Applications,
@@ -83,28 +79,6 @@ export const AgentsWelcome = compose(
: []),
];
}),
- withGuard(
- props => !(props.agent && props.agent.id),
- () => (
- <>
-
- You need to select an agent or return to
-
-
- Endpoint summary
-
-
-
- }
- />
-
- ),
- ),
withGuard(
props => props.agent.status === API_NAME_AGENT_STATUS.NEVER_CONNECTED,
PromptAgentNeverConnected,
diff --git a/plugins/main/public/components/endpoints-summary/agent/index.tsx b/plugins/main/public/components/endpoints-summary/agent/index.tsx
index 987bd7c6b9..d30b618052 100644
--- a/plugins/main/public/components/endpoints-summary/agent/index.tsx
+++ b/plugins/main/public/components/endpoints-summary/agent/index.tsx
@@ -1,11 +1,15 @@
import React, { useState, useEffect } from 'react';
-import { EuiPage, EuiPageBody, EuiProgress } from '@elastic/eui';
+import { EuiPage, EuiPageBody, EuiProgress, EuiLink } from '@elastic/eui';
import { AgentsWelcome } from '../../common/welcome/agents-welcome';
import { Agent } from '../types';
import { MainSyscollector } from '../../agents/syscollector/main';
import { MainAgentStats } from '../../agents/stats';
import WzManagementConfiguration from '../../../controllers/management/components/management/configuration/configuration-main.js';
-import { withErrorBoundary, withRouteResolvers } from '../../common/hocs';
+import {
+ withErrorBoundary,
+ withGuard,
+ withRouteResolvers,
+} from '../../common/hocs';
import { compose } from 'redux';
import { PinnedAgentManager } from '../../wz-agent-selector/wz-agent-selector-service';
import { MainModuleAgent } from '../../common/modules/main-agent';
@@ -18,11 +22,46 @@ import {
import { useRouterSearch } from '../../common/hooks/use-router-search';
import { Redirect, Route, Switch } from '../../router-search';
import NavigationService from '../../../react-services/navigation-service';
+import { connect } from 'react-redux';
+import { PromptNoSelectedAgent } from '../../agents/prompts';
+import { RedirectAppLinks } from '../../../../../../src/plugins/opensearch_dashboards_react/public';
+import { getCore } from '../../../kibana-services';
+import { endpointSummary } from '../../../utils/applications';
+
+const mapStateToProps = state => ({
+ agent: state.appStateReducers?.currentAgentData,
+});
export const AgentView = compose(
withErrorBoundary,
withRouteResolvers({ enableMenu, ip, nestedResolve, savedSearch }),
-)(() => {
+ connect(mapStateToProps),
+ withGuard(
+ props => !(props.agent && props.agent.id),
+ () => (
+ <>
+
+ You need to select an agent or return to
+
+
+ NavigationService.getInstance().navigate(`/agents-preview`)
+ }
+ >
+ Endpoint summary
+
+
+
+ }
+ />
+
+ ),
+ ),
+)(({ agent: agentData }) => {
const { tab = 'welcome' } = useRouterSearch();
const navigationService = NavigationService.getInstance();
@@ -35,23 +74,20 @@ export const AgentView = compose(
const pinnedAgentManager = new PinnedAgentManager();
- const [agent, setAgent] = useState();
const [isLoadingAgent, setIsLoadingAgent] = useState(true);
- const getAgent = async () => {
+ const syncAgent = async () => {
setIsLoadingAgent(true);
await pinnedAgentManager.syncPinnedAgentSources();
- const isPinnedAgent = pinnedAgentManager.isPinnedAgent();
- setAgent(isPinnedAgent ? pinnedAgentManager.getPinnedAgent() : null);
setIsLoadingAgent(false);
};
useEffect(() => {
- getAgent();
+ syncAgent();
}, [tab]);
const switchTab = (tab: string) => {
- navigationService.navigate(`/agents?tab=${tab}&agent=${agent?.id}`);
+ navigationService.navigate(`/agents?tab=${tab}&agent=${agentData?.id}`);
};
if (isLoadingAgent) {
@@ -67,21 +103,21 @@ export const AgentView = compose(
return (
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/plugins/main/public/components/wz-agent-selector/wz-agent-selector-service.ts b/plugins/main/public/components/wz-agent-selector/wz-agent-selector-service.ts
index 90fbf9c511..3b4902ca84 100644
--- a/plugins/main/public/components/wz-agent-selector/wz-agent-selector-service.ts
+++ b/plugins/main/public/components/wz-agent-selector/wz-agent-selector-service.ts
@@ -42,16 +42,15 @@ export class PinnedAgentManager {
const includesAgentViewURL = this.navigationService
.getPathname()
.includes(this.AGENT_VIEW_URL);
+ const params = this.navigationService.getParams();
- const urlSearchParams = this.navigationService.getParams();
-
- urlSearchParams.set(
+ params.set(
includesAgentViewURL
? PinnedAgentManager.AGENT_ID_VIEW_KEY
: PinnedAgentManager.AGENT_ID_URL_VIEW_KEY,
String(agentData?.id),
);
- this.navigationService.renewURL(urlSearchParams);
+ this.navigationService.renewURL(params);
}
unPinAgent(): void {
diff --git a/plugins/main/public/controllers/management/components/management/configuration/configuration-main.js b/plugins/main/public/controllers/management/components/management/configuration/configuration-main.js
index a75adf780d..6d71818717 100644
--- a/plugins/main/public/controllers/management/components/management/configuration/configuration-main.js
+++ b/plugins/main/public/controllers/management/components/management/configuration/configuration-main.js
@@ -9,7 +9,6 @@
*
* Find more information about this on the LICENSE file.
*/
-
import WzConfigurationSwitch from './configuration-switch';
import {
withErrorBoundary,
@@ -23,7 +22,7 @@ export default compose(
withErrorBoundary,
withGlobalBreadcrumb(props => {
let breadcrumb = false;
- if (props.agent.id === '000') {
+ if (props.agent?.id === '000') {
breadcrumb = [{ text: settings.breadcrumbLabel }];
} else {
breadcrumb = [