add logic now using general movement
This commit is contained in:
@@ -321,18 +321,6 @@ impl EventHandler {
|
||||
if !outcome.get_message_if_ok().is_empty() {
|
||||
return Ok(outcome);
|
||||
}
|
||||
} else if let Page::AddLogic(add_logic_page) = &mut router.current {
|
||||
let outcome = add_logic::event::handle_add_logic_event(
|
||||
event,
|
||||
config,
|
||||
app_state,
|
||||
add_logic_page,
|
||||
self.grpc_client.clone(),
|
||||
self.save_logic_result_sender.clone(),
|
||||
)?;
|
||||
if !outcome.get_message_if_ok().is_empty() {
|
||||
return Ok(outcome);
|
||||
}
|
||||
} else if let Page::Form(path) = &router.current {
|
||||
let outcome = forms::event::handle_form_event(
|
||||
event,
|
||||
@@ -497,6 +485,22 @@ impl EventHandler {
|
||||
return Ok(EventOutcome::Ok(self.command_message.clone()));
|
||||
}
|
||||
}
|
||||
if let Page::AddLogic(add_logic_page) = &mut router.current {
|
||||
let client_clone = self.grpc_client.clone();
|
||||
let sender_clone = self.save_logic_result_sender.clone();
|
||||
if add_logic::event::handle_add_logic_event(
|
||||
key_event,
|
||||
movement_action,
|
||||
config,
|
||||
app_state,
|
||||
add_logic_page,
|
||||
client_clone,
|
||||
sender_clone,
|
||||
&mut self.command_message,
|
||||
) {
|
||||
return Ok(EventOutcome::Ok(self.command_message.clone()));
|
||||
}
|
||||
}
|
||||
|
||||
// Generic navigation for the rest (Intro/Login/Register/Form)
|
||||
let nav_outcome = if matches!(&router.current, Page::AddTable(_) | Page::AddLogic(_)) {
|
||||
|
||||
Reference in New Issue
Block a user