Discharge7443/fleet
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Fleet UI: Fix multiple xxs bugs (#36716)

Browse Source
This commit is contained in:
RachelElysia
2025-12-05 08:25:47 -05:00
committed by GitHub
parent 820f6c85f0
commit f628c26f1b
6 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/pages/DashboardPage/cards/ActivityFeed/GlobalActivityItem/GlobalActivityItem.tests.tsx
+4 -4
View File
@@ -867,7 +867,7 @@ describe("Activity Feed", () => {
expect(
screen.getByText(
"required end user authentication for macOS hosts that automatically enroll to",
"required end user authentication for macOS, iOS, iPadOS, and Android hosts that automatically enroll to",
{ exact: false }
)
).toBeInTheDocument();
@@ -884,7 +884,7 @@ describe("Activity Feed", () => {
expect(
screen.getByText(
"required end user authentication for macOS hosts that automatically enroll to no team.",
"required end user authentication for macOS, iOS, iPadOS, and Android hosts that automatically enroll to no team.",
{ exact: false }
)
).toBeInTheDocument();
@@ -899,7 +899,7 @@ describe("Activity Feed", () => {
expect(
screen.getByText(
"removed end user authentication requirement for macOS hosts that automatically enroll to",
"removed end user authentication requirement for macOS, iOS, iPadOS, and Android hosts that automatically enroll to",
{ exact: false }
)
).toBeInTheDocument();
@@ -916,7 +916,7 @@ describe("Activity Feed", () => {
expect(
screen.getByText(
"removed end user authentication requirement for macOS hosts that automatically enroll to no team.",
"removed end user authentication requirement for macOS, iOS, iPadOS, and Android hosts that automatically enroll to no team.",
{ exact: false }
)
).toBeInTheDocument();
frontend/pages/DashboardPage/cards/ActivityFeed/GlobalActivityItem/GlobalActivityItem.tsx
+4 -4
View File
@@ -745,8 +745,8 @@ const TAGGED_TEMPLATES = {
return (
<>
{" "}
required end user authentication for macOS hosts that automatically
enroll to{" "}
required end user authentication for macOS, iOS, iPadOS, and Android
hosts that automatically enroll to{" "}
{activity.details?.team_name ? (
<>
the <b>{activity.details.team_name}</b> team
@@ -762,8 +762,8 @@ const TAGGED_TEMPLATES = {
return (
<>
{" "}
removed end user authentication requirement for macOS hosts that
automatically enroll to{" "}
removed end user authentication requirement for macOS, iOS, iPadOS, and
Android hosts that automatically enroll to{" "}
{activity.details?.team_name ? (
<>
the <b>{activity.details.team_name}</b> team
frontend/pages/ManageControlsPage/SetupExperience/cards/InstallSoftware/components/SelectSoftwareTable/SelectSoftwareTable.tsx
+1 -1
View File
@@ -76,7 +76,7 @@ const SelectSoftwareTable = ({
<p className={`${baseClass}__help-text`}>
Software will be installed on{" "}
{platform === "linux" ? "compatible platforms" : "all hosts"}.
Currently, custom targets (labels) don&apos;t apply during set up
Currently, custom targets (labels) don&apos;t apply during setup
experience.
</p>
)}
frontend/pages/SoftwarePage/components/forms/PackageAdvancedOptions/PackageAdvancedOptions.tsx
+1 -2
View File
@@ -101,8 +101,7 @@ const getUninstallHelpText = (pkgType: PackageType) => {
<>
For Windows, Fleet only creates uninstall scripts for .msi packages.
$PACKAGE_ID will be populated with the software name from the .exe file
after it&apos;s added.
{getSupportedScriptTypeText(pkgType)}{" "}
after it&apos;s added. {getSupportedScriptTypeText(pkgType)}{" "}
<CustomLink
url={`${LEARN_MORE_ABOUT_BASE_LINK}/exe-install-scripts`}
text="Learn more"
frontend/pages/hosts/details/cards/Activity/PastActivityFeed/PastActivityFeed.tsx
+9 -2
View File
@@ -1,8 +1,9 @@
import React from "react";
import React, { useContext } from "react";
import { IHostPastActivity } from "interfaces/activity";
import { IHostPastActivitiesResponse } from "services/entities/activities";
import { AppContext } from "context/app";
import DataError from "components/DataError";
import Pagination from "components/Pagination";
import { ShowActivityDetailsHandler } from "components/ActivityItem/ActivityItem";
@@ -28,6 +29,8 @@ const PastActivityFeed = ({
onNextPage,
onPreviousPage,
}: IPastActivityFeedProps) => {
const { isPremiumTier } = useContext(AppContext);
if (isError) {
return <DataError verticalPaddingSize="pad-large" />;
}
@@ -42,7 +45,11 @@ const PastActivityFeed = ({
return (
<EmptyFeed
title="No activity"
message="Completed actions will appear here (scripts, software, lock, and wipe)."
message={
isPremiumTier
? "Completed actions will appear here (scripts, software, lock, and wipe)."
: "Completed script runs will appear here."
}
className={`${baseClass}__empty-feed`}
/>
);
frontend/pages/hosts/details/cards/Activity/UpcomingActivityFeed/UpcomingActivityFeed.tsx
+9 -2
View File
@@ -1,8 +1,9 @@
import React from "react";
import React, { useContext } from "react";
import { IHostUpcomingActivity } from "interfaces/activity";
import { IHostUpcomingActivitiesResponse } from "services/entities/activities";
import { AppContext } from "context/app";
import DataError from "components/DataError";
import Pagination from "components/Pagination";
import { ShowActivityDetailsHandler } from "components/ActivityItem/ActivityItem";
@@ -31,6 +32,8 @@ const UpcomingActivityFeed = ({
onNextPage,
onPreviousPage,
}: IUpcomingActivityFeedProps) => {
const { isPremiumTier } = useContext(AppContext);
if (isError) {
return <DataError verticalPaddingSize="pad-large" />;
}
@@ -45,7 +48,11 @@ const UpcomingActivityFeed = ({
return (
<EmptyFeed
title="No pending activity "
message="Pending actions will appear here (scripts, software, lock, and wipe)."
message={
isPremiumTier
? "Pending actions will appear here (scripts, software, lock, and wipe)."
: "Pending script runs will appear here."
}
className={`${baseClass}__empty-feed`}
/>
);