From 31d49d4b1a08566c0c5b85cf79799401bd7a471f Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel@bitbadger.solutions>
Date: Sat, 16 Mar 2024 22:00:42 -0400
Subject: [PATCH] Fix "add category" button (#40)

---
 src/MyWebLog/Handlers/Admin.fs |  2 +-
 src/MyWebLog/Views/WebLog.fs   | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/MyWebLog/Handlers/Admin.fs b/src/MyWebLog/Handlers/Admin.fs
index 6bca839..8d99828 100644
--- a/src/MyWebLog/Handlers/Admin.fs
+++ b/src/MyWebLog/Handlers/Admin.fs
@@ -96,7 +96,7 @@ module Category =
 
     // GET /admin/categories
     let all : HttpHandler = fun next ctx ->
-        adminPage "Categories" true next ctx Views.WebLog.categoryList
+        adminPage "Categories" true next ctx (Views.WebLog.categoryList (ctx.Request.Query.ContainsKey "new"))
 
     // GET /admin/category/{id}/edit
     let edit catId : HttpHandler = fun next ctx -> task {
diff --git a/src/MyWebLog/Views/WebLog.fs b/src/MyWebLog/Views/WebLog.fs
index 98d64ca..26bcc9a 100644
--- a/src/MyWebLog/Views/WebLog.fs
+++ b/src/MyWebLog/Views/WebLog.fs
@@ -51,7 +51,7 @@ let categoryEdit (model: EditCategoryModel) app =
 
 
 /// Category list page
-let categoryList app = [
+let categoryList includeNew app = [
     let catCol  = "col-12 col-md-6 col-xl-5 col-xxl-4"
     let descCol = "col-12 col-md-6 col-xl-7 col-xxl-8"
     let categoryDetail (cat: DisplayCategory) =
@@ -84,6 +84,8 @@ let categoryList app = [
                 match cat.Description with Some value -> raw value | None -> em [ _class "text-muted" ] [ raw "none" ]
             ]
         ]
+    let loadNew =
+        span [ _hxGet (relUrl app "admin/category/new/edit"); _hxTrigger HxTrigger.Load; _hxSwap HxSwap.OuterHtml ] []
 
     h2 [ _class "my-3" ] [ raw app.PageTitle ]
     article [] [
@@ -92,11 +94,13 @@ let categoryList app = [
         ]
         div [ _id "catList"; _class "container" ] [
             if app.Categories.Length = 0 then
-                div [ _id "cat_new" ] [
-                    p [ _class "text-muted fst-italic text-center" ] [
-                        raw "This web log has no categories defined"
+                if includeNew then loadNew
+                else
+                    div [ _id "cat_new" ] [
+                        p [ _class "text-muted fst-italic text-center" ] [
+                            raw "This web log has no categories defined"
+                        ]
                     ]
-                ]
             else
                 div [ _class "container" ] [
                     div [ _class "row mwl-table-heading" ] [
@@ -108,7 +112,7 @@ let categoryList app = [
                     // don't think we need this...
                     // _hxTarget "#catList"; _hxSwap $"{HxSwap.OuterHtml} show:window:top"
                     antiCsrf app
-                    div [ _class "row mwl-table-detail"; _id "cat_new" ] []
+                    div [ _class "row mwl-table-detail"; _id "cat_new" ] [ if includeNew then loadNew ]
                     yield! app.Categories |> Seq.ofArray |> Seq.map categoryDetail |> List.ofSeq
                 ]
         ]
@@ -173,7 +177,7 @@ let dashboard (model: DashboardModel) app = [
                             a [ _href (relUrl app "admin/categories"); _class "btn btn-secondary me-2" ] [
                                 raw "View All"
                             ]
-                            a [ _href (relUrl app "admin/category/new/edit"); _class "btn btn-secondary" ] [
+                            a [ _href (relUrl app "admin/categories?new"); _class "btn btn-secondary" ] [
                                 raw "Add a New Category"
                             ]
                     ]