feat: link AI incidents to model/use case and owner via FK (issue #4583)

Clients/src/domain/models/Common/incidentManagement/incidentManagement.model.ts

@@ -8,6 +8,16 @@ export class AIIncidentManagementModel {
   id!: number;
   incident_id!: string;
   ai_project!: string;
+  /** FK to model_inventories (issue #4583). */
+  model_inventory_id?: number | null;
+  /** FK to projects (issue #4583). */
+  project_id?: number | null;
+  /** FK to users — responsible owner (issue #4583). */
+  assignee_id?: number | null;
+  /** Joined display names (populated by the API). */
+  model_inventory_name?: string | null;
+  project_title?: string | null;
+  assignee_name?: string | null;
   type!: string;
   severity!: Severity;
   status!: IncidentManagementStatus;
@@ -34,6 +44,12 @@ export class AIIncidentManagementModel {
     this.id = data.id;
     this.incident_id = data.incident_id;
     this.ai_project = data.ai_project;
+    this.model_inventory_id = data.model_inventory_id ?? null;
+    this.project_id = data.project_id ?? null;
+    this.assignee_id = data.assignee_id ?? null;
+    this.model_inventory_name = data.model_inventory_name ?? null;
+    this.project_title = data.project_title ?? null;
+    this.assignee_name = data.assignee_name ?? null;
     this.type = data.type;
     this.severity = data.severity;
     this.status = data.status;

Clients/src/i18n/translations.ts

@@ -1169,6 +1169,9 @@ export const translations: Record<string, Record<string, string>> = {
     "AI project": "KI-Projekt",
     "AI Project": "KI-Projekt",
     "AI PROJECT": "KI-PROJEKT",
+    "Affected model": "Betroffenes Modell",
+    "AFFECTED MODEL": "BETROFFENES MODELL",
+    "Select model from inventory": "Modell aus dem Inventar auswählen",
     "Project": "Projekt",
     "Create a new use case by filling in the following details":
       "Erstellen Sie einen neuen Anwendungsfall, indem Sie die folgenden Angaben ausfüllen",
@@ -10619,6 +10622,9 @@ export const translations: Record<string, Record<string, string>> = {
     "Deadline view": "Vue des échéances",
     "Operations view": "Vue opérationnelle",
     "AI PROJECT": "PROJET IA",
+    "Affected model": "Modèle affecté",
+    "AFFECTED MODEL": "MODÈLE AFFECTÉ",
+    "Select model from inventory": "Sélectionner un modèle dans l'inventaire",
     "How deadlines work": "Comment fonctionnent les échéances",
     "Open any task and set a due date. It will automatically appear in the correct deadline group on this view.":
       "Ouvrez une tâche et définissez une date d'échéance. Elle apparaîtra automatiquement dans le bon groupe d'échéance sur cette vue.",
@@ -19337,6 +19343,9 @@ export const translations: Record<string, Record<string, string>> = {
     "AI project": "Proyecto de IA",
     "AI Project": "Proyecto de IA",
     "AI PROJECT": "PROYECTO DE IA",
+    "Affected model": "Modelo afectado",
+    "AFFECTED MODEL": "MODELO AFECTADO",
+    "Select model from inventory": "Seleccionar modelo del inventario",
     "Project": "Proyecto",
     "How deadlines work": "Cómo funcionan los plazos",
     "Tasks in a filterable table": "Tareas en una tabla filtrable",

Clients/src/presentation/components/Modals/NewIncident/index.tsx

@@ -52,6 +52,12 @@ interface SideDrawerIncidentProps {
 export interface NewIncidentFormValues {
   incident_id?: string;
   ai_project: string;
+  /** FK to projects — set alongside ai_project when a use case is picked (issue #4583). */
+  project_id?: number | string | null;
+  /** FK to model_inventories — affected model (issue #4583). */
+  model_inventory_id?: number | string | null;
+  /** FK to users — responsible owner (issue #4583). */
+  assignee_id?: number | string | null;
   type: string;
   severity: Severity;
   status: IncidentManagementStatus;
@@ -74,6 +80,9 @@ export interface NewIncidentFormValues {
 
 const initialState: NewIncidentFormValues = {
   ai_project: "",
+  project_id: "",
+  model_inventory_id: "",
+  assignee_id: "",
   type: "",
   severity: Severity.MINOR,
   status: IncidentManagementStatus.OPEN,
@@ -133,6 +142,7 @@ const SideDrawerIncident: FC<SideDrawerIncidentProps> = ({
   const [values, setValues] = useState<NewIncidentFormValues>(initialData || initialState);
   const [users, setUsers] = useState<User[]>([]);
   const [, setIsLoadingUsers] = useState(false);
+  const [modelInventories, setModelInventories] = useState<any[]>([]);
   const [activeTab, setActiveTab] = useState("details");
 
   const validators = useMemo(
@@ -164,6 +174,7 @@ const SideDrawerIncident: FC<SideDrawerIncidentProps> = ({
   useEffect(() => {
     if (isOpen) {
       fetchUsers();
+      fetchModelInventories();
     }
   }, [isOpen]);
 
@@ -188,6 +199,16 @@ const SideDrawerIncident: FC<SideDrawerIncidentProps> = ({
     }
   };
 
+  // Fetch model inventory for the affected-model picker (issue #4583)
+  const fetchModelInventories = async () => {
+    try {
+      const response = await getAllEntities({ routeUrl: "/modelInventory" });
+      if (response?.data) setModelInventories(response.data);
+    } catch (error) {
+      console.error("Error fetching model inventory:", error);
+    }
+  };
+
   const projectOptions = useMemo(() => {
     // Use a Set to track unique project titles
     const seen = new Set<string>();
@@ -212,6 +233,45 @@ const SideDrawerIncident: FC<SideDrawerIncidentProps> = ({
     [users],
   );
 
+  // Owner/assignee options keyed by user id (issue #4583)
+  const assigneeOptions = useMemo(
+    () => [
+      // "(none)" clears the owner FK — '' is normalised to null on save (issue #4583)
+      { _id: "" as string | number, name: "(none)" },
+      ...users.map((u) => ({ _id: u.id, name: `${u.name} ${u.surname}` })),
+    ],
+    [users],
+  );
+
+  // Affected-model options keyed by model inventory id (issue #4583)
+  const modelInventoryOptions = useMemo(
+    () => [
+      // "(none)" clears the affected-model FK — '' is normalised to null on save (issue #4583)
+      { _id: "" as string | number, name: "(none)" },
+      ...modelInventories.map((m) => ({
+        _id: m.id,
+        name: [m.provider, m.model].filter(Boolean).join(" "),
+      })),
+    ],
+    [modelInventories],
+  );
+
+  // Use-case select keeps the free-text ai_project (backward compatible) and
+  // also records the project FK (issue #4583).
+  const handleProjectChange = useCallback(
+    (e: any) => {
+      const title = e.target.value;
+      const project = (approvedProjects as any[]).find((p) => p.project_title === title);
+      setValues((prev) => ({
+        ...prev,
+        ai_project: title,
+        project_id: project?.id ?? "",
+      }));
+      clearFieldError("ai_project");
+    },
+    [approvedProjects, clearFieldError],
+  );
+
   const handleFieldChange = useCallback(
     (prop: keyof NewIncidentFormValues) => (e: any) => {
       const value = e.target.value;
@@ -262,7 +322,14 @@ const SideDrawerIncident: FC<SideDrawerIncidentProps> = ({
   const handleSaveIncident = (e?: React.FormEvent) => {
     if (e) e.preventDefault();
     if (validateAll(values)) {
-      onSuccess?.(values);
+      // Normalize optional FK pickers to integer ids or null (issue #4583)
+      const toId = (v: unknown) => (v === undefined || v === null || v === "" ? null : Number(v));
+      onSuccess?.({
+        ...values,
+        project_id: toId(values.project_id),
+        model_inventory_id: toId(values.model_inventory_id),
+        assignee_id: toId(values.assignee_id),
+      });
       handleClose();
     }
   };
@@ -272,7 +339,18 @@ const SideDrawerIncident: FC<SideDrawerIncidentProps> = ({
   useModalKeyHandling({ isOpen, onClose: handleClose });
 
   return (
-    <Drawer anchor="right" open={isOpen} onClose={handleClose}>
+    <Drawer
+      anchor="right"
+      open={isOpen}
+      onClose={handleClose}
+      sx={{
+        "margin": 0,
+        "& .MuiDrawer-paper": {
+          margin: 0,
+          borderRadius: 0,
+        },
+      }}
+    >
       <Stack
         sx={{
           width: 700,
@@ -377,7 +455,7 @@ const SideDrawerIncident: FC<SideDrawerIncidentProps> = ({
                       placeholder="Select AI use case or framework"
                       items={projectOptions}
                       value={values.ai_project}
-                      onChange={handleFieldChange("ai_project")}
+                      onChange={handleProjectChange}
                       error={errors.ai_project}
                       isRequired
                       sx={{ flex: 1 }}
@@ -432,6 +510,36 @@ const SideDrawerIncident: FC<SideDrawerIncidentProps> = ({
                   </Stack>
                 </Stack>
 
+                {/* Row: Affected model + Owner (issue #4583 FK pickers) */}
+                <Stack direction={"row"} gap={theme.spacing(8)} sx={{ mt: 2 }}>
+                  <Stack sx={{ gap: 3, width: "50%", minWidth: 0 }}>
+                    <SelectComponent
+                      id="model_inventory_id"
+                      label="Affected model"
+                      placeholder="Select model from inventory"
+                      items={modelInventoryOptions}
+                      value={values.model_inventory_id ?? ""}
+                      onChange={handleFieldChange("model_inventory_id")}
+                      isOptional
+                      sx={{ flex: 1 }}
+                      disabled={isViewMode}
+                    />
+                  </Stack>
+                  <Stack sx={{ gap: 3, width: "50%", minWidth: 0 }}>
+                    <SelectComponent
+                      id="assignee_id"
+                      label="Owner"
+                      placeholder="Select owner"
+                      items={assigneeOptions}
+                      value={values.assignee_id ?? ""}
+                      onChange={handleFieldChange("assignee_id")}
+                      isOptional
+                      sx={{ flex: 1 }}
+                      disabled={isViewMode}
+                    />
+                  </Stack>
+                </Stack>
+
                 {/* Row: Occurred Date + Detected Date */}
                 <Stack direction={"row"} gap={theme.spacing(8)} sx={{ mt: 2 }}>
                   <Suspense fallback={<div>Loading...</div>}>

Clients/src/presentation/pages/IncidentManagement/IncidentTable.tsx

@@ -34,6 +34,8 @@ const cellStyle = singleTheme.tableStyles.primary.body.cell;
 const TABLE_COLUMNS: StandardColumn[] = [
   { id: "incident_id", label: "INCIDENT ID", sortable: true },
   { id: "ai_project", label: "AI PROJECT", sortable: true },
+  { id: "model_inventory_name", label: "AFFECTED MODEL", sortable: true },
+  { id: "assignee_name", label: "OWNER", sortable: true },
   { id: "type", label: "TYPE", sortable: true },
   { id: "severity", label: "SEVERITY", sortable: true },
   { id: "status", label: "STATUS", sortable: true },
@@ -94,6 +96,14 @@ const IncidentTable: React.FC<IncidentTableProps> = ({
           aValue = a.ai_project?.toLowerCase() || "";
           bValue = b.ai_project?.toLowerCase() || "";
           break;
+        case "model_inventory_name":
+          aValue = a.model_inventory_name?.toLowerCase() || "";
+          bValue = b.model_inventory_name?.toLowerCase() || "";
+          break;
+        case "assignee_name":
+          aValue = a.assignee_name?.toLowerCase() || "";
+          bValue = b.assignee_name?.toLowerCase() || "";
+          break;
         case "type":
           aValue = a.type?.toLowerCase() || "";
           bValue = b.type?.toLowerCase() || "";
@@ -190,6 +200,30 @@ const IncidentTable: React.FC<IncidentTableProps> = ({
                       <TooltipCell value={incident.ai_project} />
                     </TableCell>
                   )}
+                  {isVisible("model_inventory_name") && (
+                    <TableCell
+                      sx={{
+                        ...cellStyle,
+                        backgroundColor:
+                          sortConfig.key === "model_inventory_name"
+                            ? "background.surface"
+                            : "inherit",
+                      }}
+                    >
+                      <TooltipCell value={incident.model_inventory_name} />
+                    </TableCell>
+                  )}
+                  {isVisible("assignee_name") && (
+                    <TableCell
+                      sx={{
+                        ...cellStyle,
+                        backgroundColor:
+                          sortConfig.key === "assignee_name" ? "background.surface" : "inherit",
+                      }}
+                    >
+                      <TooltipCell value={incident.assignee_name} />
+                    </TableCell>
+                  )}
                   {isVisible("type") && (
                     <TableCell
                       sx={{