Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
feat: add in-use/unused badge on volumes and images
Kyle Mendell75ea68b04164
diff --git a/src/lib/components/badges/custom-badge.svelte b/src/lib/components/badges/custom-badge.svelteindex c933c42a3..f29c308e9 100644--- a/src/lib/components/badges/custom-badge.svelte+++ b/src/lib/components/badges/custom-badge.svelte@@ -115,6 +115,11 @@color: "rgb(21, 128, 61)",border: "rgba(34, 197, 94, 0.15)",},+ "In Use": {+ bg: "rgba(34, 197, 94, 0.15)",+ color: "rgb(21, 128, 61)",+ border: "rgba(34, 197, 94, 0.15)",+ },"partially running": {bg: "rgba(245, 158, 11, 0.15)",color: "rgb(180, 83, 9)",@@ -130,6 +135,11 @@color: "rgb(185, 28, 28)",border: "rgba(239, 68, 68, 0.15)",},+ Unused: {+ bg: "rgba(239, 68, 68, 0.15)",+ color: "rgb(185, 28, 28)",+ border: "rgba(239, 68, 68, 0.15)",+ },pending: {bg: "rgba(59, 130, 246, 0.15)",color: "rgb(37, 99, 235)",diff --git a/src/lib/services/docker-service.ts b/src/lib/services/docker-service.tsindex 51b9f8927..8de50906b 100644--- a/src/lib/services/docker-service.ts+++ b/src/lib/services/docker-service.ts@@ -458,6 +458,28 @@ export async function removeImage(}}+/**+ * Check if an image is used by any container+ * @param imageId The image ID or reference to check+ * @returns Boolean indicating if the image is in use+ */+export async function isImageInUse(imageId: string): Promise<boolean> {+ try {+ const docker = getDockerClient();+ const containers = await docker.listContainers({ all: true });++ // Look for containers using this image+ return containers.some(+ (container) =>+ container.ImageID === imageId || container.Image === imageId+ );+ } catch (error) {+ console.error(`Error checking if image ${imageId} is in use:`, error);+ // Default to assuming it's in use for safety+ return true;+ }+}+// Define and export the type returned by listNetworksexport type ServiceNetwork = {id: string;@@ -530,6 +552,39 @@ export async function listVolumes(): Promise<ServiceVolume[]> {}}+/**+ * Check if a volume is in use by any container+ * @param volumeName The name of the volume to check+ * @returns Boolean indicating if the volume is in use+ */+export async function isVolumeInUse(volumeName: string): Promise<boolean> {+ try {+ const docker = getDockerClient();+ const containers = await docker.listContainers({ all: true });++ // Inspect each container to check its mounts+ for (const containerInfo of containers) {+ const container = docker.getContainer(containerInfo.Id);+ const details = await container.inspect();++ // Check if any mount points to our volume+ const volumeMounts = details.Mounts.filter(+ (mount) => mount.Type === "volume" && mount.Name === volumeName+ );++ if (volumeMounts.length > 0) {+ return true;+ }+ }++ return false;+ } catch (error) {+ console.error(`Error checking if volume ${volumeName} is in use:`, error);+ // Default to assuming it's in use for safety+ return true;+ }+}+/*** Creates a Docker volume.* @param options - Options for creating the volume (e.g., Name, Driver, Labels).diff --git a/src/routes/images/+page.server.ts b/src/routes/images/+page.server.tsindex c195af72b..86d029f70 100644--- a/src/routes/images/+page.server.ts+++ b/src/routes/images/+page.server.ts@@ -1,17 +1,34 @@import type { PageServerLoad } from "./$types";-import { listImages } from "$lib/services/docker-service";+import { listImages, isImageInUse } from "$lib/services/docker-service";import type { ServiceImage } from "$lib/services/docker-service";+// Enhanced type with usage info+type EnhancedImageInfo = ServiceImage & {+ inUse: boolean;+};+type ImageData = {- images: ServiceImage[];+ images: EnhancedImageInfo[];error?: string;};export const load: PageServerLoad = async (): Promise<ImageData> => {try {const images = await listImages();++ // Enhance images with usage information+ const enhancedImages = await Promise.all(+ images.map(async (image): Promise<EnhancedImageInfo> => {+ const inUse = await isImageInUse(image.id);+ return {+ ...image,+ inUse,+ };+ })+ );+return {- images,+ images: enhancedImages,};} catch (err: any) {console.error("Failed to load images:", err);diff --git a/src/routes/images/ImageActions.svelte b/src/routes/images/ImageActions.svelteindex b2b68269f..6e55c105b 100644--- a/src/routes/images/ImageActions.svelte+++ b/src/routes/images/ImageActions.svelte@@ -5,12 +5,22 @@import { Trash2, Download, Ellipsis, Loader2 } from "@lucide/svelte";import { toast } from "svelte-sonner";- let { id, repoTag }: { id: string; repoTag?: string } = $props();+ let {+ id,+ repoTag,+ inUse = true,+ }: { id: string; repoTag?: string; inUse: boolean } = $props();+let isPulling = $state(false);let isDeleting = $state(false);let isConfirmDialogOpen = $state(false);- async function removeImage() {+ async function handleDelete() {+ if (inUse) {+ toast.error("Cannot delete image that is in use by containers");+ return;+ }+isDeleting = true;try {const response = await fetch(`/api/images/${encodeURIComponent(id)}`, {@@ -134,7 +144,11 @@<Button variant="ghost" onclick={() => (isConfirmDialogOpen = false)}>Cancel</Button>- <Button variant="destructive" onclick={removeImage} disabled={isDeleting}>+ <Button+ variant="destructive"+ onclick={handleDelete}+ disabled={isDeleting}+ >{#if isDeleting}<Loader2 class="h-4 w-4 animate-spin" />Deleting...diff --git a/src/routes/images/columns.ts b/src/routes/images/columns.tsindex b72bfe9e9..d7d54f570 100644--- a/src/routes/images/columns.ts+++ b/src/routes/images/columns.ts@@ -3,8 +3,12 @@ import type { ColumnDef } from "@tanstack/table-core";import { renderComponent } from "$lib/components/ui/data-table/index.js";import ImageActions from "./ImageActions.svelte";import { formatBytes } from "$lib/utils";+import CustomBadge from "$lib/components/badges/custom-badge.svelte";-export const columns: ColumnDef<ServiceImage>[] = [+// Enhanced type with usage info+export type EnhancedImage = ServiceImage & { inUse?: boolean };++export const columns: ColumnDef<EnhancedImage>[] = [{accessorKey: "repo",header: "Name",@@ -19,6 +23,29 @@ export const columns: ColumnDef<ServiceImage>[] = [return row.original.tag;},},+ {+ accessorKey: "usage",+ header: "Status",+ cell: ({ row }) => {+ const inUse = row.original.inUse;+ if (inUse === undefined) {+ return null;+ }++ if (inUse) {+ return renderComponent(CustomBadge, {+ variant: "status",+ text: "In use",+ });+ } else {+ return renderComponent(CustomBadge, {+ variant: "status",+ text: "Unused",+ });+ }+ },+ enableSorting: true,+ },{accessorKey: "id",header: "Image ID",@@ -44,6 +71,7 @@ export const columns: ColumnDef<ServiceImage>[] = [return renderComponent(ImageActions, {id: row.original.id,repoTag: row.original.repoTags?.[0],+ inUse: !!row.original.inUse,});},enableSorting: false,diff --git a/src/routes/settings/+page.server.ts b/src/routes/settings/+page.server.tsindex 8efd49690..01bbbbc36 100644--- a/src/routes/settings/+page.server.ts+++ b/src/routes/settings/+page.server.ts@@ -31,14 +31,6 @@ export const actions: Actions = {const pollingIntervalStr = formData.get("pollingInterval") as string;const stacksDirectory = (formData.get("stacksDirectory") as string) || "";- // Add logging to debug form values- console.log("Form data received:", {- dockerHost,- autoUpdate: formData.get("autoUpdate"),- pollingEnabled: formData.get("pollingEnabled"),- pollingInterval: pollingIntervalStr,- });-if (!dockerHost) {return fail(400, {error: "Docker host cannot be empty.",diff --git a/src/routes/volumes/+page.server.ts b/src/routes/volumes/+page.server.tsindex fef398ed0..40c6e7ca6 100644--- a/src/routes/volumes/+page.server.ts+++ b/src/routes/volumes/+page.server.ts@@ -1,17 +1,34 @@import type { PageServerLoad } from "./$types";-import { listVolumes } from "$lib/services/docker-service";+import { listVolumes, isVolumeInUse } from "$lib/services/docker-service";import type { ServiceVolume } from "$lib/services/docker-service";+// Enhanced type with usage info+type EnhancedVolumeInfo = ServiceVolume & {+ inUse: boolean;+};+type VolumePageData = {- volumes: ServiceVolume[];+ volumes: EnhancedVolumeInfo[];error?: string;};export const load: PageServerLoad = async (): Promise<VolumePageData> => {try {const volumes = await listVolumes();++ // Enhance volumes with usage information+ const enhancedVolumes = await Promise.all(+ volumes.map(async (volume): Promise<EnhancedVolumeInfo> => {+ const inUse = await isVolumeInUse(volume.name);+ return {+ ...volume,+ inUse,+ };+ })+ );+return {- volumes,+ volumes: enhancedVolumes,};} catch (err: any) {console.error("Failed to load volumes:", err);diff --git a/src/routes/volumes/VolumeActions.svelte b/src/routes/volumes/VolumeActions.svelteindex 1dd13e2bc..98cf095d6 100644--- a/src/routes/volumes/VolumeActions.svelte+++ b/src/routes/volumes/VolumeActions.svelte@@ -1,15 +1,20 @@<script lang="ts">import { Button } from "$lib/components/ui/button/index.js";import * as Dialog from "$lib/components/ui/dialog/index.js";- import { Trash2, AlertCircle, Loader2 } from "@lucide/svelte";+ import { Trash2, Loader2 } from "@lucide/svelte";import { toast } from "svelte-sonner";- const { name } = $props<{ name: string }>();+ const { name, inUse = true } = $props<{ name: string; inUse: boolean }>();let isConfirmDialogOpen = $state(false);let isDeleting = $state(false);- async function deleteVolume() {+ async function handleDelete() {+ if (inUse) {+ toast.error("Cannot delete volume that is in use by containers");+ return;+ }+isDeleting = true;try {const response = await fetch(`/api/volumes/${name}`, {@@ -67,7 +72,7 @@</Button><Buttonvariant="destructive"- onclick={deleteVolume}+ onclick={handleDelete}disabled={isDeleting}>{#if isDeleting}diff --git a/src/routes/volumes/columns.ts b/src/routes/volumes/columns.tsindex b2de40cdd..c978d9bbc 100644--- a/src/routes/volumes/columns.ts+++ b/src/routes/volumes/columns.ts@@ -2,9 +2,11 @@ import type { ColumnDef } from "@tanstack/table-core";import { renderComponent } from "$lib/components/ui/data-table/index.js";import VolumeActions from "./VolumeActions.svelte";import MountpointCell from "./MountpointCell.svelte";+import CustomBadge from "$lib/components/badges/custom-badge.svelte";import type { ServiceVolume } from "$lib/services/docker-service";-export type VolumeInfo = ServiceVolume;+// Update the type to include the inUse property+export type VolumeInfo = ServiceVolume & { inUse?: boolean };export const columns: ColumnDef<VolumeInfo>[] = [{@@ -19,11 +21,33 @@ export const columns: ColumnDef<VolumeInfo>[] = [accessorKey: "scope",header: "Scope",},+ {+ accessorKey: "usage",+ header: "Status",+ cell: ({ row }) => {+ const inUse = row.original.inUse;+ if (inUse === undefined) {+ return null;+ }++ if (inUse) {+ return renderComponent(CustomBadge, {+ variant: "status",+ text: "In use",+ });+ } else {+ return renderComponent(CustomBadge, {+ variant: "status",+ text: "Unused",+ });+ }+ },+ enableSorting: true,+ },{accessorKey: "mountpoint",header: "Mountpoint",cell: ({ row }) => {- // Use renderComponent with the new MountpointCellreturn renderComponent(MountpointCell, {mountpoint: row.original.mountpoint,});@@ -35,6 +59,7 @@ export const columns: ColumnDef<VolumeInfo>[] = [cell: ({ row }) => {return renderComponent(VolumeActions, {name: row.original.name,+ inUse: !!row.original.inUse,});},enableSorting: false,