diff --git a/main.go b/main.go
index 6e368a1..bc8fa45 100644
--- a/main.go
+++ b/main.go
@@ -155,6 +155,7 @@ func main() { // {{{
service.Register("/configuration/timezone", false, false, actionConfigurationTimezone)
service.Register("/configuration/notification", false, false, pageConfigurationNotification)
service.Register("/configuration/notification/update/{prio}", false, false, actionConfigurationNotificationUpdate)
+ service.Register("/configuration/notification/delete/{prio}", false, false, actionConfigurationNotificationDelete)
service.Register("/entry/{datapoint}", false, false, actionEntryDatapoint)
go nodataLoop()
@@ -1085,7 +1086,8 @@ func pageConfigurationNotification(w http.ResponseWriter, r *http.Request, _ *se
var service notification.Service
if notificationType != "" {
// Create a new instance of the selected notification type.
- service = notification.GetInstance(notificationType)
+ service = notification.NewInstance(notificationType)
+ logger.Info("FOO", "service", fmt.Sprintf("%p %#v\n", service, service))
} else {
// Find the existing service for editing.
prio, err := strconv.Atoi(prioStr)
@@ -1138,7 +1140,7 @@ func actionConfigurationNotificationUpdate(w http.ResponseWriter, r *http.Reques
// prio -1 means a new service, not existing in database.
var svc *notification.Service
if prio == -1 {
- emptyService := notification.GetInstance(r.PostFormValue("type"))
+ emptyService := notification.NewInstance(r.PostFormValue("type"))
svc = &emptyService
} else {
svc = notificationManager.GetService(prio)
@@ -1178,3 +1180,17 @@ func actionConfigurationNotificationUpdate(w http.ResponseWriter, r *http.Reques
w.Header().Add("Location", "/configuration")
w.WriteHeader(302)
} // }}}
+func actionConfigurationNotificationDelete(w http.ResponseWriter, r *http.Request, _ *session.T) { // {{{
+ prioStr := r.PathValue("prio")
+ prio, err := strconv.Atoi(prioStr)
+ if err != nil {
+ pageError(w, "/configuration", werr.Wrap(err).Log())
+ return
+ }
+
+ DeleteNotificationService(prio)
+ notificationManager.RemoveService(prio)
+
+ w.Header().Add("Location", "/configuration")
+ w.WriteHeader(302)
+} // }}}
diff --git a/notification/factory.go b/notification/factory.go
index 4c7e25f..16c35d4 100644
--- a/notification/factory.go
+++ b/notification/factory.go
@@ -37,6 +37,16 @@ func ServiceFactory(t string, config []byte, prio int, ackURL string, logger *sl
return nil, werr.New("Unknown notification service, '%s'", t).WithCode("002-0000")
}
+func NewInstance(typ string) Service {
+ switch typ {
+ case "NTFY":
+ return new(NTFY)
+ case "SCRIPT":
+ return new(Script)
+ }
+ return nil
+}
+
func GetInstance(typ string) Service {
for _, svc := range allServices {
if strings.ToLower(svc.GetType()) == strings.ToLower(typ) {
diff --git a/notification/pkg.go b/notification/pkg.go
index dba9747..efa6712 100644
--- a/notification/pkg.go
+++ b/notification/pkg.go
@@ -60,6 +60,12 @@ func (nm *Manager) GetService(prio int) *Service {
return nil
}
+func (nm *Manager) RemoveService(prioToRemove int) {
+ nm.services = slices.DeleteFunc(nm.services, func(svc Service) bool {
+ return svc.GetPrio() == prioToRemove
+ })
+}
+
func (nm *Manager) Send(problemID int, msg []byte, fn func(*Service, error)) (err error) {
for i, service := range nm.services {
nm.logger.Info("notification", "service", service.GetType(), "prio", service.GetPrio())
diff --git a/notification/script.go b/notification/script.go
index ab6492f..7eb4d5b 100644
--- a/notification/script.go
+++ b/notification/script.go
@@ -95,6 +95,8 @@ func (script Script) Send(problemID int, msg []byte) (err error) {
func (script *Script) Update(values url.Values) (err error) {
updated := Script{}
+ script.updated = &updated
+
updated.Prio, err = strconv.Atoi(values.Get("prio"))
if err != nil {
return werr.Wrap(err)
@@ -105,8 +107,6 @@ func (script *Script) Update(values url.Values) (err error) {
return werr.New("Filename cannot be empty")
}
updated.Filename = strings.TrimSpace(givenFilename)
-
- script.updated = &updated
return
}
diff --git a/notification_manager.go b/notification_manager.go
index 74b2691..1690d8e 100644
--- a/notification_manager.go
+++ b/notification_manager.go
@@ -116,6 +116,22 @@ func UpdateNotificationService(svc notification.Service) (created bool, err erro
}
return
} // }}}
+func DeleteNotificationService(prio int) (err error) { // {{{
+ _, err = service.Db.Conn.Exec(
+ `
+ DELETE FROM public.notification
+ WHERE
+ prio = $1
+
+ `,
+ prio,
+ )
+
+ if err != nil {
+ return werr.Wrap(err).WithData(struct{ Prio int }{prio})
+ }
+ return
+} // }}}
func AcknowledgeNotification(uuid string) (err error) { // {{{
/*
diff --git a/static/css/default_light/configuration.css b/static/css/default_light/configuration.css
index 715f085..8de027f 100644
--- a/static/css/default_light/configuration.css
+++ b/static/css/default_light/configuration.css
@@ -26,7 +26,7 @@
}
#services {
display: grid;
- grid-template-columns: repeat(3, min-content);
+ grid-template-columns: repeat(4, min-content);
gap: 10px 24px;
background-color: #2979b8;
width: min-content;
@@ -41,3 +41,6 @@
#services div {
white-space: nowrap;
}
+#services img.delete {
+ height: 16px;
+}
diff --git a/static/css/gruvbox/configuration.css b/static/css/gruvbox/configuration.css
index 063f37d..2392238 100644
--- a/static/css/gruvbox/configuration.css
+++ b/static/css/gruvbox/configuration.css
@@ -26,7 +26,7 @@
}
#services {
display: grid;
- grid-template-columns: repeat(3, min-content);
+ grid-template-columns: repeat(4, min-content);
gap: 10px 24px;
background-color: #333;
width: min-content;
@@ -41,3 +41,6 @@
#services div {
white-space: nowrap;
}
+#services img.delete {
+ height: 16px;
+}
diff --git a/static/less/configuration.less b/static/less/configuration.less
index b1c41fd..153ec3d 100644
--- a/static/less/configuration.less
+++ b/static/less/configuration.less
@@ -39,7 +39,7 @@
#services {
display: grid;
- grid-template-columns: repeat(3, min-content);
+ grid-template-columns: repeat(4, min-content);
gap: 10px 24px;
background-color: @bg3;
width: min-content;
@@ -55,4 +55,8 @@
div {
white-space: nowrap;
}
+
+ img.delete {
+ height: 16px;
+ }
}
diff --git a/views/pages/configuration.gotmpl b/views/pages/configuration.gotmpl
index aab74c3..0561322 100644
--- a/views/pages/configuration.gotmpl
+++ b/views/pages/configuration.gotmpl
@@ -68,6 +68,11 @@
const nType = select.value
location.href = `/configuration/notification?type=${nType}`
}
+ function deleteNotification(prio) {
+ if (!confirm(`Are you sure you want to delete notification with prio ${prio}?`))
+ return
+ location.href = `/configuration/notification/delete/${prio}`;
+ }
{{ block "page_label" . }}{{end}}
@@ -126,11 +131,13 @@
+
{{ range .Data.NotificationServices }}
+
{{ end }}
diff --git a/views/pages/notification/script.gotmpl b/views/pages/notification/script.gotmpl
index a408d4a..70277c6 100644
--- a/views/pages/notification/script.gotmpl
+++ b/views/pages/notification/script.gotmpl
@@ -19,8 +19,8 @@ button {
}
-