fix(5.19): corectii UX/retentie held (findings #2-#6 /code-review high)

#2 Filtrul "doar tinute" (held=1) devine persistent: hidden #f-held in
   #filtre-trimiteri sincronizat prin OOB din _submissions.html + paginare
   pastreaza held=1; chip "Doar tinute manual / Arata tot" ca off-switch.
   Param `held` schimbat la str (held= gol nu mai da 422 la coercion).
#3 Banner bulk "Trimite toate (N)" extras in _bulk_held_banner.html si
   re-randat prin OOB (#bulk-held-banner-wrap) la fiecare reincarcare a listei
   -> nu mai ramane stale dupa eliberari (count revine la 0).
#4 tools/carantina_held seteaza purge_after (blocked_retention_days) pe randurile
   carantinate -> PII nu mai sta la nesfarsit (purge_expired le poate sterge).
#5 Panoul de detaliu marcheaza randul tinut (eticheta amber) si ofera buton
   "Trimite acum la RAR" (paritate cu randul din lista).
#6 expire_held seteaza purge_after=now-1s -> randul expirat e purjabil in ACELASI
   ciclu (purge_expired foloseste comparatie stricta), nu la ciclul urmator.

Teste noi: stickiness held + banner OOB + detaliu buton (test_web_auto_send),
purge_after carantina, purge acelasi-ciclu (test_worker_held). 1541 passed.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Claude Agent
2026-07-06 11:19:00 +00:00
parent 789e3f54be
commit eade702a52
10 changed files with 242 additions and 51 deletions

View File

@@ -269,6 +269,20 @@ def _held_counts(conn, account_id: int) -> tuple[int, int]:
return (int(row["manual"] or 0), int(row["aged"] or 0))
def _held_bulk_ctx(conn, account_id: int) -> dict:
"""Context partajat pentru banner-ul bulk "Trimite toate (N)" + mediul RAR tinta.
Randat in _submissions.html la FIECARE reincarcare a listei (nu doar la incarcarea Acasa),
ca sa nu ramana stale dupa eliberari (fix /code-review #3). `held_manual_count` = total
randuri tinute ale contului (independent de filtrul tabelului).
"""
manual, _aged = _held_counts(conn, account_id)
return {
"held_manual_count": manual,
"env_bulk": rar_env_efectiv_cont(conn, account_id) or "prod",
}
def _trimiteri_versiune(conn, account_id: int) -> str:
"""Semnatura ieftina a starii trimiterilor contului: numar randuri + cel mai recent
updated_at. Se schimba la orice insert/update/delete -> nudge-ul "Date noi" o compara
@@ -1126,7 +1140,7 @@ def fragment_submissions(
vehicul: str | None = None,
data_de: str | None = None,
data_pana: str | None = None,
held: int | None = None,
held: str | None = None,
page: int = 1,
) -> HTMLResponse:
"""Tabel Trimiteri, scoped pe cont, cu filtre optionale si paginare.
@@ -1141,7 +1155,10 @@ def fragment_submissions(
vehicul_q = (vehicul or "").strip().upper() or None
data_de = (data_de or "").strip() or None
data_pana = (data_pana or "").strip() or None
filtru_activ = bool(status or vehicul_q or data_de or data_pana or held == 1)
# `held` vine ca query string ("1" din deep-link/form; "" cand filtrul e oprit — nu int,
# altfel un `held=` gol ar da 422 la coercion). Normalizat la bool intern.
held_activ = (held or "").strip() == "1"
filtru_activ = bool(status or vehicul_q or data_de or data_pana or held_activ)
filtru_python = bool(vehicul_q or data_de or data_pana) # filtru care necesita Python
page = max(1, page) # pre-clamp >= 1
@@ -1156,7 +1173,7 @@ def fragment_submissions(
params.append(status)
# US-007 (PRD 5.19): deep-link banner "coada tinuta" -> lista filtrata pe tinute
# (queued AND held=1). Filtru derivat, fara stare noua.
if held == 1:
if held_activ:
where.append("held=1")
where_sql = " AND ".join(where)
@@ -1231,10 +1248,15 @@ def fragment_submissions(
"f_vehicul": vehicul_q or "",
"f_data_de": data_de or "",
"f_data_pana": data_pana or "",
# US-007 (5.19): filtrul "doar tinute" persistat prin OOB pe #f-held + paginare
# (fix /code-review #2 — altfel se pierdea la reincarcare/paginare).
"f_held": "1" if held_activ else "",
# Pill-uri (OOB) + stare activa + versiune pentru nudge-ul "Date noi".
"pills_categorii": _pills_categorii(_status_counts(conn, account_id)),
"status_filtru": status or "",
"versiune_trimiteri": _trimiteri_versiune(conn, account_id),
# US-005 (5.19): banner bulk "Trimite toate" re-randat la fiecare reincarcare.
**_held_bulk_ctx(conn, account_id),
})
finally:
conn.close()
@@ -1270,8 +1292,11 @@ def _render_submissions(request: Request, conn, account_id: int,
"csrf_token": get_csrf_token(request),
"pills_categorii": _pills_categorii(_status_counts(conn, account_id)),
"status_filtru": "",
"f_held": "", # lista fara filtre -> curata OOB filtrul "doar tinute"
"versiune_trimiteri": _trimiteri_versiune(conn, account_id),
"bulk_message": message, # US-010 (PRD 5.15): sumar bulk-fix
# US-005 (5.19): banner bulk "Trimite toate" reflecta held count curent (fix staleness).
**_held_bulk_ctx(conn, account_id),
})
@@ -1377,7 +1402,11 @@ def _detaliu_ctx(request: Request, row, *, message: str | None = None,
`conn`+`account_id` (optional): cand sunt date si randul e needs_mapping, expune
`nemapate_inline` + `nomenclator` pentru maparea inline din panou.
"""
eticheta = eticheta_stare(row["status"])
# US-006/US-010 (PRD 5.19): un rand `queued AND held=1` e tinut manual -> eticheta de
# avertizare + afordanta de eliberare in panoul de detaliu (paritate cu rândul din listă).
tinut = (bool(row["held"]) if ("held" in row.keys() and row["held"] is not None) else False) \
and row["status"] == "queued"
eticheta = eticheta_stare(row["status"], held=tinut)
nemapate_inline: list[dict] = []
nomenclator: list[dict] = []
# Nomenclatorul complet, incarcat pentru needs_mapping si refolosit mai jos.
@@ -1428,6 +1457,8 @@ def _detaliu_ctx(request: Request, row, *, message: str | None = None,
"editabil": row["status"] in _CORECTABILE,
# error/needs_data/needs_mapping pot fi sterse / re-puse in coada
"gestionabil": row["status"] in _GESTIONABILE_WEB,
# US-006/US-010 (5.19): rand tinut manual (queued AND held=1) -> buton "Trimite acum".
"tinut": tinut,
# US-010 (PRD 5.20): mediul RAR tinta — badge in detaliu.
"rar_env": row["rar_env"] if "rar_env" in row.keys() else None,
# mapare inline (operatii nemapate ale acestui rand + nomenclator)