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

Jump to bottom

[7.4] [ML] Data Frame transform: Ensure preview table displays scripted fields and timestamps are formatted correctly. (#44701) #44771

Merged
merged 1 commit into from
Sep 4, 2019
Merged

[7.4] [ML] Data Frame transform: Ensure preview table displays scripted fields and timestamps are formatted correctly. (#44701) #44771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 34 additions & 36 deletions .../ml/public/data_frame/pages/data_frame_new_pivot/components/step_define/pivot_preview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,43 +229,41 @@ export const PivotPreview: SFC<PivotPreviewProps> = React.memo(({ aggs, groupBy,
const columnKeys = getFlattenedFields(dataFramePreviewData[0]);
columnKeys.sort(sortColumns(groupByArr));

const columns = columnKeys
.filter(k => typeof dataFramePreviewMappings.properties[k] !== 'undefined')
.map(k => {
const column: ColumnType = {
field: k,
name: k,
sortable: true,
truncateText: true,
};
if (typeof dataFramePreviewMappings.properties[k] !== 'undefined') {
const esFieldType = dataFramePreviewMappings.properties[k].type;
switch (esFieldType) {
case ES_FIELD_TYPES.BOOLEAN:
column.dataType = 'boolean';
break;
case ES_FIELD_TYPES.DATE:
column.align = 'right';
column.render = (d: any) => formatHumanReadableDateTimeSeconds(moment(d).unix() * 1000);
break;
case ES_FIELD_TYPES.BYTE:
case ES_FIELD_TYPES.DOUBLE:
case ES_FIELD_TYPES.FLOAT:
case ES_FIELD_TYPES.HALF_FLOAT:
case ES_FIELD_TYPES.INTEGER:
case ES_FIELD_TYPES.LONG:
case ES_FIELD_TYPES.SCALED_FLOAT:
case ES_FIELD_TYPES.SHORT:
column.dataType = 'number';
break;
case ES_FIELD_TYPES.KEYWORD:
case ES_FIELD_TYPES.TEXT:
column.dataType = 'string';
break;
}
const columns = columnKeys.map(k => {
const column: ColumnType = {
field: k,
name: k,
sortable: true,
truncateText: true,
};
if (typeof dataFramePreviewMappings.properties[k] !== 'undefined') {
const esFieldType = dataFramePreviewMappings.properties[k].type;
switch (esFieldType) {
case ES_FIELD_TYPES.BOOLEAN:
column.dataType = 'boolean';
break;
case ES_FIELD_TYPES.DATE:
column.align = 'right';
column.render = (d: any) => formatHumanReadableDateTimeSeconds(moment(d).unix() * 1000);
break;
case ES_FIELD_TYPES.BYTE:
case ES_FIELD_TYPES.DOUBLE:
case ES_FIELD_TYPES.FLOAT:
case ES_FIELD_TYPES.HALF_FLOAT:
case ES_FIELD_TYPES.INTEGER:
case ES_FIELD_TYPES.LONG:
case ES_FIELD_TYPES.SCALED_FLOAT:
case ES_FIELD_TYPES.SHORT:
column.dataType = 'number';
break;
case ES_FIELD_TYPES.KEYWORD:
case ES_FIELD_TYPES.TEXT:
column.dataType = 'string';
break;
}
return column;
});
}
return column;
});

if (columns.length === 0) {
return null;
Expand Down
53 changes: 42 additions & 11 deletions ..._frame/pages/transform_management/components/transform_list/expanded_row_preview_pane.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@

import React, { FC, useState } from 'react';
import { i18n } from '@kbn/i18n';
import { SortDirection, SORT_DIRECTION } from '../../../../../../common/types/eui/in_memory_table';
import moment from 'moment-timezone';
import {
SortDirection,
SORT_DIRECTION,
FieldDataColumnType,
} from '../../../../../../common/types/eui/in_memory_table';

import { ml } from '../../../../../services/ml_api_service';

Expand All @@ -16,15 +21,10 @@ import {
PreviewRequestBody,
DataFrameTransformPivotConfig,
} from '../../../../common';
import { ES_FIELD_TYPES } from '../../../../../../common/constants/field_types';
import { formatHumanReadableDateTimeSeconds } from '../../../../../util/date_utils';
import { TransformTable } from './transform_table';

interface Column {
field: string;
name: string;
sortable: boolean;
truncateText: boolean;
}

interface Props {
transformConfig: DataFrameTransformPivotConfig;
}
Expand Down Expand Up @@ -72,7 +72,7 @@ function getDataFromTransform(

export const ExpandedRowPreviewPane: FC<Props> = ({ transformConfig }) => {
const [dataFramePreviewData, setDataFramePreviewData] = useState([]);
const [columns, setColumns] = useState<Column[] | []>([]);
const [columns, setColumns] = useState<FieldDataColumnType[] | []>([]);
const [pageIndex, setPageIndex] = useState(0);
const [pageSize, setPageSize] = useState(10);
const [sortField, setSortField] = useState<string>('');
Expand All @@ -99,13 +99,44 @@ export const ExpandedRowPreviewPane: FC<Props> = ({ transformConfig }) => {
if (resp.preview.length > 0) {
const columnKeys = getFlattenedFields(resp.preview[0]);
columnKeys.sort(sortColumns(groupByArr));
const tableColumns = columnKeys.map(k => {
return {

const tableColumns: FieldDataColumnType[] = columnKeys.map(k => {
const column: FieldDataColumnType = {
field: k,
name: k,
sortable: true,
truncateText: true,
};

if (typeof resp.mappings.properties[k] !== 'undefined') {
const esFieldType = resp.mappings.properties[k].type;
switch (esFieldType) {
case ES_FIELD_TYPES.BOOLEAN:
column.dataType = 'boolean';
break;
case ES_FIELD_TYPES.DATE:
column.align = 'right';
column.render = (d: any) =>
formatHumanReadableDateTimeSeconds(moment(d).unix() * 1000);
break;
case ES_FIELD_TYPES.BYTE:
case ES_FIELD_TYPES.DOUBLE:
case ES_FIELD_TYPES.FLOAT:
case ES_FIELD_TYPES.HALF_FLOAT:
case ES_FIELD_TYPES.INTEGER:
case ES_FIELD_TYPES.LONG:
case ES_FIELD_TYPES.SCALED_FLOAT:
case ES_FIELD_TYPES.SHORT:
column.dataType = 'number';
break;
case ES_FIELD_TYPES.KEYWORD:
case ES_FIELD_TYPES.TEXT:
column.dataType = 'string';
break;
}
}

return column;
});

setDataFramePreviewData(resp.preview);
Expand Down