Skip to content

Modern Docker Management, Designed for Everyone

fix: refresh container list when environment changes (#573)

Neil Burrows305f2ac8a24b
diff --git a/frontend/src/routes/containers/+page.svelte b/frontend/src/routes/containers/+page.svelte
index 02d84bf7e..6e8f3fd7d 100644
--- a/frontend/src/routes/containers/+page.svelte
+++ b/frontend/src/routes/containers/+page.svelte
@@ -9,6 +9,8 @@
import ContainerTable from './container-table.svelte';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { m } from '$lib/paraglide/messages';
+ import { environmentStore } from '$lib/stores/environment.store';
+ import type { Environment } from '$lib/types/environment.type';
import { imageService } from '$lib/services/image-service';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
@@ -35,10 +37,10 @@
isLoading.checking = true;
handleApiResultWithCallbacks({
result: await tryCatch(imageService.runAutoUpdate()),
- message: 'Failed to Check Containers for Updates',
+ message: m.containers_check_updates_failed(),
setLoadingState: (value) => (isLoading.checking = value),
async onSuccess() {
- toast.success('Containers Updated Successfully.');
+ toast.success(m.containers_check_updates_success());
containers = await containerService.getContainers(requestOptions);
}
});
@@ -46,15 +48,48 @@
async function refreshContainers() {
isLoading.refreshing = true;
+ let refreshingContainerList = true;
+ let refreshingContainerCounts = true;
handleApiResultWithCallbacks({
result: await tryCatch(containerService.getContainers(requestOptions)),
- message: 'Failed to Refresh Containers',
- setLoadingState: (value) => (isLoading.refreshing = value),
+ message: m.containers_refresh_failed(),
+ setLoadingState: (value) => {
+ refreshingContainerList = value;
+ isLoading.refreshing = refreshingContainerCounts || refreshingContainerList;
+ },
async onSuccess(newContainers) {
containers = newContainers;
}
});
+ handleApiResultWithCallbacks({
+ result: await tryCatch(containerService.getContainerStatusCounts()),
+ message: m.containers_refresh_failed(),
+ setLoadingState: (value) => {
+ refreshingContainerCounts = value;
+ isLoading.refreshing = refreshingContainerCounts || refreshingContainerList;
+ },
+ async onSuccess(newStatusCounts) {
+ containerStatusCounts = newStatusCounts;
+ }
+ });
}
+
+ // React to environment changes
+ const selectedEnvStore = environmentStore.selected;
+ let lastEnvId: string | null = null;
+ $effect(() => {
+ const env = $selectedEnvStore as Environment | null;
+ if (!env) return;
+ // Skip initial page load
+ if (lastEnvId === null) {
+ lastEnvId = env.id;
+ return;
+ }
+ if (env.id !== lastEnvId) {
+ lastEnvId = env.id;
+ refreshContainers();
+ }
+ });
</script>
<div class="space-y-6">
diff --git a/frontend/src/routes/images/+page.svelte b/frontend/src/routes/images/+page.svelte
index 7869790ba..18ba2e28c 100644
--- a/frontend/src/routes/images/+page.svelte
+++ b/frontend/src/routes/images/+page.svelte
@@ -16,6 +16,8 @@
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';
+ import type { Environment } from '$lib/types/environment.type';
let { data } = $props();
@@ -63,15 +65,48 @@
async function refreshImages() {
isLoading.refreshing = true;
+ let refreshingImageList = true;
+ let refreshingImageCounts = true;
handleApiResultWithCallbacks({
result: await tryCatch(imageService.getImages(requestOptions)),
message: m.images_refresh_failed(),
- setLoadingState: (value) => (isLoading.refreshing = value),
+ setLoadingState: (value) => {
+ refreshingImageList = value;
+ isLoading.refreshing = refreshingImageCounts || refreshingImageList;
+ },
async onSuccess(newImages) {
images = newImages;
}
});
+ handleApiResultWithCallbacks({
+ result: await tryCatch(imageService.getImageUsageCounts()),
+ message: m.images_refresh_failed(),
+ setLoadingState: (value) => {
+ refreshingImageCounts = value;
+ isLoading.refreshing = refreshingImageCounts || refreshingImageList;
+ },
+ async onSuccess(newImageCounts) {
+ imageUsageCounts = newImageCounts;
+ }
+ });
}
+
+ // React to environment changes
+ const selectedEnvStore = environmentStore.selected;
+ let lastEnvId: string | null = null;
+ $effect(() => {
+ const env = $selectedEnvStore as Environment | null;
+ if (!env) return;
+ // Skip initial page load
+ if (lastEnvId === null) {
+ lastEnvId = env.id;
+ return;
+ }
+ if (env.id !== lastEnvId) {
+ lastEnvId = env.id;
+ refreshImages();
+ }
+ });
</script>
<div class="space-y-6">
diff --git a/frontend/src/routes/networks/+page.svelte b/frontend/src/routes/networks/+page.svelte
index bd19dd98b..f90d53023 100644
--- a/frontend/src/routes/networks/+page.svelte
+++ b/frontend/src/routes/networks/+page.svelte
@@ -13,6 +13,8 @@
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';
+ import type { Environment } from '$lib/types/environment.type';
let { data } = $props();
@@ -30,14 +32,30 @@
async function refreshNetworks() {
isLoading.refresh = true;
+ let refreshingNetworkList = true;
+ let refreshingNetworkCounts = true;
handleApiResultWithCallbacks({
result: await tryCatch(networkService.getNetworks(requestOptions)),
message: m.networks_refresh_failed(),
- setLoadingState: (value) => (isLoading.refresh = value),
+ setLoadingState: (value) => {
+ refreshingNetworkList = value;
+ isLoading.refresh = refreshingNetworkCounts || refreshingNetworkList;
+ },
async onSuccess(newNetworks) {
networks = newNetworks;
}
});
+ handleApiResultWithCallbacks({
+ result: await tryCatch(networkService.getNetworkUsageCounts()),
+ message: m.networks_refresh_failed(),
+ setLoadingState: (value) => {
+ refreshingNetworkCounts = value;
+ isLoading.refresh = refreshingNetworkCounts || refreshingNetworkList;
+ },
+ async onSuccess(newNetworkCounts) {
+ networkUsageCounts = newNetworkCounts;
+ }
+ });
}
async function handleCreateNetworkSubmit(options: NetworkCreateOptions) {
@@ -54,6 +72,23 @@
}
});
}
+
+ // React to environment changes
+ const selectedEnvStore = environmentStore.selected;
+ let lastEnvId: string | null = null;
+ $effect(() => {
+ const env = $selectedEnvStore as Environment | null;
+ if (!env) return;
+ // Skip initial page load
+ if (lastEnvId === null) {
+ lastEnvId = env.id;
+ return;
+ }
+ if (env.id !== lastEnvId) {
+ lastEnvId = env.id;
+ refreshNetworks();
+ }
+ });
</script>
<div class="space-y-6">
diff --git a/frontend/src/routes/projects/+page.svelte b/frontend/src/routes/projects/+page.svelte
index 23738a4dd..c0f41ee9b 100644
--- a/frontend/src/routes/projects/+page.svelte
+++ b/frontend/src/routes/projects/+page.svelte
@@ -14,6 +14,8 @@
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';
+ import type { Environment } from '$lib/types/environment.type';
let { data } = $props();
@@ -33,10 +35,10 @@
isLoading.updating = true;
handleApiResultWithCallbacks({
result: await tryCatch(imageService.runAutoUpdate()),
- message: 'Failed to Check Compose Projects for Updates',
+ message: m.containers_check_updates_failed(),
setLoadingState: (value) => (isLoading.updating = value),
async onSuccess() {
- toast.success('Compose Projects Updated Successfully.');
+ toast.success(m.compose_update_success());
projects = await projectService.getProjects(projectRequestOptions);
}
});
@@ -44,15 +46,48 @@
async function refreshCompose() {
isLoading.refreshing = true;
+ let refreshingProjectList = true;
+ let refreshingProjectCounts = true;
handleApiResultWithCallbacks({
result: await tryCatch(projectService.getProjects(projectRequestOptions)),
- message: 'Failed to Refresh Projects',
- setLoadingState: (v) => (isLoading.refreshing = v),
+ message: m.compose_refresh_failed(),
+ setLoadingState: (v) => {
+ refreshingProjectList = v;
+ isLoading.refreshing = refreshingProjectCounts || refreshingProjectList;
+ },
async onSuccess(newProjects) {
projects = newProjects;
}
});
+ handleApiResultWithCallbacks({
+ result: await tryCatch(projectService.getProjectStatusCounts()),
+ message: m.compose_refresh_failed(),
+ setLoadingState: (v) => {
+ refreshingProjectCounts = v;
+ isLoading.refreshing = refreshingProjectCounts || refreshingProjectList;
+ },
+ async onSuccess(newProjectCounts) {
+ projectStatusCounts = newProjectCounts;
+ }
+ });
}
+
+ // React to environment changes
+ const selectedEnvStore = environmentStore.selected;
+ let lastEnvId: string | null = null;
+ $effect(() => {
+ const env = $selectedEnvStore as Environment | null;
+ if (!env) return;
+ // Skip initial page load
+ if (lastEnvId === null) {
+ lastEnvId = env.id;
+ return;
+ }
+ if (env.id !== lastEnvId) {
+ lastEnvId = env.id;
+ refreshCompose();
+ }
+ });
</script>
<div class="space-y-6">
diff --git a/frontend/src/routes/volumes/+page.svelte b/frontend/src/routes/volumes/+page.svelte
index 74d1f7dd1..8a9010613 100644
--- a/frontend/src/routes/volumes/+page.svelte
+++ b/frontend/src/routes/volumes/+page.svelte
@@ -14,6 +14,8 @@
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';
+ import type { Environment } from '$lib/types/environment.type';
let { data } = $props();
@@ -49,15 +51,48 @@
async function refreshVolumes() {
isLoading.refresh = true;
+ let refreshingVolumeList = true;
+ let refreshingVolumeCounts = true;
handleApiResultWithCallbacks({
result: await tryCatch(volumeService.getVolumes(requestOptions)),
message: m.volumes_refresh_failed(),
- setLoadingState: (value) => (isLoading.refresh = value),
+ setLoadingState: (value) => {
+ refreshingVolumeList = value;
+ isLoading.refresh = refreshingVolumeCounts || refreshingVolumeList;
+ },
async onSuccess(newVolumes) {
volumes = newVolumes;
}
});
+ handleApiResultWithCallbacks({
+ result: await tryCatch(volumeService.getVolumeUsageCounts()),
+ message: m.volumes_refresh_failed(),
+ setLoadingState: (value) => {
+ refreshingVolumeCounts = value;
+ isLoading.refresh = refreshingVolumeCounts || refreshingVolumeList;
+ },
+ async onSuccess(newVolumeCounts) {
+ volumeUsageCounts = newVolumeCounts;
+ }
+ });
}
+
+ // React to environment changes
+ const selectedEnvStore = environmentStore.selected;
+ let lastEnvId: string | null = null;
+ $effect(() => {
+ const env = $selectedEnvStore as Environment | null;
+ if (!env) return;
+ // Skip initial page load
+ if (lastEnvId === null) {
+ lastEnvId = env.id;
+ return;
+ }
+ if (env.id !== lastEnvId) {
+ lastEnvId = env.id;
+ refreshVolumes();
+ }
+ });
</script>
<div class="space-y-6">