Skip to content

Modern Docker Management, Designed for Everyone

feat: localized timezone based on current locale (#3238)

Kyle Mendell06879e2f48c0
diff --git a/backend/api/handlers/auth.go b/backend/api/handlers/auth.go
index 2d34418d6..4123030cb 100644
--- a/backend/api/handlers/auth.go
+++ b/backend/api/handlers/auth.go
@@ -73,10 +73,11 @@ type LogoutAllOtherSessionsOutput struct {
type UpdateMyProfileInput struct {
Body struct {
- DisplayName *string `json:"displayName,omitempty"`
- Email *string `json:"email,omitempty"`
- Locale *string `json:"locale,omitempty"`
- FontSize *int `json:"fontSize,omitempty" minimum:"12" maximum:"20"`
+ DisplayName *string `json:"displayName,omitempty"`
+ Email *string `json:"email,omitempty"`
+ Locale *string `json:"locale,omitempty"`
+ TimeFormat *user.TimeFormat `json:"timeFormat,omitempty" enum:"auto,12h,24h"`
+ FontSize *int `json:"fontSize,omitempty" minimum:"12" maximum:"20"`
}
}
@@ -472,6 +473,9 @@ func (h *AuthHandler) UpdateMyProfile(ctx context.Context, input *UpdateMyProfil
if input.Body.Locale != nil {
userModel.Locale = input.Body.Locale
}
+ if input.Body.TimeFormat != nil {
+ userModel.TimeFormat = *input.Body.TimeFormat
+ }
if input.Body.FontSize != nil {
userModel.FontSize = input.Body.FontSize
}
diff --git a/backend/api/handlers/auth_time_format_test.go b/backend/api/handlers/auth_time_format_test.go
new file mode 100644
index 000000000..299ee1356
--- /dev/null
+++ b/backend/api/handlers/auth_time_format_test.go
@@ -0,0 +1,43 @@
+package handlers
+
+import (
+ "reflect"
+ "testing"
+
+ "github.com/danielgtaylor/huma/v2"
+ "github.com/stretchr/testify/require"
+)
+
+func TestUpdateMyProfileTimeFormatValidation(t *testing.T) {
+ registry := huma.NewMapRegistry("#/components/schemas/", huma.DefaultSchemaNamer)
+ schema := registry.Schema(reflect.TypeOf(UpdateMyProfileInput{}.Body), true, "UpdateMyProfileBody")
+
+ for _, test := range []struct {
+ name string
+ value string
+ wantError bool
+ }{
+ {name: "auto", value: "auto"},
+ {name: "12 hour", value: "12h"},
+ {name: "24 hour", value: "24h"},
+ {name: "invalid", value: "military", wantError: true},
+ } {
+ t.Run(test.name, func(t *testing.T) {
+ result := &huma.ValidateResult{}
+ huma.Validate(
+ registry,
+ schema,
+ huma.NewPathBuffer(nil, 0),
+ huma.ModeWriteToServer,
+ map[string]any{"timeFormat": test.value},
+ result,
+ )
+
+ if test.wantError {
+ require.NotEmpty(t, result.Errors)
+ return
+ }
+ require.Empty(t, result.Errors)
+ })
+ }
+}
diff --git a/backend/api/handlers/users.go b/backend/api/handlers/users.go
index 7037f051d..e6c017200 100644
--- a/backend/api/handlers/users.go
+++ b/backend/api/handlers/users.go
@@ -230,10 +230,14 @@ func (h *UserHandler) CreateUser(ctx context.Context, input *CreateUserInput) (*
DisplayName: input.Body.DisplayName,
Email: input.Body.Email,
Locale: input.Body.Locale,
+ TimeFormat: user.TimeFormatAuto,
BaseModel: models.BaseModel{
CreatedAt: time.Now(),
},
}
+ if input.Body.TimeFormat != nil {
+ userModel.TimeFormat = *input.Body.TimeFormat
+ }
createdUser, err := h.userService.CreateUser(ctx, userModel)
if err != nil {
@@ -306,6 +310,9 @@ func (h *UserHandler) UpdateUser(ctx context.Context, input *UpdateUserInput) (*
if input.Body.Locale != nil {
userModel.Locale = input.Body.Locale
}
+ if input.Body.TimeFormat != nil {
+ userModel.TimeFormat = *input.Body.TimeFormat
+ }
if input.Body.Password != nil && *input.Body.Password != "" {
hashedPassword, err := h.userService.HashPassword(*input.Body.Password)
diff --git a/backend/internal/models/user.go b/backend/internal/models/user.go
index ef377a8fc..45280b698 100644
--- a/backend/internal/models/user.go
+++ b/backend/internal/models/user.go
@@ -2,21 +2,24 @@ package models
import (
"time"
+
+ "github.com/getarcaneapp/arcane/types/v2/user"
)
type User struct {
BaseModel
- Username string `json:"username" sortable:"true"`
- PasswordHash string `json:"-" gorm:"column:password_hash"`
- DisplayName *string `json:"displayName,omitempty" gorm:"column:display_name" sortable:"true"`
- Email *string `json:"email,omitempty" sortable:"true"`
- OidcSubjectId *string `json:"oidcSubjectId,omitempty" gorm:"column:oidc_subject_id"`
- LastLogin *time.Time `json:"lastLogin,omitempty" gorm:"column:last_login" sortable:"true"`
- Locale *string `json:"locale,omitempty" gorm:"column:locale"`
- FontSize *int `json:"fontSize,omitempty" gorm:"column:font_size"`
- RequiresPasswordChange bool `json:"requiresPasswordChange" gorm:"column:requires_password_change"`
- IsServiceAccount bool `json:"isServiceAccount" gorm:"column:is_service_account;not null;default:false"`
+ Username string `json:"username" sortable:"true"`
+ PasswordHash string `json:"-" gorm:"column:password_hash"`
+ DisplayName *string `json:"displayName,omitempty" gorm:"column:display_name" sortable:"true"`
+ Email *string `json:"email,omitempty" sortable:"true"`
+ OidcSubjectId *string `json:"oidcSubjectId,omitempty" gorm:"column:oidc_subject_id"`
+ LastLogin *time.Time `json:"lastLogin,omitempty" gorm:"column:last_login" sortable:"true"`
+ Locale *string `json:"locale,omitempty" gorm:"column:locale"`
+ TimeFormat user.TimeFormat `json:"timeFormat" gorm:"column:time_format;not null;default:auto"`
+ FontSize *int `json:"fontSize,omitempty" gorm:"column:font_size"`
+ RequiresPasswordChange bool `json:"requiresPasswordChange" gorm:"column:requires_password_change"`
+ IsServiceAccount bool `json:"isServiceAccount" gorm:"column:is_service_account;not null;default:false"`
// Avatar metadata
HasAvatar bool `json:"hasAvatar" gorm:"column:has_avatar;not null;default:false"`
diff --git a/backend/internal/services/user_service.go b/backend/internal/services/user_service.go
index 16c2d4cd0..f206dd951 100644
--- a/backend/internal/services/user_service.go
+++ b/backend/internal/services/user_service.go
@@ -442,6 +442,7 @@ func (s *UserService) toUserResponseDtoInternal(ctx context.Context, u models.Us
CanDelete: true,
OidcSubjectId: u.OidcSubjectId,
Locale: u.Locale,
+ TimeFormat: u.TimeFormat,
FontSize: u.FontSize,
RequiresPasswordChange: u.RequiresPasswordChange,
CreatedAt: u.CreatedAt.Format("2006-01-02T15:04:05.999999Z"),
diff --git a/backend/internal/services/user_service_test.go b/backend/internal/services/user_service_test.go
index b49ea1d97..e5f70935d 100644
--- a/backend/internal/services/user_service_test.go
+++ b/backend/internal/services/user_service_test.go
@@ -7,6 +7,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/models"
"github.com/getarcaneapp/arcane/backend/v2/pkg/authz"
"github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"
+ "github.com/getarcaneapp/arcane/types/v2/user"
"github.com/stretchr/testify/require"
)
@@ -156,3 +157,31 @@ func TestUpdateUserPersistsFontSizeAndMapsToDto(t *testing.T) {
require.NotNil(t, dto.FontSize)
require.Equal(t, 16, *dto.FontSize)
}
+
+func TestUpdateUserPersistsTimeFormatAndMapsToDto(t *testing.T) {
+ userSvc, _ := setupUserAndRoleServices(t)
+ ctx := context.Background()
+
+ u := createTestUser(t, userSvc, "user-1", "time-format-user")
+ require.Equal(t, user.TimeFormatAuto, u.TimeFormat)
+
+ for _, timeFormat := range []user.TimeFormat{
+ user.TimeFormatAuto,
+ user.TimeFormat12Hour,
+ user.TimeFormat24Hour,
+ } {
+ t.Run(string(timeFormat), func(t *testing.T) {
+ u.TimeFormat = timeFormat
+ _, err := userSvc.UpdateUser(ctx, u)
+ require.NoError(t, err)
+
+ reloaded, err := userSvc.GetUserByID(ctx, u.ID)
+ require.NoError(t, err)
+ require.Equal(t, timeFormat, reloaded.TimeFormat)
+
+ dto, err := userSvc.ToUserResponseDto(ctx, *reloaded)
+ require.NoError(t, err)
+ require.Equal(t, timeFormat, dto.TimeFormat)
+ })
+ }
+}
diff --git a/backend/resources/migrations/postgres/064_add_user_time_format.sql b/backend/resources/migrations/postgres/064_add_user_time_format.sql
new file mode 100644
index 000000000..154d2f90e
--- /dev/null
+++ b/backend/resources/migrations/postgres/064_add_user_time_format.sql
@@ -0,0 +1,6 @@
+-- +goose Up
+ALTER TABLE users ADD COLUMN IF NOT EXISTS time_format TEXT NOT NULL DEFAULT 'auto'
+ CHECK (time_format IN ('auto', '12h', '24h'));
+
+-- +goose Down
+ALTER TABLE users DROP COLUMN IF EXISTS time_format;
diff --git a/backend/resources/migrations/sqlite/064_add_user_time_format.sql b/backend/resources/migrations/sqlite/064_add_user_time_format.sql
new file mode 100644
index 000000000..0761e471e
--- /dev/null
+++ b/backend/resources/migrations/sqlite/064_add_user_time_format.sql
@@ -0,0 +1,6 @@
+-- +goose Up
+ALTER TABLE users ADD COLUMN time_format TEXT NOT NULL DEFAULT 'auto'
+ CHECK (time_format IN ('auto', '12h', '24h'));
+
+-- +goose Down
+ALTER TABLE users DROP COLUMN time_format;
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index e92795a7f..ed840712c 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -1749,6 +1749,12 @@
"appearance_title": "Appearance",
"appearance_description": "Customize the look and feel of Arcane",
"appearance_language_current_user_description": "Language preference is saved for the current user only.",
+ "time_format": "Time Format",
+ "time_format_description": "Choose how times are displayed for this account. Auto follows the selected language.",
+ "time_format_select": "Select time format",
+ "time_format_auto": "Auto",
+ "time_format_12_hour": "12-hour",
+ "time_format_24_hour": "24-hour",
"appearance_theme_current_user_description": "Choose Light, Dark, or System. System follows your operating system's theme. This preference is saved on this device.",
"oled_mode": "OLED Mode",
"oled_mode_description": "Use true-black backgrounds for OLED displays. Only active with the Default application theme in dark mode.",
@@ -3411,6 +3417,7 @@
"account_theme": "Theme",
"account_language": "Language",
"account_language_desc": "UI language for this account",
+ "account_time_format_desc": "Time display format for this account",
"account_roles": "Your assigned roles",
"account_no_roles": "No roles assigned.",
"account_danger_zone": "Danger zone",
diff --git a/frontend/src/lib/components/activity/activity-detail-panel.svelte b/frontend/src/lib/components/activity/activity-detail-panel.svelte
index bdc283bfd..a457b6811 100644
--- a/frontend/src/lib/components/activity/activity-detail-panel.svelte
+++ b/frontend/src/lib/components/activity/activity-detail-panel.svelte
@@ -10,6 +10,7 @@
import IfPermitted from '$lib/components/if-permitted.svelte';
import { confirmCancelActivity } from './activity-cancel';
import { activityStatusLabel, activityStatusVariant, activityTypeIcon, activityTypeLabel } from './activity-labels';
+ import { formatDateTime, formatTime } from '$lib/utils/formatting';
let { activity }: { activity: Activity } = $props();
@@ -49,13 +50,10 @@
if (!value) {
return m.common_na();
}
- return new Intl.DateTimeFormat(undefined, {
- month: 'short',
- day: 'numeric',
- hour: 'numeric',
- minute: '2-digit',
- second: '2-digit'
- }).format(new Date(value));
+ return formatDateTime(value, {
+ datePattern: 'MMM d,',
+ includeSeconds: true
+ });
}
function formatDurationInternal(value: Activity | null): string {
@@ -78,11 +76,7 @@
}
function formatOutputLineInternal(message: ActivityMessage): string {
- const timestamp = new Intl.DateTimeFormat(undefined, {
- hour: 'numeric',
- minute: '2-digit',
- second: '2-digit'
- }).format(new Date(message.createdAt));
+ const timestamp = formatTime(message.createdAt) || message.createdAt;
return `[${timestamp}] ${message.level.toUpperCase()} ${message.message}`;
}
diff --git a/frontend/src/lib/components/arcane-table/cells/created-at-cell.svelte b/frontend/src/lib/components/arcane-table/cells/created-at-cell.svelte
index 63a044573..2a3d9148e 100644
--- a/frontend/src/lib/components/arcane-table/cells/created-at-cell.svelte
+++ b/frontend/src/lib/components/arcane-table/cells/created-at-cell.svelte
@@ -1,8 +1,8 @@
<script lang="ts">
- import { format } from 'date-fns';
+ import { formatDateTimeShort } from '$lib/utils/formatting';
import { m } from '$lib/paraglide/messages';
let { value }: { value: unknown } = $props();
</script>
-<span class="text-sm">{value ? format(new Date(String(value)), 'PP p') : m.common_na()}</span>
+<span class="text-sm">{value ? formatDateTimeShort(String(value)) : m.common_na()}</span>
diff --git a/frontend/src/lib/components/arcane-table/cells/unix-created-cell.svelte b/frontend/src/lib/components/arcane-table/cells/unix-created-cell.svelte
index 3513cb359..696a7f106 100644
--- a/frontend/src/lib/components/arcane-table/cells/unix-created-cell.svelte
+++ b/frontend/src/lib/components/arcane-table/cells/unix-created-cell.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
- import { format } from 'date-fns';
+ import { formatDateTimeShort } from '$lib/utils/formatting';
let { value }: { value: unknown } = $props();
</script>
-{format(new Date(Number(value || 0) * 1000), 'PP p')}
+{formatDateTimeShort(new Date(Number(value || 0) * 1000))}
diff --git a/frontend/src/lib/components/file-browser/FileList.svelte b/frontend/src/lib/components/file-browser/FileList.svelte
index 14da94ba3..80e669883 100644
--- a/frontend/src/lib/components/file-browser/FileList.svelte
+++ b/frontend/src/lib/components/file-browser/FileList.svelte
@@ -19,8 +19,7 @@
import * as Tooltip from '$lib/components/ui/tooltip';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
import RowActionsMenu from './row-actions-menu.svelte';
- import { bytes } from '$lib/utils/formatting';
- import { format } from 'date-fns';
+ import { bytes, formatDateTimeShort } from '$lib/utils/formatting';
import { activityToastOptions, extractActivityId } from '$lib/utils/activity-toast';
let {
@@ -187,7 +186,7 @@
{#snippet CreatedCell({ value }: { value: any })}
<span class="text-muted-foreground text-sm">
- {format(new Date(String(value)), 'PP p')}
+ {formatDateTimeShort(String(value))}
</span>
{/snippet}
@@ -241,7 +240,7 @@
]}
footer={{
label: m.common_created(),
- getValue: (item) => format(new Date(item.modTime), 'PP p'),
+ getValue: (item) => formatDateTimeShort(item.modTime),
icon: ClockIcon || 'div'
}}
rowActions={RowActions}
diff --git a/frontend/src/lib/components/file-browser/GenericFileBrowser.svelte b/frontend/src/lib/components/file-browser/GenericFileBrowser.svelte
index ed8e1f988..bd556ae61 100644
--- a/frontend/src/lib/components/file-browser/GenericFileBrowser.svelte
+++ b/frontend/src/lib/components/file-browser/GenericFileBrowser.svelte
@@ -39,8 +39,7 @@
import * as Alert from '$lib/components/ui/alert';
import { Label } from '$lib/components/ui/label';
import { toast } from 'svelte-sonner';
- import { bytes } from '$lib/utils/formatting';
- import { format } from 'date-fns';
+ import { bytes, formatDateTimeShort } from '$lib/utils/formatting';
import { environmentStore } from '$lib/stores/environment.store.svelte';
import { hasPermission } from '$lib/utils/auth';
import IfPermitted from '$lib/components/if-permitted.svelte';
@@ -157,7 +156,7 @@
function formatBackupLabel(backup: BackupEntry): string {
const sizeLabel = bytes.format(backup.size, { unitSeparator: ' ' }) ?? '-';
- const createdLabel = backup.createdAt ? format(new Date(backup.createdAt), 'PP p') : '-';
+ const createdLabel = backup.createdAt ? formatDateTimeShort(backup.createdAt) : '-';
return `${backup.id} • ${createdLabel} • ${sizeLabel}`;
}
diff --git a/frontend/src/lib/components/logs/log-viewer.svelte b/frontend/src/lib/components/logs/log-viewer.svelte
index 80301b4d7..8adde473f 100644
--- a/frontend/src/lib/components/logs/log-viewer.svelte
+++ b/frontend/src/lib/components/logs/log-viewer.svelte
@@ -8,7 +8,7 @@
import { m } from '$lib/paraglide/messages';
import { ReconnectingWebSocket } from '$lib/utils/ws';
import { cn } from '$lib/utils';
- import { ansiToHtml } from '$lib/utils/formatting';
+ import { ansiToHtml, formatDateTime } from '$lib/utils/formatting';
import { onDestroy } from 'svelte';
import {
buildLogDisplayEntries,
@@ -444,23 +444,14 @@
return displayEntry.entries[0]?.timestamp;
}
- const logTimestampFormatter = new Intl.DateTimeFormat('en-US', {
- month: '2-digit',
- day: '2-digit',
- year: 'numeric',
- hour: '2-digit',
- minute: '2-digit',
- second: '2-digit',
- hour12: true
- });
-
function formatLogTimestamp(timestamp: string | undefined): string {
if (!timestamp) return '';
- const parsedTimestamp = new Date(timestamp);
- if (Number.isNaN(parsedTimestamp.getTime())) {
- return timestamp;
- }
- return logTimestampFormatter.format(parsedTimestamp);
+ return (
+ formatDateTime(timestamp, {
+ datePattern: 'P',
+ includeSeconds: true
+ }) || timestamp
+ );
}
function isGroupExpanded(displayEntry: LogViewerDisplayEntry): boolean {
diff --git a/frontend/src/lib/components/project-update-item.svelte b/frontend/src/lib/components/project-update-item.svelte
index 824285beb..607ff860d 100644
--- a/frontend/src/lib/components/project-update-item.svelte
+++ b/frontend/src/lib/components/project-update-item.svelte
@@ -7,7 +7,7 @@
import { Spinner } from '$lib/components/ui/spinner/index.js';
import { AlertIcon, CircleArrowUpIcon, ClockIcon, ImagesIcon, RefreshIcon, VerifiedCheckIcon } from '$lib/icons';
import type { Component } from 'svelte';
- import { format } from 'date-fns';
+ import { formatDateTimeShort } from '$lib/utils/formatting';
import UncheckedRingIcon from '$lib/components/unchecked-ring-icon.svelte';
import { mergeProps } from 'bits-ui';
@@ -42,7 +42,7 @@
if (!updateInfo?.lastCheckedAt) return null;
const parsed = new Date(updateInfo.lastCheckedAt);
if (Number.isNaN(parsed.getTime())) return null;
- return format(parsed, 'PP p');
+ return formatDateTimeShort(parsed);
});
const stateMeta = $derived.by(
diff --git a/frontend/src/lib/components/time-format-picker.svelte b/frontend/src/lib/components/time-format-picker.svelte
new file mode 100644
index 000000000..8a7dbbb32
--- /dev/null
+++ b/frontend/src/lib/components/time-format-picker.svelte
@@ -0,0 +1,62 @@
+<script lang="ts">
+ import { createMutation, useQueryClient } from '@tanstack/svelte-query';
+ import * as Select from '$lib/components/ui/select/index.js';
+ import { m } from '$lib/paraglide/messages';
+ import { queryKeys } from '$lib/query/query-keys';
+ import { userService } from '$lib/services/user-service';
+ import { timeFormatStore } from '$lib/stores/time-format.store.svelte';
+ import userStore from '$lib/stores/user-store';
+ import type { TimeFormat } from '$lib/types/auth';
+
+ let {
+ id = 'timeFormatPicker',
+ class: className = ''
+ }: {
+ id?: string;
+ class?: string;
+ } = $props();
+
+ const queryClient = useQueryClient();
+ const options = $derived([
+ { value: 'auto' as const, label: m.time_format_auto() },
+ { value: '12h' as const, label: m.time_format_12_hour() },
+ { value: '24h' as const, label: m.time_format_24_hour() }
+ ]);
+ const currentLabel = $derived(
+ options.find((option) => option.value === timeFormatStore.current)?.label ?? m.time_format_auto()
+ );
+
+ const updateTimeFormatMutation = createMutation(() => ({
+ mutationFn: (timeFormat: TimeFormat) => userService.updateMyProfile({ timeFormat }),
+ onMutate: (timeFormat) => {
+ const previousTimeFormat = timeFormatStore.current;
+ timeFormatStore.set(timeFormat);
+ return { previousTimeFormat };
+ },
+ onSuccess: async (updatedUser) => {
+ await userStore.setUser(updatedUser);
+ await queryClient.invalidateQueries({ queryKey: queryKeys.users.all });
+ },
+ onError: (error, _timeFormat, context) => {
+ timeFormatStore.set(context?.previousTimeFormat ?? 'auto');
+ console.error('Failed to update time format', error);
+ }
+ }));
+</script>
+
+<div class={`time-format-picker ${className}`}>
+ <Select.Root
+ type="single"
+ value={timeFormatStore.current}
+ onValueChange={(value) => updateTimeFormatMutation.mutate(value as TimeFormat)}
+ >
+ <Select.Trigger {id} class="h-9 w-32 text-sm font-medium" aria-label={m.time_format_select()}>
+ <span class="truncate">{currentLabel}</span>
+ </Select.Trigger>
+ <Select.Content class="max-w-70 min-w-40">
+ {#each options as option (option.value)}
+ <Select.Item class="text-sm" value={option.value}>{option.label}</Select.Item>
+ {/each}
+ </Select.Content>
+ </Select.Root>
+</div>
diff --git a/frontend/src/lib/services/user-service.ts b/frontend/src/lib/services/user-service.ts
index efcde14b1..21d663a7b 100644
--- a/frontend/src/lib/services/user-service.ts
+++ b/frontend/src/lib/services/user-service.ts
@@ -1,5 +1,5 @@
import BaseAPIService from './api-service';
-import type { User, CreateUser } from '$lib/types/auth';
+import type { User, CreateUser, TimeFormat } from '$lib/types/auth';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/shared';
import { transformPaginationParams } from '$lib/utils/tables';
@@ -38,7 +38,13 @@ class UserAPIService extends BaseAPIService {
return this.handleResponse(this.api.post('/auth/sessions/logout-all')) as Promise<void>;
}
- async updateMyProfile(data: { displayName?: string; email?: string; locale?: string; fontSize?: number }): Promise<User> {
+ async updateMyProfile(data: {
+ displayName?: string;
+ email?: string;
+ locale?: string;
+ timeFormat?: TimeFormat;
+ fontSize?: number;
+ }): Promise<User> {
return this.handleResponse(this.api.put('/auth/me/profile', data)) as Promise<User>;
}
diff --git a/frontend/src/lib/stores/time-format.store.svelte.ts b/frontend/src/lib/stores/time-format.store.svelte.ts
new file mode 100644
index 000000000..2e73c3dd7
--- /dev/null
+++ b/frontend/src/lib/stores/time-format.store.svelte.ts
@@ -0,0 +1,15 @@
+import type { TimeFormat } from '$lib/types/auth';
+
+let currentTimeFormat = $state<TimeFormat>('auto');
+
+export const timeFormatStore = {
+ get current(): TimeFormat {
+ return currentTimeFormat;
+ },
+ set(value: TimeFormat) {
+ currentTimeFormat = value;
+ },
+ reset() {
+ currentTimeFormat = 'auto';
+ }
+};
diff --git a/frontend/src/lib/stores/user-store.ts b/frontend/src/lib/stores/user-store.ts
index 6505e8c45..bece1b56e 100644
--- a/frontend/src/lib/stores/user-store.ts
+++ b/frontend/src/lib/stores/user-store.ts
@@ -3,6 +3,7 @@ import { GLOBAL_SCOPE, SUDO_PERMISSION } from '$lib/types/auth';
import { writable, get } from 'svelte/store';
import { setLocale } from '$lib/utils/formatting';
import { applyFontSize, FONT_SIZE_DEFAULT } from '$lib/utils/theme';
+import { timeFormatStore } from '$lib/stores/time-format.store.svelte';
const userStore = writable<User | null>(null);
@@ -18,11 +19,13 @@ const setUser = async (user: User) => {
await setLocale(user.locale, false);
}
applyFontSize(user.fontSize ?? FONT_SIZE_DEFAULT);
+ timeFormatStore.set(user.timeFormat ?? 'auto');
userStore.set(user);
};
const clearUser = () => {
applyFontSize(FONT_SIZE_DEFAULT);
+ timeFormatStore.reset();
userStore.set(null);
};
diff --git a/frontend/src/lib/types/auth.ts b/frontend/src/lib/types/auth.ts
index e0390efed..636132e75 100644
--- a/frontend/src/lib/types/auth.ts
+++ b/frontend/src/lib/types/auth.ts
@@ -128,6 +128,8 @@ export const GLOBAL_SCOPE = 'global';
// --- User ---
+export type TimeFormat = 'auto' | '12h' | '24h';
+
export type User = {
id: string;
username: string;
@@ -144,6 +146,7 @@ export type User = {
updatedAt?: string;
oidcSubjectId?: string;
locale?: Locale;
+ timeFormat: TimeFormat;
fontSize?: number;
requiresPasswordChange?: boolean;
};
@@ -160,8 +163,10 @@ export type CreateUser = Omit<
| 'requiresPasswordChange'
| 'roleAssignments'
| 'permissionsByEnv'
+ | 'timeFormat'
> & {
password: string;
+ timeFormat?: TimeFormat;
};
// --- Auth: login, OIDC ---
diff --git a/frontend/src/lib/utils/formatting.ts b/frontend/src/lib/utils/formatting.ts
index a73c237b2..aa873e492 100644
--- a/frontend/src/lib/utils/formatting.ts
+++ b/frontend/src/lib/utils/formatting.ts
@@ -2,6 +2,7 @@ import Convert from 'ansi-to-html';
import { format as formatDate, setDefaultOptions, type Locale as DateFnsLocale } from 'date-fns';
import { z } from 'zod/v4';
import { setLocale as setParaglideLocale, type Locale } from '$lib/paraglide/runtime';
+import { timeFormatStore } from '$lib/stores/time-format.store.svelte';
// --- String helpers ---
@@ -159,26 +160,53 @@ export const bytes = bytesWithHelpers;
// --- Locale-aware date/time formatting ---
-function formatWithPattern(date: Date | string | null | undefined, pattern: string): string {
+type AbsoluteDateTimeFormatOptions = {
+ datePattern?: string;
+ includeSeconds?: boolean;
+};
+
+function getTimePattern(includeSeconds: boolean): string {
+ const timeFormat = timeFormatStore.current;
+ if (timeFormat === '12h') {
+ return includeSeconds ? 'h:mm:ss a' : 'h:mm a';
+ }
+ if (timeFormat === '24h') {
+ return includeSeconds ? 'HH:mm:ss' : 'HH:mm';
+ }
+ return includeSeconds ? 'pp' : 'p';
+}
+
+function formatAbsoluteDateTime(date: Date | string | null | undefined, options: AbsoluteDateTimeFormatOptions): string {
if (!date) return '';
const d = typeof date === 'string' ? new Date(date) : date;
if (isNaN(d.getTime())) return '';
+
+ const includeSeconds = options.includeSeconds ?? true;
+ const timePattern = getTimePattern(includeSeconds);
+ const useLocaleLongFormat = timeFormatStore.current === 'auto' && ['P', 'PP'].includes(options.datePattern ?? '');
+ const pattern = options.datePattern
+ ? useLocaleLongFormat
+ ? `${options.datePattern}${timePattern}`
+ : `${options.datePattern} ${timePattern}`
+ : timePattern;
+
return formatDate(d, pattern);
}
-export function formatDateTime(date: Date | string | null | undefined): string {
- return formatWithPattern(date, 'PPpp');
+export function formatDateTime(
+ date: Date | string | null | undefined,
+ options: AbsoluteDateTimeFormatOptions = { datePattern: 'PP', includeSeconds: true }
+): string {
+ return formatAbsoluteDateTime(date, options);
}
export function formatDateTimeShort(date: Date | string | null | undefined): string {
- return formatWithPattern(date, 'PPp');
+ return formatAbsoluteDateTime(date, { datePattern: 'PP', includeSeconds: false });
}
export function formatOptionalDateTime(date: Date | string | null | undefined, fallback = '-'): string {
if (!date) return fallback;
- const d = typeof date === 'string' ? new Date(date) : date;
- if (isNaN(d.getTime())) return fallback;
- return d.toLocaleString();
+ return formatDateTime(date) || fallback;
}
export function isPastDate(date: Date | string | null | undefined): boolean {
@@ -188,7 +216,7 @@ export function isPastDate(date: Date | string | null | undefined): boolean {
}
export function formatTime(date: Date | string | null | undefined): string {
- return formatWithPattern(date, 'pp');
+ return formatAbsoluteDateTime(date, { includeSeconds: true });
}
type DateFnsLocaleModule = {
diff --git a/frontend/src/lib/utils/image-updates.ts b/frontend/src/lib/utils/image-updates.ts
index 4fbc516e6..584d8ac3d 100644
--- a/frontend/src/lib/utils/image-updates.ts
+++ b/frontend/src/lib/utils/image-updates.ts
@@ -1,5 +1,5 @@
import type { ImageUpdateInfoDto } from '$lib/types/docker';
-import { format } from 'date-fns';
+import { formatDateTimeShort } from '$lib/utils/formatting';
export function formatImageUpdateValue(updateInfo: ImageUpdateInfoDto | undefined, mode: 'current' | 'latest') {
if (!updateInfo) return '-';
@@ -17,5 +17,5 @@ export function formatImageUpdateCheckedAt(value: string) {
if (!value) return '-';
const parsed = new Date(value);
if (Number.isNaN(parsed.getTime())) return '-';
- return format(parsed, 'PP p');
+ return formatDateTimeShort(parsed);
}
diff --git a/frontend/src/routes/(app)/account/+page.svelte b/frontend/src/routes/(app)/account/+page.svelte
index fdf63de4a..2f88b97bd 100644
--- a/frontend/src/routes/(app)/account/+page.svelte
+++ b/frontend/src/routes/(app)/account/+page.svelte
@@ -13,6 +13,7 @@
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';
import LocalePicker from '$lib/components/locale-picker.svelte';
+ import TimeFormatPicker from '$lib/components/time-format-picker.svelte';
import FontSizePicker from '$lib/components/font-size-picker.svelte';
import { m } from '$lib/paraglide/messages';
import { userService } from '$lib/services/user-service';
@@ -610,6 +611,13 @@
</div>
<LocalePicker inline />
</div>
+ <div class="flex items-center justify-between gap-4 p-3">
+ <div class="min-w-0">
+ <div class="text-sm font-medium">{m.time_format()}</div>
+ <div class="text-muted-foreground text-xs">{m.account_time_format_desc()}</div>
+ </div>
+ <TimeFormatPicker id="accountTimeFormatPicker" />
+ </div>
<div class="flex items-center justify-between gap-4 p-3">
<div class="min-w-0">
<div class="text-sm font-medium">{m.font_size()}</div>
diff --git a/frontend/src/routes/(app)/containers/components/ContainerHealthcheck.svelte b/frontend/src/routes/(app)/containers/components/ContainerHealthcheck.svelte
index 31d7c0722..d43d65914 100644
--- a/frontend/src/routes/(app)/containers/components/ContainerHealthcheck.svelte
+++ b/frontend/src/routes/(app)/containers/components/ContainerHealthcheck.svelte
@@ -4,7 +4,8 @@
import { m } from '$lib/paraglide/messages';
import type { ContainerDetailsDto, ContainerHealthLogEntry, ContainerHealthcheckDto } from '$lib/types/docker';
import { HealthIcon, SettingsIcon, FileTextIcon } from '$lib/icons';
- import { format, formatDistanceToNow } from 'date-fns';
+ import { formatDistanceToNow } from 'date-fns';
+ import { formatDateTime } from '$lib/utils/formatting';
interface Props {
container: ContainerDetailsDto;
@@ -96,11 +97,7 @@
function formatProbeDate(d: Date | null): string {
if (!d) return '—';
- try {
- return format(d, 'PPpp');
- } catch {
- return d.toISOString();
- }
+ return formatDateTime(d) || d.toISOString();
}
const retriesBudget = $derived.by(() => {
diff --git a/frontend/src/routes/(app)/containers/components/ContainerOverview.svelte b/frontend/src/routes/(app)/containers/components/ContainerOverview.svelte
index bbb989ff0..122de42e9 100644
--- a/frontend/src/routes/(app)/containers/components/ContainerOverview.svelte
+++ b/frontend/src/routes/(app)/containers/components/ContainerOverview.svelte
@@ -4,7 +4,8 @@
import { Switch } from '$lib/components/ui/switch';
import { m } from '$lib/paraglide/messages';
import type { ContainerDetailsDto } from '$lib/types/docker';
- import { format, formatDistanceToNow } from 'date-fns';
+ import { formatDistanceToNow } from 'date-fns';
+ import { formatDateTimeShort } from '$lib/utils/formatting';
import { InfoIcon, StartIcon, StopIcon, NetworksIcon, VolumesIcon, HealthIcon } from '$lib/icons';
import { containerService } from '$lib/services/container-service';
import { KeyValueCard } from '$lib/components/resource-detail';
@@ -63,9 +64,9 @@
return isNaN(d.getTime()) ? null : d;
}
- function formatDockerDate(input: string | Date | undefined | null, fmt = 'PP p'): string {
+ function formatDockerDate(input: string | Date | undefined | null): string {
const d = parseDockerDate(input);
- return d ? format(d, fmt) : 'N/A';
+ return d ? formatDateTimeShort(d) : 'N/A';
}
function formatRelativeDate(input: string | Date | undefined | null): string {
diff --git a/frontend/src/routes/(app)/containers/container-table.svelte b/frontend/src/routes/(app)/containers/container-table.svelte
index e104ca724..3199cad0f 100644
--- a/frontend/src/routes/(app)/containers/container-table.svelte
+++ b/frontend/src/routes/(app)/containers/container-table.svelte
@@ -8,8 +8,7 @@
import ContainerActionMenuItem from '$lib/components/arcane-table/cells/container-action-menu-item.svelte';
import type { SearchPaginationSortRequest } from '$lib/types/shared';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
- import { format } from 'date-fns';
- import { truncateImageDigest } from '$lib/utils/formatting';
+ import { formatDateTimeShort, truncateImageDigest } from '$lib/utils/formatting';
import type { ContainerSummaryDto } from '$lib/types/docker';
import type { ColumnSpec, BulkAction } from '$lib/components/arcane-table';
import { m } from '$lib/paraglide/messages';
@@ -494,7 +493,7 @@
{#snippet CreatedCell({ item }: { item: ContainerSummaryDto })}
<span class="text-sm">
- {item.created ? format(new Date(item.created * 1000), 'PP p') : m.common_na()}
+ {item.created ? formatDateTimeShort(new Date(item.created * 1000)) : m.common_na()}
</span>
{/snippet}
@@ -580,7 +579,7 @@
footer={(mobileFieldVisibility['created'] ?? true)
? {
label: m.common_created(),
- getValue: (item) => format(new Date(item.created * 1000), 'PP p'),
+ getValue: (item) => formatDateTimeShort(new Date(item.created * 1000)),
icon: ClockIcon
}
: undefined}
diff --git a/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte b/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte
index ffdc9dad8..77a567331 100644
--- a/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte
+++ b/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte
@@ -20,6 +20,7 @@
import { environmentStore } from '$lib/stores/environment.store.svelte';
import userStore from '$lib/stores/user-store';
import { hasAnyPermission, hasPermission } from '$lib/utils/auth';
+ import { formatDateTime } from '$lib/utils/formatting';
import type {
DashboardActionItem,
DashboardEnvironmentCardState,
@@ -516,7 +517,7 @@
return {
label: labelAndValue.label,
value: formatDistanceToNow(parsed, { addSuffix: true }),
- title: parsed.toLocaleString()
+ title: formatDateTime(parsed)
};
}
diff --git a/frontend/src/routes/(app)/environments/[id]/components/EnvironmentConnectionDetails.svelte b/frontend/src/routes/(app)/environments/[id]/components/EnvironmentConnectionDetails.svelte
index 0aca53923..477396957 100644
--- a/frontend/src/routes/(app)/environments/[id]/components/EnvironmentConnectionDetails.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/components/EnvironmentConnectionDetails.svelte
@@ -1,11 +1,11 @@
<script lang="ts">
import type { ComponentProps } from 'svelte';
- import { format } from 'date-fns';
import * as Card from '$lib/components/ui/card/index.js';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
import { cn } from '$lib/utils';
import { m } from '$lib/paraglide/messages';
import type { Environment, EnvironmentStatus } from '$lib/types/environment';
+ import { formatDateTimeShort } from '$lib/utils/formatting';
type BadgeVariant = ComponentProps<typeof StatusBadge>['variant'];
@@ -82,7 +82,7 @@
return m.common_unknown();
}
- return format(date, 'PP p');
+ return formatDateTimeShort(date);
}
</script>
diff --git a/frontend/src/routes/(app)/environments/[id]/gitops/sync-table.svelte b/frontend/src/routes/(app)/environments/[id]/gitops/sync-table.svelte
index eb3f0574f..1869d8029 100644
--- a/frontend/src/routes/(app)/environments/[id]/gitops/sync-table.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/gitops/sync-table.svelte
@@ -12,7 +12,7 @@
import type { GitOpsSync } from '$lib/types/automation';
import type { ColumnSpec, BulkAction, ArcaneRow } from '$lib/components/arcane-table';
import { UniversalMobileCard } from '$lib/components/arcane-table/index.js';
- import { format } from 'date-fns';
+ import { formatDateTimeShort } from '$lib/utils/formatting';
import { m } from '$lib/paraglide/messages';
import { gitOpsSyncService } from '$lib/services/gitops-sync-service';
import { toGitCommitUrl } from '$lib/utils/navigation';
@@ -258,7 +258,7 @@
{/snippet}
{#snippet LastSyncCell({ value }: { value: any; item: GitOpsSync; row: ArcaneRow<GitOpsSync> })}
- <span class="text-sm">{value ? format(new Date(value), 'PP p') : m.common_never()}</span>
+ <span class="text-sm">{value ? formatDateTimeShort(value) : m.common_never()}</span>
{/snippet}
{#snippet SyncMobileCardSnippet({ item, mobileFieldVisibility }: { item: GitOpsSync; mobileFieldVisibility: FieldVisibility })}
diff --git a/frontend/src/routes/(app)/images/[imageId]/+page.svelte b/frontend/src/routes/(app)/images/[imageId]/+page.svelte
index 6d24ee5e8..8a5a7930c 100644
--- a/frontend/src/routes/(app)/images/[imageId]/+page.svelte
+++ b/frontend/src/routes/(app)/images/[imageId]/+page.svelte
@@ -3,8 +3,7 @@
import * as Tabs from '$lib/components/ui/tabs/index.js';
import { goto } from '$app/navigation';
import { Badge } from '$lib/components/ui/badge';
- import { format } from 'date-fns';
- import { bytes } from '$lib/utils/formatting';
+ import { bytes, formatDateTimeShort } from '$lib/utils/formatting';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
import { handleApiResultWithCallbacks } from '$lib/utils/api';
import { tryCatch } from '$lib/utils/api';
@@ -192,13 +191,7 @@
const createdDate = $derived.by(() => {
if (!image?.created) return m.common_na();
- try {
- const date = new Date(image.created);
- if (isNaN(date.getTime())) return m.common_na();
- return format(date, 'PP p');
- } catch {
- return m.common_na();
- }
+ return formatDateTimeShort(image.created) || m.common_na();
});
const imageSize = $derived.by(() => bytes.format(Number(image?.size ?? 0)) || '0 B');
diff --git a/frontend/src/routes/(app)/images/[imageId]/image-history-panel.svelte b/frontend/src/routes/(app)/images/[imageId]/image-history-panel.svelte
index 9e5e7ff04..3799cdfc2 100644
--- a/frontend/src/routes/(app)/images/[imageId]/image-history-panel.svelte
+++ b/frontend/src/routes/(app)/images/[imageId]/image-history-panel.svelte
@@ -2,11 +2,10 @@
import * as Card from '$lib/components/ui/card';
import { Badge } from '$lib/components/ui/badge';
import { Spinner } from '$lib/components/ui/spinner';
- import { bytes } from '$lib/utils/formatting';
+ import { bytes, formatDateTimeShort } from '$lib/utils/formatting';
import { imageService } from '$lib/services/image-service';
import type { ImageHistoryItemDto } from '$lib/types/docker';
import { m } from '$lib/paraglide/messages';
- import { format } from 'date-fns';
let { imageId }: { imageId: string } = $props();
@@ -34,7 +33,7 @@
function formatCreated(created: number) {
if (!created) return m.common_na();
- return format(new Date(created * 1000), 'PP p');
+ return formatDateTimeShort(new Date(created * 1000));
}
</script>
diff --git a/frontend/src/routes/(app)/images/builds/+page.svelte b/frontend/src/routes/(app)/images/builds/+page.svelte
index 121bea3c4..7cf4fbbda 100644
--- a/frontend/src/routes/(app)/images/builds/+page.svelte
+++ b/frontend/src/routes/(app)/images/builds/+page.svelte
@@ -53,7 +53,7 @@
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/shared';
import { queryKeys } from '$lib/query/query-keys';
import { createMutation, createQuery, useQueryClient } from '@tanstack/svelte-query';
- import { format } from 'date-fns';
+ import { formatDateTimeShort } from '$lib/utils/formatting';
let {}: PageProps = $props();
@@ -552,11 +552,7 @@
function formatTimestamp(value?: string) {
if (!value) return '-';
- try {
- return format(new Date(value), 'PP p');
- } catch {
- return value;
- }
+ return formatDateTimeShort(value) || value;
}
function formatDuration(ms?: number) {
diff --git a/frontend/src/routes/(app)/images/image-table.svelte b/frontend/src/routes/(app)/images/image-table.svelte
index 3bc634cf7..67fef8424 100644
--- a/frontend/src/routes/(app)/images/image-table.svelte
+++ b/frontend/src/routes/(app)/images/image-table.svelte
@@ -6,7 +6,7 @@
import { goto } from '$app/navigation';
import { onDestroy } from 'svelte';
import { toast } from 'svelte-sonner';
- import { bytes } from '$lib/utils/formatting';
+ import { bytes, formatDateTimeShort } from '$lib/utils/formatting';
import { inUseBadge } from '$lib/utils/mobile-card-badges';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
import { Badge } from '$lib/components/ui/badge/index.js';
@@ -20,7 +20,6 @@
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/shared';
import type { ImageSummaryDto, ImageUpdateInfoDto } from '$lib/types/docker';
import type { VulnerabilityScanSummary } from '$lib/types/environment';
- import { format } from 'date-fns';
import type { ColumnSpec, MobileFieldVisibility, BulkAction } from '$lib/components/arcane-table';
import { m } from '$lib/paraglide/messages';
import { imageService } from '$lib/services/image-service';
@@ -621,7 +620,7 @@
footer={(mobileFieldVisibility['created'] ?? true)
? {
label: m.common_created(),
- getValue: (item) => format(new Date(Number(item.created || 0) * 1000), 'PP p'),
+ getValue: (item) => formatDateTimeShort(new Date(Number(item.created || 0) * 1000)),
icon: ClockIcon
}
: undefined}
diff --git a/frontend/src/routes/(app)/networks/[networkId]/+page.svelte b/frontend/src/routes/(app)/networks/[networkId]/+page.svelte
index bb61d4798..a64ee4ebe 100644
--- a/frontend/src/routes/(app)/networks/[networkId]/+page.svelte
+++ b/frontend/src/routes/(app)/networks/[networkId]/+page.svelte
@@ -17,7 +17,7 @@
} from '$lib/icons';
import * as Alert from '$lib/components/ui/alert';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
- import { format } from 'date-fns';
+ import { formatDateTimeShort } from '$lib/utils/formatting';
import { toast } from 'svelte-sonner';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
import { ArcaneButton } from '$lib/components/arcane-button';
@@ -40,7 +40,7 @@
let network = $derived(data.network);
const shortId = $derived(network?.id?.substring(0, 12) ?? m.common_unknown());
- const createdDate = $derived(network?.created ? format(new Date(network.created), 'PP p') : m.common_unknown());
+ const createdDate = $derived(network?.created ? formatDateTimeShort(network.created) : m.common_unknown());
const connectedContainers = $derived(
network?.containersList ??
diff --git a/frontend/src/routes/(app)/projects/projects-table.svelte b/frontend/src/routes/(app)/projects/projects-table.svelte
index d7bba3509..c46f50259 100644
--- a/frontend/src/routes/(app)/projects/projects-table.svelte
+++ b/frontend/src/routes/(app)/projects/projects-table.svelte
@@ -11,8 +11,7 @@
import StatusBadge from '$lib/components/badges/status-badge.svelte';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/shared';
import { getStatusVariant, getThemedIconUrl } from '$lib/utils/docker';
- import { capitalizeFirstLetter } from '$lib/utils/formatting';
- import { format } from 'date-fns';
+ import { capitalizeFirstLetter, formatDateTimeShort } from '$lib/utils/formatting';
import type { ColumnSpec, MobileFieldVisibility, BulkAction } from '$lib/components/arcane-table';
import { UniversalMobileCard } from '$lib/components/arcane-table';
import { m } from '$lib/paraglide/messages';
@@ -288,7 +287,7 @@
{/snippet}
{#snippet CreatedCell({ value }: { value: unknown })}
- {#if value}{format(new Date(String(value)), 'PP p')}{/if}
+ {#if value}{formatDateTimeShort(String(value))}{/if}
{/snippet}
{#snippet ProjectMobileCardSnippet({
@@ -365,7 +364,7 @@
footer={(mobileFieldVisibility['createdAt'] ?? true) && item.createdAt
? {
label: m.common_created(),
- getValue: (item: Project) => format(new Date(item.createdAt), 'PP p'),
+ getValue: (item: Project) => formatDateTimeShort(item.createdAt),
icon: CalendarIcon
}
: undefined}
diff --git a/frontend/src/routes/(app)/settings/appearance/+page.svelte b/frontend/src/routes/(app)/settings/appearance/+page.svelte
index f377855c4..5a0bf1e1c 100644
--- a/frontend/src/routes/(app)/settings/appearance/+page.svelte
+++ b/frontend/src/routes/(app)/settings/appearance/+page.svelte
@@ -12,6 +12,7 @@
import { createSettingsForm } from '$lib/utils/settings-form';
import SettingsRow from '$lib/components/settings/settings-row.svelte';
import LocalePicker from '$lib/components/locale-picker.svelte';
+ import TimeFormatPicker from '$lib/components/time-format-picker.svelte';
import SelectWithLabel from '$lib/components/form/select-with-label.svelte';
import AccentColorPicker from '$lib/components/accent-color/accent-color-picker.svelte';
import ApplicationThemePicker from '$lib/components/application-theme/application-theme-picker.svelte';
@@ -239,6 +240,11 @@
/>
</SettingsRow>
+ <!-- Time Format -->
+ <SettingsRow label={m.time_format()} description={m.time_format_description()} layout="inline">
+ <TimeFormatPicker id="appearanceTimeFormatPicker" />
+ </SettingsRow>
+
<!-- Theme -->
<SettingsRow
label={m.common_toggle_theme()}
diff --git a/frontend/src/routes/(app)/settings/diagnostics/+page.svelte b/frontend/src/routes/(app)/settings/diagnostics/+page.svelte
index 4af8e0ab5..9775daebc 100644
--- a/frontend/src/routes/(app)/settings/diagnostics/+page.svelte
+++ b/frontend/src/routes/(app)/settings/diagnostics/+page.svelte
@@ -19,6 +19,7 @@
} from '$lib/icons';
import DiagnosticStat from './diagnostic-stat.svelte';
import DiagnosticLogPanel from './diagnostic-log-panel.svelte';
+ import { formatTime } from '$lib/utils/formatting';
let {}: PageProps = $props();
@@ -358,7 +359,7 @@
{@render row(m.diagnostics_gc_total_cycles(), fmtNum(diag.gc.numGc))}
{@render row(m.diagnostics_gc_forced_cycles(), fmtNum(diag.memory.numForcedGc))}
{@render row(m.diagnostics_gc_total_pause(), fmtMs(diag.gc.pauseTotalNs))}
- {@render row(m.diagnostics_gc_last(), diag.gc.lastGc ? new Date(diag.gc.lastGc).toLocaleTimeString() : '—')}
+ {@render row(m.diagnostics_gc_last(), diag.gc.lastGc ? formatTime(diag.gc.lastGc) : '—')}
</div>
{#if diag.gc.recentPausesNs?.length}
<div class="mt-3">
@@ -413,7 +414,7 @@
<td class="text-muted-foreground px-3 py-2 font-mono text-xs">{c.clientIp || '—'}</td>
<td class="text-muted-foreground px-3 py-2 text-xs">{c.userId || '—'}</td>
<td class="text-muted-foreground px-3 py-2 text-xs tabular-nums">
- {c.startedAt ? new Date(c.startedAt).toLocaleTimeString() : '—'}
+ {c.startedAt ? formatTime(c.startedAt) : '—'}
</td>
</tr>
{/each}
diff --git a/frontend/src/routes/(app)/settings/diagnostics/diagnostic-log-panel.svelte b/frontend/src/routes/(app)/settings/diagnostics/diagnostic-log-panel.svelte
index 19df7943b..5aa72342e 100644
--- a/frontend/src/routes/(app)/settings/diagnostics/diagnostic-log-panel.svelte
+++ b/frontend/src/routes/(app)/settings/diagnostics/diagnostic-log-panel.svelte
@@ -8,6 +8,7 @@
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { TrashIcon } from '$lib/icons';
import { attrsText } from './diagnostic-log-formatting';
+ import { formatTime } from '$lib/utils/formatting';
interface Props {
height?: string;
@@ -55,15 +56,8 @@
return 'text-emerald-400';
}
- const timeFmt = new Intl.DateTimeFormat('en-US', {
- hour: '2-digit',
- minute: '2-digit',
- second: '2-digit',
- hour12: false
- });
function fmtTime(t: string): string {
- const d = new Date(t);
- return isNaN(d.getTime()) ? t : timeFmt.format(d);
+ return formatTime(t) || t;
}
function logKey(entry: LogEntry): string {
diff --git a/frontend/src/routes/(app)/settings/webhooks/webhook-table.svelte b/frontend/src/routes/(app)/settings/webhooks/webhook-table.svelte
index 277c04f3a..c2202ec47 100644
--- a/frontend/src/routes/(app)/settings/webhooks/webhook-table.svelte
+++ b/frontend/src/routes/(app)/settings/webhooks/webhook-table.svelte
@@ -16,6 +16,7 @@
import { TrashIcon, GlobeIcon } from '$lib/icons';
import * as m from '$lib/paraglide/messages.js';
import IfPermitted from '$lib/components/if-permitted.svelte';
+ import { formatDateTime } from '$lib/utils/formatting';
let {
webhooks = $bindable(),
@@ -31,7 +32,7 @@
function formatDate(dateString?: string): string {
if (!dateString) return '-';
- return new Date(dateString).toLocaleString();
+ return formatDateTime(dateString) || dateString;
}
function targetTypeLabel(type: string): string {
diff --git a/frontend/src/routes/(app)/swarm/services/components/ServiceOverview.svelte b/frontend/src/routes/(app)/swarm/services/components/ServiceOverview.svelte
index 430d8ce4d..2b0a2717d 100644
--- a/frontend/src/routes/(app)/swarm/services/components/ServiceOverview.svelte
+++ b/frontend/src/routes/(app)/swarm/services/components/ServiceOverview.svelte
@@ -3,9 +3,9 @@
import StatusBadge from '$lib/components/badges/status-badge.svelte';
import { m } from '$lib/paraglide/messages';
import type { SwarmServiceInspect } from '$lib/types/swarm';
- import { format, formatDistanceToNow } from 'date-fns';
+ import { formatDistanceToNow } from 'date-fns';
import { InfoIcon, ConnectionIcon } from '$lib/icons';
- import { truncateImageDigest } from '$lib/utils/formatting';
+ import { formatDateTimeShort, truncateImageDigest } from '$lib/utils/formatting';
import { getSwarmServiceModeLabel, getSwarmServiceModeVariant, isSwarmServiceModeScalable } from '$lib/utils/docker';
import { KeyValueCard } from '$lib/components/resource-detail';
@@ -20,13 +20,9 @@
let { service, serviceName, serviceImage, serviceMode, desiredReplicas, labels }: Props = $props();
- function formatDate(input: string | undefined | null, fmt = 'PP p'): string {
+ function formatDate(input: string | undefined | null): string {
if (!input) return m.common_na();
- try {
- return format(new Date(input), fmt);
- } catch {
- return m.common_na();
- }
+ return formatDateTimeShort(input) || m.common_na();
}
function formatRelative(input: string | undefined | null): string {
diff --git a/frontend/src/routes/(app)/volumes/[volumeName]/+page.svelte b/frontend/src/routes/(app)/volumes/[volumeName]/+page.svelte
index 3238007f0..b06903f07 100644
--- a/frontend/src/routes/(app)/volumes/[volumeName]/+page.svelte
+++ b/frontend/src/routes/(app)/volumes/[volumeName]/+page.svelte
@@ -3,13 +3,12 @@
import { VolumesIcon, ClockIcon, TagIcon, LayersIcon, InfoIcon, GlobeIcon, ContainersIcon, BoxIcon } from '$lib/icons';
import { goto } from '$app/navigation';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
- import { truncateString } from '$lib/utils/formatting';
+ import { formatDateTimeShort, truncateString } from '$lib/utils/formatting';
import { openConfirmDialog } from '$lib/components/confirm-dialog/';
import { toast } from 'svelte-sonner';
import { tryCatch } from '$lib/utils/api';
import { handleApiResultWithCallbacks } from '$lib/utils/api';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
- import { format } from 'date-fns';
import { m } from '$lib/paraglide/messages';
import { untrack } from 'svelte';
import { volumeService } from '$lib/services/volume-service.js';
@@ -35,7 +34,7 @@
const canDeleteVolume = $derived(hasPermission('volumes:delete', currentEnvId));
let isLoading = $state({ remove: false });
- const createdDate = $derived(volume.createdAt ? format(new Date(volume.createdAt), 'PP p') : m.common_unknown());
+ const createdDate = $derived(volume.createdAt ? formatDateTimeShort(volume.createdAt) : m.common_unknown());
let selectedTab = $state('overview');
diff --git a/frontend/src/routes/(app)/volumes/components/volume-backup-table.svelte b/frontend/src/routes/(app)/volumes/components/volume-backup-table.svelte
index de14e41ab..34748431e 100644
--- a/frontend/src/routes/(app)/volumes/components/volume-backup-table.svelte
+++ b/frontend/src/routes/(app)/volumes/components/volume-backup-table.svelte
@@ -18,8 +18,7 @@
} from '$lib/icons';
import { ArcaneButton } from '$lib/components/arcane-button';
import { toast } from 'svelte-sonner';
- import { bytes } from '$lib/utils/formatting';
- import { format } from 'date-fns';
+ import { bytes, formatDateTimeShort } from '$lib/utils/formatting';
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import type { SearchPaginationSortRequest } from '$lib/types/shared';
import { UniversalMobileCard, type ColumnSpec, type MobileFieldVisibility } from '$lib/components/arcane-table';
@@ -232,7 +231,7 @@
{/snippet}
{#snippet CreatedCell({ value }: { value: any })}
- {format(new Date(String(value)), 'PP p')}
+ {formatDateTimeShort(String(value))}
{/snippet}
{#snippet RowActions({ item }: { item: BackupEntry })}
@@ -297,7 +296,7 @@
]}
footer={{
label: m.common_created(),
- getValue: (item) => format(new Date(item.createdAt), 'PP p'),
+ getValue: (item) => formatDateTimeShort(item.createdAt),
icon: ClockIcon
}}
rowActions={RowActions}
diff --git a/frontend/src/routes/(app)/volumes/volume-table.svelte b/frontend/src/routes/(app)/volumes/volume-table.svelte
index a7ff6d3cf..5dd6d4ff8 100644
--- a/frontend/src/routes/(app)/volumes/volume-table.svelte
+++ b/frontend/src/routes/(app)/volumes/volume-table.svelte
@@ -8,8 +8,7 @@
import InUseStatus from '$lib/components/arcane-table/cells/in-use-status.svelte';
import { handleApiResultWithCallbacks } from '$lib/utils/api';
import { tryCatch } from '$lib/utils/api';
- import { format } from 'date-fns';
- import { truncateString } from '$lib/utils/formatting';
+ import { formatDateTimeShort, truncateString } from '$lib/utils/formatting';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/shared';
import type { VolumeSummaryDto, VolumeSizeInfo } from '$lib/types/docker';
import type { ColumnSpec, MobileFieldVisibility, BulkAction } from '$lib/components/arcane-table';
@@ -233,7 +232,7 @@
{/snippet}
{#snippet CreatedCell({ value }: { value: unknown })}
- {format(new Date(String(value)), 'PP p')}
+ {formatDateTimeShort(String(value))}
{/snippet}
{#snippet VolumeMobileCardSnippet({
@@ -264,7 +263,7 @@
footer={(mobileFieldVisibility['createdAt'] ?? true)
? {
label: m.common_created(),
- getValue: (item) => format(new Date(String(item.createdAt)), 'PP p'),
+ getValue: (item) => formatDateTimeShort(String(item.createdAt)),
icon: CalendarIcon
}
: undefined}
diff --git a/frontend/src/routes/(auth)/oidc/callback/+page.svelte b/frontend/src/routes/(auth)/oidc/callback/+page.svelte
index 93b0fb7ac..f7786925d 100644
--- a/frontend/src/routes/(auth)/oidc/callback/+page.svelte
+++ b/frontend/src/routes/(auth)/oidc/callback/+page.svelte
@@ -110,6 +110,7 @@
roleAssignments: [],
permissionsByEnv: {},
isGlobalAdmin: false,
+ timeFormat: 'auto',
createdAt: new Date().toISOString()
};
diff --git a/types/coverage.txt b/types/coverage.txt
new file mode 100644
index 000000000..161fd362e
--- /dev/null
+++ b/types/coverage.txt
@@ -0,0 +1,420 @@
+mode: atomic
+github.com/getarcaneapp/arcane/types/v2/base/json.go:18.51,19.14 1 0
+github.com/getarcaneapp/arcane/types/v2/base/json.go:19.14,21.3 1 0
+github.com/getarcaneapp/arcane/types/v2/base/json.go:22.2,22.24 1 0
+github.com/getarcaneapp/arcane/types/v2/base/json.go:29.44,30.18 1 0
+github.com/getarcaneapp/arcane/types/v2/base/json.go:30.18,33.3 2 0
+github.com/getarcaneapp/arcane/types/v2/base/json.go:34.2,34.27 1 0
+github.com/getarcaneapp/arcane/types/v2/base/json.go:35.14,36.30 1 0
+github.com/getarcaneapp/arcane/types/v2/base/json.go:37.14,38.38 1 0
+github.com/getarcaneapp/arcane/types/v2/base/json.go:39.10,40.32 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:938.46,940.31 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:940.31,942.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:944.2,945.28 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:945.28,952.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:954.2,955.29 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:955.29,966.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:968.2,969.67 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:969.67,970.51 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:970.51,972.4 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:975.2,993.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:997.55,1017.2 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1019.73,1021.60 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1021.60,1023.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1025.2,1025.49 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1025.49,1030.25 3 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1030.25,1035.12 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1038.3,1038.30 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1038.30,1046.4 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1049.2,1049.14 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1052.67,1054.32 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1054.32,1065.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1067.2,1067.15 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1070.96,1072.63 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1072.63,1074.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1076.2,1076.48 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1076.48,1078.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1080.2,1080.17 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1083.72,1084.23 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1084.23,1086.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1088.2,1094.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1097.85,1099.19 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1099.19,1101.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1103.2,1111.41 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1111.41,1120.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1122.2,1122.26 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1122.26,1124.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1126.2,1126.34 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1129.52,1130.18 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1130.18,1132.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1134.2,1142.25 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1142.25,1144.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1146.2,1146.20 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1149.57,1151.35 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1151.35,1152.19 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1152.19,1153.12 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1156.3,1161.5 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1164.2,1168.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1171.44,1172.16 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1172.16,1174.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1175.2,1175.56 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1178.60,1180.17 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1180.17,1182.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1184.2,1185.17 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1185.17,1187.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1189.2,1193.76 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1193.76,1195.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1196.2,1196.78 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1196.78,1198.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1200.2,1200.20 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1203.71,1204.14 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1204.14,1206.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1208.2,1209.25 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1209.25,1211.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1213.2,1214.25 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1214.25,1216.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1218.2,1219.27 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1219.27,1221.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1223.2,1224.29 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1224.29,1226.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1228.2,1229.35 2 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1229.35,1231.3 1 0
+github.com/getarcaneapp/arcane/types/v2/container/container.go:1233.2,1249.3 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:236.56,239.48 2 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:239.48,241.3 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:241.8,243.3 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:245.2,249.38 2 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:249.38,250.22 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:250.22,252.4 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:252.9,252.30 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:252.30,254.4 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:256.2,256.12 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:417.48,418.38 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:418.38,420.3 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:421.2,421.62 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:421.62,423.3 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:424.2,424.20 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:428.70,429.28 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:429.28,431.3 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:432.2,432.19 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:432.19,434.3 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:435.2,435.12 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:442.65,444.16 2 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:444.16,446.3 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:448.2,455.23 7 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:455.23,456.39 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:456.39,458.43 2 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:458.43,460.5 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:462.3,462.30 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:462.30,464.4 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:465.3,465.30 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:465.30,467.4 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:468.3,468.34 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:468.34,470.38 2 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:470.38,472.5 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:474.3,475.50 2 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:478.2,482.28 4 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:482.28,484.34 2 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:484.34,486.4 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:489.2,490.32 2 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:490.32,492.3 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:494.2,494.40 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:494.40,496.3 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:499.2,501.30 3 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:501.30,503.22 2 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:503.22,505.4 1 0
+github.com/getarcaneapp/arcane/types/v2/image/image.go:508.2,508.12 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:269.76,280.19 2 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:280.19,282.3 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:284.2,284.13 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:287.34,288.8 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:288.8,290.3 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:292.2,292.11 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:295.44,301.33 2 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:301.33,302.51 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:302.51,304.4 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:307.2,307.19 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:310.68,314.47 3 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:314.47,317.3 2 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:318.2,318.46 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:318.46,321.3 2 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:322.2,322.48 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:322.48,325.3 2 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:326.2,326.58 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:326.58,329.3 2 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:331.2,331.26 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:334.51,336.16 2 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:336.16,338.3 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:340.2,340.21 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:343.47,345.16 2 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:345.16,347.3 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:349.2,349.19 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:352.74,353.26 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:353.26,355.3 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:357.2,358.39 2 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:358.39,359.43 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:359.43,361.4 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:364.2,364.12 1 0
+github.com/getarcaneapp/arcane/types/v2/network/network.go:385.44,400.2 1 0
+github.com/getarcaneapp/arcane/types/v2/meta/job_metadata.go:198.55,201.2 2 0
+github.com/getarcaneapp/arcane/types/v2/meta/job_metadata.go:203.49,205.2 1 0
+github.com/getarcaneapp/arcane/types/v2/meta/job_metadata.go:207.155,222.2 1 0
+github.com/getarcaneapp/arcane/types/v2/volume/volume.go:136.41,138.62 2 0
+github.com/getarcaneapp/arcane/types/v2/volume/volume.go:138.62,140.3 1 0
+github.com/getarcaneapp/arcane/types/v2/volume/volume.go:142.2,154.24 2 0
+github.com/getarcaneapp/arcane/types/v2/volume/volume.go:154.24,158.3 3 0
+github.com/getarcaneapp/arcane/types/v2/volume/volume.go:160.2,160.12 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:50.59,52.66 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:52.66,54.3 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:56.2,59.16 3 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:59.16,61.3 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:62.2,64.12 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:74.52,76.66 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:76.66,78.3 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:80.2,83.28 3 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:83.28,86.3 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:88.2,89.42 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:89.42,91.17 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:91.17,93.4 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:94.3,94.21 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:94.21,95.12 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:97.3,97.40 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:99.2,101.12 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:107.98,109.63 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:109.63,111.3 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:113.2,114.69 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:114.69,116.3 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:118.2,119.16 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:119.16,121.3 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:123.2,124.16 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:124.16,126.3 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:128.2,129.66 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:129.66,131.3 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:133.2,133.22 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:138.65,142.2 3 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:150.87,151.37 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:151.37,153.3 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:155.2,155.41 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:155.41,157.3 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:159.2,159.31 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:159.31,161.3 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:163.2,163.25 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:164.22,165.61 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:166.36,167.60 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:168.19,169.58 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:170.23,173.20 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:178.41,179.20 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:182.2,182.19 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:187.88,189.9 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:189.9,191.3 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:193.2,196.39 3 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:196.39,197.26 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:197.26,198.12 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:201.3,201.22 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:201.22,203.18 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:203.18,205.5 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:206.4,207.10 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:207.10,209.5 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:210.4,210.12 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:213.3,214.10 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:214.10,215.12 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:218.3,219.14 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:219.14,220.12 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:223.3,224.17 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:224.17,226.4 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:227.3,227.42 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:230.2,230.24 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:235.87,237.9 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:237.9,239.3 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:241.2,242.29 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:242.29,244.17 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:244.17,246.4 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:247.3,247.33 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:250.2,250.24 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:255.85,256.45 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:256.45,258.3 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:260.2,261.9 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:261.9,263.3 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:265.2,266.31 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:266.31,268.17 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:268.17,270.4 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:271.3,271.35 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:274.2,274.24 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:284.62,285.27 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:286.19,287.43 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:287.43,289.4 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:291.3,292.17 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:292.17,294.4 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:295.3,295.47 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:295.47,297.4 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:298.3,298.32 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:300.14,302.17 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:302.17,304.4 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:305.3,305.21 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:307.10,308.75 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:314.70,316.16 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:316.16,318.3 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:320.2,320.15 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:320.15,322.3 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:324.2,325.16 2 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:325.16,327.3 1 0
+github.com/getarcaneapp/arcane/types/v2/project/marshal_utils.go:329.2,329.19 1 0
+github.com/getarcaneapp/arcane/types/v2/project/project.go:359.34,370.2 1 0
+github.com/getarcaneapp/arcane/types/v2/gitops/gitops.go:583.54,590.2 1 0
+github.com/getarcaneapp/arcane/types/v2/gitops/gitops.go:594.54,601.2 1 0
+github.com/getarcaneapp/arcane/types/v2/scheduler/job.go:44.36,44.56 1 0
+github.com/getarcaneapp/arcane/types/v2/scheduler/job.go:46.59,46.87 1 0
+github.com/getarcaneapp/arcane/types/v2/scheduler/job.go:48.47,48.63 1 0
+github.com/getarcaneapp/arcane/types/v2/scheduler/job.go:53.63,54.26 1 0
+github.com/getarcaneapp/arcane/types/v2/scheduler/job.go:54.26,56.3 1 0
+github.com/getarcaneapp/arcane/types/v2/scheduler/job.go:57.2,57.27 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/config_secret.go:52.55,60.2 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/config_secret.go:70.58,78.2 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/node.go:143.50,146.31 3 0
+github.com/getarcaneapp/arcane/types/v2/swarm/node.go:146.31,147.32 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/node.go:147.32,149.4 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/node.go:149.9,151.4 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/node.go:152.3,152.57 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/node.go:155.2,156.88 2 0
+github.com/getarcaneapp/arcane/types/v2/swarm/node.go:156.88,158.3 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/node.go:160.2,178.3 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:314.117,320.9 5 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:321.35,323.43 2 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:323.43,325.4 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:326.31,328.35 2 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:328.35,330.4 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:331.38,333.10 2 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:334.56,335.56 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:336.53,337.53 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:338.11,339.16 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:341.34,343.35 2 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:343.35,345.4 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:348.2,348.34 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:348.34,350.3 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:352.2,353.44 2 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:353.44,355.3 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:357.2,358.25 2 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:358.25,360.3 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:361.2,362.33 2 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:362.33,369.3 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:371.2,372.24 2 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:372.24,374.3 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:377.2,379.35 3 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:379.35,380.48 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:380.48,382.4 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:382.9,382.32 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:382.32,384.4 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:384.9,386.4 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:390.2,391.44 2 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:391.44,392.60 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:392.60,399.4 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:402.2,402.22 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:402.22,404.3 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:406.2,421.3 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/service.go:433.62,443.2 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/swarm.go:48.44,56.2 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/task.go:92.80,94.21 2 0
+github.com/getarcaneapp/arcane/types/v2/swarm/task.go:94.21,96.3 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/task.go:98.2,99.36 2 0
+github.com/getarcaneapp/arcane/types/v2/swarm/task.go:99.36,101.3 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/task.go:103.2,104.40 2 0
+github.com/getarcaneapp/arcane/types/v2/swarm/task.go:104.40,106.3 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/task.go:108.2,109.24 2 0
+github.com/getarcaneapp/arcane/types/v2/swarm/task.go:109.24,111.3 1 0
+github.com/getarcaneapp/arcane/types/v2/swarm/task.go:113.2,130.3 2 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:89.60,91.52 2 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:91.52,93.3 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:95.2,98.16 3 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:98.16,100.3 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:101.2,104.16 3 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:104.16,106.3 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:107.2,110.16 3 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:110.16,112.3 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:113.2,116.16 3 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:116.16,118.3 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:119.2,122.16 3 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:122.16,124.3 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:125.2,127.12 2 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:130.97,131.44 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:131.44,133.3 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:135.2,136.54 2 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:136.54,137.15 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:137.15,139.4 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:140.3,140.71 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:143.2,144.54 2 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:144.54,146.3 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:147.2,147.22 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:150.105,151.44 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:151.44,153.3 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:155.2,156.54 2 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:156.54,157.15 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:157.15,159.4 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:160.3,161.36 2 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:161.36,163.4 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:164.3,164.46 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:167.2,168.54 2 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:168.54,170.3 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:171.2,171.22 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:174.107,175.44 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:175.44,177.3 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:179.2,180.54 2 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:180.54,181.15 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:181.15,183.4 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:184.3,185.36 2 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:185.36,187.4 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:188.3,188.47 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:191.2,192.54 2 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:192.54,194.3 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:195.2,195.22 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:198.93,199.44 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:199.44,201.3 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:203.2,204.54 2 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:204.54,205.15 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:205.15,207.4 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:208.3,208.66 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:211.2,212.54 2 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:212.54,214.3 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:215.2,215.22 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:218.113,219.44 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:219.44,221.3 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:223.2,224.54 2 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:224.54,225.15 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:225.15,227.4 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:228.3,229.36 2 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:229.36,231.4 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:232.3,232.50 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:235.2,236.54 2 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:236.54,238.3 1 0
+github.com/getarcaneapp/arcane/types/v2/system/prune.go:239.2,239.22 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:369.122,388.45 2 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:388.45,389.50 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:389.50,394.25 3 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:395.26,396.30 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:397.22,398.26 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:399.24,400.28 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:401.21,402.25 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:403.25,404.29 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:405.12,406.29 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:408.4,408.26 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:412.2,412.15 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:415.70,428.22 2 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:428.22,430.36 2 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:430.36,431.28 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:431.28,434.5 2 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:435.4,435.28 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:435.28,438.5 2 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:440.3,440.43 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:440.43,442.4 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:446.2,446.28 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:446.28,447.71 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:447.71,449.4 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:451.2,451.31 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:451.31,452.74 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:452.74,454.4 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:457.2,457.13 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:460.39,461.11 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:462.18,463.26 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:464.14,465.22 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:466.16,467.24 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:468.13,469.21 1 0
+github.com/getarcaneapp/arcane/types/v2/vulnerability/vulnerability.go:470.10,471.25 1 0
diff --git a/types/user/user.go b/types/user/user.go
index 0abc8d157..83700da85 100644
--- a/types/user/user.go
+++ b/types/user/user.go
@@ -1,23 +1,34 @@
package user
+// TimeFormat controls how absolute times are displayed for a user.
+type TimeFormat string
+
+const (
+ TimeFormatAuto TimeFormat = "auto"
+ TimeFormat12Hour TimeFormat = "12h"
+ TimeFormat24Hour TimeFormat = "24h"
+)
+
// CreateUser represents the request body for creating a new user.
// Role assignments are managed separately via PUT /users/{userId}/role-assignments.
type CreateUser struct {
- Username string `json:"username" minLength:"1" maxLength:"255" doc:"Username of the user" example:"johndoe"`
- Password string `json:"password" minLength:"8" doc:"Password of the user"`
- DisplayName *string `json:"displayName,omitempty" maxLength:"255" doc:"Display name of the user" example:"John Doe"`
- Email *string `json:"email,omitempty" doc:"Email address of the user" example:"[email protected]"`
- Locale *string `json:"locale,omitempty" doc:"Locale preference of the user" example:"en-US"`
+ Username string `json:"username" minLength:"1" maxLength:"255" doc:"Username of the user" example:"johndoe"`
+ Password string `json:"password" minLength:"8" doc:"Password of the user"`
+ DisplayName *string `json:"displayName,omitempty" maxLength:"255" doc:"Display name of the user" example:"John Doe"`
+ Email *string `json:"email,omitempty" doc:"Email address of the user" example:"[email protected]"`
+ Locale *string `json:"locale,omitempty" doc:"Locale preference of the user" example:"en-US"`
+ TimeFormat *TimeFormat `json:"timeFormat,omitempty" enum:"auto,12h,24h" doc:"Preferred time display format" example:"auto"`
}
// UpdateUser represents the request body for updating a user.
// Role assignments are managed separately via PUT /users/{userId}/role-assignments.
type UpdateUser struct {
- Username *string `json:"username,omitempty" minLength:"1" maxLength:"255" doc:"Username of the user"`
- DisplayName *string `json:"displayName,omitempty" maxLength:"255" doc:"Display name of the user"`
- Email *string `json:"email,omitempty" doc:"Email address of the user"`
- Locale *string `json:"locale,omitempty" doc:"Locale preference of the user"`
- Password *string `json:"password,omitempty" minLength:"8" doc:"New password for the user"`
+ Username *string `json:"username,omitempty" minLength:"1" maxLength:"255" doc:"Username of the user"`
+ DisplayName *string `json:"displayName,omitempty" maxLength:"255" doc:"Display name of the user"`
+ Email *string `json:"email,omitempty" doc:"Email address of the user"`
+ Locale *string `json:"locale,omitempty" doc:"Locale preference of the user"`
+ TimeFormat *TimeFormat `json:"timeFormat,omitempty" enum:"auto,12h,24h" doc:"Preferred time display format"`
+ Password *string `json:"password,omitempty" minLength:"8" doc:"New password for the user"`
}
// RoleAssignmentSummary is a compact form of a user's role assignment used
@@ -42,6 +53,7 @@ type User struct {
CanDelete bool `json:"canDelete" doc:"Whether the user can currently be deleted"`
OidcSubjectId *string `json:"oidcSubjectId,omitempty" doc:"OIDC subject identifier for SSO users"`
Locale *string `json:"locale,omitempty" doc:"Locale preference of the user" example:"en-US"`
+ TimeFormat TimeFormat `json:"timeFormat" enum:"auto,12h,24h" doc:"Preferred time display format" example:"auto"`
FontSize *int `json:"fontSize,omitempty" minimum:"12" maximum:"20" doc:"Preferred root UI font size in px" example:"14"`
CreatedAt string `json:"createdAt,omitempty" doc:"Date and time when the user was created"`
UpdatedAt string `json:"updatedAt,omitempty" doc:"Date and time when the user was last updated"`