Merge pull request #8 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev
KelvinTegelaar · Feb 19, 2024 · 685f936 · 685f936
2 parents 9d28a5e + 6f17b94
commit 685f936
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 18 deletions.
diff --git a/src/views/email-exchange/reports/MailboxStatisticsList.jsx b/src/views/email-exchange/reports/MailboxStatisticsList.jsx
@@ -36,11 +36,11 @@ const MailboxStatsList = () => {
       omit: tenantColumnSet,
     },
     {
-      selector: (row) => row['UPN'],
+      selector: (row) => row['userPrincipalName'],
       name: 'User Prinicipal Name',
       sortable: true,
-      cell: (row) => CellTip(row['UPN']),
-      exportSelector: 'UPN',
+      cell: (row) => CellTip(row['userPrincipalName']),
+      exportSelector: 'userPrincipalName',
       minWidth: '200px',
     },
     {
@@ -51,47 +51,49 @@ const MailboxStatsList = () => {
       exportSelector: 'displayName',
     },
     {
-      selector: (row) => row['MailboxType'],
+      selector: (row) => row[' recipientType'],
       name: 'Mailbox Type',
       sortable: true,
-      exportSelector: 'MailboxType',
+      cell: (row) => CellTip(row['recipientType']),
+      exportSelector: 'recipientType',
     },
     {
-      selector: (row) => row['LastActive'],
+      selector: (row) => row['lastActivityDate'],
       name: 'Last Active',
       sortable: true,
-      exportSelector: 'LastActive',
+      exportSelector: 'lastActivityDate',
     },
     {
-      selector: (row) => row['UsedGB'],
-      name: 'Used Space(GB)',
+      selector: (row) => (row['storageUsedInBytes'] / 1024 ** 3).toFixed(2),
+      name: 'Used Space (GB)',
       sortable: true,
-      exportSelector: 'UsedGB',
+      exportSelector: 'storageUsedInBytes',
     },
     {
-      selector: (row) => row['QuotaGB'],
+      selector: (row) => (row['prohibitSendReceiveQuotaInBytes'] / 1024 ** 3).toFixed(2),
       name: 'Quota (GB)',
       sortable: true,
       exportSelector: 'QuotaGB',
     },
     {
-      selector: (row) => Math.round((row.UsedGB / row.QuotaGB) * 100 * 10) / 10,
+      selector: (row) =>
+        Math.round((row.storageUsedInBytes / row.prohibitSendReceiveQuotaInBytes) * 100 * 10) / 10,
       name: 'Quota Used(%)',
       sortable: true,
       exportSelector: 'QuotaUsed',
     },
     {
-      selector: (row) => row['ItemCount'],
+      selector: (row) => row['itemCount'],
       name: 'Item Count (Total)',
       sortable: true,
-      exportSelector: 'ItemCount',
+      exportSelector: 'itemCount',
     },
     {
-      selector: (row) => row['HasArchive'],
+      selector: (row) => row['hasArchive'],
       name: 'Archiving Enabled',
       sortable: true,
       cell: cellBooleanFormatter({ colourless: true }),
-      exportSelector: 'HasArchive',
+      exportSelector: 'hasArchive',
     },
   ]
   useEffect(() => {
@@ -109,9 +111,13 @@ const MailboxStatsList = () => {
       datatable={{
         keyField: 'id',
         reportName: `${tenant?.defaultDomainName}-MailboxStatistics-List`,
-        path: '/api/ListMailboxStatistics',
+        path: '/api/ListGraphRequest',
+        params: {
+          TenantFilter: tenant?.defaultDomainName,
+          Endpoint: "reports/getMailboxUsageDetail(period='D7')",
+          $format: 'application/json',
+        },
         columns,
-        params: { TenantFilter: tenant?.defaultDomainName },
         tableProps: {
           conditionalRowStyles: conditionalRowStyles,
         },

diff --git a/src/views/identity/administration/AddUser.jsx b/src/views/identity/administration/AddUser.jsx
@@ -98,6 +98,7 @@ const AddUser = () => {
       MustChangePass: values.MustChangePass,
       tenantID: tenantDomain,
       addedAttributes: values.addedAttributes,
+      setManager: values.setManager,
       ...values.license,
     }
     //window.alert(JSON.stringify(shippedValues))
@@ -361,6 +362,18 @@ const AddUser = () => {
                         </CCol>
                       </CRow>
                       <CRow className="mb-3">
+                        <CCol md={12}>
+                          <RFFSelectSearch
+                            label="Set Manager"
+                            values={users?.map((user) => ({
+                              value: user.id,
+                              name: user.displayName,
+                            }))}
+                            placeholder={!usersIsFetching ? 'Select user' : 'Loading...'}
+                            name="setManager"
+                          />
+                          {usersError && <span>Failed to load list of users</span>}
+                        </CCol>
                         <CCol md={12}>
                           <RFFSelectSearch
                             label="Copy group membership from other user"

diff --git a/src/views/identity/administration/EditUser.jsx b/src/views/identity/administration/EditUser.jsx
@@ -106,6 +106,7 @@ const EditUser = () => {
       tenantID: tenantDomain,
       mustchangepass: values.RequirePasswordChange,
       addedAttributes: values.addedAttributes,
+      setManager: values.setManager,
       ...(values.licenses ? values.license : ''),
     }
     // window.alert(JSON.stringify(shippedValues))
@@ -425,6 +426,19 @@ const EditUser = () => {
                             </CCol>
                           </CRow>
                           <CRow className="mb-3">
+                            <CCol md={12}>
+                              <RFFSelectSearch
+                                label="Set Manager"
+                                disabled={formDisabled}
+                                values={users?.map((user) => ({
+                                  value: user.id,
+                                  name: user.displayName,
+                                }))}
+                                placeholder={!usersIsFetching ? 'Select user' : 'Loading...'}
+                                name="setManager"
+                              />
+                              {usersError && <span>Failed to load list of users</span>}
+                            </CCol>
                             <CCol md={12}>
                               <RFFSelectSearch
                                 multi={true}