IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-03 12:11:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

renaming function

Browse Source
This commit is contained in:
Peter Holmberg 2019-03-14 17:39:56 +01:00
parent cf55d68894
commit 52dcb9bf00
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ import {
ResultGetter,
} from 'app/types/explore';
import { LogsDedupStrategy } from 'app/core/logs_model';
import { getNextQueryLetter } from './query';
import { getNextRefIdLetter } from './query';
export const DEFAULT_RANGE = {
from: 'now-6h',
@ -227,7 +227,7 @@ export function generateKey(index = 0): string {
}
export function generateEmptyQuery(queries: DataQuery[], index = 0): { refId: string; key: string } {
return { refId: getNextQueryLetter(queries), key: generateKey(index) };
return { refId: getNextRefIdLetter(queries), key: generateKey(index) };
}
/**

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

@ -1,7 +1,7 @@
import _ from 'lodash';
import { DataQuery } from '@grafana/ui/';
export const getNextQueryLetter = (queries: DataQuery[]): string => {
export const getNextRefIdLetter = (queries: DataQuery[]): string => {
const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
return _.find(letters, refId => {

6
public/app/features/dashboard/state/PanelModel.ts
View File

@ -5,7 +5,7 @@ import _ from 'lodash';
import { Emitter } from 'app/core/utils/emitter';
import { DataQuery, TimeSeries, Threshold, ScopedVars, PanelTypeChangedHook } from '@grafana/ui';
import { TableData } from '@grafana/ui/src';
import { getNextQueryLetter } from '../../../core/utils/query';
import { getNextRefIdLetter } from '../../../core/utils/query';
export interface GridPos {
x: number;
@ -129,7 +129,7 @@ export class PanelModel {
if (this.targets) {
for (const query of this.targets) {
if (!query.refId) {
query.refId = getNextQueryLetter(this.targets);
query.refId = getNextRefIdLetter(this.targets);
}
}
}
@ -267,7 +267,7 @@ export class PanelModel {
addQuery(query?: Partial<DataQuery>) {
query = query || { refId: 'A' };
query.refId = getNextQueryLetter(this.targets);
query.refId = getNextRefIdLetter(this.targets);
this.targets.push(query as DataQuery);
}