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: [1531154d] dequeue -> vec Side A — unified diff (full patch): diff --git a/server/src/projection_apply.rs b/server/src/projection_apply.rs index 9c8990a8af927f35d3344c8d0872a516aba56b86..ad404bacb8bcdd5ae0e682cff97f974fd44528ea 100644 --- a/server/src/projection_apply.rs +++ b/server/src/projection_apply.rs @@ -6,8 +6,6 @@ //! batch as the (non-idempotent) edge merges guarantees exactly-once application //! across replay. -use std::collections::BTreeSet; - use crate::{ event_log::EventLogError, events::{Event, EventRecord}, @@ -44,7 +42,6 @@ pub fn apply_records( let db = projection_store.db(); let mut batch = db.batch(); - let mut vote_parents: BTreeSet = BTreeSet::new(); let mut last_seq = 0u64; for record in records { @@ -70,7 +67,6 @@ pub fn apply_records( *ts, ) .map_err(|e| EventLogError::Apply(e.to_string()))?; - vote_parents.insert(parent); } Event::NodeEnsured { id } => { let parsed = parse_event_id(id)?; @@ -85,11 +81,5 @@ pub fn apply_records( .commit_with(durable::Durability::DisableWal) .map_err(|e| EventLogError::Apply(e.to_string()))?; - for parent in vote_parents { - projection_store - .trim_recent_votes(&parent) - .map_err(|e| EventLogError::Apply(e.to_string()))?; - } - Ok(()) } diff --git a/server/src/projection_store.rs b/server/src/projection_store.rs index 8576d671f351004426207894ac35594ddb0f70cf..9a8953d010029d3639dc3987687554bab8b7663e 100644 --- a/server/src/projection_store.rs +++ b/server/src/projection_store.rs @@ -18,7 +18,7 @@ use crate::{ const PROJECTION_CURSOR_KEY: &str = "cursor"; const PROJECTION_SCHEMA_KEY: &str = "schema_version"; -const PROJECTION_SCHEMA_VERSION: u64 = 3; +const PROJECTION_SCHEMA_VERSION: u64 = 4; #[derive(Debug, thiserror::Error)] pub enum ProjectionStoreError { @@ -142,16 +142,6 @@ impl ProjectionStore { Ok(tree) } - /// Cap a node's recent-vote window after applying votes (best-effort, blind). - pub(crate) fn trim_recent_votes(&self, parent: &ItemId) -> Result<(), ProjectionStoreError> { - node(parent).recent_votes().truncate_back( - &self.db, - crate::storage_schema::RECENT_VOTES_CAP, - Durability::DisableWal, - )?; - Ok(()) - } - /// Cache Reddit display content outside the event log (must be evicted per policy). pub fn put_ephemeral_content( &self, diff --git a/server/src/reducer.rs b/server/src/reducer.rs index 0c75c85150bb9e5f578bbadf58b3e43f8a80be4b..759918b8c0eb8f8bf1ed0911d8877adaa55c8ea6 100644 --- a/server/src/reducer.rs +++ b/server/src/reducer.rs @@ -1,4 +1,4 @@ -use std::collections::{HashMap, HashSet, VecDeque}; +use std::collections::{HashMap, HashSet}; use serde::{Deserialize, Serialize}; @@ -52,7 +52,7 @@ pub struct GroupState { pub idx_to_item: Vec, pub edges: HashMap<(usize, usize), f64>, pub voted_pairs: HashSet<(usize, usize)>, - pub recent_votes: VecDeque, + pub recent_votes: Vec, } impl GroupState { @@ -62,7 +62,7 @@ impl GroupState { idx_to_item: Vec::new(), edges: HashMap::new(), voted_pairs: HashSet::new(), - recent_votes: VecDeque::with_capacity(200), + recent_votes: Vec::new(), } } @@ -111,10 +111,7 @@ impl GroupState { self.add_edge_weight(b_idx, a_idx, w_a); self.add_edge_weight(a_idx, b_idx, w_b); - self.recent_votes.push_front(vote); - while self.recent_votes.len() > 200 { - self.recent_votes.pop_back(); - } + self.recent_votes.push(vote); } } diff --git a/server/src/storage_dto.rs b/server/src/storage_dto.rs index 9dfb13c53efe4389277625a6ab3bfc18f566a453..3fd6db5cb909ac4896bd8a3ecace796de5f08781 100644 --- a/server/src/storage_dto.rs +++ b/server/src/storage_dto.rs @@ -39,7 +39,7 @@ pub struct StoredEntityDataV1 { pub link_url: Option, } -/// One vote stored in a node's `recent_votes` deque. +/// One vote stored in a node's `recent_votes` list. #[derive(Debug, Clone, Serialize, Deserialize)] pub struct StoredVoteV1 { pub version: u32, diff --git a/server/src/storage_schema.rs b/server/src/storage_schema.rs index bd26e665e084b95b10fdfff091c31e8dc84d07b8..5d2bb1d56927fb61c7c6d2d8602bd6882327f862 100644 --- a/server/src/storage_schema.rs +++ b/server/src/storage_schema.rs @@ -2,13 +2,13 @@ //! durable collections instead of one blob per node. //! //! A vote updates a handful of keys: a few edge-weight merges, a voted-pair flag, -//! a recent-vote deque push, and child-link set entries. The in-memory +//! a recent-vote list append, and child-link set entries. The in-memory //! [`crate::reducer::GroupState`] is reconstructed from these keys on read for //! rank-centrality. use std::collections::{BTreeSet, HashMap, HashSet}; -use durable::{Batch, Db, Deque, Durable, Leaf, Map, Sum}; +use durable::{Batch, Db, Durable, Leaf, List, Map, Sum}; use crate::{ path_types::ItemId, @@ -38,8 +38,8 @@ pub struct NodeSchema { pub edges: Map>, /// Voted pairs `(min, max) -> true`. pub voted_pairs: Map>, - /// Recent votes, newest at the front (capped on write). - pub recent_votes: Deque>, + /// Recent votes, append-only oldest-first (cap applied on read). + pub recent_votes: List>, /// When ephemeral Reddit display content was last fetched (ms); absent after eviction. pub fetched_at: Leaf, } @@ -55,7 +55,7 @@ pub struct Store { pub view_meta: Map>, } -/// Cap on the per-node recent-vote window (matches the in-memory reducer). +/// Max recent votes returned when loading a node (query-time cap only). pub const RECENT_VOTES_CAP: u64 = 200; fn id_key(id: &ItemId) -> String { @@ -148,11 +148,14 @@ fn build_group_state( } } - // Deque is front=newest; in-memory VecDeque is also front=newest. - let mut recent_votes = std::collections::VecDeque::new(); - for stored in np.recent_votes().iter(db)? { - recent_votes.push_back(decode_vote(stored).map_err(durable::Error::Deserialize)?); - } + // List is index order (oldest first); keep the newest RECENT_VOTES_CAP entries. + let stored = np.recent_votes().iter(db)?; + let cap = RECENT_VOTES_CAP as usize; + let start = stored.len().saturating_sub(cap); + let recent_votes = stored[start..] + .iter() + .map(|s| decode_vote(s.clone()).map_err(durable::Error::Deserialize)) + .collect::, _>>()?; Ok(GroupState { item_to_idx, @@ -248,7 +251,7 @@ pub fn vote_writes( }; batch.write(pnode.voted_pairs().key(&(lo, hi)).set(&true)); - // Recent votes (newest at front). + // Recent votes (append-only; cap on read). let stored = encode_vote(&VoteData { ts, a: a_id, @@ -260,7 +263,7 @@ pub fn vote_writes( delegate: None, thread_tag: "default".to_string(), }); - batch.push_front(&pnode.recent_votes(), &stored)?; + batch.push(&pnode.recent_votes(), &stored)?; Ok(()) } @@ -314,6 +317,35 @@ mod tests { assert!(load_node_state(&db, &parent).unwrap().is_none()); } + #[test] + fn load_caps_recent_votes_at_query_time() { + let dir = tempfile::tempdir().unwrap(); + let db = Db::open(dir.path()).unwrap(); + let parent = ItemId::root(); + + let mut batch = db.batch(); + for i in 0..RECENT_VOTES_CAP + 10 { + vote_writes(&mut batch, &parent, "alpha", "beta", 1, 0, i as i64).unwrap(); + } + batch.commit().unwrap(); + + assert_eq!( + node(&parent).recent_votes().len(&db).unwrap(), + RECENT_VOTES_CAP + 10 + ); + + let node_state = load_node_state(&db, &parent).unwrap().unwrap(); + assert_eq!(node_state.local_ranking.recent_votes.len(), RECENT_VOTES_CAP as usize); + assert_eq!( + node_state.local_ranking.recent_votes.first().map(|v| v.ts), + Some(10) + ); + assert_eq!( + node_state.local_ranking.recent_votes.last().map(|v| v.ts), + Some(RECENT_VOTES_CAP as i64 + 9) + ); + } + #[test] fn missing_node_is_none() { let dir = tempfile::tempdir().unwrap(); 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