Add missing header on Fleet free for Conditional Access (#43643)

Fixes #43643

Fixed missing "Conditional access" section header on the Settings >
Integrations > Conditional access page on Fleet Free.
This commit is contained in:
Juan Fernandez
2026-05-15 08:03:40 -04:00
committed by GitHub
parent b6b6398294
commit ed2b41bd5a
3 changed files with 28 additions and 1 deletions
@@ -0,0 +1 @@
- Fixed missing "Conditional access" section header on the Settings > Integrations > Conditional access page on Fleet Free.
@@ -471,5 +471,25 @@ BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
screen.getByText(/This feature is included in Fleet Premium/i)
).toBeInTheDocument();
});
it("Renders the 'Conditional access' section header on Fleet Free", () => {
const render = createCustomRenderer({
withBackendMock: true,
context: {
app: {
isPremiumTier: false,
},
},
});
render(<ConditionalAccess />);
expect(
screen.getByRole("heading", {
level: 2,
name: /Conditional access/i,
})
).toBeInTheDocument();
});
});
});
@@ -30,6 +30,8 @@ import TooltipWrapper from "components/TooltipWrapper";
import { IConfig, isOktaConditionalAccessConfigured } from "interfaces/config";
import { IInputFieldParseTarget } from "interfaces/form_field";
import SettingsSection from "pages/admin/components/SettingsSection";
import SectionCard from "../MdmSettings/components/SectionCard";
import EntraConditionalAccessModal from "./components/EntraConditionalAccessModal";
import OktaConditionalAccessModal from "./components/OktaConditionalAccessModal";
@@ -296,7 +298,11 @@ const ConditionalAccess = () => {
}, [entraTenantId, entraConfigured, entraPhase]);
if (!isPremiumTier) {
return <PremiumFeatureMessage />;
return (
<SettingsSection title="Conditional access">
<PremiumFeatureMessage />
</SettingsSection>
);
}
// HANDLERS