web: add UI to remove tags when viewing messages

This commit is contained in:
Bill Thiede 2024-04-06 09:38:00 -07:00
parent dc7b3dd3e8
commit d4038f40d6
7 changed files with 70 additions and 2 deletions

6
Cargo.lock generated
View File

@ -1440,6 +1440,11 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
[[package]]
name = "human_format"
version = "1.0.2"
source = "git+https://github.com/wathiede/human-format-rs#c5f59f0b0e4d92e649d415a8509bc46e92413356"
[[package]] [[package]]
name = "hyper" name = "hyper"
version = "0.10.16" version = "0.10.16"
@ -1727,6 +1732,7 @@ dependencies = [
"console_log", "console_log",
"gloo-net", "gloo-net",
"graphql_client", "graphql_client",
"human_format",
"itertools", "itertools",
"log 0.4.20", "log 0.4.20",
"notmuch", "notmuch",

View File

@ -222,6 +222,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
if let Err(e) = res { if let Err(e) = res {
error!("Failed to remove tag {tag} to {query}: {e}"); error!("Failed to remove tag {tag} to {query}: {e}");
} }
// TODO: reconsider this behavior
seed::window() seed::window()
.location() .location()
.set_href(&search_url) .set_href(&search_url)

View File

@ -9,6 +9,7 @@ use crate::{
#[topo::nested] #[topo::nested]
pub(super) fn view(model: &Model) -> Node<Msg> { pub(super) fn view(model: &Model) -> Node<Msg> {
log::info!("tablet::view");
let show_icon_text = true; let show_icon_text = true;
// Do two queries, one without `unread` so it loads fast, then a second with unread. // Do two queries, one without `unread` so it loads fast, then a second with unread.
let content = match &model.context { let content = match &model.context {

View File

@ -10,6 +10,7 @@ use crate::{
}; };
pub(super) fn view(model: &Model) -> Node<Msg> { pub(super) fn view(model: &Model) -> Node<Msg> {
log::info!("tablet::view");
let show_icon_text = false; let show_icon_text = false;
let content = match &model.context { let content = match &model.context {
Context::None => div![h1!["Loading"]], Context::None => div![h1!["Loading"]],

View File

@ -61,6 +61,59 @@ fn tags_chiclet(tags: &[String], is_mobile: bool) -> impl Iterator<Item = Node<M
}) })
} }
fn removable_tags_chiclet<'a>(
thread_id: &'a str,
tags: &'a [String],
is_mobile: bool,
) -> Node<Msg> {
div![
C![
"message-tags",
"field",
"is-grouped",
"is-grouped-multiline"
],
tags.iter().map(move |tag| {
let hex = compute_color(tag);
let style = style! {St::BackgroundColor=>hex};
let classes = C!["tag", IF!(is_mobile => "is-small")];
let attrs = attrs! {
At::Href => urls::search(&format!("tag:{tag}"), 0)
};
let tag = tag.clone();
let rm_tag = tag.clone();
let thread_id = format!("thread:{thread_id}");
div![
C!["control"],
div![
C!["tags", "has-addons"],
a![
classes,
attrs,
style,
match tag.as_str() {
"attachment" => span!["📎"],
"replied" => span![i![C!["fa-solid", "fa-reply"]]],
_ => span![&tag],
},
ev(Ev::Click, move |_| Msg::FrontPageRequest {
query: format!("tag:{tag}"),
after: None,
before: None,
first: None,
last: None,
})
],
a![
C!["tag", "is-delete"],
ev(Ev::Click, move |_| Msg::RemoveTag(thread_id, rm_tag))
]
]
]
})
]
}
fn pretty_authors(authors: &str) -> impl Iterator<Item = Node<Msg>> + '_ { fn pretty_authors(authors: &str) -> impl Iterator<Item = Node<Msg>> + '_ {
let one_person = authors.matches(',').count() == 0; let one_person = authors.matches(',').count() == 0;
let authors = authors.split(','); let authors = authors.split(',');
@ -748,7 +801,10 @@ fn thread(
div![ div![
C!["thread"], C!["thread"],
h3![C!["is-size-5"], subject], h3![C!["is-size-5"], subject],
span![C!["tags"], tags_chiclet(&tags, false)], span![
C!["tags"],
removable_tags_chiclet(&thread.thread_id, &tags, false)
],
div![ div![
C!["level", "is-mobile"], C!["level", "is-mobile"],
div![ div![

View File

@ -6,6 +6,7 @@ use crate::{
}; };
pub(super) fn view(model: &Model) -> Node<Msg> { pub(super) fn view(model: &Model) -> Node<Msg> {
log::info!("tablet::view");
let show_icon_text = false; let show_icon_text = false;
// Do two queries, one without `unread` so it loads fast, then a second with unread. // Do two queries, one without `unread` so it loads fast, then a second with unread.
let content = match &model.context { let content = match &model.context {

View File

@ -155,12 +155,14 @@ input::placeholder,
padding: 1em; padding: 1em;
} }
.tablet .thread h3,
.mobile .thread h3 { .mobile .thread h3 {
overflow-wrap: break-word; overflow-wrap: break-word;
padding: 1em 1em 0; padding: 1em 1em 0;
} }
.mobile .thread .tags { .tablet .thread .message-tags,
.mobile .thread .message-tags {
padding: 0 1em; padding: 0 1em;
} }