Complete chapter edit page (#6)

first cut, anyway...

src/MyWebLog/Handlers/Admin.fs

@@ -27,7 +27,7 @@ module Dashboard =
               ListedPages        = listed
               Categories         = cats
               TopLevelCategories = topCats }
-        return! adminPage "Dashboard" false (AdminViews.Admin.dashboard model) next ctx
+        return! adminPage "Dashboard" false (Views.Admin.dashboard model) next ctx
     }
 
     // GET /admin/administration

src/MyWebLog/Handlers/Helpers.fs

@@ -3,8 +3,7 @@ module private MyWebLog.Handlers.Helpers
 
 open System.Text.Json
 open Microsoft.AspNetCore.Http
-open MyWebLog.AdminViews
-open MyWebLog.AdminViews.Helpers
+open MyWebLog.Views
 
 /// Session extensions to get and set objects
 type ISession with

src/MyWebLog/Handlers/Post.fs

@@ -379,7 +379,7 @@ let chapters postId : HttpHandler = requireAccess Author >=> fun next ctx -> tas
              && Option.isSome post.Episode.Value.Chapters
              && canEdit post.AuthorId ctx ->
         return!
-            adminPage "Manage Chapters" true (AdminViews.Post.chapters false (ManageChaptersModel.Create post)) next ctx
+            adminPage "Manage Chapters" true (Views.Post.chapters false (ManageChaptersModel.Create post)) next ctx
     | Some _ | None -> return! Error.notFound next ctx
 }
 
@@ -398,9 +398,9 @@ let editChapter (postId, index) : HttpHandler = requireAccess Author >=> fun nex
         match chapter with
         | Some chap ->
             return!
-                adminPage
+                adminBarePage
                     (if index = -1 then "Add a Chapter" else "Edit Chapter") true
-                    (AdminViews.Post.chapterEdit (EditChapterModel.FromChapter post.Id index chap)) next ctx
+                    (Views.Post.chapterEdit (EditChapterModel.FromChapter post.Id index chap)) next ctx
         | None -> return! Error.notFound next ctx
     | Some _ | None -> return! Error.notFound next ctx
 }
@@ -418,7 +418,7 @@ let saveChapter (postId, index) : HttpHandler = requireAccess Author >=> fun nex
         if index >= -1 && index < List.length chapters then
             try
                 let chapter     = form.ToChapter()
-                let existing    = if index = -1 then chapters else chapters |> List.removeAt index
+                let existing    = if index = -1 then chapters else List.removeAt index chapters
                 let updatedPost =
                     { post with
                         Episode = Some
@@ -429,9 +429,32 @@ let saveChapter (postId, index) : HttpHandler = requireAccess Author >=> fun nex
                 return!
                     adminPage
                         "Manage Chapters" true
-                        (AdminViews.Post.chapterList form.AddAnother (ManageChaptersModel.Create updatedPost)) next ctx
+                        (Views.Post.chapterList form.AddAnother (ManageChaptersModel.Create updatedPost)) next ctx
             with
-            | ex -> return! Error.notFound next ctx // TODO: return error
+            | ex -> return! Error.server ex.Message next ctx
+        else return! Error.notFound next ctx
+    | Some _ | None -> return! Error.notFound next ctx
+}
+
+// DELETE /admin/post/{id}/chapter/{idx}
+let deleteChapter (postId, index) : HttpHandler = requireAccess Author >=> fun next ctx -> task {
+    let data = ctx.Data
+    match! data.Post.FindById (PostId postId) ctx.WebLog.Id with
+    | Some post
+        when    Option.isSome post.Episode
+             && Option.isSome post.Episode.Value.Chapters
+             && canEdit post.AuthorId ctx ->
+        let  chapters = post.Episode.Value.Chapters.Value
+        if index >= 0 && index < List.length chapters then
+            let updatedPost =
+                { post with
+                    Episode = Some { post.Episode.Value with Chapters = Some (List.removeAt index chapters) } }
+            do! data.Post.Update updatedPost
+            do! addMessage ctx { UserMessage.Success with Message = "Chapter deleted successfully" }
+            return!
+                adminPage
+                    "Manage Chapters" true (Views.Post.chapterList false (ManageChaptersModel.Create updatedPost)) next
+                    ctx
         else return! Error.notFound next ctx
     | Some _ | None -> return! Error.notFound next ctx
 }

src/MyWebLog/Handlers/Routes.fs

@@ -216,6 +216,11 @@ let router : HttpHandler = choose [
                 routef  "/%s/delete"       Upload.deleteFromDb
             ])
         ]
+        DELETE >=> validateCsrf >=> choose [
+            subRoute "/post" (choose [
+                routef "/%s/chapter/%i" Post.deleteChapter
+            ])
+        ]
     ])
     GET_HEAD >=> routexp "/category/(.*)"  Post.pageOfCategorizedPosts
     GET_HEAD >=> routef  "/page/%i"        Post.pageOfPosts

src/MyWebLog/Handlers/User.fs

@@ -36,7 +36,7 @@ let logOn returnUrl : HttpHandler = fun next ctx ->
         match returnUrl with
         | Some _ -> returnUrl
         | None -> if ctx.Request.Query.ContainsKey "returnUrl" then Some ctx.Request.Query["returnUrl"].[0] else None
-    adminPage "Log On" true (AdminViews.User.logOn { LogOnModel.Empty with ReturnTo = returnTo }) next ctx
+    adminPage "Log On" true (Views.User.logOn { LogOnModel.Empty with ReturnTo = returnTo }) next ctx
 
 
 open System.Security.Claims
@@ -93,7 +93,7 @@ let private goAway : HttpHandler = RequestErrors.BAD_REQUEST "really?"
 // GET /admin/settings/users
 let all : HttpHandler = fun next ctx -> task {
     let! users = ctx.Data.WebLogUser.FindByWebLog ctx.WebLog.Id
-    return! adminBarePage "User Administration" true (AdminViews.User.userList users) next ctx
+    return! adminBarePage "User Administration" true (Views.User.userList users) next ctx
 }
 
 /// Show the edit user page