Merge pull request #210 from chvvkumar/dev

Mosaics Customization, Activity Feed Improvements, and UI Polish

Author: chvvkumar

backend/alembic/versions/0002_consolidated_schema_evolution.py

@@ -227,8 +227,81 @@ def upgrade() -> None:
 
     conn.execute(text("UPDATE mosaics SET needs_review = true"))
 
+    # -- Activity events: parent_id for hierarchical grouping (was 0003) -----
+
+    if not _column_exists("activity_events", "parent_id"):
+        op.add_column(
+            "activity_events",
+            sa.Column(
+                "parent_id",
+                sa.BigInteger(),
+                sa.ForeignKey("activity_events.id", ondelete="CASCADE"),
+                nullable=True,
+            ),
+        )
+    op.execute(text(
+        "CREATE INDEX IF NOT EXISTS ix_activity_events_parent_id "
+        "ON activity_events (parent_id)"
+    ))
+
+    # -- Custom columns: mosaic support (was 0004) ----------------------------
+
+    op.alter_column("custom_column_values", "target_id", nullable=True)
+
+    op.execute(text("ALTER TYPE applies_to_enum ADD VALUE IF NOT EXISTS 'mosaic'"))
+
+    _add_col(
+        "custom_column_values",
+        sa.Column(
+            "mosaic_id",
+            UUID(as_uuid=True),
+            sa.ForeignKey("mosaics.id", ondelete="CASCADE"),
+            nullable=True,
+        ),
+    )
+    op.execute(text(
+        "CREATE INDEX IF NOT EXISTS ix_custom_column_values_mosaic "
+        "ON custom_column_values (mosaic_id)"
+    ))
+
+    # Rebuild unique constraint to include mosaic_id
+    try:
+        op.drop_index("uq_custom_column_value", table_name="custom_column_values")
+    except Exception:
+        pass  # index may not exist yet on fresh installs
+    op.execute(text("""
+        CREATE UNIQUE INDEX IF NOT EXISTS uq_custom_column_value
+        ON custom_column_values (
+            column_id,
+            COALESCE(target_id, '00000000-0000-0000-0000-000000000000'),
+            COALESCE(mosaic_id, '00000000-0000-0000-0000-000000000000'),
+            COALESCE(session_date, '1970-01-01'),
+            COALESCE(rig_label, '')
+        )
+    """))
+
 
 def downgrade() -> None:
+    # -- Undo mosaic custom columns (was 0004) --------------------------------
+    op.drop_index("uq_custom_column_value", table_name="custom_column_values")
+    op.execute(text("""
+        CREATE UNIQUE INDEX uq_custom_column_value
+        ON custom_column_values (
+            column_id, target_id,
+            COALESCE(session_date, '1970-01-01'),
+            COALESCE(rig_label, '')
+        )
+    """))
+    op.execute(text("DROP INDEX IF EXISTS ix_custom_column_values_mosaic"))
+    if _column_exists("custom_column_values", "mosaic_id"):
+        op.drop_column("custom_column_values", "mosaic_id")
+    op.alter_column("custom_column_values", "target_id", nullable=False)
+
+    # -- Undo activity parent_id (was 0003) -----------------------------------
+    op.execute(text("DROP INDEX IF EXISTS ix_activity_events_parent_id"))
+    if _column_exists("activity_events", "parent_id"):
+        op.drop_column("activity_events", "parent_id")
+
     op.execute(text("DROP TABLE IF EXISTS mosaic_panel_sessions"))
     op.execute(text("DROP TABLE IF EXISTS target_catalog_memberships"))
     op.execute(text("DROP TABLE IF EXISTS activity_events"))

backend/app/api/activity.py

@@ -51,11 +51,13 @@ async def list_activity(
 ):
     """Return paginated activity events, newest first.
 
-    Keyset pagination via `cursor` (encodes timestamp + id of last row from
-    previous page). `since` is used by the error toast poller.
+    Only top-level events (parent_id IS NULL) are returned. Children are
+    batch-loaded and nested under their parent's `children` field.
     """
-    count_q = select(func.count(ActivityEvent.id))
-    items_q = select(ActivityEvent)
+    top_level_filter = ActivityEvent.parent_id.is_(None)
+
+    count_q = select(func.count(ActivityEvent.id)).where(top_level_filter)
+    items_q = select(ActivityEvent).where(top_level_filter)
 
     valid_sev = [s for s in severity if s in _VALID_SEVERITIES]
     if valid_sev:
