Adding part details page

This commit is contained in:
Ian Roddis committed 2026-07-27 15:11:58 -03:00
1 parent 2587ccbceb
commit 1b52ad04bc
7 files changed
+305 -9

No files matched your search

+2 -2
View File
@@ -31,7 +31,7 @@
{% set info = row.info %}
<tr>
<td>
<strong>{{ scope.description }}</strong>
<strong><a href="/admin/augmented-parts/{{ scope.id }}">{{ scope.description }}</a></strong>
{% if scope.sku %}<br><span class="muted">{{ scope.sku }}</span>{% endif %}
</td>
<td>{{ scope.manufacturer.name if scope.manufacturer else "—" }}</td>
@@ -50,7 +50,7 @@
{% for e in entries %}
<div class="fit-cell-item">
<span class="fit-badge fit-badge-{{ e.label }}">{{ e.label | capitalize }}</span>
{{ e.part.description | truncate(48) }}
<a href="/admin/augmented-parts/{{ e.part.id }}">{{ e.part.description | truncate(48) }}</a>
</div>
{% endfor %}
{% else %}
@@ -19,6 +19,7 @@
<span class="fit-item-arrow">↔</span>
<span class="fit-item-side">{{ other_part.description if other_part else "Unknown part" }} — <strong>{{ other_ap.attachment_point_name.name }}</strong> ({{ conn_desc(other_ap) }})</span>
</div>
{% if can_write %}
<div class="row-actions">
{% if fit.label.value != "exact" %}
<button class="btn btn-ghost"
@@ -44,6 +45,7 @@
hx-swap="outerHTML"
hx-confirm="Delete this fit?">Delete</button>
</div>
{% endif %}
<div class="fit-notes">
{% for note in fit.notes %}
@@ -52,11 +54,13 @@
<p class="fit-note-body">{{ note.body }}</p>
</div>
{% endfor %}
{% if can_write %}
<form hx-post="/admin/augmented-parts/{{ augmented_part_id }}/fits/{{ fit.id }}/notes"
hx-target="#fit-{{ fit.id }}" hx-swap="outerHTML"
class="inline-edit fit-note-form">
<input type="text" name="body" placeholder="Add a note…" required>
<button type="submit" class="btn btn-ghost">Add note</button>
</form>
{% endif %}
</div>
</div>
@@ -12,6 +12,7 @@
<p class="muted" style="font-size:0.85rem;margin:0 0 0.5rem">No fits recorded yet.</p>
{% endfor %}
{% if can_write %}
<div class="row-actions" style="margin:0.5rem 0">
<form hx-post="/admin/augmented-parts/{{ augmented_part_id }}/fits/recompute"
hx-target="#ap-{{ augmented_part_id }}-fits" hx-swap="outerHTML">
@@ -46,4 +47,5 @@
<div id="ap-{{ augmented_part_id }}-fit-other-points"></div>
<button type="submit" class="btn btn-primary">Add fit</button>
</form>
{% endif %}
</div>
+1 -1
View File
@@ -1,7 +1,7 @@
<tr id="augmented-part-{{ ap.id }}">
<td>{{ ap.id }}</td>
<td>{{ ap.sku or '—' }}</td>
<td>{{ ap.description | truncate(60) }}</td>
<td><a href="/admin/augmented-parts/{{ ap.id }}">{{ ap.description | truncate(60) }}</a></td>
<td>{{ ap.colour.name }}</td>
<td>{{ ap.manufacturer.name }}</td>
<td>{{ ap.scope_model.name if ap.scope_model else '—' }}</td>
@@ -0,0 +1,85 @@
{% extends "base.html" %}
{% block title %}{{ ap.description | truncate(40) }} · {{ app_name }}{% endblock %}
{% block body %}
{% include "_nav.html" %}
{%- macro conn_desc(point) -%}
{%- if point.iso_thread -%}
ISO M{{ point.iso_thread.diameter_mm }}×{{ point.iso_thread.pitch_mm }}
{%- elif point.unc_thread -%}
UNC {{ point.unc_thread.diameter_fraction }}-{{ point.unc_thread.tpi }} {{ point.unc_thread.series.value }}
{%- elif point.clamp_connection -%}
Clamp {{ point.clamp_connection.min_mm if point.clamp_connection.min_mm is not none else point.clamp_connection.min_in }}–{{ point.clamp_connection.max_mm if point.clamp_connection.max_mm is not none else point.clamp_connection.max_in }}
{%- elif point.static_connection -%}
Static {{ point.static_connection.od_mm }} mm OD
{%- else -%}
—
{%- endif -%}
{%- endmacro -%}
<main class="container">
<p><a href="/admin/augmented-parts" class="btn btn-ghost">← Augmented Parts</a></p>
<h1>{{ ap.description }}</h1>
<p class="muted">
<span class="tag">{{ ap.part_type.name }}</span>
{% if ap.sub_part_type %}<span class="tag">{{ ap.sub_part_type.name }}</span>{% endif %}
{% if ap.sku %}· SKU {{ ap.sku }}{% endif %}
</p>
<div class="grid">
<div class="card">
<h2>Details</h2>
<dl class="kv">
<dt>SKU</dt><dd>{{ ap.sku or "—" }}</dd>
<dt>Description</dt><dd>{{ ap.description }}</dd>
<dt>Colour</dt><dd>{{ ap.colour.name if ap.colour else "—" }}</dd>
<dt>Manufacturer</dt><dd>{{ ap.manufacturer.name if ap.manufacturer else "—" }}</dd>
<dt>Type</dt><dd>{{ ap.part_type.name }}</dd>
<dt>Sub type</dt><dd>{{ ap.sub_part_type.name if ap.sub_part_type else "—" }}</dd>
<dt>Scope model</dt>
<dd>
{% if ap.scope_model %}
{{ ap.scope_model.name }}
{% if ap.scope_model.url %} · <a href="{{ ap.scope_model.url }}" target="_blank" rel="noopener">link</a>{% endif %}
{% else %}—{% endif %}
</dd>
</dl>
</div>
{% if scope_info %}
<div class="card">
<h2>Scope information</h2>
<dl class="kv">
<dt>Magnification</dt>
<dd>
{% if scope_info.magnification_min is not none or scope_info.magnification_max is not none %}
{{ scope_info.magnification_min if scope_info.magnification_min is not none else "?" }}–{{ scope_info.magnification_max if scope_info.magnification_max is not none else "?" }}×
{% else %}—{% endif %}
</dd>
<dt>Model suffix</dt><dd>{{ scope_info.model_suffix or "—" }}</dd>
<dt>Objective thread</dt><dd>{{ scope_info.objective_thread_pitch or "—" }}</dd>
</dl>
</div>
{% endif %}
<div class="card">
<h2>Attachment points</h2>
{% for point in attachment_points %}
<div class="ap-item">
<span class="ap-item-name">{{ point.attachment_point_name.name }}</span>
<code class="ap-item-conn">{{ conn_desc(point) }}</code>
</div>
{% else %}
<p class="muted">No attachment points recorded.</p>
{% endfor %}
</div>
</div>
{% if can_read_fits %}
<div class="card">
{% include "admin/_augmented_part_fits.html" %}
</div>
{% endif %}
</main>
{% endblock %}
+59 -6
View File
@@ -26,6 +26,7 @@ from app.crud import manufacturer as manufacturer_crud
from app.crud import part_colour as part_colour_crud
from app.crud import part_type as part_type_crud
from app.crud import role as role_crud
from app.crud import scope_info as scope_info_crud
from app.crud import scope_model as scope_model_crud
from app.crud import attachment_point as attachment_point_crud
from app.crud import attachment_point_name as apn_crud
@@ -1780,6 +1781,37 @@ async def filter_skipped_parts(
)
@router.get("/augmented-parts/{augmented_part_id}", response_class=HTMLResponse)
async def augmented_part_detail(
request: Request,
augmented_part_id: int,
db: AsyncSession = Depends(get_db),
user: User = Depends(web_require("augmented_parts:read")),
):
ap = await augmented_part_crud.get(db, augmented_part_id)
if ap is None:
raise HTTPException(status_code=404, detail="Augmented part not found")
can_read_fits = user.is_superuser or "fits:read" in user.permissions
ctx = {
"user": user,
"ap": ap,
"scope_info": await scope_info_crud.get_by_augmented_part(
db, augmented_part_id
),
"attachment_points": await attachment_point_crud.list_for_augmented_part(
db, augmented_part_id
),
"can_read_fits": can_read_fits,
}
if can_read_fits:
ctx.update(
await _augmented_part_fits_ctx(
db, augmented_part_id, can_write=_can_write_fits(user)
)
)
return templates.TemplateResponse(request, "admin/augmented_part_detail.html", ctx)
@router.get("/augmented-parts/{augmented_part_id}/edit", response_class=HTMLResponse)
async def edit_augmented_part_row(
request: Request,
@@ -2102,10 +2134,15 @@ async def _fit_view(db: AsyncSession, fit, part_id: int) -> dict:
}
def _can_write_fits(user: User) -> bool:
return user.is_superuser or "fits:write" in user.permissions
async def _augmented_part_fits_ctx(
db: AsyncSession,
augmented_part_id: int,
*,
can_write: bool = True,
message: str | None = None,
error: str | None = None,
) -> dict:
@@ -2122,6 +2159,7 @@ async def _augmented_part_fits_ctx(
db, augmented_part_id
),
"other_parts": other_parts,
"can_write": can_write,
"message": message,
"error": error,
}
@@ -2132,9 +2170,11 @@ async def augmented_part_fits(
request: Request,
augmented_part_id: int,
db: AsyncSession = Depends(get_db),
_: User = Depends(web_require("fits:read")),
user: User = Depends(web_require("fits:read")),
):
ctx = await _augmented_part_fits_ctx(db, augmented_part_id)
ctx = await _augmented_part_fits_ctx(
db, augmented_part_id, can_write=_can_write_fits(user)
)
return templates.TemplateResponse(request, "admin/_augmented_part_fits.html", ctx)
@@ -2162,6 +2202,7 @@ async def recompute_augmented_part_fits(
ctx = await _augmented_part_fits_ctx(
db,
augmented_part_id,
can_write=_can_write_fits(actor),
message=f"{result.created} created, {result.removed} removed.",
)
return templates.TemplateResponse(request, "admin/_augmented_part_fits.html", ctx)
@@ -2223,7 +2264,9 @@ async def create_augmented_part_fit(
"Fit", fit.id, f"attachment points {ap_a.id}↔{ap_b.id}"
),
)
ctx = await _augmented_part_fits_ctx(db, augmented_part_id, error=error)
ctx = await _augmented_part_fits_ctx(
db, augmented_part_id, can_write=_can_write_fits(actor), error=error
)
return templates.TemplateResponse(request, "admin/_augmented_part_fits.html", ctx)
@@ -2255,7 +2298,11 @@ async def update_augmented_part_fit_label(
return templates.TemplateResponse(
request,
"admin/_augmented_part_fit_row.html",
{"augmented_part_id": augmented_part_id, **view},
{
"augmented_part_id": augmented_part_id,
"can_write": _can_write_fits(actor),
**view,
},
)
@@ -2281,7 +2328,11 @@ async def create_augmented_part_fit_note(
return templates.TemplateResponse(
request,
"admin/_augmented_part_fit_row.html",
{"augmented_part_id": augmented_part_id, **view},
{
"augmented_part_id": augmented_part_id,
"can_write": _can_write_fits(actor),
**view,
},
)
@@ -2309,7 +2360,9 @@ async def delete_augmented_part_fit(
resource_id=fit_id,
description=audit_crud.describe_delete("Fit", fit_id, label),
)
ctx = await _augmented_part_fits_ctx(db, augmented_part_id)
ctx = await _augmented_part_fits_ctx(
db, augmented_part_id, can_write=_can_write_fits(actor)
)
return templates.TemplateResponse(request, "admin/_augmented_part_fits.html", ctx)
+152
View File
@@ -0,0 +1,152 @@
import pytest
from app.crud import role as role_crud
from app.models.attachment_point import AttachmentPoint
from app.models.attachment_point_name import AttachmentPointName
from app.models.augmented_part import AugmentedPart
from app.models.fit import Fit, FitLabel
from app.models.part_type import PartType
from app.models.scope_info import ScopeInfo
async def _seed_part_with_fit(db):
apn = AttachmentPointName(name="Objective")
scope_t = PartType(name="Scope")
cover_t = PartType(name="Flip Cover")
db.add_all([apn, scope_t, cover_t])
await db.flush()
scope = AugmentedPart(
description="Alpha 3-18x50",
sku="ALP-318",
colour_id=1,
manufacturer_id=1,
part_type_id=scope_t.id,
)
cover = AugmentedPart(
description="Flip cover 50mm",
colour_id=1,
manufacturer_id=1,
part_type_id=cover_t.id,
)
db.add_all([scope, cover])
await db.flush()
db.add(
ScopeInfo(
augmented_part_id=scope.id,
magnification_min=3,
magnification_max=18,
objective_thread_pitch="M52x0.75",
)
)
ap_s = AttachmentPoint(
augmented_part_id=scope.id, attachment_point_name_id=apn.id
)
ap_c = AttachmentPoint(
augmented_part_id=cover.id, attachment_point_name_id=apn.id
)
db.add_all([ap_s, ap_c])
await db.flush()
db.add(
Fit(
attachment_point_a_id=ap_s.id,
attachment_point_b_id=ap_c.id,
augmented_part_a_id=scope.id,
augmented_part_b_id=cover.id,
label=FitLabel.POSSIBLE,
)
)
await db.commit()
return {"scope_id": scope.id, "cover_id": cover.id}
async def _web_login(client, email, password="secret123"):
resp = await client.post("/login", data={"email": email, "password": password})
assert resp.status_code == 303
@pytest.mark.asyncio
async def test_detail_shows_attributes_and_fits_readonly(
client, seeded, make_user, db_sessionmaker
):
async with db_sessionmaker() as db:
ids = await _seed_part_with_fit(db)
# The default "user" role has augmented_parts:read + fits:read, NOT fits:write.
await make_user("reader@example.com", role_ids=[seeded["roles"]["user"].id])
await _web_login(client, "reader@example.com")
resp = await client.get(f"/admin/augmented-parts/{ids['scope_id']}")
assert resp.status_code == 200
body = resp.text
# Attributes
assert "Alpha 3-18x50" in body
assert "ALP-318" in body
assert "M52x0.75" in body # scope info
assert "Objective" in body # attachment point
# Fits are shown (the other part in the fit)
assert "Flip cover 50mm" in body
# ...but write controls are hidden for a read-only user
assert "Add fit" not in body
assert "Mark Exact" not in body
assert "Recompute possible fits" not in body
@pytest.mark.asyncio
async def test_detail_write_controls_for_fit_editor(
client, seeded, make_user, db_sessionmaker
):
async with db_sessionmaker() as db:
ids = await _seed_part_with_fit(db)
perms = seeded["perms"]
editor = await role_crud.create(
db,
name="fit-editor",
permission_ids=[
perms["augmented_parts:read"].id,
perms["fits:read"].id,
perms["fits:write"].id,
],
)
editor_id = editor.id
await make_user("editor@example.com", role_ids=[editor_id])
await _web_login(client, "editor@example.com")
resp = await client.get(f"/admin/augmented-parts/{ids['scope_id']}")
assert resp.status_code == 200
body = resp.text
assert "Add fit" in body
assert "Mark Exact" in body
assert "Recompute possible fits" in body
@pytest.mark.asyncio
async def test_detail_404_for_missing_part(client, seeded, make_user):
await make_user("reader2@example.com", role_ids=[seeded["roles"]["user"].id])
await _web_login(client, "reader2@example.com")
resp = await client.get("/admin/augmented-parts/99999")
assert resp.status_code == 404
@pytest.mark.asyncio
async def test_detail_requires_read_permission(client, seeded, make_user, db_sessionmaker):
async with db_sessionmaker() as db:
ids = await _seed_part_with_fit(db)
await make_user("plain@example.com") # no roles, not superuser
await _web_login(client, "plain@example.com")
resp = await client.get(f"/admin/augmented-parts/{ids['scope_id']}")
assert resp.status_code == 403
@pytest.mark.asyncio
async def test_augmented_parts_list_links_to_detail(
client, seeded, make_user, db_sessionmaker
):
async with db_sessionmaker() as db:
ids = await _seed_part_with_fit(db)
await make_user("reader3@example.com", role_ids=[seeded["roles"]["user"].id])
await _web_login(client, "reader3@example.com")
resp = await client.get("/admin/augmented-parts")
assert resp.status_code == 200
assert f'href="/admin/augmented-parts/{ids["scope_id"]}"' in resp.text