From de068730504bb1c4669f60c7fbb5e72d5d688ba1 Mon Sep 17 00:00:00 2001
From: jacobshandling <61553566+jacobshandling@users.noreply.github.com>
Date: Mon, 26 Aug 2024 11:22:39 -0700
Subject: [PATCH] =?UTF-8?q?UI=20=E2=80=93=20Update=20host=20activity=20fee?=
 =?UTF-8?q?d=20empty=20states=20and=20tooltip=20(#21530)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Addresses #20955

<img width="988" alt="Screenshot 2024-08-23 at 8 58 02 AM"
src="https://github.com/user-attachments/assets/29d03464-1795-4b2a-b15f-2c974db184ca">
<img width="733" alt="Screenshot 2024-08-23 at 8 58 09 AM"
src="https://github.com/user-attachments/assets/780fa0ee-747a-4f73-982b-891042124633">

- [x] Changes file added for user-visible changes in `changes/`,
- [x] Manual QA for all new/changed functionality

---------

Co-authored-by: Jacob Shandling <jacob@fleetdm.com>
---
 changes/20955-host-activity-feed-copy-updates              | 2 ++
 frontend/pages/hosts/details/cards/Activity/Activity.tsx   | 7 ++++---
 .../cards/Activity/PastActivityFeed/PastActivityFeed.tsx   | 2 +-
 .../Activity/UpcomingActivityFeed/UpcomingActivityFeed.tsx | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 changes/20955-host-activity-feed-copy-updates

diff --git a/changes/20955-host-activity-feed-copy-updates b/changes/20955-host-activity-feed-copy-updates
new file mode 100644
index 0000000000..acfb44dfb0
--- /dev/null
+++ b/changes/20955-host-activity-feed-copy-updates
@@ -0,0 +1,2 @@
+* Update Host details activities tooltip and empty state copy to reflect recently added
+capabilities.
diff --git a/frontend/pages/hosts/details/cards/Activity/Activity.tsx b/frontend/pages/hosts/details/cards/Activity/Activity.tsx
index 91d35ce35f..507ceaa335 100644
--- a/frontend/pages/hosts/details/cards/Activity/Activity.tsx
+++ b/frontend/pages/hosts/details/cards/Activity/Activity.tsx
@@ -31,11 +31,12 @@ const UpcomingTooltip = () => {
     <TooltipWrapper
       tipContent={
         <>
-          Upcoming activities will run as listed. Failure of one activity
-          won&apos;t cancel other activities.
+          Currently, only scripts run before other scripts and
+          <br />
+          software is installed before other software.
           <br />
           <br />
-          Currently, only scripts are guaranteed to run in order.
+          Failure of one activity won&apos;t cancel other activities.
         </>
       }
       className={`${baseClass}__upcoming-tooltip`}
diff --git a/frontend/pages/hosts/details/cards/Activity/PastActivityFeed/PastActivityFeed.tsx b/frontend/pages/hosts/details/cards/Activity/PastActivityFeed/PastActivityFeed.tsx
index 5e58a50f4c..2321f9674d 100644
--- a/frontend/pages/hosts/details/cards/Activity/PastActivityFeed/PastActivityFeed.tsx
+++ b/frontend/pages/hosts/details/cards/Activity/PastActivityFeed/PastActivityFeed.tsx
@@ -44,7 +44,7 @@ const PastActivityFeed = ({
     return (
       <EmptyFeed
         title="No activity"
-        message="When a script runs on a host, it shows up here."
+        message="Completed actions will appear here (scripts, software, lock, and wipe)."
         className={`${baseClass}__empty-feed`}
       />
     );
diff --git a/frontend/pages/hosts/details/cards/Activity/UpcomingActivityFeed/UpcomingActivityFeed.tsx b/frontend/pages/hosts/details/cards/Activity/UpcomingActivityFeed/UpcomingActivityFeed.tsx
index c9c12696f2..ab4a3ba565 100644
--- a/frontend/pages/hosts/details/cards/Activity/UpcomingActivityFeed/UpcomingActivityFeed.tsx
+++ b/frontend/pages/hosts/details/cards/Activity/UpcomingActivityFeed/UpcomingActivityFeed.tsx
@@ -43,7 +43,7 @@ const UpcomingActivityFeed = ({
     return (
       <EmptyFeed
         title="No pending activity "
-        message="When you run a script on an offline host, it will appear here."
+        message="Pending actions will appear here (scripts, software, lock, and wipe)."
         className={`${baseClass}__empty-feed`}
       />
     );