diff --git a/plugins/alerts/frontend/public/javascripts/countly.views.js b/plugins/alerts/frontend/public/javascripts/countly.views.js index 1ba08964aa4..0e390d62eaa 100644 --- a/plugins/alerts/frontend/public/javascripts/countly.views.js +++ b/plugins/alerts/frontend/public/javascripts/countly.views.js @@ -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) { @@ -1106,6 +1112,7 @@ appsSelectorOption: appsSelectorOption, filterStatus: "all", filteredApps: [], + tableFilterStatus: "all", tableDynamicCols: [ { value: "appNameList", diff --git a/plugins/alerts/frontend/public/localization/alerts.properties b/plugins/alerts/frontend/public/localization/alerts.properties index 2601e3bdfe0..1e9e476007a 100644 --- a/plugins/alerts/frontend/public/localization/alerts.properties +++ b/plugins/alerts/frontend/public/localization/alerts.properties @@ -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 diff --git a/plugins/alerts/frontend/public/templates/vue-main.html b/plugins/alerts/frontend/public/templates/vue-main.html index 07905b639a1..1681a4e2a05 100644 --- a/plugins/alerts/frontend/public/templates/vue-main.html +++ b/plugins/alerts/frontend/public/templates/vue-main.html @@ -48,6 +48,13 @@ :default-sort="{prop: 'createdAt', order: 'descending'}" >