Skip to content

Modern Docker Management, Designed for Everyone

chore: eslint fixes

Kyle Mendellf9c8361d0d7f
diff --git a/src/lib/services/docker/stack-service.ts b/src/lib/services/docker/stack-service.ts
index a9c504808..c1343d84b 100644
--- a/src/lib/services/docker/stack-service.ts
+++ b/src/lib/services/docker/stack-service.ts
@@ -1,14 +1,12 @@
import { promises as fs } from 'node:fs';
-import path, { join, dirname } from 'node:path';
-import { basename } from 'node:path';
+import path, { join } from 'node:path';
import DockerodeCompose from 'dockerode-compose';
import yaml from 'js-yaml';
-import { nanoid } from 'nanoid';
import slugify from 'slugify';
import { directoryExists } from '$lib/utils/fs.utils';
import { getDockerClient } from '$lib/services/docker/core';
import { getSettings, ensureStacksDirectory } from '$lib/services/settings-service';
-import type { Stack, StackMeta, StackService, StackUpdate } from '$lib/types/docker/stack.type';
+import type { Stack, StackService, StackUpdate } from '$lib/types/docker/stack.type';
/* The above code is declaring a variable `STACKS_DIR` with an empty string as its initial value in
TypeScript. */
@@ -116,29 +114,6 @@ async function getComposeFilePath(stackId: string): Promise<string | null> {
}
}
-/**
- * Returns the path to the meta file, prioritizing .stack.json, fallback to meta.json.
- * Returns null if neither is found.
- */
-async function getStackMetaPath(stackId: string): Promise<string | null> {
- const stackDir = await getStackDir(stackId);
- const newPath = join(stackDir, '.stack.json');
- const oldPath = join(stackDir, 'meta.json');
- try {
- await fs.access(newPath);
- return newPath;
- } catch {
- // .stack.json not accessible, try meta.json
- try {
- await fs.access(oldPath);
- return oldPath;
- } catch {
- // meta.json also not accessible
- return null;
- }
- }
-}
-
/**
* Returns the path to the .env file (no fallback needed, just .env)
*/
@@ -223,13 +198,13 @@ async function getStackServices(stackId: string, composeContent: string): Promis
const composeServiceLabel = 'com.docker.compose.service'; // Standard service label
try {
- const composeData = yaml.load(composeContent) as any;
+ const composeData = yaml.load(composeContent) as Record<string, unknown>;
if (!composeData || !composeData.services) {
console.warn(`No services found in compose content for stack ${stackId}`);
return [];
}
- const serviceNames = Object.keys(composeData.services);
+ const serviceNames = Object.keys(composeData.services as Record<string, unknown>);
// List containers, potentially filtering by label for efficiency if needed
const containers = await docker.listContainers({
@@ -453,9 +428,9 @@ export async function createStack(name: string, composeContent: string, envConte
let serviceCount = 0;
try {
- const composeData = yaml.load(composeContent) as any;
+ const composeData = yaml.load(composeContent) as Record<string, unknown>;
if (composeData?.services) {
- serviceCount = Object.keys(composeData.services).length;
+ serviceCount = Object.keys(composeData.services as Record<string, unknown>).length;
}
} catch (parseErr) {
console.warn(`Could not parse compose file during creation for stack ${uniqueDirName}:`, parseErr);
@@ -565,7 +540,7 @@ export async function updateStack(currentStackId: string, updates: StackUpdate):
if (updates.composeContent !== undefined) {
const normalizedComposeContent = normalizeHealthcheckTest(updates.composeContent);
- let currentComposePath = await getComposeFilePath(effectiveStackId); // Check existing, might be null
+ const currentComposePath = await getComposeFilePath(effectiveStackId); // Check existing, might be null
const targetComposePath = currentComposePath || path.join(stackDirForContent, 'compose.yaml'); // Default to compose.yaml if not found
promises.push(fs.writeFile(targetComposePath, normalizedComposeContent, 'utf8'));
@@ -899,10 +874,9 @@ export async function removeStack(stackId: string): Promise<boolean> {
try {
await fs.rm(stackDir, { recursive: true, force: true });
console.log(`Stack directory ${stackDir} removed.`);
- } catch (e) {
- console.error(`Failed to remove stack directory ${stackDir}:`, e);
- // Even if containers were removed, directory removal failed
- throw new Error(`Failed to remove stack directory: ${e instanceof Error ? e.message : String(e)}`);
+ } catch {
+ console.error(`Failed to remove stack directory ${stackDir}`);
+ throw new Error(`Failed to remove stack directory`);
}
return true;
@@ -1009,7 +983,7 @@ export async function discoverExternalStacks(): Promise<Stack[]> {
const composeProjectLabel = 'com.docker.compose.project';
const composeServiceLabel = 'com.docker.compose.service';
- const projectMap: Record<string, any[]> = {};
+ const projectMap: Record<string, Array<{ id: string; name: string; state: { Running: boolean; Status: string; ExitCode: number } }>> = {};
containers.forEach((container) => {
const labels = container.Labels || {};
@@ -1169,7 +1143,7 @@ export async function importExternalStack(stackId: string): Promise<Stack> {
if (!composeContent) {
console.log(`Generating compose file for stack '${stackId}' as no existing file could be read or found.`);
// Create a basic compose file from container inspection
- const services: Record<string, any> = {};
+ const services: Record<string, { image: string }> = {};
for (const cont of stackContainers) {
// Renamed to 'cont' to avoid conflict with outer 'container'
@@ -1272,9 +1246,9 @@ export async function isStackRunning(stackId: string): Promise<boolean> {
* @returns {string} - The normalized YAML content.
*/
function normalizeHealthcheckTest(composeContent: string): string {
- let doc: any;
+ let doc: Record<string, unknown> | undefined;
try {
- doc = yaml.load(composeContent);
+ doc = yaml.load(composeContent) as Record<string, unknown>;
} catch (e) {
console.warn('Could not parse compose YAML for healthcheck normalization:', e);
return composeContent; // Return original if parsing fails
@@ -1284,7 +1258,7 @@ function normalizeHealthcheckTest(composeContent: string): string {
}
let modified = false;
- for (const service of Object.values(doc.services)) {
+ for (const service of Object.values(doc.services as Record<string, unknown>)) {
const svc = service as { healthcheck?: { test?: unknown } }; // Type assertion
if (svc.healthcheck && svc.healthcheck.test) {
if (typeof svc.healthcheck.test === 'string') {
diff --git a/src/lib/services/docker/system-service.ts b/src/lib/services/docker/system-service.ts
index e2263bbba..44851c902 100644
--- a/src/lib/services/docker/system-service.ts
+++ b/src/lib/services/docker/system-service.ts
@@ -7,32 +7,28 @@ type PruneType = 'containers' | 'images' | 'networks' | 'volumes';
type PruneServiceResult = PruneResult & { type: PruneType; error?: string };
const docker = await getDockerClient();
-/**
- * Prunes specified Docker resources sequentially, fetching settings to determine image prune mode.
- * @param {PruneType[]} types - Array of resource types to prune.
- * @returns {Promise<PruneServiceResult[]>} Results of each pruning operation.
- */
export async function pruneSystem(types: PruneType[]): Promise<PruneServiceResult[]> {
const results: PruneServiceResult[] = [];
- // Fetch settings first
- let pruneMode: Settings['pruneMode'] = 'dangling'; // Default prune mode
+ let pruneMode: Settings['pruneMode'] = 'dangling';
try {
- // Fetch settings INSIDE the function
const currentSettings = await getSettings();
if (currentSettings?.pruneMode) {
pruneMode = currentSettings.pruneMode;
}
- } catch (settingsError: any) {
- console.warn(`Could not fetch settings for prune operation, defaulting to 'dangling' image prune mode. Error: ${settingsError.message}`);
+ } catch (settingsError: unknown) {
+ const msg = settingsError instanceof Error ? settingsError.message : String(settingsError);
+ console.warn(`Could not fetch settings for prune operation, defaulting to 'dangling' image prune mode. Error: ${msg}`);
}
console.log(`Using image prune mode: ${pruneMode}`);
- // Use a for...of loop for sequential execution
for (const type of types) {
let result: PruneResult | null = null;
let error: string | undefined = undefined;
+ let pruneOptions: { filters: { dangling: string[] } } | undefined;
+ let filterValue: string | undefined;
+ let logMessage: string | undefined;
try {
console.log(`Pruning ${type}...`);
@@ -42,13 +38,12 @@ export async function pruneSystem(types: PruneType[]): Promise<PruneServiceResul
result = await docker.pruneContainers();
break;
case 'images':
- const filterValue = pruneMode === 'all' ? 'false' : 'true';
- const logMessage = pruneMode === 'all' ? 'Pruning all unused images (docker image prune -a)...' : 'Pruning dangling images (docker image prune)...';
+ filterValue = pruneMode === 'all' ? 'false' : 'true';
+ logMessage = pruneMode === 'all' ? 'Pruning all unused images (docker image prune -a)...' : 'Pruning dangling images (docker image prune)...';
console.log(logMessage);
- const pruneOptions = {
+ pruneOptions = {
filters: { dangling: [filterValue] }
};
-
result = await docker.pruneImages(pruneOptions);
break;
case 'networks':
@@ -64,9 +59,10 @@ export async function pruneSystem(types: PruneType[]): Promise<PruneServiceResul
console.log(`Pruning ${type} completed.`);
results.push({ ...(result || {}), type, error } as PruneServiceResult);
- } catch (err: any) {
+ } catch (err: unknown) {
+ const msg = err instanceof Error ? err.message : String(err);
console.error(`Error pruning ${type}:`, err);
- error = err.message || `Failed to prune ${type}`;
+ error = msg || `Failed to prune ${type}`;
results.push({
ContainersDeleted: type === 'containers' ? [] : undefined,
ImagesDeleted: type === 'images' ? [] : undefined,
@@ -84,17 +80,19 @@ export async function pruneSystem(types: PruneType[]): Promise<PruneServiceResul
export async function getSystemInfo() {
try {
return await docker.info();
- } catch (err: any) {
+ } catch (err: unknown) {
+ const msg = err instanceof Error ? err.message : String(err);
console.error('Error getting Docker system info:', err);
- throw new Error(`Failed to get Docker info: ${err.message}`);
+ throw new Error(`Failed to get Docker info: ${msg}`);
}
}
export async function getDiskUsage() {
try {
return await docker.df();
- } catch (err: any) {
+ } catch (err: unknown) {
+ const msg = err instanceof Error ? err.message : String(err);
console.error('Error getting Docker disk usage:', err);
- throw new Error(`Failed to get Docker disk usage: ${err.message}`);
+ throw new Error(`Failed to get Docker disk usage: ${msg}`);
}
}
diff --git a/src/lib/services/settings-service.ts b/src/lib/services/settings-service.ts
index eae44853e..c24812820 100644
--- a/src/lib/services/settings-service.ts
+++ b/src/lib/services/settings-service.ts
@@ -106,7 +106,7 @@ export async function getSettings(): Promise<Settings> {
const rawData = await fs.readFile(filePath, 'utf8');
const settingsFromFile = JSON.parse(rawData);
- let baseSettings = JSON.parse(JSON.stringify(DEFAULT_SETTINGS)) as Settings;
+ const baseSettings = JSON.parse(JSON.stringify(DEFAULT_SETTINGS)) as Settings;
if (settingsFromFile._encrypted) {
const { _encrypted, ...nonSensitiveSettings } = settingsFromFile;
diff --git a/src/lib/types/docker/stack.type.ts b/src/lib/types/docker/stack.type.ts
index ff0afb4b8..a996141dc 100644
--- a/src/lib/types/docker/stack.type.ts
+++ b/src/lib/types/docker/stack.type.ts
@@ -8,6 +8,13 @@ export interface StackMeta {
path: string;
}
+export interface StackPort {
+ PublicPort?: number;
+ PrivatePort?: number;
+ Type?: string;
+ [key: string]: any;
+}
+
export interface StackService {
id: string;
name: string;
@@ -16,7 +23,19 @@ export interface StackService {
Status: string;
ExitCode: number;
};
- ports?: string[];
+ ports?: StackPort[];
+ networkSettings?: {
+ Networks?: Record<
+ string,
+ {
+ IPAddress?: string;
+ Gateway?: string;
+ MacAddress?: string;
+ Driver?: string;
+ [key: string]: any;
+ }
+ >;
+ };
}
export interface Stack {
diff --git a/src/routes/api/containers/[containerId]/stats/stream/+server.ts b/src/routes/api/containers/[containerId]/stats/stream/+server.ts
index af026f8fd..905904c7a 100644
--- a/src/routes/api/containers/[containerId]/stats/stream/+server.ts
+++ b/src/routes/api/containers/[containerId]/stats/stream/+server.ts
@@ -17,18 +17,7 @@ export const GET: RequestHandler = async ({ params, request }) => {
const stream = new ReadableStream({
start(controller) {
let isActive = true;
- let pollInterval: ReturnType<typeof setInterval>;
- let pingInterval: ReturnType<typeof setInterval>;
-
- const cleanup = () => {
- isActive = false;
- clearInterval(pollInterval);
- clearInterval(pingInterval);
- };
-
- request.signal.addEventListener('abort', cleanup);
-
- pollInterval = setInterval(async () => {
+ const pollInterval: ReturnType<typeof setInterval> = setInterval(async () => {
if (!isActive) return;
try {
@@ -37,7 +26,7 @@ export const GET: RequestHandler = async ({ params, request }) => {
try {
controller.enqueue(encoder.encode(`data: ${JSON.stringify(stats)}\n\n`));
} catch (err) {
- if (err && typeof err === 'object' && 'code' in err && (err as any).code === 'ERR_INVALID_STATE') {
+ if (err && typeof err === 'object' && 'code' in err && (err as { code?: string }).code === 'ERR_INVALID_STATE') {
cleanup();
} else {
console.error('Enqueue error:', err);
@@ -46,12 +35,12 @@ export const GET: RequestHandler = async ({ params, request }) => {
} catch (err) {
if (!isActive) return;
- if ((err as any).statusCode === 404) {
+ if ((err as { statusCode?: number }).statusCode === 404) {
try {
controller.enqueue(encoder.encode(`data: ${JSON.stringify({ removed: true })}\n\n`));
cleanup();
controller.close();
- } catch (e) {
+ } catch {
cleanup();
}
} else {
@@ -60,17 +49,25 @@ export const GET: RequestHandler = async ({ params, request }) => {
}
}, 2000);
- pingInterval = setInterval(() => {
+ const pingInterval: ReturnType<typeof setInterval> = setInterval(() => {
if (!isActive) return;
try {
controller.enqueue(encoder.encode(':\n\n'));
} catch (err) {
- if (err && typeof err === 'object' && 'code' in err && (err as any).code === 'ERR_INVALID_STATE') {
+ if (err && typeof err === 'object' && 'code' in err && (err as { code?: string }).code === 'ERR_INVALID_STATE') {
cleanup();
}
}
}, 15000);
+ const cleanup = () => {
+ isActive = false;
+ clearInterval(pollInterval);
+ clearInterval(pingInterval);
+ };
+
+ request.signal.addEventListener('abort', cleanup);
+
return cleanup;
},
cancel() {
diff --git a/src/routes/api/images/pull-stream/[...name]/+server.ts b/src/routes/api/images/pull-stream/[...name]/+server.ts
index 2c75bdba9..164843d70 100644
--- a/src/routes/api/images/pull-stream/[...name]/+server.ts
+++ b/src/routes/api/images/pull-stream/[...name]/+server.ts
@@ -41,7 +41,7 @@ export const GET: RequestHandler = async ({ params, request }) => {
const docker = await getDockerClient();
const settings = await getSettings();
- function send(data: any) {
+ function send(data: unknown) {
controller.enqueue(new TextEncoder().encode(`data: ${JSON.stringify(data)}\n\n`));
}
@@ -110,15 +110,15 @@ export const GET: RequestHandler = async ({ params, request }) => {
}
controller.close();
},
- (event: any) => {
+ (event: Record<string, unknown>) => {
if (event.id && event.status) {
- if (!layers[event.id]) {
- layers[event.id] = { current: 0, total: 0 };
+ if (!layers[event.id as string]) {
+ layers[event.id as string] = { current: 0, total: 0 };
}
- if (event.progressDetail && event.progressDetail.current && event.progressDetail.total) {
- layers[event.id].current = event.progressDetail.current;
- layers[event.id].total = event.progressDetail.total;
+ if (event.progressDetail && (event.progressDetail as Record<string, number>).current && (event.progressDetail as Record<string, number>).total) {
+ layers[event.id as string].current = (event.progressDetail as Record<string, number>).current;
+ layers[event.id as string].total = (event.progressDetail as Record<string, number>).total;
}
let totalSize = 0;
@@ -159,10 +159,10 @@ export const GET: RequestHandler = async ({ params, request }) => {
}
}
);
- } catch (error: any) {
+ } catch (error: unknown) {
const errorResponse: ApiErrorResponse = {
success: false,
- error: error.message || 'Unknown error pulling image',
+ error: error instanceof Error ? error.message : 'Unknown error pulling image',
code: ApiErrorCode.DOCKER_API_ERROR,
details: error
};
diff --git a/src/routes/api/users/[id]/+server.ts b/src/routes/api/users/[id]/+server.ts
index a213f6593..d394c5734 100644
--- a/src/routes/api/users/[id]/+server.ts
+++ b/src/routes/api/users/[id]/+server.ts
@@ -73,8 +73,6 @@ export const PUT: RequestHandler = async ({ params, request, locals }) => {
// Handle password change
if (password) {
const settingsResult = await tryCatch(getSettings());
- const settings = settingsResult.data;
- const policy = settings?.auth?.passwordPolicy || 'medium';
// Password validation can be added here if needed
const hashResult = await tryCatch(hashPassword(password));
@@ -103,7 +101,8 @@ export const PUT: RequestHandler = async ({ params, request, locals }) => {
return json(response, { status: 500 });
}
- const { passwordHash: _, ...sanitizedUser } = saveResult.data;
+ // Remove passwordHash from returned user object
+ const { passwordHash, ...sanitizedUser } = saveResult.data;
return json({ success: true, user: sanitizedUser });
};
diff --git a/src/routes/containers/+page.server.ts b/src/routes/containers/+page.server.ts
index 58947311d..8e998dc9d 100644
--- a/src/routes/containers/+page.server.ts
+++ b/src/routes/containers/+page.server.ts
@@ -1,14 +1,11 @@
-import { fail } from '@sveltejs/kit';
-import { listContainers, createContainer } from '$lib/services/docker/container-service';
+import { listContainers } from '$lib/services/docker/container-service';
import { listImages } from '$lib/services/docker/image-service';
import { listNetworks } from '$lib/services/docker/network-service';
import { listVolumes } from '$lib/services/docker/volume-service';
-import type { PageServerLoad, Actions } from './$types';
-import type { ContainerConfig } from '$lib/types/docker';
+import type { PageServerLoad } from './$types';
export const load: PageServerLoad = async () => {
try {
- // This is always executed server-side for SSR
const [containers, volumes, networks, images] = await Promise.all([listContainers(true), listVolumes(), listNetworks(), listImages()]);
return {
@@ -17,14 +14,14 @@ export const load: PageServerLoad = async () => {
networks,
images
};
- } catch (error: any) {
+ } catch (error) {
console.error('Error loading container data:', error);
return {
containers: [],
volumes: [],
networks: [],
images: [],
- error: error.message
+ error: error instanceof Error ? error.message : String(error)
};
}
};
diff --git a/src/routes/images/+page.svelte b/src/routes/images/+page.svelte
index b6de2f41d..4f3804fcb 100644
--- a/src/routes/images/+page.svelte
+++ b/src/routes/images/+page.svelte
@@ -24,7 +24,7 @@
import { maturityStore } from '$lib/stores/maturity-store';
let { data }: { data: PageData } = $props();
- let images = $state<EnhancedImageInfo[]>(data.images || []);
+ let images = $derived(data.images || []);
let error = $state(data.error);
let selectedIds = $state<string[]>([]);
@@ -172,9 +172,9 @@
toast.error('Connection to server lost while pulling image');
isLoading.pulling = false;
};
- } catch (err: any) {
+ } catch (err: unknown) {
console.error('Failed to pull image:', err);
- toast.error(`Failed to pull image: ${err.message}`);
+ toast.error(`Failed to pull image: ${err instanceof Error ? err.message : String(err)}`);
isLoading.pulling = false;
}
}
@@ -231,7 +231,7 @@
result: await tryCatch(imageApi.prune()),
message: 'Failed to Prune Images',
setLoadingState: (value) => (isLoading.pruning = value),
- onSuccess: async (result: any) => {
+ onSuccess: async (result: { message?: string }) => {
isConfirmPruneDialogOpen = false;
toast.success(result?.message ?? 'Images pruned successfully.');
await invalidateAll();
@@ -352,10 +352,6 @@
}
}
- $effect(() => {
- images = data.images;
- });
-
let observer: IntersectionObserver | null = null;
onMount(() => {
diff --git a/src/routes/images/[imageId]/+page.svelte b/src/routes/images/[imageId]/+page.svelte
index d9ae70fd4..6ed2cd609 100644
--- a/src/routes/images/[imageId]/+page.svelte
+++ b/src/routes/images/[imageId]/+page.svelte
@@ -159,7 +159,7 @@
</Card.Header>
<Card.Content>
<div class="flex flex-wrap gap-2">
- {#each image.RepoTags as tag}
+ {#each image.RepoTags as tag (tag)}
<Badge variant="secondary">{tag}</Badge>
{/each}
</div>
@@ -174,7 +174,7 @@
<Card.Title>Labels</Card.Title>
</Card.Header>
<Card.Content class="space-y-2">
- {#each Object.entries(image.Config.Labels) as [key, value]}
+ {#each Object.entries(image.Config.Labels) as [key, value] (key)}
<div class="text-sm flex flex-col sm:flex-row sm:items-center">
<span class="font-medium text-muted-foreground w-full sm:w-1/4 break-all">{key}:</span>
<span class="font-mono text-xs sm:text-sm break-all w-full sm:w-3/4">{value}</span>
diff --git a/src/routes/images/pull-image-dialog.svelte b/src/routes/images/pull-image-dialog.svelte
index 043bcf87d..7b1ca90a5 100644
--- a/src/routes/images/pull-image-dialog.svelte
+++ b/src/routes/images/pull-image-dialog.svelte
@@ -106,7 +106,7 @@
</span>
</Select.Trigger>
<Select.Content>
- {#each platforms as platformOption}
+ {#each platforms as platformOption (platformOption.value)}
<Select.Item value={platformOption.value}>
{platformOption.label}
</Select.Item>
diff --git a/src/routes/networks/+page.svelte b/src/routes/networks/+page.svelte
index e3505a253..3ea0a2a77 100644
--- a/src/routes/networks/+page.svelte
+++ b/src/routes/networks/+page.svelte
@@ -1,14 +1,13 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card/index.js';
import { Button } from '$lib/components/ui/button/index.js';
- import { Plus, AlertCircle, Network, Trash2, Loader2, ChevronDown, ScanSearch, Ellipsis } from '@lucide/svelte';
+ import { Plus, AlertCircle, Network, Trash2, Loader2, ScanSearch, Ellipsis } from '@lucide/svelte';
import UniversalTable from '$lib/components/universal-table.svelte';
import type { PageData } from './$types';
import * as Alert from '$lib/components/ui/alert/index.js';
import { goto, invalidateAll } from '$app/navigation';
import { toast } from 'svelte-sonner';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
- import * as Dialog from '$lib/components/ui/dialog/index.js';
import CreateNetworkDialog from './CreateNetworkDialog.svelte';
import * as Table from '$lib/components/ui/table';
import type { NetworkCreateOptions } from 'dockerode';
diff --git a/src/routes/networks/CreateNetworkDialog.svelte b/src/routes/networks/CreateNetworkDialog.svelte
index 02ab486e6..04532bf38 100644
--- a/src/routes/networks/CreateNetworkDialog.svelte
+++ b/src/routes/networks/CreateNetworkDialog.svelte
@@ -15,19 +15,13 @@
onSubmit: (options: NetworkCreateOptions) => void;
};
- let {
- open = $bindable(),
- isCreating = false, // Default value for the prop
- onSubmit
- }: Props = $props();
+ let { open = $bindable(), isCreating = false, onSubmit }: Props = $props();
- // Form state
let name = $state('');
- let driver = $state('bridge'); // Default driver
+ let driver = $state('bridge');
let checkDuplicate = $state(true);
let internal = $state(false);
let labels = $state<{ key: string; value: string }[]>([{ key: '', value: '' }]);
- // Basic IPAM config state (optional)
let enableIpam = $state(false);
let subnet = $state('');
let gateway = $state('');
@@ -68,10 +62,9 @@
ipamConfig.Gateway = trimmedGateway;
}
- // Only add IPAM config if Subnet or Gateway is provided
if (Object.keys(ipamConfig).length > 0) {
options.IPAM = {
- Driver: 'default', // Usually 'default'
+ Driver: 'default',
Config: [ipamConfig]
};
}
@@ -80,7 +73,6 @@
onSubmit(options);
}
- // Reset form when dialog opens/closes
$effect(() => {
if (!open) {
name = '';
@@ -103,16 +95,13 @@
</Dialog.Header>
<form onsubmit={preventDefault(handleSubmit)} class="grid gap-4 py-4">
- <!-- Name -->
<div class="grid grid-cols-4 items-center gap-4">
<Label for="network-name" class="text-right">Name</Label>
<Input id="network-name" bind:value={name} required class="col-span-3" placeholder="e.g., my-app-network" disabled={isCreating} />
</div>
- <!-- Driver -->
<div class="grid grid-cols-4 items-center gap-4">
<Label for="network-driver" class="text-right">Driver</Label>
- <!-- Update the Select component structure -->
<Select.Root type="single" bind:value={driver}>
<Select.Trigger class="col-span-3" id="network-driver" disabled={isCreating}>
<span>{driver}</span>
@@ -127,7 +116,6 @@
</Select.Root>
</div>
- <!-- Options: Check Duplicate, Internal -->
<div class="grid grid-cols-4 items-center gap-4">
<span class="text-right text-sm font-medium">Options</span>
<div class="col-span-3 flex items-center space-x-4">
@@ -142,11 +130,10 @@
</div>
</div>
- <!-- Labels -->
<div class="grid grid-cols-4 items-start gap-4">
<Label class="text-right pt-2">Labels</Label>
<div class="col-span-3 space-y-2">
- {#each labels as label, index}
+ {#each labels as label, index (index)}
<div class="flex gap-2 items-center">
<Input placeholder="Key" bind:value={label.key} class="flex-1" disabled={isCreating} />
<Input placeholder="Value" bind:value={label.value} class="flex-1" disabled={isCreating} />
@@ -161,7 +148,6 @@
</div>
</div>
- <!-- IPAM Configuration (Optional) -->
<div class="grid grid-cols-4 items-start gap-4 border-t pt-4 mt-2">
<div class="flex items-center space-x-2 col-span-4">
<Checkbox id="enable-ipam" bind:checked={enableIpam} disabled={isCreating} />
diff --git a/src/routes/networks/[networkId]/+page.svelte b/src/routes/networks/[networkId]/+page.svelte
index 21d03f4af..9d36f2aa8 100644
--- a/src/routes/networks/[networkId]/+page.svelte
+++ b/src/routes/networks/[networkId]/+page.svelte
@@ -6,17 +6,16 @@
import * as Breadcrumb from '$lib/components/ui/breadcrumb/index.js';
import { enhance } from '$app/forms';
import * as Alert from '$lib/components/ui/alert/index.js';
- import { Separator } from '$lib/components/ui/separator/index.js';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
import { formatDate } from '$lib/utils/string.utils';
import type { NetworkInspectInfo } from 'dockerode';
import { toast } from 'svelte-sonner';
+ import { openConfirmDialog } from '$lib/components/confirm-dialog';
let { data, form }: { data: PageData; form: ActionData } = $props();
let { network }: { network: NetworkInspectInfo | null | undefined } = $derived(data);
let isRemoving = $state(false);
- let showRemoveConfirm = $state(false);
const shortId = $derived(network?.Id?.substring(0, 12) || 'N/A');
const createdDate = $derived(network?.Created ? formatDate(network.Created) : 'N/A');
@@ -30,12 +29,22 @@
console.warn('Cannot remove predefined network');
return;
}
- showRemoveConfirm = true;
+ openConfirmDialog({
+ title: 'Remove Network',
+ message: `Are you sure you want to remove the network "${network?.Name || shortId}"? This action cannot be undone.`,
+ confirm: {
+ label: 'Remove',
+ destructive: true,
+ action: () => {
+ const formElement = document.getElementById('remove-network-form') as HTMLFormElement | null;
+ formElement?.requestSubmit();
+ }
+ }
+ });
}
</script>
<div class="space-y-6 pb-8">
- <!-- Improved Header with Better Visual Hierarchy -->
<div class="flex flex-col space-y-4">
<Breadcrumb.Root>
<Breadcrumb.List>
@@ -56,13 +65,11 @@
{network?.Name || 'Network Details'}
</h1>
- <!-- Network ID pill -->
<div class="hidden sm:block">
<StatusBadge variant="gray" text={`ID: ${shortId}`} />
</div>
</div>
- <!-- Status badges in a row -->
<div class="flex gap-2 mt-2">
{#if inUse}
<StatusBadge variant="green" text={`In Use (${connectedContainers.length})`} />
@@ -78,7 +85,6 @@
</div>
</div>
- <!-- Action Button -->
<div class="self-start">
<Button variant="destructive" size="sm" onclick={triggerRemove} disabled={isRemoving || isPredefined} title={isPredefined ? 'Cannot remove predefined networks' : ''} class="w-full sm:w-auto">
{#if isRemoving}
@@ -90,7 +96,6 @@
</Button>
</div>
- <!-- Hidden form for removal action -->
<form
id="remove-network-form"
method="POST"
@@ -110,7 +115,6 @@
</div>
</div>
- <!-- Error Alert -->
{#if form?.error}
<Alert.Root variant="destructive">
<AlertCircle class="mr-2 size-4" />
@@ -121,7 +125,6 @@
{#if network}
<div class="space-y-6">
- <!-- Network Details Card: Improved Layout -->
<Card.Root class="border shadow-sm">
<Card.Header class="pb-0">
<Card.Title class="flex items-center gap-2 text-lg">
@@ -132,7 +135,6 @@
</Card.Header>
<Card.Content class="pt-6">
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-y-8 gap-x-6">
- <!-- ID -->
<div class="flex items-start gap-3">
<div class="bg-gray-500/10 p-2 rounded-full flex items-center justify-center shrink-0 size-10">
<Hash class="text-gray-500 size-5" />
@@ -143,7 +145,6 @@
</div>
</div>
- <!-- Name -->
<div class="flex items-start gap-3">
<div class="bg-blue-500/10 p-2 rounded-full flex items-center justify-center shrink-0 size-10">
<Network class="text-blue-500 size-5" />
@@ -154,7 +155,6 @@
</div>
</div>
- <!-- Driver -->
<div class="flex items-start gap-3">
<div class="bg-orange-500/10 p-2 rounded-full flex items-center justify-center shrink-0 size-10">
<HardDrive class="text-orange-500 size-5" />
@@ -165,7 +165,6 @@
</div>
</div>
- <!-- Scope -->
<div class="flex items-start gap-3">
<div class="bg-purple-500/10 p-2 rounded-full flex items-center justify-center shrink-0 size-10">
<Globe class="text-purple-500 size-5" />
@@ -176,7 +175,6 @@
</div>
</div>
- <!-- Created -->
<div class="flex items-start gap-3">
<div class="bg-green-500/10 p-2 rounded-full flex items-center justify-center shrink-0 size-10">
<Clock class="text-green-500 size-5" />
@@ -187,7 +185,6 @@
</div>
</div>
- <!-- Attachable -->
<div class="flex items-start gap-3">
<div class="bg-yellow-500/10 p-2 rounded-full flex items-center justify-center shrink-0 size-10">
<Layers class="text-yellow-500 size-5" />
@@ -200,7 +197,6 @@
</div>
</div>
- <!-- Internal -->
<div class="flex items-start gap-3">
<div class="bg-red-500/10 p-2 rounded-full flex items-center justify-center shrink-0 size-10">
<Settings class="text-red-500 size-5" />
@@ -213,7 +209,6 @@
</div>
</div>
- <!-- EnableIPv6 -->
<div class="flex items-start gap-3">
<div class="bg-indigo-500/10 p-2 rounded-full flex items-center justify-center shrink-0 size-10">
<ListTree class="text-indigo-500 size-5" />
@@ -229,7 +224,6 @@
</Card.Content>
</Card.Root>
- <!-- IPAM Configuration Card with improved styling -->
{#if network.IPAM?.Config && network.IPAM.Config.length > 0}
<Card.Root class="border shadow-sm">
<Card.Header class="pb-0">
@@ -311,7 +305,6 @@
</Card.Root>
{/if}
- <!-- Connected Containers Card - Refined -->
{#if connectedContainers.length > 0}
<Card.Root class="border shadow-sm">
<Card.Header class="pb-0">
@@ -345,7 +338,6 @@
</Card.Root>
{/if}
- <!-- Labels Card - Enhanced -->
{#if network.Labels && Object.keys(network.Labels).length > 0}
<Card.Root class="border shadow-sm">
<Card.Header class="pb-0">
@@ -372,7 +364,6 @@
</Card.Root>
{/if}
- <!-- Options Card - Enhanced -->
{#if network.Options && Object.keys(network.Options).length > 0}
<Card.Root class="border shadow-sm">
<Card.Header class="pb-0">
@@ -400,7 +391,6 @@
{/if}
</div>
{:else}
- <!-- Network Not Found with improved styling -->
<div class="flex flex-col items-center justify-center py-16 px-4 text-center">
<div class="bg-muted/30 rounded-full p-4 mb-4">
<Network class="text-muted-foreground size-10 opacity-70" />
diff --git a/src/routes/onboarding/password/+page.svelte b/src/routes/onboarding/password/+page.svelte
index b21282af6..3e8156bff 100644
--- a/src/routes/onboarding/password/+page.svelte
+++ b/src/routes/onboarding/password/+page.svelte
@@ -14,22 +14,16 @@
let confirmPassword = $state('');
let error = $state('');
let loading = $state(false);
- let welcomeStepCompleted = $state(false);
- // Add default values for required settings
const defaultDockerHost = 'unix:///var/run/docker.sock';
const defaultStacksDirectory = 'data/stacks';
- // Check for completed steps on mount
onMount(async () => {
- // If we've already completed the password step, go to settings
if (browser && $settingsStore.onboarding?.steps?.password) {
goto('/onboarding/settings');
return;
}
- // Ensure welcome step is set as completed - this fixes the issue
- // if someone has already visited the welcome page but the state wasn't persisted
updateSettingsStore({
onboarding: {
...$settingsStore.onboarding,
@@ -42,7 +36,6 @@
}
});
- // Save to ensure persistence
try {
if (browser) {
await saveSettingsToServer();
@@ -50,16 +43,12 @@
} catch (err) {
console.error('Failed to save settings:', err);
}
-
- // Update local state
- welcomeStepCompleted = true;
});
async function handleSubmit() {
loading = true;
error = '';
- // Validate passwords
if (!password || password.length < 8) {
error = 'Password must be at least 8 characters long';
loading = false;
@@ -73,14 +62,13 @@
}
try {
- // Call API to change password
const response = await fetch('/api/users/password', {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
- currentPassword: 'arcane-admin', // Default password
+ currentPassword: 'arcane-admin',
newPassword: password
})
});
@@ -145,7 +133,7 @@
</div>
<div class="flex pt-8 justify-center">
- <Button type="submit" disabled={loading} class="px-8 flex items-center size-12 size-[80%]">
+ <Button type="submit" disabled={loading} class="px-8 flex items-center h-12 w-[80%]">
{#if loading}
<span class="inline-block border-2 border-t-transparent border-white rounded-full animate-spin size-4"></span>
{/if}
diff --git a/src/routes/onboarding/settings/+page.svelte b/src/routes/onboarding/settings/+page.svelte
index e3ae6c983..31058bf1f 100644
--- a/src/routes/onboarding/settings/+page.svelte
+++ b/src/routes/onboarding/settings/+page.svelte
@@ -16,18 +16,12 @@
let error = $state('');
let loading = $state(false);
- // Add this to track if the user has passed the password step
- let passwordStepCompleted = $state(false);
-
- // Check for completed steps on mount
onMount(() => {
- // If previous step not completed, redirect to start
if (browser && !$settingsStore.onboarding?.steps?.password) {
goto('/onboarding/welcome');
return;
}
- // Mark this step as viewed
updateSettingsStore({
onboarding: {
...$settingsStore.onboarding,
@@ -39,18 +33,13 @@
}
}
});
-
- // Update local state
- passwordStepCompleted = true;
});
- // Initialize settings
let dockerHost = $derived($settingsStore.dockerHost || 'unix:///var/run/docker.sock');
let pollingEnabled = $derived($settingsStore.pollingEnabled !== undefined ? $settingsStore.pollingEnabled : true);
let pollingInterval = $derived($settingsStore.pollingInterval || 10);
let autoUpdate = $derived($settingsStore.autoUpdate !== undefined ? $settingsStore.autoUpdate : false);
- // Get the appropriate stacks directory based on environment
const defaultStacksDirectory = isDev ? './.dev-data/stacks' : 'data/stacks';
async function handleSubmit() {
@@ -88,7 +77,6 @@
}
};
- // Update the store
updateSettingsStore(settingsPayload);
await saveSettingsToServer();
@@ -167,7 +155,7 @@
</Card.Root>
<div class="flex justify-center pt-4">
- <Button type="submit" disabled={loading} class="px-8 flex items-center gap-2 size-12 size-[80%]">
+ <Button type="submit" disabled={loading} class="px-8 flex items-center gap-2 h-12 w-[80%]">
{#if loading}
<span class="inline-block border-2 border-t-transparent border-white rounded-full animate-spin size-4"></span>
{/if}
diff --git a/src/routes/settings/+page.server.ts b/src/routes/settings/+page.server.ts
index 1a9cf542b..6da86d013 100644
--- a/src/routes/settings/+page.server.ts
+++ b/src/routes/settings/+page.server.ts
@@ -10,6 +10,7 @@ export const load: PageServerLoad = async () => {
const csrf = crypto.randomUUID();
const sanitizedUsers = users.map((user) => {
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
const { passwordHash: _passwordHash, ...rest } = user;
return rest;
});
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
index ff4bcb8bb..d7b463db9 100644
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -75,7 +75,7 @@
<Tabs.Root value={settingsPageStates.activeTab} onValueChange={(val) => (settingsPageStates.activeTab = val)} class="w-full">
<Tabs.List class="grid grid-cols-4 md:w-full md:max-w-3xl mb-4 dark:bg-slate-900">
- {#each tabs as tab, i (tab.id)}
+ {#each tabs as tab (tab.id)}
<Tabs.Trigger value={tab.id} class="whitespace-nowrap data-[state=active]:border data-[state=active]:border-primary/60">
{tab.label}
</Tabs.Trigger>
diff --git a/src/routes/settings/tabs/user-management.svelte b/src/routes/settings/tabs/user-management.svelte
index 7d0a530f9..613797506 100644
--- a/src/routes/settings/tabs/user-management.svelte
+++ b/src/routes/settings/tabs/user-management.svelte
@@ -2,7 +2,7 @@
import * as Card from '$lib/components/ui/card/index.js';
import { Button } from '$lib/components/ui/button/index.js';
import { toast } from 'svelte-sonner';
- import { UserPlus, UserCheck, Ellipsis, Pencil, UserX, Mail } from '@lucide/svelte';
+ import { UserPlus, UserCheck, Ellipsis, Pencil, UserX } from '@lucide/svelte';
import type { PageData } from '../$types';
import UniversalTable from '$lib/components/universal-table.svelte';
import type { User } from '$lib/types/user.type';
diff --git a/src/routes/stacks/+page.svelte b/src/routes/stacks/+page.svelte
index 2977eb7fb..a22b769f5 100644
--- a/src/routes/stacks/+page.svelte
+++ b/src/routes/stacks/+page.svelte
@@ -19,8 +19,8 @@
import type { StackActions } from '$lib/types/actions.type';
let { data }: { data: PageData } = $props();
- let stacks = $state(data.stacks);
- let selectedIds = $state([]);
+ let stacks = $derived(data.stacks);
+ let selectedIds = $state<string[]>([]);
let isLoading = $state({
start: false,
stop: false,
@@ -142,10 +142,6 @@
await invalidateAll();
isLoading['import'] = false;
}
-
- $effect(() => {
- stacks = data.stacks;
- });
</script>
<div class="space-y-6">
diff --git a/src/routes/stacks/[stackId]/+page.server.ts b/src/routes/stacks/[stackId]/+page.server.ts
index 41a65f328..2006abf04 100644
--- a/src/routes/stacks/[stackId]/+page.server.ts
+++ b/src/routes/stacks/[stackId]/+page.server.ts
@@ -3,6 +3,7 @@ import { getSettings } from '$lib/services/settings-service';
import { getContainer } from '$lib/services/docker/container-service';
import type { PageServerLoad, Actions } from './$types';
import { tryCatch } from '$lib/utils/try-catch';
+import type { PortBinding } from 'dockerode';
export const load: PageServerLoad = async ({ params }) => {
const { stackId } = params;
@@ -49,10 +50,10 @@ export const load: PageServerLoad = async ({ params }) => {
const parsedPorts: string[] = [];
for (const containerPort in portBindings) {
- if (portBindings.hasOwnProperty(containerPort)) {
+ if (Object.prototype.hasOwnProperty.call(portBindings, containerPort)) {
const bindings = portBindings[containerPort];
if (bindings && Array.isArray(bindings) && bindings.length > 0) {
- bindings.forEach((binding: any) => {
+ bindings.forEach((binding: PortBinding) => {
if (binding.HostPort) {
const portType = containerPort.split('/')[1] || 'tcp';
parsedPorts.push(`${binding.HostPort}:${containerPort.split('/')[0]}/${portType}`);
diff --git a/src/routes/stacks/[stackId]/+page.svelte b/src/routes/stacks/[stackId]/+page.svelte
index e755cd81f..5d65a95b6 100644
--- a/src/routes/stacks/[stackId]/+page.svelte
+++ b/src/routes/stacks/[stackId]/+page.svelte
@@ -1,5 +1,6 @@
<script lang="ts">
import type { PageData } from './$types';
+ import type { Stack, StackService, StackPort } from '$lib/types/docker/stack.type';
import * as Card from '$lib/components/ui/card/index.js';
import { Button } from '$lib/components/ui/button/index.js';
import { ArrowLeft, Loader2, AlertCircle, Save, FileStack, Layers, ArrowRight, ExternalLink } from '@lucide/svelte';
@@ -60,18 +61,17 @@
async function handleSaveChanges() {
if (!stack || !hasChanges) return;
- // Store the original stack ID before saving, in case it changes
const currentStackId = stack.id;
handleApiResultWithCallbacks({
result: await tryCatch(stackApi.save(currentStackId, name, composeContent, envContent)),
message: 'Failed to Save Stack',
setLoadingState: (value) => (isLoading.saving = value),
- onSuccess: async (updatedStack) => {
+ onSuccess: async (updatedStack: Stack) => {
+ // Changed from any to Stack
console.log('Stack save successful', updatedStack);
toast.success('Stack updated successfully!');
- // Update local state for "original" values to reset hasChanges
originalName = updatedStack.name;
originalComposeContent = composeContent;
originalEnvContent = envContent;
@@ -88,7 +88,7 @@
});
}
- function getHostForService(service: any): string {
+ function getHostForService(service: StackService): string {
if (!service || !service.networkSettings?.Networks) return baseServerUrl;
const networks = service.networkSettings.Networks;
@@ -103,14 +103,8 @@
}
// Define a more specific interface for the port type
- interface Port {
- PublicPort?: number;
- PrivatePort?: number;
- Type?: string;
- [key: string]: any;
- }
- function getServicePortUrl(service: any, port: string | number | Port, protocol = 'http'): string {
+ function getServicePortUrl(service: StackService, port: string | number | StackPort, protocol = 'http'): string {
const host = getHostForService(service);
if (typeof port === 'string') {
@@ -169,7 +163,7 @@
{#if stack && servicePorts && Object.keys(servicePorts).length > 0}
{@const allUniquePorts = [...new Set(Object.values(servicePorts).flat())]}
<div class="flex flex-wrap gap-2 mt-2">
- {#each allUniquePorts as port}
+ {#each allUniquePorts as port (port)}
<a href={getServicePortUrl(stack, port)} target="_blank" rel="noopener noreferrer" class="inline-flex items-center px-2 py-1 rounded-md bg-blue-500/10 text-blue-600 dark:text-blue-400 text-xs font-medium hover:bg-blue-500/20 transition-colors">
Port {port}
<ExternalLink class="size-3 ml-1" />
diff --git a/src/routes/volumes/[volumeName]/+page.svelte b/src/routes/volumes/[volumeName]/+page.svelte
index 0e5203fcb..936f99721 100644
--- a/src/routes/volumes/[volumeName]/+page.svelte
+++ b/src/routes/volumes/[volumeName]/+page.svelte
@@ -4,7 +4,7 @@
import { Button } from '$lib/components/ui/button/index.js';
import { ArrowLeft, AlertCircle, HardDrive, Clock, Tag, Layers, Trash2, Loader2, Database, Globe, Info } from '@lucide/svelte';
import * as Breadcrumb from '$lib/components/ui/breadcrumb/index.js';
- import { goto, invalidateAll } from '$app/navigation';
+ import { goto } from '$app/navigation';
import * as Alert from '$lib/components/ui/alert/index.js';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
import { formatDate } from '$lib/utils/string.utils';
@@ -17,14 +17,12 @@
let { data, form }: { data: PageData; form: ActionData } = $props();
let { volume, inUse } = $derived(data);
- let isRefreshing = $state(false);
let isLoading = $state({ remove: false });
const createdDate = $derived(volume?.CreatedAt ? formatDate(volume.CreatedAt) : 'N/A');
const volumeApi = new VolumeAPIService();
async function handleRemoveVolumeConfirm(volumeName: string) {
- // Build a custom message that includes warnings for volumes in use
let message = 'Are you sure you want to delete this volume? This action cannot be undone.';
if (inUse) {