router4 compiled
This commit is contained in:
@@ -369,7 +369,7 @@ impl EventHandler {
|
||||
|
||||
match current_mode {
|
||||
AppMode::General => {
|
||||
if let Page::Admin(admin_state) = &router.current {
|
||||
if let Page::Admin(admin_state) = &mut router.current {
|
||||
if auth_state.role.as_deref() == Some("admin") {
|
||||
if admin_nav::handle_admin_navigation(
|
||||
key_event,
|
||||
@@ -386,24 +386,22 @@ impl EventHandler {
|
||||
}
|
||||
}
|
||||
|
||||
if let Page::AddLogic(add_logic_state) = &mut router.current {
|
||||
let client_clone = self.grpc_client.clone();
|
||||
let sender_clone = self.save_logic_result_sender.clone();
|
||||
if add_logic_nav::handle_add_logic_navigation(
|
||||
key_event,
|
||||
config,
|
||||
app_state,
|
||||
add_logic_state,
|
||||
&mut self.is_edit_mode,
|
||||
buffer_state,
|
||||
client_clone,
|
||||
sender_clone,
|
||||
&mut self.command_message,
|
||||
) {
|
||||
return Ok(EventOutcome::Ok(
|
||||
let client_clone = self.grpc_client.clone();
|
||||
let sender_clone = self.save_logic_result_sender.clone();
|
||||
if add_logic_nav::handle_add_logic_navigation(
|
||||
key_event,
|
||||
config,
|
||||
app_state,
|
||||
&mut self.is_edit_mode,
|
||||
buffer_state,
|
||||
client_clone,
|
||||
sender_clone,
|
||||
&mut self.command_message,
|
||||
router,
|
||||
) {
|
||||
return Ok(EventOutcome::Ok(
|
||||
self.command_message.clone(),
|
||||
));
|
||||
}
|
||||
));
|
||||
}
|
||||
|
||||
if let Page::AddTable(add_table_state) = &mut router.current {
|
||||
@@ -443,7 +441,7 @@ impl EventHandler {
|
||||
buffer_state,
|
||||
index,
|
||||
);
|
||||
if let Page::Admin(admin_state) = &router.current {
|
||||
if let Page::Admin(admin_state) = &mut router.current {
|
||||
if !app_state
|
||||
.profile_tree
|
||||
.profiles
|
||||
@@ -457,7 +455,7 @@ impl EventHandler {
|
||||
format!("Intro Option {} selected", index)
|
||||
}
|
||||
UiContext::Login => {
|
||||
if let Page::Login(login_state) = &router.current {
|
||||
if let Page::Login(login_state) = &mut router.current {
|
||||
match index {
|
||||
0 => login::initiate_login(
|
||||
login_state,
|
||||
@@ -478,7 +476,7 @@ impl EventHandler {
|
||||
}
|
||||
}
|
||||
UiContext::Register => {
|
||||
if let Page::Register(register_state) = &router.current {
|
||||
if let Page::Register(register_state) = &mut router.current {
|
||||
match index {
|
||||
0 => register::initiate_registration(
|
||||
register_state,
|
||||
@@ -807,7 +805,7 @@ impl EventHandler {
|
||||
) -> Result<EventOutcome> {
|
||||
match action {
|
||||
"save" => {
|
||||
if let Page::Login(login_state) = &router.current {
|
||||
if let Page::Login(login_state) = &mut router.current {
|
||||
let message = crate::tui::functions::common::login::save(
|
||||
auth_state,
|
||||
login_state,
|
||||
@@ -844,7 +842,7 @@ impl EventHandler {
|
||||
))
|
||||
}
|
||||
"save_and_quit" => {
|
||||
let message = if let Page::Login(login_state) = &router.current {
|
||||
let message = if let Page::Login(login_state) = &mut router.current {
|
||||
crate::tui::functions::common::login::save(
|
||||
auth_state,
|
||||
login_state,
|
||||
@@ -873,10 +871,10 @@ impl EventHandler {
|
||||
)))
|
||||
}
|
||||
"revert" => {
|
||||
let message = if let Page::Login(login_state) = &router.current {
|
||||
let message = if let Page::Login(login_state) = &mut router.current {
|
||||
crate::tui::functions::common::login::revert(login_state, app_state)
|
||||
.await
|
||||
} else if let Page::Register(register_state) = &router.current {
|
||||
} else if let Page::Register(register_state) = &mut router.current {
|
||||
crate::tui::functions::common::register::revert(
|
||||
register_state,
|
||||
app_state,
|
||||
|
||||
Reference in New Issue
Block a user