Merge pull request #3321 from galkremer1/CNV-75833-fix-useClusterObservabilityDisabled

CNV-75833: useClusterObservabilityDisabled should only be used in ACM

Author: openshift-merge-bot[bot]

src/utils/hooks/useAlerts/useAlerts.ts

@@ -103,7 +103,7 @@ const useAlerts: UseAlerts = () => {
   return {
     alerts: allAlerts,
     error: observabilityError || (isACMPage ? metricError : singleClusterAlerts.error),
-    loaded: isACMPage ? metricLoaded : singleClusterAlerts.loaded,
+    loaded: isACMPage ? metricLoaded && observabilityLoaded : singleClusterAlerts.loaded,
   };
 };
 

src/utils/hooks/useAlerts/utils/useClusterObservabilityDisabled.ts

@@ -4,6 +4,7 @@ import { modelToGroupVersionKind } from '@kubevirt-ui-ext/kubevirt-api/console';
 import useKubevirtWatchResource from '@kubevirt-utils/hooks/useKubevirtWatchResource/useKubevirtWatchResource';
 import { getLabel, getName } from '@kubevirt-utils/resources/shared';
 import { ManagedClusterModel } from '@multicluster/constants';
+import useIsACMPage from '@multicluster/useIsACMPage';
 import { K8sResourceCommon } from '@openshift-console/dynamic-plugin-sdk';
 import { useHubClusterName } from '@stolostron/multicluster-sdk';
 
@@ -33,6 +34,7 @@ export const useClusterObservabilityDisabled = (
   error: Error | unknown;
   loaded: boolean;
 } => {
+  const isACMPage = useIsACMPage();
   const [hubClusterName] = useHubClusterName();
 
   const [managedClusterData, loaded, loadError] = useKubevirtWatchResource<
@@ -46,7 +48,7 @@ export const useClusterObservabilityDisabled = (
   const { cnvInstalledClusters, loaded: cnvLoaded } = useClusterCNVInstalled();
 
   const { disabledClusters, enabledClusters: rawEnabledClusters } = useMemo(() => {
-    if (!managedClusterData) {
+    if (!isACMPage || !managedClusterData) {
       return { disabledClusters: [], enabledClusters: [] };
     }
 
@@ -79,7 +81,7 @@ export const useClusterObservabilityDisabled = (
     });
 
     return { disabledClusters: disabled, enabledClusters: enabled };
-  }, [managedClusterData]);
+  }, [isACMPage, managedClusterData]);
 
   const enabledClusters = useMemo(() => {
     if (!onlyCNVClusters || !cnvLoaded) {
@@ -88,6 +90,16 @@ export const useClusterObservabilityDisabled = (
     return rawEnabledClusters.filter((clusterName) => cnvInstalledClusters.includes(clusterName));
   }, [onlyCNVClusters, cnvLoaded, rawEnabledClusters, cnvInstalledClusters]);
 
+  // For non-ACM pages, return loaded=true immediately to avoid blocking consumers
+  if (!isACMPage) {
+    return {
+      disabledClusters: [],
+      enabledClusters: [],
+      error: undefined,
+      loaded: true,
+    };
+  }
+
   return {
     disabledClusters,
     enabledClusters,

src/views/clusteroverview/MigrationsTab/hooks/useMigrationCardData.ts

@@ -119,7 +119,7 @@ const useMigrationCardDataAndFilters: UseMigrationCardDataAndFilters = (duration
 
   return {
     filters,
-    loaded: vmimsLoaded && vmisLoaded,
+    loaded: vmimsLoaded && vmisLoaded && observabilityLoaded,
     loadErrors: observabilityError || vmimsErrors || vmisErrors,
     migrationsTableFilteredData: data,
     migrationsTableUnfilteredData: unfilteredData,

src/views/clusteroverview/OverviewTab/vm-statuses-card/VMStatusesCard.tsx

@@ -68,6 +68,7 @@ const VMStatusesCard: FC = () => {
   const { otherStatuses, otherStatusesCount, primaryStatuses } = getVMStatuses(vms || []);
 
   const displayError = observabilityError || error;
+  const isLoaded = loaded && observabilityLoaded;
 
   return (
     <Card className="vm-statuses-card" data-test-id="vm-statuses-card">
@@ -79,12 +80,12 @@ const VMStatusesCard: FC = () => {
           <ErrorAlert error={displayError} />
         </CardBody>
       )}
-      {!loaded && !displayError && (
+      {!isLoaded && !displayError && (
         <CardBody>
           <LoadingEmptyState />
         </CardBody>
       )}
-      {loaded && (
+      {isLoaded && (
         <>
           <div className="vm-statuses-card__body">
             <Grid hasGutter>