Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 09:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 31

Update copy on Integrations > MDM > Windows page (#12672)

Browse source 
Changes:
- Update copy to accurately reflect Windows MDM features
This commit is contained in:
Noah Talerman 2023-07-06 17:53:59 -04:00 committed by GitHub
parent 33c512a722
commit 7a05925d59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx
View file

@ -486,7 +486,7 @@ const TAGGED_TEMPLATES = {
);
},
disabledWindowsMdm: (activity: IActivity) => {
return <> told Fleet to turn off MDM features for all Windows hosts.</>;
return <> told Fleet to turn off Windows MDM features.</>;
},
};

13
frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsMdmPage/WindowsMdmPage.tsx
View file

@ -62,11 +62,9 @@ const WindowsMdmOnContent = ({ router }: IWindowsMdmOnContentProps) => {
return (
<>
<h1>Turn on Windows MDM</h1>
<p>
This will turn MDM on for Windows hosts with fleetd, overriding existing
MDM solutions.
</p>
<p>MDM won&apos;t be turned on for Windows servers</p>
<p>This will turn MDM on for Windows hosts with fleetd.</p>
<p>Hosts connected to another MDM solution won&apos;t be migrated.</p>
<p>MDM won&apos;t be turned on for Windows servers.</p>
<Button onClick={turnOnWindowsMdm}>Turn on</Button>
</>
);
@ -87,7 +85,10 @@ const WindowsMdmOffContent = ({ router }: IWindowsMdmOffContentProps) => {
return (
<>
<h1>Turn off Windows MDM</h1>
<p>This will turn off MDM on each Windows host.</p>
<p>
MDM will no longer be turned on for Windows hosts that enroll to Fleet.
</p>
<p>Hosts with MDM already turned on MDM will not have MDM removed.</p>
<Button onClick={turnOffWindowsMdm}>Turn off MDM</Button>
</>
);