feature: improve admin directory and crawl progress

app/admin.py

@@ -1,4 +1,4 @@
-from fastapi import APIRouter, BackgroundTasks, Depends, Form, Request, Response
+from fastapi import APIRouter, BackgroundTasks, Depends, Form, Request
 from fastapi.responses import HTMLResponse, RedirectResponse
 from fastapi.templating import Jinja2Templates
 from sqlalchemy import desc, func, or_, select
@@ -8,7 +8,8 @@ from app.config import Settings, get_settings
 from app.db import SessionLocal, get_db
 from app.models import CrawlError, CrawlRun, Employee
 from app.security import SESSION_COOKIE, require_admin, sign_session, verify_admin
-from app.services.crawler import run_crawl
+from app.services.admin_data import list_employees_page, run_payload, stats_payload
+from app.services.crawl_control import get_running_run, run_crawl_if_idle
 from app.version import BACKEND_VERSION, FRONTEND_VERSION
 
 router = APIRouter(prefix="/admin")
@@ -18,14 +19,11 @@ templates = Jinja2Templates(directory="app/templates")
 @router.get("", response_class=HTMLResponse)
 def dashboard(request: Request, db: Session = Depends(get_db), settings: Settings = Depends(get_settings)):
     require_admin(request, settings)
-    counts = {
-        "active": db.scalar(select(func.count()).select_from(Employee).where(Employee.status == "active")) or 0,
-        "dismissed": db.scalar(select(func.count()).select_from(Employee).where(Employee.status == "dismissed")) or 0,
-        "runs": db.scalar(select(func.count()).select_from(CrawlRun)) or 0,
-        "errors": db.scalar(select(func.count()).select_from(CrawlError)) or 0,
-    }
+    counts = stats_payload(db)
+    counts["runs"] = db.scalar(select(func.count()).select_from(CrawlRun)) or 0
+    counts["errors"] = db.scalar(select(func.count()).select_from(CrawlError)) or 0
     runs = db.scalars(select(CrawlRun).order_by(desc(CrawlRun.started_at)).limit(10)).all()
-    return _render(request, "dashboard.html", {"counts": counts, "runs": runs})
+    return _render(request, "dashboard.html", {"counts": counts, "runs": runs, "latest_run": run_payload(runs[0]) if runs else None})
 
 
 @router.get("/login", response_class=HTMLResponse)
@@ -35,7 +33,6 @@ def login_form(request: Request):
 
 @router.post("/login")
 def login(
-    response: Response,
     request: Request,
     username: str = Form(...),
     password: str = Form(...),
@@ -74,6 +71,57 @@ def employees(
     return _render(request, "employees.html", {"employees": items, "status": status or "", "q": q or ""})
 
 
+@router.get("/directory", response_class=HTMLResponse)
+def directory(
+    request: Request,
+    status: str | None = None,
+    q: str | None = None,
+    started_from: str | None = None,
+    started_to: str | None = None,
+    has_email: str | None = None,
+    sort: str = "full_name",
+    direction: str = "asc",
+    limit: int = 50,
+    offset: int = 0,
+    db: Session = Depends(get_db),
+    settings: Settings = Depends(get_settings),
+):
+    require_admin(request, settings)
+    parsed_started_from = _parse_date(started_from)
+    parsed_started_to = _parse_date(started_to)
+    parsed_has_email = None if has_email in (None, "") else has_email == "true"
+    page = list_employees_page(
+        db,
+        status=status,
+        q=q,
+        started_from=parsed_started_from,
+        started_to=parsed_started_to,
+        has_email=parsed_has_email,
+        sort=sort,
+        direction=direction,
+        limit=limit,
+        offset=offset,
+    )
+    return _render(
+        request,
+        "directory.html",
+        {
+            "page": page,
+            "filters": {
+                "status": status or "",
+                "q": q or "",
+                "started_from": started_from or "",
+                "started_to": started_to or "",
+                "has_email": has_email or "",
+                "sort": sort,
+                "direction": direction,
+                "limit": limit,
+                "offset": offset,
+            },
+        },
+    )
+
+
 @router.get("/employees/{employee_id}", response_class=HTMLResponse)
 def employee_detail(
     employee_id: int,
@@ -101,18 +149,40 @@ def runs(request: Request, db: Session = Depends(get_db), settings: Settings = D
 def trigger_run(
     request: Request,
     background_tasks: BackgroundTasks,
+    db: Session = Depends(get_db),
     settings: Settings = Depends(get_settings),
 ):
     require_admin(request, settings)
+    if get_running_run(db):
+        return RedirectResponse("/admin/runs", status_code=303)
 
     def _crawl() -> None:
         with SessionLocal() as db:
-            run_crawl(db, settings)
+            run_crawl_if_idle(db, settings)
 
     background_tasks.add_task(_crawl)
     return RedirectResponse("/admin/runs", status_code=303)
 
 
+@router.post("/crawl-now")
+def crawl_now(
+    request: Request,
+    background_tasks: BackgroundTasks,
+    db: Session = Depends(get_db),
+    settings: Settings = Depends(get_settings),
+):
+    require_admin(request, settings)
+    if get_running_run(db):
+        return RedirectResponse("/admin", status_code=303)
+
+    def _crawl() -> None:
+        with SessionLocal() as db:
+            run_crawl_if_idle(db, settings)
+
+    background_tasks.add_task(_crawl)
+    return RedirectResponse("/admin", status_code=303)
+
+
 def _render(request: Request, template: str, context: dict, status_code: int = 200) -> HTMLResponse:
     payload = {
         "request": request,
@@ -121,3 +191,14 @@ def _render(request: Request, template: str, context: dict, status_code: int = 2
         **context,
     }
     return templates.TemplateResponse(template, payload, status_code=status_code)
+
+
+def _parse_date(value: str | None):
+    if not value:
+        return None
+    try:
+        from datetime import date
+
+        return date.fromisoformat(value)
+    except ValueError:
+        return None