Change event sorting to event id (#963)

* change event sorting to event id

* remove unused file

* update fixtures

Author: Assem-Uber

src/views/workflow-history/__fixtures__/workflow-history-event-groups.ts

@@ -26,6 +26,7 @@ export const mockActivityEventGroup: ActivityHistoryGroup = {
   startTimeMs: 1725747370599,
   timeLabel: 'Mock time label',
   events: completedActivityTaskEvents,
+  firstEventId: completedActivityTaskEvents[0].eventId,
 };
 
 export const mockDecisionEventGroup: DecisionHistoryGroup = {
@@ -38,6 +39,7 @@ export const mockDecisionEventGroup: DecisionHistoryGroup = {
   startTimeMs: 1725747370599,
   timeLabel: 'Mock time label',
   events: completedDecisionTaskEvents,
+  firstEventId: completedDecisionTaskEvents[0].eventId,
 };
 
 export const mockTimerEventGroup: TimerHistoryGroup = {
@@ -50,6 +52,7 @@ export const mockTimerEventGroup: TimerHistoryGroup = {
   startTimeMs: 1725747380000,
   timeLabel: 'Mock time label',
   events: [startTimerTaskEvent],
+  firstEventId: startTimerTaskEvent.eventId,
 };
 
 export const mockChildWorkflowEventGroup: ChildWorkflowExecutionHistoryGroup = {
@@ -62,6 +65,7 @@ export const mockChildWorkflowEventGroup: ChildWorkflowExecutionHistoryGroup = {
   startTimeMs: 1725769671830,
   timeLabel: 'Mock time label',
   events: completedChildWorkflowEvents,
+  firstEventId: completedChildWorkflowEvents[0].eventId,
 };
 
 export const mockSignalExternalWorkflowEventGroup: SignalExternalWorkflowExecutionHistoryGroup =
@@ -75,6 +79,7 @@ export const mockSignalExternalWorkflowEventGroup: SignalExternalWorkflowExecuti
     startTimeMs: 1725769470356,
     timeLabel: 'Mock time label',
     events: signaledExternalWorkflowEvents,
+    firstEventId: signaledExternalWorkflowEvents[0].eventId,
   };
 
 export const mockRequestCancelExternalWorkflowEventGroup: RequestCancelExternalWorkflowExecutionHistoryGroup =
@@ -88,6 +93,7 @@ export const mockRequestCancelExternalWorkflowEventGroup: RequestCancelExternalW
     startTimeMs: 1725749470886,
     timeLabel: 'Mock time label',
     events: requestedCancelExternalWorkflowEvents,
+    firstEventId: requestedCancelExternalWorkflowEvents[0].eventId,
   };
 
 export const mockSingleEventGroup: SingleEventHistoryGroup = {
@@ -100,4 +106,5 @@ export const mockSingleEventGroup: SingleEventHistoryGroup = {
   startTimeMs: 1725747380000,
   timeLabel: 'Mock time label',
   events: [startWorkflowExecutionEvent],
+  firstEventId: startWorkflowExecutionEvent.eventId,
 };

src/views/workflow-history/helpers/__tests__/get-common-history-group-fields.test.ts

@@ -181,6 +181,11 @@ describe('getCommonHistoryGroupFields', () => {
     expect(group.eventsMetadata[0].negativeFields).toEqual(['startReason']);
     expect(group.eventsMetadata[1].negativeFields).toBeUndefined();
   });
+
+  it('should return group with firstEventId equal to first event id', () => {
+    const group = setup({});
+    expect(group.firstEventId).toEqual(group.events[0].eventId);
+  });
 });
 
 // using timer events for testing

src/views/workflow-history/helpers/__tests__/get-sortable-event-id.test.ts

@@ -0,0 +1,31 @@
+import getSortableEventId from '../get-sortable-event-id';
+
+describe('getSortableEventId', () => {
+  it('should return Number.MAX_SAFE_INTEGER for empty input', () => {
+    expect(getSortableEventId(null)).toBe(Number.MAX_SAFE_INTEGER);
+    expect(getSortableEventId(undefined)).toBe(Number.MAX_SAFE_INTEGER);
+    expect(getSortableEventId('')).toBe(Number.MAX_SAFE_INTEGER);
+    expect(getSortableEventId('   ')).toBe(Number.MAX_SAFE_INTEGER);
+  });
+
+  it('should parse valid positive integer strings', () => {
+    expect(getSortableEventId('0')).toBe(0);
+    expect(getSortableEventId('1')).toBe(1);
+    expect(getSortableEventId('123')).toBe(123);
+    expect(getSortableEventId('999999')).toBe(999999);
+  });
+
+  it('should parse valid negative integer strings', () => {
+    expect(getSortableEventId('-1')).toBe(-1);
+    expect(getSortableEventId('-123')).toBe(-123);
+    expect(getSortableEventId('-999999')).toBe(-999999);
+  });
+
+  it('should return Number.MAX_SAFE_INTEGER for strings starting with non-digits', () => {
+    expect(getSortableEventId('abc')).toBe(Number.MAX_SAFE_INTEGER);
+    expect(getSortableEventId('abc123')).toBe(Number.MAX_SAFE_INTEGER);
+    expect(getSortableEventId('!@#$%')).toBe(Number.MAX_SAFE_INTEGER);
+    expect(getSortableEventId('😀123')).toBe(Number.MAX_SAFE_INTEGER);
+    expect(getSortableEventId('\x00123')).toBe(Number.MAX_SAFE_INTEGER);
+  });
+});

src/views/workflow-history/helpers/get-common-history-group-fields.ts

@@ -27,6 +27,7 @@ export default function getCommonHistoryGroupFields<
   | 'timeLabel'
   | 'closeTimeMs'
   | 'startTimeMs'
+  | 'firstEventId'
 > {
   const eventsMetadata = events.map((event, index) => {
     const attrs = event.attributes as GroupT['events'][number]['attributes'];
@@ -51,6 +52,7 @@ export default function getCommonHistoryGroupFields<
     };
   });
 
+  const groupFirstEventId = events[0].eventId;
   const groupStatus = eventsMetadata[eventsMetadata.length - 1].status;
   const groupTimeMs = eventsMetadata[eventsMetadata.length - 1].timeMs;
   const groupStartTimeMs = eventsMetadata[0].timeMs;
@@ -67,5 +69,6 @@ export default function getCommonHistoryGroupFields<
     startTimeMs: groupStartTimeMs,
     closeTimeMs: groupCloseTimeMs,
     timeLabel: groupTimeLabel,
+    firstEventId: groupFirstEventId,
   };
 }

