From 3d5ba203f9f597be71673aae68ca5c7849887f00 Mon Sep 17 00:00:00 2001
From: Craig O'Donnell <craig@replicated.com>
Date: Fri, 1 Mar 2024 14:34:04 +0000
Subject: [PATCH] fix cluster upgrade modal not showing intermittently

---
 pkg/api/handlers/types/types.go |  2 ++
 pkg/embeddedcluster/util.go     | 25 ++++++++++++++++++++-----
 pkg/handlers/app.go             | 16 +++++++++++++---
 web/src/utilities/utilities.js  | 23 +++++++++++++++++------
 4 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/pkg/api/handlers/types/types.go b/pkg/api/handlers/types/types.go
index 7d3301a33f..6df5a0a619 100644
--- a/pkg/api/handlers/types/types.go
+++ b/pkg/api/handlers/types/types.go
@@ -97,6 +97,8 @@ type ResponseCluster struct {
 	RequiresUpgrade bool `json:"requiresUpgrade"`
 	// State represents the current state of the most recently deployed embedded cluster config
 	State string `json:"state,omitempty"`
+	// NumInstallations represents the number of installation objects in the cluster
+	NumInstallations int `json:"numInstallations"`
 }
 
 type GetPendingAppResponse struct {
diff --git a/pkg/embeddedcluster/util.go b/pkg/embeddedcluster/util.go
index 4e606b5cbf..1521cb6871 100644
--- a/pkg/embeddedcluster/util.go
+++ b/pkg/embeddedcluster/util.go
@@ -60,6 +60,18 @@ func RequiresUpgrade(ctx context.Context, newcfg embeddedclusterv1beta1.ConfigSp
 
 // GetCurrentInstallation returns the most recent installation object from the cluster.
 func GetCurrentInstallation(ctx context.Context) (*embeddedclusterv1beta1.Installation, error) {
+	installations, err := ListInstallations(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to list installations: %w", err)
+	}
+	latest, err := GetLatestInstallation(ctx, installations)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get latest installation: %w", err)
+	}
+	return latest, nil
+}
+
+func ListInstallations(ctx context.Context) ([]embeddedclusterv1beta1.Installation, error) {
 	clientConfig, err := k8sutil.GetClusterConfig()
 	if err != nil {
 		return nil, fmt.Errorf("failed to get cluster config: %w", err)
@@ -75,14 +87,17 @@ func GetCurrentInstallation(ctx context.Context) (*embeddedclusterv1beta1.Instal
 	if err != nil {
 		return nil, fmt.Errorf("failed to list installations: %w", err)
 	}
-	if len(installationList.Items) == 0 {
+	return installationList.Items, nil
+}
+
+func GetLatestInstallation(ctx context.Context, installations []embeddedclusterv1beta1.Installation) (*embeddedclusterv1beta1.Installation, error) {
+	if len(installations) == 0 {
 		return nil, ErrNoInstallations
 	}
-	items := installationList.Items
-	sort.SliceStable(items, func(i, j int) bool {
-		return items[j].CreationTimestamp.Before(&items[i].CreationTimestamp)
+	sort.SliceStable(installations, func(i, j int) bool {
+		return installations[j].CreationTimestamp.Before(&installations[i].CreationTimestamp)
 	})
-	return &installationList.Items[0], nil
+	return &installations[0], nil
 }
 
 // ClusterConfig will extract the current cluster configuration from the latest installation
diff --git a/pkg/handlers/app.go b/pkg/handlers/app.go
index 6872854ee5..597482601a 100644
--- a/pkg/handlers/app.go
+++ b/pkg/handlers/app.go
@@ -341,11 +341,21 @@ func responseAppFromApp(a *apptypes.App) (*types.ResponseApp, error) {
 				return nil, errors.Wrap(err, "failed to check if cluster requires upgrade")
 			}
 
-			embeddedClusterInstallation, err := embeddedcluster.GetCurrentInstallation(context.TODO())
+			embeddedClusterInstallations, err := embeddedcluster.ListInstallations(context.TODO())
 			if err != nil {
-				return nil, errors.Wrap(err, "failed to get current installation")
+				return nil, errors.Wrap(err, "failed to list installations")
+			}
+
+			cluster.NumInstallations = len(embeddedClusterInstallations)
+
+			latestEmbeddedClusterInstallation, err := embeddedcluster.GetLatestInstallation(context.TODO(), embeddedClusterInstallations)
+			if err != nil {
+				return nil, errors.Wrap(err, "failed to get latest installation")
+			}
+
+			if latestEmbeddedClusterInstallation != nil {
+				cluster.State = string(latestEmbeddedClusterInstallation.Status.State)
 			}
-			cluster.State = string(embeddedClusterInstallation.Status.State)
 		}
 	}
 
diff --git a/web/src/utilities/utilities.js b/web/src/utilities/utilities.js
index e9d3ca4906..bcfd26e6b3 100644
--- a/web/src/utilities/utilities.js
+++ b/web/src/utilities/utilities.js
@@ -672,11 +672,22 @@ export const Utilities = {
     }
   },
 
-  isClusterUpgrading(state) {
-    const normalizedState = this.clusterState(state);
-    return (
-      normalizedState === "Upgrading" || normalizedState === "Upgrading addons"
-    );
+  isClusterUpgrading(cluster) {
+    if (!cluster) {
+      return false;
+    }
+    const normalizedState = this.clusterState(cluster.state);
+    if (normalizedState === "Upgrading" || normalizedState === "Upgrading addons") {
+      return true;
+    }
+
+    if (cluster.numInstallations > 1 && !cluster.state) {
+      // if there multiple installations and no state, assume it's upgrading
+      // as it's possible the downtime begins before a state is reported
+      return true;
+    }
+
+    return false;
   },
 
   isPendingClusterUpgrade(app) {
@@ -696,7 +707,7 @@ export const Utilities = {
     // and the cluster will upgrade or is already upgrading
     return (
       app.downstream?.cluster?.requiresUpgrade ||
-      Utilities.isClusterUpgrading(app.downstream?.cluster?.state)
+      Utilities.isClusterUpgrading(app.downstream?.cluster)
     );
   },