diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c90d5ad19..3c323b4871 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ All notable changes to the Wazuh app project will be documented in this file.
- Implement new data source feature on MITRE ATT&CK module [#6482](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6482)
- Upgraded versions of `follow-redirects` and `es5-ext` [#6626](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6626)
- Changed agent log collector socket API response controller component [#6660](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6660)
+- Improve margins and paddins in the Events, Inventory and Control tabs [#6708](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6708)
### Fixed
diff --git a/plugins/main/public/components/common/wazuh-data-grid/wz-data-grid.tsx b/plugins/main/public/components/common/wazuh-data-grid/wz-data-grid.tsx
index f8b1f6d61d..698375aaf8 100644
--- a/plugins/main/public/components/common/wazuh-data-grid/wz-data-grid.tsx
+++ b/plugins/main/public/components/common/wazuh-data-grid/wz-data-grid.tsx
@@ -27,6 +27,7 @@ import { DiscoverNoResults } from '../no-results/no-results';
import { DocumentViewTableAndJson } from '../wazuh-discover/components/document-view-table-and-json';
import DiscoverDataGridAdditionalControls from '../wazuh-discover/components/data-grid-additional-controls';
import './wazuh-data-grid.scss';
+import { wzDiscoverRenderColumns } from '../wazuh-discover/render-columns';
export const MAX_ENTRIES_PER_QUERY = 10000;
@@ -78,6 +79,7 @@ const WazuhDataGrid = (props: tWazuhDataGridProps) => {
const dataGridProps = useDataGrid({
ariaLabelledBy: 'Actions data grid',
defaultColumns,
+ renderColumns: wzDiscoverRenderColumns,
results,
indexPattern: indexPattern as IndexPattern,
DocViewInspectButton,
diff --git a/plugins/main/public/components/common/wazuh-discover/discover.scss b/plugins/main/public/components/common/wazuh-discover/discover.scss
index db82845c2a..46de648c6c 100644
--- a/plugins/main/public/components/common/wazuh-discover/discover.scss
+++ b/plugins/main/public/components/common/wazuh-discover/discover.scss
@@ -1,28 +1,28 @@
.discoverContainer {
- height: calc(100vh - 104px);
+ height: calc(100vh - 104px);
- .euiDataGrid--fullScreen {
- height: calc(100vh - 49px);
- bottom: 0;
- top: auto;
- }
-
- .discoverDataGrid {
- height: calc(100vh - 496px);
- }
+ .euiDataGrid--fullScreen {
+ height: calc(100vh - 49px);
+ bottom: 0;
+ top: auto;
+ }
+
+ .discoverDataGrid {
+ height: calc(100vh - 464px);
+ }
- .discoverChartContainer {
- min-height: 234px;
- .dshLayout-isMaximizedPanel {
- top: 0;
- left: 0;
- min-height: calc(100vh - 49px);
- position: fixed;
- z-index: 9999;
- }
+ .discoverChartContainer {
+ min-height: 234px;
+ .dshLayout-isMaximizedPanel {
+ top: 0;
+ left: 0;
+ min-height: calc(100vh - 49px);
+ position: fixed;
+ z-index: 9999;
}
+ }
}
.headerIsExpanded .discoverContainer {
- height: calc(100vh - 153px);
+ height: calc(100vh - 153px);
}
diff --git a/plugins/main/public/components/common/wazuh-discover/wz-discover.tsx b/plugins/main/public/components/common/wazuh-discover/wz-discover.tsx
index 90f68d923c..7693bf2e6a 100644
--- a/plugins/main/public/components/common/wazuh-discover/wz-discover.tsx
+++ b/plugins/main/public/components/common/wazuh-discover/wz-discover.tsx
@@ -11,7 +11,6 @@ import {
EuiFlyoutBody,
EuiFlyoutHeader,
EuiTitle,
- EuiSpacer,
EuiPanel,
} from '@elastic/eui';
import { IntlProvider } from 'react-intl';
@@ -191,6 +190,8 @@ const WazuhDiscoverComponent = (props: WazuhDiscoverProps) => {
restrictWidth='100%'
fullHeight={true}
grow
+ paddingSize='none'
+ pageContentProps={{ color: 'transparent' }}
>
<>
{isDataSourceLoading ? (
@@ -210,47 +211,48 @@ const WazuhDiscoverComponent = (props: WazuhDiscoverProps) => {