Skip to content

Added Functionality to CIPP Notifications so you can filter by severity #1665

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

Merged
merged 3 commits into from
Aug 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/data/Extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions src/store/api/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export const appApi = baseApi.injectEndpoints({
onePerTenant,
sendtoIntegration,
logsToInclude,
Severity,
}) => ({
path: '/api/ExecNotificationConfig',
data: {
Expand All @@ -70,6 +71,7 @@ export const appApi = baseApi.injectEndpoints({
addChocoApp: addChocoApp,
onePerTenant: onePerTenant,
logsToInclude: logsToInclude,
Severity: Severity,
sendtoIntegration: sendtoIntegration,
},
method: 'post',
Expand Down
16 changes: 16 additions & 0 deletions src/views/cipp/CIPPSettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) => {
Expand Down Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions src/views/tenant/administration/ListLicences.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ const columns = [
name: 'Estimated Term',
selector: (row) => row['EstTerm'],
sortable: true,
cell: (row) => CellTip(row['EstTerm']),
exportSelector: 'EstTerm',
},
{
Expand Down