diff --git a/changes/19184-activity-human-readable b/changes/19184-activity-human-readable new file mode 100644 index 0000000000..2021f81bca --- /dev/null +++ b/changes/19184-activity-human-readable @@ -0,0 +1 @@ +- Fix activity without public IP to be human readable diff --git a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tests.tsx b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tests.tsx index 830d485425..f04e855af7 100644 --- a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tests.tsx +++ b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tests.tsx @@ -245,6 +245,15 @@ describe("Activity Feed", () => { screen.getByText("successfully logged in from public IP 192.168.0.1.") ).toBeInTheDocument(); }); + it("renders a user_logged_in type activity without public IP", () => { + const activity = createMockActivity({ + type: ActivityType.UserLoggedIn, + details: {}, + }); + render(); + + expect(screen.getByText("successfully logged in.")).toBeInTheDocument(); + }); it("renders a user_failed_login type activity globally", () => { const activity = createMockActivity({ diff --git a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx index c3a2759329..d8deaf0fe7 100644 --- a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx +++ b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx @@ -182,7 +182,14 @@ const TAGGED_TEMPLATES = { return "was added to Fleet by SSO."; }, userLoggedIn: (activity: IActivity) => { - return `successfully logged in from public IP ${activity.details?.public_ip}.`; + return ( + <> + successfully logged in + {activity.details?.public_ip && + ` from public IP ${activity.details?.public_ip}`} + . + + ); }, userFailedLogin: (activity: IActivity) => { return (