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.

Sign up for GitHub

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

[7.x] [Logs UI] Correctly update the expanded log rate table rows (#60306) #60643

Merged
merged 2 commits into from
Mar 20, 2020
Merged

[7.x] [Logs UI] Correctly update the expanded log rate table rows (#60306) #60643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbe932e
[Logs UI] Correctly update the expanded log rate table rows (#60306)
weltenwort Mar 19, 2020
6d85059
Merge branch '7.x' into backport/7.x/pr-60306
elasticmachine Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/expanded_row.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import { AnomaliesChart } from './chart';

export const AnomaliesTableExpandedRow: React.FunctionComponent<{
partitionId: string;
topAnomalyScore: number;
results: LogEntryRateResults;
setTimeRange: (timeRange: TimeRange) => void;
timeRange: TimeRange;
Expand Down
118 changes: 55 additions & 63 deletions x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { EuiBasicTable, EuiBasicTableColumn } from '@elastic/eui';
import { RIGHT_ALIGNMENT } from '@elastic/eui/lib/services';
import { i18n } from '@kbn/i18n';
import React, { useCallback, useMemo, useState } from 'react';

import { useSet } from 'react-use';
import { euiStyled } from '../../../../../../../observability/public';
import { TimeRange } from '../../../../../../common/http_api/shared/time_range';
import {
Expand Down Expand Up @@ -64,9 +64,31 @@ export const AnomaliesTable: React.FunctionComponent<{
});
}, [results]);

const [itemIdToExpandedRowMap, setItemIdToExpandedRowMap] = useState<
Record<string, React.ReactNode>
>({});
const [expandedDatasetIds, { add: expandDataset, remove: collapseDataset }] = useSet<string>(
new Set()
);

const expandedDatasetRowContents = useMemo(
() =>
[...expandedDatasetIds].reduce<Record<string, React.ReactNode>>(
(aggregatedDatasetRows, datasetId) => {
return {
...aggregatedDatasetRows,
[getFriendlyNameForPartitionId(datasetId)]: (
<AnomaliesTableExpandedRow
partitionId={datasetId}
results={results}
setTimeRange={setTimeRange}
timeRange={timeRange}
jobId={jobId}
/>
),
};
},
{}
),
[expandedDatasetIds, jobId, results, setTimeRange, timeRange]
);

const [sorting, setSorting] = useState<SortingOptions>({
sort: {
Expand Down Expand Up @@ -98,73 +120,43 @@ export const AnomaliesTable: React.FunctionComponent<{
return sorting.sort.direction === 'asc' ? sortedItems : sortedItems.reverse();
}, [tableItems, sorting]);

const expandItem = useCallback(
(item: TableItem) => {
const newItemIdToExpandedRowMap = {
...itemIdToExpandedRowMap,
[item.partitionName]: (
<AnomaliesTableExpandedRow
partitionId={item.partitionId}
results={results}
topAnomalyScore={item.topAnomalyScore}
setTimeRange={setTimeRange}
timeRange={timeRange}
jobId={jobId}
const columns: Array<EuiBasicTableColumn<TableItem>> = useMemo(
() => [
{
field: 'partitionName',
name: partitionColumnName,
sortable: true,
truncateText: true,
},
{
field: 'topAnomalyScore',
name: maxAnomalyScoreColumnName,
sortable: true,
truncateText: true,
dataType: 'number' as const,
},
{
align: RIGHT_ALIGNMENT,
width: '40px',
isExpander: true,
render: (item: TableItem) => (
<RowExpansionButton
isExpanded={expandedDatasetIds.has(item.partitionId)}
item={item.partitionId}
onExpand={expandDataset}
onCollapse={collapseDataset}
/>
),
};
setItemIdToExpandedRowMap(newItemIdToExpandedRowMap);
},
[itemIdToExpandedRowMap, jobId, results, setTimeRange, timeRange]
},
],
[collapseDataset, expandDataset, expandedDatasetIds]
);

const collapseItem = useCallback(
(item: TableItem) => {
if (itemIdToExpandedRowMap[item.partitionName]) {
const {
[item.partitionName]: toggledItem,
...remainingExpandedRowMap
} = itemIdToExpandedRowMap;
setItemIdToExpandedRowMap(remainingExpandedRowMap);
}
},
[itemIdToExpandedRowMap]
);

const columns: Array<EuiBasicTableColumn<TableItem>> = [
{
field: 'partitionName',
name: partitionColumnName,
sortable: true,
truncateText: true,
},
{
field: 'topAnomalyScore',
name: maxAnomalyScoreColumnName,
sortable: true,
truncateText: true,
dataType: 'number' as const,
},
{
align: RIGHT_ALIGNMENT,
width: '40px',
isExpander: true,
render: (item: TableItem) => (
<RowExpansionButton
isExpanded={item.partitionName in itemIdToExpandedRowMap}
item={item}
onExpand={expandItem}
onCollapse={collapseItem}
/>
),
},
];

return (
<StyledEuiBasicTable
items={sortedTableItems}
itemId="partitionName"
itemIdToExpandedRowMap={itemIdToExpandedRowMap}
itemIdToExpandedRowMap={expandedDatasetRowContents}
isExpandable={true}
hasActions={true}
columns={columns}
Expand Down