Merge pull request #2356 from JohnDuprey/dev

Recent Jobs and Tenant Onboarding
KelvinTegelaar · Apr 23, 2024 · f359a3c · f359a3c
2 parents b8fd9bf + abbddb8
commit f359a3c
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 28 deletions.
diff --git a/src/components/layout/AppHeader.jsx b/src/components/layout/AppHeader.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, useRef } from 'react'
 import { useSelector, useDispatch } from 'react-redux'
 import {
   CAlert,
@@ -72,8 +72,29 @@ const AppHeader = () => {
     loadCippQueue()
   }
 
+  function useInterval(callback, delay, state) {
+    const savedCallback = useRef()
+
+    // Remember the latest callback.
+    useEffect(() => {
+      savedCallback.current = callback
+    })
+
+    // Set up the interval.
+    useEffect(() => {
+      function tick() {
+        savedCallback.current()
+      }
+
+      if (delay !== null) {
+        let id = setInterval(tick, delay)
+        return () => clearInterval(id)
+      }
+    }, [delay, state])
+  }
+
   useEffect(() => {
-    if (cippQueueList.isFetching || cippQueueList.isLoading) {
+    if (cippQueueList.isUninitialized && (cippQueueList.isFetching || cippQueueList.isLoading)) {
       setCippQueueExtendedInfo([
         {
           label: 'Fetching recent jobs',
@@ -82,28 +103,40 @@ const AppHeader = () => {
           link: '#',
         },
       ])
-    }
-    if (
-      cippQueueList.isSuccess &&
-      Array.isArray(cippQueueList.data) &&
-      cippQueueList.data.length > 0
-    ) {
-      setCippQueueExtendedInfo(
-        cippQueueList.data?.map((job) => ({
-          label: `${job.Name}`,
-          value: job.Status,
-          link: job.Link,
-          timestamp: job.Timestamp,
-          percent: job.PercentComplete,
-          progressText: `${job.PercentComplete}%`,
-        })),
-      )
     } else {
-      setCippQueueExtendedInfo([
-        { label: 'No jobs to display', value: '', timestamp: Date(), link: '#' },
-      ])
+      if (
+        cippQueueList.isSuccess &&
+        Array.isArray(cippQueueList.data) &&
+        cippQueueList.data.length > 0
+      ) {
+        setCippQueueExtendedInfo(
+          cippQueueList.data?.map((job) => ({
+            label: `${job.Name}`,
+            value: job.Status,
+            link: job.Link,
+            timestamp: job.Timestamp,
+            percent: job.PercentComplete,
+            progressText: `${job.PercentComplete}%`,
+          })),
+        )
+      } else {
+        setCippQueueExtendedInfo([
+          { label: 'No jobs to display', value: '', timestamp: Date(), link: '#' },
+        ])
+      }
     }
-  }, [cippQueueList])
+  }, [cippQueueList, setCippQueueExtendedInfo])
+
+  useInterval(
+    async () => {
+      if (cippQueueVisible) {
+        setCippQueueRefresh((Math.random() + 1).toString(36).substring(7))
+        getCippQueueList({ path: 'api/ListCippQueue', params: { refresh: cippQueueRefresh } })
+      }
+    },
+    5000,
+    cippQueueVisible,
+  )
 
   const SwitchTheme = () => {
     let targetTheme = preferredTheme

diff --git a/src/components/utilities/CippActionsOffcanvas.jsx b/src/components/utilities/CippActionsOffcanvas.jsx
@@ -231,7 +231,7 @@ export default function CippActionsOffcanvas(props) {
           </CCardBody>
           <CCardFooter className="text-end">
             <CRow>
-              {action.percent && (
+              {action?.percent > 0 && (
                 <CCol xs="8">
                   <div className="mt-1">
                     <CProgress>

diff --git a/src/views/tenant/administration/TenantOnboardingWizard.jsx b/src/views/tenant/administration/TenantOnboardingWizard.jsx
@@ -312,14 +312,14 @@ const TenantOnboardingWizard = () => {
                 reportName="Add-GDAP-Relationship"
                 keyField="id"
                 path="/api/ListGraphRequest"
-                params={{ Endpoint: 'tenantRelationships/delegatedAdminRelationships' }}
+                params={{
+                  Endpoint: 'tenantRelationships/delegatedAdminRelationships',
+                  $filter:
+                    "(status eq 'active' or status eq 'approvalPending') and not startsWith(displayName,'MLT_')",
+                }}
                 columns={columns}
                 filterlist={[
                   { filterName: 'Active Relationships', filter: 'Complex: status eq active' },
-                  {
-                    filterName: 'Terminated Relationships',
-                    filter: 'Complex: status eq terminated',
-                  },
                   {
                     filterName: 'Pending Relationships',
                     filter: 'Complex: status eq approvalPending',