Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/projects/create.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ fn is_conflict_error(err: &anyhow::Error) -> bool {
})
}

pub async fn run(client: &ApiClient, name: Option<&str>) -> Result<()> {
pub async fn run(client: &ApiClient, name: Option<&str>, json: bool) -> Result<()> {
let name = match name {
Some(n) if !n.is_empty() => n.to_string(),
_ => {
Expand All @@ -77,7 +77,11 @@ pub async fn run(client: &ApiClient, name: Option<&str>) -> Result<()> {
};

match create_project_checked(client, &name).await {
Ok(CreateProjectOutcome::Created(_)) => {
Ok(CreateProjectOutcome::Created(project)) => {
if json {
println!("{}", serde_json::to_string(&project)?);
return Ok(());
}
print_command_status(
CommandStatus::Success,
&format!("Successfully created '{name}'"),
Expand Down
21 changes: 20 additions & 1 deletion src/projects/delete.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::ui::{

use super::api;

pub async fn run(client: &ApiClient, name: Option<&str>, force: bool) -> Result<()> {
pub async fn run(client: &ApiClient, name: Option<&str>, force: bool, json: bool) -> Result<()> {
if force && name.is_none() {
bail!("project name required when using --force. Use: bt projects delete <name> --force");
}
Expand All @@ -33,6 +33,15 @@ pub async fn run(client: &ApiClient, name: Option<&str>, force: bool) -> Result<
.interact()?;

if !confirm {
if json {
println!(
"{}",
serde_json::to_string(&serde_json::json!({
"deleted": false,
"project": project,
}))?
);
}
return Ok(());
}
}
Expand All @@ -44,6 +53,16 @@ pub async fn run(client: &ApiClient, name: Option<&str>, force: bool) -> Result<
.await
{
Ok(_) => {
if json {
Comment thread
Qard marked this conversation as resolved.
println!(
"{}",
serde_json::to_string(&serde_json::json!({
"deleted": true,
"project": project,
}))?
);
return Ok(());
}
print_command_status(
CommandStatus::Success,
&format!("Deleted '{}'", project.name),
Expand Down
10 changes: 7 additions & 3 deletions src/projects/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,14 @@ pub async fn run(base: BaseArgs, args: ProjectsArgs) -> Result<()> {

match args.command {
None | Some(ProjectsCommands::List) => list::run(&client, &org_name, base.json).await,
Some(ProjectsCommands::Create(a)) => create::run(&client, a.name.as_deref()).await,
Some(ProjectsCommands::Create(a)) => {
create::run(&client, a.name.as_deref(), base.json).await
}
Some(ProjectsCommands::View(a)) => {
view::run(&client, &ctx.app_url, &org_name, a.name()).await
view::run(&client, &ctx.app_url, &org_name, a.name(), base.json).await
}
Some(ProjectsCommands::Delete(a)) => {
delete::run(&client, a.name.as_deref(), a.force, base.json).await
}
Some(ProjectsCommands::Delete(a)) => delete::run(&client, a.name.as_deref(), a.force).await,
}
}
23 changes: 12 additions & 11 deletions src/projects/view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,26 @@ pub async fn run(
app_url: &str,
org_name: &str,
name: Option<&str>,
json: bool,
) -> Result<()> {
let project_name = match name {
Some(n) => {
with_spinner("Loading project...", api::get_project_by_name(client, n))
.await?
.ok_or_else(|| anyhow::anyhow!("project '{n}' not found"))?
.name
}
let project = match name {
Some(n) => with_spinner("Loading project...", api::get_project_by_name(client, n))
.await?
.ok_or_else(|| anyhow::anyhow!("project '{n}' not found"))?,
None => {
if !is_interactive() {
bail!("project name required. Use: bt projects view <name>")
}
select_project(client, None, None, ProjectSelectMode::ExistingOnly)
.await?
.name
select_project(client, None, None, ProjectSelectMode::ExistingOnly).await?
}
};

let url = app_project_url(app_url, org_name, &project_name, &[]);
if json {
println!("{}", serde_json::to_string(&project)?);
return Ok(());
}

let url = app_project_url(app_url, org_name, &project.name, &[]);

open::that(&url)?;
print_command_status(CommandStatus::Success, &format!("Opened {url} in browser"));
Expand Down
Loading