Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/lib/models/event-groups/create-event-group.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ const createGroupFor = <K extends keyof StartingEvents>(
level: undefined,
pendingActivity: undefined,
pendingNexusOperation: undefined,
cancelRequested: false,
userMetadata: event?.userMetadata,
get eventTime() {
return this.lastEvent?.eventTime;
Expand All @@ -105,7 +106,8 @@ const createGroupFor = <K extends keyof StartingEvents>(
!!this.pendingActivity ||
!!this.pendingNexusOperation ||
(isTimerStartedEvent(this.initialEvent) &&
this.eventList.length === 1) ||
this.eventList.length === 1 &&
!this.cancelRequested) ||
(isStartChildWorkflowExecutionInitiatedEvent(this.initialEvent) &&
this.eventList.length === 2)
);
Expand All @@ -114,7 +116,12 @@ const createGroupFor = <K extends keyof StartingEvents>(
return Boolean(this.eventList.find(eventIsFailureOrTimedOut));
},
get isCanceled() {
return Boolean(this.eventList.find(eventIsCanceled));
return (
Boolean(this.eventList.find(eventIsCanceled)) ||
(isTimerStartedEvent(this.initialEvent) &&
this.eventList.length === 1 &&
this.cancelRequested)
);
},
get isTerminated() {
return Boolean(this.eventList.find(eventIsTerminated));
Expand Down
1 change: 1 addition & 0 deletions src/lib/models/event-groups/event-groups.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ interface EventGroup extends Pick<
level: number | undefined;
pendingActivity: PendingActivity | undefined;
pendingNexusOperation: PendingNexusOperation | undefined;
cancelRequested: boolean;
userMetadata?: { summary?: Payload };
decodedLocalActivity?: SummaryAttribute;
links: EventLink[];
Expand Down
17 changes: 17 additions & 0 deletions src/lib/models/event-groups/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import {
isNexusOperationCanceledEvent,
isNexusOperationCompletedEvent,
isNexusOperationFailedEvent,
isTimerStartedEvent,
isWorkflowExecutionCancelRequestedEvent,
isNexusOperationTimedOutEvent,
} from '$lib/utilities/is-event-type';
import {
Expand Down Expand Up @@ -106,6 +108,21 @@ export const groupEvents = (
}
}

const cancelRequestedEvent = events.find(
isWorkflowExecutionCancelRequestedEvent,
);

if (cancelRequestedEvent) {
for (const group of Object.values(groups)) {
if (
isTimerStartedEvent(group.initialEvent) &&
group.eventList.length === 1
) {
group.cancelRequested = true;
}
}
}

return sort === 'descending'
? Object.values(groups).reverse()
: Object.values(groups);
Expand Down
Loading