From 074077fe097266ac50e078b96503c57d9576a9c3 Mon Sep 17 00:00:00 2001
From: Elay Aharoni <elayaha@gmail.com>
Date: Tue, 30 Dec 2025 18:32:15 +0200
Subject: [PATCH] Assisted Installer OVE UI shows transient blank page with
 Technology Preview spinner

Signed-off-by: Elay Aharoni <elayaha@gmail.com>
---
 libs/ui-lib/lib/ocm/hooks/useInfraEnvId.ts       | 4 ++--
 libs/ui-lib/lib/ocm/services/InfraEnvsService.ts | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libs/ui-lib/lib/ocm/hooks/useInfraEnvId.ts b/libs/ui-lib/lib/ocm/hooks/useInfraEnvId.ts
index 8dca06a67a..1e9ddd2c40 100644
--- a/libs/ui-lib/lib/ocm/hooks/useInfraEnvId.ts
+++ b/libs/ui-lib/lib/ocm/hooks/useInfraEnvId.ts
@@ -55,12 +55,12 @@ export default function useInfraEnvId(
   ]);
 
   React.useEffect(() => {
-    if (!clusterId) {
+    if (!clusterId && !isSingleClusterFeatureEnabled) {
       setError('Missing clusterId to load infrastructure environment');
     } else if (!infraEnvId) {
       void findInfraEnvId();
     }
-  }, [clusterId, findInfraEnvId, infraEnvId]);
+  }, [clusterId, findInfraEnvId, infraEnvId, isSingleClusterFeatureEnabled]);
 
   return { infraEnvId, error };
 }
diff --git a/libs/ui-lib/lib/ocm/services/InfraEnvsService.ts b/libs/ui-lib/lib/ocm/services/InfraEnvsService.ts
index d122399700..35d5f7ceae 100644
--- a/libs/ui-lib/lib/ocm/services/InfraEnvsService.ts
+++ b/libs/ui-lib/lib/ocm/services/InfraEnvsService.ts
@@ -21,7 +21,10 @@ const InfraEnvsService = {
       const { data: infraEnvs } = await InfraEnvsAPI.list(
         !isSingleClusterFeatureEnabled ? clusterId : '',
       );
-      if (infraEnvs.length > 0) {
+      if (isSingleClusterFeatureEnabled) {
+        return infraEnvs[0].id;
+      }
+      if (infraEnvs.length > 0 && clusterId) {
         InfraEnvCache.updateInfraEnvs(clusterId, infraEnvs);
         infraEnvId = InfraEnvCache.getInfraEnvId(clusterId, cpuArchitecture);
       }