feat: update to move cmd

Cargo.toml

@@ -66,7 +66,7 @@ async-compression = { version = "0.4", features = ["tokio", "gzip"] }
 
 # *nix only deps
 [target.'cfg(all(not(windows), not(macos)))'.dependencies]
-hop = { version = "0.1.9", features = [
+hop = { version = "0.1", features = [
     "chrono",
     "rustls-tls-webpki-roots",
 ], default-features = false }

src/commands/ignite/groups/mod.rs

@@ -1,7 +1,7 @@
-mod add;
 mod create;
 mod delete;
 mod list;
+mod r#move;
 pub mod utils;
 
 use anyhow::Result;
@@ -15,8 +15,8 @@ pub enum Commands {
     Create(create::Options),
     #[clap(name = "rm", alias = "delete")]
     Delete(delete::Options),
-    #[clap(name = "add", alias = "add-deployment")]
-    Add(add::Options),
+    #[clap(name = "move", alias = "add-deployment", alias = "add")]
+    Move(r#move::Options),
     List(list::Options),
 }
 
@@ -32,7 +32,7 @@ pub async fn handle(options: Options, state: State) -> Result<()> {
     match options.commands {
         Commands::Create(options) => create::handle(options, state).await,
         Commands::Delete(options) => delete::handle(options, state).await,
-        Commands::Add(options) => add::handle(options, state).await,
+        Commands::Move(options) => r#move::handle(options, state).await,
         Commands::List(options) => list::handle(options, state).await,
     }
 }

src/commands/ignite/groups/add.rs → src/commands/ignite/groups/move.rs

@@ -1,15 +1,17 @@
 use anyhow::{ensure, Result};
 use clap::Parser;
+use console::style;
 
 use crate::commands::ignite::groups::utils::{fetch_grouped_deployments, format_groups};
+use crate::commands::ignite::utils::get_deployment;
 use crate::config::EXEC_NAME;
 use crate::state::State;
 
 #[derive(Debug, Parser)]
-#[clap(about = "Add a deployment to an Ignite group")]
+#[clap(about = "Move a Deployment to a group")]
 #[group(skip)]
 pub struct Options {
-    #[clap(help = "The ID of the group")]
+    #[clap(help = "The ID of the group, or \"none\" to remove from a group")]
     pub group: Option<String>,
     #[clap(help = "Deployment ID to add")]
     pub deployment: Option<String>,
@@ -18,29 +20,8 @@ pub struct Options {
 pub async fn handle(options: Options, state: State) -> Result<()> {
     let project = state.ctx.current_project_error()?;
 
-    let group = if let Some(group) = options.group {
-        group
-    } else {
-        let mut groups = state.hop.ignite.groups.get_all(&project.id).await?;
-
-        ensure!(
-            !groups.is_empty(),
-            "No groups found, create one with `{EXEC_NAME} ignite groups create`"
-        );
-
-        groups.sort_unstable_by_key(|group| group.position);
-
-        let dialoguer_groups = dialoguer::Select::new()
-            .with_prompt("Select group")
-            .default(0)
-            .items(&format_groups(&groups)?)
-            .interact()?;
-
-        groups[dialoguer_groups].id.clone()
-    };
-
-    let deployments = if let Some(deployment) = options.deployment {
-        deployment
+    let deployment = if let Some(deployment) = options.deployment {
+        get_deployment(&state.http, &deployment).await?
     } else {
         let (deployments_fmt, deployments, validator) =
             fetch_grouped_deployments(&state, false, true).await?;
@@ -59,14 +40,49 @@ pub async fn handle(options: Options, state: State) -> Result<()> {
             console::Term::stderr().clear_last_lines(1)?
         };
 
-        deployments[idx].id.clone()
+        deployments[idx].to_owned()
+    };
+
+    let group = if let Some(group) = options.group {
+        if group.is_empty() || ["none", "null"].contains(&group.to_lowercase().as_str()) {
+            None
+        } else {
+            Some(group)
+        }
+    } else {
+        let mut groups = state.hop.ignite.groups.get_all(&project.id).await?;
+
+        ensure!(
+            !groups.is_empty(),
+            "No groups found, create one with `{EXEC_NAME} ignite groups create`"
+        );
+
+        groups.sort_unstable_by_key(|group| group.position);
+
+        let mut formated = format_groups(&groups)?;
+
+        if deployment.group_id.is_some() {
+            formated.push(style("None (remove from a group)").white().to_string());
+        }
+
+        let dialoguer_groups = dialoguer::Select::new()
+            .with_prompt("Select group")
+            .default(0)
+            .items(&formated)
+            .interact()?;
+
+        if dialoguer_groups == groups.len() - 1 {
+            None
+        } else {
+            Some(groups[dialoguer_groups].id.clone())
+        }
     };
 
     state
         .hop
         .ignite
         .groups
-        .add_deployment(&group, &deployments)
+        .move_deployment(group.as_deref(), &deployment.id)
         .await?;
 
     log::info!("Added deployment to group");