-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[discover] add elastic-charts bar chart to discover
- Loading branch information
Emma Cunningham
committed
Jun 14, 2019
1 parent
5d90300
commit de8f4a3
Showing
8 changed files
with
244 additions
and
0 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
3 changes: 3 additions & 0 deletions
3
src/legacy/core_plugins/kibana/public/discover/components/histogram/_index.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 |
---|---|---|
@@ -0,0 +1,3 @@ | ||
.dscHistogram__header--partial { | ||
font-weight: $euiFontWeightRegular; | ||
} |
28 changes: 28 additions & 0 deletions
28
src/legacy/core_plugins/kibana/public/discover/components/histogram/directive.js
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,28 @@ | ||
/* | ||
* Licensed to Elasticsearch B.V. under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch B.V. licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
import 'ngreact'; | ||
import { uiModules } from 'ui/modules'; | ||
import { DiscoverHistogram } from './histogram'; | ||
|
||
import { wrapInI18nContext } from 'ui/i18n'; | ||
|
||
const app = uiModules.get('apps/discover', ['react']); | ||
|
||
app.directive('discoverHistogram', reactDirective => reactDirective(wrapInI18nContext(DiscoverHistogram))); |
181 changes: 181 additions & 0 deletions
181
src/legacy/core_plugins/kibana/public/discover/components/histogram/histogram.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 |
---|---|---|
@@ -0,0 +1,181 @@ | ||
/* | ||
* Licensed to Elasticsearch B.V. under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch B.V. licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiSpacer } from '@elastic/eui'; | ||
import moment from 'moment'; | ||
import React, { Component } from 'react'; | ||
import PropTypes from 'prop-types'; | ||
|
||
import { | ||
AnnotationDomainTypes, | ||
Axis, | ||
Chart, | ||
HistogramBarSeries, | ||
getAnnotationId, | ||
getAxisId, | ||
getSpecId, | ||
LineAnnotation, | ||
Position, | ||
ScaleType, | ||
Settings, | ||
RectAnnotation, | ||
TooltipValue, | ||
} from '@elastic/charts'; | ||
|
||
export interface DiscoverHistogramProps { | ||
chartData: any; // TODO: make this unknown? | ||
} | ||
|
||
export class DiscoverHistogram extends Component<DiscoverHistogramProps> { | ||
static propTypes = { | ||
chartData: PropTypes.object, | ||
}; | ||
|
||
render() { | ||
const { chartData } = this.props; | ||
|
||
if (!chartData || !chartData.series[0]) { | ||
return null; | ||
} | ||
|
||
const data = chartData.series[0].values; | ||
const format = chartData.xAxisFormat.params.pattern; | ||
const xInterval = chartData.ordered.interval; | ||
const xValues = chartData.xAxisOrderedValues; | ||
const lastXValue = xValues[xValues.length - 1]; | ||
|
||
const formatter = (val: string) => { | ||
return moment(val).format(format); | ||
}; | ||
|
||
const currentTime = { | ||
dataValue: moment(), | ||
details: '', | ||
}; | ||
|
||
const lineAnnotationStyle = { | ||
line: { | ||
strokeWidth: 2, | ||
stroke: '#c80000', | ||
opacity: 0.3, | ||
}, | ||
}; | ||
|
||
const domain = chartData.ordered; | ||
const domainStart = domain.min.valueOf(); | ||
const domainEnd = domain.max.valueOf(); | ||
|
||
const rectAnnotations = [ | ||
{ | ||
coordinates: { | ||
x0: domainStart, | ||
}, | ||
details: 'This area may contain partial data', | ||
}, | ||
{ | ||
coordinates: { | ||
x1: domainEnd, | ||
}, | ||
details: 'This area may contain partial data', | ||
}, | ||
]; | ||
|
||
const domainMin = data[0].x > domainStart ? domainStart : data[0].x; | ||
const xDomain = { | ||
domainRange: { | ||
min: domainMin, | ||
max: lastXValue, | ||
}, | ||
minInterval: xInterval, | ||
}; | ||
|
||
const onBrushEnd = (min: number, max: number) => { | ||
// console.log(min, max); | ||
}; | ||
|
||
// TODO: localize | ||
const partialDataText = | ||
'Part of this bucket may contain partial data. The selected time range does not fully cover it.'; | ||
|
||
const tooltipHeaderFormater = (headerData: TooltipValue): JSX.Element | string => { | ||
const headerDataValue = headerData.value; | ||
const formattedValue = formatter(headerDataValue); | ||
|
||
if (headerDataValue < domainStart || headerDataValue + xInterval > domainEnd) { | ||
return ( | ||
<React.Fragment> | ||
<EuiFlexGroup alignItems="center" className="dscHistogram__header--partial"> | ||
<EuiFlexItem grow={false}> | ||
<EuiIcon type="iInCircle" /> | ||
</EuiFlexItem> | ||
<EuiFlexItem>{partialDataText}</EuiFlexItem> | ||
</EuiFlexGroup> | ||
<EuiSpacer size="m" /> | ||
<p>{formattedValue}</p> | ||
</React.Fragment> | ||
); | ||
} | ||
|
||
return formattedValue; | ||
}; | ||
|
||
const tooltipProps = { | ||
headerFormatter: tooltipHeaderFormater, | ||
}; | ||
|
||
return ( | ||
<Chart> | ||
<Settings xDomain={xDomain} onBrushEnd={onBrushEnd} tooltip={tooltipProps} /> | ||
<Axis | ||
id={getAxisId('discover-histogram-left-axis')} | ||
position={Position.Left} | ||
title={chartData.yAxisLabel} | ||
/> | ||
<Axis | ||
id={getAxisId('discover-histogram-bottom-axis')} | ||
position={Position.Bottom} | ||
title={chartData.xAxisLabel} | ||
tickFormat={formatter} | ||
/> | ||
<LineAnnotation | ||
annotationId={getAnnotationId('line-annotation')} | ||
domainType={AnnotationDomainTypes.XDomain} | ||
dataValues={[currentTime]} | ||
hideTooltips={true} | ||
style={lineAnnotationStyle} | ||
/> | ||
<RectAnnotation | ||
dataValues={rectAnnotations} | ||
annotationId={getAnnotationId('rect-annotation')} | ||
zIndex={2} | ||
/> | ||
<HistogramBarSeries | ||
id={getSpecId('discover-histogram')} | ||
xScaleType={ScaleType.Time} | ||
yScaleType={ScaleType.Linear} | ||
xAccessor="x" | ||
yAccessors={['y']} | ||
data={data} | ||
timeZone={'local'} | ||
name={'Count'} | ||
/> | ||
</Chart> | ||
); | ||
} | ||
} |
20 changes: 20 additions & 0 deletions
20
src/legacy/core_plugins/kibana/public/discover/components/histogram/index.js
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,20 @@ | ||
/* | ||
* Licensed to Elasticsearch B.V. under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch B.V. licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
import './directive'; |
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
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