bit-badger/myWebLog
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases 11 Activity

Page / Post edit pages work

Browse Source 
Category in work
This commit is contained in:
Daniel J. Summers 2016-11-11 16:28:15 -06:00
parent 0d54fc2ec3
commit 458b8308ae
10 changed files with 115 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/MyWebLog.App/PageModule.fs
View File

@ -57,18 +57,22 @@ type PageModule (data : IMyWebLogData, clock : IClock) as this =
|> function |> function
| Some p -> | Some p ->
let page = match pageId with "new" -> { p with WebLogId = this.WebLog.Id } | _ -> p let page = match pageId with "new" -> { p with WebLogId = this.WebLog.Id } | _ -> p
let pId = { p with let pId =
Title = form.Title { p with
Permalink = form.Permalink Title = form.Title
PublishedOn = match pageId with "new" -> now | _ -> page.PublishedOn Permalink = form.Permalink
UpdatedOn = now PublishedOn = match pageId with "new" -> now | _ -> page.PublishedOn
Text = match form.Source with UpdatedOn = now
| RevisionSource.Markdown -> (* Markdown.TransformHtml *) form.Text ShowInPageList = form.ShowInPageList
| _ -> form.Text Text = match form.Source with
Revisions = { AsOf = now | RevisionSource.Markdown -> (* Markdown.TransformHtml *) form.Text
SourceType = form.Source | _ -> form.Text
Text = form.Text } :: page.Revisions } Revisions = { AsOf = now
|> savePage data SourceType = form.Source
Text = form.Text
} :: page.Revisions
}
|> savePage data
let model = MyWebLogModel (this.Context, this.WebLog) let model = MyWebLogModel (this.Context, this.WebLog)
{ UserMessage.Empty with { UserMessage.Empty with
Level = Level.Info Level = Level.Info

5
src/MyWebLog.App/PostModule.fs
View File

@ -269,7 +269,7 @@ type PostModule(data : IMyWebLogData, clock : IClock) as this =
match postId with "new" -> Some Post.Empty | _ -> tryFindPost data this.WebLog.Id postId match postId with "new" -> Some Post.Empty | _ -> tryFindPost data this.WebLog.Id postId
|> function |> function
| Some p -> | Some p ->
let justPublished = p.PublishedOn = int64 0 && form.PublishNow let justPublished = p.PublishedOn = 0L && form.PublishNow
let post = match postId with let post = match postId with
| "new" -> { p with | "new" -> { p with
WebLogId = this.WebLog.Id WebLogId = this.WebLog.Id
@ -281,7 +281,7 @@ type PostModule(data : IMyWebLogData, clock : IClock) as this =
Status = match form.PublishNow with true -> PostStatus.Published | _ -> PostStatus.Draft Status = match form.PublishNow with true -> PostStatus.Published | _ -> PostStatus.Draft
Title = form.Title Title = form.Title
Permalink = form.Permalink Permalink = form.Permalink
PublishedOn = match justPublished with true -> now | _ -> int64 0 PublishedOn = match justPublished with true -> now | _ -> post.PublishedOn
UpdatedOn = now UpdatedOn = now
Text = match form.Source with Text = match form.Source with
| RevisionSource.Markdown -> (* Markdown.TransformHtml *) form.Text | RevisionSource.Markdown -> (* Markdown.TransformHtml *) form.Text
@ -289,6 +289,7 @@ type PostModule(data : IMyWebLogData, clock : IClock) as this =
CategoryIds = Array.toList form.Categories CategoryIds = Array.toList form.Categories
Tags = form.Tags.Split ',' Tags = form.Tags.Split ','
|> Seq.map (fun t -> t.Trim().ToLowerInvariant ()) |> Seq.map (fun t -> t.Trim().ToLowerInvariant ())
|> Seq.sort
|> Seq.toList |> Seq.toList
Revisions = { AsOf = now Revisions = { AsOf = now
SourceType = form.Source SourceType = form.Source

21
src/MyWebLog.App/ViewModels.fs
View File

@ -220,6 +220,8 @@ type CategoryEditModel (ctx, webLog, category) =
inherit MyWebLogModel (ctx, webLog) inherit MyWebLogModel (ctx, webLog)
/// The form with the category information /// The form with the category information
member val Form = CategoryForm (category) with get, set member val Form = CategoryForm (category) with get, set
/// The category being edited
member val Category = category
/// The categories /// The categories
member val Categories : IndentedCategory list = [] with get, set member val Categories : IndentedCategory list = [] with get, set
@ -336,9 +338,15 @@ type PostForDisplay (webLog : WebLog, post : Post) =
/// The time zone for the web log to which this post belongs /// The time zone for the web log to which this post belongs
member this.TimeZone = webLog.TimeZone member this.TimeZone = webLog.TimeZone
/// The date the post was published /// The date the post was published
member this.PublishedDate = FormatDateTime.longDate this.TimeZone this.Post.PublishedOn member this.PublishedDate =
match this.Post.Status with
| PostStatus.Published -> FormatDateTime.longDate this.TimeZone this.Post.PublishedOn
| _ -> FormatDateTime.longDate this.TimeZone this.Post.UpdatedOn
/// The time the post was published /// The time the post was published
member this.PublishedTime = FormatDateTime.time this.TimeZone this.Post.PublishedOn member this.PublishedTime =
match this.Post.Status with
| PostStatus.Published -> FormatDateTime.time this.TimeZone this.Post.PublishedOn
| _ -> FormatDateTime.time this.TimeZone this.Post.UpdatedOn
/// Tags /// Tags
member this.Tags = member this.Tags =
match List.length this.Post.Tags with match List.length this.Post.Tags with
@ -389,14 +397,17 @@ type EditPostForm () =
/// The selected category Ids for the post /// The selected category Ids for the post
member val Categories : string[] = [||] with get, set member val Categories : string[] = [||] with get, set
/// Whether the post should be published /// Whether the post should be published
member val PublishNow = true with get, set member val PublishNow = false with get, set
/// Fill the form with applicable values from a post /// Fill the form with applicable values from a post
member this.ForPost (post : Post) = member this.ForPost (post : Post) =
this.Title <- post.Title this.Title <- post.Title
this.Permalink <- post.Permalink this.Permalink <- post.Permalink
this.Tags <- List.reduce (fun acc x -> sprintf "%s, %s" acc x) post.Tags this.Tags <- match List.isEmpty post.Tags with
| true -> ""
| _ -> List.reduce (fun acc x -> sprintf "%s, %s" acc x) post.Tags
this.Categories <- List.toArray post.CategoryIds this.Categories <- List.toArray post.CategoryIds
this.PublishNow <- post.Status = PostStatus.Published || "new" = post.Id
this this
/// Fill the form with applicable values from a revision /// Fill the form with applicable values from a revision
@ -442,6 +453,8 @@ type EditPostModel (ctx, webLog, post, revision) =
member this.PublishedDate = this.DisplayLongDate this.Post.PublishedOn member this.PublishedDate = this.DisplayLongDate this.Post.PublishedOn
/// The published time /// The published time
member this.PublishedTime = this.DisplayTime this.Post.PublishedOn member this.PublishedTime = this.DisplayTime this.Post.PublishedOn
/// The "checked" attribute for the Publish Now box
member this.PublishNowCheckedAttr = match this.Form.PublishNow with true -> "checked=\"checked\"" | _ -> ""
// ---- User models ---- // ---- User models ----

96
src/MyWebLog.Data.RethinkDB/Category.fs
View File

@ -5,12 +5,6 @@ open RethinkDb.Driver.Ast
let private r = RethinkDb.Driver.RethinkDB.R let private r = RethinkDb.Driver.RethinkDB.R
/// Shorthand to get a category by Id and filter by web log Id
let private category (webLogId : string) (catId : string) =
r.Table(Table.Category)
.Get(catId)
.Filter(ReqlFunction1 (fun c -> upcast c.["WebLogId"].Eq webLogId))
/// Get all categories for a web log /// Get all categories for a web log
let getAllCategories conn (webLogId : string) = let getAllCategories conn (webLogId : string) =
async { async {
@ -24,10 +18,16 @@ let getAllCategories conn (webLogId : string) =
/// Get a specific category by its Id /// Get a specific category by its Id
let tryFindCategory conn webLogId catId : Category option = let tryFindCategory conn webLogId catId : Category option =
async { async {
let! catt = (category webLogId catId).RunResultAsync<Category> conn let! c =
return catt r.Table(Table.Category)
|> box .Get(catId)
|> function null -> None | cat -> Some <| unbox cat .RunResultAsync<Category> conn
return
match box c with
| null -> None
| catt ->
let cat : Category = unbox catt
match cat.WebLogId = webLogId with true -> Some cat | _ -> None
} }
|> Async.RunSynchronously |> Async.RunSynchronously
@ -48,53 +48,63 @@ type CategoryUpdateRecord =
} }
/// Update a category /// Update a category
let updateCategory conn (cat : Category) = let updateCategory conn (cat : Category) =
async { match tryFindCategory conn cat.WebLogId cat.Id with
do! (category cat.WebLogId cat.Id) | Some _ ->
.Update({ CategoryUpdateRecord.Name = cat.Name async {
do! r.Table(Table.Category)
.Get(cat.Id)
.Update(
{ CategoryUpdateRecord.Name = cat.Name
Slug = cat.Slug Slug = cat.Slug
Description = cat.Description Description = cat.Description
ParentId = cat.ParentId ParentId = cat.ParentId
}) })
.RunResultAsync conn .RunResultAsync conn
} }
|> Async.RunSynchronously |> Async.RunSynchronously
| _ -> ()
type CategoryChildrenUpdateRecord =
{ Children : string list }
/// Update a category's children /// Update a category's children
let updateChildren conn webLogId parentId (children : string list) = let updateChildren conn webLogId parentId (children : string list) =
async { match tryFindCategory conn webLogId parentId with
do! (category webLogId parentId) | Some _ ->
.Update({ CategoryChildrenUpdateRecord.Children = children }) async {
.RunResultAsync conn do! r.Table(Table.Category)
} .Get(parentId)
|> Async.RunSynchronously .Update(dict [ "Children", children ])
.RunResultAsync conn
}
|> Async.RunSynchronously
| _ -> ()
type CategoryParentUpdateRecord =
{ ParentId : string option }
type PostCategoriesUpdateRecord =
{ CategoryIds : string list }
/// Delete a category /// Delete a category
let deleteCategory conn (cat : Category) = let deleteCategory conn (cat : Category) =
async { async {
// Remove the category from its parent // Remove the category from its parent
match cat.ParentId with match cat.ParentId with
| Some parentId -> match tryFindCategory conn cat.WebLogId parentId with | Some parentId ->
| Some parent -> parent.Children match tryFindCategory conn cat.WebLogId parentId with
|> List.filter (fun childId -> childId <> cat.Id) | Some parent -> parent.Children
|> updateChildren conn cat.WebLogId parentId |> List.filter (fun childId -> childId <> cat.Id)
| _ -> () |> updateChildren conn cat.WebLogId parentId
| _ -> ()
| _ -> () | _ -> ()
// Move this category's children to its parent // Move this category's children to its parent
let newParent = { CategoryParentUpdateRecord.ParentId = cat.ParentId }
cat.Children cat.Children
|> List.map (fun childId -> |> List.map (fun childId ->
async { match tryFindCategory conn cat.WebLogId childId with
do! (category cat.WebLogId childId) | Some _ ->
.Update(newParent) async {
.RunResultAsync conn do! r.Table(Table.Category)
}) .Get(childId)
|> List.iter Async.RunSynchronously .Update(dict [ "ParentId", cat.ParentId ])
.RunResultAsync conn
}
|> Some
| _ -> None)
|> List.filter Option.isSome
|> List.map Option.get
|> List.iter Async.RunSynchronously
// Remove the category from posts where it is assigned // Remove the category from posts where it is assigned
let! posts = let! posts =
r.Table(Table.Post) r.Table(Table.Post)
@ -105,13 +115,9 @@ let deleteCategory conn (cat : Category) =
posts posts
|> List.map (fun post -> |> List.map (fun post ->
async { async {
let newCats =
{ PostCategoriesUpdateRecord.CategoryIds = post.CategoryIds
|> List.filter (fun c -> c <> cat.Id)
}
do! r.Table(Table.Post) do! r.Table(Table.Post)
.Get(post.Id) .Get(post.Id)
.Update(newCats) .Update(dict [ "CategoryIds", post.CategoryIds |> List.filter (fun c -> c <> cat.Id) ])
.RunResultAsync conn .RunResultAsync conn
}) })
|> List.iter Async.RunSynchronously |> List.iter Async.RunSynchronously

2
src/MyWebLog.Data.RethinkDB/Page.fs
View File

@ -62,6 +62,7 @@ type PageUpdateRecord =
Permalink : string Permalink : string
PublishedOn : int64 PublishedOn : int64
UpdatedOn : int64 UpdatedOn : int64
ShowInPageList : bool
Text : string Text : string
Revisions : Revision list } Revisions : Revision list }
/// Update a page /// Update a page
@ -75,6 +76,7 @@ let updatePage conn (page : Page) =
Permalink = page.Permalink Permalink = page.Permalink
PublishedOn = page.PublishedOn PublishedOn = page.PublishedOn
UpdatedOn = page.UpdatedOn UpdatedOn = page.UpdatedOn
ShowInPageList = page.ShowInPageList
Text = page.Text Text = page.Text
Revisions = page.Revisions }) Revisions = page.Revisions })
.RunResultAsync conn .RunResultAsync conn

4
src/MyWebLog.Data.RethinkDB/Post.fs
View File

@ -85,10 +85,12 @@ let tryFindOlderTaggedPost conn (tag : string) post =
let findPageOfAllPosts conn (webLogId : string) pageNbr nbrPerPage = let findPageOfAllPosts conn (webLogId : string) pageNbr nbrPerPage =
// FIXME: sort unpublished posts by their last updated date // FIXME: sort unpublished posts by their last updated date
async { async {
// .orderBy(r.desc(r.branch(r.row("Status").eq("Published"), r.row("PublishedOn"), r.row("UpdatedOn"))))
return! return!
r.Table(Table.Post) r.Table(Table.Post)
.GetAll(webLogId).OptArg("index", "WebLogId") .GetAll(webLogId).OptArg("index", "WebLogId")
.OrderBy(r.Desc "PublishedOn") .OrderBy(r.Desc (ReqlFunction1 (fun p ->
upcast r.Branch (p.["Status"].Eq("Published"), p.["PublishedOn"], p.["UpdatedOn"]))))
.Slice((pageNbr - 1) * nbrPerPage, pageNbr * nbrPerPage) .Slice((pageNbr - 1) * nbrPerPage, pageNbr * nbrPerPage)
.RunResultAsync<Post list> conn .RunResultAsync<Post list> conn
} }

5
src/MyWebLog.Resources/en-US.json
View File

@ -8,6 +8,9 @@
"AndPublished": " and Published", "AndPublished": " and Published",
"andXMore": "and {0} more...", "andXMore": "and {0} more...",
"at": "at", "at": "at",
"BackToCategoryList": "Back to Category List",
"BackToPageList": "Back to Page List",
"BackToPostList": "Back to Post List",
"Categories": "Categories", "Categories": "Categories",
"Category": "Category", "Category": "Category",
"CategoryDeleteWarning": "Are you sure you wish to delete the category", "CategoryDeleteWarning": "Are you sure you wish to delete the category",
@ -36,7 +39,7 @@
"MsgLogOffSuccess": "Log off successful | Have a nice day!", "MsgLogOffSuccess": "Log off successful | Have a nice day!",
"MsgLogOnSuccess": "Log on successful | Welcome to myWebLog!", "MsgLogOnSuccess": "Log on successful | Welcome to myWebLog!",
"MsgPageDeleted": "Deleted page successfully", "MsgPageDeleted": "Deleted page successfully",
"MsgPageEditSuccess": "{0} edited successfully", "MsgPageEditSuccess": "{0} page successfully",
"MsgPostEditSuccess": "{0}{1} post successfully", "MsgPostEditSuccess": "{0}{1} post successfully",
"Name": "Name", "Name": "Name",
"NewerPosts": "Newer Posts", "NewerPosts": "Newer Posts",

3
src/myWebLog/views/admin/category/edit.html
View File

@ -5,6 +5,9 @@
@AntiForgeryToken @AntiForgeryToken
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<a href="/categories" class="btn btn-default">
<i class="fa fa-list-ul"></i> @Translate.BackToCategoryList
</a>
<div class="form-group"> <div class="form-group">
<label class="control-label" for="Name">@Translate.Name</label> <label class="control-label" for="Name">@Translate.Name</label>
<input type="text" class="form-control" id="Name" name="Name" value="@Model.Form.Name" /> <input type="text" class="form-control" id="Name" name="Name" value="@Model.Form.Name" />

10
src/myWebLog/views/admin/page/edit.html
View File

@ -5,6 +5,9 @@
@AntiForgeryToken @AntiForgeryToken
<div class="row"> <div class="row">
<div class="col-sm-9"> <div class="col-sm-9">
<a href="/pages" class="btn btn-default">
<i class="fa fa-list-ul"></i> @Translate.BackToPageList
</a>
<div class="form-group"> <div class="form-group">
<label class="control-label" for="Title">@Translate.Title</label> <label class="control-label" for="Title">@Translate.Title</label>
<input type="text" name="Title" id="Title" class="form-control" value="@Model.Form.Title" /> <input type="text" name="Title" id="Title" class="form-control" value="@Model.Form.Title" />
@ -12,10 +15,11 @@
<div class="form-group"> <div class="form-group">
<label class="control-label" for="Permalink">@Translate.Permalink</label> <label class="control-label" for="Permalink">@Translate.Permalink</label>
<input type="text" name="Permalink" id="Permalink" class="form-control" value="@Model.Form.Permalink" /> <input type="text" name="Permalink" id="Permalink" class="form-control" value="@Model.Form.Permalink" />
<p class="form-hint"><em>@Translate.startingWith</em> http://@Model.WebLog.UrlBase/ </p> <p class="form-hint"><em>@Translate.startingWith</em> //@Model.WebLog.UrlBase/</p>
</div> </div>
<!-- // TODO: Markdown / HTML choice --> <!-- // TODO: Markdown / HTML choice -->
<div class="form-group"> <input type="hidden" name="Source" value="html" />
<div class="form-group">
<textarea name="Text" id="Text" rows="15" class="form-control">@Model.Form.Text</textarea> <textarea name="Text" id="Text" rows="15" class="form-control">@Model.Form.Text</textarea>
</div> </div>
</div> </div>
@ -34,7 +38,7 @@
</div> </div>
@EndIf @EndIf
<div class="form-group"> <div class="form-group">
<input type="checkbox" name="ShowInPageList" id="ShowInPageList" @Model.PageListChecked /> <input type="checkbox" name="ShowInPageList" id="ShowInPageList" value="true" @Model.PageListChecked />
&nbsp; <label for="ShowInPageList">@Translate.ShowInPageList</label> &nbsp; <label for="ShowInPageList">@Translate.ShowInPageList</label>
</div> </div>
</div> </div>

11
src/myWebLog/views/admin/post/edit.html
View File

@ -5,6 +5,9 @@
@AntiForgeryToken @AntiForgeryToken
<div class="row"> <div class="row">
<div class="col-sm-9"> <div class="col-sm-9">
<a href="/posts/list" class="btn btn-default">
<i class="fa fa-list-ul"></i> @Translate.BackToPostList
</a>
<div class="form-group"> <div class="form-group">
<label class="control-label" for="Title">@Translate.Title</label> <label class="control-label" for="Title">@Translate.Title</label>
<input type="text" name="Title" id="Title" class="form-control" value="@Model.Form.Title" /> <input type="text" name="Title" id="Title" class="form-control" value="@Model.Form.Title" />
@ -12,10 +15,10 @@
<div class="form-group"> <div class="form-group">
<label class="control-label" for="Permalink">@Translate.Permalink</label> <label class="control-label" for="Permalink">@Translate.Permalink</label>
<input type="text" name="Permalink" id="Permalink" class="form-control" value="@Model.Form.Permalink" /> <input type="text" name="Permalink" id="Permalink" class="form-control" value="@Model.Form.Permalink" />
<!-- // FIXME: hard-coded "http" --> <p class="form-hint"><em>@Translate.startingWith</em> //@Model.WebLog.UrlBase/ </p>
<p class="form-hint"><em>@Translate.startingWith</em> http://@Model.WebLog.UrlBase/ </p>
</div> </div>
<!-- // TODO: Markdown / HTML choice --> <!-- // TODO: Markdown / HTML choice -->
<input type="hidden" name="Source" value="html" />
<div class="form-group"> <div class="form-group">
<textarea name="Text" id="Text" rows="15">@Model.Form.Text</textarea> <textarea name="Text" id="Text" rows="15">@Model.Form.Text</textarea>
</div> </div>
@ -49,7 +52,7 @@
<div class="panel-body" style="max-height:350px;overflow:scroll;"> <div class="panel-body" style="max-height:350px;overflow:scroll;">
@Each.Categories @Each.Categories
@Current.Indent @Current.Indent
<input type="checkbox" id="Category-@Current.Id" name="Category" value="@Current.Id" @Current.CheckedAttr /> <input type="checkbox" id="Category-@Current.Id" name="Categories" value="@Current.Id" @Current.CheckedAttr />
&nbsp; &nbsp;
<label for="Category-@Current.Id" title="@Current.Description">@Current.Name</label> <label for="Category-@Current.Id" title="@Current.Description">@Current.Name</label>
<br/> <br/>
@ -62,7 +65,7 @@
@EndIf @EndIf
@IfNot.IsPublished @IfNot.IsPublished
<div> <div>
<input type="checkbox" name="PublishNow" id="PublishNow" value="true" checked="checked" /> <input type="checkbox" name="PublishNow" id="PublishNow" value="true" @Model.PublishNowCheckedAttr />
&nbsp; <label for="PublishNow">@Translate.PublishThisPost</label> &nbsp; <label for="PublishNow">@Translate.PublishThisPost</label>
</div> </div>
@EndIf @EndIf