feat: Implement configuration and job duplication functionality

- Added duplication feature for configurations and jobs, allowing users to create copies of existing entries.
- Introduced new buttons in the UI for duplicating configurations and jobs, enhancing user experience.
- Implemented backend logic to handle duplication requests, ensuring proper ownership checks and data integrity.
- Added notifications for successful duplication actions to inform users of the outcome.
- Updated relevant templates and handlers to support the new duplication functionality.
This commit is contained in:
StarFleetCPTN
2025-03-22 22:19:05 -07:00
parent 49a586db53
commit db6259f8a3
20 changed files with 2433 additions and 347 deletions
+76
View File
@@ -136,6 +136,18 @@ templ Configs(ctx context.Context, data ConfigsData) {
// This is definitely a delete request - store this information
window.isConfigDeleteRequest = true;
}
// Check if this is a duplication request
if (path && method === 'POST' && path.match(/^\/configs\/\d+\/duplicate$/)) {
window.isConfigDuplicateRequest = true;
// Store the config ID for reference
const configId = path.match(/^\/configs\/(\d+)\/duplicate$/)[1];
const configButton = document.querySelector(`button[hx-post="/configs/${configId}/duplicate"]`);
if (configButton) {
window.duplicatingConfigName = configButton.closest('li').querySelector('.text-blue-600').textContent.trim();
}
}
});
// Track HTMX after-request events for config deletion
@@ -175,6 +187,22 @@ templ Configs(ctx context.Context, data ConfigsData) {
window.isConfigDeleteRequest = false;
window.lastDeletedConfig = null;
}
// Check if this is a duplication request
const isDuplicateRequest = window.isConfigDuplicateRequest &&
event.detail.pathInfo &&
event.detail.pathInfo.requestPath &&
event.detail.pathInfo.requestPath.match(/^\/configs\/\d+\/duplicate$/);
// If this is a successful duplication request, show notification
if (isDuplicateRequest && event.detail.successful) {
const configName = window.duplicatingConfigName || "configuration";
window.notyf.success(`Configuration "${configName}" duplicated successfully`);
// Clear flags
window.isConfigDuplicateRequest = false;
window.duplicatingConfigName = null;
}
});
// Track HTMX error events for config deletion
@@ -218,6 +246,36 @@ templ Configs(ctx context.Context, data ConfigsData) {
window.isConfigDeleteRequest = false;
window.lastDeletedConfig = null;
}
// Check if this is a duplication request
const isDuplicateRequest = window.isConfigDuplicateRequest &&
event.detail.pathInfo &&
event.detail.pathInfo.requestPath &&
event.detail.pathInfo.requestPath.match(/^\/configs\/\d+\/duplicate$/);
if (isDuplicateRequest) {
const configName = window.duplicatingConfigName || "configuration";
let errorMsg = `Failed to duplicate configuration "${configName}"`;
if (event.detail.xhr && event.detail.xhr.responseText) {
try {
const error = JSON.parse(event.detail.xhr.responseText);
errorMsg = `Error: ${error.error}`;
} catch (e) {
// If not JSON, use the response text directly
if (event.detail.xhr.responseText.trim()) {
errorMsg = event.detail.xhr.responseText;
}
}
}
window.notyf.error(errorMsg);
// Clear flags
window.isConfigDuplicateRequest = false;
window.duplicatingConfigName = null;
}
});
</script>
@@ -289,6 +347,15 @@ templ Configs(ctx context.Context, data ConfigsData) {
<i class="fas fa-edit w-3.5 h-3.5 mr-1.5"></i>
Edit
</a>
<!-- Duplicate config button -->
<button
type="button"
hx-post={ fmt.Sprintf("/configs/%d/duplicate", config.ID) }
hx-target="body"
class="text-indigo-700 bg-indigo-100 hover:bg-indigo-200 focus:ring-4 focus:outline-none focus:ring-indigo-300 font-medium rounded-lg text-sm px-3 py-1.5 text-center inline-flex items-center dark:bg-indigo-700 dark:text-indigo-300 dark:hover:bg-indigo-600 dark:focus:ring-indigo-800">
<i class="fas fa-clone w-3.5 h-3.5 mr-1.5"></i>
Duplicate
</button>
<!-- Add delete dialog for each configuration -->
@ConfigDialog(
fmt.Sprintf("delete-config-dialog-%d", config.ID),
@@ -355,6 +422,15 @@ templ Configs(ctx context.Context, data ConfigsData) {
<p class="text-gray-700 dark:text-gray-300">Google Drive and Google Photos configurations require authentication. Click the "Authenticate" button to complete setup.</p>
</div>
</div>
<div class="flex items-start mt-4">
<div class="flex items-center h-5">
<i class="fas fa-clone w-4 h-4 text-indigo-500 dark:text-indigo-400 mr-2"></i>
</div>
<div class="ml-2 text-sm">
<p class="text-gray-700 dark:text-gray-300">When duplicating configurations, you may need to re-enter sensitive credentials for security reasons. Make sure to edit duplicated configurations to add any required credentials.</p>
</div>
</div>
</div>
</div>
</div>
+17 -17
View File
@@ -64,8 +64,8 @@ templ Dashboard(ctx context.Context, data DashboardData) {
<div class="p-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800 sm:p-6">
<div class="flex items-center justify-between mb-4">
<h3 class="text-lg font-semibold text-gray-900 dark:text-white">Active Transfers</h3>
<div class="flex items-center justify-center w-8 h-8 text-blue-600 bg-blue-100 rounded-lg dark:text-blue-300 dark:bg-blue-900">
<i class="fas fa-exchange-alt w-5 h-5 text-center"></i>
<div class="inline-flex items-center justify-center w-10 h-10 text-blue-600 bg-blue-100 rounded-lg dark:text-blue-300 dark:bg-blue-900">
<i class="fas fa-exchange-alt w-6 h-6 flex items-center justify-center"></i>
</div>
</div>
<div class="flex items-center">
@@ -82,8 +82,8 @@ templ Dashboard(ctx context.Context, data DashboardData) {
<div class="p-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800 sm:p-6">
<div class="flex items-center justify-between mb-4">
<h3 class="text-lg font-semibold text-gray-900 dark:text-white">Completed Today</h3>
<div class="flex items-center justify-center w-8 h-8 text-green-600 bg-green-100 rounded-lg dark:text-green-300 dark:bg-green-900">
<i class="fas fa-check-circle w-5 h-5 text-center"></i>
<div class="inline-flex items-center justify-center w-10 h-10 text-green-600 bg-green-100 rounded-lg dark:text-green-300 dark:bg-green-900">
<i class="fas fa-check-circle w-6 h-6 flex items-center justify-center"></i>
</div>
</div>
<div class="flex items-center">
@@ -100,8 +100,8 @@ templ Dashboard(ctx context.Context, data DashboardData) {
<div class="p-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800 sm:p-6">
<div class="flex items-center justify-between mb-4">
<h3 class="text-lg font-semibold text-gray-900 dark:text-white">Failed Transfers</h3>
<div class="flex items-center justify-center w-8 h-8 text-red-600 bg-red-100 rounded-lg dark:text-red-300 dark:bg-red-900">
<i class="fas fa-exclamation-circle w-5 h-5 text-center"></i>
<div class="inline-flex items-center justify-center w-10 h-10 text-red-600 bg-red-100 rounded-lg dark:text-red-300 dark:bg-red-900">
<i class="fas fa-exclamation-circle w-6 h-6 flex items-center justify-center"></i>
</div>
</div>
<div class="flex items-center">
@@ -121,7 +121,7 @@ templ Dashboard(ctx context.Context, data DashboardData) {
<div class="bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800">
<div class="flex items-center justify-between px-4 py-4 border-b border-gray-200 dark:border-gray-700">
<h3 class="text-lg font-semibold text-gray-900 dark:text-white flex items-center">
<i class="fas fa-history w-5 h-5 mr-2 text-blue-500 dark:text-blue-400 flex-shrink-0"></i>
<i class="fas fa-history w-6 h-6 mr-2 text-blue-500 dark:text-blue-400 flex-shrink-0"></i>
Recent Jobs
</h3>
</div>
@@ -147,16 +147,16 @@ templ Dashboard(ctx context.Context, data DashboardData) {
<div class="flex items-center">
<div class="flex-shrink-0">
if job.Status == "completed" {
<span class="inline-flex items-center justify-center h-10 w-10 rounded-full bg-green-100 dark:bg-green-900">
<i class="fas fa-check-circle w-5 h-5 text-green-600 dark:text-green-300"></i>
<span class="inline-flex items-center justify-center h-12 w-12 rounded-full bg-green-100 dark:bg-green-900">
<i class="fas fa-check-circle w-6 h-6 flex items-center justify-center"></i>
</span>
} else if job.Status == "failed" {
<span class="inline-flex items-center justify-center h-10 w-10 rounded-full bg-red-100 dark:bg-red-900">
<i class="fas fa-exclamation-circle w-5 h-5 text-red-600 dark:text-red-300"></i>
<span class="inline-flex items-center justify-center h-12 w-12 rounded-full bg-red-100 dark:bg-red-900">
<i class="fas fa-exclamation-circle w-6 h-6 flex items-center justify-center"></i>
</span>
} else {
<span class="inline-flex items-center justify-center h-10 w-10 rounded-full bg-blue-100 dark:bg-blue-900">
<i class="fas fa-tasks w-5 h-5 text-blue-600 dark:text-blue-300"></i>
<span class="inline-flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 dark:bg-blue-900">
<i class="fas fa-tasks w-6 h-6 flex items-center justify-center"></i>
</span>
}
</div>
@@ -195,21 +195,21 @@ templ Dashboard(ctx context.Context, data DashboardData) {
<div class="bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800">
<div class="flex items-center justify-between px-4 py-4 border-b border-gray-200 dark:border-gray-700">
<h3 class="text-lg font-semibold text-gray-900 dark:text-white flex items-center">
<i class="fas fa-bolt w-5 h-5 mr-2 text-blue-500 dark:text-blue-400 flex-shrink-0"></i>
<i class="fas fa-bolt w-6 h-6 mr-2 text-blue-500 dark:text-blue-400 flex-shrink-0"></i>
Quick Actions
</h3>
</div>
<div class="p-4 space-y-4">
<a href="/configs/new" class="inline-flex items-center justify-center w-full text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium rounded-lg px-5 py-2.5 dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800">
<i class="fas fa-plus w-4 h-4 mr-2"></i>
<i class="fas fa-plus w-5 h-5 mr-2"></i>
Create New Config
</a>
<a href="/jobs/new" class="inline-flex items-center justify-center w-full text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium rounded-lg px-5 py-2.5 dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800">
<i class="fas fa-tasks w-4 h-4 mr-2"></i>
<i class="fas fa-tasks w-5 h-5 mr-2"></i>
Create New Job
</a>
<a href="/history" class="inline-flex items-center justify-center w-full text-gray-900 bg-white border border-gray-300 focus:outline-none hover:bg-gray-100 focus:ring-4 focus:ring-gray-200 font-medium rounded-lg px-5 py-2.5 dark:bg-gray-800 dark:text-white dark:border-gray-600 dark:hover:bg-gray-700 dark:hover:border-gray-600 dark:focus:ring-gray-700">
<i class="fas fa-history w-4 h-4 mr-2"></i>
<i class="fas fa-history w-5 h-5 mr-2"></i>
View Transfer History
</a>
+10
View File
@@ -319,6 +319,16 @@ templ Jobs(ctx context.Context, data JobsData) {
<i class="fas fa-pen-to-square mr-1"></i>
Edit
</a>
<button
hx-post={ fmt.Sprintf("/jobs/%d/duplicate", job.ID) }
hx-swap="innerHTML"
hx-target="body"
class="text-indigo-700 bg-indigo-100 hover:bg-indigo-200 focus:ring-4 focus:outline-none focus:ring-indigo-300 font-medium rounded-lg text-xs px-3 py-1.5 text-center inline-flex items-center dark:bg-indigo-700 dark:text-indigo-300 dark:hover:bg-indigo-600 dark:focus:ring-indigo-800"
data-job-id={ fmt.Sprint(job.ID) }
data-job-name={ job.Name }>
<i class="fas fa-clone mr-1"></i>
Duplicate
</button>
<!-- Add delete dialog for each job -->
@JobDialog(
fmt.Sprintf("delete-job-dialog-%d", job.ID),
+29 -95
View File
@@ -353,12 +353,15 @@ templ LayoutWithContext(title string, ctx context.Context) {
type="button"
class="p-2 text-gray-500 rounded-lg hover:text-gray-900 hover:bg-gray-100 dark:text-gray-400 dark:hover:text-white dark:hover:bg-gray-700 focus:ring-4 focus:ring-gray-300 dark:focus:ring-gray-600 relative"
id="notification-bell"
data-dropdown-toggle="notification-dropdown"
data-dropdown-toggle="notification-dropdown"
hx-get="/notifications/dropdown"
hx-trigger="click once"
hx-target="#notification-dropdown-content"
data-dropdown-placement="bottom-end">
<span class="sr-only">View notifications</span>
<i class="fas fa-bell"></i>
<!-- Notification badge -->
<div class="absolute inline-flex items-center justify-center w-5 h-5 text-xs font-bold text-white bg-red-500 rounded-full -top-1 -right-1">3</div>
<!-- Notification badge will be loaded dynamically -->
<div hx-get="/notifications/count" hx-trigger="load, notification-updated from:body" id="notification-count-container"></div>
</button>
<!-- Notification dropdown -->
@@ -366,99 +369,30 @@ templ LayoutWithContext(title string, ctx context.Context) {
id="notification-dropdown"
style="min-width: 320px; width: 100%;"
data-dropdown-placement="bottom-end">
<div class="block py-2 px-4 text-base font-medium text-center text-gray-700 bg-gray-50 dark:bg-gray-600 dark:text-gray-300">
Notifications
</div>
<div>
<!-- Job completed notification -->
<a href="#" class="flex py-3 px-4 border-b hover:bg-gray-100 dark:hover:bg-gray-600 dark:border-gray-600">
<div class="flex-shrink-0">
<div class="w-11 h-11 rounded-full bg-green-100 flex items-center justify-center dark:bg-green-900">
<i class="fas fa-check-circle text-green-600 dark:text-green-300"></i>
</div>
<div class="flex absolute justify-center items-center ml-6 -mt-5 w-5 h-5 bg-primary-700 rounded-full border border-white dark:border-gray-700">
<i class="fas fa-check text-white text-xs"></i>
</div>
</div>
<div class="pl-3 w-full">
<div class="text-gray-500 font-normal text-sm mb-1.5 dark:text-gray-400">
<span class="font-semibold text-gray-900 dark:text-white">Job Complete:</span> Daily backup to AWS S3
</div>
<div class="text-xs font-medium text-primary-600 dark:text-primary-500">
10 minutes ago
</div>
</div>
</a>
<!-- Job failed notification -->
<a href="#" class="flex py-3 px-4 border-b hover:bg-gray-100 dark:hover:bg-gray-600 dark:border-gray-600">
<div class="flex-shrink-0">
<div class="w-11 h-11 rounded-full bg-red-100 flex items-center justify-center dark:bg-red-900">
<i class="fas fa-exclamation-circle text-red-600 dark:text-red-300"></i>
</div>
<div class="flex absolute justify-center items-center ml-6 -mt-5 w-5 h-5 bg-red-600 rounded-full border border-white dark:border-gray-700">
<i class="fas fa-times text-white text-xs"></i>
</div>
</div>
<div class="pl-3 w-full">
<div class="text-gray-500 font-normal text-sm mb-1.5 dark:text-gray-400">
<span class="font-semibold text-gray-900 dark:text-white">Job Failed:</span> SFTP transfer to customer portal
</div>
<div class="text-xs font-medium text-primary-600 dark:text-primary-500">
1 hour ago
</div>
</div>
</a>
<!-- Config updated notification -->
<a href="#" class="flex py-3 px-4 border-b hover:bg-gray-100 dark:hover:bg-gray-600 dark:border-gray-600">
<div class="flex-shrink-0">
<div class="w-11 h-11 rounded-full bg-blue-100 flex items-center justify-center dark:bg-blue-900">
<i class="fas fa-cog text-blue-600 dark:text-blue-300"></i>
</div>
<div class="flex absolute justify-center items-center ml-6 -mt-5 w-5 h-5 bg-blue-500 rounded-full border border-white dark:border-gray-700">
<i class="fas fa-wrench text-white text-xs"></i>
</div>
</div>
<div class="pl-3 w-full">
<div class="text-gray-500 font-normal text-sm mb-1.5 dark:text-gray-400">
<span class="font-semibold text-gray-900 dark:text-white">Config Updated:</span> AWS credentials refreshed
</div>
<div class="text-xs font-medium text-primary-600 dark:text-primary-500">
3 hours ago
</div>
</div>
</a>
<!-- New user notification -->
<a href="#" class="flex py-3 px-4 hover:bg-gray-100 dark:hover:bg-gray-600">
<div class="flex-shrink-0">
<div class="w-11 h-11 rounded-full bg-purple-100 flex items-center justify-center dark:bg-purple-900">
<i class="fas fa-user-plus text-purple-600 dark:text-purple-300"></i>
</div>
<div class="flex absolute justify-center items-center ml-6 -mt-5 w-5 h-5 bg-purple-500 rounded-full border border-white dark:border-gray-700">
<i class="fas fa-user text-white text-xs"></i>
</div>
</div>
<div class="pl-3 w-full">
<div class="text-gray-500 font-normal text-sm mb-1.5 dark:text-gray-400">
<span class="font-semibold text-gray-900 dark:text-white">User Added:</span> New admin added to the system
</div>
<div class="text-xs font-medium text-primary-600 dark:text-primary-500">
5 hours ago
</div>
</div>
</a>
</div>
<a href="/notifications" class="block py-2 text-md font-medium text-center text-gray-900 bg-gray-50 hover:bg-gray-100 dark:bg-gray-600 dark:text-white dark:hover:underline">
<div class="inline-flex items-center">
<svg aria-hidden="true" class="mr-2 w-4 h-4 text-gray-500 dark:text-gray-400" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<path d="M10 12a2 2 0 100-4 2 2 0 000 4z"></path>
<path fill-rule="evenodd" d="M.458 10C1.732 5.943 5.522 3 10 3s8.268 2.943 9.542 7c-1.274 4.057-5.064 7-9.542 7S1.732 14.057.458 10zM14 10a4 4 0 11-8 0 4 4 0 018 0z" clip-rule="evenodd"></path>
</svg>
View all
<div id="notification-dropdown-content">
<!-- Content will be loaded dynamically via HTMX -->
<div class="block py-2 px-4 text-base font-medium text-center text-gray-700 bg-gray-50 dark:bg-gray-600 dark:text-gray-300">
Notifications
</div>
</a>
<div class="py-4 px-4 text-center text-gray-500 dark:text-gray-400">
<div class="animate-pulse flex flex-col items-center">
<div class="rounded-full bg-gray-200 dark:bg-gray-700 h-12 w-12 mb-2"></div>
<div class="h-2 bg-gray-200 dark:bg-gray-700 rounded w-24 mb-4"></div>
<div class="h-2 bg-gray-200 dark:bg-gray-700 rounded w-full mb-2"></div>
<div class="h-2 bg-gray-200 dark:bg-gray-700 rounded w-full mb-2"></div>
<div class="h-2 bg-gray-200 dark:bg-gray-700 rounded w-3/4"></div>
</div>
</div>
<a href="/notifications" class="block py-2 text-md font-medium text-center text-gray-900 bg-gray-50 hover:bg-gray-100 dark:bg-gray-600 dark:text-white dark:hover:underline">
<div class="inline-flex items-center">
<svg aria-hidden="true" class="mr-2 w-4 h-4 text-gray-500 dark:text-gray-400" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<path d="M10 12a2 2 0 100-4 2 2 0 000 4z"></path>
<path fill-rule="evenodd" d="M.458 10C1.732 5.943 5.522 3 10 3s8.268 2.943 9.542 7c-1.274 4.057-5.064 7-9.542 7S1.732 14.057.458 10zM14 10a4 4 0 11-8 0 4 4 0 018 0z" clip-rule="evenodd"></path>
</svg>
View all
</div>
</a>
</div>
</div>
</div>
+86
View File
@@ -0,0 +1,86 @@
package components
import (
"context"
"fmt"
)
templ NotificationsPage(ctx context.Context, data NotificationsData) {
@LayoutWithContext("Notifications", ctx) {
<div class="bg-white dark:bg-gray-800 shadow-sm rounded-lg overflow-hidden">
<div class="p-6">
<div class="flex justify-between items-center mb-6">
<h1 class="text-2xl font-bold text-gray-900 dark:text-white">Notifications</h1>
<div class="flex space-x-2">
<a
href="/notifications/mark-all-read"
hx-post="/notifications/mark-all-read"
hx-swap="none"
hx-target="#notification-bell"
class="text-sm font-medium text-primary-600 hover:text-primary-700 dark:text-primary-400 dark:hover:text-primary-300"
>
<i class="fas fa-check-double mr-1"></i>
Mark all as read
</a>
</div>
</div>
if len(data.Notifications) == 0 {
<div class="text-center py-12">
<div class="inline-flex items-center justify-center w-16 h-16 rounded-full bg-gray-100 dark:bg-gray-700 mb-4">
<i class="fas fa-bell-slash text-2xl text-gray-500 dark:text-gray-400"></i>
</div>
<h3 class="text-lg font-medium text-gray-900 dark:text-white mb-1">No notifications</h3>
<p class="text-gray-500 dark:text-gray-400">You don't have any notifications yet.</p>
</div>
} else {
<div class="divide-y divide-gray-200 dark:divide-gray-700">
for _, notification := range data.Notifications {
<div
class={ "py-4 flex items-start", templ.KV("bg-blue-50 dark:bg-blue-900/20", !notification.IsRead) }
id={ "notification-" + fmt.Sprintf("%d", notification.ID) }>
<div class="flex-shrink-0 mr-4">
<div class={ "w-12 h-12 rounded-full flex items-center justify-center", GetNotificationBgColor(notification.Type) }>
<i class={ GetNotificationIcon(notification.Type) }></i>
</div>
</div>
<div class="flex-1 min-w-0">
<div class="flex justify-between items-start">
<div>
<h3 class="text-base font-medium text-gray-900 dark:text-white">{ notification.Title }</h3>
<p class="text-sm text-gray-500 dark:text-gray-400 mt-1">{ notification.Message }</p>
</div>
<div class="flex items-center text-xs text-gray-500 dark:text-gray-400">
<span>{ FormatNotificationTime(notification.CreatedAt) }</span>
if !notification.IsRead {
<button
hx-post={ "/notifications/" + fmt.Sprintf("%d", notification.ID) + "/read" }
hx-target={ "#notification-" + fmt.Sprintf("%d", notification.ID) }
hx-swap="outerHTML"
class="ml-4 text-primary-600 hover:text-primary-700 dark:text-primary-400 dark:hover:text-primary-300"
>
<i class="fas fa-check"></i>
<span class="sr-only">Mark as read</span>
</button>
}
</div>
</div>
<div class="mt-2">
<a
href={ templ.SafeURL(notification.Link) }
class="inline-flex items-center text-sm font-medium text-primary-600 hover:text-primary-700 dark:text-primary-400 dark:hover:text-primary-300">
<span>View details</span>
<i class="fas fa-chevron-right ml-1 text-xs"></i>
</a>
</div>
</div>
</div>
}
</div>
<!-- Pagination will go here if needed -->
}
</div>
</div>
}
}
+183
View File
@@ -0,0 +1,183 @@
package components
import (
"github.com/starfleetcptn/gomft/internal/db"
"time"
"fmt"
)
type NotificationsData struct {
Notifications []db.UserNotification
UnreadCount int64
}
// FormatNotificationTime formats a notification time in a user-friendly way
func FormatNotificationTime(t time.Time) string {
now := time.Now()
diff := now.Sub(t)
if diff < time.Minute {
return "just now"
} else if diff < time.Hour {
minutes := int(diff.Minutes())
if minutes == 1 {
return "1 minute ago"
}
return fmt.Sprintf("%d minutes ago", minutes)
} else if diff < 24*time.Hour {
hours := int(diff.Hours())
if hours == 1 {
return "1 hour ago"
}
return fmt.Sprintf("%d hours ago", hours)
} else if diff < 48*time.Hour {
return "yesterday"
} else {
days := int(diff.Hours() / 24)
if days < 7 {
return fmt.Sprintf("%d days ago", days)
} else {
return t.Format("Jan 2")
}
}
}
// GetNotificationIcon returns the appropriate icon class based on notification type
func GetNotificationIcon(notificationType db.NotificationType) string {
switch notificationType {
case db.NotificationJobStart:
return "fas fa-play text-blue-600 dark:text-blue-300"
case db.NotificationJobComplete:
return "fas fa-check-circle text-green-600 dark:text-green-300"
case db.NotificationJobFail:
return "fas fa-exclamation-circle text-red-600 dark:text-red-300"
case db.NotificationConfigUpdate:
return "fas fa-cog text-blue-600 dark:text-blue-300"
case db.NotificationSystemAlert:
return "fas fa-bell text-yellow-600 dark:text-yellow-300"
default:
return "fas fa-info-circle text-blue-600 dark:text-blue-300"
}
}
// GetNotificationBgColor returns the appropriate background color class based on notification type
func GetNotificationBgColor(notificationType db.NotificationType) string {
switch notificationType {
case db.NotificationJobStart:
return "bg-blue-100 dark:bg-blue-900"
case db.NotificationJobComplete:
return "bg-green-100 dark:bg-green-900"
case db.NotificationJobFail:
return "bg-red-100 dark:bg-red-900"
case db.NotificationConfigUpdate:
return "bg-blue-100 dark:bg-blue-900"
case db.NotificationSystemAlert:
return "bg-yellow-100 dark:bg-yellow-900"
default:
return "bg-blue-100 dark:bg-blue-900"
}
}
// GetNotificationBadgeColor returns the appropriate badge color class based on notification type
func GetNotificationBadgeColor(notificationType db.NotificationType) string {
switch notificationType {
case db.NotificationJobStart:
return "bg-primary-700"
case db.NotificationJobComplete:
return "bg-green-600"
case db.NotificationJobFail:
return "bg-red-600"
case db.NotificationConfigUpdate:
return "bg-blue-500"
case db.NotificationSystemAlert:
return "bg-yellow-500"
default:
return "bg-primary-700"
}
}
// GetNotificationBadgeIcon returns the appropriate badge icon class based on notification type
func GetNotificationBadgeIcon(notificationType db.NotificationType) string {
switch notificationType {
case db.NotificationJobStart:
return "fas fa-play"
case db.NotificationJobComplete:
return "fas fa-check"
case db.NotificationJobFail:
return "fas fa-times"
case db.NotificationConfigUpdate:
return "fas fa-wrench"
case db.NotificationSystemAlert:
return "fas fa-exclamation"
default:
return "fas fa-info"
}
}
templ NotificationDropdown(data NotificationsData) {
<div
class="block py-2 px-4 text-base font-medium text-center text-gray-700 bg-gray-50 dark:bg-gray-600 dark:text-gray-300">
Notifications
</div>
<div>
if len(data.Notifications) == 0 {
<div class="py-4 px-4 text-center text-gray-500 dark:text-gray-400">
<i class="fas fa-bell-slash text-2xl mb-2"></i>
<p>No notifications</p>
</div>
} else {
for _, notification := range data.Notifications {
<a
href={ templ.SafeURL(notification.Link) }
class={ "flex py-3 px-4 border-b hover:bg-gray-100 dark:hover:bg-gray-600 dark:border-gray-600", templ.KV("bg-blue-50 dark:bg-blue-900/20", !notification.IsRead) }>
<div class="flex-shrink-0">
<div class={ "w-11 h-11 rounded-full flex items-center justify-center", GetNotificationBgColor(notification.Type) }>
<i class={ GetNotificationIcon(notification.Type) }></i>
</div>
<div class={ "flex absolute justify-center items-center ml-6 -mt-5 w-5 h-5 rounded-full border border-white dark:border-gray-700", GetNotificationBadgeColor(notification.Type) }>
<i class={ "text-white text-xs", GetNotificationBadgeIcon(notification.Type) }></i>
</div>
</div>
<div class="pl-3 w-full">
<div class="text-gray-500 font-normal text-sm mb-1.5 dark:text-gray-400">
<span class="font-semibold text-gray-900 dark:text-white">{ notification.Title }:</span> { notification.Message }
</div>
<div class="text-xs font-medium text-primary-600 dark:text-primary-500">
{ FormatNotificationTime(notification.CreatedAt) }
</div>
</div>
</a>
}
}
</div>
<div class="flex">
<a href="/notifications" class="block w-1/2 py-2 text-md font-medium text-center text-gray-900 bg-gray-50 hover:bg-gray-100 dark:bg-gray-600 dark:text-white dark:hover:bg-gray-500">
<div class="inline-flex items-center">
<i class="far fa-eye mr-2"></i>
View all
</div>
</a>
<a href="/notifications/mark-all-read"
hx-post="/notifications/mark-all-read"
hx-swap="none"
hx-target="#notification-count"
class="block w-1/2 py-2 text-md font-medium text-center text-gray-900 bg-gray-50 hover:bg-gray-100 dark:bg-gray-600 dark:text-white dark:hover:bg-gray-500 border-l border-gray-200 dark:border-gray-700">
<div class="inline-flex items-center">
<i class="fas fa-check-double mr-2"></i>
Mark all read
</div>
</a>
</div>
}
templ NotificationCount(count int64) {
if count > 0 {
<div class="absolute inline-flex items-center justify-center w-5 h-5 text-xs font-bold text-white bg-red-500 rounded-full -top-1 -right-1" id="notification-count">
if count > 99 {
99+
} else {
{ fmt.Sprintf("%d", count) }
}
</div>
}
}
+313 -139
View File
@@ -8,7 +8,7 @@ import (
type NotificationService struct {
ID uint
Name string
Type string // "email", "slack", "webhook", etc.
Type string // "email", "webhook", etc.
IsEnabled bool
Config map[string]string
Description string
@@ -113,134 +113,275 @@ templ Settings(ctx context.Context, data SettingsData) {
</button>
</div>
} else {
<div class="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
for _, service := range data.NotificationServices {
<div class="p-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:bg-gray-800 dark:border-gray-700">
<div class="flex items-center justify-between mb-3">
<div class="flex items-center">
if service.Type == "email" {
<div class="w-10 h-10 rounded-full bg-blue-100 flex items-center justify-center text-blue-600 dark:bg-blue-900 dark:text-blue-400">
<i class="fas fa-envelope"></i>
<div class="bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800 overflow-hidden">
<ul class="divide-y divide-gray-200 dark:divide-gray-700">
for _, service := range data.NotificationServices {
<li>
<div class="block hover:bg-gray-50 dark:hover:bg-gray-700 transition-colors">
<div class="px-4 py-4 sm:px-6">
<div class="flex items-center justify-between">
<div class="flex items-center">
if service.Type == "email" {
<div class="w-10 h-10 rounded-full bg-blue-100 flex items-center justify-center text-blue-600 dark:bg-blue-900 dark:text-blue-400 mr-3">
<i class="fas fa-envelope"></i>
</div>
} else if service.Type == "webhook" {
<div class="w-10 h-10 rounded-full bg-green-100 flex items-center justify-center text-green-600 dark:bg-green-900 dark:text-green-400 mr-3">
<i class="fas fa-code"></i>
</div>
} else {
<div class="w-10 h-10 rounded-full bg-gray-100 flex items-center justify-center text-gray-600 dark:bg-gray-700 dark:text-gray-400 mr-3">
<i class="fas fa-bell"></i>
</div>
}
<div>
<p class="text-sm font-medium text-blue-600 dark:text-blue-400 truncate">
{ service.Name }
</p>
<p class="text-sm text-gray-500 dark:text-gray-400 mt-1">
{ service.Description }
</p>
</div>
</div>
<div class="ml-2 flex-shrink-0 flex space-x-2">
<button
type="button"
class="text-gray-500 bg-white focus:outline-none hover:bg-gray-100 focus:ring-4 focus:ring-gray-200 rounded-lg text-sm p-2 mr-1 dark:bg-gray-800 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white dark:focus:ring-gray-700"
data-modal-target="edit-notification-modal"
data-modal-toggle="edit-notification-modal"
data-service-id={ fmt.Sprint(service.ID) }
>
<i class="fas fa-edit"></i>
</button>
<button
type="button"
class="text-red-500 bg-white focus:outline-none hover:bg-gray-100 focus:ring-4 focus:ring-gray-200 rounded-lg text-sm p-2 dark:bg-gray-800 dark:text-red-400 dark:hover:bg-gray-700 dark:hover:text-white dark:focus:ring-gray-700"
hx-delete={ "/admin/settings/notifications/" + fmt.Sprint(service.ID) }
hx-confirm="Are you sure you want to delete this notification service? This cannot be undone."
hx-target="body"
>
<i class="fas fa-trash-alt"></i>
</button>
</div>
</div>
} else if service.Type == "slack" {
<div class="w-10 h-10 rounded-full bg-purple-100 flex items-center justify-center text-purple-600 dark:bg-purple-900 dark:text-purple-400">
<i class="fab fa-slack"></i>
<div class="mt-3 sm:flex sm:justify-between">
<div class="sm:flex flex-col md:flex-row gap-2 md:gap-6">
<div class="flex items-center">
<span class={ "px-2 py-1 text-xs font-medium rounded-full",
templ.KV("bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-300", service.IsEnabled),
templ.KV("bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300", !service.IsEnabled) }>
if service.IsEnabled {
Active
} else {
Disabled
}
</span>
<span class="ml-2 px-2 py-1 text-xs font-medium bg-blue-100 text-blue-800 dark:bg-blue-900 dark:text-blue-300 rounded-full">
{ service.Type }
</span>
if len(service.EventTriggers) > 0 && service.Type == "webhook" {
<span class="ml-2 px-2 py-1 text-xs font-medium bg-purple-100 text-purple-800 dark:bg-purple-900 dark:text-purple-300 rounded-full">
{ fmt.Sprintf("%d triggers", len(service.EventTriggers)) }
</span>
}
if service.SuccessCount > 0 || service.FailureCount > 0 {
<span class="ml-2 px-2 py-1 text-xs font-medium bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300 rounded-full">
{ fmt.Sprintf("%d/%d", service.SuccessCount, service.SuccessCount + service.FailureCount) }
</span>
}
</div>
</div>
if service.Type == "webhook" {
<div class="mt-2 md:mt-0 flex items-center space-x-4">
<div class="text-xs">
<span class="text-gray-500 dark:text-gray-400">Events:</span>
<span class="ml-1 text-gray-900 dark:text-gray-300">
if len(service.EventTriggers) == 0 {
None
} else {
for i, trigger := range service.EventTriggers {
if i > 0 {
<span>, </span>
}
{ trigger }
}
}
</span>
</div>
<div class="text-xs">
<span class="text-gray-500 dark:text-gray-400">Retry:</span>
<span class="ml-1 text-gray-900 dark:text-gray-300">
if service.RetryPolicy == "" {
Default
} else {
{ service.RetryPolicy }
}
</span>
</div>
</div>
} else {
<div class="mt-2 md:mt-0 flex items-center text-sm text-gray-500 dark:text-gray-400">
<i class="far fa-clock w-4 h-4 mr-1.5 text-gray-400 dark:text-gray-500"></i>
<p>Last sent:
if service.SuccessCount > 0 {
"Recently"
} else {
"Never"
}
</p>
</div>
}
</div>
} else if service.Type == "webhook" {
<div class="w-10 h-10 rounded-full bg-green-100 flex items-center justify-center text-green-600 dark:bg-green-900 dark:text-green-400">
<i class="fas fa-code"></i>
</div>
} else {
<div class="w-10 h-10 rounded-full bg-gray-100 flex items-center justify-center text-gray-600 dark:bg-gray-700 dark:text-gray-400">
<i class="fas fa-bell"></i>
</div>
}
<h3 class="ml-3 text-lg font-semibold text-gray-900 dark:text-white">{ service.Name }</h3>
</div>
<div class="flex">
<div class="inline-flex">
<button
type="button"
class="text-gray-500 bg-white focus:outline-none hover:bg-gray-100 focus:ring-4 focus:ring-gray-200 rounded-lg text-sm p-2 mr-1 dark:bg-gray-800 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white dark:focus:ring-gray-700"
data-modal-target="edit-notification-modal"
data-modal-toggle="edit-notification-modal"
data-service-id={ fmt.Sprint(service.ID) }
>
<i class="fas fa-edit"></i>
</button>
<button
type="button"
class="text-red-500 bg-white focus:outline-none hover:bg-gray-100 focus:ring-4 focus:ring-gray-200 rounded-lg text-sm p-2 dark:bg-gray-800 dark:text-red-400 dark:hover:bg-gray-700 dark:hover:text-white dark:focus:ring-gray-700"
hx-delete={ "/settings/notifications/" + fmt.Sprint(service.ID) }
hx-confirm="Are you sure you want to delete this notification service? This cannot be undone."
hx-target="body"
>
<i class="fas fa-trash-alt"></i>
</button>
</div>
</div>
</div>
<div class="flex items-center mb-2">
<span class={ "px-2 py-1 text-xs font-medium rounded-full",
templ.KV("bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-300", service.IsEnabled),
templ.KV("bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300", !service.IsEnabled) }>
if service.IsEnabled {
Active
} else {
Disabled
}
</span>
<span class="ml-2 px-2 py-1 text-xs font-medium bg-blue-100 text-blue-800 dark:bg-blue-900 dark:text-blue-300 rounded-full">
{ service.Type }
</span>
if len(service.EventTriggers) > 0 && service.Type == "webhook" {
<span class="ml-2 px-2 py-1 text-xs font-medium bg-purple-100 text-purple-800 dark:bg-purple-900 dark:text-purple-300 rounded-full">
{ fmt.Sprintf("%d triggers", len(service.EventTriggers)) }
</span>
}
if service.SuccessCount > 0 || service.FailureCount > 0 {
<span class="ml-2 px-2 py-1 text-xs font-medium bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300 rounded-full">
{ fmt.Sprintf("%d/%d", service.SuccessCount, service.SuccessCount + service.FailureCount) }
</span>
}
</div>
<p class="text-sm text-gray-500 dark:text-gray-400 mb-2">{ service.Description }</p>
if service.Type == "webhook" {
<div class="mt-3 pt-3 border-t border-gray-200 dark:border-gray-700">
<h4 class="text-sm font-medium text-gray-900 dark:text-white mb-2">Webhook Configuration</h4>
<div class="grid grid-cols-2 gap-2">
<div class="text-xs">
<span class="text-gray-500 dark:text-gray-400">Events:</span>
<span class="ml-1 text-gray-900 dark:text-gray-300">
if len(service.EventTriggers) == 0 {
None
} else {
for i, trigger := range service.EventTriggers {
if i > 0 {
<span>, </span>
}
{ trigger }
}
}
</span>
</div>
<div class="text-xs">
<span class="text-gray-500 dark:text-gray-400">Retry:</span>
<span class="ml-1 text-gray-900 dark:text-gray-300">
if service.RetryPolicy == "" {
Default
} else {
{ service.RetryPolicy }
}
</span>
</div>
<div class="text-xs">
<span class="text-gray-500 dark:text-gray-400">Secret Key:</span>
<span class="ml-1 text-gray-900 dark:text-gray-300">
if service.SecretKey == "" {
None
} else {
<i class="fas fa-check-circle text-green-500"></i> Configured
}
</span>
</div>
<div class="text-xs">
<span class="text-gray-500 dark:text-gray-400">Custom Payload:</span>
<span class="ml-1 text-gray-900 dark:text-gray-300">
if service.PayloadTemplate == "" {
Default
} else {
<i class="fas fa-check-circle text-green-500"></i> Custom
}
</span>
</div>
</div>
</div>
}
</div>
}
</li>
}
</ul>
</div>
}
// if len(data.NotificationServices) == 0 {
// <div class="text-center py-8">
// <div class="inline-flex items-center justify-center w-16 h-16 rounded-full bg-blue-100 dark:bg-blue-900 mb-4">
// <i class="fas fa-bell text-2xl text-blue-600 dark:text-blue-400"></i>
// </div>
// <h3 class="mb-2 text-lg font-semibold text-gray-900 dark:text-white">No notification services configured</h3>
// <p class="text-gray-500 dark:text-gray-400 mb-4">Add your first notification service to start receiving alerts about jobs and system events.</p>
// <button
// type="button"
// class="px-4 py-2 text-sm font-medium text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 rounded-lg dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800"
// data-modal-target="add-notification-modal"
// data-modal-toggle="add-notification-modal"
// >
// <i class="fas fa-plus mr-2"></i>Add Notification Service
// </button>
// </div>
// } else {
// <div class="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
// for _, service := range data.NotificationServices {
// <div class="p-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:bg-gray-800 dark:border-gray-700">
// <div class="flex items-center justify-between mb-3">
// <div class="flex items-center">
// if service.Type == "email" {
// <div class="w-10 h-10 rounded-full bg-blue-100 flex items-center justify-center text-blue-600 dark:bg-blue-900 dark:text-blue-400">
// <i class="fas fa-envelope"></i>
// </div>
// } else if service.Type == "webhook" {
// <div class="w-10 h-10 rounded-full bg-green-100 flex items-center justify-center text-green-600 dark:bg-green-900 dark:text-green-400">
// <i class="fas fa-code"></i>
// </div>
// } else {
// <div class="w-10 h-10 rounded-full bg-gray-100 flex items-center justify-center text-gray-600 dark:bg-gray-700 dark:text-gray-400">
// <i class="fas fa-bell"></i>
// </div>
// }
// <h3 class="ml-3 text-lg font-semibold text-gray-900 dark:text-white">{ service.Name }</h3>
// </div>
// <div class="flex">
// <div class="inline-flex">
// <button
// type="button"
// class="text-gray-500 bg-white focus:outline-none hover:bg-gray-100 focus:ring-4 focus:ring-gray-200 rounded-lg text-sm p-2 mr-1 dark:bg-gray-800 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white dark:focus:ring-gray-700"
// data-modal-target="edit-notification-modal"
// data-modal-toggle="edit-notification-modal"
// data-service-id={ fmt.Sprint(service.ID) }
// >
// <i class="fas fa-edit"></i>
// </button>
// <button
// type="button"
// class="text-red-500 bg-white focus:outline-none hover:bg-gray-100 focus:ring-4 focus:ring-gray-200 rounded-lg text-sm p-2 dark:bg-gray-800 dark:text-red-400 dark:hover:bg-gray-700 dark:hover:text-white dark:focus:ring-gray-700"
// hx-delete={ "/admin/settings/notifications/" + fmt.Sprint(service.ID) }
// hx-confirm="Are you sure you want to delete this notification service? This cannot be undone."
// hx-target="body"
// >
// <i class="fas fa-trash-alt"></i>
// </button>
// </div>
// </div>
// </div>
// <div class="flex items-center mb-2">
// <span class={ "px-2 py-1 text-xs font-medium rounded-full",
// templ.KV("bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-300", service.IsEnabled),
// templ.KV("bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300", !service.IsEnabled) }>
// if service.IsEnabled {
// Active
// } else {
// Disabled
// }
// </span>
// <span class="ml-2 px-2 py-1 text-xs font-medium bg-blue-100 text-blue-800 dark:bg-blue-900 dark:text-blue-300 rounded-full">
// { service.Type }
// </span>
// if len(service.EventTriggers) > 0 && service.Type == "webhook" {
// <span class="ml-2 px-2 py-1 text-xs font-medium bg-purple-100 text-purple-800 dark:bg-purple-900 dark:text-purple-300 rounded-full">
// { fmt.Sprintf("%d triggers", len(service.EventTriggers)) }
// </span>
// }
// if service.SuccessCount > 0 || service.FailureCount > 0 {
// <span class="ml-2 px-2 py-1 text-xs font-medium bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300 rounded-full">
// { fmt.Sprintf("%d/%d", service.SuccessCount, service.SuccessCount + service.FailureCount) }
// </span>
// }
// </div>
// <p class="text-sm text-gray-500 dark:text-gray-400 mb-2">{ service.Description }</p>
// if service.Type == "webhook" {
// <div class="mt-3 pt-3 border-t border-gray-200 dark:border-gray-700">
// <h4 class="text-sm font-medium text-gray-900 dark:text-white mb-2">Webhook Configuration</h4>
// <div class="grid grid-cols-2 gap-2">
// <div class="text-xs">
// <span class="text-gray-500 dark:text-gray-400">Events:</span>
// <span class="ml-1 text-gray-900 dark:text-gray-300">
// if len(service.EventTriggers) == 0 {
// None
// } else {
// for i, trigger := range service.EventTriggers {
// if i > 0 {
// <span>, </span>
// }
// { trigger }
// }
// }
// </span>
// </div>
// <div class="text-xs">
// <span class="text-gray-500 dark:text-gray-400">Retry:</span>
// <span class="ml-1 text-gray-900 dark:text-gray-300">
// if service.RetryPolicy == "" {
// Default
// } else {
// { service.RetryPolicy }
// }
// </span>
// </div>
// <div class="text-xs">
// <span class="text-gray-500 dark:text-gray-400">Secret Key:</span>
// <span class="ml-1 text-gray-900 dark:text-gray-300">
// if service.SecretKey == "" {
// None
// } else {
// <i class="fas fa-check-circle text-green-500"></i> Configured
// }
// </span>
// </div>
// <div class="text-xs">
// <span class="text-gray-500 dark:text-gray-400">Custom Payload:</span>
// <span class="ml-1 text-gray-900 dark:text-gray-300">
// if service.PayloadTemplate == "" {
// Default
// } else {
// <i class="fas fa-check-circle text-green-500"></i> Custom
// }
// </span>
// </div>
// </div>
// </div>
// }
// </div>
// }
// </div>
// }
</div>
<!-- General Tab -->
@@ -308,13 +449,12 @@ templ Settings(ctx context.Context, data SettingsData) {
</button>
</div>
<div class="p-6 space-y-6">
<form id="add-notification-form" hx-post="/settings/notifications" hx-target="body">
<form id="add-notification-form" hx-post="/admin/settings/notifications" hx-target="body">
<div class="mb-6">
<label for="notification_type" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Notification Type</label>
<select id="notification_type" name="type" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
<option value="">Select a type</option>
<option value="email">Email</option>
<option value="slack">Slack</option>
<option value="webhook">Webhook</option>
</select>
</div>
@@ -351,17 +491,6 @@ templ Settings(ctx context.Context, data SettingsData) {
</div>
</div>
<div id="slack_fields" class="hidden notification-fields">
<div class="mb-6">
<label for="webhook_url" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Webhook URL</label>
<input type="url" id="webhook_url" name="webhook_url" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="https://hooks.slack.com/services/..." />
</div>
<div class="mb-6">
<label for="channel" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Channel</label>
<input type="text" id="channel" name="channel" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="#general" />
</div>
</div>
<div id="webhook_fields" class="hidden notification-fields">
<div class="mb-6">
<label for="webhook_url" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Webhook URL</label>
@@ -380,8 +509,31 @@ templ Settings(ctx context.Context, data SettingsData) {
</div>
<div class="mb-6">
<label for="payload_template" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Payload Template (JSON)</label>
<textarea id="payload_template" name="payload_template" rows="5" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder='{"job_id": "{{job.id}}", "status": "{{job.status}}", "message": "{{job.message}}", "timestamp": "{{job.timestamp}}"}'></textarea>
<p class="mt-1 text-sm text-gray-500 dark:text-gray-400">Use {`job.field`} as placeholders for job data</p>
<textarea id="payload_template" name="payload_template" rows="5" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder='{
"event": "{{job.event}}",
"job": {
"id": "{{job.id}}",
"name": "{{job.name}}",
"status": "{{job.status}}",
"message": "{{job.message}}",
"started_at": "{{job.started_at}}",
"completed_at": "{{job.completed_at}}",
"duration_seconds": {{job.duration_seconds}},
"config_id": "{{job.config_id}}",
"config_name": "{{job.config_name}}",
"transfer_bytes": {{job.transfer_bytes}},
"file_count": {{job.file_count}}
},
"instance": {
"id": "{{instance.id}}",
"name": "{{instance.name}}",
"version": "{{instance.version}}",
"environment": "{{instance.environment}}"
},
"timestamp": "{{timestamp}}",
"notification_id": "{{notification.id}}"
}'></textarea>
<p class="mt-1 text-sm text-gray-500 dark:text-gray-400">Use {`variable`} placeholders for dynamic values. Available variables: job.*, instance.*, timestamp, notification.*</p>
</div>
<div class="mb-6">
<label class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Event Triggers</label>
@@ -413,6 +565,27 @@ templ Settings(ctx context.Context, data SettingsData) {
<option value="exponential">Exponential backoff</option>
</select>
</div>
<!-- Test notification button -->
<div class="mb-6 p-4 bg-gray-50 border border-gray-200 rounded-lg dark:bg-gray-700 dark:border-gray-600">
<div class="flex items-center justify-between mb-2">
<h4 class="text-base font-medium text-gray-900 dark:text-white">Test Configuration</h4>
<button
type="button"
id="test-webhook-btn" hx-post="/admin/settings/notifications/test" hx-trigger="click" hx-target="#test-notification-result" hx-swap="outerHTML"
class="px-3 py-2 text-xs font-medium text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 rounded-lg dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800"
>
<i class="fas fa-paper-plane mr-1"></i>
Send Test Notification
</button>
</div>
<p class="text-sm text-gray-500 dark:text-gray-400">
Send a test notification to verify your configuration works correctly before saving.
</p>
<div id="test-notification-result" class="mt-3 hidden">
<!-- Result will be shown here -->
</div>
</div>
</div>
<div class="flex items-start mb-6">
@@ -433,6 +606,7 @@ templ Settings(ctx context.Context, data SettingsData) {
</div>
</div>
}
@toggleNotificationFields()
}
script toggleNotificationFields() {
@@ -454,4 +628,4 @@ script toggleNotificationFields() {
}
});
});
}
}
@@ -2,6 +2,9 @@ package migrations
import (
"fmt"
"os"
"path/filepath"
"time"
"github.com/go-gormigrate/gormigrate/v2"
"gorm.io/gorm"
@@ -11,6 +14,60 @@ func InitialSchema() *gormigrate.Migration {
return &gormigrate.Migration{
ID: "001_initial_schema",
Migrate: func(tx *gorm.DB) error {
// Check if any tables exist (indicating an existing database)
var count int64
if err := tx.Raw("SELECT count(*) FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'").Scan(&count).Error; err != nil {
return fmt.Errorf("failed to check for existing tables: %v", err)
}
// If tables exist, create a backup
if count > 0 {
// Get the database path
sqlDB, err := tx.DB()
if err != nil {
return fmt.Errorf("failed to get underlying database: %v", err)
}
var seq int
var name, dbPath string
if err := sqlDB.QueryRow("PRAGMA database_list").Scan(&seq, &name, &dbPath); err != nil {
return fmt.Errorf("failed to get database path: %v", err)
}
// Get backup directory from environment variable or use default
backupDir := os.Getenv("BACKUP_DIR")
if backupDir == "" {
backupDir = "/app/backups" // Default Docker path
// Check if we're not in Docker
if _, err := os.Stat(backupDir); os.IsNotExist(err) {
backupDir = "backups" // Fallback to local directory
}
}
// Create backup directory if it doesn't exist
if err := os.MkdirAll(backupDir, 0755); err != nil {
return fmt.Errorf("failed to create backup directory: %v", err)
}
// Create backup file with timestamp in the backup directory
dbFileName := filepath.Base(dbPath)
backupFileName := fmt.Sprintf("%s.backup.%s", dbFileName, time.Now().Format("20060102_150405"))
backupFile := filepath.Join(backupDir, backupFileName)
// Read original database
data, err := os.ReadFile(dbPath)
if err != nil {
return fmt.Errorf("failed to read database for backup: %v", err)
}
// Write backup
if err := os.WriteFile(backupFile, data, 0600); err != nil {
return fmt.Errorf("failed to create database backup: %v", err)
}
fmt.Printf("Created database backup at: %s\n", backupFile)
}
// Disable foreign key constraints while creating tables
if err := tx.Exec("PRAGMA foreign_keys = OFF").Error; err != nil {
return fmt.Errorf("failed to disable foreign key constraints: %v", err)
@@ -3,6 +3,8 @@ package migrations
import (
"encoding/json"
"fmt"
"os"
"path/filepath"
"time"
"github.com/go-gormigrate/gormigrate/v2"
@@ -14,6 +16,60 @@ func AddTimestampsToJobHistories() *gormigrate.Migration {
return &gormigrate.Migration{
ID: "006_add_timestamps_to_job_histories",
Migrate: func(tx *gorm.DB) error {
// Check if any tables exist (indicating an existing database)
var count int64
if err := tx.Raw("SELECT count(*) FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'").Scan(&count).Error; err != nil {
return fmt.Errorf("failed to check for existing tables: %v", err)
}
// If tables exist, create a backup
if count > 0 {
// Get the database path
sqlDB, err := tx.DB()
if err != nil {
return fmt.Errorf("failed to get underlying database: %v", err)
}
var seq int
var name, dbPath string
if err := sqlDB.QueryRow("PRAGMA database_list").Scan(&seq, &name, &dbPath); err != nil {
return fmt.Errorf("failed to get database path: %v", err)
}
// Get backup directory from environment variable or use default
backupDir := os.Getenv("BACKUP_DIR")
if backupDir == "" {
backupDir = "/app/backups" // Default Docker path
// Check if we're not in Docker
if _, err := os.Stat(backupDir); os.IsNotExist(err) {
backupDir = "backups" // Fallback to local directory
}
}
// Create backup directory if it doesn't exist
if err := os.MkdirAll(backupDir, 0755); err != nil {
return fmt.Errorf("failed to create backup directory: %v", err)
}
// Create backup file with timestamp in the backup directory
dbFileName := filepath.Base(dbPath)
backupFileName := fmt.Sprintf("%s.backup.%s", dbFileName, time.Now().Format("20060102_150405"))
backupFile := filepath.Join(backupDir, backupFileName)
// Read original database
data, err := os.ReadFile(dbPath)
if err != nil {
return fmt.Errorf("failed to read database for backup: %v", err)
}
// Write backup
if err := os.WriteFile(backupFile, data, 0600); err != nil {
return fmt.Errorf("failed to create database backup: %v", err)
}
fmt.Printf("Created database backup at: %s\n", backupFile)
}
// Add created_at column
if err := tx.Exec("ALTER TABLE job_histories ADD COLUMN created_at DATETIME").Error; err != nil {
return fmt.Errorf("failed to add created_at column: %v", err)
@@ -3,6 +3,8 @@ package migrations
import (
"encoding/json"
"fmt"
"os"
"path/filepath"
"time"
"github.com/go-gormigrate/gormigrate/v2"
@@ -14,6 +16,60 @@ func AddNotificationServices() *gormigrate.Migration {
return &gormigrate.Migration{
ID: "007_add_notification_services",
Migrate: func(tx *gorm.DB) error {
// Check if any tables exist (indicating an existing database)
var count int64
if err := tx.Raw("SELECT count(*) FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'").Scan(&count).Error; err != nil {
return fmt.Errorf("failed to check for existing tables: %v", err)
}
// If tables exist, create a backup
if count > 0 {
// Get the database path
sqlDB, err := tx.DB()
if err != nil {
return fmt.Errorf("failed to get underlying database: %v", err)
}
var seq int
var name, dbPath string
if err := sqlDB.QueryRow("PRAGMA database_list").Scan(&seq, &name, &dbPath); err != nil {
return fmt.Errorf("failed to get database path: %v", err)
}
// Get backup directory from environment variable or use default
backupDir := os.Getenv("BACKUP_DIR")
if backupDir == "" {
backupDir = "/app/backups" // Default Docker path
// Check if we're not in Docker
if _, err := os.Stat(backupDir); os.IsNotExist(err) {
backupDir = "backups" // Fallback to local directory
}
}
// Create backup directory if it doesn't exist
if err := os.MkdirAll(backupDir, 0755); err != nil {
return fmt.Errorf("failed to create backup directory: %v", err)
}
// Create backup file with timestamp in the backup directory
dbFileName := filepath.Base(dbPath)
backupFileName := fmt.Sprintf("%s.backup.%s", dbFileName, time.Now().Format("20060102_150405"))
backupFile := filepath.Join(backupDir, backupFileName)
// Read original database
data, err := os.ReadFile(dbPath)
if err != nil {
return fmt.Errorf("failed to read database for backup: %v", err)
}
// Write backup
if err := os.WriteFile(backupFile, data, 0600); err != nil {
return fmt.Errorf("failed to create database backup: %v", err)
}
fmt.Printf("Created database backup at: %s\n", backupFile)
}
// Create notification_services table
type NotificationService struct {
ID uint `gorm:"primaryKey"`
@@ -0,0 +1,122 @@
package migrations
import (
"fmt"
"os"
"path/filepath"
"time"
"github.com/go-gormigrate/gormigrate/v2"
"gorm.io/gorm"
)
// AddUserNotifications adds the user_notifications table
func AddUserNotifications() *gormigrate.Migration {
return &gormigrate.Migration{
ID: "008_add_user_notifications",
Migrate: func(tx *gorm.DB) error {
// Check if any tables exist (indicating an existing database)
var count int64
if err := tx.Raw("SELECT count(*) FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'").Scan(&count).Error; err != nil {
return fmt.Errorf("failed to check for existing tables: %v", err)
}
// If tables exist, create a backup
if count > 0 {
// Get the database path
sqlDB, err := tx.DB()
if err != nil {
return fmt.Errorf("failed to get underlying database: %v", err)
}
var seq int
var name, dbPath string
if err := sqlDB.QueryRow("PRAGMA database_list").Scan(&seq, &name, &dbPath); err != nil {
return fmt.Errorf("failed to get database path: %v", err)
}
// Get backup directory from environment variable or use default
backupDir := os.Getenv("BACKUP_DIR")
if backupDir == "" {
backupDir = "/app/backups" // Default Docker path
// Check if we're not in Docker
if _, err := os.Stat(backupDir); os.IsNotExist(err) {
backupDir = "backups" // Fallback to local directory
}
}
// Create backup directory if it doesn't exist
if err := os.MkdirAll(backupDir, 0755); err != nil {
return fmt.Errorf("failed to create backup directory: %v", err)
}
// Create backup file with timestamp in the backup directory
dbFileName := filepath.Base(dbPath)
backupFileName := fmt.Sprintf("%s.backup.%s", dbFileName, time.Now().Format("20060102_150405"))
backupFile := filepath.Join(backupDir, backupFileName)
// Read original database
data, err := os.ReadFile(dbPath)
if err != nil {
return fmt.Errorf("failed to read database for backup: %v", err)
}
// Write backup
if err := os.WriteFile(backupFile, data, 0600); err != nil {
return fmt.Errorf("failed to create database backup: %v", err)
}
fmt.Printf("Created database backup at: %s\n", backupFile)
}
// Create the user_notifications table
err := tx.Exec(`
CREATE TABLE IF NOT EXISTS user_notifications (
id INTEGER PRIMARY KEY AUTOINCREMENT,
user_id INTEGER NOT NULL,
type TEXT NOT NULL,
title TEXT NOT NULL,
message TEXT NOT NULL,
link TEXT NOT NULL,
job_id INTEGER,
job_run_id INTEGER,
config_id INTEGER,
is_read BOOLEAN NOT NULL DEFAULT 0,
created_at DATETIME NOT NULL,
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
)
`).Error
if err != nil {
return err
}
// Create an index on user_id for faster lookups
err = tx.Exec(`
CREATE INDEX IF NOT EXISTS idx_user_notifications_user_id ON user_notifications(user_id)
`).Error
if err != nil {
return err
}
// Create an index on created_at for faster sorting
err = tx.Exec(`
CREATE INDEX IF NOT EXISTS idx_user_notifications_created_at ON user_notifications(created_at)
`).Error
if err != nil {
return err
}
// Create an index on is_read for faster filtering of unread notifications
err = tx.Exec(`
CREATE INDEX IF NOT EXISTS idx_user_notifications_is_read ON user_notifications(is_read)
`).Error
if err != nil {
return err
}
return nil
},
Rollback: func(tx *gorm.DB) error {
return tx.Exec(`DROP TABLE IF EXISTS user_notifications`).Error
},
}
}
+1
View File
@@ -18,6 +18,7 @@ func GetMigrations(db *gorm.DB) *gormigrate.Gormigrate {
AddDefaultRoles(), // 005
AddTimestampsToJobHistories(), // 006
AddNotificationServices(), // 007
AddUserNotifications(), // 008
)
return gormigrate.New(db, gormigrate.DefaultOptions, migrations)
+104
View File
@@ -0,0 +1,104 @@
package db
import (
"encoding/json"
"time"
"gorm.io/gorm"
)
// NotificationService represents a notification service configuration
type NotificationService struct {
ID uint `json:"id" gorm:"primaryKey"`
Name string `json:"name" gorm:"not null"`
Type string `json:"type" gorm:"not null"` // email, webhook
IsEnabled bool `json:"is_enabled" gorm:"default:true"`
Config map[string]string `json:"config" gorm:"-"`
ConfigJSON string `json:"-" gorm:"column:config"`
Description string `json:"description"`
EventTriggers []string `json:"event_triggers" gorm:"-"`
EventTriggersJSON string `json:"-" gorm:"column:event_triggers;default:'[]'"`
PayloadTemplate string `json:"payload_template" gorm:"column:payload_template"`
SecretKey string `json:"secret_key" gorm:"column:secret_key"`
RetryPolicy string `json:"retry_policy" gorm:"column:retry_policy;default:'simple'"`
LastUsed time.Time `json:"last_used" gorm:"column:last_used"`
SuccessCount int `json:"success_count" gorm:"column:success_count;default:0"`
FailureCount int `json:"failure_count" gorm:"column:failure_count;default:0"`
CreatedBy uint `json:"created_by"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
}
// BeforeSave converts Config map and EventTriggers to JSON strings for storage
func (n *NotificationService) BeforeSave(tx *gorm.DB) error {
configJSON, err := json.Marshal(n.Config)
if err != nil {
return err
}
n.ConfigJSON = string(configJSON)
eventsJSON, err := json.Marshal(n.EventTriggers)
if err != nil {
return err
}
n.EventTriggersJSON = string(eventsJSON)
return nil
}
// AfterFind converts JSON strings back to Config map and EventTriggers
func (n *NotificationService) AfterFind(tx *gorm.DB) error {
if n.ConfigJSON != "" {
if err := json.Unmarshal([]byte(n.ConfigJSON), &n.Config); err != nil {
return err
}
}
if n.EventTriggersJSON != "" {
if err := json.Unmarshal([]byte(n.EventTriggersJSON), &n.EventTriggers); err != nil {
return err
}
}
return nil
}
// GetNotificationServices returns notification services, filtered by enabled status if specified
func (db *DB) GetNotificationServices(onlyEnabled bool) ([]NotificationService, error) {
var services []NotificationService
query := db.DB
if onlyEnabled {
query = query.Where("is_enabled = ?", true)
}
if err := query.Find(&services).Error; err != nil {
return nil, err
}
return services, nil
}
// GetNotificationService returns a notification service by ID
func (db *DB) GetNotificationService(id uint) (*NotificationService, error) {
var service NotificationService
if err := db.First(&service, id).Error; err != nil {
return nil, err
}
return &service, nil
}
// CreateNotificationService creates a new notification service
func (db *DB) CreateNotificationService(service *NotificationService) error {
return db.Create(service).Error
}
// UpdateNotificationService updates an existing notification service
func (db *DB) UpdateNotificationService(service *NotificationService) error {
return db.Save(service).Error
}
// DeleteNotificationService deletes a notification service by ID
func (db *DB) DeleteNotificationService(id uint) error {
return db.Delete(&NotificationService{}, id).Error
}
+133
View File
@@ -0,0 +1,133 @@
package db
import (
"fmt"
"time"
)
// NotificationType defines the type of notification
type NotificationType string
const (
NotificationJobStart NotificationType = "job_start"
NotificationJobComplete NotificationType = "job_complete"
NotificationJobFail NotificationType = "job_fail"
NotificationConfigUpdate NotificationType = "config_update"
NotificationSystemAlert NotificationType = "system_alert"
)
// UserNotification represents a notification shown to users in the UI
type UserNotification struct {
ID uint `json:"id" gorm:"primaryKey"`
UserID uint `json:"user_id" gorm:"index"`
Type NotificationType `json:"type"`
Title string `json:"title"`
Message string `json:"message"`
Link string `json:"link"`
JobID uint `json:"job_id,omitempty"`
JobRunID uint `json:"job_run_id,omitempty"`
ConfigID uint `json:"config_id,omitempty"`
IsRead bool `json:"is_read" gorm:"default:false"`
CreatedAt time.Time `json:"created_at"`
}
// GetUserNotifications returns the latest notifications for a user
func (db *DB) GetUserNotifications(userID uint, limit int) ([]UserNotification, error) {
var notifications []UserNotification
result := db.Where("user_id = ?", userID).Order("created_at DESC").Limit(limit).Find(&notifications)
return notifications, result.Error
}
// GetUnreadNotificationCount returns the count of unread notifications for a user
func (db *DB) GetUnreadNotificationCount(userID uint) (int64, error) {
var count int64
result := db.Model(&UserNotification{}).Where("user_id = ? AND is_read = ?", userID, false).Count(&count)
return count, result.Error
}
// MarkNotificationAsRead marks a notification as read
func (db *DB) MarkNotificationAsRead(id uint) error {
return db.Model(&UserNotification{}).Where("id = ?", id).Update("is_read", true).Error
}
// MarkAllNotificationsAsRead marks all notifications for a user as read
func (db *DB) MarkAllNotificationsAsRead(userID uint) error {
return db.Model(&UserNotification{}).Where("user_id = ?", userID).Update("is_read", true).Error
}
// CreateJobNotification creates a notification for a job event
func (db *DB) CreateJobNotification(
userID uint,
jobID uint,
jobRunID uint,
notificationType NotificationType,
title string,
message string,
) error {
notification := UserNotification{
UserID: userID,
Type: notificationType,
Title: title,
Message: message,
JobID: jobID,
JobRunID: jobRunID,
Link: generateJobRunLink(jobRunID),
CreatedAt: time.Now(),
}
return db.Create(&notification).Error
}
// CreateConfigNotification creates a notification for a config update
func (db *DB) CreateConfigNotification(
userID uint,
configID uint,
title string,
message string,
) error {
notification := UserNotification{
UserID: userID,
Type: NotificationConfigUpdate,
Title: title,
Message: message,
ConfigID: configID,
Link: generateConfigLink(configID),
CreatedAt: time.Now(),
}
return db.Create(&notification).Error
}
// CreateSystemNotification creates a system-wide notification
func (db *DB) CreateSystemNotification(
title string,
message string,
) error {
// Get all active users
var users []User
if err := db.Where("active = ?", true).Find(&users).Error; err != nil {
return err
}
// Create a notification for each user
for _, user := range users {
notification := UserNotification{
UserID: user.ID,
Type: NotificationSystemAlert,
Title: title,
Message: message,
CreatedAt: time.Now(),
}
if err := db.Create(&notification).Error; err != nil {
return err
}
}
return nil
}
// Helper functions to generate links
func generateJobRunLink(jobRunID uint) string {
return "/job-runs/" + fmt.Sprintf("%d", jobRunID)
}
func generateConfigLink(configID uint) string {
return "/configs/" + fmt.Sprintf("%d", configID)
}
+591 -11
View File
@@ -447,6 +447,9 @@ func (s *Scheduler) processConfiguration(job *db.Job, config *db.TransferConfig,
s.log.LogDebug("Creating job history record: %+v", history)
// Send webhook notification for job start
s.sendWebhookNotification(job, history, config)
// Execute the configuration transfer
s.executeConfigTransfer(*job, *config, history)
}
@@ -484,6 +487,7 @@ func (s *Scheduler) executeConfigTransfer(job db.Job, config db.TransferConfig,
}
// Send webhook notification for failure
s.sendWebhookNotification(&job, history, &config)
return
}
defer os.Remove(filterFile)
@@ -974,8 +978,14 @@ func (s *Scheduler) executeConfigTransfer(job db.Job, config db.TransferConfig,
s.log.LogError("Error updating job history for job %d, config %d: %v", job.ID, config.ID, err)
}
// Create job notification
if err := s.createJobNotification(&job, history); err != nil {
s.log.LogError("Failed to create job notification", "jobID", job.ID, "error", err)
}
// Send webhook notification for success or with errors
s.sendWebhookNotification(&job, history, &config)
}
// ProcessOutputPattern processes an output pattern with variables and returns the result
@@ -1098,20 +1108,25 @@ func (s *Scheduler) checkFileProcessingHistory(jobID uint, fileName string) (*db
// sendWebhookNotification sends a notification to the configured webhook URL
func (s *Scheduler) sendWebhookNotification(job *db.Job, history *db.JobHistory, config *db.TransferConfig) {
if !job.GetWebhookEnabled() || job.WebhookURL == "" {
return
// First, handle job-specific webhook if configured
if job.GetWebhookEnabled() && job.WebhookURL != "" {
// Skip notifications based on settings
if history.Status == "completed" && !job.GetNotifyOnSuccess() {
s.log.LogDebug("Skipping success notification for job %d (notifyOnSuccess=false)", job.ID)
} else if history.Status == "failed" && !job.GetNotifyOnFailure() {
s.log.LogDebug("Skipping failure notification for job %d (notifyOnFailure=false)", job.ID)
} else {
s.log.LogInfo("Sending job-specific webhook notification for job %d", job.ID)
s.sendJobWebhookNotification(job, history, config)
}
}
// Skip notifications based on settings
if history.Status == "completed" && !job.GetNotifyOnSuccess() {
return
}
if history.Status == "failed" && !job.GetNotifyOnFailure() {
return
}
s.log.LogInfo("Sending webhook notification for job %d", job.ID)
// Next, process global notification services
s.sendGlobalNotifications(job, history, config)
}
// sendJobWebhookNotification sends a notification to the job's configured webhook URL
func (s *Scheduler) sendJobWebhookNotification(job *db.Job, history *db.JobHistory, config *db.TransferConfig) {
// Create the payload with useful information
payload := map[string]interface{}{
"event_type": "job_execution",
@@ -1208,3 +1223,568 @@ func (s *Scheduler) sendWebhookNotification(job *db.Job, history *db.JobHistory,
}
}
}
// sendGlobalNotifications sends notifications through all configured notification services
func (s *Scheduler) sendGlobalNotifications(job *db.Job, history *db.JobHistory, config *db.TransferConfig) {
// Fetch all enabled notification services
services, err := s.db.GetNotificationServices(true)
if err != nil {
s.log.LogError("Error fetching notification services: %v", err)
return
}
if len(services) == 0 {
s.log.LogDebug("No enabled notification services found")
return
}
s.log.LogInfo("Found %d enabled notification services", len(services))
// Determine event type based on job status
var eventType string
switch history.Status {
case "running":
eventType = "job_start"
case "completed", "completed_with_errors":
eventType = "job_complete"
case "failed":
eventType = "job_error"
default:
eventType = "job_status"
}
// Process each notification service
for i := range services {
service := &services[i] // Use pointer to update stats
s.log.LogInfo("Processing notification service %s (%s)", service.Name, service.Type)
// Check if this service should handle this event type
shouldSend := false
for _, trigger := range service.EventTriggers {
if trigger == eventType {
shouldSend = true
break
}
}
// Skip if this service doesn't handle this event type
if !shouldSend {
s.log.LogDebug("Skipping notification service %s (%s) for event %s (not in triggers)",
service.Name, service.Type, eventType)
continue
}
s.log.LogInfo("Sending notification via service %s (%s) for job %d",
service.Name, service.Type, job.ID)
// Send notification based on service type
var notifyErr error
switch service.Type {
case "email":
notifyErr = s.sendEmailNotification(service, job, history, config, eventType)
case "webhook":
notifyErr = s.sendServiceWebhookNotification(service, job, history, config, eventType)
default:
s.log.LogError("Unsupported notification service type: %s", service.Type)
continue
}
// Update service success/failure count
if notifyErr != nil {
service.FailureCount++
s.log.LogError("Notification service %s failed: %v", service.Name, notifyErr)
} else {
service.SuccessCount++
service.LastUsed = time.Now()
s.log.LogInfo("Notification service %s sent successfully", service.Name)
}
// Update notification service stats in the database
if err := s.db.UpdateNotificationService(service); err != nil {
s.log.LogError("Error updating notification service stats: %v", err)
}
}
}
// sendEmailNotification sends an email notification using the configured email service
func (s *Scheduler) sendEmailNotification(service *db.NotificationService, job *db.Job, history *db.JobHistory, config *db.TransferConfig, eventType string) error {
s.log.LogDebug("Preparing email notification via service %s for job %d", service.Name, job.ID)
// Extract SMTP settings from service config
smtpHost := service.Config["smtp_host"]
smtpPortStr := service.Config["smtp_port"]
fromEmail := service.Config["from_email"]
toEmail := service.Config["to_email"]
// Validate required settings
if smtpHost == "" || smtpPortStr == "" || fromEmail == "" || toEmail == "" {
return fmt.Errorf("missing required SMTP settings")
}
// Parse SMTP port
smtpPort, err := strconv.Atoi(smtpPortStr)
if err != nil {
return fmt.Errorf("invalid SMTP port: %v", err)
}
// Prepare email content
subject := fmt.Sprintf("[GoMFT] Job %s: %s", job.Name, history.Status)
body := generateEmailBody(job, history, config, eventType)
// TODO: Implement actual email sending logic
// This would typically involve using a package like "net/smtp" or a third-party
// email library to send the actual email.
// For actual implementation, you would use:
// - smtpUsername := service.Config["smtp_username"]
// - smtpPassword := service.Config["smtp_password"]
s.log.LogInfo("Email would be sent to %s with subject: %s", toEmail, subject)
s.log.LogDebug("Email body: %s", body)
// Placeholder for actual email sending
// For now, we'll just log that the email would be sent
s.log.LogInfo("Email notification prepared (SMTP: %s:%d, From: %s, To: %s)",
smtpHost, smtpPort, fromEmail, toEmail)
return nil
}
// generateEmailBody creates the email body for job notifications
func generateEmailBody(job *db.Job, history *db.JobHistory, config *db.TransferConfig, eventType string) string {
var b strings.Builder
b.WriteString(fmt.Sprintf("Job: %s (ID: %d)\n", job.Name, job.ID))
b.WriteString(fmt.Sprintf("Status: %s\n", history.Status))
b.WriteString(fmt.Sprintf("Start Time: %s\n", history.StartTime.Format(time.RFC3339)))
if history.EndTime != nil {
b.WriteString(fmt.Sprintf("End Time: %s\n", history.EndTime.Format(time.RFC3339)))
duration := history.EndTime.Sub(history.StartTime)
b.WriteString(fmt.Sprintf("Duration: %.2f seconds\n", duration.Seconds()))
}
b.WriteString(fmt.Sprintf("Files Transferred: %d\n", history.FilesTransferred))
b.WriteString(fmt.Sprintf("Bytes Transferred: %d\n", history.BytesTransferred))
b.WriteString("\nTransfer Configuration:\n")
b.WriteString(fmt.Sprintf("Name: %s (ID: %d)\n", config.Name, config.ID))
b.WriteString(fmt.Sprintf("Source: %s:%s\n", config.SourceType, config.SourcePath))
b.WriteString(fmt.Sprintf("Destination: %s:%s\n", config.DestinationType, config.DestinationPath))
if history.ErrorMessage != "" {
b.WriteString("\nError Details:\n")
b.WriteString(history.ErrorMessage)
}
return b.String()
}
// sendServiceWebhookNotification sends a webhook notification using a configured notification service
func (s *Scheduler) sendServiceWebhookNotification(service *db.NotificationService, job *db.Job, history *db.JobHistory, config *db.TransferConfig, eventType string) error {
s.log.LogDebug("Preparing webhook notification via service %s for job %d", service.Name, job.ID)
// Extract webhook settings
webhookURL := service.Config["webhook_url"]
method := service.Config["method"]
if method == "" {
method = "POST" // Default to POST if not specified
}
// Validate required settings
if webhookURL == "" {
return fmt.Errorf("missing webhook URL")
}
// Prepare payload
var payload map[string]interface{}
// Use custom payload template if provided
if service.PayloadTemplate != "" {
// Parse the template and fill in variables
payload = generateCustomPayload(service.PayloadTemplate, job, history, config, eventType)
} else {
// Use default payload format
payload = generateDefaultPayload(job, history, config, eventType)
}
// Convert payload to JSON
jsonPayload, err := json.Marshal(payload)
if err != nil {
return fmt.Errorf("error marshaling webhook payload: %v", err)
}
s.log.LogDebug("Webhook payload: %s", string(jsonPayload))
// Create HTTP request
req, err := http.NewRequest(method, webhookURL, bytes.NewBuffer(jsonPayload))
if err != nil {
return fmt.Errorf("error creating webhook request: %v", err)
}
// Set default headers
req.Header.Set("Content-Type", "application/json")
req.Header.Set("User-Agent", "GoMFT-Notification/1.0")
// Add signature if secret key is provided
if service.SecretKey != "" {
h := hmac.New(sha256.New, []byte(service.SecretKey))
h.Write(jsonPayload)
signature := hex.EncodeToString(h.Sum(nil))
req.Header.Set("X-GoMFT-Signature", signature)
}
// Add custom headers if specified
if headersStr := service.Config["headers"]; headersStr != "" {
var headers map[string]string
if err := json.Unmarshal([]byte(headersStr), &headers); err == nil {
for key, value := range headers {
req.Header.Set(key, value)
}
}
}
s.log.LogDebug("Webhook headers: %+v", req.Header)
// Determine timeout based on retry policy
timeout := 10 * time.Second
maxRetries := 0
switch service.RetryPolicy {
case "none":
maxRetries = 0
case "simple":
maxRetries = 3
timeout = 15 * time.Second
case "exponential":
maxRetries = 5
timeout = 30 * time.Second
default:
// Default to simple
maxRetries = 3
timeout = 15 * time.Second
}
// Prepare client with timeout
client := &http.Client{
Timeout: timeout,
}
// Attempt to send with retries
var resp *http.Response
var lastErr error
for attempt := 0; attempt <= maxRetries; attempt++ {
if attempt > 0 {
// Wait before retry with increasing backoff
backoffDuration := time.Duration(1<<uint(attempt-1)) * time.Second
s.log.LogInfo("Retrying webhook notification (attempt %d/%d) after %v",
attempt, maxRetries, backoffDuration)
time.Sleep(backoffDuration)
}
resp, err = client.Do(req)
if err == nil {
// Check for success status code
if resp.StatusCode >= 200 && resp.StatusCode < 300 {
defer resp.Body.Close()
s.log.LogInfo("Webhook notification sent successfully (status: %d)", resp.StatusCode)
return nil
}
// Error status code
respBody, _ := io.ReadAll(resp.Body)
resp.Body.Close()
lastErr = fmt.Errorf("webhook returned status %d: %s", resp.StatusCode, respBody)
s.log.LogError("Webhook error (attempt %d/%d): %v", attempt+1, maxRetries+1, lastErr)
} else {
// Network or request error
lastErr = fmt.Errorf("webhook request failed: %v", err)
s.log.LogError("Webhook request error (attempt %d/%d): %v", attempt+1, maxRetries+1, lastErr)
}
}
return lastErr
}
// generateDefaultPayload creates a standard webhook payload
func generateDefaultPayload(job *db.Job, history *db.JobHistory, config *db.TransferConfig, eventType string) map[string]interface{} {
payload := map[string]interface{}{
"event": eventType,
"job": map[string]interface{}{
"id": job.ID,
"name": job.Name,
"status": history.Status,
"message": history.ErrorMessage,
"started_at": history.StartTime.Format(time.RFC3339),
"config_id": config.ID,
"config_name": config.Name,
"transfer_bytes": history.BytesTransferred,
"file_count": history.FilesTransferred,
},
"instance": map[string]interface{}{
"id": "gomft",
"name": "GoMFT",
"version": "1.0", // TODO: Get actual version
"environment": "production", // TODO: Get from env
},
"timestamp": time.Now().Format(time.RFC3339),
}
if history.EndTime != nil {
payload["job"].(map[string]interface{})["completed_at"] = history.EndTime.Format(time.RFC3339)
duration := history.EndTime.Sub(history.StartTime)
payload["job"].(map[string]interface{})["duration_seconds"] = duration.Seconds()
}
return payload
}
// generateCustomPayload creates a webhook payload from a template
func generateCustomPayload(template string, job *db.Job, history *db.JobHistory, config *db.TransferConfig, eventType string) map[string]interface{} {
// Start with the default payload as a base
defaultPayload := generateDefaultPayload(job, history, config, eventType)
// Parse the template string to JSON
var customPayload map[string]interface{}
if err := json.Unmarshal([]byte(template), &customPayload); err != nil {
// If template can't be parsed, fall back to default payload
return defaultPayload
}
// Replace variables in the template
// This is a simplified version - a real implementation would do deep traversal
// and replace all variables in the structure
processedPayload := processPayloadVariables(customPayload, defaultPayload)
return processedPayload
}
// processPayloadVariables recursively processes a payload structure and replaces variables
func processPayloadVariables(customPayload map[string]interface{}, variables map[string]interface{}) map[string]interface{} {
result := make(map[string]interface{})
// Process each key-value pair in the custom payload
for key, value := range customPayload {
switch v := value.(type) {
case string:
// Replace string variables
result[key] = replaceVariables(v, variables)
case map[string]interface{}:
// Recursively process nested maps
result[key] = processPayloadVariables(v, variables)
case []interface{}:
// Process arrays
result[key] = processArrayVariables(v, variables)
default:
// Keep other types as is
result[key] = value
}
}
return result
}
// processArrayVariables processes array elements for variable replacement
func processArrayVariables(array []interface{}, variables map[string]interface{}) []interface{} {
result := make([]interface{}, len(array))
for i, value := range array {
switch v := value.(type) {
case string:
result[i] = replaceVariables(v, variables)
case map[string]interface{}:
result[i] = processPayloadVariables(v, variables)
case []interface{}:
result[i] = processArrayVariables(v, variables)
default:
result[i] = value
}
}
return result
}
// replaceVariables replaces variable placeholders in a string with their values
func replaceVariables(template string, variables map[string]interface{}) string {
// Check for variable pattern like {{job.name}}
re := regexp.MustCompile(`{{([^{}]+)}}`)
result := re.ReplaceAllStringFunc(template, func(match string) string {
// Extract variable path (e.g., "job.name")
varPath := re.FindStringSubmatch(match)[1]
parts := strings.Split(varPath, ".")
// Navigate the variables structure to find the value
var current interface{} = variables
for _, part := range parts {
if m, ok := current.(map[string]interface{}); ok {
if val, exists := m[part]; exists {
current = val
} else {
return match // Keep original if not found
}
} else {
return match // Keep original if structure doesn't match
}
}
// Convert the found value to string
switch v := current.(type) {
case string:
return v
case int, int64, uint, uint64, float32, float64:
return fmt.Sprintf("%v", v)
case bool:
return fmt.Sprintf("%v", v)
case time.Time:
return v.Format(time.RFC3339)
default:
// For complex types, convert to JSON
if bytes, err := json.Marshal(v); err == nil {
return string(bytes)
}
return match
}
})
return result
}
func (s *Scheduler) updateJobStatus(jobID uint, status string, startTime, endTime time.Time, message string) (*db.JobHistory, error) {
// Create the history record
history := &db.JobHistory{
JobID: jobID,
Status: status,
StartTime: startTime,
EndTime: &endTime,
ErrorMessage: message,
}
// Add code to create notifications for job events
if job, err := s.db.GetJob(jobID); err == nil {
// Get the user who created the job
userID := job.CreatedBy
// Create job title from job name or ID
jobTitle := job.Name
if jobTitle == "" {
jobTitle = fmt.Sprintf("Job #%d", job.ID)
}
// Check which notification to send based on status
var notificationType db.NotificationType
var title string
var message string
switch status {
case "running":
notificationType = db.NotificationJobStart
title = "Job Started"
message = jobTitle
case "completed":
notificationType = db.NotificationJobComplete
title = "Job Complete"
message = jobTitle
case "failed":
notificationType = db.NotificationJobFail
title = "Job Failed"
message = jobTitle
if history.ErrorMessage != "" {
message = jobTitle + ": " + history.ErrorMessage
}
default:
// Don't create notifications for other statuses
return history, nil
}
// Create the notification
err = s.db.CreateJobNotification(
userID,
jobID,
history.ID, // Use the job history ID
notificationType,
title,
message,
)
if err != nil {
s.log.LogError("Failed to create job notification", "jobID", job.ID, "error", err)
// Continue anyway, not critical
}
}
return history, nil
}
// Create a job history record and send notification
func (s *Scheduler) createJobHistoryAndNotify(job *db.Job, status string, startTime time.Time, endTime time.Time, message string) error {
// Create the job history entry
history := db.JobHistory{
JobID: job.ID,
Status: status,
StartTime: startTime,
EndTime: &endTime,
ErrorMessage: message,
}
// Save to database
if err := s.db.Create(&history).Error; err != nil {
s.log.LogError("Failed to create job history", "jobID", job.ID, "error", err)
return err
}
// Create notification
err := s.createJobNotification(job, &history)
if err != nil {
s.log.LogError("Failed to create job notification", "jobID", job.ID, "error", err)
// Continue anyway - notification is not critical
}
return nil
}
// Create a notification for a job event
func (s *Scheduler) createJobNotification(job *db.Job, history *db.JobHistory) error {
// Get the user who created the job
userID := job.CreatedBy
// Create job title from job name or ID
jobTitle := job.Name
if jobTitle == "" {
jobTitle = fmt.Sprintf("Job #%d", job.ID)
}
// Determine notification type and content
var notificationType db.NotificationType
var title string
var message string
switch history.Status {
case "running":
notificationType = db.NotificationJobStart
title = "Job Started"
message = jobTitle
case "completed":
notificationType = db.NotificationJobComplete
title = "Job Complete"
message = jobTitle
case "failed":
notificationType = db.NotificationJobFail
title = "Job Failed"
message = jobTitle
if history.ErrorMessage != "" {
message = jobTitle + ": " + history.ErrorMessage
}
default:
// Don't create notifications for other statuses
return nil
}
// Create the notification
return s.db.CreateJobNotification(
userID,
job.ID,
history.ID,
notificationType,
title,
message,
)
}
+142
View File
@@ -427,3 +427,145 @@ func (h *Handlers) HandleDeleteConfig(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{"message": "Config deleted successfully"})
}
// HandleDuplicateConfig handles the POST /configs/:id/duplicate route
func (h *Handlers) HandleDuplicateConfig(c *gin.Context) {
id := c.Param("id")
userID := c.GetUint("userID")
var originalConfig db.TransferConfig
if err := h.DB.First(&originalConfig, id).Error; err != nil {
c.JSON(http.StatusNotFound, gin.H{"error": "Config not found"})
return
}
// Check if user owns this config
if originalConfig.CreatedBy != userID {
// Check if user is admin
isAdmin, exists := c.Get("isAdmin")
if !exists || isAdmin != true {
c.JSON(http.StatusForbidden, gin.H{"error": "You do not have permission to duplicate this config"})
return
}
}
// Create a duplicate config
duplicateConfig := originalConfig
duplicateConfig.ID = 0 // Set ID to 0 to create a new record
duplicateConfig.Name = originalConfig.Name + " - Copy"
duplicateConfig.CreatedAt = time.Now()
duplicateConfig.UpdatedAt = time.Now()
duplicateConfig.CreatedBy = userID
// Deep copy all boolean pointers
skipProcessedVal := *originalConfig.SkipProcessedFiles
duplicateConfig.SkipProcessedFiles = &skipProcessedVal
archiveEnabledVal := *originalConfig.ArchiveEnabled
duplicateConfig.ArchiveEnabled = &archiveEnabledVal
deleteAfterTransferVal := *originalConfig.DeleteAfterTransfer
duplicateConfig.DeleteAfterTransfer = &deleteAfterTransferVal
sourcePassiveModeVal := *originalConfig.SourcePassiveMode
duplicateConfig.SourcePassiveMode = &sourcePassiveModeVal
destPassiveModeVal := *originalConfig.DestPassiveMode
duplicateConfig.DestPassiveMode = &destPassiveModeVal
// Google Photos specific fields
if originalConfig.DestReadOnly != nil {
destReadOnlyVal := *originalConfig.DestReadOnly
duplicateConfig.DestReadOnly = &destReadOnlyVal
}
if originalConfig.SourceReadOnly != nil {
sourceReadOnlyVal := *originalConfig.SourceReadOnly
duplicateConfig.SourceReadOnly = &sourceReadOnlyVal
}
if originalConfig.DestIncludeArchived != nil {
destIncludeArchivedVal := *originalConfig.DestIncludeArchived
duplicateConfig.DestIncludeArchived = &destIncludeArchivedVal
}
if originalConfig.SourceIncludeArchived != nil {
sourceIncludeArchivedVal := *originalConfig.SourceIncludeArchived
duplicateConfig.SourceIncludeArchived = &sourceIncludeArchivedVal
}
if originalConfig.UseBuiltinAuthSource != nil {
useBuiltinAuthSourceVal := *originalConfig.UseBuiltinAuthSource
duplicateConfig.UseBuiltinAuthSource = &useBuiltinAuthSourceVal
}
if originalConfig.UseBuiltinAuthDest != nil {
useBuiltinAuthDestVal := *originalConfig.UseBuiltinAuthDest
duplicateConfig.UseBuiltinAuthDest = &useBuiltinAuthDestVal
}
// Start a transaction
tx := h.DB.Begin()
if tx.Error != nil {
log.Printf("Error beginning transaction: %v", tx.Error)
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to begin transaction"})
return
}
if err := tx.Create(&duplicateConfig).Error; err != nil {
tx.Rollback()
log.Printf("Error creating duplicate config: %v", err)
c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("Failed to create duplicate config: %v", err)})
return
}
// Create audit log entry
auditDetails := map[string]interface{}{
"name": duplicateConfig.Name,
"source_type": duplicateConfig.SourceType,
"dest_type": duplicateConfig.DestinationType,
"source_path": duplicateConfig.SourcePath,
"dest_path": duplicateConfig.DestinationPath,
"skip_processed_files": *duplicateConfig.SkipProcessedFiles,
"archive_enabled": *duplicateConfig.ArchiveEnabled,
"delete_after_transfer": *duplicateConfig.DeleteAfterTransfer,
"source_passive_mode": *duplicateConfig.SourcePassiveMode,
"dest_passive_mode": *duplicateConfig.DestPassiveMode,
"duplicated_from": originalConfig.ID,
}
auditLog := db.AuditLog{
Action: "duplicate",
EntityType: "config",
EntityID: duplicateConfig.ID,
UserID: userID,
Details: auditDetails,
Timestamp: time.Now(),
}
if err := tx.Create(&auditLog).Error; err != nil {
tx.Rollback()
log.Printf("Error creating audit log: %v", err)
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create audit log"})
return
}
// Commit the transaction
if err := tx.Commit().Error; err != nil {
log.Printf("Error committing transaction: %v", err)
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to commit transaction"})
return
}
// Generate rclone config file for the duplicate
if err := h.DB.GenerateRcloneConfig(&duplicateConfig); err != nil {
log.Printf("Warning: Failed to generate rclone config for duplicate: %v", err)
// Continue anyway, as the config was created in the database
} else {
log.Printf("Generated rclone config for duplicate config ID %d", duplicateConfig.ID)
}
// Return with full page reload to show the new config
c.Header("HX-Refresh", "true")
c.JSON(http.StatusOK, gin.H{"message": "Config duplicated successfully"})
}
+84
View File
@@ -733,3 +733,87 @@ func (h *Handlers) HandleRunJob(c *gin.Context) {
successScript := fmt.Sprintf("<script>window.notyfInstance.success('Job \"%s\" has been started successfully')</script>", jobName)
c.String(http.StatusOK, successScript)
}
// HandleDuplicateJob handles duplication of a job
func (h *Handlers) HandleDuplicateJob(c *gin.Context) {
// Get the job ID from the URL
idParam := c.Param("id")
id, err := strconv.ParseUint(idParam, 10, 64)
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid job ID"})
return
}
userID := c.GetUint("userID")
// Get the original job
var originalJob db.Job
if err := h.DB.First(&originalJob, id).Error; err != nil {
c.JSON(http.StatusNotFound, gin.H{"error": "Job not found"})
return
}
// Create a new job as a copy of the original
newJob := originalJob
newJob.ID = 0 // Reset ID to create a new record
newJob.Name = originalJob.Name + " - Copy"
newJob.CreatedAt = time.Now()
newJob.UpdatedAt = time.Now()
// Reset execution specific fields
newJob.LastRun = nil
newJob.NextRun = nil
// Save the new job
if err := h.DB.Create(&newJob).Error; err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create duplicate job: " + err.Error()})
return
}
// If the job has associated configs, duplicate those associations
configIDs := originalJob.GetConfigIDsList()
if len(configIDs) > 0 {
// Set the new job's config IDs
newJob.SetConfigIDsList(configIDs)
if err := h.DB.Save(&newJob).Error; err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to update config associations: " + err.Error()})
return
}
}
// Create audit log entry
auditDetails := map[string]interface{}{
"name": newJob.Name,
"original_job_id": originalJob.ID,
"new_job_id": newJob.ID,
"schedule": newJob.Schedule,
"enabled": newJob.GetEnabled(),
"config_ids": configIDs,
"webhook_enabled": newJob.GetWebhookEnabled(),
"notify_on_success": newJob.GetNotifyOnSuccess(),
"notify_on_failure": newJob.GetNotifyOnFailure(),
}
auditLog := db.AuditLog{
Action: "duplicate",
EntityType: "job",
EntityID: newJob.ID,
UserID: userID,
Details: auditDetails,
Timestamp: time.Now(),
}
if err := h.DB.Create(&auditLog).Error; err != nil {
log.Printf("Warning: Failed to create audit log for job duplication: %v", err)
// Continue anyway, as this is not critical
}
// Schedule the job with the scheduler
if err := h.Scheduler.ScheduleJob(&newJob); err != nil {
log.Printf("Warning: Failed to schedule duplicated job: %v", err)
// Continue anyway, as user can manually schedule later
}
// Redirect to jobs page
c.Redirect(http.StatusFound, "/jobs")
}
@@ -0,0 +1,122 @@
package handlers
import (
"net/http"
"strconv"
"github.com/gin-gonic/gin"
"github.com/starfleetcptn/gomft/components"
)
// HandleNotifications displays all notifications for the current user
func (h *Handlers) HandleNotifications(c *gin.Context) {
userID := c.GetUint("userID")
// Get notifications for the user
notifications, err := h.DB.GetUserNotifications(userID, 50) // Get more for the full page
if err != nil {
c.String(http.StatusInternalServerError, "Failed to load notifications")
return
}
// Get unread count
unreadCount, err := h.DB.GetUnreadNotificationCount(userID)
if err != nil {
c.String(http.StatusInternalServerError, "Failed to load notification count")
return
}
data := components.NotificationsData{
Notifications: notifications,
UnreadCount: unreadCount,
}
// Render the notifications page
components.NotificationsPage(c.Request.Context(), data).Render(c, c.Writer)
}
// HandleLoadNotifications loads the notifications dropdown content
func (h *Handlers) HandleLoadNotifications(c *gin.Context) {
userID := c.GetUint("userID")
// Get 10 most recent notifications
notifications, err := h.DB.GetUserNotifications(userID, 10)
if err != nil {
c.String(http.StatusInternalServerError, "Failed to load notifications")
return
}
// Get unread count
unreadCount, err := h.DB.GetUnreadNotificationCount(userID)
if err != nil {
c.String(http.StatusInternalServerError, "Failed to load notification count")
return
}
data := components.NotificationsData{
Notifications: notifications,
UnreadCount: unreadCount,
}
// Render just the dropdown content
components.NotificationDropdown(data).Render(c, c.Writer)
}
// HandleNotificationCount returns the notification count badge
func (h *Handlers) HandleNotificationCount(c *gin.Context) {
userID := c.GetUint("userID")
// Get unread count
unreadCount, err := h.DB.GetUnreadNotificationCount(userID)
if err != nil {
c.String(http.StatusInternalServerError, "Failed to load notification count")
return
}
// Render just the count badge
components.NotificationCount(unreadCount).Render(c, c.Writer)
}
// HandleMarkNotificationAsRead marks a single notification as read
func (h *Handlers) HandleMarkNotificationAsRead(c *gin.Context) {
userID := c.GetUint("userID")
// Get notification ID from path
idParam := c.Param("id")
id, err := strconv.ParseUint(idParam, 10, 64)
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid notification ID"})
return
}
// Mark as read
if err := h.DB.MarkNotificationAsRead(uint(id)); err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to mark notification as read"})
return
}
// Return updated count
unreadCount, err := h.DB.GetUnreadNotificationCount(userID)
if err != nil {
c.String(http.StatusInternalServerError, "Failed to load notification count")
return
}
// Return just the updated count badge
components.NotificationCount(unreadCount).Render(c, c.Writer)
}
// HandleMarkAllNotificationsAsRead marks all notifications for a user as read
func (h *Handlers) HandleMarkAllNotificationsAsRead(c *gin.Context) {
userID := c.GetUint("userID")
// Mark all as read
if err := h.DB.MarkAllNotificationsAsRead(userID); err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to mark notifications as read"})
return
}
// Return empty count (no more unread notifications)
components.NotificationCount(0).Render(c, c.Writer)
}
+10
View File
@@ -35,6 +35,13 @@ func (h *Handlers) RegisterRoutes(router *gin.Engine) {
authorized.GET("/profile/2fa/backup-codes", h.Handle2FABackupCodes)
authorized.POST("/profile/2fa/regenerate-codes", h.Handle2FARegenerateCodes)
// Add notifications routes
authorized.GET("/notifications", h.HandleNotifications)
authorized.GET("/notifications/dropdown", h.HandleLoadNotifications)
authorized.GET("/notifications/count", h.HandleNotificationCount)
authorized.POST("/notifications/:id/read", h.HandleMarkNotificationAsRead)
authorized.POST("/notifications/mark-all-read", h.HandleMarkAllNotificationsAsRead)
{
authorized.GET("/dashboard", h.HandleDashboard)
authorized.GET("/configs", h.HandleConfigs)
@@ -44,6 +51,7 @@ func (h *Handlers) RegisterRoutes(router *gin.Engine) {
authorized.PUT("/configs/:id", h.HandleUpdateConfig)
authorized.POST("/configs/:id", h.HandleUpdateConfig)
authorized.DELETE("/configs/:id", h.HandleDeleteConfig)
authorized.POST("/configs/:id/duplicate", h.HandleDuplicateConfig)
// Path validation endpoint
authorized.GET("/check-path", h.HandleCheckPath)
@@ -60,6 +68,7 @@ func (h *Handlers) RegisterRoutes(router *gin.Engine) {
authorized.PUT("/jobs/:id", h.HandleUpdateJob)
authorized.POST("/jobs/:id", h.HandleUpdateJob)
authorized.DELETE("/jobs/:id", h.HandleDeleteJob)
authorized.POST("/jobs/:id/duplicate", h.HandleDuplicateJob)
authorized.POST("/jobs/:id/run", h.HandleRunJob)
authorized.GET("/history", h.HandleHistory)
authorized.GET("/job-runs/:id", h.HandleJobRunDetails)
@@ -132,6 +141,7 @@ func (h *Handlers) RegisterRoutes(router *gin.Engine) {
settingsGroup.GET("", h.HandleSettings)
settingsGroup.POST("/notifications", h.HandleCreateNotificationService)
settingsGroup.DELETE("/notifications/:id", h.HandleDeleteNotificationService)
settingsGroup.POST("/notifications/test", h.HandleTestNotification)
settingsGroup.POST("/general", h.HandleSettings) // Placeholder for future implementation
settingsGroup.POST("/security", h.HandleSettings) // Placeholder for future implementation
}
+241 -85
View File
@@ -1,56 +1,24 @@
package handlers
import (
"bytes"
"encoding/json"
"fmt"
"io"
"log"
"net/http"
"strconv"
"strings"
"time"
"crypto/hmac"
"crypto/sha256"
"github.com/gin-gonic/gin"
"github.com/starfleetcptn/gomft/components"
"github.com/starfleetcptn/gomft/internal/db"
)
// NotificationService represents a notification service configuration
type NotificationService struct {
ID uint `json:"id" gorm:"primaryKey"`
Name string `json:"name" gorm:"not null"`
Type string `json:"type" gorm:"not null"` // email, slack, webhook
IsEnabled bool `json:"is_enabled" gorm:"default:true"`
Config map[string]string `json:"config" gorm:"-"`
ConfigJSON string `json:"-" gorm:"column:config"`
Description string `json:"description"`
EventTriggers string `json:"event_triggers" gorm:"column:event_triggers;default:'[]'"`
PayloadTemplate string `json:"payload_template" gorm:"column:payload_template"`
SecretKey string `json:"secret_key" gorm:"column:secret_key"`
RetryPolicy string `json:"retry_policy" gorm:"column:retry_policy;default:'simple'"`
LastUsed time.Time `json:"last_used" gorm:"column:last_used"`
SuccessCount int `json:"success_count" gorm:"column:success_count;default:0"`
FailureCount int `json:"failure_count" gorm:"column:failure_count;default:0"`
CreatedBy uint `json:"created_by"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
}
// BeforeSave converts Config map to JSON string for storage
func (n *NotificationService) BeforeSave() error {
configJSON, err := json.Marshal(n.Config)
if err != nil {
return err
}
n.ConfigJSON = string(configJSON)
return nil
}
// AfterFind converts JSON string back to Config map
func (n *NotificationService) AfterFind() error {
if n.ConfigJSON != "" {
return json.Unmarshal([]byte(n.ConfigJSON), &n.Config)
}
return nil
}
// HandleSettings handles GET /settings
func (h *Handlers) HandleSettings(c *gin.Context) {
// Check if the user has permission to view settings
@@ -59,7 +27,7 @@ func (h *Handlers) HandleSettings(c *gin.Context) {
return
}
var notificationServices []NotificationService
var notificationServices []db.NotificationService
if err := h.DB.Find(&notificationServices).Error; err != nil {
log.Printf("Error fetching notification services: %v", err)
}
@@ -67,14 +35,6 @@ func (h *Handlers) HandleSettings(c *gin.Context) {
// Convert to components.NotificationService
var componentServices []components.NotificationService
for _, service := range notificationServices {
// Parse event triggers from JSON string to string slice
var eventTriggers []string
if service.EventTriggers != "" {
if err := json.Unmarshal([]byte(service.EventTriggers), &eventTriggers); err != nil {
log.Printf("Error parsing event triggers: %v", err)
}
}
componentServices = append(componentServices, components.NotificationService{
ID: service.ID,
Name: service.Name,
@@ -82,7 +42,7 @@ func (h *Handlers) HandleSettings(c *gin.Context) {
IsEnabled: service.IsEnabled,
Config: service.Config,
Description: service.Description,
EventTriggers: eventTriggers,
EventTriggers: service.EventTriggers,
PayloadTemplate: service.PayloadTemplate,
SecretKey: service.SecretKey,
RetryPolicy: service.RetryPolicy,
@@ -130,16 +90,17 @@ func (h *Handlers) HandleCreateNotificationService(c *gin.Context) {
config["smtp_username"] = c.PostForm("smtp_username")
config["smtp_password"] = c.PostForm("smtp_password")
config["from_email"] = c.PostForm("from_email")
case "slack":
config["webhook_url"] = c.PostForm("webhook_url")
config["channel"] = c.PostForm("channel")
case "webhook":
config["webhook_url"] = c.PostForm("webhook_url")
config["method"] = c.PostForm("method")
config["headers"] = c.PostForm("headers")
// Add the new webhook fields
// Create event triggers JSON array
// Create event triggers array
// print all event triggers
log.Printf("Event triggers: %v", c.PostForm("trigger_job_start"))
log.Printf("Event triggers: %v", c.PostForm("trigger_job_complete"))
log.Printf("Event triggers: %v", c.PostForm("trigger_job_error"))
eventTriggers := make([]string, 0)
if c.PostForm("trigger_job_start") == "on" {
eventTriggers = append(eventTriggers, "job_start")
@@ -151,21 +112,14 @@ func (h *Handlers) HandleCreateNotificationService(c *gin.Context) {
eventTriggers = append(eventTriggers, "job_error")
}
// Marshal the event triggers to JSON
eventTriggersJSON, err := json.Marshal(eventTriggers)
if err != nil {
h.handleSettingsWithError(c, "Failed to process event triggers: "+err.Error())
return
}
// Create new notification service with additional fields
service := NotificationService{
service := db.NotificationService{
Name: name,
Type: serviceType,
IsEnabled: isEnabled,
Config: config,
Description: description,
EventTriggers: string(eventTriggersJSON),
EventTriggers: eventTriggers,
PayloadTemplate: c.PostForm("payload_template"),
SecretKey: c.PostForm("secret_key"),
RetryPolicy: c.PostForm("retry_policy"),
@@ -211,7 +165,7 @@ func (h *Handlers) HandleCreateNotificationService(c *gin.Context) {
}
// Create new notification service
service := NotificationService{
service := db.NotificationService{
Name: name,
Type: serviceType,
IsEnabled: isEnabled,
@@ -267,14 +221,14 @@ func (h *Handlers) HandleDeleteNotificationService(c *gin.Context) {
}
// Find service to delete (for audit log)
var service NotificationService
var service db.NotificationService
if err := h.DB.First(&service, serviceID).Error; err != nil {
h.handleSettingsWithError(c, "Notification service not found.")
return
}
// Delete the service
if err := h.DB.Delete(&NotificationService{}, serviceID).Error; err != nil {
if err := h.DB.Delete(&db.NotificationService{}, serviceID).Error; err != nil {
log.Printf("Error deleting notification service: %v", err)
h.handleSettingsWithError(c, "Failed to delete notification service: "+err.Error())
return
@@ -304,6 +258,224 @@ func (h *Handlers) HandleDeleteNotificationService(c *gin.Context) {
h.handleSettingsWithSuccess(c, "Notification service deleted successfully.")
}
// HandleTestNotification handles POST /settings/notifications/test
// This endpoint tests a notification configuration without saving it
func (h *Handlers) HandleTestNotification(c *gin.Context) {
// Check if the user has permission to manage settings
if !h.checkPermission(c, "system.settings") {
c.JSON(http.StatusForbidden, gin.H{
"success": false,
"message": "You don't have permission to test notifications",
})
return
}
// Parse form data to create a test notification service
name := c.PostForm("name")
serviceType := c.PostForm("type")
// Validate required fields
if name == "" || serviceType == "" {
c.JSON(http.StatusBadRequest, gin.H{
"success": false,
"message": "Name and type are required fields",
})
return
}
// Create config map based on service type
config := make(map[string]string)
switch serviceType {
case "email":
config["smtp_host"] = c.PostForm("smtp_host")
config["smtp_port"] = c.PostForm("smtp_port")
config["smtp_username"] = c.PostForm("smtp_username")
config["smtp_password"] = c.PostForm("smtp_password")
config["from_email"] = c.PostForm("from_email")
// Basic validation
if config["smtp_host"] == "" || config["smtp_port"] == "" {
c.JSON(http.StatusBadRequest, gin.H{
"success": false,
"message": "SMTP host and port are required for email notifications",
})
return
}
case "webhook":
config["webhook_url"] = c.PostForm("webhook_url")
config["method"] = c.PostForm("method")
config["headers"] = c.PostForm("headers")
// Basic validation
if config["webhook_url"] == "" {
c.JSON(http.StatusBadRequest, gin.H{
"success": false,
"message": "Webhook URL is required for webhook notifications",
})
return
}
// Get additional webhook fields
payloadTemplate := c.PostForm("payload_template")
secretKey := c.PostForm("secret_key")
// Create and format sample payload
samplePayload := generateSamplePayload(payloadTemplate)
// Send test webhook
err := sendTestWebhook(config, samplePayload, secretKey)
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{
"success": false,
"message": "Failed to send test webhook: " + err.Error(),
})
return
}
c.JSON(http.StatusOK, gin.H{
"success": true,
"message": "Test webhook sent successfully",
})
return
default:
c.JSON(http.StatusBadRequest, gin.H{
"success": false,
"message": "Invalid notification service type",
})
return
}
// For email, simulate a successful test for now
// In a real implementation, you would send an actual test notification
c.JSON(http.StatusOK, gin.H{
"success": true,
"message": fmt.Sprintf("Simulated %s notification test successful", serviceType),
})
}
// generateSamplePayload creates a sample payload for testing
func generateSamplePayload(template string) string {
// If no template provided, use a default sample
if template == "" {
return `{
"event": "job_complete",
"job": {
"id": "sample-job-123",
"name": "Test Job",
"status": "completed",
"message": "This is a test notification",
"started_at": "` + time.Now().Add(-5*time.Minute).Format(time.RFC3339) + `",
"completed_at": "` + time.Now().Format(time.RFC3339) + `",
"duration_seconds": 300,
"config_id": "config-456",
"config_name": "Test Config",
"transfer_bytes": 1024,
"file_count": 5
},
"instance": {
"id": "gomft-instance-1",
"name": "GoMFT Test Instance",
"version": "1.0.0",
"environment": "testing"
},
"timestamp": "` + time.Now().Format(time.RFC3339) + `",
"notification_id": "test-notification"
}`
}
// Replace placeholders in the template with sample values
samplePayload := template
// Replace common placeholders
replacements := map[string]string{
"{{job.id}}": "sample-job-123",
"{{job.name}}": "Test Job",
"{{job.status}}": "completed",
"{{job.message}}": "This is a test notification",
"{{job.event}}": "job_complete",
"{{job.started_at}}": time.Now().Add(-5 * time.Minute).Format(time.RFC3339),
"{{job.completed_at}}": time.Now().Format(time.RFC3339),
"{{job.duration_seconds}}": "300",
"{{job.config_id}}": "config-456",
"{{job.config_name}}": "Test Config",
"{{job.transfer_bytes}}": "1024",
"{{job.file_count}}": "5",
"{{instance.id}}": "gomft-instance-1",
"{{instance.name}}": "GoMFT Test Instance",
"{{instance.version}}": "1.0.0",
"{{instance.environment}}": "testing",
"{{timestamp}}": time.Now().Format(time.RFC3339),
"{{notification.id}}": "test-notification",
}
for placeholder, value := range replacements {
samplePayload = strings.Replace(samplePayload, placeholder, value, -1)
}
return samplePayload
}
// sendTestWebhook sends a test webhook to the specified URL
func sendTestWebhook(config map[string]string, payload string, secretKey string) error {
webhookURL := config["webhook_url"]
method := config["method"]
if method == "" {
method = "POST"
}
// Create the request
req, err := http.NewRequest(method, webhookURL, bytes.NewBufferString(payload))
if err != nil {
return fmt.Errorf("error creating request: %v", err)
}
// Set default Content-Type if not specified
req.Header.Set("Content-Type", "application/json")
// Parse and set custom headers
if config["headers"] != "" {
var headers map[string]string
if err := json.Unmarshal([]byte(config["headers"]), &headers); err == nil {
for key, value := range headers {
req.Header.Set(key, value)
}
}
}
// Add signature if secret key is provided
if secretKey != "" {
signature := calculateSignature(payload, secretKey)
req.Header.Set("X-GoMFT-Signature", signature)
}
// Send the request
client := &http.Client{
Timeout: 10 * time.Second,
}
resp, err := client.Do(req)
if err != nil {
return fmt.Errorf("error sending webhook: %v", err)
}
defer resp.Body.Close()
// Check the response
if resp.StatusCode >= 400 {
body, _ := io.ReadAll(resp.Body)
return fmt.Errorf("webhook returned error %d: %s", resp.StatusCode, string(body))
}
return nil
}
// calculateSignature generates an HMAC signature for webhook payloads
func calculateSignature(payload string, secretKey string) string {
h := hmac.New(sha256.New, []byte(secretKey))
h.Write([]byte(payload))
return fmt.Sprintf("sha256=%x", h.Sum(nil))
}
// Helper function to check if user has a specific permission
func (h *Handlers) checkPermission(c *gin.Context, permission string) bool {
// If user is admin, they have all permissions
@@ -332,7 +504,7 @@ func (h *Handlers) checkPermission(c *gin.Context, permission string) bool {
// handleSettingsWithError renders the settings page with an error message
func (h *Handlers) handleSettingsWithError(c *gin.Context, errorMessage string) {
var notificationServices []NotificationService
var notificationServices []db.NotificationService
if err := h.DB.Find(&notificationServices).Error; err != nil {
log.Printf("Error fetching notification services: %v", err)
}
@@ -340,14 +512,6 @@ func (h *Handlers) handleSettingsWithError(c *gin.Context, errorMessage string)
// Convert to components.NotificationService
var componentServices []components.NotificationService
for _, service := range notificationServices {
// Parse event triggers from JSON string to string slice
var eventTriggers []string
if service.EventTriggers != "" {
if err := json.Unmarshal([]byte(service.EventTriggers), &eventTriggers); err != nil {
log.Printf("Error parsing event triggers: %v", err)
}
}
componentServices = append(componentServices, components.NotificationService{
ID: service.ID,
Name: service.Name,
@@ -355,7 +519,7 @@ func (h *Handlers) handleSettingsWithError(c *gin.Context, errorMessage string)
IsEnabled: service.IsEnabled,
Config: service.Config,
Description: service.Description,
EventTriggers: eventTriggers,
EventTriggers: service.EventTriggers,
PayloadTemplate: service.PayloadTemplate,
SecretKey: service.SecretKey,
RetryPolicy: service.RetryPolicy,
@@ -375,7 +539,7 @@ func (h *Handlers) handleSettingsWithError(c *gin.Context, errorMessage string)
// handleSettingsWithSuccess renders the settings page with a success message
func (h *Handlers) handleSettingsWithSuccess(c *gin.Context, successMessage string) {
var notificationServices []NotificationService
var notificationServices []db.NotificationService
if err := h.DB.Find(&notificationServices).Error; err != nil {
log.Printf("Error fetching notification services: %v", err)
}
@@ -383,14 +547,6 @@ func (h *Handlers) handleSettingsWithSuccess(c *gin.Context, successMessage stri
// Convert to components.NotificationService
var componentServices []components.NotificationService
for _, service := range notificationServices {
// Parse event triggers from JSON string to string slice
var eventTriggers []string
if service.EventTriggers != "" {
if err := json.Unmarshal([]byte(service.EventTriggers), &eventTriggers); err != nil {
log.Printf("Error parsing event triggers: %v", err)
}
}
componentServices = append(componentServices, components.NotificationService{
ID: service.ID,
Name: service.Name,
@@ -398,7 +554,7 @@ func (h *Handlers) handleSettingsWithSuccess(c *gin.Context, successMessage stri
IsEnabled: service.IsEnabled,
Config: service.Config,
Description: service.Description,
EventTriggers: eventTriggers,
EventTriggers: service.EventTriggers,
PayloadTemplate: service.PayloadTemplate,
SecretKey: service.SecretKey,
RetryPolicy: service.RetryPolicy,