IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

s/initialDatasourceId/initialDatasource/

Browse Source
This commit is contained in:
David Kaltschmidt 2019-01-02 11:32:12 +00:00
parent 67ebdcbcc3
commit 757d6f322e
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/core/utils/explore.test.ts
View File

@ -68,7 +68,7 @@ describe('state functions', () => {
it('returns url parameter value for a state object', () => { it('returns url parameter value for a state object', () => {
const state = { const state = {
...DEFAULT_EXPLORE_STATE, ...DEFAULT_EXPLORE_STATE,
initialDatasourceId: 'foo', initialDatasource: 'foo',
range: { range: {
from: 'now-5h', from: 'now-5h',
to: 'now', to: 'now',
@ -93,7 +93,7 @@ describe('state functions', () => {
it('returns url parameter value for a state object', () => { it('returns url parameter value for a state object', () => {
const state = { const state = {
...DEFAULT_EXPLORE_STATE, ...DEFAULT_EXPLORE_STATE,
initialDatasourceId: 'foo', initialDatasource: 'foo',
range: { range: {
from: 'now-5h', from: 'now-5h',
to: 'now', to: 'now',
@ -119,7 +119,7 @@ describe('state functions', () => {
it('can parse the serialized state into the original state', () => { it('can parse the serialized state into the original state', () => {
const state = { const state = {
...DEFAULT_EXPLORE_STATE, ...DEFAULT_EXPLORE_STATE,
initialDatasourceId: 'foo', initialDatasource: 'foo',
range: { range: {
from: 'now - 5h', from: 'now - 5h',
to: 'now', to: 'now',
@ -143,7 +143,7 @@ describe('state functions', () => {
const resultState = { const resultState = {
...rest, ...rest,
datasource: DEFAULT_EXPLORE_STATE.datasource, datasource: DEFAULT_EXPLORE_STATE.datasource,
initialDatasourceId: datasource, initialDatasource: datasource,
initialQueries: queries, initialQueries: queries,
}; };

2
public/app/core/utils/explore.ts
View File

@ -105,7 +105,7 @@ export function parseUrlState(initial: string | undefined): ExploreUrlState {
export function serializeStateToUrlParam(state: ExploreState, compact?: boolean): string { export function serializeStateToUrlParam(state: ExploreState, compact?: boolean): string {
const urlState: ExploreUrlState = { const urlState: ExploreUrlState = {
datasource: state.initialDatasourceId, datasource: state.initialDatasource,
queries: state.initialQueries.map(clearQueryKeys), queries: state.initialQueries.map(clearQueryKeys),
range: state.range, range: state.range,
}; };

14
public/app/features/explore/Explore.tsx
View File

@ -95,7 +95,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
/** /**
* Set via URL or local storage * Set via URL or local storage
*/ */
initialDatasourceId: string; initialDatasource: string;
/** /**
* Current query expressions of the rows including their modifications, used for running queries. * Current query expressions of the rows including their modifications, used for running queries.
* Not kept in component state to prevent edit-render roundtrips. * Not kept in component state to prevent edit-render roundtrips.
@ -121,7 +121,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
initialQueries = splitState.initialQueries; initialQueries = splitState.initialQueries;
} else { } else {
const { datasource, queries, range } = props.urlState as ExploreUrlState; const { datasource, queries, range } = props.urlState as ExploreUrlState;
const initialDatasourceId = datasource || store.get(LAST_USED_DATASOURCE_KEY); const initialDatasource = datasource || store.get(LAST_USED_DATASOURCE_KEY);
initialQueries = ensureQueries(queries); initialQueries = ensureQueries(queries);
const initialRange = { from: parseTime(range.from), to: parseTime(range.to) } || { ...DEFAULT_RANGE }; const initialRange = { from: parseTime(range.from), to: parseTime(range.to) } || { ...DEFAULT_RANGE };
// Millies step for helper bar charts // Millies step for helper bar charts
@ -134,7 +134,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
exploreDatasources: [], exploreDatasources: [],
graphInterval: initialGraphInterval, graphInterval: initialGraphInterval,
graphResult: [], graphResult: [],
initialDatasourceId, initialDatasource,
initialQueries, initialQueries,
history: [], history: [],
logsResult: null, logsResult: null,
@ -158,7 +158,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
async componentDidMount() { async componentDidMount() {
const { datasourceSrv } = this.props; const { datasourceSrv } = this.props;
const { initialDatasourceId } = this.state; const { initialDatasource } = this.state;
if (!datasourceSrv) { if (!datasourceSrv) {
throw new Error('No datasource service passed as props.'); throw new Error('No datasource service passed as props.');
} }
@ -174,8 +174,8 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
this.setState({ datasourceLoading: true, exploreDatasources }); this.setState({ datasourceLoading: true, exploreDatasources });
// Priority for datasource preselection: URL, localstorage, default datasource // Priority for datasource preselection: URL, localstorage, default datasource
let datasource; let datasource;
if (initialDatasourceId) { if (initialDatasource) {
datasource = await datasourceSrv.get(initialDatasourceId); datasource = await datasourceSrv.get(initialDatasource);
} else { } else {
datasource = await datasourceSrv.get(); datasource = await datasourceSrv.get();
} }
@ -260,7 +260,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
supportsLogs, supportsLogs,
supportsTable, supportsTable,
datasourceLoading: false, datasourceLoading: false,
initialDatasourceId: datasource.name, initialDatasource: datasource.name,
initialQueries: nextQueries, initialQueries: nextQueries,
logsHighlighterExpressions: undefined, logsHighlighterExpressions: undefined,
showingStartPage: Boolean(StartPage), showingStartPage: Boolean(StartPage),

2
public/app/types/explore.ts
View File

@ -159,7 +159,7 @@ export interface ExploreState {
graphInterval: number; // in ms graphInterval: number; // in ms
graphResult?: any[]; graphResult?: any[];
history: HistoryItem[]; history: HistoryItem[];
initialDatasourceId?: string; initialDatasource?: string;
initialQueries: DataQuery[]; initialQueries: DataQuery[];
logsHighlighterExpressions?: string[]; logsHighlighterExpressions?: string[];
logsResult?: LogsModel; logsResult?: LogsModel;