Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 01:18:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 84

Fleet UI: Fix .ipa installers relies on mdm and not scripts enabled (#35522)

Browse source
This commit is contained in:
RachelElysia 2025-11-11 12:12:31 -05:00 committed by GitHub
parent 8145323e80
commit 7ce53d8804
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 102 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostInstallerActionCell/HostInstallerActionCell.tests.tsx
View file

@ -118,6 +118,92 @@ describe("getButtonActionState helper function", () => {
expect(result.installTooltip).toBeUndefined();
expect(result.uninstallTooltip).toBeUndefined();
});
it("returns enabled buttons and no tooltips for isMyDevicePage", () => {
const result = getActionButtonState({
hostScriptsEnabled: false, // ignored when isMyDevicePage
status: null,
appStoreApp: null,
softwareId: 1,
softwarePackage: mockSoftwarePackage,
hostMDMEnrolled: false,
isMyDevicePage: true,
installedVersionsDetected: true,
});
expect(result).toEqual({
installDisabled: false,
uninstallDisabled: false,
moreDisabled: false,
});
});
it("disables both buttons and sets tooltips when host scripts are off and package is not IPA/appStore and script versions not detected", () => {
const result = getActionButtonState({
hostScriptsEnabled: false,
status: null,
appStoreApp: null,
softwareId: 1,
softwarePackage: mockSoftwarePackage,
hostMDMEnrolled: false,
installedVersionsDetected: false,
});
expect(result).toEqual({
installDisabled: true,
installTooltip: "To install, turn on host scripts.",
uninstallDisabled: true,
uninstallTooltip: "To uninstall, turn on host scripts.",
moreDisabled: true,
});
});
it("disables install button for IPA/appStore if hostMDMEnrolled is false", () => {
const result = getActionButtonState({
hostScriptsEnabled: true,
status: null,
appStoreApp: mockAppStoreApp,
softwareId: 1,
softwarePackage: mockSoftwarePackage,
hostMDMEnrolled: false,
installedVersionsDetected: true,
});
expect(result.installDisabled).toBe(true);
expect(result.uninstallDisabled).toBe(true);
expect(result.installTooltip).toBe(
"To install, turn on MDM for this host."
);
});
it("returns enabled buttons and no tooltips for non-IPA, scripts enabled", () => {
const result = getActionButtonState({
hostScriptsEnabled: true,
status: null,
appStoreApp: null,
softwareId: 1,
softwarePackage: mockSoftwarePackage,
hostMDMEnrolled: true,
installedVersionsDetected: true,
});
expect(result.installDisabled).toBe(false);
expect(result.uninstallDisabled).toBe(false);
expect(result.installTooltip).toBeUndefined();
expect(result.uninstallTooltip).toBeUndefined();
expect(result.moreDisabled).toBe(false);
});
it("returns disabled uninstall and enabled install for IPA/appStore app with MDM enrolled", () => {
const result = getActionButtonState({
hostScriptsEnabled: true,
status: null,
appStoreApp: mockAppStoreApp,
softwareId: 1,
softwarePackage: mockSoftwarePackage,
hostMDMEnrolled: true,
installedVersionsDetected: true,
});
expect(result.installDisabled).toBe(false);
expect(result.uninstallDisabled).toBe(true);
expect(result.installTooltip).toBeUndefined();
expect(result.uninstallTooltip).toBeUndefined();
});
});
describe("HostInstallerActionCell component", () => {

20
frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostInstallerActionCell/HostInstallerActionCell.tsx
View file

@ -73,10 +73,16 @@ export const getActionButtonState = ({
hostScriptsEnabled,
status,
appStoreApp,
softwarePackage,
hostMDMEnrolled,
isMyDevicePage,
installedVersionsDetected,
}: IGetActionButtonStateProps): IActionButtonState => {
// Determine platform and management method
const platform = softwarePackage?.platform || "";
const isIpaOrAppStore = ["ipados", "ios"].includes(platform) || !!appStoreApp;
// Pending states take priority
const isPending = ["pending_install", "pending_uninstall"].includes(
status || ""
);
@ -105,7 +111,8 @@ export const getActionButtonState = ({
/** If scripts are not enabled, software actions disabled with tooltip on
* Host details > Software > Library but doesn't show to Fleet Desktop > Self-service. */
if (!hostScriptsEnabled && !appStoreApp) {
const requiresScripts = !isIpaOrAppStore;
if (requiresScripts && !hostScriptsEnabled) {
return {
installDisabled: true,
uninstallDisabled: true,
@ -116,8 +123,8 @@ export const getActionButtonState = ({
}
/** If MDM is not enrolled, software actions disabled with tooltip on
Host details > Software > Library but doesn't show Fleet Desktop > Self-service */
if (appStoreApp) {
* Host details > Software > Library but doesn't show Fleet Desktop > Self-service */
if (isIpaOrAppStore) {
return {
installDisabled: !hostMDMEnrolled,
uninstallDisabled: true,
@ -127,7 +134,12 @@ export const getActionButtonState = ({
};
}
return { installDisabled: false, uninstallDisabled: false };
// Default: actions enabled, no tooltips
return {
installDisabled: false,
uninstallDisabled: false,
moreDisabled: false,
};
};
const getMoreActionsDropdownOptions = (