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

Fix: Hide invite when disabled login form is set (#67031)

Browse Source 
* FIX: Hide Invite Button with external user management

* Hide also when login form is disabled

* add tests and readability

---------

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
This commit is contained in:
Gabriel MABILLE 2023-04-21 13:03:13 +02:00 committed by GitHub
parent 0eca9950a0
commit b7f047c8dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/app/features/users/UsersActionBar.test.tsx
View File

@ -2,6 +2,8 @@ import { render, screen } from '@testing-library/react';
import React from 'react';
import { mockToolkitActionCreator } from 'test/core/redux/mocks';
import { config } from 'app/core/config';
import { Props, UsersActionBarUnconnected } from './UsersActionBar';
import { searchQueryChanged } from './state/reducers';
@ -62,4 +64,17 @@ describe('Render', () => {
expect(screen.getByRole('link', { name: 'someUrl' })).toHaveAttribute('href', 'some/url');
});
it('should not show invite button when disableLoginForm is set', () => {
const originalDisableLoginForm = config.disableLoginForm;
config.disableLoginForm = true;
setup({
canInvite: true,
});
expect(screen.queryByRole('link', { name: 'Invite' })).not.toBeInTheDocument();
// Reset the disableLoginForm mock to its original value
config.disableLoginForm = originalDisableLoginForm;
});
});

5
public/app/features/users/UsersActionBar.tsx
View File

@ -2,6 +2,7 @@ import React from 'react';
import { connect, ConnectedProps } from 'react-redux';
import { RadioButtonGroup, LinkButton, FilterInput } from '@grafana/ui';
import config from 'app/core/config';
import { contextSrv } from 'app/core/core';
import { AccessControlAction, StoreState } from 'app/types';
@ -48,6 +49,8 @@ export const UsersActionBarUnconnected = ({
{ label: `Pending Invites (${pendingInvitesCount})`, value: 'invites' },
];
const canAddToOrg: boolean = contextSrv.hasAccess(AccessControlAction.OrgUsersAdd, canInvite);
// backend rejects invitations if the login form is disabled
const showInviteButton: boolean = canAddToOrg && !config.disableLoginForm;
return (
<div className="page-action-bar" data-testid="users-action-bar">
@ -63,7 +66,7 @@ export const UsersActionBarUnconnected = ({
<RadioButtonGroup value={showInvites ? 'invites' : 'users'} options={options} onChange={onShowInvites} />
</div>
)}
{canAddToOrg && <LinkButton href="org/users/invite">Invite</LinkButton>}
{showInviteButton && <LinkButton href="org/users/invite">Invite</LinkButton>}
{externalUserMngLinkUrl && (
<LinkButton href={externalUserMngLinkUrl} target="_blank" rel="noopener">
{externalUserMngLinkName}