refactor: enhance project and environment handling across components and services by replacing projectId with environmentId, improving context clarity and authorization checks

apps/dokploy/__test__/drop/drop.test.ts

@@ -56,13 +56,20 @@ const baseApp: ApplicationNested = {
 	previewPort: 3000,
 	previewLimit: 0,
 	previewWildcard: "",
-	project: {
-		env: "",
-		organizationId: "",
+	environment: {
+		environmentId: "",
 		name: "",
-		description: "",
 		createdAt: "",
+		description: "",
 		projectId: "",
+		project: {
+			env: "",
+			organizationId: "",
+			name: "",
+			description: "",
+			createdAt: "",
+			projectId: "",
+		},
 	},
 	buildArgs: null,
 	buildPath: "/",
@@ -92,6 +99,7 @@ const baseApp: ApplicationNested = {
 	dockerfile: null,
 	dockerImage: null,
 	dropBuildPath: null,
+	environmentId: "",
 	enabled: null,
 	env: null,
 	healthCheckSwarm: null,
@@ -106,7 +114,6 @@ const baseApp: ApplicationNested = {
 	password: null,
 	placementSwarm: null,
 	ports: [],
-	projectId: "",
 	publishDirectory: null,
 	isStaticSpa: null,
 	redirects: [],

apps/dokploy/__test__/traefik/traefik.test.ts

@@ -36,13 +36,21 @@ const baseApp: ApplicationNested = {
 	previewLimit: 0,
 	previewCustomCertResolver: null,
 	previewWildcard: "",
-	project: {
-		env: "",
-		organizationId: "",
+	environmentId: "",
+	environment: {
+		environmentId: "",
 		name: "",
-		description: "",
 		createdAt: "",
+		description: "",
 		projectId: "",
+		project: {
+			env: "",
+			organizationId: "",
+			name: "",
+			description: "",
+			createdAt: "",
+			projectId: "",
+		},
 	},
 	buildPath: "/",
 	gitlabPathNamespace: "",
@@ -85,7 +93,6 @@ const baseApp: ApplicationNested = {
 	password: null,
 	placementSwarm: null,
 	ports: [],
-	projectId: "",
 	publishDirectory: null,
 	isStaticSpa: null,
 	redirects: [],

apps/dokploy/components/dashboard/compose/delete-service.tsx

@@ -101,7 +101,7 @@ export const DeleteService = ({ id, type }: Props) => {
 				deleteVolumes,
 			})
 				.then((result) => {
-					push(`/dashboard/project/${result?.projectId}`);
+					push(`/dashboard/project/${result?.environment?.projectId}/environment/${result?.environment?.environmentId}`);
 					toast.success("deleted successfully");
 					setIsOpen(false);
 				})

apps/dokploy/components/dashboard/project/advanced-environment-selector.tsx

@@ -33,7 +33,7 @@ import { Badge } from "@/components/ui/badge";
 import { AlertBlock } from "@/components/shared/alert-block";
 import { findEnvironmentById } from "@dokploy/server";
 
-type Environment = Awaited<ReturnType<typeof findEnvironmentById>>;
+type Environment = Omit<Awaited<ReturnType<typeof findEnvironmentById>>, "project">;
 interface AdvancedEnvironmentSelectorProps {
 	projectId: string;
 	currentEnvironmentId?: string;
@@ -242,17 +242,6 @@ export const AdvancedEnvironmentSelector = ({
 									>
 										<PencilIcon className="h-3 w-3" />
 									</Button>
-									{/* <Button
-										variant="ghost"
-										size="sm"
-										className="h-6 w-6 p-0"
-										onClick={(e) => {
-											e.stopPropagation();
-											handleDuplicateEnvironment(environment);
-										}}
-									>
-										<CopyIcon className="h-3 w-3" />
-									</Button> */}
 									<Button
 										variant="ghost"
 										size="sm"

apps/dokploy/components/dashboard/projects/handle-project.tsx

@@ -101,7 +101,7 @@ export const HandleProject = ({ projectId }: Props) => {
 				toast.success(projectId ? "Project Updated" : "Project Created");
 				setIsOpen(false);
 				if (!projectId) {
-					router.push(`/dashboard/project/${data?.projectId}`);
+					router.push(`/dashboard/project/${data?.project?.projectId}/environment/${data?.environment?.environmentId}`);
 				} else {
 					refetch();
 				}

apps/dokploy/pages/api/deploy/compose/[refreshToken].ts

@@ -27,7 +27,11 @@ export default async function handler(
 		const composeResult = await db.query.compose.findFirst({
 			where: eq(compose.refreshToken, refreshToken as string),
 			with: {
-				project: true,
+				environment: {
+					with: {
+						project: true,
+					},
+				},
 				bitbucket: true,
 			},
 		});

apps/dokploy/server/api/routers/application.ts

@@ -255,7 +255,7 @@ export const applicationRouter = createTRPCRouter({
 				} catch (_) {}
 			}
 
-			return result[0];
+			return application;
 		}),
 
 	stop: protectedProcedure

apps/dokploy/server/api/routers/compose.ts

@@ -208,7 +208,6 @@ export const composeRouter = createTRPCRouter({
 					message: "You are not authorized to delete this compose",
 				});
 			}
-			4;
 
 			const result = await db
 				.delete(composeTable)
@@ -227,7 +226,7 @@ export const composeRouter = createTRPCRouter({
 				} catch (_) {}
 			}
 
-			return result[0];
+			return composeResult;
 		}),
 	cleanQueues: protectedProcedure
 		.input(apiFindCompose)

apps/dokploy/server/api/routers/redirects.ts

@@ -19,7 +19,7 @@ export const redirectsRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !== ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -34,7 +34,7 @@ export const redirectsRouter = createTRPCRouter({
 			const redirect = await findRedirectById(input.redirectId);
 			const application = await findApplicationById(redirect.applicationId);
 			if (
-				application.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !== ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -49,7 +49,7 @@ export const redirectsRouter = createTRPCRouter({
 			const redirect = await findRedirectById(input.redirectId);
 			const application = await findApplicationById(redirect.applicationId);
 			if (
-				application.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !== ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -64,7 +64,7 @@ export const redirectsRouter = createTRPCRouter({
 			const redirect = await findRedirectById(input.redirectId);
 			const application = await findApplicationById(redirect.applicationId);
 			if (
-				application.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !== ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",