starred/yaak
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-03-27 11:51:29 +01:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Some fixes around environments

Browse Source
This commit is contained in:
Gregory Schier
2024-12-21 11:04:49 -08:00
parent c1d5881167
commit 61d094d9fd
20 changed files with 95 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src-tauri/yaak_models/src/queries.rs
View File

@@ -152,6 +152,7 @@ pub async fn list_workspaces<R: Runtime>(mgr: &impl Manager<R>) -> Result<Vec<Wo
let (sql, params) = Query::select()
.from(WorkspaceIden::Table)
.column(Asterisk)
.order_by(WorkspaceIden::Name, Order::Asc)
.build_rusqlite(SqliteQueryBuilder);
let mut stmt = db.prepare(sql.as_str())?;
let items = stmt.query_map(&*params.as_params(), |row| row.try_into())?;
@@ -746,7 +747,7 @@ pub async fn list_environments<R: Runtime>(
.from(EnvironmentIden::Table)
.cond_where(Expr::col(EnvironmentIden::WorkspaceId).eq(workspace_id))
.column(Asterisk)
.order_by(EnvironmentIden::CreatedAt, Order::Desc)
.order_by(EnvironmentIden::Name, Order::Asc)
.build_rusqlite(SqliteQueryBuilder);
let mut stmt = db.prepare(sql.as_str())?;
let items = stmt.query_map(&*params.as_params(), |row| row.try_into())?;
@@ -757,6 +758,7 @@ pub async fn list_environments<R: Runtime>(
environments.iter().find(|e| e.environment_id == None && e.workspace_id == workspace_id);
if let None = base_environment {
info!("Creating base environment for {workspace_id}");
let base_environment = upsert_environment(
window,
Environment {
@@ -766,7 +768,6 @@ pub async fn list_environments<R: Runtime>(
},
)
.await?;
info!("Created base environment for {workspace_id}");
environments.push(base_environment);
}