Skip to content

Modern Docker Management, Designed for Everyone

fix: use dockerInfo for container and image counts

Kyle Mendell3413dc43192a
diff --git a/frontend/src/routes/containers/+page.svelte b/frontend/src/routes/containers/+page.svelte
index 37f4e99be..e4d470d97 100644
--- a/frontend/src/routes/containers/+page.svelte
+++ b/frontend/src/routes/containers/+page.svelte
@@ -29,14 +29,6 @@
refreshing: false
});
- const runningContainers = $derived(
- containers?.filter((c: ContainerInfo) => c.State === 'running').length || 0
- );
- const stoppedContainers = $derived(
- containers?.filter((c: ContainerInfo) => c.State === 'exited').length || 0
- );
- const totalContainers = $derived(containers?.length || 0);
-
let requestOptions = $state<SearchPaginationSortRequest>(data.containerRequestOptions);
$effect(() => {
@@ -155,13 +147,13 @@
<div class="grid grid-cols-1 gap-4 sm:grid-cols-3">
<StatCard
title="Total"
- value={totalContainers}
+ value={data.dockerInfo.containers}
icon={Box}
class="border-l-primary border-l-4 transition-shadow hover:shadow-lg"
/>
<StatCard
title="Running"
- value={runningContainers}
+ value={data.dockerInfo.containersRunning}
icon={Box}
iconColor="text-green-500"
bgColor="bg-green-500/10"
@@ -169,7 +161,7 @@
/>
<StatCard
title="Stopped"
- value={stoppedContainers}
+ value={data.dockerInfo.containersStopped}
icon={Box}
iconColor="text-amber-500"
class="border-l-4 border-l-amber-500"
diff --git a/frontend/src/routes/containers/+page.ts b/frontend/src/routes/containers/+page.ts
index 0e2b26cf7..d85cb08ca 100644
--- a/frontend/src/routes/containers/+page.ts
+++ b/frontend/src/routes/containers/+page.ts
@@ -1,25 +1,27 @@
-import { environmentAPI } from '$lib/services/api';
+import { environmentAPI, systemAPI } from '$lib/services/api';
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
import type { PageLoad } from './$types';
export const load: PageLoad = async () => {
- const containerRequestOptions: SearchPaginationSortRequest = {
- pagination: {
- page: 1,
- limit: 20
- },
- sort: {
- column: 'created',
- direction: 'desc' as const
- }
- };
+ const containerRequestOptions: SearchPaginationSortRequest = {
+ pagination: {
+ page: 1,
+ limit: 20
+ },
+ sort: {
+ column: 'created',
+ direction: 'desc' as const
+ }
+ };
- const containers = await environmentAPI.getContainers(
- containerRequestOptions.pagination,
- containerRequestOptions.sort,
- containerRequestOptions.search,
- containerRequestOptions.filters
- );
+ const dockerInfo = await systemAPI.getDockerInfo();
- return { containers, containerRequestOptions };
-};
\ No newline at end of file
+ const containers = await environmentAPI.getContainers(
+ containerRequestOptions.pagination,
+ containerRequestOptions.sort,
+ containerRequestOptions.search,
+ containerRequestOptions.filters
+ );
+
+ return { dockerInfo, containers, containerRequestOptions };
+};
diff --git a/frontend/src/routes/images/+page.svelte b/frontend/src/routes/images/+page.svelte
index fffbde3d5..1fde92d96 100644
--- a/frontend/src/routes/images/+page.svelte
+++ b/frontend/src/routes/images/+page.svelte
@@ -173,7 +173,7 @@
<div class="grid grid-cols-1 gap-4 sm:grid-cols-2">
<StatCard
title="Total Images"
- value={images.length}
+ value={data.dockerInfo.images}
icon={HardDrive}
iconColor="text-blue-500"
class="border-l-4 border-l-blue-500"
diff --git a/frontend/src/routes/images/+page.ts b/frontend/src/routes/images/+page.ts
index 5bcfff451..82534575b 100644
--- a/frontend/src/routes/images/+page.ts
+++ b/frontend/src/routes/images/+page.ts
@@ -1,25 +1,27 @@
-import { environmentAPI } from '$lib/services/api';
+import { environmentAPI, systemAPI } from '$lib/services/api';
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
import type { PageLoad } from './$types';
export const load: PageLoad = async () => {
- const imageRequestOptions: SearchPaginationSortRequest = {
- pagination: {
- page: 1,
- limit: 20
- },
- sort: {
- column: 'Created',
- direction: 'desc' as const
- }
- };
+ const imageRequestOptions: SearchPaginationSortRequest = {
+ pagination: {
+ page: 1,
+ limit: 20
+ },
+ sort: {
+ column: 'Created',
+ direction: 'desc' as const
+ }
+ };
- const images = await environmentAPI.getImages(
- imageRequestOptions.pagination,
- imageRequestOptions.sort,
- imageRequestOptions.search,
- imageRequestOptions.filters
- );
+ const dockerInfo = await systemAPI.getDockerInfo();
- return { images, imageRequestOptions };
-};
\ No newline at end of file
+ const images = await environmentAPI.getImages(
+ imageRequestOptions.pagination,
+ imageRequestOptions.sort,
+ imageRequestOptions.search,
+ imageRequestOptions.filters
+ );
+
+ return { dockerInfo, images, imageRequestOptions };
+};