Skip to content

armgit / posta

Public Imported from GitHub
0

Self-hosted email delivery platform that enables applications to send emails via HTTP APIs while handling SMTP delivery, templates, storage, security, and analytics. Fully self-hostable alternative to services like SendGrid or Mailgun.

feat(admin): add server search functionality and enhance UI/UX

Jonas Kaninda580be591ecbd
diff --git a/internal/handlers/event_handler.go b/internal/handlers/event_handler.go
index fc6c58c..c27091a 100644
--- a/internal/handlers/event_handler.go
+++ b/internal/handlers/event_handler.go
@@ -35,6 +35,7 @@ type ListEventsRequest struct {
Page int `query:"page" default:"0"`
Size int `query:"size" default:"20"`
Category string `query:"category"`
+ Search string `query:"search"`
}
func NewEventHandler(repo *repositories.EventRepository, bus *eventbus.EventBus) *EventHandler {
@@ -63,9 +64,9 @@ func (h *EventHandler) List(c *okapi.Context, req *ListEventsRequest) error {
var err error
if req.Category != "" {
- events, total, err = h.repo.FindByCategory(models.EventCategory(req.Category), size, offset)
+ events, total, err = h.repo.FindByCategory(models.EventCategory(req.Category), req.Search, size, offset)
} else {
- events, total, err = h.repo.FindAll(size, offset)
+ events, total, err = h.repo.FindAll(req.Search, size, offset)
}
if err != nil {
return c.AbortInternalServerError("failed to list events")
diff --git a/internal/handlers/plan_handler.go b/internal/handlers/plan_handler.go
index 1528784..1cb222a 100644
--- a/internal/handlers/plan_handler.go
+++ b/internal/handlers/plan_handler.go
@@ -148,11 +148,16 @@ func (h *PlanHandler) Create(c *okapi.Context, req *CreatePlanRequest) error {
return created(c, plan)
}
-// List returns all plans with pagination.
-func (h *PlanHandler) List(c *okapi.Context, req *ListRequest) error {
+type ListPlansRequest struct {
+ Page int `query:"page" default:"0"`
+ Size int `query:"size" default:"20"`
+ Search string `query:"search"`
+}
+
+func (h *PlanHandler) List(c *okapi.Context, req *ListPlansRequest) error {
page, size, offset := normalizePageParams(req.Page, req.Size)
- plans, total, err := h.planRepo.FindAll(size, offset)
+ plans, total, err := h.planRepo.FindAll(req.Search, size, offset)
if err != nil {
return c.AbortInternalServerError("failed to list plans")
}
diff --git a/internal/handlers/server_handler.go b/internal/handlers/server_handler.go
index b9579f5..0f249f7 100644
--- a/internal/handlers/server_handler.go
+++ b/internal/handlers/server_handler.go
@@ -133,10 +133,16 @@ func (h *ServerHandler) Get(c *okapi.Context, req *ServerIDRequest) error {
return ok(c, server)
}
-func (h *ServerHandler) List(c *okapi.Context, req *ListRequest) error {
+type ListServersRequest struct {
+ Page int `query:"page" default:"0"`
+ Size int `query:"size" default:"20"`
+ Search string `query:"search"`
+}
+
+func (h *ServerHandler) List(c *okapi.Context, req *ListServersRequest) error {
page, size, offset := normalizePageParams(req.Page, req.Size)
- servers, total, err := h.repo.FindAll(size, offset)
+ servers, total, err := h.repo.FindAll(req.Search, size, offset)
if err != nil {
return c.AbortInternalServerError("failed to list servers")
}
diff --git a/internal/middlewares/middleware.go b/internal/middlewares/middleware.go
index b6818af..773868f 100644
--- a/internal/middlewares/middleware.go
+++ b/internal/middlewares/middleware.go
@@ -223,7 +223,6 @@ func APIKeyAuthMiddleware(keyService *auth.APIKeyService, userRepo *repositories
}
// RequireScope aborts 403 unless the authenticated API key grants scope (or "*").
-// These routes are API-key-only; JWT callers never reach this middleware.
func RequireScope(scope string) okapi.Middleware {
return func(c *okapi.Context) error {
raw := c.GetString("api_key_scopes")
diff --git a/internal/routes/admin_routes.go b/internal/routes/admin_routes.go
index f4512b1..80b4c7d 100644
--- a/internal/routes/admin_routes.go
+++ b/internal/routes/admin_routes.go
@@ -143,7 +143,7 @@ func (r *Router) adminRoutes() []okapi.RouteDefinition {
},
{
Method: http.MethodPost,
- Path: "/users/{id:int}/revoke-sessions",
+ Path: "/users/{id}/revoke-sessions",
Handler: okapi.H(r.h.admin.RevokeUserSessions),
Group: adminGroup,
Summary: "Revoke all user sessions",
@@ -299,7 +299,7 @@ func (r *Router) adminRoutes() []okapi.RouteDefinition {
Handler: okapi.H(r.h.plan.List),
Group: adminGroup,
Summary: "List plans",
- Request: &handlers.ListRequest{},
+ Request: &handlers.ListPlansRequest{},
Response: &dto.PageableResponse[models.Plan]{},
},
{
@@ -403,7 +403,7 @@ func (r *Router) adminRoutes() []okapi.RouteDefinition {
Handler: okapi.H(r.h.server.List),
Group: adminGroup,
Summary: "List shared SMTP servers",
- Request: &handlers.ListRequest{},
+ Request: &handlers.ListServersRequest{},
Response: &dto.PageableResponse[models.Server]{},
},
{
diff --git a/internal/routes/auth_routes.go b/internal/routes/auth_routes.go
index 7ce3c89..efbe1d6 100644
--- a/internal/routes/auth_routes.go
+++ b/internal/routes/auth_routes.go
@@ -414,7 +414,7 @@ func (r *Router) apiAuthRoutes() []okapi.RouteDefinition {
},
{
Method: http.MethodDelete,
- Path: "/webhooks/{id:int}",
+ Path: "/webhooks/{id}",
Handler: okapi.H(r.h.webhook.Delete),
Group: apiWebhooks,
Summary: "Delete webhook",
diff --git a/internal/storage/repositories/event_repo.go b/internal/storage/repositories/event_repo.go
index ff61caf..67372d1 100644
--- a/internal/storage/repositories/event_repo.go
+++ b/internal/storage/repositories/event_repo.go
@@ -45,13 +45,21 @@ func (r *EventRepository) FindByID(id uint) (*models.Event, error) {
return &event, nil
}
-func (r *EventRepository) FindAll(limit, offset int) ([]models.Event, int64, error) {
+func (r *EventRepository) FindAll(search string, limit, offset int) ([]models.Event, int64, error) {
var events []models.Event
var total int64
- r.db.Model(&models.Event{}).Count(&total)
+ countQ := r.db.Model(&models.Event{})
+ findQ := r.db.Model(&models.Event{})
+ if search != "" {
+ like := "%" + search + "%"
+ countQ = countQ.Where("type ILIKE ? OR message ILIKE ? OR actor_name ILIKE ?", like, like, like)
+ findQ = findQ.Where("type ILIKE ? OR message ILIKE ? OR actor_name ILIKE ?", like, like, like)
+ }
+
+ countQ.Count(&total)
- if err := r.db.Order("created_at DESC").
+ if err := findQ.Order("created_at DESC").
Limit(limit).Offset(offset).
Find(&events).Error; err != nil {
return nil, 0, err
@@ -74,14 +82,21 @@ func (r *EventRepository) FindPersonalByActorAndCategory(actorID uint, category
return events, total, nil
}
-func (r *EventRepository) FindByCategory(category models.EventCategory, limit, offset int) ([]models.Event, int64, error) {
+func (r *EventRepository) FindByCategory(category models.EventCategory, search string, limit, offset int) ([]models.Event, int64, error) {
var events []models.Event
var total int64
- r.db.Model(&models.Event{}).Where("category = ?", category).Count(&total)
+ countQ := r.db.Model(&models.Event{}).Where("category = ?", category)
+ findQ := r.db.Model(&models.Event{}).Where("category = ?", category)
+ if search != "" {
+ like := "%" + search + "%"
+ countQ = countQ.Where("type ILIKE ? OR message ILIKE ? OR actor_name ILIKE ?", like, like, like)
+ findQ = findQ.Where("type ILIKE ? OR message ILIKE ? OR actor_name ILIKE ?", like, like, like)
+ }
- if err := r.db.Where("category = ?", category).
- Order("created_at DESC").
+ countQ.Count(&total)
+
+ if err := findQ.Order("created_at DESC").
Limit(limit).Offset(offset).
Find(&events).Error; err != nil {
return nil, 0, err
diff --git a/internal/storage/repositories/plan_repo.go b/internal/storage/repositories/plan_repo.go
index 9f59f61..dc45704 100644
--- a/internal/storage/repositories/plan_repo.go
+++ b/internal/storage/repositories/plan_repo.go
@@ -50,13 +50,21 @@ func (r *PlanRepository) FindByID(id uint) (*models.Plan, error) {
return &plan, nil
}
-func (r *PlanRepository) FindAll(limit, offset int) ([]models.Plan, int64, error) {
+func (r *PlanRepository) FindAll(search string, limit, offset int) ([]models.Plan, int64, error) {
var plans []models.Plan
var total int64
- r.db.Model(&models.Plan{}).Count(&total)
+ countQ := r.db.Model(&models.Plan{})
+ findQ := r.db.Model(&models.Plan{})
+ if search != "" {
+ like := "%" + search + "%"
+ countQ = countQ.Where("name ILIKE ? OR description ILIKE ?", like, like)
+ findQ = findQ.Where("name ILIKE ? OR description ILIKE ?", like, like)
+ }
+
+ countQ.Count(&total)
- if err := r.db.Order("created_at DESC").
+ if err := findQ.Order("created_at DESC").
Limit(limit).Offset(offset).
Find(&plans).Error; err != nil {
return nil, 0, err
diff --git a/internal/storage/repositories/server_repo.go b/internal/storage/repositories/server_repo.go
index 3f3c5a2..98997c6 100644
--- a/internal/storage/repositories/server_repo.go
+++ b/internal/storage/repositories/server_repo.go
@@ -50,13 +50,21 @@ func (r *ServerRepository) FindByID(id uint) (*models.Server, error) {
return &server, nil
}
-func (r *ServerRepository) FindAll(limit, offset int) ([]models.Server, int64, error) {
+func (r *ServerRepository) FindAll(search string, limit, offset int) ([]models.Server, int64, error) {
var servers []models.Server
var total int64
- r.db.Model(&models.Server{}).Count(&total)
+ countQ := r.db.Model(&models.Server{})
+ findQ := r.db.Model(&models.Server{})
+ if search != "" {
+ like := "%" + search + "%"
+ countQ = countQ.Where("name ILIKE ? OR host ILIKE ?", like, like)
+ findQ = findQ.Where("name ILIKE ? OR host ILIKE ?", like, like)
+ }
+
+ countQ.Count(&total)
- if err := r.db.Order("created_at DESC").
+ if err := findQ.Order("created_at DESC").
Limit(limit).Offset(offset).
Find(&servers).Error; err != nil {
return nil, 0, err
diff --git a/web/src/api/admin.ts b/web/src/api/admin.ts
index 60dc4cc..4387414 100644
--- a/web/src/api/admin.ts
+++ b/web/src/api/admin.ts
@@ -44,9 +44,10 @@ export const adminApi = {
getMetrics() {
return api.get<ApiResponse<AdminMetrics>>('/admin/metrics')
},
- listEvents(page = 0, size = 20, category?: string) {
+ listEvents(page = 0, size = 20, category?: string, search = '') {
const params: Record<string, any> = { page, size }
if (category) params.category = category
+ if (search) params.search = search
return api.get<PaginatedResponse<Event>>('/admin/events', { params })
},
getEvent(id: number) {
diff --git a/web/src/api/plans.ts b/web/src/api/plans.ts
index 0f088d4..8495c2d 100644
--- a/web/src/api/plans.ts
+++ b/web/src/api/plans.ts
@@ -2,8 +2,8 @@ import api from './client'
import type { ApiResponse, PaginatedResponse, Plan, PlanInput } from './types'
export const plansApi = {
- list(page = 0, size = 20) {
- return api.get<PaginatedResponse<Plan>>('/admin/plans', { params: { page, size } })
+ list(page = 0, size = 20, search = '') {
+ return api.get<PaginatedResponse<Plan>>('/admin/plans', { params: { page, size, search: search || undefined } })
},
get(id: number) {
return api.get<ApiResponse<Plan>>(`/admin/plans/${id}`)
diff --git a/web/src/api/servers.ts b/web/src/api/servers.ts
index 2b78fd9..41a5fc1 100644
--- a/web/src/api/servers.ts
+++ b/web/src/api/servers.ts
@@ -2,8 +2,8 @@ import api from './client'
import type { ApiResponse, PaginatedResponse, SharedServer, SharedServerInput } from './types'
export const serversApi = {
- list(page = 0, size = 20) {
- return api.get<PaginatedResponse<SharedServer>>('/admin/servers', { params: { page, size } })
+ list(page = 0, size = 20, search = '') {
+ return api.get<PaginatedResponse<SharedServer>>('/admin/servers', { params: { page, size, search: search || undefined } })
},
get(id: number) {
return api.get<ApiResponse<SharedServer>>(`/admin/servers/${id}`)
diff --git a/web/src/views/admin/Events.vue b/web/src/views/admin/Events.vue
index 4801d8c..0809b41 100644
--- a/web/src/views/admin/Events.vue
+++ b/web/src/views/admin/Events.vue
@@ -12,6 +12,8 @@ const loading = ref(true)
const events = ref<Event[]>([])
const page = ref(0)
const category = ref('')
+const search = ref('')
+let searchTimeout: ReturnType<typeof setTimeout> | null = null
const liveEvents = ref<Event[]>([])
const streaming = ref(false)
let eventSource: EventSource | null = null
@@ -28,7 +30,7 @@ onBeforeUnmount(() => {
const { pageable, goToPage } = usePagination(async (page) => {
loading.value = true
try {
- const res = await adminApi.listEvents(page, 20, category.value || undefined)
+ const res = await adminApi.listEvents(page, pageable.value.size, category.value || undefined, search.value)
events.value = res.data.data
pageable.value = res.data.pageable
} catch (e) {
@@ -38,7 +40,11 @@ const { pageable, goToPage } = usePagination(async (page) => {
}
})
-
+// Debounce keystrokes, then reset to the first page of results.
+function onSearchInput() {
+ if (searchTimeout) clearTimeout(searchTimeout)
+ searchTimeout = setTimeout(() => goToPage(0), 300)
+}
function filterByCategory(cat: string) {
category.value = cat
@@ -181,12 +187,21 @@ function timeAgo(date: string) {
<template v-else>
<div class="card">
- <div class="card-header">
+ <div class="card-header" style="display: flex; gap: 12px; align-items: center;">
<h2>Event History</h2>
+ <input
+ v-model="search"
+ type="text"
+ class="form-input"
+ placeholder="Search events..."
+ style="max-width: 320px; margin-left: auto;"
+ @input="onSearchInput"
+ />
</div>
<div v-if="events.length === 0" class="empty-state">
<h3>No events found</h3>
- <p>No activity has been recorded yet.</p>
+ <p v-if="search || category">No events match your filters.</p>
+ <p v-else>No activity has been recorded yet.</p>
</div>
<div v-else class="card-body">
<table class="table">
@@ -201,7 +216,7 @@ function timeAgo(date: string) {
</tr>
</thead>
<tbody>
- <tr v-for="evt in events" :key="evt.id" class="clickable-row" @click="openDetail(evt)">
+ <tr v-for="evt in events" :key="evt.id" class="row-clickable" @click="openDetail(evt)">
<td><span :class="categoryBadgeClass(evt.category)">{{ evt.category }}</span></td>
<td><code>{{ evt.type }}</code></td>
<td>{{ evt.actor_name || '-' }}</td>
diff --git a/web/src/views/admin/Plans.vue b/web/src/views/admin/Plans.vue
index 84a3abe..060fb4b 100644
--- a/web/src/views/admin/Plans.vue
+++ b/web/src/views/admin/Plans.vue
@@ -38,10 +38,14 @@ const defaultForm = (): PlanInput => ({
})
const form = ref<PlanInput>(defaultForm())
+
+const search = ref('')
+let searchTimeout: ReturnType<typeof setTimeout> | null = null
+
const { pageable, goToPage } = usePagination(async (page) => {
loading.value = true
try {
- const res = await plansApi.list(currentPage.value)
+ const res = await plansApi.list(page, pageable.value.size, search.value)
plans.value = res.data.data
pageable.value = res.data.pageable
} catch (e) {
@@ -51,6 +55,12 @@ const { pageable, goToPage } = usePagination(async (page) => {
}
})
+// Debounce keystrokes, then reset to the first page of results.
+function onSearchInput() {
+ if (searchTimeout) clearTimeout(searchTimeout)
+ searchTimeout = setTimeout(() => goToPage(0), 300)
+}
+
function openCreate() {
editing.value = null
form.value = defaultForm()
@@ -144,12 +154,24 @@ const { watchClickStart, confirmClickEnd } = useModalSafeClose(() => {
<button class="btn btn-primary" @click="openCreate">Create Plan</button>
</div>
- <div v-if="loading" class="loading-page">
- <div class="spinner"></div>
- </div>
+ <div class="card">
+ <div class="card-header" style="display: flex; gap: 12px; align-items: center;">
+ <h2>Plans</h2>
+ <input
+ v-model="search"
+ type="text"
+ class="form-input"
+ placeholder="Search by name or description..."
+ style="max-width: 320px; margin-left: auto;"
+ @input="onSearchInput"
+ />
+ </div>
+
+ <div v-if="loading" class="loading-page">
+ <div class="spinner"></div>
+ </div>
- <template v-else>
- <div class="card">
+ <template v-else>
<div class="table-wrapper" v-if="plans.length > 0">
<table>
<thead>
@@ -163,7 +185,12 @@ const { watchClickStart, confirmClickEnd } = useModalSafeClose(() => {
</tr>
</thead>
<tbody>
- <tr v-for="plan in plans" :key="plan.id">
+ <tr
+ v-for="plan in plans"
+ :key="plan.id"
+ class="row-clickable"
+ @click="router.push(`/admin/plans/${plan.id}`)"
+ >
<td>
<strong>{{ plan.name }}</strong>
<span v-if="plan.is_default" class="badge badge-info" style="margin-left: 8px">Default</span>
@@ -189,10 +216,10 @@ const { watchClickStart, confirmClickEnd } = useModalSafeClose(() => {
<td>{{ formatLimit(plan.max_workspaces) }}</td>
<td>
<div class="flex gap-2">
- <button class="btn btn-secondary btn-sm" @click="router.push(`/admin/plans/${plan.id}`)">View</button>
- <button class="btn btn-secondary btn-sm" @click="openEdit(plan)">Edit</button>
- <button v-if="!plan.is_default" class="btn btn-secondary btn-sm" @click="setDefault(plan)">Set Default</button>
- <button class="btn btn-danger btn-sm" @click="deletePlan(plan)">Delete</button>
+ <button class="btn btn-secondary btn-sm" @click.stop="router.push(`/admin/plans/${plan.id}`)">View</button>
+ <button class="btn btn-secondary btn-sm" @click.stop="openEdit(plan)">Edit</button>
+ <button v-if="!plan.is_default" class="btn btn-secondary btn-sm" @click.stop="setDefault(plan)">Set Default</button>
+ <button class="btn btn-danger btn-sm" @click.stop="deletePlan(plan)">Delete</button>
</div>
</td>
</tr>
@@ -202,11 +229,12 @@ const { watchClickStart, confirmClickEnd } = useModalSafeClose(() => {
<div v-else class="empty-state">
<h3>No plans</h3>
- <p>Create a plan to define usage limits and resource quotas for workspaces.</p>
+ <p v-if="search">No plans match “{{ search }}”.</p>
+ <p v-else>Create a plan to define usage limits and resource quotas for workspaces.</p>
</div>
-<Pagination :pageable="pageable" @page="goToPage" />
- </div>
- </template>
+ <Pagination :pageable="pageable" @page="goToPage" />
+ </template>
+ </div>
<!-- Create/Edit Modal -->
<div v-if="showModal" class="modal-overlay" @mousedown="watchClickStart" @mouseup="confirmClickEnd">
diff --git a/web/src/views/admin/Servers.vue b/web/src/views/admin/Servers.vue
index 7ae0f6d..17a987e 100644
--- a/web/src/views/admin/Servers.vue
+++ b/web/src/views/admin/Servers.vue
@@ -17,7 +17,6 @@ const { confirm } = useConfirm()
const servers = ref<SharedServer[]>([])
const loading = ref(true)
-const currentPage = ref(0)
const showModal = ref(false)
const editing = ref<SharedServer | null>(null)
@@ -34,10 +33,14 @@ const editing = ref<SharedServer | null>(null)
})
const allowedDomainsText = ref('')
const saving = ref(false)
+
+const search = ref('')
+let searchTimeout: ReturnType<typeof setTimeout> | null = null
+
const { pageable, goToPage } = usePagination(async (page) => {
loading.value = true
try {
- const res = await serversApi.list(currentPage.value)
+ const res = await serversApi.list(page, pageable.value.size, search.value)
servers.value = res.data.data
pageable.value = res.data.pageable
} catch (e) {
@@ -47,6 +50,12 @@ const { pageable, goToPage } = usePagination(async (page) => {
}
})
+// Debounce keystrokes, then reset to the first page of results.
+function onSearchInput() {
+ if (searchTimeout) clearTimeout(searchTimeout)
+ searchTimeout = setTimeout(() => goToPage(0), 300)
+}
+
function openCreate() {
editing.value = null
form.value = { name: '', host: '', port: 587, username: '', password: '', encryption: 'starttls', max_retries: 0, allowed_domains: [], security_mode: 'permissive' }
@@ -132,12 +141,24 @@ const { watchClickStart, confirmClickEnd } = useModalSafeClose(() => {
<button class="btn btn-primary" @click="openCreate">Add Server</button>
</div>
- <div v-if="loading" class="loading-page">
- <div class="spinner"></div>
- </div>
+ <div class="card">
+ <div class="card-header" style="display: flex; gap: 12px; align-items: center;">
+ <h2>Servers</h2>
+ <input
+ v-model="search"
+ type="text"
+ class="form-input"
+ placeholder="Search by name or host..."
+ style="max-width: 320px; margin-left: auto;"
+ @input="onSearchInput"
+ />
+ </div>
+
+ <div v-if="loading" class="loading-page">
+ <div class="spinner"></div>
+ </div>
- <template v-else>
- <div class="card">
+ <template v-else>
<div class="table-wrapper" v-if="servers.length > 0">
<table>
<thead>
@@ -151,7 +172,12 @@ const { watchClickStart, confirmClickEnd } = useModalSafeClose(() => {
</tr>
</thead>
<tbody>
- <tr v-for="server in servers" :key="server.id">
+ <tr
+ v-for="server in servers"
+ :key="server.id"
+ class="row-clickable"
+ @click="router.push(`/admin/servers/${server.id}`)"
+ >
<td><strong>{{ server.name }}</strong></td>
<td>{{ server.host }}</td>
<td>
@@ -174,9 +200,9 @@ const { watchClickStart, confirmClickEnd } = useModalSafeClose(() => {
</td>
<td>
<div class="flex gap-2">
- <button class="btn btn-secondary btn-sm" @click="router.push(`/admin/servers/${server.id}`)">View</button>
- <button class="btn btn-secondary btn-sm" @click="openEdit(server)">Edit</button>
- <button class="btn btn-danger btn-sm" @click="deleteServer(server)">Delete</button>
+ <button class="btn btn-secondary btn-sm" @click.stop="router.push(`/admin/servers/${server.id}`)">View</button>
+ <button class="btn btn-secondary btn-sm" @click.stop="openEdit(server)">Edit</button>
+ <button class="btn btn-danger btn-sm" @click.stop="deleteServer(server)">Delete</button>
</div>
</td>
</tr>
@@ -186,13 +212,13 @@ const { watchClickStart, confirmClickEnd } = useModalSafeClose(() => {
<div v-else class="empty-state">
<h3>No shared servers</h3>
- <p>Add a shared SMTP server to give accounts without personal SMTP configuration a delivery path.</p>
+ <p v-if="search">No servers match “{{ search }}”.</p>
+ <p v-else>Add a shared SMTP server to give accounts without personal SMTP configuration a delivery path.</p>
</div>
-<Pagination :pageable="pageable" @page="goToPage" />
-
- </div>
- </template>
+ <Pagination :pageable="pageable" @page="goToPage" />
+ </template>
+ </div>
<!-- Create/Edit Modal -->
<div v-if="showModal" class="modal-overlay" @mousedown="watchClickStart" @mouseup="confirmClickEnd">