- 
+
{dataSource.name}
- {dataSource.isDefault && default}
+ {dataSource.isDefault && default}
{dataSource.url}
diff --git a/public/app/features/datasources/__snapshots__/DataSourcesListItem.test.tsx.snap b/public/app/features/datasources/__snapshots__/DataSourcesListItem.test.tsx.snap
index a424276cf32..3ab1b1d53aa 100644
--- a/public/app/features/datasources/__snapshots__/DataSourcesListItem.test.tsx.snap
+++ b/public/app/features/datasources/__snapshots__/DataSourcesListItem.test.tsx.snap
@@ -24,6 +24,7 @@ exports[`Render should render component 1`] = `
className="card-item-figure"
>
diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx
index 909c4e81b8b..b210bcccc18 100644
--- a/public/app/features/explore/Explore.tsx
+++ b/public/app/features/explore/Explore.tsx
@@ -1,5 +1,5 @@
// Libraries
-import React from 'react';
+import React, { ComponentClass } from 'react';
import { hot } from 'react-hot-loader';
import { connect } from 'react-redux';
import _ from 'lodash';
@@ -18,34 +18,26 @@ import TableContainer from './TableContainer';
import TimePicker, { parseTime } from './TimePicker';
// Actions
-import {
- changeSize,
- changeTime,
- initializeExplore,
- modifyQueries,
- scanStart,
- scanStop,
- setQueries,
-} from './state/actions';
+import { changeSize, changeTime, initializeExplore, modifyQueries, scanStart, setQueries } from './state/actions';
// Types
-import { RawTimeRange, TimeRange, DataQuery } from '@grafana/ui';
+import { RawTimeRange, TimeRange, DataQuery, ExploreStartPageProps, ExploreDataSourceApi } from '@grafana/ui';
import { ExploreItemState, ExploreUrlState, RangeScanner, ExploreId } from 'app/types/explore';
import { StoreState } from 'app/types';
-import { LAST_USED_DATASOURCE_KEY, ensureQueries, DEFAULT_RANGE } from 'app/core/utils/explore';
+import { LAST_USED_DATASOURCE_KEY, ensureQueries, DEFAULT_RANGE, DEFAULT_UI_STATE } from 'app/core/utils/explore';
import { Emitter } from 'app/core/utils/emitter';
import { ExploreToolbar } from './ExploreToolbar';
+import { scanStopAction } from './state/actionTypes';
interface ExploreProps {
- StartPage?: any;
+ StartPage?: ComponentClass
;
changeSize: typeof changeSize;
changeTime: typeof changeTime;
datasourceError: string;
- datasourceInstance: any;
+ datasourceInstance: ExploreDataSourceApi;
datasourceLoading: boolean | null;
datasourceMissing: boolean;
exploreId: ExploreId;
- initialQueries: DataQuery[];
initializeExplore: typeof initializeExplore;
initialized: boolean;
modifyQueries: typeof modifyQueries;
@@ -54,7 +46,7 @@ interface ExploreProps {
scanning?: boolean;
scanRange?: RawTimeRange;
scanStart: typeof scanStart;
- scanStop: typeof scanStop;
+ scanStopAction: typeof scanStopAction;
setQueries: typeof setQueries;
split: boolean;
showingStartPage?: boolean;
@@ -62,6 +54,7 @@ interface ExploreProps {
supportsLogs: boolean | null;
supportsTable: boolean | null;
urlState: ExploreUrlState;
+ queryKeys: string[];
}
/**
@@ -107,18 +100,20 @@ export class Explore extends React.PureComponent {
// Don't initialize on split, but need to initialize urlparameters when present
if (!initialized) {
// Load URL state and parse range
- const { datasource, queries, range = DEFAULT_RANGE } = (urlState || {}) as ExploreUrlState;
+ const { datasource, queries, range = DEFAULT_RANGE, ui = DEFAULT_UI_STATE } = (urlState || {}) as ExploreUrlState;
const initialDatasource = datasource || store.get(LAST_USED_DATASOURCE_KEY);
const initialQueries: DataQuery[] = ensureQueries(queries);
const initialRange = { from: parseTime(range.from), to: parseTime(range.to) };
const width = this.el ? this.el.offsetWidth : 0;
+
this.props.initializeExplore(
exploreId,
initialDatasource,
initialQueries,
initialRange,
width,
- this.exploreEvents
+ this.exploreEvents,
+ ui
);
}
}
@@ -171,7 +166,7 @@ export class Explore extends React.PureComponent {
};
onStopScanning = () => {
- this.props.scanStop(this.props.exploreId);
+ this.props.scanStopAction({ exploreId: this.props.exploreId });
};
render() {
@@ -182,12 +177,12 @@ export class Explore extends React.PureComponent {
datasourceLoading,
datasourceMissing,
exploreId,
- initialQueries,
showingStartPage,
split,
supportsGraph,
supportsLogs,
supportsTable,
+ queryKeys,
} = this.props;
const exploreClass = split ? 'explore explore-split' : 'explore';
@@ -208,7 +203,7 @@ export class Explore extends React.PureComponent {
{datasourceInstance &&
!datasourceError && (
-
+
{({ width }) => (
@@ -216,7 +211,7 @@ export class Explore extends React.PureComponent {
{showingStartPage && }
{!showingStartPage && (
<>
- {supportsGraph && }
+ {supportsGraph && !supportsLogs && }
{supportsTable && }
{supportsLogs && (
{
this.props.runQuery(this.props.exploreId);
};
+ onCloseTimePicker = () => {
+ this.props.timepickerRef.current.setState({ isOpen: false });
+ };
+
render() {
const {
datasourceMissing,
@@ -137,7 +142,9 @@ export class UnConnectedExploreToolbar extends PureComponent {
-
+
+
+