Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] dev from KelvinTegelaar:dev #1

Closed
wants to merge 1,955 commits into from
Closed
Changes from 3 commits
Commits
Show all changes
1955 commits
Select commit Hold shift + click to select a range
1eaade5
Merge pull request #2161 from JohnDuprey/dev
JohnDuprey Feb 24, 2024
938f670
Merge branch 'KelvinTegelaar:dev' into dev
kris6673 Feb 24, 2024
32fb278
Add filters and reorder table
kris6673 Feb 24, 2024
7da0199
Merge pull request #2162 from kris6673/dev
KelvinTegelaar Feb 24, 2024
dd548f5
guest name change
kris6673 Feb 24, 2024
fa560dd
Merge pull request #2163 from kris6673/dev
KelvinTegelaar Feb 24, 2024
0ce553a
Update GraphExplorer.jsx
JohnDuprey Feb 24, 2024
8c44073
Update GraphExplorer.jsx
JohnDuprey Feb 24, 2024
ced715f
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Feb 25, 2024
417ed6f
Add refresh function
JohnDuprey Feb 25, 2024
98b56a4
Update RFFComponents.jsx
JohnDuprey Feb 25, 2024
992b5b5
version up
KelvinTegelaar Feb 26, 2024
54ce4a9
Merge pull request #2174 from KelvinTegelaar/dev
KelvinTegelaar Feb 26, 2024
d78fbc6
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Feb 26, 2024
ba13bf6
Merge pull request #81 from KelvinTegelaar/dev
BNWEIN Feb 27, 2024
4f5d03a
Update DomainsAnalyser.jsx
BNWEIN Feb 27, 2024
e2339d9
Merge pull request #2177 from BNWEIN/dev
JohnDuprey Feb 27, 2024
3e0a1b5
remove old imports
KelvinTegelaar Feb 27, 2024
bbe4231
save columns when user changes them with option to reset
KelvinTegelaar Feb 28, 2024
250cf4d
add exportselector where required
KelvinTegelaar Feb 28, 2024
c7eb44a
fixes missing postal code
KelvinTegelaar Feb 28, 2024
ced6cd1
Added custom thresholds for SharePoint and Mailbox Quota alerts
BNWEIN Feb 28, 2024
9fd38bf
removed default value
BNWEIN Feb 28, 2024
b425621
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Feb 28, 2024
0477b25
Merge pull request #2180 from JohnDuprey/dev
JohnDuprey Feb 28, 2024
9e10c78
Merge pull request #2178 from BNWEIN/dev
KelvinTegelaar Feb 28, 2024
a02aa52
use endpointname instead of report name.
KelvinTegelaar Feb 28, 2024
c313de9
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar Feb 28, 2024
b1e63d4
CippDatatable - refetch
JohnDuprey Feb 28, 2024
e54be47
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Feb 28, 2024
9489fbb
for now, this'll do.
KelvinTegelaar Feb 28, 2024
ee6aa12
CippTable fix
JohnDuprey Feb 28, 2024
249f119
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Feb 28, 2024
72cccaf
Merge pull request #2181 from JohnDuprey/dev
JohnDuprey Feb 28, 2024
45bb37c
More omit checks
JohnDuprey Feb 28, 2024
04c8cfb
Merge pull request #2182 from JohnDuprey/dev
JohnDuprey Feb 28, 2024
4a98832
Made a start on adding "New User" attributes in "User Settings"
BNWEIN Feb 29, 2024
a97d970
Fix nav items property
JohnDuprey Mar 1, 2024
0696ae1
Devices Bulk Actions
JohnDuprey Mar 1, 2024
147f7fe
Merge pull request #2195 from JohnDuprey/dev
JohnDuprey Mar 1, 2024
789ef93
Settings refactor, CippCallout wip
k-grube Mar 5, 2024
4d1f7a9
Merge pull request #11 from KelvinTegelaar/dev
kris6673 Mar 6, 2024
0c04ed8
Bump version, update font awesome icons
k-grube Mar 12, 2024
5d2f33e
Unify all results notifications to use new component CippCallout whic…
k-grube Mar 12, 2024
e8418ff
Merge pull request #2208 from k-grube/dev
KelvinTegelaar Mar 12, 2024
da55cfd
Merge branch 'dev' into dev
KelvinTegelaar Mar 12, 2024
b60e581
add saving of user settings
KelvinTegelaar Mar 12, 2024
2e99c74
added defaultAttributes
KelvinTegelaar Mar 12, 2024
c00851b
update license overview
KelvinTegelaar Mar 12, 2024
7eadc37
add anon data warning.
KelvinTegelaar Mar 12, 2024
4dd820e
fixes anon
KelvinTegelaar Mar 12, 2024
39400ad
added #2189
KelvinTegelaar Mar 12, 2024
8cb3569
Pending Webhooks
JohnDuprey Mar 13, 2024
d86e348
Merge pull request #2213 from JohnDuprey/dev
JohnDuprey Mar 13, 2024
305514f
fix button text
JohnDuprey Mar 13, 2024
e25ef82
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Mar 13, 2024
08f6e33
fixes bug when endpoint name is null for modals
KelvinTegelaar Mar 14, 2024
d2d9fdc
fixed issue with graph explorer columns
KelvinTegelaar Mar 14, 2024
890c800
minor bug with new column setup
KelvinTegelaar Mar 14, 2024
bef8ab3
Update AppHeader.jsx
JohnDuprey Mar 14, 2024
ed53d22
Merge pull request #2215 from JohnDuprey/dev
JohnDuprey Mar 14, 2024
f5c816c
fix card layout while bringing sexy back
KelvinTegelaar Mar 14, 2024
c348b7c
fix button
JohnDuprey Mar 14, 2024
b511e62
cleanup imports
JohnDuprey Mar 14, 2024
f53a348
Pretty MEM policy list json
JohnDuprey Mar 14, 2024
377a662
Add tooltips
JohnDuprey Mar 14, 2024
c4f220b
Merge pull request #2216 from JohnDuprey/dev
JohnDuprey Mar 14, 2024
1744088
Graph Explorer - Org Branding preset
JohnDuprey Mar 15, 2024
886d8d5
Merge pull request #2217 from JohnDuprey/dev
JohnDuprey Mar 15, 2024
e17aa34
upp version
KelvinTegelaar Mar 15, 2024
5b71920
Merge pull request #2218 from KelvinTegelaar/dev
KelvinTegelaar Mar 15, 2024
b08a54c
Add null safe operator to default settings
JohnDuprey Mar 15, 2024
8197a11
up version
JohnDuprey Mar 15, 2024
3697f63
Merge pull request #2221 from JohnDuprey/dev
JohnDuprey Mar 15, 2024
c2e94b0
Merge pull request #2222 from KelvinTegelaar/dev
JohnDuprey Mar 15, 2024
6006ad1
Merge pull request #13 from KelvinTegelaar/dev
kris6673 Mar 16, 2024
9258e95
Update Statistics.jsx
JohnDuprey Mar 16, 2024
9437488
update package-lock
JohnDuprey Mar 16, 2024
e5012de
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Mar 16, 2024
ff0eacb
Merge pull request #2226 from JohnDuprey/dev
JohnDuprey Mar 16, 2024
9be0bcd
Merge pull request #149 from KelvinTegelaar/dev
JohnDuprey Mar 17, 2024
131df0f
fixes edit user bug
KelvinTegelaar Mar 18, 2024
aed7b03
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Mar 18, 2024
86137e5
users fix
KelvinTegelaar Mar 19, 2024
a23f6b9
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Mar 19, 2024
50e655a
Merge pull request #15 from KelvinTegelaar/dev
kris6673 Mar 20, 2024
ac12ae9
DisableAppCreation standard
kris6673 Mar 20, 2024
3804ccc
Merge pull request #2238 from kris6673/dev
KelvinTegelaar Mar 20, 2024
4a98750
Merge pull request #151 from KelvinTegelaar/dev
JohnDuprey Mar 21, 2024
0ce920a
Update formatters for alerts/scheduler
JohnDuprey Mar 22, 2024
8430b48
Merge pull request #2243 from JohnDuprey/dev
JohnDuprey Mar 22, 2024
393066f
up version
JohnDuprey Mar 22, 2024
211f2de
Update package-lock.json
JohnDuprey Mar 22, 2024
dc10a67
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Mar 22, 2024
756c6a5
Merge pull request #2246 from JohnDuprey/dev
JohnDuprey Mar 22, 2024
8514b48
Add boolean switch to standards list
OfficialEsco Mar 22, 2024
a9ff314
Merge pull request #2247 from Ren-Roros-Digital/BooleanSwitch
JohnDuprey Mar 22, 2024
f052bc9
Merge pull request #2248 from KelvinTegelaar/dev
JohnDuprey Mar 22, 2024
9004df8
SafeLinks Standard
OfficialEsco Mar 20, 2024
861bc9a
Updated Name label
OfficialEsco Mar 22, 2024
78899c0
Changed according to feedback
OfficialEsco Mar 25, 2024
6b557bf
Updated label name
OfficialEsco Mar 25, 2024
fcfeed9
bulk user adds
KelvinTegelaar Mar 25, 2024
e655b28
Merge pull request #2249 from Ren-Roros-Digital/SafeLinksPolicy
KelvinTegelaar Mar 25, 2024
df8e011
create
KelvinTegelaar Mar 26, 2024
d961d17
Added Compliance Policies
KelvinTegelaar Mar 26, 2024
d982072
Merge pull request #16 from KelvinTegelaar/dev
kris6673 Mar 26, 2024
af12a3f
Standard for trusting external MFA in Cross-tenant access setting
kris6673 Mar 26, 2024
51b6bc9
Merge pull request #2264 from kris6673/dev
KelvinTegelaar Mar 26, 2024
66b8be6
dynamic lists
KelvinTegelaar Mar 26, 2024
96bb11a
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar Mar 26, 2024
712988f
fixes bug with blank arrays
KelvinTegelaar Mar 27, 2024
d1dcd45
fixes #2210
KelvinTegelaar Mar 27, 2024
3137854
added alerts
KelvinTegelaar Mar 27, 2024
06a41ad
changes
KelvinTegelaar Mar 27, 2024
ee11d70
fix radio/checkbox bug
JohnDuprey Mar 27, 2024
dea0ad6
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Mar 27, 2024
3151407
Merge pull request #2270 from JohnDuprey/dev
JohnDuprey Mar 27, 2024
79946f8
fixes selector
KelvinTegelaar Mar 27, 2024
e20249e
fix tenant access check
JohnDuprey Mar 27, 2024
0a17740
fixes ap issue disappearing offCanvas
KelvinTegelaar Mar 27, 2024
70c4a0c
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Mar 27, 2024
638a9c7
Merge pull request #2271 from JohnDuprey/dev
JohnDuprey Mar 27, 2024
d7cf61d
add standards from PR
JohnDuprey Mar 27, 2024
25b7bce
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Mar 27, 2024
0e5ea07
Merge pull request #2272 from JohnDuprey/dev
JohnDuprey Mar 27, 2024
6e616b9
improved search
KelvinTegelaar Mar 28, 2024
9e6e01d
fixes for or
KelvinTegelaar Mar 28, 2024
329e0b0
WizardTableField set dynamicColumns to false
JohnDuprey Mar 28, 2024
8c68e72
Merge pull request #2275 from JohnDuprey/dev
JohnDuprey Mar 28, 2024
694ca32
remove lighthouse requirement for tenant check
JohnDuprey Mar 28, 2024
b0509ec
add version update function
JohnDuprey Mar 28, 2024
4a2e532
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Mar 28, 2024
fa88b32
Merge pull request #2276 from JohnDuprey/dev
JohnDuprey Mar 28, 2024
58a9cab
Mail Test
JohnDuprey Mar 29, 2024
6480ec0
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Mar 29, 2024
12b8c31
Merge pull request #2277 from JohnDuprey/dev
JohnDuprey Mar 29, 2024
e6efeeb
Update MailTest.jsx
JohnDuprey Mar 29, 2024
2af5d5c
add multi select offboarding
KelvinTegelaar Mar 29, 2024
fe5c2b3
add alert for going over maximum
KelvinTegelaar Mar 29, 2024
eb56d15
up version
KelvinTegelaar Mar 29, 2024
b4e6f5f
Merge pull request #2278 from KelvinTegelaar/dev
KelvinTegelaar Mar 29, 2024
5c69db8
Update MailTest.jsx
JohnDuprey Mar 29, 2024
8c467df
Merge pull request #155 from KelvinTegelaar/dev
JohnDuprey Mar 29, 2024
3a4439d
Merge pull request #2279 from JohnDuprey/dev
JohnDuprey Mar 29, 2024
1c3eb56
Merge pull request #2280 from KelvinTegelaar/dev
KelvinTegelaar Mar 29, 2024
479ebbb
Added default value support to standards number type
OfficialEsco Mar 25, 2024
74c6f27
Merge pull request #2281 from Ren-Roros-Digital/NumberDefaultValue
KelvinTegelaar Mar 29, 2024
fe66cd8
handle undefined/null columns
JohnDuprey Mar 29, 2024
bf6fd46
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Mar 30, 2024
ad3dcd9
favourites adding
KelvinTegelaar Mar 31, 2024
034beab
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Mar 31, 2024
e493d71
add dash header if favorites are set.
KelvinTegelaar Apr 2, 2024
d4ef10f
null safe props on mail test
JohnDuprey Apr 2, 2024
aa9bef4
Merge pull request #19 from KelvinTegelaar/dev
kris6673 Apr 2, 2024
1d60573
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Apr 2, 2024
73209c1
Update licenses
kris6673 Apr 2, 2024
f1934da
Fix Number defaultValue
OfficialEsco Apr 3, 2024
1e38409
Merge pull request #2292 from kris6673/dev
JohnDuprey Apr 3, 2024
6ffac04
preserve tableFilter in tenant selector
JohnDuprey Apr 3, 2024
199f0cb
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Apr 3, 2024
a61438f
Merge pull request #2296 from JohnDuprey/dev
JohnDuprey Apr 3, 2024
0faf5d5
Merge pull request #2294 from Ren-Roros-Digital/Fix-defaultValue
JohnDuprey Apr 3, 2024
8a36a89
Up version
JohnDuprey Apr 3, 2024
4a3e79d
Merge pull request #2297 from JohnDuprey/dev
JohnDuprey Apr 3, 2024
e3cb141
Merge pull request #2298 from KelvinTegelaar/dev
JohnDuprey Apr 3, 2024
298e1bc
add jsx
KelvinTegelaar Apr 3, 2024
b1cf7e2
potential fix.
KelvinTegelaar Apr 3, 2024
043b6d3
Revert "Merge pull request #2298 from KelvinTegelaar/dev"
JohnDuprey Apr 3, 2024
57d0bf6
up version
JohnDuprey Apr 3, 2024
1d172a5
Fixes dynamic routes issues.
KelvinTegelaar Apr 3, 2024
0bd5e95
Allow retry button while running
JohnDuprey Apr 4, 2024
8192d34
Merge pull request #2302 from JohnDuprey/dev
JohnDuprey Apr 4, 2024
791e567
DefaultValue Switch and Input
OfficialEsco Apr 4, 2024
cd0e858
Merge pull request #2306 from Ren-Roros-Digital/defaultValue
KelvinTegelaar Apr 8, 2024
8659d9e
fixes columns not being correct.
KelvinTegelaar Apr 8, 2024
0e1bf28
set default size to A3, with fit to page enabled for reprinting.
KelvinTegelaar Apr 8, 2024
5c939cd
add sort for devices
KelvinTegelaar Apr 8, 2024
8c765c2
update footer
JohnDuprey Apr 9, 2024
f3d2bb9
use $orderby and $count for devices
JohnDuprey Apr 9, 2024
acf1eeb
removed unused vars
KelvinTegelaar Apr 9, 2024
d6fad2f
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Apr 9, 2024
c62d3de
Merge pull request #2309 from JohnDuprey/dev
JohnDuprey Apr 9, 2024
b9706b9
Merge pull request #21 from KelvinTegelaar/dev
kris6673 Apr 9, 2024
4e5007f
Change to use tenantID for DA
kris6673 Apr 9, 2024
9f3f9f4
Merge pull request #2311 from kris6673/dev
KelvinTegelaar Apr 9, 2024
3b78518
Update augmentt link
JohnDuprey Apr 10, 2024
33e8eaf
json translation prework
KelvinTegelaar Apr 10, 2024
6d9e415
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar Apr 10, 2024
5889082
Partner webhooks
JohnDuprey Apr 10, 2024
ce40efa
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Apr 10, 2024
9d0cb5b
removed console logs
KelvinTegelaar Apr 10, 2024
6ce20e0
testing new layout
KelvinTegelaar Apr 10, 2024
ebcc929
Add webhook testing
JohnDuprey Apr 10, 2024
5d0fc9e
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Apr 11, 2024
2df3c74
Merge pull request #2314 from JohnDuprey/dev
JohnDuprey Apr 11, 2024
a7a1722
fixes new json view
KelvinTegelaar Apr 11, 2024
490710a
add displayName sort if available.
KelvinTegelaar Apr 11, 2024
db636c1
replaces json overview
KelvinTegelaar Apr 11, 2024
d973469
prettification
KelvinTegelaar Apr 11, 2024
f8b3f37
null safe edit user
KelvinTegelaar Apr 11, 2024
e4e581b
null safe adduser
KelvinTegelaar Apr 11, 2024
4a03aac
update augmentt logo
JohnDuprey Apr 11, 2024
3d3aca5
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Apr 11, 2024
5651726
added option to create templates for standards.
KelvinTegelaar Apr 11, 2024
058e225
Merge remote-tracking branch 'upstream/dev' into dev
JohnDuprey Apr 11, 2024
6f138e9
Include logdata object
JohnDuprey Apr 11, 2024
a6c0100
remove unused vars
KelvinTegelaar Apr 11, 2024
247603f
finsihed tester
KelvinTegelaar Apr 11, 2024
a4f0d2c
added policy tester to nav
KelvinTegelaar Apr 11, 2024
706dfac
Create dev_deploy.yml
JohnDuprey Apr 11, 2024
bad4bf3
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Apr 11, 2024
43280a9
Merge pull request #2317 from JohnDuprey/dev
JohnDuprey Apr 11, 2024
72fdd67
added listing of applications
KelvinTegelaar Apr 11, 2024
aa97c7e
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar Apr 11, 2024
51adb04
Fix cellTable
JohnDuprey Apr 11, 2024
b982323
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Apr 11, 2024
77f8eea
removed beta
KelvinTegelaar Apr 12, 2024
06f7c22
logo spacing
KelvinTegelaar Apr 12, 2024
64a7f87
Merge branch 'KelvinTegelaar:dev' into dev
JohnDuprey Apr 12, 2024
add7a37
up version
KelvinTegelaar Apr 12, 2024
6738816
Merge pull request #2319 from JohnDuprey/dev
KelvinTegelaar Apr 12, 2024
4a10522
Merge branch 'main' into dev
KelvinTegelaar Apr 12, 2024
ae12818
deleted old routes.js
KelvinTegelaar Apr 12, 2024
fbacbf2
corrected app.jsx
KelvinTegelaar Apr 12, 2024
b3e104e
fix conflict issues
KelvinTegelaar Apr 12, 2024
e65658c
fixed app.jsx
KelvinTegelaar Apr 12, 2024
c518942
fixes annoying thing
KelvinTegelaar Apr 12, 2024
87ae2ea
Update SettingsPartner.jsx
JohnDuprey Apr 12, 2024
a8ef8d6
Merge pull request #2322 from JohnDuprey/dev
JohnDuprey Apr 12, 2024
b8e0e33
Test automatic retries
KelvinTegelaar Apr 14, 2024
5a13d28
case sensitivity
KelvinTegelaar Apr 14, 2024
9575626
return export
KelvinTegelaar Apr 14, 2024
5502c47
returned abort request
KelvinTegelaar Apr 14, 2024
c36b6c3
casing
KelvinTegelaar Apr 14, 2024
fd2da90
console logging
KelvinTegelaar Apr 14, 2024
c23ded7
api
KelvinTegelaar Apr 14, 2024
136d9cf
console logs
KelvinTegelaar Apr 14, 2024
ef830dc
tolower
KelvinTegelaar Apr 14, 2024
d468484
lowercase
KelvinTegelaar Apr 14, 2024
5c77a19
improvements to retry
KelvinTegelaar Apr 14, 2024
5799b41
remove blank items from favourites.
KelvinTegelaar Apr 15, 2024
128d98b
add tab browsing
KelvinTegelaar Apr 15, 2024
d184d12
added refresh to list tenants.
KelvinTegelaar Apr 15, 2024
450858f
fixes or/ands
KelvinTegelaar Apr 15, 2024
f7bdf2d
fix bpa
KelvinTegelaar Apr 15, 2024
bb6c7bd
Added Tenant ID to Tenant Information Offcanvas
MWGMorningwood Apr 16, 2024
98a2d31
Merge pull request #2336 from BezaluLLC/dev
KelvinTegelaar Apr 16, 2024
eeee870
add superadmin compare
KelvinTegelaar Apr 16, 2024
894c017
added easier way of setting up multitenant/partner/singletenant mode.
KelvinTegelaar Apr 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 35 additions & 9 deletions src/views/tenant/administration/ListAlertsQueue.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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 { Field, Form, FormSpy } from 'react-final-form'
import { RFFCFormSwitch } from 'src/components/forms'
import {
useGenericGetRequestQuery,
@@ -25,8 +25,18 @@ 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',
},
{
name: 'SharePointQuota',
label: 'Alert on % SharePoint quota used',
requiresInput: true,
inputLabel: 'Enter quota percentage',
},
{ name: 'ExpiringLicenses', label: 'Alert on licenses expiring in 30 days' },
{ name: 'SecDefaultsUpsell', label: 'Alert on Security Defaults automatic enablement' },
{
@@ -121,7 +131,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 +211,27 @@ 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 }) => {
// Check if the switch for this alert is turned on before showing the input
if (values[alert.name]) {
return (
<Field
name={`${alert.name}Quota`} // Unique name for the input field
component="input"
type="number"
placeholder={alert.inputLabel}
initialValue={alert.defaultValue} // Set the initial value
parse={(value) => Number(value)} // Ensure value is a number
/>
)
}
return null
}}
</FormSpy>
)}
</CCol>
))}
</CRow>