You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tooling.apache.org by ar...@apache.org on 2026/05/20 10:41:18 UTC
(tooling-trusted-releases) branch arm updated: Restore archived banner and fix some project/release loading bugs
This is an automated email from the ASF dual-hosted git repository.
alitheg pushed a commit to branch arm
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git
The following commit(s) were added to refs/heads/arm by this push:
new db5ef13e Restore archived banner and fix some project/release loading bugs
db5ef13e is described below
commit db5ef13ec9c92a7fb541444dc1e3ffccaa564d44
Author: Alastair McFarlane <ar...@apache.org>
AuthorDate: Wed May 20 11:40:56 2026 +0100
Restore archived banner and fix some project/release loading bugs
---
atr/db/interaction.py | 5 ---
atr/get/announce.py | 2 +-
atr/get/compose.py | 2 +-
atr/get/finish.py | 2 +-
atr/get/projects.py | 118 ++++++++++++++++++++++++++++++--------------------
atr/get/release.py | 2 +-
atr/get/vote.py | 2 +-
atr/get/voting.py | 2 +-
atr/paths.py | 6 +--
atr/render.py | 7 +--
10 files changed, 82 insertions(+), 66 deletions(-)
diff --git a/atr/db/interaction.py b/atr/db/interaction.py
index d1c661f3..cb4f9541 100644
--- a/atr/db/interaction.py
+++ b/atr/db/interaction.py
@@ -408,11 +408,6 @@ async def effective_trusted_ballots(
return current_ballots + carried
-async def full_releases(project: sql.Project) -> list[sql.Release]:
- """Get the full releases for the project."""
- return await releases_by_phase(project, sql.ReleasePhase.RELEASE)
-
-
async def has_blocker_checks(
release: sql.Release, revision_number: safe.RevisionNumber, caller_data: db.Session | None = None
) -> bool:
diff --git a/atr/get/announce.py b/atr/get/announce.py
index 0e9b008e..eec0a637 100644
--- a/atr/get/announce.py
+++ b/atr/get/announce.py
@@ -203,7 +203,7 @@ async def _render_page(
page.append(_render_release_card(release))
page.h2["Publish and announce this release"]
- if banner := render.archived_project_banner(release.project):
+ if banner := render.archived_project_banner(release.project, "Release actions are disabled."):
page.append(banner)
announce_msg = ""
diff --git a/atr/get/compose.py b/atr/get/compose.py
index 0cbb595b..2f8fdf3d 100644
--- a/atr/get/compose.py
+++ b/atr/get/compose.py
@@ -200,7 +200,7 @@ async def selected(
)[""],
]
- archived_banner = render.archived_project_banner(release.project)
+ archived_banner = render.archived_project_banner(release.project, "Release actions are disabled.")
archived_banner_html = str(archived_banner) if archived_banner is not None else ""
return await template.render(
diff --git a/atr/get/finish.py b/atr/get/finish.py
index 8de268f8..cd5f2bb6 100644
--- a/atr/get/finish.py
+++ b/atr/get/finish.py
@@ -310,7 +310,7 @@ async def _render_page(
htm.em[release.version],
]
- if banner := render.archived_project_banner(release.project):
+ if banner := render.archived_project_banner(release.project, "Release actions are disabled."):
page.append(banner)
# Release info card
diff --git a/atr/get/projects.py b/atr/get/projects.py
index 55ffbca6..4dd98608 100644
--- a/atr/get/projects.py
+++ b/atr/get/projects.py
@@ -29,7 +29,6 @@ import atr.blueprints.get as get
import atr.config as config
import atr.construct as construct
import atr.db as db
-import atr.db.interaction as interaction
import atr.form as form
import atr.get.committees as committees
import atr.get.compose as compose
@@ -42,6 +41,7 @@ import atr.models.safe as safe
import atr.models.sql as sql
import atr.post as post
import atr.registry as registry
+import atr.render as render
import atr.shared as shared
import atr.template as template
import atr.user as user
@@ -189,18 +189,17 @@ async def view(
"""
async with db.session() as data:
project = await data.project(
- key=str(project_key), _committee=True, _committee_public_signing_keys=True, _release_policy=True
+ key=str(project_key),
+ _committee=True,
+ _committee_public_signing_keys=True,
+ _release_policy=True,
+ _releases=True,
).demand(base.ASFQuartException(f"Project {project_key} not found", errorcode=404))
cycles = list(await data.project_cycle(project_key=str(project_key)).all())
is_committee_member = bool(project.committee and user.is_committee_member(project.committee, session.uid))
is_privileged = session.is_admin
- can_edit = is_committee_member or is_privileged
-
- candidate_drafts = await interaction.candidate_drafts(project)
- candidates = await interaction.candidates(project)
- previews = await interaction.previews(project)
- full_releases = await interaction.full_releases(project)
+ can_edit = (is_committee_member or is_privileged) and project.status != sql.ProjectStatus.RETIRED
page = htm.Block()
@@ -220,6 +219,11 @@ async def view(
else "",
]
page.append(title_row)
+
+ archived_banner = render.archived_project_banner(project, "Actions are disabled.")
+ if archived_banner:
+ page.append(archived_banner)
+
if project.updated:
page.append(
htm.div(".row.mb-2")[
@@ -243,10 +247,6 @@ async def view(
render=lambda: _render_releases_tab(
project,
cycles,
- candidate_drafts,
- candidates,
- previews,
- full_releases,
can_edit=can_edit,
),
)
@@ -292,17 +292,20 @@ async def view(
# Below the tabs: admin-only project actions.
if is_committee_member or is_privileged:
- if project.created_by == session.uid:
- page.append(await _render_delete_section(project))
+ section = htm.Block(htm.div)
+ section.h2["Actions"]
+
+ await _delete_section(section, project)
if project.committee:
if (project.committee.key in session.committees) or is_privileged:
- page.p[
+ section.p[
htm.a(
".btn.btn-sm.btn-outline-primary",
href=util.as_url(add_project, committee_key=project.committee.key),
)["Create a sibling project"]
]
+ page.append(section.collect())
content = page.collect()
@@ -522,23 +525,36 @@ async def _render_cycle_dates_form(project: sql.Project, cycle: sql.ProjectCycle
return card.collect()
-async def _render_delete_section(project: sql.Project) -> htm.Element:
- section = htm.Block(htm.div)
- section.h2["Actions"]
-
- delete_form = await form.render(
- shared.projects.DeleteProjectForm,
- action=util.as_url(post.projects.view, name=str(project.key)),
- form_classes="",
- submit_classes="btn-sm btn-outline-danger",
- submit_label="Delete project",
- defaults={"project_key": str(project.key)},
- confirm="Are you sure you want to delete this project? This cannot be undone.",
- empty=True,
- )
-
- section.div(".my-3")[delete_form]
- return section.collect()
+async def _delete_section(section: htm.Block, project: sql.Project):
+ delete_form = None
+ if not project.releases:
+ delete_form = await form.render(
+ shared.projects.DeleteProjectForm,
+ action=util.as_url(post.projects.view, name=str(project.key)),
+ form_classes="",
+ submit_classes="btn-sm btn-outline-danger",
+ submit_label="Delete project",
+ defaults={"project_key": str(project.key)},
+ confirm="Are you sure you want to delete this project? This cannot be undone.",
+ empty=True,
+ )
+ elif all(r.phase == sql.ReleasePhase.RELEASE_CANDIDATE_DRAFT for r in project.releases):
+ delete_form = await form.render(
+ model_cls=shared.projects.ArchiveSelectedProject,
+ action=util.as_url(post.projects.archive),
+ form_classes=".d-inline-block.m-0",
+ submit_classes="btn-sm btn-outline-secondary",
+ submit_label="Archive project",
+ empty=True,
+ defaults={"project_key": str(project.key)},
+ confirm=(
+ f"This project has {util.plural(len(project.releases), 'draft release')}."
+ " Archiving will delete those drafts and mark the project as retired."
+ " Continue?"
+ ),
+ )
+ if delete_form:
+ section.div(".my-3")[delete_form]
async def _render_finish_form(project: sql.Project) -> htm.Element:
@@ -869,22 +885,19 @@ async def _render_releases_sections(
async def _render_releases_tab(
project: sql.Project,
cycles: list[sql.ProjectCycle],
- candidate_drafts: list[sql.Release],
- candidates: list[sql.Release],
- previews: list[sql.Release],
- full_releases: list[sql.Release],
*,
can_edit: bool,
) -> htm.Element:
block = htm.Block()
- block.p(".mb-4")[
- htm.a(
- ".btn.btn-sm.btn-outline-primary",
- href=util.as_url(start.selected, project_key=str(project.key)),
- )["Start a new release"]
- ]
+ if can_edit:
+ block.p(".mb-4")[
+ htm.a(
+ ".btn.btn-sm.btn-outline-primary",
+ href=util.as_url(start.selected, project_key=str(project.key)),
+ )["Start a new release"]
+ ]
- if not (candidate_drafts or candidates or previews or full_releases):
+ if not project.releases:
block.p(".text-muted.mb-4")["No releases found."]
# Stay flat for projects with only the implicit "default" cycle and no
@@ -893,11 +906,22 @@ async def _render_releases_tab(
# PMC of a simple-default project can still set eod/eos/eol/lts.
show_cycle_heading = (len(cycles) > 1) or any(c.cycle != "default" for c in cycles)
+ # Newest first, as the old per-phase queries returned them.
+ releases = sorted(project.releases, key=lambda r: r.created, reverse=True)
+
for cycle in cycles:
- cycle_drafts = [r for r in candidate_drafts if r.cycle_key == cycle.cycle_key]
- cycle_candidates = [r for r in candidates if r.cycle_key == cycle.cycle_key]
- cycle_previews = [r for r in previews if r.cycle_key == cycle.cycle_key]
- cycle_full = [r for r in full_releases if r.cycle_key == cycle.cycle_key]
+ cycle_drafts = [
+ r
+ for r in releases
+ if r.cycle_key == cycle.cycle_key and r.phase == sql.ReleasePhase.RELEASE_CANDIDATE_DRAFT
+ ]
+ cycle_candidates = [
+ r for r in releases if r.cycle_key == cycle.cycle_key and r.phase == sql.ReleasePhase.RELEASE_CANDIDATE
+ ]
+ cycle_previews = [
+ r for r in releases if r.cycle_key == cycle.cycle_key and r.phase == sql.ReleasePhase.RELEASE_PREVIEW
+ ]
+ cycle_full = [r for r in releases if r.cycle_key == cycle.cycle_key and r.phase == sql.ReleasePhase.RELEASE]
cycle_has_dates = _cycle_has_dates(cycle)
cycle_has_releases = bool(cycle_drafts or cycle_candidates or cycle_previews or cycle_full)
diff --git a/atr/get/release.py b/atr/get/release.py
index 59421a5b..d99cd44f 100644
--- a/atr/get/release.py
+++ b/atr/get/release.py
@@ -97,7 +97,7 @@ async def select(
"""
await session.prevent_confusing_ui_display(project_key)
async with db.session() as data:
- project = await data.project(key=str(project_key), status=sql.ProjectStatus.ACTIVE, _releases=True).demand(
+ project = await data.project(key=str(project_key), status=sql.ProjectStatus.ACTIVE).demand(
base.ASFQuartException(f"Project {project_key} not found", errorcode=404)
)
releases = await interaction.releases_in_progress(project)
diff --git a/atr/get/vote.py b/atr/get/vote.py
index 37a656e8..9c226ff9 100644
--- a/atr/get/vote.py
+++ b/atr/get/vote.py
@@ -733,7 +733,7 @@ def _render_vote_delivery(
]
else:
page.p["Your vote will be sent to ", htpy.code[vote_recipient], "."]
- if banner := render.archived_project_banner(release.project):
+ if banner := render.archived_project_banner(release.project, "Release actions are disabled."):
page.append(banner)
diff --git a/atr/get/voting.py b/atr/get/voting.py
index e996bea1..442c6c38 100644
--- a/atr/get/voting.py
+++ b/atr/get/voting.py
@@ -203,7 +203,7 @@ async def _render_page(
htm.em[release.version],
]
- if banner := render.archived_project_banner(release.project):
+ if banner := render.archived_project_banner(release.project, "Release actions are disabled."):
page.append(banner)
page.div(".px-3.py-4.mb-4.bg-light.border.rounded")[
diff --git a/atr/paths.py b/atr/paths.py
index d8f95342..655700b2 100644
--- a/atr/paths.py
+++ b/atr/paths.py
@@ -110,7 +110,7 @@ def release_directory(release: sql.Release) -> safe.StatePath:
def release_directory_base(release: sql.Release) -> safe.StatePath:
"""Determine the filesystem directory for a given release based on its phase."""
phase = release.phase
- project_key = release.project.key
+ project_key = release.project_key
version_key = release.version
base_dir: safe.StatePath | None = None
@@ -129,7 +129,7 @@ def release_directory_base(release: sql.Release) -> safe.StatePath:
def release_directory_revision(release: sql.Release) -> safe.StatePath | None:
"""Return the path to the directory containing the active files for a given release phase."""
- path_project = release.project.key
+ path_project = release.project_key
path_version = release.version
match release.phase:
case (
@@ -148,7 +148,7 @@ def release_directory_revision(release: sql.Release) -> safe.StatePath | None:
def release_directory_version(release: sql.Release) -> safe.StatePath:
"""Return the path to the directory containing the active files for a given release phase."""
- path_project = release.project.key
+ path_project = release.project_key
path_version = release.version
match release.phase:
case (
diff --git a/atr/render.py b/atr/render.py
index f72d4fe8..6a7cff26 100644
--- a/atr/render.py
+++ b/atr/render.py
@@ -92,13 +92,10 @@ _STATUS_LABELS: Final[dict[sql.CheckResultStatus, str]] = {
}
-def archived_project_banner(project: sql.Project) -> htm.Element | None:
- # Shown on the five top-level release pages when the PMC has archived the
- # project. The storage layer still refuses the write, but the banner tells
- # the viewer why the buttons are inert.
+def archived_project_banner(project: sql.Project, message: str = "") -> htm.Element | None:
if project.status != sql.ProjectStatus.RETIRED:
return None
- return htm.div(".alert.alert-warning.mb-4")["This project is archived. Release actions are disabled."]
+ return htm.div(".alert.alert-warning.mb-4")[f"This project is archived. {message}"]
def highest_severity(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tooling.apache.org
For additional commands, e-mail: commits-help@tooling.apache.org