Bugfixes and code cleanup

src/store/api/reports.js

@@ -6,10 +6,10 @@ export const reportsApi = baseApi.injectEndpoints({
       query: () => ({ path: '/api/BestPracticeAnalyser_List' }),
     }),
     execBestPracticeAnalyser: builder.mutation({
-      query: () => ({ path: '/api/BestPracticeAnalyser_OrchestrationStarter' }),
+      query: () => ({ path: '/api/ExecBPA' }),
     }),
     execDomainsAnalyser: builder.mutation({
-      query: () => ({ path: '/api/DomainAnalyser_OrchestrationStarter' }),
+      query: () => ({ path: '/api/ExecDomainAnalyser' }),
     }),
   }),
 })

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

@@ -195,7 +195,7 @@ const MailboxPermissions = () => {
     params: {
       Endpoint: 'users',
       TenantFilter: tenantDomain,
-      $filter: 'assignedLicenses/$count ne 0 and accountEnabled eq true',
+      $filter: "assignedLicenses/$count ne 0 and accountEnabled eq true and userType eq 'Member'",
       $count: true,
     },
   })
@@ -586,7 +586,7 @@ const MailboxForwarding = () => {
     params: {
       Endpoint: 'users',
       TenantFilter: tenantDomain,
-      $filter: "userType eq 'Member' and mail ge ' '", // filter out guests and users with no mailbox. #HACK "mail ne 'null'" does not work so this horrible hack is required
+      $filter: "userType eq 'Member' and proxyAddresses/$count ne 0",
     },
   })
   useEffect(() => {
@@ -803,19 +803,6 @@ const OutOfOffice = () => {
     error: userError,
   } = useListMailboxPermissionsQuery({ tenantDomain, userId })
 
-  const {
-    data: users = [],
-    isFetching: usersIsFetching,
-    error: usersError,
-  } = useGenericGetRequestQuery({
-    path: '/api/ListGraphRequest',
-    params: {
-      Endpoint: 'users',
-      TenantFilter: tenantDomain,
-      $filter: 'assignedLicenses/$count ne 0 and accountEnabled eq true',
-      $count: true,
-    },
-  })
   useEffect(() => {
     if (postResults.isSuccess) {
       // @TODO do something here?
@@ -865,9 +852,9 @@ const OutOfOffice = () => {
           )}
           <CRow>
             <CCol className="mb-3">
-              {usersIsFetching && <CSpinner />}
+              {userIsFetching && <CSpinner />}
               {userError && <span>Error loading user</span>}
-              {!usersIsFetching && (
+              {!userIsFetching && (
                 <Form
                   initialValues={{ ...initialState }}
                   onSubmit={onSubmit}

src/views/endpoint/applications/ListApplicationQueue.jsx

@@ -20,7 +20,7 @@ const RefreshAction = () => {
           <i>Please note: This job runs automatically every 12 hours.</i>
         </div>
       ),
-      onConfirm: () => execStandards({ path: 'api/AddChocoApp_OrchestrationStarter' }),
+      onConfirm: () => execStandards({ path: 'api/ExecAppUpload' }),
     })
 
   return (

src/views/tenant/standards/BestPracticeAnalyser.jsx

@@ -61,7 +61,7 @@ const RefreshAction = ({ singleTenant = false, refreshFunction = null }) => {
       ),
       onConfirm: () =>
         execBestPracticeAnalyser({
-          path: 'api/BestPracticeAnalyser_OrchestrationStarter',
+          path: 'api/ExecBPA',
           params: params,
         }),
     })