>
- columnConfigs={searchResultsTableConfig}
- data={dropdownHosts}
- isLoading={false}
- emptyComponent={() => (
-
-
-
No hosts match the current search criteria.
-
- Expecting to see hosts? Try again in a few seconds as
- the system catches up.
-
-
+ {isActiveSearch && (
+
+
>
+ columnConfigs={searchResultsTableConfig}
+ data={dropdownHosts}
+ isLoading={isTargetsLoading}
+ emptyComponent={() => (
+
+
+
No hosts match the current search criteria.
+
+ Expecting to see hosts? Try again in a few seconds as the
+ system catches up.
+
- )}
- showMarkAllPages={false}
- isAllPagesSelected={false}
- disableCount
- disablePagination
- disableMultiRowSelect
- onClickRow={handleRowSelect}
- />
-
- ))}
+
+ )}
+ showMarkAllPages={false}
+ isAllPagesSelected={false}
+ disableCount
+ disablePagination
+ disableMultiRowSelect
+ onClickRow={handleRowSelect}
+ />
+
+ )}
{isSearchError && (
diff --git a/frontend/components/LiveQuery/TargetsInput/_styles.scss b/frontend/components/LiveQuery/TargetsInput/_styles.scss
index e219d2660d18..a3fac64150b3 100644
--- a/frontend/components/LiveQuery/TargetsInput/_styles.scss
+++ b/frontend/components/LiveQuery/TargetsInput/_styles.scss
@@ -17,10 +17,6 @@
overflow: auto;
}
- &__data-table-block > div {
- min-height: 89px;
- }
-
// Properly vertically aligns host issue icon
.display_name__cell {
display: inline-flex;
@@ -39,7 +35,7 @@
}
.empty-search,
- .error-search {
+ .data-error {
padding-top: 72px;
padding-bottom: 72px;
min-height: 225px;
@@ -48,16 +44,14 @@
box-shadow: 0px 4px 10px rgba(52, 59, 96, 0.15);
box-sizing: border-box;
- &__inner {
- h4 {
- margin: 0;
- margin-bottom: 16px;
- font-size: $small;
- }
- p {
- margin: 0;
- font-size: $x-small;
- }
+ h4 {
+ margin: 0;
+ margin-bottom: 16px;
+ font-size: $small;
+ }
+ p {
+ margin: 0;
+ font-size: $x-small;
}
}
}
@@ -99,9 +93,15 @@
}
}
- // override the default styles for the spinner.
- // TODO: set better default styles for the spinner
+ .data-table-block .data-table__no-rows {
+ min-height: 225px; // Match empty and error state
+ }
+
+ .loading-overlay {
+ height: 100%; // Match container height
+ }
+
.loading-spinner.centered {
- margin: 1rem auto;
+ margin: auto;
}
}
diff --git a/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx b/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx
index 8c12c4905388..fdf534328259 100644
--- a/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx
+++ b/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx
@@ -5,12 +5,13 @@ import { APP_CONTEXT_NO_TEAM_ID } from "interfaces/team";
import { NotificationContext } from "context/notification";
import configAPI from "services/entities/config";
import teamsAPI from "services/entities/teams";
+import { ApplePlatform } from "interfaces/platform";
// @ts-ignore
import InputField from "components/forms/fields/InputField";
import Button from "components/buttons/Button";
import validatePresence from "components/forms/validators/validate_presence";
-import { ApplePlatform } from "interfaces/platform";
+import CustomLink from "components/CustomLink";
const baseClass = "apple-os-target-form";
@@ -166,28 +167,18 @@ const AppleOSTargetForm = ({
setDeadline(val);
};
- const getMinimumVersionPlaceholder = (platform: ApplePlatform) => {
- switch (platform) {
- case "darwin":
- return "13.0.1";
- case "ios":
- case "ipados":
- return "17.5.1";
- default:
- return "";
- }
- };
-
- const getMinimumVersionTooltip = (platform: ApplePlatform) => {
- switch (platform) {
- case "darwin":
- return "The end user sees the window until their macOS is at or above this version.";
- case "ios":
- case "ipados":
- return "If the end user's host is below the minimum version, they see a notification in their Notification Center after the deadline. They can’t continue until the OS update is installed.";
- default:
- return "";
- }
+ const getMinimumVersionTooltip = () => {
+ return (
+ <>
+ If an already enrolled host is below the minimum version,
+
the host is updated to exactly the minimum version if it's
+
available from Apple.
+
+
If a new or wiped host is below the minimum version and
+
automatically enrolls (ADE), the host is updated to Apple's
+
lastest version during Setup Assistant.
+ >
+ );
};
const getDeadlineTooltip = (platform: ApplePlatform) => {
@@ -206,9 +197,17 @@ const AppleOSTargetForm = ({
- setIsSelfService(newVal)}
- className={`${baseClass}__self-service-checkbox`}
- tooltipContent={
- <>
- End users can install from Fleet Desktop {">"}{" "}
- Self-service.
- >
- }
- >
- Self-service
-
+ {renderSelfServiceContent(
+ (selectedApp && selectedApp.platform) || ""
+ )}