Ajoute l'URL du repo sur les projets
Colonne projects.repo_url (migration 0003), exposée par l'API (repo_url à la création, "" ou null pour l'effacer) et éditable sur la page clients ; une icône ouvre le repo dans un nouvel onglet. Seules les URL http(s) sont acceptées. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
9e136bd208
commit
63ddfd39d9
11 files changed
+126
-8
No files matched your search
@@ -25,6 +25,8 @@ pub struct Project {
|
||||
pub color: Option<String>,
|
||||
/// `color`, or the client's color.
|
||||
pub effective_color: String,
|
||||
/// Link to the source repository.
|
||||
pub repo_url: Option<String>,
|
||||
pub archived: bool,
|
||||
pub created_at: DateTime<Utc>,
|
||||
}
|
||||
@@ -97,6 +99,9 @@ pub struct NameInput {
|
||||
/// `#rrggbb`. Clients get one from the palette, projects inherit their client's.
|
||||
#[serde(default)]
|
||||
pub color: Option<String>,
|
||||
/// Projects only: `http(s)://` link to the source repository.
|
||||
#[serde(default)]
|
||||
pub repo_url: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Default, Deserialize)]
|
||||
@@ -106,6 +111,9 @@ pub struct UpdateInput {
|
||||
/// Absent: unchanged. `null`: reset to the client's color (projects only).
|
||||
#[serde(default, deserialize_with = "present")]
|
||||
pub color: Option<Option<String>>,
|
||||
/// Projects only. Absent: unchanged. `null` or `""`: removed.
|
||||
#[serde(default, deserialize_with = "present")]
|
||||
pub repo_url: Option<Option<String>>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
|
||||
@@ -33,6 +33,22 @@ fn clean_color(color: &str) -> AppResult<String> {
|
||||
Ok(color.to_ascii_lowercase())
|
||||
}
|
||||
|
||||
/// Validates an optional repository URL; blank means none.
|
||||
fn clean_repo_url(url: &str) -> AppResult<Option<String>> {
|
||||
let url = url.trim();
|
||||
if url.is_empty() {
|
||||
return Ok(None);
|
||||
}
|
||||
let valid = (url.starts_with("https://") || url.starts_with("http://"))
|
||||
&& !url.contains(char::is_whitespace);
|
||||
if !valid {
|
||||
return Err(AppError::Validation(format!(
|
||||
"URL du repo invalide « {url} » (doit commencer par http:// ou https://)"
|
||||
)));
|
||||
}
|
||||
Ok(Some(url.to_owned()))
|
||||
}
|
||||
|
||||
/// Maps "zero rows affected" to `NotFound`.
|
||||
fn affected(result: sqlx::sqlite::SqliteQueryResult) -> AppResult<()> {
|
||||
if result.rows_affected() == 0 {
|
||||
|
||||
+16
-4
@@ -1,12 +1,13 @@
|
||||
use sqlx::SqlitePool;
|
||||
|
||||
use super::{affected, clean_color, clean_name};
|
||||
use super::{affected, clean_color, clean_name, clean_repo_url};
|
||||
use crate::clock;
|
||||
use crate::error::{AppError, AppResult};
|
||||
use crate::models::{Project, UpdateInput};
|
||||
|
||||
const SELECT: &str = "SELECT p.id, p.client_id, c.name AS client_name, p.name,
|
||||
p.color, COALESCE(p.color, c.color) AS effective_color, p.archived, p.created_at
|
||||
p.color, COALESCE(p.color, c.color) AS effective_color, p.repo_url, p.archived,
|
||||
p.created_at
|
||||
FROM projects p JOIN clients c ON c.id = p.client_id";
|
||||
|
||||
/// Lists projects, optionally for one client. Archived projects (or projects of
|
||||
@@ -40,17 +41,21 @@ pub async fn create(
|
||||
client_id: i64,
|
||||
name: &str,
|
||||
color: Option<&str>,
|
||||
repo_url: Option<&str>,
|
||||
) -> AppResult<Project> {
|
||||
let name = clean_name(name)?;
|
||||
let color = color.map(clean_color).transpose()?;
|
||||
let repo_url = repo_url.map(clean_repo_url).transpose()?.flatten();
|
||||
// Surface a missing client as 404 rather than a foreign key error.
|
||||
super::clients::get(pool, client_id).await?;
|
||||
let id = sqlx::query(
|
||||
"INSERT INTO projects (client_id, name, color, created_at) VALUES (?1, ?2, ?3, ?4)",
|
||||
"INSERT INTO projects (client_id, name, color, repo_url, created_at)
|
||||
VALUES (?1, ?2, ?3, ?4, ?5)",
|
||||
)
|
||||
.bind(client_id)
|
||||
.bind(name)
|
||||
.bind(color)
|
||||
.bind(repo_url)
|
||||
.bind(clock::ts(&clock::now()))
|
||||
.execute(pool)
|
||||
.await?
|
||||
@@ -64,10 +69,15 @@ pub async fn update(pool: &SqlitePool, id: i64, input: &UpdateInput) -> AppResul
|
||||
Some(Some(c)) => Some(clean_color(c)?),
|
||||
_ => None,
|
||||
};
|
||||
let repo_url = match &input.repo_url {
|
||||
Some(Some(u)) => clean_repo_url(u)?,
|
||||
_ => None,
|
||||
};
|
||||
affected(
|
||||
sqlx::query(
|
||||
"UPDATE projects SET name = COALESCE(?2, name), archived = COALESCE(?3, archived),
|
||||
color = CASE WHEN ?4 THEN ?5 ELSE color END
|
||||
color = CASE WHEN ?4 THEN ?5 ELSE color END,
|
||||
repo_url = CASE WHEN ?6 THEN ?7 ELSE repo_url END
|
||||
WHERE id = ?1",
|
||||
)
|
||||
.bind(id)
|
||||
@@ -75,6 +85,8 @@ pub async fn update(pool: &SqlitePool, id: i64, input: &UpdateInput) -> AppResul
|
||||
.bind(input.archived)
|
||||
.bind(input.color.is_some())
|
||||
.bind(color)
|
||||
.bind(input.repo_url.is_some())
|
||||
.bind(repo_url)
|
||||
.execute(pool)
|
||||
.await?,
|
||||
)?;
|
||||
|
||||
+10
-1
@@ -90,7 +90,16 @@ async fn create_project(
|
||||
) -> AppResult<(StatusCode, Json<Project>)> {
|
||||
Ok((
|
||||
StatusCode::CREATED,
|
||||
Json(projects::create(&pool, client_id, &input.name, input.color.as_deref()).await?),
|
||||
Json(
|
||||
projects::create(
|
||||
&pool,
|
||||
client_id,
|
||||
&input.name,
|
||||
input.color.as_deref(),
|
||||
input.repo_url.as_deref(),
|
||||
)
|
||||
.await?,
|
||||
),
|
||||
))
|
||||
}
|
||||
|
||||
|
||||
+12
-1
@@ -417,6 +417,9 @@ struct ItemForm {
|
||||
/// Projects only: go back to the client's color.
|
||||
#[serde(default)]
|
||||
inherit: bool,
|
||||
/// Projects only; blank removes it.
|
||||
#[serde(default)]
|
||||
repo_url: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
@@ -476,7 +479,14 @@ async fn create_project(
|
||||
// The color picker is prefilled with the client's color: keeping it means inheriting.
|
||||
let client = clients::get(&pool, client_id).await?;
|
||||
let color = f.color.filter(|c| !c.eq_ignore_ascii_case(&client.color));
|
||||
projects::create(&pool, client_id, &f.name, color.as_deref()).await?;
|
||||
projects::create(
|
||||
&pool,
|
||||
client_id,
|
||||
&f.name,
|
||||
color.as_deref(),
|
||||
f.repo_url.as_deref(),
|
||||
)
|
||||
.await?;
|
||||
back_to_clients()
|
||||
}
|
||||
|
||||
@@ -497,6 +507,7 @@ async fn save_project(
|
||||
let input = UpdateInput {
|
||||
name: Some(f.name),
|
||||
color,
|
||||
repo_url: f.repo_url.map(Some),
|
||||
..Default::default()
|
||||
};
|
||||
projects::update(&pool, id, &input).await?;
|
||||
|
||||
Reference in new issue
Block a user