Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev

Author: KelvinTegelaar

package-lock.json

@@ -122,6 +122,8 @@ const MailboxPermissions = () => {
       RemoveFullAccess: values.RemoveFullAccess ? values.RemoveFullAccess : null,
       AddSendAs: values.AddSendAs ? values.AddSendAs : null,
       RemoveSendAs: values.RemoveSendAs ? values.RemoveSendAs : null,
+      AddSendOnBehalf: values.AddSendOnBehalf ? values.AddSendOnBehalf : null,
+      RemoveSendOnBehalf: values.RemoveSendOnBehalf ? values.RemoveSendOnBehalf : null,
     }
     //window.alert(JSON.stringify(shippedValues))
     genericPostRequest({ path: '/api/ExecEditMailboxPermissions', values: shippedValues })
@@ -250,6 +252,34 @@ const MailboxPermissions = () => {
                                 />
                                 {usersError && <span>Failed to load list of users</span>}
                               </CCol>
+                              <CCol md={12}>
+                                <RFFSelectSearch
+                                  multi={true}
+                                  label="Add Send On Behalf permissions"
+                                  disabled={formDisabled}
+                                  values={users?.map((user) => ({
+                                    value: user.mail,
+                                    name: `${user.displayName} - ${user.mail} `,
+                                  }))}
+                                  placeholder={!usersIsFetching ? 'Select user' : 'Loading...'}
+                                  name="AddSendOnBehalf"
+                                />
+                                {usersError && <span>Failed to load list of users</span>}
+                              </CCol>
+                              <CCol md={12}>
+                                <RFFSelectSearch
+                                  multi={true}
+                                  label="Remove Send On Behalf permissions"
+                                  disabled={formDisabled}
+                                  values={users?.map((user) => ({
+                                    value: user.mail,
+                                    name: `${user.displayName} - ${user.mail} `,
+                                  }))}
+                                  placeholder={!usersIsFetching ? 'Select user' : 'Loading...'}
+                                  name="RemoveSendOnBehalf"
+                                />
+                                {usersError && <span>Failed to load list of users</span>}
+                              </CCol>
                             </CRow>
                             <CRow className="mb-3">
                               <CCol md={6}>

src/views/email-exchange/administration/EditMailboxPermissions.js

@@ -68,18 +68,18 @@ const AutopilotListTemplates = () => {
   const columns = [
     {
       name: 'Display Name',
-      selector: (row) => row['Displayname'],
+      selector: (row) => row['displayName'],
       sortable: true,
-      cell: (row) => CellTip(row['Displayname']),
+      cell: (row) => CellTip(row['displayName']),
       exportSelector: 'Displayname',
       minWidth: '400px',
       maxWidth: '400px',
     },
     {
       name: 'Description',
-      selector: (row) => row['Description'],
+      selector: (row) => row['description'],
       sortable: true,
-      cell: (row) => CellTip(row['Description']),
+      cell: (row) => CellTip(row['description']),
       exportSelector: 'Description',
       minWidth: '400px',
       maxWidth: '400px',
@@ -124,7 +124,7 @@ const AutopilotListTemplates = () => {
           <CippDatatable
             keyField="id"
             reportName={`${tenant?.defaultDomainName}-MEMPolicyTemplates-List`}
-            path="/api/ListIntuneTemplates"
+            path="/api/ListIntuneTemplates?View=true"
             columns={columns}
             params={{ TenantFilter: tenant?.defaultDomainName }}
           />

src/views/endpoint/intune/MEMListPolicyTemplates.js

@@ -52,7 +52,7 @@ const columns = [
     cell: cellBooleanFormatter(),
   },
   {
-    name: 'Time until renewal (days)',
+    name: 'Days until renewal',
     selector: (row) => row['TimeUntilRenew'],
     sortable: true,
     exportSelector: 'TimeUntilRenew',
@@ -65,7 +65,7 @@ const columns = [
     cell: cellDateFormatter(),
   },
   {
-    name: 'Time until renewal (days)',
+    name: 'Renewal Date',
     selector: (row) => row['dateExpires'],
     sortable: true,
     exportSelector: 'dateExpires',