From 9d594e1b4edaf299dafaf89181834f8b4c546732 Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Fri, 3 Feb 2023 11:36:27 -0500
Subject: [PATCH] Fleet UI: MDM > ABM fix org_name key (#9655)

---
 frontend/interfaces/mdm.ts                    |  2 +-
 .../admin/IntegrationsPage/cards/Mdm/Mdm.tsx  |  2 +-
 .../services/mock_service/mocks/config.ts     |  3 ---
 .../services/mock_service/mocks/responses.ts  | 24 -------------------
 4 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/frontend/interfaces/mdm.ts b/frontend/interfaces/mdm.ts
index 7ea560ae3a..f79a21536c 100644
--- a/frontend/interfaces/mdm.ts
+++ b/frontend/interfaces/mdm.ts
@@ -8,7 +8,7 @@ export interface IMdmApple {
 export interface IMdmAppleBm {
   default_team?: string;
   apple_id: string;
-  organization_name: string;
+  org_name: string;
   mdm_server_url: string;
   renew_date: string;
 }
diff --git a/frontend/pages/admin/IntegrationsPage/cards/Mdm/Mdm.tsx b/frontend/pages/admin/IntegrationsPage/cards/Mdm/Mdm.tsx
index bfe4e876b5..55b223c82c 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/Mdm/Mdm.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/Mdm/Mdm.tsx
@@ -249,7 +249,7 @@ const Mdm = (): JSX.Element => {
           <h4>Apple ID</h4>
           <p>{mdmAppleBm.apple_id}</p>
           <h4>Organization name</h4>
-          <p>{mdmAppleBm.organization_name}</p>
+          <p>{mdmAppleBm.org_name}</p>
           <h4>MDM Server URL</h4>
           <p>{mdmAppleBm.mdm_server_url}</p>
           <h4>Renew date</h4>
diff --git a/frontend/services/mock_service/mocks/config.ts b/frontend/services/mock_service/mocks/config.ts
index 40775746ee..ab7c5583ec 100644
--- a/frontend/services/mock_service/mocks/config.ts
+++ b/frontend/services/mock_service/mocks/config.ts
@@ -22,9 +22,6 @@ const REQUEST_RESPONSE_MAPPINGS: IResponses = {
     // request query string is hostname, uuid, or mac address; response is host detail excluding any
     // expensive data operations
     "targets?query={*}": RESPONSES.hosts,
-    "mdm/apple": RESPONSES.mdmApple,
-    "mdm/apple_bm": RESPONSES.mdmAppleBm,
-    "mdm/profile": RESPONSES.mdmEnrollmentProfile,
   },
   POST: {
     // request body is ISelectedTargets
diff --git a/frontend/services/mock_service/mocks/responses.ts b/frontend/services/mock_service/mocks/responses.ts
index 33569dfe0b..39ccc7f329 100644
--- a/frontend/services/mock_service/mocks/responses.ts
+++ b/frontend/services/mock_service/mocks/responses.ts
@@ -11,27 +11,6 @@ const count = {
   targets_missing_in_action: 0,
 };
 
-// MDM TODO: Remove mock when backend is merged
-const mdmApple = {
-  common_name: "Mock backend response APSP:04b46ce0-xxxx-xxxx-xxxx-xxxxxxxx",
-  serial_number: "Mock backend response 123938388712",
-  issuer:
-    "Mock backend response Apple Application Integration 2 Certification Authority",
-  renew_date: "2023-09-30T00:00:00Z",
-};
-
-// MDM TODO: Remove mock when backend is merged
-const mdmAppleBm = {
-  default_team: "Mock backend response Apples",
-  apple_id: "Mock backend response test@example.com",
-  organization_name: "Mock backend response Fleet Device Management",
-  mdm_server_url: "Mock backend response https://fleet.organization.com/mdm",
-  renew_date: "2023-09-30T00:00:00Z",
-};
-
-// MDM TODO: Remove mock when backend is merged
-const mdmEnrollmentProfile = {};
-
 const hosts = {
   hosts: [
     {
@@ -389,7 +368,4 @@ export default {
   count,
   hosts,
   labels,
-  mdmApple,
-  mdmAppleBm,
-  mdmEnrollmentProfile,
 };