From 81949295588d410a460be4ab3336e77bd8e7a5f8 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Mon, 1 Sep 2025 23:15:44 -0600
Subject: [PATCH] refactor: improve project navigation logic by ensuring proper
 handling of projectId and environmentId, enhancing routing clarity and user
 experience

---
 .../components/dashboard/projects/handle-project.tsx     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/dokploy/components/dashboard/projects/handle-project.tsx b/apps/dokploy/components/dashboard/projects/handle-project.tsx
index d9aad3b8e..a98c81b00 100644
--- a/apps/dokploy/components/dashboard/projects/handle-project.tsx
+++ b/apps/dokploy/components/dashboard/projects/handle-project.tsx
@@ -101,9 +101,12 @@ export const HandleProject = ({ projectId }: Props) => {
 				toast.success(projectId ? "Project Updated" : "Project Created");
 				setIsOpen(false);
 				if (!projectId) {
-					router.push(
-						`/dashboard/project/${data?.project?.projectId}/environment/${data?.environment?.environmentId}`,
-					);
+					const projectIdToUse =  data && 'project' in data ? data.project.projectId : undefined;
+					const environmentIdToUse = data && 'environment' in data ? data.environment.environmentId : undefined;
+					
+					if (environmentIdToUse && projectIdToUse) {
+						router.push(`/dashboard/project/${projectIdToUse}/environment/${environmentIdToUse}`);
+					} 
 				} else {
 					refetch();
 				}