From 1700c16ba523838244b826255b06b83038a21944 Mon Sep 17 00:00:00 2001
From: Rohit Dash <rohitdash08@gmail.com>
Date: Thu, 1 May 2025 14:06:12 +0530
Subject: [PATCH 1/5] allow tagging in incident comments

---
 .../activity/ui/IncidentActivityComment.tsx   |  12 +-
 .../[id]/activity/ui/MentionsInput.tsx        | 153 ++++++++++++++++
 keep/api/models/comment.py                    |   8 +
 keep/api/routes/incidents.py                  |  19 +-
 tests/test_incident_enrichments.py            | 173 ++++++++++++++++++
 tests/test_incident_routes.py                 | 170 +++++++++++++++++
 6 files changed, 531 insertions(+), 4 deletions(-)
 create mode 100644 keep-ui/app/(keep)/incidents/[id]/activity/ui/MentionsInput.tsx
 create mode 100644 keep/api/models/comment.py
 create mode 100644 tests/test_incident_enrichments.py
 create mode 100644 tests/test_incident_routes.py

diff --git a/keep-ui/app/(keep)/incidents/[id]/activity/ui/IncidentActivityComment.tsx b/keep-ui/app/(keep)/incidents/[id]/activity/ui/IncidentActivityComment.tsx
index 518ad919f3..e62559e87a 100644
--- a/keep-ui/app/(keep)/incidents/[id]/activity/ui/IncidentActivityComment.tsx
+++ b/keep-ui/app/(keep)/incidents/[id]/activity/ui/IncidentActivityComment.tsx
@@ -6,6 +6,8 @@ import { KeyedMutator } from "swr";
 import { useApi } from "@/shared/lib/hooks/useApi";
 import { showErrorToast } from "@/shared/ui";
 import { AuditEvent } from "@/entities/alerts/model";
