Skip to content

PostgreSQL backup tool with Point-In-Time-Recovery and restore verification

FEATURE (email): Add "from" field

Rostislav Dugin9b066bcb8a25
diff --git a/backend/internal/features/notifiers/models/email_notifier/model.go b/backend/internal/features/notifiers/models/email_notifier/model.go
index 689ff107..ec080b38 100644
--- a/backend/internal/features/notifiers/models/email_notifier/model.go
+++ b/backend/internal/features/notifiers/models/email_notifier/model.go
@@ -27,6 +27,7 @@ type EmailNotifier struct {
SMTPPort int `json:"smtpPort" gorm:"not null;column:smtp_port"`
SMTPUser string `json:"smtpUser" gorm:"type:varchar(255);column:smtp_user"`
SMTPPassword string `json:"smtpPassword" gorm:"type:varchar(255);column:smtp_password"`
+ From string `json:"from" gorm:"type:varchar(255);column:from_email"`
}
func (e *EmailNotifier) TableName() string {
@@ -56,9 +57,12 @@ func (e *EmailNotifier) Validate() error {
func (e *EmailNotifier) Send(logger *slog.Logger, heading string, message string) error {
// Compose email
- from := e.SMTPUser
+ from := e.From
if from == "" {
- from = "noreply@" + e.SMTPHost
+ from = e.SMTPUser
+ if from == "" {
+ from = "noreply@" + e.SMTPHost
+ }
}
to := []string{e.TargetEmail}
@@ -218,6 +222,7 @@ func (e *EmailNotifier) Update(incoming *EmailNotifier) {
e.SMTPHost = incoming.SMTPHost
e.SMTPPort = incoming.SMTPPort
e.SMTPUser = incoming.SMTPUser
+ e.From = incoming.From
if incoming.SMTPPassword != "" {
e.SMTPPassword = incoming.SMTPPassword
diff --git a/backend/migrations/20251108173913_add_from_to_email_notifier.sql b/backend/migrations/20251108173913_add_from_to_email_notifier.sql
new file mode 100644
index 00000000..858951a2
--- /dev/null
+++ b/backend/migrations/20251108173913_add_from_to_email_notifier.sql
@@ -0,0 +1,11 @@
+-- +goose Up
+-- +goose StatementBegin
+ALTER TABLE email_notifiers
+ ADD COLUMN from_email VARCHAR(255);
+-- +goose StatementEnd
+
+-- +goose Down
+-- +goose StatementBegin
+ALTER TABLE email_notifiers
+ DROP COLUMN from_email;
+-- +goose StatementEnd
diff --git a/frontend/src/entity/notifiers/models/email/EmailNotifier.ts b/frontend/src/entity/notifiers/models/email/EmailNotifier.ts
index 5d2f7327..5803973b 100644
--- a/frontend/src/entity/notifiers/models/email/EmailNotifier.ts
+++ b/frontend/src/entity/notifiers/models/email/EmailNotifier.ts
@@ -4,4 +4,5 @@ export interface EmailNotifier {
smtpPort: number;
smtpUser: string;
smtpPassword: string;
+ from: string;
}
diff --git a/frontend/src/features/backups/ui/BackupsComponent.tsx b/frontend/src/features/backups/ui/BackupsComponent.tsx
index ff1ce068..9a35721b 100644
--- a/frontend/src/features/backups/ui/BackupsComponent.tsx
+++ b/frontend/src/features/backups/ui/BackupsComponent.tsx
@@ -25,7 +25,7 @@ import { getUserTimeFormat } from '../../../shared/time';
import { ConfirmationComponent } from '../../../shared/ui';
import { RestoresComponent } from '../../restores';
-const BACKUPS_PAGE_SIZE = 10;
+const BACKUPS_PAGE_SIZE = 50;
interface Props {
database: Database;
diff --git a/frontend/src/features/notifiers/ui/edit/EditNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/EditNotifierComponent.tsx
index 1e80f2b7..ac502f43 100644
--- a/frontend/src/features/notifiers/ui/edit/EditNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/edit/EditNotifierComponent.tsx
@@ -111,6 +111,7 @@ export function EditNotifierComponent({
smtpPort: 0,
smtpUser: '',
smtpPassword: '',
+ from: '',
};
}
diff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsx
index f2f33871..b443f2b9 100644
--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsx
@@ -126,6 +126,35 @@ export function EditEmailNotifierComponent({ notifier, setNotifier, setIsUnsaved
placeholder="password"
/>
</div>
+
+ <div className="mb-1 flex items-center">
+ <div className="w-[130px] min-w-[130px]">From</div>
+ <Input
+ value={notifier?.emailNotifier?.from || ''}
+ onChange={(e) => {
+ if (!notifier?.emailNotifier) return;
+
+ setNotifier({
+ ...notifier,
+ emailNotifier: {
+ ...notifier.emailNotifier,
+ from: e.target.value.trim(),
+ },
+ });
+ setIsUnsaved(true);
+ }}
+ size="small"
+ className="w-full max-w-[250px]"
+ placeholder="[email protected]"
+ />
+
+ <Tooltip
+ className="cursor-pointer"
+ title="Optional. Email address to use as sender. If empty, will use SMTP user or auto-generate from host"
+ >
+ <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />
+ </Tooltip>
+ </div>
</>
);
}
diff --git a/frontend/src/features/notifiers/ui/show/notifier/ShowEmailNotifierComponent.tsx b/frontend/src/features/notifiers/ui/show/notifier/ShowEmailNotifierComponent.tsx
index 99fb225b..4b1ed23c 100644
--- a/frontend/src/features/notifiers/ui/show/notifier/ShowEmailNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/show/notifier/ShowEmailNotifierComponent.tsx
@@ -31,6 +31,11 @@ export function ShowEmailNotifierComponent({ notifier }: Props) {
<div className="min-w-[110px]">SMTP password</div>
{'*************'}
</div>
+
+ <div className="mb-1 flex items-center">
+ <div className="min-w-[110px]">From</div>
+ {notifier?.emailNotifier?.from || '(auto)'}
+ </div>
</>
);
}