Skip to content

Commit 1a6ce90

Browse files
authored
Merge pull request #2357 from Kobzol/fix-cyclic-dep
Fix cyclic dependency in frontend
2 parents 1875aeb + 46a5646 commit 1a6ce90

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

site/frontend/src/pages/compare/prefs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {createStoredValue} from "../../storage";
2-
import {DATE_FMT_24HR} from "../../utils/formatting";
2+
import {DATE_FMT_24HR} from "../../utils/date-formats";
33

44
export const PREF_FILTERS_OPENED = createStoredValue(
55
"compare.filters-opened",

site/frontend/src/pages/status/date-format-selection.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup lang="ts">
2-
import {DATE_FMT_12HR} from "../../utils/formatting";
2+
import {DATE_FMT_12HR} from "../../utils/date-formats";
33
44
const props = defineProps<{
55
dateFmt: string;

site/frontend/src/pages/status/page.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import {
99
formatISODate,
1010
formatSecondsAsDuration,
1111
parseDateIsoStringOrNull,
12-
DATE_FMT_12HR,
13-
DATE_FMT_24HR,
1412
preferredDateTimeFormat,
1513
} from "../../utils/formatting";
1614
import {useExpandedStore} from "../../utils/expansion";
@@ -24,6 +22,7 @@ import {
2422
import Collector from "./collector.vue";
2523
import CommitSha from "./commit-sha.vue";
2624
import DateFmtPicker from "./date-format-selection.vue";
25+
import {DATE_FMT_12HR, DATE_FMT_24HR} from "../../utils/date-formats";
2726
2827
const loading = ref(true);
2928
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// Date formats taken from https://date-fns.org/v4.1.0/docs/format
2+
export const DATE_FMT_24HR = "yyyy-MM-dd HH:mm:ss";
3+
export const DATE_FMT_12HR = "yyyy-MM-dd hh:mm:ss a";

site/frontend/src/utils/formatting.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ export function formatSecondsAsDuration(time: number): string {
2222
return s;
2323
}
2424

25-
// Date formats taken from https://date-fns.org/v4.1.0/docs/format
26-
export const DATE_FMT_24HR = "yyyy-MM-dd HH:mm:ss";
27-
export const DATE_FMT_12HR = "yyyy-MM-dd hh:mm:ss a";
28-
2925
export const preferredDateTimeFormat = createPersistedRef(PREF_DATETIME_FORMAT);
3026

3127
// Takes a date like `2025-09-10T08:22:47.161348Z` and formats it according to

0 commit comments

Comments
 (0)