From f020aaa66dcebbe7e6677ed0307dc633b928f6d3 Mon Sep 17 00:00:00 2001 From: melpike <79950145+melpike@users.noreply.github.com> Date: Mon, 23 Mar 2026 09:54:35 -0600 Subject: [PATCH] Update UI to reflect enrollment behavior (#42105) **Related issue:** Resolves #41921 --- ...uring-default-teams-for-devices-in-fleet.md | 2 -- .../AppleBusinessManagerTableConfig.tsx | 18 ++++++++++++------ .../EditTeamsAbmModal/EditTeamsAbmModal.tsx | 18 ++++++++++++------ 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/articles/configuring-default-teams-for-devices-in-fleet.md b/articles/configuring-default-teams-for-devices-in-fleet.md index 603079362e..b0a78381cb 100644 --- a/articles/configuring-default-teams-for-devices-in-fleet.md +++ b/articles/configuring-default-teams-for-devices-in-fleet.md @@ -2,8 +2,6 @@ Fleet allows you to configure default fleets for macOS, iOS, and iPadOS devices as they automatically enroll in your instance. This ensures that hosts receive the appropriate apps and configuration profiles at enrollment. -If a host is manually assigned to a different fleet before enrollment, it will enroll to the newly assigned fleet and not the default. - ## Why configure default fleets? The ability to assign default fleets during device enrollment helps streamline the deployment process. Each host is automatically placed in its correct group, ensuring it receives the necessary configuration profiles and apps without requiring manual assignment. diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AppleBusinessManagerTable/AppleBusinessManagerTableConfig.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AppleBusinessManagerTable/AppleBusinessManagerTableConfig.tsx index 658bdeb27d..5069017fb1 100644 --- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AppleBusinessManagerTable/AppleBusinessManagerTableConfig.tsx +++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AppleBusinessManagerTable/AppleBusinessManagerTableConfig.tsx @@ -96,8 +96,10 @@ export const generateTableConfig = ( - macOS hosts are automatically added to this fleet in Fleet when - they appear in Apple Business Manager. + macOS hosts are automatically added to this fleet on initial + sync from ABM. If a host is manually assigned to a different + fleet before enrollment, it will enroll to the newly assigned + fleet and not the default. } > @@ -119,8 +121,10 @@ export const generateTableConfig = ( - iOS hosts are automatically added to this fleet in Fleet when - they appear in Apple Business Manager. + iOS hosts are automatically added to this fleet on initial sync + from ABM. If a host is manually assigned to a different fleet + before enrollment, it will enroll to the newly assigned fleet + and not the default. } > @@ -142,8 +146,10 @@ export const generateTableConfig = ( - iPadOS hosts are automatically added to this fleet in Fleet when - they appear in Apple Business Manager. + iPadOS hosts are automatically added to this fleet on initial + sync from ABM. If a host is manually assigned to a different + fleet before enrollment, it will enroll to the newly assigned + fleet and not the default. } > diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/EditTeamsAbmModal/EditTeamsAbmModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/EditTeamsAbmModal/EditTeamsAbmModal.tsx index 4a4ec81a3c..5168ae1982 100644 --- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/EditTeamsAbmModal/EditTeamsAbmModal.tsx +++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/EditTeamsAbmModal/EditTeamsAbmModal.tsx @@ -147,8 +147,10 @@ const EditTeamsAbmModal = ({ wrapperClassName={`${baseClass}__form-field form-field--macos`} tooltip={ <> - macOS hosts are automatically added to this fleet in Fleet when - they appear in Apple Business Manager. + macOS hosts are automatically added to this fleet on initial sync + from ABM. If a host is manually assigned to a different fleet + before enrollment, it will enroll to the newly assigned fleet and + not the default. } /> @@ -163,8 +165,10 @@ const EditTeamsAbmModal = ({ wrapperClassName={`${baseClass}__form-field form-field--ios`} tooltip={ <> - iOS hosts are automatically added to this fleet in Fleet when they - appear in Apple Business Manager. + iOS hosts are automatically added to this fleet on initial sync + from ABM. If a host is manually assigned to a different fleet + before enrollment, it will enroll to the newly assigned fleet and + not the default. } /> @@ -179,8 +183,10 @@ const EditTeamsAbmModal = ({ wrapperClassName={`${baseClass}__form-field form-field--ipados`} tooltip={ <> - iPadOS hosts are automatically added to this fleet in Fleet when - they appear in Apple Business Manager. + iPadOS hosts are automatically added to this fleet on initial sync + from ABM. If a host is manually assigned to a different fleet + before enrollment, it will enroll to the newly assigned fleet and + not the default. } />