address code review

Author: juanmrad

client/src/webpages/dashboard/userStrikes/StrikeAnalyticsTab.tsx

@@ -215,8 +215,12 @@ function RecentUserStrikeActionsTable() {
       ?.slice()
       ?.sort((a, b) => (a.time > b.time ? -1 : a.time < b.time ? 1 : 0))
       .map((values) => {
-        const userId = values.creatorId ?? values.itemId;
-        const userTypeId = values.creatorTypeId ?? values.itemTypeId;
+        const creatorIdentity =
+          values.creatorId && values.creatorTypeId
+            ? { id: values.creatorId, typeId: values.creatorTypeId }
+            : null;
+        const userId = creatorIdentity?.id ?? values.itemId;
+        const userTypeId = creatorIdentity?.typeId ?? values.itemTypeId;
         return {
           user: (
             <Link

server/plugins/warehouse/queries/ClickhouseActionExecutionsAdapter.test.ts

@@ -199,6 +199,30 @@ describe('ClickhouseActionExecutionsAdapter.getRecentUserStrikeActions', () => {
     expect(results[0]?.creatorTypeId).toBeNull();
   });
 
+  it('returns both creator fields when both are present in the row', async () => {
+    const ts = '2026-06-01T10:00:00.000Z';
+    const { adapter } = makeAdapter([
+      {
+        ts,
+        item_id: 'content-1',
+        item_type_id: 'content-type-A',
+        item_type_kind: 'CONTENT',
+        item_creator_id: 'user-5',
+        item_creator_type_id: null,
+        action_id: 'action-ban',
+        action_source: 'user-strike-action-execution',
+      },
+    ]);
+
+    const results = await adapter.getRecentUserStrikeActions({
+      orgId: 'org-1',
+      limit: 10,
+    });
+
+    expect(results[0]?.creatorId).toBe('user-5');
+    expect(results[0]?.creatorTypeId).toBeNull();
+  });
+
   it('selects item_creator_id and item_creator_type_id in the SQL', async () => {
     const { adapter, query } = makeAdapter([]);
 

server/services/userStrikeService/userStrikeService.ts

@@ -266,8 +266,9 @@ export class UserStrikeService {
               actionId: it.actionId,
               itemId: it.itemId,
               itemTypeId: it.itemTypeId,
-              creatorId: it.creatorId ?? null,
-              creatorTypeId: it.creatorTypeId ?? null,
+              creatorId: it.creatorId && it.creatorTypeId ? it.creatorId : null,
+              creatorTypeId:
+                it.creatorId && it.creatorTypeId ? it.creatorTypeId : null,
               source: it.source,
               time: it.occurredAt,
             }