From bf8f84a39929ae5817c9071967a6720995b34ae3 Mon Sep 17 00:00:00 2001
From: Gabriel Hernandez <ghernandez345@gmail.com>
Date: Tue, 3 Sep 2024 14:46:11 +0100
Subject: [PATCH] show abm and vpp sections when mdm is disabled (#21752)

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)
---
 .../IntegrationsPage/cards/MdmSettings/MdmSettings.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/MdmSettings.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/MdmSettings.tsx
index ff3cf5b539..b6e0f02795 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/MdmSettings.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/MdmSettings.tsx
@@ -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}>