From 7824f66cd3b8be1d30ec6206817d45634fdc37b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 15 May 2019 13:10:59 +0200 Subject: [PATCH] Explore: fixed cherrypick / merge issue --- public/app/features/explore/LogsContainer.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/app/features/explore/LogsContainer.tsx b/public/app/features/explore/LogsContainer.tsx index dc2cb88129c..e62906c2a84 100644 --- a/public/app/features/explore/LogsContainer.tsx +++ b/public/app/features/explore/LogsContainer.tsx @@ -1,7 +1,8 @@ import React, { PureComponent } from 'react'; import { hot } from 'react-hot-loader'; import { connect } from 'react-redux'; -import { RawTimeRange, TimeRange, LogLevel, TimeZone, AbsoluteTimeRange, toUtc, dateTime } from '@grafana/ui'; +import moment from 'moment'; +import { RawTimeRange, TimeRange, LogLevel, TimeZone, AbsoluteTimeRange } from '@grafana/ui'; import { ExploreId, ExploreItemState } from 'app/types/explore'; import { LogsModel, LogsDedupStrategy } from 'app/core/logs_model'; @@ -41,13 +42,12 @@ export class LogsContainer extends PureComponent { onChangeTime = (absRange: AbsoluteTimeRange) => { const { exploreId, timeZone, changeTime } = this.props; const range = { - from: timeZone.isUtc ? toUtc(absRange.from) : dateTime(absRange.from), - to: timeZone.isUtc ? toUtc(absRange.to) : dateTime(absRange.to), + from: timeZone.isUtc ? moment.utc(absRange.from) : moment(absRange.from), + to: timeZone.isUtc ? moment.utc(absRange.to) : moment(absRange.to), }; changeTime(exploreId, range); }; - onClickLogsButton = () => { this.props.toggleLogs(this.props.exploreId, this.props.showingLogs); };