fix(cli): stdout out of order for Confirm

Author: michael-0acf4

meta-cli/src/deploy/actors/console/input.rs

@@ -122,10 +122,9 @@ impl Confirm {
     ) -> Result<bool> {
         let mut retry_left = self.max_retry_count as isize;
 
-        eprintln!("{} {}", "[confirm]".yellow(), self.prompt);
-
         loop {
-            eprint!("(y/N)> ");
+            self.console
+                .error(format!("{} {} (y/N)", "[confirm]".yellow(), self.prompt));
 
             let input = self.console.read_line().await;
 

meta-cli/src/deploy/push/migration_resolution.rs

@@ -7,14 +7,41 @@ use actix::prelude::*;
 use anyhow::Result;
 use colored::Colorize;
 
-use crate::deploy::actors::{
-    console::{
-        input::{OptionLabel, SelectOption},
-        Console, ConsoleActor,
+use crate::{
+    com::{responses::SDKResponse, store::ServerStore},
+    deploy::actors::{
+        console::{
+            input::{ConfirmHandler, OptionLabel, SelectOption},
+            Console, ConsoleActor,
+        },
+        loader::{LoadModule, LoaderActor},
     },
-    loader::{LoadModule, LoaderActor},
 };
 
+// DatabaseReset failure
+
+#[derive(Debug)]
+pub struct ConfirmDatabaseResetRequired {
+    pub sdk_response: SDKResponse,
+    pub loader: Addr<LoaderActor>,
+}
+
+impl ConfirmHandler for ConfirmDatabaseResetRequired {
+    fn on_confirm(&self) {
+        let tg_path = self.sdk_response.clone().typegraph_path;
+
+        // reset
+        let mut option = ServerStore::get_migration_action(&tg_path);
+        option.reset = true;
+        ServerStore::set_migration_action(tg_path.clone(), option);
+
+        // reload
+        self.loader.do_send(LoadModule(tg_path.into()));
+    }
+}
+
+// NullConstraintViolation failure
+
 #[derive(Debug)]
 pub struct ForceReset {
     pub loader: Addr<LoaderActor>,

meta-cli/src/deploy/push/pusher.rs

@@ -13,14 +13,14 @@ use anyhow::Result;
 use serde::Deserialize;
 
 use crate::com::{responses::SDKResponse, store::ServerStore};
-use crate::deploy::actors::console::input::{Confirm, ConfirmHandler, Select};
+use crate::deploy::actors::console::input::{Confirm, Select};
 use crate::deploy::actors::console::{Console, ConsoleActor};
-use crate::deploy::actors::loader::{LoadModule, LoaderActor};
+use crate::deploy::actors::loader::LoaderActor;
 use crate::deploy::push::migration_resolution::{ManualResolution, RemoveLatestMigration};
 
 use lazy_static::lazy_static;
 
-use super::migration_resolution::ForceReset;
+use super::migration_resolution::{ConfirmDatabaseResetRequired, ForceReset};
 
 #[derive(Deserialize, Debug)]
 #[serde(rename_all = "snake_case")]
@@ -208,26 +208,6 @@ impl PushResult {
 
 // DatabaseReset Handler + interactivity
 
-#[derive(Debug)]
-struct ConfirmDatabaseResetRequired {
-    sdk_response: SDKResponse,
-    loader: Addr<LoaderActor>,
-}
-
-impl ConfirmHandler for ConfirmDatabaseResetRequired {
-    fn on_confirm(&self) {
-        let tg_path = self.sdk_response.clone().typegraph_path;
-
-        // reset
-        let mut option = ServerStore::get_migration_action(&tg_path);
-        option.reset = true;
-        ServerStore::set_migration_action(tg_path.clone(), option);
-
-        // reload
-        self.loader.do_send(LoadModule(tg_path.into()));
-    }
-}
-
 async fn handle_database_reset(
     console: Addr<ConsoleActor>,
     loader: Addr<LoaderActor>,