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

wip: panel-header: Move getResolution and calculateInterval into utils-functions and use the same code from react and angular

Browse Source
This commit is contained in:
Johannes Schill
2018-11-12 09:32:55 +01:00
parent 9fd62b80d9
commit e55f3f883f
5 changed files with 69 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,15 @@
import $ from 'jquery';
import _ from 'lodash';
import config from 'app/core/config';
import kbn from 'app/core/utils/kbn';
// import kbn from 'app/core/utils/kbn';
import { PanelCtrl } from 'app/features/panel/panel_ctrl';
import { getExploreUrl } from 'app/core/utils/explore';
import { metricsTabDirective } from './metrics_tab';
import { applyPanelTimeOverrides as applyPanelTimeOverridesUtil } from 'app/features/dashboard/utils/panel';
import {
applyPanelTimeOverrides as applyPanelTimeOverridesUtil,
calculateInterval as calculateIntervalUtil,
getResolution,
} from 'app/features/dashboard/utils/panel';
import { TimeData } from 'app/types';
class MetricsPanelCtrl extends PanelCtrl {
@@ -137,11 +140,7 @@ class MetricsPanelCtrl extends PanelCtrl {
this.applyPanelTimeOverrides();
if (this.panel.maxDataPoints) {
this.resolution = this.panel.maxDataPoints;
} else {
this.resolution = Math.ceil($(window).width() * (this.panel.gridPos.w / 24));
}
this.resolution = getResolution(this.panel);
this.calculateInterval();
@@ -149,18 +148,22 @@ class MetricsPanelCtrl extends PanelCtrl {
}
calculateInterval() {
let intervalOverride = this.panel.interval;
// let intervalOverride = this.panel.interval;
// if no panel interval check datasource
if (intervalOverride) {
intervalOverride = this.templateSrv.replace(intervalOverride, this.panel.scopedVars);
} else if (this.datasource && this.datasource.interval) {
intervalOverride = this.datasource.interval;
}
// // if no panel interval check datasource
// if (intervalOverride) {
// intervalOverride = this.templateSrv.replace(intervalOverride, this.panel.scopedVars);
// } else if (this.datasource && this.datasource.interval) {
// intervalOverride = this.datasource.interval;
// }
const res = kbn.calculateInterval(this.range, this.resolution, intervalOverride);
this.interval = res.interval;
this.intervalMs = res.intervalMs;
// const res = kbn.calculateInterval(this.range, this.resolution, intervalOverride);
// this.interval = res.interval;
// this.intervalMs = res.intervalMs;
const interval = calculateIntervalUtil(this.panel, this.datasource, this.range, this.resolution);
this.interval = interval.interval;
this.intervalMs = this.intervalMs;
}
applyPanelTimeOverrides() {