Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: incorrect events api being used in frontend
Kyle Mendelle727a8332cd6
diff --git a/frontend/src/lib/query/query-keys.ts b/frontend/src/lib/query/query-keys.tsindex 32feb8862..30b9bc281 100644--- a/frontend/src/lib/query/query-keys.ts+++ b/frontend/src/lib/query/query-keys.ts@@ -65,10 +65,8 @@ export const queryKeys = {},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+ deleteSelectedGlobal: () => ['events', 'delete-selected', 'global'] as const},system: {upgradeAvailable: (scope: 'mobile-nav' | 'sidebar') => ['system', 'upgrade-available', scope] as const,diff --git a/frontend/src/lib/services/event-service.ts b/frontend/src/lib/services/event-service.tsindex 8877c0f96..bbe8ea99f 100644--- a/frontend/src/lib/services/event-service.ts+++ b/frontend/src/lib/services/event-service.ts@@ -4,12 +4,6 @@ import type { Event } from '$lib/types/event.type';import { transformPaginationParams } from '$lib/utils/params.util';export default class EventService extends BaseAPIService {- async getEventsForEnvironment(environmentId: string, options?: SearchPaginationSortRequest): Promise<Paginated<Event>> {- const params = transformPaginationParams(options);- const res = await this.api.get(`/environments/${environmentId}/events`, { params });- return res.data;- }-async getEvents(options?: SearchPaginationSortRequest): Promise<Paginated<Event>> {const params = transformPaginationParams(options);const res = await this.api.get('/events', { params });diff --git a/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte b/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelteindex 597c4ec45..ad484b330 100644--- a/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte+++ b/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte@@ -52,8 +52,6 @@const excludedContainers = new SvelteSet<string>();let searchTerm = $state('');--$effect(() => {const savedValue = $formInputs.autoUpdateExcludedContainers?.value || '';const names = savedValue@@ -141,7 +139,7 @@return $formInputs.vulnerabilityScanEnabled.value;default:return undefined;- }+ }}function getContainerName(c: ContainerSummaryDto): string {@@ -222,74 +220,69 @@{/if}{/snippet}- {#if job.id === 'auto-update' && $formInputs.autoUpdate.value}- <div class="border-border/20 space-y-3 border-t pt-3">- <div class="space-y-1">- <Label class="text-sm font-medium">- {m.auto_update_excluded_containers()}- {#await containersPromise then containers}- <span class="text-muted-foreground ml-1 font-normal">- ({containers.filter((c) => excludedContainers.has(getContainerName(c))).length})- </span>- {/await}- </Label>- <p class="text-muted-foreground text-xs">{m.auto_update_exclude_description()}</p>- </div>+ {#if job.id === 'auto-update' && $formInputs.autoUpdate.value}+ <div class="border-border/20 space-y-3 border-t pt-3">+ <div class="space-y-1">+ <Label class="text-sm font-medium">+ {m.auto_update_excluded_containers()}+ {#await containersPromise then containers}+ <span class="text-muted-foreground ml-1 font-normal">+ ({containers.filter((c) => excludedContainers.has(getContainerName(c))).length})+ </span>+ {/await}+ </Label>+ <p class="text-muted-foreground text-xs">{m.auto_update_exclude_description()}</p>+ </div>- <div class="rounded-md border p-2">- <Input- type="search"- placeholder="Search containers..."- class="mb-2 h-8"- bind:value={searchTerm}- />- <ScrollArea.Root class="h-64 w-full rounded-md border p-2">- <div class="space-y-2">- {#await containersPromise}- <div class="flex items-center justify-center p-4">- <Spinner class="size-4" />- </div>- {:then containers}- {@const allItems = containers.map(mapContainerToItem)}- {@const filteredItems = searchTerm- ? allItems.filter(item => item.label.toLowerCase().includes(searchTerm.toLowerCase()))- : allItems}-- {#if filteredItems.length === 0}- <p class="text-muted-foreground text-center text-sm py-4">- {m.common_no_results_found()}- </p>- {:else}- {#each filteredItems as container (container.value)}- <div class="flex items-center space-x-2">- <Checkbox- id="container-{container.value}"- checked={container.selected}- disabled={container.disabled}- onCheckedChange={() => toggleContainerExclusion(container.value)}- />- <Label- for="container-{container.value}"- class="text-sm font-normal {container.disabled ? 'text-muted-foreground' : ''}"- >- {container.label}- {#if container.hint}- <span class="ml-1 text-xs opacity-70">{container.hint}</span>- {/if}- </Label>- </div>- {/each}- {/if}- {:catch error}- <div class="text-destructive text-sm p-2">- {error.message || 'Failed to load containers'}- </div>- {/await}- </div>- </ScrollArea.Root>- </div>+ <div class="rounded-md border p-2">+ <Input type="search" placeholder="Search containers..." class="mb-2 h-8" bind:value={searchTerm} />+ <ScrollArea.Root class="h-64 w-full rounded-md border p-2">+ <div class="space-y-2">+ {#await containersPromise}+ <div class="flex items-center justify-center p-4">+ <Spinner class="size-4" />+ </div>+ {:then containers}+ {@const allItems = containers.map(mapContainerToItem)}+ {@const filteredItems = searchTerm+ ? allItems.filter((item) => item.label.toLowerCase().includes(searchTerm.toLowerCase()))+ : allItems}++ {#if filteredItems.length === 0}+ <p class="text-muted-foreground py-4 text-center text-sm">+ {m.common_no_results_found()}+ </p>+ {:else}+ {#each filteredItems as container (container.value)}+ <div class="flex items-center space-x-2">+ <Checkbox+ id="container-{container.value}"+ checked={container.selected}+ disabled={container.disabled}+ onCheckedChange={() => toggleContainerExclusion(container.value)}+ />+ <Label+ for="container-{container.value}"+ class="text-sm font-normal {container.disabled ? 'text-muted-foreground' : ''}"+ >+ {container.label}+ {#if container.hint}+ <span class="ml-1 text-xs opacity-70">{container.hint}</span>+ {/if}+ </Label>+ </div>+ {/each}+ {/if}+ {:catch error}+ <div class="text-destructive p-2 text-sm">+ {error.message || 'Failed to load containers'}+ </div>+ {/await}+ </div>+ </ScrollArea.Root></div>- {/if}+ </div>+ {/if}{#if job.id === 'scheduled-prune'}{#if $formInputs.scheduledPruneEnabled.value}diff --git a/frontend/src/routes/(app)/events/+page.svelte b/frontend/src/routes/(app)/events/+page.svelteindex 49631fcba..e0ffcda9a 100644--- a/frontend/src/routes/(app)/events/+page.svelte+++ b/frontend/src/routes/(app)/events/+page.svelte@@ -5,7 +5,6 @@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';@@ -17,16 +16,15 @@let events = $state(untrack(() => data.events));let selectedIds = $state<string[]>([]);let requestOptions = $state(untrack(() => data.eventRequestOptions));- const envId = $derived(environmentStore.selected?.id || '0');const eventsQuery = createQuery(() => ({- queryKey: queryKeys.events.listByEnvironment(envId, requestOptions),- queryFn: () => eventService.getEventsForEnvironment(envId, requestOptions),+ queryKey: queryKeys.events.listGlobal(requestOptions),+ queryFn: () => eventService.getEvents(requestOptions),initialData: data.events}));const deleteSelectedMutation = createMutation(() => ({- mutationKey: queryKeys.events.deleteSelected(envId),+ mutationKey: queryKeys.events.deleteSelectedGlobal(),mutationFn: async (ids: string[]) => {let successCount = 0;let failureCount = 0;diff --git a/frontend/src/routes/(app)/events/+page.ts b/frontend/src/routes/(app)/events/+page.tsindex 53478a131..742b8f00f 100644--- a/frontend/src/routes/(app)/events/+page.ts+++ b/frontend/src/routes/(app)/events/+page.ts@@ -3,11 +3,9 @@ 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();const eventRequestOptions = resolveInitialTableRequest('arcane-events-table', {pagination: {@@ -21,8 +19,8 @@ export const load: PageLoad = async ({ parent }) => {} satisfies SearchPaginationSortRequest);const events = await queryClient.fetchQuery({- queryKey: queryKeys.events.listByEnvironment(envId, eventRequestOptions),- queryFn: () => eventService.getEventsForEnvironment(envId, eventRequestOptions)+ queryKey: queryKeys.events.listGlobal(eventRequestOptions),+ queryFn: () => eventService.getEvents(eventRequestOptions)});return { events, eventRequestOptions };