fix dayjs duration and losing restore status

Author: PhilBastian

src/Frontend/src/composables/formatter.ts

@@ -76,3 +76,13 @@ function formatTimeValue(timeValue: number, displayTwoDigits = false) {
   const strValue = Math.floor(timeValue);
   return `${displayTwoDigits ? ("0" + strValue).slice(-2) : strValue.toLocaleString()}`;
 }
+
+export function timeSpanToDuration(timeSpan: string | undefined) {
+  if (!timeSpan) return dayjs.duration("PT0S");
+
+  const [days, rest] = timeSpan.split(".");
+  const [hours, minutes, seconds, milliseconds] = rest.split(/[:.]/);
+  const units = { days: parseInt(days) ?? 0, hours: parseInt(hours) ?? 0, minutes: parseInt(minutes) ?? 0, seconds: parseInt(seconds) ?? 0, milliseconds: parseInt(milliseconds) ?? 0 };
+
+  return dayjs.duration(units);
+}

src/Frontend/src/stores/MessageStore.ts

@@ -14,6 +14,7 @@ import { EditAndRetryConfig } from "@/resources/Configuration";
 import EditRetryResponse from "@/resources/EditRetryResponse";
 import { EditedMessage } from "@/resources/EditMessage";
 import useEnvironmentAndVersionsAutoRefresh from "@/composables/useEnvironmentAndVersionsAutoRefresh";
+import { timeSpanToDuration } from "@/composables/formatter";
 
 interface Model {
   id?: string;
@@ -79,7 +80,7 @@ export const useMessageStore = defineStore("MessageStore", () => {
   const areSimpleHeadersSupported = environmentStore.serviceControlIsGreaterThan("5.2.0");
 
   const { configuration } = storeToRefs(configStore);
-  const error_retention_period = computed(() => dayjs.duration(configuration.value?.data_retention?.error_retention_period ?? "PT0S").asHours());
+  const error_retention_period = computed(() => timeSpanToDuration(configuration.value?.data_retention?.error_retention_period).asHours());
 
   watch(serviceControlUrl, loadConfig, { immediate: true });
   async function loadConfig() {

src/Frontend/src/stores/MessagesStore.ts

@@ -9,6 +9,7 @@ import dayjs from "@/utils/dayjs";
 import { useConfigurationStore } from "./ConfigurationStore";
 import FailureGroup from "@/resources/FailureGroup";
 import QueueAddress from "@/resources/QueueAddress";
+import { timeSpanToDuration } from "@/composables/formatter";
 
 const deletedPeriodOptions = ["All Deleted", "Deleted in the last 2 Hours", "Deleted in the last 1 Day", "Deleted in the last 7 days"] as const;
 const retryPeriodOptions = ["All Pending Retries", "Retried in the last 2 Hours", "Retried in the last 1 Day", "Retried in the last 7 Days"] as const;
@@ -100,6 +101,7 @@ export const useMessagesStore = defineStore("MessagesStore", () => {
             if (previousMessage.last_modified === receivedMessage.last_modified) {
               receivedMessage.retryInProgress = previousMessage.retryInProgress;
               receivedMessage.deleteInProgress = previousMessage.deleteInProgress;
+              receivedMessage.restoreInProgress = previousMessage.restoreInProgress;
               receivedMessage.submittedForRetrial = previousMessage.submittedForRetrial;
               receivedMessage.resolved = previousMessage.resolved;
             }
@@ -124,7 +126,7 @@ export const useMessagesStore = defineStore("MessagesStore", () => {
       case FailedMessageStatus.Archived:
         //check deletion time
         messages.forEach((message) => {
-          message.error_retention_period = dayjs.duration(configuration.value?.data_retention.error_retention_period ?? "PT0S").asHours();
+          message.error_retention_period = timeSpanToDuration(configuration.value?.data_retention.error_retention_period).asHours();
           const countdown = dayjs(message.last_modified).add(message.error_retention_period, "hours");
           message.delete_soon = countdown < dayjs();
           message.deleted_in = countdown.format();