wathiede/letterbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Releases Wiki Activity

web: rename view_thread to take advantage of new namespaces

Browse Source
This commit is contained in:
Bill Thiede 2023-12-03 08:49:20 -08:00
parent 071fe2e206
commit be8fd59703
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/state.rs
View File

@ -302,7 +302,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
model.context = Context::ThreadResult(data.thread);
}
Msg::ShowThreadResult(bad) => {
error!("show_thread_query error: {bad:?}");
error!("show_thread_query error: {}", bad);
}
}
}

4
web/src/view/desktop.rs
View File

@ -5,7 +5,7 @@ use seed_hooks::{state_access::CloneState, topo, use_state};
use crate::{
api::urls,
state::{Context, Model, Msg, Tag},
view::{legacy, view_header, view_search_results, view_thread},
view::{self, legacy, view_header, view_search_results},
};
#[topo::nested]
@ -14,7 +14,7 @@ pub(super) fn view(model: &Model) -> Node<Msg> {
let content = match &model.context {
Context::None => div![h1!["Loading"]],
Context::Thread(thread_set) => legacy::thread(thread_set),
Context::ThreadResult(thread) => view_thread(thread),
Context::ThreadResult(thread) => view::thread(thread),
Context::Search(search_results) => legacy::search_results(&model.query, search_results),
Context::SearchResult {
query,

6
web/src/view/mobile.rs
View File

@ -5,8 +5,8 @@ use crate::{
graphql::front_page_query::*,
state::{Context, Model, Msg},
view::{
human_age, legacy, pretty_authors, set_title, tags_chiclet, view_header, view_search_pager,
view_thread,
self, human_age, legacy, pretty_authors, set_title, tags_chiclet, view_header,
view_search_pager,
},
};
@ -14,7 +14,7 @@ pub(super) fn view(model: &Model) -> Node<Msg> {
let content = match &model.context {
Context::None => div![h1!["Loading"]],
Context::Thread(thread_set) => legacy::thread(thread_set),
Context::ThreadResult(thread) => view_thread(thread),
Context::ThreadResult(thread) => view::thread(thread),
Context::Search(search_results) => {
legacy::mobile_search_results(&model.query, search_results)
}

12
web/src/view/mod.rs
View File

@ -250,14 +250,13 @@ fn view_addresses(addrs: &[impl Email]) -> Vec<Node<Msg>> {
addrs.into_iter().map(view_address).collect::<Vec<_>>()
}
fn view_thread(thread: &ShowThreadQueryThread) -> Node<Msg> {
fn thread(thread: &ShowThreadQueryThread) -> Node<Msg> {
// TODO(wathiede): show per-message subject if it changes significantly from top-level subject
set_title(&thread.subject);
let messages = thread.messages.iter().map(|msg| {
div![
C!["message"],
/* TODO(wathiede): collect all the tags and show them here. */
/* TODO(wathiede): collect all the attachments from all the subparts */
msg.from
.as_ref()
.map(|from| div![C!["header"], "From: ", view_address(&from)]),
@ -289,6 +288,15 @@ fn view_thread(thread: &ShowThreadQueryThread) -> Node<Msg> {
) => div![
C!["view-part-text-html"],
raw![contents],
IF!(!msg.attachments.is_empty() =>
div![
C!["attachments"],
br![],
h2!["Attachments"],
msg.attachments
.iter()
.map(|a| div!["Filename: ", &a.filename, " ", &a.content_type])
]),
pre![content_tree]
],
}

4
web/src/view/tablet.rs
View File

@ -2,7 +2,7 @@ use seed::{prelude::*, *};
use crate::{
state::{Context, Model, Msg},
view::{view_header, view_search_results, view_thread},
view::{self, view_header, view_search_results},
};
pub(super) fn view(model: &Model) -> Node<Msg> {
@ -10,7 +10,7 @@ pub(super) fn view(model: &Model) -> Node<Msg> {
let content = match &model.context {
Context::None => div![h1!["Loading"]],
Context::Thread(_) => unimplemented!("tablet legacy thread view"),
Context::ThreadResult(thread) => view_thread(thread),
Context::ThreadResult(thread) => view::thread(thread),
Context::Search(_) => unimplemented!("tablet legacy search results view"),
Context::SearchResult {
query,