From 4a3fa6e63f7bee6f02a47b32ae1b7fd47e092264 Mon Sep 17 00:00:00 2001 From: Mauricio Siu Date: Fri, 8 May 2026 18:45:44 -0600 Subject: [PATCH] fix: reorder imports and clean up unused ones across various components --- .../components/dashboard/application/domains/columns.tsx | 4 ++-- .../compose/containers/show-compose-containers.tsx | 8 ++++---- .../general/generic/save-gitea-provider-compose.tsx | 2 +- .../dashboard/docker/mounts/show-container-mounts.tsx | 2 +- .../dashboard/docker/networks/show-container-networks.tsx | 2 +- .../dashboard/docker/upload/upload-file-modal.tsx | 2 +- .../mariadb/general/show-internal-mariadb-credentials.tsx | 2 +- .../mongo/general/show-internal-mongo-credentials.tsx | 2 +- .../mysql/general/show-internal-mysql-credentials.tsx | 2 +- .../general/show-internal-postgres-credentials.tsx | 2 +- .../dokploy/components/dashboard/project/add-template.tsx | 2 +- .../redis/general/show-internal-redis-credentials.tsx | 2 +- .../dashboard/settings/billing/show-billing.tsx | 2 +- .../settings/servers/actions/toggle-docker-cleanup.tsx | 4 ++-- .../dashboard/settings/users/add-permissions.tsx | 2 +- apps/dokploy/pages/dashboard/swarm.tsx | 2 +- apps/dokploy/server/api/routers/ai.ts | 2 +- apps/dokploy/server/api/routers/libsql.ts | 2 +- apps/dokploy/server/api/routers/mysql.ts | 2 +- apps/dokploy/server/api/routers/postgres.ts | 2 +- apps/dokploy/server/api/routers/redis.ts | 2 +- apps/dokploy/server/api/routers/server.ts | 2 +- packages/server/src/index.ts | 2 +- packages/server/src/utils/backups/web-server.ts | 2 +- 24 files changed, 29 insertions(+), 29 deletions(-) diff --git a/apps/dokploy/components/dashboard/application/domains/columns.tsx b/apps/dokploy/components/dashboard/application/domains/columns.tsx index cd8254aa0..518063835 100644 --- a/apps/dokploy/components/dashboard/application/domains/columns.tsx +++ b/apps/dokploy/components/dashboard/application/domains/columns.tsx @@ -21,9 +21,9 @@ import { TooltipTrigger, } from "@/components/ui/tooltip"; import type { RouterOutputs } from "@/utils/api"; -import type { ValidationStates } from "./show-domains"; -import { AddDomain } from "./handle-domain"; import { DnsHelperModal } from "./dns-helper-modal"; +import { AddDomain } from "./handle-domain"; +import type { ValidationStates } from "./show-domains"; export type Domain = | RouterOutputs["domain"]["byApplicationId"][0] diff --git a/apps/dokploy/components/dashboard/compose/containers/show-compose-containers.tsx b/apps/dokploy/components/dashboard/compose/containers/show-compose-containers.tsx index 7787d00e7..fb9016fb9 100644 --- a/apps/dokploy/components/dashboard/compose/containers/show-compose-containers.tsx +++ b/apps/dokploy/components/dashboard/compose/containers/show-compose-containers.tsx @@ -2,6 +2,10 @@ import { Loader2, MoreHorizontal, RefreshCw } from "lucide-react"; import dynamic from "next/dynamic"; import { useState } from "react"; import { toast } from "sonner"; +import { ShowContainerConfig } from "@/components/dashboard/docker/config/show-container-config"; +import { ShowContainerMounts } from "@/components/dashboard/docker/mounts/show-container-mounts"; +import { ShowContainerNetworks } from "@/components/dashboard/docker/networks/show-container-networks"; +import { DockerTerminalModal } from "@/components/dashboard/docker/terminal/docker-terminal-modal"; import { Badge } from "@/components/ui/badge"; import { Button } from "@/components/ui/button"; import { @@ -36,10 +40,6 @@ import { TableRow, } from "@/components/ui/table"; import { api } from "@/utils/api"; -import { ShowContainerConfig } from "@/components/dashboard/docker/config/show-container-config"; -import { ShowContainerMounts } from "@/components/dashboard/docker/mounts/show-container-mounts"; -import { ShowContainerNetworks } from "@/components/dashboard/docker/networks/show-container-networks"; -import { DockerTerminalModal } from "@/components/dashboard/docker/terminal/docker-terminal-modal"; const DockerLogsId = dynamic( () => diff --git a/apps/dokploy/components/dashboard/compose/general/generic/save-gitea-provider-compose.tsx b/apps/dokploy/components/dashboard/compose/general/generic/save-gitea-provider-compose.tsx index 7ea71fc89..a7277f406 100644 --- a/apps/dokploy/components/dashboard/compose/general/generic/save-gitea-provider-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/general/generic/save-gitea-provider-compose.tsx @@ -1,5 +1,5 @@ import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema"; -import { CheckIcon, ChevronsUpDown, Plus, X, HelpCircle } from "lucide-react"; +import { CheckIcon, ChevronsUpDown, HelpCircle, Plus, X } from "lucide-react"; import Link from "next/link"; import { useEffect } from "react"; import { useForm } from "react-hook-form"; diff --git a/apps/dokploy/components/dashboard/docker/mounts/show-container-mounts.tsx b/apps/dokploy/components/dashboard/docker/mounts/show-container-mounts.tsx index 0c1832fc2..2fca83fe4 100644 --- a/apps/dokploy/components/dashboard/docker/mounts/show-container-mounts.tsx +++ b/apps/dokploy/components/dashboard/docker/mounts/show-container-mounts.tsx @@ -1,3 +1,4 @@ +import { Badge } from "@/components/ui/badge"; import { Dialog, DialogContent, @@ -15,7 +16,6 @@ import { TableHeader, TableRow, } from "@/components/ui/table"; -import { Badge } from "@/components/ui/badge"; import { api } from "@/utils/api"; interface Props { diff --git a/apps/dokploy/components/dashboard/docker/networks/show-container-networks.tsx b/apps/dokploy/components/dashboard/docker/networks/show-container-networks.tsx index 12a015b3a..a9555fb7d 100644 --- a/apps/dokploy/components/dashboard/docker/networks/show-container-networks.tsx +++ b/apps/dokploy/components/dashboard/docker/networks/show-container-networks.tsx @@ -1,3 +1,4 @@ +import { Badge } from "@/components/ui/badge"; import { Dialog, DialogContent, @@ -15,7 +16,6 @@ import { TableHeader, TableRow, } from "@/components/ui/table"; -import { Badge } from "@/components/ui/badge"; import { api } from "@/utils/api"; interface Props { diff --git a/apps/dokploy/components/dashboard/docker/upload/upload-file-modal.tsx b/apps/dokploy/components/dashboard/docker/upload/upload-file-modal.tsx index 8838ac094..bbf640e45 100644 --- a/apps/dokploy/components/dashboard/docker/upload/upload-file-modal.tsx +++ b/apps/dokploy/components/dashboard/docker/upload/upload-file-modal.tsx @@ -26,8 +26,8 @@ import { import { Input } from "@/components/ui/input"; import { api } from "@/utils/api"; import { - uploadFileToContainerSchema, type UploadFileToContainer, + uploadFileToContainerSchema, } from "@/utils/schema"; interface Props { diff --git a/apps/dokploy/components/dashboard/mariadb/general/show-internal-mariadb-credentials.tsx b/apps/dokploy/components/dashboard/mariadb/general/show-internal-mariadb-credentials.tsx index 8a99300ad..04d431fa1 100644 --- a/apps/dokploy/components/dashboard/mariadb/general/show-internal-mariadb-credentials.tsx +++ b/apps/dokploy/components/dashboard/mariadb/general/show-internal-mariadb-credentials.tsx @@ -1,10 +1,10 @@ +import { toast } from "sonner"; import { ToggleVisibilityInput } from "@/components/shared/toggle-visibility-input"; import { UpdateDatabasePassword } from "@/components/shared/update-database-password"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { Input } from "@/components/ui/input"; import { Label } from "@/components/ui/label"; import { api } from "@/utils/api"; -import { toast } from "sonner"; interface Props { mariadbId: string; diff --git a/apps/dokploy/components/dashboard/mongo/general/show-internal-mongo-credentials.tsx b/apps/dokploy/components/dashboard/mongo/general/show-internal-mongo-credentials.tsx index c1e03716c..ef38fe3cb 100644 --- a/apps/dokploy/components/dashboard/mongo/general/show-internal-mongo-credentials.tsx +++ b/apps/dokploy/components/dashboard/mongo/general/show-internal-mongo-credentials.tsx @@ -1,10 +1,10 @@ +import { toast } from "sonner"; import { ToggleVisibilityInput } from "@/components/shared/toggle-visibility-input"; import { UpdateDatabasePassword } from "@/components/shared/update-database-password"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { Input } from "@/components/ui/input"; import { Label } from "@/components/ui/label"; import { api } from "@/utils/api"; -import { toast } from "sonner"; interface Props { mongoId: string; diff --git a/apps/dokploy/components/dashboard/mysql/general/show-internal-mysql-credentials.tsx b/apps/dokploy/components/dashboard/mysql/general/show-internal-mysql-credentials.tsx index 4f91c7efc..39937badd 100644 --- a/apps/dokploy/components/dashboard/mysql/general/show-internal-mysql-credentials.tsx +++ b/apps/dokploy/components/dashboard/mysql/general/show-internal-mysql-credentials.tsx @@ -1,10 +1,10 @@ +import { toast } from "sonner"; import { ToggleVisibilityInput } from "@/components/shared/toggle-visibility-input"; import { UpdateDatabasePassword } from "@/components/shared/update-database-password"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { Input } from "@/components/ui/input"; import { Label } from "@/components/ui/label"; import { api } from "@/utils/api"; -import { toast } from "sonner"; interface Props { mysqlId: string; diff --git a/apps/dokploy/components/dashboard/postgres/general/show-internal-postgres-credentials.tsx b/apps/dokploy/components/dashboard/postgres/general/show-internal-postgres-credentials.tsx index 30e265577..3d1b1032e 100644 --- a/apps/dokploy/components/dashboard/postgres/general/show-internal-postgres-credentials.tsx +++ b/apps/dokploy/components/dashboard/postgres/general/show-internal-postgres-credentials.tsx @@ -1,10 +1,10 @@ +import { toast } from "sonner"; import { ToggleVisibilityInput } from "@/components/shared/toggle-visibility-input"; import { UpdateDatabasePassword } from "@/components/shared/update-database-password"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { Input } from "@/components/ui/input"; import { Label } from "@/components/ui/label"; import { api } from "@/utils/api"; -import { toast } from "sonner"; interface Props { postgresId: string; diff --git a/apps/dokploy/components/dashboard/project/add-template.tsx b/apps/dokploy/components/dashboard/project/add-template.tsx index 959afe905..a4c50c178 100644 --- a/apps/dokploy/components/dashboard/project/add-template.tsx +++ b/apps/dokploy/components/dashboard/project/add-template.tsx @@ -1,6 +1,6 @@ import { - BookText, Bookmark, + BookText, CheckIcon, ChevronsUpDown, Globe, diff --git a/apps/dokploy/components/dashboard/redis/general/show-internal-redis-credentials.tsx b/apps/dokploy/components/dashboard/redis/general/show-internal-redis-credentials.tsx index 2245e724e..3dd6814a2 100644 --- a/apps/dokploy/components/dashboard/redis/general/show-internal-redis-credentials.tsx +++ b/apps/dokploy/components/dashboard/redis/general/show-internal-redis-credentials.tsx @@ -1,10 +1,10 @@ +import { toast } from "sonner"; import { ToggleVisibilityInput } from "@/components/shared/toggle-visibility-input"; import { UpdateDatabasePassword } from "@/components/shared/update-database-password"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { Input } from "@/components/ui/input"; import { Label } from "@/components/ui/label"; import { api } from "@/utils/api"; -import { toast } from "sonner"; interface Props { redisId: string; diff --git a/apps/dokploy/components/dashboard/settings/billing/show-billing.tsx b/apps/dokploy/components/dashboard/settings/billing/show-billing.tsx index acfd241ff..13525a37c 100644 --- a/apps/dokploy/components/dashboard/settings/billing/show-billing.tsx +++ b/apps/dokploy/components/dashboard/settings/billing/show-billing.tsx @@ -25,7 +25,6 @@ import { CardHeader, CardTitle, } from "@/components/ui/card"; -import { NumberInput } from "@/components/ui/input"; import { Dialog, DialogContent, @@ -34,6 +33,7 @@ import { DialogTitle, DialogTrigger, } from "@/components/ui/dialog"; +import { NumberInput } from "@/components/ui/input"; import { Label } from "@/components/ui/label"; import { Progress } from "@/components/ui/progress"; import { Switch } from "@/components/ui/switch"; diff --git a/apps/dokploy/components/dashboard/settings/servers/actions/toggle-docker-cleanup.tsx b/apps/dokploy/components/dashboard/settings/servers/actions/toggle-docker-cleanup.tsx index 9520a7f7a..33b297006 100644 --- a/apps/dokploy/components/dashboard/settings/servers/actions/toggle-docker-cleanup.tsx +++ b/apps/dokploy/components/dashboard/settings/servers/actions/toggle-docker-cleanup.tsx @@ -1,3 +1,5 @@ +import { HelpCircle } from "lucide-react"; +import { toast } from "sonner"; import { Label } from "@/components/ui/label"; import { Switch } from "@/components/ui/switch"; import { @@ -7,8 +9,6 @@ import { TooltipTrigger, } from "@/components/ui/tooltip"; import { api } from "@/utils/api"; -import { HelpCircle } from "lucide-react"; -import { toast } from "sonner"; interface Props { serverId?: string; diff --git a/apps/dokploy/components/dashboard/settings/users/add-permissions.tsx b/apps/dokploy/components/dashboard/settings/users/add-permissions.tsx index 073ed663d..e54140bbf 100644 --- a/apps/dokploy/components/dashboard/settings/users/add-permissions.tsx +++ b/apps/dokploy/components/dashboard/settings/users/add-permissions.tsx @@ -3,6 +3,7 @@ import { useEffect, useState } from "react"; import { useForm } from "react-hook-form"; import { toast } from "sonner"; import { z } from "zod"; +import { EnterpriseFeatureLocked } from "@/components/proprietary/enterprise-feature-gate"; import { AlertBlock } from "@/components/shared/alert-block"; import { Button } from "@/components/ui/button"; import { Checkbox } from "@/components/ui/checkbox"; @@ -26,7 +27,6 @@ import { FormMessage, } from "@/components/ui/form"; import { Switch } from "@/components/ui/switch"; -import { EnterpriseFeatureLocked } from "@/components/proprietary/enterprise-feature-gate"; import { api, type RouterOutputs } from "@/utils/api"; /** Shape returned by project.allForPermissions (admin only). Used for the permissions UI. */ diff --git a/apps/dokploy/pages/dashboard/swarm.tsx b/apps/dokploy/pages/dashboard/swarm.tsx index c8a5a4bf1..40bdc0e71 100644 --- a/apps/dokploy/pages/dashboard/swarm.tsx +++ b/apps/dokploy/pages/dashboard/swarm.tsx @@ -4,8 +4,8 @@ import { createServerSideHelpers } from "@trpc/react-query/server"; import type { GetServerSidePropsContext } from "next"; import type { ReactElement } from "react"; import superjson from "superjson"; -import SwarmMonitorCard from "@/components/dashboard/swarm/monitoring-card"; import { ShowSwarmContainers } from "@/components/dashboard/swarm/containers/show-swarm-containers"; +import SwarmMonitorCard from "@/components/dashboard/swarm/monitoring-card"; import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { Card } from "@/components/ui/card"; import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; diff --git a/apps/dokploy/server/api/routers/ai.ts b/apps/dokploy/server/api/routers/ai.ts index 3a299235a..81e03fe26 100644 --- a/apps/dokploy/server/api/routers/ai.ts +++ b/apps/dokploy/server/api/routers/ai.ts @@ -25,8 +25,8 @@ import { findProjectById } from "@dokploy/server/services/project"; import { getProviderHeaders, getProviderName, - selectAIProvider, type Model, + selectAIProvider, } from "@dokploy/server/utils/ai/select-ai-provider"; import { TRPCError } from "@trpc/server"; import { generateText } from "ai"; diff --git a/apps/dokploy/server/api/routers/libsql.ts b/apps/dokploy/server/api/routers/libsql.ts index 47798393e..77fff4e59 100644 --- a/apps/dokploy/server/api/routers/libsql.ts +++ b/apps/dokploy/server/api/routers/libsql.ts @@ -6,6 +6,7 @@ import { findEnvironmentById, findLibsqlById, findProjectById, + getAccessibleServerIds, getContainerLogs, IS_CLOUD, rebuildDatabase, @@ -16,7 +17,6 @@ import { stopService, stopServiceRemote, updateLibsqlById, - getAccessibleServerIds, } from "@dokploy/server"; import { addNewService, diff --git a/apps/dokploy/server/api/routers/mysql.ts b/apps/dokploy/server/api/routers/mysql.ts index 263fa53f0..56350d285 100644 --- a/apps/dokploy/server/api/routers/mysql.ts +++ b/apps/dokploy/server/api/routers/mysql.ts @@ -9,6 +9,7 @@ import { findEnvironmentById, findMySqlById, findProjectById, + getAccessibleServerIds, getContainerLogs, getServiceContainerCommand, IS_CLOUD, @@ -20,7 +21,6 @@ import { stopService, stopServiceRemote, updateMySqlById, - getAccessibleServerIds, } from "@dokploy/server"; import { db } from "@dokploy/server/db"; import { diff --git a/apps/dokploy/server/api/routers/postgres.ts b/apps/dokploy/server/api/routers/postgres.ts index 33d8fd3f4..0b263100d 100644 --- a/apps/dokploy/server/api/routers/postgres.ts +++ b/apps/dokploy/server/api/routers/postgres.ts @@ -9,6 +9,7 @@ import { findEnvironmentById, findPostgresById, findProjectById, + getAccessibleServerIds, getContainerLogs, getMountPath, getServiceContainerCommand, @@ -21,7 +22,6 @@ import { stopService, stopServiceRemote, updatePostgresById, - getAccessibleServerIds, } from "@dokploy/server"; import { db } from "@dokploy/server/db"; import { diff --git a/apps/dokploy/server/api/routers/redis.ts b/apps/dokploy/server/api/routers/redis.ts index a1e912e0b..a8664f664 100644 --- a/apps/dokploy/server/api/routers/redis.ts +++ b/apps/dokploy/server/api/routers/redis.ts @@ -8,6 +8,7 @@ import { findEnvironmentById, findProjectById, findRedisById, + getAccessibleServerIds, getContainerLogs, getServiceContainerCommand, IS_CLOUD, @@ -19,7 +20,6 @@ import { stopService, stopServiceRemote, updateRedisById, - getAccessibleServerIds, } from "@dokploy/server"; import { db } from "@dokploy/server/db"; import { diff --git a/apps/dokploy/server/api/routers/server.ts b/apps/dokploy/server/api/routers/server.ts index 85f23ec0e..310363efd 100644 --- a/apps/dokploy/server/api/routers/server.ts +++ b/apps/dokploy/server/api/routers/server.ts @@ -5,6 +5,7 @@ import { findServerById, findServersByUserId, findUserById, + getAccessibleServerIds, getPublicIpWithFallback, haveActiveServices, IS_CLOUD, @@ -14,7 +15,6 @@ import { serverValidate, setupMonitoring, updateServerById, - getAccessibleServerIds, } from "@dokploy/server"; import { db } from "@dokploy/server/db"; import { hasValidLicense } from "@dokploy/server/services/proprietary/license-key"; diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index 717c20246..0028fc65c 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -108,7 +108,6 @@ export * from "./utils/notifications/docker-cleanup"; export * from "./utils/notifications/dokploy-restart"; export * from "./utils/notifications/server-threshold"; export * from "./utils/notifications/utils"; -export * from "./verification/send-verification-email"; export * from "./utils/process/execAsync"; export * from "./utils/process/spawnAsync"; export * from "./utils/providers/bitbucket"; @@ -134,4 +133,5 @@ export * from "./utils/traefik/types"; export * from "./utils/traefik/web-server"; export * from "./utils/volume-backups/index"; export * from "./utils/watch-paths/should-deploy"; +export * from "./verification/send-verification-email"; export * from "./wss/utils"; diff --git a/packages/server/src/utils/backups/web-server.ts b/packages/server/src/utils/backups/web-server.ts index 19975cd6f..712cc0809 100644 --- a/packages/server/src/utils/backups/web-server.ts +++ b/packages/server/src/utils/backups/web-server.ts @@ -18,7 +18,7 @@ function formatBytes(bytes?: number) { if (bytes === 0) return "0 B"; const sizes = ["B", "KB", "MB", "GB", "TB"]; const i = Math.floor(Math.log(bytes) / Math.log(1024)); - const value = bytes / Math.pow(1024, i); + const value = bytes / 1024 ** i; return `${value.toFixed(2)} ${sizes[i]} (${bytes} bytes)`; }