Merge pull request #1328 from DChorn-ANS/dev

Seperate Unused and Overused License Alerts
KelvinTegelaar · Jan 25, 2023 · fcf1ff0 · fcf1ff0
2 parents 658e8e5 + fa82827
commit fcf1ff0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/views/tenant/administration/AlertWizard.js b/src/views/tenant/administration/AlertWizard.js
@@ -118,6 +118,7 @@ const AlertWizard = () => {
           />
           <RFFCFormSwitch name="QuotaUsed" label="Alert on 90% mailbox quota used" />
           <RFFCFormSwitch name="UnusedLicenses" label="Alert on unused licenses" />
+          <RFFCFormSwitch name="OverusedLicenses" label="Alert on overused licenses" />
           <RFFCFormSwitch name="AppSecretExpiry" label="Alert on expiring application secrets" />
           <RFFCFormSwitch name="ApnCertExpiry" label="Alert on expiring APN certificates" />
           <RFFCFormSwitch name="VppTokenExpiry" label="Alert on expiring VPP tokens" />
@@ -204,6 +205,14 @@ const AlertWizard = () => {
                             icon={props.values.UnusedLicenses ? faCheck : faTimes}
                           />
                         </CListGroupItem>
+                        <CListGroupItem className="d-flex justify-content-between align-items-center">
+                          Alert on overused licenses
+                          <FontAwesomeIcon
+                            color="#f77f00"
+                            size="lg"
+                            icon={props.values.OverusedLicenses ? faCheck : faTimes}
+                          />
+                        </CListGroupItem>
                         <CListGroupItem className="d-flex justify-content-between align-items-center">
                           Alert on expiring application secrets
                           <FontAwesomeIcon

diff --git a/src/views/tenant/administration/ListAlertsQueue.js b/src/views/tenant/administration/ListAlertsQueue.js
@@ -93,6 +93,13 @@ const ListAlertsQueue = () => {
       exportSelector: 'UnusedLicenses',
       cell: cellBooleanFormatter(),
     },
+    {
+      name: 'Overused Licenses',
+      selector: (row) => row['OverusedLicenses'],
+      sortable: true,
+      exportSelector: 'OverusedLicenses',
+      cell: cellBooleanFormatter(),
+    },
     {
       name: 'App Secret Expiry',
       selector: (row) => row['AppSecretExpiry'],