From bfc986df7e5117e2ebdd61589d908da2e4a58dab Mon Sep 17 00:00:00 2001 From: Magnus Jensen Date: Thu, 9 Jul 2026 18:00:06 +0200 Subject: [PATCH] update missed ABM references (#49027) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Related issue:** Resolves #48314 # Checklist for submitter If some of the following don't apply, delete the relevant line. - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/guides/committing-changes.md#changes-files) for more information. - [x] Input data is properly validated, `SELECT *` is avoided, SQL injection is prevented (using placeholders for values in statements), JS inline code is prevented especially for url redirects, and untrusted data interpolated into shell scripts/commands is validated against shell metacharacters. - [x] Timeouts are implemented and retries are limited to avoid infinite loops - [x] If paths of existing endpoints are modified without backwards compatibility, checked the frontend/CLI for any necessary changes ## Testing - [x] Added/updated automated tests - [x] QA'd all new/changed functionality manually ## Summary by CodeRabbit * **Bug Fixes** * Updated Apple Business Manager references across admin and host device flows to use the shorter “AB” wording. * Improved user-facing copy in enrollment, status, tooltip, and error messages for consistency. * Adjusted the automatic enrollment button label to match the updated terminology. --- changes/48314-updated-missed-abm-references | 1 + .../components/AddAbmModal/helpers.tsx | 2 +- .../AppleBusinessManagerTable/OrgNameCell/OrgNameCell.tsx | 4 ++-- .../AppleAutomaticEnrollmentCard.tsx | 2 +- .../modals/UnenrollMdmModal/UnenrollMdmModal.tsx | 5 ++--- .../hosts/details/modals/MDMStatusModal/MDMStatusModal.tsx | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 changes/48314-updated-missed-abm-references diff --git a/changes/48314-updated-missed-abm-references b/changes/48314-updated-missed-abm-references new file mode 100644 index 0000000000..150aa3bc5a --- /dev/null +++ b/changes/48314-updated-missed-abm-references @@ -0,0 +1 @@ +- Updated missed ABM references to AB. \ No newline at end of file diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/helpers.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/helpers.tsx index a7ec3afc7b..b1289a1cea 100644 --- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/helpers.tsx +++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/helpers.tsx @@ -8,7 +8,7 @@ const generateDuplicateMessage = (msg: string) => { const orgName = msg.split("'")[1]; return ( <> - Couldn't add. There's already an ABM connection for the{" "} + Couldn't add. There's already an AB connection for the{" "} {orgName} organization. ); diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AppleBusinessManagerTable/OrgNameCell/OrgNameCell.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AppleBusinessManagerTable/OrgNameCell/OrgNameCell.tsx index 2a34b16d5b..6eaf047f2e 100644 --- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AppleBusinessManagerTable/OrgNameCell/OrgNameCell.tsx +++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AppleBusinessManagerTable/OrgNameCell/OrgNameCell.tsx @@ -19,9 +19,9 @@ const OrgNameCell = ({ orgName, termsExpired }: IOrgNameCellProps) => { position="top" tipContent={ <> - The ABM terms have changed. + The AB terms have changed.
- To accept terms, go to ABM. + To accept terms, go to AB. } className={`${baseClass}__tooltip-wrapper`} diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AppleBusinessManagerSection/AppleAutomaticEnrollmentCard/AppleAutomaticEnrollmentCard.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AppleBusinessManagerSection/AppleAutomaticEnrollmentCard/AppleAutomaticEnrollmentCard.tsx index e4a7934493..7834122c1e 100644 --- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AppleBusinessManagerSection/AppleAutomaticEnrollmentCard/AppleAutomaticEnrollmentCard.tsx +++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AppleBusinessManagerSection/AppleAutomaticEnrollmentCard/AppleAutomaticEnrollmentCard.tsx @@ -43,7 +43,7 @@ const AppleAutomaticEnrollmentCard = ({ header="Apple (macOS, iOS, iPadOS) company-owned and personal hosts enrollment" cta={ } > diff --git a/frontend/pages/hosts/details/HostDetailsPage/modals/UnenrollMdmModal/UnenrollMdmModal.tsx b/frontend/pages/hosts/details/HostDetailsPage/modals/UnenrollMdmModal/UnenrollMdmModal.tsx index 7f8c527bb5..49a155a586 100644 --- a/frontend/pages/hosts/details/HostDetailsPage/modals/UnenrollMdmModal/UnenrollMdmModal.tsx +++ b/frontend/pages/hosts/details/HostDetailsPage/modals/UnenrollMdmModal/UnenrollMdmModal.tsx @@ -88,9 +88,8 @@ const UnenrollMdmModal = ({ } else if (isAutomaticDeviceEnrollment(enrollmentStatus)) { return (

- To re-enroll, make sure that the host is still in Apple Business - Manager (ABM). The host will automatically enroll after it's - reset. + To re-enroll, make sure that the host is still in Apple Business (AB). + The host will automatically enroll after it's reset.

); } diff --git a/frontend/pages/hosts/details/modals/MDMStatusModal/MDMStatusModal.tsx b/frontend/pages/hosts/details/modals/MDMStatusModal/MDMStatusModal.tsx index 4bc1d1a7c3..b7b8f0c705 100644 --- a/frontend/pages/hosts/details/modals/MDMStatusModal/MDMStatusModal.tsx +++ b/frontend/pages/hosts/details/modals/MDMStatusModal/MDMStatusModal.tsx @@ -76,7 +76,7 @@ const PROFILE_STATUS_UI_MAP: Record< label: "Assigned", tooltip: ( <> - Profile is assigned in ABM, and ABM
+ Profile is assigned in AB, and AB
is preparing to push it to the host. ),