diff --git a/integration/projects_page_test.py b/integration/projects_page_test.py index 3022455..9003820 100644 --- a/integration/projects_page_test.py +++ b/integration/projects_page_test.py @@ -125,7 +125,7 @@ def test_projects_page_loads_without_auth(tmp_path: Path) -> None: page = browser.new_page() page.goto(base, wait_until="domcontentloaded") sync_api.expect(page).to_have_title("PyGitWeb - Projects") - sync_api.expect(page.get_by_role("heading", name="Project List")).to_be_visible() + sync_api.expect(page.get_by_role("heading", name="Projects")).to_be_visible() sync_api.expect(page.get_by_role("link", name="demo", exact=True)).to_be_visible() finally: browser.close() diff --git a/pygitweb/src/pygitweb/actions.py b/pygitweb/src/pygitweb/actions.py index ea327b4..ed77ea1 100644 --- a/pygitweb/src/pygitweb/actions.py +++ b/pygitweb/src/pygitweb/actions.py @@ -6,6 +6,7 @@ Ported from gitweb/gitweb.perl action handlers. Invoked by main.dispatch. from __future__ import annotations import base64 +import json import mimetypes import os from datetime import UTC, datetime, timedelta, timezone @@ -16,6 +17,7 @@ from urllib.parse import parse_qsl, quote, urlencode import pygit2 from fastapi import HTTPException, Request from fastapi.responses import HTMLResponse, JSONResponse, PlainTextResponse, RedirectResponse, Response +from pygittools.merge import MR_REF_PREFIX, MergeRequestStatus, get_merge_request_by_oid from python_ripgrep import PySortMode, PySortModeKind from python_ripgrep import search as rg_search @@ -41,7 +43,11 @@ from pygitweb.git_helpers import ( parse_tag, ) from pygitweb.hooks_install import list_installable_hooks, list_installed_hooks -from pygitweb.merge_requests import merge_request_tag_response, resolve_merge_request_tag_to_tip +from pygitweb.merge_requests import ( + merge_request_status_fields, + merge_request_tag_response, + resolve_merge_request_tag_to_tip, +) from pygitweb.projects import git_get_project_owner from pygitweb.templates_env import ( Cell, @@ -311,6 +317,7 @@ def _table_page( pagination: dict[str, Any] | None = None, empty_message: str | None = None, empty_muted: bool = False, + nav: str | None = None, ) -> HTMLResponse: ctx: dict[str, object] = { "title": title, @@ -319,6 +326,7 @@ def _table_page( "pagination": pagination, "empty_message": empty_message, "empty_muted": empty_muted, + "nav": nav or ("projects" if project else None), } if cols is not None: ctx["cols"] = cols @@ -574,6 +582,62 @@ def _hooks_context(project: str, project_enc: str) -> dict[str, Any]: } +_OPEN_MR_BADGE = { + "can_fast_forward": "green", + "blocked_diverged": "yellow", + "ours_ref_missing": "red", + "mr_head_missing": "red", + "error": "red", +} + + +def _ref_short(ref: str | None) -> str: + if not ref: + return "" + if ref.startswith("refs/heads/"): + return ref.removeprefix("refs/heads/") + return ref + + +def _open_merge_requests(project: str) -> list[dict[str, str]]: + """Merge requests whose head is not already contained in the destination branch.""" + try: + repo = open_repo(project) + except (OSError, pygit2.GitError, ValueError): + return [] + project_enc = quote(project, safe="/") + open_mrs: list[dict[str, str]] = [] + for ref_name in repo.references: + if not ref_name.startswith(MR_REF_PREFIX): + continue + try: + oid = repo.references[ref_name].resolve().target + obj = repo[oid] + if not isinstance(obj, pygit2.Tag): + continue + mr = get_merge_request_by_oid(repo, pygit2.Oid(hex=str(oid))) + except (ValueError, KeyError, TypeError, json.JSONDecodeError, pygit2.GitError): + continue + try: + status = mr.check_status(repo) + except ValueError: + status = None + if status == MergeRequestStatus.UP_TO_DATE: + continue + fields = merge_request_status_fields(repo, mr) + status_code = str(fields["status_code"]) + open_mrs.append({ + "title": mr.title or ref_name.removeprefix(MR_REF_PREFIX), + "href": f"/project/{project_enc}?a=tag&h={quote(ref_name, safe='')}", + "theirs": _ref_short(mr.theirs), + "ours": _ref_short(mr.ours), + "status_label": str(fields["status_label"]), + "badge": _OPEN_MR_BADGE.get(status_code, "secondary"), + }) + open_mrs.sort(key=lambda item: item["title"].lower()) + return open_mrs + + def _merge_request_context(project: str) -> dict[str, Any] | None: heads = git_get_heads_list(project) if not heads: @@ -658,7 +722,9 @@ def git_summary(project: str, extra_rows: list[list[Cell]] | None = None) -> HTM board=board_link_spec(project), hooks=_hooks_context(project, project_enc), merge_request=_merge_request_context(project), + open_merge_requests=_open_merge_requests(project), extra_rows=extra_rows or [], + nav="projects", ) diff --git a/pygitweb/src/pygitweb/main.py b/pygitweb/src/pygitweb/main.py index b946a45..c10fd06 100644 --- a/pygitweb/src/pygitweb/main.py +++ b/pygitweb/src/pygitweb/main.py @@ -116,6 +116,7 @@ from pygitweb.tasks import ( board_router, comment_router, create_board_for_project, + get_all_project_tasks, get_board_tasks_grouped, list_project_boards, task_router, @@ -248,6 +249,46 @@ def _project_subpage_rows(project: str) -> list[list[Cell]]: # ---------- Routes (no project) ---------- +_OPEN_TASK_STATUSES = frozenset({"TODO", "IN_PROGRESS", "IN_REVIEW"}) + + +def _home_stats(projects: list[dict[str, object]]) -> dict[str, int]: + """Counts for the project-list dashboard cards.""" + from pygitweb.capacity_config import current_iso_week, get_user_week_capacity + + visible = {str(pr.get("path") or "") for pr in projects if pr.get("path")} + points_by_assignee: dict[str, int] = {} + open_tasks = 0 + for path in visible: + try: + tasks = get_all_project_tasks(path) + except Exception: + continue + for task in tasks: + if task.get("status") not in _OPEN_TASK_STATUSES: + continue + open_tasks += 1 + assignee = str(task.get("assignee") or "").strip() + if not assignee: + continue + points = task.get("points") or 0 + points_by_assignee[assignee] = points_by_assignee.get(assignee, 0) + int(points) + week = current_iso_week() + over_capacity = 0 + for assignee, points in points_by_assignee.items(): + capacity = get_user_week_capacity(assignee, week) + if capacity is not None and points > capacity: + over_capacity += 1 + recent_commits = sum( + 1 for item in get_all_timeline_events() if item["project"] in visible and item["event"]["kind"] == "commit" + ) + return { + "projects": len(visible), + "open_tasks": open_tasks, + "over_capacity": over_capacity, + "recent_commits": recent_commits, + } + @app.get("/", response_class=HTMLResponse) def git_project_list( @@ -288,6 +329,8 @@ def git_project_list( title=f"{settings.SITE_NAME} - Projects", notice=notice, projects=projects, + stats=_home_stats(list_), + nav="projects", ) @@ -332,18 +375,17 @@ def activity_page( has_next = len(events_page) > pc if has_next: events_page = events_page[:pc] - rows: list[list[Cell]] = [] + events: list[dict[str, str]] = [] for item in events_page: project_name = item["project"] event = item["event"] oid = event["oid"] - if event["kind"] == "commit": - event_label: Cell = html_link( - f"/project/{quote(project_name, safe='/')}?a=commit&h={quote(oid, safe='')}", - oid[:7], - ) - else: - event_label = event["kind"] or "" + kind = event["kind"] or "" + event_href = "" + label: Literal["commit", "ref"] | str = kind + if kind == "commit": + label = oid[:7] + event_href = f"/project/{quote(project_name, safe='/')}?a=commit&h={quote(oid, safe='')}" description_raw = event.get("description") if not description_raw: description = "" @@ -358,12 +400,14 @@ def activity_page( activity_time = "right now" if age_seconds <= 0 else age_string(age_seconds) except (ValueError, OSError): activity_time = "" - rows.append([ - activity_time, - html_link(f"/project/{quote(project_name, safe='/')}", project_name), - event_label, - description, - ]) + events.append({ + "time": activity_time, + "project": project_name, + "project_href": f"/project/{quote(project_name, safe='/')}", + "label": label, + "event_href": event_href, + "description": description, + }) prev_url = "" next_url = "" if p > 1: @@ -371,11 +415,10 @@ def activity_page( if has_next: next_url = f"/activity?{urlencode({'page': str(p + 1), 'pagecount': str(pc)})}" return render_page( - "table_page.html", + "activity.html", title=f"{settings.SITE_NAME} - Activity", - heading="Activity", - cols=["Time", "Project Name", "Event", "Description"], - rows=rows, + events=events, + nav="activity", pagination={ "current_page": p, "pagecount": pc, @@ -427,6 +470,7 @@ def boards_overview_page( rows=rows, empty_message="No projects found." if not rows else None, empty_muted=True, + nav="boards", ) @@ -497,6 +541,7 @@ def addproject_page( show_sign_in_notice=show_sign_in_notice, empty_repo_form_content=Project.form_content(), upload_zip_form_content=ProjectZip.form_content(), + nav="add", ) @@ -577,6 +622,7 @@ def project_board( project=project, project_url=project_url, board_name=board_name, + nav="boards", board_url=board_url, columns=columns, ) diff --git a/pygitweb/src/pygitweb/merge_requests_test.py b/pygitweb/src/pygitweb/merge_requests_test.py index 13d6bdd..da0e4f3 100644 --- a/pygitweb/src/pygitweb/merge_requests_test.py +++ b/pygitweb/src/pygitweb/merge_requests_test.py @@ -59,6 +59,24 @@ class TestMergeRequestTagView: "tip_b": str(b), } + def test_summary_lists_open_merge_request_until_it_is_merged(self, mr_env: dict[str, str]) -> None: + client = mr_env["client"] + before = client.get(f"/project/{mr_env['project']}") + assert before.status_code == 200 + assert "Feature MR" in before.text + assert "Can fast-forward" in before.text + assert "step-item" not in before.text + post = client.post( + "/mr/ff", + params={"project": mr_env["project"], "h": mr_env["mr_tag_oid"]}, + follow_redirects=False, + ) + assert post.status_code == 303 + after = client.get(f"/project/{mr_env['project']}") + assert after.status_code == 200 + assert "Feature MR" not in after.text + assert "No open merge requests." in after.text + def test_tag_action_renders_merge_request_template(self, mr_env: dict[str, str]) -> None: client = mr_env["client"] resp = client.get( diff --git a/pygitweb/src/pygitweb/project_list_routes_test.py b/pygitweb/src/pygitweb/project_list_routes_test.py index 7d37dc8..c2f348f 100644 --- a/pygitweb/src/pygitweb/project_list_routes_test.py +++ b/pygitweb/src/pygitweb/project_list_routes_test.py @@ -52,5 +52,7 @@ def test_home_page_shows_auth_visibility_notice_when_no_readable_projects( client = TestClient(app) resp = client.get("/") assert resp.status_code == 200 - assert "No projects are visible with your current authentication" in resp.text - assert " None: assert "bg-secondary" in js.classes("#navbar-user-avatar") +def test_signed_in_user_gets_profile_and_sign_out(js: JsPage) -> None: + js.route("/auth/status", body={"auth_enabled": True, "username": "ada"}) + js.set_html( + '" + ) + js.load("navbar-auth.js") + assert "dropdown" in js.classes("#navbar-user") + assert js.attr("#navbar-user-link", "data-bs-toggle") == "dropdown" + assert js.prop("#navbar-user-profile", "href").endswith("/user") + assert "next=/" in js.prop("#navbar-user-logout", "href") + assert "d-none" not in js.classes("#navbar-user-menu") + + def test_status_fetch_failure_sends_the_link_to_login(js: JsPage) -> None: js.route("/auth/status", error="offline") js.set_html(_NAV) diff --git a/pygitweb/src/pygitweb/tasks.py b/pygitweb/src/pygitweb/tasks.py index ca2f349..587ea90 100644 --- a/pygitweb/src/pygitweb/tasks.py +++ b/pygitweb/src/pygitweb/tasks.py @@ -41,7 +41,7 @@ from pygitweb.dependencies import ValidatedReadableQueryProject, filter_projects from pygitweb.gravatar import gravatar_url from pygitweb.permissions import Permission, PermissionPrincipal from pygitweb.projects import git_get_projects_list -from pygitweb.templates_env import Cell, html_link, render_page +from pygitweb.templates_env import Cell, html_link, person_label, priority_badge, render_page, status_badge # Well-known empty tree OID for boards/tasks when repo has no HEAD EMPTY_TREE_OID = pygit2.Oid(hex="4b825dc642cb6eb9a060e54bf8d69288fbee4904") @@ -350,9 +350,9 @@ def all_tasks_page( html_link(task_url, t.get("title") or "(untitled)"), html_link(project_url, project), t.get("board") or "", - task_status.replace("_", " ").title(), - (t.get("priority") or "LOW").title(), - t.get("assignee") or "Unassigned", + status_badge(task_status), + priority_badge(t.get("priority") or "LOW"), + person_label(t.get("assignee") or ""), str(t.get("points") if t.get("points") is not None else ""), ]) statuses = [ @@ -366,6 +366,7 @@ def all_tasks_page( statuses=statuses, cols=["Task", "Project", "Board", "Status", "Priority", "Assignee", "Points"], rows=rows, + nav="tasks", ) diff --git a/pygitweb/src/pygitweb/team.py b/pygitweb/src/pygitweb/team.py index 8a2401e..01c4bd8 100644 --- a/pygitweb/src/pygitweb/team.py +++ b/pygitweb/src/pygitweb/team.py @@ -109,10 +109,14 @@ def team_page( ]) can_edit = (not is_unassigned) and (can_edit_others or assignee == current_username) capacity_url = f"/team/capacity?user={quote(assignee, safe='')}&week={quote(iso_week, safe='')}" + capacity_pct = 0 + if capacity: + capacity_pct = min(100, round(100 * points_total / capacity)) groups.append({ "assignee": assignee, "points_total": points_total, "capacity": capacity, + "capacity_pct": capacity_pct, "over_capacity": capacity is not None and points_total > capacity, "can_edit": can_edit, "capacity_url": capacity_url, @@ -124,6 +128,7 @@ def team_page( title=f"{settings.SITE_NAME} - Team", iso_week=iso_week, groups=groups, + nav="team", ) @@ -149,6 +154,7 @@ def team_capacity_form( target_user=target_user, iso_week=iso_week, current_points=current_points, + nav="team", ) diff --git a/pygitweb/src/pygitweb/templates/activity.html b/pygitweb/src/pygitweb/templates/activity.html new file mode 100644 index 0000000..fdf71aa --- /dev/null +++ b/pygitweb/src/pygitweb/templates/activity.html @@ -0,0 +1,44 @@ +{% extends "base.html" %} +{% from "macros.html" import page_header %} +{% block content %} +{{ page_header("Activity", "Timeline") }} +{% if events %} +
+
+ {% for event in events %} +
+
+
+ {{ event.project | initials }} +
+
+ {{ event.project }} +
+ {% if event.event_href %} + {{ event.label }} + {% else %} + {{ event.label }} + {% endif %} + {% if event.description %} + {{ event.description }} + {% endif %} +
+
+
{{ event.time }}
+
+
+ {% endfor %} +
+
+{% else %} +
+

No activity yet

+

Commits and ref updates from repositories you can read show up here.

+
+{% endif %} +{% if pagination %} +{% with current_page=pagination.current_page, pagecount=pagination.pagecount, has_prev=pagination.has_prev, has_next=pagination.has_next, prev_url=pagination.prev_url, next_url=pagination.next_url, total_pages=pagination.total_pages, page_links=pagination.page_links %} +{% include "pagination.html" %} +{% endwith %} +{% endif %} +{% endblock %} diff --git a/pygitweb/src/pygitweb/templates/addproject.html b/pygitweb/src/pygitweb/templates/addproject.html index 92b1c32..04d9869 100644 --- a/pygitweb/src/pygitweb/templates/addproject.html +++ b/pygitweb/src/pygitweb/templates/addproject.html @@ -1,6 +1,7 @@ {% extends "base.html" %} +{% from "macros.html" import page_header %} {% block content %} -

Add project

+{{ page_header("Add project", "Repositories") }} {% if show_sign_in_notice %}