Commit b95650d1 by Hugo Häggmark

Added function hasAccessToExplore in ContextSrv and refactored tests

parent 9d6ac2c3
......@@ -59,6 +59,10 @@ export class ContextSrv {
this.sidemenu = !this.sidemenu;
store.set('grafana.sidemenu', this.sidemenu);
}
hasAccessToExplore() {
return (this.isEditor || config.viewersCanEdit) && config.exploreEnabled;
}
}
const contextSrv = new ContextSrv();
......
import $ from 'jquery';
import _ from 'lodash';
import config from 'app/core/config';
import coreModule from 'app/core/core_module';
import appEvents from 'app/core/app_events';
import { getExploreUrl } from 'app/core/utils/explore';
......@@ -197,7 +196,7 @@ export class KeybindingSrv {
});
// jump to explore if permissions allow
if ((this.contextSrv.isEditor || config.viewersCanEdit) && config.exploreEnabled) {
if (this.contextSrv.hasAccessToExplore()) {
this.bind('x', async () => {
if (dashboard.meta.focusPanelId) {
const panel = dashboard.getPanelById(dashboard.meta.focusPanelId);
......
import _ from 'lodash';
import kbn from 'app/core/utils/kbn';
import config from 'app/core/config';
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';
class MetricsPanelCtrl extends PanelCtrl {
scope: any;
datasource: any;
$q: any;
$timeout: any;
contextSrv: any;
contextSrv: ContextSrv;
datasourceSrv: any;
timeSrv: any;
templateSrv: any;
......@@ -231,7 +231,7 @@ class MetricsPanelCtrl extends PanelCtrl {
getAdditionalMenuItems() {
const items = [];
if (config.exploreEnabled && (this.contextSrv.isEditor || config.viewersCanEdit) && this.datasource) {
if (this.contextSrv.hasAccessToExplore() && this.datasource) {
items.push({
text: 'Explore',
click: 'ctrl.explore();',
......
jest.mock('app/core/core', () => ({}));
jest.mock('app/core/config', () => {
return {
exploreEnabled: true,
viewersCanEdit: false,
panels: {
test: {
id: 'test',
......@@ -15,62 +13,47 @@ jest.mock('app/core/config', () => {
import q from 'q';
import { PanelModel } from 'app/features/dashboard/panel_model';
import { MetricsPanelCtrl } from '../metrics_panel_ctrl';
import config from 'app/core/config';
describe('MetricsPanelCtrl', () => {
let ctrl;
beforeEach(() => {
ctrl = setupController();
});
describe('when getting additional menu items', () => {
let additionalItems;
describe('and has no datasource set', () => {
beforeEach(() => {
additionalItems = ctrl.getAdditionalMenuItems();
});
describe('and has no datasource set but user has access to explore', () => {
it('should not return any items', () => {
expect(additionalItems.length).toBe(0);
const ctrl = setupController({ hasAccessToExplore: true });
expect(ctrl.getAdditionalMenuItems().length).toBe(0);
});
});
describe('and has datasource set that supports explore and user has powers', () => {
beforeEach(() => {
ctrl.contextSrv = { isEditor: true };
describe('and has datasource set that supports explore and user does not have access to explore', () => {
it('should not return any items', () => {
const ctrl = setupController({ hasAccessToExplore: false });
ctrl.datasource = { meta: { explore: true } };
additionalItems = ctrl.getAdditionalMenuItems();
});
it('should not return any items', () => {
expect(additionalItems.length).toBe(1);
expect(ctrl.getAdditionalMenuItems().length).toBe(0);
});
});
describe('and has datasource set that supports explore and viewersCanEdit is true', () => {
beforeEach(() => {
config.viewersCanEdit = true;
ctrl.contextSrv = { isEditor: false };
describe('and has datasource set that supports explore and user has access to explore', () => {
it('should return one item', () => {
const ctrl = setupController({ hasAccessToExplore: true });
ctrl.datasource = { meta: { explore: true } };
additionalItems = ctrl.getAdditionalMenuItems();
});
it('should not return any items', () => {
expect(additionalItems.length).toBe(1);
expect(ctrl.getAdditionalMenuItems().length).toBe(1);
});
});
});
});
function setupController() {
function setupController({ hasAccessToExplore } = { hasAccessToExplore: false }) {
const injectorStub = {
get: type => {
switch (type) {
case '$q': {
return q;
}
case 'contextSrv': {
return { hasAccessToExplore: () => hasAccessToExplore };
}
default: {
return jest.fn();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment