public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Teams: Consistency in save/update on the team settings page (#99200)

Browse Source 
* make team page consistent

* fmt/linting

* fix tests
This commit is contained in:
Eric Leijonmarck
2025-01-20 14:07:38 +00:00
committed by GitHub
parent c601d79889
commit cf19d6d4b7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/teams/TeamSettings.test.tsx
+2 -2
View File
@@ -45,7 +45,7 @@ describe('Team settings', () => {
await userEvent.clear(screen.getByRole('textbox', { name: /Name/ }));
await userEvent.type(screen.getByLabelText(/Email/i), 'team@test.com');
// Submitting with userEvent doesn't work here
fireEvent.submit(screen.getByRole('button', { name: 'Update' }));
fireEvent.submit(screen.getByRole('button', { name: 'Save' }));
expect(await screen.findByText('Name is required')).toBeInTheDocument();
await waitFor(() => expect(mockUpdate).not.toHaveBeenCalled());
});
@@ -58,7 +58,7 @@ describe('Team settings', () => {
await userEvent.type(screen.getByRole('textbox', { name: /Name/ }), 'New team');
await userEvent.type(screen.getByLabelText(/Email/i), 'team@test.com');
// Submitting with userEvent doesn't work here
fireEvent.submit(screen.getByRole('button', { name: 'Update' }));
fireEvent.submit(screen.getByRole('button', { name: 'Save' }));
await waitFor(() => expect(mockUpdate).toHaveBeenCalledWith('New team', 'team@test.com'));
});
});
public/app/features/teams/TeamSettings.tsx
+3 -3
View File
@@ -1,7 +1,7 @@
import { useForm } from 'react-hook-form';
import { connect, ConnectedProps } from 'react-redux';
import { ConnectedProps, connect } from 'react-redux';
import { Input, Field, Button, FieldSet, Stack } from '@grafana/ui';
import { Button, Field, FieldSet, Input, Stack } from '@grafana/ui';
import { TeamRolePicker } from 'app/core/components/RolePicker/TeamRolePicker';
import { useRoleOptions } from 'app/core/components/RolePicker/hooks';
import { SharedPreferences } from 'app/core/components/SharedPreferences/SharedPreferences';
@@ -75,7 +75,7 @@ export const TeamSettings = ({ team, updateTeam }: Props) => {
<Input {...register('email')} placeholder="team@email.com" type="email" id="email-input" />
</Field>
<Button type="submit" disabled={!canWriteTeamSettings}>
Update
Save
</Button>
</FieldSet>
</form>