From d4e99bac477558e7ffe557e587f5258660b6847e Mon Sep 17 00:00:00 2001
From: John Duprey <jwd@johnwduprey.com>
Date: Tue, 23 Jul 2024 16:28:44 -0400
Subject: [PATCH 1/3] Change placeholder

---
 src/views/cipp/Setup.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/cipp/Setup.jsx b/src/views/cipp/Setup.jsx
index bf09e8b04baf..7f18e7c6a661 100644
--- a/src/views/cipp/Setup.jsx
+++ b/src/views/cipp/Setup.jsx
@@ -286,7 +286,7 @@ const Setup = () => {
                 type="text"
                 name="TenantID"
                 label="Tenant ID"
-                placeholder="Enter the Tenant ID. e.g. mymsp.onmicrosoft.com. Leave blank to retain a previous key if this exists."
+                placeholder="Enter the Tenant ID. e.g. 1111-1111-1111-1111-11111. Leave blank to retain a previous key if this exists."
               />
             </CCol>
           </CRow>

From 0d4dd6f3fd24d2a8d701bd27a0b1601346d6c500 Mon Sep 17 00:00:00 2001
From: John Duprey <jwd@johnwduprey.com>
Date: Thu, 25 Jul 2024 17:57:55 -0400
Subject: [PATCH 2/3] MFA report update

---
 src/views/identity/reports/MFAReport.jsx | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/views/identity/reports/MFAReport.jsx b/src/views/identity/reports/MFAReport.jsx
index 27f09aecfa3b..7eb6859a3b07 100644
--- a/src/views/identity/reports/MFAReport.jsx
+++ b/src/views/identity/reports/MFAReport.jsx
@@ -3,6 +3,7 @@ import { useSelector } from 'react-redux'
 import { cellBooleanFormatter, CellTip } from 'src/components/tables'
 import { CippPageList } from 'src/components/layout'
 import { Row } from 'react-bootstrap'
+import { cellGenericFormatter } from 'src/components/tables/CellGenericFormat'
 
 const columns = [
   {
@@ -57,9 +58,23 @@ const columns = [
     selector: (row) => row['CoveredByCA'],
     name: 'Enforced via Conditional Access',
     sortable: true,
-    cell: (row) => CellTip(row['CoveredByCA']),
+    cell: cellGenericFormatter(),
     exportSelector: 'CoveredByCA',
   },
+  {
+    selector: (row) => row['MFAMethods'],
+    name: 'MFA Methods',
+    sortable: true,
+    cell: cellGenericFormatter(),
+    exportSelector: 'MFAMethods',
+  },
+  {
+    selector: (row) => row['CAPolicies'],
+    name: 'CA Policies',
+    sortable: true,
+    cell: cellGenericFormatter(),
+    exportSelector: 'CAPolicies',
+  },
 ]
 
 const Altcolumns = [

From 34a75336f21626b931488cc3de1e5c8130c1d441 Mon Sep 17 00:00:00 2001
From: John Duprey <jwd@johnwduprey.com>
Date: Thu, 25 Jul 2024 18:20:35 -0400
Subject: [PATCH 3/3] Add remove tenant bulk action

---
 src/views/cipp/app-settings/SettingsTenants.jsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/views/cipp/app-settings/SettingsTenants.jsx b/src/views/cipp/app-settings/SettingsTenants.jsx
index c425f3c1ae97..bbced7def29a 100644
--- a/src/views/cipp/app-settings/SettingsTenants.jsx
+++ b/src/views/cipp/app-settings/SettingsTenants.jsx
@@ -7,7 +7,7 @@ import { useLazyGenericGetRequestQuery } from 'src/store/api/app.js'
 import React, { useEffect, useRef } from 'react'
 import { ModalService, TenantSelectorMultiple } from 'src/components/utilities/index.js'
 import { setCurrentTenant } from 'src/store/features/app.js'
-import { CAlert, CButton, CCallout, CSpinner, CTooltip } from '@coreui/react'
+import { CButton, CSpinner, CTooltip } from '@coreui/react'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import {
   faCheckCircle,
@@ -261,6 +261,16 @@ export function SettingsTenants() {
                 modalMessage:
                   'Are you sure you want to reset the CPV permissions for these tenants? (This will delete the Service Principal and re-add it.)',
               },
+              {
+                label: 'Remove Tenant',
+                modal: true,
+                modalType: 'POST',
+                modalUrl: `/api/ExecRemoveTenant`,
+                modalBody: {
+                  TenantID: '!customerId',
+                },
+                modalMessage: 'Are you sure you want to remove this tenant?',
+              },
             ],
           },
           isModal: true,