You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/12/09 12:20:56 UTC
ambari git commit: AMBARI-8601. Alerts UI: Removing alert-definition
does not update count on Alert-Groups filter. (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 996a07b4b -> 4fbfe4c5b
AMBARI-8601. Alerts UI: Removing alert-definition does not update count on Alert-Groups filter. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4fbfe4c5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4fbfe4c5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4fbfe4c5
Branch: refs/heads/trunk
Commit: 4fbfe4c5b35d481c5a28e6d0f82b07753654ef2c
Parents: 996a07b
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Tue Dec 9 13:10:53 2014 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Tue Dec 9 13:10:53 2014 +0200
----------------------------------------------------------------------
ambari-web/app/assets/test/tests.js | 1 +
.../alert_definitions_actions_controller.js | 4 +-
ambari-web/app/models/alert_group.js | 2 +-
ambari-web/test/models/alert_group_test.js | 57 ++++++++++++++++++++
4 files changed, 62 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4fbfe4c5/ambari-web/app/assets/test/tests.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/test/tests.js b/ambari-web/app/assets/test/tests.js
index a62e00b..fdd95c3 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -227,6 +227,7 @@ var files = ['test/init_model_test',
'test/models/alert_test',
'test/models/alert_config_test',
'test/models/alert_definition_test',
+ 'test/models/alert_group_test',
'test/models/alert_instance_test',
'test/models/authentication_test',
'test/models/cluster_states_test',
http://git-wip-us.apache.org/repos/asf/ambari/blob/4fbfe4c5/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js b/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
index 33a8b8b..83445cc 100644
--- a/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
+++ b/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
@@ -138,7 +138,9 @@ App.MainAlertDefinitionActionsController = Em.ArrayController.extend({
else {
self.hide();
App.router.get('updateController').updateAlertGroups(function () {
- App.router.get('updateController').updateAlertNotifications(Em.K);
+ App.router.get('updateController').updateAlertDefinitions(function() {
+ App.router.get('updateController').updateAlertNotifications(Em.K);
+ });
});
}
} else {
http://git-wip-us.apache.org/repos/asf/ambari/blob/4fbfe4c5/ambari-web/app/models/alert_group.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/alert_group.js b/ambari-web/app/models/alert_group.js
index f14ebea..6ffe263 100644
--- a/ambari-web/app/models/alert_group.js
+++ b/ambari-web/app/models/alert_group.js
@@ -52,7 +52,7 @@ App.AlertGroup = DS.Model.extend({
this.get('aggregateAlertDefinitions').toArray(),
this.get('scriptAlertDefinitions').toArray()
);
- }.property('portAlertDefinitions', 'metricsAlertDefinitions', 'webAlertDefinitions', 'aggregateAlertDefinitions', 'scriptAlertDefinitions'),
+ }.property('portAlertDefinitions.length', 'metricsAlertDefinitions.length', 'webAlertDefinitions.length', 'aggregateAlertDefinitions.length', 'scriptAlertDefinitions.length'),
/**
* @type {App.PortAlertDefinition[]}
http://git-wip-us.apache.org/repos/asf/ambari/blob/4fbfe4c5/ambari-web/test/models/alert_group_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/models/alert_group_test.js b/ambari-web/test/models/alert_group_test.js
new file mode 100644
index 0000000..37168c7
--- /dev/null
+++ b/ambari-web/test/models/alert_group_test.js
@@ -0,0 +1,57 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var App = require('app');
+
+require('models/alert_group');
+
+var model;
+
+describe('App.AlertGroup', function () {
+
+ beforeEach(function () {
+
+ model = App.AlertGroup.createRecord();
+
+ });
+
+ describe('#definitions', function () {
+
+ beforeEach(function () {
+
+ model.reopen({
+ portAlertDefinitions: [1],
+ metricsAlertDefinitions: [2, 3],
+ webAlertDefinitions: [4],
+ aggregateAlertDefinitions: [],
+ scriptAlertDefinitions: [6]
+ });
+
+ });
+
+ it('should concatenate all types of definitions', function () {
+ expect(model.get('definitions')).to.eql([1,2,3,4,6]);
+ model.set('aggregateAlertDefinitions', [5]);
+ expect(model.get('definitions')).to.eql([1,2,3,4,5,6]);
+ model.set('scriptAlertDefinitions', []);
+ expect(model.get('definitions')).to.eql([1,2,3,4,5]);
+ });
+
+ });
+
+});
\ No newline at end of file