From a5f8ad65c7e5329e1d8d893cc5e98ba0b1fe0ca2 Mon Sep 17 00:00:00 2001
From: BNWEIN <bweinberg@prime-networks.co.uk>
Date: Wed, 2 Aug 2023 11:12:34 +0100
Subject: [PATCH 1/3] Added Functionality to CIPP Notifications so you can
 filter by severity

Added Functionality to CIPP Notifications so you can filter by severity
---
 src/store/api/app.js           |  2 ++
 src/views/cipp/CIPPSettings.js | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/store/api/app.js b/src/store/api/app.js
index 77cab1b67fc9..06089d3113bd 100644
--- 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
index bb428a0fac45..e0607023e5cb 100644
--- a/src/views/cipp/CIPPSettings.js
+++ b/src/views/cipp/CIPPSettings.js
@@ -981,6 +981,10 @@ const NotificationsSettings = () => {
                   label: m,
                   value: m,
                 })),
+                Severity: notificationListResult.data?.Severity?.map((s) => ({
+                  label: s,
+                  value: s,
+                })),
               }}
               onSubmit={onSubmit}
               render={({ handleSubmit, submitting, values }) => {
@@ -1033,6 +1037,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"

From 33d1c703bafc2336079f8d6cdf8dd4cbd38d8d45 Mon Sep 17 00:00:00 2001
From: BNWEIN <bweinberg@prime-networks.co.uk>
Date: Thu, 3 Aug 2023 09:55:55 +0100
Subject: [PATCH 2/3] Added Cell Tip

Added Cell Tip
---
 src/views/tenant/administration/ListLicences.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/tenant/administration/ListLicences.js b/src/views/tenant/administration/ListLicences.js
index a4acad8efaea..08ce292b82ad 100644
--- 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',
   },
   {

From 97e5be05bd50d5f8589db6295e82746b0bc13d2a Mon Sep 17 00:00:00 2001
From: BNWEIN <bweinberg@prime-networks.co.uk>
Date: Thu, 3 Aug 2023 10:19:08 +0100
Subject: [PATCH 3/3] Updated wording.

updated wording.
---
 src/data/Extensions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/data/Extensions.json b/src/data/Extensions.json
index 194c0c6c153d..cb15aa1043e8 100644
--- 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",