IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-12 00:25:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Identity: Fix org role none comparison (#76999)

Browse Source
This commit is contained in:
Juan Cabanas 2023-10-23 17:14:01 -03:00 committed by GitHub
parent 344e99e069
commit a174e69c52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/app.ts
View File

@ -15,6 +15,7 @@ import { createRoot } from 'react-dom/client';
import {
locationUtil,
monacoLanguageRegistry,
OrgRole,
setLocale,
setTimeZoneResolver,
setWeekStart,
@ -279,7 +280,7 @@ function initEchoSrv() {
}
});
if (contextSrv.user.orgRole !== '') {
if (contextSrv.user.orgRole !== OrgRole.None) {
registerEchoBackend(new PerformanceBackend({}));
}

4
public/app/features/live/LiveConnectionWarning.tsx
View File

@ -2,7 +2,7 @@ import { css } from '@emotion/css';
import React, { PureComponent } from 'react';
import { Unsubscribable } from 'rxjs';
import { GrafanaTheme2 } from '@grafana/data';
import { GrafanaTheme2, OrgRole } from '@grafana/data';
import { config, getGrafanaLiveSrv } from '@grafana/runtime';
import { Alert, stylesFactory } from '@grafana/ui';
import { contextSrv } from 'app/core/services/context_srv';
@ -46,7 +46,7 @@ export class LiveConnectionWarning extends PureComponent<Props, State> {
render() {
const { show } = this.state;
if (show) {
if (!contextSrv.isSignedIn || !config.liveEnabled || contextSrv.user.orgRole === '') {
if (!contextSrv.isSignedIn || !config.liveEnabled || contextSrv.user.orgRole === OrgRole.None) {
return null; // do not show the warning for anonymous users or ones with no org (and /login page etc)
}