Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
45503de195 | ||
|
|
486c49d50b |
No files matched your search
@@ -3,6 +3,16 @@
|
|||||||
All notable changes to CodeCraft. Versions follow [Semantic Versioning](https://semver.org/);
|
All notable changes to CodeCraft. Versions follow [Semantic Versioning](https://semver.org/);
|
||||||
until 1.0, minor versions may contain breaking changes.
|
until 1.0, minor versions may contain breaking changes.
|
||||||
|
|
||||||
|
## [v202611-00062] – 2026-11-18
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- **Factory: remove issues from the board** – a "Remove from board" button for issues that are not running, and issues deleted on the forge (404) disappear from the board by themselves at the next poll.
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- **Factory: the "parallel" limit was exceeded** – phases were counted by their run rows, which appear only after the checkout, so one poll could start more phases than allowed (2 allowed, 4 running). They are now counted by issue state, which is set before a phase starts.
|
||||||
|
|
||||||
## [v202611-00061] – 2026-11-18
|
## [v202611-00061] – 2026-11-18
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<img alt="Version v202611-00061" src="https://img.shields.io/badge/version-v202611--00061-d69e2e?style=flat-square">
|
<img alt="Version v202611-00062" src="https://img.shields.io/badge/version-v202611--00062-d69e2e?style=flat-square">
|
||||||
<img alt="License: MIT" src="https://img.shields.io/badge/license-MIT-689d6a?style=flat-square">
|
<img alt="License: MIT" src="https://img.shields.io/badge/license-MIT-689d6a?style=flat-square">
|
||||||
<img alt="Rust backend" src="https://img.shields.io/badge/backend-Rust-b7410e?style=flat-square&logo=rust">
|
<img alt="Rust backend" src="https://img.shields.io/badge/backend-Rust-b7410e?style=flat-square&logo=rust">
|
||||||
<img alt="React PWA" src="https://img.shields.io/badge/frontend-React%20PWA-2d81ff?style=flat-square&logo=react">
|
<img alt="React PWA" src="https://img.shields.io/badge/frontend-React%20PWA-2d81ff?style=flat-square&logo=react">
|
||||||
|
|||||||
@@ -176,6 +176,7 @@ pub fn router(app: AppState) -> Router {
|
|||||||
.route("/factory/release/preview", get(factory_release_preview))
|
.route("/factory/release/preview", get(factory_release_preview))
|
||||||
.route("/factory/release", post(factory_release))
|
.route("/factory/release", post(factory_release))
|
||||||
.route("/factory/issues/close", post(factory_close_issue))
|
.route("/factory/issues/close", post(factory_close_issue))
|
||||||
|
.route("/factory/issues/remove", post(factory_remove_issue))
|
||||||
.route("/factory/issues/pr", get(factory_pr))
|
.route("/factory/issues/pr", get(factory_pr))
|
||||||
.route("/factory/issues/pr/merge", post(factory_pr_merge))
|
.route("/factory/issues/pr/merge", post(factory_pr_merge))
|
||||||
.route("/account/factory/connection/test", post(test_factory_connection))
|
.route("/account/factory/connection/test", post(test_factory_connection))
|
||||||
@@ -2836,6 +2837,17 @@ async fn factory_close_issue(Extension(user): Extension<User>, State(app): State
|
|||||||
Ok(Json(json!({"ok": true})))
|
Ok(Json(json!({"ok": true})))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Take an issue off the factory board (the issue on the forge is not touched). Not while a phase runs.
|
||||||
|
async fn factory_remove_issue(Extension(user): Extension<User>, State(app): State<AppState>, headers: axum::http::HeaderMap, Json(b): Json<CloseIssue>) -> ApiResult {
|
||||||
|
let (_, row) = factory_issue_forge(&app, &user, &b.repo, b.number)?;
|
||||||
|
if matches!(row["state"].as_str(), Some("review" | "building" | "testing")) {
|
||||||
|
return Err(ApiError(StatusCode::BAD_REQUEST, "a phase is running – wait for it to end or stop it first".into()));
|
||||||
|
}
|
||||||
|
app.store.factory_issue_delete(&b.repo, b.number)?;
|
||||||
|
app.audit(Some(&user), "factory.issue.remove", &format!("{}#{}", b.repo, b.number), &crate::auth::client_ip(&headers));
|
||||||
|
Ok(Json(json!({"ok": true})))
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
struct PrQuery {
|
struct PrQuery {
|
||||||
repo: String,
|
repo: String,
|
||||||
|
|||||||
@@ -562,6 +562,14 @@ impl Forge {
|
|||||||
Ok(!matches!(v["state"].as_str(), Some("closed")))
|
Ok(!matches!(v["state"].as_str(), Some("closed")))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Has the issue been deleted on the forge (404)? Other errors (network, token) count as "still there".
|
||||||
|
pub async fn issue_gone(&self, number: u64) -> bool {
|
||||||
|
match self.call(reqwest::Method::GET, self.rp(&format!("/issues/{number}")), None).await {
|
||||||
|
Err(e) => e.to_string().contains("404"),
|
||||||
|
Ok(_) => false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn close_issue(&self, number: u64) -> Result<()> {
|
pub async fn close_issue(&self, number: u64) -> Result<()> {
|
||||||
match self.kind {
|
match self.kind {
|
||||||
Kind::Gitlab => self.call(reqwest::Method::PUT, self.rp(&format!("/issues/{number}")), Some(json!({"state_event": "close"}))).await.map(|_| ()),
|
Kind::Gitlab => self.call(reqwest::Method::PUT, self.rp(&format!("/issues/{number}")), Some(json!({"state_event": "close"}))).await.map(|_| ()),
|
||||||
@@ -1353,6 +1361,14 @@ pub async fn poll_repo(app: &Arc<App>, user: &User, cfg: &RepoCfg) -> Result<()>
|
|||||||
app.store.factory_issue_set(&cfg.url, n, &[("state", json!("closed"))])?;
|
app.store.factory_issue_set(&cfg.url, n, &[("state", json!("closed"))])?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Issues deleted on the forge leave the board (closed ones stay: they still exist there).
|
||||||
|
for row in app.store.factory_issues(&user.id)?.into_iter().filter(|r| r["repo"].as_str() == Some(cfg.url.as_str()) && !matches!(r["state"].as_str(), Some("review" | "building" | "testing"))) {
|
||||||
|
let n = issue_no(&row);
|
||||||
|
if n > 0 && !open.contains(&n) && g.issue_gone(n as u64).await {
|
||||||
|
tracing::info!("factory {}: #{n} was deleted on the forge – removed from the board", cfg.url);
|
||||||
|
app.store.factory_issue_delete(&cfg.url, n)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
// Merged issues get their version and tag.
|
// Merged issues get their version and tag.
|
||||||
if let Err(e) = crate::factory_version::version_pass(app, user, cfg).await {
|
if let Err(e) = crate::factory_version::version_pass(app, user, cfg).await {
|
||||||
tracing::warn!("factory {}: versions: {e:#}", cfg.url);
|
tracing::warn!("factory {}: versions: {e:#}", cfg.url);
|
||||||
|
|||||||
+9
-1
@@ -1497,6 +1497,12 @@ impl Store {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Remove an issue from the factory board (runs and cost statistics stay).
|
||||||
|
pub fn factory_issue_delete(&self, repo: &str, number: i64) -> Result<()> {
|
||||||
|
self.conn.lock().unwrap().execute("DELETE FROM factory_issues WHERE repo_url = ?1 AND number = ?2", params![repo, number])?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
/// Update the given columns (whitelisted) of an issue.
|
/// Update the given columns (whitelisted) of an issue.
|
||||||
pub fn factory_issue_set(&self, repo: &str, number: i64, fields: &[(&str, Value)]) -> Result<()> {
|
pub fn factory_issue_set(&self, repo: &str, number: i64, fields: &[(&str, Value)]) -> Result<()> {
|
||||||
const COLS: [&str; 11] = ["title", "state", "attempts", "rounds", "last_comment", "scenarios", "branch", "pr_url", "note", "author", "version"];
|
const COLS: [&str; 11] = ["title", "state", "attempts", "rounds", "last_comment", "scenarios", "branch", "pr_url", "note", "author", "version"];
|
||||||
@@ -1586,7 +1592,9 @@ impl Store {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn factory_running(&self, repo: &str) -> Result<i64> {
|
pub fn factory_running(&self, repo: &str) -> Result<i64> {
|
||||||
Ok(self.conn.lock().unwrap().query_row("SELECT COUNT(*) FROM factory_runs WHERE repo_url = ?1 AND status = 'running'", [repo], |r| r.get(0))?)
|
// Counted by issue state, not by run rows: the state is set before the phase is spawned, the run row
|
||||||
|
// only once its checkout is done – counting runs let a single poll start more phases than allowed.
|
||||||
|
Ok(self.conn.lock().unwrap().query_row("SELECT COUNT(*) FROM factory_issues WHERE repo_url = ?1 AND state IN ('review', 'building', 'testing')", [repo], |r| r.get(0))?)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Runs with token and cost totals (joined from the usage table).
|
/// Runs with token and cost totals (joined from the usage table).
|
||||||
|
|||||||
@@ -348,6 +348,20 @@ function FactoryOverview({ onSettings }: { onSettings: () => void }) {
|
|||||||
setBusy(false);
|
setBusy(false);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
const removeIssue = async () => {
|
||||||
|
if (!selected) return;
|
||||||
|
if (!(await confirmDialog({ message: t("factory.removeConfirm", { n: selected.number }), confirmLabel: t("factory.remove"), danger: true }))) return;
|
||||||
|
setBusy(true);
|
||||||
|
try {
|
||||||
|
await post("/factory/issues/remove", { repo: selected.repo, number: selected.number });
|
||||||
|
setSel("");
|
||||||
|
await reload();
|
||||||
|
} catch (e: any) {
|
||||||
|
toast(e.message);
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
const closeIssue = async () => {
|
const closeIssue = async () => {
|
||||||
if (!selected) return;
|
if (!selected) return;
|
||||||
const comment = await promptDialog({ title: t("factory.closeTitle"), message: t("factory.closeMsg", { n: selected.number }), defaultValue: t("factory.closeDefault"), confirmLabel: t("factory.close") });
|
const comment = await promptDialog({ title: t("factory.closeTitle"), message: t("factory.closeMsg", { n: selected.number }), defaultValue: t("factory.closeDefault"), confirmLabel: t("factory.close") });
|
||||||
@@ -503,6 +517,11 @@ function FactoryOverview({ onSettings }: { onSettings: () => void }) {
|
|||||||
</button>
|
</button>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
{selected && !["review", "building", "testing"].includes(selected.state) && (
|
||||||
|
<button className="small" onClick={removeIssue} disabled={busy} title={t("factory.removeHint")}>
|
||||||
|
<Icon name="trash" /> {t("factory.remove")}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
{selected && selected.state === "done" && (
|
{selected && selected.state === "done" && (
|
||||||
<button className="small" onClick={closeIssue} disabled={busy}>
|
<button className="small" onClick={closeIssue} disabled={busy}>
|
||||||
<Icon name="check" /> {t("factory.close")}
|
<Icon name="check" /> {t("factory.close")}
|
||||||
|
|||||||
@@ -1294,6 +1294,9 @@ export const de: Messages = {
|
|||||||
"factory.closeTitle": "Issue schließen",
|
"factory.closeTitle": "Issue schließen",
|
||||||
"factory.closeMsg": "Kommentar zum Schließen von Issue #{n}. Er wird im Issue veröffentlicht, danach wird das Issue geschlossen.",
|
"factory.closeMsg": "Kommentar zum Schließen von Issue #{n}. Er wird im Issue veröffentlicht, danach wird das Issue geschlossen.",
|
||||||
"factory.closeDefault": "Erledigt und abgenommen.",
|
"factory.closeDefault": "Erledigt und abgenommen.",
|
||||||
|
"factory.remove": "Vom Board entfernen",
|
||||||
|
"factory.removeHint": "Nimmt das Issue vom Factory-Board; das Issue im Forge bleibt unberührt. Gelöschte Issues verschwinden von selbst.",
|
||||||
|
"factory.removeConfirm": "#{n} vom Factory-Board entfernen? Das Issue im Forge bleibt unverändert.",
|
||||||
"factory.closed": "Issue geschlossen",
|
"factory.closed": "Issue geschlossen",
|
||||||
"factory.skills": "Skills",
|
"factory.skills": "Skills",
|
||||||
"factory.skillAdd": "Skill hinzufügen…",
|
"factory.skillAdd": "Skill hinzufügen…",
|
||||||
|
|||||||
@@ -1293,6 +1293,9 @@ export const en = {
|
|||||||
"factory.closeTitle": "Close issue",
|
"factory.closeTitle": "Close issue",
|
||||||
"factory.closeMsg": "Comment for closing issue #{n}. It is posted on the issue, then the issue is closed.",
|
"factory.closeMsg": "Comment for closing issue #{n}. It is posted on the issue, then the issue is closed.",
|
||||||
"factory.closeDefault": "Done and accepted.",
|
"factory.closeDefault": "Done and accepted.",
|
||||||
|
"factory.remove": "Remove from board",
|
||||||
|
"factory.removeHint": "Take the issue off the factory board; the issue on the forge is not touched. Deleted issues disappear by themselves.",
|
||||||
|
"factory.removeConfirm": "Remove #{n} from the factory board? The issue on the forge stays as it is.",
|
||||||
"factory.closed": "Issue closed",
|
"factory.closed": "Issue closed",
|
||||||
"factory.skills": "Skills",
|
"factory.skills": "Skills",
|
||||||
"factory.skillAdd": "Add skill…",
|
"factory.skillAdd": "Add skill…",
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
* under "unreleased"; scripts/release.sh renames the key to the release version.
|
* under "unreleased"; scripts/release.sh renames the key to the release version.
|
||||||
*/
|
*/
|
||||||
export const WHATS_NEW: Record<string, { en: string[]; de: string[] }> = {
|
export const WHATS_NEW: Record<string, { en: string[]; de: string[] }> = {
|
||||||
|
"202611-00062": {
|
||||||
|
en: ["Factory: the parallel limit per project is now respected exactly", "Factory: remove issues from the board; issues deleted on the forge disappear by themselves"],
|
||||||
|
de: ["Factory: das Parallel-Limit pro Projekt wird jetzt genau eingehalten", "Factory: Issues vom Board entfernen; im Forge gelöschte Issues verschwinden von selbst"],
|
||||||
|
},
|
||||||
"202611-00061": {
|
"202611-00061": {
|
||||||
en: ["Factory: projects are chosen from a dropdown (all projects or a single one)"],
|
en: ["Factory: projects are chosen from a dropdown (all projects or a single one)"],
|
||||||
de: ["Factory: Projekte werden per Dropdown gewählt (alle oder nur eins)"],
|
de: ["Factory: Projekte werden per Dropdown gewählt (alle oder nur eins)"],
|
||||||
|
|||||||
Reference in new issue
Block a user