From 78d8320f5eb4f7bc9871e24ed605697fd263210e Mon Sep 17 00:00:00 2001
From: Andrew Lavery <laverya@umich.edu>
Date: Tue, 16 Jan 2024 21:41:36 -0500
Subject: [PATCH 1/2] embedded cluster state display should not split up
 application state

---
 .../Dashboard/components/AppStatus.tsx        | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/web/src/features/Dashboard/components/AppStatus.tsx b/web/src/features/Dashboard/components/AppStatus.tsx
index db38a4f1e1..3b89758aff 100644
--- a/web/src/features/Dashboard/components/AppStatus.tsx
+++ b/web/src/features/Dashboard/components/AppStatus.tsx
@@ -109,35 +109,6 @@ export default class AppStatus extends Component<Props, State> {
             >
               {Utilities.toTitleCase(appStatus)}
             </span>
-            {!isEmpty(embeddedClusterState) && (
-              <>
-                <span className="tw-mr-1 tw-ml-4 tw-text-sm tw-text-gray-500">
-                  Cluster State:
-                </span>
-                <span
-                  className={`status-dot ${
-                    embeddedClusterState === "Installed"
-                      ? "u-color--success"
-                      : embeddedClusterState === "Installing" ||
-                        embeddedClusterState === "Enqueued"
-                      ? "u-color--warning"
-                      : "u-color--error"
-                  }`}
-                />
-                <span
-                  className={`u-fontSize--normal u-fontWeight--medium ${
-                    embeddedClusterState === "Installed"
-                      ? "u-textColor--bodyCopy"
-                      : embeddedClusterState === "Installing" ||
-                        embeddedClusterState === "Enqueued"
-                      ? "u-textColor--warning"
-                      : "u-textColor--error"
-                  }`}
-                >
-                  {Utilities.clusterState(embeddedClusterState)}
-                </span>
-              </>
-            )}
             {this.props.hasStatusInformers && (
               <span
                 onClick={this.props.onViewAppStatusDetails}
@@ -147,6 +118,35 @@ export default class AppStatus extends Component<Props, State> {
                 Details{" "}
               </span>
             )}
+            {!isEmpty(embeddedClusterState) && (
+                <>
+                <span className="tw-mr-1 tw-ml-4 tw-text-sm tw-text-gray-500">
+                  Cluster State:
+                </span>
+                  <span
+                      className={`status-dot ${
+                          embeddedClusterState === "Installed"
+                              ? "u-color--success"
+                              : embeddedClusterState === "Installing" ||
+                              embeddedClusterState === "Enqueued"
+                                  ? "u-color--warning"
+                                  : "u-color--error"
+                      }`}
+                  />
+                  <span
+                      className={`u-fontSize--normal u-fontWeight--medium ${
+                          embeddedClusterState === "Installed"
+                              ? "u-textColor--bodyCopy"
+                              : embeddedClusterState === "Installing" ||
+                              embeddedClusterState === "Enqueued"
+                                  ? "u-textColor--warning"
+                                  : "u-textColor--error"
+                      }`}
+                  >
+                  {Utilities.clusterState(embeddedClusterState)}
+                </span>
+                </>
+            )}
             <Link
               to={`${url}/config/${app?.downstream?.currentVersion?.sequence}`}
               className="link u-marginLeft--10 u-borderLeft--gray u-paddingLeft--10 u-fontSize--small"

From def32b469a6be34fe53e7b2c5da9b2407e57841b Mon Sep 17 00:00:00 2001
From: Andrew Lavery <laverya@umich.edu>
Date: Wed, 17 Jan 2024 10:57:06 -0500
Subject: [PATCH 2/2] fix fmt

---
 .../Dashboard/components/AppStatus.tsx        | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/web/src/features/Dashboard/components/AppStatus.tsx b/web/src/features/Dashboard/components/AppStatus.tsx
index 3b89758aff..454133d7fd 100644
--- a/web/src/features/Dashboard/components/AppStatus.tsx
+++ b/web/src/features/Dashboard/components/AppStatus.tsx
@@ -119,33 +119,33 @@ export default class AppStatus extends Component<Props, State> {
               </span>
             )}
             {!isEmpty(embeddedClusterState) && (
-                <>
+              <>
                 <span className="tw-mr-1 tw-ml-4 tw-text-sm tw-text-gray-500">
                   Cluster State:
                 </span>
-                  <span
-                      className={`status-dot ${
-                          embeddedClusterState === "Installed"
-                              ? "u-color--success"
-                              : embeddedClusterState === "Installing" ||
-                              embeddedClusterState === "Enqueued"
-                                  ? "u-color--warning"
-                                  : "u-color--error"
-                      }`}
-                  />
-                  <span
-                      className={`u-fontSize--normal u-fontWeight--medium ${
-                          embeddedClusterState === "Installed"
-                              ? "u-textColor--bodyCopy"
-                              : embeddedClusterState === "Installing" ||
-                              embeddedClusterState === "Enqueued"
-                                  ? "u-textColor--warning"
-                                  : "u-textColor--error"
-                      }`}
-                  >
+                <span
+                  className={`status-dot ${
+                    embeddedClusterState === "Installed"
+                      ? "u-color--success"
+                      : embeddedClusterState === "Installing" ||
+                        embeddedClusterState === "Enqueued"
+                      ? "u-color--warning"
+                      : "u-color--error"
+                  }`}
+                />
+                <span
+                  className={`u-fontSize--normal u-fontWeight--medium ${
+                    embeddedClusterState === "Installed"
+                      ? "u-textColor--bodyCopy"
+                      : embeddedClusterState === "Installing" ||
+                        embeddedClusterState === "Enqueued"
+                      ? "u-textColor--warning"
+                      : "u-textColor--error"
+                  }`}
+                >
                   {Utilities.clusterState(embeddedClusterState)}
                 </span>
-                </>
+              </>
             )}
             <Link
               to={`${url}/config/${app?.downstream?.currentVersion?.sequence}`}