Skip to content

Commit 94d83c2

Browse files
committed
Remove test code, add option for cache while fetching
1 parent 54d2cd8 commit 94d83c2

File tree

4 files changed

+13
-20
lines changed

4 files changed

+13
-20
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ defineProps<{
2828
<div class="cell-inner cell-inner-right"></div>
2929
<div class="cell-inner cell-inner-side cell-inner-side--active">
3030
<img class="saga-icon saga-icon--side-cell" :src="TimeoutIcon" alt="" />
31-
<h2 class="message-title" aria-label="timeout message type">FOURTH:{{ message.MessageFriendlyTypeName }}<br />{{ message.MessageId }}</h2>
31+
<h2 class="message-title" aria-label="timeout message type">{{ message.MessageFriendlyTypeName }}</h2>
3232
<div class="timestamp" aria-label="timeout message timestamp">{{ message.FormattedTimeSent }}</div>
3333
</div>
3434
<div v-if="showMessageData" class="message-data message-data--active">

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,15 @@ const props = defineProps<{
2323
<div class="cell-inner cell-inner-side">
2424
<img class="saga-icon saga-icon--side-cell" :src="CommandIcon" alt="" />
2525
<h2 class="message-title" aria-label="initiating message type">
26-
FIRST:{{ update.InitiatingMessageType }}<br />
27-
{{ update.MessageId }}
26+
{{ update.InitiatingMessageType }}
2827
</h2>
2928
<div class="timestamp" aria-label="initiating message timestamp">{{ update.FormattedInitiatingMessageTimestamp }}</div>
3029
</div>
3130
</div>
3231
<div class="cell cell--center cell-flex">
3332
<div class="cell-inner cell-inner-center cell-inner--align-bottom">
3433
<img class="saga-icon saga-icon--center-cell" :src="update.IsFirstNode ? SagaInitiatedIcon : SagaUpdatedIcon" alt="" />
35-
<h2 class="saga-status-title saga-status-title--inline">SECOND:{{ update.StatusDisplay }}<br />{{ update.MessageId }}</h2>
34+
<h2 class="saga-status-title saga-status-title--inline">{{ update.StatusDisplay }}</h2>
3635
<div class="timestamp timestamp--inline" aria-label="time stamp">{{ update.FormattedStartTime }}</div>
3736
</div>
3837
</div>
@@ -73,7 +72,7 @@ const props = defineProps<{
7372
<template v-for="(msg, msgIndex) in update.NonTimeoutMessages" :key="msgIndex">
7473
<div class="cell-inner cell-inner-side">
7574
<img class="saga-icon saga-icon--side-cell" :src="msg.IsEventMessage ? EventIcon : CommandIcon" :alt="msg.IsEventMessage ? 'Event' : 'Command'" />
76-
<h2 class="message-title">THIRD:{{ msg.MessageFriendlyTypeName }}<br />{{ msg.MessageId }}</h2>
75+
<h2 class="message-title">{{ msg.MessageFriendlyTypeName }}</h2>
7776
<div class="timestamp">{{ msg.FormattedTimeSent }}</div>
7877
</div>
7978
<div v-if="showMessageData" class="message-data message-data--active">

src/Frontend/src/composables/serviceServiceControlUrls.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,17 @@ export function useIsMonitoringEnabled() {
4747
return !useIsMonitoringDisabled();
4848
}
4949

50-
// export function useFetchFromServiceControl(suffix: string) {
51-
// return fetch(serviceControlUrl.value + suffix);
52-
// }
53-
export function useFetchFromServiceControl(suffix: string, headers?: HeadersInit) {
50+
export function useFetchFromServiceControl(suffix: string, options?: { cache?: RequestCache }) {
5451
const requestOptions: RequestInit = {
55-
headers,
52+
method: "GET",
53+
cache: options?.cache ?? "default", // Default if not specified
54+
headers: {
55+
Accept: "application/json",
56+
},
5657
};
5758
return fetch(serviceControlUrl.value + suffix, requestOptions);
5859
}
60+
5961
export async function useTypedFetchFromServiceControl<T>(suffix: string): Promise<[Response, T]> {
6062
const response = await fetch(`${serviceControlUrl.value}${suffix}`);
6163
if (!response.ok) throw new Error(response.statusText ?? "No response");

src/Frontend/src/stores/SagaDiagramStore.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,16 +121,9 @@ export const useSagaDiagramStore = defineStore("sagaHistory", () => {
121121
const bodyUrl = (message.body_url ?? formatUrl(MessageBodyEndpoint, message.message_id)).replace(/^\//, "");
122122
loading.value = true;
123123
error.value = null;
124-
// const headers = {
125-
// //"Cache-Control": message.message_status === MessageStatus.Successful ? "no-cache" : "no-cache",
126-
// "Cache-Control": "no-cache",
127-
// };
124+
128125
try {
129-
console.log("MessageBodyEndpoint:", MessageBodyEndpoint);
130-
console.log("message.body_url:", message.body_url);
131-
console.log("message.message_id:", message.message_id);
132-
console.log("bodyUrl:", bodyUrl);
133-
const response = await useFetchFromServiceControl(bodyUrl);
126+
const response = await useFetchFromServiceControl(bodyUrl, { cache: "no-store" });
134127
if (!response.ok) {
135128
throw new Error(`HTTP error! status: ${response.status}`);
136129
}
@@ -156,7 +149,6 @@ export const useSagaDiagramStore = defineStore("sagaHistory", () => {
156149
};
157150
} catch (e) {
158151
error.value = e instanceof Error ? e.message : "Unknown error occurred";
159-
console.log("InCATCH" + error.value);
160152
return createEmptyMessageData(message.message_id);
161153
} finally {
162154
loading.value = false;

0 commit comments

Comments
 (0)