Remove any mock data, remove code bypassing and logs

fleetdm · Jul 2, 2024 · 6e6bbdf · 6e6bbdf
1 parent 5463fd7
commit 6e6bbdf
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 341 deletions.
diff --git a/frontend/pages/DashboardPage/cards/HostsSummary/HostsSummary.tsx b/frontend/pages/DashboardPage/cards/HostsSummary/HostsSummary.tsx
@@ -137,7 +137,7 @@ const HostsSummary = ({
 
   const renderIosCount = (teamId?: number) => {
     const iosLabelId = builtInLabels?.find(
-      (builtin) => builtin.name === PLATFORM_NAME_TO_LABEL_NAME.chrome // TODO: change to ios
+      (builtin) => builtin.name === PLATFORM_NAME_TO_LABEL_NAME.ios // TODO: change to ios
     )?.id;
 
     if (isLoadingHostsSummary || iosLabelId === undefined) {
@@ -160,7 +160,7 @@ const HostsSummary = ({
 
   const renderIpadosCount = (teamId?: number) => {
     const ipadosLabelId = builtInLabels?.find(
-      (builtin) => builtin.name === PLATFORM_NAME_TO_LABEL_NAME.chrome // TODO: change to ipados
+      (builtin) => builtin.name === PLATFORM_NAME_TO_LABEL_NAME.ipados // TODO: change to ipados
     )?.id;
 
     if (isLoadingHostsSummary || ipadosLabelId === undefined) {

diff --git a/frontend/pages/ManageControlsPage/OSSettings/OSSettings.tsx b/frontend/pages/ManageControlsPage/OSSettings/OSSettings.tsx
@@ -51,14 +51,12 @@ const OSSettings = ({
   );
 
   // MDM is not on so show messaging for user to enable it.
-  // TODO: Reinstate when ready
-  // if (
-  //   !config?.mdm.enabled_and_configured &&
-  //   !config?.mdm.windows_enabled_and_configured
-  // ) {
-  //   return <TurnOnMdmMessage router={router} />;
-  // }
-  // END TODO
+  if (
+    !config?.mdm.enabled_and_configured &&
+    !config?.mdm.windows_enabled_and_configured
+  ) {
+    return <TurnOnMdmMessage router={router} />;
+  }
 
   const DEFAULT_SETTINGS_SECTION = OS_SETTINGS_NAV_ITEMS[0];
 

diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/CustomSettings/CustomSettings.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/CustomSettings/CustomSettings.tsx
@@ -57,28 +57,8 @@ const CustomSettings = ({
 
   const selectedProfile = useRef<IMdmProfile | null>(null);
 
-  const profilesData: IMdmProfilesResponse = {
-    profiles: [
-      {
-        profile_uuid: "12345",
-        team_id: 1,
-        name: "Profile name",
-        platform: "ios",
-        identifier: "1234", // null for windows profiles
-        created_at: "2024-03-07T14:40:00Z",
-        updated_at: "2024-03-07T14:40:00Z",
-        checksum: "1234", // null for windows profiles
-        labels: [{ name: "string", broken: false }],
-      },
-    ],
-    meta: {
-      has_next_results: true,
-      has_previous_results: false,
-    },
-  };
-
   const {
-    data: profilesData2,
+    data: profilesData,
     isLoading: isLoadingProfiles,
     isError: isErrorProfiles,
     refetch: refetchProfiles,

diff --git a/frontend/pages/ManageControlsPage/OSUpdates/OSUpdates.tsx b/frontend/pages/ManageControlsPage/OSUpdates/OSUpdates.tsx
@@ -40,10 +40,11 @@ const getSelectedPlatform = (
 };
 
 interface IOSUpdates {
+  router: InjectedRouter;
   teamIdForApi: number;
 }
 
-const OSUpdates = ({ teamIdForApi }: IOSUpdates) => {
+const OSUpdates = ({ router, teamIdForApi }: IOSUpdates) => {
   const { isPremiumTier, config, setConfig } = useContext(AppContext);
 
   const [
@@ -92,26 +93,18 @@ const OSUpdates = ({ teamIdForApi }: IOSUpdates) => {
   // FIXME: Handle error states for app config and team config (need specifications for this).
 
   // mdm is not enabled for mac or windows.
-  // TODO: Reinstate when ready
-  // if (
-  //   !config?.mdm.enabled_and_configured &&
-  //   !config?.mdm.windows_enabled_and_configured
-  // ) {
-  //   return <TurnOnMdmMessage router={router} />;
-  // }
-  // END TODO
+
+  if (
+    !config?.mdm.enabled_and_configured &&
+    !config?.mdm.windows_enabled_and_configured
+  ) {
+    return <TurnOnMdmMessage router={router} />;
+  }
 
   // If the user has not selected a platform yet, we default to the platform that
   // is enabled and configured.
   const selectedPlatform = selectedPlatformTab || getSelectedPlatform(config);
 
-  // TODO: Remove when ready
-  if (!config) {
-    return null;
-  }
-  // END TODO
-
-  console.log("selectedPlatform", selectedPlatform);
   return (
     <div className={baseClass}>
       <p className={`${baseClass}__description`}>