Fix adding note

Author: Piszmog

components/add_note.templ

@@ -5,7 +5,9 @@ import (
 )
 
 templ filter() {
-	<form class="ml-3 mr-3 mt-3 flex items-center space-x-2">
+	<form
+ 		class="ml-3 mr-3 mt-3 flex items-center space-x-2"
+	>
 		<div class="w-full">
 			<label for="company" class="block text-sm font-medium leading-6 text-gray-900">Company</label>
 			<div class="mt-2">

components/filter.templ

@@ -154,7 +154,7 @@ templ JobDetails(j types.JobApplication, timelineEntries []types.JobApplicationT
 	</form>
 	@Timeline(timelineEntries, "")
 	<div class="mt-6 flex gap-x-3">
-		@note(j.ID, timelineEntries)
+		@note(j.ID)
 	</div>
 }
 

components/jobs.templ

@@ -2,19 +2,17 @@ package components
 
 import (
 	"strconv"
-	"github.com/Piszmog/pathwise/types"
-	"github.com/Piszmog/pathwise/utils"
 )
 
-templ note(id int, timelineEntries []types.JobApplicationTimelineEntry) {
+templ note(id int) {
 	<form
  		id="note-form"
  		class="relative flex-auto"
  		hx-post={ "/jobs/" + strconv.Itoa(id) + "/notes" }
  		hx-on::after-request="this.reset()"
+ 		hx-target="#timeline-list"
+ 		hx-swap="afterbegin"
 	>
-		<input type="hidden" name="firstTimelineEntryID" value={ strconv.Itoa(utils.GetFirstElementID(timelineEntries)) }/>
-		<input type="hidden" name="firstTimelineEntryType" value={ string(utils.GetFirstElementType(timelineEntries)) }/>
 		<div
  			class="overflow-hidden rounded-lg pb-12 shadow-sm ring-1 ring-inset ring-gray-300 focus-within:ring-2 focus-within:ring-blue-600"
 		>

components/note.templ

@@ -9,13 +9,13 @@ templ Timeline(entries []types.JobApplicationTimelineEntry, oob string) {
 	<div id="timeline" class="flow-root" hx-swap-oob={ oob }>
 		<ul id="timeline-list" role="list" class="-mb-8">
 			for i, entry := range entries {
-				@timelineEntry(entry, i == len(entries) - 1)
+				@TimelineEntry(entry, i == len(entries) - 1)
 			}
 		</ul>
 	</div>
 }
 
-templ timelineEntry(entry types.JobApplicationTimelineEntry, isLast bool) {
+templ TimelineEntry(entry types.JobApplicationTimelineEntry, isLast bool) {
 	switch v := entry.(type) {
 		case types.JobApplicationStatusHistory:
 			@timelineEntryStatus(v, isLast)

components/timeline.templ

@@ -8,7 +8,7 @@ templ UpdateJob(j types.JobApplication, s *types.StatsOpts, newTimelineEntry typ
 	}
 	if newTimelineEntry.SwapOOB != "" {
 		<div hx-swap-oob={ newTimelineEntry.SwapOOB }>
-			@timelineEntry(newTimelineEntry.Entry, false)
+			@TimelineEntry(newTimelineEntry.Entry, false)
 		</div>
 	}
 	@job(j)

components/update_job.templ

@@ -57,6 +57,44 @@ func (h *Handler) Jobs(w http.ResponseWriter, r *http.Request) {
 	m.Render(r.Context(), w)
 }
 
+func (h *Handler) FilterJobs(w http.ResponseWriter, r *http.Request) {
+	queries := r.URL.Query()
+	pageQuery := queries.Get("page")
+	perPageQuery := queries.Get("per_page")
+	page := 0
+	var err error
+	if pageQuery != "" {
+		page, err = strconv.Atoi(pageQuery)
+		if err != nil {
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+	}
+	perPage := 10
+	if perPageQuery != "" {
+		perPage, err = strconv.Atoi(perPageQuery)
+		if err != nil {
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+	}
+	jobs, err := h.JobApplicationStore.Get(r.Context(), store.GetOpts{Page: page, PerPage: perPage})
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	statsOpts, err := h.StatsStore.Get(r.Context())
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	m := components.Main(
+		jobs,
+		statsOpts,
+	)
+	m.Render(r.Context(), w)
+}
+
 func (h *Handler) JobDetails(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	id, err := strconv.Atoi(vars["id"])
@@ -220,8 +258,6 @@ func (h *Handler) AddNote(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
-	firstTimelineEntryID := r.FormValue("firstTimelineEntryID")
-	firstTimelineEntryType := r.FormValue("firstTimelineEntryType")
 
 	jobNote := types.JobApplicationNote{
 		JobApplicationID: id,
@@ -232,10 +268,5 @@ func (h *Handler) AddNote(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
-	components.AddNote(
-		types.NewTimelineEntry{
-			SwapOOB: "beforebegin:#" + newTimelineID(firstTimelineEntryType, firstTimelineEntryID),
-			Entry:   n,
-		},
-	).Render(r.Context(), w)
+	components.TimelineEntry(n, false).Render(r.Context(), w)
 }

handlers/handler.go

@@ -40,6 +40,7 @@ func main() {
 	r.PathPrefix("/assets/").Handler(http.FileServer(http.FS(assets)))
 	r.HandleFunc("/", handler.Jobs).Methods(http.MethodGet)
 	r.HandleFunc("/jobs", handler.AddJob).Methods(http.MethodPost)
+	r.HandleFunc("/jobs", handler.FilterJobs).Methods(http.MethodPost)
 	r.HandleFunc("/jobs/{id}", handler.JobDetails).Methods(http.MethodGet)
 	r.HandleFunc("/jobs/{id}", handler.UpdateJob).Methods(http.MethodPatch)
 	r.HandleFunc("/jobs/{id}/notes", handler.AddNote).Methods(http.MethodPost)