From 7c10db07d9207e6a9aee60ebd2e684d744edc393 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 24 Oct 2026 10:31:09 -0700 Subject: [PATCH] PivotTables: Show Details reports the turned-off option before an out-of-date report With Enable show details off, Show Details on a value cell of a report whose source has changed gave the out-of-date error. It now gives the turned-off message, and a label still reports that it is not a value cell. The message names pivot.options with enableShowDetails set to true, since there is no PivotTable Options dialog. --- crates/engine/src/cmd/pivot.rs | 26 ++++++++++++++----- crates/ui-egui/tests/it/pivot_show_details.rs | 2 +- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/crates/engine/src/cmd/pivot.rs b/crates/engine/src/cmd/pivot.rs index 5277ff98a..05acb4170 100644 --- a/crates/engine/src/cmd/pivot.rs +++ b/crates/engine/src/cmd/pivot.rs @@ -764,11 +764,13 @@ fn show_details(s: &mut Session, p: &Json) -> Result { .find(|pt| pt.last_range.is_some_and(|r| r.contains(at))) .ok_or_else(|| EngineError::Disabled("pivot.showDetails".into(), pv::NOT_A_VALUE_CELL.into()))?; let origin = pt.last_range.map(|r| r.start).unwrap_or_default(); - let found = pv::detail_records(&d.wb, pt, active, at.row.saturating_sub(origin.row), at.col.saturating_sub(origin.col)).map_err(other)?; - let (src, records) = found.ok_or_else(|| EngineError::Disabled("pivot.showDetails".into(), pv::NOT_A_VALUE_CELL.into()))?; - if !pt.enable_show_details { + let found = pv::detail_records(&d.wb, pt, active, at.row.saturating_sub(origin.row), at.col.saturating_sub(origin.col)); + // With the option off, a report that is out of date or a source that cannot be read is + // reported as the option; only a cell that is not a value cell keeps its own message. + if !pt.enable_show_details && !matches!(found, Ok(None)) { return Err(other(SHOW_DETAILS_OFF)); } + let (src, records) = found.map_err(other)?.ok_or_else(|| EngineError::Disabled("pivot.showDetails".into(), pv::NOT_A_VALUE_CELL.into()))?; if d.wb.protected_structure { return Err(other("The workbook is protected and cannot be changed.")); } @@ -837,7 +839,7 @@ fn show_details(s: &mut Session, p: &Json) -> Result { } /// The message Show Details gives while Enable show details is off. -const SHOW_DETAILS_OFF: &str = "Show Details is turned off for this PivotTable. Turn on Enable show details in PivotTable Options."; +const SHOW_DETAILS_OFF: &str = "Show Details is turned off for this PivotTable. Turn it on with pivot.options and enableShowDetails set to true."; /// PivotTable Options: Enable show details (Data). Changes only the option; the report is not /// refreshed. Without params it returns the current setting. @@ -2629,11 +2631,11 @@ mod tests { assert!(!pt(&s).enable_show_details); assert_eq!(s.execute("pivot.fields", json!({})).unwrap()["enableShowDetails"], false); let e = s.execute("pivot.showDetails", json!({"cell": "B5"})).unwrap_err().to_string(); - assert!(e.contains("Enable show details"), "{e}"); + assert!(e.contains("turned off") && e.contains("pivot.options") && e.contains("enableShowDetails"), "{e}"); assert_eq!(s.doc().unwrap().wb.sheets.len(), 2); // A label still reports that it is not a value cell. let e = s.execute("pivot.showDetails", json!({"cell": "A5"})).unwrap_err().to_string(); - assert!(!e.contains("Enable show details"), "{e}"); + assert!(!e.contains("turned off"), "{e}"); // Setting the same value again adds no undo step. let after = s.doc().unwrap().revision; s.execute("pivot.options", json!({"enableShowDetails": false})).unwrap(); @@ -2644,4 +2646,16 @@ mod tests { assert!(pt(&s).enable_show_details); assert_eq!(s.execute("pivot.showDetails", json!({"cell": "B5"})).unwrap()["records"], 2); } + + #[test] + fn enable_show_details_off_is_reported_before_an_out_of_date_report() { + let mut s = sales(); + s.execute("insert.pivotTable", json!({"rows": ["Region"], "columns": ["Product"], "values": ["Sales"]})).unwrap(); + s.execute("pivot.options", json!({"enableShowDetails": false})).unwrap(); + // The source changes after the report was written, so the report is out of date. + s.execute("range.setValues", json!({"range": "Sheet1!A2", "values": [["Central"]]})).unwrap(); + let e = s.execute("pivot.showDetails", json!({"cell": "B5"})).unwrap_err().to_string(); + assert!(e.contains("turned off") && !e.contains("out of date"), "{e}"); + assert_eq!(s.doc().unwrap().wb.sheets.len(), 2); + } } diff --git a/crates/ui-egui/tests/it/pivot_show_details.rs b/crates/ui-egui/tests/it/pivot_show_details.rs index 6300a719f..959eea0f6 100644 --- a/crates/ui-egui/tests/it/pivot_show_details.rs +++ b/crates/ui-egui/tests/it/pivot_show_details.rs @@ -116,6 +116,6 @@ fn double_click_with_enable_show_details_off_says_why_and_does_not_edit() { let app = h.state(); assert!(app.editor.is_none(), "the value cell must not open for editing"); - assert!(app.message.as_ref().is_some_and(|(_, m)| m.contains("Enable show details")), "{:?}", app.message); + assert!(app.message.as_ref().is_some_and(|(_, m)| m.contains("enableShowDetails")), "{:?}", app.message); assert_eq!(app.session.active().unwrap().wb.sheets.len(), 1); }