The app-wide Back row existed because it duplicated Esc — two of its call sites said as much in a comment. On both platforms Esc is a labelled key and every footer hint names it, so the row bought nothing for the blank separator and line it took out of every screen; on the PicoCalc's 26 rows that is a row in thirteen. back_rows() is gone, and with it the four hand-drawn copies: ReorderScreen's clean-state row, the live feed's pinned foot stop (the cursor now clamps on the oldest packet), node detail's tail action, and the action-list rows on the trace and TX-sweep screens. Kept, because there leaving is a choice rather than an exit — the same rule that keeps a dialog's Cancel button: exit_rows()' staged pair, where Apply has no key of its own and ✗ Back names what the other way out costs; ReorderScreen's dirty-state pair; the two Quit rows, which initiate the app's terminal action behind a confirm; and the new-record dialog's Close, which is its default, so dropping it would let a reflex Enter navigate. With no Back row there is no Back value: the six spellings callers used to test three at a time (_BACK, "__back__", _CANCEL, two tuple shapes, bare None) collapse to `is CANCEL` / `is None`. The gallery now asserts the absence of an exit row on every screen, on both platforms. Resolves findings E and §10 of docs/survey-navigation.md. Finding D — Esc peeling a filter on three screens and leaving on two — still stands, and is now the only thing left telling a user what Esc does. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
116 lines
4.6 KiB
Python
116 lines
4.6 KiB
Python
"""The admin-node picker: choose a remote node you hold (or will enter) credentials for.
|
|
|
|
Shared by the tools that administer remote nodes over the mesh — TX optimize and the
|
|
repeater admin screen — so "pick the node to manage" reads identically everywhere.
|
|
Credentialed nodes lead the list in their own 🔑 section (those are the nodes previously
|
|
administered, the likeliest picks), repeaters and room servers follow, then everything
|
|
else; each section orders by how recently the node was heard. Any contact with a public
|
|
key is offerable, since holding a password is a fact about the *user*, not the node.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import TYPE_CHECKING, Optional
|
|
|
|
from rich.text import Text
|
|
|
|
from ..core.models import NODE_TYPE_REPEATER, NODE_TYPE_ROOM, Contact
|
|
|
|
if TYPE_CHECKING:
|
|
from ..context import AppContext
|
|
|
|
|
|
def admin_picker_rows(
|
|
ctx: "AppContext", contacts: list[Contact]
|
|
) -> tuple[list, list[Contact]]:
|
|
"""Build the admin-node picker's grouped rows and the contacts they map to.
|
|
|
|
Shared so the pick and any later redraw are guaranteed identical: :func:`pick_admin_node`
|
|
runs these rows, and a caller can rebuild the same list as a static backdrop to float a
|
|
follow-up dialog (the admin login) over the very list the node was picked from. Rows carry
|
|
``value = contact.name``, so a picked name (or a backdrop's ``default``) resolves through
|
|
``candidates``.
|
|
|
|
Args:
|
|
ctx: Shared application context (for the admin store, which sorts remembered nodes up).
|
|
contacts: The device's known contacts.
|
|
|
|
Returns:
|
|
``(rows, candidates)`` — the grouped select rows and the offerable contacts
|
|
(those holding a key). Both are empty when nothing is offerable; the caller
|
|
notes that and never opens a list at all.
|
|
"""
|
|
from .menus import section_heading
|
|
from .theme import name_style
|
|
from .tui import Choice
|
|
from .widgets import _DEFAULT_GLYPH, _NODE_GLYPHS
|
|
|
|
candidates = [c for c in contacts if (c.public_key or c.key_prefix).strip()]
|
|
if not candidates:
|
|
return [], candidates
|
|
|
|
def row(contact: Contact) -> Choice:
|
|
# The type mark keeps its own fixed hue; the *name* takes the node's key-derived
|
|
# colour like every other list of nodes (a style on the Text itself would be the
|
|
# row's base and would paint the name the type's colour too).
|
|
glyph, glyph_style = _NODE_GLYPHS.get(contact.node_type, _DEFAULT_GLYPH)
|
|
label = Text()
|
|
label.append(f"{glyph} ", style=glyph_style)
|
|
label.append(
|
|
contact.name,
|
|
style=name_style(contact.name, contact.public_key or contact.key_prefix),
|
|
)
|
|
return Choice(title=label, value=contact.name)
|
|
|
|
def recency(contact: Contact) -> float:
|
|
return -(contact.last_seen.timestamp() if contact.last_seen else 0.0)
|
|
|
|
remembered = [c for c in candidates if ctx.admin_store.get(c) is not None]
|
|
infrastructure = [
|
|
c for c in candidates
|
|
if c not in remembered and c.node_type in (NODE_TYPE_REPEATER, NODE_TYPE_ROOM)
|
|
]
|
|
others = [c for c in candidates if c not in remembered and c not in infrastructure]
|
|
|
|
items: list = []
|
|
if remembered:
|
|
items.append(section_heading("Remembered admins"))
|
|
items.extend(row(c) for c in sorted(remembered, key=recency))
|
|
if infrastructure:
|
|
items.append(section_heading("Repeaters & rooms"))
|
|
items.extend(row(c) for c in sorted(infrastructure, key=recency))
|
|
if others:
|
|
items.append(section_heading("Other contacts"))
|
|
items.extend(row(c) for c in sorted(others, key=recency))
|
|
return items, candidates
|
|
|
|
|
|
async def pick_admin_node(
|
|
ctx: "AppContext",
|
|
contacts: list[Contact],
|
|
*,
|
|
title: str,
|
|
prompt: str,
|
|
) -> Optional[Contact]:
|
|
"""Pick a remote node to administer, credentialed and infrastructure nodes first.
|
|
|
|
Args:
|
|
ctx: Shared application context (for the UI surface and the admin store).
|
|
contacts: The device's known contacts.
|
|
title: The select screen's heading (names the calling feature).
|
|
prompt: One line above the list saying what the pick is for.
|
|
|
|
Returns:
|
|
The chosen contact, or ``None`` if cancelled (or there is nothing to pick).
|
|
"""
|
|
items, candidates = admin_picker_rows(ctx, contacts)
|
|
if not candidates:
|
|
ctx.ui.note("[err]no contacts with a key — receive an advert first[/err]")
|
|
await ctx.ui.present(title=title)
|
|
return None
|
|
|
|
choice = await ctx.ui.select(title, items, prompt=prompt, wrap=False)
|
|
if choice is None:
|
|
return None
|
|
return next((c for c in candidates if c.name == choice), None)
|