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

Merge pull request #12809 from dehrax/12224-share-modal-ctrl

Browse Source 
Karma to Jest: share_modal_ctrl
This commit is contained in:
Marcus Efraimsson 2018-08-14 10:57:15 +02:00 committed by GitHub
commit 77ee032e41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 239 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
public/app/features/dashboard/shareModalCtrl.ts
View File

@ -2,120 +2,118 @@ import angular from 'angular';
import config from 'app/core/config'; import config from 'app/core/config';
import moment from 'moment'; import moment from 'moment';
export class ShareModalCtrl { /** @ngInject */
/** @ngInject */ export function ShareModalCtrl($scope, $rootScope, $location, $timeout, timeSrv, templateSrv, linkSrv) {
constructor($scope, $rootScope, $location, $timeout, timeSrv, templateSrv, linkSrv) { $scope.options = {
$scope.options = { forCurrent: true,
forCurrent: true, includeTemplateVars: true,
includeTemplateVars: true, theme: 'current',
theme: 'current', };
}; $scope.editor = { index: $scope.tabIndex || 0 };
$scope.editor = { index: $scope.tabIndex || 0 };
$scope.init = function() { $scope.init = function() {
$scope.modeSharePanel = $scope.panel ? true : false; $scope.modeSharePanel = $scope.panel ? true : false;
$scope.tabs = [{ title: 'Link', src: 'shareLink.html' }]; $scope.tabs = [{ title: 'Link', src: 'shareLink.html' }];
if ($scope.modeSharePanel) { if ($scope.modeSharePanel) {
$scope.modalTitle = 'Share Panel'; $scope.modalTitle = 'Share Panel';
$scope.tabs.push({ title: 'Embed', src: 'shareEmbed.html' }); $scope.tabs.push({ title: 'Embed', src: 'shareEmbed.html' });
} else { } else {
$scope.modalTitle = 'Share'; $scope.modalTitle = 'Share';
} }
if (!$scope.dashboard.meta.isSnapshot) { if (!$scope.dashboard.meta.isSnapshot) {
$scope.tabs.push({ title: 'Snapshot', src: 'shareSnapshot.html' }); $scope.tabs.push({ title: 'Snapshot', src: 'shareSnapshot.html' });
} }
if (!$scope.dashboard.meta.isSnapshot && !$scope.modeSharePanel) { if (!$scope.dashboard.meta.isSnapshot && !$scope.modeSharePanel) {
$scope.tabs.push({ title: 'Export', src: 'shareExport.html' }); $scope.tabs.push({ title: 'Export', src: 'shareExport.html' });
} }
$scope.buildUrl(); $scope.buildUrl();
}; };
$scope.buildUrl = function() { $scope.buildUrl = function() {
var baseUrl = $location.absUrl(); var baseUrl = $location.absUrl();
var queryStart = baseUrl.indexOf('?'); var queryStart = baseUrl.indexOf('?');
if (queryStart !== -1) { if (queryStart !== -1) {
baseUrl = baseUrl.substring(0, queryStart); baseUrl = baseUrl.substring(0, queryStart);
} }
var params = angular.copy($location.search()); var params = angular.copy($location.search());
var range = timeSrv.timeRange(); var range = timeSrv.timeRange();
params.from = range.from.valueOf(); params.from = range.from.valueOf();
params.to = range.to.valueOf(); params.to = range.to.valueOf();
params.orgId = config.bootData.user.orgId; params.orgId = config.bootData.user.orgId;
if ($scope.options.includeTemplateVars) { if ($scope.options.includeTemplateVars) {
templateSrv.fillVariableValuesForUrl(params); templateSrv.fillVariableValuesForUrl(params);
} }
if (!$scope.options.forCurrent) { if (!$scope.options.forCurrent) {
delete params.from; delete params.from;
delete params.to; delete params.to;
} }
if ($scope.options.theme !== 'current') { if ($scope.options.theme !== 'current') {
params.theme = $scope.options.theme; params.theme = $scope.options.theme;
} }
if ($scope.modeSharePanel) { if ($scope.modeSharePanel) {
params.panelId = $scope.panel.id; params.panelId = $scope.panel.id;
params.fullscreen = true; params.fullscreen = true;
} else { } else {
delete params.panelId; delete params.panelId;
delete params.fullscreen;
}
$scope.shareUrl = linkSrv.addParamsToUrl(baseUrl, params);
var soloUrl = baseUrl.replace(config.appSubUrl + '/dashboard/', config.appSubUrl + '/dashboard-solo/');
soloUrl = soloUrl.replace(config.appSubUrl + '/d/', config.appSubUrl + '/d-solo/');
delete params.fullscreen; delete params.fullscreen;
delete params.edit; }
soloUrl = linkSrv.addParamsToUrl(soloUrl, params);
$scope.iframeHtml = '<iframe src="' + soloUrl + '" width="450" height="200" frameborder="0"></iframe>'; $scope.shareUrl = linkSrv.addParamsToUrl(baseUrl, params);
$scope.imageUrl = soloUrl.replace( var soloUrl = baseUrl.replace(config.appSubUrl + '/dashboard/', config.appSubUrl + '/dashboard-solo/');
config.appSubUrl + '/dashboard-solo/', soloUrl = soloUrl.replace(config.appSubUrl + '/d/', config.appSubUrl + '/d-solo/');
config.appSubUrl + '/render/dashboard-solo/' delete params.fullscreen;
); delete params.edit;
$scope.imageUrl = $scope.imageUrl.replace(config.appSubUrl + '/d-solo/', config.appSubUrl + '/render/d-solo/'); soloUrl = linkSrv.addParamsToUrl(soloUrl, params);
$scope.imageUrl += '&width=1000&height=500' + $scope.getLocalTimeZone();
};
// This function will try to return the proper full name of the local timezone $scope.iframeHtml = '<iframe src="' + soloUrl + '" width="450" height="200" frameborder="0"></iframe>';
// Chrome does not handle the timezone offset (but phantomjs does)
$scope.getLocalTimeZone = function() {
let utcOffset = '&tz=UTC' + encodeURIComponent(moment().format('Z'));
// Older browser does not the internationalization API $scope.imageUrl = soloUrl.replace(
if (!(<any>window).Intl) { config.appSubUrl + '/dashboard-solo/',
return utcOffset; config.appSubUrl + '/render/dashboard-solo/'
} );
$scope.imageUrl = $scope.imageUrl.replace(config.appSubUrl + '/d-solo/', config.appSubUrl + '/render/d-solo/');
$scope.imageUrl += '&width=1000&height=500' + $scope.getLocalTimeZone();
};
const dateFormat = (<any>window).Intl.DateTimeFormat(); // This function will try to return the proper full name of the local timezone
if (!dateFormat.resolvedOptions) { // Chrome does not handle the timezone offset (but phantomjs does)
return utcOffset; $scope.getLocalTimeZone = function() {
} let utcOffset = '&tz=UTC' + encodeURIComponent(moment().format('Z'));
const options = dateFormat.resolvedOptions(); // Older browser does not the internationalization API
if (!options.timeZone) { if (!(<any>window).Intl) {
return utcOffset; return utcOffset;
} }
return '&tz=' + encodeURIComponent(options.timeZone); const dateFormat = (<any>window).Intl.DateTimeFormat();
}; if (!dateFormat.resolvedOptions) {
return utcOffset;
}
$scope.getShareUrl = function() { const options = dateFormat.resolvedOptions();
return $scope.shareUrl; if (!options.timeZone) {
}; return utcOffset;
} }
return '&tz=' + encodeURIComponent(options.timeZone);
};
$scope.getShareUrl = function() {
return $scope.shareUrl;
};
} }
angular.module('grafana.controllers').controller('ShareModalCtrl', ShareModalCtrl); angular.module('grafana.controllers').controller('ShareModalCtrl', ShareModalCtrl);

