Skip to content

Commit 67f809d

Browse files
committed
Remove unsed variables, Add display for initiating timeout message display
1 parent 0cfc649 commit 67f809d

File tree

5 files changed

+19
-14
lines changed

5 files changed

+19
-14
lines changed

src/Frontend/src/components/messages2/SagaDiagram.spec.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,6 @@ const sampleSagaHistory: SagaHistory = {
378378
is_saga_timeout_message: true,
379379
originating_endpoint: "Endpoint1",
380380
originating_machine: "mobvm2",
381-
receiving_endpoint: "receiving endpoint",
382381
time_sent: new Date("2025-03-28T03:04:06.321561Z"),
383382
message_type: "ServiceControl.SmokeTest.MyCustomTimeout",
384383
intent: "Send",
@@ -398,7 +397,6 @@ const sampleSagaHistory: SagaHistory = {
398397
is_saga_timeout_message: true,
399398
originating_endpoint: "Endpoint1",
400399
originating_machine: "mobvm2",
401-
receiving_endpoint: "receiving endpoint",
402400
time_sent: new Date("2025-03-28T03:04:05.37723Z"),
403401
message_type: "ServiceControl.SmokeTest.MyCustomTimeout",
404402
intent: "Send",
@@ -418,7 +416,6 @@ const sampleSagaHistory: SagaHistory = {
418416
is_saga_timeout_message: false,
419417
originating_endpoint: "Sender",
420418
originating_machine: "mobvm2",
421-
receiving_endpoint: "receiving endpoint",
422419
time_sent: new Date("2025-03-28T03:04:06.293765Z"),
423420
message_type: "ServiceControl.SmokeTest.SagaMessage2",
424421
intent: "Send",
@@ -437,7 +434,6 @@ const sampleSagaHistory: SagaHistory = {
437434
is_saga_timeout_message: false,
438435
originating_endpoint: "Sender",
439436
originating_machine: "mobvm2",
440-
receiving_endpoint: "receiving endpoint",
441437
body_url: "body_url",
442438
message_status: MessageStatus.Successful,
443439
},
@@ -454,7 +450,6 @@ const sampleSagaHistory: SagaHistory = {
454450
is_saga_timeout_message: false,
455451
originating_endpoint: "Sender",
456452
originating_machine: "mobvm2",
457-
receiving_endpoint: "receiving endpoint",
458453
time_sent: new Date("2025-03-28T03:04:05.235534Z"),
459454
message_type: "ServiceControl.SmokeTest.SagaMessage1",
460455
intent: "Send",
@@ -473,7 +468,6 @@ const sampleSagaHistory: SagaHistory = {
473468
is_saga_timeout_message: false,
474469
originating_endpoint: "Sender",
475470
originating_machine: "mobvm2",
476-
receiving_endpoint: "receiving endpoint",
477471
body_url: "body_url",
478472
message_status: MessageStatus.Successful,
479473
},

src/Frontend/src/components/messages2/SagaDiagram/SagaUpdateNode.vue

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import CommandIcon from "@/assets/command.svg";
88
import EventIcon from "@/assets/event.svg";
99
import SagaInitiatedIcon from "@/assets/SagaInitiatedIcon.svg";
1010
import SagaUpdatedIcon from "@/assets/SagaUpdatedIcon.svg";
11-
11+
import TimeoutIcon from "@/assets/timeout.svg";
12+
import SagaTimeoutIcon from "@/assets/SagaTimeoutIcon.svg";
1213
defineProps<{
1314
update: SagaUpdateViewModel;
1415
showMessageData?: boolean;
@@ -21,15 +22,18 @@ defineProps<{
2122
<div class="row">
2223
<div class="cell cell--side">
2324
<div class="cell-inner cell-inner-side">
24-
<img class="saga-icon saga-icon--side-cell" :src="CommandIcon" alt="" />
25-
<h2 class="message-title" aria-label="initiating message type">
26-
{{ update.InitiatingMessageType }}
27-
</h2>
25+
<img class="saga-icon saga-icon--side-cell" :src="update.IsInitiatingMessageTimeOut ? TimeoutIcon : CommandIcon" alt="" />
26+
<h2 class="message-title" aria-label="initiating message type">{{ update.InitiatingMessageType }}</h2>
2827
<div class="timestamp" aria-label="initiating message timestamp">{{ update.FormattedInitiatingMessageTimestamp }}</div>
2928
</div>
3029
</div>
3130
<div class="cell cell--center cell-flex">
3231
<div class="cell-inner cell-inner-center cell-inner--align-bottom">
32+
<template v-if="update.IsInitiatingMessageTimeOut">
33+
<img class="saga-icon saga-icon--center-cell" :src="SagaTimeoutIcon" alt="" />
34+
<h2 class="saga-status-title saga-status-title--inline timeout-status" aria-label="timeout invoked">Timeout Invoked</h2>
35+
<br />
36+
</template>
3337
<img class="saga-icon saga-icon--center-cell" :src="update.IsFirstNode ? SagaInitiatedIcon : SagaUpdatedIcon" alt="" />
3438
<h2 class="saga-status-title saga-status-title--inline">{{ update.StatusDisplay }}</h2>
3539
<div class="timestamp timestamp--inline" aria-label="time stamp">{{ update.FormattedStartTime }}</div>
@@ -307,4 +311,10 @@ defineProps<{
307311
height: 1rem;
308312
margin-top: -0.3rem;
309313
}
314+
.timeout-status {
315+
display: inline-block;
316+
font-size: 1rem;
317+
font-weight: 900;
318+
color: #00a3c4;
319+
}
310320
</style>

src/Frontend/src/components/messages2/SagaDiagram/useSagaDiagramParser.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export interface SagaUpdateViewModel {
2121
FinishTime: Date;
2222
FormattedStartTime: string;
2323
InitiatingMessageType: string;
24+
IsInitiatingMessageTimeOut: boolean;
2425
FormattedInitiatingMessageTimestamp: string;
2526
Status: string;
2627
StatusDisplay: string;
@@ -57,6 +58,7 @@ export function parseSagaUpdates(sagaHistory: SagaHistory | null, messagesData:
5758

5859
// Find message data for initiating message
5960
const initiatingMessageData = update.initiating_message ? messagesData.find((m) => m.message_id === update.initiating_message.message_id)?.data || [] : [];
61+
const isInitiatingMessageTimeOut = update.initiating_message?.is_saga_timeout_message || false;
6062

6163
// Create common base message objects with shared properties
6264
const outgoingMessages = update.outgoing_messages.map((msg) => {
@@ -68,7 +70,6 @@ export function parseSagaUpdates(sagaHistory: SagaHistory | null, messagesData:
6870

6971
// Find corresponding message data
7072
const messageData = messagesData.find((m) => m.message_id === msg.message_id)?.data || [];
71-
7273
return {
7374
MessageType: msg.message_type || "",
7475
MessageId: msg.message_id,
@@ -106,6 +107,7 @@ export function parseSagaUpdates(sagaHistory: SagaHistory | null, messagesData:
106107
InitiatingMessageType: typeToName(update.initiating_message?.message_type || "Unknown Message") || "",
107108
FormattedInitiatingMessageTimestamp: `${initiatingMessageTimestamp.toLocaleDateString()} ${initiatingMessageTimestamp.toLocaleTimeString()}`,
108109
InitiatingMessageData: initiatingMessageData,
110+
IsInitiatingMessageTimeOut: isInitiatingMessageTimeOut,
109111
HasTimeout: hasTimeout,
110112
IsFirstNode: update.status === "new",
111113
TimeoutMessages: timeoutMessages,

src/Frontend/src/resources/SagaHistory.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ export interface SagaMessage {
2222
is_saga_timeout_message: boolean;
2323
originating_endpoint: string;
2424
originating_machine: string;
25-
receiving_endpoint: string;
2625
time_sent: Date;
2726
message_type: string;
2827
intent: string;

src/Frontend/src/stores/SagaDiagramStore.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export const useSagaDiagramStore = defineStore("sagaHistory", () => {
9696
error.value = "Failed to fetch saga history";
9797
} else {
9898
const data = await response.json();
99-
console.log("Saga history data for sis" + id, data);
99+
console.log("Saga history data for" + id, data);
100100
sagaHistory.value = data;
101101
}
102102
} catch (e) {

0 commit comments

Comments
 (0)