Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add default sorting and columns in all data grid tables #6912

Merged
merged 12 commits into from
Aug 19, 2024
Merged
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ All notable changes to the Wazuh app project will be documented in this file.

### Changed

- Removed embedded discover [#6120](https:/wazuh/wazuh-dashboard-plugins/pull/6120) [#6235](https:/wazuh/wazuh-dashboard-plugins/pull/6235) [#6254](https:/wazuh/wazuh-dashboard-plugins/pull/6254) [#6285](https:/wazuh/wazuh-dashboard-plugins/pull/6285) [#6288](https:/wazuh/wazuh-dashboard-plugins/pull/6288) [#6290](https:/wazuh/wazuh-dashboard-plugins/pull/6290) [#6289](https:/wazuh/wazuh-dashboard-plugins/pull/6289) [#6286](https:/wazuh/wazuh-dashboard-plugins/pull/6286) [#6275](https:/wazuh/wazuh-dashboard-plugins/pull/6275) [#6287](https:/wazuh/wazuh-dashboard-plugins/pull/6287) [#6297](https:/wazuh/wazuh-dashboard-plugins/pull/6297) [#6291](https:/wazuh/wazuh-dashboard-plugins/pull/6287) [#6459](https:/wazuh/wazuh-dashboard-plugins/pull/6459) [#6434](https:/wazuh/wazuh-dashboard-plugins/pull/6434) [#6504](https:/wazuh/wazuh-dashboard-plugins/pull/6504) [#6649](https:/wazuh/wazuh-dashboard-plugins/pull/6649) [#6506](https:/wazuh/wazuh-dashboard-plugins/pull/6506) [#6537](https:/wazuh/wazuh-dashboard-plugins/pull/6537) [#6528](https:/wazuh/wazuh-dashboard-plugins/pull/6528) [#6675](https:/wazuh/wazuh-dashboard-plugins/pull/6675) [#6674](https:/wazuh/wazuh-dashboard-plugins/pull/6674) [#6558](https:/wazuh/wazuh-dashboard-plugins/pull/6558) [#6685](https:/wazuh/wazuh-dashboard-plugins/pull/6685) [#6691](https:/wazuh/wazuh-dashboard-plugins/pull/6691) [#6712](https:/wazuh/wazuh-dashboard-plugins/pull/6712) [#6734](https:/wazuh/wazuh-dashboard-plugins/pull/6734) [#6746](https:/wazuh/wazuh-dashboard-plugins/pull/6746) [#6752](https:/wazuh/wazuh-dashboard-plugins/pull/6752) [#6753](https:/wazuh/wazuh-dashboard-plugins/pull/6753) [#6756](https:/wazuh/wazuh-dashboard-plugins/pull/6756) [#6771](https:/wazuh/wazuh-dashboard-plugins/pull/6771) [#6792](https:/wazuh/wazuh-dashboard-plugins/pull/6792) [#6845](https:/wazuh/wazuh-dashboard-plugins/pull/6845) [#6857](https:/wazuh/wazuh-dashboard-plugins/pull/6857) [#6847](https:/wazuh/wazuh-dashboard-plugins/pull/6847) [#6865](https:/wazuh/wazuh-dashboard-plugins/pull/6865) [#6848](https:/wazuh/wazuh-dashboard-plugins/pull/6848) [#6843](https:/wazuh/wazuh-dashboard-plugins/pull/6843) [#6878](https:/wazuh/wazuh-dashboard-plugins/pull/6878) [#6883](https:/wazuh/wazuh-dashboard-plugins/pull/6883) [#6889](https:/wazuh/wazuh-dashboard-plugins/pull/6889) [#6902](https:/wazuh/wazuh-dashboard-plugins/pull/6902)
- Removed embedded discover [#6120](https:/wazuh/wazuh-dashboard-plugins/pull/6120) [#6235](https:/wazuh/wazuh-dashboard-plugins/pull/6235) [#6254](https:/wazuh/wazuh-dashboard-plugins/pull/6254) [#6285](https:/wazuh/wazuh-dashboard-plugins/pull/6285) [#6288](https:/wazuh/wazuh-dashboard-plugins/pull/6288) [#6290](https:/wazuh/wazuh-dashboard-plugins/pull/6290) [#6289](https:/wazuh/wazuh-dashboard-plugins/pull/6289) [#6286](https:/wazuh/wazuh-dashboard-plugins/pull/6286) [#6275](https:/wazuh/wazuh-dashboard-plugins/pull/6275) [#6287](https:/wazuh/wazuh-dashboard-plugins/pull/6287) [#6297](https:/wazuh/wazuh-dashboard-plugins/pull/6297) [#6291](https:/wazuh/wazuh-dashboard-plugins/pull/6287) [#6459](https:/wazuh/wazuh-dashboard-plugins/pull/6459) [#6434](https:/wazuh/wazuh-dashboard-plugins/pull/6434) [#6504](https:/wazuh/wazuh-dashboard-plugins/pull/6504) [#6649](https:/wazuh/wazuh-dashboard-plugins/pull/6649) [#6506](https:/wazuh/wazuh-dashboard-plugins/pull/6506) [#6537](https:/wazuh/wazuh-dashboard-plugins/pull/6537) [#6528](https:/wazuh/wazuh-dashboard-plugins/pull/6528) [#6675](https:/wazuh/wazuh-dashboard-plugins/pull/6675) [#6674](https:/wazuh/wazuh-dashboard-plugins/pull/6674) [#6558](https:/wazuh/wazuh-dashboard-plugins/pull/6558) [#6685](https:/wazuh/wazuh-dashboard-plugins/pull/6685) [#6691](https:/wazuh/wazuh-dashboard-plugins/pull/6691) [#6712](https:/wazuh/wazuh-dashboard-plugins/pull/6712) [#6734](https:/wazuh/wazuh-dashboard-plugins/pull/6734) [#6746](https:/wazuh/wazuh-dashboard-plugins/pull/6746) [#6752](https:/wazuh/wazuh-dashboard-plugins/pull/6752) [#6753](https:/wazuh/wazuh-dashboard-plugins/pull/6753) [#6756](https:/wazuh/wazuh-dashboard-plugins/pull/6756) [#6771](https:/wazuh/wazuh-dashboard-plugins/pull/6771) [#6792](https:/wazuh/wazuh-dashboard-plugins/pull/6792) [#6845](https:/wazuh/wazuh-dashboard-plugins/pull/6845) [#6857](https:/wazuh/wazuh-dashboard-plugins/pull/6857) [#6847](https:/wazuh/wazuh-dashboard-plugins/pull/6847) [#6865](https:/wazuh/wazuh-dashboard-plugins/pull/6865) [#6848](https:/wazuh/wazuh-dashboard-plugins/pull/6848) [#6843](https:/wazuh/wazuh-dashboard-plugins/pull/6843) [#6878](https:/wazuh/wazuh-dashboard-plugins/pull/6878) [#6883](https:/wazuh/wazuh-dashboard-plugins/pull/6883) [#6889](https:/wazuh/wazuh-dashboard-plugins/pull/6889) [#6902](https:/wazuh/wazuh-dashboard-plugins/pull/6902) [#6912](https:/wazuh/wazuh-dashboard-plugins/pull/6912)
- Allow editing groups for an agent from Endpoints Summary [#6250](https:/wazuh/wazuh-dashboard-plugins/pull/6250)
- Change how the configuration is managed in the backend side [#6337](https:/wazuh/wazuh-dashboard-plugins/pull/6337) [#6519](https:/wazuh/wazuh-dashboard-plugins/pull/6519) [#6573](https:/wazuh/wazuh-dashboard-plugins/pull/6573)
- Change the view of API is down and check connection to Server APIs application [#6337](https:/wazuh/wazuh-dashboard-plugins/pull/6337)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,8 @@ export class FileDetails extends Component {
? [
{
id: 'timestamp',
isSortable: true,
defaultSortDirection: 'desc',
displayAsText: 'Time',
render: value => formatUIDate(value),
},
Expand Down Expand Up @@ -491,6 +493,8 @@ export class FileDetails extends Component {
: [
{
id: 'timestamp',
isSortable: true,
defaultSortDirection: 'desc',
displayAsText: 'Time',
render: value => formatUIDate(value),
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { tDataGridColumn } from '../../../common/data-grid';
export const configurationAssessmentColumns: tDataGridColumn[] = [
{
id: 'timestamp',
isSortable: true,
defaultSortDirection: 'desc',
},
{
id: 'data.sca.check.title',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,16 @@ export const exportSearchToCSV = async (
export const parseColumns = (
fields: IFieldType[],
defaultColumns: tDataGridColumn[] = [],
): EuiDataGridColumn[] => {
): tDataGridColumn[] => {
// remove _source field becuase is a object field and is not supported
fields = fields.filter(field => field.name !== '_source');
// merge the properties of the field with the default columns
const columns =
fields.map(field => {
if (!fields?.length) {
return defaultColumns;
Machi3mfl marked this conversation as resolved.
Show resolved Hide resolved
}

const columns = fields
.filter(field => field.name !== '_source')
.map(field => {
const defaultColumn = defaultColumns.find(
column => column.id === field.name,
);
Expand All @@ -191,7 +195,7 @@ export const parseColumns = (
},
...defaultColumn,
};
}) || [];
}) as tDataGridColumn[];
return columns;
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
import React from 'react';
import { tDataGridColumn } from '../../data-grid';

export const threatHuntingColumns: tDataGridColumn[] = [{
id: 'timestamp'
},
{
id: 'agent.name'
},
{
id: 'rule.description'
},
{
id: 'rule.level'
},
{
id: 'rule.id'
}]



export const threatHuntingColumns: tDataGridColumn[] = [
{
id: 'timestamp',
isSortable: true,
defaultSortDirection: 'desc',
},
{
id: 'agent.name',
},
{
id: 'rule.description',
},
{
id: 'rule.level',
},
{
id: 'rule.id',
},
];
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { tDataGridColumn } from '../../../common/data-grid';
export const amazonWebServicesColumns: tDataGridColumn[] = [
{
id: 'timestamp',
isSortable: true,
defaultSortDirection: 'desc',
},
{
id: 'data.aws.source',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ export const RequirementFlyout = connect(mapStateToProps)(
const columnsAgent = [
{
id: 'timestamp',
isSortable: true,
defaultSortDirection: 'desc',
displayAsText: 'Time',
render: value => formatUIDate(value),
},
Expand All @@ -96,6 +98,8 @@ export const RequirementFlyout = connect(mapStateToProps)(
const columnsWithoutAgent = [
{
id: 'timestamp',
isSortable: true,
defaultSortDirection: 'desc',
displayAsText: 'Time',
render: value => formatUIDate(value),
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { tDataGridColumn } from '../../../common/data-grid';
export const dockerColumns: tDataGridColumn[] = [
{
id: 'timestamp',
isSortable: true,
defaultSortDirection: 'desc',
},
{
id: 'agent.name',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { tDataGridColumn } from '../../../common/data-grid';
export const fileIntegrityMonitoringColumns: tDataGridColumn[] = [
{
id: 'timestamp',
isSortable: true,
defaultSortDirection: 'desc',
},
{
id: 'agent.name',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { tDataGridColumn } from '../../../common/data-grid';
export const gdprColumns: tDataGridColumn[] = [
{
id: 'timestamp',
isSortable: true,
defaultSortDirection: 'desc',
},
{
id: 'agent.name',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { tDataGridColumn } from '../../../common/data-grid';
export const githubColumns: tDataGridColumn[] = [
{
id: 'timestamp',
isSortable: true,
defaultSortDirection: 'desc',
},
{
id: 'agent.id',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,8 @@ const getDashboardPanels = (
};

export const DrilldownConfigAction = (drilldownProps: ModuleConfigProps) => {

const {
fetchData,
fetchFilters,
searchBarProps,
indexPattern
} = drilldownProps;
const { fetchData, fetchFilters, searchBarProps, indexPattern } =
drilldownProps;

return {
rows: [
Expand Down Expand Up @@ -148,7 +143,7 @@ export const DrilldownConfigAction = (drilldownProps: ModuleConfigProps) => {
},
hidePanelTitles: false,
}}
onInputUpdated={() => { }}
onInputUpdated={() => {}}
/>
</div>
);
Expand All @@ -161,16 +156,19 @@ export const DrilldownConfigAction = (drilldownProps: ModuleConfigProps) => {
{
width: 100,
component: () => {

const defaultTableColumns = [
{ id: 'timestamp' },
{
id: 'timestamp',
isSortable: true,
defaultSortDirection: 'desc',
},
{ id: 'rule.description' },
{ id: 'data.github.org', displayAsText: 'Organization' },
{ id: 'data.github.repo', displayAsText: 'Repository' },
{ id: 'data.github.actor', displayAsText: 'Actor' },
{ id: 'rule.level' },
{ id: 'rule.id' },
]
];

return (
<DrillDownDataGrid
Expand All @@ -180,9 +178,9 @@ export const DrilldownConfigAction = (drilldownProps: ModuleConfigProps) => {
searchBarProps={searchBarProps}
indexPattern={indexPattern}
/>
)
);
},
}
},
],
},
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,15 @@
*/

import React, { useState, useMemo, useEffect } from 'react';
import { EuiFlexItem, EuiPanel, EuiToolTip, EuiButtonIcon, EuiDataGridCellValueElementProps, EuiDataGrid, EuiLink } from '@elastic/eui';
import {
EuiFlexItem,
EuiPanel,
EuiToolTip,
EuiButtonIcon,
EuiDataGridCellValueElementProps,
EuiDataGrid,
EuiLink,
} from '@elastic/eui';
import { ViewMode } from '../../../../../../../../src/plugins/embeddable/public';
import { getPlugins, getCore } from '../../../../../kibana-services';
import { DashboardPanelState } from '../../../../../../../../src/plugins/dashboard/public/application';
Expand All @@ -24,7 +32,11 @@ import {
getVisStateTopRepositories,
} from './visualizations';
import { ModuleConfigProps } from './module-config';
import { ErrorFactory, HttpError, ErrorHandler } from '../../../../../react-services/error-management';
import {
ErrorFactory,
HttpError,
ErrorHandler,
} from '../../../../../react-services/error-management';
import DrillDownDataGrid from './drilldown-data-grid';
import { rules } from '../../../../../utils/applications';
import { RedirectAppLinks } from '../../../../../../../../src/plugins/opensearch_dashboards_react/public';
Expand Down Expand Up @@ -114,13 +126,8 @@ const getDashboardPanels = (
};

export const DrilldownConfigActor = (drilldownProps: ModuleConfigProps) => {

const {
fetchData,
fetchFilters,
searchBarProps,
indexPattern
} = drilldownProps;
const { fetchData, fetchFilters, searchBarProps, indexPattern } =
drilldownProps;

return {
rows: [
Expand All @@ -141,7 +148,7 @@ export const DrilldownConfigActor = (drilldownProps: ModuleConfigProps) => {
id: 'github-drilldown-action-dashboard-tab',
timeRange: {
from: searchBarProps.dateRangeFrom,
to: searchBarProps.dateRangeTo
to: searchBarProps.dateRangeTo,
},
title: 'GitHub drilldown action dashboard',
description: 'Dashboard of the GitHub drilldown action',
Expand All @@ -152,7 +159,7 @@ export const DrilldownConfigActor = (drilldownProps: ModuleConfigProps) => {
},
hidePanelTitles: false,
}}
onInputUpdated={() => { }}
onInputUpdated={() => {}}
/>
</div>
);
Expand All @@ -166,14 +173,18 @@ export const DrilldownConfigActor = (drilldownProps: ModuleConfigProps) => {
width: 100,
component: () => {
const defaultTableColumns = [
{ id: 'timestamp' },
{
id: 'timestamp',
isSortable: true,
defaultSortDirection: 'desc',
},
{ id: 'rule.description' },
{ id: 'data.github.org', displayAsText: 'Organization' },
{ id: 'data.github.repo', displayAsText: 'Repository' },
{ id: 'data.github.action', displayAsText: 'Action' },
{ id: 'rule.level' },
{ id: 'rule.id' }
]
{ id: 'rule.id' },
];

return (
<DrillDownDataGrid
Expand All @@ -183,9 +194,9 @@ export const DrilldownConfigActor = (drilldownProps: ModuleConfigProps) => {
searchBarProps={searchBarProps}
indexPattern={indexPattern}
/>
)
);
},
}
},
],
},
],
Expand Down
Loading
Loading