From 4d732113e0ccf3a4e8f0628c840ff67915511b5d Mon Sep 17 00:00:00 2001 From: Martin Angers Date: Mon, 2 Dec 2024 15:30:51 -0500 Subject: [PATCH] Windows Migration: support the new activities in the UI (#24279) --- frontend/interfaces/activity.ts | 2 ++ .../ActivityItem/ActivityItem.tsx | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/frontend/interfaces/activity.ts b/frontend/interfaces/activity.ts index d6fcafc8c7..14618ad9e2 100644 --- a/frontend/interfaces/activity.ts +++ b/frontend/interfaces/activity.ts @@ -69,6 +69,8 @@ export enum ActivityType { TransferredHosts = "transferred_hosts", EnabledWindowsMdm = "enabled_windows_mdm", DisabledWindowsMdm = "disabled_windows_mdm", + EnabledWindowsMdmMigration = "enabled_windows_mdm_migration", + DisabledWindowsMdmMigration = "disabled_windows_mdm_migration", RanScript = "ran_script", AddedScript = "added_script", DeletedScript = "deleted_script", diff --git a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx index b162a22fcc..5e724059bf 100644 --- a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx +++ b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx @@ -37,6 +37,8 @@ const PREMIUM_ACTIVITIES = new Set([ "enabled_macos_setup_end_user_auth", "disabled_macos_setup_end_user_auth", "tranferred_hosts", + "enabled_windows_mdm_migration", + "disabled_windows_mdm_migration", ]); const getProfileMessageSuffix = ( @@ -663,6 +665,24 @@ const TAGGED_TEMPLATES = { disabledWindowsMdm: () => { return <> told Fleet to turn off Windows MDM features.; }, + enabledWindowsMdmMigration: () => { + return ( + <> + {" "} + told Fleet to automatically migrate Windows hosts connected to another + MDM solution. + + ); + }, + disabledWindowsMdmMigration: () => { + return ( + <> + {" "} + told Fleet to stop migrating Windows hosts connected to another MDM + solution. + + ); + }, // TODO: Combine ranScript template with host details page templates // frontend/pages/hosts/details/cards/Activity/PastActivity/PastActivity.tsx and // frontend/pages/hosts/details/cards/Activity/UpcomingActivity/UpcomingActivity.tsx @@ -1262,6 +1282,12 @@ const getDetail = ( case ActivityType.DisabledWindowsMdm: { return TAGGED_TEMPLATES.disabledWindowsMdm(); } + case ActivityType.EnabledWindowsMdmMigration: { + return TAGGED_TEMPLATES.enabledWindowsMdmMigration(); + } + case ActivityType.DisabledWindowsMdmMigration: { + return TAGGED_TEMPLATES.disabledWindowsMdmMigration(); + } case ActivityType.RanScript: { return TAGGED_TEMPLATES.ranScript(activity, onDetailsClick); }