Explore: Uses new TimePicker from Grafana/UI (#17793)

* Wip: Intiail commit

* Refactor: Replaces TimePicker in Explore

* Refactor: Removes Angular TimePicker folder

* Refactor: Adds tests for getShiftedTimeRange

* Fix: Fixes invalid import to removed TimePicker

* Fix: Fixes dateTime tests

* Refactor: Reuses getShiftedTimeRange for both Explore and Dashboards

* Refactor: Shares getZoomedTimeRange between Explore and Dashboard
This commit is contained in:
Hugo Häggmark
2019-06-28 12:07:55 +02:00
committed by GitHub
parent 2379de53c4
commit ead4b1f5c7
27 changed files with 302 additions and 1032 deletions

View File

@@ -11,6 +11,7 @@ import {
LogRowModel,
LogsDedupStrategy,
LoadingState,
TimeRange,
} from '@grafana/ui';
import { ExploreId, ExploreItemState } from 'app/types/explore';
@@ -47,6 +48,7 @@ interface LogsContainerProps {
isLive: boolean;
stopLive: typeof changeRefreshIntervalAction;
updateTimeRange: typeof updateTimeRange;
range: TimeRange;
absoluteRange: AbsoluteTimeRange;
}
@@ -90,7 +92,9 @@ export class LogsContainer extends Component<LogsContainerProps> {
return (
nextProps.loading !== this.props.loading ||
nextProps.dedupStrategy !== this.props.dedupStrategy ||
nextProps.logsHighlighterExpressions !== this.props.logsHighlighterExpressions
nextProps.logsHighlighterExpressions !== this.props.logsHighlighterExpressions ||
nextProps.scanning !== this.props.scanning ||
nextProps.isLive !== this.props.isLive
);
}
@@ -107,7 +111,7 @@ export class LogsContainer extends Component<LogsContainerProps> {
absoluteRange,
timeZone,
scanning,
scanRange,
range,
width,
hiddenLogLevels,
isLive,
@@ -139,7 +143,7 @@ export class LogsContainer extends Component<LogsContainerProps> {
absoluteRange={absoluteRange}
timeZone={timeZone}
scanning={scanning}
scanRange={scanRange}
scanRange={range.raw}
width={width}
hiddenLogLevels={hiddenLogLevels}
getRowContext={this.getLogRowContext}
@@ -157,9 +161,9 @@ function mapStateToProps(state: StoreState, { exploreId }) {
logsResult,
loadingState,
scanning,
scanRange,
datasourceInstance,
isLive,
range,
absoluteRange,
} = item;
const loading = loadingState === LoadingState.Loading || loadingState === LoadingState.Streaming;
@@ -173,13 +177,13 @@ function mapStateToProps(state: StoreState, { exploreId }) {
logsHighlighterExpressions,
logsResult,
scanning,
scanRange,
timeZone,
dedupStrategy,
hiddenLogLevels,
dedupedResult,
datasourceInstance,
isLive,
range,
absoluteRange,
};
}