diff --git a/changes/issue-7825-edit-team-config-file-fleetctl b/changes/issue-7825-edit-team-config-file-fleetctl new file mode 100644 index 0000000000..a758f8fb95 --- /dev/null +++ b/changes/issue-7825-edit-team-config-file-fleetctl @@ -0,0 +1 @@ +* Activity feed includes editing team config file using fleetctl \ No newline at end of file diff --git a/frontend/interfaces/activity.ts b/frontend/interfaces/activity.ts index 0a8ef9b5a7..f48ea80a4c 100644 --- a/frontend/interfaces/activity.ts +++ b/frontend/interfaces/activity.ts @@ -1,5 +1,6 @@ import { IPolicy } from "./policy"; import { IQuery } from "./query"; +import { ITeamSummary } from "./team"; export enum ActivityType { CreatedPack = "created_pack", @@ -40,6 +41,7 @@ export interface IActivityDetails { query_name?: string; team_id?: number; team_name?: string; + teams?: ITeamSummary[]; targets_count?: number; specs?: IQuery[] | IPolicy[]; global?: boolean; diff --git a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityFeed.tsx b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityFeed.tsx index 734b61f750..9192b51936 100644 --- a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityFeed.tsx +++ b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityFeed.tsx @@ -51,6 +51,16 @@ const TAGGED_TEMPLATES = { ? "edited a query using fleetctl" : `edited ${count === 1 ? "a query" : "queries"} using fleetctl`; }, + editTeamCtlActivityTemplate: (activity: IActivity) => { + const count = activity.details?.teams?.length; + return count === 1 && activity.details?.teams ? ( + <> + edited {activity.details?.teams[0].name} team using fleetctl + + ) : ( + "edited multiple teams using fleetctl" + ); + }, userAddedBySSOTempalte: () => { return `was added to Fleet by SSO`; }, @@ -109,11 +119,7 @@ const ActivityFeed = ({ keepPreviousData: true, staleTime: 5000, select: (data) => { - // We purposly removed the "applied_spec_team" activity as we are currently - // thinking how we want to display this in the UI. - return data.activities.filter( - (activity) => activity.type !== ActivityType.AppliedSpecTeam - ); + return data.activities; }, onSuccess: (results) => { setShowActivityFeedTitle(true); @@ -150,6 +156,9 @@ const ActivityFeed = ({ case ActivityType.AppliedSpecSavedQuery: { return TAGGED_TEMPLATES.editQueryCtlActivityTemplate(activity); } + case ActivityType.AppliedSpecTeam: { + return TAGGED_TEMPLATES.editTeamCtlActivityTemplate(activity); + } case ActivityType.UserAddedBySSO: { return TAGGED_TEMPLATES.userAddedBySSOTempalte(); }