From eb1f6ddec6e80cdb9421ba9733990d802cdb4fe7 Mon Sep 17 00:00:00 2001 From: Gabriel Hernandez Date: Tue, 17 Sep 2024 14:52:46 +0100 Subject: [PATCH 1/4] change tooltip for the mac target min version tooltip --- .../AppleOSTargetForm/AppleOSTargetForm.tsx | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx b/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx index 8c12c4905388..0c4dc2d9fd68 100644 --- a/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx +++ b/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx @@ -178,16 +178,17 @@ const AppleOSTargetForm = ({ } }; - const getMinimumVersionTooltip = (platform: ApplePlatform) => { - switch (platform) { - case "darwin": - return "The end user sees the window until their macOS is at or above this version."; - case "ios": - case "ipados": - return "If the end user's host is below the minimum version, they see a notification in their Notification Center after the deadline. They can’t continue until the OS update is installed."; - default: - return ""; - } + const getMinimumVersionTooltip = () => { + return ( + <> + If an already enrolled host is below the minimum version, the +
host is updated to exactly the minimum version. +
+
If a new or wiped host is below the minimum version and +
automatically enrolls (DEP), the host is updated to Apple's +
lastest version during Setup Assistant. + + ); }; const getDeadlineTooltip = (platform: ApplePlatform) => { @@ -206,7 +207,7 @@ const AppleOSTargetForm = ({
Date: Tue, 17 Sep 2024 14:57:26 +0100 Subject: [PATCH 2/4] changefile --- changes/21976-update-macos-target-version-tooltip | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/21976-update-macos-target-version-tooltip diff --git a/changes/21976-update-macos-target-version-tooltip b/changes/21976-update-macos-target-version-tooltip new file mode 100644 index 000000000000..5ae1a5ffdf3b --- /dev/null +++ b/changes/21976-update-macos-target-version-tooltip @@ -0,0 +1 @@ +- update the macos target minimum version tooltip From 372467f4495f61da9d5fb642c0941f14d918e25e Mon Sep 17 00:00:00 2001 From: gillespi314 <73313222+gillespi314@users.noreply.github.com> Date: Wed, 18 Sep 2024 13:10:47 -0500 Subject: [PATCH 3/4] Tweak copy for tooltip --- .../components/AppleOSTargetForm/AppleOSTargetForm.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx b/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx index 0c4dc2d9fd68..4bcb61aa8574 100644 --- a/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx +++ b/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx @@ -181,8 +181,9 @@ const AppleOSTargetForm = ({ const getMinimumVersionTooltip = () => { return ( <> - If an already enrolled host is below the minimum version, the -
host is updated to exactly the minimum version. + If an already enrolled host is below the minimum version, +
the host is updated to exactly the minimum version if it's +
available from Apple.

If a new or wiped host is below the minimum version and
automatically enrolls (DEP), the host is updated to Apple's From 5b3c1387976ac7c50fcc3358570614e9e4680a31 Mon Sep 17 00:00:00 2001 From: Roberto Dip Date: Wed, 18 Sep 2024 15:16:41 -0300 Subject: [PATCH 4/4] Update frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx --- .../components/AppleOSTargetForm/AppleOSTargetForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx b/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx index 4bcb61aa8574..d3c35e3f604b 100644 --- a/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx +++ b/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx @@ -186,7 +186,7 @@ const AppleOSTargetForm = ({
available from Apple.

If a new or wiped host is below the minimum version and -
automatically enrolls (DEP), the host is updated to Apple's +
automatically enrolls (ADE), the host is updated to Apple's
lastest version during Setup Assistant. );