PostgreSQL backup tool with Point-In-Time-Recovery and restore verification
TypeScript backupbackupsdatabasedatabase-backupdevopsdockergolangkubernetesmariadbmongodbmysqlpgpostgrespostgresqls3self-hostedsystem-administrationtoolsweb-ui
FIX (notifiers): Improve email validation
Rostislav Dugin02c735bc5a9e
diff --git a/frontend/src/entity/notifiers/models/email/validateEmailNotifier.ts b/frontend/src/entity/notifiers/models/email/validateEmailNotifier.tsindex 9d6c3f72..eb3692d6 100644--- a/frontend/src/entity/notifiers/models/email/validateEmailNotifier.ts+++ b/frontend/src/entity/notifiers/models/email/validateEmailNotifier.ts@@ -1,7 +1,8 @@+import { FormValidator } from '../../../../shared/lib';import type { EmailNotifier } from './EmailNotifier';export const validateEmailNotifier = (isCreate: boolean, notifier: EmailNotifier): boolean => {- if (!notifier.targetEmail) {+ if (!notifier.targetEmail || !FormValidator.isValidEmail(notifier.targetEmail)) {return false;}@@ -17,5 +18,9 @@ export const validateEmailNotifier = (isCreate: boolean, notifier: EmailNotifierreturn false;}+ if (notifier.smtpUser && !FormValidator.isValidEmail(notifier.smtpUser)) {+ return false;+ }+return true;};diff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsxindex 593f8560..dfdbd80f 100644--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsx+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsx@@ -2,6 +2,7 @@ import { InfoCircleOutlined } from '@ant-design/icons';import { Input, Tooltip } from 'antd';import type { Notifier } from '../../../../../entity/notifiers';+import { FormValidator } from '../../../../../shared/lib';interface Props {notifier: Notifier;@@ -31,6 +32,12 @@ export function EditEmailNotifierComponent({ notifier, setNotifier, setIsUnsavedsize="small"className="w-full max-w-[250px]"placeholder="[email protected]"+ status={+ notifier?.emailNotifier?.targetEmail &&+ !FormValidator.isValidEmail(notifier.emailNotifier.targetEmail)+ ? 'error'+ : undefined+ }/><Tooltip className="cursor-pointer" title="The email where you want to receive the message">@@ -102,6 +109,12 @@ export function EditEmailNotifierComponent({ notifier, setNotifier, setIsUnsavedsize="small"className="w-full max-w-[250px]"placeholder="[email protected]"+ status={+ notifier?.emailNotifier?.smtpUser &&+ !FormValidator.isValidEmail(notifier.emailNotifier.smtpUser)+ ? 'error'+ : undefined+ }/></div>