From 67d1d835c6ff51608f1554cdd2a6f97e23e8a902 Mon Sep 17 00:00:00 2001
From: Gilad Shoham <shoham.gilad@gmail.com>
Date: Mon, 15 Apr 2024 14:35:58 +0300
Subject: [PATCH] fix(templates) - resolve env id set by template to add env
 version to generated component

---
 scopes/generator/generator/component-generator.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/scopes/generator/generator/component-generator.ts b/scopes/generator/generator/component-generator.ts
index db0b46f2dcbc..ba396e2f2d4d 100644
--- a/scopes/generator/generator/component-generator.ts
+++ b/scopes/generator/generator/component-generator.ts
@@ -224,7 +224,15 @@ export class ComponentGenerator {
         setBy: hasEnvConfiguredOriginally ? 'workspace variants' : '<default>',
       };
     };
-    const { envId, setBy } = getEnvData();
+    // eslint-disable-next-line prefer-const
+    let { envId, setBy } = getEnvData();
+    if (envId) {
+      const isInWorkspace = this.workspace.exists(envId);
+      const isSameAsThisEnvId = envId === this.envId?.toString() || envId === this.envId?.toStringWithoutVersion();
+      if (isSameAsThisEnvId && this.envId) {
+        envId = isInWorkspace ? this.envId.toStringWithoutVersion() : this.envId.toString();
+      }
+    }
     return {
       id: componentId,
       dir: componentPath,