@@ -99,8 +101,28 @@ async def list_activity(
         last = rows[-1]
         next_cursor = _encode_cursor(last.timestamp, last.id)
 
+    parent_ids = [r.id for r in rows]
+    children_by_parent: dict[int, list[ActivityItem]] = {}
+    if parent_ids:
+        children_q = (
+            select(ActivityEvent)
+            .where(ActivityEvent.parent_id.in_(parent_ids))
+            .order_by(ActivityEvent.timestamp.asc())
+        )
+        children_result = await session.execute(children_q)
+        for child in children_result.scalars().all():
+            children_by_parent.setdefault(child.parent_id, []).append(
+                ActivityItem.model_validate(child)
+            )
+
+    items = []
+    for r in rows:
+        item = ActivityItem.model_validate(r)
+        item.children = children_by_parent.get(r.id) or None
+        items.append(item)
+
     return PaginatedActivityResponse(
-        items=[ActivityItem.model_validate(r) for r in rows],
+        items=items,
         next_cursor=next_cursor,
         total=total,
     )

backend/app/api/custom_columns.py

@@ -151,7 +151,34 @@ async def get_custom_values(
     return [
         CustomColumnValueResponse(
             column_id=str(v.column_id), column_slug=slug,
-            target_id=str(v.target_id), session_date=v.session_date,
+            target_id=str(v.target_id) if v.target_id else None,
+            mosaic_id=str(v.mosaic_id) if v.mosaic_id else None,
+            session_date=v.session_date,
+            rig_label=v.rig_label, value=v.value,
+            updated_by=str(v.updated_by), updated_at=v.updated_at,
+        )
+        for v, slug in rows
+    ]
+
+
+@router.get("/values/mosaic/{mosaic_id}", response_model=list[CustomColumnValueResponse])
+async def get_mosaic_custom_values(
+    mosaic_id: uuid.UUID,
+    session: AsyncSession = Depends(get_session),
+    user: User = Depends(get_current_user),
+):
+    q = (
+        select(CustomColumnValue, CustomColumn.slug)
+        .join(CustomColumn)
+        .where(CustomColumnValue.mosaic_id == mosaic_id)
+    )
+    rows = (await session.execute(q)).all()
+    return [
+        CustomColumnValueResponse(
+            column_id=str(v.column_id), column_slug=slug,
+            target_id=str(v.target_id) if v.target_id else None,
+            mosaic_id=str(v.mosaic_id) if v.mosaic_id else None,
+            session_date=v.session_date,
             rig_label=v.rig_label, value=v.value,
             updated_by=str(v.updated_by), updated_at=v.updated_at,
         )
@@ -166,7 +193,8 @@ async def set_custom_value(
     user: User = Depends(get_current_user),
 ):
     col_id = uuid.UUID(body.column_id)
-    target_id = uuid.UUID(body.target_id)
+    target_id = uuid.UUID(body.target_id) if body.target_id else None
+    mosaic_id = uuid.UUID(body.mosaic_id) if body.mosaic_id else None
 
     col = await session.get(CustomColumn, col_id)
     if not col:
@@ -179,8 +207,15 @@ async def set_custom_value(
 
     conditions = [
         CustomColumnValue.column_id == col_id,
-        CustomColumnValue.target_id == target_id,
     ]
+    if target_id is not None:
+        conditions.append(CustomColumnValue.target_id == target_id)
+    else:
+        conditions.append(CustomColumnValue.target_id.is_(None))
+    if mosaic_id is not None:
+        conditions.append(CustomColumnValue.mosaic_id == mosaic_id)
+    else:
+        conditions.append(CustomColumnValue.mosaic_id.is_(None))
     if body.session_date is not None:
         conditions.append(CustomColumnValue.session_date == body.session_date)
     else:
@@ -201,6 +236,7 @@ async def set_custom_value(
         val = CustomColumnValue(
             column_id=col_id,
             target_id=target_id,
+            mosaic_id=mosaic_id,
             session_date=body.session_date,
             rig_label=body.rig_label,
             value=body.value,

backend/app/api/mosaics.py

@@ -10,6 +10,7 @@
 
 from app.database import get_session
 from app.models import Image, Target, User, UserSettings, SETTINGS_ROW_ID
+from app.models.custom_column import CustomColumn, CustomColumnValue, AppliesTo
 from app.models.mosaic import Mosaic
 from app.models.mosaic_panel import MosaicPanel
 from app.models.mosaic_panel_session import MosaicPanelSession
@@ -613,6 +614,19 @@ async def dismiss_suggestion(
     return {"status": "ok"}
 
 
+@router.post("/clear-reviews")
+async def clear_all_reviews(
+    session: AsyncSession = Depends(get_session),
+    user: User = Depends(get_current_user),
+):
+    from sqlalchemy import update
+    await session.execute(
+        update(Mosaic).where(Mosaic.needs_review == True).values(needs_review=False)
+    )
+    await session.commit()
+    return {"ok": True}
+
+
 @router.get("", response_model=list[MosaicSummary])
 async def list_mosaics(
     session: AsyncSession = Depends(get_session),
@@ -739,6 +753,25 @@ async def list_mosaics(
             else:
                 panel_dates_map[pid] = (None, None)
 
+    # Batch-load custom column values for all mosaics
+    mosaic_ids = [m.id for m in mosaics]
+    custom_values_map: dict[str, dict[str, str]] = {}
+    if mosaic_ids:
+        cv_q = (
+            select(CustomColumnValue.mosaic_id, CustomColumn.slug, CustomColumnValue.value)
+            .join(CustomColumn)
+            .where(
+                CustomColumnValue.mosaic_id.in_(mosaic_ids),
+                CustomColumn.applies_to == AppliesTo.mosaic,
+            )
+        )
+        cv_rows = (await session.execute(cv_q)).all()
+        for mid, slug, val in cv_rows:
+            mid_str = str(mid)
+            if mid_str not in custom_values_map:
+                custom_values_map[mid_str] = {}
+            custom_values_map[mid_str][slug] = val
+
     results = []
     for m in mosaics:
         total_int = 0
@@ -778,6 +811,7 @@ async def list_mosaics(
             first_session=mosaic_first,
             last_session=mosaic_last,
             needs_review=m.needs_review,
+            custom_values=custom_values_map.get(str(m.id)),
         ))
     return results
 

backend/app/models/activity_event.py

@@ -30,3 +30,9 @@ class ActivityEvent(Base):
     )
     actor: Mapped[str | None] = mapped_column(String(64), nullable=True)
     duration_ms: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    parent_id: Mapped[int | None] = mapped_column(
+        BigInteger,
+        ForeignKey("activity_events.id", ondelete="CASCADE"),
+        nullable=True,
+        index=True,
+    )

backend/app/models/custom_column.py

@@ -21,6 +21,7 @@ class AppliesTo(str, enum.Enum):
     target = "target"
     session = "session"
     rig = "rig"
+    mosaic = "mosaic"
 
 
 class CustomColumn(Base):
@@ -50,8 +51,11 @@ class CustomColumnValue(Base):
     column_id: Mapped[uuid.UUID] = mapped_column(
         UUID(as_uuid=True), ForeignKey("custom_columns.id", ondelete="CASCADE"), nullable=False,
     )
-    target_id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True), ForeignKey("targets.id", ondelete="CASCADE"), nullable=False,
+    target_id: Mapped[uuid.UUID | None] = mapped_column(
+        UUID(as_uuid=True), ForeignKey("targets.id", ondelete="CASCADE"), nullable=True,
+    )
+    mosaic_id: Mapped[uuid.UUID | None] = mapped_column(
+        UUID(as_uuid=True), ForeignKey("mosaics.id", ondelete="CASCADE"), nullable=True,
     )
     session_date: Mapped[datetime | None] = mapped_column(Date, nullable=True)
     rig_label: Mapped[str | None] = mapped_column(String(255), nullable=True)
@@ -66,11 +70,14 @@ class CustomColumnValue(Base):
     __table_args__ = (
         Index(
             "uq_custom_column_value",
-            "column_id", "target_id",
+            "column_id",
+            func.coalesce(target_id, "00000000-0000-0000-0000-000000000000"),
+            func.coalesce(mosaic_id, "00000000-0000-0000-0000-000000000000"),
             func.coalesce(session_date, "1970-01-01"),
             func.coalesce(rig_label, ""),
             unique=True,
         ),
         Index("ix_custom_column_values_target", "target_id"),
         Index("ix_custom_column_values_column", "column_id"),
+        Index("ix_custom_column_values_mosaic", "mosaic_id"),
     )

backend/app/schemas/activity.py

@@ -18,6 +18,8 @@ class ActivityItem(BaseModel):
     target_id: UUID | None = None
     actor: str | None = None
     duration_ms: int | None = None
+    parent_id: int | None = None
+    children: list[ActivityItem] | None = None
 
     model_config = {"from_attributes": True}
 

backend/app/schemas/custom_column.py

@@ -8,7 +8,7 @@
 class CustomColumnCreate(BaseModel):
     name: str = Field(..., min_length=1, max_length=255)
     column_type: str = Field(..., pattern=r"^(boolean|text|dropdown)$")
-    applies_to: str = Field(..., pattern=r"^(target|session|rig)$")
+    applies_to: str = Field(..., pattern=r"^(target|session|rig|mosaic)$")
     dropdown_options: list[str] | None = None
 
 
@@ -34,7 +34,8 @@ class CustomColumnResponse(BaseModel):
 
 class CustomColumnValueSet(BaseModel):
     column_id: str
-    target_id: str
+    target_id: str | None = None
+    mosaic_id: str | None = None
     session_date: date | None = None
     rig_label: str | None = None
     value: str
@@ -43,7 +44,8 @@ class CustomColumnValueSet(BaseModel):
 class CustomColumnValueResponse(BaseModel):
     column_id: str
     column_slug: str
-    target_id: str
+    target_id: str | None = None
+    mosaic_id: str | None = None
     session_date: date | None = None
     rig_label: str | None = None
     value: str

backend/app/schemas/mosaic.py

@@ -75,6 +75,7 @@ class MosaicSummary(BaseModel):
     first_session: str | None = None
     last_session: str | None = None
     needs_review: bool = False
+    custom_values: dict[str, str] | None = None
 
 
 class MosaicPanelBatchItem(BaseModel):

backend/app/schemas/settings.py

@@ -65,6 +65,7 @@ class ColumnVisibility(BaseModel):
     dashboard: TableColumnVisibility = TableColumnVisibility()
     session_table: TableColumnVisibility = TableColumnVisibility()
     session_detail: TableColumnVisibility = TableColumnVisibility()
+    mosaic_table: TableColumnVisibility = TableColumnVisibility()
 
 
 class GraphSettings(BaseModel):