From 96fc9945580c4067df8ca5cf9c5f8aa1c81877fe Mon Sep 17 00:00:00 2001
From: Martin Angers <martin.n.angers@gmail.com>
Date: Mon, 3 Mar 2025 16:33:42 -0500
Subject: [PATCH] Bugfix: fix many small bugs in activity actor and activity
 formatting (#26779)

---
 .../GlobalActivityItem/GlobalActivityItem.tsx         |  4 +++-
 .../InstalledSoftwareActivityItem.tsx                 | 11 +++++++++--
 .../RanScriptActivityItem/RanScriptActivityItem.tsx   |  5 ++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/frontend/pages/DashboardPage/cards/ActivityFeed/GlobalActivityItem/GlobalActivityItem.tsx b/frontend/pages/DashboardPage/cards/ActivityFeed/GlobalActivityItem/GlobalActivityItem.tsx
index 39696c8899..e5abfdd656 100644
--- a/frontend/pages/DashboardPage/cards/ActivityFeed/GlobalActivityItem/GlobalActivityItem.tsx
+++ b/frontend/pages/DashboardPage/cards/ActivityFeed/GlobalActivityItem/GlobalActivityItem.tsx
@@ -1352,7 +1352,9 @@ const GlobalActivityItem = ({
   const hasDetails = ACTIVITIES_WITH_DETAILS.has(activity.type);
 
   const renderActivityPrefix = () => {
-    const DEFAULT_ACTOR_DISPLAY = <b>{activity.actor_full_name ?? "Fleet"} </b>;
+    const DEFAULT_ACTOR_DISPLAY = (
+      <b>{activity.fleet_initiated ? "Fleet" : activity.actor_full_name} </b>
+    );
 
     switch (activity.type) {
       case ActivityType.UserLoggedIn:
diff --git a/frontend/pages/hosts/details/cards/Activity/ActivityItems/InstalledSoftwareActivityItem/InstalledSoftwareActivityItem.tsx b/frontend/pages/hosts/details/cards/Activity/ActivityItems/InstalledSoftwareActivityItem/InstalledSoftwareActivityItem.tsx
index 6d0a623cc4..4e1612ba1b 100644
--- a/frontend/pages/hosts/details/cards/Activity/ActivityItems/InstalledSoftwareActivityItem/InstalledSoftwareActivityItem.tsx
+++ b/frontend/pages/hosts/details/cards/Activity/ActivityItems/InstalledSoftwareActivityItem/InstalledSoftwareActivityItem.tsx
@@ -9,6 +9,7 @@ import { IHostActivityItemComponentPropsWithShowDetails } from "../../ActivityCo
 const baseClass = "installed-software-activity-item";
 
 const InstalledSoftwareActivityItem = ({
+  tab,
   activity,
   onShowDetails,
   hideCancel,
@@ -24,6 +25,12 @@ const InstalledSoftwareActivityItem = ({
     <b>{actorName ?? "Fleet"}</b>
   );
 
+  let installedSoftwarePrefix = getInstallStatusPredicate(status);
+  if (tab !== "past" && activity.fleet_initiated) {
+    installedSoftwarePrefix =
+      status === "pending_uninstall" ? "will uninstall" : "will install";
+  }
+
   return (
     <ActivityItem
       className={baseClass}
@@ -31,8 +38,8 @@ const InstalledSoftwareActivityItem = ({
       hideCancel={hideCancel}
       onShowDetails={onShowDetails}
     >
-      <>{actorDisplayName}</> {getInstallStatusPredicate(status)} <b>{title}</b>{" "}
-      on this host {self_service && "(self-service)"}.{" "}
+      <>{actorDisplayName}</> {installedSoftwarePrefix} <b>{title}</b> on this
+      host{self_service && " (self-service)"}.{" "}
     </ActivityItem>
   );
 };
diff --git a/frontend/pages/hosts/details/cards/Activity/ActivityItems/RanScriptActivityItem/RanScriptActivityItem.tsx b/frontend/pages/hosts/details/cards/Activity/ActivityItems/RanScriptActivityItem/RanScriptActivityItem.tsx
index ae4be92455..df7ec7bb49 100644
--- a/frontend/pages/hosts/details/cards/Activity/ActivityItems/RanScriptActivityItem/RanScriptActivityItem.tsx
+++ b/frontend/pages/hosts/details/cards/Activity/ActivityItems/RanScriptActivityItem/RanScriptActivityItem.tsx
@@ -15,7 +15,10 @@ const RanScriptActivityItem = ({
   isSoloActivity,
   hideCancel,
 }: IHostActivityItemComponentPropsWithShowDetails) => {
-  const ranScriptPrefix = tab === "past" ? "ran" : "told Fleet to run";
+  let ranScriptPrefix = tab === "past" ? "ran" : "told Fleet to run";
+  if (tab !== "past" && activity.fleet_initiated) {
+    ranScriptPrefix = "will run";
+  }
 
   return (
     <ActivityItem