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.

Sign up for GitHub

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

[SER-2099] added enabled-disabled filter to alerts table #5746

Merged
merged 4 commits into from
Jan 8, 2025
Merged

[SER-2099] added enabled-disabled filter to alerts table #5746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0b1127
added enabled-disabled filter to alerts table
ekin-burak Nov 8, 2024
23990c3
Merge branch 'next' into SER-2099-do-a-small-product-frontend-improve…
can-angun Nov 12, 2024
e710d1c
Merge branch 'next' into SER-2099-do-a-small-product-frontend-improve…
ArtursKadikis Nov 20, 2024
951854a
Merge branch 'next' into SER-2099-do-a-small-product-frontend-improve…
ar2rsawseen Jan 8, 2025
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
7 changes: 7 additions & 0 deletions plugins/alerts/frontend/public/javascripts/countly.views.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,6 +1069,12 @@
computed: {
tableRows: function() {
var rows = this.$store.getters["countlyAlerts/table/all"];
if (this.tableFilterStatus !== "all") {
var enabled = this.tableFilterStatus === "enabled" ? true : false;
rows = rows.filter(function(r) {
return r.enabled === enabled;
});
}
if (this.filteredApps.length > 0) {
var self = this;
rows = rows.filter(function(r) {
Expand Down Expand Up @@ -1106,6 +1112,7 @@
appsSelectorOption: appsSelectorOption,
filterStatus: "all",
filteredApps: [],
tableFilterStatus: "all",
tableDynamicCols: [
{
value: "appNameList",
Expand Down
4 changes: 3 additions & 1 deletion plugins/alerts/frontend/public/localization/alerts.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,6 @@ alert.email-header = Email Notification
alerts.email-icon = This alert can only be used within Hooks to trigger actions.
alerts.common-icon-info = Alert will be triggered as soon as a new response is submitted for the selected widget.
alerts.crashes-icon = Alert will be triggered as soon as a new, before unseen crash occurs.

alerts.status-all = All alerts
alerts.status-enabled = Enabled
alerts.status-disabled = Disabled
7 changes: 7 additions & 0 deletions plugins/alerts/frontend/public/templates/vue-main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@
:default-sort="{prop: 'createdAt', order: 'descending'}"
>
<template v-slot:header-left="scope">
<div class="bu-mr-2">
<el-radio-group :plain="true" v-model="tableFilterStatus">
<el-radio-button label="all">{{i18n('alerts.status-all')}}</el-radio-button>
<el-radio-button label="enabled">{{i18n('alerts.status-enabled')}}</el-radio-button>
<el-radio-button label="disabled">{{i18n('alerts.status-disabled')}}</el-radio-button>
</el-radio-group>
</div>
<div class="alerts-table-app-selector">
<cly-select-x
:placeholder="i18n('alert.all-applications')"
Expand Down
Loading