Fix conflicts in branch synchronization (#5708)

* fix: fix conflicts

* changelog: remove entry

CHANGELOG.md

@@ -30,7 +30,6 @@ All notable changes to the Wazuh app project will be documented in this file.
 ### Fixed
 
 - Fixed trailing hyphen character for OS value in the list of agents [#4828](https://github.com/wazuh/wazuh-kibana-app/pull/4828)
-- Fixed an issue that caused incorrect visualization of IPv6 addresses ([#4909](https://github.com/wazuh/wazuh-kibana-app/pull/4909)).
 - Fixed several typos in the code, by @jctello [#4911](https://github.com/wazuh/wazuh-kibana-app/pull/4911)
 - Fixed the display of more than one protocol in the Global configuration section [#4917](https://github.com/wazuh/wazuh-kibana-app/pull/4917)
 - Handling endpoint response was done when there is no data to show [#4918](https://github.com/wazuh/wazuh-kibana-app/pull/4918)

plugins/main/public/components/common/welcome/agents-info.js

@@ -19,7 +19,6 @@ import WzTextWithTooltipIfTruncated from '../wz-text-with-tooltip-if-truncated';
 import { WzStat } from '../../wz-stat';
 import { GroupTruncate } from '../util/agent-group-truncate';
 import { AgentStatus } from '../../agents/agent_status';
-import { compressIPv6 } from '../../../services/ipv6-services';
 
 export class AgentInfo extends Component {
   constructor(props) {
@@ -181,7 +180,7 @@ export class AgentInfo extends Component {
         {
           title: agent.ip,
           description: 'IP address',
-          style: { minwidth: 150 },
+          style: {},
         },
         {
           title: agent.version,

plugins/main/public/controllers/agent/components/agents-table.js

@@ -49,7 +49,6 @@ import { UI_ERROR_SEVERITIES } from '../../../react-services/error-orchestrator/
 import { getErrorOrchestrator } from '../../../react-services/common-services';
 import { AgentStatus } from '../../../components/agents/agent_status';
 import { AgentSynced } from '../../../components/agents/agent-synced';
-import { compressIPv6 } from '../../../services/ipv6-services';
 
 export const AgentsTable = withErrorBoundary(
   class AgentsTable extends Component {
@@ -310,9 +309,6 @@ export const AgentsTable = withErrorBoundary(
     }
 
     formatAgent(agent) {
-      const checkField = field => {
-        return field !== undefined ? field : '-';
-      };
       const agentVersion =
         agent.version !== undefined ? agent.version.split(' ')[1] : '-';
       const node_name =
@@ -323,7 +319,7 @@ export const AgentsTable = withErrorBoundary(
       return {
         id: agent.id,
         name: agent.name,
-        ip: compressIPv6(agent.ip),
+        ip: agent.ip,
         status: agent.status,
         group_config_status: agent.group_config_status,
         group: agent?.group || '-',
@@ -384,11 +380,8 @@ export const AgentsTable = withErrorBoundary(
     }
 
     addIconPlatformRender(agent) {
-      let icon = false;
-      const checkField = field => {
-        return field !== undefined ? field : '-';
-      };
-      const os = (agent || {}).os;
+      let icon = '';
+      const os = agent?.os || {};
 
       if ((os?.uname || '').includes('Linux')) {
         icon = 'linux';
@@ -397,8 +390,7 @@ export const AgentsTable = withErrorBoundary(
       } else if (os?.platform === 'darwin') {
         icon = 'apple';
       }
-      const os_name =
-        checkField(agent?.os?.name) + ' ' + checkField(agent?.os?.version);
+      const os_name = `${agent?.os?.name || ''} ${agent?.os?.version || ''}`;
 
       return (
         <EuiFlexGroup gutterSize='xs'>
@@ -408,7 +400,7 @@ export const AgentsTable = withErrorBoundary(
               aria-hidden='true'
             ></i>
           </EuiFlexItem>{' '}
-          <EuiFlexItem>{os_name === '- -' ? '-' : os_name}</EuiFlexItem>
+          <EuiFlexItem>{os_name.trim() || '-'}</EuiFlexItem>
         </EuiFlexGroup>
       );
     }

plugins/main/scripts/tag.py

@@ -17,7 +17,7 @@
 # Wazuh version: major.minor.patch
 version = '4.6.0'
 # App's revision number (previous rev + 1)
-revision = '02'
+revision = '01'
 # One of 'pre-alpha', 'alpha', 'beta', 'release-candidate', 'stable'
 stage = 'stable'
 # Tag suffix. Usually set to stage + stage iteration.