Fix Explorer event display fields

app.py

@@ -16,7 +16,7 @@ from h2epr_explorer.constants import (
     RELEASE_BOUNDARY_NOTICE,
 )
 from h2epr_explorer.data_loader import load_catalog, load_event_graph, load_finalcascade_summary, load_stages
-from h2epr_explorer.filters import filter_catalog
+from h2epr_explorer.filters import event_description, event_display_label, event_name, filter_catalog
 from h2epr_explorer.render_gantt import build_timeline_figure
 
 
@@ -62,13 +62,16 @@ if not filtered_rows:
     st.warning("No event matches the current filters.")
     st.stop()
 
+event_labels = {row["event_id"]: event_display_label(row) for row in catalog_rows}
+
 selected_event = st.selectbox(
     "Selected event",
     [row["event_id"] for row in filtered_rows],
-    format_func=lambda event_id: f"{event_id} · {catalog.loc[catalog['event_id'] == event_id, 'event_name'].iloc[0]}",
+    format_func=lambda event_id: event_labels.get(event_id, event_id),
 )
 
 event_row = catalog[catalog["event_id"] == selected_event].iloc[0]
+event_record = event_row.to_dict()
 event_stages = stages[stages["event_id"] == selected_event].sort_values("stage_order")
 summary_row = summary[summary["event_id"] == selected_event]
 
@@ -79,8 +82,8 @@ with tabs[0]:
     st.dataframe(_select_columns(catalog[catalog["event_id"].isin([row["event_id"] for row in filtered_rows])], CATALOG_COLUMNS), use_container_width=True, height=520)
 
 with tabs[1]:
-    st.subheader(str(event_row.get("event_name", selected_event)))
-    st.write(str(event_row.get("short_description", "")))
+    st.subheader(event_name(event_record))
+    st.write(event_description(event_record))
     c1, c2, c3, c4 = st.columns(4)
     c1.metric("Domain", str(event_row.get("domain", "")))
     c2.metric("Category", str(event_row.get("event_category", "")))

src/h2epr_explorer/filters.py

@@ -3,14 +3,56 @@ from __future__ import annotations
 from typing import Any, Iterable
 
 
-SEARCH_FIELDS = ("event_id", "event_name", "short_description", "domain", "event_category", "keywords")
+NAME_FIELDS = ("display_name", "event_name_en", "event_name", "event_name_zh")
+DESCRIPTION_FIELDS = ("short_description", "event_descriptor_en", "event_description_en", "event_description_zh")
+SEARCH_FIELDS = (
+    "event_id",
+    "display_name",
+    "event_name_en",
+    "event_name",
+    "event_name_zh",
+    "short_description",
+    "event_descriptor_en",
+    "event_description_zh",
+    "domain",
+    "event_category",
+    "keywords",
+)
+
+
+def _text_value(value: Any) -> str:
+    if isinstance(value, list):
+        return " ".join(str(item) for item in value)
+    return str(value or "")
+
+
+def event_name(row: dict[str, Any]) -> str:
+    for field in NAME_FIELDS:
+        value = _text_value(row.get(field)).strip()
+        if value:
+            return value
+    return _text_value(row.get("event_id")).strip() or "Unnamed event"
+
+
+def event_description(row: dict[str, Any]) -> str:
+    for field in DESCRIPTION_FIELDS:
+        value = _text_value(row.get(field)).strip()
+        if value:
+            return value
+    return ""
+
+
+def event_display_label(row: dict[str, Any]) -> str:
+    event_id = _text_value(row.get("event_id")).strip()
+    name = event_name(row)
+    return f"{event_id} · {name}" if event_id else name
 
 
 def _contains_query(row: dict[str, Any], query: str) -> bool:
     if not query:
         return True
     needle = query.casefold()
-    return any(needle in str(row.get(field, "")).casefold() for field in SEARCH_FIELDS)
+    return any(needle in _text_value(row.get(field)).casefold() for field in SEARCH_FIELDS)
 
 
 def filter_catalog(
@@ -38,4 +80,3 @@ def filter_catalog(
             continue
         filtered.append(row)
     return filtered
-