feat(ui): Sprint 2 UI — save/hide, filters, deadline sort, CSV, badges

app/ui_streamlit.py

@@ -186,6 +186,27 @@ def _ministry_filter(rows):
         if is_preferred_agency or has_ministry_cue:
             kept.append(r)
     return kept
+
+def _days_until(iso):
+    from datetime import date, datetime
+    if not iso:
+        return None
+    try:
+        d = datetime.fromisoformat(str(iso)).date()
+        return (d - date.today()).days
+    except Exception:
+        return None
+
+def _deadline_badge(days_left):
+    if days_left is None:
+        return "🟦 TBD"
+    if days_left < 0:
+        return "⬛ Closed"
+    if days_left <= 14:
+        return f"🟥 Due in {days_left}d"
+    if days_left <= 30:
+        return f"🟨 {days_left}d"
+    return f"🟩 {days_left}d"
 # ---------- end helpers ----------
 
 # ---------- optional diagnostics ----------
@@ -246,10 +267,38 @@ sort_by = st.selectbox("Sort by", ["Relevance", "Deadline (soonest first)"], ind
 only_open = st.checkbox("Only show opportunities with a future deadline", value=True)
 ministry_focus = st.checkbox("Ministry Focus (hide research/defense/academic BAAs)", value=True)
 
+# NEW: Sprint 2 view + agency facet
+view = st.selectbox("View", ["All", "Saved", "Hidden"], index=0)
+# pre-load agencies list (from meta.json when present)
+try:
+    meta_for_agencies = json.loads(Path(_env["INDEX_DIR"], "meta.json").read_text())
+    agency_options = sorted({m.get("agency") for m in meta_for_agencies if m.get("agency")})
+except Exception:
+    agency_options = []
+sel_agencies = st.multiselect("Agency filter (optional)", options=agency_options, default=[])
+
 # Build backend filters (if the search() supports them)
 backend_filters = {}
 if geo: backend_filters["geo"] = geo
 if categories: backend_filters["categories"] = categories
+if sel_agencies: backend_filters["agency"] = sel_agencies
+
+# --- Sprint 2 session state for Save/Hide ---
+if "saved_ids" not in st.session_state:
+    st.session_state.saved_ids = set()
+if "hidden_ids" not in st.session_state:
+    st.session_state.hidden_ids = set()
+
+# action helpers
+def _save_item(item_id: str):
+    st.session_state.saved_ids.add(item_id)
+    st.session_state.hidden_ids.discard(item_id)
+    st.experimental_rerun()
+
+def _hide_item(item_id: str):
+    st.session_state.hidden_ids.add(item_id)
+    st.session_state.saved_ids.discard(item_id)
+    st.experimental_rerun()
 
 col1, col2 = st.columns([1, 1])
 
@@ -277,36 +326,37 @@ with col1:
                 open_filtered = [r for r in base_filtered
                                  if (_to_date_safe(r.get("deadline")) or date.max) >= date.today()]
 
-            # 3) Ministry filter
+            # 3) Agency filter (client-side, in case backend didn't apply)
+            if sel_agencies:
+                af = set(sel_agencies)
+                open_filtered = [r for r in open_filtered if (r.get("agency") in af)]
+
+            # 4) Ministry filter
             final_results = _ministry_filter(open_filtered) if ministry_focus else open_filtered
 
-            # --- Step 1: clear any previous “show hidden” choice when filter is off
+            # Clear/show hidden toggle mgmt
             if not ministry_focus and st.session_state.get("show_hidden"):
                 st.session_state.pop("show_hidden", None)
 
-            # --- Step 2: count how many items the ministry filter hid
             hidden_due_to_ministry = 0
             if ministry_focus:
                 hidden_due_to_ministry = len(open_filtered) - len(final_results)
-                # Reset toggle on a new search run
                 st.session_state.pop("show_hidden", None)
 
-            # Save fully-filtered results
             st.session_state["results"] = final_results
             st.session_state["last_query"] = q
             st.session_state["last_filters"] = {
                 "geo": geo, "categories": categories,
                 "only_open": only_open, "ministry_focus": ministry_focus,
+                "agencies": sel_agencies,
             }
 
-            # Honest breakdown message (now includes hidden count)
             st.success(
                 f"Found {len(dedup)} total • After geo/cat: {len(base_filtered)} • "
                 f"Open-only: {len(open_filtered)} • Displaying: {len(final_results)}"
                 + (f" • Hidden by ministry filter: {hidden_due_to_ministry}" if ministry_focus else "")
             )
 
-            # Checkbox to reveal hidden items without re-searching
             if ministry_focus and hidden_due_to_ministry > 0:
                 if st.checkbox(f"Show hidden items ({hidden_due_to_ministry})", value=False, key="show_hidden"):
                     st.session_state["results"] = open_filtered
@@ -338,6 +388,12 @@ def _to_date(d):
 # ---- Render results ----
 results = st.session_state.get("results", [])
 
+# Apply "View" (All/Saved/Hidden)
+if view == "Saved":
+    results = [r for r in results if r.get("id") in st.session_state.saved_ids]
+elif view == "Hidden":
+    results = [r for r in results if r.get("id") in st.session_state.hidden_ids]
+
 # Apply sort if selected
 if sort_by.startswith("Deadline") and results:
     results.sort(
@@ -357,17 +413,29 @@ if results:
         url = r.get("url", "")
         cats = r.get("categories") or r.get("cats") or []
         geo_tags = r.get("geo") or []
+        _id = r.get("id") or r.get("url") or title
 
         st.markdown(f"### {title}")
         st.write(f"**Source:** {r.get('source','')} | **Geo:** {', '.join(geo_tags) if isinstance(geo_tags, list) else geo_tags} | **Categories:** {', '.join(cats) if isinstance(cats, list) else cats}")
 
+        # Link / score
         if url and not url.startswith("http"):
             st.caption("Note: This item may display an ID or number instead of a full link. Open on Grants.gov if needed.")
         st.write(f"[Open Link]({url})  \nScore: {r.get('score', 0):.3f}")
 
+        # Deadline + badge
         posted = r.get("posted_date") or ""
         deadline = r.get("deadline") or ""
-        st.caption(f"Posted: {posted}  •  Deadline: {deadline}")
+        days_left = _days_until(deadline)
+        st.caption(f"Posted: {posted}  •  Deadline: {deadline}  •  {_deadline_badge(days_left)}")
+
+        # Save / Hide buttons
+        c1, c2, _ = st.columns([1,1,6])
+        if c1.button(("✅ Saved" if _id in st.session_state.saved_ids else "💾 Save"), key=f"save-{_id}"):
+            _save_item(_id)
+        if c2.button(("🙈 Hidden" if _id in st.session_state.hidden_ids else "🙈 Hide"), key=f"hide-{_id}"):
+            _hide_item(_id)
+
         st.markdown("---")
 else:
     if ran_search: