瀏覽代碼

AMBARI-7132. Filter not clearing causes confusion. (onechiporenko)

Oleg Nechiporenko 10 年之前
父節點
當前提交
d341f7ceb3

+ 1 - 0
ambari-web/app/assets/test/tests.js

@@ -127,6 +127,7 @@ var files = ['test/init_model_test',
   'test/utils/ui_effects_test',
   'test/utils/ui_effects_test',
   'test/utils/updater_test',
   'test/utils/updater_test',
   'test/views/common/chart/linear_time_test',
   'test/views/common/chart/linear_time_test',
+  'test/views/common/filter_combo_cleanable_test',
   'test/views/common/filter_view_test',
   'test/views/common/filter_view_test',
   'test/views/common/table_view_test',
   'test/views/common/table_view_test',
   'test/views/common/quick_link_view_test',
   'test/views/common/quick_link_view_test',

+ 1 - 0
ambari-web/app/views/common/filter_combo_cleanable.js

@@ -35,6 +35,7 @@ App.FilterComboCleanableView = Ember.View.extend({
       placement: 'bottom',
       placement: 'bottom',
       trigger: 'hover'
       trigger: 'hover'
     });
     });
+    this.clearFilter();
   },
   },
 
 
   placeHolder: function(){
   placeHolder: function(){

+ 42 - 0
ambari-web/test/views/common/filter_combo_cleanable_test.js

@@ -0,0 +1,42 @@
+/**
+ * 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');
+var view;
+describe('App.FilterComboCleanableView', function() {
+
+  beforeEach(function() {
+    view = App.FilterComboCleanableView.create();
+  });
+
+  describe('#didInsertElement', function() {
+
+    it('should clean filter when created', function() {
+      sinon.stub(App, 'popover', Em.K);
+      view.setProperties({
+        filter: 'some value',
+        popoverDescription: ['', '']
+      });
+      view.didInsertElement();
+      App.popover.restore();
+      expect(view.get('filter')).to.be.empty;
+    });
+
+  });
+
+});