Merge pull request #2863 from JohnDuprey/dev

BEC prettification

Author: JohnDuprey

src/store/api/users.js

@@ -64,6 +64,7 @@ export const usersApi = baseApi.injectEndpoints({
             userId: _args.userId,
             tenantFilter: _args.tenantFilter,
             userName: _args.userName,
+            overwrite: _args.overwrite,
           },
         })
         if (startRequest.error) {

src/views/email-exchange/administration/QuarantineList.jsx

@@ -10,6 +10,7 @@ import { MessageViewer } from 'src/views/email-exchange/tools/MessageViewer'
 import { ModalService } from 'src/components/utilities'
 import { useLazyGenericGetRequestQuery } from 'src/store/api/app'
 import PropTypes from 'prop-types'
+import Skeleton from 'react-loading-skeleton'
 
 const QuarantineList = () => {
   const tenant = useSelector((state) => state.app.currentTenant)
@@ -95,11 +96,7 @@ const QuarantineList = () => {
           placement="end"
         >
           <>
-            {quarantineMessage.isLoading && (
-              <div>
-                <CSpinner className="me-2" /> Loading message
-              </div>
-            )}
+            {quarantineMessage.isLoading && <Skeleton count={10} height={30} />}
             {quarantineMessage.isSuccess && (
               <MessageViewer emailSource={quarantineMessage?.data?.Message} />
             )}

src/views/identity/administration/ViewBEC.jsx

@@ -22,6 +22,7 @@ import { CippContentCard, CippMasonry, CippMasonryItem, CippPage } from 'src/com
 import 'react-loading-skeleton/dist/skeleton.css'
 import Skeleton from 'react-loading-skeleton'
 import useConfirmModal from 'src/hooks/useConfirmModal'
+import { cellGenericFormatter } from 'src/components/tables/CellGenericFormat'
 
 const ViewBec = () => {
   let query = useQuery()
@@ -85,28 +86,33 @@ const ViewBec = () => {
   const logonColumns = [
     {
       name: 'App',
-      selector: (row) => row['AppDisplayName'],
+      selector: (row) => row['appDisplayName'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
     {
       name: 'Date Time',
-      selector: (row) => row['CreatedDateTime'],
+      selector: (row) => row['createdDateTime'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
     {
       name: 'Error code',
       selector: (row) => row.id,
       sortable: true,
+      cell: cellGenericFormatter(),
     },
     {
       name: 'Details',
       selector: (row) => row.Status,
       sortable: true,
+      cell: cellGenericFormatter(),
     },
     {
       name: 'IP',
       selector: (row) => row.IPAddress,
       sortable: true,
+      cell: cellGenericFormatter(),
     },
   ]
 
@@ -115,38 +121,45 @@ const ViewBec = () => {
       name: 'IP',
       selector: (row) => row['IPAddress'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
     {
       name: 'User',
       selector: (row) => row['userPrincipalName'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
     {
       name: 'Application',
       selector: (row) => row['AppDisplayName'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
     {
       name: 'Result',
       selector: (row) => row['Status'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
   ]
   const newUserColumns = [
     {
       name: 'DisplayName',
       selector: (row) => row['displayName'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
     {
       name: 'Username',
       selector: (row) => row['userPrincipalName'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
     {
       name: 'Date',
-      selector: (row) => row['CreatedDateTime'],
+      selector: (row) => row['createdDateTime'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
   ]
 
@@ -155,16 +168,19 @@ const ViewBec = () => {
       name: 'displayName',
       selector: (row) => row['displayName'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
     {
       name: 'Username',
       selector: (row) => row['userPrincipalName'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
     {
       name: 'Date',
       selector: (row) => row['lastPasswordChangeDateTime'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
   ]
 
@@ -173,44 +189,46 @@ const ViewBec = () => {
       name: 'Operation',
       selector: (row) => row['Operation'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
     {
       name: 'Executed by',
       selector: (row) => row['UserKey'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
     {
       name: 'Executed on',
       selector: (row) => row['ObjectId'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
     {
       name: 'Permissions',
       selector: (row) => row['Permissions'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
   ]
 
   const appColumns = [
     {
-      name: 'Type',
-      selector: (row) => row['Operation'],
-      sortable: true,
-    },
-    {
-      name: 'User',
-      selector: (row) => row['UserId'],
+      name: 'Application',
+      selector: (row) => row['appDisplayName'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
     {
-      name: 'Application',
-      selector: (row) => row['ObjectId'],
+      name: 'Application ID',
+      selector: (row) => row['appId'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
     {
-      name: 'Result',
-      selector: (row) => row['ResultStatus'],
+      name: 'Created',
+      selector: (row) => row['createdDateTime'],
       sortable: true,
+      cell: cellGenericFormatter(),
     },
   ]
   const handleReMediate = useConfirmModal({
@@ -304,9 +322,9 @@ const ViewBec = () => {
                 data={alerts.SuspectUserDevices}
                 striped
                 responsive={true}
-                tableProps={{ subHeaderComponent: false, pagination: false }}
+                isModal={true}
                 wrapperClasses="table-responsive"
-                reportName="none"
+                reportName="bec-user-devices"
               />
             )}
           </CippContentCard>
@@ -322,8 +340,8 @@ const ViewBec = () => {
                 data={alerts.NewRules}
                 striped
                 responsive={true}
-                tableProps={{ subHeaderComponent: false }}
-                reportName="none"
+                isModal={true}
+                reportName="bec-inbox-rules"
               />
             )}
           </CippContentCard>
@@ -338,8 +356,8 @@ const ViewBec = () => {
                 data={alerts.LastSuspectUserLogon}
                 striped
                 responsive={true}
-                tableProps={{ subHeaderComponent: false }}
-                reportName="none"
+                isModal={true}
+                reportName="bec-suspect-user-logons"
               />
             )}
           </CippContentCard>
@@ -355,9 +373,9 @@ const ViewBec = () => {
                 data={alerts.NewUsers}
                 striped
                 responsive={true}
-                tableProps={{ subHeaderComponent: false }}
+                isModal={true}
                 wrapperClasses="table-responsive"
-                reportName="none"
+                reportName="bec-new-users"
               />
             )}
           </CippContentCard>
@@ -373,9 +391,9 @@ const ViewBec = () => {
                 data={alerts.ChangedPasswords}
                 striped
                 responsive={true}
-                tableProps={{ subHeaderComponent: false }}
+                isModal={true}
                 wrapperClasses="table-responsive"
-                reportName="none"
+                reportName="bec-changed-passwords"
               />
             )}
           </CippContentCard>
@@ -391,9 +409,9 @@ const ViewBec = () => {
                 data={alerts.MailboxPermissionChanges}
                 striped
                 responsive={true}
-                tableProps={{ subHeaderComponent: false }}
+                isModal={true}
                 wrapperClasses="table-responsive"
-                reportName="none"
+                reportName="bec-mailbox-permission-changes"
               />
             )}
           </CippContentCard>
@@ -409,9 +427,9 @@ const ViewBec = () => {
                 data={alerts.AddedApps}
                 striped
                 responsive={true}
-                tableProps={{ subHeaderComponent: false }}
                 wrapperClasses="table-responsive"
-                reportName="none"
+                isModal={true}
+                reportName="bec-added-apps"
               />
             )}
           </CippContentCard>
@@ -427,7 +445,7 @@ const ViewBec = () => {
                 data={alerts.SuspectUserMailboxLogons}
                 striped
                 responsive={true}
-                tableProps={{ subHeaderComponent: false }}
+                isModal={true}
                 wrapperClasses="table-responsive"
                 reportName="none"
               />