-
Notifications
You must be signed in to change notification settings - Fork 192
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '4.10.0' into enhancement/7084-improve-loading-speed
- Loading branch information
Showing
24 changed files
with
240 additions
and
315 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 62 additions & 4 deletions
66
plugins/main/public/components/common/search-bar/search-bar.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,71 @@ | ||
| .wz-search-bar-no-padding .globalQueryBar:not(:empty) { | ||
| padding: 0px !important; | ||
| } | ||
|
|
||
| .wz-search-bar { | ||
| &.no-padding .globalQueryBar:not(:empty) { | ||
| padding: 0px !important; | ||
| } | ||
|
|
||
| > .euiFlexGroup { | ||
| &:first-child { | ||
| #GlobalFilterGroup { | ||
| display: none; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| &-query { | ||
| .osdQueryBar--withDatePicker { | ||
| align-items: flex-end; | ||
|
|
||
| > :first-child { | ||
| margin-top: 8px; | ||
| margin-bottom: 4px !important; | ||
|
|
||
| @media only screen and (max-width: 574px) { | ||
| margin-top: -8px; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @media only screen and (min-width: 575px) and (max-width: 767px) { | ||
| .globalFilterGroup__filterBar { | ||
| margin-top: 4px; | ||
| } | ||
|
|
||
| .globalFilterGroup__wrapper-isVisible { | ||
| margin-top: 0; | ||
| } | ||
|
|
||
| .euiFlexGroup--responsive > .euiFlexItem { | ||
| margin-bottom: 0 !important; | ||
| } | ||
| } | ||
|
|
||
| @media only screen and (max-width: 767px) { | ||
| .euiFlexGroup--responsive { | ||
| -webkit-flex-wrap: wrap; | ||
| flex-wrap: wrap; | ||
| margin-left: 0; | ||
| margin-right: 0; | ||
| margin-bottom: 1px; | ||
| } | ||
| } | ||
|
|
||
| @media only screen and (max-width: 574px) { | ||
| .globalFilterGroup__wrapper-isVisible { | ||
| margin-top: -6px; | ||
| } | ||
|
|
||
| .euiFlexGroup--responsive { | ||
| margin-bottom: -3px; | ||
| } | ||
|
|
||
| > .euiFlexGroup.euiFlexGroup--gutterSmall.euiFlexGroup--directionRow.euiFlexGroup--responsive | ||
| > .euiFlexItem.euiFlexItem--flexGrowZero { | ||
| margin-bottom: 6px !important; | ||
| } | ||
|
|
||
| .osdQueryBar--withDatePicker > :first-child { | ||
| margin-top: -8px; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 6 additions & 18 deletions
24
plugins/main/public/components/common/wazuh-discover/config/data-grid-columns.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,10 @@ | ||
| import React from 'react'; | ||
| import { tDataGridColumn } from '../../data-grid'; | ||
| import { commonColumns } from '../../../overview/common/data-grid-columns'; | ||
|
|
||
| export const threatHuntingColumns: tDataGridColumn[] = [ | ||
| { | ||
| id: 'timestamp', | ||
| isSortable: true, | ||
| defaultSortDirection: 'desc', | ||
| }, | ||
| { | ||
| id: 'agent.name', | ||
| }, | ||
| { | ||
| id: 'rule.description', | ||
| }, | ||
| { | ||
| id: 'rule.level', | ||
| }, | ||
| { | ||
| id: 'rule.id', | ||
| }, | ||
| commonColumns['timestamp'], | ||
| commonColumns['agent.name'], | ||
| commonColumns['rule.description'], | ||
| commonColumns['rule.level'], | ||
| commonColumns['rule.id'], | ||
| ]; |
20 changes: 6 additions & 14 deletions
20
...ain/public/components/overview/amazon-web-services/events/amazon-web-services-columns.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,13 @@ | ||
| import { tDataGridColumn } from '../../../common/data-grid'; | ||
| import { commonColumns } from '../../common/data-grid-columns'; | ||
|
|
||
| export const amazonWebServicesColumns: tDataGridColumn[] = [ | ||
| { | ||
| id: 'timestamp', | ||
| isSortable: true, | ||
| defaultSortDirection: 'desc', | ||
| }, | ||
| commonColumns.timestamp, | ||
| { | ||
| id: 'data.aws.source', | ||
| initialWidth: 144, | ||
| }, | ||
| { | ||
| id: 'rule.description', | ||
| }, | ||
| { | ||
| id: 'rule.level', | ||
| }, | ||
| { | ||
| id: 'rule.id', | ||
| }, | ||
| commonColumns['rule.description'], | ||
| commonColumns['rule.level'], | ||
| commonColumns['rule.id'], | ||
| ]; |
29 changes: 29 additions & 0 deletions
29
plugins/main/public/components/overview/common/data-grid-columns.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import { commonInitialWidth } from './initial-width'; | ||
|
|
||
| export const commonColumns = { | ||
| timestamp: { | ||
| id: 'timestamp', | ||
| isSortable: true, | ||
| defaultSortDirection: 'desc', | ||
| initialWidth: commonInitialWidth.timestamp, | ||
| }, | ||
| 'agent.id': { | ||
| id: 'agent.id', | ||
| initialWidth: commonInitialWidth['agent.id'], | ||
| }, | ||
| 'agent.name': { | ||
| id: 'agent.name', | ||
| initialWidth: commonInitialWidth['agent.name'], | ||
| }, | ||
| 'rule.description': { | ||
| id: 'rule.description', | ||
| }, | ||
| 'rule.level': { | ||
| id: 'rule.level', | ||
| initialWidth: commonInitialWidth['rule.level'], | ||
| }, | ||
| 'rule.id': { | ||
| id: 'rule.id', | ||
| initialWidth: commonInitialWidth['rule.id'], | ||
| }, | ||
| } as const; |
7 changes: 7 additions & 0 deletions
7
plugins/main/public/components/overview/common/initial-width.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| export const commonInitialWidth = { | ||
| timestamp: 204, | ||
| 'agent.id': 93, | ||
| 'agent.name': 318, | ||
| 'rule.level': 93, | ||
| 'rule.id': 93, | ||
| } as const; |
22 changes: 8 additions & 14 deletions
22
plugins/main/public/components/overview/docker/events/docker-columns.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,21 @@ | ||
| import { tDataGridColumn } from '../../../common/data-grid'; | ||
| import { commonColumns } from '../../common/data-grid-columns'; | ||
|
|
||
| export const dockerColumns: tDataGridColumn[] = [ | ||
| { | ||
| id: 'timestamp', | ||
| isSortable: true, | ||
| defaultSortDirection: 'desc', | ||
| }, | ||
| { | ||
| id: 'agent.name', | ||
| }, | ||
| commonColumns.timestamp, | ||
| commonColumns['agent.name'], | ||
| { | ||
| id: 'data.docker.from', | ||
| initialWidth: 151, | ||
| }, | ||
| { | ||
| id: 'data.docker.Type', | ||
| initialWidth: 149, | ||
| }, | ||
| { | ||
| id: 'data.docker.Action', | ||
| initialWidth: 161, | ||
| }, | ||
| { | ||
| id: 'rule.description', | ||
| }, | ||
| { | ||
| id: 'rule.level', | ||
| }, | ||
| commonColumns['rule.description'], | ||
| commonColumns['rule.level'], | ||
| ]; |
25 changes: 8 additions & 17 deletions
25
plugins/main/public/components/overview/fim/events/file-integrity-monitoring-columns.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,18 @@ | ||
| import { tDataGridColumn } from '../../../common/data-grid'; | ||
| import { commonColumns } from '../../common/data-grid-columns'; | ||
|
|
||
| export const fileIntegrityMonitoringColumns: tDataGridColumn[] = [ | ||
| { | ||
| id: 'timestamp', | ||
| isSortable: true, | ||
| defaultSortDirection: 'desc', | ||
| }, | ||
| { | ||
| id: 'agent.name', | ||
| }, | ||
| commonColumns.timestamp, | ||
| commonColumns['agent.name'], | ||
| { | ||
| id: 'syscheck.path', | ||
| initialWidth: 392, | ||
| }, | ||
| { | ||
| id: 'syscheck.event', | ||
| initialWidth: 140, | ||
| }, | ||
| { | ||
| id: 'rule.description', | ||
| }, | ||
| { | ||
| id: 'rule.level', | ||
| }, | ||
| { | ||
| id: 'rule.id', | ||
| }, | ||
| commonColumns['rule.description'], | ||
| commonColumns['rule.level'], | ||
| commonColumns['rule.id'], | ||
| ]; |
24 changes: 7 additions & 17 deletions
24
plugins/main/public/components/overview/gdpr/events/gdpr-columns.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,14 @@ | ||
| import { tDataGridColumn } from '../../../common/data-grid'; | ||
| import { commonColumns } from '../../common/data-grid-columns'; | ||
|
|
||
| export const gdprColumns: tDataGridColumn[] = [ | ||
| { | ||
| id: 'timestamp', | ||
| isSortable: true, | ||
| defaultSortDirection: 'desc', | ||
| }, | ||
| { | ||
| id: 'agent.name', | ||
| }, | ||
| commonColumns.timestamp, | ||
| commonColumns['agent.name'], | ||
| { | ||
| id: 'rule.gdpr', | ||
| initialWidth: 138, | ||
| }, | ||
| { | ||
| id: 'rule.description', | ||
| }, | ||
| { | ||
| id: 'rule.level', | ||
| }, | ||
| { | ||
| id: 'rule.id', | ||
| }, | ||
| commonColumns['rule.description'], | ||
| commonColumns['rule.level'], | ||
| commonColumns['rule.id'], | ||
| ]; |
26 changes: 9 additions & 17 deletions
26
plugins/main/public/components/overview/github/events/github-columns.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,22 @@ | ||
| import { tDataGridColumn } from '../../../common/data-grid'; | ||
| import { commonColumns } from '../../common/data-grid-columns'; | ||
|
|
||
| export const githubColumns: tDataGridColumn[] = [ | ||
| { | ||
| id: 'timestamp', | ||
| isSortable: true, | ||
| defaultSortDirection: 'desc', | ||
| }, | ||
| { | ||
| id: 'agent.id', | ||
| }, | ||
| commonColumns.timestamp, | ||
| commonColumns['agent.id'], | ||
| { | ||
| id: 'data.github.repo', | ||
| initialWidth: 200, | ||
| }, | ||
| { | ||
| id: 'data.github.actor', | ||
| initialWidth: 200, | ||
| }, | ||
| { | ||
| id: 'data.github.org', | ||
| initialWidth: 200, | ||
| }, | ||
| { | ||
| id: 'rule.description', | ||
| }, | ||
| { | ||
| id: 'rule.level', | ||
| }, | ||
| { | ||
| id: 'rule.id', | ||
| }, | ||
| commonColumns['rule.description'], | ||
| commonColumns['rule.level'], | ||
| commonColumns['rule.id'], | ||
| ]; |
Oops, something went wrong.