fix: Viewers can edit means that viewers have acces to Explore #14281

pull/14963/head
Hugo Häggmark 6 years ago
parent bc8f3374a3
commit 9d6ac2c3d4
  1. 1
      pkg/api/frontendsettings.go
  2. 2
      pkg/api/index.go
  3. 2
      public/app/core/config.ts
  4. 5
      public/app/core/services/keybindingSrv.ts
  5. 2
      public/app/features/panel/metrics_panel_ctrl.ts
  6. 15
      public/app/features/panel/specs/metrics_panel_ctrl.test.ts
  7. 3
      public/app/routes/routes.ts

@ -165,6 +165,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf
"externalUserMngInfo": setting.ExternalUserMngInfo, "externalUserMngInfo": setting.ExternalUserMngInfo,
"externalUserMngLinkUrl": setting.ExternalUserMngLinkUrl, "externalUserMngLinkUrl": setting.ExternalUserMngLinkUrl,
"externalUserMngLinkName": setting.ExternalUserMngLinkName, "externalUserMngLinkName": setting.ExternalUserMngLinkName,
"viewersCanEdit": setting.ViewersCanEdit,
"buildInfo": map[string]interface{}{ "buildInfo": map[string]interface{}{
"version": setting.BuildVersion, "version": setting.BuildVersion,
"commit": setting.BuildCommit, "commit": setting.BuildCommit,

@ -140,7 +140,7 @@ func (hs *HTTPServer) setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, er
Children: dashboardChildNavs, Children: dashboardChildNavs,
}) })
if setting.ExploreEnabled && (c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR) { if setting.ExploreEnabled && (c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR || setting.ViewersCanEdit) {
data.NavTree = append(data.NavTree, &dtos.NavLink{ data.NavTree = append(data.NavTree, &dtos.NavLink{
Text: "Explore", Text: "Explore",
Id: "explore", Id: "explore",

@ -34,6 +34,7 @@ export class Settings {
disableUserSignUp: boolean; disableUserSignUp: boolean;
loginHint: any; loginHint: any;
loginError: any; loginError: any;
viewersCanEdit: boolean;
constructor(options) { constructor(options) {
const defaults = { const defaults = {
@ -50,6 +51,7 @@ export class Settings {
env: 'production', env: 'production',
isEnterprise: false, isEnterprise: false,
}, },
viewersCanEdit: false,
}; };
_.extend(this, defaults, options); _.extend(this, defaults, options);

@ -8,6 +8,7 @@ import { getExploreUrl } from 'app/core/utils/explore';
import Mousetrap from 'mousetrap'; import Mousetrap from 'mousetrap';
import 'mousetrap-global-bind'; import 'mousetrap-global-bind';
import { ContextSrv } from './context_srv';
export class KeybindingSrv { export class KeybindingSrv {
helpModal: boolean; helpModal: boolean;
@ -21,7 +22,7 @@ export class KeybindingSrv {
private $timeout, private $timeout,
private datasourceSrv, private datasourceSrv,
private timeSrv, private timeSrv,
private contextSrv private contextSrv: ContextSrv
) { ) {
// clear out all shortcuts on route change // clear out all shortcuts on route change
$rootScope.$on('$routeChangeSuccess', () => { $rootScope.$on('$routeChangeSuccess', () => {
@ -196,7 +197,7 @@ export class KeybindingSrv {
}); });
// jump to explore if permissions allow // jump to explore if permissions allow
if (this.contextSrv.isEditor && config.exploreEnabled) { if ((this.contextSrv.isEditor || config.viewersCanEdit) && config.exploreEnabled) {
this.bind('x', async () => { this.bind('x', async () => {
if (dashboard.meta.focusPanelId) { if (dashboard.meta.focusPanelId) {
const panel = dashboard.getPanelById(dashboard.meta.focusPanelId); const panel = dashboard.getPanelById(dashboard.meta.focusPanelId);

@ -231,7 +231,7 @@ class MetricsPanelCtrl extends PanelCtrl {
getAdditionalMenuItems() { getAdditionalMenuItems() {
const items = []; const items = [];
if (config.exploreEnabled && this.contextSrv.isEditor && this.datasource) { if (config.exploreEnabled && (this.contextSrv.isEditor || config.viewersCanEdit) && this.datasource) {
items.push({ items.push({
text: 'Explore', text: 'Explore',
click: 'ctrl.explore();', click: 'ctrl.explore();',

@ -2,6 +2,7 @@ jest.mock('app/core/core', () => ({}));
jest.mock('app/core/config', () => { jest.mock('app/core/config', () => {
return { return {
exploreEnabled: true, exploreEnabled: true,
viewersCanEdit: false,
panels: { panels: {
test: { test: {
id: 'test', id: 'test',
@ -14,6 +15,7 @@ jest.mock('app/core/config', () => {
import q from 'q'; import q from 'q';
import { PanelModel } from 'app/features/dashboard/panel_model'; import { PanelModel } from 'app/features/dashboard/panel_model';
import { MetricsPanelCtrl } from '../metrics_panel_ctrl'; import { MetricsPanelCtrl } from '../metrics_panel_ctrl';
import config from 'app/core/config';
describe('MetricsPanelCtrl', () => { describe('MetricsPanelCtrl', () => {
let ctrl; let ctrl;
@ -46,6 +48,19 @@ describe('MetricsPanelCtrl', () => {
expect(additionalItems.length).toBe(1); expect(additionalItems.length).toBe(1);
}); });
}); });
describe('and has datasource set that supports explore and viewersCanEdit is true', () => {
beforeEach(() => {
config.viewersCanEdit = true;
ctrl.contextSrv = { isEditor: false };
ctrl.datasource = { meta: { explore: true } };
additionalItems = ctrl.getAdditionalMenuItems();
});
it('should not return any items', () => {
expect(additionalItems.length).toBe(1);
});
});
}); });
}); });

@ -16,6 +16,7 @@ import UsersListPage from 'app/features/users/UsersListPage';
import DataSourceDashboards from 'app/features/datasources/DataSourceDashboards'; import DataSourceDashboards from 'app/features/datasources/DataSourceDashboards';
import DataSourceSettingsPage from '../features/datasources/settings/DataSourceSettingsPage'; import DataSourceSettingsPage from '../features/datasources/settings/DataSourceSettingsPage';
import OrgDetailsPage from '../features/org/OrgDetailsPage'; import OrgDetailsPage from '../features/org/OrgDetailsPage';
import config from 'app/core/config';
/** @ngInject */ /** @ngInject */
export function setupAngularRoutes($routeProvider, $locationProvider) { export function setupAngularRoutes($routeProvider, $locationProvider) {
@ -129,7 +130,7 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
template: '<react-container />', template: '<react-container />',
reloadOnSearch: false, reloadOnSearch: false,
resolve: { resolve: {
roles: () => ['Editor', 'Admin'], roles: () => (config.viewersCanEdit ? [] : ['Editor', 'Admin']),
component: () => import(/* webpackChunkName: "explore" */ 'app/features/explore/Wrapper'), component: () => import(/* webpackChunkName: "explore" */ 'app/features/explore/Wrapper'),
}, },
}) })

Loading…
Cancel
Save