Merge branch 'feature/add-ratatui' into development

Author: setoelkahfi

Cargo.lock

@@ -9,6 +9,7 @@ chrono = "0.4"
 clap = "4.1.6"
 clap_mangen = "0.2.10"
 console = "0.16"
+crossterm = "0.28"
 dialoguer = "0.11.0"
 dirs = "6.0"
 
@@ -20,6 +21,7 @@ log = "0.4.14"
 maybe-async = "0.2"
 open = "5.3"
 openssl = { version = "0.10", features = ["vendored"] }
+ratatui = { version = "0.29", default-features = false, features = ["crossterm"] }
 regex = "1.11"
 reqwest = { version = "0.12.18", default-features = false }
 serde = "1"

Cargo.toml

@@ -27,6 +27,7 @@ chrono = { workspace = true }
 clap = { workspace = true, features = ["derive", "env"] }
 clap_mangen = { workspace = true }
 console = { workspace = true }
+crossterm = { workspace = true }
 dialoguer = { workspace = true }
 dirs = { workspace = true }
 
@@ -37,6 +38,7 @@ home = { workspace = true }
 indicatif = { workspace = true }
 log = { workspace = true }
 open = { workspace = true }
+ratatui = { workspace = true }
 regex = { workspace = true }
 reqwest = { workspace = true, features = ["json", "rustls-tls-native-roots"] }
 serde = { workspace = true, features = ["derive"] }

crates/cli/Cargo.toml

@@ -3,37 +3,13 @@ use crate::client;
 use crate::token::get_smb_token::get_smb_token;
 use crate::{
     cli::CommandResult,
-    ui::{fail_message, fail_symbol, succeed_message, succeed_symbol},
+    ui::{fail_message, fail_symbol, me_view::show_user_tui, succeed_message, succeed_symbol},
 };
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use smbcloud_auth::me::me;
-use smbcloud_model::account::User;
+
 use smbcloud_network::environment::Environment;
 use spinners::Spinner;
