Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Fleet UI: Indicator for min os requirement not met includes warning icon (#20813)

Browse source
This commit is contained in:
RachelElysia 2024-07-30 10:21:27 -04:00 committed by GitHub
parent bec4072ca7
commit 56bdfdcda6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
frontend/pages/hosts/details/cards/HostSummary/HostSummary.tsx
View file

@ -173,26 +173,6 @@ const getHostDiskEncryptionTooltipMessage = (
];
};
const getOSVersionRequirementTooltipMessage = (
osVersion: string,
osVersionRequirement: IAppleDeviceUpdates
) => {
const requirementMetTooltip = "Meets minimum version requirement.";
const requirementNotMetTooltip = (
<>
Does not meet minimum version requirement.
<br />
Deadline to update: {osVersionRequirement.deadline}
</>
);
const result = compareVersions(
removeOSPrefix(osVersion),
osVersionRequirement.minimum_version
);
return result < 0 ? requirementNotMetTooltip : requirementMetTooltip;
};
const HostSummary = ({
summaryData,
bootstrapPackageData,
@ -341,22 +321,43 @@ const HostSummary = ({
const renderOperatingSystemSummary = () => {
// No tooltip if minimum version is not set, including all Windows, Linux, ChromeOS operating systems
if (!osVersionRequirement?.minimum_version) {
return (
<DataSet title="Operating system" value={summaryData.os_version} />
);
}
const osVersionWithoutPrefix = removeOSPrefix(summaryData.os_version);
const osVersionRequirementMet =
compareVersions(
osVersionWithoutPrefix,
osVersionRequirement.minimum_version
) >= 0;
return (
<DataSet
title="Operating system"
value={
osVersionRequirement?.minimum_version ? (
<>
{!osVersionRequirementMet && (
<Icon name="error-outline" color="ui-fleet-black-75" />
)}
<TooltipWrapper
tipContent={getOSVersionRequirementTooltipMessage(
summaryData.os_version,
osVersionRequirement
)}
tipContent={
osVersionRequirementMet ? (
"Meets minimum version requirement."
) : (
<>
Does not meet minimum version requirement.
<br />
Deadline to update: {osVersionRequirement.deadline}
</>
)
}
>
{summaryData.os_version}
</TooltipWrapper>
) : (
summaryData.os_version
)
</>
}
/>
);