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

LDAP: validate organization role during parsing (#37188)

Browse Source 
* LDAP: validate organization role during parsing

* Trigger a new build

* Check if grafana_admin is present
This commit is contained in:
Krzysztof Dąbrowski
2022-05-04 09:35:10 +02:00
committed by GitHub
parent 18f089d1bd
commit c41397a6e7
3 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
public/app/features/admin/ldap/LdapUserGroups.tsx
View File

@@ -33,31 +33,21 @@ export const LdapUserGroups: FC<Props> = ({ groups, showAttributeMapping }) => {
{items.map((group, index) => {
return (
<tr key={`${group.orgId}-${index}`}>
{showAttributeMapping && (
<>
<td>{group.groupDN}</td>
{!group.orgRole && (
<>
<td />
<td>
<span className="text-warning">
No match
<Tooltip placement="top" content="No matching groups found" theme={'info'}>
<span className="gf-form-help-icon">
<Icon name="info-circle" />
</span>
</Tooltip>
</span>
</td>
</>
)}
</>
)}
{group.orgName && (
<>
<td>{group.orgName}</td>
<td>{group.orgRole}</td>
</>
{showAttributeMapping && <td>{group.groupDN}</td>}
{group.orgName && group.orgRole ? <td>{group.orgName}</td> : <td />}
{group.orgRole ? (
<td>{group.orgRole}</td>
) : (
<td>
<span className="text-warning">
No match
<Tooltip placement="top" content="No matching groups found" theme={'info'}>
<span className="gf-form-help-icon">
<Icon name="info-circle" />
</span>
</Tooltip>
</span>
</td>
)}
</tr>
);