feat: repo list search, header sort, pagination (stage 6)

- list_repos: Pulp next 페이지 끝까지 순회 (첫-페이지-only 누락 수정)
- BFF 메모리 검색(이름)·정렬(이름/검증/버전/패키지/동기화)·페이지네이션(20/페이지)
- GET /repos/table 조각: 검색창은 표 밖(포커스 유지), 정렬헤더/페이저는 표 안,
  hx-include 로 검색어·정렬상태 상호 전송
- 폰트 재조정: 데이터 셀 14px, 헤더 13px, 배지/액션버튼 14px (동기화 버튼 대비 균형)
- 버전 페이지 제목↔검증상세 마진, 데모 저장소 26개로 확장

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-06-17 14:04:54 +09:00
parent 15bb0994be
commit abf8654b52
11 changed files with 477 additions and 158 deletions

View File

@@ -1,62 +1,88 @@
"""임시 데모용 가짜 Pulp 클라이언트 — 성공 대시보드 미리보기.
"""임시 데모용 가짜 Pulp 클라이언트 — 실제 Pulp 없이 화면 확인.
PULP_DEMO=true 일 때만 사용된다. 실제 Pulp 서버 없이 화면을 확인하기 위한 것.
정식 기능과 무관하므로 단계 5(또는 실제 Pulp 연동 시) 제거 가능.
PULP_DEMO=true 일 때만 사용. 검색·정렬·페이지네이션을 눈으로 보도록 저장소를 여러 개 생성한다.
정식 기능과 무관하므로 실제 Pulp 연동 시 제거 가능.
"""
from __future__ import annotations
from typing import Any
_REPOS: list[dict[str, Any]] = [
{
"pulp_href": "/pulp/api/v3/repositories/rpm/rpm/0001/",
"name": "rocky9-baseos",
"latest_version_href": "/pulp/api/v3/repositories/rpm/rpm/0001/versions/3/",
"repo_config": {"gpgcheck": 1, "repo-gpgcheck": 1},
},
{
"pulp_href": "/pulp/api/v3/repositories/rpm/rpm/0002/",
"name": "rocky9-appstream",
"latest_version_href": "/pulp/api/v3/repositories/rpm/rpm/0002/versions/2/",
"repo_config": {"gpgcheck": 1, "repo-gpgcheck": 1},
},
{
"pulp_href": "/pulp/api/v3/repositories/rpm/rpm/0003/",
"name": "ubuntu2204-main",
"latest_version_href": "/pulp/api/v3/repositories/rpm/rpm/0003/versions/5/",
"repo_config": {"gpgcheck": 1, "repo-gpgcheck": 0}, # 부분 검증
},
{
"pulp_href": "/pulp/api/v3/repositories/rpm/rpm/0004/",
"name": "internal-tools",
"latest_version_href": "/pulp/api/v3/repositories/rpm/rpm/0004/versions/1/",
"repo_config": {}, # 미설정
},
_NAMES = [
"rocky9-baseos",
"rocky9-appstream",
"rocky9-extras",
"rocky8-baseos",
"rocky8-appstream",
"almalinux9-baseos",
"almalinux9-appstream",
"ubuntu2204-main",
"ubuntu2204-updates",
"ubuntu2204-security",
"ubuntu2004-main",
"debian12-main",
"debian12-updates",
"epel9",
"epel8",
"centos-stream9",
"docker-ce",
"kubernetes",
"postgresql16",
"nginx-stable",
"grafana",
"elastic-8",
"hashicorp",
"internal-tools",
"internal-agents",
"monitoring-exporters",
]
_VERSIONS: dict[str, dict[str, Any]] = {
"/pulp/api/v3/repositories/rpm/rpm/0001/versions/3/": {
"pulp_created": "2026-06-15T02:11:00Z",
"content_summary": {"present": {"rpm.package": {"count": 4821}}},
},
"/pulp/api/v3/repositories/rpm/rpm/0002/versions/2/": {
"pulp_created": "2026-06-14T23:40:00Z",
"content_summary": {"present": {"rpm.package": {"count": 8934}}},
},
"/pulp/api/v3/repositories/rpm/rpm/0003/versions/5/": {
"pulp_created": "2026-06-16T08:05:00Z",
"content_summary": {"present": {"deb.package": {"count": 12500}}},
},
"/pulp/api/v3/repositories/rpm/rpm/0004/versions/1/": {
"pulp_created": "2026-05-30T11:20:00Z",
"content_summary": {"present": {"rpm.package": {"count": 87}}},
},
}
# 검증 상태를 섞는다: pass / warn(부분) / unset
_CFGS = [
{"gpgcheck": 1, "repo-gpgcheck": 1},
{"gpgcheck": 1, "repo-gpgcheck": 0},
{},
]
def _uuid(i: int) -> str:
return f"{i:04d}"
def _latest(i: int) -> int:
return (i % 5) + 1 # 1~5
_REPOS: list[dict[str, Any]] = [
{
"pulp_href": f"/pulp/api/v3/repositories/rpm/rpm/{_uuid(i)}/",
"name": name,
"latest_version_href": (
f"/pulp/api/v3/repositories/rpm/rpm/{_uuid(i)}/versions/{_latest(i)}/"
),
"repo_config": _CFGS[i % 3],
}
for i, name in enumerate(_NAMES, start=1)
]
def _synth_version(version_href: str) -> dict[str, Any]:
parts = version_href.rstrip("/").split("/")
n = int(parts[-1]) if parts[-1].isdigit() else 1
base = 800 + (int(parts[-3]) if parts[-3].isdigit() else 1) * 53
present = base + n * 137
return {
"pulp_created": f"2026-06-{(n * 5) % 27 + 1:02d}T0{n}:11:00Z",
"content_summary": {
"present": {"rpm.package": {"count": present}},
"added": {"rpm.package": {"count": n * 137}},
"removed": {"rpm.package": {"count": n * 7}},
},
}
class DemoPulpClient:
def close(self) -> None: # 인터페이스 호환
def close(self) -> None:
pass
def status(self) -> dict[str, Any]:
@@ -66,7 +92,7 @@ class DemoPulpClient:
return _REPOS
def get_version(self, version_href: str) -> dict[str, Any]:
return _VERSIONS.get(version_href, {})
return _synth_version(version_href)
def get_repo(self, uuid: str) -> dict[str, Any]:
for r in _REPOS:
@@ -74,59 +100,32 @@ class DemoPulpClient:
return {**r, "remote": "/pulp/api/v3/remotes/rpm/rpm/demo/"}
return {"remote": "/pulp/api/v3/remotes/rpm/rpm/demo/"}
def sync_repo(self, uuid: str, remote_href: str) -> str:
return f"/pulp/api/v3/tasks/demo-{uuid}/"
def get_task(self, task_href: str) -> dict[str, Any]:
# 데모: 첫 폴링에서 바로 완료 처리
return {
"state": "completed",
"progress_reports": [{"done": 120, "total": 120}],
"created_resources": ["/pulp/api/v3/repositories/rpm/rpm/demo/versions/9/"],
}
def list_versions(self, uuid: str) -> list[dict[str, Any]]:
base = f"/pulp/api/v3/repositories/rpm/rpm/{uuid}/versions/"
return [
{
"pulp_href": base + "1/",
"pulp_created": "2026-05-02T01:00:00Z",
"content_summary": {
"present": {"rpm.package": {"count": 4500}},
"added": {"rpm.package": {"count": 4500}},
"removed": {},
},
},
{
"pulp_href": base + "2/",
"pulp_created": "2026-05-28T04:30:00Z",
"content_summary": {
"present": {"rpm.package": {"count": 4700}},
"added": {"rpm.package": {"count": 250}},
"removed": {"rpm.package": {"count": 50}},
},
},
{
"pulp_href": base + "3/",
"pulp_created": "2026-06-15T02:11:00Z",
"content_summary": {
"present": {"rpm.package": {"count": 4821}},
"added": {"rpm.package": {"count": 130}},
"removed": {"rpm.package": {"count": 9}},
},
},
]
latest = 1
for i, r in enumerate(_NAMES, start=1):
if _uuid(i) == uuid:
latest = _latest(i)
break
out = []
for n in range(1, latest + 1):
href = f"{base}{n}/"
out.append({"pulp_href": href, **_synth_version(href)})
return out
def list_distributions(self) -> list[dict[str, Any]]:
# 저장소별 현재 배포 버전 (publication href 에 uuid-버전 인코딩)
deployed = {"0001": 2, "0002": 1, "0003": 3, "0004": 1}
return [
{
"pulp_href": f"/pulp/api/v3/distributions/rpm/rpm/{u}/",
"publication": f"/pulp/api/v3/publications/rpm/rpm/{u}-{v}/",
}
for u, v in deployed.items()
]
# 저장소별 현재 배포 버전 (보통 최신-1). publication href 에 uuid-버전 인코딩
dists = []
for i in range(1, len(_NAMES) + 1):
deployed = max(1, _latest(i) - 1)
u = _uuid(i)
dists.append(
{
"pulp_href": f"/pulp/api/v3/distributions/rpm/rpm/{u}/",
"publication": f"/pulp/api/v3/publications/rpm/rpm/{u}-{deployed}/",
}
)
return dists
def get_publication(self, publication_href: str) -> dict[str, Any]:
tail = publication_href.rstrip("/").split("/")[-1] # "0001-2"
@@ -137,6 +136,16 @@ class DemoPulpClient:
)
}
def sync_repo(self, uuid: str, remote_href: str) -> str:
return f"/pulp/api/v3/tasks/demo-{uuid}/"
def get_task(self, task_href: str) -> dict[str, Any]:
return {
"state": "completed",
"progress_reports": [{"done": 120, "total": 120}],
"created_resources": ["/pulp/api/v3/repositories/rpm/rpm/demo/versions/9/"],
}
def create_publication(self, version_href: str) -> str:
return "/pulp/api/v3/tasks/demo-pub/"
@@ -144,7 +153,6 @@ class DemoPulpClient:
return "/pulp/api/v3/tasks/demo-dist/"
def wait_for_task(self, task_href: str, attempts: int = 120, delay: float = 1.0):
# 데모: 즉시 완료. publication task 면 새 publication 리소스를 돌려준다.
created = (
["/pulp/api/v3/publications/rpm/rpm/demo-new/"]
if "pub" in task_href

View File

@@ -62,9 +62,14 @@ class PulpClient:
return self.get(f"{API_PREFIX}/status/")
def list_repos(self) -> list[dict[str, Any]]:
"""RPM 저장소 목록: GET /pulp/api/v3/repositories/rpm/rpm/ → results."""
data = self.get(f"{API_PREFIX}/repositories/rpm/rpm/")
return data.get("results", [])
"""RPM 저장소 전체 목록. Pulp 페이지네이션(next)을 끝까지 따라가 모두 모은다."""
results: list[dict[str, Any]] = []
path: str | None = f"{API_PREFIX}/repositories/rpm/rpm/?limit=100"
while path:
data = self.get(path)
results.extend(data.get("results", []))
path = data.get("next") # 절대 URL/상대경로 모두 httpx가 처리
return results
def get_version(self, version_href: str) -> dict[str, Any]:
"""RepositoryVersion 단건 조회 (href 기준). content_summary 등 포함."""

View File

@@ -1,11 +1,16 @@
"""대시보드 (화면 1, 읽기 전용).
"""대시보드 (화면 1, 읽기 전용) + 목록 컨트롤(검색·정렬·페이지네이션).
GET / 전체 페이지(상태 + 요약 카드 + 저장소 목록)
GET /repos 저장소 목록 조각 (새로고침/폴링용 partial)
GET / 전체 페이지
GET /repos 저장소 목록 전체 조각 (요약+검색창+표) — 새로고침용
GET /repos/table 표+페이저 조각 — 검색/정렬/페이지 이동 대상
저장소 수십 개 규모 가정: 전체를 가져와 enrich 후 메모리에서 검색·정렬·페이지네이션한다.
(요약 카드는 검색/필터와 무관하게 항상 전체 인벤토리 기준.)
"""
from __future__ import annotations
from math import ceil
from typing import Any
import httpx
@@ -18,17 +23,33 @@ from ..pulp_client import PulpClient
router = APIRouter()
PAGE_SIZE = 20
def _load_repos(pulp: PulpClient) -> dict[str, Any]:
"""저장소 목록을 읽어 표시 모델 + 요약 + (실패 시) 에러 메시지를 만든다."""
def _load_repos(
pulp: PulpClient,
q: str = "",
sort: str = "name",
direction: str = "asc",
page: int = 1,
) -> dict[str, Any]:
syncing = task_store.active_count()
base = {"q": q, "sort": sort, "dir": direction}
try:
repos = pulp.list_repos()
raw = pulp.list_repos()
except httpx.HTTPError as exc:
return {"repos": [], "summary": views.summarize([], syncing), "error": str(exc)}
return {
**base,
"repos": [],
"summary": views.summarize([], syncing),
"page": 1,
"pages": 1,
"total": 0,
"error": str(exc),
}
repo_views: list[dict[str, Any]] = []
for repo in repos:
for repo in raw:
version = None
vhref = repo.get("latest_version_href")
if vhref:
@@ -38,24 +59,65 @@ def _load_repos(pulp: PulpClient) -> dict[str, Any]:
version = None # 버전 상세 실패는 치명적이지 않음 — 행은 표시
repo_views.append(views.build_repo_view(repo, version))
summary = views.summarize(repo_views, syncing) # 전체 기준
ql = q.strip().lower()
filtered = [r for r in repo_views if ql in r["name"].lower()] if ql else repo_views
filtered = views.sort_repos(filtered, sort, direction)
total = len(filtered)
pages = max(1, ceil(total / PAGE_SIZE))
page = min(max(page, 1), pages)
window = filtered[(page - 1) * PAGE_SIZE : page * PAGE_SIZE]
return {
"repos": repo_views,
"summary": views.summarize(repo_views, syncing),
**base,
"repos": window,
"summary": summary,
"page": page,
"pages": pages,
"total": total,
"error": None,
}
@router.get("/", response_class=HTMLResponse)
def dashboard(
request: Request, pulp: PulpClient = Depends(get_pulp_client)
request: Request,
q: str = "",
sort: str = "name",
dir: str = "asc",
page: int = 1,
pulp: PulpClient = Depends(get_pulp_client),
) -> HTMLResponse:
return templates.TemplateResponse(request, "dashboard.html", _load_repos(pulp))
return templates.TemplateResponse(
request, "dashboard.html", _load_repos(pulp, q, sort, dir, page)
)
@router.get("/repos", response_class=HTMLResponse)
def repos_fragment(
request: Request, pulp: PulpClient = Depends(get_pulp_client)
request: Request,
q: str = "",
sort: str = "name",
dir: str = "asc",
page: int = 1,
pulp: PulpClient = Depends(get_pulp_client),
) -> HTMLResponse:
return templates.TemplateResponse(
request, "partials/repo_list.html", _load_repos(pulp)
request, "partials/repo_list.html", _load_repos(pulp, q, sort, dir, page)
)
@router.get("/repos/table", response_class=HTMLResponse)
def repos_table(
request: Request,
q: str = "",
sort: str = "name",
dir: str = "asc",
page: int = 1,
pulp: PulpClient = Depends(get_pulp_client),
) -> HTMLResponse:
return templates.TemplateResponse(
request, "partials/table_wrap.html", _load_repos(pulp, q, sort, dir, page)
)

