Update participants/captain/reporter handling

Author: spalmurray

frontend/src/routes/$incidentId/components/ParticipantsList.tsx

@@ -22,7 +22,7 @@ export function ParticipantsList({participants}: ParticipantsListProps) {
             <div className="text-content-headings flex-1 font-medium">
               {participant.name}
             </div>
-            {participant.role && (
+            {participant.role && participant.role !== 'Participant' && (
               <div className="text-content-secondary text-sm uppercase">
                 {participant.role}
               </div>

frontend/src/routes/$incidentId/queries/incidentDetailQueryOptions.ts

@@ -5,7 +5,7 @@ import {z} from 'zod';
 const ParticipantSchema = z.object({
   name: z.string(),
   avatar_url: z.string().nullable(),
-  role: z.string().nullable(),
+  role: z.string(),
 });
 
 const ExternalLinksSchema = z.object({
@@ -14,6 +14,8 @@ const ExternalLinksSchema = z.object({
   datadog: z.string().nullable(),
   pagerduty: z.string().nullable(),
   statuspage: z.string().nullable(),
+  notion: z.string().nullable(),
+  linear: z.string().nullable(),
 });
 
 const IncidentDetailSchema = z.object({

frontend/src/routes/components/Header.test.tsx

@@ -60,9 +60,8 @@ const mockIncidentDetail: IncidentDetail = {
   participants: [
     {
       name: 'John Doe',
-      slack: '@johndoe',
       avatar_url: 'https://example.com/avatar.jpg',
-      role: 'Incident Commander',
+      role: 'Captain',
     },
   ],
   external_links: {
@@ -71,6 +70,8 @@ const mockIncidentDetail: IncidentDetail = {
     datadog: null,
     pagerduty: null,
     statuspage: null,
+    notion: null,
+    linear: null,
   },
 };
 

src/firetower/incidents/serializers.py

@@ -1,7 +1,5 @@
 from rest_framework import serializers
 
-from firetower.auth.serializers import UserSerializer
-
 from .models import Incident
 
 
@@ -70,10 +68,7 @@ class IncidentDetailUISerializer(serializers.ModelSerializer):
     id = serializers.CharField(source="incident_number", read_only=True)
 
     # Full nested user data for captain/reporter
-    captain = UserSerializer(read_only=True)
-    reporter = UserSerializer(read_only=True)
-
-    # Participants with role information
+    # Participants with role information (includes captain and reporter)
     participants = serializers.SerializerMethodField()
 
     # Tags as arrays of strings (not full objects)
@@ -95,8 +90,6 @@ class Meta:
             "status",
             "severity",
             "is_private",
-            "captain",
-            "reporter",
             "participants",
             "affected_areas",
             "root_causes",
@@ -108,21 +101,23 @@ class Meta:
 
     def get_participants(self, obj):
         """
-        Get all participants with their roles.
+        Get all participants with their roles, with captain and reporter at the top.
 
-        Combines captain, reporter, and participants into one list
-        matching frontend expectation.
+        Order:
+        1. Captain (if exists)
+        2. Reporter (if exists)
+        3. Other participants
         """
         participants_list = []
         seen_users = set()
 
-        # Add captain
+        # Add captain first
         if obj.captain and obj.captain.id not in seen_users:
             serializer = ParticipantSerializer(obj.captain, context={"incident": obj})
             participants_list.append(serializer.data)
             seen_users.add(obj.captain.id)
 
-        # Add reporter
+        # Add reporter second
         if obj.reporter and obj.reporter.id not in seen_users:
             serializer = ParticipantSerializer(obj.reporter, context={"incident": obj})
             participants_list.append(serializer.data)

src/firetower/incidents/tests/test_serializers.py

@@ -119,34 +119,27 @@ def test_incident_detail_serialization(self):
         assert data["id"] == f"INC-{incident.id}"
         assert data["title"] == "Test Incident"
 
-        # Check nested users for captain/reporter (name and avatar only)
-        assert data["captain"]["name"] == "Jane Captain"
-        assert "avatar_url" in data["captain"]
-        assert "email" not in data["captain"]
-
-        assert data["reporter"]["name"] == "John Reporter"
-        assert "avatar_url" in data["reporter"]
-        assert "email" not in data["reporter"]
+        # Captain and reporter should NOT be separate fields
+        assert "captain" not in data
+        assert "reporter" not in data
 
-        # Check participants structure (matches frontend expectation)
-        assert len(data["participants"]) == 3  # captain, reporter, participant
+        # Check participants include captain, reporter, and other participants with roles
+        assert len(data["participants"]) == 3
 
-        # Find each participant
-        captain_participant = next(
-            p for p in data["participants"] if p["role"] == "Captain"
-        )
-        assert captain_participant["name"] == "Jane Captain"
-        assert "avatar_url" in captain_participant
+        # First should be captain
+        assert data["participants"][0]["name"] == "Jane Captain"
+        assert data["participants"][0]["role"] == "Captain"
+        assert "avatar_url" in data["participants"][0]
 
-        reporter_participant = next(
-            p for p in data["participants"] if p["role"] == "Reporter"
-        )
-        assert reporter_participant["name"] == "John Reporter"
+        # Second should be reporter
+        assert data["participants"][1]["name"] == "John Reporter"
+        assert data["participants"][1]["role"] == "Reporter"
+        assert "avatar_url" in data["participants"][1]
 
-        other_participant = next(
-            p for p in data["participants"] if p["role"] == "Participant"
-        )
-        assert other_participant["name"] == "Alice Participant"
+        # Third should be participant
+        assert data["participants"][2]["name"] == "Alice Participant"
+        assert data["participants"][2]["role"] == "Participant"
+        assert "avatar_url" in data["participants"][2]
 
         # Check affected_areas and root_causes as arrays of strings
         assert "API" in data["affected_areas"]

src/firetower/incidents/tests/test_views.py

@@ -175,9 +175,16 @@ def test_retrieve_incident(self):
         assert data["id"] == incident.incident_number
         assert data["title"] == "Test Incident"
 
+        # Captain and reporter should not be separate fields
+        assert "captain" not in data
+        assert "reporter" not in data
+
+        # Captain should be in participants list
+        assert len(data["participants"]) == 1
+        assert data["participants"][0]["name"] == "Jane Captain"
+        assert data["participants"][0]["role"] == "Captain"
+
         # Detail view includes full data
-        assert "captain" in data
-        assert data["captain"]["name"] == "Jane Captain"
         assert "affected_areas" in data
         assert "API" in data["affected_areas"]
         assert "external_links" in data