From 59d9cafbdd8e93e74b254eb236e7e6b18b62cbf7 Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Thu, 20 Mar 2025 09:20:10 -0400
Subject: [PATCH] Fleet UI: Make OS copies in dashboard are consistent (#27248)

---
 frontend/pages/DashboardPage/DashboardPage.tsx   | 16 ++++++++--------
 .../cards/OperatingSystems/OperatingSystems.tsx  |  2 +-
 .../PlatformHostCounts/PlatformHostCounts.tsx    |  6 +++---
 server/mdm/apple/apple_mdm.go                    |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/frontend/pages/DashboardPage/DashboardPage.tsx b/frontend/pages/DashboardPage/DashboardPage.tsx
index 505a13c9c5..ffab81a49e 100644
--- a/frontend/pages/DashboardPage/DashboardPage.tsx
+++ b/frontend/pages/DashboardPage/DashboardPage.tsx
@@ -239,29 +239,29 @@ const DashboardPage = ({ router, location }: IDashboardProps): JSX.Element => {
           (platform: IHostSummaryPlatforms) => platform.platform === "windows"
         ) || { platform: "windows", hosts_count: 0 };
 
-        const chromebooks = data.platforms?.find(
+        const chomeOSHosts = data.platforms?.find(
           (platform: IHostSummaryPlatforms) => platform.platform === "chrome"
         ) || { platform: "chrome", hosts_count: 0 };
 
-        const iphones = data.platforms?.find(
+        const iOSHosts = data.platforms?.find(
           (platform: IHostSummaryPlatforms) => platform.platform === "ios"
         ) || { platform: "ios", hosts_count: 0 };
 
-        const ipads = data.platforms?.find(
+        const iPadOSHosts = data.platforms?.find(
           (platform: IHostSummaryPlatforms) => platform.platform === "ipados"
         ) || { platform: "ipados", hosts_count: 0 };
 
-        const android = data.platforms?.find(
+        const androidHosts = data.platforms?.find(
           (platform: IHostSummaryPlatforms) => platform.platform === "android"
         ) || { platform: "android", hosts_count: 0 };
 
         setMacCount(macHosts.hosts_count);
         setWindowsCount(windowsHosts.hosts_count);
         setLinuxCount(data.all_linux_count);
-        setChromeCount(chromebooks.hosts_count);
-        setIosCount(iphones.hosts_count);
-        setIpadosCount(ipads.hosts_count);
-        setAndroidCount(android.hosts_count);
+        setChromeCount(chomeOSHosts.hosts_count);
+        setIosCount(iOSHosts.hosts_count);
+        setIpadosCount(iPadOSHosts.hosts_count);
+        setAndroidCount(androidHosts.hosts_count);
         setShowHostsUI(true);
       },
     }
diff --git a/frontend/pages/DashboardPage/cards/OperatingSystems/OperatingSystems.tsx b/frontend/pages/DashboardPage/cards/OperatingSystems/OperatingSystems.tsx
index 343f74fe70..20284a4f96 100644
--- a/frontend/pages/DashboardPage/cards/OperatingSystems/OperatingSystems.tsx
+++ b/frontend/pages/DashboardPage/cards/OperatingSystems/OperatingSystems.tsx
@@ -78,7 +78,7 @@ const OperatingSystems = ({
           auto-update expiration date.{" "}
           <CustomLink
             url="https://fleetdm.com/learn-more-about/chromeos-updates"
-            text="See supported devices"
+            text="Learn more"
             newTab
             multiline
           />
diff --git a/frontend/pages/DashboardPage/sections/PlatformHostCounts/PlatformHostCounts.tsx b/frontend/pages/DashboardPage/sections/PlatformHostCounts/PlatformHostCounts.tsx
index 7d556352ec..9ccc53b938 100644
--- a/frontend/pages/DashboardPage/sections/PlatformHostCounts/PlatformHostCounts.tsx
+++ b/frontend/pages/DashboardPage/sections/PlatformHostCounts/PlatformHostCounts.tsx
@@ -138,7 +138,7 @@ const PlatformHostCounts = ({
       <HostCountCard
         iconName="chrome"
         count={chromeCount}
-        title="Chromebooks"
+        title="ChromeOS"
         path={getPathWithQueryParams(PATHS.MANAGE_HOSTS_LABEL(chromeLabelId), {
           team_id: teamId,
         })}
@@ -161,7 +161,7 @@ const PlatformHostCounts = ({
       <HostCountCard
         iconName="iOS"
         count={iosCount}
-        title="iPhones"
+        title="iOS"
         path={getPathWithQueryParams(PATHS.MANAGE_HOSTS_LABEL(iosLabelId), {
           team_id: teamId,
         })}
@@ -184,7 +184,7 @@ const PlatformHostCounts = ({
       <HostCountCard
         iconName="iPadOS"
         count={ipadosCount}
-        title="iPads"
+        title="iPadOS"
         path={getPathWithQueryParams(PATHS.MANAGE_HOSTS_LABEL(ipadosLabelId), {
           team_id: teamId,
         })}
diff --git a/server/mdm/apple/apple_mdm.go b/server/mdm/apple/apple_mdm.go
index d05a4ddafa..7867004b40 100644
--- a/server/mdm/apple/apple_mdm.go
+++ b/server/mdm/apple/apple_mdm.go
@@ -1203,7 +1203,7 @@ func IOSiPadOSRefetch(ctx context.Context, ds fleet.Datastore, commander *MDMApp
 	start := time.Now()
 	devices, err := ds.ListIOSAndIPadOSToRefetch(ctx, 1*time.Hour)
 	if err != nil {
-		return ctxerr.Wrap(ctx, err, "list ios and ipad devices to refetch")
+		return ctxerr.Wrap(ctx, err, "list ios and ipados devices to refetch")
 	}
 	if len(devices) == 0 {
 		return nil