150
public/app/features/dashboard/specs/share_modal_ctrl.jest.ts Normal file
View File

@ -0,0 +1,150 @@
import '../shareModalCtrl';
import { ShareModalCtrl } from '../shareModalCtrl';
import config from 'app/core/config';
import { LinkSrv } from 'app/features/panellinks/link_srv';
describe('ShareModalCtrl', () => {
var ctx = <any>{
timeSrv: {
timeRange: () => {
return { from: new Date(1000), to: new Date(2000) };
},
},
$location: {
absUrl: () => 'http://server/#!/test',
search: () => {
return { from: '', to: '' };
},
},
scope: {
dashboard: {
meta: {
isSnapshot: true,
},
},
},
templateSrv: {
fillVariableValuesForUrl: () => {},
},
};
(<any>window).Intl.DateTimeFormat = () => {
return {
resolvedOptions: () => {
return { timeZone: 'UTC' };
},
};
};
beforeEach(() => {
config.bootData = {
user: {
orgId: 1,
},
};
ctx.ctrl = new ShareModalCtrl(
ctx.scope,
{},
ctx.$location,
{},
ctx.timeSrv,
ctx.templateSrv,
new LinkSrv({}, ctx.stimeSrv)
);
});
describe('shareUrl with current time range and panel', () => {
it('should generate share url absolute time', () => {
ctx.scope.panel = { id: 22 };
ctx.scope.init();
expect(ctx.scope.shareUrl).toBe('http://server/#!/test?from=1000&to=2000&orgId=1&panelId=22&fullscreen');
});
it('should generate render url', () => {
ctx.$location.absUrl = () => 'http://dashboards.grafana.com/d/abcdefghi/my-dash';
ctx.scope.panel = { id: 22 };
ctx.scope.init();
var base = 'http://dashboards.grafana.com/render/d-solo/abcdefghi/my-dash';
var params = '?from=1000&to=2000&orgId=1&panelId=22&width=1000&height=500&tz=UTC';
expect(ctx.scope.imageUrl).toContain(base + params);
});
it('should generate render url for scripted dashboard', () => {
ctx.$location.absUrl = () => 'http://dashboards.grafana.com/dashboard/script/my-dash.js';
ctx.scope.panel = { id: 22 };
ctx.scope.init();
var base = 'http://dashboards.grafana.com/render/dashboard-solo/script/my-dash.js';
var params = '?from=1000&to=2000&orgId=1&panelId=22&width=1000&height=500&tz=UTC';
expect(ctx.scope.imageUrl).toContain(base + params);
});
it('should remove panel id when no panel in scope', () => {
ctx.$location.absUrl = () => 'http://server/#!/test';
ctx.scope.options.forCurrent = true;
ctx.scope.panel = null;
ctx.scope.init();
expect(ctx.scope.shareUrl).toBe('http://server/#!/test?from=1000&to=2000&orgId=1');
});
it('should add theme when specified', () => {
ctx.scope.options.theme = 'light';
ctx.scope.panel = null;
ctx.scope.init();
expect(ctx.scope.shareUrl).toBe('http://server/#!/test?from=1000&to=2000&orgId=1&theme=light');
});
it('should remove fullscreen from image url when is first param in querystring and modeSharePanel is true', () => {
ctx.$location.search = () => {
return { fullscreen: true, edit: true };
};
ctx.$location.absUrl = () => 'http://server/#!/test?fullscreen&edit';
ctx.scope.modeSharePanel = true;
ctx.scope.panel = { id: 1 };
ctx.scope.buildUrl();
expect(ctx.scope.shareUrl).toContain('?fullscreen&edit&from=1000&to=2000&orgId=1&panelId=1');
expect(ctx.scope.imageUrl).toContain('?from=1000&to=2000&orgId=1&panelId=1&width=1000&height=500&tz=UTC');
});
it('should remove edit from image url when is first param in querystring and modeSharePanel is true', () => {
ctx.$location.search = () => {
return { edit: true, fullscreen: true };
};
ctx.$location.absUrl = () => 'http://server/#!/test?edit&fullscreen';
ctx.scope.modeSharePanel = true;
ctx.scope.panel = { id: 1 };
ctx.scope.buildUrl();
expect(ctx.scope.shareUrl).toContain('?edit&fullscreen&from=1000&to=2000&orgId=1&panelId=1');
expect(ctx.scope.imageUrl).toContain('?from=1000&to=2000&orgId=1&panelId=1&width=1000&height=500&tz=UTC');
});
it('should include template variables in url', () => {
ctx.$location.search = () => {
return {};
};
ctx.$location.absUrl = () => 'http://server/#!/test';
ctx.scope.options.includeTemplateVars = true;
ctx.templateSrv.fillVariableValuesForUrl = function(params) {
params['var-app'] = 'mupp';
params['var-server'] = 'srv-01';
};
ctx.scope.buildUrl();
expect(ctx.scope.shareUrl).toContain(
'http://server/#!/test?from=1000&to=2000&orgId=1&var-app=mupp&var-server=srv-01'
);
});
});
});

