Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
chore: fix type errors
Kyle Mendell2c77075354b8
diff --git a/frontend/src/lib/components/sheets/create-network-sheet.svelte b/frontend/src/lib/components/sheets/create-network-sheet.svelteindex 796595d10..abeed9390 100644--- a/frontend/src/lib/components/sheets/create-network-sheet.svelte+++ b/frontend/src/lib/components/sheets/create-network-sheet.svelte@@ -255,32 +255,32 @@<p class="text-muted-foreground text-xs">{m.network_labels_description()}</p></div></div>- </Accordion.Content>- </Accordion.Item>-- <Accordion.Item value="options">- <Accordion.Trigger class="text-sm font-medium">{m.common_driver_options()}</Accordion.Trigger>- <Accordion.Content class="pt-4">- <div class="space-y-2">- <Label for="driver-options" class="text-sm font-medium">{m.common_driver_options()}</Label>- <Textarea- id="driver-options"- placeholder={m.network_driver_options_placeholder()}- disabled={isLoading}- rows={3}- bind:value={$inputs.driverOptions.value}- class={$inputs.driverOptions.error ? 'border-destructive' : ''}- />- {#if $inputs.driverOptions.error}- <p class="text-destructive text-xs">{$inputs.driverOptions.error}</p>- {/if}- <p class="text-muted-foreground text-xs">{m.network_driver_options_description()}</p>- </div>- </Accordion.Content>- </Accordion.Item>+ </Accordion.Content>+ </Accordion.Item>++ <Accordion.Item value="options">+ <Accordion.Trigger class="text-sm font-medium">{m.common_driver_options()}</Accordion.Trigger>+ <Accordion.Content class="pt-4">+ <div class="space-y-2">+ <Label for="driver-options" class="text-sm font-medium">{m.common_driver_options()}</Label>+ <Textarea+ id="driver-options"+ placeholder={m.network_driver_options_placeholder()}+ disabled={isLoading}+ rows={3}+ bind:value={$inputs.driverOptions.value}+ class={$inputs.driverOptions.error ? 'border-destructive' : ''}+ />+ {#if $inputs.driverOptions.error}+ <p class="text-destructive text-xs">{$inputs.driverOptions.error}</p>+ {/if}+ <p class="text-muted-foreground text-xs">{m.network_driver_options_description()}</p>+ </div>+ </Accordion.Content>+ </Accordion.Item>- <Accordion.Item value="ipam">- <Accordion.Trigger class="text-sm font-medium">{m.networks_ipam_title()}</Accordion.Trigger>+ <Accordion.Item value="ipam">+ <Accordion.Trigger class="text-sm font-medium">{m.networks_ipam_title()}</Accordion.Trigger><Accordion.Content class="pt-4"><div class="space-y-4"><div class="flex items-center space-x-2">diff --git a/frontend/src/lib/services/network-service.ts b/frontend/src/lib/services/network-service.tsindex 7a396f9ff..e1f87308a 100644--- a/frontend/src/lib/services/network-service.ts+++ b/frontend/src/lib/services/network-service.ts@@ -1,6 +1,6 @@import BaseAPIService from './api-service';import { environmentStore } from '$lib/stores/environment.store.svelte';-import type { NetworkSummaryDto, NetworkUsageCounts, NetworkCreateRequest } from '$lib/types/network.type';+import type { NetworkSummaryDto, NetworkUsageCounts, NetworkCreateRequest, NetworkCreateDto } from '$lib/types/network.type';import type { SearchPaginationSortRequest, Paginated } from '$lib/types/pagination.type';import type { NetworkCreateOptions } from 'dockerode';import { transformPaginationParams } from '$lib/utils/params.util';@@ -24,21 +24,11 @@ export class NetworkService extends BaseAPIService {return this.handleResponse(this.api.get(`/environments/${envId}/networks/${networkId}`));}- async createNetwork(options: NetworkCreateOptions): Promise<any> {+ async createNetwork(name: string, options: NetworkCreateDto): Promise<any> {const envId = await environmentStore.getCurrentEnvironmentId();const request: NetworkCreateRequest = {- name: options.Name || '',- options: {- Driver: options.Driver,- CheckDuplicate: options.CheckDuplicate,- Internal: options.Internal,- Attachable: options.Attachable,- Ingress: options.Ingress,- IPAM: options.IPAM,- EnableIPv6: options.EnableIPv6,- Options: options.Options,- Labels: options.Labels- }+ name,+ options};return this.handleResponse(this.api.post(`/environments/${envId}/networks`, request));}diff --git a/frontend/src/lib/types/network.type.ts b/frontend/src/lib/types/network.type.tsindex 788594686..445adac93 100644--- a/frontend/src/lib/types/network.type.ts+++ b/frontend/src/lib/types/network.type.ts@@ -1,29 +1,20 @@-export interface NetworkCreateOptions {- name: string;- driver?: string;- internal?: boolean;- attachable?: boolean;- ingress?: boolean;- ipam?: IPAMConfig;- enableIPv6?: boolean;- options?: Record<string, string>;- labels?: Record<string, string>;- checkDuplicate?: boolean;+import type { IPAM } from 'dockerode';++export interface NetworkCreateDto {+ Driver?: string;+ CheckDuplicate?: boolean;+ Internal?: boolean;+ Attachable?: boolean;+ Ingress?: boolean;+ IPAM?: IPAM;+ EnableIPv6?: boolean;+ Options?: Record<string, string>;+ Labels?: Record<string, string>;}export interface NetworkCreateRequest {name: string;- options: {- Driver?: string;- CheckDuplicate?: boolean;- Internal?: boolean;- Attachable?: boolean;- Ingress?: boolean;- IPAM?: IPAMConfig;- EnableIPv6?: boolean;- Options?: Record<string, string>;- Labels?: Record<string, string>;- };+ options: NetworkCreateDto;}export interface NetworkUsageCounts {diff --git a/frontend/src/routes/networks/+page.svelte b/frontend/src/routes/networks/+page.svelteindex 51153ec60..6d1d630cf 100644--- a/frontend/src/routes/networks/+page.svelte+++ b/frontend/src/routes/networks/+page.svelte@@ -3,6 +3,7 @@import EthernetPortIcon from '@lucide/svelte/icons/ethernet-port';import { toast } from 'svelte-sonner';import type { NetworkCreateOptions } from 'dockerode';+ import type { NetworkCreateDto } from '$lib/types/network.type';import { handleApiResultWithCallbacks } from '$lib/utils/api.util';import { tryCatch } from '$lib/utils/try-catch';import CreateNetworkSheet from '$lib/components/sheets/create-network-sheet.svelte';@@ -58,8 +59,19 @@async function handleCreateNetworkSubmit(options: NetworkCreateOptions) {isLoading.create = true;const name = options.Name?.trim() || m.common_unknown();+ const dto: NetworkCreateDto = {+ Driver: options.Driver,+ CheckDuplicate: options.CheckDuplicate,+ Internal: options.Internal,+ Attachable: options.Attachable,+ Ingress: options.Ingress,+ IPAM: options.IPAM,+ EnableIPv6: options.EnableIPv6,+ Options: options.Options,+ Labels: options.Labels+ };handleApiResultWithCallbacks({- result: await tryCatch(networkService.createNetwork(options)),+ result: await tryCatch(networkService.createNetwork(name, dto)),message: m.common_create_failed({ resource: `${m.resource_network()} "${name}"` }),setLoadingState: (value) => (isLoading.create = value),onSuccess: async () => {