feat(api,ui): add howler.triaged to track time assessment is made

api/howler/actions/demote.py

@@ -76,7 +76,7 @@ def execute(
                     *hit_helper.demote_hit(escalation=escalation),
                     odm_helper.update("howler.assessment", None),
                     odm_helper.update("howler.rationale", None),
-                    odm_helper.update("howler.assignment", None),
+                    odm_helper.update("howler.triaged", None),
                 ],
             )
         else:
@@ -94,7 +94,7 @@ def execute(
             ds.hit.update_by_query(
                 query,
                 [
-                    *hit_helper.assess_hit(assessment, rationale, user=(user if user else "automation")),
+                    *hit_helper.assess_hit(assessment, rationale),
                     odm_helper.update(
                         "howler.assignment",
                         user.get("uname", "automation") if user else "automation",

api/howler/actions/promote.py

@@ -10,7 +10,6 @@
     AssessmentEscalationMap,
     Escalation,
 )
-from howler.odm.models.user import User
 from howler.utils.str_utils import sanitize_lucene_query
 
 OPERATION_ID = "promote"
@@ -27,7 +26,6 @@ def execute(
     escalation: Escalation = Escalation.ALERT,
     assessment: Optional[str] = None,
     rationale: Optional[str] = None,
-    user: Optional[User] = None,
     **kwargs,
 ):
     """Promote a hit.
@@ -75,7 +73,7 @@ def execute(
                     *hit_helper.promote_hit(escalation=escalation),
                     odm_helper.update("howler.assessment", None),
                     odm_helper.update("howler.rationale", None),
-                    odm_helper.update("howler.assignment", None),
+                    odm_helper.update("howler.triaged", None),
                 ],
             )
         else:
@@ -90,9 +88,7 @@ def execute(
                 )
                 return report
 
-            ds.hit.update_by_query(
-                query, hit_helper.assess_hit(assessment, rationale, user=(user if user else "automation"))
-            )
+            ds.hit.update_by_query(query, hit_helper.assess_hit(assessment, rationale))
 
         report.append(
             {

api/howler/helper/hit.py

@@ -24,16 +24,13 @@ def assess_hit(
     assessment: Optional[str] = None,
     rationale: Optional[str] = None,
     hit: Optional[Union[dict[str, Any], Hit]] = None,
-    *,
-    user: User | str,
     **kwargs,
 ) -> list[OdmUpdateOperation]:
     """Update the assessment and esclation of a hit
 
     Args:
-        user (User | str): The user making the assessment
         assessment (Optional[str], optional): The assessment to set the hit to. Defaults to None.
-        hit (Optional[Union[dict[str, Any], Hit]], optional): The hit to update. Defaults to None.
+        hit (Optional[dict[str, Any]], optional): The hit to update. Defaults to None.
 
     Raises:
         InvalidDataException: An invalid assessment was provided
@@ -55,6 +52,9 @@ def assess_hit(
     if assessment is None and rationale:
         rationale = None
 
+    # reset the timestamp to None if removing assessment (re-assessing)
+    triaged_timestamp = "NOW" if assessment is not None else None
+
     logger.debug(
         "Updating assessment of %s to %s",
         hit["howler"]["id"] if hit else "unknown",
@@ -66,16 +66,11 @@ def assess_hit(
         escalation,
     )
 
-    if assessment is None:
-        assessor_id = None
-    else:
-        assessor_id = user.get("uname", user.get("username", None)) if isinstance(user, User) else user
-
     return [
         odm_helper.update("howler.assessment", assessment),
         odm_helper.update("howler.escalation", escalation),
         odm_helper.update("howler.rationale", rationale, silent=True),
-        odm_helper.update("howler.assessor", assessor_id, silent=True),
+        odm_helper.update("howler.triaged", triaged_timestamp),
     ]
 
 

api/howler/odm/helper.py

@@ -165,10 +165,10 @@ def generate_useful_hit(lookups: dict[str, dict[str, Any]], users: list[str], pr
 
     hit.howler.assessment = None
     hit.howler.rationale = None
+    hit.howler.triaged = None
     hit.howler.status = "open"
     hit.howler.assignment = "unassigned"
     hit.howler.escalation = choice([Escalation.HIT, Escalation.ALERT])
-    hit.howler.assessor = None
 
     if randint(1, 10) > 9:
         hit.howler.expiry = datetime.now() + timedelta(days=randint(1, 60))

api/howler/odm/models/howler_data.py

@@ -1,4 +1,5 @@
 # mypy: ignore-errors
+from datetime import datetime
 from typing import Optional
 
 from howler import odm
@@ -210,12 +211,6 @@ class HowlerData(odm.Model):
         description="Unique identifier of the assigned user.",
         default=DEFAULT_ASSIGNMENT,
     )
-    assessor: Optional[str] = odm.Optional(
-        odm.Keyword(
-            description="The most recent person to assess a hit",
-            default=None,
-        )
-    )
     bundles: list[str] = odm.List(
         odm.Keyword(
             description="A list of bundle IDs this hit is a part of. Corresponds to the howler.id of the bundle."
@@ -297,6 +292,7 @@ class HowlerData(odm.Model):
             )
         )
     )
+    triaged: Optional[datetime] = odm.Optional(odm.Date(description="Timestamp at which the hit was triaged."))
     comment: list[Comment] = odm.List(
         odm.Compound(Comment),
         default=[],

api/howler/odm/random_data.py

@@ -577,7 +577,6 @@ def create_hits(ds: HowlerDatastore, hit_count: int = 200):
                 hit.howler.id,
                 [
                     *assess_hit(
-                        user=user,
                         assessment=choice(Assessment.list()),
                         rationale=get_random_string(),
                         hit=hit,

api/howler/services/hit_service.py

@@ -111,7 +111,7 @@ def get_hit_workflow() -> Workflow:
                     "source": [HitStatus.OPEN, HitStatus.IN_PROGRESS],
                     "transition": HitStatusTransition.ASSESS,
                     "dest": HitStatus.RESOLVED,
-                    "actions": [assess_hit],
+                    "actions": [assess_hit, assign_hit],
                 }
             ),
             Transition(

api/test/integration/api/test_hit_transition.py

@@ -1,5 +1,6 @@
+import datetime
 import json
-from typing import Any, Optional
+from typing import Any, Literal, Optional
 
 import pytest
 
@@ -42,11 +43,8 @@ def datastore(datastore_connection: HowlerDatastore):
         wipe_hits(datastore_connection)
 
 
-def test_full_transition_flow(datastore: HowlerDatastore, login_session):
-    """Test that /api/v1/hit/<id>/transitions/start endpoint performs the correct transition"""
-    session, host = login_session
-
-    assert datastore.hit.get(HIT_ID).howler.status == HitStatus.OPEN
+@pytest.fixture(scope="module")
+def transition_data(datastore: HowlerDatastore) -> list[dict[str, Any]]:
 
     def check_assignment(user: str):
         def check():
@@ -66,23 +64,30 @@ def check():
 
         return check
 
-    def check_assessor(user: str):
+    def check_triaged(assessment_time: Literal["NOW"] | None):
         def check():
-            assert datastore.hit.get(HIT_ID).howler.assessor == user
+            tolerance = datetime.timedelta(seconds=1)
+
+            triaged_timestamp = datastore.hit.get(HIT_ID).howler.triaged
+            if assessment_time is None:
+                assert triaged_timestamp is None
+            else:
+                assert triaged_timestamp is not None
+                assert abs(triaged_timestamp - datetime.datetime.now(datetime.timezone.utc)) < tolerance
 
         return check
 
-    transition_data: list[dict[str, Any]] = [
+    return [
         {
             "transition": HitStatusTransition.ASSESS,
             "data": {"assessment": Assessment.AMBIGUOUS},
             "dest": HitStatus.RESOLVED,
-            "check": [check_assessor("admin")],
+            "check": [check_assignment("admin"), check_triaged("NOW")],
         },
         {
             "transition": HitStatusTransition.RE_EVALUATE,
             "dest": HitStatus.IN_PROGRESS,
-            "check": [check_assessment(None), check_assignment("admin"), check_assessor(None)],
+            "check": [check_assessment(None), check_assignment("admin"), check_triaged(None)],
         },
         {
             "transition": HitStatusTransition.RELEASE,
@@ -148,12 +153,16 @@ def check():
             "transition": HitStatusTransition.ASSESS,
             "data": {"assessment": Assessment.AMBIGUOUS},
             "dest": HitStatus.RESOLVED,
-            "check": [check_assessment(Assessment.AMBIGUOUS), check_assessor("admin")],
+            "check": [
+                check_assessment(Assessment.AMBIGUOUS),
+                check_assignment("admin"),
+                check_triaged("NOW"),
+            ],
         },
         {
             "transition": HitStatusTransition.RE_EVALUATE,
             "dest": HitStatus.IN_PROGRESS,
-            "check": [check_assessment(None), check_assignment("admin"), check_assessor(None)],
+            "check": [check_assessment(None), check_assignment("admin"), check_triaged(None)],
         },
         {
             "transition": HitStatusTransition.RELEASE,
@@ -168,6 +177,13 @@ def check():
         },
     ]
 
+
+def test_full_transition_flow(transition_data, datastore, login_session):
+    """Test that /api/v1/hit/<id>/transitions/start endpoint performs the correct transition"""
+    session, host = login_session
+
+    assert datastore.hit.get(HIT_ID).howler.status == HitStatus.OPEN
+
     for data in transition_data:
         checks = data.pop("check", None)
         _, version = datastore.hit.get(HIT_ID, as_obj=False, version=True)

ui/src/components/elements/hit/HitBanner.tsx

@@ -25,9 +25,9 @@ import { Link } from 'react-router-dom';
 import { ESCALATION_COLORS, PROVIDER_COLORS } from 'utils/constants';
 import { stringToColor } from 'utils/utils';
 import PluginTypography from '../PluginTypography';
+import Assigned from './elements/Assigned';
 import EscalationChip from './elements/EscalationChip';
 import HitTimestamp from './elements/HitTimestamp';
-import HitUsers from './elements/HitUsers';
 import HitBannerTooltip from './HitBannerTooltip';
 import { HitLayout } from './HitLayout';
 
@@ -345,7 +345,7 @@ const HitBanner: FC<HitBannerProps> = ({ hit, layout = HitLayout.NORMAL, showAss
         ]}
       >
         <HitTimestamp hit={hit} layout={layout} />
-        <HitUsers hit={hit} layout={layout} showAssigned={showAssigned} />
+        {showAssigned && <Assigned hit={hit} layout={layout} />}
         {hit.howler.links?.[0]?.href && (
           <Chip
             icon={<OpenInNew />}

ui/src/components/elements/hit/elements/Assigned.tsx

@@ -0,0 +1,71 @@
+import { avatarClasses, AvatarGroup, Chip, Stack } from '@mui/material';
+import { useAppUser } from 'commons/components/app/hooks';
+import HowlerAvatar from 'components/elements/display/HowlerAvatar';
+import type { Hit } from 'models/entities/generated/Hit';
+import type { HowlerUser } from 'models/entities/HowlerUser';
+import type { FC } from 'react';
+import { useTranslation } from 'react-i18next';
+import { HitLayout } from '../HitLayout';
+
+const Assigned: FC<{ hit: Hit; layout: HitLayout; hideLabel?: boolean }> = ({ hit, layout, hideLabel = false }) => {
+  const { t } = useTranslation();
+  const { user } = useAppUser<HowlerUser>();
+
+  const userAvatar = (
+    <HowlerAvatar
+      userId={hit.howler.assignment}
+      sx={{ height: layout !== HitLayout.COMFY ? 24 : 32, width: layout !== HitLayout.COMFY ? 24 : 32 }}
+    />
+  );
+
+  return (
+    <Stack direction="row" spacing={0.5}>
+      {hideLabel ? (
+        userAvatar
+      ) : (
+        <Chip
+          variant="outlined"
+          sx={{
+            width: 'fit-content',
+            '& .MuiChip-icon': {
+              marginLeft: 0
+            }
+          }}
+          icon={userAvatar}
+          label={
+            !hideLabel &&
+            (hit?.howler.assignment !== 'unassigned'
+              ? hit?.howler.assignment
+              : t('app.drawer.hit.assignment.unassigned.name'))
+          }
+          size={layout !== HitLayout.COMFY ? 'small' : 'medium'}
+        />
+      )}
+      <AvatarGroup
+        max={3}
+        sx={{ [`.${avatarClasses.root}`]: { border: 0, marginLeft: 0.5 } }}
+        componentsProps={{
+          additionalAvatar: {
+            sx: {
+              height: layout !== HitLayout.COMFY ? 24 : 32,
+              width: layout !== HitLayout.COMFY ? 24 : 32,
+              fontSize: '12px'
+            }
+          }
+        }}
+      >
+        {[...new Set(hit?.howler.viewers)]
+          .filter(viewer => viewer !== user.username)
+          .map(viewer => (
+            <HowlerAvatar
+              key={viewer}
+              userId={viewer}
+              sx={{ height: layout !== HitLayout.COMFY ? 24 : 32, width: layout !== HitLayout.COMFY ? 24 : 32 }}
+            />
+          ))}
+      </AvatarGroup>
+    </Stack>
+  );
+};
+
+export default Assigned;