View File

@@ -153,10 +153,10 @@ button:disabled,
[role="button"]:disabled {
opacity: 0.45;
}
/* 표 안 액션 버튼: 컴팩트 */
/* 표 안 액션 버튼: 컴팩트하되 글자는 또렷하게 */
.btn-sm {
padding: 7px 14px;
font-size: 13px;
font-size: 14px;
margin: 0;
width: auto;
}
@@ -213,7 +213,7 @@ button:disabled,
margin: 0;
}
.table-card thead th {
font-size: 12px;
font-size: 13px;
font-weight: 600;
color: var(--text-dim);
text-transform: uppercase;
@@ -224,6 +224,7 @@ button:disabled,
}
.table-card tbody td {
height: 56px;
font-size: 14px;
border-bottom: 1px solid var(--border);
padding-block: 12px;
vertical-align: middle;
@@ -266,9 +267,9 @@ th.num {
display: inline-flex;
align-items: center;
gap: 6px;
padding: 4px 10px;
padding: 4px 11px;
border-radius: 999px;
font-size: 13px;
font-size: 14px;
font-weight: 500;
white-space: nowrap;
}
@@ -301,7 +302,8 @@ th.num {
display: flex;
align-items: center;
gap: 12px;
margin-bottom: 16px;
margin-top: 20px;
margin-bottom: 20px;
}
.verify-detail small {
color: var(--text-muted);
@@ -362,6 +364,47 @@ th.num {
color: var(--text-muted);
}
/* 검색 툴바 / 정렬 헤더 / 페이저 */
.list-toolbar {
margin-bottom: 14px;
}
.repo-search {
max-width: 280px;
margin: 0;
font-size: 14px;
}
.table-card thead th a.th-sort {
display: inline-flex;
align-items: center;
gap: 4px;
color: inherit;
text-decoration: none;
cursor: pointer;
}
.table-card thead th a.th-sort:hover {
color: var(--text-secondary);
}
.table-card thead th a.th-sort.is-active {
color: var(--accent);
}
.sort-ind {
font-size: 11px;
}
.pager {
display: flex;
align-items: center;
justify-content: flex-end;
gap: 14px;
padding: 12px 16px;
border-top: 1px solid var(--border);
color: var(--text-muted);
font-size: 13px;
}
.empty-note {
padding: 16px;
color: var(--text-muted);
}
@media (max-width: 640px) {
.summary {
grid-template-columns: repeat(2, 1fr);

View File

@@ -9,43 +9,15 @@
<div class="card"><div class="value">{{ summary.total_packages }}</div><div class="label">총 패키지</div></div>
</div>
{% if repos %}
<div class="table-card">
<table>
<thead>
<tr>
<th>저장소</th>
<th>검증</th>
<th class="num">최신 버전</th>
<th class="num">패키지 수</th>
<th>마지막 동기화</th>
<th></th>
</tr>
</thead>
<tbody>
{% for repo in repos %}
<tr>
<td class="repo-name"><a href="/repos/{{ repo.uuid }}/versions">{{ repo.name }}</a></td>
<td><span class="badge badge-{{ repo.gpg.level }}">{{ repo.gpg.label }}</span></td>
<td class="num">{% if repo.latest_version is not none %}v{{ repo.latest_version }}{% else %}—{% endif %}</td>
<td class="num">{% if repo.package_count is not none %}{{ repo.package_count }}{% else %}—{% endif %}</td>
<td class="mono">{{ repo.last_sync or "—" }}</td>
<td>
<div id="sync-{{ repo.uuid }}" class="row-action">
<button class="secondary btn-sm"
hx-post="/repos/{{ repo.uuid }}/sync"
hx-target="#sync-{{ repo.uuid }}"
hx-swap="innerHTML"
hx-disabled-elt="this">동기화</button>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
<div class="list-toolbar">
<!-- 검색창은 표 바깥에 둬서 입력 중 포커스 유지. 정렬 상태([data-state])를 함께 전송 -->
<input id="repo-search" class="repo-search" type="search" name="q" value="{{ q }}"
placeholder="저장소 이름 검색"
hx-get="/repos/table" hx-target="#repo-table-wrap" hx-swap="outerHTML"
hx-trigger="input changed delay:300ms, search"
hx-include="[data-state]">
</div>
{% else %}
<p>등록된 저장소가 없습니다.</p>
{% endif %}
{% include "partials/table_wrap.html" %}
{% endif %}
</div>

View File

@@ -0,0 +1,75 @@
{#
표 + 페이저 조각. 검색/정렬/페이지 이동의 swap 대상(#repo-table-wrap).
정렬 헤더와 페이저는 현재 검색어(q)를 #repo-search 에서 hx-include 로 가져온다.
hidden state(sort/dir, data-state)는 검색창이 정렬 상태를 함께 보내도록 노출.
#}
<div id="repo-table-wrap">
<input type="hidden" name="sort" value="{{ sort }}" data-state>
<input type="hidden" name="dir" value="{{ dir }}" data-state>
{% macro sorth(col, label, extra="") %}
<th class="{{ extra }}">
<a href="#" class="th-sort{% if sort == col %} is-active{% endif %}"
hx-get="/repos/table" hx-target="#repo-table-wrap" hx-swap="outerHTML"
hx-include="#repo-search"
hx-vals='{"sort": "{{ col }}", "dir": "{{ 'desc' if (sort == col and dir == 'asc') else 'asc' }}"}'>
{{ label }}{% if sort == col %} <span class="sort-ind">{{ '↑' if dir == 'asc' else '↓' }}</span>{% endif %}
</a>
</th>
{% endmacro %}
{% if total %}
<div class="table-card">
<table>
<thead>
<tr>
{{ sorth("name", "저장소") }}
{{ sorth("verified", "검증") }}
{{ sorth("version", "최신 버전", "num") }}
{{ sorth("packages", "패키지 수", "num") }}
{{ sorth("last_sync", "마지막 동기화") }}
<th></th>
</tr>
</thead>
<tbody>
{% for repo in repos %}
<tr>
<td class="repo-name"><a href="/repos/{{ repo.uuid }}/versions">{{ repo.name }}</a></td>
<td><span class="badge badge-{{ repo.gpg.level }}">{{ repo.gpg.label }}</span></td>
<td class="num">{% if repo.latest_version is not none %}v{{ repo.latest_version }}{% else %}—{% endif %}</td>
<td class="num">{% if repo.package_count is not none %}{{ repo.package_count }}{% else %}—{% endif %}</td>
<td class="mono">{{ repo.last_sync or "—" }}</td>
<td>
<div id="sync-{{ repo.uuid }}" class="row-action">
<button class="secondary btn-sm"
hx-post="/repos/{{ repo.uuid }}/sync"
hx-target="#sync-{{ repo.uuid }}"
hx-swap="innerHTML"
hx-disabled-elt="this">동기화</button>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% if pages > 1 %}
<div class="pager">
<button class="secondary btn-sm" {% if page <= 1 %}disabled{% endif %}
hx-get="/repos/table" hx-target="#repo-table-wrap" hx-swap="outerHTML"
hx-include="#repo-search"
hx-vals='{"sort": "{{ sort }}", "dir": "{{ dir }}", "page": "{{ page - 1 }}"}'>이전</button>
<span class="mono">{{ page }} / {{ pages }}</span>
<button class="secondary btn-sm" {% if page >= pages %}disabled{% endif %}
hx-get="/repos/table" hx-target="#repo-table-wrap" hx-swap="outerHTML"
hx-include="#repo-search"
hx-vals='{"sort": "{{ sort }}", "dir": "{{ dir }}", "page": "{{ page + 1 }}"}'>다음</button>
</div>
{% endif %}
</div>
{% elif q %}
<p class="empty-note">'{{ q }}' 검색 결과가 없습니다.</p>
{% else %}
<p class="empty-note">등록된 저장소가 없습니다.</p>
{% endif %}
</div>

View File

@@ -139,6 +139,25 @@ def verification_detail(repo: dict[str, Any]) -> dict[str, Any]:
}
_REPO_SORT_KEYS = {
"name": lambda r: (r["name"] or "").lower(),
"verified": lambda r: {"pass": 0, "warn": 1, "unset": 2}.get(
(r["gpg"] or {}).get("level"), 3
),
"version": lambda r: r["latest_version"] if r["latest_version"] is not None else -1,
"packages": lambda r: r["package_count"] if r["package_count"] is not None else -1,
"last_sync": lambda r: r["last_sync"] or "",
}
def sort_repos(
repo_views: list[dict[str, Any]], key: str, direction: str = "asc"
) -> list[dict[str, Any]]:
"""대시보드 헤더 정렬. 알 수 없는 key 는 이름순으로 폴백."""
fn = _REPO_SORT_KEYS.get(key) or _REPO_SORT_KEYS["name"]
return sorted(repo_views, key=fn, reverse=(direction == "desc"))
def summarize(repo_views: list[dict[str, Any]], syncing: int = 0) -> dict[str, int]:
"""상단 요약 카드 수치. syncing 은 task_store.active_count() 에서 주입."""
return {