From 239a7a399403ef30664c50cd9c6e1a46cc3eb331 Mon Sep 17 00:00:00 2001
From: Sarah Gillespie <73313222+gillespi314@users.noreply.github.com>
Date: Tue, 4 Mar 2025 11:38:50 -0600
Subject: [PATCH] Hide some host details cards for Android hosts (#26763)

---
 .../HostDetailsPage/HostDetailsPage.tsx       | 56 ++++++++++---------
 .../details/HostDetailsPage/_styles.scss      | 19 ++++---
 2 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx b/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx
index 673877293a..0213d44397 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx
+++ b/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx
@@ -854,9 +854,11 @@ const HostDetailsPage = ({
 
   const isDarwinHost = host.platform === "darwin";
   const isIosOrIpadosHost = isIPadOrIPhone(host.platform);
+  const isAndroidHost = isAndroid(host.platform);
 
   const detailsPanelClass = classNames(`${baseClass}__details-panel`, {
     [`${baseClass}__details-panel--ios-grid`]: isIosOrIpadosHost,
+    [`${baseClass}__details-panel--android-grid`]: isAndroidHost,
     [`${baseClass}__details-panel--macos-grid`]: isDarwinHost,
   });
 
@@ -919,31 +921,33 @@ const HostDetailsPage = ({
                 munki={macadmins?.munki}
                 mdm={mdm}
               />
-              <ActivityCard
-                activeTab={activeActivityTab}
-                activities={
-                  activeActivityTab === "past"
-                    ? pastActivities
-                    : upcomingActivities
-                }
-                isLoading={
-                  activeActivityTab === "past"
-                    ? pastActivitiesIsFetching
-                    : upcomingActivitiesIsFetching
-                }
-                isError={
-                  activeActivityTab === "past"
-                    ? pastActivitiesIsError
-                    : upcomingActivitiesIsError
-                }
-                upcomingCount={upcomingActivities?.count || 0}
-                onChangeTab={onChangeActivityTab}
-                onNextPage={() => setActivityPage(activityPage + 1)}
-                onPreviousPage={() => setActivityPage(activityPage - 1)}
-                onShowDetails={onShowActivityDetails}
-                onCancel={onCancelActivity}
-              />
-              {!isIosOrIpadosHost && (
+              {!isAndroidHost && (
+                <ActivityCard
+                  activeTab={activeActivityTab}
+                  activities={
+                    activeActivityTab === "past"
+                      ? pastActivities
+                      : upcomingActivities
+                  }
+                  isLoading={
+                    activeActivityTab === "past"
+                      ? pastActivitiesIsFetching
+                      : upcomingActivitiesIsFetching
+                  }
+                  isError={
+                    activeActivityTab === "past"
+                      ? pastActivitiesIsError
+                      : upcomingActivitiesIsError
+                  }
+                  upcomingCount={upcomingActivities?.count || 0}
+                  onChangeTab={onChangeActivityTab}
+                  onNextPage={() => setActivityPage(activityPage + 1)}
+                  onPreviousPage={() => setActivityPage(activityPage - 1)}
+                  onShowDetails={onShowActivityDetails}
+                  onCancel={onCancelActivity}
+                />
+              )}
+              {!isIosOrIpadosHost && !isAndroidHost && (
                 <AgentOptionsCard
                   osqueryData={osqueryData}
                   wrapFleetHelper={wrapFleetHelper}
@@ -954,7 +958,7 @@ const HostDetailsPage = ({
                 labels={host?.labels || []}
                 onLabelClick={onLabelClick}
               />
-              {!isIosOrIpadosHost && (
+              {!isIosOrIpadosHost && !isAndroidHost && (
                 <UsersCard
                   users={host?.users || []}
                   usersState={usersState}
diff --git a/frontend/pages/hosts/details/HostDetailsPage/_styles.scss b/frontend/pages/hosts/details/HostDetailsPage/_styles.scss
index 9560b6c95f..e7fbfb34f1 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/_styles.scss
+++ b/frontend/pages/hosts/details/HostDetailsPage/_styles.scss
@@ -26,18 +26,23 @@
         "certs certs";
     }
 
+    // No agent options card for Android, so extend Labels card vertically.
+    &__details-panel--android-grid.react-tabs__tab-panel--selected {
+      grid-template-areas:
+        "about about"
+        "labels labels";
+    }
 
     // We add the certs card to the grid layout on mac hosts
     &__details-panel--macos-grid.react-tabs__tab-panel--selected {
-        grid-template-areas:
-          "about about"
-          "activity agent-options"
-          "activity labels"
-          "users users"
-          "certs certs";
+      grid-template-areas:
+        "about about"
+        "activity agent-options"
+        "activity labels"
+        "users users"
+        "certs certs";
     }
 
-
     .about-card {
       grid-area: about;
     }