From a750259a2c231e555cc706533e84ffe3a797c57e Mon Sep 17 00:00:00 2001
From: matias-portainer <104775949+matias-portainer@users.noreply.github.com>
Date: Thu, 11 Aug 2022 22:23:13 -0300
Subject: [PATCH] fix(edge): generate new EdgeID only if not present (#7454)

---
 .../shared/EdgeAgentTab/EdgeAgentTab.tsx                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/react/portainer/environments/wizard/EnvironmentsCreationView/shared/EdgeAgentTab/EdgeAgentTab.tsx b/app/react/portainer/environments/wizard/EnvironmentsCreationView/shared/EdgeAgentTab/EdgeAgentTab.tsx
index 27c46357a..8dbafa540 100644
--- a/app/react/portainer/environments/wizard/EnvironmentsCreationView/shared/EdgeAgentTab/EdgeAgentTab.tsx
+++ b/app/react/portainer/environments/wizard/EnvironmentsCreationView/shared/EdgeAgentTab/EdgeAgentTab.tsx
@@ -59,7 +59,7 @@ export function EdgeAgentTab({
   );
 
   function handleCreate(environment: Environment) {
-    setEdgeInfo({ key: environment.EdgeKey, id: uuid() });
+    setEdgeInfo({ key: environment.EdgeKey, id: environment.EdgeID || uuid() });
     onCreate(environment);
   }