Revert to master for specific files

Author: warwickschroeder

src/Frontend/src/composables/formatter.spec.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "vitest";
-import { useFormatTime, useGetDayDiffFromToday, useFormatLargeNumber } from "./formatter";
+import { useFormatTime, useGetDayDiffFromToday, useFormatLargeNumber, createDateWithDayOffset } from "./formatter";
 
 describe("useFormatTime", () => {
   describe("milliseconds formatting", () => {
@@ -100,47 +100,37 @@ describe("useFormatTime", () => {
 
 describe("useGetDayDiffFromToday", () => {
   test("returns 0 for today's date", () => {
-    const today = new Date();
-    today.setHours(12, 0, 0, 0);
+    const today = createDateWithDayOffset();
     const result = useGetDayDiffFromToday(today.toISOString());
     expect(result).toBe(0);
   });
 
   test("returns positive number for future dates", () => {
-    const tomorrow = new Date();
-    tomorrow.setDate(tomorrow.getDate() + 1);
-    tomorrow.setHours(12, 0, 0, 0);
+    const tomorrow = createDateWithDayOffset(1);
     const result = useGetDayDiffFromToday(tomorrow.toISOString());
     expect(result).toBe(1);
   });
 
   test("returns negative number for past dates", () => {
-    const yesterday = new Date();
-    yesterday.setDate(yesterday.getDate() - 1);
-    yesterday.setHours(12, 0, 0, 0);
+    const yesterday = createDateWithDayOffset(-1);
     const result = useGetDayDiffFromToday(yesterday.toISOString());
     expect(result).toBe(-1);
   });
 
   test("returns 7 for date 7 days in the future", () => {
-    const futureDate = new Date();
-    futureDate.setDate(futureDate.getDate() + 7);
-    futureDate.setHours(12, 0, 0, 0);
+    const futureDate = createDateWithDayOffset(7);
     const result = useGetDayDiffFromToday(futureDate.toISOString());
     expect(result).toBe(7);
   });
 
   test("returns -30 for date 30 days in the past", () => {
-    const pastDate = new Date();
-    pastDate.setDate(pastDate.getDate() - 30);
-    pastDate.setHours(12, 0, 0, 0);
+    const pastDate = createDateWithDayOffset(-30);
     const result = useGetDayDiffFromToday(pastDate.toISOString());
     expect(result).toBe(-30);
   });
 
   test("handles dates without Z suffix", () => {
-    const date = new Date();
-    date.setHours(12, 0, 0, 0);
+    const date = createDateWithDayOffset();
     const isoString = date.toISOString().replace("Z", "");
     const result = useGetDayDiffFromToday(isoString);
     expect(result).toBe(0);

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;
@@ -77,7 +78,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());
 
   async function loadEditAndRetryConfiguration() {
     try {