mirror of
https://github.com/storytold/gridcraft.git
synced 2026-10-24 10:46:50 -06:00
bfentyandClaude
9f13434972
- The region already starts at the header row when headers are on, so the dropdown label reads start.row for both cases (was showing the first data value, e.g. B: 30 instead of B: Revenue). - + Add Level picks the first region column no level uses yet instead of columns.get(levels.len()), which re-seeded an already-used column. Co-Authored-By: Claude <noreply@anthropic.com>
82 lines
2.9 KiB
Rust
82 lines
2.9 KiB
Rust
//! #1906: the Sort dialog seeds "Sort by" from the active column instead of a
|
|
//! free-text box stuck on "A", and the column list offers the region's columns.
|
|
|
|
use egui::{Key, Modifiers};
|
|
use egui_kittest::kittest::Queryable;
|
|
use gridcraft_engine::Session;
|
|
use gridcraft_ui_egui::SheetApp;
|
|
use serde_json::json;
|
|
|
|
type Harness = egui_kittest::Harness<'static, SheetApp>;
|
|
|
|
fn harness(session: Session) -> Harness {
|
|
let mut h = Harness::builder().with_size(egui::vec2(1200.0, 800.0)).build_ui_state(
|
|
|ui, app: &mut SheetApp| {
|
|
let ctx = ui.ctx().clone();
|
|
app.logic(&ctx);
|
|
app.ui(ui);
|
|
},
|
|
SheetApp::new(session, Default::default()),
|
|
);
|
|
h.run_steps(4);
|
|
h
|
|
}
|
|
|
|
/// Header row + three rows; the user's cursor sits in column B (Revenue).
|
|
fn sales() -> Session {
|
|
let mut s = Session::new();
|
|
s.new_workbook();
|
|
s.execute("range.setValues", json!({"range": "A1", "values": [["Month", "Revenue"], ["Mar", 30], ["Jan", 10], ["Feb", 20]]})).unwrap();
|
|
s.execute("selection.set", json!({"range": "B2"})).unwrap();
|
|
s
|
|
}
|
|
|
|
fn col(h: &Harness) -> String {
|
|
h.state().dialog.as_ref().unwrap().values["levels"][0]["column"].as_str().unwrap_or("<missing>").to_string()
|
|
}
|
|
|
|
#[test]
|
|
fn sort_dialog_seeds_the_active_column() {
|
|
let mut h = harness(sales());
|
|
h.state_mut().open_dialog("sort", json!({}));
|
|
h.run_steps(2);
|
|
assert_eq!(col(&h), "B", "Sort by starts on the column the cursor is in, not A");
|
|
}
|
|
|
|
#[test]
|
|
fn add_level_picks_a_column_no_level_uses_yet() {
|
|
let mut h = harness(sales());
|
|
h.state_mut().open_dialog("sort", json!({}));
|
|
h.run_steps(2);
|
|
// Level 1 seeded B; clicking "+ Add Level" must not default level 2 to B too (#1906 review).
|
|
h.run_steps(6);
|
|
h.get_by_label("+ Add Level").click();
|
|
h.run_steps(6);
|
|
let cols: Vec<String> = h.state().dialog.as_ref().unwrap().values["levels"]
|
|
.as_array()
|
|
.map(|a| a.iter().filter_map(|l| l["column"].as_str().map(str::to_string)).collect())
|
|
.unwrap_or_default();
|
|
assert_eq!(cols.len(), 2, "two levels after Add Level");
|
|
assert_ne!(cols[0], cols[1], "the second level defaults to a different column: {cols:?}");
|
|
}
|
|
|
|
#[test]
|
|
fn sorting_by_the_seeded_column_orders_the_rows() {
|
|
let mut h = harness(sales());
|
|
h.state_mut().open_dialog("sort", json!({}));
|
|
h.run_steps(2);
|
|
// Accept the dialog: rows must come back ordered by Revenue (10, 20, 30).
|
|
h.input_mut().events.push(egui::Event::Key {
|
|
key: Key::Enter,
|
|
physical_key: Some(Key::Enter),
|
|
pressed: true,
|
|
repeat: false,
|
|
modifiers: Modifiers::NONE,
|
|
});
|
|
h.run_steps(2);
|
|
let d = h.state().session.active().unwrap();
|
|
let sh = d.wb.active().unwrap();
|
|
let nums: Vec<i64> = (1..4).map(|r| sh.value(gridcraft_engine::core::CellRef::new(r, 1))).filter_map(|v| v.as_f64().map(|n| n as i64)).collect();
|
|
assert_eq!(nums, vec![10, 20, 30], "sort ran on the seeded column B");
|
|
}
|