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

Remove LDAP specific example from team sync (#51368)

Browse Source 
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
This commit is contained in:
Jguer 2022-06-24 13:29:50 +00:00 committed by GitHub
parent c804639b53
commit 9a82ed7105
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.betterer.results
View File

@ -4512,7 +4512,7 @@ exports[`no explicit any`] = {
[45, 20, 3, "Unexpected any. Specify a different type.", "193409811"], [45, 20, 3, "Unexpected any. Specify a different type.", "193409811"],
[47, 17, 3, "Unexpected any. Specify a different type.", "193409811"] [47, 17, 3, "Unexpected any. Specify a different type.", "193409811"]
], ],
"public/app/features/teams/TeamGroupSync.tsx:187124828": [ "public/app/features/teams/TeamGroupSync.tsx:2819142271": [
[59, 32, 3, "Unexpected any. Specify a different type.", "193409811"], [59, 32, 3, "Unexpected any. Specify a different type.", "193409811"],
[63, 23, 3, "Unexpected any. Specify a different type.", "193409811"] [63, 23, 3, "Unexpected any. Specify a different type.", "193409811"]
], ],

10
public/app/features/teams/TeamGroupSync.tsx
View File

@ -37,7 +37,7 @@ interface State {
const connector = connect(mapStateToProps, mapDispatchToProps); const connector = connect(mapStateToProps, mapDispatchToProps);
export type Props = OwnProps & ConnectedProps<typeof connector>; export type Props = OwnProps & ConnectedProps<typeof connector>;
const headerTooltip = `Sync LDAP or OAuth groups with your Grafana teams.`; const headerTooltip = `Sync LDAP, OAuth or SAML groups with your Grafana teams.`;
export class TeamGroupSync extends PureComponent<Props, State> { export class TeamGroupSync extends PureComponent<Props, State> {
constructor(props: Props) { constructor(props: Props) {
@ -130,17 +130,19 @@ export class TeamGroupSync extends PureComponent<Props, State> {
<CloseButton onClick={this.onToggleAdding} /> <CloseButton onClick={this.onToggleAdding} />
<form onSubmit={this.onAddGroup}> <form onSubmit={this.onAddGroup}>
<InlineFieldRow> <InlineFieldRow>
<InlineField label={'Add External Group'}> <InlineField
label={'Add External Group'}
tooltip="LDAP Group Example: cn=users,ou=groups,dc=grafana,dc=org."
>
<Input <Input
type="text" type="text"
id={'add-external-group'} id={'add-external-group'}
placeholder=""
value={newGroupId} value={newGroupId}
onChange={this.onNewGroupIdChanged} onChange={this.onNewGroupIdChanged}
placeholder="cn=ops,ou=groups,dc=grafana,dc=org"
disabled={isReadOnly} disabled={isReadOnly}
/> />
</InlineField> </InlineField>
<Button type="submit" disabled={isReadOnly || !this.isNewGroupValid()} style={{ marginLeft: 4 }}> <Button type="submit" disabled={isReadOnly || !this.isNewGroupValid()} style={{ marginLeft: 4 }}>
Add group Add group
</Button> </Button>