Imap-smtp-caldav form fixes (#19392)

/closes #19273
This commit is contained in:
neo773
2026-04-07 17:48:11 +05:30
committed by GitHub
parent fe07de63b0
commit dd2a09576b
3 changed files with 23 additions and 14 deletions
@@ -24,6 +24,8 @@ export const GET_CONNECTED_IMAP_SMTP_CALDAV_ACCOUNT = gql`
}
CALDAV {
host
port
secure
username
password
}
@@ -41,20 +41,18 @@ export const useImapSmtpCaldavConnectionForm = ({
const navigate = useNavigateSettings();
const currentWorkspaceMember = useAtomStateValue(currentWorkspaceMemberState);
const defaultProtocolValues: Record<string, ConnectionParameters> = {
IMAP: { host: '', port: 993, password: '', secure: true },
SMTP: { host: '', username: '', port: 587, password: '', secure: true },
CALDAV: { host: '', port: 443, password: '', secure: true },
};
const formMethods = useForm<ConnectionFormData>({
mode: 'onSubmit',
resolver: zodResolver(connectionImapSmtpCalDav),
defaultValues: {
handle: '',
IMAP: { host: '', port: 993, password: '', secure: true },
SMTP: { host: '', username: '', port: 587, password: '', secure: true },
CALDAV: {
host: '',
port: 443,
password: '',
secure: true,
username: undefined,
},
...defaultProtocolValues,
},
});
@@ -71,9 +69,18 @@ export const useImapSmtpCaldavConnectionForm = ({
if (isDefined(connectedAccount)) {
reset({
handle: connectedAccount.handle || '',
IMAP: connectedAccount.connectionParameters?.IMAP || undefined,
SMTP: connectedAccount.connectionParameters?.SMTP || undefined,
CALDAV: connectedAccount.connectionParameters?.CALDAV || undefined,
IMAP: {
...defaultProtocolValues.IMAP,
...connectedAccount.connectionParameters?.IMAP,
},
SMTP: {
...defaultProtocolValues.SMTP,
...connectedAccount.connectionParameters?.SMTP,
},
CALDAV: {
...defaultProtocolValues.CALDAV,
...connectedAccount.connectionParameters?.CALDAV,
},
});
}
}, [connectedAccount, reset]);