diff --git a/src/Frontend/src/components/messages2/SagaDiagram.spec.ts b/src/Frontend/src/components/messages2/SagaDiagram.spec.ts index b9da2c0ea..2e135af1b 100644 --- a/src/Frontend/src/components/messages2/SagaDiagram.spec.ts +++ b/src/Frontend/src/components/messages2/SagaDiagram.spec.ts @@ -77,35 +77,6 @@ describe("Feature: Detecting no Audited Saga Data Available", () => { }); describe("Feature: Navigation and Contextual Information", () => { - describe("Rule: Provide clear navigational elements to move between the message flow diagram and the saga view.", () => { - test("EXAMPLE: A message record with id '123' and with a saga Id '88878' gets selected", () => { - //A "← Back to Messages" link allows users to easily navigate back to the flow diagram. - const storedMessageRecordId = "123"; - const message_id = "456"; - - const messageStore = {} as MessageStore; - messageStore.state = {} as MessageStore["state"]; - messageStore.state.data = {} as MessageStore["state"]["data"]; - messageStore.state.data.message_id = message_id; - messageStore.state.data.id = storedMessageRecordId; - messageStore.state.data.invoked_saga = { - has_saga: true, - saga_id: "saga-id-123", - saga_type: "Shipping.ShipOrderWorkflow", - }; - - // Set initial state with sample saga history - const componentDriver = rendercomponent({ - initialState: { - MessageStore: messageStore, - SagaDiagramStore: { sagaHistory: sampleSagaHistory }, - }, - }); - - componentDriver.assert.linkIsShown({ withText: "← Back to Messages", withHref: `#/messages/${message_id}/${storedMessageRecordId}` }); - }); - }); - describe("Rule: Clearly indicate contextual information like Saga ID and Saga Type.", () => { test("EXAMPLE: A message with a Saga Id '123' and a Saga Type 'ServiceControl.SmokeTest.AuditingSaga' gets selected", () => { const messageStore = {} as MessageStore; diff --git a/src/Frontend/src/components/messages2/SagaDiagram.vue b/src/Frontend/src/components/messages2/SagaDiagram.vue index 3091a7e22..741424f6c 100644 --- a/src/Frontend/src/components/messages2/SagaDiagram.vue +++ b/src/Frontend/src/components/messages2/SagaDiagram.vue @@ -1,6 +1,5 @@ @@ -13,7 +10,6 @@ defineProps<{
- ← Back to Messages

{{ sagaTitle }}

guid {{ sagaGuid }} diff --git a/src/Frontend/src/composables/deliveryDelayParser.ts b/src/Frontend/src/composables/deliveryDelayParser.ts index c06f11fb6..843249952 100644 --- a/src/Frontend/src/composables/deliveryDelayParser.ts +++ b/src/Frontend/src/composables/deliveryDelayParser.ts @@ -1,6 +1,16 @@ -export function parseDeliveryDelay(delay: string): { hours: number; minutes: number; seconds: number } { - const [hours, minutes, seconds] = delay.split(":").map(Number); - return { hours, minutes, seconds }; +export function parseDeliveryDelay(delay: string): { days: number; hours: number; minutes: number; seconds: number } { + // Split on period first to handle multi-digit days + const parts = delay.split("."); + let days = 0; + let timeComponent = delay; + + if (parts.length > 1) { + days = parseInt(parts[0], 10); + timeComponent = parts[1]; + } + + const [hours, minutes, seconds] = timeComponent.split(":").map(Number); + return { days, hours, minutes, seconds }; } function getFriendly(time: number, text: string): string { @@ -8,7 +18,7 @@ function getFriendly(time: number, text: string): string { } export function getTimeoutFriendly(delivery_delay: string): string { - const { hours, minutes, seconds } = parseDeliveryDelay(delivery_delay); + const { days, hours, minutes, seconds } = parseDeliveryDelay(delivery_delay); - return `${getFriendly(hours, "h")}${getFriendly(minutes, "m")}${getFriendly(seconds, "s")}`; + return `${getFriendly(days, "d")}${getFriendly(hours, "h")}${getFriendly(minutes, "m")}${getFriendly(seconds, "s")}`; }