-use tabled::{Table, Tabled};
-
-#[derive(Tabled)]
-struct UserRow {
-    #[tabled(rename = "ID")]
-    id: i32,
-    #[tabled(rename = "Email")]
-    email: String,
-    #[tabled(rename = "Created At")]
-    created_at: String,
-    #[tabled(rename = "Updated At")]
-    updated_at: String,
-}
-
-fn show_user(user: &User) {
-    let row = UserRow {
-        id: user.id,
-        email: user.email.clone(),
-        created_at: user.created_at.format("%Y-%m-%d %H:%M:%S").to_string(),
-        updated_at: user.updated_at.format("%Y-%m-%d %H:%M:%S").to_string(),
-    };
-    let table = Table::new(vec![row]);
-    println!("{table}");
-}
 
 pub async fn process_me(env: Environment) -> Result<CommandResult> {
     if !is_logged_in(env) {
@@ -54,14 +30,14 @@ pub async fn process_me(env: Environment) -> Result<CommandResult> {
     match me(env, client(), &token).await {
         Ok(user) => {
             spinner.stop_and_persist(&succeed_symbol(), succeed_message("Loaded."));
-            show_user(&user);
+            show_user_tui(&user).map_err(|e| anyhow!(e))?;
             Ok(CommandResult {
                 spinner: Spinner::new(
                     spinners::Spinners::SimpleDotsScrolling,
                     succeed_message("Loading"),
                 ),
                 symbol: succeed_symbol(),
-                msg: succeed_message("User info loaded."),
+                msg: succeed_message("Done."),
             })
         }
         Err(e) => {

crates/cli/src/account/me/mod.rs

@@ -3,10 +3,12 @@ use crate::token::get_smb_token::get_smb_token;
 use crate::{
     account::lib::is_logged_in,
     cli::CommandResult,
-    ui::{fail_message, fail_symbol, succeed_message, succeed_symbol},
+    ui::{
+        confirm_dialog::confirm_delete_tui, fail_message, fail_symbol, succeed_message,
+        succeed_symbol,
+    },
 };
 use anyhow::{anyhow, Result};
-use dialoguer::{theme::ColorfulTheme, Input};
 use smbcloud_network::environment::Environment;
 use smbcloud_networking_project::crud_project_delete::delete_project;
 use spinners::Spinner;
@@ -16,17 +18,14 @@ pub async fn process_project_delete(env: Environment, id: String) -> Result<Comm
         return Err(anyhow!(fail_message("Please log in with `smb init`.")));
     }
 
-    let confirmation = Input::<String>::with_theme(&ColorfulTheme::default())
-        .with_prompt("Are you sure you want to delete this project? (y/n)")
-        .interact()
-        .unwrap();
+    let confirmed = confirm_delete_tui(&format!("Delete project #{id}")).map_err(|e| anyhow!(e))?;
 
     let spinner = Spinner::new(
         spinners::Spinners::SimpleDotsScrolling,
         succeed_message("Deleting project"),
     );
 
-    if confirmation != "y" {
+    if !confirmed {
         return Ok(CommandResult {
             spinner,
             symbol: succeed_symbol(),

crates/cli/src/project/crud_delete.rs

@@ -4,45 +4,17 @@ use crate::client;
 use crate::token::get_smb_token::get_smb_token;
 use crate::{
     cli::CommandResult,
-    ui::{fail_message, fail_symbol, succeed_message, succeed_symbol},
+    ui::{
+        fail_message, fail_symbol, project_detail_view::show_project_detail_tui,
+        project_table::show_projects_tui, succeed_message, succeed_symbol,
+    },
 };
 use anyhow::{anyhow, Result};
 use log::debug;
 use smbcloud_model::project::{Config, Project};
 use smbcloud_network::environment::Environment;
 use smbcloud_networking_project::crud_project_read::{get_project, get_projects};
 use spinners::Spinner;
-use tabled::{Table, Tabled};
-
-#[derive(Tabled)]
-struct ProjectRow {
-    #[tabled(rename = "ID")]
-    id: i32,
-    #[tabled(rename = "Name")]
-    name: String,
-    #[tabled(rename = "Runner")]
-    runner: String,
-    #[tabled(rename = "Repository")]
-    repository: String,
-    #[tabled(rename = "Description")]
-    description: String,
-}
-
-#[derive(Tabled)]
-struct ProjectDetailRow {
-    #[tabled(rename = "ID")]
-    id: i32,
-    #[tabled(rename = "Name")]
-    name: String,
-    #[tabled(rename = "Repository")]
-    repository: String,
-    #[tabled(rename = "Description")]
-    description: String,
-    #[tabled(rename = "Created at")]
-    created_at: String,
-    #[tabled(rename = "Updated at")]
-    updated_at: String,
-}
 
 pub async fn process_project_list(env: Environment) -> Result<CommandResult> {
     let mut spinner = Spinner::new(
@@ -56,9 +28,9 @@ pub async fn process_project_list(env: Environment) -> Result<CommandResult> {
             let msg = if projects.is_empty() {
                 succeed_message("No projects found.")
             } else {
-                succeed_message("Showing all projects.")
+                succeed_message("Done.")
             };
-            show_projects(projects);
+            show_projects(projects)?;
             Ok(CommandResult {
                 spinner: Spinner::new(
                     spinners::Spinners::SimpleDotsScrolling,
@@ -89,7 +61,7 @@ pub async fn process_project_show(env: Environment, id: String) -> Result<Comman
         Ok(project) => {
             spinner.stop_and_persist(&succeed_symbol(), succeed_message("Loaded."));
             let message = succeed_message(&format!("Showing project {}.", &project.name));
-            show_project_detail(&project);
+            show_project_detail(&project)?;
             Ok(CommandResult {
                 spinner: Spinner::new(
                     spinners::Spinners::SimpleDotsScrolling,
@@ -106,35 +78,15 @@ pub async fn process_project_show(env: Environment, id: String) -> Result<Comman
     }
 }
 
-pub(crate) fn show_projects(projects: Vec<Project>) {
+pub(crate) fn show_projects(projects: Vec<Project>) -> Result<()> {
     if projects.is_empty() {
-        return;
+        return Ok(());
     }
-    let rows: Vec<ProjectRow> = projects
-        .into_iter()
-        .map(|p| ProjectRow {
-            id: p.id,
-            name: p.name,
-            runner: p.runner.to_string(),
-            repository: p.repository.unwrap_or("-".to_string()),
-            description: p.description.unwrap_or("-".to_owned()),
-        })
-        .collect();
-    let table = Table::new(rows);
-    println!("{table}");
+    show_projects_tui(projects).map_err(|e| anyhow!(e))
 }
 
-pub(crate) fn show_project_detail(project: &Project) {
-    let row = ProjectDetailRow {
-        id: project.id,
-        name: project.name.clone(),
-        repository: project.repository.clone().unwrap_or("-".to_owned()),
-        description: project.description.clone().unwrap_or("-".to_owned()),
-        created_at: project.created_at.date_naive().to_string(),
-        updated_at: project.updated_at.date_naive().to_string(),
-    };
-    let table = Table::new(vec![row]);
-    println!("{table}");
+pub(crate) fn show_project_detail(project: &Project) -> Result<()> {
+    show_project_detail_tui(project).map_err(|e| anyhow!(e))
 }
 
 pub(crate) async fn process_project_use(env: Environment, id: String) -> Result<CommandResult> {

crates/cli/src/project/crud_read.rs

@@ -3,14 +3,15 @@ use crate::token::get_smb_token::get_smb_token;
 use crate::{
     cli::CommandResult,
     deploy::config::{check_project, get_config},
-    ui::{succeed_message, succeed_symbol},
+    ui::{
+        deployment_detail_view::show_deployment_detail_tui, deployment_table::show_deployments_tui,
+        succeed_message, succeed_symbol,
+    },
 };
-use anyhow::Result;
-use smbcloud_model::project::Deployment;
+use anyhow::{anyhow, Result};
 use smbcloud_network::environment::Environment;
 use smbcloud_networking_project::crud_project_deployment_read::{get_deployment, get_deployments};
 use spinners::Spinner;
-use tabled::{Table, Tabled};
 
 pub(crate) async fn process_deployment(
     env: Environment,
@@ -37,13 +38,13 @@ pub(crate) async fn process_deployment(
         )
         .await?;
         spinner.stop_and_persist(&succeed_symbol(), succeed_message("Loaded"));
-        show_deployment_detail(&deployment);
+        show_deployment_detail_tui(&deployment).map_err(|e| anyhow!(e))?;
     } else {
         // List all deployments for the project
         let access_token = get_smb_token(env)?;
         let deployments = get_deployments(env, client(), access_token, config.project.id).await?;
         spinner.stop_and_persist(&succeed_symbol(), succeed_message("Load all deployments"));
-        show_project_deployments(&deployments);
+        show_deployments_tui(deployments).map_err(|e| anyhow!(e))?;
     };
 
     Ok(CommandResult {
@@ -52,61 +53,3 @@ pub(crate) async fn process_deployment(
         msg: succeed_message("Loaded"),
     })
 }
-
-// Helper struct for table display
-#[derive(Tabled)]
-struct DeploymentRow {
-    id: i32,
-    commit_hash: String,
-    status: String, // Keep as String, but populate with Display trait output + Debug output
-}
-
-pub fn show_project_deployments(deployments: &[Deployment]) {
-    let rows: Vec<DeploymentRow> = deployments
-        .iter()
-        .map(|d| DeploymentRow {
-            id: d.id,
-            commit_hash: d.commit_hash.clone(),
-            status: format!("{} {:?}", d.status, d.status), // Use Display for emoji and Debug for text
-        })
-        .collect();
-
-    let table = Table::new(rows);
-    println!("{table}");
-}
-
-pub fn show_deployment_detail(deployment: &Deployment) {
-    #[derive(Tabled)]
-    struct Detail {
-        #[tabled(rename = "ID")]
-        id: i32,
-        #[tabled(rename = "Project ID")]
-        project_id: i32,
-        #[tabled(rename = "Commit Hash")]
-        commit_hash: String,
-        #[tabled(rename = "Status")]
-        status: String,
-        #[tabled(rename = "Created At")]
-        created_at: String,
-        #[tabled(rename = "Updated At")]
-        updated_at: String,
-    }
-
-    let row = Detail {
-        id: deployment.id,
-        project_id: deployment.project_id,
-        commit_hash: deployment.commit_hash.clone(),
-        status: format!("{} {:?}", deployment.status, deployment.status), // Use Display for emoji and Debug for text
-        created_at: deployment
-            .created_at
-            .format("%Y-%m-%d %H:%M:%S")
-            .to_string(),
-        updated_at: deployment
-            .updated_at
-            .format("%Y-%m-%d %H:%M:%S")
-            .to_string(),
-    };
-
-    let table = Table::new(vec![row]);
-    println!("{table}");
-}