web: add link to original message.

This commit is contained in:
Bill Thiede 2021-11-04 19:32:42 -07:00
parent db0e7c2005
commit 10c766b6f7

View File

@ -7,7 +7,7 @@ use log::{error, info, Level};
use seed::{prelude::*, *};
use serde::Deserialize;
use notmuch::{Message, SearchSummary, ThreadSet};
use notmuch::{Message, SearchSummary, ThreadNode, ThreadSet};
// ------ ------
// Init
@ -84,7 +84,7 @@ fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
}
async fn search_request(query: &str) -> fetch::Result<SearchSummary> {
Request::new(get_search_request_url(query))
Request::new(api::search(query))
.method(Method::Get)
.fetch()
.await?
@ -93,12 +93,21 @@ async fn search_request(query: &str) -> fetch::Result<SearchSummary> {
.await
}
fn get_search_request_url(query: &str) -> String {
format!("http://nixos-07:9345/search/{}", query)
mod api {
const BASE_URL: &str = "http://nixos-07:9345";
pub fn search(query: &str) -> String {
format!("{}/search/{}", BASE_URL, query)
}
pub fn show(query: &str) -> String {
format!("{}/show/{}", BASE_URL, query)
}
pub fn original(message_id: &str) -> String {
format!("{}/original/{}", BASE_URL, message_id)
}
}
async fn show_request(query: &str) -> fetch::Result<ThreadSet> {
Request::new(get_show_request_url(query))
Request::new(api::show(query))
.method(Method::Get)
.fetch()
.await?
@ -107,51 +116,41 @@ async fn show_request(query: &str) -> fetch::Result<ThreadSet> {
.await
}
fn get_show_request_url(query: &str) -> String {
format!("http://nixos-07:9345/show/{}", query)
}
// ------ ------
// View
// ------ ------
fn view_message(msg: Option<&Message>) -> Node<Msg> {
fn view_message(thread: &ThreadNode) -> Node<Msg> {
let msg = thread.0.as_ref();
if let Some(msg) = msg {
div![
dl![
dt!["Subject"],
dd![&msg.headers.subject],
dt!["From"],
dd![&msg.headers.from],
dt!["To"],
dd![&msg.headers.to],
dt!["CC"],
dd![&msg.headers.cc],
dt!["BCC"],
dd![&msg.headers.bcc],
dt!["Reply-To"],
dd![&msg.headers.reply_to],
dt!["Date"],
dd![&msg.headers.date],
a![attrs! {At::Href=>api::original(&msg.id)}, "Original"],
table![
tr![th!["Subject"], td![&msg.headers.subject],],
tr![th!["From"], td![&msg.headers.from],],
tr![th!["To"], td![&msg.headers.to],],
tr![th!["CC"], td![&msg.headers.cc],],
tr![th!["BCC"], td![&msg.headers.bcc],],
tr![th!["Reply-To"], td![&msg.headers.reply_to],],
tr![th!["Date"], td![&msg.headers.date],],
],
dl![
dt!["MessageId"],
dd![&msg.id],
dt!["Match"],
dd![if msg.r#match { "true" } else { "false" }],
dt!["Excluded"],
dd![if msg.excluded { "true" } else { "false" }],
dt!["Filename"],
dd![&msg.filename],
dt!["Timestamp"],
dd![msg.timestamp.to_string()],
dt!["Date"],
dd![&msg.date_relative],
dt!["Tags"],
dd![format!("{:?}", msg.tags)],
table![
tr![th!["MessageId"], td![&msg.id],],
tr![
th!["Match"],
td![if msg.r#match { "true" } else { "false" }],
],
tr![
th!["Excluded"],
td![if msg.excluded { "true" } else { "false" }],
],
tr![th!["Filename"], td![&msg.filename],],
tr![th!["Timestamp"], td![msg.timestamp.to_string()],],
tr![th!["Date"], td![&msg.date_relative],],
tr![th!["Tags"], td![format!("{:?}", msg.tags)],],
],
// msg.body.iter().map(|part| pre![part])
pre![format!("{:#?}", msg.body)]
pre![format!("{:#?}", thread)]
]
} else {
div![h2!["No message"]]
@ -173,7 +172,7 @@ fn view(model: &Model) -> Node<Msg> {
.enumerate()
.map(|(thread_node_idx, thread_node)| div![
h3![format!("thread node {}", thread_node_idx)],
view_message(thread_node.0.as_ref())
view_message(thread_node)
])
])]
} else if let Some(search_results) = &model.search_results {