Merge pull request KelvinTegelaar#1665 from BNWEIN/dev

Added Functionality to CIPP Notifications so you can filter by severity
DChorn-ANS · Aug 8, 2023 · 9c888be · 9c888be
2 parents 8de2017 + 97e5be0
commit 9c888be
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/src/data/Extensions.json b/src/data/Extensions.json
@@ -56,7 +56,7 @@
     "type": "HaloPSA",
     "cat": "Ticketing",
     "forceSyncButton": false,
-    "helpText": "This integration allows you to use to send alerts to your ticketing system.",
+    "helpText": "This integration allows you to send alerts to your ticketing system.",
     "SettingOptions": [
       {
         "type": "input",

diff --git a/src/store/api/app.js b/src/store/api/app.js
@@ -56,6 +56,7 @@ export const appApi = baseApi.injectEndpoints({
         onePerTenant,
         sendtoIntegration,
         logsToInclude,
+        Severity,
       }) => ({
         path: '/api/ExecNotificationConfig',
         data: {
@@ -70,6 +71,7 @@ export const appApi = baseApi.injectEndpoints({
           addChocoApp: addChocoApp,
           onePerTenant: onePerTenant,
           logsToInclude: logsToInclude,
+          Severity: Severity,
           sendtoIntegration: sendtoIntegration,
         },
         method: 'post',

diff --git a/src/views/cipp/CIPPSettings.js b/src/views/cipp/CIPPSettings.js
@@ -1078,6 +1078,10 @@ const NotificationsSettings = () => {
                   label: m,
                   value: m,
                 })),
+                Severity: notificationListResult.data?.Severity?.map((s) => ({
+                  label: s,
+                  value: s,
+                })),
               }}
               onSubmit={onSubmit}
               render={({ handleSubmit, submitting, values }) => {
@@ -1130,6 +1134,18 @@ const NotificationsSettings = () => {
                           ]}
                         />
                       </CCol>
+                      <CCol>
+                        <RFFSelectSearch
+                          multi={true}
+                          label="Choose which severity of alert you want to be notified for."
+                          name="Severity"
+                          values={[
+                            { value: 'Alert', name: 'Alert' },
+                            { value: 'Error', name: 'Error' },
+                            { value: 'Info', name: 'Info' },
+                          ]}
+                        />
+                      </CCol>
                       <CCol>
                         <RFFCFormSwitch
                           name="onePerTenant"

diff --git a/src/views/tenant/administration/ListLicences.js b/src/views/tenant/administration/ListLicences.js
@@ -42,6 +42,7 @@ const columns = [
     name: 'Estimated Term',
     selector: (row) => row['EstTerm'],
     sortable: true,
+    cell: (row) => CellTip(row['EstTerm']),
     exportSelector: 'EstTerm',
   },
   {