Highlight required sheet selection
This commit is contained in:
parent
db290555a5
commit
2d8deb10cd
|
|
@ -250,7 +250,14 @@ impl App {
|
|||
if self.sheets.len() == 1 {
|
||||
self.sheet = self.sheets[0].clone();
|
||||
}
|
||||
self.status = "Select a sheet, then analyze".into();
|
||||
self.status = if self.sheets.len() > 1 {
|
||||
format!(
|
||||
"Choose one of {} workbook sheets to continue",
|
||||
self.sheets.len()
|
||||
)
|
||||
} else {
|
||||
"Ready to analyze".into()
|
||||
};
|
||||
}
|
||||
Update::Analyzed(a, table) => {
|
||||
self.tables.retain(|t| t.name != table.name);
|
||||
|
|
@ -313,6 +320,10 @@ impl App {
|
|||
}
|
||||
}
|
||||
|
||||
fn needs_sheet_choice(&self) -> bool {
|
||||
self.sheets.len() > 1 && self.sheet.is_empty()
|
||||
}
|
||||
|
||||
fn mapping_controls(&mut self, ui: &mut egui::Ui) {
|
||||
self.mapping_fields(ui);
|
||||
}
|
||||
|
|
@ -607,21 +618,44 @@ impl App {
|
|||
self.sheet.clear();
|
||||
self.invalidate();
|
||||
}
|
||||
egui::ComboBox::from_label("Sheet")
|
||||
.selected_text(if self.sheet.is_empty() {
|
||||
"Choose…"
|
||||
} else {
|
||||
&self.sheet
|
||||
})
|
||||
.show_ui(ui, |ui| {
|
||||
for s in self.sheets.clone() {
|
||||
if ui.selectable_value(&mut self.sheet, s.clone(), s).changed() {
|
||||
self.profile = "{}".into();
|
||||
self.profile_path = None;
|
||||
self.invalidate();
|
||||
let choose_sheet = self.needs_sheet_choice();
|
||||
if choose_sheet {
|
||||
ui.colored_label(
|
||||
Color32::from_rgb(235, 190, 95),
|
||||
format!(
|
||||
"This workbook has {} sheets. Choose the sheet to convert before continuing.",
|
||||
self.sheets.len()
|
||||
),
|
||||
);
|
||||
}
|
||||
let mut picker = |ui: &mut egui::Ui| {
|
||||
egui::ComboBox::from_label("Sheet to convert")
|
||||
.selected_text(if self.sheet.is_empty() {
|
||||
"Choose a sheet…"
|
||||
} else {
|
||||
&self.sheet
|
||||
})
|
||||
.show_ui(ui, |ui| {
|
||||
for s in self.sheets.clone() {
|
||||
if ui.selectable_value(&mut self.sheet, s.clone(), s).changed() {
|
||||
self.profile = "{}".into();
|
||||
self.profile_path = None;
|
||||
self.invalidate();
|
||||
self.status = "Ready to analyze selected sheet".into();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
};
|
||||
if choose_sheet {
|
||||
egui::Frame::new()
|
||||
.fill(Color32::from_rgb(54, 44, 26))
|
||||
.stroke(egui::Stroke::new(1.0_f32, Color32::from_rgb(235, 190, 95)))
|
||||
.corner_radius(4.0)
|
||||
.inner_margin(8.0)
|
||||
.show(ui, &mut picker);
|
||||
} else {
|
||||
picker(ui);
|
||||
}
|
||||
ui.add_space(12.0);
|
||||
self.general_options(ui);
|
||||
ui.add_space(12.0);
|
||||
|
|
@ -756,6 +790,12 @@ impl App {
|
|||
self.cancel.store(true, Ordering::Relaxed);
|
||||
}
|
||||
} else {
|
||||
if self.needs_sheet_choice() {
|
||||
ui.colored_label(
|
||||
Color32::from_rgb(235, 190, 95),
|
||||
"Choose a sheet in Setup to enable analysis.",
|
||||
);
|
||||
}
|
||||
if ui
|
||||
.add_enabled(
|
||||
!self.sheet.is_empty(),
|
||||
|
|
@ -839,7 +879,7 @@ mod tests {
|
|||
fn fixture() -> PathBuf {
|
||||
PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/fixtures/lunch.csv")
|
||||
}
|
||||
fn frame(app: &mut App, width: f32, height: f32) {
|
||||
fn frame(app: &mut App, width: f32, height: f32) -> Vec<String> {
|
||||
let ctx = egui::Context::default();
|
||||
configure_style(&ctx);
|
||||
let output = ctx.run(
|
||||
|
|
@ -852,7 +892,23 @@ mod tests {
|
|||
},
|
||||
|ctx| app.draw(ctx),
|
||||
);
|
||||
fn texts(shape: &egui::Shape, labels: &mut Vec<String>) {
|
||||
match shape {
|
||||
egui::Shape::Text(text) => labels.push(text.galley.job.text.clone()),
|
||||
egui::Shape::Vec(shapes) => {
|
||||
for shape in shapes {
|
||||
texts(shape, labels);
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
assert!(!output.shapes.is_empty());
|
||||
let mut labels = Vec::new();
|
||||
for shape in output.shapes {
|
||||
texts(&shape.shape, &mut labels);
|
||||
}
|
||||
labels
|
||||
}
|
||||
fn drop_file(app: &mut App, path: PathBuf) {
|
||||
let ctx = egui::Context::default();
|
||||
|
|
@ -926,6 +982,40 @@ mod tests {
|
|||
assert!(app.rx.is_some());
|
||||
wait(&mut app);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn multiple_sheets_focus_the_picker_and_explain_blocked_analysis() {
|
||||
let mut app = App::default();
|
||||
let mut first = reader::read(&fixture()).unwrap().remove(0);
|
||||
first.name = "Opening".into();
|
||||
let mut second = first.clone();
|
||||
second.name = "Closing".into();
|
||||
let tx = app.begin();
|
||||
tx.send(Update::Sheets(vec![first, second])).unwrap();
|
||||
app.receive();
|
||||
|
||||
assert!(app.needs_sheet_choice());
|
||||
assert_eq!(app.status, "Choose one of 2 workbook sheets to continue");
|
||||
let labels = frame(&mut app, 860.0, 620.0);
|
||||
assert!(labels.iter().any(|label| {
|
||||
label == "This workbook has 2 sheets. Choose the sheet to convert before continuing."
|
||||
}));
|
||||
assert!(
|
||||
labels
|
||||
.iter()
|
||||
.any(|label| label == "Choose a sheet in Setup to enable analysis.")
|
||||
);
|
||||
assert!(labels.iter().any(|label| label == "Choose a sheet…"));
|
||||
|
||||
app.sheet = "Opening".into();
|
||||
assert!(!app.needs_sheet_choice());
|
||||
let labels = frame(&mut app, 860.0, 620.0);
|
||||
assert!(
|
||||
!labels
|
||||
.iter()
|
||||
.any(|label| label.starts_with("This workbook has"))
|
||||
);
|
||||
}
|
||||
#[test]
|
||||
fn errors_cancellation_and_changed_inputs_invalidate_exports() {
|
||||
let mut app = App {
|
||||
|
|
|
|||
Loading…
Reference in New Issue