From bb63da41b70ebefd76d3da4b51ee67166216ca6f Mon Sep 17 00:00:00 2001 From: Gabriel Hernandez Date: Tue, 26 Mar 2024 17:54:23 +0000 Subject: [PATCH] add ddm activities to the UI (#17864) relates to #17409 adds the ddm activities to the UI. - [x] Changes file added for user-visible changes in `changes/` or `orbit/changes/`. - [x] Manual QA for all new/changed functionality --- changes/issue-17409-add-ddm-activities-to-ui | 1 + frontend/interfaces/activity.ts | 3 + .../ActivityItem/ActivityItem.tsx | 65 +++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 changes/issue-17409-add-ddm-activities-to-ui diff --git a/changes/issue-17409-add-ddm-activities-to-ui b/changes/issue-17409-add-ddm-activities-to-ui new file mode 100644 index 0000000000..0c0c267a32 --- /dev/null +++ b/changes/issue-17409-add-ddm-activities-to-ui @@ -0,0 +1 @@ +- add ddm activities to the fleet UI diff --git a/frontend/interfaces/activity.ts b/frontend/interfaces/activity.ts index 143efeaf0a..dd871d7be6 100644 --- a/frontend/interfaces/activity.ts +++ b/frontend/interfaces/activity.ts @@ -67,6 +67,9 @@ export enum ActivityType { LockedHost = "locked_host", UnlockedHost = "unlocked_host", WipedHost = "wiped_host", + CreatedDeclarationProfile = "created_declaration_profile", + DeletedDeclarationProfile = "deleted_declaration_profile", + EditedDeclarationProfile = "edited_declaration_profile", } // This is a subset of ActivityType that are shown only for the host past activities diff --git a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx index 7c13965bdb..a3941ac7af 100644 --- a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx +++ b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx @@ -763,6 +763,55 @@ const TAGGED_TEMPLATES = { ); }, + createdDeclarationProfile: (activity: IActivity, isPremiumTier: boolean) => { + return ( + <> + {" "} + added declaration (DDM) profile + {activity.details?.profile_name} + {" "} + to{" "} + {getProfileMessageSuffix( + isPremiumTier, + "darwin", + activity.details?.team_name + )} + . + + ); + }, + deletedDeclarationProfile: (activity: IActivity, isPremiumTier: boolean) => { + return ( + <> + {" "} + removed declaration (DDM) profile{" "} + {activity.details?.profile_name} from{" "} + {getProfileMessageSuffix( + isPremiumTier, + "darwin", + activity.details?.team_name + )} + . + + ); + }, + editedDeclarationProfile: (activity: IActivity, isPremiumTier: boolean) => { + return ( + <> + {" "} + edited declaration (DDM) profile + {activity.details?.profile_name} + {" "} + for{" "} + {getProfileMessageSuffix( + isPremiumTier, + "darwin", + activity.details?.team_name + )}{" "} + via fleetctl. + + ); + }, }; const getDetail = ( @@ -918,6 +967,22 @@ const getDetail = ( case ActivityType.WipedHost: { return TAGGED_TEMPLATES.wipedHost(activity); } + case ActivityType.CreatedDeclarationProfile: { + return TAGGED_TEMPLATES.createdDeclarationProfile( + activity, + isPremiumTier + ); + } + case ActivityType.DeletedDeclarationProfile: { + return TAGGED_TEMPLATES.deletedDeclarationProfile( + activity, + isPremiumTier + ); + } + case ActivityType.EditedDeclarationProfile: { + return TAGGED_TEMPLATES.editedDeclarationProfile(activity, isPremiumTier); + } + default: { return TAGGED_TEMPLATES.defaultActivityTemplate(activity); }