Merge pull request #515 from k-grube/react

Fix ListAlerts

Author: KelvinTegelaar

src/components/CippPage.js

@@ -15,17 +15,19 @@ export function CippPage({ tenantSelector = true, title, children, titleButton =
   const dispatch = useDispatch()
 
   useEffect(() => {
-    const customerId = searchParams.get('customerId')
-    if (customerId && isSuccess) {
-      const currentTenant = tenants.filter((tenant) => tenant.customerId === customerId)
-      if (currentTenant.length > 0) {
-        dispatch(setCurrentTenant({ tenant: currentTenant[0] }))
+    if (tenantSelector) {
+      const customerId = searchParams.get('customerId')
+      if (customerId && isSuccess) {
+        const currentTenant = tenants.filter((tenant) => tenant.customerId === customerId)
+        if (currentTenant.length > 0) {
+          dispatch(setCurrentTenant({ tenant: currentTenant[0] }))
+        }
+      }
+      if (!customerId && Object.keys(tenant).length > 0) {
+        setSearchParams({ customerId: tenant?.customerId })
       }
     }
-    if (!customerId && Object.keys(tenant).length > 0) {
-      setSearchParams({ customerId: tenant?.customerId })
-    }
-  }, [searchParams, dispatch, tenants, isSuccess, tenant, setSearchParams])
+  }, [searchParams, dispatch, tenants, isSuccess, tenant, setSearchParams, tenantSelector])
 
   return (
     <div>

src/store/api/security.js

@@ -22,17 +22,17 @@ export const securityApi = createApi({
               params: { GUID },
             })
             if (error) {
-              console.log('request error', error)
               clearInterval(interval)
               resolve({ error })
             }
             if (!data['Waiting'] === true) {
-              console.log('request complete', { data })
+              if (!Array.isArray(data['MSResults'])) {
+                data['MSResults'] = []
+              }
               clearInterval(interval)
               resolve({ data })
             }
             if (retries >= 60) {
-              console.log('too many retries')
               clearInterval(interval)
               resolve({
                 error: {

src/views/security/reports/ListAlerts.js

@@ -11,37 +11,12 @@ import cellGetProperty from '../../../components/cipp/cellGetProperty'
 import { useDispatch } from 'react-redux'
 import { showModal } from '../../../store/features/modal'
 
-const columns = [
-  {
-    name: 'Date',
-    selector: (row) => row['EventDateTime'],
-    sortable: true,
-    cell: cellDateFormatter(),
-  },
-  {
-    name: 'Tenant',
-    selector: (row) => row['Tenant'],
-    sortable: true,
-  },
-  {
-    name: 'Title',
-    selector: (row) => row['Title'],
-    sortable: true,
-  },
-  {
-    name: 'Severity',
-    selector: (row) => row['Severity'],
-    sortable: true,
-  },
-  {
-    name: 'Status',
-    selector: (row) => row['Status'],
-    sortable: true,
-  },
-]
-
 const AlertBox = ({ value, title, fetching }) => {
-  const displayValue = value ? value : 'n/a'
+  let displayValue = value
+  if (typeof value !== 'number') {
+    displayValue = 'n/a'
+  }
+
   return (
     <CCard>
       <CCardBody>
@@ -89,20 +64,48 @@ const ListAlerts = () => {
       }),
     )
 
-  columns.push({
-    name: 'RawResult',
-    selector: (row) => row['RawResult'],
-    sortable: true,
-    cell: (row, index, column, id) => {
-      const value = cellGetProperty(row, index, column, id)
+  const columns = [
+    {
+      name: 'Date',
+      selector: (row) => row['EventDateTime'],
+      sortable: true,
+      cell: cellDateFormatter(),
+    },
+    {
+      name: 'Tenant',
+      selector: (row) => row['Tenant'],
+      sortable: true,
+    },
+    {
+      name: 'Title',
+      selector: (row) => row['Title'],
+      sortable: true,
+    },
+    {
+      name: 'Severity',
+      selector: (row) => row['Severity'],
+      sortable: true,
+    },
+    {
+      name: 'Status',
+      selector: (row) => row['Status'],
+      sortable: true,
+    },
+    {
+      name: 'More Info',
+      selector: (row) => row['MSResults'],
+      sortable: true,
+      cell: (row, index, column, id) => {
+        const value = cellGetProperty(row, index, column, id)
 
-      return (
-        <CButton size="sm" onClick={() => handleShowModal(value)}>
-          More
-        </CButton>
-      )
+        return (
+          <CButton size="sm" onClick={() => handleShowModal(value)}>
+            More
+          </CButton>
+        )
+      },
     },
-  })
+  ]
 
   return (
     <CippPage tenantSelector={false} title="List Alerts">