diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/AppleBusinessManagerPage.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/AppleBusinessManagerPage.tsx
index f2c978adbb..2a125b459c 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/AppleBusinessManagerPage.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/AppleBusinessManagerPage.tsx
@@ -233,7 +233,6 @@ const AppleBusinessManagerPage = ({ router }: { router: InjectedRouter }) => {
{showRenewModal && selectedToken.current && (
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/AddAbmModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/AddAbmModal.tsx
index 068b69518a..675aa5db9e 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/AddAbmModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/AddAbmModal.tsx
@@ -52,73 +52,15 @@ const AddAbmModal = ({ onCancel, onAdded }: IAddAbmModalProps) => {
return (
-
-
- 1.
-
- Download your public key.
-
-
-
- 2.
-
-
- Sign in to{" "}
-
-
- If your organization doesn't have an account, select{" "}
- Enroll now .
-
-
-
-
- 3.
-
- Select your account name at the bottom left of the screen,
- then select Preferences .
-
-
-
- 4.
-
- In the Your MDM Servers section, select Add .
-
-
-
- 5.
- Enter a name for the server such as "Fleet".
-
-
- 6.
-
- Under MDM Server Settings , upload the public key downloaded
- in the first step and select Save .
-
-
-
- 7.
-
- In the Default Device Assignment section, select{" "}
- Change , then assign the newly created server as the default
- for your Macs, iPhones, and iPads. Then select Done .
-
-
-
- 8.
-
- Select newly created server in the sidebar, then select{" "}
- Download MDM Server Token on the top.
-
-
-
- 9.
- Upload the downloaded token (.p7m file).
-
-
+
+ Follow the step-by-step guide to connect Fleet to Apple Business
+ Manager.{" "}
+
+
{
>
Add AB
+
);
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/_styles.scss b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/_styles.scss
index 74ccf5138b..2e95eb5437 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/_styles.scss
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/_styles.scss
@@ -1,10 +1,13 @@
.add-abm-modal {
+ p {
+ margin: 0;
+ }
+
&__request-button {
display: flex;
gap: $pad-small;
align-items: center;
- margin-top: $pad-small;
label {
display: flex;
@@ -13,33 +16,8 @@
}
}
- &__setup-list {
- font-size: $x-small;
- display: flex;
- flex-direction: column;
- gap: $pad-large;
- padding: 0;
- margin: 0;
- max-width: 660px;
- list-style: none;
-
- li {
- display: flex;
- flex-direction: row;
- gap: $pad-small;
-
- p {
- display: flex;
- flex-direction: column;
- align-items: flex-start;
- margin: 0;
- }
- }
- }
-
&__file-uploader {
margin-top: $pad-medium;
- margin-left: $pad-medium;
.file-uploader__message {
color: $ui-fleet-black-75;
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/RenewAbmModal/RenewAbmModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/RenewAbmModal/RenewAbmModal.tsx
index db93a51a0f..4b35d634b5 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/RenewAbmModal/RenewAbmModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/RenewAbmModal/RenewAbmModal.tsx
@@ -14,14 +14,12 @@ const baseClass = "renew-abm-modal";
interface IRenewAbmModalProps {
tokenId: number;
- orgName: string;
onCancel: () => void;
onRenewedToken: () => void;
}
const RenewAbmModal = ({
tokenId,
- orgName,
onCancel,
onRenewedToken,
}: IRenewAbmModalProps) => {
@@ -65,31 +63,24 @@ const RenewAbmModal = ({
width="large"
>
-
- Renew Apple Business for {orgName} by uploading your AB token.{" "}
+
+ Follow the step-by-step guide to renew.{" "}
-
+
p {
- margin: 0;
- }
- }
-
-
- &__file-uploader {
- margin-top: $pad-medium;
- margin-left: $pad-medium;
- }
-
&__button-wrap {
display: flex;
justify-content: flex-end;
diff --git a/website/config/routes.js b/website/config/routes.js
index 5b03033e54..b6c3adfe2b 100644
--- a/website/config/routes.js
+++ b/website/config/routes.js
@@ -1176,11 +1176,12 @@ module.exports.routes = {
'GET /learn-more-about/audit-logs': '/docs/using-fleet/audit-logs',
'GET /learn-more-about/calendar-events': '/announcements/fleet-in-your-calendar-introducing-maintenance-windows',
'GET /learn-more-about/setup-windows-mdm': '/guides/windows-mdm-setup',
- 'GET /learn-more-about/setup-abm': '/docs/using-fleet/mdm-setup#apple-business-manager-abm',
+ 'GET /learn-more-about/turn-on-apple-mdm': '/guides/apple-mdm-setup#turn-on-apple-mdm',
+ 'GET /learn-more-about/setup-abm': '/guides/apple-mdm-setup#apple-business-ab',
'GET /learn-more-about/renew-apns': '/guides/apple-mdm-setup#renew-apns',
+ 'GET /learn-more-about/renew-abm': '/guides/apple-mdm-setup#renew-ab',
'GET /learn-more-about/add-vpp': '/guides/apple-mdm-setup#volume-purchasing-program-vpp',
'GET /learn-more-about/renew-vpp': '/guides/apple-mdm-setup#renew-vpp',
- 'GET /learn-more-about/renew-abm': '/docs/using-fleet/mdm-setup#apple-business-manager-abm',
'GET /learn-more-about/abm-issues': '/guides/apple-mdm-setup#troubleshooting',
'GET /learn-more-about/fleet-server-private-key': '/docs/configuration/fleet-server-configuration#server-private-key',
'GET /learn-more-about/agent-options': '/docs/configuration/agent-configuration',