+import { useUsers } from "@/entities/users/model/useUsers";
+import { MentionsInput } from "./MentionsInput";
 
 export function IncidentActivityComment({
   incident,
@@ -16,12 +18,17 @@ export function IncidentActivityComment({
 }) {
   const [comment, setComment] = useState("");
   const api = useApi();
+  const { data: users = [] } = useUsers();
 
   const onSubmit = useCallback(async () => {
     try {
+      // Extract mentioned users from comment
+      const mentionedUsers = comment.match(/@([\w.-]+@[\w.-]+)/g)?.map(mention => mention.slice(1)) || [];
+      
       await api.post(`/incidents/${incident.id}/comment`, {
         status: incident.status,
         comment,
+        mentioned_users: mentionedUsers,
       });
       toast.success("Comment added!", { position: "top-right" });
       setComment("");
@@ -53,10 +60,11 @@ export function IncidentActivityComment({
 
   return (
     <div className="flex h-full w-full relative items-center">
-      <TextInput
+      <MentionsInput
         value={comment}
         onValueChange={setComment}
-        placeholder="Add a new comment..."
+        users={users}
+        placeholder="Add a new comment... Use @ to mention users"
       />
       <Button
         color="orange"
diff --git a/keep-ui/app/(keep)/incidents/[id]/activity/ui/MentionsInput.tsx b/keep-ui/app/(keep)/incidents/[id]/activity/ui/MentionsInput.tsx
new file mode 100644
index 0000000000..4f017bdf56
--- /dev/null
+++ b/keep-ui/app/(keep)/incidents/[id]/activity/ui/MentionsInput.tsx
@@ -0,0 +1,153 @@
+import { User } from "@/app/(keep)/settings/models";
+import { useEffect, useRef, useState } from "react";
+import { TextInput } from "@tremor/react";
+
+interface MentionsInputProps {
+  value: string;
+  onValueChange: (value: string) => void;
+  users: User[];
+  placeholder?: string;
+}
+
+interface SuggestionState {
+  isOpen: boolean;
+  query: string;
+  index: number;
+  startPosition: number;
+}
+
+export function MentionsInput({
+  value,
+  onValueChange,
+  users,
+  placeholder,
+}: MentionsInputProps) {
+  const [suggestion, setSuggestion] = useState<SuggestionState>({
+    isOpen: false,
+    query: "",
+    index: 0,
+    startPosition: 0,
+  });
+
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  const filteredUsers = users.filter((user) =>
+    (user.name?.toLowerCase() || user.email.toLowerCase()).includes(
+      suggestion.query.toLowerCase()
+    )
+  );
+
+  const insertMention = (user: User) => {
+    const before = value.slice(0, suggestion.startPosition);
+    const after = value.slice(inputRef.current?.selectionStart || 0);
+    const mention = `@${user.email} `;
+    onValueChange(before + mention + after);
+    setSuggestion({ isOpen: false, query: "", index: 0, startPosition: 0 });
+  };
+
+  const handleKeyDown = (event: React.KeyboardEvent) => {
+    if (!suggestion.isOpen) return;
+
+    switch (event.key) {
+      case "ArrowDown":
+        event.preventDefault();
+        setSuggestion((prev) => ({
+          ...prev,
+          index: (prev.index + 1) % filteredUsers.length,
+        }));
+        break;
+      case "ArrowUp":
+        event.preventDefault();
+        setSuggestion((prev) => ({
+          ...prev,
+          index:
+            prev.index - 1 < 0 ? filteredUsers.length - 1 : prev.index - 1,
+        }));
+        break;
+      case "Enter":
+        event.preventDefault();
+        if (filteredUsers[suggestion.index]) {
+          insertMention(filteredUsers[suggestion.index]);
+        }
+        break;
+      case "Escape":
+        setSuggestion({ isOpen: false, query: "", index: 0, startPosition: 0 });
+        break;
+    }
+  };
+
+  const handleInput = (newValue: string) => {
+    onValueChange(newValue);
+
+    const cursorPosition = inputRef.current?.selectionStart || 0;
+    const textBeforeCursor = newValue.slice(0, cursorPosition);
+    const matches = textBeforeCursor.match(/@([\w\s]*)$/);
+
+    if (matches) {
+      setSuggestion({
+        isOpen: true,
+        query: matches[1],
+        index: 0,
+        startPosition: cursorPosition - matches[1].length - 1,
+      });
+    } else {
+      setSuggestion({ isOpen: false, query: "", index: 0, startPosition: 0 });
+    }
+  };
+
+  useEffect(() => {
+    const handleClickOutside = (event: MouseEvent) => {
+      if (
+        suggestion.isOpen &&
+        inputRef.current &&
+        !inputRef.current.contains(event.target as Node)
+      ) {
+        setSuggestion({ isOpen: false, query: "", index: 0, startPosition: 0 });
+      }
+    };
+
+    document.addEventListener("click", handleClickOutside);
+    return () => document.removeEventListener("click", handleClickOutside);
+  }, [suggestion.isOpen]);
+
+  return (
+    <div className="relative w-full">
+      <TextInput
+        ref={inputRef}
+        value={value}
+        onValueChange={handleInput}
+        placeholder={placeholder}
+        onKeyDown={handleKeyDown}
+      />
+      {suggestion.isOpen && filteredUsers.length > 0 && (
+        <div className="absolute z-10 w-64 mt-1 bg-white rounded-md shadow-lg border border-gray-200">
+          <ul className="py-1">
+            {filteredUsers.map((user, index) => (
+              <li
+                key={user.email}
+                className={`px-3 py-2 cursor-pointer hover:bg-gray-100 ${suggestion.index === index ? "bg-gray-100" : ""}`}
+                onClick={() => insertMention(user)}
+              >
+                <div className="flex items-center">
+                  {user.picture && (
+                    <img
+                      src={user.picture}
+                      alt={user.name}
+                      className="w-6 h-6 rounded-full mr-2"
+                    />
+                  )}
+                  <div>
+                    <div className="font-medium">{user.name || user.email}</div>
+                    {user.name && (
+                      <div className="text-sm text-gray-500">{user.email}</div>
+                    )}
+                  </div>
+                </div>
+              </li>
+            ))}
+          </ul>
+        </div>
+      )}
+    </div>
+  );
+}
\ No newline at end of file
diff --git a/keep/api/models/comment.py b/keep/api/models/comment.py
new file mode 100644
index 0000000000..d2f7541d20
--- /dev/null
+++ b/keep/api/models/comment.py
@@ -0,0 +1,8 @@
+from typing import List
+from pydantic import BaseModel
+from keep.api.models.db.incident import IncidentStatus
+
+class IncidentCommentDto(BaseModel):
+    status: IncidentStatus
+    comment: str
+    mentioned_users: List[str] = []
\ No newline at end of file
diff --git a/keep/api/routes/incidents.py b/keep/api/routes/incidents.py
index c6560381d0..e0330c89bb 100644
--- a/keep/api/routes/incidents.py
+++ b/keep/api/routes/incidents.py
@@ -76,6 +76,7 @@
 from keep.identitymanager.identitymanagerfactory import IdentityManagerFactory
 from keep.providers.providers_factory import ProvidersFactory
 from keep.topologies.topologies_service import TopologiesService  # noqa
+from keep.api.models.comment import IncidentCommentDto
 
 router = APIRouter()
 logger = logging.getLogger(__name__)
@@ -888,7 +889,7 @@ def change_incident_severity(
 @router.post("/{incident_id}/comment", description="Add incident audit activity")
 def add_comment(
     incident_id: UUID,
-    change: IncidentStatusChangeDto,
+    change: IncidentCommentDto,
     authenticated_entity: AuthenticatedEntity = Depends(
         IdentityManagerFactory.get_auth_verifier(["write:incident"])
     ),
@@ -899,6 +900,7 @@ def add_comment(
         "commenter": authenticated_entity.email,
         "comment": change.comment,
         "incident_id": str(incident_id),
+        "mentioned_users": change.mentioned_users,
     }
     logger.info("Adding comment to incident", extra=extra)
     comment = add_audit(
@@ -910,11 +912,24 @@ def add_comment(
     )
 
     if pusher_client:
+        # Notify about the comment
         pusher_client.trigger(
             f"private-{authenticated_entity.tenant_id}", "incident-comment", {}
         )
+        
+        # Send notifications to mentioned users
+        for mentioned_user in change.mentioned_users:
+            pusher_client.trigger(
+                f"private-{authenticated_entity.tenant_id}-{mentioned_user}",
+                "user-mention",
+                {
+                    "incident_id": str(incident_id),
+                    "comment": change.comment,
+                    "mentioned_by": authenticated_entity.email,
+                }
+            )
 
-    logger.info("Added comment to incident", extra=extra)
+    logger.info("Added comment to incident with mentions", extra=extra)
     return comment
 
 
diff --git a/tests/test_incident_enrichments.py b/tests/test_incident_enrichments.py
new file mode 100644
index 0000000000..2fda1c5098
--- /dev/null
+++ b/tests/test_incident_enrichments.py
@@ -0,0 +1,173 @@
+import pytest
+from datetime import datetime, timezone
+from uuid import uuid4
+
+from keep.api.bl.enrichments_bl import EnrichmentsBl
+from keep.api.models.action_type import ActionType
+from keep.api.models.alert import EnrichIncidentRequestBody, UnEnrichIncidentRequestBody
+from keep.api.core.db import get_incident_by_id, get_enrichment
+from keep.api.core.dependencies import SINGLE_TENANT_UUID
+from keep.api.models.incident import IncidentDto, IncidentDtoIn, IncidentStatus, IncidentSeverity
+
+@pytest.fixture
+def enrichments_bl(db_session):
+    return EnrichmentsBl(tenant_id=SINGLE_TENANT_UUID, session=db_session)
+
+@pytest.fixture
+def sample_incident(db_session):
+    incident_dto = IncidentDtoIn(
+        name="Test Incident",
+        summary="Test incident for enrichment testing",
+        status=IncidentStatus.open,
+        severity=IncidentSeverity.high,
+        assignee="test@example.com"
+    )
+    incident = IncidentDto.from_dto_in(incident_dto)
+    return incident
+
+def test_enrich_incident(enrichments_bl, sample_incident):
+    # Test enriching an incident with new data
+    enrichment_data = {
+        "environment": "production",
+        "region": "us-west-2",
+        "team": "platform"
+    }
+    
+    enrichments_bl.enrich_entity(
+        entity_id=str(sample_incident.id),
+        enrichments=enrichment_data,
+        action_type=ActionType.INCIDENT_ENRICH,
+        action_callee="test",
+        action_description="Test enrichment"
+    )
+    
+    # Verify enrichment was added
+    enrichment = get_enrichment(
+        tenant_id=SINGLE_TENANT_UUID,
+        entity_id=str(sample_incident.id)
+    )
+    
+    assert enrichment is not None
+    assert enrichment.enrichments == enrichment_data
+
+def test_update_incident_enrichment(enrichments_bl, sample_incident):
+    # Initial enrichment
+    initial_data = {"environment": "staging"}
+    enrichments_bl.enrich_entity(
+        entity_id=str(sample_incident.id),
+        enrichments=initial_data,
+        action_type=ActionType.INCIDENT_ENRICH,
+        action_callee="test",
+        action_description="Initial enrichment"
+    )
+    
+    # Update enrichment
+    updated_data = {"environment": "production"}
+    enrichments_bl.enrich_entity(
+        entity_id=str(sample_incident.id),
+        enrichments=updated_data,
+        action_type=ActionType.INCIDENT_ENRICH,
+        action_callee="test",
+        action_description="Updated enrichment"
+    )
+    
+    # Verify enrichment was updated
+    enrichment = get_enrichment(
+        tenant_id=SINGLE_TENANT_UUID,
+        entity_id=str(sample_incident.id)
+    )
+    
+    assert enrichment.enrichments["environment"] == "production"
+
+def test_remove_incident_enrichment(enrichments_bl, sample_incident):
+    # Add initial enrichment
+    initial_data = {
+        "environment": "production",
+        "region": "us-west-2"
+    }
+    enrichments_bl.enrich_entity(
+        entity_id=str(sample_incident.id),
+        enrichments=initial_data,
+        action_type=ActionType.INCIDENT_ENRICH,
+        action_callee="test",
+        action_description="Initial enrichment"
+    )
+    
+    # Remove one enrichment field
+    enrichments_bl.unenrich_entity(
+        entity_id=str(sample_incident.id),
+        fields=["environment"],
+        action_callee="test",
+        action_description="Remove environment enrichment"
+    )
+    
+    # Verify field was removed
+    enrichment = get_enrichment(
+        tenant_id=SINGLE_TENANT_UUID,
+        entity_id=str(sample_incident.id)
+    )
+    
+    assert "environment" not in enrichment.enrichments
+    assert "region" in enrichment.enrichments
+    assert enrichment.enrichments["region"] == "us-west-2"
+
+def test_enrich_incident_with_invalid_data(enrichments_bl, sample_incident):
+    # Test enriching with invalid data types
+    invalid_data = {
+        "invalid_field": object()  # Non-serializable object
+    }
+    
+    with pytest.raises(TypeError):
+        enrichments_bl.enrich_entity(
+            entity_id=str(sample_incident.id),
+            enrichments=invalid_data,
+            action_type=ActionType.INCIDENT_ENRICH,
+            action_callee="test",
+            action_description="Invalid enrichment"
+        )
+
+def test_enrich_nonexistent_incident(enrichments_bl):
+    # Test enriching an incident that doesn't exist
+    nonexistent_id = str(uuid4())
+    enrichment_data = {"environment": "production"}
+    
+    enrichments_bl.enrich_entity(
+        entity_id=nonexistent_id,
+        enrichments=enrichment_data,
+        action_type=ActionType.INCIDENT_ENRICH,
+        action_callee="test",
+        action_description="Enrichment for nonexistent incident"
+    )
+    
+    # Verify enrichment was still created
+    enrichment = get_enrichment(
+        tenant_id=SINGLE_TENANT_UUID,
+        entity_id=nonexistent_id
+    )
+    
+    assert enrichment is not None
+    assert enrichment.enrichments == enrichment_data
+
+def test_bulk_enrich_incidents(enrichments_bl, sample_incident):
+    # Create multiple incidents
+    incidents = [sample_incident]
+    enrichment_data = {"environment": "production"}
+    
+    # Bulk enrich incidents
+    for incident in incidents:
+        enrichments_bl.enrich_entity(
+            entity_id=str(incident.id),
+            enrichments=enrichment_data,
+            action_type=ActionType.INCIDENT_ENRICH,
+            action_callee="test",
+            action_description="Bulk enrichment"
+        )
+    
+    # Verify all incidents were enriched
+    for incident in incidents:
+        enrichment = get_enrichment(
+            tenant_id=SINGLE_TENANT_UUID,
+            entity_id=str(incident.id)
+        )
+        assert enrichment is not None
+        assert enrichment.enrichments == enrichment_data
\ No newline at end of file
diff --git a/tests/test_incident_routes.py b/tests/test_incident_routes.py
new file mode 100644
index 0000000000..b452de028c
--- /dev/null
+++ b/tests/test_incident_routes.py
@@ -0,0 +1,170 @@
+import pytest
+from fastapi.testclient import TestClient
+from uuid import uuid4
+from datetime import datetime, timezone
+
+from keep.api.models.incident import (
+    IncidentDto,
+    IncidentDtoIn,
+    IncidentStatus,
+    IncidentSeverity,
+    MergeIncidentsRequestDto,
+    SplitIncidentRequestDto
+)
+from keep.api.models.db.incident import Incident
+from keep.api.core.db import get_incident_by_id
+from keep.api.core.dependencies import SINGLE_TENANT_UUID
+
+@pytest.fixture
+def sample_incident_data():
+    return {
+        "name": "Test Incident",
+        "summary": "Test incident for API testing",
+        "status": "open",
+        "severity": "high",
+        "assignee": "test@example.com"
+    }
+
+def test_create_incident_endpoint(client, sample_incident_data):
+    response = client.post("/api/v1/incidents", json=sample_incident_data)
+    assert response.status_code == 202
+    data = response.json()
+    assert data["name"] == sample_incident_data["name"]
+    assert data["summary"] == sample_incident_data["summary"]
+    assert data["status"] == sample_incident_data["status"]
+    assert data["severity"] == sample_incident_data["severity"]
+    assert data["assignee"] == sample_incident_data["assignee"]
+
+def test_get_incidents_meta_endpoint(client):
+    response = client.get("/api/v1/incidents/meta")
+    assert response.status_code == 200
+    data = response.json()
+    assert "statuses" in data
+    assert "severities" in data
+    assert "assignees" in data
+    assert "sources" in data
+
+def test_get_all_incidents_endpoint(client, sample_incident_data):
+    # Create a test incident first
+    create_response = client.post("/api/v1/incidents", json=sample_incident_data)
+    assert create_response.status_code == 202
+
+    # Test getting all incidents
+    response = client.get("/api/v1/incidents")
+    assert response.status_code == 200
+    data = response.json()
+    assert "items" in data
+    assert data["count"] > 0
+    assert len(data["items"]) > 0
+
+def test_get_incident_by_id_endpoint(client, sample_incident_data):
+    # Create a test incident first
+    create_response = client.post("/api/v1/incidents", json=sample_incident_data)
+    assert create_response.status_code == 202
+    incident_id = create_response.json()["id"]
+
+    # Test getting specific incident
+    response = client.get(f"/api/v1/incidents/{incident_id}")
+    assert response.status_code == 200
+    data = response.json()
+    assert data["id"] == incident_id
+    assert data["name"] == sample_incident_data["name"]
+
+def test_update_incident_endpoint(client, sample_incident_data):
+    # Create a test incident first
+    create_response = client.post("/api/v1/incidents", json=sample_incident_data)
+    assert create_response.status_code == 202
+    incident_id = create_response.json()["id"]
+
+    # Update the incident
+    updated_data = sample_incident_data.copy()
+    updated_data["name"] = "Updated Incident"
+    updated_data["status"] = "resolved"
+
+    response = client.put(f"/api/v1/incidents/{incident_id}", json=updated_data)
+    assert response.status_code == 200
+    data = response.json()
+    assert data["name"] == "Updated Incident"
+    assert data["status"] == "resolved"
+
+def test_delete_incident_endpoint(client, sample_incident_data):
+    # Create a test incident first
+    create_response = client.post("/api/v1/incidents", json=sample_incident_data)
+    assert create_response.status_code == 202
+    incident_id = create_response.json()["id"]
+
+    # Delete the incident
+    response = client.delete(f"/api/v1/incidents/{incident_id}")
+    assert response.status_code == 202
+
+    # Verify incident is deleted
+    get_response = client.get(f"/api/v1/incidents/{incident_id}")
+    assert get_response.status_code == 404
+
+def test_merge_incidents_endpoint(client, sample_incident_data):
+    # Create two test incidents
+    incident1 = client.post("/api/v1/incidents", json=sample_incident_data).json()
+    incident2 = client.post("/api/v1/incidents", json=sample_incident_data).json()
+
+    merge_data = {
+        "source_incident_ids": [incident2["id"]],
+        "destination_incident_id": incident1["id"]
+    }
+
+    response = client.post("/api/v1/incidents/merge", json=merge_data)
+    assert response.status_code == 200
+    data = response.json()
+    assert data["destination_incident_id"] == incident1["id"]
+    assert incident2["id"] in data["merged_incident_ids"]
+
+def test_split_incident_endpoint(client, sample_incident_data):
+    # Create two test incidents
+    source_incident = client.post("/api/v1/incidents", json=sample_incident_data).json()
+    dest_incident = client.post("/api/v1/incidents", json=sample_incident_data).json()
+
+    # Add test alerts to source incident
+    test_fingerprints = ["test_fingerprint_1", "test_fingerprint_2"]
+    split_data = {
+        "destination_incident_id": dest_incident["id"],
+        "alert_fingerprints": test_fingerprints
+    }
+
+    response = client.post(f"/api/v1/incidents/{source_incident['id']}/split", json=split_data)
+    assert response.status_code == 200
+    data = response.json()
+    assert data["destination_incident_id"] == dest_incident["id"]
+    assert all(fp in data["moved_alert_fingerprints"] for fp in test_fingerprints)
+
+def test_get_incident_alerts_endpoint(client, sample_incident_data):
+    # Create a test incident
+    incident = client.post("/api/v1/incidents", json=sample_incident_data).json()
+
+    response = client.get(f"/api/v1/incidents/{incident['id']}/alerts")
+    assert response.status_code == 200
+    data = response.json()
+    assert "items" in data
+    assert "count" in data
+
+def test_get_incident_workflows_endpoint(client, sample_incident_data):
+    # Create a test incident
+    incident = client.post("/api/v1/incidents", json=sample_incident_data).json()
+
+    response = client.get(f"/api/v1/incidents/{incident['id']}/workflows")
+    assert response.status_code == 200
+    data = response.json()
+    assert "items" in data
+    assert "count" in data
+
+def test_get_incident_facets_endpoint(client):
+    response = client.get("/api/v1/incidents/facets")
+    assert response.status_code == 200
+    data = response.json()
+    assert isinstance(data, list)
+    assert len(data) > 0
+
+def test_get_incident_facet_fields_endpoint(client):
+    response = client.get("/api/v1/incidents/facets/fields")
+    assert response.status_code == 200
+    data = response.json()
+    assert isinstance(data, list)
+    assert len(data) > 0
\ No newline at end of file

From 4f6adc49bf2b299cbb600b4822e4f09b1c942930 Mon Sep 17 00:00:00 2001
From: Rohit Dash <rohitdash08@gmail.com>
Date: Thu, 1 May 2025 14:17:30 +0530
Subject: [PATCH 2/5] added migrations and made changes to the model

---
 keep/api/models/db/comment.py                 | 29 +++++++++
 .../2024-07-29-18-11_add_incident_comments.py | 61 +++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 keep/api/models/db/comment.py
 create mode 100644 keep/api/models/db/migrations/versions/2024-07-29-18-11_add_incident_comments.py

diff --git a/keep/api/models/db/comment.py b/keep/api/models/db/comment.py
new file mode 100644
index 0000000000..07ba076f52
--- /dev/null
+++ b/keep/api/models/db/comment.py
@@ -0,0 +1,29 @@
+from datetime import datetime
+from typing import List
+from uuid import UUID, uuid4
+
+from sqlalchemy import Column, ForeignKey, Text
+from sqlalchemy_utils import UUIDType
+from sqlmodel import Field, JSON, SQLModel
+
+from keep.api.models.db.incident import Incident, IncidentStatus
+
+
+class IncidentComment(SQLModel, table=True):
+    """Model for storing incident comments with mentioned users."""
+    id: UUID = Field(default_factory=uuid4, primary_key=True)
+    incident_id: UUID = Field(
+        sa_column=Column(
+            UUIDType(binary=False),
+            ForeignKey("incident.id", ondelete="CASCADE"),
+            index=True,
+        )
+    )
+    status: str = Field(sa_column=Column(Text, nullable=False))
+    comment: str = Field(sa_column=Column(Text, nullable=False))
+    mentioned_users: List[str] = Field(default=[], sa_column=Column(JSON))
+    created_at: datetime = Field(
+        default_factory=datetime.utcnow,
+        nullable=False,
+    )
+    created_by: str | None = Field(default=None)
\ No newline at end of file
diff --git a/keep/api/models/db/migrations/versions/2024-07-29-18-11_add_incident_comments.py b/keep/api/models/db/migrations/versions/2024-07-29-18-11_add_incident_comments.py
new file mode 100644
index 0000000000..60b69f275b
--- /dev/null
+++ b/keep/api/models/db/migrations/versions/2024-07-29-18-11_add_incident_comments.py
@@ -0,0 +1,61 @@
+"""Add incident comments table
+
+Revision ID: add_incident_comments
+Revises: 92f4f93f2140
+Create Date: 2024-07-29 18:11:00.000000
+
+"""
+from typing import List
+
+import sqlalchemy as sa
+import sqlmodel
+from alembic import op
+from sqlalchemy.dialects.postgresql import ARRAY
+from sqlalchemy_utils import UUIDType
+
+# revision identifiers, used by Alembic.
+revision = "add_incident_comments"
+down_revision = "92f4f93f2140"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "incident_comment",
+        sa.Column("id", UUIDType(binary=False), primary_key=True),
+        sa.Column("incident_id", UUIDType(binary=False), nullable=False),
+        sa.Column("status", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+        sa.Column("comment", sa.Text(), nullable=False),
+        sa.Column(
+            "mentioned_users",
+            sa.JSON(),
+            nullable=False,
+            server_default=sa.text("'[]'"),
+        ),
+        sa.Column(
+            "created_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.text("CURRENT_TIMESTAMP"),
+            nullable=False,
+        ),
+        sa.Column("created_by", sqlmodel.sql.sqltypes.AutoString(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["incident_id"],
+            ["incident.id"],
+            ondelete="CASCADE",
+        ),
+    )
+    op.create_index(
+        op.f("ix_incident_comment_incident_id"),
+        "incident_comment",
+        ["incident_id"],
+        unique=False,
+    )
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f("ix_incident_comment_incident_id"), table_name="incident_comment")
+    op.drop_table("incident_comment")
\ No newline at end of file

From 1e1aa00888fe86019f7ee81c48a7bcbfa2319c4f Mon Sep 17 00:00:00 2001
From: Rohit Dash <rohitdash08@gmail.com>
Date: Sat, 3 May 2025 17:13:43 +0530
Subject: [PATCH 3/5] added e2e test for the allow tagging in the incident
 comment

---
 .../test_incident_comments.py                 | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 tests/e2e_tests/incidents_alerts_tests/test_incident_comments.py

diff --git a/tests/e2e_tests/incidents_alerts_tests/test_incident_comments.py b/tests/e2e_tests/incidents_alerts_tests/test_incident_comments.py
new file mode 100644
index 0000000000..207d5048e3
--- /dev/null
+++ b/tests/e2e_tests/incidents_alerts_tests/test_incident_comments.py
@@ -0,0 +1,79 @@
+import time
+from datetime import datetime
+
+from playwright.sync_api import Page, expect
+
+from tests.e2e_tests.incidents_alerts_tests.incidents_alerts_setup import (
+    KEEP_UI_URL,
+    KEEP_API_URL,
+)
+from tests.e2e_tests.test_end_to_end import init_e2e_test, setup_console_listener
+from tests.e2e_tests.utils import get_token
+
+
+def test_incident_comment_with_mentions(browser: Page):
+    """Test adding comments with user mentions to incidents."""
+    log_entries = []
+    setup_console_listener(browser, log_entries)
+
+    # Initialize test and navigate to incidents page
+    init_e2e_test(browser, next_url="/incidents")
+
+    # Create a test incident first
+    browser.locator("[data-testid='create-incident-button']").click()
+    browser.locator("[data-testid='incident-name-input']").fill("Test Incident for Comments")
+    browser.locator("[data-testid='incident-summary-input']").fill("Testing comment functionality with user mentions")
+    browser.locator("[data-testid='create-incident-submit']").click()
+
+    # Wait for incident to be created and navigate to its details
+    browser.wait_for_selector("table[data-testid='incidents-table'] tbody tr", timeout=5000)
+    browser.locator("table[data-testid='incidents-table'] tbody tr").first.click()
+
+    # Add a comment with user mentions
+    browser.locator("[data-testid='add-comment-button']").click()
+    comment_input = browser.locator("[data-testid='comment-input']")
+    comment_input.fill("Hey @Rohit.dash and @Oz.rooh, please take a look at this incident")
+
+    # Verify mention suggestions appear
+    browser.wait_for_selector("[data-testid='mention-suggestions']")
+    expect(browser.locator("[data-testid='mention-suggestions']")).to_be_visible()
+
+    # Submit the comment
+    browser.locator("[data-testid='submit-comment-button']").click()
+
+    # Verify the comment appears with proper mention formatting
+    comment_element = browser.locator("[data-testid='incident-comment']").first
+    expect(comment_element).to_contain_text("@rohit.dash")
+    expect(comment_element).to_contain_text("@oz.rooh")
+
+    # Verify mentioned users are highlighted
+    mentioned_users = browser.locator("[data-testid='mentioned-user']")
+    expect(mentioned_users).to_have_count(2)
+    expect(mentioned_users.first).to_have_class("mentioned-user")
+
+    # Test editing a comment with mentions
+    browser.locator("[data-testid='edit-comment-button']").first.click()
+    edit_input = browser.locator("[data-testid='edit-comment-input']")
+    edit_input.fill("Updated: @rohit.dash please check this ASAP")
+    browser.locator("[data-testid='save-comment-button']").click()
+
+    # Verify the edited comment
+    updated_comment = browser.locator("[data-testid='incident-comment']").first
+    expect(updated_comment).to_contain_text("Updated:")
+    expect(updated_comment).to_contain_text("@rohit.dash")
+    expect(updated_comment).not_to_contain_text("@oz.rooh")
+
+    # Test comment with status change
+    browser.locator("[data-testid='add-comment-button']").click()
+    comment_input = browser.locator("[data-testid='comment-input']")
+    comment_input.fill("@oz.rooh I'm acknowledging this incident")
+    browser.locator("[data-testid='comment-status-select']").select_option("acknowledged")
+    browser.locator("[data-testid='submit-comment-button']").click()
+
+    # Verify status change comment
+    status_comment = browser.locator("[data-testid='incident-comment']").first
+    expect(status_comment).to_contain_text("acknowledged")
+    expect(status_comment).to_contain_text("@oz.rooh")
+
+    # Verify incident status updated
+    expect(browser.locator("[data-testid='incident-status']")).to_have_text("acknowledged")
\ No newline at end of file

From a0f891292c352b0a63764a5826cb11da64813913 Mon Sep 17 00:00:00 2001
From: Rohit Dash <rohitdash08@gmail.com>
Date: Mon, 5 May 2025 15:42:48 +0530
Subject: [PATCH 4/5] made changes to incident tagging used react quill instead
 of doing it from scratch

---
 .../activity/ui/IncidentActivityComment.tsx   |   8 +-
 .../[id]/activity/ui/MentionsInput.tsx        | 177 +++++-------------
 .../test_incident_comments.py                 |  15 ++
 3 files changed, 69 insertions(+), 131 deletions(-)

diff --git a/keep-ui/app/(keep)/incidents/[id]/activity/ui/IncidentActivityComment.tsx b/keep-ui/app/(keep)/incidents/[id]/activity/ui/IncidentActivityComment.tsx
index e62559e87a..1d11139d2c 100644
--- a/keep-ui/app/(keep)/incidents/[id]/activity/ui/IncidentActivityComment.tsx
+++ b/keep-ui/app/(keep)/incidents/[id]/activity/ui/IncidentActivityComment.tsx
@@ -1,5 +1,5 @@
 import { IncidentDto } from "@/entities/incidents/model";
-import { TextInput, Button } from "@tremor/react";
+import { Button } from "@tremor/react";
 import { useState, useCallback, useEffect } from "react";
 import { toast } from "react-toastify";
 import { KeyedMutator } from "swr";
@@ -22,8 +22,10 @@ export function IncidentActivityComment({
 
   const onSubmit = useCallback(async () => {
     try {
-      // Extract mentioned users from comment
-      const mentionedUsers = comment.match(/@([\w.-]+@[\w.-]+)/g)?.map(mention => mention.slice(1)) || [];
+      // Extract mentioned users from Quill-formatted comment
+      const mentionedUsers = (comment.match(/@[^>]+<([^>]+)>/g) || [])
+        .map(mention => mention.match(/<([^>]+)>/)?.[1])
+        .filter(Boolean) as string[];
       
       await api.post(`/incidents/${incident.id}/comment`, {
         status: incident.status,
diff --git a/keep-ui/app/(keep)/incidents/[id]/activity/ui/MentionsInput.tsx b/keep-ui/app/(keep)/incidents/[id]/activity/ui/MentionsInput.tsx
index 4f017bdf56..ff47935e53 100644
--- a/keep-ui/app/(keep)/incidents/[id]/activity/ui/MentionsInput.tsx
+++ b/keep-ui/app/(keep)/incidents/[id]/activity/ui/MentionsInput.tsx
@@ -1,6 +1,9 @@
-import { User } from "@/app/(keep)/settings/models";
-import { useEffect, useRef, useState } from "react";
-import { TextInput } from "@tremor/react";
+import { User } from "@/entities/users/model/types";
+import dynamic from "next/dynamic";
+import "react-quill-new/dist/quill.snow.css";
+import { useCallback, useMemo } from "react";
+
+const ReactQuill = dynamic(() => import("react-quill-new"), { ssr: false });
 
 interface MentionsInputProps {
   value: string;
@@ -9,145 +12,63 @@ interface MentionsInputProps {
   placeholder?: string;
 }
 
-interface SuggestionState {
-  isOpen: boolean;
-  query: string;
-  index: number;
-  startPosition: number;
-}
-
 export function MentionsInput({
   value,
   onValueChange,
   users,
-  placeholder,
+  placeholder = "Add a new comment... Use @ to mention users",
 }: MentionsInputProps) {
-  const [suggestion, setSuggestion] = useState<SuggestionState>({
-    isOpen: false,
-    query: "",
-    index: 0,
-    startPosition: 0,
-  });
+  const mentionSuggestions = useMemo(() => {
+    return users.map((user) => ({
+      id: user.email,
+      value: user.name || user.email,
+    }));
+  }, [users]);
 
-  const inputRef = useRef<HTMLInputElement>(null);
-
-  const filteredUsers = users.filter((user) =>
-    (user.name?.toLowerCase() || user.email.toLowerCase()).includes(
-      suggestion.query.toLowerCase()
-    )
+  const modules = useMemo(
+    () => ({
+      toolbar: [
+        ["bold", "italic", "underline"],
+        [{ list: "ordered" }, { list: "bullet" }],
+        ["link"],
+      ],
+      mention: {
+        allowedChars: /^[A-Za-z\sÅÄÖåäö]*$/,
+        mentionDenotationChars: ["@"],
+        source: function (searchTerm: string, renderList: Function) {
+          const matches = mentionSuggestions.filter((item) =>
+            item.value.toLowerCase().includes(searchTerm.toLowerCase())
+          );
+          renderList(matches, searchTerm);
+        },
+        renderItem: function (item: any) {
+          return `${item.value} <${item.id}>`;
+        },
+      },
+    }),
+    [mentionSuggestions]
   );
 
-  const insertMention = (user: User) => {
-    const before = value.slice(0, suggestion.startPosition);
-    const after = value.slice(inputRef.current?.selectionStart || 0);
-    const mention = `@${user.email} `;
-    onValueChange(before + mention + after);
-    setSuggestion({ isOpen: false, query: "", index: 0, startPosition: 0 });
-  };
-
-  const handleKeyDown = (event: React.KeyboardEvent) => {
-    if (!suggestion.isOpen) return;
-
-    switch (event.key) {
-      case "ArrowDown":
-        event.preventDefault();
-        setSuggestion((prev) => ({
-          ...prev,
-          index: (prev.index + 1) % filteredUsers.length,
-        }));
-        break;
-      case "ArrowUp":
-        event.preventDefault();
-        setSuggestion((prev) => ({
-          ...prev,
-          index:
-            prev.index - 1 < 0 ? filteredUsers.length - 1 : prev.index - 1,
-        }));
-        break;
-      case "Enter":
-        event.preventDefault();
-        if (filteredUsers[suggestion.index]) {
-          insertMention(filteredUsers[suggestion.index]);
-        }
-        break;
-      case "Escape":
-        setSuggestion({ isOpen: false, query: "", index: 0, startPosition: 0 });
-        break;
-    }
-  };
+  const formats = ["bold", "italic", "underline", "list", "bullet", "link", "mention"];
 
-  const handleInput = (newValue: string) => {
-    onValueChange(newValue);
-
-    const cursorPosition = inputRef.current?.selectionStart || 0;
-    const textBeforeCursor = newValue.slice(0, cursorPosition);
-    const matches = textBeforeCursor.match(/@([\w\s]*)$/);
-
-    if (matches) {
-      setSuggestion({
-        isOpen: true,
-        query: matches[1],
-        index: 0,
-        startPosition: cursorPosition - matches[1].length - 1,
-      });
-    } else {
-      setSuggestion({ isOpen: false, query: "", index: 0, startPosition: 0 });
-    }
-  };
-
-  useEffect(() => {
-    const handleClickOutside = (event: MouseEvent) => {
-      if (
-        suggestion.isOpen &&
-        inputRef.current &&
-        !inputRef.current.contains(event.target as Node)
-      ) {
-        setSuggestion({ isOpen: false, query: "", index: 0, startPosition: 0 });
-      }
-    };
-
-    document.addEventListener("click", handleClickOutside);
-    return () => document.removeEventListener("click", handleClickOutside);
-  }, [suggestion.isOpen]);
+  const handleChange = useCallback(
+    (content: string) => {
+      onValueChange(content);
+    },
+    [onValueChange]
+  );
 
   return (
-    <div className="relative w-full">
-      <TextInput
-        ref={inputRef}
+    <div className="w-full">
+      <ReactQuill
+        theme="snow"
         value={value}
-        onValueChange={handleInput}
+        onChange={handleChange}
+        modules={modules}
+        formats={formats}
         placeholder={placeholder}
-        onKeyDown={handleKeyDown}
+        className="border border-tremor-border rounded-tremor-default shadow-tremor-input"
       />
-      {suggestion.isOpen && filteredUsers.length > 0 && (
-        <div className="absolute z-10 w-64 mt-1 bg-white rounded-md shadow-lg border border-gray-200">
-          <ul className="py-1">
-            {filteredUsers.map((user, index) => (
-              <li
-                key={user.email}
-                className={`px-3 py-2 cursor-pointer hover:bg-gray-100 ${suggestion.index === index ? "bg-gray-100" : ""}`}
-                onClick={() => insertMention(user)}
-              >
-                <div className="flex items-center">
-                  {user.picture && (
-                    <img
-                      src={user.picture}
-                      alt={user.name}
-                      className="w-6 h-6 rounded-full mr-2"
-                    />
-                  )}
-                  <div>
-                    <div className="font-medium">{user.name || user.email}</div>
-                    {user.name && (
-                      <div className="text-sm text-gray-500">{user.email}</div>
-                    )}
-                  </div>
-                </div>
-              </li>
-            ))}
-          </ul>
-        </div>
-      )}
     </div>
   );
 }
\ No newline at end of file
diff --git a/tests/e2e_tests/incidents_alerts_tests/test_incident_comments.py b/tests/e2e_tests/incidents_alerts_tests/test_incident_comments.py
index 207d5048e3..5ea8b8958f 100644
--- a/tests/e2e_tests/incidents_alerts_tests/test_incident_comments.py
+++ b/tests/e2e_tests/incidents_alerts_tests/test_incident_comments.py
@@ -51,6 +51,21 @@ def test_incident_comment_with_mentions(browser: Page):
     expect(mentioned_users).to_have_count(2)
     expect(mentioned_users.first).to_have_class("mentioned-user")
 
+    # Verify notification creation
+    notifications_url = f"{KEEP_API_URL}/notifications"
+    notifications_response = browser.request.get(notifications_url)
+    expect(notifications_response).to_be_ok()
+    notifications = notifications_response.json()
+    mentioned_emails = ["rohit.dash@example.com", "oz.rooh@example.com"]
+    assert any(n["recipient"] in mentioned_emails and "mention" in n["type"] for n in notifications), "Missing mention notifications"
+
+    # Verify workflow execution
+    workflow_executions_url = f"{KEEP_API_URL}/workflows/executions"
+    executions_response = browser.request.get(workflow_executions_url)
+    expect(executions_response).to_be_ok()
+    executions = executions_response.json()
+    assert any(e["workflow_id"] == "user-mention-notification" and e["status"] == "success" for e in executions), "Missing workflow execution"
+
     # Test editing a comment with mentions
     browser.locator("[data-testid='edit-comment-button']").first.click()
     edit_input = browser.locator("[data-testid='edit-comment-input']")

From 3f9d587861014ce9ed1e315a6fde311ff73c1edc Mon Sep 17 00:00:00 2001
From: Rohit Dash <rohitdash08@gmail.com>
Date: Mon, 5 May 2025 16:44:55 +0530
Subject: [PATCH 5/5] comment resolved changed MentionInput to CommentInput

---
 .../ui/{MentionsInput.tsx => CommentInput.tsx}       | 12 ++++++------
 .../[id]/activity/ui/IncidentActivityComment.tsx     |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename keep-ui/app/(keep)/incidents/[id]/activity/ui/{MentionsInput.tsx => CommentInput.tsx} (88%)

diff --git a/keep-ui/app/(keep)/incidents/[id]/activity/ui/MentionsInput.tsx b/keep-ui/app/(keep)/incidents/[id]/activity/ui/CommentInput.tsx
similarity index 88%
rename from keep-ui/app/(keep)/incidents/[id]/activity/ui/MentionsInput.tsx
rename to keep-ui/app/(keep)/incidents/[id]/activity/ui/CommentInput.tsx
index ff47935e53..b0019b4b5d 100644
--- a/keep-ui/app/(keep)/incidents/[id]/activity/ui/MentionsInput.tsx
+++ b/keep-ui/app/(keep)/incidents/[id]/activity/ui/CommentInput.tsx
@@ -5,20 +5,20 @@ import { useCallback, useMemo } from "react";
 
 const ReactQuill = dynamic(() => import("react-quill-new"), { ssr: false });
 
-interface MentionsInputProps {
+interface CommentInputProps {
   value: string;
   onValueChange: (value: string) => void;
   users: User[];
   placeholder?: string;
 }
 
-export function MentionsInput({
+export function CommentInput({
   value,
   onValueChange,
   users,
   placeholder = "Add a new comment... Use @ to mention users",
-}: MentionsInputProps) {
-  const mentionSuggestions = useMemo(() => {
+}: CommentInputProps) {
+  const commentSuggestions = useMemo(() => {
     return users.map((user) => ({
       id: user.email,
       value: user.name || user.email,
@@ -36,7 +36,7 @@ export function MentionsInput({
         allowedChars: /^[A-Za-z\sÅÄÖåäö]*$/,
         mentionDenotationChars: ["@"],
         source: function (searchTerm: string, renderList: Function) {
-          const matches = mentionSuggestions.filter((item) =>
+          const matches = commentSuggestions.filter((item) =>
             item.value.toLowerCase().includes(searchTerm.toLowerCase())
           );
           renderList(matches, searchTerm);
@@ -46,7 +46,7 @@ export function MentionsInput({
         },
       },
     }),
-    [mentionSuggestions]
+    [commentSuggestions]
   );
 
   const formats = ["bold", "italic", "underline", "list", "bullet", "link", "mention"];
diff --git a/keep-ui/app/(keep)/incidents/[id]/activity/ui/IncidentActivityComment.tsx b/keep-ui/app/(keep)/incidents/[id]/activity/ui/IncidentActivityComment.tsx
index 1d11139d2c..706fa386af 100644
--- a/keep-ui/app/(keep)/incidents/[id]/activity/ui/IncidentActivityComment.tsx
+++ b/keep-ui/app/(keep)/incidents/[id]/activity/ui/IncidentActivityComment.tsx
@@ -7,7 +7,7 @@ import { useApi } from "@/shared/lib/hooks/useApi";
 import { showErrorToast } from "@/shared/ui";
 import { AuditEvent } from "@/entities/alerts/model";
 import { useUsers } from "@/entities/users/model/useUsers";
-import { MentionsInput } from "./MentionsInput";
+import { CommentInput } from "./CommentInput";
 
 export function IncidentActivityComment({
   incident,
@@ -62,7 +62,7 @@ export function IncidentActivityComment({
 
   return (
     <div className="flex h-full w-full relative items-center">
-      <MentionsInput
+      <CommentInput
         value={comment}
         onValueChange={setComment}
         users={users}