Skip to content

Modern Docker Management, Designed for Everyone

fix: surface OIDC and settings errors, allow clearing the OIDC secret, require it while enabled (#3954)

Kyle Mendell70cf8a2596d3
diff --git a/AGENTS.md b/AGENTS.md
index 489de3ade..f7c5c70c0 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -151,6 +151,12 @@ frontend/src/
- Extend `BaseAPIService`; reuse existing services and query/mutation patterns.
- Use precise TypeScript types. Do not introduce `any`.
- Reuse shared components before creating page-local variants.
+- Component error paths never end at `console.error`. One-shot actions go through
+ `handleApiResultWithCallbacks` (or `toast.error(headline, { description: extractApiErrorMessage(err) })`
+ where a `Result` does not fit, such as TanStack `onError`); streams and polling feeds set an
+ inline unavailable state where the data renders; page loads rethrow via `throwPageLoadError`.
+ A thrown `APIError.message` is already the server's message, so surface it rather than a
+ canned string alone.
- Put every rendered string behind Paraglide messages.
- Reuse a matching key from `frontend/messages/en.json` before adding one.
- Add new keys only to `en.json`; Crowdin manages every other locale.
diff --git a/backend/internal/settings/service.go b/backend/internal/settings/service.go
index c6ec04aab..b26b61d59 100644
--- a/backend/internal/settings/service.go
+++ b/backend/internal/settings/service.go
@@ -28,6 +28,7 @@ import (
libcrypto "go.getarcane.app/sys/crypto"
"github.com/getarcaneapp/arcane/backend/v2/internal/actors"
+ "github.com/getarcaneapp/arcane/backend/v2/internal/common"
"github.com/getarcaneapp/arcane/backend/v2/internal/config"
"github.com/getarcaneapp/arcane/backend/v2/internal/database"
"github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
@@ -582,6 +583,7 @@ func (s *SettingsService) publishSettingsChangesInternal(updates []libarcane.Set
func (s *SettingsService) updateSettingsInternal(ctx context.Context, updates settingstypes.Update) (settingsUpdateResultInternal, error) {
defaultCfg := s.getDefaultSettings()
cfg := s.GetSettingsConfig().Clone()
+ oidcClientSecretUpdated := updates.OidcClientSecret != nil && !s.IsEnvOverrideActive("oidcClientSecret")
trivyServerTokenUpdated := updates.TrivyServerToken != nil && *updates.TrivyServerToken != "" && !s.IsEnvOverrideActive("trivyServerToken")
normalizeTargetURL := func(value string) string {
normalized, err := httpx.NormalizeBaseURL(value)
@@ -597,11 +599,34 @@ func (s *SettingsService) updateSettingsInternal(ctx context.Context, updates se
updates.OidcIssuerUrl,
normalizeTargetURL,
map[string]bool{"oidcClientSecret": cfg.OidcClientSecret.Value != ""},
- map[string]bool{"oidcClientSecret": updates.OidcClientSecret != nil && *updates.OidcClientSecret != ""},
+ map[string]bool{"oidcClientSecret": updates.OidcClientSecret != nil},
); err != nil {
return settingsUpdateResultInternal{}, err
}
+ effectiveValue := func(current SettingVariable, next *string) string {
+ if next != nil {
+ return *next
+ }
+ return current.Value
+ }
+ oidcClientSecret := cfg.OidcClientSecret.Value
+ if oidcClientSecretUpdated {
+ oidcClientSecret = *updates.OidcClientSecret
+ }
+ if effectiveValue(cfg.OidcEnabled, updates.OidcEnabled) == "true" {
+ required := []struct{ key, value string }{
+ {"oidcClientId", effectiveValue(cfg.OidcClientId, updates.OidcClientId)},
+ {"oidcClientSecret", oidcClientSecret},
+ {"oidcIssuerUrl", effectiveValue(cfg.OidcIssuerUrl, updates.OidcIssuerUrl)},
+ }
+ for _, field := range required {
+ if strings.TrimSpace(field.value) == "" {
+ return settingsUpdateResultInternal{}, common.Classify(common.ErrValidation, errors.WithDetails(errors.Errorf("Enabling OIDC requires %s", field.key), "field", field.key))
+ }
+ }
+ }
+
if err := validation.ValidateCredentialTargetChange(
"Trivy server URL",
cfg.TrivyServerUrl.Value,
@@ -617,7 +642,7 @@ func (s *SettingsService) updateSettingsInternal(ctx context.Context, updates se
if err != nil {
return settingsUpdateResultInternal{}, err
}
- if updates.OidcClientSecret != nil && *updates.OidcClientSecret != "" {
+ if oidcClientSecretUpdated {
valuesToUpdate = append(valuesToUpdate, SettingVariable{Key: "oidcClientSecret", Value: *updates.OidcClientSecret})
}
if trivyServerTokenUpdated {
diff --git a/backend/internal/settings/service_test.go b/backend/internal/settings/service_test.go
index 6ddc6e29f..ff5a81d52 100644
--- a/backend/internal/settings/service_test.go
+++ b/backend/internal/settings/service_test.go
@@ -221,8 +221,7 @@ func TestSettingsServiceUpdateSettingsRejectsOIDCIssuerChangeWithStoredSecretInt
require.NoError(t, svc.UpdateSetting(ctx, "oidcClientSecret", "old-client-secret"))
_, err = svc.UpdateSettings(ctx, settingstypes.Update{
- OidcIssuerUrl: new("https://attacker.example.com"),
- OidcClientSecret: new(""),
+ OidcIssuerUrl: new("https://attacker.example.com"),
})
require.ErrorIs(t, err, common.ErrValidation)
@@ -232,6 +231,44 @@ func TestSettingsServiceUpdateSettingsRejectsOIDCIssuerChangeWithStoredSecretInt
require.Equal(t, "old-client-secret", current.OidcClientSecret.Value)
}
+func TestSettingsServiceUpdateSettingsAllowsOIDCIssuerChangeWhenClearingSecretInternal(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+ svc, err := newSettingsServiceForTestInternal(t, ctx, db)
+ require.NoError(t, err)
+ require.NoError(t, svc.UpdateSetting(ctx, "oidcIssuerUrl", "https://issuer.example.com"))
+ require.NoError(t, svc.UpdateSetting(ctx, "oidcClientSecret", "old-client-secret"))
+
+ _, err = svc.UpdateSettings(ctx, settingstypes.Update{
+ OidcIssuerUrl: new("https://replacement.example.com"),
+ OidcClientSecret: new(""),
+ })
+ require.NoError(t, err)
+
+ current, loadErr := svc.GetSettings(ctx)
+ require.NoError(t, loadErr)
+ require.Equal(t, "https://replacement.example.com", current.OidcIssuerUrl.Value)
+ require.Empty(t, current.OidcClientSecret.Value)
+}
+
+func TestSettingsServiceUpdateSettingsRejectsEnablingOIDCWithoutSecretInternal(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+ svc, err := newSettingsServiceForTestInternal(t, ctx, db)
+ require.NoError(t, err)
+
+ _, err = svc.UpdateSettings(ctx, settingstypes.Update{
+ OidcEnabled: new("true"),
+ OidcClientId: new("arcane"),
+ OidcIssuerUrl: new("https://issuer.example.com"),
+ })
+ require.ErrorIs(t, err, common.ErrValidation)
+
+ current, loadErr := svc.GetSettings(ctx)
+ require.NoError(t, loadErr)
+ require.Equal(t, "false", current.OidcEnabled.Value)
+}
+
func TestSettingsServiceUpdateSettingsAllowsOIDCIssuerChangeWithReplacementSecretInternal(t *testing.T) {
ctx := context.Background()
db := setupSettingsTestDB(t)
diff --git a/backend/pkg/utils/validation/credential_target.go b/backend/pkg/utils/validation/credential_target.go
index dbd5d8454..335f3836d 100644
--- a/backend/pkg/utils/validation/credential_target.go
+++ b/backend/pkg/utils/validation/credential_target.go
@@ -46,7 +46,7 @@ func ValidateCredentialTargetChange(
slices.Sort(missingFields)
if len(missingFields) == 1 {
- return common.Classify(common.ErrValidation, errors.WithDetails(errors.Errorf("Changing %s requires re-supplying or clearing the %s", targetName, missingFields[0]), "field", missingFields[0]))
+ return common.Classify(common.ErrValidation, errors.WithDetails(errors.Errorf("Changing %s requires re-entering the %s", targetName, missingFields[0]), "field", missingFields[0]))
}
return common.NewAPIErrorWithDetails(
diff --git a/backend/pkg/utils/validation/credential_target_test.go b/backend/pkg/utils/validation/credential_target_test.go
index b9f34add4..e2e163d92 100644
--- a/backend/pkg/utils/validation/credential_target_test.go
+++ b/backend/pkg/utils/validation/credential_target_test.go
@@ -99,7 +99,7 @@ func TestValidateCredentialTargetChange(t *testing.T) {
case tt.wantField != "":
require.ErrorIs(t, err, common.ErrValidation)
assert.Contains(t, errors.GetDetails(err), tt.wantField)
- assert.Equal(t, "Changing credential target requires re-supplying or clearing the token", err.Error())
+ assert.Equal(t, "Changing credential target requires re-entering the token", err.Error())
case len(tt.wantFields) > 0:
var apiErr *common.APIError
require.ErrorAs(t, err, &apiErr)
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 1ef0b732b..9422288d5 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -184,6 +184,9 @@
"common_copy": "Copy",
"common_copied": "Copied to clipboard",
"common_copy_failed": "Failed to copy",
+ "common_load_failed": "Failed to load {resource}",
+ "common_search_failed": "Search failed",
+ "vuln_image_filter_options": "image filter options",
"common_copy_json": "Copy JSON",
"common_close": "Close",
"common_invalid_email": "Must be a valid email",
@@ -1525,7 +1528,8 @@
"security_server_disabled_via_server": "Disabled via Server",
"security_oidc_forced_disabled_tooltip": "OIDC is disabled by server environment variables and cannot be changed here.",
"security_oidc_forced_managed_tooltip": "OIDC is managed by server environment variables.",
- "security_oidc_client_secret_help": "Leave blank to keep the existing secret",
+ "security_oidc_client_secret_help": "Leave blank to keep the existing secret. Changing the issuer URL requires re-entering it.",
+ "security_oidc_clear_client_secret": "Clear stored client secret",
"security_oidc_merge_accounts_label": "Link OIDC with Existing Accounts",
"security_oidc_merge_accounts_description": "Allow OIDC logins to merge with existing local accounts by matching email addresses",
"security_oidc_merge_accounts_alert_title": "Enable Account Linking?",
@@ -1611,7 +1615,7 @@
"security_enable_one_provider": "Enable at least one authentication provider.",
"security_enable_one_provider_error": "At least one authentication provider must be enabled.",
"security_form_validation_error": "Please check the form for errors.",
- "security_oidc_required_fields": "Client ID and Issuer URL are required to enable OIDC.",
+ "security_oidc_required_fields": "Client ID, client secret, and issuer URL are required to enable OIDC.",
"security_settings_saved": "Settings saved successfully.",
"security_local_enabled_info": "Local Authentication enabled to ensure at least one provider is active.",
"security_settings_save_failed": "Failed to save security settings",
@@ -1736,6 +1740,10 @@
"proxy_request_timeout": "Proxy Request Timeout",
"proxy_request_timeout_description": "Timeout for proxied requests in seconds (default: 60)",
"customize_title": "Customization",
+ "theme": "Theme",
+ "containers_stats_stream_failed": "Live stats are unavailable",
+ "swarm_service_spec_parse_failed": "The current service spec could not be read, so the editor starts empty.",
+ "vuln_report_load_failed": "Vulnerability report details could not be loaded",
"customize_subtitle": "Customize templates, registries, and configuration defaults",
"customize_search_placeholder": "Search customization options…",
"customize_search_results": "Search Results for \"{query}\"",
diff --git a/frontend/src/lib/components/category-index-page.svelte b/frontend/src/lib/components/category-index-page.svelte
index 45975e343..a1a4867f8 100644
--- a/frontend/src/lib/components/category-index-page.svelte
+++ b/frontend/src/lib/components/category-index-page.svelte
@@ -14,6 +14,7 @@
showSearchResults: boolean;
searchResults: NormalizedCategory[];
isSearching: boolean;
+ searchError: string | null;
performSearch: (query: string) => void | Promise<void>;
debouncedSearch: (query: string) => void;
clearSearch: () => void;
@@ -29,6 +30,7 @@
clearSearchLabel: string;
// Search-results empty/loading states
searchingLabel: string;
+ searchFailedLabel: string;
noResultsTitle: string;
noResultsDescription: string;
// Matching-items section
@@ -51,6 +53,7 @@
searchPlaceholder,
clearSearchLabel,
searchingLabel,
+ searchFailedLabel,
noResultsTitle,
noResultsDescription,
matchingItemsLabel,
@@ -162,6 +165,12 @@
<Spinner class="mx-auto mb-3 size-8 text-primary sm:mb-4 sm:size-12" />
<p class="text-sm text-muted-foreground sm:text-base">{searchingLabel}</p>
</div>
+ {:else if categorySearch.searchError}
+ <div class="py-8 text-center sm:py-12">
+ <SearchIcon class="mx-auto mb-3 size-8 text-destructive sm:mb-4 sm:size-12" />
+ <h3 class="mb-2 text-base font-medium sm:text-lg">{searchFailedLabel}</h3>
+ <p class="text-sm text-muted-foreground sm:text-base">{categorySearch.searchError}</p>
+ </div>
{:else if categorySearch.searchResults.length === 0}
<div class="py-8 text-center sm:py-12">
<SearchIcon class="mx-auto mb-3 size-8 text-muted-foreground sm:mb-4 sm:size-12" />
diff --git a/frontend/src/lib/components/dialogs/environment-switcher-dialog.svelte b/frontend/src/lib/components/dialogs/environment-switcher-dialog.svelte
index 9f4efae39..e07790456 100644
--- a/frontend/src/lib/components/dialogs/environment-switcher-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/environment-switcher-dialog.svelte
@@ -12,6 +12,7 @@
import { goto } from '$app/navigation';
import { toast } from 'svelte-sonner';
import { m } from '#lib/paraglide/messages.js';
+ import { handleApiResultWithCallbacks } from '#lib/utils/api.js';
import { cn } from '#lib/utils.js';
import settingsStore from '#lib/stores/config-store.svelte.js';
import { debounced } from '#lib/utils/ws.js';
@@ -222,19 +223,14 @@
async function handleSelect(env: Environment) {
if (!env || !env.enabled) return;
- const operationResult2 = await tryCatch(
- (async () => {
- await environmentStore.setEnvironment(env);
+ await handleApiResultWithCallbacks({
+ result: await tryCatch(environmentStore.setEnvironment(env)),
+ message: m.environments_connect_error(),
+ onSuccess: () => {
closeDialog();
toast.success(m.environments_switched_to({ name: env.name }));
- })()
- );
- if (operationResult2.error !== null) {
- const error = operationResult2.error;
-
- console.error('Failed to set environment:', error);
- toast.error(m.environments_connect_error());
- }
+ }
+ });
}
function handleOpenSettings(env: Environment) {
diff --git a/frontend/src/lib/components/dialogs/service-editor-dialog.svelte b/frontend/src/lib/components/dialogs/service-editor-dialog.svelte
index d78587e33..01844371f 100644
--- a/frontend/src/lib/components/dialogs/service-editor-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/service-editor-dialog.svelte
@@ -8,6 +8,7 @@
import { m } from '#lib/paraglide/messages.js';
import { AddIcon, TrashIcon } from '#lib/icons/index.js';
import * as Accordion from '#lib/components/ui/accordion/index.js';
+ import * as Alert from '#lib/components/ui/alert/index.js';
import FormInput from '#lib/components/form/form-input.svelte';
import { untrack } from 'svelte';
import { getSwarmServiceModeLabel } from '#lib/utils/docker.js';
@@ -168,6 +169,8 @@
return mode === 'replicated-job' || mode === 'global-job';
}
+ let specParseError = $state<string | null>(null);
+
function parseInitialSpec(specText: string): SwarmServiceSpecRaw | null {
if (!specText.trim()) return null;
@@ -175,7 +178,7 @@
const parsed = JSON.parse(specText) as unknown;
return asRecord(parsed) as SwarmServiceSpecRaw;
} catch (error) {
- console.error('Failed to parse service spec:', error);
+ specParseError = error instanceof Error ? error.message : String(error);
return null;
}
}
@@ -378,6 +381,11 @@
<ResponsiveDialog bind:open onOpenChange={handleOpenChange} variant="sheet" {title} {description} contentClass="sm:max-w-[600px]">
{#snippet children()}
<form onsubmit={preventDefault(handleSubmit)} class="space-y-6 py-4">
+ {#if specParseError}
+ <Alert.Root variant="destructive">
+ <Alert.Description>{m.swarm_service_spec_parse_failed()} {specParseError}</Alert.Description>
+ </Alert.Root>
+ {/if}
<!-- Basic Config -->
<div class="space-y-4">
<FormInput input={form.name} label={m.common_name()} placeholder="my-service" disabled={isLoading} />
diff --git a/frontend/src/lib/components/font-size-picker.svelte b/frontend/src/lib/components/font-size-picker.svelte
index 65c276e0e..1f63bcaec 100644
--- a/frontend/src/lib/components/font-size-picker.svelte
+++ b/frontend/src/lib/components/font-size-picker.svelte
@@ -1,5 +1,6 @@
<script lang="ts">
import { tryCatch } from '#lib/utils/try-catch.js';
+ import { handleApiResultWithCallbacks } from '#lib/utils/api.js';
import * as Slider from '#lib/components/ui/slider/index.js';
import userStore from '#lib/stores/user-store.svelte.js';
@@ -22,20 +23,18 @@
const persist = debounced(async (px: number) => {
const previous = lastPersisted;
- const operationResult1 = await tryCatch(
- (async () => {
- await userService.updateMyProfile({ fontSize: px });
+ await handleApiResultWithCallbacks({
+ result: await tryCatch(userService.updateMyProfile({ fontSize: px })),
+ message: m.common_update_failed({ resource: m.font_size() }),
+ onSuccess: async () => {
lastPersisted = px;
await queryClient.invalidateQueries({ queryKey: queryKeys.users.all });
- })()
- );
- if (operationResult1.error !== null) {
- const err = operationResult1.error;
-
- console.error('Failed to update font size', err);
- currentSize = previous;
- applyFontSize(previous);
- }
+ },
+ onError: () => {
+ currentSize = previous;
+ applyFontSize(previous);
+ }
+ });
}, 400);
function handleChange(px: number) {
diff --git a/frontend/src/lib/components/locale-picker.svelte b/frontend/src/lib/components/locale-picker.svelte
index b9029c5c0..49d1942ba 100644
--- a/frontend/src/lib/components/locale-picker.svelte
+++ b/frontend/src/lib/components/locale-picker.svelte
@@ -8,6 +8,8 @@
import { queryKeys } from '#lib/query/query-keys.js';
import { userService } from '#lib/services/user-service.js';
import { createMutation, useQueryClient } from '@tanstack/svelte-query';
+ import { toast } from 'svelte-sonner';
+ import { extractApiErrorMessage } from '#lib/utils/api.js';
let {
inline = false,
@@ -69,7 +71,7 @@
},
onError: (err, _locale, context) => {
currentLocale = context?.previousLocale ?? getLocale();
- console.error('Failed to update locale', err);
+ toast.error(m.common_update_failed({ resource: m.language() }), { description: extractApiErrorMessage(err) });
}
}));
diff --git a/frontend/src/lib/components/logs/structured-log-entry.svelte b/frontend/src/lib/components/logs/structured-log-entry.svelte
index 956536aca..69d54b997 100644
--- a/frontend/src/lib/components/logs/structured-log-entry.svelte
+++ b/frontend/src/lib/components/logs/structured-log-entry.svelte
@@ -1,5 +1,7 @@
<script lang="ts">
import { tryCatch } from '#lib/utils/try-catch.js';
+ import { handleApiResultWithCallbacks } from '#lib/utils/api.js';
+ import { m } from '#lib/paraglide/messages.js';
// Dozzle reference: the compact structured-log summary and expandable details pattern
// here were informed by amir20/dozzle's ComplexLogItem.vue and LogDetails.vue.
@@ -228,20 +230,16 @@
const hasDetails = $derived(summaryFields.length > SUMMARY_LIMIT || summaryFields.length > 0 || !!rawJson);
async function copyToClipboard() {
- const operationResult1 = await tryCatch(
- (async () => {
- await navigator.clipboard.writeText(jsonString);
+ await handleApiResultWithCallbacks({
+ result: await tryCatch(navigator.clipboard.writeText(jsonString)),
+ message: m.common_copy_failed(),
+ onSuccess: () => {
copied = true;
setTimeout(() => {
copied = false;
}, 2000);
- })()
- );
- if (operationResult1.error !== null) {
- const err = operationResult1.error;
-
- console.error('Failed to copy to clipboard:', err);
- }
+ }
+ });
}
</script>
diff --git a/frontend/src/lib/components/theme-mode/theme-mode-selector.svelte b/frontend/src/lib/components/theme-mode/theme-mode-selector.svelte
index 7e7b85a00..2570d2ad3 100644
--- a/frontend/src/lib/components/theme-mode/theme-mode-selector.svelte
+++ b/frontend/src/lib/components/theme-mode/theme-mode-selector.svelte
@@ -1,5 +1,6 @@
<script lang="ts">
import { tryCatch } from '#lib/utils/try-catch.js';
+ import { handleApiResultWithCallbacks } from '#lib/utils/api.js';
import { userPrefersMode, setMode } from 'mode-watcher';
import { m } from '#lib/paraglide/messages.js';
@@ -29,17 +30,11 @@
setMode(value);
if (!userStore.current) return;
- const operationResult1 = await tryCatch(
- (async () => {
- const updated = await userService.updateMyProfile({ preferences: { themeMode: value } });
- await userStore.setUser(updated);
- })()
- );
- if (operationResult1.error !== null) {
- const err = operationResult1.error;
-
- console.error('Failed to save theme mode', err);
- }
+ await handleApiResultWithCallbacks({
+ result: await tryCatch(userService.updateMyProfile({ preferences: { themeMode: value } })),
+ message: m.common_update_failed({ resource: m.theme() }),
+ onSuccess: (updated) => userStore.setUser(updated)
+ });
}
</script>
diff --git a/frontend/src/lib/components/time-format-picker.svelte b/frontend/src/lib/components/time-format-picker.svelte
index 59eb9fae7..d4a510e4f 100644
--- a/frontend/src/lib/components/time-format-picker.svelte
+++ b/frontend/src/lib/components/time-format-picker.svelte
@@ -1,5 +1,7 @@
<script lang="ts">
import { createMutation, useQueryClient } from '@tanstack/svelte-query';
+ import { toast } from 'svelte-sonner';
+ import { extractApiErrorMessage } from '#lib/utils/api.js';
import * as Select from '#lib/components/ui/select/index.js';
import { m } from '#lib/paraglide/messages.js';
import { queryKeys } from '#lib/query/query-keys.js';
@@ -37,7 +39,7 @@
},
onError: (error, _timeFormat, context) => {
timeFormatStore.set(context?.previousTimeFormat ?? 'auto');
- console.error('Failed to update time format', error);
+ toast.error(m.common_update_failed({ resource: m.time_format() }), { description: extractApiErrorMessage(error) });
}
}));
</script>
diff --git a/frontend/src/lib/components/vulnerability/vulnerability-scan-item.svelte b/frontend/src/lib/components/vulnerability/vulnerability-scan-item.svelte
index 8c3a1fb1f..2e98f257f 100644
--- a/frontend/src/lib/components/vulnerability/vulnerability-scan-item.svelte
+++ b/frontend/src/lib/components/vulnerability/vulnerability-scan-item.svelte
@@ -21,10 +21,11 @@
interface Props {
scanSummary?: VulnerabilityScanSummary;
imageId: string;
+ pollError?: string | null;
onScanned?: (data: VulnerabilityScanSummary) => void;
}
- let { scanSummary = $bindable(), imageId, onScanned }: Props = $props();
+ let { scanSummary = $bindable(), imageId, pollError = null, onScanned }: Props = $props();
let isOpen = $state(false);
let lastScanRequestedAt = $state<string | null>(null);
@@ -219,6 +220,9 @@
</div>
{/if}
</div>
+ {#if pollError}
+ <p class="text-xs text-destructive">{pollError}</p>
+ {/if}
{:else if isCompleted && scanSummary?.summary}
<div class="space-y-2">
<div class="flex items-center gap-2">
diff --git a/frontend/src/lib/components/vulnerability/vulnerability-scan-panel.svelte b/frontend/src/lib/components/vulnerability/vulnerability-scan-panel.svelte
index 232d2df5f..24c42428f 100644
--- a/frontend/src/lib/components/vulnerability/vulnerability-scan-panel.svelte
+++ b/frontend/src/lib/components/vulnerability/vulnerability-scan-panel.svelte
@@ -28,11 +28,12 @@
interface Props {
scan?: VulnerabilityScanResult | null;
+ reportError?: string | null;
isScanning?: boolean;
onScan?: () => void;
}
- let { scan, isScanning = false, onScan }: Props = $props();
+ let { scan, reportError = null, isScanning = false, onScan }: Props = $props();
const DEFAULT_PAGE_SIZE = 20;
@@ -289,6 +290,9 @@
</div>
{:else if scan?.status === 'completed' && resolvedSummary}
{@const summary = resolvedSummary}
+ {#if reportError}
+ <p class="mb-3 text-xs text-muted-foreground">{m.vuln_report_load_failed()}: {reportError}</p>
+ {/if}
{#if summary.total === 0}
<div class="rounded-2xl border border-emerald-500/20 bg-emerald-500/5 p-6 shadow-sm">
<div class="flex items-center gap-4">
diff --git a/frontend/src/lib/hooks/use-category-search.svelte.ts b/frontend/src/lib/hooks/use-category-search.svelte.ts
index 6e7666ce8..d8aa9c012 100644
--- a/frontend/src/lib/hooks/use-category-search.svelte.ts
+++ b/frontend/src/lib/hooks/use-category-search.svelte.ts
@@ -1,4 +1,5 @@
import { tryCatch } from '#lib/utils/try-catch.js';
+import { extractApiErrorMessage } from '#lib/utils/api.js';
import { debounced } from '#lib/utils/ws.js';
type CategorySearchResponse<T> = {
@@ -8,14 +9,14 @@ type CategorySearchResponse<T> = {
type UseCategorySearchOptions<T> = {
search: (query: string) => Promise<CategorySearchResponse<T>>;
filter: (category: T) => boolean;
- onError?: (error: unknown) => void;
};
-export function useCategorySearch<T>({ search, filter, onError }: UseCategorySearchOptions<T>) {
+export function useCategorySearch<T>({ search, filter }: UseCategorySearchOptions<T>) {
let searchQuery = $state('');
let showSearchResults = $state(false);
let searchResults = $state<T[]>([]);
let isSearching = $state(false);
+ let searchError = $state<string | null>(null);
let currentSearchRequest = 0;
async function performSearch(query: string) {
@@ -33,6 +34,7 @@ export function useCategorySearch<T>({ search, filter, onError }: UseCategorySea
const requestId = currentSearchRequest;
isSearching = true;
showSearchResults = true;
+ searchError = null;
const operationResult = await tryCatch(
(async () => {
@@ -43,13 +45,10 @@ export function useCategorySearch<T>({ search, filter, onError }: UseCategorySea
}
})()
);
- if (operationResult.error !== null) {
- const error = operationResult.error;
- onError?.(error);
- if (requestId === currentSearchRequest) {
- searchResults = [];
- isSearching = false;
- }
+ if (operationResult.error !== null && requestId === currentSearchRequest) {
+ searchError = extractApiErrorMessage(operationResult.error);
+ searchResults = [];
+ isSearching = false;
}
}
@@ -61,6 +60,7 @@ export function useCategorySearch<T>({ search, filter, onError }: UseCategorySea
searchQuery = '';
showSearchResults = false;
isSearching = false;
+ searchError = null;
searchResults = [];
currentSearchRequest++;
}
@@ -81,6 +81,9 @@ export function useCategorySearch<T>({ search, filter, onError }: UseCategorySea
get isSearching() {
return isSearching;
},
+ get searchError() {
+ return searchError;
+ },
performSearch,
debouncedSearch,
clearSearch
diff --git a/frontend/src/lib/utils/api.ts b/frontend/src/lib/utils/api.ts
index 66771602e..915801bee 100644
--- a/frontend/src/lib/utils/api.ts
+++ b/frontend/src/lib/utils/api.ts
@@ -152,19 +152,10 @@ export async function simpleRefresh<T>(
setLoading: (loading: boolean) => void
): Promise<void> {
setLoading(true);
- try {
- const operationResult = await tryCatch(
- (async () => {
- const data = await fetch();
- onSuccess(data);
- })()
- );
- if (operationResult.error !== null) {
- const error = operationResult.error;
- console.error('Refresh failed:', error);
- toast.error(errorMessage);
- }
- } finally {
- setLoading(false);
- }
+ await handleApiResultWithCallbacks({
+ result: await tryCatch(fetch()),
+ message: errorMessage,
+ setLoadingState: setLoading,
+ onSuccess
+ });
}
diff --git a/frontend/src/routes/(app)/containers/[containerId]/+page.svelte b/frontend/src/routes/(app)/containers/[containerId]/+page.svelte
index d7726948c..32a78b032 100644
--- a/frontend/src/routes/(app)/containers/[containerId]/+page.svelte
+++ b/frontend/src/routes/(app)/containers/[containerId]/+page.svelte
@@ -64,6 +64,7 @@
let autoScrollLogs = $state(true);
let hasInitialStatsLoaded = $state(false);
+ let statsError = $state(false);
// Auto-update: the Docker label controls the state when set (not toggleable via UI)
const autoUpdateLabelControlled = $derived(isAutoUpdateLabelDisabled(container?.labels));
@@ -522,6 +523,7 @@
{memoryLimitFormatted}
{memoryUsagePercent}
loading={!hasInitialStatsLoaded}
+ streamError={statsError}
/>
{/if}
</Tabs.Content>
@@ -588,6 +590,7 @@
enabled={(activeTab === 'stats' || activeTab === 'logs') && !!container.state?.running}
bind:stats
bind:hasInitialStatsLoaded
+ bind:statsError
/>
{/key}
diff --git a/frontend/src/routes/(app)/containers/components/ContainerStats.svelte b/frontend/src/routes/(app)/containers/components/ContainerStats.svelte
index 802f79be0..a4f8cbda3 100644
--- a/frontend/src/routes/(app)/containers/components/ContainerStats.svelte
+++ b/frontend/src/routes/(app)/containers/components/ContainerStats.svelte
@@ -15,6 +15,7 @@
memoryLimitFormatted: string;
memoryUsagePercent: number;
loading?: boolean;
+ streamError?: boolean;
}
let {
@@ -25,7 +26,8 @@
memoryUsageFormatted,
memoryLimitFormatted,
memoryUsagePercent,
- loading = false
+ loading = false,
+ streamError = false
}: Props = $props();
const networkInterfaces = $derived(stats?.networks ? Object.entries(stats.networks) : []);
@@ -121,7 +123,11 @@
</div>
{/snippet}
-{#if loading}
+{#if loading && streamError}
+ <div class="rounded-lg border border-dashed py-12 text-center text-muted-foreground">
+ <div class="text-sm">{m.containers_stats_stream_failed()}</div>
+ </div>
+{:else if loading}
<div class="space-y-6">
<div class="flex flex-wrap items-center gap-x-6 gap-y-2 rounded-lg bg-muted/40 px-4 py-3">
{#each Array(3) as _, i (i)}
diff --git a/frontend/src/routes/(app)/containers/components/container-detail-stats-sync.svelte b/frontend/src/routes/(app)/containers/components/container-detail-stats-sync.svelte
index 851941154..cea83bc54 100644
--- a/frontend/src/routes/(app)/containers/components/container-detail-stats-sync.svelte
+++ b/frontend/src/routes/(app)/containers/components/container-detail-stats-sync.svelte
@@ -11,16 +11,19 @@
containerId,
enabled,
stats = $bindable<ContainerStatsType | null>(null),
- hasInitialStatsLoaded = $bindable(false)
+ hasInitialStatsLoaded = $bindable(false),
+ statsError = $bindable(false)
}: {
containerId?: string;
enabled: boolean;
stats?: ContainerStatsType | null;
hasInitialStatsLoaded?: boolean;
+ statsError?: boolean;
} = $props();
stats = null;
hasInitialStatsLoaded = false;
+ statsError = false;
let statsWebSocket: ReconnectingWebSocket<ContainerStatsType> | null = null;
let isConnecting = false;
@@ -60,13 +63,17 @@
lastStatsRead = statsData.read;
stats = { ...statsData, statsHistory: history };
hasInitialStatsLoaded = true;
+ statsError = false;
},
onOpen: () => {
isConnecting = false;
+ statsError = false;
},
- onError: (err) => {
- console.error('Stats WebSocket error:', err);
+ onError: () => {
isConnecting = false;
+ stats = null;
+ hasInitialStatsLoaded = false;
+ statsError = true;
},
onClose: () => {
isConnecting = false;
@@ -81,10 +88,8 @@
);
if (requestGeneration !== generation) return;
if (operationResult.error !== null) {
- const error = operationResult.error;
-
- console.error('Failed to connect to stats stream:', error);
isConnecting = false;
+ statsError = true;
}
}
diff --git a/frontend/src/routes/(app)/containers/components/container-stats-cell.svelte b/frontend/src/routes/(app)/containers/components/container-stats-cell.svelte
index 0632ee2b4..8ed565eb5 100644
--- a/frontend/src/routes/(app)/containers/components/container-stats-cell.svelte
+++ b/frontend/src/routes/(app)/containers/components/container-stats-cell.svelte
@@ -8,10 +8,11 @@
limit?: number;
loading?: boolean;
stopped?: boolean;
+ unavailable?: boolean;
type: 'cpu' | 'memory';
}
- let { value, limit, loading = false, stopped = false, type }: Props = $props();
+ let { value, limit, loading = false, stopped = false, unavailable = false, type }: Props = $props();
const memoryPercent = $derived.by(() => {
if (type !== 'memory' || !value || !limit || limit === 0) return undefined;
@@ -28,6 +29,8 @@
{#if stopped}
<div class="text-xs text-muted-foreground">{m.common_na()}</div>
+{:else if unavailable && value === undefined}
+ <div class="text-xs text-muted-foreground">{m.common_unavailable()}</div>
{:else if loading}
<div class="flex items-center gap-2">
<div class="size-[26px] shrink-0 animate-pulse rounded-full bg-muted"></div>
diff --git a/frontend/src/routes/(app)/containers/components/container-stats-manager.svelte.ts b/frontend/src/routes/(app)/containers/components/container-stats-manager.svelte.ts
index 643d0b6b9..da2a0fd2b 100644
--- a/frontend/src/routes/(app)/containers/components/container-stats-manager.svelte.ts
+++ b/frontend/src/routes/(app)/containers/components/container-stats-manager.svelte.ts
@@ -8,6 +8,7 @@ export class ContainerStatsManager {
private connections = new SvelteMap<string, ReconnectingWebSocket<ContainerStats>>();
private stats = new SvelteMap<string, ContainerStats>();
private loadingStates = new SvelteMap<string, boolean>();
+ private errorStates = new SvelteMap<string, boolean>();
private desiredIds = new SvelteSet<string>();
private currentEnvId: string | null = null;
@@ -22,10 +23,12 @@ export class ContainerStatsManager {
onMessage: (data: ContainerStats) => {
this.stats.set(containerId, data);
this.loadingStates.set(containerId, false);
+ this.errorStates.delete(containerId);
},
- onError: (err) => {
- console.error(`[ContainerStatsManager] Stats error for container ${containerId}:`, err);
+ onError: () => {
+ this.stats.delete(containerId);
this.loadingStates.set(containerId, false);
+ this.errorStates.set(containerId, true);
},
shouldReconnect: () => this.connections.has(containerId)
});
@@ -41,6 +44,7 @@ export class ContainerStatsManager {
this.connections.delete(containerId);
this.stats.delete(containerId);
this.loadingStates.delete(containerId);
+ this.errorStates.delete(containerId);
}
}
@@ -69,6 +73,10 @@ export class ContainerStatsManager {
return this.loadingStates.get(containerId) ?? false;
}
+ hasError(containerId: string): boolean {
+ return this.errorStates.get(containerId) ?? false;
+ }
+
hasConnection(containerId: string): boolean {
return this.connections.has(containerId);
}
@@ -119,5 +127,6 @@ export class ContainerStatsManager {
this.connections.clear();
this.stats.clear();
this.loadingStates.clear();
+ this.errorStates.clear();
}
}
diff --git a/frontend/src/routes/(app)/containers/container-table.svelte b/frontend/src/routes/(app)/containers/container-table.svelte
index 394fc8f36..e04f72e1c 100644
--- a/frontend/src/routes/(app)/containers/container-table.svelte
+++ b/frontend/src/routes/(app)/containers/container-table.svelte
@@ -437,6 +437,7 @@
<ContainerStatsCell
value={statsManager.getCPUPercent(item.id)}
loading={statsManager.isLoading(item.id) ?? false}
+ unavailable={statsManager.hasError(item.id)}
stopped={item.state !== 'running'}
type="cpu"
/>
@@ -444,7 +445,13 @@
{#snippet MemoryCell({ item }: { item: ContainerSummaryDto })}
{@const memoryData = statsManager.getMemoryUsage(item.id)}
- <ContainerStatsCell value={memoryData?.usage} limit={memoryData?.limit} stopped={item.state !== 'running'} type="memory" />
+ <ContainerStatsCell
+ value={memoryData?.usage}
+ limit={memoryData?.limit}
+ unavailable={statsManager.hasError(item.id)}
+ stopped={item.state !== 'running'}
+ type="memory"
+ />
{/snippet}
{#snippet PortsCell({ item }: { item: ContainerSummaryDto })}
@@ -625,7 +632,7 @@
getValue: (item: ContainerSummaryDto) => {
const cpu = statsManager.getCPUPercent(item.id);
if (item.state !== 'running') return m.common_na();
- if (cpu === undefined) return '...';
+ if (cpu === undefined) return statsManager.hasError(item.id) ? m.common_unavailable() : '...';
return `${cpu.toFixed(1)}%`;
},
icon: ClockIcon,
@@ -637,7 +644,7 @@
getValue: (item: ContainerSummaryDto) => {
const memData = statsManager.getMemoryUsage(item.id);
if (item.state !== 'running') return m.common_na();
- if (!memData?.usage) return '...';
+ if (!memData?.usage) return statsManager.hasError(item.id) ? m.common_unavailable() : '...';
return `${(memData.usage / 1024 / 1024).toFixed(0)} MB`;
},
icon: ClockIcon,
diff --git a/frontend/src/routes/(app)/customize/+page.svelte b/frontend/src/routes/(app)/customize/+page.svelte
index 897d9d8b1..8001a85fd 100644
--- a/frontend/src/routes/(app)/customize/+page.svelte
+++ b/frontend/src/routes/(app)/customize/+page.svelte
@@ -1,5 +1,6 @@
<script lang="ts">
import { tryCatch } from '#lib/utils/try-catch.js';
+ import { handleApiResultWithCallbacks } from '#lib/utils/api.js';
import type { PageProps } from './$types';
import { goto } from '$app/navigation';
@@ -22,8 +23,7 @@
const permissionsManifest = $derived(data.permissionsManifest);
const categorySearch = useCategorySearch<CustomizeCategory>({
search: (query) => customizeSearchService.search(query),
- filter: isAccessibleCategory,
- onError: (error) => console.error('Search failed:', error)
+ filter: isAccessibleCategory
});
const iconMap: Record<string, any> = {
@@ -59,19 +59,13 @@
}
onMount(async () => {
- const operationResult = await tryCatch(
- (async () => {
- customizeCategories = orderCategoriesByNav(
- (await customizeSearchService.getCategories()).filter(isAccessibleCategory),
- getCustomizeSubpageUrlsInNavOrder()
- );
- })()
- );
- if (operationResult.error !== null) {
- const error = operationResult.error;
-
- console.error('Failed to load categories:', error);
- }
+ await handleApiResultWithCallbacks({
+ result: await tryCatch(customizeSearchService.getCategories()),
+ message: m.common_load_failed({ resource: m.customize_title() }),
+ onSuccess: (categories) => {
+ customizeCategories = orderCategoriesByNav(categories.filter(isAccessibleCategory), getCustomizeSubpageUrlsInNavOrder());
+ }
+ });
});
function navigateToCategory(categoryUrl: string) {
@@ -112,6 +106,9 @@
get isSearching() {
return categorySearch.isSearching;
},
+ get searchError() {
+ return categorySearch.searchError;
+ },
performSearch: categorySearch.performSearch,
debouncedSearch: categorySearch.debouncedSearch,
clearSearch: categorySearch.clearSearch
@@ -125,6 +122,7 @@
searchPlaceholder={m.customize_search_placeholder()}
clearSearchLabel={m.common_clear_search()}
searchingLabel={m.searching()}
+ searchFailedLabel={m.common_search_failed()}
noResultsTitle={m.customize_no_options()}
noResultsDescription={m.customize_try_adjusting()}
matchingItemsLabel={m.customize_available_options()}
diff --git a/frontend/src/routes/(app)/environments/environment-table.svelte b/frontend/src/routes/(app)/environments/environment-table.svelte
index 69a6e2345..abea9b19c 100644
--- a/frontend/src/routes/(app)/environments/environment-table.svelte
+++ b/frontend/src/routes/(app)/environments/environment-table.svelte
@@ -363,13 +363,13 @@
toast.error(m.environments_cannot_switch_disabled());
return;
}
- const result = await tryCatch(
- (async () => {
- await environmentStore.setEnvironment(item);
+ await handleApiResultWithCallbacks({
+ result: await tryCatch(environmentStore.setEnvironment(item)),
+ message: m.environments_connect_error(),
+ onSuccess: () => {
toast.success(m.environments_switched_to({ name: item.name }));
- })()
- );
- if (result.error) console.error('Failed to set environment:', result.error);
+ }
+ });
}}
disabled={!item.enabled || environmentStore.selected?.id === item.id}
>
diff --git a/frontend/src/routes/(app)/images/[imageId]/+page.svelte b/frontend/src/routes/(app)/images/[imageId]/+page.svelte
index 7358f6a17..df5df12e0 100644
--- a/frontend/src/routes/(app)/images/[imageId]/+page.svelte
+++ b/frontend/src/routes/(app)/images/[imageId]/+page.svelte
@@ -5,7 +5,7 @@
import { Badge } from '#lib/components/ui/badge/index.js';
import { bytes, formatDateTimeShort, nowInstantString } from '#lib/utils/formatting.js';
import { openConfirmDialog } from '#lib/components/confirm-dialog/index.js';
- import { handleApiResultWithCallbacks } from '#lib/utils/api.js';
+ import { handleApiResultWithCallbacks, extractApiErrorMessage } from '#lib/utils/api.js';
import { tryCatch } from '#lib/utils/try-catch.js';
import { toast } from 'svelte-sonner';
import { onMount, onDestroy, tick } from 'svelte';
@@ -112,7 +112,10 @@
});
let destroyed = false;
+ let scanReportError = $state<string | null>(null);
+
async function handleScanImage() {
+ scanReportError = null;
if (!canScanImage || !image?.id || isLoading.scanning) return;
const environmentId = currentEnvId;
const requestedImageId = image.id;
@@ -239,9 +242,7 @@
if (destroyed || !vulnerabilityManagementEnabled || environmentId !== currentEnvId || requestedImageId !== image.id)
return;
if (operationResult2.error !== null) {
- const error = operationResult2.error;
-
- console.error('Failed to load scan result:', error);
+ scanReportError = extractApiErrorMessage(operationResult2.error);
queryClient.setQueryData(requestedKey, {
...(vulnerabilityScan ?? {}),
imageId: resolvedSummary.imageId,
@@ -252,6 +253,7 @@
error: resolvedSummary.error
} as VulnerabilityScanResult);
} else {
+ scanReportError = null;
queryClient.setQueryData(requestedKey, operationResult2.data);
}
if (showToast) {
@@ -499,7 +501,12 @@
</Tabs.Content>
{#if vulnerabilityManagementEnabled}
<Tabs.Content value="vulnerabilities">
- <VulnerabilityScanPanel scan={vulnerabilityScan} isScanning={isLoading.scanning} onScan={handleScanImage} />
+ <VulnerabilityScanPanel
+ scan={vulnerabilityScan}
+ reportError={scanReportError}
+ isScanning={isLoading.scanning}
+ onScan={handleScanImage}
+ />
</Tabs.Content>
{/if}
</Tabs.Root>
diff --git a/frontend/src/routes/(app)/images/image-table.svelte b/frontend/src/routes/(app)/images/image-table.svelte
index 0c4edc223..aac3f1b46 100644
--- a/frontend/src/routes/(app)/images/image-table.svelte
+++ b/frontend/src/routes/(app)/images/image-table.svelte
@@ -13,7 +13,7 @@
import { inUseBadge } from '#lib/utils/mobile-card-badges.js';
import { openConfirmDialog } from '#lib/components/confirm-dialog/index.js';
import { Badge } from '#lib/components/ui/badge/index.js';
- import { handleApiResultWithCallbacks } from '#lib/utils/api.js';
+ import { handleApiResultWithCallbacks, extractApiErrorMessage } from '#lib/utils/api.js';
import { tryCatch } from '#lib/utils/try-catch.js';
import ImageUpdateItem from '#lib/components/image-update-item.svelte';
import VulnerabilityScanItem from '#lib/components/vulnerability/vulnerability-scan-item.svelte';
@@ -298,6 +298,8 @@
.map((item) => item.id);
}
+ let scanPollError = $state<string | null>(null);
+
async function pollBatchScanSummaries() {
const requestedEnvId = currentEnvId;
const imageIds = getScanningImageIds();
@@ -352,10 +354,7 @@
}
})()
);
- if (operationResult.error !== null) {
- const error = operationResult.error;
- console.error('Failed to poll vulnerability summaries:', error);
- }
+ scanPollError = operationResult.error !== null ? extractApiErrorMessage(operationResult.error) : null;
} finally {
scanPollInFlight = false;
if (!destroyed && getScanningImageIds().length > 0) {
@@ -640,6 +639,7 @@
<VulnerabilityScanItem
scanSummary={item.vulnerabilityScan}
imageId={item.id}
+ pollError={scanPollError}
onScanned={(newSummary) => handleVulnerabilityScanChanged(item.id, newSummary)}
/>
</div>
diff --git a/frontend/src/routes/(app)/security/security-vulnerability-table.svelte b/frontend/src/routes/(app)/security/security-vulnerability-table.svelte
index 0ce15501b..5a937fdec 100644
--- a/frontend/src/routes/(app)/security/security-vulnerability-table.svelte
+++ b/frontend/src/routes/(app)/security/security-vulnerability-table.svelte
@@ -21,6 +21,7 @@
import { Switch } from '#lib/components/ui/switch/index.js';
import { Label } from '#lib/components/ui/label/index.js';
import { toast } from 'svelte-sonner';
+ import { handleApiResultWithCallbacks } from '#lib/utils/api.js';
import { onMount } from 'svelte';
import { environmentStore } from '#lib/stores/environment.store.svelte.js';
import { hasPermission } from '#lib/utils/auth.js';
@@ -99,14 +100,11 @@
return optionsResponse;
})()
);
- if (operationResult.error !== null) {
- const error = operationResult.error;
-
- console.error('Failed to refresh vulnerability image filter options:', error);
- return imageNameFilterOptions;
- } else {
- return operationResult.data;
- }
+ await handleApiResultWithCallbacks({
+ result: operationResult,
+ message: m.common_refresh_failed({ resource: m.vuln_image_filter_options() })
+ });
+ return operationResult.error !== null ? imageNameFilterOptions : operationResult.data;
}
async function refreshVulnerabilityTable(options: SearchPaginationSortRequest) {
diff --git a/frontend/src/routes/(app)/settings/+page.svelte b/frontend/src/routes/(app)/settings/+page.svelte
index 26eeb04a0..386c8e8a5 100644
--- a/frontend/src/routes/(app)/settings/+page.svelte
+++ b/frontend/src/routes/(app)/settings/+page.svelte
@@ -1,5 +1,6 @@
<script lang="ts">
import { tryCatch } from '#lib/utils/try-catch.js';
+ import { handleApiResultWithCallbacks } from '#lib/utils/api.js';
import type { PageProps } from './$types';
import { goto } from '$app/navigation';
@@ -37,8 +38,7 @@
const permissionsManifest = $derived(data.permissionsManifest);
const categorySearch = useCategorySearch<SettingsCategory>({
search: (query) => settingsSearchService.search(query),
- filter: isAccessibleCategory,
- onError: (error) => console.error('Search failed:', error)
+ filter: isAccessibleCategory
});
const iconMap: Record<string, any> = {
@@ -101,19 +101,13 @@
} as const;
onMount(async () => {
- const operationResult = await tryCatch(
- (async () => {
- settingsCategories = orderCategoriesByNav(
- (await settingsSearchService.getCategories()).filter(isAccessibleCategory),
- getSettingsSubpageUrlsInNavOrder()
- );
- })()
- );
- if (operationResult.error !== null) {
- const error = operationResult.error;
-
- console.error('Failed to load categories:', error);
- }
+ await handleApiResultWithCallbacks({
+ result: await tryCatch(settingsSearchService.getCategories()),
+ message: m.common_load_failed({ resource: m.settings() }),
+ onSuccess: (categories) => {
+ settingsCategories = orderCategoriesByNav(categories.filter(isAccessibleCategory), getSettingsSubpageUrlsInNavOrder());
+ }
+ });
});
function navigateToCategory(categoryUrl: string) {
@@ -170,6 +164,9 @@
get isSearching() {
return categorySearch.isSearching;
},
+ get searchError() {
+ return categorySearch.searchError;
+ },
performSearch: categorySearch.performSearch,
debouncedSearch: categorySearch.debouncedSearch,
clearSearch: categorySearch.clearSearch
@@ -183,6 +180,7 @@
searchPlaceholder={m.settings_search_placeholder()}
clearSearchLabel={m.common_clear_search()}
searchingLabel={m.searching()}
+ searchFailedLabel={m.common_search_failed()}
noResultsTitle={m.settings_no_results()}
noResultsDescription={m.settings_no_results_description()}
matchingItemsLabel={m.settings_matching_settings()}
diff --git a/frontend/src/routes/(app)/settings/api-keys/+page.svelte b/frontend/src/routes/(app)/settings/api-keys/+page.svelte
index 098e500e6..a67e1bcb9 100644
--- a/frontend/src/routes/(app)/settings/api-keys/+page.svelte
+++ b/frontend/src/routes/(app)/settings/api-keys/+page.svelte
@@ -45,6 +45,16 @@
isDialogOpen.edit = true;
}
+ async function refreshApiKeys() {
+ await handleApiResultWithCallbacks({
+ result: await tryCatch(apiKeyService.getApiKeys(requestOptions)),
+ message: m.common_refresh_failed({ resource: m.api_key_page_title() }),
+ onSuccess: (list) => {
+ apiKeys = list;
+ }
+ });
+ }
+
async function handleApiKeySubmit({
apiKey,
isEditMode,
@@ -56,45 +66,33 @@
}) {
const loading = isEditMode ? 'editing' : 'creating';
isLoading[loading] = true;
+ const safeName = apiKey.name?.trim() || 'Unknown';
- const operationResult = await tryCatch(
- (async () => {
- if (isEditMode && apiKeyId) {
- const safeName = apiKey.name?.trim() || 'Unknown';
- const result = await tryCatch(apiKeyService.update(apiKeyId, apiKey));
- await handleApiResultWithCallbacks({
- result,
- message: m.api_key_update_failed({ name: safeName }),
- setLoadingState: (value) => (isLoading[loading] = value),
- onSuccess: async () => {
- toast.success(m.api_key_updated_success({ name: safeName }));
- apiKeys = await apiKeyService.getApiKeys(requestOptions);
- isDialogOpen.edit = false;
- apiKeyToEdit = null;
- }
- });
- } else {
- const safeName = apiKey.name?.trim() || 'Unknown';
- const result = await tryCatch(apiKeyService.create({ ...apiKey, permissions: apiKey.permissions ?? [] }));
- await handleApiResultWithCallbacks({
- result,
- message: m.api_key_create_failed({ name: safeName }),
- setLoadingState: (value) => (isLoading[loading] = value),
- onSuccess: async (createdKey) => {
- toast.success(m.api_key_created_success({ name: safeName }));
- apiKeys = await apiKeyService.getApiKeys(requestOptions);
- isDialogOpen.create = false;
- newlyCreatedKey = createdKey as ApiKeyCreated;
- isDialogOpen.showKey = true;
- }
- });
+ if (isEditMode && apiKeyId) {
+ await handleApiResultWithCallbacks({
+ result: await tryCatch(apiKeyService.update(apiKeyId, apiKey)),
+ message: m.api_key_update_failed({ name: safeName }),
+ setLoadingState: (value) => (isLoading[loading] = value),
+ onSuccess: async () => {
+ toast.success(m.api_key_updated_success({ name: safeName }));
+ isDialogOpen.edit = false;
+ apiKeyToEdit = null;
+ await refreshApiKeys();
}
- })()
- );
- if (operationResult.error !== null) {
- const error = operationResult.error;
-
- console.error('Failed to submit API key:', error);
+ });
+ } else {
+ await handleApiResultWithCallbacks({
+ result: await tryCatch(apiKeyService.create({ ...apiKey, permissions: apiKey.permissions ?? [] })),
+ message: m.api_key_create_failed({ name: safeName }),
+ setLoadingState: (value) => (isLoading[loading] = value),
+ onSuccess: async (createdKey) => {
+ toast.success(m.api_key_created_success({ name: safeName }));
+ isDialogOpen.create = false;
+ newlyCreatedKey = createdKey as ApiKeyCreated;
+ isDialogOpen.showKey = true;
+ await refreshApiKeys();
+ }
+ });
}
}
diff --git a/frontend/src/routes/(app)/settings/authentication/+page.svelte b/frontend/src/routes/(app)/settings/authentication/+page.svelte
index ddaf9a6ce..1803b0579 100644
--- a/frontend/src/routes/(app)/settings/authentication/+page.svelte
+++ b/frontend/src/routes/(app)/settings/authentication/+page.svelte
@@ -6,6 +6,7 @@
import { ArcaneButton } from '#lib/components/arcane-button/index.js';
import { Switch } from '#lib/components/ui/switch/index.js';
import TextInputWithLabel from '#lib/components/form/text-input-with-label.svelte';
+ import SwitchWithLabel from '#lib/components/form/labeled-switch.svelte';
import { toast } from 'svelte-sonner';
import type { Settings } from '#lib/types/settings.js';
import * as ArcaneTooltip from '#lib/components/arcane-tooltip/index.js';
@@ -16,6 +17,7 @@
import { SettingsPageLayout } from '#lib/layouts/index.js';
import { CopyButton } from '#lib/components/ui/copy-button/index.js';
import { createSettingsForm } from '#lib/utils/settings-form.js';
+ import { settingsService } from '#lib/services/settings-service.js';
import * as Alert from '#lib/components/ui/alert/index.js';
import * as Collapsible from '#lib/components/ui/collapsible/index.js';
import SettingsRow from '#lib/components/settings/settings-row.svelte';
@@ -125,6 +127,7 @@
oidcAutoRedirectToProvider: z.boolean(),
oidcClientId: z.string(),
oidcClientSecret: z.string(),
+ oidcClearClientSecret: z.boolean(),
oidcIssuerUrl: z.string(),
oidcScopes: z.string(),
oidcGroupsClaim: z.string(),
@@ -133,57 +136,65 @@
})
.superRefine((formData, ctx) => {
const oidcEnabledForAuthValidation = data.oidcStatus.envForced ? currentSettings.oidcEnabled : formData.oidcEnabled;
- if (oidcEnabledForAuthValidation) return;
- if (!formData.authLocalEnabled) {
+ if (!oidcEnabledForAuthValidation && !formData.authLocalEnabled) {
ctx.addIssue({
code: 'custom',
message: m.security_enable_one_provider(),
path: ['authLocalEnabled']
});
}
+ if (formData.oidcEnabled && !data.oidcStatus.envForced) {
+ for (const field of ['oidcClientId', 'oidcIssuerUrl'] as const) {
+ if (!formData[field].trim()) {
+ ctx.addIssue({ code: 'custom', message: m.security_oidc_required_fields(), path: [field] });
+ }
+ }
+ if ((!currentSettings.oidcClientSecret || formData.oidcClearClientSecret) && !formData.oidcClientSecret.trim()) {
+ ctx.addIssue({ code: 'custom', message: m.security_oidc_required_fields(), path: ['oidcClientSecret'] });
+ }
+ }
});
let showMergeAccountsAlert = $state(false);
- let oidcConfigOpen = $state(false);
-
- const formDefaults = $derived({
- authLocalEnabled: currentSettings.authLocalEnabled,
- authSessionTimeout: currentSettings.authSessionTimeout,
- authPasswordPolicy: currentSettings.authPasswordPolicy,
- oidcEnabled: currentSettings.oidcEnabled,
- oidcMergeAccounts: currentSettings.oidcMergeAccounts,
- oidcSkipTlsVerify: currentSettings.oidcSkipTlsVerify,
- oidcAutoRedirectToProvider: currentSettings.oidcAutoRedirectToProvider,
- oidcClientId: currentSettings.oidcClientId,
- oidcClientSecret: '',
- oidcIssuerUrl: currentSettings.oidcIssuerUrl,
- oidcScopes: currentSettings.oidcScopes,
- oidcGroupsClaim: currentSettings.oidcGroupsClaim,
- oidcProviderName: currentSettings.oidcProviderName,
- oidcProviderLogoUrl: currentSettings.oidcProviderLogoUrl
- });
- const { formInputs, form, settingsForm } = untrack(() =>
+ function readFormValues() {
+ const source = settingsStore.current || data.settings!;
+ return {
+ authLocalEnabled: source.authLocalEnabled,
+ authSessionTimeout: source.authSessionTimeout,
+ authPasswordPolicy: source.authPasswordPolicy,
+ oidcEnabled: source.oidcEnabled,
+ oidcMergeAccounts: source.oidcMergeAccounts,
+ oidcSkipTlsVerify: source.oidcSkipTlsVerify,
+ oidcAutoRedirectToProvider: source.oidcAutoRedirectToProvider,
+ oidcClientId: source.oidcClientId,
+ oidcClientSecret: '',
+ oidcClearClientSecret: false,
+ oidcIssuerUrl: source.oidcIssuerUrl,
+ oidcScopes: source.oidcScopes,
+ oidcGroupsClaim: source.oidcGroupsClaim,
+ oidcProviderName: source.oidcProviderName,
+ oidcProviderLogoUrl: source.oidcProviderLogoUrl
+ };
+ }
+
+ const { formInputs } = untrack(() =>
createSettingsForm({
schema: formSchema,
- currentSettings: formDefaults,
- getCurrentSettings: () => ({
- authLocalEnabled: (settingsStore.current || data.settings!).authLocalEnabled,
- authSessionTimeout: (settingsStore.current || data.settings!).authSessionTimeout,
- authPasswordPolicy: (settingsStore.current || data.settings!).authPasswordPolicy,
- oidcEnabled: (settingsStore.current || data.settings!).oidcEnabled,
- oidcMergeAccounts: (settingsStore.current || data.settings!).oidcMergeAccounts,
- oidcSkipTlsVerify: (settingsStore.current || data.settings!).oidcSkipTlsVerify,
- oidcAutoRedirectToProvider: (settingsStore.current || data.settings!).oidcAutoRedirectToProvider,
- oidcClientId: (settingsStore.current || data.settings!).oidcClientId,
- oidcClientSecret: '',
- oidcIssuerUrl: (settingsStore.current || data.settings!).oidcIssuerUrl,
- oidcScopes: (settingsStore.current || data.settings!).oidcScopes,
- oidcGroupsClaim: (settingsStore.current || data.settings!).oidcGroupsClaim,
- oidcProviderName: (settingsStore.current || data.settings!).oidcProviderName,
- oidcProviderLogoUrl: (settingsStore.current || data.settings!).oidcProviderLogoUrl
- }),
- successMessage: m.security_settings_saved()
+ currentSettings: readFormValues(),
+ getCurrentSettings: readFormValues,
+ onSave: async ({ oidcClientSecret, oidcClearClientSecret, ...rest }) => {
+ const payload: Partial<Settings> = rest;
+ if (oidcClearClientSecret) payload.oidcClientSecret = '';
+ else if (oidcClientSecret) payload.oidcClientSecret = oidcClientSecret;
+ await settingsService.updateSettings(payload);
+ },
+ onSuccess: () => {
+ formInputs.oidcClientSecret.value = '';
+ formInputs.oidcClearClientSecret.value = false;
+ },
+ successMessage: m.security_settings_saved(),
+ errorMessage: m.security_settings_save_failed()
})
);
@@ -195,61 +206,11 @@
isOidcEnvForced ? currentSettings.oidcEnabled : formInputs.oidcEnabled.value
);
const showOidcDetails = $derived(formInputs.oidcEnabled.value || isOidcForcedEnabled);
+ const hasStoredClientSecret = $derived(!!currentSettings.oidcClientSecret);
- async function customSubmit() {
- const formData = form.validate();
- if (!formData) {
- toast.error(m.security_form_validation_error());
- return;
- }
-
- if (formData.oidcEnabled && !isOidcEnvForced) {
- if (!formData.oidcClientId || !formData.oidcIssuerUrl) {
- toast.error(m.security_oidc_required_fields());
- return;
- }
- }
-
- settingsForm.setLoading(true);
-
- try {
- const operationResult = await tryCatch(
- (async () => {
- await settingsForm.updateSettings({
- authLocalEnabled: formData.authLocalEnabled,
- authSessionTimeout: formData.authSessionTimeout,
- authPasswordPolicy: formData.authPasswordPolicy,
- oidcEnabled: formData.oidcEnabled,
- oidcMergeAccounts: formData.oidcMergeAccounts,
- oidcSkipTlsVerify: formData.oidcSkipTlsVerify,
- oidcAutoRedirectToProvider: formData.oidcAutoRedirectToProvider,
- oidcClientId: formData.oidcClientId,
- oidcIssuerUrl: formData.oidcIssuerUrl,
- oidcScopes: formData.oidcScopes,
- oidcGroupsClaim: formData.oidcGroupsClaim,
- oidcProviderName: formData.oidcProviderName,
- oidcProviderLogoUrl: formData.oidcProviderLogoUrl,
- ...(formData.oidcClientSecret && { oidcClientSecret: formData.oidcClientSecret })
- });
- formInputs.oidcClientSecret.value = '';
- toast.success(m.security_settings_saved());
- })()
- );
- if (operationResult.error !== null) {
- const error = operationResult.error;
-
- console.error('Failed to save settings:', error);
- toast.error(m.security_settings_save_failed());
- }
- } finally {
- settingsForm.setLoading(false);
- }
- }
-
- function customReset() {
- form.reset(formDefaults);
- formInputs.oidcClientSecret.value = '';
- }
+ let oidcConfigOpen = $derived(
+ !!(formInputs.oidcClientId.error || formInputs.oidcClientSecret.error || formInputs.oidcIssuerUrl.error)
+ );
function handleLocalSwitchChange(checked: boolean) {
if (!checked && !isOidcEnabledForAuthValidation) {
@@ -285,8 +246,6 @@
formInputs.oidcMergeAccounts.value = false;
showMergeAccountsAlert = false;
}
-
- settingsForm.registerFormActions(customSubmit, customReset);
</script>
{#snippet passwordPolicyOption(value: 'basic' | 'standard' | 'strong', label: string, tooltip: string)}
@@ -412,13 +371,21 @@
type="password"
label={m.oidc_client_secret_label()}
placeholder={m.oidc_client_secret_placeholder()}
- disabled={isOidcEnvForced}
+ disabled={isOidcEnvForced || formInputs.oidcClearClientSecret.value}
bind:value={formInputs.oidcClientSecret.value}
error={formInputs.oidcClientSecret.error}
helpText={m.security_oidc_client_secret_help()}
/>
</div>
+ {#if hasStoredClientSecret && !isOidcEnvForced}
+ <SwitchWithLabel
+ id="clearOidcClientSecret"
+ label={m.security_oidc_clear_client_secret()}
+ bind:checked={formInputs.oidcClearClientSecret.value}
+ />
+ {/if}
+
<TextInputWithLabel
id="oidcIssuerUrl"
label={m.oidc_issuer_url_label()}
diff --git a/frontend/src/routes/(app)/settings/authentication/federated-credentials-tab.svelte b/frontend/src/routes/(app)/settings/authentication/federated-credentials-tab.svelte
index fee860b6a..91cc6a477 100644
--- a/frontend/src/routes/(app)/settings/authentication/federated-credentials-tab.svelte
+++ b/frontend/src/routes/(app)/settings/authentication/federated-credentials-tab.svelte
@@ -53,7 +53,13 @@
}
async function refreshFederatedCredentials() {
- federatedCredentials = await federatedCredentialService.list(requestOptions);
+ await handleApiResultWithCallbacks({
+ result: await tryCatch(federatedCredentialService.list(requestOptions)),
+ message: m.common_refresh_failed({ resource: m.federated_credential_page_title() }),
+ onSuccess: (list) => {
+ federatedCredentials = list;
+ }
+ });
}
async function handleFederatedCredentialSubmit({
@@ -68,43 +74,34 @@
const loading = isEditMode ? 'editing' : 'creating';
isLoading[loading] = true;
- const operationResult = await tryCatch(
- (async () => {
- const safeName = credential.name?.trim() || m.common_unknown();
- if (isEditMode && credentialId) {
- const result = await tryCatch(federatedCredentialService.update(credentialId, credential));
- await handleApiResultWithCallbacks({
- result,
- message: m.federated_credential_update_failed({ name: safeName }),
- setLoadingState: (value) => (isLoading[loading] = value),
- onSuccess: async () => {
- toast.success(m.federated_credential_updated_success({ name: safeName }));
- await refreshFederatedCredentials();
- isDialogOpen.edit = false;
- credentialToEdit = null;
- }
- });
- } else {
- const result = await tryCatch(federatedCredentialService.create(credential));
- await handleApiResultWithCallbacks({
- result,
- message: m.federated_credential_create_failed({ name: safeName }),
- setLoadingState: (value) => (isLoading[loading] = value),
- onSuccess: async (createdCredential) => {
- toast.success(m.federated_credential_created_success({ name: safeName }));
- await refreshFederatedCredentials();
- isDialogOpen.create = false;
- newlyCreatedCredential = createdCredential as FederatedCredential;
- isDialogOpen.instructions = true;
- }
- });
+ const safeName = credential.name?.trim() || m.common_unknown();
+ if (isEditMode && credentialId) {
+ const result = await tryCatch(federatedCredentialService.update(credentialId, credential));
+ await handleApiResultWithCallbacks({
+ result,
+ message: m.federated_credential_update_failed({ name: safeName }),
+ setLoadingState: (value) => (isLoading[loading] = value),
+ onSuccess: async () => {
+ toast.success(m.federated_credential_updated_success({ name: safeName }));
+ await refreshFederatedCredentials();
+ isDialogOpen.edit = false;
+ credentialToEdit = null;
}
- })()
- );
- if (operationResult.error !== null) {
- const error = operationResult.error;
-
- console.error('Failed to submit federated credential:', error);
+ });
+ } else {
+ const result = await tryCatch(federatedCredentialService.create(credential));
+ await handleApiResultWithCallbacks({
+ result,
+ message: m.federated_credential_create_failed({ name: safeName }),
+ setLoadingState: (value) => (isLoading[loading] = value),
+ onSuccess: async (createdCredential) => {
+ toast.success(m.federated_credential_created_success({ name: safeName }));
+ await refreshFederatedCredentials();
+ isDialogOpen.create = false;
+ newlyCreatedCredential = createdCredential as FederatedCredential;
+ isDialogOpen.instructions = true;
+ }
+ });
}
}
diff --git a/frontend/src/routes/(app)/settings/users/+page.svelte b/frontend/src/routes/(app)/settings/users/+page.svelte
index 18dae7346..deaaa2845 100644
--- a/frontend/src/routes/(app)/settings/users/+page.svelte
+++ b/frontend/src/routes/(app)/settings/users/+page.svelte
@@ -63,11 +63,21 @@
isDialogOpen.edit = true;
}
+ async function refreshUsers() {
+ await handleApiResultWithCallbacks({
+ result: await tryCatch(userService.getUsers(requestOptions)),
+ message: m.common_refresh_failed({ resource: m.users_title() }),
+ onSuccess: (list) => {
+ users = list;
+ }
+ });
+ }
+
async function completeUserEdit(username: string) {
toast.success(m.common_update_success({ resource: `${m.resource_user()} "${username}"` }));
- users = await userService.getUsers(requestOptions);
isDialogOpen.edit = false;
userToEdit = null;
+ await refreshUsers();
}
async function handleUserSubmit({
@@ -84,82 +94,88 @@
}): Promise<boolean> {
const loading = isEditMode ? 'editing' : 'creating';
isLoading[loading] = true;
+ let assignmentsFailed = false;
- const operationResult = await tryCatch(
- (async () => {
- if (isEditMode && userId) {
- const safeUsername = userToEdit?.username || m.common_unknown();
- // Split: profile fields go to PUT /users/{id}; role assignments
- // go to PUT /users/{id}/role-assignments (separate endpoint).
- const { roleAssignments, ...profile } = user;
+ if (isEditMode && userId) {
+ const safeUsername = userToEdit?.username || m.common_unknown();
+ // Split: profile fields go to PUT /users/{id}; role assignments
+ // go to PUT /users/{id}/role-assignments (separate endpoint).
+ const { roleAssignments, ...profile } = user;
- // OIDC users submit role assignments only — skip the empty profile PUT.
- if (Object.keys(profile).length === 0 && isAdmin && roleAssignments) {
+ // OIDC users submit role assignments only — skip the empty profile PUT.
+ if (Object.keys(profile).length === 0 && isAdmin && roleAssignments) {
+ const assignmentsResult = await tryCatch(roleService.setUserAssignments(userId, { assignments: roleAssignments }));
+ await handleApiResultWithCallbacks({
+ result: assignmentsResult,
+ message: m.common_update_failed({ resource: `${m.resource_user()} "${safeUsername}"` }),
+ setLoadingState: (value) => (isLoading[loading] = value),
+ onSuccess: async () => {
+ await completeUserEdit(safeUsername);
+ }
+ });
+ return !assignmentsResult.error;
+ }
+
+ const result = await tryCatch(userService.update(userId, profile));
+ await handleApiResultWithCallbacks({
+ result,
+ message: m.common_update_failed({ resource: `${m.resource_user()} "${safeUsername}"` }),
+ setLoadingState: (value) => (isLoading[loading] = value),
+ onSuccess: async () => {
+ if (isAdmin && roleAssignments) {
const assignmentsResult = await tryCatch(roleService.setUserAssignments(userId, { assignments: roleAssignments }));
await handleApiResultWithCallbacks({
result: assignmentsResult,
- message: m.common_update_failed({ resource: `${m.resource_user()} "${safeUsername}"` }),
- setLoadingState: (value) => (isLoading[loading] = value),
- onSuccess: async () => {
- await completeUserEdit(safeUsername);
- }
+ message: m.common_update_failed({ resource: `${m.resource_user()} "${safeUsername}"` })
});
- return !assignmentsResult.error;
- }
-
- const result = await tryCatch(userService.update(userId, profile));
- await handleApiResultWithCallbacks({
- result,
- message: m.common_update_failed({ resource: `${m.resource_user()} "${safeUsername}"` }),
- setLoadingState: (value) => (isLoading[loading] = value),
- onSuccess: async () => {
- if (isAdmin && roleAssignments) {
- await roleService.setUserAssignments(userId, { assignments: roleAssignments });
- }
- await completeUserEdit(safeUsername);
- }
- });
- return !result.error;
- } else {
- if (!user.username) {
- toast.error(m.common_username_required());
- isLoading[loading] = false;
- return false;
+ assignmentsFailed = assignmentsResult.error !== null;
+ if (assignmentsFailed) return;
}
+ await completeUserEdit(safeUsername);
+ }
+ });
+ return !result.error && !assignmentsFailed;
+ } else {
+ if (!user.username) {
+ toast.error(m.common_username_required());
+ isLoading[loading] = false;
+ return false;
+ }
- const safeUsername = user.username!.trim() || m.common_unknown();
+ const safeUsername = user.username!.trim() || m.common_unknown();
- const createUser: CreateUser = {
- username: user.username!,
- displayName: user.displayName,
- email: user.email,
- password: user.password!
- };
+ const createUser: CreateUser = {
+ username: user.username!,
+ displayName: user.displayName,
+ email: user.email,
+ password: user.password!
+ };
- const result = await tryCatch(userService.create(createUser));
- await handleApiResultWithCallbacks({
- result,
- message: m.common_create_failed({ resource: `${m.resource_user()} "${safeUsername}"` }),
- setLoadingState: (value) => (isLoading[loading] = value),
- onSuccess: async (created) => {
- if (isAdmin && user.roleAssignments && created?.id) {
- await roleService.setUserAssignments(created.id, { assignments: user.roleAssignments });
- }
- toast.success(m.common_create_success({ resource: `${m.resource_user()} "${safeUsername}"` }));
- users = await userService.getUsers(requestOptions);
- isDialogOpen.create = false;
- }
- });
- return !result.error;
+ const result = await tryCatch(userService.create(createUser));
+ await handleApiResultWithCallbacks({
+ result,
+ message: m.common_create_failed({ resource: `${m.resource_user()} "${safeUsername}"` }),
+ setLoadingState: (value) => (isLoading[loading] = value),
+ onSuccess: async (created) => {
+ if (isAdmin && user.roleAssignments && created?.id) {
+ const assignmentsResult = await tryCatch(
+ roleService.setUserAssignments(created.id, { assignments: user.roleAssignments })
+ );
+ await handleApiResultWithCallbacks({
+ result: assignmentsResult,
+ message: m.common_update_failed({ resource: `${m.resource_user()} "${safeUsername}"` })
+ });
+ assignmentsFailed = assignmentsResult.error !== null;
+ }
+ if (!assignmentsFailed) {
+ toast.success(m.common_create_success({ resource: `${m.resource_user()} "${safeUsername}"` }));
+ }
+ isDialogOpen.create = false;
+ await refreshUsers();
}
- })()
- );
- if (operationResult.error !== null) {
- const error = operationResult.error;
- console.error('Failed to submit user:', error);
- return false;
+ });
+ return !result.error;
}
- return operationResult.data;
}
// Avatar policy: server-wide settings that belong with user management.
@@ -261,9 +277,7 @@
bind:selectedIds
bind:requestOptions
roles={data.roles}
- onUsersChanged={async () => {
- users = await userService.getUsers(requestOptions);
- }}
+ onUsersChanged={refreshUsers}
onEditUser={openEditDialog}
/>
{/snippet}
diff --git a/frontend/src/routes/(app)/volumes/volume-table.svelte b/frontend/src/routes/(app)/volumes/volume-table.svelte
index 644ee0af2..580af2cb0 100644
--- a/frontend/src/routes/(app)/volumes/volume-table.svelte
+++ b/frontend/src/routes/(app)/volumes/volume-table.svelte
@@ -6,7 +6,7 @@
import { toast } from 'svelte-sonner';
import { openConfirmDialog } from '#lib/components/confirm-dialog/index.js';
import InUseStatus from '#lib/components/arcane-table/cells/in-use-status.svelte';
- import { handleApiResultWithCallbacks } from '#lib/utils/api.js';
+ import { handleApiResultWithCallbacks, extractApiErrorMessage } from '#lib/utils/api.js';
import { tryCatch } from '#lib/utils/try-catch.js';
import { formatDateTimeShort, truncateString } from '#lib/utils/formatting.js';
import type { Paginated, SearchPaginationSortRequest } from '#lib/types/shared.js';
@@ -139,14 +139,10 @@
return cache.subscribe((event) => {
if (event.type !== 'updated') return;
if (event.query !== cache.find({ queryKey: queryKeys.volumes.sizes(currentEnvId), exact: true })) return;
- if (event.action.type === 'error') {
- console.error('Failed to load volume sizes:', event.query.state.error);
- return;
- }
if (event.action.type === 'success' && sizesEnabled && requestOptions?.sort?.column === 'size') {
- void tryCatch(refreshVolumes(requestOptions, false)).then((result) => {
- if (result.error) console.error('Failed to refresh volume size sorting:', result.error);
- });
+ void tryCatch(refreshVolumes(requestOptions, false)).then((result) =>
+ handleApiResultWithCallbacks({ result, message: m.common_refresh_failed({ resource: m.resource_volumes_cap() }) })
+ );
}
});
});
@@ -288,6 +284,8 @@
{/if}
{:else if item.size > 0}
<span class="text-sm tabular-nums">{bytes.format(item.size)}</span>
+ {:else if sizesEnabled && sizesQuery.isError}
+ <span class="text-sm text-muted-foreground" title={extractApiErrorMessage(sizesQuery.error)}>{m.common_unavailable()}</span>
{:else}
<span class="text-sm text-muted-foreground">-</span>
{/if}
diff --git a/frontend/src/routes/(auth)/login/+page.svelte b/frontend/src/routes/(auth)/login/+page.svelte
index 58f29614a..4452bf243 100644
--- a/frontend/src/routes/(auth)/login/+page.svelte
+++ b/frontend/src/routes/(auth)/login/+page.svelte
@@ -182,7 +182,9 @@
<AlertIcon class="size-4" />
<Alert.Title>{m.auth_login_problem_title()}</Alert.Title>
<Alert.Description>
- {#if data.error === 'oidc_invalid_response'}
+ {#if data.errorMessage}
+ {data.errorMessage}
+ {:else if data.error === 'oidc_invalid_response'}
{m.auth_oidc_invalid_response()}
{:else if data.error === 'oidc_misconfigured'}
{m.auth_oidc_misconfigured()}
@@ -196,8 +198,12 @@
{m.auth_oidc_token_error()}
{:else if data.error === 'user_processing_failed'}
{m.auth_user_processing_failed()}
- {:else if data.errorMessage}
- {data.errorMessage}
+ {:else if data.error === 'oidc_init_failed'}
+ {m.auth_oidc_init_failed()}
+ {:else if data.error === 'oidc_url_generation_failed'}
+ {m.auth_oidc_url_generation_failed()}
+ {:else if data.error === 'oidc_network_error'}
+ {m.auth_oidc_network_error()}
{:else}
{m.auth_unexpected_error()}
{/if}
diff --git a/frontend/src/routes/(auth)/login/+page.ts b/frontend/src/routes/(auth)/login/+page.ts
index 9cd3ba048..fd1f5d8c3 100644
--- a/frontend/src/routes/(auth)/login/+page.ts
+++ b/frontend/src/routes/(auth)/login/+page.ts
@@ -1,5 +1,6 @@
import { tryCatch } from '#lib/utils/try-catch.js';
import { redirect } from '@sveltejs/kit';
+import { browser } from '$app/env';
import { getEffectiveLandingPage } from '#lib/utils/navigation.js';
import { passkeyService } from '#lib/services/passkey-service.js';
@@ -22,8 +23,13 @@ export const load = async ({ parent, url }) => {
);
const error = url.searchParams.get('error');
+ const storedErrorMessage = browser ? sessionStorage.getItem('oidc_login_error') : null;
+ if (storedErrorMessage) sessionStorage.removeItem('oidc_login_error');
const errorMessage =
- url.searchParams.get('message') || url.searchParams.get('error_message') || url.searchParams.get('errorMessage');
+ url.searchParams.get('message') ||
+ url.searchParams.get('error_message') ||
+ url.searchParams.get('errorMessage') ||
+ storedErrorMessage;
return {
passkeyLoginAvailable: passkeyAvailability?.available === true,
diff --git a/frontend/src/routes/(auth)/oidc/login/+page.svelte b/frontend/src/routes/(auth)/oidc/login/+page.svelte
index 8ee95bd2e..7cd109f74 100644
--- a/frontend/src/routes/(auth)/oidc/login/+page.svelte
+++ b/frontend/src/routes/(auth)/oidc/login/+page.svelte
@@ -4,6 +4,7 @@
import { page } from '$app/state';
import { m } from '#lib/paraglide/messages.js';
import { authService } from '#lib/services/auth-service.js';
+ import { APIError } from '#lib/services/api-service.js';
import OidcStatusPanel from '#lib/components/oidc-status-panel.svelte';
import { createMutation } from '@tanstack/svelte-query';
@@ -32,24 +33,25 @@
}
window.location.href = authUrl;
},
- onError: (err: any) => {
- console.error('OIDC login initiation error:', err);
-
- let userMessage = m.auth_oidc_init_failed();
+ onError: (err: unknown) => {
+ const serverMessage = err instanceof APIError && err.response ? err.message.trim() : '';
+ const text = err instanceof Error ? err.message : '';
+ let fallback = m.auth_oidc_init_failed();
let redirectError = 'oidc_init_failed';
- if (err.message === 'oidc_url_generation_failed') {
- userMessage = m.auth_oidc_url_generation_failed();
+ if (text === 'oidc_url_generation_failed') {
+ fallback = m.auth_oidc_url_generation_failed();
redirectError = 'oidc_url_generation_failed';
- } else if (err.message?.includes('discovery')) {
- userMessage = m.auth_oidc_misconfigured();
+ } else if (text.includes('discovery')) {
+ fallback = m.auth_oidc_misconfigured();
redirectError = 'oidc_misconfigured';
- } else if (err.message?.includes('network') || err.message?.includes('timeout')) {
- userMessage = m.auth_oidc_network_error();
+ } else if (text.includes('network') || text.includes('timeout') || text.includes('fetch')) {
+ fallback = m.auth_oidc_network_error();
redirectError = 'oidc_network_error';
}
- error = userMessage;
+ error = serverMessage || fallback;
+ if (serverMessage) sessionStorage.setItem('oidc_login_error', serverMessage);
setTimeout(() => goto(`/login?error=${redirectError}`), 3000);
}
}));