From 5cb859d3bbb5975e0f67da38331ef84329296499 Mon Sep 17 00:00:00 2001 From: Noah Talerman <47070608+noahtalerman@users.noreply.github.com> Date: Fri, 31 Oct 2025 11:20:24 -0400 Subject: [PATCH] Fleet product: Simplify "Turned on MDM copy" (#35048) Simplify copy on dashboard (MDM > Status card), Hosts page, and Host details page. Context: https://github.com/fleetdm/fleet/issues/34044#issuecomment-3473098231 --- .../HostsFilterBlock/HostsFilterBlock.tsx | 13 ++++--------- frontend/utilities/constants.tsx | 15 +++++---------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/frontend/pages/hosts/ManageHostsPage/components/HostsFilterBlock/HostsFilterBlock.tsx b/frontend/pages/hosts/ManageHostsPage/components/HostsFilterBlock/HostsFilterBlock.tsx index 80f7be18f4..4f45307771 100644 --- a/frontend/pages/hosts/ManageHostsPage/components/HostsFilterBlock/HostsFilterBlock.tsx +++ b/frontend/pages/hosts/ManageHostsPage/components/HostsFilterBlock/HostsFilterBlock.tsx @@ -393,20 +393,15 @@ const HostsFilterBlock = ({ automatic: ( MDM was turned on
- automatically using Apple
- Automated Device
- Enrollment (DEP),
- Windows Autopilot, or
- Windows Azure AD Join.
- Administrators can block
- device users from turning -
MDM off. + automatically. IT admins
+ can block end users
+ from turning MDM off.
), manual: ( MDM was turned on
- manually. Device users
+ manually. End users
can turn MDM off.
), diff --git a/frontend/utilities/constants.tsx b/frontend/utilities/constants.tsx index ed51b9d221..72f90e0d17 100644 --- a/frontend/utilities/constants.tsx +++ b/frontend/utilities/constants.tsx @@ -346,22 +346,17 @@ export const MDM_STATUS_TOOLTIP: Record< > = { "On (automatic)": ( - MDM was turned on automatically using Apple Automated Device Enrollment - (DEP), Windows Autopilot, or Windows Azure AD Join. Administrators can - block end users from turning MDM off. + MDM was turned on automatically. IT admins can block end users from + turning MDM off. ), "On (manual)": ( - - MDM was turned on manually, by installing fleetd on macOS and Windows, or - by installing enrollment profile on macOS. End user can turn MDM off. - + MDM was turned on manually. End users can turn MDM off. ), "On (personal)": ( - End user turned on MDM on personal (BYOD) host, by signing in with Managed - Apple Account on iPhone/iPad, or by enrolling Android via enrollment link - or by signing in with Google account. End user can turn MDM off. + MDM was turned on by signing in with Managed Apple Account on iPhone/iPad, + or by creating a work profile on Android. End users can turn MDM off. ), "On (company-owned)": null,