From bb2156967d0d1094136a3a939aeedbb437fb0ad2 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Thu, 11 Jan 2024 14:48:55 +0300 Subject: [PATCH] Team LBAC: Show permissions warning (#80215) * Permissions: Add team LBAC warnings * Replace info with warning if present * Keep info message * Update warning message * Translate permission warning * Use box component * Generate translation placeholder * Use multiple messages * Move LBAC warnings to enterprise --- .../AccessControl/PermissionListItem.tsx | 97 ++++++++++++------- .../components/AccessControl/Permissions.tsx | 12 ++- .../core/components/AccessControl/types.ts | 1 + 3 files changed, 71 insertions(+), 39 deletions(-) diff --git a/public/app/core/components/AccessControl/PermissionListItem.tsx b/public/app/core/components/AccessControl/PermissionListItem.tsx index 77b7e177a2b..0d6eaf15cf7 100644 --- a/public/app/core/components/AccessControl/PermissionListItem.tsx +++ b/public/app/core/components/AccessControl/PermissionListItem.tsx @@ -1,6 +1,8 @@ +import { css } from '@emotion/css'; import React from 'react'; -import { Button, Icon, Select, Tooltip } from '@grafana/ui'; +import { GrafanaTheme2 } from '@grafana/data'; +import { Box, Button, Icon, Select, Tooltip, useStyles2 } from '@grafana/ui'; import { ResourcePermission } from './types'; @@ -12,42 +14,59 @@ interface Props { onChange: (item: ResourcePermission, permission: string) => void; } -export const PermissionListItem = ({ item, permissionLevels, canSet, onRemove, onChange }: Props) => ( - - {getAvatar(item)} - {getDescription(item)} - {item.isInherited && Inherited from folder} - - onChange(item, p.value!)} + value={permissionLevels.find((p) => p === item.permission)} + options={permissionLevels.map((p) => ({ value: p, label: p }))} /> - ) : ( - -