Merge remote-tracking branch 'upstream/dev' into dev

Author: JohnDuprey

src/components/tables/CippDatatable.jsx

@@ -23,6 +23,7 @@ export default function CippDatatable({ path, params, ...rest }) {
       {data?.Metadata?.Queued && <CCallout color="info">{data?.Metadata?.QueueMessage}</CCallout>}
       <CippTable
         {...rest}
+        endpointName={path}
         data={Array.isArray(data?.Results) ? data?.Results : data}
         isFetching={isFetching}
         error={error}

src/components/tables/CippTable.jsx

@@ -37,6 +37,7 @@ import { debounce, update } from 'lodash-es'
 import { useSearchParams } from 'react-router-dom'
 import CopyToClipboard from 'react-copy-to-clipboard'
 import { setDefaultColumns } from 'src/store/features/app'
+import { end } from '@popperjs/core'
 
 const FilterComponent = ({ filterText, onFilter, onClear, filterlist, onFilterPreset }) => (
   <>
@@ -122,6 +123,7 @@ export default function CippTable({
   exportFiltered = false,
   filterlist,
   showFilter = true,
+  endpointName,
   tableProps: {
     keyField = 'id',
     theme = 'cyberdrain',
@@ -146,7 +148,7 @@ export default function CippTable({
 }) {
   const inputRef = useRef('')
   const [loopRunning, setLoopRunning] = React.useState(false)
-  const defaultColumns = useSelector((state) => state.app.defaultColumns[reportName])
+  const defaultColumns = useSelector((state) => state.app.defaultColumns[endpointName])
   const [defaultColumnsSet, setDefaultColumnsSet] = React.useState(false)
   const [massResults, setMassResults] = React.useState([])
   const [filterText, setFilterText] = React.useState(defaultFilterText)
@@ -334,14 +336,14 @@ export default function CippTable({
 
   const resetDropdown = () => {
     setUpdatedColumns(originalColumns)
-    setColumnDefaultLayout(reportName, null)
+    setColumnDefaultLayout(endpointName, null)
   }
   const dispatch = useDispatch()
   useEffect(() => {
     if (columns.length !== updatedColumns.length) {
       setUpdatedColumns(updatedColumns)
       setColumnDefaultLayout(
-        reportName,
+        endpointName,
         updatedColumns.map((column) => column.exportSelector).join(','),
       )
     }
@@ -351,7 +353,7 @@ export default function CippTable({
     dispatch,
     dynamicColumns,
     originalColumns,
-    reportName,
+    endpointName,
     setColumnDefaultLayout,
     updatedColumns,
   ])
@@ -855,7 +857,8 @@ export default function CippTable({
     data,
     dynamicColumns,
     reportName,
-    originalColumns,
+    resetDropdown,
+    updatedColumns,
     addColumn,
     setGraphFilter,
   ])

src/views/tenant/administration/ListAlertsQueue.jsx

@@ -1,8 +1,8 @@
 import React, { useState } from 'react'
 import { CButton, CCallout, CCol, CForm, CRow, CSpinner, CTooltip } from '@coreui/react'
 import { useSelector } from 'react-redux'
-import { Field, Form } from 'react-final-form'
-import { RFFCFormSwitch } from 'src/components/forms'
+import { Field, Form, FormSpy } from 'react-final-form'
+import { RFFCFormInput, RFFCFormSwitch } from 'src/components/forms'
 import {
   useGenericGetRequestQuery,
   useLazyGenericGetRequestQuery,
@@ -14,7 +14,6 @@ import { CippContentCard, CippPage, CippPageList } from 'src/components/layout'
 import { CellTip } from 'src/components/tables/CellGenericFormat'
 import 'react-datepicker/dist/react-datepicker.css'
 import { CippActionsOffcanvas, ModalService, TenantSelector } from 'src/components/utilities'
-import CippCodeOffCanvas from 'src/components/utilities/CippCodeOffcanvas'
 import arrayMutators from 'final-form-arrays'
 const alertsList = [
   { name: 'MFAAlertUsers', label: 'Alert on users without any form of MFA' },
@@ -25,8 +24,20 @@ const alertsList = [
       'Alert on tenants without a Conditional Access policy, while having Conditional Access licensing available.',
   },
   { name: 'AdminPassword', label: 'Alert on changed admin Passwords' },
-  { name: 'QuotaUsed', label: 'Alert on 90% mailbox quota used' },
-  { name: 'SharePointQuota', label: 'Alert on 90% SharePoint quota used' },
+  {
+    name: 'QuotaUsed',
+    label: 'Alert on % mailbox quota used',
+    requiresInput: true,
+    inputLabel: 'Enter quota percentage',
+    inputName: 'QuotaUsedQuota',
+  },
+  {
+    name: 'SharePointQuota',
+    label: 'Alert on % SharePoint quota used',
+    requiresInput: true,
+    inputLabel: 'Enter quota percentage',
+    inputName: 'SharePointQuotaQuota',
+  },
   { name: 'ExpiringLicenses', label: 'Alert on licenses expiring in 30 days' },
   { name: 'SecDefaultsUpsell', label: 'Alert on Security Defaults automatic enablement' },
   {
@@ -121,7 +132,7 @@ const ListClassicAlerts = () => {
   const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
   const onSubmit = (values) => {
     Object.keys(values).filter(function (x) {
-      if (values[x] === null) {
+      if (values[x] === null || values[x] === 0) {
         delete values[x]
       }
       return null
@@ -201,11 +212,24 @@ const ListClassicAlerts = () => {
                         <hr />
                         {alertsList.map((alert, index) => (
                           <CCol key={alert.name} md="6">
-                            <RFFCFormSwitch
-                              name={alert.name}
-                              label={alert.label}
-                              sublabel={getLabel(alert.name)}
-                            />
+                            <RFFCFormSwitch name={alert.name} label={alert.label} />
+                            {alert.requiresInput && (
+                              <FormSpy subscription={{ values: true }}>
+                                {({ values }) => {
+                                  if (values[alert.name]) {
+                                    return (
+                                      <RFFCFormInput
+                                        name={`${alert.inputName}`}
+                                        placeholder={alert.inputLabel}
+                                        initialValue={alert.defaultValue} // Set the initial value
+                                        type="number"
+                                      />
+                                    )
+                                  }
+                                  return null
+                                }}
+                              </FormSpy>
+                            )}
                           </CCol>
                         ))}
                       </CRow>