[v10.1.x] Auth: add a lock message for Grafana Admin role (#72762)

merge
This commit is contained in:
Ieva
2023-08-02 20:20:30 +03:00
committed by GitHub
parent 20dc40f4cf
commit 83fcc34c74
3 changed files with 26 additions and 3 deletions
@@ -107,6 +107,8 @@ export class UserAdminPage extends PureComponent<Props> {
const canReadSessions = contextSrv.hasPermission(AccessControlAction.UsersAuthTokenList);
const canReadLDAPStatus = contextSrv.hasPermission(AccessControlAction.LDAPStatusRead);
const isUserSynced = !config.auth.DisableSyncLock && user?.isExternallySynced;
const authSource = user?.authLabels?.[0];
const lockMessage = authSource ? `Synced via ${authSource}` : '';
const pageNav: NavModelItem = {
text: user?.login ?? '',
@@ -133,6 +135,7 @@ export class UserAdminPage extends PureComponent<Props> {
<UserPermissions
isGrafanaAdmin={user.isGrafanaAdmin}
isExternalUser={user?.isGrafanaAdminExternallySynced}
lockMessage={lockMessage}
onGrafanaAdminChange={this.onGrafanaAdminChange}
/>
</>
+1 -1
View File
@@ -488,7 +488,7 @@ interface ExternalUserTooltipProps {
lockMessage?: string;
}
const ExternalUserTooltip = ({ lockMessage }: ExternalUserTooltipProps) => {
export const ExternalUserTooltip = ({ lockMessage }: ExternalUserTooltipProps) => {
const styles = useStyles2(getTooltipStyles);
return (
+22 -2
View File
@@ -1,12 +1,16 @@
import { css } from '@emotion/css';
import React, { useState } from 'react';
import { ConfirmButton, RadioButtonGroup, Icon } from '@grafana/ui';
import { GrafanaTheme2 } from '@grafana/data';
import { ConfirmButton, RadioButtonGroup, Icon, useStyles2 } from '@grafana/ui';
import { contextSrv } from 'app/core/core';
import { ExternalUserTooltip } from 'app/features/admin/UserOrgs';
import { AccessControlAction } from 'app/types';
interface Props {
isGrafanaAdmin: boolean;
isExternalUser?: boolean;
lockMessage?: string;
onGrafanaAdminChange: (isGrafanaAdmin: boolean) => void;
}
@@ -16,7 +20,7 @@ const adminOptions = [
{ label: 'No', value: false },
];
export function UserPermissions({ isGrafanaAdmin, isExternalUser, onGrafanaAdminChange }: Props) {
export function UserPermissions({ isGrafanaAdmin, isExternalUser, lockMessage, onGrafanaAdminChange }: Props) {
const [isEditing, setIsEditing] = useState(false);
const [currentAdminOption, setCurrentAdminOption] = useState(isGrafanaAdmin);
@@ -31,6 +35,8 @@ export function UserPermissions({ isGrafanaAdmin, isExternalUser, onGrafanaAdmin
const canChangePermissions = contextSrv.hasPermission(AccessControlAction.UsersPermissionsUpdate) && !isExternalUser;
const styles = useStyles2(getTooltipStyles);
return (
<>
<h3 className="page-heading">Permissions</h3>
@@ -71,6 +77,11 @@ export function UserPermissions({ isGrafanaAdmin, isExternalUser, onGrafanaAdmin
Change
</ConfirmButton>
)}
{isExternalUser && (
<div className={styles.lockMessageClass}>
<ExternalUserTooltip lockMessage={lockMessage} />
</div>
)}
</td>
</tr>
</tbody>
@@ -80,3 +91,12 @@ export function UserPermissions({ isGrafanaAdmin, isExternalUser, onGrafanaAdmin
</>
);
}
const getTooltipStyles = (theme: GrafanaTheme2) => ({
lockMessageClass: css`
display: flex;
justify-content: flex-end;
font-style: italic;
margin-right: ${theme.spacing(0.6)};
`,
});