122
public/app/features/dashboard/specs/share_modal_ctrl_specs.ts
View File

@ -1,122 +0,0 @@
import { describe, beforeEach, it, expect, sinon, angularMocks } from 'test/lib/common';
import helpers from 'test/specs/helpers';
import '../shareModalCtrl';
import config from 'app/core/config';
import 'app/features/panellinks/link_srv';
describe('ShareModalCtrl', function() {
var ctx = new helpers.ControllerTestContext();
function setTime(range) {
ctx.timeSrv.timeRange = sinon.stub().returns(range);
}
beforeEach(function() {
config.bootData = {
user: {
orgId: 1,
},
};
});
setTime({ from: new Date(1000), to: new Date(2000) });
beforeEach(angularMocks.module('grafana.controllers'));
beforeEach(angularMocks.module('grafana.services'));
beforeEach(
angularMocks.module(function($compileProvider) {
$compileProvider.preAssignBindingsEnabled(true);
})
);
beforeEach(ctx.providePhase());
beforeEach(ctx.createControllerPhase('ShareModalCtrl'));
describe('shareUrl with current time range and panel', function() {
it('should generate share url absolute time', function() {
ctx.$location.path('/test');
ctx.scope.panel = { id: 22 };
ctx.scope.init();
expect(ctx.scope.shareUrl).to.be('http://server/#!/test?from=1000&to=2000&orgId=1&panelId=22&fullscreen');
});
it('should generate render url', function() {
ctx.$location.$$absUrl = 'http://dashboards.grafana.com/d/abcdefghi/my-dash';
ctx.scope.panel = { id: 22 };
ctx.scope.init();
var base = 'http://dashboards.grafana.com/render/d-solo/abcdefghi/my-dash';
var params = '?from=1000&to=2000&orgId=1&panelId=22&width=1000&height=500&tz=UTC';
expect(ctx.scope.imageUrl).to.contain(base + params);
});
it('should generate render url for scripted dashboard', function() {
ctx.$location.$$absUrl = 'http://dashboards.grafana.com/dashboard/script/my-dash.js';
ctx.scope.panel = { id: 22 };
ctx.scope.init();
var base = 'http://dashboards.grafana.com/render/dashboard-solo/script/my-dash.js';
var params = '?from=1000&to=2000&orgId=1&panelId=22&width=1000&height=500&tz=UTC';
expect(ctx.scope.imageUrl).to.contain(base + params);
});
it('should remove panel id when no panel in scope', function() {
ctx.$location.path('/test');
ctx.scope.options.forCurrent = true;
ctx.scope.panel = null;
ctx.scope.init();
expect(ctx.scope.shareUrl).to.be('http://server/#!/test?from=1000&to=2000&orgId=1');
});
it('should add theme when specified', function() {
ctx.$location.path('/test');
ctx.scope.options.theme = 'light';
ctx.scope.panel = null;
ctx.scope.init();
expect(ctx.scope.shareUrl).to.be('http://server/#!/test?from=1000&to=2000&orgId=1&theme=light');
});
it('should remove fullscreen from image url when is first param in querystring and modeSharePanel is true', function() {
ctx.$location.url('/test?fullscreen&edit');
ctx.scope.modeSharePanel = true;
ctx.scope.panel = { id: 1 };
ctx.scope.buildUrl();
expect(ctx.scope.shareUrl).to.contain('?fullscreen&edit&from=1000&to=2000&orgId=1&panelId=1');
expect(ctx.scope.imageUrl).to.contain('?from=1000&to=2000&orgId=1&panelId=1&width=1000&height=500&tz=UTC');
});
it('should remove edit from image url when is first param in querystring and modeSharePanel is true', function() {
ctx.$location.url('/test?edit&fullscreen');
ctx.scope.modeSharePanel = true;
ctx.scope.panel = { id: 1 };
ctx.scope.buildUrl();
expect(ctx.scope.shareUrl).to.contain('?edit&fullscreen&from=1000&to=2000&orgId=1&panelId=1');
expect(ctx.scope.imageUrl).to.contain('?from=1000&to=2000&orgId=1&panelId=1&width=1000&height=500&tz=UTC');
});
it('should include template variables in url', function() {
ctx.$location.path('/test');
ctx.scope.options.includeTemplateVars = true;
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=1000&to=2000&orgId=1&var-app=mupp&var-server=srv-01'
);
});
});
});