imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: server picker validates unselected option (#11020)

Browse source 
* add aria-label to default homeserver checkbox

* test ServerPickerDialog

* remove debug

* strict fixes

* dont validate unselected server field on ServerPickerDialog

* i18n
This commit is contained in:
Kerry 2023-06-01 13:08:44 +12:00 • committed by GitHub
parent a28f44a075
commit 143ffccb0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/views/dialogs/ServerPickerDialog.tsx
View file

@ -157,15 +157,19 @@ export default class ServerPickerDialog extends React.PureComponent<IProps, ISta
private onSubmit = async (ev: SyntheticEvent): Promise<void> => { private onSubmit = async (ev: SyntheticEvent): Promise<void> => {
ev.preventDefault(); ev.preventDefault();
if (this.state.defaultChosen) {
this.props.onFinished(this.defaultServer);
}
const valid = await this.fieldRef.current?.validate({ allowEmpty: false }); const valid = await this.fieldRef.current?.validate({ allowEmpty: false });
if (!valid && !this.state.defaultChosen) { if (!valid) {
this.fieldRef.current?.focus(); this.fieldRef.current?.focus();
this.fieldRef.current?.validate({ allowEmpty: false, focused: true }); this.fieldRef.current?.validate({ allowEmpty: false, focused: true });
return; return;
} }
this.props.onFinished(this.state.defaultChosen ? this.defaultServer : this.validatedConf); this.props.onFinished(this.validatedConf);
}; };
public render(): React.ReactNode { public render(): React.ReactNode {

6
test/components/views/dialogs/ServerPickerDialog-test.tsx
View file

@ -110,12 +110,6 @@ describe("<ServerPickerDialog />", () => {
fireEvent.click(screen.getByText("Continue")); fireEvent.click(screen.getByText("Continue"));
// serverpicker still validates the 'other homeserver' field on submit
// when default is chosen
// so this throws a lot of errors into the console
// and is asynchronous while waiting for validation
await flushPromises();
// closed dialog with default server // closed dialog with default server
expect(onFinished).toHaveBeenCalledWith(defaultServerConfig); expect(onFinished).toHaveBeenCalledWith(defaultServerConfig);
}); });