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

Panels: Add types for DataList and range (#16500)

Browse Source
This commit is contained in:
Ryan McKinley
2019-04-10 22:57:24 -07:00
committed by Torkel Ödegaard
parent ef44a05be3
commit 5e48750868
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/features/dashboard/dashgrid/DataPanel.tsx
View File

@@ -15,6 +15,7 @@ import {
ScopedVars,
toSeriesData,
guessFieldTypes,
DataQuery,
} from '@grafana/ui';
interface RenderProps {
@@ -24,7 +25,7 @@ interface RenderProps {
export interface Props {
datasource: string | null;
queries: any[];
queries: DataQuery[];
panelId: number;
dashboardId?: number;
isVisible?: boolean;

11
public/app/features/panel/metrics_panel_ctrl.ts
View File

@@ -6,7 +6,8 @@ import { PanelCtrl } from 'app/features/panel/panel_ctrl';
import { getExploreUrl } from 'app/core/utils/explore';
import { applyPanelTimeOverrides, getResolution } from 'app/features/dashboard/utils/panel';
import { ContextSrv } from 'app/core/services/context_srv';
import { toLegacyResponseData, isSeriesData } from '@grafana/ui';
import { toLegacyResponseData, isSeriesData, LegacyResponseData, TimeRange } from '@grafana/ui';
import { Unsubscribable } from 'rxjs';
class MetricsPanelCtrl extends PanelCtrl {
scope: any;
@@ -17,15 +18,15 @@ class MetricsPanelCtrl extends PanelCtrl {
datasourceSrv: any;
timeSrv: any;
templateSrv: any;
range: any;
range: TimeRange;
interval: any;
intervalMs: any;
resolution: any;
timeInfo: any;
timeInfo?: string;
skipDataOnInit: boolean;
dataStream: any;
dataSubscription: any;
dataList: any;
dataSubscription?: Unsubscribable;
dataList: LegacyResponseData[];
constructor($scope, $injector) {
super($scope, $injector);

4
public/app/plugins/panel/heatmap/heatmap_ctrl.ts
View File

@@ -164,7 +164,7 @@ export class HeatmapCtrl extends MetricsPanelCtrl {
const logBase = this.panel.yAxis.logBase;
const xBucketNumber = this.panel.xBucketNumber || X_BUCKET_NUMBER_DEFAULT;
const xBucketSizeByNumber = Math.floor((this.range.to - this.range.from) / xBucketNumber);
const xBucketSizeByNumber = Math.floor((this.range.to.valueOf() - this.range.from.valueOf()) / xBucketNumber);
// Parse X bucket size (number or interval)
const isIntervalString = kbn.interval_regex.test(this.panel.xBucketSize);
@@ -333,7 +333,7 @@ export class HeatmapCtrl extends MetricsPanelCtrl {
if (datapoints && datapoints.length > 0) {
const last = datapoints[datapoints.length - 1][1];
const from = this.range.from;
if (last - from < -10000) {
if (last - from.valueOf() < -10000) {
series.isOutsideRange = true;
}
}