Merge pull request #2728 from JohnDuprey/dev

MFA report update & UI tweaks

Author: JohnDuprey

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>

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,

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 = [