You are a constitutional council ranking individual git commits for ownership allocation. Compare these two commits. Decide which contributed more lasting value to the project. Judge substance, not spectacle: - Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise. - Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one. - Do not favor a side merely because its patch is longer or noisier. - Weight what the change does for the project, not the contributor's name. Return ONLY a JSON object: {"winner": "A" or "B", "ratio": "N:M", "explanation": "..."} The explanation must cite concrete differences in the patches (1-3 sentences). Side A — contributor: tommy-mor Side A — commit message: [8f6be6d0] Add copy button for garden rankings (markdown clipboard) (#168) * Add garden ranking markdown copy button via POST /ui Introduce HtmlUiAction::CopyGardenRank that rebuilds the visible child ranking and returns JsBuilder clipboard JS (fetch → eval), matching CopyThread. Place a copy control on garden ranking headings; clipboard text is a concise markdown numbered list with unranked bullets. Co-authored-by: tommy * Fix paren balance in garden ranking copy browser test Co-authored-by: tommy --------- Co-authored-by: Cursor Agent Side A — unified diff (full patch): diff --git a/agents.md b/agents.md index 7d6fea5791f7c95677e17e8975a14df83f998fd6..1dc989e4b23071f2eef69f2479c9a1ca2bd04b32 100644 --- a/agents.md +++ b/agents.md @@ -40,6 +40,8 @@ Strict **CSP** that blocks `eval` would break the current app. Other projects ma - **Non-morph `POST /ui` responses:** **`SetGardenPin`** returns **`303 See Other`** and **`Set-Cookie`** (same as **`POST /theme`**). Garden pin/unpin is a normal **`
`** — browser navigation applies cookies reliably (see **`test/browser_garden_pin.clj`**). Each **`__rpc__`** payload includes **`form_action: "/ui"`**; **`post_ui_html`** rejects mismatches to bind tokens to the UI endpoint. +- **`CopyGardenRank`:** Browser copy control on garden ranking headings. Returns **`text/javascript`** via **`JsBuilder::clipboard_write_text_and_label_btn`** (same **`fetch` → `eval`** loop as **`CopyThread`**). Payload includes **`room`**, **`parent_path`**, **`depth`**, **`copy_btn_id`**, and optional **`external_hosts`** (for **`/-/`** host-root indexes). Clipboard text is a concise markdown numbered list of display paths (plus unranked bullets). + - **`VoteComparePost`:** On success returns **`text/javascript`** that **morphs** **`#vote-edge-history-region`** (recomputed **`
    `** — ratios match **`left`/`right`** query order, bullets, sorted by strength toward **`left`** then newer) and **`.vote-compare-nav`** (fresh next-pair link). The compare **`GET`** page uses **`layout_full_bleed_chromeless`** (no breadcrumbs, no **`#controls`**, no **`slug-pin-hud`**; **`view-vote-compare-fullscreen`** full-width **`body`**). **`__rpc__`** carries **`form_action: "/ui"`**; **`thread_tag`** and ratio fields come from the same form as **`$form`** holes. **Guests** on a shared pair see the compose UI with **`post vote`** as a link to **`/login?next=`** (class **`vote-compare-login-cta`**); after OAuth / username selection they return to that matchup. An unauthenticated **`VoteComparePost`** (forged/stale form) still JS-redirects to the same **`/login?next=`** target. - **`ThreadGraduate` / `GraduateThread`:** Private-room forum threads with **Manage** can be published to the public site under the same tag. The writer replays non-redacted ingests into **`room: public`** (chronological order), then appends a durable **`ThreadGraduated`** marker. Graduated private threads show a banner linking to public **`/t/:tag`**, block further private posts, and cannot be graduated twice. CLI: **`npx slugsocial private forum graduate `**; RPC: **`ThreadGraduate`**. diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs index b4a0c9e87e462050bd52728e49e0d6781bf1cfc8..611956d0a46062b49ce350be176e4be139312ff0 100644 --- a/server/src/api/ui_html.rs +++ b/server/src/api/ui_html.rs @@ -24,9 +24,9 @@ use crate::{ external_resolver_status_markup, fragment_new_thread_slot, login_to_post_hint_markup, parse_html_ui_from_form, room_members_section_markup, thread_feed_html, thread_feed_html_for_room, thread_feed_region_markup, thread_ui_collapse_redacted_post, - thread_ui_copy_thread, - thread_ui_expand_post_full, thread_ui_expand_redacted_post, ui_js_warn, user_can_post_room, - user_can_view_room, HtmlUiAction, JsBuilder, ThreadNav, + garden_ui_copy_rank, thread_ui_copy_thread, thread_ui_expand_post_full, + thread_ui_expand_redacted_post, ui_js_warn, user_can_post_room, user_can_view_room, + HtmlUiAction, JsBuilder, ThreadNav, }, reducer::{scope_from_room_wire, ScopeId}, state::AppState, @@ -575,6 +575,25 @@ async fn dispatch_ui_action( let viewer = session.map(|s| s.username.as_str()); thread_ui_copy_thread(state, &room, &thread_tag, ©_btn_id, viewer).await } + HtmlUiAction::CopyGardenRank { + room, + parent_path, + depth, + copy_btn_id, + external_hosts, + } => { + let viewer = session.map(|s| s.username.as_str()); + garden_ui_copy_rank( + state, + &room, + &parent_path, + depth, + ©_btn_id, + external_hosts, + viewer, + ) + .await + } HtmlUiAction::GraduateThread { room, thread_tag } => { let Some(session) = session else { return js_redirect("/login").into_response(); diff --git a/server/src/html/garden/copy.rs b/server/src/html/garden/copy.rs new file mode 100644 index 0000000000000000000000000000000000000000..271ea87c34c99e23ab1b0d8572632fdc41380b78 --- /dev/null +++ b/server/src/html/garden/copy.rs @@ -0,0 +1,199 @@ +//! Copy garden rankings to the clipboard as concise markdown (POST /ui + JsBuilder eval). + +use crate::form_template::template_json_compact; +use crate::html::forum::ThreadNav; +use crate::html::js_string_literal; +use crate::html::ui_action::HtmlUiAction; +use crate::html::{JsBuilder, ui_js_warn}; +use crate::path_types::ItemId; +use crate::reducer::scope_from_room_wire; +use crate::scope_rank::{ + build_children_rankings, build_rankings_for_item_set, external_root_host_items, + resolve_scope_recursive, ChildrenRankings, +}; +use crate::state::AppState; +use maud::{html, Markup}; + +use super::access::user_can_view_room; +use super::item::item_display_path; +use crate::reducer::{ContentState, ScopeId}; + +const COPY_BTN_ID: &str = "garden-rank-copy"; + +/// `POST /ui` + `__rpc__` from an inline button; response body is `eval`'d (same as forum copy). +fn garden_ui_fetch_onclick(rpc_compact_json: &str) -> String { + format!( + "fetch('/ui',{{method:'POST',headers:{{'Content-Type':'application/x-www-form-urlencoded'}},body:new URLSearchParams({{__rpc__:{}}}).toString(),credentials:'same-origin'}}).then(r=>r.text()).then(eval);return false", + js_string_literal(rpc_compact_json) + ) +} + +/// Concise markdown for ranked child groups (numbered lists + unranked bullets). +pub(crate) fn format_garden_rank_markdown(rankings: &ChildrenRankings) -> String { + let mut out = String::new(); + let multi = rankings.component_rankings.len() > 1; + for (ci, comp) in rankings.component_rankings.iter().enumerate() { + if ci > 0 { + out.push('\n'); + } + if multi { + out.push_str(&format!("### ordering {}\n\n", ci + 1)); + } + for (i, r) in comp.ranked.iter().enumerate() { + out.push_str(&format!( + "{}. {}\n", + i + 1, + item_display_path(r.item.as_str()) + )); + } + } + if !rankings.unranked_items.is_empty() { + if !out.is_empty() { + out.push('\n'); + } + for name in &rankings.unranked_items { + out.push_str(&format!("- {}\n", item_display_path(name.as_str()))); + } + } + out +} + +fn rankings_for_copy( + state_content: &crate::reducer::ContentState, + parent_path: &str, + depth: usize, + external_hosts: bool, +) -> ChildrenRankings { + if external_hosts { + let hosts = external_root_host_items(state_content); + return build_rankings_for_item_set(state_content, &hosts); + } + let parent = ItemId::parse(parent_path.trim()) + .unwrap_or_else(|| ItemId::ontology_root()) + .normalized_storage(); + let depth = depth.clamp(1, 5); + if depth > 1 { + let items = resolve_scope_recursive(state_content, &[parent.as_str().to_string()], depth); + build_rankings_for_item_set(state_content, &items) + } else { + build_children_rankings(state_content, &parent) + } +} + +pub(crate) async fn garden_ui_copy_rank( + state: &AppState, + room: &str, + parent_path: &str, + depth: usize, + copy_btn_id: &str, + external_hosts: bool, + viewer: Option<&str>, +) -> axum::response::Response { + let room = room.trim(); + let scope = scope_from_room_wire(room); + if let ScopeId::Room(ref rid) = scope { + let reduced = state.reduced.read().await; + if !user_can_view_room(&reduced, rid, viewer) { + return ui_js_warn("forbidden"); + } + } + + let reduced = state.reduced.read().await; + let empty = ContentState::default(); + let content = match &scope { + ScopeId::Public => reduced.public(), + ScopeId::Room(_) => reduced.content_for_scope(&scope).unwrap_or(&empty), + }; + let rankings = rankings_for_copy(content, parent_path, depth, external_hosts); + let text = format_garden_rank_markdown(&rankings); + drop(reduced); + + if text.is_empty() { + return ui_js_warn("nothing to copy"); + } + + JsBuilder::new() + .clipboard_write_text_and_label_btn(&text, copy_btn_id, "copied") + .into_response() +} + +pub(super) fn garden_rank_copy_button_markup( + nav: &ThreadNav, + parent_path: &str, + depth: usize, + external_hosts: bool, +) -> Markup { + let rpc = template_json_compact(&HtmlUiAction::CopyGardenRank { + room: nav.room_wire.clone(), + parent_path: parent_path.to_string(), + depth, + copy_btn_id: COPY_BTN_ID.to_string(), + external_hosts, + }) + .expect("CopyGardenRank serializes"); + html! { + button type="button" id=(COPY_BTN_ID) class="post-nav-btn ont-rank-copy-btn" title="Copy ranking as markdown" + onclick=(garden_ui_fetch_onclick(&rpc)) { + "copy" + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::path_types::ItemId; + use crate::ranking::RankedItem; + use crate::scope_rank::ScopedComponent; + + #[test] + fn markdown_single_component_and_unranked() { + let rankings = ChildrenRankings { + component_rankings: vec![ScopedComponent { + pairs: 1, + ranked: vec![ + RankedItem { + item: ItemId::parse("~/a").unwrap(), + score: 0.9, + }, + RankedItem { + item: ItemId::parse("~/b").unwrap(), + score: 0.1, + }, + ], + }], + unranked_items: vec![ItemId::parse("~/c").unwrap()], + }; + assert_eq!( + format_garden_rank_markdown(&rankings), + "1. ~/a\n2. ~/b\n\n- ~/c\n" + ); + } + + #[test] + fn markdown_multi_component_headers() { + let rankings = ChildrenRankings { + component_rankings: vec![ + ScopedComponent { + pairs: 1, + ranked: vec![RankedItem { + item: ItemId::parse("~/a").unwrap(), + score: 1.0, + }], + }, + ScopedComponent { + pairs: 1, + ranked: vec![RankedItem { + item: ItemId::parse("~/b").unwrap(), + score: 1.0, + }], + }, + ], + unranked_items: vec![], + }; + assert_eq!( + format_garden_rank_markdown(&rankings), + "### ordering 1\n\n1. ~/a\n\n### ordering 2\n\n1. ~/b\n" + ); + } +} diff --git a/server/src/html/garden/mod.rs b/server/src/html/garden/mod.rs index ee8696727e5473fe1fa913b8a7b9f3cb9c32d12f..69012a2c1d069e47fa611d63d3bd2a329fd6255d 100644 --- a/server/src/html/garden/mod.rs +++ b/server/src/html/garden/mod.rs @@ -2,6 +2,7 @@ mod access; mod browse; +mod copy; mod external; mod item; mod item_page; @@ -13,6 +14,7 @@ mod vote; #[cfg(test)] mod tests; +pub(crate) use copy::garden_ui_copy_rank; pub(crate) use external::external_resolver_status_markup; pub(crate) use pin::{encode_pin_cookie_value, GARDEN_PIN_COOKIE}; pub(crate) use vote::vote_compare_post_success_js; diff --git a/server/src/html/garden/render.rs b/server/src/html/garden/render.rs index ca546693ecb2bb9ae5fb370f02b860c943f604b9..eed80e807d77e6b4eeeb0c3f38d6372e91ad2852 100644 --- a/server/src/html/garden/render.rs +++ b/server/src/html/garden/render.rs @@ -25,6 +25,7 @@ use crate::{ use super::{ access::content_for_garden_view, browse::{garden_layout_meta, scoped_bc_path_for, GardenBrowsePath}, + copy::garden_rank_copy_button_markup, external::{external_frame_allowed, external_source_href, github_resolver_controls}, item::{child_depth_from_uri, item_code_label, item_display_path, item_href}, item_page::{build_item_page_view_model, sibling_nav_markup}, @@ -196,6 +197,15 @@ pub(super) async fn render_scope_view( " " span class="muted" { (format!("(depth {})", model.child_depth)) } } + @if total_children > 0 { + " " + (garden_rank_copy_button_markup( + &nav, + &item_display_path(&model.item), + model.child_depth, + false, + )) + } @if total_children >= 2 { " " a class="ont-vote-children-btn" href=(vote_pool_href(&nav, &model.item)) { diff --git a/server/src/html/garden/routes.rs b/server/src/html/garden/routes.rs index 8a0499576d9093dbac0fffa1cf2ed88187e14acb..31b61355b1ec75645d405e16ab6abf8205c66380 100644 --- a/server/src/html/garden/routes.rs +++ b/server/src/html/garden/routes.rs @@ -28,6 +28,7 @@ use crate::{ use super::{ access::{content_for_garden_view, room_not_found_page, room_scope_has_garden_content, user_can_view_room}, browse::{GardenBrowsePath, scoped_bc_path_external}, + copy::garden_rank_copy_button_markup, item::{item_display_path, item_href}, render::render_scope_view, }; @@ -52,7 +53,13 @@ pub async fn garden_index( html! { @let root_path = OntologyPath::root(); nav class="breadcrumb" { (bc_path(&root_path)) } - h2 { "paths" } + h2 { + "paths" + @if !(child_rankings.component_rankings.is_empty() && child_rankings.unranked_items.is_empty()) { + " " + (garden_rank_copy_button_markup(&nav, "~/", 1, false)) + } + } @if child_rankings.component_rankings.is_empty() && child_rankings.unranked_items.is_empty() { p class="muted" { "no items yet" } } @else { @@ -137,7 +144,13 @@ pub async fn external_garden_index( "view-ontology view-ontology-light", html! { nav class="breadcrumb" { (bc_path_external(&ext_path)) } - h2 { "external paths" } + h2 { + "external paths" + @if !(child_rankings.component_rankings.is_empty() && child_rankings.unranked_items.is_empty()) { + " " + (garden_rank_copy_button_markup(&nav, "", 1, true)) + } + } p class="muted" { "Items outside slug.social use the " code { "-/" } " prefix followed by the full " code { "https://…" } " URL (legacy " code { "-/host/path" } " still works)." } @if child_rankings.component_rankings.is_empty() && child_rankings.unranked_items.is_empty() { p class="muted" { "no external items indexed yet" } @@ -272,7 +285,13 @@ pub async fn room_external_garden_index( "view-ontology view-ontology-light", html! { nav class="breadcrumb" { (scoped_bc_path_external(&ext_path, &nav)) } - h2 { "external paths" } + h2 { + "external paths" + @if !(child_rankings.component_rankings.is_empty() && child_rankings.unranked_items.is_empty()) { + " " + (garden_rank_copy_button_markup(&nav, "", 1, true)) + } + } @if child_rankings.component_rankings.is_empty() && child_rankings.unranked_items.is_empty() { p class="muted" { "no external items indexed yet" } } @else { diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index d7014fc7f934e5b0c7fb47ebf00cb4ef50d306c2..645d54f2e117ba901e02ed958ada6ff69a78ae34 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -37,8 +37,8 @@ pub(crate) use forum::{ user_can_post_room, user_can_view_room, }; pub(crate) use garden::{ - encode_pin_cookie_value, external_resolver_status_markup, vote_compare_post_success_js, - GARDEN_PIN_COOKIE, + encode_pin_cookie_value, external_resolver_status_markup, garden_ui_copy_rank, + vote_compare_post_success_js, GARDEN_PIN_COOKIE, }; pub use garden::{ external_garden_index, external_ontology_path, garden_index, ontology_path, diff --git a/server/src/html/ui_action.rs b/server/src/html/ui_action.rs index 5cf3168fb74e7654215cd9ff8942c6ed63fd0002..7dc3db062954370b5504fc311c0ab24bab569f80 100644 --- a/server/src/html/ui_action.rs +++ b/server/src/html/ui_action.rs @@ -118,6 +118,18 @@ pub enum HtmlUiAction { thread_tag: String, copy_btn_id: String, }, + /// Copy garden child ranking as a concise markdown list to the clipboard. + CopyGardenRank { + room: String, + /// Parent item path (storage or display). Ignored when `external_hosts` is true. + parent_path: String, + #[serde(default = "default_garden_rank_depth")] + depth: usize, + copy_btn_id: String, + /// When true, copy rankings for external host roots (`/-/` index), not parent children. + #[serde(default)] + external_hosts: bool, + }, /// Publish a private-room thread to the public forum (Manage only). GraduateThread { room: String, @@ -125,6 +137,10 @@ pub enum HtmlUiAction { }, } +fn default_garden_rank_depth() -> usize { + 1 +} + #[derive(Debug, Error)] pub enum HtmlUiParseError { #[error("missing __rpc__ field")] @@ -272,4 +288,57 @@ mod tests { } ); } + + #[test] + fn copy_garden_rank_round_trip() { + let template = serde_json::json!({ + "action": "copy_garden_rank", + "room": "public", + "parent_path": "~/topic", + "depth": 2, + "copy_btn_id": "garden-rank-copy", + }); + let mut form = HashMap::new(); + form.insert( + UI_RPC_FIELD.to_string(), + serde_json::to_string(&template).unwrap(), + ); + let a = parse_html_ui_from_form(&form).unwrap(); + assert_eq!( + a, + HtmlUiAction::CopyGardenRank { + room: "public".into(), + parent_path: "~/topic".into(), + depth: 2, + copy_btn_id: "garden-rank-copy".into(), + external_hosts: false, + } + ); + } + + #[test] + fn copy_garden_rank_defaults_depth_and_external_hosts() { + let template = serde_json::json!({ + "action": "copy_garden_rank", + "room": "public", + "parent_path": "~/", + "copy_btn_id": "garden-rank-copy", + }); + let mut form = HashMap::new(); + form.insert( + UI_RPC_FIELD.to_string(), + serde_json::to_string(&template).unwrap(), + ); + let a = parse_html_ui_from_form(&form).unwrap(); + assert_eq!( + a, + HtmlUiAction::CopyGardenRank { + room: "public".into(), + parent_path: "~/".into(), + depth: 1, + copy_btn_id: "garden-rank-copy".into(), + external_hosts: false, + } + ); + } } diff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs index d242abff5769cc704b3c8070d7456e5788c31a45..6b1475b773106a2dd3f326475c9fb4cc727f6b4b 100644 --- a/server/tests/integration_ui.rs +++ b/server/tests/integration_ui.rs @@ -490,3 +490,71 @@ async fn test_vote_compare_post_rejects_over_max_ratio() { ); } +#[tokio::test] +async fn test_copy_garden_rank_returns_clipboard_js_with_markdown() { + let (addr, _tmp, _log, _handle) = create_test_server().await; + let client = reqwest::Client::new(); + let bearer = test_bearer(); + + let seed = rpc_batch( + &client, + addr, + Some(&bearer), + serde_json::json!([{ + "Post": { + "room": "public", + "thread_tag": "copy-rank-ui", + "text": "# copy-rank-ui\n\n~/copy-a {a}\n~/copy-b {b}\n~/copy-c {c}\n{vote}\n~/copy-a 2:1 ~/copy-b\n", + "return_rank_diff": false + } + }]), + ) + .await; + assert_eq!(seed["results"][0]["ok"], true, "seed: {:?}", seed); + + let page = client + .get(format!("http://{addr}/~")) + .send() + .await + .unwrap(); + assert!(page.status().is_success()); + let html = page.text().await.unwrap(); + assert!( + html.contains("id=\"garden-rank-copy\"") && html.contains("copy_garden_rank"), + "garden index should include copy button + action payload" + ); + + let rpc = serde_json::json!({ + "action": "copy_garden_rank", + "room": "public", + "parent_path": "~/", + "depth": 1, + "copy_btn_id": "garden-rank-copy", + }) + .to_string(); + let resp = client + .post(format!("http://{addr}/ui")) + .header("Authorization", format!("Bearer {bearer}")) + .form(&[("__rpc__", rpc.as_str())]) + .send() + .await + .unwrap(); + assert_eq!(resp.status(), reqwest::StatusCode::OK); + assert_eq!( + resp.headers() + .get(reqwest::header::CONTENT_TYPE) + .and_then(|v| v.to_str().ok()), + Some("text/javascript; charset=utf-8") + ); + let js = resp.text().await.unwrap(); + assert!( + js.contains("navigator.clipboard.writeText") && js.contains("garden-rank-copy"), + "expected clipboard JsBuilder snippet, got: {js}" + ); + assert!( + js.contains("1. ~/copy-a") && js.contains("2. ~/copy-b") && js.contains("- ~/copy-c"), + "expected concise markdown ranking in clipboard payload, got: {js}" + ); + assert!(js.contains("\"copied\""), "expected button label flip to copied"); +} + diff --git a/test/browser_public_garden.clj b/test/browser_public_garden.clj index 5dd49f1f70c870e25a2a9f5348f0bdb85647e897..8ceb532c664f9fc3d6f66a451e5ea5eaa1671007 100644 --- a/test/browser_public_garden.clj +++ b/test/browser_public_garden.clj @@ -73,6 +73,7 @@ (core/with-playwright [pw] (core/with-browser [browser (core/launch-chromium pw {:headless true :channel "chrome"})] (core/with-context [ctx (core/new-context browser)] + (core/context-grant-permissions! ctx ["clipboard-read" "clipboard-write"]) (core/with-page [pg (core/new-page-from-context ctx)] (page/navigate pg (str base-url "/login")) (is (wait-for-text pg "body" "@alice" 15000) "alice session after login") @@ -84,7 +85,12 @@ (is (wait-for-text pg "body" "~/br-pub-b" 10000) "ranked list shows ~/br-pub-b") (is (wait-for-text pg "body" "unranked" 10000) "unranked section present") (is (wait-for-text pg "body" "~/br-pub-c" 10000) - "unranked list shows ~/br-pub-c")))))) + "unranked list shows ~/br-pub-c") + (is (wait-for-text pg "#garden-rank-copy" "copy" 5000) + "garden ranking copy button visible") + (locator/click (page/locator pg "#garden-rank-copy")) + (is (wait-for-text pg "#garden-rank-copy" "copied" 10000) + "copy button flips to copied after POST /ui eval")))))) (finally (when-some [s @!server] (common/kill-server s)) Side B — contributor: tommy-mor Side B — commit message: [893a2007] fullscreen? Side B — unified diff (full patch): diff --git a/agents.md b/agents.md index d9a924d2f77c444d9b112bbf37a480b963ace4f0..1f66ddbeddd1e40310947c7eb474c1ac4858bc42 100644 --- a/agents.md +++ b/agents.md @@ -37,9 +37,9 @@ Strict **CSP** that blocks `eval` would break the current app. Other projects ma - **Non-morph `POST /ui` responses:** **`SetGardenPin`** returns **`303 See Other`** and **`Set-Cookie`** (same as **`POST /theme`**). Garden pin/unpin is a normal **``** — browser navigation applies cookies reliably (see **`test/browser_garden_pin.clj`**). Each **`__rpc__`** payload includes **`form_action: "/ui"`**; **`post_ui_html`** rejects mismatches to bind tokens to the UI endpoint. -- **`VoteComparePost`:** On success returns **`text/javascript`** that **morphs** **`#vote-compare-preview`** (new ingest card) and **`#vote-edge-history-region`** (recomputed edge list). Uses **`RpcResult::PostOk`**’s **`post_id`** / **`post_index`** for the card. **`__rpc__`** carries **`form_action: "/ui"`**; **`thread_tag`** and ratio fields come from the same form as **`$form`** holes. +- **`VoteComparePost`:** On success returns **`text/javascript`** that **morphs** **`#vote-compare-preview`** (new ingest card), **`#vote-edge-history-region`** (recomputed **`
      `** — ratios match **`left`/`right`** query order, bullets, sorted by strength toward **`left`** then newer). The compare **`GET`** page uses **`layout_full_bleed_chromeless`** (no breadcrumbs, no **`#controls`**, no **`slug-pin-hud`**; **`view-vote-compare-fullscreen`** full-width **`body`**). **`__rpc__`** carries **`form_action: "/ui"`**; **`thread_tag`** and ratio fields come from the same form as **`$form`** holes. -- **Garden pin / compare voting:** Cookie **`slug_garden_pin`** via **`set_garden_pin`**. Pairwise UI: **`GET /vote/compare?…`** / **`GET /r/:room_key/vote/compare?…`**. HUD: **`#slug-pin-hud`** when **`layout`** passes garden metadata on **`body`**; the label is **`POST /ui`** **`set_garden_pin`** **`clear:true`** (**`slug_ui.js`**), not a permalink to the item. +- **Garden pin / compare voting:** Cookie **`slug_garden_pin`** via **`set_garden_pin`**. Pairwise UI: **`GET /vote/compare?…`** / **`GET /r/:room_key/vote/compare?…`** (fullscreen **`GET`** page: no HUD; other garden pages). HUD (**`#slug-pin-hud`**): only when **`layout`** passes garden metadata on **`body`**; the label is **`POST /ui`** **`set_garden_pin`** **`clear:true`** (**`slug_ui.js`**), not a permalink to the item. **Rule of thumb:** New **CLI or API** verbs → `RpcCommand`. New **in-page morph or form-driven** behavior that only makes sense in the browser → `HtmlUiAction`. If both need the same operation, implement the real work once (e.g. call shared RPC helpers from `post_ui_html`) and keep the wire shapes separate. diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs index 5aa6a86326ba3545d261322c010e02fe86ee1c57..696e7b3605e2e68aee0351116c494c2958506add 100644 --- a/server/src/api/ui_html.rs +++ b/server/src/api/ui_html.rs @@ -254,7 +254,17 @@ async fn dispatch_ui_action( }; n }; - let js = vote_compare_post_success_js(state, &nav, &left_id, &right_id).await; + let js = vote_compare_post_success_js( + state, + &nav, + &room, + &thread_tag, + &left_id, + &right_id, + pid.as_str(), + post_index, + ) + .await; Response::builder() .status(StatusCode::OK) .header(header::CONTENT_TYPE, "text/javascript; charset=utf-8") diff --git a/server/src/html/garden.rs b/server/src/html/garden.rs index 121d9498e8cb93d4d001dc1bbce23d74fbb958f5..41f9e9c64a80a55a9d3ece2a6a1f592cf5e8d8dd 100644 --- a/server/src/html/garden.rs +++ b/server/src/html/garden.rs @@ -22,17 +22,17 @@ use crate::{ }, events::ThreadCapability, path_types::ItemId, - reducer::{ContentState, ReducerState, ScopeId}, + reducer::{scope_from_room_wire, ContentState, ReducerState, ScopeId}, scope_rank::{build_children_rankings, ChildrenRankings}, state::AppState, timeago, }; use super::{ - bc_path, bc_path_external, bc_segment, cli_panel, layout, now_ms, ratio_pct, - render_linkified_with_embeds_in_scope, theme_from_jar, theme_next_from_uri, + bc_path, bc_path_external, bc_segment, cli_panel, layout, layout_full_bleed_chromeless, now_ms, + ratio_pct, render_linkified_with_embeds_in_scope, theme_from_jar, theme_next_from_uri, breadcrumb_path::{ExternalOntologyPath, OntologyPath}, - forum::{ThreadNav}, + forum::{ingest_entry_markup, ThreadNav}, }; /// `GET /vote/compare` — pairs `left` / `right` query params with optional `thread`. @@ -89,25 +89,62 @@ fn canonical_edge_items(a: &ItemId, b: &ItemId) -> (ItemId, ItemId) { } } -/// Votes whose endpoints are exactly this unordered pair, oldest first. -fn votes_for_edge(content: &ContentState, a: &ItemId, b: &ItemId) -> Vec { +/// All votes whose endpoints are exactly this unordered pair (unsorted). +fn edge_vote_entries_for_pair(content: &ContentState, a: &ItemId, b: &ItemId) -> Vec { let (lo, hi) = canonical_edge_items(a, b); let lo_s = lo.as_str(); let hi_s = hi.as_str(); - let mut out: Vec = content + content .item_votes .get(&lo) .into_iter() .flat_map(|q| q.iter()) .filter(|v| { - let touches = (v.a.as_str() == lo_s && v.b.as_str() == hi_s) - || (v.a.as_str() == hi_s && v.b.as_str() == lo_s); - touches + (v.a.as_str() == lo_s && v.b.as_str() == hi_s) + || (v.a.as_str() == hi_s && v.b.as_str() == lo_s) }) .cloned() - .collect(); - out.sort_by_key(|v| v.ts); - out + .collect() +} + +fn ratios_for_compare_page(v: &crate::reducer::VoteData, page_left: &ItemId, page_right: &ItemId) -> (i32, i32) { + let pl = page_left.as_str(); + let pr = page_right.as_str(); + match (v.a.as_str(), v.b.as_str()) { + (a, b) if a == pl && b == pr => (v.ratio_left, v.ratio_right), + (a, b) if a == pr && b == pl => (v.ratio_right, v.ratio_left), + _ => (v.ratio_left, v.ratio_right), + } +} + +fn left_share_normalized(ratio_left: i32, ratio_right: i32) -> f64 { + let l = ratio_left.max(0) as f64; + let r = ratio_right.max(0) as f64; + let sum = l + r; + if sum <= 0.0 { + 0.5 + } else { + l / sum + } +} + +/// Stronger preference for **`page_left` first**; ties **newer first**. +fn sort_votes_for_compare_display( + mut votes: Vec, + page_left: &ItemId, + page_right: &ItemId, +) -> Vec { + votes.sort_by(|va, vb| { + let (ratio_left_a, ratio_right_a) = ratios_for_compare_page(va, page_left, page_right); + let (ratio_left_b, ratio_right_b) = ratios_for_compare_page(vb, page_left, page_right); + let sa = left_share_normalized(ratio_left_a, ratio_right_a); + let sb = left_share_normalized(ratio_left_b, ratio_right_b); + match sb.partial_cmp(&sa).unwrap_or(std::cmp::Ordering::Equal) { + std::cmp::Ordering::Equal => vb.ts.cmp(&va.ts), + o => o, + } + }); + votes } /// Number of vote ingests recorded for this unordered pair in `content` (same scope as ranking). @@ -144,39 +181,40 @@ fn vote_edge_history_markup( content: &ContentState, left: &ItemId, right: &ItemId, - nav: &ThreadNav, ) -> maud::Markup { - let votes = votes_for_edge(content, left, right); - let (lo, hi) = canonical_edge_items(left, right); + let votes = edge_vote_entries_for_pair(content, left, right); + let votes = sort_votes_for_compare_display(votes, left, right); + let legend_left = item_display_path(left.as_str()); + let legend_right = item_display_path(right.as_str()); html! { @if votes.is_empty() { p class="muted vote-edge-empty" { "no votes on this pair in this scope yet" } } @else { - h3 class="vote-edge-history-title" { "votes on this edge" } - ol class="vote-edge-history" { + h3 class="vote-edge-history-title" { + "votes on this edge" + span class="vote-edge-history-axis muted" { " · " (legend_left) " : " (legend_right) } + } + ul class="vote-edge-history" { @for v in &votes { - @let (ratio_lo, ratio_hi) = if v.a == lo && v.b == hi { - (v.ratio_left, v.ratio_right) - } else { - (v.ratio_right, v.ratio_left) - }; - @let pct = ratio_pct(ratio_lo, ratio_hi); - @let left_class = if lo.as_str() == left.as_str() { "ratio-left current" } else { "ratio-left" }; - @let right_class = if hi.as_str() == left.as_str() { "ratio-right current" } else { "ratio-right" }; - li class="vote-edge-history-row" { + @let (r_left, r_right) = ratios_for_compare_page(v, left, right); + @let pct = ratio_pct(r_left, r_right); + @let row_tip = format!( + "{}:{} counts toward {} (left of bar) vs {} (right of bar); #{} · @{}", + r_left, + r_right, + legend_left, + legend_right, + v.thread_tag, + v.principal, + ); + li class="vote-edge-history-row" title=(row_tip) { div class="vote-edge-meta" { - a href=(nav.garden_item_href(&lo)) { - code { (item_display_path(lo.as_str())) } - } - span class="vote-edge-ratio" { (format!("{}:{}", ratio_lo, ratio_hi)) } - a href=(nav.garden_item_href(&hi)) { - code { (item_display_path(hi.as_str())) } - } + span class="vote-edge-ratio" { (format!("{}:{}", r_left, r_right)) } span class="muted" { " · #" (v.thread_tag) " · @" (v.principal) } } - div class="ratio-bar vote-edge-bar" { - div class=(left_class) style={(format!("width: {:.3}%;", pct))} {} - div class=(right_class) style={(format!("width: {:.3}%;", 100.0 - pct))} {} + div class="ratio-bar vote-edge-bar" aria-hidden="true" { + div class="ratio-left" style={(format!("width: {:.3}%;", pct))} {} + div class="ratio-right" style={(format!("width: {:.3}%;", 100.0 - pct))} {} } @if !v.body.trim().is_empty() { div class="vote-edge-reason muted" { (v.body.trim()) } @@ -192,14 +230,33 @@ fn vote_edge_history_markup( pub(crate) async fn vote_compare_post_success_js( state: &AppState, nav: &ThreadNav, + room_wire: &str, + thread_tag: &str, left: &ItemId, right: &ItemId, + post_id: &str, + post_idx: Option, ) -> String { let reduced = state.reduced.read().await; + let scope = scope_from_room_wire(room_wire); + let Some(ing) = reduced.ingests_by_id.get(post_id).cloned() else { + drop(reduced); + return "console.warn('vote compare: new post not found');".to_string(); + }; + let idx = match post_idx { + Some(i) => i, + None => reduced + .try_thread_post_index_chronological(&scope, thread_tag, post_id) + .unwrap_or(0), + }; + let viewer = None::<&str>; + let now = now_ms(); let content = content_for_garden_view(&reduced, &nav.scope()); - let edge_history = vote_edge_history_markup(content, left, right, nav); + let edge_history = vote_edge_history_markup(content, left, right); + let card = ingest_entry_markup(nav, thread_tag, idx, &ing, viewer, now, &reduced); drop(reduced); let mut b = JsBuilder::new(); + b = b.morph_inner_selector("#vote-compare-preview", card); b = b.morph_inner_selector("#vote-edge-history-region", edge_history); b.build() } @@ -1259,7 +1316,7 @@ async fn vote_compare_inner( .filter(|t| !t.is_empty()) .unwrap_or_else(|| pick_autothread_for_vote_pair(content, &left, &right)); let thread_tags = vote_thread_tags_for_pair(content, &left, &right); - let edge_history = vote_edge_history_markup(content, &left, &right, &nav); + let edge_history = vote_edge_history_markup(content, &left, &right); drop(reduced); let title = format!("vote — {} vs {}", item_display_path(left.as_str()), item_display_path(right.as_str())); @@ -1282,15 +1339,6 @@ async fn vote_compare_inner( .expect("vote compare rpc json"); let body = html! { - nav class="breadcrumb" { - a href="/" { "slug.social" } - @let vote_bc_href = if nav.room_path_prefix_for_vote_compare().is_empty() { - "/vote/compare".to_string() - } else { - format!("{}/vote/compare", nav.room_path_prefix_for_vote_compare()) - }; - (bc_segment("vote", &vote_bc_href, true)) - } section class="vote-compare-shell" { h2 { "compare" } div class="vote-compare-pair" { @@ -1305,6 +1353,10 @@ async fn vote_compare_inner( div id="vote-edge-history-region" { (edge_history) } + div class="vote-compare-preview-wrap" { + h3 { "your vote (after post)" } + div id="vote-compare-preview" class="vote-compare-preview" {} + } @if can_post { form id="vote-compare-form" method="POST" action="/ui" { input type="hidden" name=(UI_RPC_FIELD) value=(rpc_json); @@ -1342,16 +1394,12 @@ async fn vote_compare_inner( } }; - let (gr, gp) = garden_layout_meta(&nav); - let page = layout( + let page = layout_full_bleed_chromeless( &title, - "view-ontology view-ontology-light view-vote-compare", + "view-ontology view-ontology-light view-vote-compare view-vote-compare-fullscreen", body, - None, theme_from_jar(&jar), &theme_next_from_uri(&uri), - Some(&gr), - Some(&gp), ); Html(page.into_string()).into_response() } @@ -1388,10 +1436,40 @@ mod tests { })); } + #[test] + fn vote_edge_compare_sorts_rows_by_strength_for_page_left() { + use super::{ + content_for_garden_view, edge_vote_entries_for_pair, ratios_for_compare_page, + sort_votes_for_compare_display, + }; + use crate::path_types::ItemId; + let mut reduced = ReducerState::default(); + apply_ingest( + &mut reduced, + 1, + "@00000000-0000-0000-0000-000000000000:test:local/test\n\ + ~/topic {root}\n\ + ~/topic/a {alpha}\n\ + ~/topic/b {beta}\n\ + ~/topic/a 1:9 ~/topic/b {weak for a}\n\ + ~/topic/a 8:2 ~/topic/b {strong for a}\n", + ); + let content = content_for_garden_view(&reduced, &ScopeId::Public); + let page_left = ItemId::parse("~/topic/a").unwrap().normalized_storage(); + let page_right = ItemId::parse("~/topic/b").unwrap().normalized_storage(); + let raw = edge_vote_entries_for_pair(content, &page_left, &page_right); + assert_eq!(raw.len(), 2); + let sorted = sort_votes_for_compare_display(raw, &page_left, &page_right); + let (r0, _) = ratios_for_compare_page(&sorted[0], &page_left, &page_right); + assert_eq!(r0, 8, "stronger left weight should sort first"); + let (r1, _) = ratios_for_compare_page(&sorted[1], &page_left, &page_right); + assert_eq!(r1, 1); + } + #[test] fn edge_vote_count_for_pair_matches_votes_for_edge_len() { use super::{ - content_for_garden_view, edge_vote_count_for_pair, votes_for_edge, + content_for_garden_view, edge_vote_count_for_pair, edge_vote_entries_for_pair, }; use crate::path_types::ItemId; let mut reduced = ReducerState::default(); @@ -1410,9 +1488,9 @@ mod tests { let b = ItemId::parse("~/topic/b").unwrap().normalized_storage(); assert_eq!( edge_vote_count_for_pair(content, &a, &b), - votes_for_edge(content, &a, &b).len() + edge_vote_entries_for_pair(content, &a, &b).len() ); - assert_eq!(votes_for_edge(content, &a, &b).len(), 2); + assert_eq!(edge_vote_entries_for_pair(content, &a, &b).len(), 2); } #[test] diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index 40c15debe91a708da24dc1dec2ece2a852dd6381..f57b66f510dfaade1b656990fb2cbb30d16e5bf1 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -304,6 +304,28 @@ pub(super) fn layout( layout_embed_controls(title, view, body, views, theme, theme_next, garden_room_wire, garden_path_prefix, true) } +/// Minimal document shell: no bottom controls, no garden HUD data attributes (`data-garden-room` / +/// `data-garden-prefix` empty). For routes that own the full viewport (e.g. vote compare). +pub(super) fn layout_full_bleed_chromeless( + title: &str, + view: &str, + body: Markup, + theme: &str, + theme_next: &str, +) -> Markup { + layout_embed_controls( + title, + view, + body, + None, + theme, + theme_next, + None, + None, + false, + ) +} + fn layout_embed_controls( title: &str, view: &str, diff --git a/server/static/theme_default.css b/server/static/theme_default.css index 9178f0629cfb868348740e6dea1626dc6afb8345..a441c4f79d8cf88f5a8240f9992f47dbbd1ab46b 100644 --- a/server/static/theme_default.css +++ b/server/static/theme_default.css @@ -1054,6 +1054,26 @@ body.view-vote-compare #vote-explain:focus { body.view-vote-compare #vote-compare-form button[type="submit"] { margin-top: 6px; } + +body.view-vote-compare-fullscreen { + max-width: none; + width: 100%; + margin-left: 0; + margin-right: 0; + padding: clamp(8px, 2.5vw, 28px); + padding-bottom: max(20px, env(safe-area-inset-bottom, 0px)); + padding-top: max(8px, env(safe-area-inset-top, 0px)); + min-height: 100vh; + min-height: 100dvh; + box-sizing: border-box; +} +body.view-vote-compare-fullscreen .vote-compare-shell { + max-width: none; + width: 100%; + box-sizing: border-box; + margin: 0; +} + .vote-edge-history-title { font-size: 12px; letter-spacing: 0.06em; @@ -1061,9 +1081,15 @@ body.view-vote-compare #vote-compare-form button[type="submit"] { color: var(--meta); margin: 16px 0 8px; } -ol.vote-edge-history { +.vote-edge-history-axis { + text-transform: none; + letter-spacing: normal; + font-size: 13px; +} +ul.vote-edge-history { margin: 0; - padding-left: 1.2em; + padding-left: 1.35em; + list-style-type: disc; } li.vote-edge-history-row { margin: 10px 0; diff --git a/server/static/theme_retro.css b/server/static/theme_retro.css index f2d0ddee113995817a7f9bfa8500b2f5e7d81cf4..373f15bbd75b62604cdd14b9f0fadda2d6176991 100644 --- a/server/static/theme_retro.css +++ b/server/static/theme_retro.css @@ -176,3 +176,21 @@ nav.breadcrumb.ont-sibling-nav span.ont-sibling-nav-group-sep { border-right: none; border-top: none; } + +body.view-vote-compare-fullscreen { + max-width: none; + width: 100%; + margin: 0; + padding: clamp(8px, 2.5vw, 20px); + padding-bottom: max(24px, env(safe-area-inset-bottom, 0px)); + padding-top: max(8px, env(safe-area-inset-top, 0px)); + min-height: 100vh; + min-height: 100dvh; + box-sizing: border-box; +} +body.view-vote-compare-fullscreen .vote-compare-shell { + max-width: none; + width: 100%; + box-sizing: border-box; + margin: 0; +} diff --git a/server/static/theme_retro_craft.css b/server/static/theme_retro_craft.css index efaeed06d01fd835df0621f4c621c8f034c8b536..0871e3126c656ba534306cdc3f405f802d10b589 100644 --- a/server/static/theme_retro_craft.css +++ b/server/static/theme_retro_craft.css @@ -785,6 +785,24 @@ body.view-ontology.view-vote-compare .vote-compare-shell { border-radius: 3px; box-shadow: 0 1px 0 rgba(26, 24, 20, 0.06); } +body.view-ontology.view-vote-compare.view-vote-compare-fullscreen .vote-compare-shell { + max-width: none; + width: 100%; + min-height: calc(100dvh - clamp(20px, 5vw, 56px)); + margin: 0; + box-sizing: border-box; +} +body.view-vote-compare-fullscreen { + max-width: none !important; + width: 100%; + margin: 0 !important; + padding: clamp(6px, 2vw, 1.75rem); + padding-bottom: max(1.25rem, env(safe-area-inset-bottom, 0px)); + padding-top: max(6px, env(safe-area-inset-top, 0px)); + min-height: 100vh; + min-height: 100dvh; + box-sizing: border-box; +} body.view-ontology.view-vote-compare .vote-compare-shell > h2 { margin-top: 0; font-size: 0.7rem; @@ -910,9 +928,16 @@ body.view-ontology .vote-edge-history-title { color: #5c574e; margin: 0 0 0.5rem; } -body.view-ontology ol.vote-edge-history { +body.view-ontology .vote-edge-history-axis { + text-transform: none; + letter-spacing: normal; + font-size: 0.82rem; + font-weight: 400; +} +body.view-ontology ul.vote-edge-history { margin: 0; - padding-left: 1.1rem; + padding-left: 1.25rem; + list-style-type: disc; } body.view-ontology li.vote-edge-history-row { margin: 0.65rem 0; diff --git a/test/browser_vote_compare.clj b/test/browser_vote_compare.clj index 26fcff8bceb0c10bcd5ddfdae1aa145b56b7a0d1..78fc40c160c84478ab8ee0d953b9ed878b4c712f 100644 --- a/test/browser_vote_compare.clj +++ b/test/browser_vote_compare.clj @@ -72,13 +72,13 @@ (is (wait-for-text pg "body" "@alice" 15000) "alice session after login") (page/navigate pg cmp-url) (is (wait-for-text pg ".vote-compare-shell" "compare" 15000) "vote compare shell") - (is (wait-for-text pg "ol.vote-edge-history" "seed edge vote" 15000) + (is (wait-for-text pg "ul.vote-edge-history" "seed edge vote" 15000) "edge history lists canonical-order vote") (locator/fill (page/locator pg "#vote-explain") "because playwright says so") (locator/click (page/locator pg "#vote-compare-form button[type=submit]")) (is (wait-for-text pg "#vote-compare-preview" "because playwright" 20000) "preview region morphs new post card") - (is (wait-for-text pg "ol.vote-edge-history" "because playwright" 20000) + (is (wait-for-text pg "ul.vote-edge-history" "because playwright" 20000) "new vote appears in edge history after morph")))))) (finally