AMBARI-13235. Incorrect Hosts table filtering after navigating back f…

…rom Host Summary (rzang)
bglogowski · Sep 25, 2015 · 8b405fa · 8b405fa
1 parent ac6a255
commit 8b405fa
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/ambari-web/app/mappers/hosts_mapper.js b/ambari-web/app/mappers/hosts_mapper.js
@@ -153,7 +153,10 @@ App.hostsMapper = App.QuickDataMapper.create({
         var alertsSummary = item.alerts_summary;
         item.critical_warning_alerts_count = alertsSummary ? (alertsSummary.CRITICAL || 0) + (alertsSummary.WARNING || 0) : 0;
         item.cluster_id = clusterName;
-        item.index = index;
+        var existingHost = App.Host.find().findProperty('hostName', component.host_name);
+        var fromHostDetail = App.router.get('currentState.parentState.name') == 'hostDetails';
+        // There is no need to override existing index in host detail view since old model(already have indexes) will not be cleared.
+        item.index = (existingHost && fromHostDetail)? existingHost.get('index'): index;
 
         if (stackUpgradeSupport) {
           this.config = $.extend(this.config, {

diff --git a/ambari-web/app/views/common/sort_view.js b/ambari-web/app/views/common/sort_view.js
@@ -203,18 +203,28 @@ var serverWrapperView = Em.View.extend({
    * Initialize and save sorting statuses: hostName sorting_asc
    */
   loadSortStatuses: function () {
-    var statuses = [];
     var childViews = this.get('childViews');
-    childViews.forEach(function (childView) {
-      var sortStatus = (childView.get('name') == 'hostName' && childView.get('status') == 'sorting') ? 'sorting_asc' : childView.get('status');
-      statuses.push({
-        name: childView.get('name'),
-        status: sortStatus
+    var statuses = App.db.getSortingStatuses(this.get('controller.name'));
+    if (statuses) {
+      var sortingColumn = App.db.getSortingStatuses(this.get('controller.name')).find(function(column){ return column.status != 'sorting'})
+      if (sortingColumn) {
+        var sortingColumnView = childViews.findProperty('name', sortingColumn.name);
+        sortingColumnView.set('status', sortingColumn.status);
+        this.get('controller').set('sortingColumn', sortingColumnView);
+      }
+    } else {
+      statuses = [];
+      childViews.forEach(function (childView) {
+        var sortStatus = (childView.get('name') == 'hostName' && childView.get('status') == 'sorting') ? 'sorting_asc' : childView.get('status');
+        statuses.push({
+          name: childView.get('name'),
+          status: sortStatus
+        });
+        childView.set('status', sortStatus);
       });
-      childView.set('status', sortStatus);
-    });
-    App.db.setSortingStatuses(this.get('controller.name'), statuses);
-    this.get('controller').set('sortingColumn', childViews.findProperty('name', 'hostName'));
+      App.db.setSortingStatuses(this.get('controller.name'), statuses);
+      this.get('controller').set('sortingColumn', childViews.findProperty('name', 'hostName'));
+    }
   },
 
   /**