refactor(web): reroute actions

Author: ItsNotGoodName

web/helpers/helpers.go

@@ -15,6 +15,7 @@ import (
 	"github.com/ItsNotGoodName/smtpbridge/internal/endpoint"
 	"github.com/ItsNotGoodName/smtpbridge/internal/models"
 	"github.com/ItsNotGoodName/smtpbridge/internal/trace"
+	"github.com/ItsNotGoodName/smtpbridge/pkg/htmx"
 	"github.com/ItsNotGoodName/smtpbridge/pkg/pagination"
 	"github.com/dustin/go-humanize"
 	"github.com/gorilla/schema"
@@ -142,3 +143,8 @@ func DecodeForm(w http.ResponseWriter, r *http.Request, form any) error {
 func ParseMultipartForm(r *http.Request) error {
 	return r.ParseMultipartForm(32 << 20)
 }
+
+func Reroute(w http.ResponseWriter, r *http.Request, view http.Handler) {
+	htmx.SetRetarget(w, "body")
+	view.ServeHTTP(w, r)
+}

web/http/router.go

@@ -16,8 +16,6 @@ import (
 	"github.com/gorilla/sessions"
 )
 
-const paramID = "{id}"
-
 func NewRouter(ct pages.Controller, app core.App, fileFS fs.FS, csrfSecret []byte, ss sessions.Store) *chi.Mux {
 	r := chi.NewRouter()
 
@@ -62,74 +60,74 @@ func NewRouter(ct pages.Controller, app core.App, fileFS fs.FS, csrfSecret []byt
 			pages.EnvelopeCreateView(ct, app))
 		r.Post(routes.EnvelopeCreate().String(),
 			pages.EnvelopeCreate(ct, app))
-		r.Get(routes.Envelope(paramID).String(),
+		r.Get(routes.Envelope(pages.ParamID).String(),
 			pages.EnvelopeView(ct, app))
-		r.Delete(routes.Envelope(paramID).String(),
+		r.Delete(routes.Envelope(pages.ParamID).String(),
 			pages.EnvelopeDelete(ct, app))
-		r.Get(routes.EnvelopeHTML(paramID).String(),
+		r.Get(routes.EnvelopeHTML(pages.ParamID).String(),
 			pages.EnvelopeHTMLView(ct, app))
-		r.Post(routes.EnvelopeEndpointSend(paramID).String(),
+		r.Post(routes.EnvelopeEndpointSend(pages.ParamID).String(),
 			pages.EnvelopeEndpointSend(ct, app))
 		{
-			envelopeListView := pages.EnvelopeListView(ct, app)
+			view := pages.EnvelopeListView(ct, app)
 			r.Get(routes.EnvelopeList().String(),
-				envelopeListView)
+				view)
 			r.Delete(routes.EnvelopeList().String(),
-				pages.EnvelopeListDrop(ct, app, envelopeListView))
+				pages.EnvelopeListDrop(ct, app, view))
 		}
 
 		// Attachment
 		r.Get(routes.AttachmentFile("*").String(),
 			pages.Files(ct, app, fileFS))
 		{
-			attachmentListView := pages.AttachmentListView(ct, app)
+			view := pages.AttachmentListView(ct, app)
 			r.Get(routes.AttachmentList().String(),
-				attachmentListView)
+				view)
 			r.Post(routes.AttachmentTrim().String(),
-				pages.AttachmentTrim(ct, app, attachmentListView))
+				pages.AttachmentTrim(ct, app, view))
 		}
 
 		// Endpoint
-		r.Get(routes.Endpoint(paramID).String(),
+		r.Get(routes.Endpoint(pages.ParamID).String(),
 			pages.EndpointView(ct, app))
-		r.Post(routes.Endpoint(paramID).String(),
+		r.Post(routes.Endpoint(pages.ParamID).String(),
 			pages.EndpointUpdate(ct, app))
 		r.Get(routes.EndpointList().String(),
 			pages.EndpointListView(ct, app))
-		r.Post(routes.EndpointTest(paramID).String(),
+		r.Post(routes.EndpointTest(pages.ParamID).String(),
 			pages.EndpointTest(ct, app))
 		r.Get(routes.EndpointCreate().String(),
 			pages.EndpointCreateView(ct, app))
 		r.Post(routes.EndpointCreate().String(),
 			pages.EndpointCreate(ct, app))
-		r.Delete(routes.Endpoint(paramID).String(),
+		r.Delete(routes.Endpoint(pages.ParamID).String(),
 			pages.EndpointDelete(ct, app))
 
 		// Traces
 		{
-			traceListView := pages.TraceListView(ct, app)
+			view := pages.TraceListView(ct, app)
 			r.Get(routes.TraceList().String(),
-				traceListView)
+				view)
 			r.Delete(routes.TraceList().String(),
-				pages.TraceListDrop(ct, app, traceListView))
+				pages.TraceListDrop(ct, app, view))
 		}
 
 		// Rules
 		r.Get(routes.RuleList().String(),
 			pages.RuleListView(ct, app))
-		r.Get(routes.Rule(paramID).String(),
+		r.Get(routes.Rule(pages.ParamID).String(),
 			pages.RuleView(ct, app))
-		r.Delete(routes.Rule(paramID).String(),
+		r.Delete(routes.Rule(pages.ParamID).String(),
 			pages.RuleDelete(ct, app))
-		r.Post(routes.Rule(paramID).String(),
+		r.Post(routes.Rule(pages.ParamID).String(),
 			pages.RuleUpdate(ct, app))
 		r.Post(routes.RuleExpressionCheck().String(),
 			pages.RuleExpressionCheck(ct, app))
 		r.Get(routes.RuleCreate().String(),
 			pages.RuleCreateView(ct, app))
 		r.Post(routes.RuleCreate().String(),
 			pages.RuleCreate(ct, app))
-		r.Post(routes.RuleToggle(paramID).String(),
+		r.Post(routes.RuleToggle(pages.ParamID).String(),
 			pages.RuleToggle(ct, app))
 
 		// Retention Policy
@@ -141,11 +139,11 @@ func NewRouter(ct pages.Controller, app core.App, fileFS fs.FS, csrfSecret []byt
 			pages.EndpointFormConfigComponent(ct, app))
 		r.Get(routes.StorageStatsComponent().String(),
 			pages.StorageStatsComponent(ct, app))
-		r.Get(routes.EnvelopeTabComponent(paramID, routes.EnvelopeTabText).String(),
+		r.Get(routes.EnvelopeTabComponent(pages.ParamID, routes.EnvelopeTabText).String(),
 			pages.EnvelopeTabComponent(ct, app, routes.EnvelopeTabText))
-		r.Get(routes.EnvelopeTabComponent(paramID, routes.EnvelopeTabHTML).String(),
+		r.Get(routes.EnvelopeTabComponent(pages.ParamID, routes.EnvelopeTabHTML).String(),
 			pages.EnvelopeTabComponent(ct, app, routes.EnvelopeTabHTML))
-		r.Get(routes.EnvelopeTabComponent(paramID, routes.EnvelopeTabAttachments).String(),
+		r.Get(routes.EnvelopeTabComponent(pages.ParamID, routes.EnvelopeTabAttachments).String(),
 			pages.EnvelopeTabComponent(ct, app, routes.EnvelopeTabAttachments))
 		r.Get(routes.RecentEnvelopeListComponent().String(),
 			pages.RecentEnvelopeListComponent(ct, app))

web/pages/pages.go

@@ -30,6 +30,8 @@ import (
 
 // utils
 
+const ParamID = "{id}"
+
 func withID(ct Controller, fn func(w http.ResponseWriter, r *http.Request, id int64)) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		id, err := strconv.ParseInt(chi.URLParam(r, "id"), 10, 64)
@@ -459,8 +461,7 @@ func TraceListDrop(ct Controller, app core.App, view http.Handler) http.HandlerF
 			return
 		}
 
-		htmx.SetRetarget(w, "body")
-		view.ServeHTTP(w, r)
+		helpers.Reroute(w, r, view)
 	}
 }
 func RuleListView(ct Controller, app core.App) http.HandlerFunc {
@@ -490,8 +491,7 @@ func AttachmentTrim(ct Controller, app core.App, view http.Handler) http.Handler
 			return
 		}
 
-		htmx.SetRetarget(w, "body")
-		view.ServeHTTP(w, r)
+		helpers.Reroute(w, r, view)
 	}
 }