Improve UX for edit server form
- Auto focus the password field on edit server form - Don't disable save button when fields blank - Add tooltip for modified fields
This commit is contained in:
parent
cbb15ac7ee
commit
2d7c52a6b6
1 changed files with 20 additions and 9 deletions
|
@ -1,7 +1,8 @@
|
||||||
import { useState } from 'react';
|
import { useState } from 'react';
|
||||||
import { Checkbox, Stack, Group } from '@mantine/core';
|
import { Checkbox, Stack, Group } from '@mantine/core';
|
||||||
import { Button, PasswordInput, TextInput, toast } from '/@/renderer/components';
|
import { Button, PasswordInput, TextInput, toast, Tooltip } from '/@/renderer/components';
|
||||||
import { useForm } from '@mantine/form';
|
import { useForm } from '@mantine/form';
|
||||||
|
import { useFocusTrap } from '@mantine/hooks';
|
||||||
import { closeAllModals } from '@mantine/modals';
|
import { closeAllModals } from '@mantine/modals';
|
||||||
import { RiInformationLine } from 'react-icons/ri';
|
import { RiInformationLine } from 'react-icons/ri';
|
||||||
import { jellyfinApi } from '/@/renderer/api/jellyfin.api';
|
import { jellyfinApi } from '/@/renderer/api/jellyfin.api';
|
||||||
|
@ -23,8 +24,19 @@ const AUTH_FUNCTIONS = {
|
||||||
[ServerType.SUBSONIC]: subsonicApi.authenticate,
|
[ServerType.SUBSONIC]: subsonicApi.authenticate,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const ModifiedFieldIndicator = () => {
|
||||||
|
return (
|
||||||
|
<Tooltip label="Field has been modified">
|
||||||
|
<span>
|
||||||
|
<RiInformationLine color="red" />
|
||||||
|
</span>
|
||||||
|
</Tooltip>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const EditServerForm = ({ isUpdate, server, onCancel }: EditServerFormProps) => {
|
export const EditServerForm = ({ isUpdate, server, onCancel }: EditServerFormProps) => {
|
||||||
const { updateServer } = useAuthStoreActions();
|
const { updateServer } = useAuthStoreActions();
|
||||||
|
const focusTrapRef = useFocusTrap();
|
||||||
const [isLoading, setIsLoading] = useState(false);
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
|
|
||||||
const form = useForm({
|
const form = useForm({
|
||||||
|
@ -40,9 +52,6 @@ export const EditServerForm = ({ isUpdate, server, onCancel }: EditServerFormPro
|
||||||
|
|
||||||
const isSubsonic = form.values.type === ServerType.SUBSONIC;
|
const isSubsonic = form.values.type === ServerType.SUBSONIC;
|
||||||
|
|
||||||
const isSubmitDisabled =
|
|
||||||
!form.values.name || !form.values.url || !form.values.username || !form.values.password;
|
|
||||||
|
|
||||||
const handleSubmit = form.onSubmit(async (values) => {
|
const handleSubmit = form.onSubmit(async (values) => {
|
||||||
const authFunction = AUTH_FUNCTIONS[values.type];
|
const authFunction = AUTH_FUNCTIONS[values.type];
|
||||||
|
|
||||||
|
@ -81,25 +90,28 @@ export const EditServerForm = ({ isUpdate, server, onCancel }: EditServerFormPro
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<form onSubmit={handleSubmit}>
|
<form onSubmit={handleSubmit}>
|
||||||
<Stack>
|
<Stack ref={focusTrapRef}>
|
||||||
<TextInput
|
<TextInput
|
||||||
required
|
required
|
||||||
label="Name"
|
label="Name"
|
||||||
rightSection={form.isDirty('name') && <RiInformationLine color="red" />}
|
rightSection={form.isDirty('name') && <ModifiedFieldIndicator />}
|
||||||
{...form.getInputProps('name')}
|
{...form.getInputProps('name')}
|
||||||
/>
|
/>
|
||||||
<TextInput
|
<TextInput
|
||||||
required
|
required
|
||||||
label="Url"
|
label="Url"
|
||||||
rightSection={form.isDirty('url') && <RiInformationLine color="red" />}
|
rightSection={form.isDirty('url') && <ModifiedFieldIndicator />}
|
||||||
{...form.getInputProps('url')}
|
{...form.getInputProps('url')}
|
||||||
/>
|
/>
|
||||||
<TextInput
|
<TextInput
|
||||||
|
required
|
||||||
label="Username"
|
label="Username"
|
||||||
rightSection={form.isDirty('username') && <RiInformationLine color="red" />}
|
rightSection={form.isDirty('username') && <ModifiedFieldIndicator />}
|
||||||
{...form.getInputProps('username')}
|
{...form.getInputProps('username')}
|
||||||
/>
|
/>
|
||||||
<PasswordInput
|
<PasswordInput
|
||||||
|
data-autofocus
|
||||||
|
required
|
||||||
label="Password"
|
label="Password"
|
||||||
{...form.getInputProps('password')}
|
{...form.getInputProps('password')}
|
||||||
/>
|
/>
|
||||||
|
@ -119,7 +131,6 @@ export const EditServerForm = ({ isUpdate, server, onCancel }: EditServerFormPro
|
||||||
Cancel
|
Cancel
|
||||||
</Button>
|
</Button>
|
||||||
<Button
|
<Button
|
||||||
disabled={isSubmitDisabled}
|
|
||||||
loading={isLoading}
|
loading={isLoading}
|
||||||
type="submit"
|
type="submit"
|
||||||
variant="filled"
|
variant="filled"
|
||||||
|
|
Reference in a new issue