Move to "show pretty" currently a dupe of 'show'.

Cargo.lock

@@ -982,6 +982,7 @@ dependencies = [
  "serde",
  "serde_json",
  "wasm-bindgen-test",
+ "wasm-timer",
 ]
 
 [[package]]
@@ -1242,6 +1243,17 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -1249,7 +1261,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
- "parking_lot_core",
+ "parking_lot_core 0.9.4",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if 1.0.0",
+ "instant",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1572,7 +1598,7 @@ dependencies = [
  "memchr",
  "multer",
  "num_cpus",
- "parking_lot",
+ "parking_lot 0.12.1",
  "pin-project-lite",
  "rand",
  "ref-cast",
@@ -2443,6 +2469,21 @@ dependencies = [
  "quote 1.0.21",
 ]
 
+[[package]]
+name = "wasm-timer"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
+dependencies = [
+ "futures",
+ "js-sys",
+ "parking_lot 0.11.2",
+ "pin-utils",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.60"

server/src/main.rs

@@ -32,6 +32,15 @@ async fn search(
     Ok(Json(res))
 }
 
+#[get("/show/<query>/pretty")]
+async fn show_pretty(
+    nm: &State<Notmuch>,
+    query: &str,
+) -> Result<Json<ThreadSet>, Debug<NotmuchError>> {
+    let res = nm.show(query)?;
+    Ok(Json(res))
+}
+
 #[get("/show/<query>")]
 async fn show(nm: &State<Notmuch>, query: &str) -> Result<Json<ThreadSet>, Debug<NotmuchError>> {
     let res = nm.show(query)?;
@@ -110,7 +119,15 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let _ = rocket::build()
         .mount(
             "/",
-            routes![original_part, original, hello, search_all, search, show],
+            routes![
+                original_part,
+                original,
+                hello,
+                search_all,
+                search,
+                show_pretty,
+                show
+            ],
         )
         .attach(cors)
         .manage(Notmuch::default())

web/Cargo.toml

@@ -24,6 +24,7 @@ serde = { version = "1.0.147", features = ["derive"] }
 notmuch = {path = "../notmuch"}
 itertools = "0.10.5"
 serde_json = { version = "1.0.93", features = ["unbounded_depth"] }
+wasm-timer = "0.2.5"
 
 [package.metadata.wasm-pack.profile.release]
 wasm-opt = ['-Os']

web/index.html

@@ -14,7 +14,6 @@
 }
 .body {
   padding-bottom: 1em;
-  border: 1px red solid;
 }
 .error {
   background-color: red;
@@ -34,6 +33,18 @@ iframe {
 .index .date {
   white-space: nowrap;
 }
+.footer {
+  background-color: #eee;
+  position: fixed; 
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 3em;
+  padding: 1em;
+}
+.tag {
+  margin-right: 2px;
+}
 </style>
 </head>
 

web/src/lib.rs

@@ -2,12 +2,17 @@
 //  - it's useful when you want to check your code with `cargo make verify`
 // but some rules are too "annoying" or are not applicable for your case.)
 #![allow(clippy::wildcard_imports)]
+use std::{
+    collections::hash_map::DefaultHasher,
+    hash::{Hash, Hasher},
+};
 
 use itertools::Itertools;
 use log::{debug, error, info, warn, Level};
 use notmuch::{Content, Part, SearchSummary, Thread, ThreadNode, ThreadSet};
 use seed::{prelude::*, *};
 use serde::de::Deserialize;
+use wasm_timer::Instant;
 
 // ------ ------
 //     Init
@@ -24,7 +29,7 @@ fn init(url: Url, orders: &mut impl Orders<Msg>) -> Model {
     match hpp {
         Some("t") => {
             let tid = url.next_hash_path_part().unwrap_or("").to_string();
-            orders.send_msg(Msg::ShowRequest(tid));
+            orders.send_msg(Msg::ShowPrettyRequest(tid));
         }
         Some("s") => {
             query = url.next_hash_path_part().unwrap_or("").to_string();
@@ -73,6 +78,8 @@ enum Msg {
     SearchResult(fetch::Result<SearchSummary>),
     ShowRequest(String),
     ShowResult(fetch::Result<ThreadSet>),
+    ShowPrettyRequest(String),
+    ShowPrettyResult(fetch::Result<ThreadSet>),
 }
 
 // `update` describes how to handle each `Msg`.
@@ -110,6 +117,21 @@ fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
         Msg::ShowResult(Err(fetch_error)) => {
             error!("fetch failed {:?}", fetch_error);
         }
+
+        Msg::ShowPrettyRequest(tid) => {
+            let url = Url::new().set_hash_path(["t", &tid]);
+            orders.request_url(url);
+            orders
+                .skip()
+                .perform_cmd(async move { Msg::ShowPrettyResult(show_pretty_request(&tid).await) });
+        }
+        Msg::ShowPrettyResult(Ok(response_data)) => {
+            debug!("fetch ok {:#?}", response_data);
+            model.context = Context::Thread(response_data);
+        }
+        Msg::ShowPrettyResult(Err(fetch_error)) => {
+            error!("fetch failed {:?}", fetch_error);
+        }
     }
 }
 
@@ -131,6 +153,9 @@ mod api {
     pub fn show(tid: &str) -> String {
         format!("{}/show/{}", BASE_URL, tid)
     }
+    pub fn show_pretty(tid: &str) -> String {
+        format!("{}/show/{}/pretty", BASE_URL, tid)
+    }
     pub fn original(message_id: &str) -> String {
         format!("{}/original/{}", BASE_URL, message_id)
     }
@@ -150,6 +175,16 @@ async fn show_request(tid: &str) -> fetch::Result<ThreadSet> {
         .map_err(|_| FetchError::JsonError(fetch::JsonError::Serde(JsValue::NULL)))?)
 }
 
+async fn show_pretty_request(tid: &str) -> fetch::Result<ThreadSet> {
+    Request::new(api::show_pretty(tid))
+        .method(Method::Get)
+        .fetch()
+        .await?
+        .check_status()?
+        .json()
+        .await
+}
+
 // ------ ------
 //     View
 // ------ ------
@@ -273,30 +308,32 @@ fn set_title(title: &str) {
 }
 
 fn tags_chiclet(tags: &[String]) -> impl Iterator<Item = Node<Msg>> + '_ {
-    tags.iter().map(|tag| match tag.as_str() {
-        "attachment" => span![C!["tag"], "📎"],
-        "replied" => span![C!["tag"], i![C!["fa-solid", "fa-reply"]]],
-        _ => span![C!["tag"], tag],
+    tags.iter().map(|tag| {
+        let mut hasher = DefaultHasher::new();
+        tag.hash(&mut hasher);
+        let hex = format!("#{:06x}", hasher.finish() % (1 << 24));
+        let style = style! {St::BackgroundColor=>hex};
+        match tag.as_str() {
+            "attachment" => span![C!["tag"], style, "📎"],
+            "replied" => span![C!["tag"], style, i![C!["fa-solid", "fa-reply"]]],
+            _ => span![C!["tag"], style, tag],
+        }
     })
 }
 
 fn pretty_authors(authors: &str) -> impl Iterator<Item = Node<Msg>> + '_ {
+    let one_person = authors.matches(',').count() == 0;
     let authors = authors.split(',');
 
-    /*
-    if authors.len() == 1 {
-        return authors.iter().filter_map(|author| {
-            Some(span![
+    Itertools::intersperse(
+        authors.filter_map(move |author| {
+            if one_person {
+                return Some(span![
                     attrs! {
                     At::Title => author.trim()},
                     author
-            ])
-        });
+                ]);
             }
-    */
-
-    authors
-        .filter_map(|author| {
             author.split_whitespace().nth(0).map(|first| {
                 span![
                     attrs! {
@@ -304,8 +341,9 @@ fn pretty_authors(authors: &str) -> impl Iterator<Item = Node<Msg>> + '_ {
                     first
                 ]
             })
-        })
-        .intersperse(span![", "])
+        }),
+        span![", "],
+    )
 }
 
 fn view_search_results(query: &str, search_results: &SearchSummary) -> Node<Msg> {
@@ -324,7 +362,7 @@ fn view_search_results(query: &str, search_results: &SearchSummary) -> Node<Msg>
             ],
             td![C!["subject"], tags_chiclet(&r.tags), " ", &r.subject],
             td![C!["date"], &r.date_relative],
-            ev(Ev::Click, move |_| Msg::ShowRequest(tid)),
+            ev(Ev::Click, move |_| Msg::ShowPrettyRequest(tid)),
         ]
     });
     div![table![
@@ -398,8 +436,6 @@ fn view_header(query: &str) -> Node<Msg> {
     nav![
         C!["navbar"],
         attrs! {At::Role=>"navigation"},
-        div![
-            C!["navbar-menu"],
         div![
             C!["navbar-start"],
             a![
@@ -429,22 +465,35 @@ fn view_header(query: &str) -> Node<Msg> {
             ]
         ]
     ]
+}
+
+fn view_footer(render_time_ms: u128) -> Node<Msg> {
+    footer![
+        C!["footer"],
+        div![
+            C!["content", "has-text-right", "is-size-7"],
+            format!("Render time {} ms", render_time_ms)
+        ]
     ]
 }
 
 // `view` describes what to display.
 fn view(model: &Model) -> Node<Msg> {
+    let start = Instant::now();
     info!("view called");
     let content = match &model.context {
         Context::None => div![h1!["Loading"]],
         Context::Thread(thread_set) => view_thread(thread_set),
         Context::Search(search_results) => view_search_results(&model.query, search_results),
     };
-    div![section![
-        C!["section"],
+    div![
         view_header(&model.query),
-        div![C!["container"], content]
-    ]]
+        section![
+            C!["section"],
+            div![C!["container"], content],
+            view_footer(start.elapsed().as_millis())
+        ]
+    ]
 }
 
 // ------ ------