src/views/workflow-history/helpers/get-sortable-event-id.ts

@@ -0,0 +1,6 @@
+export default function getSortableEventId(eventId: string | null | undefined) {
+  if (!eventId) return Number.MAX_SAFE_INTEGER;
+  const numericEventId = parseInt(eventId, 10);
+  if (isNaN(numericEventId)) return Number.MAX_SAFE_INTEGER;
+  return numericEventId;
+}

src/views/workflow-history/workflow-history-filters-status/helpers/__tests__/filter-groups-by-group-status.test.ts

@@ -12,6 +12,7 @@ const ACTIVITY_HISTORY_GROUP_COMPLETED: ActivityHistoryGroup = {
   timeLabel: 'Mock time label',
   groupType: 'Activity',
   events: [],
+  firstEventId: null,
 };
 
 describe(filterGroupsByGroupStatus.name, () => {

src/views/workflow-history/workflow-history.tsx

@@ -37,6 +37,7 @@ import { useSuspenseDescribeWorkflow } from '../workflow-page/hooks/use-describe
 import workflowHistoryFiltersConfig from './config/workflow-history-filters.config';
 import WORKFLOW_HISTORY_PAGE_SIZE_CONFIG from './config/workflow-history-page-size.config';
 import compareUngroupedEvents from './helpers/compare-ungrouped-events';
+import getSortableEventId from './helpers/get-sortable-event-id';
 import getVisibleGroupsHasMissingEvents from './helpers/get-visible-groups-has-missing-events';
 import { groupHistoryEvents } from './helpers/group-history-events';
 import pendingActivitiesInfoToEvents from './helpers/pending-activities-info-to-events';
@@ -150,7 +151,7 @@ export default function WorkflowHistory({ params }: Props) {
     () =>
       sortBy(
         Object.entries(eventGroups),
-        ([_, { timeMs }]) => timeMs,
+        ([_, { firstEventId }]) => getSortableEventId(firstEventId),
         'ASC'
       ).filter(([_, g]) =>
         workflowHistoryFiltersConfig.every((f) =>

src/views/workflow-history/workflow-history.types.ts

@@ -60,6 +60,7 @@ type BaseHistoryGroup = {
   startTimeMs: number | null;
   closeTimeMs?: number | null;
   timeLabel: string;
+  firstEventId: string | null;
   badges?: HistoryGroupBadge[];
   resetToDecisionEventId?: string | null;
 };