Skip to content

Modern Docker Management, Designed for Everyone

refactor: move frontend api calls to use tanstack query (#1710)

Kyle Mendellbf641fb73b51
diff --git a/backend/internal/huma/handlers/appimages.go b/backend/internal/huma/handlers/appimages.go
index 879d1028a..b5730b294 100644
--- a/backend/internal/huma/handlers/appimages.go
+++ b/backend/internal/huma/handlers/appimages.go
@@ -121,10 +121,10 @@ func (h *AppImagesHandler) getImageWithColor(name string, colorOverride string)
return nil, huma.Error500InternalServerError((&common.ImageRetrievalError{Err: err}).Error())
}
- // If color override is provided, don't cache (for preview purposes)
- // Otherwise cache for 15 minutes with stale-while-revalidate for 24 hours
+ // Always disable logo caching so theme/logo updates are reflected immediately.
+ // Keep cache for static app images that do not change at runtime.
cacheControl := "public, max-age=900, stale-while-revalidate=86400"
- if colorOverride != "" {
+ if name == "logo" || name == "logo-full" || colorOverride != "" {
cacheControl = "no-cache, no-store, must-revalidate"
}
diff --git a/frontend/package.json b/frontend/package.json
index f78872c23..96305ca0c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -21,6 +21,7 @@
"@shikijs/monaco": "^3.21.0",
"@sveltejs/adapter-static": "^3.0.10",
"@sveltejs/kit": "^2.49.5",
+ "@tanstack/svelte-query": "^6.0.18",
"@tanstack/table-core": "^8.21.3",
"@xterm/addon-fit": "^0.11.0",
"@xterm/xterm": "^6.0.0",
@@ -43,6 +44,8 @@
"@prettier/plugin-oxc": "^0.1.3",
"@sveltejs/vite-plugin-svelte": "^6.2.4",
"@tailwindcss/vite": "^4.1.18",
+ "@tanstack/eslint-plugin-query": "^5.91.4",
+ "@tanstack/svelte-query-devtools": "^6.0.4",
"@types/bytes": "^3.1.5",
"@types/js-yaml": "^4.0.9",
"@types/node": "^25.0.10",
diff --git a/frontend/src/lib/components/action-buttons.svelte b/frontend/src/lib/components/action-buttons.svelte
index b6827f241..579ca53fd 100644
--- a/frontend/src/lib/components/action-buttons.svelte
+++ b/frontend/src/lib/components/action-buttons.svelte
@@ -13,6 +13,7 @@
import { projectService } from '$lib/services/project-service';
import { isDownloadingLine, calculateOverallProgress, areAllLayersComplete } from '$lib/utils/pull-progress';
import { EllipsisIcon, DownloadIcon } from '$lib/icons';
+ import { createMutation } from '@tanstack/svelte-query';
type TargetType = 'container' | 'project';
type LoadingStates = {
@@ -93,6 +94,57 @@
refresh: !!(isLoading.refresh || loading?.refresh || refreshLoading)
});
+ const startMutation = createMutation(() => ({
+ mutationKey: ['action', 'start', type, id],
+ mutationFn: () => tryCatch(type === 'container' ? containerService.startContainer(id) : projectService.deployProject(id)),
+ onMutate: () => setLoading('start', true),
+ onSettled: () => {
+ if (!deployPulling) {
+ setLoading('start', false);
+ }
+ }
+ }));
+
+ const stopMutation = createMutation(() => ({
+ mutationKey: ['action', 'stop', type, id],
+ mutationFn: () => tryCatch(type === 'container' ? containerService.stopContainer(id) : projectService.downProject(id)),
+ onMutate: () => setLoading('stop', true),
+ onSettled: () => setLoading('stop', false)
+ }));
+
+ const restartMutation = createMutation(() => ({
+ mutationKey: ['action', 'restart', type, id],
+ mutationFn: () => tryCatch(type === 'container' ? containerService.restartContainer(id) : projectService.restartProject(id)),
+ onMutate: () => setLoading('restart', true),
+ onSettled: () => setLoading('restart', false)
+ }));
+
+ const redeployMutation = createMutation(() => ({
+ mutationKey: ['action', 'redeploy', id],
+ mutationFn: () => tryCatch(projectService.redeployProject(id)),
+ onMutate: () => setLoading('redeploy', true),
+ onSettled: () => setLoading('redeploy', false)
+ }));
+
+ const removeMutation = createMutation(() => ({
+ mutationKey: ['action', 'remove', type, id],
+ mutationFn: ({ removeFiles, removeVolumes }: { removeFiles: boolean; removeVolumes: boolean }) =>
+ tryCatch(
+ type === 'container'
+ ? containerService.deleteContainer(id, { volumes: removeVolumes })
+ : projectService.destroyProject(id, removeVolumes, removeFiles)
+ ),
+ onMutate: () => setLoading('remove', true),
+ onSettled: () => setLoading('remove', false)
+ }));
+
+ const refreshMutation = createMutation(() => ({
+ mutationKey: ['action', 'refresh', id],
+ mutationFn: () => tryCatch(Promise.resolve(onRefresh?.())),
+ onMutate: () => setLoading('refresh', true),
+ onSettled: () => setLoading('refresh', false)
+ }));
+
let pullPopoverOpen = $state(false);
let deployPullPopoverOpen = $state(false);
let projectPulling = $state(false); // only for Project Pull button/popover
@@ -181,12 +233,7 @@
async function handleRefresh() {
if (!onRefresh) return;
- setLoading('refresh', true);
- try {
- await onRefresh();
- } finally {
- setLoading('refresh', false);
- }
+ await refreshMutation.mutateAsync();
}
function confirmAction(action: string) {
@@ -204,18 +251,13 @@
const removeFiles = checkboxStates['removeFiles'] === true;
const removeVolumes = checkboxStates['removeVolumes'] === true;
- setLoading('remove', true);
+ const result = await removeMutation.mutateAsync({ removeFiles, removeVolumes });
handleApiResultWithCallbacks({
- result: await tryCatch(
- type === 'container'
- ? containerService.deleteContainer(id, { volumes: removeVolumes })
- : projectService.destroyProject(id, removeVolumes, removeFiles)
- ),
+ result,
message: m.common_action_failed_with_type({
action: type === 'project' ? m.compose_destroy() : m.common_remove(),
type: type
}),
- setLoadingState: (value) => setLoading('remove', value),
onSuccess: async () => {
toast.success(
type === 'project'
@@ -244,11 +286,10 @@
confirm: {
label: m.common_redeploy(),
action: async () => {
- setLoading('redeploy', true);
+ const result = await redeployMutation.mutateAsync();
handleApiResultWithCallbacks({
- result: await tryCatch(projectService.redeployProject(id)),
+ result,
message: m.common_action_failed_with_type({ action: m.common_redeploy(), type }),
- setLoadingState: (value) => setLoading('redeploy', value),
onSuccess: async () => {
toast.success(m.common_redeploy_success({ type: name || type }));
onActionComplete('running');
@@ -261,11 +302,10 @@
}
async function handleStart() {
- setLoading('start', true);
+ const result = await startMutation.mutateAsync();
await handleApiResultWithCallbacks({
- result: await tryCatch(type === 'container' ? containerService.startContainer(id) : projectService.deployProject(id)),
+ result,
message: m.common_action_failed_with_type({ action: m.common_start(), type }),
- setLoadingState: (value) => setLoading('start', value),
onSuccess: async () => {
itemState = 'running';
toast.success(m.common_started_success({ type: name || type }));
@@ -466,11 +506,10 @@
}
async function handleStop() {
- setLoading('stop', true);
+ const result = await stopMutation.mutateAsync();
await handleApiResultWithCallbacks({
- result: await tryCatch(type === 'container' ? containerService.stopContainer(id) : projectService.downProject(id)),
+ result,
message: m.common_action_failed_with_type({ action: m.common_stop(), type }),
- setLoadingState: (value) => setLoading('stop', value),
onSuccess: async () => {
itemState = 'stopped';
toast.success(m.common_stopped_success({ type: name || type }));
@@ -480,11 +519,10 @@
}
async function handleRestart() {
- setLoading('restart', true);
+ const result = await restartMutation.mutateAsync();
await handleApiResultWithCallbacks({
- result: await tryCatch(type === 'container' ? containerService.restartContainer(id) : projectService.restartProject(id)),
+ result,
message: m.common_action_failed_with_type({ action: m.common_restart(), type }),
- setLoadingState: (value) => setLoading('restart', value),
onSuccess: async () => {
itemState = 'running';
toast.success(m.common_restarted_success({ type: name || type }));
diff --git a/frontend/src/lib/components/dialogs/environment-switcher-dialog.svelte b/frontend/src/lib/components/dialogs/environment-switcher-dialog.svelte
index 015bb4734..031e96217 100644
--- a/frontend/src/lib/components/dialogs/environment-switcher-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/environment-switcher-dialog.svelte
@@ -5,6 +5,7 @@
import { Spinner } from '$lib/components/ui/spinner/index.js';
import { environmentStore } from '$lib/stores/environment.store.svelte';
import { environmentManagementService } from '$lib/services/env-mgmt-service';
+ import { queryKeys } from '$lib/query/query-keys';
import type { Environment } from '$lib/types/environment.type';
import { goto } from '$app/navigation';
import { toast } from 'svelte-sonner';
@@ -15,6 +16,7 @@
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
import { tick } from 'svelte';
import { EnvironmentsIcon, RemoteEnvironmentIcon, AddIcon, SearchIcon, CloseIcon } from '$lib/icons';
+ import { useQueryClient } from '@tanstack/svelte-query';
type Props = {
open: boolean;
@@ -22,6 +24,7 @@
};
let { open = $bindable(false), isAdmin = false }: Props = $props();
+ const queryClient = useQueryClient();
let searchQuery = $state('');
let environments = $state<Environment[]>([]);
@@ -70,7 +73,11 @@
}
try {
- const result = await environmentManagementService.getEnvironments(options);
+ const result = await queryClient.fetchQuery({
+ queryKey: queryKeys.environments.switcher(options),
+ queryFn: () => environmentManagementService.getEnvironments(options),
+ staleTime: 0
+ });
if (requestId !== currentRequestId) return;
environments = append ? [...environments, ...result.data] : result.data;
diff --git a/frontend/src/lib/components/dialogs/file-browser-dialog.svelte b/frontend/src/lib/components/dialogs/file-browser-dialog.svelte
index d06e46f4f..8d50f084c 100644
--- a/frontend/src/lib/components/dialogs/file-browser-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/file-browser-dialog.svelte
@@ -4,9 +4,11 @@
import { Spinner } from '$lib/components/ui/spinner/index.js';
import { ScrollArea } from '$lib/components/ui/scroll-area/index.js';
import { gitRepositoryService } from '$lib/services/git-repository-service';
+ import { queryKeys } from '$lib/query/query-keys';
import type { FileTreeNode } from '$lib/types/gitops.type';
import { FolderOpenIcon, FileTextIcon, ArrowRightIcon } from '$lib/icons';
import { m } from '$lib/paraglide/messages';
+ import { createQuery } from '@tanstack/svelte-query';
type FileBrowserDialogProps = {
open: boolean;
@@ -18,24 +20,18 @@
let { open = $bindable(false), repositoryId, branch, onSelect }: FileBrowserDialogProps = $props();
let currentPath = $state('');
- let files = $state<FileTreeNode[]>([]);
- let loading = $state(false);
let pathSegments = $derived(currentPath.split('/').filter(Boolean));
+ const fileTreeQuery = createQuery<{ files: FileTreeNode[] }>(() => ({
+ queryKey: queryKeys.gitRepositories.files(repositoryId, branch, currentPath),
+ queryFn: () => gitRepositoryService.browseFiles(repositoryId, branch, currentPath),
+ enabled: open && !!repositoryId && !!branch,
+ staleTime: 0
+ }));
+ const files = $derived(fileTreeQuery.data?.files ?? []);
+ const loading = $derived(fileTreeQuery.isPending || fileTreeQuery.isFetching);
- async function loadFiles(path: string = '') {
- if (!repositoryId || !branch) return;
-
- loading = true;
- try {
- const result = await gitRepositoryService.browseFiles(repositoryId, branch, path);
- files = result.files || [];
- currentPath = path;
- } catch (error) {
- console.error('Failed to load files:', error);
- files = [];
- } finally {
- loading = false;
- }
+ function loadFiles(path: string = '') {
+ currentPath = path;
}
function handleFileClick(file: FileTreeNode) {
@@ -60,12 +56,6 @@
loadFiles(segments.join('/'));
}
- $effect(() => {
- if (open && repositoryId && branch) {
- loadFiles('');
- }
- });
-
function isComposeFile(fileName: string): boolean {
return fileName.endsWith('.yml') || fileName.endsWith('.yaml');
}
@@ -73,77 +63,80 @@
<ResponsiveDialog
bind:open
+ onOpenChange={(isOpen) => {
+ if (isOpen && repositoryId && branch) {
+ currentPath = '';
+ }
+ }}
title={m.git_sync_browse_files_title()}
description={m.git_sync_browse_files_description()}
contentClass="max-w-2xl"
>
- {#snippet children()}
- <div class="space-y-4">
- <!-- Breadcrumb navigation -->
- <div class="flex items-center gap-2 text-sm">
- <Button variant="ghost" size="sm" onclick={() => loadFiles('')} disabled={currentPath === ''} class="h-8 px-2">
- <FolderOpenIcon class="size-4" />
- <span class="ml-1">{m.git_sync_browse_root()}</span>
+ <div class="space-y-4">
+ <!-- Breadcrumb navigation -->
+ <div class="flex items-center gap-2 text-sm">
+ <Button variant="ghost" size="sm" onclick={() => loadFiles('')} disabled={currentPath === ''} class="h-8 px-2">
+ <FolderOpenIcon class="size-4" />
+ <span class="ml-1">{m.git_sync_browse_root()}</span>
+ </Button>
+ {#each pathSegments as segment, index (`${index}-${segment}`)}
+ <ArrowRightIcon class="text-muted-foreground size-4" />
+ <Button variant="ghost" size="sm" onclick={() => goToPath(index)} class="h-8 px-2">
+ {segment}
</Button>
- {#each pathSegments as segment, index}
- <ArrowRightIcon class="text-muted-foreground size-4" />
- <Button variant="ghost" size="sm" onclick={() => goToPath(index)} class="h-8 px-2">
- {segment}
- </Button>
- {/each}
- </div>
+ {/each}
+ </div>
- <!-- File list -->
- <ScrollArea class="h-96 rounded-md border">
- {#if loading}
- <div class="flex items-center justify-center py-8">
- <Spinner class="size-6" />
- </div>
- {:else if files.length === 0}
- <div class="text-muted-foreground flex items-center justify-center py-8 text-sm">{m.git_sync_browse_no_files()}</div>
- {:else}
- <div class="space-y-1 p-2">
- {#if currentPath !== ''}
- <button
- onclick={goBack}
- class="hover:bg-accent flex w-full items-center gap-2 rounded-md px-3 py-2 text-left transition-colors"
- >
- <FolderOpenIcon class="text-muted-foreground size-4" />
- <span class="text-sm">..</span>
- </button>
- {/if}
- {#each files as file}
- {@const isCompose = file.type === 'file' && isComposeFile(file.name)}
- {@const canSelect = file.type === 'directory' || isCompose}
- <button
- onclick={() => handleFileClick(file)}
- disabled={!canSelect}
- class="hover:bg-accent flex w-full items-center gap-2 rounded-md px-3 py-2 text-left transition-colors disabled:cursor-not-allowed disabled:opacity-50"
- >
- {#if file.type === 'directory'}
- <FolderOpenIcon class="size-4 text-blue-500" />
- {:else}
- <FileTextIcon class="text-muted-foreground size-4" />
- {/if}
- <span class="text-sm {isCompose ? 'font-medium' : ''}">
- {file.name}
+ <!-- File list -->
+ <ScrollArea class="h-96 rounded-md border">
+ {#if loading}
+ <div class="flex items-center justify-center py-8">
+ <Spinner class="size-6" />
+ </div>
+ {:else if files.length === 0}
+ <div class="text-muted-foreground flex items-center justify-center py-8 text-sm">{m.git_sync_browse_no_files()}</div>
+ {:else}
+ <div class="space-y-1 p-2">
+ {#if currentPath !== ''}
+ <button
+ onclick={goBack}
+ class="hover:bg-accent flex w-full items-center gap-2 rounded-md px-3 py-2 text-left transition-colors"
+ >
+ <FolderOpenIcon class="text-muted-foreground size-4" />
+ <span class="text-sm">..</span>
+ </button>
+ {/if}
+ {#each files as file (file.path)}
+ {@const isCompose = file.type === 'file' && isComposeFile(file.name)}
+ {@const canSelect = file.type === 'directory' || isCompose}
+ <button
+ onclick={() => handleFileClick(file)}
+ disabled={!canSelect}
+ class="hover:bg-accent flex w-full items-center gap-2 rounded-md px-3 py-2 text-left transition-colors disabled:cursor-not-allowed disabled:opacity-50"
+ >
+ {#if file.type === 'directory'}
+ <FolderOpenIcon class="size-4 text-blue-500" />
+ {:else}
+ <FileTextIcon class="text-muted-foreground size-4" />
+ {/if}
+ <span class="text-sm {isCompose ? 'font-medium' : ''}">
+ {file.name}
+ </span>
+ {#if isCompose}
+ <span class="bg-primary/10 text-primary ml-auto rounded px-2 py-0.5 text-xs">
+ {m.git_sync_browse_compose_label()}
</span>
- {#if isCompose}
- <span class="bg-primary/10 text-primary ml-auto rounded px-2 py-0.5 text-xs">
- {m.git_sync_browse_compose_label()}
- </span>
- {/if}
- </button>
- {/each}
- </div>
- {/if}
- </ScrollArea>
+ {/if}
+ </button>
+ {/each}
+ </div>
+ {/if}
+ </ScrollArea>
- <p class="text-muted-foreground text-xs">
- {m.git_sync_browse_hint()}
- </p>
- </div>
- {/snippet}
+ <p class="text-muted-foreground text-xs">
+ {m.git_sync_browse_hint()}
+ </p>
+ </div>
{#snippet footer()}
<Button variant="outline" onclick={() => (open = false)}>
diff --git a/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte b/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte
index 417fa21ae..02ec96a8a 100644
--- a/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte
@@ -4,11 +4,11 @@
import * as InputGroup from '$lib/components/ui/input-group/index.js';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Label } from '$lib/components/ui/label';
- import { Spinner } from '$lib/components/ui/spinner/index.js';
import { authService } from '$lib/services/auth-service';
import { toast } from 'svelte-sonner';
import { EyeOnIcon, EyeOffIcon, AlertIcon } from '$lib/icons';
import { m } from '$lib/paraglide/messages';
+ import { createMutation } from '@tanstack/svelte-query';
let {
open = $bindable(false),
@@ -21,15 +21,28 @@
let currentPassword = $state('arcane-admin');
let newPassword = $state('');
let confirmPassword = $state('');
- let isLoading = $state(false);
let error = $state('');
let showCurrentPassword = $state(false);
let showNewPassword = $state(false);
let showConfirmPassword = $state(false);
const isValid = $derived(currentPassword.length > 0 && newPassword.length >= 8 && confirmPassword === newPassword);
+ const changePasswordMutation = createMutation(() => ({
+ mutationFn: ({ currentPassword, newPassword }: { currentPassword: string; newPassword: string }) =>
+ authService.changePassword(currentPassword, newPassword),
+ onSuccess: () => {
+ toast.success(m.first_login_success());
+ open = false;
+ onSuccess?.();
+ },
+ onError: (err) => {
+ error = err instanceof Error ? err.message : m.first_login_error_failed();
+ }
+ }));
+
+ const isLoading = $derived(changePasswordMutation.isPending);
- async function handleSubmit() {
+ function handleSubmit() {
if (!isValid) {
if (newPassword.length < 8) {
error = m.first_login_error_length();
@@ -40,18 +53,7 @@
}
error = '';
- isLoading = true;
-
- try {
- await authService.changePassword(currentPassword, newPassword);
- toast.success(m.first_login_success());
- open = false;
- onSuccess?.();
- } catch (err: any) {
- error = err.message || m.first_login_error_failed();
- } finally {
- isLoading = false;
- }
+ changePasswordMutation.mutate({ currentPassword, newPassword });
}
</script>
@@ -66,110 +68,108 @@
description={m.first_login_description()}
contentClass="sm:max-w-[425px] [&>button]:hidden"
>
- {#snippet children()}
- <form
- onsubmit={(e) => {
- e.preventDefault();
- handleSubmit();
- }}
- class="space-y-4"
- >
- {#if error}
- <Alert.Root variant="destructive">
- <AlertIcon class="size-4" />
- <Alert.Title>{m.error_generic()}</Alert.Title>
- <Alert.Description>{error}</Alert.Description>
- </Alert.Root>
- {/if}
+ <form
+ onsubmit={(e) => {
+ e.preventDefault();
+ handleSubmit();
+ }}
+ class="space-y-4"
+ >
+ {#if error}
+ <Alert.Root variant="destructive">
+ <AlertIcon class="size-4" />
+ <Alert.Title>{m.error_generic()}</Alert.Title>
+ <Alert.Description>{error}</Alert.Description>
+ </Alert.Root>
+ {/if}
- <div class="space-y-2">
- <Label for="current-password">{m.first_login_current_password()}</Label>
- <InputGroup.Root>
- <InputGroup.Input
- id="current-password"
- type={showCurrentPassword ? 'text' : 'password'}
- bind:value={currentPassword}
- placeholder={m.first_login_current_password_placeholder()}
- required
+ <div class="space-y-2">
+ <Label for="current-password">{m.first_login_current_password()}</Label>
+ <InputGroup.Root>
+ <InputGroup.Input
+ id="current-password"
+ type={showCurrentPassword ? 'text' : 'password'}
+ bind:value={currentPassword}
+ placeholder={m.first_login_current_password_placeholder()}
+ required
+ disabled={isLoading}
+ />
+ <InputGroup.Addon align="inline-end">
+ <InputGroup.Button
+ type="button"
+ size="icon-xs"
+ onclick={() => (showCurrentPassword = !showCurrentPassword)}
disabled={isLoading}
- />
- <InputGroup.Addon align="inline-end">
- <InputGroup.Button
- type="button"
- size="icon-xs"
- onclick={() => (showCurrentPassword = !showCurrentPassword)}
- disabled={isLoading}
- aria-label={showCurrentPassword ? 'Hide password' : 'Show password'}
- >
- {#if showCurrentPassword}
- <EyeOffIcon />
- {:else}
- <EyeOnIcon />
- {/if}
- </InputGroup.Button>
- </InputGroup.Addon>
- </InputGroup.Root>
- </div>
+ aria-label={showCurrentPassword ? 'Hide password' : 'Show password'}
+ >
+ {#if showCurrentPassword}
+ <EyeOffIcon />
+ {:else}
+ <EyeOnIcon />
+ {/if}
+ </InputGroup.Button>
+ </InputGroup.Addon>
+ </InputGroup.Root>
+ </div>
- <div class="space-y-2">
- <Label for="new-password">{m.first_login_new_password()}</Label>
- <InputGroup.Root>
- <InputGroup.Input
- id="new-password"
- type={showNewPassword ? 'text' : 'password'}
- bind:value={newPassword}
- placeholder={m.first_login_new_password_placeholder()}
- required
+ <div class="space-y-2">
+ <Label for="new-password">{m.first_login_new_password()}</Label>
+ <InputGroup.Root>
+ <InputGroup.Input
+ id="new-password"
+ type={showNewPassword ? 'text' : 'password'}
+ bind:value={newPassword}
+ placeholder={m.first_login_new_password_placeholder()}
+ required
+ disabled={isLoading}
+ />
+ <InputGroup.Addon align="inline-end">
+ <InputGroup.Button
+ type="button"
+ size="icon-xs"
+ onclick={() => (showNewPassword = !showNewPassword)}
disabled={isLoading}
- />
- <InputGroup.Addon align="inline-end">
- <InputGroup.Button
- type="button"
- size="icon-xs"
- onclick={() => (showNewPassword = !showNewPassword)}
- disabled={isLoading}
- aria-label={showNewPassword ? 'Hide password' : 'Show password'}
- >
- {#if showNewPassword}
- <EyeOffIcon />
- {:else}
- <EyeOnIcon />
- {/if}
- </InputGroup.Button>
- </InputGroup.Addon>
- </InputGroup.Root>
- </div>
+ aria-label={showNewPassword ? 'Hide password' : 'Show password'}
+ >
+ {#if showNewPassword}
+ <EyeOffIcon />
+ {:else}
+ <EyeOnIcon />
+ {/if}
+ </InputGroup.Button>
+ </InputGroup.Addon>
+ </InputGroup.Root>
+ </div>
- <div class="space-y-2">
- <Label for="confirm-password">{m.first_login_confirm_password()}</Label>
- <InputGroup.Root>
- <InputGroup.Input
- id="confirm-password"
- type={showConfirmPassword ? 'text' : 'password'}
- bind:value={confirmPassword}
- placeholder={m.first_login_confirm_password_placeholder()}
- required
+ <div class="space-y-2">
+ <Label for="confirm-password">{m.first_login_confirm_password()}</Label>
+ <InputGroup.Root>
+ <InputGroup.Input
+ id="confirm-password"
+ type={showConfirmPassword ? 'text' : 'password'}
+ bind:value={confirmPassword}
+ placeholder={m.first_login_confirm_password_placeholder()}
+ required
+ disabled={isLoading}
+ />
+ <InputGroup.Addon align="inline-end">
+ <InputGroup.Button
+ type="button"
+ size="icon-xs"
+ onclick={() => (showConfirmPassword = !showConfirmPassword)}
disabled={isLoading}
- />
- <InputGroup.Addon align="inline-end">
- <InputGroup.Button
- type="button"
- size="icon-xs"
- onclick={() => (showConfirmPassword = !showConfirmPassword)}
- disabled={isLoading}
- aria-label={showConfirmPassword ? 'Hide password' : 'Show password'}
- >
- {#if showConfirmPassword}
- <EyeOffIcon />
- {:else}
- <EyeOnIcon />
- {/if}
- </InputGroup.Button>
- </InputGroup.Addon>
- </InputGroup.Root>
- </div>
- </form>
- {/snippet}
+ aria-label={showConfirmPassword ? 'Hide password' : 'Show password'}
+ >
+ {#if showConfirmPassword}
+ <EyeOffIcon />
+ {:else}
+ <EyeOnIcon />
+ {/if}
+ </InputGroup.Button>
+ </InputGroup.Addon>
+ </InputGroup.Root>
+ </div>
+ </form>
{#snippet footer()}
<ArcaneButton
diff --git a/frontend/src/lib/components/dialogs/gitops-sync-dialog.svelte b/frontend/src/lib/components/dialogs/gitops-sync-dialog.svelte
index 9aa959340..76f10b42c 100644
--- a/frontend/src/lib/components/dialogs/gitops-sync-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/gitops-sync-dialog.svelte
@@ -11,8 +11,10 @@
import { gitRepositoryService } from '$lib/services/git-repository-service';
import { z } from 'zod/v4';
import { createForm, preventDefault } from '$lib/utils/form.utils';
+ import { queryKeys } from '$lib/query/query-keys';
import { m } from '$lib/paraglide/messages';
import { FolderOpenIcon } from '$lib/icons';
+ import { createQuery } from '@tanstack/svelte-query';
type GitOpsSyncFormProps = {
open: boolean;
@@ -24,10 +26,6 @@
let { open = $bindable(false), syncToEdit = $bindable(), onSubmit, isLoading }: GitOpsSyncFormProps = $props();
let isEditMode = $derived(!!syncToEdit);
- let repositories = $state<GitRepository[]>([]);
- let branches = $state<BranchInfo[]>([]);
- let loadingData = $state(true);
- let loadingBranches = $state(false);
let showFileBrowser = $state(false);
const formSchema = z.object({
@@ -51,62 +49,48 @@
let { inputs, ...form } = $derived(createForm<typeof formSchema>(formSchema, formData));
let selectedRepository = $state<{ value: string; label: string } | undefined>(undefined);
+ const repositoriesQuery = createQuery(() => ({
+ queryKey: queryKeys.gitRepositories.syncDialog(),
+ queryFn: () => gitRepositoryService.getRepositories({ pagination: { page: 1, limit: 100 } }),
+ enabled: open,
+ staleTime: 0
+ }));
+ const repositories = $derived<GitRepository[]>(repositoriesQuery.data?.data ?? []);
+ const loadingData = $derived(repositoriesQuery.isPending || repositoriesQuery.isFetching);
- async function loadBranches(repositoryId: string) {
- if (!repositoryId) return;
+ const branchesQuery = createQuery(() => ({
+ queryKey: queryKeys.gitRepositories.branches(selectedRepository?.value || ''),
+ queryFn: () => gitRepositoryService.getBranches(selectedRepository?.value || ''),
+ enabled: open && !!selectedRepository?.value,
+ staleTime: 0
+ }));
+ const branches = $derived<BranchInfo[]>(branchesQuery.data?.branches ?? []);
+ const loadingBranches = $derived(!!selectedRepository?.value && (branchesQuery.isPending || branchesQuery.isFetching));
- loadingBranches = true;
- branches = [];
- try {
- const result = await gitRepositoryService.getBranches(repositoryId);
- branches = result.branches || [];
-
- // Auto-select default branch if not editing
- if (!isEditMode && branches.length > 0) {
- const defaultBranch = branches.find((b) => b.isDefault);
- if (defaultBranch) {
- $inputs.branch.value = defaultBranch.name;
- }
+ $effect(() => {
+ if (open) {
+ selectedRepository = undefined;
+ showFileBrowser = false;
+ if (!isEditMode) {
+ form.reset();
}
- } catch (error) {
- console.error('Failed to load branches:', error);
- } finally {
- loadingBranches = false;
}
- }
-
- async function loadData() {
- loadingData = true;
- // Reset state before loading data to ensure a clean state
- selectedRepository = undefined;
- branches = [];
- loadingBranches = false;
- showFileBrowser = false;
-
- try {
- const reposResult = await gitRepositoryService.getRepositories({ pagination: { page: 1, limit: 100 } });
- repositories = reposResult.data || [];
+ });
- if (syncToEdit) {
- const repo = repositories.find((r) => r.id === syncToEdit.repositoryId);
- if (repo) {
- selectedRepository = { value: repo.id, label: repo.name };
- await loadBranches(repo.id);
- }
- }
- } catch (error) {
- console.error('Failed to load data:', error);
- } finally {
- loadingData = false;
+ $effect(() => {
+ if (!open || !syncToEdit || repositories.length === 0) return;
+ const repo = repositories.find((r) => r.id === syncToEdit.repositoryId);
+ if (repo) {
+ selectedRepository = { value: repo.id, label: repo.name };
+ $inputs.repositoryId.value = repo.id;
}
- }
+ });
$effect(() => {
- if (open) {
- loadData();
- if (!isEditMode) {
- form.reset();
- }
+ if (!open || isEditMode || branches.length === 0) return;
+ const defaultBranch = branches.find((b) => b.isDefault);
+ if (defaultBranch && !$inputs.branch.value) {
+ $inputs.branch.value = defaultBranch.name;
}
});
@@ -154,7 +138,6 @@
if (repo) {
selectedRepository = { value: repo.id, label: repo.name };
$inputs.repositoryId.value = v;
- loadBranches(v);
}
}
}}
diff --git a/frontend/src/lib/components/dialogs/template-selection-dialog.svelte b/frontend/src/lib/components/dialogs/template-selection-dialog.svelte
index e8b0c68d0..c1e34bff5 100644
--- a/frontend/src/lib/components/dialogs/template-selection-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/template-selection-dialog.svelte
@@ -23,6 +23,7 @@
import { toast } from 'svelte-sonner';
import { m } from '$lib/paraglide/messages';
import { templateService } from '$lib/services/template-service';
+ import { createMutation } from '@tanstack/svelte-query';
interface Props {
open: boolean;
@@ -36,6 +37,12 @@
let loadingStates = $state<Set<string>>(new Set());
let sortBy = $state<'name-asc' | 'name-desc'>('name-asc');
let groupByRegistry = $state(true);
+ const selectTemplateMutation = createMutation(() => ({
+ mutationFn: (template: Template) => templateService.getTemplateContent(template.id)
+ }));
+ const downloadTemplateMutation = createMutation(() => ({
+ mutationFn: (template: Template) => templateService.download(template.id)
+ }));
const allTemplates = $derived(templates ?? []);
@@ -102,7 +109,7 @@
loadingStates.add(loadingKey);
try {
- const details = await templateService.getTemplateContent(template.id);
+ const details = await selectTemplateMutation.mutateAsync(template);
if (!details) {
toast.error(m.templates_load_failed());
return;
@@ -130,7 +137,7 @@
loadingStates.add(loadingKey);
try {
- const result = await templateService.download(template.id);
+ const result = await downloadTemplateMutation.mutateAsync(template);
if (result) {
toast.success(m.templates_downloaded_success({ name: template.name }));
onDownloadSuccess?.();
diff --git a/frontend/src/lib/components/dialogs/upgrade-confirmation-dialog.svelte b/frontend/src/lib/components/dialogs/upgrade-confirmation-dialog.svelte
index bf78f91d4..e64ec85d3 100644
--- a/frontend/src/lib/components/dialogs/upgrade-confirmation-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/upgrade-confirmation-dialog.svelte
@@ -3,11 +3,13 @@
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import Spinner from '$lib/components/ui/spinner/spinner.svelte';
import * as m from '$lib/paraglide/messages';
+ import { queryKeys } from '$lib/query/query-keys';
import { onDestroy } from 'svelte';
import systemUpgradeService from '$lib/services/api/system-upgrade-service';
import { cn } from '$lib/utils';
import { AlertIcon, InfoIcon, SuccessIcon } from '$lib/icons';
import type { AppVersionInformation } from '$lib/types/application-configuration';
+ import { useQueryClient } from '@tanstack/svelte-query';
let {
open = $bindable(false),
@@ -28,6 +30,7 @@
environmentId?: string;
upgrading?: boolean;
} = $props();
+ const queryClient = useQueryClient();
const isRemoteEnvironment = $derived(!!environmentName);
const targetDescription = $derived(isRemoteEnvironment ? `remote environment "${environmentName}"` : m.upgrade_this_system());
@@ -92,7 +95,11 @@
let delayMs = 1000;
while (!abortRef.aborted && Date.now() - startedAt < timeoutMs) {
- const { healthy } = await systemUpgradeService.checkHealth(envId);
+ const { healthy } = await queryClient.fetchQuery({
+ queryKey: queryKeys.system.upgradeHealth(envId),
+ queryFn: () => systemUpgradeService.checkHealth(envId),
+ staleTime: 0
+ });
if (!healthy) {
log('health', { healthy, consecutiveHealthyChecks, backoffMs: delayMs });
consecutiveHealthyChecks = 0;
@@ -109,7 +116,11 @@
}
try {
- const info = await systemUpgradeService.getVersionInfo(envId);
+ const info = await queryClient.fetchQuery({
+ queryKey: queryKeys.system.versionInfo(envId),
+ queryFn: () => systemUpgradeService.getVersionInfo(envId),
+ staleTime: 0
+ });
lastSeenVersionInfo = info;
const expVer = expectedVersion?.trim();
@@ -153,13 +164,20 @@
async function captureBaseline() {
try {
- baselineVersionInfo = await systemUpgradeService.getVersionInfo(environmentId ?? '0');
+ baselineVersionInfo = await queryClient.fetchQuery({
+ queryKey: queryKeys.system.versionInfo(environmentId ?? '0'),
+ queryFn: () => systemUpgradeService.getVersionInfo(environmentId ?? '0'),
+ staleTime: 0
+ });
lastSeenVersionInfo = baselineVersionInfo;
+ if (!baselineVersionInfo) return;
+
+ const baseline = baselineVersionInfo;
log('baseline', {
- currentVersion: baselineVersionInfo.currentVersion,
- currentDigest: short(baselineVersionInfo.currentDigest),
+ currentVersion: baseline.currentVersion,
+ currentDigest: short(baseline.currentDigest),
- revision: short(baselineVersionInfo.revision, 8)
+ revision: short(baseline.revision, 8)
});
} catch (err) {
log('baseline-error', err);
diff --git a/frontend/src/lib/components/dialogs/version-info-dialog.svelte b/frontend/src/lib/components/dialogs/version-info-dialog.svelte
index 6b2934c34..5a1ed6cd8 100644
--- a/frontend/src/lib/components/dialogs/version-info-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/version-info-dialog.svelte
@@ -5,6 +5,7 @@
import { m } from '$lib/paraglide/messages';
import { CopyButton } from '$lib/components/ui/copy-button';
import { getApplicationLogo } from '$lib/utils/image.util';
+ import { accentColorPreviewStore } from '$lib/utils/accent-color-util';
import { ExternalLinkIcon, GithubIcon, BookOpenIcon } from '$lib/icons';
interface Props {
@@ -17,7 +18,8 @@
const shortCommit = $derived(versionInfo.shortRevision || versionInfo.revision?.slice(0, 8) || '-');
const shortDigest = $derived(versionInfo.currentDigest?.slice(0, 19) || '-');
- const logoUrl = $derived(getApplicationLogo(false));
+ const accentColor = $derived($accentColorPreviewStore);
+ const logoUrl = $derived(getApplicationLogo(false, accentColor, accentColor));
</script>
<ResponsiveDialog bind:open {onOpenChange} description={m.version_info_description()} contentClass="sm:max-w-md">
@@ -28,29 +30,27 @@
</div>
{/snippet}
- {#snippet children()}
- <div class="flex flex-col gap-6 pt-4">
- <div class="space-y-1.5 rounded-lg border p-3">
- {@render infoRow(m.version_info_version(), versionInfo.displayVersion || versionInfo.currentVersion)}
+ <div class="flex flex-col gap-6 pt-4">
+ <div class="space-y-1.5 rounded-lg border p-3">
+ {@render infoRow(m.version_info_version(), versionInfo.displayVersion || versionInfo.currentVersion)}
- {#if versionInfo.currentTag}
- {@render infoRow(m.version_info_tag(), versionInfo.currentTag)}
- {/if}
+ {#if versionInfo.currentTag}
+ {@render infoRow(m.version_info_tag(), versionInfo.currentTag)}
+ {/if}
- {@render infoRowWithCopy(m.version_info_full_commit(), shortCommit, versionInfo.revision)}
+ {@render infoRowWithCopy(m.version_info_full_commit(), shortCommit, versionInfo.revision)}
- {@render infoRow(m.version_info_go_version(), versionInfo.goVersion || '-')}
+ {@render infoRow(m.version_info_go_version(), versionInfo.goVersion || '-')}
- {#if versionInfo.buildTime && versionInfo.buildTime !== 'unknown'}
- {@render infoRow(m.version_info_build_time(), versionInfo.buildTime, false)}
- {/if}
+ {#if versionInfo.buildTime && versionInfo.buildTime !== 'unknown'}
+ {@render infoRow(m.version_info_build_time(), versionInfo.buildTime, false)}
+ {/if}
- {#if versionInfo.currentDigest}
- {@render infoRowWithCopy(m.version_info_digest(), shortDigest, versionInfo.currentDigest)}
- {/if}
- </div>
+ {#if versionInfo.currentDigest}
+ {@render infoRowWithCopy(m.version_info_digest(), shortDigest, versionInfo.currentDigest)}
+ {/if}
</div>
- {/snippet}
+ </div>
{#snippet footer()}
<div class="flex w-full flex-col gap-2 sm:flex-row sm:justify-end">
diff --git a/frontend/src/lib/components/disk-meter.svelte b/frontend/src/lib/components/disk-meter.svelte
index 5af3fe0f4..4bd55583f 100644
--- a/frontend/src/lib/components/disk-meter.svelte
+++ b/frontend/src/lib/components/disk-meter.svelte
@@ -8,10 +8,12 @@
import { m } from '$lib/paraglide/messages';
import bytes from 'bytes';
import settingsStore from '$lib/stores/config-store';
+ import { queryKeys } from '$lib/query/query-keys';
import { settingsService } from '$lib/services/settings-service';
import { toast } from 'svelte-sonner';
import { z } from 'zod/v4';
import { VolumesIcon, SettingsIcon } from '$lib/icons';
+ import { createMutation, useQueryClient } from '@tanstack/svelte-query';
let {
diskUsage,
@@ -33,7 +35,7 @@
let diskUsagePath = $state($settingsStore.diskUsagePath || 'data/projects');
let popoverOpen = $state(false);
- let isSaving = $state(false);
+ const queryClient = useQueryClient();
const pathSchema = z
.string()
@@ -41,7 +43,23 @@
.refine((path) => !path.includes('..'), 'Path cannot contain ".."')
.refine((path) => !/^[a-zA-Z]:/.test(path), 'Windows-style paths are not supported');
- async function saveDiskUsagePath() {
+ const savePathMutation = createMutation(() => ({
+ mutationFn: (path: string) => settingsService.updateSettings({ diskUsagePath: path }),
+ onSuccess: async (_, path) => {
+ settingsStore.set({ ...$settingsStore, diskUsagePath: path });
+ await queryClient.invalidateQueries({ queryKey: queryKeys.settings.all });
+ toast.success(m.disk_usage_save());
+ popoverOpen = false;
+ },
+ onError: (error) => {
+ console.error('Failed to update disk usage path:', error);
+ toast.error(m.disk_usage_save_failed());
+ }
+ }));
+
+ const isSaving = $derived(savePathMutation.isPending);
+
+ function saveDiskUsagePath() {
const trimmedPath = diskUsagePath.trim();
const result = pathSchema.safeParse(trimmedPath);
@@ -51,19 +69,7 @@
return;
}
- isSaving = true;
-
- try {
- await settingsService.updateSettings({ diskUsagePath: trimmedPath });
- settingsStore.set({ ...$settingsStore, diskUsagePath: trimmedPath });
- toast.success(m.disk_usage_save());
- popoverOpen = false;
- } catch (error) {
- console.error('Failed to update disk usage path:', error);
- toast.error(m.disk_usage_save_failed());
- } finally {
- isSaving = false;
- }
+ savePathMutation.mutate(trimmedPath);
}
function formatBytes(value: number): string {
@@ -72,88 +78,84 @@
</script>
<Card.Root class="flex h-full flex-col {className}">
- {#snippet children()}
- <Card.Header icon={VolumesIcon} iconVariant="primary" compact {loading}>
- {#snippet children()}
- <div class="min-w-0 flex-1">
- <div class="text-foreground text-sm font-semibold">{m.dashboard_meter_disk()}</div>
- <div class="text-muted-foreground text-xs">{m.dashboard_meter_disk_desc()}</div>
- <div class="text-muted-foreground/70 mt-0.5 font-mono text-[10px]">
- {m.dashboard_meter_disk_monitoring({ path: $settingsStore.diskUsagePath })}
+ <Card.Header icon={VolumesIcon} iconVariant="primary" compact {loading}>
+ <div class="min-w-0 flex-1">
+ <div class="text-foreground text-sm font-semibold">{m.dashboard_meter_disk()}</div>
+ <div class="text-muted-foreground text-xs">{m.dashboard_meter_disk_desc()}</div>
+ <div class="text-muted-foreground/70 mt-0.5 font-mono text-[10px]">
+ {m.dashboard_meter_disk_monitoring({ path: $settingsStore.diskUsagePath })}
+ </div>
+ </div>
+ <Popover.Root bind:open={popoverOpen}>
+ <Popover.Trigger>
+ {#snippet child({ props })}
+ <ArcaneButton
+ {...props}
+ action="base"
+ tone="ghost"
+ size="icon"
+ icon={SettingsIcon}
+ class="hover:bg-muted size-7 shrink-0"
+ />
+ {/snippet}
+ </Popover.Trigger>
+ <Popover.Content class="w-80">
+ <div class="space-y-4">
+ <div class="space-y-2">
+ <h4 class="text-sm leading-none font-medium">{m.disk_usage_settings()}</h4>
+ <p class="text-muted-foreground text-sm">{m.disk_usage_settings_description()}</p>
+ </div>
+ <div class="space-y-2">
+ <Label for="disk-path">{m.directory_path()}</Label>
+ <Input id="disk-path" placeholder="/app/data/projects" bind:value={diskUsagePath} disabled={isSaving} />
+ </div>
+ <div class="flex justify-end gap-2">
+ <ArcaneButton
+ action="cancel"
+ size="sm"
+ onclick={() => {
+ diskUsagePath = $settingsStore.diskUsagePath || '/app/data/projects';
+ popoverOpen = false;
+ }}
+ disabled={isSaving}
+ />
+ <ArcaneButton action="save" size="sm" onclick={saveDiskUsagePath} disabled={isSaving} loading={isSaving} />
</div>
</div>
- <Popover.Root bind:open={popoverOpen}>
- <Popover.Trigger>
- {#snippet child({ props })}
- <ArcaneButton
- {...props}
- action="base"
- tone="ghost"
- size="icon"
- icon={SettingsIcon}
- class="hover:bg-muted size-7 shrink-0"
- />
- {/snippet}
- </Popover.Trigger>
- <Popover.Content class="w-80">
- <div class="space-y-4">
- <div class="space-y-2">
- <h4 class="text-sm leading-none font-medium">{m.disk_usage_settings()}</h4>
- <p class="text-muted-foreground text-sm">{m.disk_usage_settings_description()}</p>
- </div>
- <div class="space-y-2">
- <Label for="disk-path">{m.directory_path()}</Label>
- <Input id="disk-path" placeholder="/app/data/projects" bind:value={diskUsagePath} disabled={isSaving} />
- </div>
- <div class="flex justify-end gap-2">
- <ArcaneButton
- action="cancel"
- size="sm"
- onclick={() => {
- diskUsagePath = $settingsStore.diskUsagePath || '/app/data/projects';
- popoverOpen = false;
- }}
- disabled={isSaving}
- />
- <ArcaneButton action="save" size="sm" onclick={saveDiskUsagePath} disabled={isSaving} loading={isSaving} />
- </div>
- </div>
- </Popover.Content>
- </Popover.Root>
- {/snippet}
- </Card.Header>
+ </Popover.Content>
+ </Popover.Root>
+ </Card.Header>
- <Card.Content class="flex flex-1 flex-col justify-end gap-3 p-3 sm:p-4">
- {#if loading}
- <div class="flex items-center gap-3">
- <div class="bg-muted h-2.5 flex-1 animate-pulse rounded-full"></div>
- <div class="bg-muted h-4 w-12 animate-pulse rounded"></div>
- </div>
- <div class="flex justify-between gap-4">
- <div class="bg-muted h-4 w-20 animate-pulse rounded"></div>
- <div class="bg-muted h-4 w-20 animate-pulse rounded"></div>
- </div>
- {:else}
- <div class="flex items-center gap-3">
- <Progress value={percentage} max={100} class="h-2.5 flex-1" />
- <span class="text-foreground min-w-12 text-right text-sm font-bold tabular-nums">
- {percentage.toFixed(1)}%
- </span>
- </div>
+ <Card.Content class="flex flex-1 flex-col justify-end gap-3 p-3 sm:p-4">
+ {#if loading}
+ <div class="flex items-center gap-3">
+ <div class="bg-muted h-2.5 flex-1 animate-pulse rounded-full"></div>
+ <div class="bg-muted h-4 w-12 animate-pulse rounded"></div>
+ </div>
+ <div class="flex justify-between gap-4">
+ <div class="bg-muted h-4 w-20 animate-pulse rounded"></div>
+ <div class="bg-muted h-4 w-20 animate-pulse rounded"></div>
+ </div>
+ {:else}
+ <div class="flex items-center gap-3">
+ <Progress value={percentage} max={100} class="h-2.5 flex-1" />
+ <span class="text-foreground min-w-12 text-right text-sm font-bold tabular-nums">
+ {percentage.toFixed(1)}%
+ </span>
+ </div>
- <div class="flex flex-wrap items-center justify-between gap-x-4 gap-y-1">
- <div class="flex items-center gap-2 whitespace-nowrap">
- <div class="bg-primary size-2 shrink-0 rounded-full"></div>
- <span class="text-muted-foreground text-xs">{m.dashboard_meter_disk_used()}</span>
- <span class="text-foreground text-sm font-semibold tabular-nums">{formatBytes(diskUsage ?? 0)}</span>
- </div>
- <div class="flex items-center gap-2 whitespace-nowrap">
- <div class="bg-primary/20 size-2 shrink-0 rounded-full"></div>
- <span class="text-muted-foreground text-xs">{m.dashboard_meter_disk_free()}</span>
- <span class="text-foreground text-sm font-semibold tabular-nums">{formatBytes(diskFree)}</span>
- </div>
+ <div class="flex flex-wrap items-center justify-between gap-x-4 gap-y-1">
+ <div class="flex items-center gap-2 whitespace-nowrap">
+ <div class="bg-primary size-2 shrink-0 rounded-full"></div>
+ <span class="text-muted-foreground text-xs">{m.dashboard_meter_disk_used()}</span>
+ <span class="text-foreground text-sm font-semibold tabular-nums">{formatBytes(diskUsage ?? 0)}</span>
+ </div>
+ <div class="flex items-center gap-2 whitespace-nowrap">
+ <div class="bg-primary/20 size-2 shrink-0 rounded-full"></div>
+ <span class="text-muted-foreground text-xs">{m.dashboard_meter_disk_free()}</span>
+ <span class="text-foreground text-sm font-semibold tabular-nums">{formatBytes(diskFree)}</span>
</div>
- {/if}
- </Card.Content>
- {/snippet}
+ </div>
+ {/if}
+ </Card.Content>
</Card.Root>
diff --git a/frontend/src/lib/components/file-browser/VolumeBrowser.svelte b/frontend/src/lib/components/file-browser/VolumeBrowser.svelte
index 379aae53f..0d36dfeac 100644
--- a/frontend/src/lib/components/file-browser/VolumeBrowser.svelte
+++ b/frontend/src/lib/components/file-browser/VolumeBrowser.svelte
@@ -1,26 +1,65 @@
<script lang="ts">
import { volumeBrowserService } from '$lib/services/volume-browser-service';
import { volumeBackupService } from '$lib/services/volume-backup-service';
+ import { queryKeys } from '$lib/query/query-keys';
import GenericFileBrowser, { type FileProvider } from './GenericFileBrowser.svelte';
+ import { useQueryClient } from '@tanstack/svelte-query';
let { volumeName }: { volumeName: string } = $props();
+ const queryClient = useQueryClient();
const provider: FileProvider = {
- list: (path) => volumeBrowserService.listDirectory(volumeName, path),
- mkdir: (path) => volumeBrowserService.createDirectory(volumeName, path),
- upload: (path, file) => volumeBrowserService.uploadFile(volumeName, path, file),
- delete: (path) => volumeBrowserService.deleteFile(volumeName, path),
+ list: (path) =>
+ queryClient.fetchQuery({
+ queryKey: queryKeys.volumes.list(volumeName, path),
+ queryFn: () => volumeBrowserService.listDirectory(volumeName, path),
+ staleTime: 0
+ }),
+ mkdir: async (path) => {
+ const result = await volumeBrowserService.createDirectory(volumeName, path);
+ await queryClient.invalidateQueries({ queryKey: queryKeys.volumes.listPrefix(volumeName) });
+ return result;
+ },
+ upload: async (path, file) => {
+ const result = await volumeBrowserService.uploadFile(volumeName, path, file);
+ await queryClient.invalidateQueries({ queryKey: queryKeys.volumes.listPrefix(volumeName) });
+ return result;
+ },
+ delete: async (path) => {
+ const result = await volumeBrowserService.deleteFile(volumeName, path);
+ await queryClient.invalidateQueries({ queryKey: queryKeys.volumes.listPrefix(volumeName) });
+ return result;
+ },
download: (path) => volumeBrowserService.downloadFile(volumeName, path),
- getContent: (path) => volumeBrowserService.getFileContent(volumeName, path),
+ getContent: (path) =>
+ queryClient.fetchQuery({
+ queryKey: queryKeys.volumes.content(volumeName, path),
+ queryFn: () => volumeBrowserService.getFileContent(volumeName, path),
+ staleTime: 0
+ }),
listBackups: async () => {
- const res = await volumeBackupService.listBackups(volumeName, {
- pagination: { page: 1, limit: 200 },
- sort: { column: 'createdAt', direction: 'desc' }
+ const res = await queryClient.fetchQuery({
+ queryKey: queryKeys.volumes.backups(volumeName),
+ queryFn: () =>
+ volumeBackupService.listBackups(volumeName, {
+ pagination: { page: 1, limit: 200 },
+ sort: { column: 'createdAt', direction: 'desc' }
+ }),
+ staleTime: 0
});
return res.data;
},
- restoreFromBackup: (backupId, path) => volumeBackupService.restoreBackupFiles(volumeName, backupId, [path]),
- backupHasPath: (backupId, path) => volumeBackupService.backupHasPath(backupId, path)
+ restoreFromBackup: async (backupId, path) => {
+ const result = await volumeBackupService.restoreBackupFiles(volumeName, backupId, [path]);
+ await queryClient.invalidateQueries({ queryKey: queryKeys.volumes.listPrefix(volumeName) });
+ return result;
+ },
+ backupHasPath: (backupId, path) =>
+ queryClient.fetchQuery({
+ queryKey: queryKeys.volumes.backupHasPath(backupId, path),
+ queryFn: () => volumeBackupService.backupHasPath(backupId, path),
+ staleTime: 0
+ })
};
</script>
diff --git a/frontend/src/lib/components/image-update-item.svelte b/frontend/src/lib/components/image-update-item.svelte
index 3c510d9ba..95bfb03b4 100644
--- a/frontend/src/lib/components/image-update-item.svelte
+++ b/frontend/src/lib/components/image-update-item.svelte
@@ -5,8 +5,11 @@
import type { ImageUpdateData } from '$lib/types/image.type';
import { m } from '$lib/paraglide/messages';
import { imageService } from '$lib/services/image-service';
+ import { queryKeys } from '$lib/query/query-keys';
+ import { environmentStore } from '$lib/stores/environment.store.svelte';
import type { Component } from 'svelte';
import { ArrowRightIcon, RefreshIcon, AlertIcon, VerifiedCheckIcon, ApiKeyIcon, CircleArrowUpIcon, BoxIcon } from '$lib/icons';
+ import { createQuery } from '@tanstack/svelte-query';
interface Props {
updateInfo?: ImageUpdateData;
@@ -22,7 +25,7 @@
}
let {
- updateInfo = $bindable(),
+ updateInfo,
isLoadingInBackground = false,
imageId,
repo,
@@ -32,16 +35,54 @@
debugHasUpdate
}: Props = $props();
+ function getCheckTimeValue(info?: ImageUpdateData): number {
+ if (!info?.checkTime) return 0;
+ const parsed = Date.parse(info.checkTime);
+ return Number.isNaN(parsed) ? 0 : parsed;
+ }
+
+ const imageUpdateQuery = createQuery<ImageUpdateData>(() => ({
+ queryKey: queryKeys.images.updateCheck(environmentStore.selected?.id || '0', imageId),
+ queryFn: () => imageService.checkImageUpdateByID(imageId),
+ enabled: false,
+ retry: false
+ }));
+
+ const errorFromQuery = $derived.by((): ImageUpdateData | undefined => {
+ if (!imageUpdateQuery.error) return undefined;
+ return {
+ hasUpdate: false,
+ updateType: 'error',
+ currentVersion: tag || '',
+ currentDigest: '',
+ latestVersion: '',
+ latestDigest: '',
+ checkTime: new Date().toISOString(),
+ responseTimeMs: 0,
+ error: imageUpdateQuery.error instanceof Error ? imageUpdateQuery.error.message : m.images_update_check_failed()
+ };
+ });
+
+ const resolvedUpdateInfo = $derived.by((): ImageUpdateData | undefined => {
+ const queryInfo = imageUpdateQuery.data;
+ const propInfo = updateInfo;
+
+ if (!queryInfo) return propInfo ?? errorFromQuery;
+ if (!propInfo) return queryInfo;
+
+ return getCheckTimeValue(propInfo) > getCheckTimeValue(queryInfo) ? propInfo : queryInfo;
+ });
+
// If debug is enabled, override hasUpdate to true
const effectiveUpdateInfo = $derived.by((): ImageUpdateData | undefined => {
- if (!updateInfo) return undefined;
+ if (!resolvedUpdateInfo) return undefined;
if (debugHasUpdate) {
- return { ...updateInfo, hasUpdate: true, updateType: updateInfo.updateType || 'tag' };
+ return { ...resolvedUpdateInfo, hasUpdate: true, updateType: resolvedUpdateInfo.updateType || 'tag' };
}
- return updateInfo;
+ return resolvedUpdateInfo;
});
- let isChecking = $state(false);
+ const isChecking = $derived(imageUpdateQuery.isFetching);
let isOpen = $state(false);
const canCheckUpdate = $derived(!!(repo && tag && repo !== '<none>' && tag !== '<none>'));
@@ -93,23 +134,39 @@
});
async function checkImageUpdate() {
- if (!canCheckUpdate || isChecking) return;
+ if (!canCheckUpdate || imageUpdateQuery.isFetching) return;
- isChecking = true;
try {
- const result = await imageService.checkImageUpdateByID(imageId);
- if (result) {
- updateInfo = result;
- onUpdated?.(result);
+ const result = await imageUpdateQuery.refetch();
+ if (result.data) {
+ onUpdated?.(result.data);
- if (result.error) {
- toast.error(result.error || m.images_update_check_failed());
+ if (result.data.error) {
+ toast.error(result.data.error || m.images_update_check_failed());
} else {
toast.success(m.images_update_check_completed());
}
- } else {
- toast.error(m.images_update_check_failed());
+ return;
}
+
+ if (result.error) {
+ const message = result.error instanceof Error ? result.error.message : m.images_update_check_failed();
+ onUpdated?.({
+ hasUpdate: false,
+ updateType: 'error',
+ currentVersion: tag || '',
+ currentDigest: '',
+ latestVersion: '',
+ latestDigest: '',
+ checkTime: new Date().toISOString(),
+ responseTimeMs: 0,
+ error: message
+ });
+ toast.error(message);
+ return;
+ }
+
+ toast.error(m.images_update_check_failed());
} catch (error) {
console.error('Error checking update:', error);
const errorInfo: ImageUpdateData = {
@@ -123,11 +180,8 @@
responseTimeMs: 0,
error: (error as Error)?.message || m.images_update_check_failed()
};
- updateInfo = errorInfo;
onUpdated?.(errorInfo);
toast.error(errorInfo.error);
- } finally {
- isChecking = false;
}
}
diff --git a/frontend/src/lib/components/job-card/job-card.svelte b/frontend/src/lib/components/job-card/job-card.svelte
index 34cc4b3b5..994ebfc66 100644
--- a/frontend/src/lib/components/job-card/job-card.svelte
+++ b/frontend/src/lib/components/job-card/job-card.svelte
@@ -5,12 +5,12 @@
import { Button } from '$lib/components/ui/button';
import * as Card from '$lib/components/ui/card';
import { Spinner } from '$lib/components/ui/spinner';
- import { tryCatch } from '$lib/utils/try-catch';
import { jobScheduleService } from '$lib/services/job-schedule-service';
import { formatDistanceToNow } from 'date-fns';
import type { Snippet } from 'svelte';
import type { JobStatus } from '$lib/types/job-schedule.type';
import JobScheduleDialog from './job-schedule-dialog.svelte';
+ import { createMutation } from '@tanstack/svelte-query';
let {
job,
@@ -30,8 +30,11 @@
headerAccessory?: Snippet;
} = $props();
- let isRunning = $state(false);
let showScheduleDialog = $state(false);
+ const runJobMutation = createMutation(() => ({
+ mutationFn: () => jobScheduleService.runJob(job.id, environmentId)
+ }));
+ const isRunning = $derived(runJobMutation.isPending);
const nextRunText = $derived.by(() => {
if (!job.nextRun) return null;
@@ -45,16 +48,9 @@
const canRun = $derived(isEnabled && job.canRunManually && !isRunning && !(isAgent && job.managerOnly));
- async function runJobNow() {
+ function runJobNow() {
if (!canRun) return;
-
- isRunning = true;
- const result = await tryCatch(jobScheduleService.runJob(job.id, environmentId));
- isRunning = false;
-
- if (result.error || !result.data?.success) {
- return;
- }
+ runJobMutation.mutate();
}
function openScheduleDialog() {
diff --git a/frontend/src/lib/components/job-card/job-schedule-dialog.svelte b/frontend/src/lib/components/job-card/job-schedule-dialog.svelte
index 8860a09f0..0d0edd5c7 100644
--- a/frontend/src/lib/components/job-card/job-schedule-dialog.svelte
+++ b/frontend/src/lib/components/job-card/job-schedule-dialog.svelte
@@ -5,9 +5,9 @@
import { ResponsiveDialog } from '$lib/components/ui/responsive-dialog';
import { Label } from '$lib/components/ui/label';
import { Input } from '$lib/components/ui/input';
- import { tryCatch } from '$lib/utils/try-catch';
import { jobScheduleService } from '$lib/services/job-schedule-service';
import type { JobStatus } from '$lib/types/job-schedule.type';
+ import { createMutation } from '@tanstack/svelte-query';
let {
job,
@@ -23,7 +23,17 @@
let scheduleValue = $state('');
let error = $state<string | null>(null);
- let isLoading = $state(false);
+ const saveMutation = createMutation(() => ({
+ mutationFn: (update: Record<string, string>) => jobScheduleService.updateJobSchedules(update, environmentId),
+ onSuccess: () => {
+ toast.success(m.jobs_schedule_updated());
+ onUpdate?.();
+ },
+ onError: (err) => {
+ toast.error(err instanceof Error ? err.message : m.jobs_schedule_update_failed());
+ }
+ }));
+ const isLoading = $derived(saveMutation.isPending);
const cronExamples = [
{ label: m.jobs_cron_example_every_15min(), value: '0 */15 * * * *' },
@@ -48,7 +58,7 @@
return true;
}
- async function save() {
+ function save() {
if (!validateCron(scheduleValue)) {
return;
}
@@ -58,18 +68,8 @@
return;
}
- isLoading = true;
const update = { [job.settingsKey]: scheduleValue };
- const result = await tryCatch(jobScheduleService.updateJobSchedules(update, environmentId));
- isLoading = false;
-
- if (result.error) {
- toast.error(result.error.message || m.jobs_schedule_update_failed());
- return;
- }
-
- toast.success(m.jobs_schedule_updated());
- onUpdate?.();
+ saveMutation.mutate(update);
}
function useCronExample(value: string) {
diff --git a/frontend/src/lib/components/locale-picker.svelte b/frontend/src/lib/components/locale-picker.svelte
index 8c32d0d43..93f3ba4b2 100644
--- a/frontend/src/lib/components/locale-picker.svelte
+++ b/frontend/src/lib/components/locale-picker.svelte
@@ -5,7 +5,9 @@
import userStore from '$lib/stores/user-store';
import { setLocale } from '$lib/utils/locale.util';
import { Label } from '$lib/components/ui/label/index.js';
+ import { queryKeys } from '$lib/query/query-keys';
import { userService } from '$lib/services/user-service';
+ import { createMutation, useQueryClient } from '@tanstack/svelte-query';
let {
inline = false,
@@ -19,8 +21,9 @@
onOpenChange?: (open: boolean) => void;
} = $props();
- const currentLocale = $state(getLocale());
+ let currentLocale = $state<Locale>(getLocale());
let isOpen = $state(false);
+ const queryClient = useQueryClient();
const locales: Record<string, string> = {
de: 'Deutsch',
@@ -42,15 +45,31 @@
'zh-TW': '繁體中文'
};
- async function updateLocale(locale: Locale) {
- try {
+ const updateLocaleMutation = createMutation(() => ({
+ mutationFn: async (locale: Locale) => {
if ($userStore) {
await userService.update($userStore.id, { locale });
}
await setLocale(locale);
- } catch (err) {
+ return locale;
+ },
+ onMutate: (locale) => {
+ const previousLocale = currentLocale;
+ currentLocale = locale;
+ return { previousLocale };
+ },
+ onSuccess: async (locale) => {
+ currentLocale = locale;
+ await queryClient.invalidateQueries({ queryKey: queryKeys.users.all });
+ },
+ onError: (err, _locale, context) => {
+ currentLocale = context?.previousLocale ?? getLocale();
console.error('Failed to update locale', err);
}
+ }));
+
+ function updateLocale(locale: Locale) {
+ updateLocaleMutation.mutate(locale);
}
</script>
@@ -73,7 +92,7 @@
<span class="truncate">{locales[currentLocale]}</span>
</Select.Trigger>
<Select.Content class="bg-card/60 bubble-shadow max-w-70 min-w-40 rounded-xl backdrop-blur-sm">
- {#each Object.entries(locales) as [value, label]}
+ {#each Object.entries(locales) as [value, label] (value)}
<Select.Item class="text-sm" {value}>{label}</Select.Item>
{/each}
</Select.Content>
@@ -102,7 +121,7 @@
<span class="truncate">{locales[currentLocale]}</span>
</Select.Trigger>
<Select.Content class="bg-card/60 bubble-shadow rounded-xl backdrop-blur-sm">
- {#each Object.entries(locales) as [value, label]}
+ {#each Object.entries(locales) as [value, label] (value)}
<Select.Item {value}>{label}</Select.Item>
{/each}
</Select.Content>
diff --git a/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte b/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte
index c24d17929..7b2a0997e 100644
--- a/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte
+++ b/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte
@@ -8,13 +8,14 @@
import MobileUserCard from './mobile-user-card.svelte';
import * as Drawer from '$lib/components/ui/drawer/index.js';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
+ import { queryKeys } from '$lib/query/query-keys';
import systemUpgradeService from '$lib/services/api/system-upgrade-service';
import UpgradeConfirmationDialog from '$lib/components/dialogs/upgrade-confirmation-dialog.svelte';
import { toast } from 'svelte-sonner';
- import { onMount } from 'svelte';
import { DownloadIcon } from '$lib/icons';
import { extractApiErrorMessage } from '$lib/utils/api.util';
import type { AppVersionInformation } from '$lib/types/application-configuration';
+ import { createMutation, createQuery } from '@tanstack/svelte-query';
let {
open = $bindable(false),
@@ -38,12 +39,26 @@
const currentPath = $derived(page.url.pathname);
const memoizedUser = $derived.by(() => user ?? storeUser);
- let canUpgrade = $state(false);
- let checkingUpgrade = $state(false);
let upgrading = $state(false);
let showConfirmDialog = $state(false);
-
const isAdmin = $derived(!!user?.roles?.includes('admin'));
+
+ const shouldCheckUpgrade = $derived(!!(versionInformation?.updateAvailable && isAdmin && !debug));
+ const upgradeAvailabilityQuery = createQuery(() => ({
+ queryKey: queryKeys.system.upgradeAvailable('mobile-nav'),
+ queryFn: () => systemUpgradeService.checkUpgradeAvailable(),
+ enabled: shouldCheckUpgrade,
+ staleTime: 0
+ }));
+
+ const canUpgrade = $derived.by(() => {
+ if (debug) return true;
+ const result = upgradeAvailabilityQuery.data;
+ return !!result?.canUpgrade && !result?.error;
+ });
+ const checkingUpgrade = $derived(
+ !!(shouldCheckUpgrade && (upgradeAvailabilityQuery.isPending || upgradeAvailabilityQuery.isFetching))
+ );
const shouldShowUpgrade = $derived((canUpgrade && isAdmin) || debug);
// Determine update type and display text
@@ -83,51 +98,24 @@
return m.upgrade_now();
});
- // Debug mode: force show upgrade button
- $effect(() => {
- if (debug) {
- canUpgrade = true;
- }
- });
-
- // Check if self-upgrade is available
- onMount(() => {
- if (versionInformation?.updateAvailable && isAdmin && !debug) {
- checkUpgradeAvailability();
- }
- });
-
// Show banner for both semver and digest-based updates
const shouldShowBanner = $derived(versionInformation?.updateAvailable || debug);
-
- async function checkUpgradeAvailability() {
- if (checkingUpgrade) return;
-
- checkingUpgrade = true;
- try {
- const result = await systemUpgradeService.checkUpgradeAvailable();
- canUpgrade = result.canUpgrade && !result.error;
- } catch (error) {
- canUpgrade = false;
- } finally {
- checkingUpgrade = false;
+ const triggerUpgradeMutation = createMutation(() => ({
+ mutationFn: () => systemUpgradeService.triggerUpgrade(),
+ onError: (error: unknown) => {
+ const errorMessage = extractApiErrorMessage(error);
+ const wrappedPrefix = m.upgrade_failed({ error: '' });
+ toast.error(errorMessage.startsWith(wrappedPrefix) ? errorMessage : m.upgrade_failed({ error: errorMessage }));
+ upgrading = false;
}
- }
+ }));
function handleUpgradeClick() {
showConfirmDialog = true;
}
- async function handleConfirmUpgrade() {
- try {
- await systemUpgradeService.triggerUpgrade();
- // Dialog will handle countdown and reload
- } catch (error: any) {
- const errorMessage = extractApiErrorMessage(error);
- const wrappedPrefix = m.upgrade_failed({ error: '' });
- toast.error(errorMessage.startsWith(wrappedPrefix) ? errorMessage : m.upgrade_failed({ error: errorMessage }));
- upgrading = false;
- }
+ function handleConfirmUpgrade() {
+ triggerUpgradeMutation.mutate();
}
function handleItemClick() {
diff --git a/frontend/src/lib/components/sheets/add-template-registry-sheet.svelte b/frontend/src/lib/components/sheets/add-template-registry-sheet.svelte
index fbaba723c..cedb97aac 100644
--- a/frontend/src/lib/components/sheets/add-template-registry-sheet.svelte
+++ b/frontend/src/lib/components/sheets/add-template-registry-sheet.svelte
@@ -10,6 +10,7 @@
import { m } from '$lib/paraglide/messages';
import { templateService } from '$lib/services/template-service';
import { AlertIcon } from '$lib/icons';
+ import { createMutation } from '@tanstack/svelte-query';
type TemplateRegistryFormProps = {
open: boolean;
@@ -32,31 +33,33 @@
let { inputs, ...form } = $derived(createForm<typeof formSchema>(formSchema, formData));
let submitError = $state<string | null>(null);
-
- async function handleSubmit() {
- submitError = null;
-
- const data = form.validate();
- if (!data) return;
-
- try {
- const registryData = await templateService.fetchRegistry(data.url);
-
+ const validateRegistryMutation = createMutation(() => ({
+ mutationFn: ({ url }: { url: string; enabled: boolean }) => templateService.fetchRegistry(url),
+ onSuccess: (registryData, variables) => {
if (!registryData.name || !registryData.templates || !Array.isArray(registryData.templates)) {
- throw new Error(m.templates_registry_invalid_format());
+ submitError = m.templates_registry_invalid_format();
+ return;
}
- const registryPayload = {
+ onSubmit({
name: registryData.name,
- url: data.url,
+ url: variables.url,
description: registryData.description || '',
- enabled: data.enabled
- };
-
- onSubmit(registryPayload);
- } catch (error) {
+ enabled: variables.enabled
+ });
+ },
+ onError: (error) => {
submitError = error instanceof Error ? error.message : m.templates_registry_validate_failed();
}
+ }));
+ const isValidating = $derived(validateRegistryMutation.isPending);
+
+ function handleSubmit() {
+ submitError = null;
+
+ const data = form.validate();
+ if (!data) return;
+ validateRegistryMutation.mutate({ url: data.url, enabled: data.enabled });
}
function handleOpenChange(newOpenState: boolean) {
@@ -110,14 +113,14 @@
type="button"
class="flex-1"
onclick={() => (open = false)}
- disabled={isLoading}
+ disabled={isLoading || isValidating}
/>
<ArcaneButton
action="create"
type="submit"
class="flex-1"
- disabled={isLoading}
- loading={isLoading}
+ disabled={isLoading || isValidating}
+ loading={isLoading || isValidating}
onclick={handleSubmit}
customLabel={m.templates_add_registry_button()}
/>
diff --git a/frontend/src/lib/components/sheets/new-environment-sheet.svelte b/frontend/src/lib/components/sheets/new-environment-sheet.svelte
index 6d638b625..de85ca4e0 100644
--- a/frontend/src/lib/components/sheets/new-environment-sheet.svelte
+++ b/frontend/src/lib/components/sheets/new-environment-sheet.svelte
@@ -12,7 +12,9 @@
import { createForm, preventDefault } from '$lib/utils/form.utils';
import { m } from '$lib/paraglide/messages';
import { environmentManagementService } from '$lib/services/env-mgmt-service';
+ import { queryKeys } from '$lib/query/query-keys';
import { RemoteEnvironmentIcon, EdgeConnectionIcon } from '$lib/icons';
+ import { createMutation, useQueryClient } from '@tanstack/svelte-query';
type NewEnvironmentSheetProps = {
open: boolean;
@@ -20,6 +22,7 @@
};
let { open = $bindable(false), onEnvironmentCreated }: NewEnvironmentSheetProps = $props();
+ const queryClient = useQueryClient();
type ConnectionMode = 'direct' | 'edge';
let connectionMode = $state<ConnectionMode>('direct');
@@ -34,8 +37,48 @@
dockerCompose?: string;
} | null>(null);
- let isSubmittingNewAgent = $state(false);
let isLoadingSnippets = $state(false);
+ const createEnvironmentMutation = createMutation(() => ({
+ mutationFn: ({ dto, apiUrl, isEdge }: { dto: CreateEnvironmentDTO; apiUrl: string; isEdge: boolean }) =>
+ environmentManagementService.create(dto),
+ onSuccess: async (created, variables) => {
+ await queryClient.invalidateQueries({ queryKey: queryKeys.environments.all });
+
+ if (created.apiKey) {
+ createdEnvironment = {
+ id: created.id,
+ apiKey: created.apiKey,
+ name: created.name,
+ apiUrl: variables.apiUrl,
+ isEdge: variables.isEdge
+ };
+
+ isLoadingSnippets = true;
+ try {
+ const snippets = await queryClient.fetchQuery({
+ queryKey: queryKeys.environments.deploymentSnippets(created.id),
+ queryFn: () => environmentManagementService.getDeploymentSnippets(created.id),
+ staleTime: 0
+ });
+ createdEnvironment.dockerRun = snippets.dockerRun;
+ createdEnvironment.dockerCompose = snippets.dockerCompose;
+ } catch (err) {
+ console.error('Failed to fetch deployment snippets:', err);
+ } finally {
+ isLoadingSnippets = false;
+ }
+
+ toast.success(m.environments_created_success());
+ } else {
+ toast.error('Failed to generate API key');
+ }
+ },
+ onError: (error) => {
+ toast.error(m.environments_create_failed());
+ console.error(error);
+ }
+ }));
+ const isSubmittingNewAgent = $derived(createEnvironmentMutation.isPending);
let newAgentUrlProtocol = $state<'https' | 'http'>('http');
let newAgentUrlHost = $state('');
@@ -78,89 +121,41 @@
$directInputs.apiUrl.value = newAgentUrlHost;
});
- async function handleDirectSubmit() {
+ function handleDirectSubmit() {
const data = directForm.validate();
if (!data) return;
- try {
- isSubmittingNewAgent = true;
- const fullUrl = `${newAgentUrlProtocol}://${newAgentUrlHost}`;
+ const fullUrl = `${newAgentUrlProtocol}://${newAgentUrlHost}`;
- const dto: CreateEnvironmentDTO = {
- name: data.name,
- apiUrl: fullUrl,
- useApiKey: true,
- isEdge: false
- };
+ const dto: CreateEnvironmentDTO = {
+ name: data.name,
+ apiUrl: fullUrl,
+ useApiKey: true,
+ isEdge: false
+ };
- await createEnvironmentAndFetchSnippets(dto, fullUrl, false);
- } catch (error) {
- toast.error(m.environments_create_failed());
- console.error(error);
- } finally {
- isSubmittingNewAgent = false;
- }
+ createEnvironmentMutation.mutate({ dto, apiUrl: fullUrl, isEdge: false });
}
- async function handleEdgeSubmit() {
+ function handleEdgeSubmit() {
const data = edgeForm.validate();
if (!data) return;
- try {
- isSubmittingNewAgent = true;
- const edgeApiHost = data.name
- .trim()
- .toLowerCase()
- .replace(/[^a-z0-9]+/g, '-')
- .replace(/(^-|-$)+/g, '');
- const edgeApiUrl = `edge://${edgeApiHost}`;
-
- // Edge agents don't need a URL - they connect outbound
- // We use a placeholder URL that indicates edge mode
- const dto: CreateEnvironmentDTO = {
- name: data.name,
- apiUrl: edgeApiUrl,
- useApiKey: true,
- isEdge: true
- };
-
- await createEnvironmentAndFetchSnippets(dto, '', true);
- } catch (error) {
- toast.error(m.environments_create_failed());
- console.error(error);
- } finally {
- isSubmittingNewAgent = false;
- }
- }
-
- async function createEnvironmentAndFetchSnippets(dto: CreateEnvironmentDTO, apiUrl: string, isEdge: boolean) {
- const created = await environmentManagementService.create(dto);
-
- if (created.apiKey) {
- createdEnvironment = {
- id: created.id,
- apiKey: created.apiKey,
- name: created.name,
- apiUrl: apiUrl,
- isEdge: isEdge
- };
-
- // Fetch deployment snippets from backend
- isLoadingSnippets = true;
- try {
- const snippets = await environmentManagementService.getDeploymentSnippets(created.id);
- createdEnvironment.dockerRun = snippets.dockerRun;
- createdEnvironment.dockerCompose = snippets.dockerCompose;
- } catch (err) {
- console.error('Failed to fetch deployment snippets:', err);
- } finally {
- isLoadingSnippets = false;
- }
-
- toast.success(m.environments_created_success());
- } else {
- toast.error('Failed to generate API key');
- }
+ const edgeApiHost = data.name
+ .trim()
+ .toLowerCase()
+ .replace(/[^a-z0-9]+/g, '-')
+ .replace(/(^-|-$)+/g, '');
+ const edgeApiUrl = `edge://${edgeApiHost}`;
+
+ const dto: CreateEnvironmentDTO = {
+ name: data.name,
+ apiUrl: edgeApiUrl,
+ useApiKey: true,
+ isEdge: true
+ };
+
+ createEnvironmentMutation.mutate({ dto, apiUrl: '', isEdge: true });
}
function handleDone() {
diff --git a/frontend/src/lib/components/sidebar/sidebar-logo.svelte b/frontend/src/lib/components/sidebar/sidebar-logo.svelte
index 3d277e566..69c6c0239 100644
--- a/frontend/src/lib/components/sidebar/sidebar-logo.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar-logo.svelte
@@ -1,14 +1,13 @@
<script lang="ts">
- import type { AppVersionInformation } from '$lib/types/application-configuration';
import { cn } from '$lib/utils';
import { m } from '$lib/paraglide/messages';
import { getApplicationLogo } from '$lib/utils/image.util';
- import settingsStore from '$lib/stores/config-store';
+ import { accentColorPreviewStore } from '$lib/utils/accent-color-util';
- let { isCollapsed, versionInformation }: { isCollapsed: boolean; versionInformation: AppVersionInformation } = $props();
+ let { isCollapsed }: { isCollapsed: boolean } = $props();
- // Make logo URL reactive to accent color changes
- let logoUrl = $derived(getApplicationLogo(!isCollapsed));
+ const accentColor = $derived($accentColorPreviewStore);
+ const logoUrl = $derived(getApplicationLogo(!isCollapsed, accentColor, accentColor));
</script>
<div
diff --git a/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte b/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte
index db83d3316..4cf87d9a0 100644
--- a/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte
@@ -7,12 +7,13 @@
import type { User } from '$lib/types/user.type';
import { m } from '$lib/paraglide/messages';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
+ import { queryKeys } from '$lib/query/query-keys';
import systemUpgradeService from '$lib/services/api/system-upgrade-service';
import UpgradeConfirmationDialog from '$lib/components/dialogs/upgrade-confirmation-dialog.svelte';
import { toast } from 'svelte-sonner';
- import { onMount } from 'svelte';
import { DownloadIcon, ExternalLinkIcon } from '$lib/icons';
import { extractApiErrorMessage } from '$lib/utils/api.util';
+ import { createMutation, createQuery } from '@tanstack/svelte-query';
let {
isCollapsed,
@@ -28,12 +29,26 @@
const sidebar = useSidebar();
- let canUpgrade = $state(false);
- let checkingUpgrade = $state(false);
let upgrading = $state(false);
let showConfirmDialog = $state(false);
-
const isAdmin = $derived(!!user?.roles?.includes('admin'));
+
+ const shouldCheckUpgrade = $derived(!!(versionInformation?.updateAvailable && isAdmin && !debug));
+ const upgradeAvailabilityQuery = createQuery(() => ({
+ queryKey: queryKeys.system.upgradeAvailable('sidebar'),
+ queryFn: () => systemUpgradeService.checkUpgradeAvailable(),
+ enabled: shouldCheckUpgrade,
+ staleTime: 0
+ }));
+
+ const canUpgrade = $derived.by(() => {
+ if (debug) return true;
+ const result = upgradeAvailabilityQuery.data;
+ return !!result?.canUpgrade && !result?.error;
+ });
+ const checkingUpgrade = $derived(
+ !!(shouldCheckUpgrade && (upgradeAvailabilityQuery.isPending || upgradeAvailabilityQuery.isFetching))
+ );
const shouldShowUpgrade = $derived((canUpgrade && isAdmin) || debug);
// Determine update type and display text
@@ -73,48 +88,22 @@
return m.upgrade_now();
});
- // Debug mode: force show upgrade button
- $effect(() => {
- if (debug) {
- canUpgrade = true;
- }
- });
-
- // Check if self-upgrade is available
- onMount(() => {
- if (versionInformation?.updateAvailable && isAdmin && !debug) {
- checkUpgradeAvailability();
- }
- });
-
- async function checkUpgradeAvailability() {
- if (checkingUpgrade) return;
-
- checkingUpgrade = true;
- try {
- const result = await systemUpgradeService.checkUpgradeAvailable();
- canUpgrade = result.canUpgrade && !result.error;
- } catch (error) {
- canUpgrade = false;
- } finally {
- checkingUpgrade = false;
+ const triggerUpgradeMutation = createMutation(() => ({
+ mutationFn: () => systemUpgradeService.triggerUpgrade(),
+ onError: (error: unknown) => {
+ const errorMessage = extractApiErrorMessage(error);
+ const wrappedPrefix = m.upgrade_failed({ error: '' });
+ toast.error(errorMessage.startsWith(wrappedPrefix) ? errorMessage : m.upgrade_failed({ error: errorMessage }));
+ upgrading = false;
}
- }
+ }));
function handleUpgradeClick() {
showConfirmDialog = true;
}
- async function handleConfirmUpgrade() {
- try {
- await systemUpgradeService.triggerUpgrade();
- // Dialog will handle countdown and reload
- } catch (error: any) {
- const errorMessage = extractApiErrorMessage(error);
- const wrappedPrefix = m.upgrade_failed({ error: '' });
- toast.error(errorMessage.startsWith(wrappedPrefix) ? errorMessage : m.upgrade_failed({ error: errorMessage }));
- upgrading = false;
- }
+ function handleConfirmUpgrade() {
+ triggerUpgradeMutation.mutate();
}
// Show banner for both semver and digest-based updates
diff --git a/frontend/src/lib/components/sidebar/sidebar.svelte b/frontend/src/lib/components/sidebar/sidebar.svelte
index eb4af80fb..703bfd91b 100644
--- a/frontend/src/lib/components/sidebar/sidebar.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar.svelte
@@ -21,6 +21,7 @@
import VersionInfoDialog from '$lib/components/dialogs/version-info-dialog.svelte';
import { LogoutIcon } from '$lib/icons';
import { environmentStore } from '$lib/stores/environment.store.svelte';
+ import { fromStore } from 'svelte/store';
let {
ref = $bindable(null),
@@ -36,14 +37,9 @@
const sidebar = useSidebar();
- let storeUser: User | null = $state(null);
+ const storeUser = fromStore(userStore);
let showVersionDialog = $state(false);
-
- $effect(() => {
- const unsub = userStore.subscribe((u) => (storeUser = u));
- return unsub;
- });
- const effectiveUser = $derived(user ?? storeUser);
+ const effectiveUser = $derived(user ?? storeUser.current);
const isCollapsed = $derived(sidebar.state === 'collapsed' && !(sidebar.hoverExpansionEnabled && sidebar.isHovered));
const isAdmin = $derived(!!effectiveUser?.roles?.includes('admin'));
@@ -79,7 +75,7 @@
</div>
{/if}
<div class="relative">
- <SidebarLogo {isCollapsed} {versionInformation} />
+ <SidebarLogo {isCollapsed} />
{#if !isCollapsed}
<div class="absolute top-0 right-0 -mt-1 -mr-1">
<SidebarPinButton />
diff --git a/frontend/src/lib/components/ui/data-table/flex-render.svelte b/frontend/src/lib/components/ui/data-table/flex-render.svelte
index 97487fc24..be0421f21 100644
--- a/frontend/src/lib/components/ui/data-table/flex-render.svelte
+++ b/frontend/src/lib/components/ui/data-table/flex-render.svelte
@@ -26,7 +26,7 @@
<Component {...props} />
{:else if result instanceof RenderSnippetConfig}
{@const { snippet, params } = result}
- {@render snippet(params)}
+ {@render snippet?.(params)}
{:else}
{result}
{/if}
diff --git a/frontend/src/lib/components/vulnerability/vulnerability-scan-item.svelte b/frontend/src/lib/components/vulnerability/vulnerability-scan-item.svelte
index e3bf3cdab..9aa49794f 100644
--- a/frontend/src/lib/components/vulnerability/vulnerability-scan-item.svelte
+++ b/frontend/src/lib/components/vulnerability/vulnerability-scan-item.svelte
@@ -6,9 +6,11 @@
import { onDestroy } from 'svelte';
import type { VulnerabilityScanSummary } from '$lib/types/vulnerability.type';
import { m } from '$lib/paraglide/messages';
+ import { queryKeys } from '$lib/query/query-keys';
import { vulnerabilityService } from '$lib/services/vulnerability-service';
import { startVulnerabilityScanPolling } from '$lib/utils/vulnerability-scan.util';
import { ShieldCheckIcon, ShieldAlertIcon, ScanIcon, ShieldXIcon } from '$lib/icons';
+ import { createMutation, useQueryClient } from '@tanstack/svelte-query';
interface Props {
scanSummary?: VulnerabilityScanSummary;
@@ -19,9 +21,13 @@
let { scanSummary = $bindable(), imageId, onScanned, pollingEnabled = true }: Props = $props();
- let isScanning = $state(false);
let isOpen = $state(false);
let stopPolling: (() => void) | null = $state(null);
+ const queryClient = useQueryClient();
+ const scanMutation = createMutation(() => ({
+ mutationFn: () => vulnerabilityService.scanImage(imageId)
+ }));
+ const isScanning = $derived(scanMutation.isPending);
const hasError = $derived(scanSummary?.status === 'failed' || !!scanSummary?.error);
const isCompleted = $derived(scanSummary?.status === 'completed');
@@ -85,9 +91,8 @@
async function startScan() {
if (isScanning) return;
- isScanning = true;
try {
- const result = await vulnerabilityService.scanImage(imageId);
+ const result = await scanMutation.mutateAsync();
if (result) {
const summary: VulnerabilityScanSummary = {
imageId: result.imageId,
@@ -110,7 +115,7 @@
console.error('Error scanning image:', error);
toast.error(m.vuln_scan_failed());
} finally {
- isScanning = false;
+ // no-op, TanStack manages pending state
}
}
@@ -123,25 +128,34 @@
function beginPolling(showToast: boolean) {
if (stopPolling) return;
- const cancel = startVulnerabilityScanPolling(imageId, (id) => vulnerabilityService.getScanSummary(id), {
- onUpdate: (summary) => {
- scanSummary = summary;
- onScanned?.(summary);
- },
- onComplete: (summary) => {
- scanSummary = summary;
- onScanned?.(summary);
- stopScanPolling();
- if (showToast) {
- if (summary.status === 'completed') {
- toast.success(m.vuln_scan_completed());
- } else {
- toast.error(summary.error || m.vuln_scan_failed());
+ const cancel = startVulnerabilityScanPolling(
+ imageId,
+ (id) =>
+ queryClient.fetchQuery({
+ queryKey: queryKeys.vulnerabilities.summaryByImage(id),
+ queryFn: () => vulnerabilityService.getScanSummary(id),
+ staleTime: 0
+ }),
+ {
+ onUpdate: (summary) => {
+ scanSummary = summary;
+ onScanned?.(summary);
+ },
+ onComplete: (summary) => {
+ scanSummary = summary;
+ onScanned?.(summary);
+ stopScanPolling();
+ if (showToast) {
+ if (summary.status === 'completed') {
+ toast.success(m.vuln_scan_completed());
+ } else {
+ toast.error(summary.error || m.vuln_scan_failed());
+ }
}
- }
- },
- onError: () => {}
- });
+ },
+ onError: () => {}
+ }
+ );
stopPolling = cancel;
}
diff --git a/frontend/src/lib/components/vulnerability/vulnerability-scan-panel.svelte b/frontend/src/lib/components/vulnerability/vulnerability-scan-panel.svelte
index 03b6a1128..084d9ca16 100644
--- a/frontend/src/lib/components/vulnerability/vulnerability-scan-panel.svelte
+++ b/frontend/src/lib/components/vulnerability/vulnerability-scan-panel.svelte
@@ -3,6 +3,7 @@
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import UniversalMobileCard from '$lib/components/arcane-table/cards/universal-mobile-card.svelte';
import { ArcaneButton } from '$lib/components/arcane-button';
+ import { queryKeys } from '$lib/query/query-keys';
import { Spinner } from '$lib/components/ui/spinner';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
import { m } from '$lib/paraglide/messages';
@@ -11,6 +12,7 @@
import type { VulnerabilityScanResult, Vulnerability as VulnType, SeveritySummary } from '$lib/types/vulnerability.type';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/pagination.type';
import { ShieldCheckIcon, ShieldAlertIcon, ShieldXIcon, ScanIcon, CodeIcon, CheckIcon } from '$lib/icons';
+ import { useQueryClient } from '@tanstack/svelte-query';
interface Props {
scan?: VulnerabilityScanResult | null;
@@ -19,6 +21,7 @@
}
let { scan, isScanning = false, onScan }: Props = $props();
+ const queryClient = useQueryClient();
const DEFAULT_PAGE_SIZE = 20;
@@ -266,7 +269,11 @@
filters: Object.keys(mergedFilters).length ? mergedFilters : undefined
};
- const response = await vulnerabilityService.getImageVulnerabilities(scan.imageId, request);
+ const response = await queryClient.fetchQuery({
+ queryKey: queryKeys.vulnerabilities.imageRows(scan.imageId, request),
+ queryFn: () => vulnerabilityService.getImageVulnerabilities(scan.imageId, request),
+ staleTime: 0
+ });
const page = request.pagination?.page ?? 1;
const limit = request.pagination?.limit ?? DEFAULT_PAGE_SIZE;
const offset = (page - 1) * limit;
diff --git a/frontend/src/lib/query/query-keys.ts b/frontend/src/lib/query/query-keys.ts
new file mode 100644
index 000000000..3db3473f1
--- /dev/null
+++ b/frontend/src/lib/query/query-keys.ts
@@ -0,0 +1,130 @@
+import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
+
+function stableSerialize(value: unknown): string {
+ if (value === null || value === undefined) return 'null';
+ if (typeof value !== 'object') return JSON.stringify(value);
+ if (Array.isArray(value)) return `[${value.map((entry) => stableSerialize(entry)).join(',')}]`;
+
+ const entries = Object.entries(value as Record<string, unknown>)
+ .filter(([, entry]) => entry !== undefined)
+ .sort(([a], [b]) => a.localeCompare(b));
+
+ return `{${entries.map(([key, entry]) => `${JSON.stringify(key)}:${stableSerialize(entry)}`).join(',')}}`;
+}
+
+export const queryKeys = {
+ auth: {
+ all: ['auth'] as const,
+ logout: () => ['auth', 'logout'] as const
+ },
+ settings: {
+ all: ['settings'] as const,
+ global: () => ['settings', 'global'] as const,
+ byEnvironment: (environmentId: string) => ['settings', environmentId] as const
+ },
+ users: {
+ all: ['users'] as const,
+ list: (options: SearchPaginationSortRequest) => ['users', stableSerialize(options)] as const
+ },
+ apiKeys: {
+ all: ['api-keys'] as const,
+ list: (options: SearchPaginationSortRequest) => ['api-keys', stableSerialize(options)] as const
+ },
+ environments: {
+ all: ['environments'] as const,
+ list: (options: SearchPaginationSortRequest) => ['environments', stableSerialize(options)] as const,
+ switcher: (options: SearchPaginationSortRequest) => ['environments', 'switcher', stableSerialize(options)] as const,
+ detail: (environmentId: string) => ['environment', environmentId] as const,
+ settings: (environmentId: string) => ['environment-settings', environmentId] as const,
+ deploymentSnippets: (environmentId: string) => ['environment', 'deployment-snippets', environmentId] as const
+ },
+ gitRepositories: {
+ all: ['git-repositories'] as const,
+ list: (options: SearchPaginationSortRequest) => ['git-repositories', stableSerialize(options)] as const,
+ syncDialog: () => ['git-repositories', 'sync-dialog'] as const,
+ branches: (repositoryId: string) => ['git-repositories', 'branches', repositoryId] as const,
+ files: (repositoryId: string, branch: string, path: string) => ['git-repository-files', repositoryId, branch, path] as const
+ },
+ containerRegistries: {
+ all: ['container-registries'] as const,
+ list: (options: SearchPaginationSortRequest) => ['container-registries', stableSerialize(options)] as const
+ },
+ templates: {
+ all: ['templates'] as const,
+ allTemplates: () => ['templates', 'all'] as const,
+ defaults: () => ['templates', 'defaults'] as const,
+ list: (options: SearchPaginationSortRequest) => ['templates', stableSerialize(options)] as const,
+ content: (templateId: string) => ['template-content', templateId] as const,
+ registries: () => ['template-registries'] as const,
+ globalVariables: () => ['templates', 'global-variables'] as const
+ },
+ notifications: {
+ settings: () => ['notification-settings'] as const
+ },
+ events: {
+ all: ['events'] as const,
+ listByEnvironment: (environmentId: string, options: SearchPaginationSortRequest) =>
+ ['events', environmentId, stableSerialize(options)] as const,
+ listGlobal: (options: SearchPaginationSortRequest) => ['events', 'global', stableSerialize(options)] as const,
+ deleteSelected: (environmentId: string) => ['events', 'delete-selected', environmentId] as const
+ },
+ system: {
+ upgradeAvailable: (scope: 'mobile-nav' | 'sidebar') => ['system', 'upgrade-available', scope] as const,
+ upgradeHealth: (environmentId: string) => ['system', 'upgrade-health', environmentId] as const,
+ versionInfo: (environmentId: string) => ['system', 'version-info', environmentId] as const,
+ dockerInfo: (environmentId: string) => ['system', 'docker-info', environmentId] as const
+ },
+ containers: {
+ all: ['containers'] as const,
+ list: (environmentId: string, options: SearchPaginationSortRequest) =>
+ ['containers', environmentId, stableSerialize(options)] as const,
+ checkUpdates: (environmentId: string) => ['containers', 'check-updates', environmentId] as const,
+ create: (environmentId: string) => ['containers', 'create', environmentId] as const,
+ statusCounts: (environmentId: string) => ['containers', 'status-counts', environmentId] as const,
+ detail: (environmentId: string, containerId: string) => ['container', environmentId, containerId] as const
+ },
+ images: {
+ all: ['images'] as const,
+ list: (environmentId: string, options: SearchPaginationSortRequest) =>
+ ['images', environmentId, stableSerialize(options)] as const,
+ usageCounts: (environmentId: string) => ['images', 'usage-counts', environmentId] as const,
+ detail: (environmentId: string, imageId: string) => ['image', environmentId, imageId] as const,
+ updateCheck: (environmentId: string, imageId: string) => ['image-update', environmentId, imageId] as const
+ },
+ projects: {
+ all: ['projects'] as const,
+ list: (environmentId: string, options: SearchPaginationSortRequest) =>
+ ['projects', environmentId, stableSerialize(options)] as const,
+ statusCounts: (environmentId: string) => ['projects', 'status-counts', environmentId] as const,
+ detail: (environmentId: string, projectId: string) => ['project', environmentId, projectId] as const
+ },
+ networks: {
+ all: ['networks'] as const,
+ list: (environmentId: string, options: SearchPaginationSortRequest) =>
+ ['networks', environmentId, stableSerialize(options)] as const,
+ detail: (environmentId: string, networkId: string) => ['network', environmentId, networkId] as const
+ },
+ gitOpsSyncs: {
+ all: ['gitops-syncs'] as const,
+ list: (environmentId: string, options: SearchPaginationSortRequest) =>
+ ['gitops-syncs', environmentId, stableSerialize(options)] as const
+ },
+ volumes: {
+ table: (environmentId: string, options: SearchPaginationSortRequest) =>
+ ['volumes', environmentId, stableSerialize(options)] as const,
+ detail: (environmentId: string, volumeName: string) => ['volume', environmentId, volumeName] as const,
+ list: (volumeName: string, path: string) => ['volume-browser', volumeName, 'list', path] as const,
+ listPrefix: (volumeName: string) => ['volume-browser', volumeName, 'list'] as const,
+ content: (volumeName: string, path: string) => ['volume-browser', volumeName, 'content', path] as const,
+ backups: (volumeName: string) => ['volume-backups', volumeName] as const,
+ backupHasPath: (backupId: string, path: string) => ['volume-backups', backupId, 'has-path', path] as const
+ },
+ vulnerabilities: {
+ summaryByEnvironment: (environmentId: string) => ['vulnerabilities', 'summary', environmentId] as const,
+ summaryByImage: (imageId: string) => ['vulnerabilities', 'image-summary', imageId] as const,
+ allByEnvironment: (environmentId: string, request: SearchPaginationSortRequest) =>
+ ['vulnerabilities', 'all', environmentId, stableSerialize(request)] as const,
+ imageRows: (imageId: string, request: SearchPaginationSortRequest) =>
+ ['vulnerabilities', 'image', imageId, stableSerialize(request)] as const
+ }
+} as const;
diff --git a/frontend/src/lib/services/container-service.ts b/frontend/src/lib/services/container-service.ts
index a5d05060c..19b9c9f07 100644
--- a/frontend/src/lib/services/container-service.ts
+++ b/frontend/src/lib/services/container-service.ts
@@ -12,23 +12,41 @@ import { transformPaginationParams } from '$lib/utils/params.util';
export type ContainersPaginatedResponse = Paginated<ContainerSummaryDto, ContainerStatusCounts>;
export class ContainerService extends BaseAPIService {
+ private async resolveEnvironmentId(environmentId?: string): Promise<string> {
+ return environmentId ?? (await environmentStore.getCurrentEnvironmentId());
+ }
+
async getContainers(options?: SearchPaginationSortRequest): Promise<ContainersPaginatedResponse> {
- const envId = await environmentStore.getCurrentEnvironmentId();
+ const envId = await this.resolveEnvironmentId();
+ return this.getContainersForEnvironment(envId, options);
+ }
+
+ async getContainersForEnvironment(
+ environmentId: string,
+ options?: SearchPaginationSortRequest
+ ): Promise<ContainersPaginatedResponse> {
const params = transformPaginationParams(options);
- const res = await this.api.get(`/environments/${envId}/containers`, { params });
+ const res = await this.api.get(`/environments/${environmentId}/containers`, { params });
return res.data;
}
async getContainerStatusCounts(): Promise<ContainerStatusCounts> {
- const envId = await environmentStore.getCurrentEnvironmentId();
+ const envId = await this.resolveEnvironmentId();
+ return this.getContainerStatusCountsForEnvironment(envId);
+ }
- const res = await this.api.get(`/environments/${envId}/containers/counts`);
+ async getContainerStatusCountsForEnvironment(environmentId: string): Promise<ContainerStatusCounts> {
+ const res = await this.api.get(`/environments/${environmentId}/containers/counts`);
return res.data.data;
}
async getContainer(containerId: string): Promise<any> {
- const envId = await environmentStore.getCurrentEnvironmentId();
- return this.handleResponse(this.api.get(`/environments/${envId}/containers/${containerId}`));
+ const envId = await this.resolveEnvironmentId();
+ return this.getContainerForEnvironment(envId, containerId);
+ }
+
+ async getContainerForEnvironment(environmentId: string, containerId: string): Promise<any> {
+ return this.handleResponse(this.api.get(`/environments/${environmentId}/containers/${containerId}`));
}
async startContainer(containerId: string): Promise<any> {
diff --git a/frontend/src/lib/services/image-service.ts b/frontend/src/lib/services/image-service.ts
index 29bffd2b1..350710abb 100644
--- a/frontend/src/lib/services/image-service.ts
+++ b/frontend/src/lib/services/image-service.ts
@@ -6,22 +6,41 @@ import type { AutoUpdateCheck, AutoUpdateResult } from '$lib/types/auto-update.t
import { transformPaginationParams } from '$lib/utils/params.util';
export class ImageService extends BaseAPIService {
+ private async resolveEnvironmentId(environmentId?: string): Promise<string> {
+ return environmentId ?? (await environmentStore.getCurrentEnvironmentId());
+ }
+
async getImages(options?: SearchPaginationSortRequest): Promise<Paginated<ImageSummaryDto>> {
- const envId = await environmentStore.getCurrentEnvironmentId();
+ const envId = await this.resolveEnvironmentId();
+ return this.getImagesForEnvironment(envId, options);
+ }
+
+ async getImagesForEnvironment(
+ environmentId: string,
+ options?: SearchPaginationSortRequest
+ ): Promise<Paginated<ImageSummaryDto>> {
const params = transformPaginationParams(options);
- const res = await this.api.get(`/environments/${envId}/images`, { params });
+ const res = await this.api.get(`/environments/${environmentId}/images`, { params });
return res.data;
}
async getImageUsageCounts(): Promise<ImageUsageCounts> {
- const envId = await environmentStore.getCurrentEnvironmentId();
- const res = await this.api.get(`/environments/${envId}/images/counts`);
+ const envId = await this.resolveEnvironmentId();
+ return this.getImageUsageCountsForEnvironment(envId);
+ }
+
+ async getImageUsageCountsForEnvironment(environmentId: string): Promise<ImageUsageCounts> {
+ const res = await this.api.get(`/environments/${environmentId}/images/counts`);
return res.data.data;
}
async getImage(imageId: string): Promise<any> {
- const envId = await environmentStore.getCurrentEnvironmentId();
- return this.handleResponse(this.api.get(`/environments/${envId}/images/${imageId}`));
+ const envId = await this.resolveEnvironmentId();
+ return this.getImageForEnvironment(envId, imageId);
+ }
+
+ async getImageForEnvironment(environmentId: string, imageId: string): Promise<any> {
+ return this.handleResponse(this.api.get(`/environments/${environmentId}/images/${imageId}`));
}
async pullImage(imageName: string, tag: string = 'latest', auth?: any): Promise<any> {
diff --git a/frontend/src/lib/services/network-service.ts b/frontend/src/lib/services/network-service.ts
index 122d3b7d3..cf91b6308 100644
--- a/frontend/src/lib/services/network-service.ts
+++ b/frontend/src/lib/services/network-service.ts
@@ -13,10 +13,21 @@ import { transformPaginationParams } from '$lib/utils/params.util';
export type NetworksPaginatedResponse = Paginated<NetworkSummaryDto, NetworkUsageCounts>;
export class NetworkService extends BaseAPIService {
+ private async resolveEnvironmentId(environmentId?: string): Promise<string> {
+ return environmentId ?? (await environmentStore.getCurrentEnvironmentId());
+ }
+
async getNetworks(options?: SearchPaginationSortRequest): Promise<NetworksPaginatedResponse> {
- const envId = await environmentStore.getCurrentEnvironmentId();
+ const envId = await this.resolveEnvironmentId();
+ return this.getNetworksForEnvironment(envId, options);
+ }
+
+ async getNetworksForEnvironment(
+ environmentId: string,
+ options?: SearchPaginationSortRequest
+ ): Promise<NetworksPaginatedResponse> {
const params = transformPaginationParams(options);
- const res = await this.api.get(`/environments/${envId}/networks`, { params });
+ const res = await this.api.get(`/environments/${environmentId}/networks`, { params });
return res.data;
}
@@ -27,9 +38,17 @@ export class NetworkService extends BaseAPIService {
}
async getNetwork(networkId: string, options?: SearchPaginationSortRequest): Promise<NetworkInspectDto> {
- const envId = await environmentStore.getCurrentEnvironmentId();
+ const envId = await this.resolveEnvironmentId();
+ return this.getNetworkForEnvironment(envId, networkId, options);
+ }
+
+ async getNetworkForEnvironment(
+ environmentId: string,
+ networkId: string,
+ options?: SearchPaginationSortRequest
+ ): Promise<NetworkInspectDto> {
const params = transformPaginationParams(options);
- return this.handleResponse(this.api.get(`/environments/${envId}/networks/${networkId}`, { params }));
+ return this.handleResponse(this.api.get(`/environments/${environmentId}/networks/${networkId}`, { params }));
}
async createNetwork(name: string, options: NetworkCreateOptions): Promise<any> {
diff --git a/frontend/src/lib/services/project-service.ts b/frontend/src/lib/services/project-service.ts
index f4c6c0446..530fdb784 100644
--- a/frontend/src/lib/services/project-service.ts
+++ b/frontend/src/lib/services/project-service.ts
@@ -6,10 +6,18 @@ import { transformPaginationParams } from '$lib/utils/params.util';
import BaseAPIService from './api-service';
export class ProjectService extends BaseAPIService {
+ private async resolveEnvironmentId(environmentId?: string): Promise<string> {
+ return environmentId ?? (await environmentStore.getCurrentEnvironmentId());
+ }
+
async getProjects(options?: SearchPaginationSortRequest): Promise<Paginated<Project>> {
- const envId = await environmentStore.getCurrentEnvironmentId();
+ const envId = await this.resolveEnvironmentId();
+ return this.getProjectsForEnvironment(envId, options);
+ }
+
+ async getProjectsForEnvironment(environmentId: string, options?: SearchPaginationSortRequest): Promise<Paginated<Project>> {
const params = transformPaginationParams(options);
- const res = await this.api.get(`/environments/${envId}/projects`, { params });
+ const res = await this.api.get(`/environments/${environmentId}/projects`, { params });
return res.data;
}
@@ -74,18 +82,25 @@ export class ProjectService extends BaseAPIService {
}
async getProject(projectId: string): Promise<Project> {
- const envId = await environmentStore.getCurrentEnvironmentId();
+ const envId = await this.resolveEnvironmentId();
+ return this.getProjectForEnvironment(envId, projectId);
+ }
+
+ async getProjectForEnvironment(environmentId: string, projectId: string): Promise<Project> {
const response = await this.handleResponse<{ project?: Project; success?: boolean }>(
- this.api.get(`/environments/${envId}/projects/${projectId}`)
+ this.api.get(`/environments/${environmentId}/projects/${projectId}`)
);
return response.project ? response.project : (response as Project);
}
async getProjectStatusCounts(): Promise<ProjectStatusCounts> {
- const envId = await environmentStore.getCurrentEnvironmentId();
+ const envId = await this.resolveEnvironmentId();
+ return this.getProjectStatusCountsForEnvironment(envId);
+ }
- const res = await this.api.get(`/environments/${envId}/projects/counts`);
+ async getProjectStatusCountsForEnvironment(environmentId: string): Promise<ProjectStatusCounts> {
+ const res = await this.api.get(`/environments/${environmentId}/projects/counts`);
return res.data.data;
}
diff --git a/frontend/src/lib/services/settings-service.ts b/frontend/src/lib/services/settings-service.ts
index cce78c0ca..39cafa5ce 100644
--- a/frontend/src/lib/services/settings-service.ts
+++ b/frontend/src/lib/services/settings-service.ts
@@ -10,9 +10,12 @@ export default class SettingsService extends BaseAPIService {
// Wait for environment store to be initialized before fetching settings
await environmentStore.ready;
const envId = await environmentStore.getCurrentEnvironmentId();
+ return this.getSettingsForEnvironmentMerged(envId);
+ }
+ async getSettingsForEnvironmentMerged(environmentId: string): Promise<Settings> {
// If we're on environment 0, just get all settings normally
- if (envId === '0') {
+ if (environmentId === '0') {
const res = await this.api.get(`/environments/0/settings`);
return this.normalize(res.data);
}
@@ -22,7 +25,7 @@ export default class SettingsService extends BaseAPIService {
// - Environment-specific settings from current environment
const [mainSettings, envSettings] = await Promise.all([
this.api.get('/environments/0/settings'),
- this.api.get(`/environments/${envId}/settings`)
+ this.api.get(`/environments/${environmentId}/settings`)
]);
const mainNormalized = this.normalize(mainSettings.data);
diff --git a/frontend/src/lib/services/system-service.ts b/frontend/src/lib/services/system-service.ts
index 9d2785d49..9fb9583d4 100644
--- a/frontend/src/lib/services/system-service.ts
+++ b/frontend/src/lib/services/system-service.ts
@@ -28,7 +28,11 @@ export class SystemService extends BaseAPIService {
async getDockerInfo(): Promise<DockerInfo> {
const envId = await environmentStore.getCurrentEnvironmentId();
- return this.handleResponse(this.api.get(`/environments/${envId}/system/docker/info`));
+ return this.getDockerInfoForEnvironment(envId);
+ }
+
+ async getDockerInfoForEnvironment(environmentId: string): Promise<DockerInfo> {
+ return this.handleResponse(this.api.get(`/environments/${environmentId}/system/docker/info`));
}
async convert(dockerRunCommand: string) {
diff --git a/frontend/src/lib/services/volume-service.ts b/frontend/src/lib/services/volume-service.ts
index b7d08b645..ae0f84709 100644
--- a/frontend/src/lib/services/volume-service.ts
+++ b/frontend/src/lib/services/volume-service.ts
@@ -14,16 +14,31 @@ import { transformPaginationParams } from '$lib/utils/params.util';
export type VolumesPaginatedResponse = Paginated<VolumeSummaryDto, VolumeUsageCounts>;
export class VolumeService extends BaseAPIService {
+ private async resolveEnvironmentId(environmentId?: string): Promise<string> {
+ return environmentId ?? (await environmentStore.getCurrentEnvironmentId());
+ }
+
async getVolumes(options?: SearchPaginationSortRequest): Promise<VolumesPaginatedResponse> {
- const envId = await environmentStore.getCurrentEnvironmentId();
+ const envId = await this.resolveEnvironmentId();
+ return this.getVolumesForEnvironment(envId, options);
+ }
+
+ async getVolumesForEnvironment(
+ environmentId: string,
+ options?: SearchPaginationSortRequest
+ ): Promise<VolumesPaginatedResponse> {
const params = transformPaginationParams(options);
- const res = await this.api.get(`/environments/${envId}/volumes`, { params });
+ const res = await this.api.get(`/environments/${environmentId}/volumes`, { params });
return res.data;
}
async getVolume(volumeName: string): Promise<VolumeDetailDto> {
- const envId = await environmentStore.getCurrentEnvironmentId();
- return this.handleResponse(this.api.get(`/environments/${envId}/volumes/${volumeName}`)) as Promise<VolumeDetailDto>;
+ const envId = await this.resolveEnvironmentId();
+ return this.getVolumeForEnvironment(envId, volumeName);
+ }
+
+ async getVolumeForEnvironment(environmentId: string, volumeName: string): Promise<VolumeDetailDto> {
+ return this.handleResponse(this.api.get(`/environments/${environmentId}/volumes/${volumeName}`)) as Promise<VolumeDetailDto>;
}
async getVolumeUsage(volumeName: string): Promise<VolumeUsageDto> {
diff --git a/frontend/src/lib/services/vulnerability-service.ts b/frontend/src/lib/services/vulnerability-service.ts
index 1cad99d2b..a5c0c741b 100644
--- a/frontend/src/lib/services/vulnerability-service.ts
+++ b/frontend/src/lib/services/vulnerability-service.ts
@@ -15,6 +15,10 @@ import type { Paginated, SearchPaginationSortRequest } from '$lib/types/paginati
import { transformPaginationParams } from '$lib/utils/params.util';
export class VulnerabilityService extends BaseAPIService {
+ private async resolveEnvironmentId(environmentId?: string): Promise<string> {
+ return environmentId ?? (await environmentStore.getCurrentEnvironmentId());
+ }
+
/**
* Scan an image for vulnerabilities
*/
@@ -73,17 +77,28 @@ export class VulnerabilityService extends BaseAPIService {
* Get aggregated vulnerability summary for the current environment
*/
async getEnvironmentSummary(): Promise<EnvironmentVulnerabilitySummary> {
- const envId = await environmentStore.getCurrentEnvironmentId();
- return this.handleResponse(this.api.get(`/environments/${envId}/vulnerabilities/summary`));
+ const envId = await this.resolveEnvironmentId();
+ return this.getEnvironmentSummaryForEnvironment(envId);
+ }
+
+ async getEnvironmentSummaryForEnvironment(environmentId: string): Promise<EnvironmentVulnerabilitySummary> {
+ return this.handleResponse(this.api.get(`/environments/${environmentId}/vulnerabilities/summary`));
}
/**
* Get a paginated list of vulnerabilities across all images
*/
async getAllVulnerabilities(options?: SearchPaginationSortRequest): Promise<Paginated<VulnerabilityWithImage>> {
- const envId = await environmentStore.getCurrentEnvironmentId();
+ const envId = await this.resolveEnvironmentId();
+ return this.getAllVulnerabilitiesForEnvironment(envId, options);
+ }
+
+ async getAllVulnerabilitiesForEnvironment(
+ environmentId: string,
+ options?: SearchPaginationSortRequest
+ ): Promise<Paginated<VulnerabilityWithImage>> {
const params = transformPaginationParams(options);
- const res = await this.api.get(`/environments/${envId}/vulnerabilities/all`, { params });
+ const res = await this.api.get(`/environments/${environmentId}/vulnerabilities/all`, { params });
return res.data;
}
diff --git a/frontend/src/lib/stores/config-store.ts b/frontend/src/lib/stores/config-store.ts
index f3c0807b9..9edac4dc4 100644
--- a/frontend/src/lib/stores/config-store.ts
+++ b/frontend/src/lib/stores/config-store.ts
@@ -1,20 +1,13 @@
import { settingsService } from '$lib/services/settings-service';
import type { Settings } from '$lib/types/settings.type';
import { applyAccentColor } from '$lib/utils/accent-color-util';
-import { bustLogoCache } from '$lib/utils/image.util';
-import { get, writable } from 'svelte/store';
+import { writable } from 'svelte/store';
const settingsStore = writable<Settings>();
const reload = async () => {
- const previousSettings = get(settingsStore);
const settings = await settingsService.getSettings();
- // Bust logo cache if accent color changed
- if (previousSettings && previousSettings.accentColor !== settings.accentColor) {
- bustLogoCache();
- }
-
set(settings);
};
diff --git a/frontend/src/lib/utils/accent-color-util.ts b/frontend/src/lib/utils/accent-color-util.ts
index 775618f8e..d4b835970 100644
--- a/frontend/src/lib/utils/accent-color-util.ts
+++ b/frontend/src/lib/utils/accent-color-util.ts
@@ -1,4 +1,17 @@
+import { writable } from 'svelte/store';
+
+const DEFAULT_ACCENT_COLOR = 'oklch(0.606 0.25 292.717)';
+
+export const accentColorPreviewStore = writable<string>(DEFAULT_ACCENT_COLOR);
+
export function applyAccentColor(accentValue: string) {
+ const resolvedAccent = accentValue === 'default' ? DEFAULT_ACCENT_COLOR : accentValue;
+ accentColorPreviewStore.set(resolvedAccent);
+
+ if (typeof document === 'undefined') {
+ return;
+ }
+
if (accentValue === 'default') {
document.documentElement.style.removeProperty('--primary');
document.documentElement.style.removeProperty('--primary-foreground');
@@ -7,14 +20,14 @@ export function applyAccentColor(accentValue: string) {
return;
}
- document.documentElement.style.setProperty('--primary', accentValue);
+ document.documentElement.style.setProperty('--primary', resolvedAccent);
// Smart foreground color selection based on brightness
- const foregroundColor = getContrastingForeground(accentValue);
+ const foregroundColor = getContrastingForeground(resolvedAccent);
document.documentElement.style.setProperty('--primary-foreground', foregroundColor);
// Create proper ring colors based on input format
- const ringColor = `color-mix(in srgb, ${accentValue} 50%, transparent)`;
+ const ringColor = `color-mix(in srgb, ${resolvedAccent} 50%, transparent)`;
document.documentElement.style.setProperty('--ring', ringColor);
document.documentElement.style.setProperty('--sidebar-ring', ringColor);
}
diff --git a/frontend/src/lib/utils/image.util.ts b/frontend/src/lib/utils/image.util.ts
index 41fec8a78..76f89dca0 100644
--- a/frontend/src/lib/utils/image.util.ts
+++ b/frontend/src/lib/utils/image.util.ts
@@ -1,64 +1,22 @@
-type SkipCacheUntil = {
- [key: string]: number;
-};
+export function getApplicationLogo(full = false, colorOverride?: string, version?: string): string {
+ const params = new URLSearchParams();
-export function getApplicationLogo(full = false, colorOverride?: string): string {
- // Build base URL - don't include color param for normal requests
- // The backend reads the saved color from settings automatically
- // Only include color param when explicitly previewing a different color
- const baseUrl = full ? '/api/app-images/logo?full=true' : '/api/app-images/logo';
+ if (full) {
+ params.set('full', 'true');
+ }
if (colorOverride) {
- const separator = full ? '&' : '?';
- return `${baseUrl}${separator}color=${encodeURIComponent(colorOverride)}`;
+ params.set('color', colorOverride);
}
- return getCachedImageUrl(baseUrl);
-}
-
-export function bustLogoCache(): void {
- // Set skip cache for all logo URL patterns to force refetch
- const skipCacheUntil = Date.now() + 60000; // Skip cache for 1 minute
- const skipCacheUntilMap: SkipCacheUntil = JSON.parse(localStorage.getItem('skip-cache-until') ?? '{}');
-
- // Clear all existing logo cache entries and set new ones
- for (const key of Object.keys(skipCacheUntilMap)) {
- delete skipCacheUntilMap[key];
+ if (version) {
+ params.set('v', version);
}
- // Add cache bust timestamp for base logo URLs
- skipCacheUntilMap[hashKey('/api/app-images/logo')] = skipCacheUntil;
- skipCacheUntilMap[hashKey('/api/app-images/logo?full=true')] = skipCacheUntil;
-
- localStorage.setItem('skip-cache-until', JSON.stringify(skipCacheUntilMap));
+ const query = params.toString();
+ return query ? `/api/app-images/logo?${query}` : '/api/app-images/logo';
}
export function getDefaultProfilePicture(): string {
- return getCachedImageUrl('/api/app-images/profile');
-}
-
-function getCachedImageUrl(url: string) {
- const skipCacheUntil = getSkipCacheUntil(url);
- const skipCache = skipCacheUntil > Date.now();
- if (skipCache) {
- const separator = url.includes('?') ? '&' : '?';
- url += separator + 'skip-cache=' + skipCacheUntil.toString();
- }
-
- return url.toString();
-}
-
-function getSkipCacheUntil(url: string) {
- const skipCacheUntil: SkipCacheUntil = JSON.parse(localStorage.getItem('skip-cache-until') ?? '{}');
- return skipCacheUntil[hashKey(url)] ?? 0;
-}
-
-function hashKey(key: string): string {
- let hash = 0;
- for (let i = 0; i < key.length; i++) {
- const char = key.charCodeAt(i);
- hash = (hash << 5) - hash + char;
- hash = hash & hash;
- }
- return Math.abs(hash).toString(36);
+ return '/api/app-images/profile';
}
diff --git a/frontend/src/routes/(app)/containers/+page.svelte b/frontend/src/routes/(app)/containers/+page.svelte
index 97d09e150..088361728 100644
--- a/frontend/src/routes/(app)/containers/+page.svelte
+++ b/frontend/src/routes/(app)/containers/+page.svelte
@@ -1,82 +1,104 @@
<script lang="ts">
import CreateContainerDialog from '$lib/components/dialogs/create-container-dialog.svelte';
import { toast } from 'svelte-sonner';
- import { tryCatch } from '$lib/utils/try-catch';
- import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
import { containerService } from '$lib/services/container-service';
import ContainerTable from './container-table.svelte';
import { m } from '$lib/paraglide/messages';
import { imageService } from '$lib/services/image-service';
import { untrack } from 'svelte';
import { ResourcePageLayout, type ActionButton, type StatCardConfig } from '$lib/layouts/index';
- import { useEnvironmentRefresh } from '$lib/hooks/use-environment-refresh.svelte';
- import { parallelRefresh } from '$lib/utils/refresh.util';
+ import { environmentStore } from '$lib/stores/environment.store.svelte';
+ import type { ContainerCreateRequest, ContainerStatusCounts } from '$lib/types/container.type';
+ import { createMutation, createQuery } from '@tanstack/svelte-query';
import { BoxIcon } from '$lib/icons';
+ import { queryKeys } from '$lib/query/query-keys';
let { data } = $props();
- let containers = $state(untrack(() => data.containers));
- let containerStatusCounts = $state(untrack(() => data.containerStatusCounts));
let requestOptions = $state(untrack(() => data.containerRequestOptions));
- let selectedIds = $state([]);
+ let selectedIds = $state<string[]>([]);
let isCreateDialogOpen = $state(false);
- let isLoading = $state({ checking: false, create: false, refreshing: false });
+ let containers = $state(untrack(() => data.containers));
+ const envId = $derived(environmentStore.selected?.id || '0');
- async function refresh() {
- await parallelRefresh(
- {
- containers: {
- fetch: () => containerService.getContainers(requestOptions),
- onSuccess: (data) => {
- containers = data;
- containerStatusCounts = data.counts ?? { runningContainers: 0, stoppedContainers: 0, totalContainers: 0 };
- },
- errorMessage: m.common_refresh_failed({ resource: m.containers_title() })
- }
- },
- (v) => (isLoading.refreshing = v)
- );
- }
+ const countsFallback: ContainerStatusCounts = {
+ runningContainers: 0,
+ stoppedContainers: 0,
+ totalContainers: 0
+ };
+
+ const containersQuery = createQuery(() => ({
+ queryKey: queryKeys.containers.list(envId, requestOptions),
+ queryFn: () => containerService.getContainersForEnvironment(envId, requestOptions),
+ initialData: data.containers
+ }));
- useEnvironmentRefresh(refresh);
+ const checkUpdatesMutation = createMutation(() => ({
+ mutationKey: queryKeys.containers.checkUpdates(envId),
+ mutationFn: () => imageService.runAutoUpdate(),
+ onSuccess: async () => {
+ toast.success(m.containers_check_updates_success());
+ await containersQuery.refetch();
+ },
+ onError: () => {
+ toast.error(m.containers_check_updates_failed());
+ }
+ }));
+
+ const createContainerMutation = createMutation(() => ({
+ mutationKey: queryKeys.containers.create(envId),
+ mutationFn: (options: ContainerCreateRequest) => containerService.createContainer(options),
+ onSuccess: async () => {
+ toast.success(m.common_create_success({ resource: m.resource_container() }));
+ await containersQuery.refetch();
+ isCreateDialogOpen = false;
+ },
+ onError: () => {
+ toast.error(m.containers_create_failed());
+ }
+ }));
+
+ $effect(() => {
+ if (containersQuery.data) {
+ containers = containersQuery.data;
+ }
+ });
async function handleCheckForUpdates() {
- isLoading.checking = true;
- handleApiResultWithCallbacks({
- result: await tryCatch(imageService.runAutoUpdate()),
- message: m.containers_check_updates_failed(),
- setLoadingState: (v) => (isLoading.checking = v),
- onSuccess: async () => {
- toast.success(m.containers_check_updates_success());
- containers = await containerService.getContainers(requestOptions);
- }
- });
+ await checkUpdatesMutation.mutateAsync();
+ }
+
+ async function refresh() {
+ await containersQuery.refetch();
}
+ const isRefreshing = $derived(containersQuery.isFetching && !containersQuery.isPending);
+ const containerStatusCounts = $derived(containers.counts ?? countsFallback);
+
const actionButtons: ActionButton[] = $derived([
{
id: 'create',
action: 'create',
label: m.common_create_button({ resource: m.resource_container_cap() }),
onclick: () => (isCreateDialogOpen = true),
- loading: isLoading.create,
- disabled: isLoading.create
+ loading: createContainerMutation.isPending,
+ disabled: createContainerMutation.isPending
},
{
id: 'check-updates',
action: 'update',
label: m.containers_check_updates(),
onclick: handleCheckForUpdates,
- loading: isLoading.checking,
- disabled: isLoading.checking
+ loading: checkUpdatesMutation.isPending,
+ disabled: checkUpdatesMutation.isPending
},
{
id: 'refresh',
action: 'restart',
label: m.common_refresh(),
onclick: refresh,
- loading: isLoading.refreshing,
- disabled: isLoading.refreshing
+ loading: isRefreshing,
+ disabled: isRefreshing
}
]);
@@ -104,26 +126,22 @@
<ResourcePageLayout title={m.containers_title()} subtitle={m.containers_subtitle()} {actionButtons} {statCards}>
{#snippet mainContent()}
- <ContainerTable bind:containers bind:selectedIds bind:requestOptions />
+ <ContainerTable
+ bind:containers
+ bind:selectedIds
+ bind:requestOptions
+ onRefreshData={async (options) => {
+ requestOptions = options;
+ await containersQuery.refetch();
+ }}
+ />
{/snippet}
{#snippet additionalContent()}
<CreateContainerDialog
bind:open={isCreateDialogOpen}
- isLoading={isLoading.create}
- onSubmit={async (options) => {
- isLoading.create = true;
- handleApiResultWithCallbacks({
- result: await tryCatch(containerService.createContainer(options)),
- message: m.containers_create_failed(),
- setLoadingState: (v) => (isLoading.create = v),
- onSuccess: async () => {
- toast.success(m.common_create_success({ resource: m.resource_container() }));
- containers = await containerService.getContainers(requestOptions);
- isCreateDialogOpen = false;
- }
- });
- }}
+ isLoading={createContainerMutation.isPending}
+ onSubmit={(options) => createContainerMutation.mutate(options)}
/>
{/snippet}
</ResourcePageLayout>
diff --git a/frontend/src/routes/(app)/containers/+page.ts b/frontend/src/routes/(app)/containers/+page.ts
index a06869b26..944cb1f1d 100644
--- a/frontend/src/routes/(app)/containers/+page.ts
+++ b/frontend/src/routes/(app)/containers/+page.ts
@@ -3,8 +3,13 @@ import { containerService } from '$lib/services/container-service';
import { resolveInitialTableRequest } from '$lib/utils/table-persistence.util';
import type { PageLoad } from './$types';
import { settingsService } from '$lib/services/settings-service';
+import { environmentStore } from '$lib/stores/environment.store.svelte';
+import { queryKeys } from '$lib/query/query-keys';
+
+export const load: PageLoad = async ({ parent }) => {
+ const { queryClient } = await parent();
+ const envId = await environmentStore.getCurrentEnvironmentId();
-export const load: PageLoad = async () => {
const containerRequestOptions = resolveInitialTableRequest('arcane-container-table', {
pagination: { page: 1, limit: 20 },
sort: { column: 'created', direction: 'desc' }
@@ -12,8 +17,14 @@ export const load: PageLoad = async () => {
// containers includes counts, settings is separate
const [containers, settings] = await Promise.all([
- containerService.getContainers(containerRequestOptions),
- settingsService.getSettings()
+ queryClient.fetchQuery({
+ queryKey: queryKeys.containers.list(envId, containerRequestOptions),
+ queryFn: () => containerService.getContainersForEnvironment(envId, containerRequestOptions)
+ }),
+ queryClient.fetchQuery({
+ queryKey: queryKeys.settings.byEnvironment(envId),
+ queryFn: () => settingsService.getSettingsForEnvironmentMerged(envId)
+ })
]);
return {
diff --git a/frontend/src/routes/(app)/containers/[containerId]/+page.ts b/frontend/src/routes/(app)/containers/[containerId]/+page.ts
index f362bae56..dc35cbbf6 100644
--- a/frontend/src/routes/(app)/containers/[containerId]/+page.ts
+++ b/frontend/src/routes/(app)/containers/[containerId]/+page.ts
@@ -2,12 +2,25 @@ import type { PageLoad } from './$types';
import { error } from '@sveltejs/kit';
import { containerService } from '$lib/services/container-service';
import { settingsService } from '$lib/services/settings-service';
+import { environmentStore } from '$lib/stores/environment.store.svelte';
+import { queryKeys } from '$lib/query/query-keys';
-export const load: PageLoad = async ({ params }) => {
+export const load: PageLoad = async ({ params, parent }) => {
+ const { queryClient } = await parent();
+ const envId = await environmentStore.getCurrentEnvironmentId();
const containerId = params.containerId;
try {
- const [container, settings] = await Promise.all([containerService.getContainer(containerId), settingsService.getSettings()]);
+ const [container, settings] = await Promise.all([
+ queryClient.fetchQuery({
+ queryKey: queryKeys.containers.detail(envId, containerId),
+ queryFn: () => containerService.getContainerForEnvironment(envId, containerId)
+ }),
+ queryClient.fetchQuery({
+ queryKey: queryKeys.settings.byEnvironment(envId),
+ queryFn: () => settingsService.getSettingsForEnvironmentMerged(envId)
+ })
+ ]);
if (!container) {
throw error(404, 'Container not found');
diff --git a/frontend/src/routes/(app)/containers/container-table.svelte b/frontend/src/routes/(app)/containers/container-table.svelte
index 7b405f786..559ab700f 100644
--- a/frontend/src/routes/(app)/containers/container-table.svelte
+++ b/frontend/src/routes/(app)/containers/container-table.svelte
@@ -53,11 +53,13 @@
let {
containers = $bindable(),
selectedIds = $bindable(),
- requestOptions = $bindable()
+ requestOptions = $bindable(),
+ onRefreshData
}: {
containers: Paginated<ContainerSummaryDto>;
selectedIds: string[];
requestOptions: SearchPaginationSortRequest;
+ onRefreshData?: (options: SearchPaginationSortRequest) => Promise<void>;
} = $props();
// Track action status per container ID (e.g., "starting", "stopping", "updating", "")
@@ -73,6 +75,10 @@
const statsManager = new ContainerStatsManager();
async function refreshContainers(options: SearchPaginationSortRequest) {
+ if (onRefreshData) {
+ await onRefreshData(options);
+ return containers;
+ }
const result = await containerService.getContainers(options);
containers = result;
return result;
diff --git a/frontend/src/routes/(app)/customize/git-repositories/+page.ts b/frontend/src/routes/(app)/customize/git-repositories/+page.ts
index 83c7ef2f1..e640c04f3 100644
--- a/frontend/src/routes/(app)/customize/git-repositories/+page.ts
+++ b/frontend/src/routes/(app)/customize/git-repositories/+page.ts
@@ -1,9 +1,12 @@
import { gitRepositoryService } from '$lib/services/git-repository-service';
+import { queryKeys } from '$lib/query/query-keys';
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
import { resolveInitialTableRequest } from '$lib/utils/table-persistence.util';
import type { PageLoad } from './$types';
-export const load: PageLoad = async () => {
+export const load: PageLoad = async ({ parent }) => {
+ const { queryClient } = await parent();
+
const repositoryRequestOptions = resolveInitialTableRequest('arcane-git-repositories-table', {
pagination: {
page: 1,
@@ -15,7 +18,10 @@ export const load: PageLoad = async () => {
}
} satisfies SearchPaginationSortRequest);
- const repositories = await gitRepositoryService.getRepositories(repositoryRequestOptions);
+ const repositories = await queryClient.fetchQuery({
+ queryKey: queryKeys.gitRepositories.list(repositoryRequestOptions),
+ queryFn: () => gitRepositoryService.getRepositories(repositoryRequestOptions)
+ });
return { repositories, repositoryRequestOptions };
};
diff --git a/frontend/src/routes/(app)/customize/registries/+page.ts b/frontend/src/routes/(app)/customize/registries/+page.ts
index 13b00473f..841992c58 100644
--- a/frontend/src/routes/(app)/customize/registries/+page.ts
+++ b/frontend/src/routes/(app)/customize/registries/+page.ts
@@ -1,9 +1,12 @@
import { containerRegistryService } from '$lib/services/container-registry-service';
+import { queryKeys } from '$lib/query/query-keys';
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
import { resolveInitialTableRequest } from '$lib/utils/table-persistence.util';
import type { PageLoad } from './$types';
-export const load: PageLoad = async () => {
+export const load: PageLoad = async ({ parent }) => {
+ const { queryClient } = await parent();
+
const registryRequestOptions = resolveInitialTableRequest('arcane-registries-table', {
pagination: {
page: 1,
@@ -15,7 +18,10 @@ export const load: PageLoad = async () => {
}
} satisfies SearchPaginationSortRequest);
- const registries = await containerRegistryService.getRegistries(registryRequestOptions);
+ const registries = await queryClient.fetchQuery({
+ queryKey: queryKeys.containerRegistries.list(registryRequestOptions),
+ queryFn: () => containerRegistryService.getRegistries(registryRequestOptions)
+ });
return { registries, registryRequestOptions };
};
diff --git a/frontend/src/routes/(app)/customize/templates/+page.ts b/frontend/src/routes/(app)/customize/templates/+page.ts
index 1af3e5f7f..eba830726 100644
--- a/frontend/src/routes/(app)/customize/templates/+page.ts
+++ b/frontend/src/routes/(app)/customize/templates/+page.ts
@@ -1,24 +1,40 @@
import { templateService } from '$lib/services/template-service';
+import { queryKeys } from '$lib/query/query-keys';
import type { Template, TemplateRegistry } from '$lib/types/template.type';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/pagination.type';
import { resolveInitialTableRequest } from '$lib/utils/table-persistence.util';
+import type { PageLoad } from './$types';
-export const load = async (): Promise<{
+export const load: PageLoad = async ({
+ parent
+}): Promise<{
templates: Paginated<Template>;
registries: TemplateRegistry[];
templateRequestOptions: SearchPaginationSortRequest;
}> => {
+ const { queryClient } = await parent();
+
const templateRequestOptions = resolveInitialTableRequest('arcane-template-table', {
pagination: { page: 1, limit: 20 },
sort: { column: 'name', direction: 'asc' }
} satisfies SearchPaginationSortRequest);
const [templates, registries] = await Promise.all([
- templateService.getTemplates(templateRequestOptions).catch(() => ({
- data: [],
- pagination: { currentPage: 1, totalPages: 0, totalItems: 0, itemsPerPage: 20 }
- })),
- templateService.getRegistries().catch(() => [])
+ queryClient
+ .fetchQuery({
+ queryKey: queryKeys.templates.list(templateRequestOptions),
+ queryFn: () => templateService.getTemplates(templateRequestOptions)
+ })
+ .catch(() => ({
+ data: [],
+ pagination: { currentPage: 1, totalPages: 0, totalItems: 0, itemsPerPage: 20 }
+ })),
+ queryClient
+ .fetchQuery({
+ queryKey: queryKeys.templates.registries(),
+ queryFn: () => templateService.getRegistries()
+ })
+ .catch(() => [])
]);
return {
diff --git a/frontend/src/routes/(app)/customize/templates/[id]/+page.ts b/frontend/src/routes/(app)/customize/templates/[id]/+page.ts
index 7fcf56a7f..8fa40013d 100644
--- a/frontend/src/routes/(app)/customize/templates/[id]/+page.ts
+++ b/frontend/src/routes/(app)/customize/templates/[id]/+page.ts
@@ -1,17 +1,28 @@
import { templateService } from '$lib/services/template-service';
+import { queryKeys } from '$lib/query/query-keys';
import { error } from '@sveltejs/kit';
import type { Template, TemplateContentData } from '$lib/types/template.type';
+import type { PageLoad } from './$types';
-export const load = async ({
- params
+export const load: PageLoad = async ({
+ params,
+ parent
}): Promise<{
templateData: TemplateContentData;
allTemplates: Template[];
}> => {
+ const { queryClient } = await parent();
+
try {
const [templateData, allTemplates] = await Promise.all([
- templateService.getTemplateContent(params.id),
- templateService.getAllTemplates()
+ queryClient.fetchQuery({
+ queryKey: queryKeys.templates.content(params.id),
+ queryFn: () => templateService.getTemplateContent(params.id)
+ }),
+ queryClient.fetchQuery({
+ queryKey: queryKeys.templates.allTemplates(),
+ queryFn: () => templateService.getAllTemplates()
+ })
]);
return {
diff --git a/frontend/src/routes/(app)/customize/templates/default/+page.ts b/frontend/src/routes/(app)/customize/templates/default/+page.ts
index 0118e4242..6cf50b952 100644
--- a/frontend/src/routes/(app)/customize/templates/default/+page.ts
+++ b/frontend/src/routes/(app)/customize/templates/default/+page.ts
@@ -1,16 +1,32 @@
import { templateService } from '$lib/services/template-service';
+import { queryKeys } from '$lib/query/query-keys';
import type { Template } from '$lib/types/template.type';
+import type { PageLoad } from './$types';
+
+export const load: PageLoad = async ({
+ parent
+}): Promise<{ composeTemplate: string; envTemplate: string; templates: Template[] }> => {
+ const { queryClient } = await parent();
-export const load = async (): Promise<{ composeTemplate: string; envTemplate: string; templates: Template[] }> => {
const [defaultTemplates, templates] = await Promise.all([
- templateService.getDefaultTemplates().catch((err) => {
- console.warn('Failed to load default templates:', err);
- return { composeTemplate: '', envTemplate: '' };
- }),
- templateService.getAllTemplates().catch((err) => {
- console.warn('Failed to load templates:', err);
- return [];
- })
+ queryClient
+ .fetchQuery({
+ queryKey: queryKeys.templates.defaults(),
+ queryFn: () => templateService.getDefaultTemplates()
+ })
+ .catch((err) => {
+ console.warn('Failed to load default templates:', err);
+ return { composeTemplate: '', envTemplate: '' };
+ }),
+ queryClient
+ .fetchQuery({
+ queryKey: queryKeys.templates.allTemplates(),
+ queryFn: () => templateService.getAllTemplates()
+ })
+ .catch((err) => {
+ console.warn('Failed to load templates:', err);
+ return [];
+ })
]);
return {
diff --git a/frontend/src/routes/(app)/customize/variables/+page.ts b/frontend/src/routes/(app)/customize/variables/+page.ts
index ce1ede446..e8527d5a7 100644
--- a/frontend/src/routes/(app)/customize/variables/+page.ts
+++ b/frontend/src/routes/(app)/customize/variables/+page.ts
@@ -1,8 +1,15 @@
import type { PageLoad } from './$types';
import { templateService } from '$lib/services/template-service';
+import { queryKeys } from '$lib/query/query-keys';
+
+export const load: PageLoad = async ({ parent }) => {
+ const { queryClient } = await parent();
+
+ const variables = await queryClient.fetchQuery({
+ queryKey: queryKeys.templates.globalVariables(),
+ queryFn: () => templateService.getGlobalVariables()
+ });
-export const load: PageLoad = async () => {
- const variables = await templateService.getGlobalVariables();
return {
variables
};
diff --git a/frontend/src/routes/(app)/dashboard/+page.ts b/frontend/src/routes/(app)/dashboard/+page.ts
index 04290a0a6..7b602b47f 100644
--- a/frontend/src/routes/(app)/dashboard/+page.ts
+++ b/frontend/src/routes/(app)/dashboard/+page.ts
@@ -2,10 +2,15 @@ import { containerService } from '$lib/services/container-service';
import { imageService } from '$lib/services/image-service';
import { settingsService } from '$lib/services/settings-service';
import { systemService } from '$lib/services/system-service';
+import { environmentStore } from '$lib/stores/environment.store.svelte';
+import { queryKeys } from '$lib/query/query-keys';
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
import type { PageLoad } from './$types';
-export const load: PageLoad = async () => {
+export const load: PageLoad = async ({ parent }) => {
+ const { queryClient } = await parent();
+ const envId = await environmentStore.getCurrentEnvironmentId();
+
const containerRequestOptions: SearchPaginationSortRequest = {
pagination: {
page: 1,
@@ -27,13 +32,30 @@ export const load: PageLoad = async () => {
}
};
- const containers = await containerService.getContainers(containerRequestOptions);
- const images = await imageService.getImages(imageRequestOptions);
- const containerStatusCounts = await containerService.getContainerStatusCounts();
+ const [containers, images, containerStatusCounts] = await Promise.all([
+ queryClient.fetchQuery({
+ queryKey: queryKeys.containers.list(envId, containerRequestOptions),
+ queryFn: () => containerService.getContainersForEnvironment(envId, containerRequestOptions)
+ }),
+ queryClient.fetchQuery({
+ queryKey: queryKeys.images.list(envId, imageRequestOptions),
+ queryFn: () => imageService.getImagesForEnvironment(envId, imageRequestOptions)
+ }),
+ queryClient.fetchQuery({
+ queryKey: queryKeys.containers.statusCounts(envId),
+ queryFn: () => containerService.getContainerStatusCountsForEnvironment(envId)
+ })
+ ]);
const [dockerInfoResult, settingsResult] = await Promise.allSettled([
- systemService.getDockerInfo(),
- settingsService.getSettings()
+ queryClient.fetchQuery({
+ queryKey: queryKeys.system.dockerInfo(envId),
+ queryFn: () => systemService.getDockerInfoForEnvironment(envId)
+ }),
+ queryClient.fetchQuery({
+ queryKey: queryKeys.settings.byEnvironment(envId),
+ queryFn: () => settingsService.getSettingsForEnvironmentMerged(envId)
+ })
]);
const dockerInfo = dockerInfoResult.status === 'fulfilled' ? dockerInfoResult.value : null;
diff --git a/frontend/src/routes/(app)/environments/+page.ts b/frontend/src/routes/(app)/environments/+page.ts
index f8874a7cb..41e4b0274 100644
--- a/frontend/src/routes/(app)/environments/+page.ts
+++ b/frontend/src/routes/(app)/environments/+page.ts
@@ -2,8 +2,11 @@ import type { PageLoad } from './$types';
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
import { environmentManagementService } from '$lib/services/env-mgmt-service';
import { resolveInitialTableRequest } from '$lib/utils/table-persistence.util';
+import { queryKeys } from '$lib/query/query-keys';
+
+export const load: PageLoad = async ({ parent }) => {
+ const { queryClient } = await parent();
-export const load: PageLoad = async () => {
const environmentRequestOptions = resolveInitialTableRequest('arcane-environments-table', {
pagination: {
page: 1,
@@ -15,7 +18,10 @@ export const load: PageLoad = async () => {
}
} satisfies SearchPaginationSortRequest);
- const environments = await environmentManagementService.getEnvironments(environmentRequestOptions);
+ const environments = await queryClient.fetchQuery({
+ queryKey: queryKeys.environments.list(environmentRequestOptions),
+ queryFn: () => environmentManagementService.getEnvironments(environmentRequestOptions)
+ });
return { environments, environmentRequestOptions };
};
diff --git a/frontend/src/routes/(app)/environments/[id]/+page.ts b/frontend/src/routes/(app)/environments/[id]/+page.ts
index 9ea5a8b36..dd5b372c0 100644
--- a/frontend/src/routes/(app)/environments/[id]/+page.ts
+++ b/frontend/src/routes/(app)/environments/[id]/+page.ts
@@ -1,14 +1,23 @@
import { environmentManagementService } from '$lib/services/env-mgmt-service';
import { settingsService } from '$lib/services/settings-service';
+import { queryKeys } from '$lib/query/query-keys';
import type { PageLoad } from './$types';
-export const load: PageLoad = async ({ params }) => {
+export const load: PageLoad = async ({ params, parent }) => {
+ const { queryClient } = await parent();
+
try {
- const environment = await environmentManagementService.get(params.id);
+ const environment = await queryClient.fetchQuery({
+ queryKey: queryKeys.environments.detail(params.id),
+ queryFn: () => environmentManagementService.get(params.id)
+ });
let settings = null;
try {
- settings = await settingsService.getSettingsForEnvironment(params.id);
+ settings = await queryClient.fetchQuery({
+ queryKey: queryKeys.environments.settings(params.id),
+ queryFn: () => settingsService.getSettingsForEnvironment(params.id)
+ });
} catch {}
return {
diff --git a/frontend/src/routes/(app)/environments/[id]/gitops/+page.ts b/frontend/src/routes/(app)/environments/[id]/gitops/+page.ts
index e9e575518..58e4e155c 100644
--- a/frontend/src/routes/(app)/environments/[id]/gitops/+page.ts
+++ b/frontend/src/routes/(app)/environments/[id]/gitops/+page.ts
@@ -1,10 +1,13 @@
import { gitOpsSyncService } from '$lib/services/gitops-sync-service';
import { environmentManagementService } from '$lib/services/env-mgmt-service';
+import { queryKeys } from '$lib/query/query-keys';
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
import { resolveInitialTableRequest } from '$lib/utils/table-persistence.util';
import type { PageLoad } from './$types';
-export const load: PageLoad = async ({ params }) => {
+export const load: PageLoad = async ({ params, parent }) => {
+ const { queryClient } = await parent();
+
const environmentId = params.id;
const syncRequestOptions = resolveInitialTableRequest('arcane-gitops-syncs-table', {
@@ -19,8 +22,14 @@ export const load: PageLoad = async ({ params }) => {
} satisfies SearchPaginationSortRequest);
const [environment, syncs] = await Promise.all([
- environmentManagementService.get(environmentId),
- gitOpsSyncService.getSyncs(environmentId, syncRequestOptions)
+ queryClient.fetchQuery({
+ queryKey: queryKeys.environments.detail(environmentId),
+ queryFn: () => environmentManagementService.get(environmentId)
+ }),
+ queryClient.fetchQuery({
+ queryKey: queryKeys.gitOpsSyncs.list(environmentId, syncRequestOptions),
+ queryFn: () => gitOpsSyncService.getSyncs(environmentId, syncRequestOptions)
+ })
]);
return { environment, environmentId, syncs, syncRequestOptions };
diff --git a/frontend/src/routes/(app)/events/+page.svelte b/frontend/src/routes/(app)/events/+page.svelte
index 4c8ca53d4..49631fcba 100644
--- a/frontend/src/routes/(app)/events/+page.svelte
+++ b/frontend/src/routes/(app)/events/+page.svelte
@@ -1,15 +1,15 @@
<script lang="ts">
import { toast } from 'svelte-sonner';
- import { tryCatch } from '$lib/utils/try-catch';
- import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
import type { Event } from '$lib/types/event.type';
import EventTable from './event-table.svelte';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
import { m } from '$lib/paraglide/messages';
import { eventService } from '$lib/services/event-service';
+ import { environmentStore } from '$lib/stores/environment.store.svelte';
+ import { queryKeys } from '$lib/query/query-keys';
import { untrack } from 'svelte';
import { ResourcePageLayout, type ActionButton, type StatCardConfig } from '$lib/layouts/index.js';
- import { simpleRefresh } from '$lib/utils/refresh.util';
+ import { createMutation, createQuery } from '@tanstack/svelte-query';
import { EventsIcon } from '$lib/icons';
let { data } = $props();
@@ -17,21 +17,58 @@
let events = $state(untrack(() => data.events));
let selectedIds = $state<string[]>([]);
let requestOptions = $state(untrack(() => data.eventRequestOptions));
- let isLoading = $state({ refreshing: false, deleting: false });
+ const envId = $derived(environmentStore.selected?.id || '0');
+
+ const eventsQuery = createQuery(() => ({
+ queryKey: queryKeys.events.listByEnvironment(envId, requestOptions),
+ queryFn: () => eventService.getEventsForEnvironment(envId, requestOptions),
+ initialData: data.events
+ }));
+
+ const deleteSelectedMutation = createMutation(() => ({
+ mutationKey: queryKeys.events.deleteSelected(envId),
+ mutationFn: async (ids: string[]) => {
+ let successCount = 0;
+ let failureCount = 0;
+
+ for (const eventId of ids) {
+ try {
+ await eventService.delete(eventId);
+ successCount += 1;
+ } catch {
+ failureCount += 1;
+ }
+ }
+
+ return { successCount, failureCount };
+ },
+ onSuccess: async ({ successCount, failureCount }) => {
+ if (successCount > 0) {
+ toast.success(m.common_bulk_delete_success({ count: successCount, resource: m.events_title() }));
+ await eventsQuery.refetch();
+ }
+ if (failureCount > 0) {
+ toast.error(m.common_bulk_delete_failed({ count: failureCount, resource: m.events_title() }));
+ }
+ selectedIds = [];
+ }
+ }));
+
+ $effect(() => {
+ if (eventsQuery.data) {
+ events = eventsQuery.data;
+ }
+ });
const infoEvents = $derived(events?.data?.filter((e: Event) => e.severity === 'info').length || 0);
const warningEvents = $derived(events?.data?.filter((e: Event) => e.severity === 'warning').length || 0);
const errorEvents = $derived(events?.data?.filter((e: Event) => e.severity === 'error').length || 0);
const successEvents = $derived(events?.data?.filter((e: Event) => e.severity === 'success').length || 0);
const totalEvents = $derived(events?.pagination?.totalItems || 0);
+ const isRefreshing = $derived(eventsQuery.isFetching && !eventsQuery.isPending);
async function refresh() {
- await simpleRefresh(
- () => eventService.getEvents(requestOptions),
- (data) => (events = data),
- m.common_refresh_failed({ resource: m.events_title() }),
- (v) => (isLoading.refreshing = v)
- );
+ await eventsQuery.refetch();
}
async function handleDeleteSelected() {
@@ -44,32 +81,7 @@
label: m.common_delete(),
destructive: true,
action: async () => {
- isLoading.deleting = true;
- let successCount = 0;
- let failureCount = 0;
-
- for (const eventId of selectedIds) {
- const result = await tryCatch(eventService.delete(eventId));
- handleApiResultWithCallbacks({
- result,
- message: m.events_delete_item_failed({ id: eventId }),
- setLoadingState: () => {},
- onSuccess: () => {
- successCount++;
- }
- });
- if (result.error) failureCount++;
- }
-
- isLoading.deleting = false;
- if (successCount > 0) {
- toast.success(m.common_bulk_delete_success({ count: successCount, resource: m.events_title() }));
- await refresh();
- }
- if (failureCount > 0) {
- toast.error(m.common_bulk_delete_failed({ count: failureCount, resource: m.events_title() }));
- }
- selectedIds = [];
+ await deleteSelectedMutation.mutateAsync([...selectedIds]);
}
}
});
@@ -83,8 +95,8 @@
action: 'remove' as const,
label: m.events_remove_selected(),
onclick: handleDeleteSelected,
- loading: isLoading.deleting,
- disabled: isLoading.deleting
+ loading: deleteSelectedMutation.isPending,
+ disabled: deleteSelectedMutation.isPending
}
]
: []),
@@ -93,8 +105,8 @@
action: 'restart' as const,
label: m.common_refresh(),
onclick: refresh,
- loading: isLoading.refreshing,
- disabled: isLoading.refreshing
+ loading: isRefreshing,
+ disabled: isRefreshing
}
]);
@@ -138,6 +150,14 @@
<ResourcePageLayout title={m.events_title()} subtitle={m.events_subtitle()} {actionButtons} {statCards}>
{#snippet mainContent()}
- <EventTable bind:events bind:selectedIds bind:requestOptions />
+ <EventTable
+ bind:events
+ bind:selectedIds
+ bind:requestOptions
+ onRefreshData={async (options) => {
+ requestOptions = options;
+ await eventsQuery.refetch();
+ }}
+ />
{/snippet}
</ResourcePageLayout>
diff --git a/frontend/src/routes/(app)/events/+page.ts b/frontend/src/routes/(app)/events/+page.ts
index 19ce2ba72..53478a131 100644
--- a/frontend/src/routes/(app)/events/+page.ts
+++ b/frontend/src/routes/(app)/events/+page.ts
@@ -1,9 +1,14 @@
import { eventService } from '$lib/services/event-service';
+import { queryKeys } from '$lib/query/query-keys';
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
import { resolveInitialTableRequest } from '$lib/utils/table-persistence.util';
import type { PageLoad } from './$types';
+import { environmentStore } from '$lib/stores/environment.store.svelte';
+
+export const load: PageLoad = async ({ parent }) => {
+ const { queryClient } = await parent();
+ const envId = await environmentStore.getCurrentEnvironmentId();
-export const load: PageLoad = async () => {
const eventRequestOptions = resolveInitialTableRequest('arcane-events-table', {
pagination: {
page: 1,
@@ -15,7 +20,10 @@ export const load: PageLoad = async () => {
}
} satisfies SearchPaginationSortRequest);
- const events = await eventService.getEvents(eventRequestOptions);
+ const events = await queryClient.fetchQuery({
+ queryKey: queryKeys.events.listByEnvironment(envId, eventRequestOptions),
+ queryFn: () => eventService.getEventsForEnvironment(envId, eventRequestOptions)
+ });
return { events, eventRequestOptions };
};
diff --git a/frontend/src/routes/(app)/events/event-table.svelte b/frontend/src/routes/(app)/events/event-table.svelte
index cbe1a62c0..458c8a3f5 100644
--- a/frontend/src/routes/(app)/events/event-table.svelte
+++ b/frontend/src/routes/(app)/events/event-table.svelte
@@ -21,17 +21,27 @@
let {
events = $bindable(),
selectedIds = $bindable(),
- requestOptions = $bindable()
+ requestOptions = $bindable(),
+ onRefreshData
}: {
events: Paginated<Event>;
selectedIds: string[];
requestOptions: SearchPaginationSortRequest;
+ onRefreshData?: (options: SearchPaginationSortRequest) => Promise<void>;
} = $props();
let isLoading = $state({ removing: false });
let detailsOpen = $state(false);
let detailsEvent = $state<Event | null>(null);
+ async function refreshEvents(options: SearchPaginationSortRequest = requestOptions) {
+ if (onRefreshData) {
+ await onRefreshData(options);
+ return;
+ }
+ events = await eventService.getEvents(options);
+ }
+
function getSeverityBadgeVariant(severity: string) {
switch (severity) {
case 'success':
@@ -75,7 +85,7 @@
setLoadingState: (value) => (isLoading.removing = value),
onSuccess: async () => {
toast.success(m.events_delete_success({ title: safeTitle }));
- events = await eventService.getEvents(requestOptions);
+ await refreshEvents();
}
});
}
@@ -252,7 +262,11 @@
bind:requestOptions
bind:selectedIds
bind:mobileFieldVisibility
- onRefresh={async (options) => (events = await eventService.getEvents(options))}
+ onRefresh={async (options) => {
+ requestOptions = options;
+ await refreshEvents(options);
+ return events;
+ }}
{columns}
{mobileFields}
rowActions={RowActions}
diff --git a/frontend/src/routes/(app)/images/+page.svelte b/frontend/src/routes/(app)/images/+page.svelte
index 8b9005298..455eecec5 100644
--- a/frontend/src/routes/(app)/images/+page.svelte
+++ b/frontend/src/routes/(app)/images/+page.svelte
@@ -6,66 +6,107 @@
import bytes from 'bytes';
import * as Dialog from '$lib/components/ui/dialog/index.js';
import { displaySize, FileDropZone, MEGABYTE, type FileDropZoneProps } from '$lib/components/ui/file-drop-zone';
- import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
- import { tryCatch } from '$lib/utils/try-catch';
import ImageTable from './image-table.svelte';
import { m } from '$lib/paraglide/messages';
import { imageService } from '$lib/services/image-service';
+ import { environmentStore } from '$lib/stores/environment.store.svelte';
+ import { queryKeys } from '$lib/query/query-keys';
+ import type { ImageUsageCounts } from '$lib/types/image.type';
import { untrack } from 'svelte';
import { ResourcePageLayout, type ActionButton, type StatCardConfig } from '$lib/layouts/index.js';
- import { useEnvironmentRefresh } from '$lib/hooks/use-environment-refresh.svelte';
- import { parallelRefresh } from '$lib/utils/refresh.util';
+ import { createMutation, createQuery } from '@tanstack/svelte-query';
import { CloseIcon, VolumesIcon, LocalFolderComputerIcon } from '$lib/icons';
let { data } = $props();
let images = $state(untrack(() => data.images));
- let imageUsageCounts = $state(untrack(() => data.imageUsageCounts));
let requestOptions = $state(untrack(() => data.imageRequestOptions));
let selectedIds = $state<string[]>([]);
-
- let isLoading = $state({ pulling: false, uploading: false, refreshing: false, pruning: false, checking: false });
let isPullDialogOpen = $state(false);
let isUploadDialogOpen = $state(false);
let isConfirmPruneDialogOpen = $state(false);
let uploadedFiles = $state<File[]>([]);
+ const envId = $derived(environmentStore.selected?.id || '0');
+ const imageUsageFallback: ImageUsageCounts = {
+ imagesInuse: 0,
+ imagesUnused: 0,
+ totalImages: 0,
+ totalImageSize: 0
+ };
const maxUploadSizeMB = $derived(parseInt(String(data.settings?.maxImageUploadSize || '500'), 10));
+ const shouldPruneDangling = $derived(data.settings?.dockerPruneMode === 'dangling');
- async function refresh() {
- await parallelRefresh(
- {
- images: {
- fetch: () => imageService.getImages(requestOptions),
- onSuccess: (data) => (images = data),
- errorMessage: m.common_refresh_failed({ resource: m.images_title() })
- },
- counts: {
- fetch: () => imageService.getImageUsageCounts(),
- onSuccess: (data) => (imageUsageCounts = data),
- errorMessage: m.common_refresh_failed({ resource: m.images_title() })
- }
- },
- (v) => (isLoading.refreshing = v)
- );
- }
+ const imagesQuery = createQuery(() => ({
+ queryKey: queryKeys.images.list(envId, requestOptions),
+ queryFn: () => imageService.getImagesForEnvironment(envId, requestOptions),
+ initialData: data.images
+ }));
- useEnvironmentRefresh(refresh);
+ const imageUsageCountsQuery = createQuery(() => ({
+ queryKey: queryKeys.images.usageCounts(envId),
+ queryFn: () => imageService.getImageUsageCountsForEnvironment(envId),
+ initialData: data.imageUsageCounts
+ }));
- async function handlePruneImages() {
- isLoading.pruning = true;
- const dangling = data.settings?.dockerPruneMode === 'dangling';
- handleApiResultWithCallbacks({
- result: await tryCatch(imageService.pruneImages(dangling)),
- message: m.images_prune_failed(),
- setLoadingState: (v) => (isLoading.pruning = v),
- onSuccess: async () => {
- toast.success(m.images_pruned_success());
- images = await imageService.getImages(requestOptions);
- isConfirmPruneDialogOpen = false;
+ const pruneImagesMutation = createMutation(() => ({
+ mutationKey: ['images', 'prune', envId],
+ mutationFn: () => imageService.pruneImages(shouldPruneDangling),
+ onSuccess: async () => {
+ toast.success(m.images_pruned_success());
+ await Promise.all([imagesQuery.refetch(), imageUsageCountsQuery.refetch()]);
+ isConfirmPruneDialogOpen = false;
+ },
+ onError: () => {
+ toast.error(m.images_prune_failed());
+ }
+ }));
+
+ const checkUpdatesMutation = createMutation(() => ({
+ mutationKey: ['images', 'check-updates', envId],
+ mutationFn: () => imageService.checkAllImages(),
+ onSuccess: async () => {
+ toast.success(m.images_update_check_completed());
+ await imagesQuery.refetch();
+ },
+ onError: () => {
+ toast.error(m.images_update_check_failed());
+ }
+ }));
+
+ const uploadImagesMutation = createMutation(() => ({
+ mutationKey: ['images', 'upload', envId],
+ mutationFn: async (files: File[]) => {
+ for (const file of files) {
+ try {
+ await imageService.uploadImage(file);
+ toast.success(m.images_upload_success());
+ } catch {
+ toast.error(m.images_upload_failed());
+ }
}
- });
- }
+ },
+ onSuccess: async () => {
+ await Promise.all([imagesQuery.refetch(), imageUsageCountsQuery.refetch()]);
+ uploadedFiles = [];
+ isUploadDialogOpen = false;
+ }
+ }));
+
+ $effect(() => {
+ if (imagesQuery.data) {
+ images = imagesQuery.data;
+ }
+ });
+
+ const imageUsageCounts = $derived(imageUsageCountsQuery.data ?? imageUsageFallback);
+
+ const isRefreshing = $derived(
+ (imagesQuery.isFetching && !imagesQuery.isPending) || (imageUsageCountsQuery.isFetching && !imageUsageCountsQuery.isPending)
+ );
+ const isUploading = $derived(uploadImagesMutation.isPending);
+ const isPruning = $derived(pruneImagesMutation.isPending);
+ const isChecking = $derived(checkUpdatesMutation.isPending);
const onUpload: FileDropZoneProps['onUpload'] = async (files) => {
uploadedFiles = [...uploadedFiles, ...files];
@@ -80,36 +121,19 @@
toast.error(m.images_upload_file_required());
return;
}
- isLoading.uploading = true;
- for (const file of uploadedFiles) {
- handleApiResultWithCallbacks({
- result: await tryCatch(imageService.uploadImage(file)),
- message: m.images_upload_failed(),
- setLoadingState: (v) => {
- isLoading.uploading = v;
- },
- onSuccess: () => {
- toast.success(m.images_upload_success());
- }
- });
- }
- images = await imageService.getImages(requestOptions);
- uploadedFiles = [];
- isUploadDialogOpen = false;
- isLoading.uploading = false;
+ await uploadImagesMutation.mutateAsync(uploadedFiles);
}
async function handleTriggerBulkUpdateCheck() {
- isLoading.checking = true;
- try {
- await imageService.checkAllImages();
- toast.success(m.images_update_check_completed());
- images = await imageService.getImages(requestOptions);
- } catch {
- toast.error(m.images_update_check_failed());
- } finally {
- isLoading.checking = false;
- }
+ await checkUpdatesMutation.mutateAsync();
+ }
+
+ async function handlePruneImages() {
+ await pruneImagesMutation.mutateAsync();
+ }
+
+ async function refresh() {
+ await Promise.all([imagesQuery.refetch(), imageUsageCountsQuery.refetch()]);
}
const actionButtons: ActionButton[] = $derived([
@@ -121,16 +145,16 @@
label: m.images_check_updates(),
loadingLabel: m.common_action_checking(),
onclick: handleTriggerBulkUpdateCheck,
- loading: isLoading.checking,
- disabled: isLoading.checking
+ loading: isChecking,
+ disabled: isChecking
},
{
id: 'refresh',
action: 'restart',
label: m.common_refresh(),
onclick: refresh,
- loading: isLoading.refreshing,
- disabled: isLoading.refreshing
+ loading: isRefreshing,
+ disabled: isRefreshing
},
{
id: 'prune',
@@ -138,8 +162,8 @@
label: m.images_prune_unused(),
loadingLabel: m.common_action_pruning(),
onclick: () => (isConfirmPruneDialogOpen = true),
- loading: isLoading.pruning,
- disabled: isLoading.pruning
+ loading: isPruning,
+ disabled: isPruning
}
]);
@@ -165,8 +189,12 @@
bind:images
bind:selectedIds
bind:requestOptions
+ onRefreshData={async (options) => {
+ requestOptions = options;
+ await Promise.all([imagesQuery.refetch(), imageUsageCountsQuery.refetch()]);
+ }}
onImageUpdated={async () => {
- images = await imageService.getImages(requestOptions);
+ await imagesQuery.refetch();
}}
/>
{/snippet}
@@ -175,7 +203,7 @@
<ImagePullSheet
bind:open={isPullDialogOpen}
onPullFinished={async () => {
- images = await imageService.getImages(requestOptions);
+ await Promise.all([imagesQuery.refetch(), imageUsageCountsQuery.refetch()]);
}}
/>
@@ -193,7 +221,7 @@
accept=".tar,.tar.gz,.tgz,.tar.xz"
maxFiles={10}
fileCount={uploadedFiles.length}
- disabled={isLoading.uploading}
+ disabled={isUploading}
/>
{#if uploadedFiles.length > 0}
<div class="flex flex-col gap-2">
@@ -208,14 +236,14 @@
tone="ghost"
size="icon"
onclick={() => (uploadedFiles = [...uploadedFiles.slice(0, i), ...uploadedFiles.slice(i + 1)])}
- disabled={isLoading.uploading}
+ disabled={isUploading}
icon={CloseIcon}
/>
</div>
{/each}
</div>
{/if}
- {#if isLoading.uploading}
+ {#if isUploading}
<div class="text-muted-foreground flex items-center gap-2 text-sm">
<Spinner class="size-4" />{m.images_uploading()}
</div>
@@ -228,13 +256,13 @@
isUploadDialogOpen = false;
uploadedFiles = [];
}}
- disabled={isLoading.uploading}
+ disabled={isUploading}
/>
<ArcaneButton
action="create"
onclick={handleUploadImages}
- disabled={isLoading.uploading || uploadedFiles.length === 0}
- loading={isLoading.uploading}
+ disabled={isUploading || uploadedFiles.length === 0}
+ loading={isUploading}
customLabel={m.images_upload_image()}
/>
</div>
@@ -250,12 +278,12 @@
>
</Dialog.Header>
<div class="flex justify-end gap-3 pt-6">
- <ArcaneButton action="cancel" onclick={() => (isConfirmPruneDialogOpen = false)} disabled={isLoading.pruning} />
+ <ArcaneButton action="cancel" onclick={() => (isConfirmPruneDialogOpen = false)} disabled={isPruning} />
<ArcaneButton
action="remove"
onclick={handlePruneImages}
- disabled={isLoading.pruning}
- loading={isLoading.pruning}
+ disabled={isPruning}
+ loading={isPruning}
customLabel={m.images_prune_action()}
loadingLabel={m.common_action_pruning()}
/>
diff --git a/frontend/src/routes/(app)/images/+page.ts b/frontend/src/routes/(app)/images/+page.ts
index 53c08a3db..f872c00fa 100644
--- a/frontend/src/routes/(app)/images/+page.ts
+++ b/frontend/src/routes/(app)/images/+page.ts
@@ -1,10 +1,15 @@
import { imageService } from '$lib/services/image-service';
import { settingsService } from '$lib/services/settings-service';
+import { queryKeys } from '$lib/query/query-keys';
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
import { resolveInitialTableRequest } from '$lib/utils/table-persistence.util';
import type { PageLoad } from './$types';
+import { environmentStore } from '$lib/stores/environment.store.svelte';
+
+export const load: PageLoad = async ({ parent }) => {
+ const { queryClient } = await parent();
+ const envId = await environmentStore.getCurrentEnvironmentId();
-export const load: PageLoad = async () => {
const imageRequestOptions = resolveInitialTableRequest('arcane-image-table', {
pagination: {
page: 1,
@@ -16,9 +21,18 @@ export const load: PageLoad = async () => {
}
} satisfies SearchPaginationSortRequest);
const [images, settings, imageUsageCounts] = await Promise.all([
- imageService.getImages(imageRequestOptions),
- settingsService.getSettings(),
- imageService.getImageUsageCounts()
+ queryClient.fetchQuery({
+ queryKey: queryKeys.images.list(envId, imageRequestOptions),
+ queryFn: () => imageService.getImagesForEnvironment(envId, imageRequestOptions)
+ }),
+ queryClient.fetchQuery({
+ queryKey: queryKeys.settings.byEnvironment(envId),
+ queryFn: () => settingsService.getSettingsForEnvironmentMerged(envId)
+ }),
+ queryClient.fetchQuery({
+ queryKey: queryKeys.images.usageCounts(envId),
+ queryFn: () => imageService.getImageUsageCountsForEnvironment(envId)
+ })
]);
return { images, imageRequestOptions, settings, imageUsageCounts };
diff --git a/frontend/src/routes/(app)/images/[imageId]/+page.ts b/frontend/src/routes/(app)/images/[imageId]/+page.ts
index 703e7cfe7..4760cc000 100644
--- a/frontend/src/routes/(app)/images/[imageId]/+page.ts
+++ b/frontend/src/routes/(app)/images/[imageId]/+page.ts
@@ -1,5 +1,8 @@
import { imageService } from '$lib/services/image-service.js';
+import { environmentStore } from '$lib/stores/environment.store.svelte';
import type { ImageDetailSummaryDto } from '$lib/types/image.type.js';
+import { queryKeys } from '$lib/query/query-keys';
+import type { PageLoad } from './$types';
import { error } from '@sveltejs/kit';
type ImageDetailData = {
@@ -7,11 +10,17 @@ type ImageDetailData = {
error?: string;
};
-export const load = async ({ params }): Promise<ImageDetailData> => {
+export const load: PageLoad = async ({ params, parent }): Promise<ImageDetailData> => {
+ const { queryClient } = await parent();
+ const envId = await environmentStore.getCurrentEnvironmentId();
+
const { imageId } = params;
try {
- const image = await imageService.getImage(imageId);
+ const image = await queryClient.fetchQuery({
+ queryKey: queryKeys.images.detail(envId, imageId),
+ queryFn: () => imageService.getImageForEnvironment(envId, imageId)
+ });
if (!image) {
throw error(404, 'Image not found');
diff --git a/frontend/src/routes/(app)/images/image-table.svelte b/frontend/src/routes/(app)/images/image-table.svelte
index fcbda3302..cc98d7dd9 100644
--- a/frontend/src/routes/(app)/images/image-table.svelte
+++ b/frontend/src/routes/(app)/images/image-table.svelte
@@ -29,12 +29,14 @@
images = $bindable(),
selectedIds = $bindable(),
requestOptions = $bindable(),
- onImageUpdated
+ onImageUpdated,
+ onRefreshData
}: {
images: Paginated<ImageSummaryDto>;
selectedIds: string[];
requestOptions: SearchPaginationSortRequest;
onImageUpdated?: () => Promise<void>;
+ onRefreshData?: (options: SearchPaginationSortRequest) => Promise<void>;
} = $props();
let isLoading = $state({
@@ -48,6 +50,14 @@
let scanPollInFlight = false;
const SCAN_POLL_INTERVAL_MS = 4000;
+ async function refreshImages(options: SearchPaginationSortRequest = requestOptions) {
+ if (onRefreshData) {
+ await onRefreshData(options);
+ return;
+ }
+ images = await imageService.getImages(options);
+ }
+
async function handleDeleteSelected(ids: string[]) {
if (!ids || ids.length === 0) return;
@@ -81,7 +91,7 @@
const msg =
successCount === 1 ? m.images_remove_success_one() : m.images_remove_success_many({ count: successCount });
toast.success(msg);
- images = await imageService.getImages(requestOptions);
+ await refreshImages();
}
if (failureCount > 0) {
const msg = failureCount === 1 ? m.images_remove_failed_one() : m.images_remove_failed_many({ count: failureCount });
@@ -111,7 +121,7 @@
setLoadingState: () => {},
onSuccess: async () => {
toast.success(m.images_remove_success());
- images = await imageService.getImages(requestOptions);
+ await refreshImages();
}
});
@@ -135,7 +145,7 @@
setLoadingState: () => {},
onSuccess: async () => {
toast.success(m.images_pull_success({ repoTag }));
- images = await imageService.getImages(requestOptions);
+ await refreshImages();
}
});
@@ -547,7 +557,11 @@
bind:selectedIds
bind:mobileFieldVisibility
{bulkActions}
- onRefresh={async (options) => (images = await imageService.getImages(options))}
+ onRefresh={async (options) => {
+ requestOptions = options;
+ await refreshImages(options);
+ return images;
+ }}
{columns}
{mobileFields}
rowActions={RowActions}
diff --git a/frontend/src/routes/(app)/networks/+page.svelte b/frontend/src/routes/(app)/networks/+page.svelte
index 8fda17761..6b492aaad 100644
--- a/frontend/src/routes/(app)/networks/+page.svelte
+++ b/frontend/src/routes/(app)/networks/+page.svelte
@@ -1,75 +1,79 @@
<script lang="ts">
import { NetworksIcon, ConnectionIcon } from '$lib/icons';
import { toast } from 'svelte-sonner';
- import type { NetworkCreateOptions } from '$lib/types/network.type';
- import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
- import { tryCatch } from '$lib/utils/try-catch';
+ import type { NetworkCreateOptions, NetworkUsageCounts } from '$lib/types/network.type';
import CreateNetworkSheet from '$lib/components/sheets/create-network-sheet.svelte';
import NetworkTable from './network-table.svelte';
import { m } from '$lib/paraglide/messages';
import { networkService } from '$lib/services/network-service';
+ import { environmentStore } from '$lib/stores/environment.store.svelte';
+ import { queryKeys } from '$lib/query/query-keys';
import { untrack } from 'svelte';
import { ResourcePageLayout, type ActionButton, type StatCardConfig } from '$lib/layouts/index.js';
- import { useEnvironmentRefresh } from '$lib/hooks/use-environment-refresh.svelte';
- import { parallelRefresh } from '$lib/utils/refresh.util';
+ import { createMutation, createQuery } from '@tanstack/svelte-query';
let { data } = $props();
let networks = $state(untrack(() => data.networks));
- let networkUsageCounts = $state(untrack(() => data.networkUsageCounts));
let requestOptions = $state(untrack(() => data.networkRequestOptions));
let selectedIds = $state<string[]>([]);
let isCreateDialogOpen = $state(false);
- let isLoading = $state({ create: false, refresh: false });
+ const envId = $derived(environmentStore.selected?.id || '0');
+ const countsFallback: NetworkUsageCounts = { inuse: 0, unused: 0, total: 0 };
- async function refresh() {
- await parallelRefresh(
- {
- networks: {
- fetch: () => networkService.getNetworks(requestOptions),
- onSuccess: (data) => {
- networks = data;
- networkUsageCounts = data.counts ?? { inuse: 0, unused: 0, total: 0 };
- },
- errorMessage: m.common_refresh_failed({ resource: m.networks_title() })
- }
- },
- (v) => (isLoading.refresh = v)
- );
- }
+ const networksQuery = createQuery(() => ({
+ queryKey: queryKeys.networks.list(envId, requestOptions),
+ queryFn: () => networkService.getNetworksForEnvironment(envId, requestOptions),
+ initialData: data.networks
+ }));
+
+ const createNetworkMutation = createMutation(() => ({
+ mutationKey: ['networks', 'create', envId],
+ mutationFn: ({ name, options }: { name: string; options: NetworkCreateOptions }) =>
+ networkService.createNetwork(name, options),
+ onSuccess: async (_data, variables) => {
+ toast.success(m.common_create_success({ resource: `${m.resource_network()} "${variables.name}"` }));
+ await networksQuery.refetch();
+ isCreateDialogOpen = false;
+ },
+ onError: (_error, variables) => {
+ toast.error(m.common_create_failed({ resource: `${m.resource_network()} "${variables.name}"` }));
+ }
+ }));
- useEnvironmentRefresh(refresh);
+ $effect(() => {
+ if (networksQuery.data) {
+ networks = networksQuery.data;
+ }
+ });
async function handleCreate(name: string, options: NetworkCreateOptions) {
- isLoading.create = true;
- handleApiResultWithCallbacks({
- result: await tryCatch(networkService.createNetwork(name, options)),
- message: m.common_create_failed({ resource: `${m.resource_network()} "${name}"` }),
- setLoadingState: (v) => (isLoading.create = v),
- onSuccess: async () => {
- toast.success(m.common_create_success({ resource: `${m.resource_network()} "${name}"` }));
- const data = await networkService.getNetworks(requestOptions);
- networks = data;
- networkUsageCounts = data.counts ?? { inuse: 0, unused: 0, total: 0 };
- isCreateDialogOpen = false;
- }
- });
+ await createNetworkMutation.mutateAsync({ name, options });
}
+ async function refresh() {
+ await networksQuery.refetch();
+ }
+
+ const isRefreshing = $derived(networksQuery.isFetching && !networksQuery.isPending);
+ const networkUsageCounts = $derived(networks.counts ?? countsFallback);
+
const actionButtons: ActionButton[] = $derived([
{
id: 'create',
action: 'create',
label: m.common_create_button({ resource: m.resource_network_cap() }),
- onclick: () => (isCreateDialogOpen = true)
+ onclick: () => (isCreateDialogOpen = true),
+ loading: createNetworkMutation.isPending,
+ disabled: createNetworkMutation.isPending
},
{
id: 'refresh',
action: 'restart',
label: m.common_refresh(),
onclick: refresh,
- loading: isLoading.refresh,
- disabled: isLoading.refresh
+ loading: isRefreshing,
+ disabled: isRefreshing
}
]);
@@ -95,15 +99,14 @@
bind:networks
bind:selectedIds
bind:requestOptions
- onNetworksChange={(data) => {
- if (data.counts) {
- networkUsageCounts = data.counts;
- }
+ onRefreshData={async (options) => {
+ requestOptions = options;
+ await networksQuery.refetch();
}}
/>
{/snippet}
{#snippet additionalContent()}
- <CreateNetworkSheet bind:open={isCreateDialogOpen} isLoading={isLoading.create} onSubmit={handleCreate} />
+ <CreateNetworkSheet bind:open={isCreateDialogOpen} isLoading={createNetworkMutation.isPending} onSubmit={handleCreate} />
{/snippet}
</ResourcePageLayout>
diff --git a/frontend/src/routes/(app)/networks/+page.ts b/frontend/src/routes/(app)/networks/+page.ts
index e5824c41b..a22d7f02a 100644
--- a/frontend/src/routes/(app)/networks/+page.ts
+++ b/frontend/src/routes/(app)/networks/+page.ts
@@ -1,9 +1,14 @@
import { networkService } from '$lib/services/network-service';
+import { queryKeys } from '$lib/query/query-keys';
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
import { resolveInitialTableRequest } from '$lib/utils/table-persistence.util';
import type { PageLoad } from './$types';
+import { environmentStore } from '$lib/stores/environment.store.svelte';
+
+export const load: PageLoad = async ({ parent }) => {
+ const { queryClient } = await parent();
+ const envId = await environmentStore.getCurrentEnvironmentId();
-export const load: PageLoad = async () => {
const networkRequestOptions = resolveInitialTableRequest('arcane-networks-table', {
pagination: {
page: 1,
@@ -16,7 +21,10 @@ export const load: PageLoad = async () => {
} satisfies SearchPaginationSortRequest);
// Single API call - counts are included in the response
- const networks = await networkService.getNetworks(networkRequestOptions);
+ const networks = await queryClient.fetchQuery({
+ queryKey: queryKeys.networks.list(envId, networkRequestOptions),
+ queryFn: () => networkService.getNetworksForEnvironment(envId, networkRequestOptions)
+ });
return {
networks,
diff --git a/frontend/src/routes/(app)/networks/[networkId]/+page.ts b/frontend/src/routes/(app)/networks/[networkId]/+page.ts
index 060d1f276..50cddd19c 100644
--- a/frontend/src/routes/(app)/networks/[networkId]/+page.ts
+++ b/frontend/src/routes/(app)/networks/[networkId]/+page.ts
@@ -1,12 +1,20 @@
import type { PageLoad } from './$types';
import { error } from '@sveltejs/kit';
import { networkService } from '$lib/services/network-service';
+import { environmentStore } from '$lib/stores/environment.store.svelte';
+import { queryKeys } from '$lib/query/query-keys';
+
+export const load: PageLoad = async ({ params, parent }) => {
+ const { queryClient } = await parent();
+ const envId = await environmentStore.getCurrentEnvironmentId();
-export const load: PageLoad = async ({ params }) => {
const { networkId } = params;
try {
- const network = await networkService.getNetwork(networkId);
+ const network = await queryClient.fetchQuery({
+ queryKey: queryKeys.networks.detail(envId, networkId),
+ queryFn: () => networkService.getNetworkForEnvironment(envId, networkId)
+ });
if (!network) {
throw error(404, 'Network not found');
diff --git a/frontend/src/routes/(app)/networks/network-table.svelte b/frontend/src/routes/(app)/networks/network-table.svelte
index 126ef72da..b0ba90fba 100644
--- a/frontend/src/routes/(app)/networks/network-table.svelte
+++ b/frontend/src/routes/(app)/networks/network-table.svelte
@@ -24,18 +24,32 @@
networks = $bindable(),
selectedIds = $bindable(),
requestOptions = $bindable(),
- onNetworksChange
+ onNetworksChange,
+ onRefreshData
}: {
networks: Paginated<NetworkSummaryDto, NetworkUsageCounts>;
selectedIds: string[];
requestOptions: SearchPaginationSortRequest;
onNetworksChange?: (networks: Paginated<NetworkSummaryDto, NetworkUsageCounts>) => void;
+ onRefreshData?: (options: SearchPaginationSortRequest) => Promise<void>;
} = $props();
let isLoading = $state({
remove: false
});
+ async function refreshNetworks(options: SearchPaginationSortRequest = requestOptions) {
+ if (onRefreshData) {
+ await onRefreshData(options);
+ if (onNetworksChange) {
+ onNetworksChange(networks);
+ }
+ return;
+ }
+ networks = await networkService.getNetworks(options);
+ onNetworksChange?.(networks);
+ }
+
async function handleDeleteNetwork(id: string, name: string) {
const safeName = name?.trim() || m.common_unknown();
if (DEFAULT_NETWORK_NAMES.has(name)) {
@@ -55,8 +69,7 @@
setLoadingState: (value) => (isLoading.remove = value),
onSuccess: async () => {
toast.success(m.common_delete_success({ resource: `${m.resource_network()} "${safeName}"` }));
- networks = await networkService.getNetworks(requestOptions);
- onNetworksChange?.(networks);
+ await refreshNetworks();
}
});
}
@@ -108,8 +121,7 @@
isLoading.remove = false;
if (successCount > 0) {
- networks = await networkService.getNetworks(requestOptions);
- onNetworksChange?.(networks);
+ await refreshNetworks();
}
selectedIds = [];
}
@@ -288,7 +300,11 @@
bind:selectedIds
bind:mobileFieldVisibility
{bulkActions}
- onRefresh={async (options) => (networks = await networkService.getNetworks(options))}
+ onRefresh={async (options) => {
+ requestOptions = options;
+ await refreshNetworks(options);
+ return networks;
+ }}
{columns}
{mobileFields}
rowActions={RowActions}
diff --git a/frontend/src/routes/(app)/projects/+page.svelte b/frontend/src/routes/(app)/projects/+page.svelte
index bb8b69c5f..260f509e8 100644
--- a/frontend/src/routes/(app)/projects/+page.svelte
+++ b/frontend/src/routes/(app)/projects/+page.svelte
@@ -1,88 +1,77 @@
<script lang="ts">
import { ProjectsIcon, StartIcon, StopIcon } from '$lib/icons';
import { toast } from 'svelte-sonner';
- import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
- import { tryCatch } from '$lib/utils/try-catch';
import ProjectsTable from './projects-table.svelte';
import { goto } from '$app/navigation';
import { m } from '$lib/paraglide/messages';
import { projectService } from '$lib/services/project-service';
import { imageService } from '$lib/services/image-service';
import { environmentStore } from '$lib/stores/environment.store.svelte';
+ import { queryKeys } from '$lib/query/query-keys';
+ import type { ProjectStatusCounts } from '$lib/types/project.type';
import { untrack } from 'svelte';
+ import { createMutation, createQuery } from '@tanstack/svelte-query';
import { ResourcePageLayout, type ActionButton, type StatCardConfig } from '$lib/layouts/index.js';
let { data } = $props();
let projects = $state(untrack(() => data.projects));
- let projectStatusCounts = $state(untrack(() => data.projectStatusCounts));
let projectRequestOptions = $state(untrack(() => data.projectRequestOptions));
let selectedIds = $state<string[]>([]);
+ const envId = $derived(environmentStore.selected?.id || '0');
+ const countsFallback: ProjectStatusCounts = {
+ runningProjects: 0,
+ stoppedProjects: 0,
+ totalProjects: 0
+ };
- let isLoading = $state({
- updating: false,
- refreshing: false
+ const projectsQuery = createQuery(() => ({
+ queryKey: queryKeys.projects.list(envId, projectRequestOptions),
+ queryFn: () => projectService.getProjectsForEnvironment(envId, projectRequestOptions),
+ initialData: data.projects
+ }));
+
+ const projectStatusCountsQuery = createQuery(() => ({
+ queryKey: queryKeys.projects.statusCounts(envId),
+ queryFn: () => projectService.getProjectStatusCountsForEnvironment(envId),
+ initialData: data.projectStatusCounts
+ }));
+
+ const checkUpdatesMutation = createMutation(() => ({
+ mutationKey: ['projects', 'check-updates', envId],
+ mutationFn: () => imageService.runAutoUpdate(),
+ onSuccess: async () => {
+ toast.success(m.compose_update_success());
+ await projectsQuery.refetch();
+ },
+ onError: () => {
+ toast.error(m.containers_check_updates_failed());
+ }
+ }));
+
+ $effect(() => {
+ if (projectsQuery.data) {
+ projects = projectsQuery.data;
+ }
});
+ const projectStatusCounts = $derived(projectStatusCountsQuery.data ?? countsFallback);
const totalCompose = $derived(projectStatusCounts.totalProjects);
const runningCompose = $derived(projectStatusCounts.runningProjects);
const stoppedCompose = $derived(projectStatusCounts.stoppedProjects);
+ const isRefreshing = $derived(
+ (projectsQuery.isFetching && !projectsQuery.isPending) ||
+ (projectStatusCountsQuery.isFetching && !projectStatusCountsQuery.isPending)
+ );
async function handleCheckForUpdates() {
- isLoading.updating = true;
- handleApiResultWithCallbacks({
- result: await tryCatch(imageService.runAutoUpdate()),
- message: m.containers_check_updates_failed(),
- setLoadingState: (value) => (isLoading.updating = value),
- async onSuccess() {
- toast.success(m.compose_update_success());
- projects = await projectService.getProjects(projectRequestOptions);
- }
- });
+ await checkUpdatesMutation.mutateAsync();
}
async function refreshCompose() {
- isLoading.refreshing = true;
- let refreshingProjectList = true;
- let refreshingProjectCounts = true;
- handleApiResultWithCallbacks({
- result: await tryCatch(projectService.getProjects(projectRequestOptions)),
- message: m.common_refresh_failed({ resource: m.projects_title() }),
- setLoadingState: (v) => {
- refreshingProjectList = v;
- isLoading.refreshing = refreshingProjectCounts || refreshingProjectList;
- },
- async onSuccess(newProjects) {
- projects = newProjects;
- }
- });
- handleApiResultWithCallbacks({
- result: await tryCatch(projectService.getProjectStatusCounts()),
- message: m.common_refresh_failed({ resource: m.projects_title() }),
- setLoadingState: (v) => {
- refreshingProjectCounts = v;
- isLoading.refreshing = refreshingProjectCounts || refreshingProjectList;
- },
- async onSuccess(newProjectCounts) {
- projectStatusCounts = newProjectCounts;
- }
- });
+ await Promise.all([projectsQuery.refetch(), projectStatusCountsQuery.refetch()]);
}
- let lastEnvId: string | null = null;
- $effect(() => {
- const env = environmentStore.selected;
- if (!env) return;
- if (lastEnvId === null) {
- lastEnvId = env.id;
- return;
- }
- if (env.id !== lastEnvId) {
- lastEnvId = env.id;
- refreshCompose();
- }
- });
-
const actionButtons: ActionButton[] = $derived([
{
id: 'create',
@@ -95,16 +84,16 @@
action: 'update',
label: m.compose_update_projects(),
onclick: handleCheckForUpdates,
- loading: isLoading.updating,
- disabled: isLoading.updating
+ loading: checkUpdatesMutation.isPending,
+ disabled: checkUpdatesMutation.isPending
},
{
id: 'refresh',
action: 'restart',
label: m.common_refresh(),
onclick: refreshCompose,
- loading: isLoading.refreshing,
- disabled: isLoading.refreshing
+ loading: isRefreshing,
+ disabled: isRefreshing
}
]);
@@ -132,6 +121,14 @@
<ResourcePageLayout title={m.projects_title()} subtitle={m.compose_subtitle()} {actionButtons} {statCards}>
{#snippet mainContent()}
- <ProjectsTable bind:projects bind:selectedIds bind:requestOptions={projectRequestOptions} />
+ <ProjectsTable
+ bind:projects
+ bind:selectedIds
+ bind:requestOptions={projectRequestOptions}
+ onRefreshData={async (options) => {
+ projectRequestOptions = options;
+ await Promise.all([projectsQuery.refetch(), projectStatusCountsQuery.refetch()]);
+ }}
+ />
{/snippet}
</ResourcePageLayout>
diff --git a/frontend/src/routes/(app)/projects/+page.ts b/frontend/src/routes/(app)/projects/+page.ts
index 069679c25..03f0dc76f 100644
--- a/frontend/src/routes/(app)/projects/+page.ts
+++ b/frontend/src/routes/(app)/projects/+page.ts
@@ -1,9 +1,14 @@
import { projectService } from '$lib/services/project-service';
+import { queryKeys } from '$lib/query/query-keys';
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
import { resolveInitialTableRequest } from '$lib/utils/table-persistence.util';
import type { PageLoad } from './$types';
+import { environmentStore } from '$lib/stores/environment.store.svelte';
+
+export const load: PageLoad = async ({ parent }) => {
+ const { queryClient } = await parent();
+ const envId = await environmentStore.getCurrentEnvironmentId();
-export const load: PageLoad = async () => {
const projectRequestOptions = resolveInitialTableRequest('arcane-project-table', {
pagination: {
page: 1,
@@ -16,8 +21,14 @@ export const load: PageLoad = async () => {
} satisfies SearchPaginationSortRequest);
const [projects, projectStatusCounts] = await Promise.all([
- projectService.getProjects(projectRequestOptions),
- projectService.getProjectStatusCounts()
+ queryClient.fetchQuery({
+ queryKey: queryKeys.projects.list(envId, projectRequestOptions),
+ queryFn: () => projectService.getProjectsForEnvironment(envId, projectRequestOptions)
+ }),
+ queryClient.fetchQuery({
+ queryKey: queryKeys.projects.statusCounts(envId),
+ queryFn: () => projectService.getProjectStatusCountsForEnvironment(envId)
+ })
]);
return { projects, projectRequestOptions, projectStatusCounts };
diff --git a/frontend/src/routes/(app)/projects/[projectId]/+page.ts b/frontend/src/routes/(app)/projects/[projectId]/+page.ts
index 94024bc2b..cc6b8201e 100644
--- a/frontend/src/routes/(app)/projects/[projectId]/+page.ts
+++ b/frontend/src/routes/(app)/projects/[projectId]/+page.ts
@@ -1,8 +1,16 @@
import { projectService } from '$lib/services/project-service';
+import { environmentStore } from '$lib/stores/environment.store.svelte';
+import { queryKeys } from '$lib/query/query-keys';
import type { PageLoad } from './$types';
-export const load: PageLoad = async ({ params }) => {
- const project = await projectService.getProject(params.projectId);
+export const load: PageLoad = async ({ params, parent }) => {
+ const { queryClient } = await parent();
+ const envId = await environmentStore.getCurrentEnvironmentId();
+
+ const project = await queryClient.fetchQuery({
+ queryKey: queryKeys.projects.detail(envId, params.projectId),
+ queryFn: () => projectService.getProjectForEnvironment(envId, params.projectId)
+ });
const editorState = {
name: project.name || '',
diff --git a/frontend/src/routes/(app)/projects/new/+page.ts b/frontend/src/routes/(app)/projects/new/+page.ts
index 4dc5e0767..e4afd0148 100644
--- a/frontend/src/routes/(app)/projects/new/+page.ts
+++ b/frontend/src/routes/(app)/projects/new/+page.ts
@@ -1,22 +1,41 @@
import { templateService } from '$lib/services/template-service';
+import { queryKeys } from '$lib/query/query-keys';
+import type { PageLoad } from './$types';
+
+export const load: PageLoad = async ({ url, parent }) => {
+ const { queryClient } = await parent();
-export const load = async ({ url }) => {
const templateId = url.searchParams.get('templateId');
const [allTemplates, defaultTemplates, selectedTemplate] = await Promise.all([
- templateService.getAllTemplates().catch((err) => {
- console.warn('Failed to load templates:', err);
- return [];
- }),
- templateService.getDefaultTemplates().catch((err) => {
- console.warn('Failed to load default templates:', err);
- return { composeTemplate: '', envTemplate: '' };
- }),
+ queryClient
+ .fetchQuery({
+ queryKey: queryKeys.templates.allTemplates(),
+ queryFn: () => templateService.getAllTemplates()
+ })
+ .catch((err) => {
+ console.warn('Failed to load templates:', err);
+ return [];
+ }),
+ queryClient
+ .fetchQuery({
+ queryKey: queryKeys.templates.defaults(),
+ queryFn: () => templateService.getDefaultTemplates()
+ })
+ .catch((err) => {
+ console.warn('Failed to load default templates:', err);
+ return { composeTemplate: '', envTemplate: '' };
+ }),
templateId
- ? templateService.getTemplateContent(templateId).catch((err) => {
- console.warn('Failed to load selected template:', err);
- return null;
- })
+ ? queryClient
+ .fetchQuery({
+ queryKey: queryKeys.templates.content(templateId),
+ queryFn: () => templateService.getTemplateContent(templateId)
+ })
+ .catch((err) => {
+ console.warn('Failed to load selected template:', err);
+ return null;
+ })
: Promise.resolve(null)
]);
diff --git a/frontend/src/routes/(app)/projects/projects-table.svelte b/frontend/src/routes/(app)/projects/projects-table.svelte
index 91e364b81..ad3b1a16d 100644
--- a/frontend/src/routes/(app)/projects/projects-table.svelte
+++ b/frontend/src/routes/(app)/projects/projects-table.svelte
@@ -27,11 +27,13 @@
let {
projects = $bindable(),
selectedIds = $bindable(),
- requestOptions = $bindable()
+ requestOptions = $bindable(),
+ onRefreshData
}: {
projects: Paginated<Project>;
selectedIds: string[];
requestOptions: SearchPaginationSortRequest;
+ onRefreshData?: (options: SearchPaginationSortRequest) => Promise<void>;
} = $props();
let isLoading = $state({
@@ -51,6 +53,14 @@
redeploy: false
});
+ async function refreshProjects(options: SearchPaginationSortRequest = requestOptions) {
+ if (onRefreshData) {
+ await onRefreshData(options);
+ return;
+ }
+ projects = await projectService.getProjects(options);
+ }
+
function getStatusTooltip(project: Project): string | undefined {
return project.status.toLowerCase() === 'unknown' && project.statusReason ? project.statusReason : undefined;
}
@@ -66,7 +76,7 @@
setLoadingState: (value) => (isLoading.start = value),
onSuccess: async () => {
toast.success(m.compose_start_success());
- projects = await projectService.getProjects(requestOptions);
+ await refreshProjects();
}
});
} else if (action === 'stop') {
@@ -76,7 +86,7 @@
setLoadingState: (value) => (isLoading.stop = value),
onSuccess: async () => {
toast.success(m.compose_stop_success());
- projects = await projectService.getProjects(requestOptions);
+ await refreshProjects();
}
});
} else if (action === 'restart') {
@@ -86,7 +96,7 @@
setLoadingState: (value) => (isLoading.restart = value),
onSuccess: async () => {
toast.success(m.compose_restart_success());
- projects = await projectService.getProjects(requestOptions);
+ await refreshProjects();
}
});
} else if (action === 'redeploy') {
@@ -96,7 +106,7 @@
setLoadingState: (value) => (isLoading.pull = value),
onSuccess: async () => {
toast.success(m.compose_pull_success());
- projects = await projectService.getProjects(requestOptions);
+ await refreshProjects();
}
});
} else if (action === 'destroy') {
@@ -128,7 +138,7 @@
setLoadingState: (value) => (isLoading.destroy = value),
onSuccess: async () => {
toast.success(m.compose_destroy_success());
- projects = await projectService.getProjects(requestOptions);
+ await refreshProjects();
}
});
}
@@ -150,7 +160,7 @@
setLoadingState: (value) => (isLoading.syncing = value),
onSuccess: async () => {
toast.success(m.git_sync_success());
- projects = await projectService.getProjects(requestOptions);
+ await refreshProjects();
}
});
}
@@ -182,7 +192,7 @@
toast.error(m.compose_start_failed());
}
- projects = await projectService.getProjects(requestOptions);
+ await refreshProjects();
selectedIds = [];
}
}
@@ -216,7 +226,7 @@
toast.error(m.compose_stop_failed());
}
- projects = await projectService.getProjects(requestOptions);
+ await refreshProjects();
selectedIds = [];
}
}
@@ -250,7 +260,7 @@
toast.error(m.compose_pull_failed());
}
- projects = await projectService.getProjects(requestOptions);
+ await refreshProjects();
selectedIds = [];
}
}
@@ -515,7 +525,11 @@
bind:requestOptions
bind:selectedIds
bind:mobileFieldVisibility
- onRefresh={async (options) => (projects = await projectService.getProjects(options))}
+ onRefresh={async (options) => {
+ requestOptions = options;
+ await refreshProjects(options);
+ return projects;
+ }}
{columns}
{mobileFields}
{bulkActions}
diff --git a/frontend/src/routes/(app)/security/+page.ts b/frontend/src/routes/(app)/security/+page.ts
index ab528ac46..e79eb93d9 100644
--- a/frontend/src/routes/(app)/security/+page.ts
+++ b/frontend/src/routes/(app)/security/+page.ts
@@ -1,4 +1,6 @@
import { vulnerabilityService } from '$lib/services/vulnerability-service';
+import { environmentStore } from '$lib/stores/environment.store.svelte';
+import { queryKeys } from '$lib/query/query-keys';
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
import { resolveInitialTableRequest } from '$lib/utils/table-persistence.util';
import type { Paginated } from '$lib/types/pagination.type';
@@ -48,7 +50,10 @@ function mapVulnerabilityPage(
};
}
-export const load: PageLoad = async () => {
+export const load: PageLoad = async ({ parent }) => {
+ const { queryClient } = await parent();
+ const envId = await environmentStore.getCurrentEnvironmentId();
+
const vulnerabilityRequestOptions = resolveInitialTableRequest('arcane-security-vuln-table', {
pagination: {
page: 1,
@@ -63,8 +68,14 @@ export const load: PageLoad = async () => {
const requestForApi = mapVulnerabilityRequest(vulnerabilityRequestOptions);
const [summary, vulnerabilities] = await Promise.all([
- vulnerabilityService.getEnvironmentSummary(),
- vulnerabilityService.getAllVulnerabilities(requestForApi)
+ queryClient.fetchQuery({
+ queryKey: queryKeys.vulnerabilities.summaryByEnvironment(envId),
+ queryFn: () => vulnerabilityService.getEnvironmentSummaryForEnvironment(envId)
+ }),
+ queryClient.fetchQuery({
+ queryKey: queryKeys.vulnerabilities.allByEnvironment(envId, requestForApi),
+ queryFn: () => vulnerabilityService.getAllVulnerabilitiesForEnvironment(envId, requestForApi)
+ })
]);
return {
diff --git a/frontend/src/routes/(app)/settings/api-keys/+page.ts b/frontend/src/routes/(app)/settings/api-keys/+page.ts
index 50a81455c..9f13b1987 100644
--- a/frontend/src/routes/(app)/settings/api-keys/+page.ts
+++ b/frontend/src/routes/(app)/settings/api-keys/+page.ts
@@ -1,8 +1,12 @@
import { apiKeyService } from '$lib/services/api-key-service';
+import { queryKeys } from '$lib/query/query-keys';
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
import { resolveInitialTableRequest } from '$lib/utils/table-persistence.util';
+import type { PageLoad } from './$types';
+
+export const load: PageLoad = async ({ parent }) => {
+ const { queryClient } = await parent();
-export const load = async () => {
const apiKeyRequestOptions = resolveInitialTableRequest('arcane-api-keys-table', {
pagination: {
page: 1,
@@ -14,7 +18,10 @@ export const load = async () => {
}
} satisfies SearchPaginationSortRequest);
- const apiKeys = await apiKeyService.getApiKeys(apiKeyRequestOptions);
+ const apiKeys = await queryClient.fetchQuery({
+ queryKey: queryKeys.apiKeys.list(apiKeyRequestOptions),
+ queryFn: () => apiKeyService.getApiKeys(apiKeyRequestOptions)
+ });
return {
apiKeys,
diff --git a/frontend/src/routes/(app)/settings/notifications/+page.ts b/frontend/src/routes/(app)/settings/notifications/+page.ts
index efaaf5a47..17422d388 100644
--- a/frontend/src/routes/(app)/settings/notifications/+page.ts
+++ b/frontend/src/routes/(app)/settings/notifications/+page.ts
@@ -1,9 +1,15 @@
import { notificationService } from '$lib/services/notification-service';
+import { queryKeys } from '$lib/query/query-keys';
import type { PageLoad } from './$types';
-export const load: PageLoad = async () => {
+export const load: PageLoad = async ({ parent }) => {
+ const { queryClient } = await parent();
+
try {
- const notificationSettings = await notificationService.getSettings();
+ const notificationSettings = await queryClient.fetchQuery({
+ queryKey: queryKeys.notifications.settings(),
+ queryFn: () => notificationService.getSettings()
+ });
return {
notificationSettings
diff --git a/frontend/src/routes/(app)/settings/timeouts/+page.ts b/frontend/src/routes/(app)/settings/timeouts/+page.ts
index eca96acce..fb604d1dc 100644
--- a/frontend/src/routes/(app)/settings/timeouts/+page.ts
+++ b/frontend/src/routes/(app)/settings/timeouts/+page.ts
@@ -1,9 +1,17 @@
import type { PageLoad } from './$types';
import { settingsService } from '$lib/services/settings-service';
+import { environmentStore } from '$lib/stores/environment.store.svelte';
+import { queryKeys } from '$lib/query/query-keys';
+
+export const load: PageLoad = async ({ parent }) => {
+ const { queryClient } = await parent();
+ const envId = await environmentStore.getCurrentEnvironmentId();
-export const load: PageLoad = async () => {
try {
- const settings = await settingsService.getSettings();
+ const settings = await queryClient.fetchQuery({
+ queryKey: queryKeys.settings.byEnvironment(envId),
+ queryFn: () => settingsService.getSettingsForEnvironmentMerged(envId)
+ });
return { settings };
} catch (error) {
console.error('Failed to load timeout settings:', error);
diff --git a/frontend/src/routes/(app)/settings/users/+page.ts b/frontend/src/routes/(app)/settings/users/+page.ts
index 803cd7dbf..bc8955355 100644
--- a/frontend/src/routes/(app)/settings/users/+page.ts
+++ b/frontend/src/routes/(app)/settings/users/+page.ts
@@ -1,8 +1,12 @@
import { userService } from '$lib/services/user-service';
+import { queryKeys } from '$lib/query/query-keys';
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
import { resolveInitialTableRequest } from '$lib/utils/table-persistence.util';
+import type { PageLoad } from './$types';
+
+export const load: PageLoad = async ({ parent }) => {
+ const { queryClient } = await parent();
-export const load = async () => {
const userRequestOptions = resolveInitialTableRequest('arcane-users-table', {
pagination: {
page: 1,
@@ -14,7 +18,10 @@ export const load = async () => {
}
} satisfies SearchPaginationSortRequest);
- const users = await userService.getUsers(userRequestOptions);
+ const users = await queryClient.fetchQuery({
+ queryKey: queryKeys.users.list(userRequestOptions),
+ queryFn: () => userService.getUsers(userRequestOptions)
+ });
return {
users,
diff --git a/frontend/src/routes/(app)/volumes/+page.svelte b/frontend/src/routes/(app)/volumes/+page.svelte
index c864e94ef..9c88c0e13 100644
--- a/frontend/src/routes/(app)/volumes/+page.svelte
+++ b/frontend/src/routes/(app)/volumes/+page.svelte
@@ -1,77 +1,80 @@
<script lang="ts">
- import { VolumesIcon, VolumeUnusedIcon, VolumeUsedIcon } from '$lib/icons';
+ import { VolumesIcon, VolumeUnusedIcon } from '$lib/icons';
import { toast } from 'svelte-sonner';
- import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
- import { tryCatch } from '$lib/utils/try-catch';
import CreateVolumeSheet from '$lib/components/sheets/create-volume-sheet.svelte';
- import type { VolumeCreateRequest } from '$lib/types/volume.type';
+ import type { VolumeCreateRequest, VolumeUsageCounts } from '$lib/types/volume.type';
import VolumeTable from './volume-table.svelte';
import { m } from '$lib/paraglide/messages';
import { volumeService } from '$lib/services/volume-service';
+ import { environmentStore } from '$lib/stores/environment.store.svelte';
+ import { queryKeys } from '$lib/query/query-keys';
import { untrack } from 'svelte';
import { ResourcePageLayout, type ActionButton, type StatCardConfig } from '$lib/layouts/index.js';
- import { useEnvironmentRefresh } from '$lib/hooks/use-environment-refresh.svelte';
- import { parallelRefresh } from '$lib/utils/refresh.util';
+ import { createMutation, createQuery } from '@tanstack/svelte-query';
let { data } = $props();
let volumes = $state(untrack(() => data.volumes));
- let volumeUsageCounts = $state(untrack(() => data.volumeUsageCounts));
let requestOptions = $state(untrack(() => data.volumeRequestOptions));
let selectedIds = $state<string[]>([]);
let isCreateDialogOpen = $state(false);
- let isLoading = $state({ creating: false, refresh: false });
+ const envId = $derived(environmentStore.selected?.id || '0');
+ const countsFallback: VolumeUsageCounts = { inuse: 0, unused: 0, total: 0 };
- async function refresh() {
- await parallelRefresh(
- {
- volumes: {
- fetch: () => volumeService.getVolumes(requestOptions),
- onSuccess: (data) => {
- volumes = data;
- // Extract counts from the response - they're included in the list endpoint
- volumeUsageCounts = data.counts ?? { inuse: 0, unused: 0, total: 0 };
- },
- errorMessage: m.common_refresh_failed({ resource: m.volumes_title() })
- }
- },
- (v) => (isLoading.refresh = v)
- );
- }
+ const volumesQuery = createQuery(() => ({
+ queryKey: queryKeys.volumes.table(envId, requestOptions),
+ queryFn: () => volumeService.getVolumesForEnvironment(envId, requestOptions),
+ initialData: data.volumes
+ }));
+
+ const createVolumeMutation = createMutation(() => ({
+ mutationKey: ['volumes', 'create', envId],
+ mutationFn: (options: VolumeCreateRequest) => volumeService.createVolume(options),
+ onSuccess: async (_data, options) => {
+ const name = options.name?.trim() || m.common_unknown();
+ toast.success(m.common_create_success({ resource: `${m.resource_volume()} "${name}"` }));
+ await volumesQuery.refetch();
+ isCreateDialogOpen = false;
+ },
+ onError: (_error, options) => {
+ const name = options.name?.trim() || m.common_unknown();
+ toast.error(m.common_create_failed({ resource: `${m.resource_volume()} "${name}"` }));
+ }
+ }));
- useEnvironmentRefresh(refresh);
+ $effect(() => {
+ if (volumesQuery.data) {
+ volumes = volumesQuery.data;
+ }
+ });
async function handleCreate(options: VolumeCreateRequest) {
- isLoading.creating = true;
- const name = options.name?.trim() || m.common_unknown();
- handleApiResultWithCallbacks({
- result: await tryCatch(volumeService.createVolume(options)),
- message: m.common_create_failed({ resource: `${m.resource_volume()} "${name}"` }),
- setLoadingState: (v) => (isLoading.creating = v),
- onSuccess: async () => {
- toast.success(m.common_create_success({ resource: `${m.resource_volume()} "${name}"` }));
- volumes = await volumeService.getVolumes(requestOptions);
- isCreateDialogOpen = false;
- }
- });
+ await createVolumeMutation.mutateAsync(options);
}
+ async function refresh() {
+ await volumesQuery.refetch();
+ }
+
+ const isRefreshing = $derived(volumesQuery.isFetching && !volumesQuery.isPending);
+ const volumeUsageCounts = $derived(volumes.counts ?? countsFallback);
+
const actionButtons: ActionButton[] = $derived([
{
id: 'create',
action: 'create',
label: m.common_create_button({ resource: m.resource_volume_cap() }),
onclick: () => (isCreateDialogOpen = true),
- loading: isLoading.creating,
- disabled: isLoading.creating
+ loading: createVolumeMutation.isPending,
+ disabled: createVolumeMutation.isPending
},
{
id: 'refresh',
action: 'restart',
label: m.common_refresh(),
onclick: refresh,
- loading: isLoading.refresh,
- disabled: isLoading.refresh
+ loading: isRefreshing,
+ disabled: isRefreshing
}
]);
@@ -93,10 +96,18 @@
<ResourcePageLayout title={m.volumes_title()} subtitle={m.volumes_subtitle()} {actionButtons} {statCards}>
{#snippet mainContent()}
- <VolumeTable bind:volumes bind:selectedIds bind:requestOptions />
+ <VolumeTable
+ bind:volumes
+ bind:selectedIds
+ bind:requestOptions
+ onRefreshData={async (options) => {
+ requestOptions = options;
+ await volumesQuery.refetch();
+ }}
+ />
{/snippet}
{#snippet additionalContent()}
- <CreateVolumeSheet bind:open={isCreateDialogOpen} isLoading={isLoading.creating} onSubmit={handleCreate} />
+ <CreateVolumeSheet bind:open={isCreateDialogOpen} isLoading={createVolumeMutation.isPending} onSubmit={handleCreate} />
{/snippet}
</ResourcePageLayout>
diff --git a/frontend/src/routes/(app)/volumes/+page.ts b/frontend/src/routes/(app)/volumes/+page.ts
index f9c72ac55..bdac1f66c 100644
--- a/frontend/src/routes/(app)/volumes/+page.ts
+++ b/frontend/src/routes/(app)/volumes/+page.ts
@@ -1,9 +1,14 @@
import { volumeService } from '$lib/services/volume-service';
+import { queryKeys } from '$lib/query/query-keys';
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
import { resolveInitialTableRequest } from '$lib/utils/table-persistence.util';
import type { PageLoad } from './$types';
+import { environmentStore } from '$lib/stores/environment.store.svelte';
+
+export const load: PageLoad = async ({ parent }) => {
+ const { queryClient } = await parent();
+ const envId = await environmentStore.getCurrentEnvironmentId();
-export const load: PageLoad = async () => {
const volumeRequestOptions = resolveInitialTableRequest('arcane-volumes-table', {
pagination: {
page: 1,
@@ -16,7 +21,10 @@ export const load: PageLoad = async () => {
} satisfies SearchPaginationSortRequest);
// Single API call - counts are included in the response
- const volumes = await volumeService.getVolumes(volumeRequestOptions);
+ const volumes = await queryClient.fetchQuery({
+ queryKey: queryKeys.volumes.table(envId, volumeRequestOptions),
+ queryFn: () => volumeService.getVolumesForEnvironment(envId, volumeRequestOptions)
+ });
return {
volumes,
diff --git a/frontend/src/routes/(app)/volumes/[volumeName]/+page.ts b/frontend/src/routes/(app)/volumes/[volumeName]/+page.ts
index 463edda6d..c6552a066 100644
--- a/frontend/src/routes/(app)/volumes/[volumeName]/+page.ts
+++ b/frontend/src/routes/(app)/volumes/[volumeName]/+page.ts
@@ -2,19 +2,30 @@ import type { PageLoad } from './$types';
import { error } from '@sveltejs/kit';
import { volumeService } from '$lib/services/volume-service';
import { containerService } from '$lib/services/container-service';
+import { environmentStore } from '$lib/stores/environment.store.svelte';
+import { queryKeys } from '$lib/query/query-keys';
+
+export const load: PageLoad = async ({ params, parent }) => {
+ const { queryClient } = await parent();
+ const envId = await environmentStore.getCurrentEnvironmentId();
-export const load: PageLoad = async ({ params }) => {
const { volumeName } = params;
try {
- const volume = await volumeService.getVolume(volumeName);
+ const volume = await queryClient.fetchQuery({
+ queryKey: queryKeys.volumes.detail(envId, volumeName),
+ queryFn: () => volumeService.getVolumeForEnvironment(envId, volumeName)
+ });
let containersDetailed: { id: string; name: string }[] = [];
if (volume.containers && volume.containers.length > 0) {
containersDetailed = await Promise.all(
volume.containers.map(async (id: string) => {
try {
- const c = await containerService.getContainer(id);
+ const c = await queryClient.fetchQuery({
+ queryKey: queryKeys.containers.detail(envId, id),
+ queryFn: () => containerService.getContainerForEnvironment(envId, id)
+ });
const idVal = (c?.id || c?.Id || id) as string;
const nameVal = (c?.name ||
c?.Name ||
diff --git a/frontend/src/routes/(app)/volumes/volume-table.svelte b/frontend/src/routes/(app)/volumes/volume-table.svelte
index e5121cc8e..160202009 100644
--- a/frontend/src/routes/(app)/volumes/volume-table.svelte
+++ b/frontend/src/routes/(app)/volumes/volume-table.svelte
@@ -24,17 +24,27 @@
let {
volumes = $bindable(),
selectedIds = $bindable(),
- requestOptions = $bindable()
+ requestOptions = $bindable(),
+ onRefreshData
}: {
volumes: Paginated<VolumeSummaryDto>;
selectedIds: string[];
requestOptions: SearchPaginationSortRequest;
+ onRefreshData?: (options: SearchPaginationSortRequest) => Promise<void>;
} = $props();
let isLoading = $state({
removing: false
});
+ async function refreshVolumes(options: SearchPaginationSortRequest = requestOptions) {
+ if (onRefreshData) {
+ await onRefreshData(options);
+ return;
+ }
+ volumes = await volumeService.getVolumes(options);
+ }
+
const backupVolumeName = $derived.by(() => $settingsStore?.backupVolumeName || 'arcane-backups');
const isBackupVolumeName = (name?: string) => (name ?? '') === backupVolumeName;
const isBackupVolume = (item: VolumeSummaryDto) => isBackupVolumeName(item.name);
@@ -71,7 +81,7 @@
setLoadingState: (value) => (isLoading.removing = value),
onSuccess: async () => {
toast.success(m.common_remove_success({ resource: `${m.resource_volume()} "${safeName}"` }));
- volumes = await volumeService.getVolumes(requestOptions);
+ await refreshVolumes();
}
});
}
@@ -120,7 +130,7 @@
if (successCount > 0) {
const successMsg = m.common_bulk_remove_success({ count: successCount, resource: m.volumes_title() });
toast.success(successMsg);
- volumes = await volumeService.getVolumes(requestOptions);
+ await refreshVolumes();
}
if (failureCount > 0) {
const failureMsg = m.common_bulk_remove_failed({ count: failureCount, resource: m.volumes_title() });
@@ -303,7 +313,11 @@
bind:selectedIds
bind:mobileFieldVisibility
{bulkActions}
- onRefresh={async (options) => (volumes = await volumeService.getVolumes(options))}
+ onRefresh={async (options) => {
+ requestOptions = options;
+ await refreshVolumes(options);
+ return volumes;
+ }}
{columns}
{mobileFields}
rowActions={RowActions}
diff --git a/frontend/src/routes/(auth)/login/+page.svelte b/frontend/src/routes/(auth)/login/+page.svelte
index d3aaada06..8bf8838f1 100644
--- a/frontend/src/routes/(auth)/login/+page.svelte
+++ b/frontend/src/routes/(auth)/login/+page.svelte
@@ -9,22 +9,22 @@
import userStore from '$lib/stores/user-store';
import { m } from '$lib/paraglide/messages';
import { authService } from '$lib/services/auth-service';
+ import { queryKeys } from '$lib/query/query-keys';
import { getApplicationLogo } from '$lib/utils/image.util';
import { Motion } from 'svelte-motion';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { onMount } from 'svelte';
+ import { createMutation, useQueryClient } from '@tanstack/svelte-query';
let { data }: { data: PageData } = $props();
- let isLoading = $state({
- local: false,
- oidc: false
- });
let error = $state<string | null>(null);
let username = $state('');
let password = $state('');
+ const queryClient = useQueryClient();
- let logoUrl = $derived(getApplicationLogo());
+ const accentColor = $derived(data.settings?.accentColor);
+ const logoUrl = $derived(getApplicationLogo(false, accentColor, accentColor));
const oidcEnabledBySettings = $derived(data.settings?.oidcEnabled === true);
const showOidcLoginButton = $derived(oidcEnabledBySettings);
@@ -40,20 +40,47 @@
oidcProviderName ? m.auth_oidc_signin_with({ provider: oidcProviderName }) : m.auth_oidc_signin()
);
+ const oidcLoginMutation = createMutation(() => ({
+ mutationFn: async () => {
+ error = null;
+ const currentRedirect = data.redirectTo || '/dashboard';
+ await goto(`/oidc/login?redirect=${encodeURIComponent(currentRedirect)}`);
+ }
+ }));
+
+ const loginMutation = createMutation(() => ({
+ mutationFn: () => authService.login({ username, password }),
+ onSuccess: async (user) => {
+ userStore.setUser(user);
+ await queryClient.invalidateQueries({ queryKey: queryKeys.auth.all });
+ const redirectTo = data.redirectTo || '/dashboard';
+ await goto(redirectTo, { replaceState: true });
+ },
+ onError: (err) => {
+ error = err instanceof Error ? err.message : 'Login failed';
+ }
+ }));
+
+ const isLocalLoading = $derived(loginMutation.isPending);
+ const isOidcLoading = $derived(oidcLoginMutation.isPending);
+
onMount(() => {
if (oidcAutoRedirect && oidcEnabledBySettings && !data.error) {
- handleOidcLogin();
+ oidcLoginMutation.mutate();
}
});
- async function handleOidcLogin() {
- isLoading.oidc = true;
+ function handleOidcLogin() {
const currentRedirect = data.redirectTo || '/dashboard';
- await goto(`/oidc/login?redirect=${encodeURIComponent(currentRedirect)}`);
- isLoading.oidc = false;
+ oidcLoginMutation.mutate(undefined, {
+ onError: () => {
+ // Fallback to direct navigation when mutation fails unexpectedly
+ void goto(`/oidc/login?redirect=${encodeURIComponent(currentRedirect)}`);
+ }
+ });
}
- async function handleLogin(event: Event) {
+ function handleLogin(event: Event) {
event.preventDefault();
if (!username || !password) {
@@ -61,19 +88,8 @@
return;
}
- isLoading.local = true;
error = null;
-
- try {
- const user = await authService.login({ username, password });
- userStore.setUser(user);
- const redirectTo = data.redirectTo || '/dashboard';
- await goto(redirectTo, { replaceState: true });
- } catch (err) {
- error = err instanceof Error ? err.message : 'Login failed';
- } finally {
- isLoading.local = false;
- }
+ loginMutation.mutate();
}
const showDivider = $derived(showOidcLoginButton && showLocalLoginForm);
@@ -204,8 +220,8 @@
hoverEffect="none"
action="oidc_login"
onclick={() => handleOidcLogin()}
- loading={isLoading.oidc}
- disabled={isLoading.local}
+ loading={isOidcLoading}
+ disabled={isLocalLoading}
icon={null}
customLabel=""
>
@@ -234,7 +250,7 @@
required
bind:value={username}
placeholder={m.auth_username_placeholder()}
- disabled={isLoading.local || isLoading.oidc}
+ disabled={isLocalLoading || isOidcLoading}
/>
</InputGroup.Root>
</div>
@@ -252,17 +268,11 @@
required
bind:value={password}
placeholder={m.auth_password_placeholder()}
- disabled={isLoading.local || isLoading.oidc}
+ disabled={isLocalLoading || isOidcLoading}
/>
</InputGroup.Root>
</div>
- <ArcaneButton
- type="submit"
- action="login"
- loading={isLoading.local}
- disabled={isLoading.oidc}
- hoverEffect="none"
- />
+ <ArcaneButton type="submit" action="login" loading={isLocalLoading} disabled={isOidcLoading} hoverEffect="none" />
</form>
{#if showDivider}
@@ -283,8 +293,8 @@
action="oidc_login"
hoverEffect="none"
onclick={() => handleOidcLogin()}
- loading={isLoading.oidc}
- disabled={isLoading.local}
+ loading={isOidcLoading}
+ disabled={isLocalLoading}
icon={null}
customLabel=""
>
diff --git a/frontend/src/routes/(auth)/logout/+page.ts b/frontend/src/routes/(auth)/logout/+page.ts
index 03b2f0283..5074f36a8 100644
--- a/frontend/src/routes/(auth)/logout/+page.ts
+++ b/frontend/src/routes/(auth)/logout/+page.ts
@@ -1,8 +1,11 @@
import { redirect } from '@sveltejs/kit';
import type { PageLoad } from './$types';
import { authService } from '$lib/services/auth-service';
+import { queryKeys } from '$lib/query/query-keys';
+
+export const load: PageLoad = async ({ fetch, parent }) => {
+ const { queryClient } = await parent();
-export const load: PageLoad = async ({ fetch }) => {
try {
await fetch('/api/auth/logout', {
method: 'POST',
@@ -13,6 +16,7 @@ export const load: PageLoad = async ({ fetch }) => {
}
authService.logout();
+ queryClient.removeQueries({ queryKey: queryKeys.auth.all });
throw redirect(302, '/login');
};
diff --git a/frontend/src/routes/(auth)/oidc/callback/+page.svelte b/frontend/src/routes/(auth)/oidc/callback/+page.svelte
index 1ae7eaeac..1fe8351c8 100644
--- a/frontend/src/routes/(auth)/oidc/callback/+page.svelte
+++ b/frontend/src/routes/(auth)/oidc/callback/+page.svelte
@@ -8,11 +8,13 @@
import { m } from '$lib/paraglide/messages';
import settingsStore from '$lib/stores/config-store';
import { settingsService } from '$lib/services/settings-service';
+ import { queryKeys } from '$lib/query/query-keys';
import { authService } from '$lib/services/auth-service';
import { Spinner } from '$lib/components/ui/spinner/index.js';
+ import { createMutation, useQueryClient } from '@tanstack/svelte-query';
- let isProcessing = $state(true);
let error = $state('');
+ const queryClient = useQueryClient();
const buildLoginRedirect = (errorCode: string, message?: string) => {
const params = new URLSearchParams({ error: errorCode });
@@ -22,8 +24,17 @@
return `/login?${params.toString()}`;
};
- onMount(async () => {
- try {
+ type CallbackFailure = {
+ code: string;
+ userMessage: string;
+ };
+
+ function failure(code: string, userMessage: string): CallbackFailure {
+ return { code, userMessage };
+ }
+
+ const callbackMutation = createMutation(() => ({
+ mutationFn: async () => {
const code = page.url.searchParams.get('code');
const stateFromUrl = page.url.searchParams.get('state');
const errorParam = page.url.searchParams.get('error');
@@ -34,23 +45,20 @@
if (errorParam) {
let userMessage = m.auth_oidc_provider_error();
+ let redirectCode = 'oidc_provider_error';
if (errorParam === 'access_denied') {
userMessage = m.auth_oidc_access_denied();
+ redirectCode = 'oidc_access_denied';
} else if (errorParam === 'invalid_request') {
userMessage = m.auth_oidc_invalid_request();
+ redirectCode = 'oidc_invalid_request';
}
- error = errorDescription || userMessage;
- setTimeout(() => goto(buildLoginRedirect('oidc_provider_error', error)), 3000);
- isProcessing = false;
- return;
+ throw failure(redirectCode, errorDescription || userMessage);
}
if (!code || !stateFromUrl) {
- error = m.auth_oidc_invalid_response();
- setTimeout(() => goto(buildLoginRedirect('oidc_invalid_response', error)), 3000);
- isProcessing = false;
- return;
+ throw failure('oidc_invalid_response', m.auth_oidc_invalid_response());
}
const authResult = await authService.handleCallback(code, stateFromUrl);
@@ -63,57 +71,72 @@
userMessage = m.auth_oidc_session_expired();
}
- error = authResult.error || userMessage;
- setTimeout(() => goto(buildLoginRedirect('oidc_auth_failed', error)), 3000);
- isProcessing = false;
- return;
+ throw failure('oidc_auth_failed', authResult.error || userMessage);
}
- if (authResult.user) {
- const user: User = {
- id: authResult.user.sub || authResult.user.email || '',
- username: authResult.user.preferred_username || authResult.user.email || '',
- email: authResult.user.email,
- displayName:
- authResult.user.name ||
- authResult.user.displayName ||
- authResult.user.given_name ||
- authResult.user.preferred_username ||
- authResult.user.email ||
- m.common_unknown(),
- roles: authResult.user.groups || ['user'],
- createdAt: new Date().toISOString()
- };
-
- userStore.setUser(user);
-
- async function finalizeLogin() {
- const settings = await settingsService.getSettings();
- settingsStore.set(settings);
- toast.success('Successfully logged in!');
- goto(redirectTo, { replaceState: true });
- }
-
- await invalidateAll();
- finalizeLogin();
- } else {
- error = m.auth_oidc_user_info_missing();
- setTimeout(() => goto(buildLoginRedirect('oidc_user_info_missing', error)), 3000);
- isProcessing = false;
+ if (!authResult.user) {
+ throw failure('oidc_user_info_missing', m.auth_oidc_user_info_missing());
}
- } catch (err: any) {
+
+ return {
+ authResult,
+ redirectTo
+ };
+ },
+ onSuccess: async ({ authResult, redirectTo }) => {
+ const user: User = {
+ id: authResult.user!.sub || authResult.user!.email || '',
+ username: authResult.user!.preferred_username || authResult.user!.email || '',
+ email: authResult.user!.email,
+ displayName:
+ authResult.user!.name ||
+ authResult.user!.displayName ||
+ authResult.user!.given_name ||
+ authResult.user!.preferred_username ||
+ authResult.user!.email ||
+ m.common_unknown(),
+ roles: authResult.user!.groups || ['user'],
+ createdAt: new Date().toISOString()
+ };
+
+ userStore.setUser(user);
+ await invalidateAll();
+ const settings = await queryClient.fetchQuery({
+ queryKey: queryKeys.settings.global(),
+ queryFn: () => settingsService.getSettings()
+ });
+ settingsStore.set(settings);
+ toast.success('Successfully logged in!');
+ await goto(redirectTo, { replaceState: true });
+ },
+ onError: (err: unknown) => {
console.error('OIDC callback error:', err);
- let userMessage = m.auth_oidc_callback_error();
- if (err.message?.includes('network') || err.message?.includes('timeout')) {
- userMessage = m.auth_oidc_network_error();
+ let redirectCode = 'oidc_callback_error';
+ let userMessage: string = String(m.auth_oidc_callback_error());
+
+ if (err && typeof err === 'object' && 'code' in err && 'userMessage' in err) {
+ redirectCode = String((err as CallbackFailure).code);
+ userMessage = String((err as CallbackFailure).userMessage);
+ } else {
+ const unknownError = err as { message?: string };
+ if (unknownError?.message?.includes('network') || unknownError?.message?.includes('timeout')) {
+ userMessage = String(m.auth_oidc_network_error());
+ redirectCode = 'oidc_network_error';
+ } else if (unknownError?.message && !unknownError.message.includes('Request failed')) {
+ userMessage = unknownError.message;
+ }
}
- const serverMessage = err?.message && !err.message.includes('Request failed') ? err.message : '';
- error = serverMessage || userMessage;
- setTimeout(() => goto(buildLoginRedirect('oidc_callback_error', error)), 3000);
- isProcessing = false;
+ error = userMessage;
+ setTimeout(() => goto(buildLoginRedirect(redirectCode, userMessage)), 3000);
}
+ }));
+
+ const isProcessing = $derived(callbackMutation.isPending);
+
+ onMount(() => {
+ callbackMutation.mutate();
});
</script>
diff --git a/frontend/src/routes/(auth)/oidc/login/+page.svelte b/frontend/src/routes/(auth)/oidc/login/+page.svelte
index 2bb722e60..87f52f942 100644
--- a/frontend/src/routes/(auth)/oidc/login/+page.svelte
+++ b/frontend/src/routes/(auth)/oidc/login/+page.svelte
@@ -5,38 +5,48 @@
import { m } from '$lib/paraglide/messages';
import { authService } from '$lib/services/auth-service';
import { Spinner } from '$lib/components/ui/spinner/index.js';
+ import { createMutation } from '@tanstack/svelte-query';
- let isRedirecting = $state(true);
let error = $state('');
- onMount(async () => {
- try {
+ const oidcLoginMutation = createMutation(() => ({
+ mutationFn: async () => {
const redirect = page.url.searchParams.get('redirect') || '/dashboard';
const authUrl = await authService.getAuthUrl(redirect);
if (!authUrl) {
- error = m.auth_oidc_url_generation_failed();
- setTimeout(() => goto('/login?error=oidc_url_generation_failed'), 3000);
- isRedirecting = false;
- return;
+ throw new Error('oidc_url_generation_failed');
}
localStorage.setItem('oidc_redirect', redirect);
window.location.href = authUrl;
- } catch (err: any) {
+ },
+ onError: (err: any) => {
console.error('OIDC login initiation error:', err);
let userMessage = m.auth_oidc_init_failed();
- if (err.message?.includes('discovery')) {
+ let redirectError = 'oidc_init_failed';
+
+ if (err.message === 'oidc_url_generation_failed') {
+ userMessage = m.auth_oidc_url_generation_failed();
+ redirectError = 'oidc_url_generation_failed';
+ } else if (err.message?.includes('discovery')) {
userMessage = m.auth_oidc_misconfigured();
+ redirectError = 'oidc_misconfigured';
} else if (err.message?.includes('network') || err.message?.includes('timeout')) {
userMessage = m.auth_oidc_network_error();
+ redirectError = 'oidc_network_error';
}
error = userMessage;
- setTimeout(() => goto('/login?error=oidc_init_failed'), 3000);
- isRedirecting = false;
+ setTimeout(() => goto(`/login?error=${redirectError}`), 3000);
}
+ }));
+
+ const isRedirecting = $derived(oidcLoginMutation.isPending && !error);
+
+ onMount(() => {
+ oidcLoginMutation.mutate();
});
</script>
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 05e595aa5..2df40e7ba 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -1,23 +1,25 @@
<script lang="ts">
- import '../app.css';
- import { ModeWatcher } from 'mode-watcher';
- import { Toaster } from '$lib/components/ui/sonner/index.js';
+ import { browser, dev } from '$app/environment';
+ import { invalidateAll } from '$app/navigation';
import { navigating, page } from '$app/state';
import ConfirmDialog from '$lib/components/confirm-dialog/confirm-dialog.svelte';
- import LoadingIndicator from '$lib/components/loading-indicator.svelte';
- import type { LayoutData } from './$types';
- import type { Snippet } from 'svelte';
+ import FirstLoginPasswordDialog from '$lib/components/dialogs/first-login-password-dialog.svelte';
import Error from '$lib/components/error.svelte';
- import { m } from '$lib/paraglide/messages';
+ import LoadingIndicator from '$lib/components/loading-indicator.svelte';
+ import { Toaster } from '$lib/components/ui/sonner/index.js';
+ import * as Tooltip from '$lib/components/ui/tooltip/index.js';
import { IsMobile } from '$lib/hooks/is-mobile.svelte.js';
import { IsTablet } from '$lib/hooks/is-tablet.svelte.js';
- import { browser, dev } from '$app/environment';
- import { onMount } from 'svelte';
- import FirstLoginPasswordDialog from '$lib/components/dialogs/first-login-password-dialog.svelte';
- import { invalidateAll } from '$app/navigation';
- import { cn } from '$lib/utils';
- import * as Tooltip from '$lib/components/ui/tooltip/index.js';
+ import { m } from '$lib/paraglide/messages';
import { environmentStore } from '$lib/stores/environment.store.svelte';
+ import { cn } from '$lib/utils';
+ import { QueryClientProvider } from '@tanstack/svelte-query';
+ import { SvelteQueryDevtools } from '@tanstack/svelte-query-devtools';
+ import { ModeWatcher } from 'mode-watcher';
+ import type { Snippet } from 'svelte';
+ import { onMount } from 'svelte';
+ import '../app.css';
+ import type { LayoutData } from './$types';
let {
data,
@@ -45,15 +47,7 @@
String(page.url.pathname).startsWith('/oidc')
);
- let showPasswordChangeDialog = $state(false);
-
- $effect(() => {
- if (data.user && data.user.requiresPasswordChange && !isAuthPage) {
- showPasswordChangeDialog = true;
- } else {
- showPasswordChangeDialog = false;
- }
- });
+ const showPasswordChangeDialog = $derived(!!(data.user && data.user.requiresPasswordChange && !isAuthPage));
function handlePasswordChangeSuccess() {
invalidateAll();
@@ -71,7 +65,13 @@
<Error message={m.error_occurred()} showButton={true} />
{:else}
<Tooltip.Provider>
- {@render children()}
+ <QueryClientProvider client={data.queryClient}>
+ {@render children()}
+ <FirstLoginPasswordDialog open={showPasswordChangeDialog} onSuccess={handlePasswordChangeSuccess} />
+ {#if dev}
+ <SvelteQueryDevtools />
+ {/if}
+ </QueryClientProvider>
</Tooltip.Provider>
{/if}
</div>
@@ -92,4 +92,3 @@
/>
<ConfirmDialog />
<LoadingIndicator active={isNavigating} thickness="h-1.5" />
-<FirstLoginPasswordDialog bind:open={showPasswordChangeDialog} onSuccess={handlePasswordChangeSuccess} />
diff --git a/frontend/src/routes/+layout.ts b/frontend/src/routes/+layout.ts
index b12381738..42d52e0b4 100644
--- a/frontend/src/routes/+layout.ts
+++ b/frontend/src/routes/+layout.ts
@@ -1,17 +1,33 @@
-import { environmentStore } from '$lib/stores/environment.store.svelte';
+import { browser } from '$app/environment';
+import { environmentManagementService } from '$lib/services/env-mgmt-service';
+import { settingsService } from '$lib/services/settings-service';
+import { userService } from '$lib/services/user-service';
import versionService from '$lib/services/version-service';
-import { tryCatch } from '$lib/utils/try-catch';
-import userStore from '$lib/stores/user-store';
import settingsStore from '$lib/stores/config-store';
+import { environmentStore } from '$lib/stores/environment.store.svelte';
+import userStore from '$lib/stores/user-store';
+import { type AppVersionInformation } from '$lib/types/application-configuration';
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
-import type { AppVersionInformation } from '$lib/types/application-configuration';
-import { userService } from '$lib/services/user-service';
-import { settingsService } from '$lib/services/settings-service';
-import { environmentManagementService } from '$lib/services/env-mgmt-service';
+import { tryCatch } from '$lib/utils/try-catch';
+import { QueryClient } from '@tanstack/svelte-query';
export const ssr = false;
export const load = async () => {
+ // Tanstack Query Client
+ const queryClient = new QueryClient({
+ defaultOptions: {
+ queries: {
+ enabled: browser,
+ staleTime: 0,
+ gcTime: 60 * 1000,
+ refetchOnMount: 'always',
+ refetchOnWindowFocus: 'always',
+ refetchOnReconnect: 'always'
+ }
+ }
+ });
+
// Step 1: Check authentication first
const user = await userService.getCurrentUser().catch(() => null);
@@ -86,6 +102,7 @@ export const load = async () => {
return {
user,
settings,
- versionInformation
+ versionInformation,
+ queryClient
};
};
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bc393320f..e97774dda 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -70,6 +70,9 @@ importers:
'@sveltejs/kit':
specifier: ^2.49.5
+ '@tanstack/svelte-query':
+ specifier: ^6.0.18
+ version: 6.0.18([email protected])
'@tanstack/table-core':
specifier: ^8.21.3
version: 8.21.3
@@ -131,6 +134,12 @@ importers:
'@tailwindcss/vite':
specifier: ^4.1.18
+ '@tanstack/eslint-plugin-query':
+ specifier: ^5.91.4
+ '@tanstack/svelte-query-devtools':
+ specifier: ^6.0.4
'@types/bytes':
specifier: ^3.1.5
version: 3.1.5
@@ -798,6 +807,44 @@ packages:
cpu: [x64]
os: [win32]
+ '@eslint-community/[email protected]':
+ resolution: {integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==}
+ engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+ peerDependencies:
+ eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+
+ '@eslint-community/[email protected]':
+ resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==}
+ engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+
+ '@eslint/[email protected]':
+ resolution: {integrity: sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+ '@eslint/[email protected]':
+ resolution: {integrity: sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+ '@eslint/[email protected]':
+ resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+ '@eslint/[email protected]':
+ resolution: {integrity: sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+ '@eslint/[email protected]':
+ resolution: {integrity: sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+ '@eslint/[email protected]':
+ resolution: {integrity: sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+ '@eslint/[email protected]':
+ resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
'@exodus/[email protected]':
resolution: {integrity: sha512-8JPn18Bcp8Uo1T82gR8lh2guEOa5KKU/IEKvvdp0sgmi7coPBWf1Doi1EXsGZb2ehc8ym/StJCjffYV+ne7sXQ==}
engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
@@ -825,6 +872,22 @@ packages:
resolution: {integrity: sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==}
+ '@humanfs/[email protected]':
+ resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==}
+ engines: {node: '>=18.18.0'}
+
+ '@humanfs/[email protected]':
+ resolution: {integrity: sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==}
+ engines: {node: '>=18.18.0'}
+
+ '@humanwhocodes/[email protected]':
+ resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
+ engines: {node: '>=12.22'}
+
+ '@humanwhocodes/[email protected]':
+ resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==}
+ engines: {node: '>=18.18'}
+
'@iconify/[email protected]':
resolution: {integrity: sha512-pOJ8ntUspUj6MNpNVdc9r3ezsuP70bhXG6/w3y0id7vqJqXJasjdiWu6SXi9GPleTf2sHdRB6R+gTyCyiKajXg==}
@@ -1771,6 +1834,32 @@ packages:
peerDependencies:
vite: ^8.0.0-beta.12
+ '@tanstack/[email protected]':
+ resolution: {integrity: sha512-8a+GAeR7oxJ5laNyYBQ6miPK09Hi18o5Oie/jx8zioXODv/AUFLZQecKabPdpQSLmuDXEBPKFh+W5DKbWlahjQ==}
+ peerDependencies:
+ eslint: ^8.57.0 || ^9.0.0
+ typescript: ^5.0.0
+ peerDependenciesMeta:
+ typescript:
+ optional: true
+
+ '@tanstack/[email protected]':
+ resolution: {integrity: sha512-OMD2HLpNouXEfZJWcKeVKUgQ5n+n3A2JFmBaScpNDUqSrQSjiveC7dKMe53uJUg1nDG16ttFPz2xfilz6i2uVg==}
+
+ '@tanstack/[email protected]':
+ resolution: {integrity: sha512-+kpsx1NQnOFTZsw6HAFCW3HkKg0+2cepGtAWXjiiSOJJ1CtQpt72EE2nyZb+AjAbLRPoeRmPJ8MtQd8r8gsPdg==}
+
+ '@tanstack/[email protected]':
+ resolution: {integrity: sha512-jHcpWb8KrL3QxoyBHpceR1tIfZUQB1uCiXjh+rDBrmkw1AMIMnIKANzLoz8eQgIGJC7C2dUZXRvDpUvtLDgRAQ==}
+ peerDependencies:
+ '@tanstack/svelte-query': ^6.0.18
+ svelte: ^5.25.0
+
+ '@tanstack/[email protected]':
+ resolution: {integrity: sha512-iGS8osfrIVUW5pkV4Ig6pspNIMtiNjGnVTNJKDas0m/QaNDFFIKbgg74rCzcjwrTIvO38tMpzb4VUKklvAmjxw==}
+ peerDependencies:
+ svelte: ^5.25.0
+
'@tanstack/[email protected]':
resolution: {integrity: sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg==}
engines: {node: '>=12'}
@@ -1844,6 +1933,43 @@ packages:
'@types/json-schema':
optional: true
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-zRcVVPFUYWa3kNnjaZGXSu3xkKV1zXy8M4nO/pElzQhFweb7PPtluDLQtKArEOGmjXoRjnUZ29NjOiF0eCDkcQ==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ peerDependencies:
+ typescript: '>=4.8.4 <6.0.0'
+
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-fVu5Omrd3jeqeQLiB9f1YsuK/iHFOwb04bCtY4BSCLgjNbOD33ZdV6KyEqplHr+IlpgT0QTZ/iJ+wT7hvTx49Q==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-1R9cXqY7RQd7WuqSN47PK9EDpgFUK3VqdmbYrvWJZYDd0cavROGn+74ktWBlmJ13NXUQKlZ/iAEQHI/V0kKe0Q==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ peerDependencies:
+ typescript: '>=4.8.4 <6.0.0'
+
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-ujT0Je8GI5BJWi+/mMoR0wxwVEQaxM+pi30xuMiJETlX80OPovb2p9E8ss87gnSVtYXtJoU9U1Cowcr6w2FE0w==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-EwrH67bSWdx/3aRQhCoxDaHM+CrZjotc2UCCpEDVqfCE+7OjKAGWNY2HsCSTEVvWH2clYQK8pdeLp42EVs+xQw==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ peerDependencies:
+ typescript: '>=4.8.4 <6.0.0'
+
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-BqZEsnPGdYpgyEIkDC1BadNY8oMwckftxBT+C8W0g1iKPdeqKZBtTfnvcq0nf60u7MkjFO8RBvpRGZBPw4L2ow==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ peerDependencies:
+ eslint: ^8.57.0 || ^9.0.0
+ typescript: '>=4.8.4 <6.0.0'
+
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-AxNRwEie8Nn4eFS1FzDMJWIISMGoXMb037sgCBJ3UR6o0fQTzr2tqN9WT+DkWJPhIdQCfV7T6D387566VtnCJA==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
@@ -1870,6 +1996,11 @@ packages:
resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
engines: {node: '>= 0.6'}
+ resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
+ peerDependencies:
+ acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+
resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==}
engines: {node: '>=0.4.0'}
@@ -1887,6 +2018,9 @@ packages:
ajv:
optional: true
+ resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
+
resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
@@ -1898,6 +2032,10 @@ packages:
resolution: {integrity: sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==}
engines: {node: '>=12'}
+ resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
+ engines: {node: '>=8'}
+
resolution: {integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==}
engines: {node: '>=12'}
@@ -1936,6 +2074,9 @@ packages:
resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==}
engines: {node: '>= 0.4'}
+ resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+
resolution: {integrity: sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==}
engines: {node: ^4.5.0 || >= 5.9}
@@ -1954,6 +2095,12 @@ packages:
'@internationalized/date': ^3.8.1
svelte: ^5.33.0
+ resolution: {integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==}
+
+ resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==}
+
resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
engines: {node: '>=8'}
@@ -1969,6 +2116,10 @@ packages:
resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
engines: {node: '>= 0.4'}
+ resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
+ engines: {node: '>=6'}
+
resolution: {integrity: sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==}
engines: {node: '>=16'}
@@ -1979,6 +2130,10 @@ packages:
resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
+ resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
+ engines: {node: '>=10'}
+
resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==}
engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
@@ -2018,6 +2173,13 @@ packages:
resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
engines: {node: '>=6'}
+ resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
+ engines: {node: '>=7.0.0'}
+
+ resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+
resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}
@@ -2051,6 +2213,9 @@ packages:
resolution: {integrity: sha512-taEtr3ozUmOB7it68Jll7s0Pwm+aoiHyXKrEC8SEodL4rNpdfDLqa7PfBlrgFoCNNdR8ImL+muti5IGvktJAAg==}
engines: {node: '>= 6'}
+ resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+
resolution: {integrity: sha512-Uy5YN9KEu0WWDaZAVJ5FAmZoaJt9rdK6kH+utItPyGsCqCgaTKkrmZx3zoE0/3q6S3bcp3Ihkk+ZqPxWxFK5og==}
engines: {node: '>=20'}
@@ -2133,6 +2298,9 @@ packages:
babel-plugin-macros:
optional: true
+ resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+
resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
engines: {node: '>=0.10.0'}
@@ -2253,6 +2421,32 @@ packages:
engines: {node: '>=18'}
hasBin: true
+ resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
+ engines: {node: '>=10'}
+
+ resolution: {integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+ resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
+ engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+ resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+ resolution: {integrity: sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ hasBin: true
+ peerDependencies:
+ jiti: '*'
+ peerDependenciesMeta:
+ jiti:
+ optional: true
+
resolution: {integrity: sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==}
@@ -2260,14 +2454,34 @@ packages:
resolution: {integrity: sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==}
engines: {node: '>=6'}
+ resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
engines: {node: '>=4'}
hasBin: true
+ resolution: {integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==}
+ engines: {node: '>=0.10'}
+
resolution: {integrity: sha512-zA6497ha+qKvoWIK+WM9NAh5ni17sKZKhbS5B3PoYbBvaYHZWoS33zmFybmyqpn07RLUxSmn+RCls2/XF+d0oQ==}
+ resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
+ engines: {node: '>=4.0'}
+
+ resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+ engines: {node: '>=4.0'}
+
+ resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
+ engines: {node: '>=0.10.0'}
+
resolution: {integrity: sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==}
@@ -2285,6 +2499,12 @@ packages:
resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==}
engines: {node: '>=8.6.0'}
+ resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
+
+ resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+
resolution: {integrity: sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==}
@@ -2303,10 +2523,25 @@ packages:
picomatch:
optional: true
+ resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
+ engines: {node: '>=16.0.0'}
+
resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
engines: {node: '>=8'}
+ resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
+ engines: {node: '>=10'}
+
+ resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
+ engines: {node: '>=16'}
+
+ resolution: {integrity: sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==}
+
resolution: {integrity: sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==}
engines: {node: '>=4.0'}
@@ -2371,12 +2606,20 @@ packages:
resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
engines: {node: '>= 6'}
+ resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+ engines: {node: '>=10.13.0'}
+
resolution: {integrity: sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==}
engines: {node: 20 || >=22}
deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting [email protected]
hasBin: true
+ resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==}
+ engines: {node: '>=18'}
+
resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
engines: {node: '>= 0.4'}
@@ -2384,6 +2627,10 @@ packages:
resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+ resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
+ engines: {node: '>=8'}
+
resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==}
engines: {node: '>= 0.4'}
@@ -2440,6 +2687,18 @@ packages:
resolution: {integrity: sha512-g/zPenRzkE0NV0LWSCKfQ6h08lCSloh5MPHKPAw19oscPKMV5zEcyYF2QrwUvZF5CV96aeR8XQenJcsEWcLlIw==}
hasBin: true
+ resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
+ engines: {node: '>= 4'}
+
+ resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
+ engines: {node: '>=6'}
+
+ resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
+ engines: {node: '>=0.8.19'}
+
resolution: {integrity: sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q==}
@@ -2523,21 +2782,33 @@ packages:
engines: {node: '>=6'}
hasBin: true
+ resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
+
resolution: {integrity: sha512-+DWg8jCJG2TEnpy7kOm/7/AxaYoaRbjVB4LFZLySZlWn8exGs3A4OLJR966cVvU26N7X9TWxl+Jsw7dzAqKT6g==}
engines: {node: '>=16'}
+ resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
+
resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
resolution: {integrity: sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==}
+ resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
+
resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
engines: {node: '>=6'}
hasBin: true
+ resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
+
resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
engines: {node: '>=6'}
@@ -2561,6 +2832,10 @@ packages:
resolution: {integrity: sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==}
+ resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
+ engines: {node: '>= 0.8.0'}
+
resolution: {integrity: sha512-Z3IhgVgrqO1S5xPYM3K5XwbkDasU67/Vys4heW+lfSBALcUZjeIIzI8zCLifY+OCzSq+fpDdywMDa7z+4srJPQ==}
@@ -2728,6 +3003,13 @@ packages:
resolution: {integrity: sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==}
+ resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
+ engines: {node: '>=10'}
+
+ resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+
resolution: {integrity: sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw==}
engines: {node: '>=18'}
@@ -2825,6 +3107,13 @@ packages:
resolution: {integrity: sha512-fu656aJ0n2kcXwsnwnv9g24tkU5uSmOlTjd6WyyaKm2Z+h1qmY6bAjrcaIxF/BslFqbZ8UBtbJi7KgQOZD2PTw==}
engines: {node: 20 || >=22}
+ resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+
+ resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
+ engines: {node: '>=16 || 14 >=14.17'}
+
resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
@@ -2863,6 +3152,9 @@ packages:
engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
hasBin: true
+ resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
+
resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
engines: {node: '>= 0.6'}
@@ -2918,6 +3210,10 @@ packages:
resolution: {integrity: sha512-3VhUGN3w2eYxnTzHn+ikMI+fp/96KoRSVK9/kMTcFqj1NRDh2IhQCKvYxDnWePKRXY/AqH+Fuiyb7VHSzBjHfA==}
+ resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
+ engines: {node: '>= 0.8.0'}
+
resolution: {integrity: sha512-a0oW0AMaP/Uqk1gU7s3unE83wzs/MACy3wsCnNREn4wqp4KCcxRdulRjf0d2FeIxENbGJ4EBGtHTQ6J30XB6Cw==}
@@ -2932,6 +3228,14 @@ packages:
resolution: {integrity: sha512-R5P2Tw6th+nQJdNcZGfuppBS/sM0x1EukqYffmlfX2xXLgLGCCPwu4ruEr9Sx29mrpkHgITc130Qps2JR90NdQ==}
+ resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
+ engines: {node: '>=10'}
+
+ resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
+ engines: {node: '>=10'}
+
resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
@@ -2943,12 +3247,20 @@ packages:
peerDependencies:
svelte: ^5.29.0
+ resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
+ engines: {node: '>=6'}
+
resolution: {integrity: sha512-9m4m5GSgXjL4AjumKzq1Fgfp3Z8rsvjRNbnkVwfu2ImRqE5D0LnY2QfDen18FSY9C573YU5XxSapdHZTZ2WolA==}
resolution: {integrity: sha512-e6qHKe3a9HWr0oMRVDTRhKce+bRO8VGQR3NyVwcjwrbhMmFCX9KszEV35+rn4AdilFAq9VPxP/Fe1wC9Qjd2lw==}
+ resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+ engines: {node: '>=8'}
+
resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
engines: {node: '>=8'}
@@ -3006,6 +3318,10 @@ packages:
resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==}
engines: {node: ^10 || ^12 || >=14}
+ resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
+ engines: {node: '>= 0.8.0'}
+
resolution: {integrity: sha512-xL49LCloMoZRvSwa6IEdN2GV6cq2IqpYGstYtMT+5wmml1/dClEoI0MZR78MiVPpu6BdQFfN0/y73yO6+br5Pg==}
peerDependencies:
@@ -3138,6 +3454,10 @@ packages:
resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
engines: {node: '>=0.10.0'}
+ resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
+ engines: {node: '>=4'}
+
resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
@@ -3314,6 +3634,10 @@ packages:
resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
engines: {node: '>=4'}
+ resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
+ engines: {node: '>=8'}
+
resolution: {integrity: sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==}
engines: {node: '>=14.16'}
@@ -3347,6 +3671,10 @@ packages:
resolution: {integrity: sha512-uV+TFRZdXsqXTL2pRvujROjdZQ4RAlBUS5BTh9IGm+jTqQntYThciG/qu57Gs69yjnVUSqdxF9YLmSnpupBW9A==}
engines: {node: '>=14.0.0'}
+ resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
+ engines: {node: '>=8'}
+
resolution: {integrity: sha512-e4VWZETyXaKGhpkxOXP+B/d0Fp/zKViZoJmneZWe/05Y2aqSKj3YN2nLfYPJBQ87WEiY4BQCQ9hWGu9mPT1a1Q==}
engines: {node: '>= 18.0.0'}
@@ -3477,6 +3805,12 @@ packages:
resolution: {integrity: sha512-FPAhNPFMrkwz76P7cdjdmiShwMynZYN6SgOujD1urY4oNm80Ou9oMdmbR45LotcKOXoy7wSmHkRFE6Mxbrhefw==}
+ resolution: {integrity: sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==}
+ engines: {node: '>=18.12'}
+ peerDependencies:
+ typescript: '>=4.8.4'
+
resolution: {integrity: sha512-Du/ZW2RfwV/D4cmA5rXafYjBQVuvu4qGiEEla4EmEHVHgRdx68Gftx7i66jn2bzHPwSVZY36Ae6OuDn9el4ZKA==}
engines: {node: '>=14.13.1'}
@@ -3503,6 +3837,10 @@ packages:
resolution: {integrity: sha512-7bziOlRqH0hJx80h/3mbicLW7o8qLsH5+RaLR2t+OHM3D0JlWGODQKQ4cxbK7WlvmUxpcj6Kgu6EKqjrGFe3QQ==}
+ resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
+ engines: {node: '>= 0.8.0'}
+
resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}
engines: {node: '>=12.20'}
@@ -3571,6 +3909,9 @@ packages:
resolution: {integrity: sha512-5uKD0nqiYVzlmCRs01Fhs2BdkEgBS3SAVP6ndrBsuK42iC2+JHyxM05Rm9G8+5mkmRtzMZGY8Ct5+mliZxU/Ww==}
engines: {node: '>=18.12.0'}
+ resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
+
resolution: {integrity: sha512-IGjKp/o0NL3Bso1PymYURCJxMPNAf/ILOpendP9f5B6e1rTJgdgiOvgfoT8VxCAdY+Wisb9uhGaJJf3yZ2V9nw==}
@@ -3701,6 +4042,10 @@ packages:
engines: {node: '>= 8'}
hasBin: true
+ resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
+ engines: {node: '>=0.10.0'}
+
resolution: {integrity: sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==}
engines: {node: '>=18'}
@@ -3729,6 +4074,10 @@ packages:
engines: {node: '>= 14.6'}
hasBin: true
+ resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
+ engines: {node: '>=10'}
+
resolution: {integrity: sha512-CzhO+pFNo8ajLM2d2IW/R93ipy99LWjtwblvC1RsoSUMZgyLbYFr221TnSNT7GjGdYui6P459mw9JH/g/zW2ug==}
engines: {node: '>=18'}
@@ -4107,6 +4456,52 @@ snapshots:
'@esbuild/[email protected]':
optional: true
+ dependencies:
+ eslint: 9.39.2([email protected])
+ eslint-visitor-keys: 3.4.3
+
+ '@eslint-community/[email protected]': {}
+
+ '@eslint/[email protected]':
+ dependencies:
+ '@eslint/object-schema': 2.1.7
+ debug: 4.4.3
+ minimatch: 3.1.2
+ transitivePeerDependencies:
+ - supports-color
+
+ '@eslint/[email protected]':
+ dependencies:
+ '@eslint/core': 0.17.0
+
+ '@eslint/[email protected]':
+ dependencies:
+ '@types/json-schema': 7.0.15
+
+ '@eslint/[email protected]':
+ dependencies:
+ ajv: 6.12.6
+ debug: 4.4.3
+ espree: 10.4.0
+ globals: 14.0.0
+ ignore: 5.3.2
+ import-fresh: 3.3.1
+ js-yaml: 4.1.1
+ minimatch: 3.1.2
+ strip-json-comments: 3.1.1
+ transitivePeerDependencies:
+ - supports-color
+
+ '@eslint/[email protected]': {}
+
+ '@eslint/[email protected]': {}
+
+ '@eslint/[email protected]':
+ dependencies:
+ '@eslint/core': 0.17.0
+ levn: 0.4.1
+
'@exodus/[email protected]': {}
'@exodus/[email protected]':
@@ -4131,6 +4526,17 @@ snapshots:
'@hapi/hoek': 9.3.0
optional: true
+ '@humanfs/[email protected]': {}
+
+ '@humanfs/[email protected]':
+ dependencies:
+ '@humanfs/core': 0.19.1
+ '@humanwhocodes/retry': 0.4.3
+
+ '@humanwhocodes/[email protected]': {}
+
+ '@humanwhocodes/[email protected]': {}
+
'@iconify/[email protected]':
dependencies:
'@iconify/types': 2.0.0
@@ -4860,6 +5266,31 @@ snapshots:
tailwindcss: 4.1.18
+ dependencies:
+ '@typescript-eslint/utils': 8.55.0([email protected]([email protected]))([email protected])
+ eslint: 9.39.2([email protected])
+ optionalDependencies:
+ typescript: 5.9.3
+ transitivePeerDependencies:
+ - supports-color
+
+ '@tanstack/[email protected]': {}
+
+ '@tanstack/[email protected]': {}
+
+ dependencies:
+ '@tanstack/query-devtools': 5.93.0
+ '@tanstack/svelte-query': 6.0.18([email protected])
+ esm-env: 1.2.2
+ svelte: 5.50.0
+
+ dependencies:
+ '@tanstack/query-core': 5.90.20
+ svelte: 5.50.0
+
'@tanstack/[email protected]': {}
@@ -4883,8 +5314,7 @@ snapshots:
'@types/[email protected]': {}
- '@types/[email protected]':
- optional: true
+ '@types/[email protected]': {}
dependencies:
@@ -4931,6 +5361,57 @@ snapshots:
'@types/json-schema': 7.0.15
optional: true
+ '@typescript-eslint/[email protected]([email protected])':
+ dependencies:
+ '@typescript-eslint/tsconfig-utils': 8.55.0([email protected])
+ '@typescript-eslint/types': 8.55.0
+ debug: 4.4.3
+ typescript: 5.9.3
+ transitivePeerDependencies:
+ - supports-color
+
+ '@typescript-eslint/[email protected]':
+ dependencies:
+ '@typescript-eslint/types': 8.55.0
+ '@typescript-eslint/visitor-keys': 8.55.0
+
+ '@typescript-eslint/[email protected]([email protected])':
+ dependencies:
+ typescript: 5.9.3
+
+ '@typescript-eslint/[email protected]': {}
+
+ '@typescript-eslint/[email protected]([email protected])':
+ dependencies:
+ '@typescript-eslint/project-service': 8.55.0([email protected])
+ '@typescript-eslint/tsconfig-utils': 8.55.0([email protected])
+ '@typescript-eslint/types': 8.55.0
+ '@typescript-eslint/visitor-keys': 8.55.0
+ debug: 4.4.3
+ minimatch: 9.0.5
+ semver: 7.7.4
+ tinyglobby: 0.2.15
+ ts-api-utils: 2.4.0([email protected])
+ typescript: 5.9.3
+ transitivePeerDependencies:
+ - supports-color
+
+ dependencies:
+ '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
+ '@typescript-eslint/scope-manager': 8.55.0
+ '@typescript-eslint/types': 8.55.0
+ '@typescript-eslint/typescript-estree': 8.55.0([email protected])
+ eslint: 9.39.2([email protected])
+ typescript: 5.9.3
+ transitivePeerDependencies:
+ - supports-color
+
+ '@typescript-eslint/[email protected]':
+ dependencies:
+ '@typescript-eslint/types': 8.55.0
+ eslint-visitor-keys: 4.2.1
+
'@ungap/[email protected]': {}
@@ -4962,6 +5443,10 @@ snapshots:
mime-types: 2.1.35
negotiator: 0.6.3
+ dependencies:
+ acorn: 8.15.0
+
@@ -4970,6 +5455,13 @@ snapshots:
optionalDependencies:
ajv: 8.17.1
+ dependencies:
+ fast-deep-equal: 3.1.3
+ fast-json-stable-stringify: 2.1.0
+ json-schema-traverse: 0.4.1
+ uri-js: 4.4.1
+
dependencies:
fast-deep-equal: 3.1.3
@@ -4983,6 +5475,10 @@ snapshots:
+ dependencies:
+ color-convert: 2.0.1
+
@@ -5024,6 +5520,8 @@ snapshots:
+
@@ -5045,6 +5543,15 @@ snapshots:
transitivePeerDependencies:
- '@sveltejs/kit'
+ dependencies:
+ balanced-match: 1.0.2
+ concat-map: 0.0.1
+
+ dependencies:
+ balanced-match: 1.0.2
+
dependencies:
fill-range: 7.1.1
@@ -5059,6 +5566,8 @@ snapshots:
es-errors: 1.3.0
function-bind: 1.1.2
+
optional: true
@@ -5066,6 +5575,11 @@ snapshots:
+ dependencies:
+ ansi-styles: 4.3.0
+ supports-color: 7.2.0
+
@@ -5102,6 +5616,12 @@ snapshots:
+ dependencies:
+ color-name: 1.1.4
+
+
@@ -5127,6 +5647,8 @@ snapshots:
core-util-is: 1.0.3
esprima: 4.0.1
+
dependencies:
ajv: 8.17.1
@@ -5200,6 +5722,8 @@ snapshots:
+
@@ -5397,16 +5921,86 @@ snapshots:
'@esbuild/win32-x64': 0.27.2
optional: true
+
+ dependencies:
+ esrecurse: 4.3.0
+ estraverse: 5.3.0
+
+
+
+ dependencies:
+ '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
+ '@eslint-community/regexpp': 4.12.2
+ '@eslint/config-array': 0.21.1
+ '@eslint/config-helpers': 0.4.2
+ '@eslint/core': 0.17.0
+ '@eslint/eslintrc': 3.3.3
+ '@eslint/js': 9.39.2
+ '@eslint/plugin-kit': 0.4.1
+ '@humanfs/node': 0.16.7
+ '@humanwhocodes/module-importer': 1.0.1
+ '@humanwhocodes/retry': 0.4.3
+ '@types/estree': 1.0.8
+ ajv: 6.12.6
+ chalk: 4.1.2
+ cross-spawn: 7.0.6
+ debug: 4.4.3
+ escape-string-regexp: 4.0.0
+ eslint-scope: 8.4.0
+ eslint-visitor-keys: 4.2.1
+ espree: 10.4.0
+ esquery: 1.7.0
+ esutils: 2.0.3
+ fast-deep-equal: 3.1.3
+ file-entry-cache: 8.0.0
+ find-up: 5.0.0
+ glob-parent: 6.0.2
+ ignore: 5.3.2
+ imurmurhash: 0.1.4
+ is-glob: 4.0.3
+ json-stable-stringify-without-jsonify: 1.0.1
+ lodash.merge: 4.6.2
+ minimatch: 3.1.2
+ natural-compare: 1.4.0
+ optionator: 0.9.4
+ optionalDependencies:
+ jiti: 2.6.1
+ transitivePeerDependencies:
+ - supports-color
+
+ dependencies:
+ acorn: 8.15.0
+ acorn-jsx: 5.3.2([email protected])
+ eslint-visitor-keys: 4.2.1
+
+ dependencies:
+ estraverse: 5.3.0
+
dependencies:
'@jridgewell/sourcemap-codec': 1.5.5
+ dependencies:
+ estraverse: 5.3.0
+
+
+
@@ -5426,6 +6020,10 @@ snapshots:
merge2: 1.4.1
micromatch: 4.0.8
+
+
@@ -5440,10 +6038,26 @@ snapshots:
optionalDependencies:
picomatch: 4.0.3
+ dependencies:
+ flat-cache: 4.0.1
+
dependencies:
to-regex-range: 5.0.1
+ dependencies:
+ locate-path: 6.0.0
+ path-exists: 4.0.0
+
+ dependencies:
+ flatted: 3.3.3
+ keyv: 4.5.4
+
+
@@ -5509,6 +6123,10 @@ snapshots:
dependencies:
is-glob: 4.0.3
+ dependencies:
+ is-glob: 4.0.3
+
dependencies:
foreground-child: 3.3.1
@@ -5518,10 +6136,14 @@ snapshots:
package-json-from-dist: 1.0.1
path-scurry: 2.0.1
+
+
@@ -5599,6 +6221,15 @@ snapshots:
esm: 3.2.25
ts-import: 2.0.40
+
+ dependencies:
+ parent-module: 1.0.1
+ resolve-from: 4.0.0
+
+
@@ -5693,18 +6324,28 @@ snapshots:
+
dependencies:
'@babel/runtime': 7.28.4
ts-algebra: 2.0.0
optional: true
+
+
+ dependencies:
+ json-buffer: 3.0.1
+
@@ -5730,6 +6371,11 @@ snapshots:
+ dependencies:
+ prelude-ls: 1.2.1
+ type-check: 0.4.0
+
optional: true
@@ -5858,6 +6504,12 @@ snapshots:
+ dependencies:
+ p-locate: 5.0.0
+
+
dependencies:
chalk: 5.6.2
@@ -5950,6 +6602,14 @@ snapshots:
dependencies:
'@isaacs/brace-expansion': 5.0.1
+ dependencies:
+ brace-expansion: 1.1.12
+
+ dependencies:
+ brace-expansion: 2.0.2
+
@@ -5982,6 +6642,8 @@ snapshots:
+
@@ -6038,6 +6700,15 @@ snapshots:
regex: 6.1.0
regex-recursion: 6.0.2
+ dependencies:
+ deep-is: 0.1.4
+ fast-levenshtein: 2.0.6
+ levn: 0.4.1
+ prelude-ls: 1.2.1
+ type-check: 0.4.0
+ word-wrap: 1.2.5
+
@@ -6095,6 +6766,14 @@ snapshots:
'@oxc-resolver/binding-win32-ia32-msvc': 11.17.0
'@oxc-resolver/binding-win32-x64-msvc': 11.17.0
+ dependencies:
+ yocto-queue: 0.1.0
+
+ dependencies:
+ p-limit: 3.1.0
+
@@ -6105,6 +6784,10 @@ snapshots:
svelte: 5.50.0
svelte-toolbelt: 0.9.3([email protected])
+ dependencies:
+ callsites: 3.1.0
+
dependencies:
entities: 6.0.1
@@ -6114,6 +6797,8 @@ snapshots:
leac: 0.6.0
peberminta: 0.9.0
+
@@ -6172,6 +6857,8 @@ snapshots:
picocolors: 1.1.1
source-map-js: 1.2.1
+
dependencies:
prettier: 3.8.0
@@ -6256,6 +6943,8 @@ snapshots:
+
@@ -6487,6 +7176,8 @@ snapshots:
+
@@ -6512,6 +7203,10 @@ snapshots:
optional: true
+ dependencies:
+ has-flag: 4.0.0
+
dependencies:
'@jridgewell/trace-mapping': 0.3.31
@@ -6676,6 +7371,10 @@ snapshots:
optional: true
+ dependencies:
+ typescript: 5.9.3
+
@@ -6701,6 +7400,10 @@ snapshots:
+ dependencies:
+ prelude-ls: 1.2.1
+
optional: true
@@ -6761,6 +7464,10 @@ snapshots:
picomatch: 4.0.3
webpack-virtual-modules: 0.6.2
+ dependencies:
+ punycode: 2.3.1
+
@@ -6845,6 +7552,8 @@ snapshots:
dependencies:
isexe: 2.0.0
+
dependencies:
ansi-styles: 6.2.3
@@ -6859,6 +7568,8 @@ snapshots:
+