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

show abm and vpp sections when mdm is disabled (#21752)

Browse source 
relates to #21716

This shows the abm and vpp sections on the mdm settings page when mdm is
not enabled.


![image](https://github.com/user-attachments/assets/357a0f5a-6e99-4a85-aed5-e5e4c18a5b20)
This commit is contained in:
Gabriel Hernandez 2024-09-03 14:46:11 +01:00 committed by GitHub
parent a6dcdca2dd
commit bf8f84a399
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frontend/pages/admin/IntegrationsPage/cards/MdmSettings/MdmSettings.tsx
View file

@ -27,6 +27,8 @@ interface IMdmSettingsProps {
const MdmSettings = ({ router }: IMdmSettingsProps) => {
const { isPremiumTier, config } = useContext(AppContext);
const isMdmEnabled = !!config?.mdm.enabled_and_configured;
// Currently the status of this API call is what determines various UI states on
// this page. Because of this we will not render any of this components UI until this API
// call has completed.
@ -48,7 +50,7 @@ const MdmSettings = ({ router }: IMdmSettingsProps) => {
// we're fetching and setting the config, but for now we'll just assume that any 400 response
// means that MDM is not enabled and we'll show the "Turn on MDM" button.
staleTime: 5000,
enabled: !!config?.mdm.enabled_and_configured,
enabled: isMdmEnabled,
}
);
@ -63,7 +65,7 @@ const MdmSettings = ({ router }: IMdmSettingsProps) => {
{
...DEFAULT_USE_QUERY_OPTIONS,
retry: false,
enabled: isPremiumTier && !!config?.mdm.enabled_and_configured,
enabled: isPremiumTier && isMdmEnabled,
}
);
@ -80,7 +82,7 @@ const MdmSettings = ({ router }: IMdmSettingsProps) => {
{
...DEFAULT_USE_QUERY_OPTIONS,
retry: false,
enabled: isPremiumTier && !!config?.mdm.enabled_and_configured,
enabled: isPremiumTier && isMdmEnabled,
}
);
@ -104,7 +106,7 @@ const MdmSettings = ({ router }: IMdmSettingsProps) => {
// we use this to determine if we have all the data we need to render the UI.
// Notice that we do not need VPP or EULA data to render this page.
const hasAllData = !!APNSInfo;
const hasAllData = !isMdmEnabled || !!APNSInfo;
return (
<div className={baseClass}>