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

Share link should always have absolute time range, Closes #2060

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-05-28 09:35:47 +02:00
parent 96bd66e811
commit aeb8bc8755
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/features/dashboard/shareModalCtrl.js
View File

@ -43,9 +43,9 @@ function (angular, _, require, config) {
var params = angular.copy($location.search());
var range = timeSrv.timeRangeForUrl();
params.from = range.from;
params.to = range.to;
var range = timeSrv.timeRange();
params.from = range.from.getTime();
params.to = range.to.getTime();
if ($scope.options.includeTemplateVars) {
templateSrv.fillVariableValuesForUrl(params);

26
public/test/specs/shareModalCtrl-specs.js
View File

@ -9,10 +9,10 @@ define([
var ctx = new helpers.ControllerTestContext();
function setTime(range) {
ctx.timeSrv.timeRangeForUrl = sinon.stub().returns(range);
ctx.timeSrv.timeRange = sinon.stub().returns(range);
}
setTime({ from: 'now-1h', to: 'now' });
setTime({ from: new Date(1000), to: new Date(2000) });
beforeEach(module('grafana.controllers'));
beforeEach(module('grafana.services'));
@ -23,57 +23,43 @@ define([
describe('shareUrl with current time range and panel', function() {
it('should generate share url relative time', function() {
ctx.$location.path('/test');
ctx.scope.panel = { id: 22 };
setTime({ from: 'now-1h', to: 'now' });
ctx.scope.init();
expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=now-1h&to=now&panelId=22&fullscreen');
});
it('should generate share url absolute time', function() {
ctx.$location.path('/test');
ctx.scope.panel = { id: 22 };
setTime({ from: 1362178800000, to: 1396648800000 });
ctx.scope.init();
expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=1362178800000&to=1396648800000&panelId=22&fullscreen');
expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=1000&to=2000&panelId=22&fullscreen');
});
it('should remove panel id when no panel in scope', function() {
ctx.$location.path('/test');
ctx.scope.options.forCurrent = true;
ctx.scope.panel = null;
setTime({ from: 'now-1h', to: 'now' });
ctx.scope.init();
expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=now-1h&to=now');
expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=1000&to=2000');
});
it('should add theme when specified', function() {
ctx.$location.path('/test');
ctx.scope.options.theme = 'light';
ctx.scope.panel = null;
setTime({ from: 'now-1h', to: 'now' });
ctx.scope.init();
expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=now-1h&to=now&theme=light');
expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=1000&to=2000&theme=light');
});
it('should include template variables in url', function() {
ctx.$location.path('/test');
ctx.scope.options.includeTemplateVars = true;
setTime({ from: 'now-1h', to: 'now' });
ctx.templateSrv.fillVariableValuesForUrl = function(params) {
params['var-app'] = 'mupp';
params['var-server'] = 'srv-01';
};
ctx.scope.buildUrl();
expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=now-1h&to=now&var-app=mupp&var-server=srv-01');
expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=1000&to=2000&var-app=mupp&var-server=srv-01');
});
});