github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Logs UI] Fixes date picker grid display bug (#36646) (#38111)

Browse source 
* Fixes display of date picker and streaming button grid

* Removes unused dependency that somehow slipped through the commit hook linter >.<

* Changes streaming button to empty style to de-emphasize a bit

* Updates streaming message to match standard case

* Updates yarn.lock for new core-js version that auto updated during bootstrap

* Removes unnecessary import
This commit is contained in:
Jason Rhodes 2019-06-05 23:17:40 -04:00 • committed by GitHub
parent 87b4d491d3
commit ff466b5d02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

64
x-pack/plugins/infra/public/components/logging/log_time_controls.tsx
View file

@ -4,13 +4,11 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { EuiDatePicker, EuiFilterButton, EuiFilterGroup } from '@elastic/eui';
import { EuiDatePicker, EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui';
import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
import moment, { Moment } from 'moment';
import React from 'react';
import euiStyled from '../../../../../common/eui_styled_components';
const noop = () => undefined;
interface LogTimeControlsProps {
@ -30,34 +28,36 @@ class LogTimeControlsUI extends React.PureComponent<LogTimeControlsProps> {
if (isLiveStreaming) {
return (
<EuiFilterGroup>
<InlineWrapper>
<EuiFlexGroup gutterSize="s">
<EuiFlexItem>
<EuiDatePicker
disabled
onChange={noop}
value={intl.formatMessage({
id: 'xpack.infra.logs.streamingDescription',
defaultMessage: 'streaming…',
defaultMessage: 'Streaming new entries…',
})}
/>
</InlineWrapper>
<EuiFilterButton
color="primary"
iconType="pause"
iconSide="left"
onClick={this.stopLiveStreaming}
>
<FormattedMessage
id="xpack.infra.logs.stopStreamingButtonLabel"
defaultMessage="Stop streaming"
/>
</EuiFilterButton>
</EuiFilterGroup>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButtonEmpty
color="primary"
iconType="pause"
iconSide="left"
onClick={this.stopLiveStreaming}
>
<FormattedMessage
id="xpack.infra.logs.stopStreamingButtonLabel"
defaultMessage="Stop streaming"
/>
</EuiButtonEmpty>
</EuiFlexItem>
</EuiFlexGroup>
);
} else {
return (
<EuiFilterGroup>
<InlineWrapper>
<EuiFlexGroup gutterSize="s">
<EuiFlexItem>
<EuiDatePicker
dateFormat="L LTS"
onChange={this.handleChangeDate}
@ -68,14 +68,16 @@ class LogTimeControlsUI extends React.PureComponent<LogTimeControlsProps> {
timeFormat="LTS"
injectTimes={currentMoment ? [currentMoment] : []}
/>
</InlineWrapper>
<EuiFilterButton iconType="play" iconSide="left" onClick={this.startLiveStreaming}>
<FormattedMessage
id="xpack.infra.logs.startStreamingButtonLabel"
defaultMessage="Stream live"
/>
</EuiFilterButton>
</EuiFilterGroup>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButtonEmpty iconType="play" iconSide="left" onClick={this.startLiveStreaming}>
<FormattedMessage
id="xpack.infra.logs.startStreamingButtonLabel"
defaultMessage="Stream live"
/>
</EuiButtonEmpty>
</EuiFlexItem>
</EuiFlexGroup>
);
}
}
@ -96,7 +98,3 @@ class LogTimeControlsUI extends React.PureComponent<LogTimeControlsProps> {
}
export const LogTimeControls = injectI18n(LogTimeControlsUI);
const InlineWrapper = euiStyled.div`
display: inline-block;
`;