AMBARI-3842 Host configs page should properly order services. (ababiichuk)

ambari-web/app/mappers/service_mapper.js

@@ -16,37 +16,9 @@
  */
 
 var App = require('app');
+var misc = require('utils/misc');
 
 App.servicesMapper = App.QuickDataMapper.create({
-  servicesSortOrder: [
-    'HDFS',
-    'YARN',
-    'MAPREDUCE',
-    'MAPREDUCE2',
-    'TEZ',
-    'HBASE',
-    'HIVE',
-    'HCATALOG',
-    'WEBHCAT',
-    'FLUME',
-    'OOZIE',
-    'GANGLIA',
-    'NAGIOS',
-    'ZOOKEEPER',
-    'PIG',
-    'SQOOP',
-    'HUE'
-  ],
-  sortByOrder: function (sortOrder, array) {
-    var sorted = [];
-    for (var i = 0; i < sortOrder.length; i++)
-      for (var j = 0; j < array.length; j++) {
-        if (sortOrder[i] == array[j].id) {
-          sorted.push(array[j]);
-        }
-      }
-    return sorted;
-  },
 
   model: App.Service,
   config: {
@@ -262,7 +234,7 @@ App.servicesMapper = App.QuickDataMapper.create({
         }
       }, this);
 
-      result = this.sortByOrder(this.get('servicesSortOrder'), result);
+      result = misc.sortByOrder(App.Service.servicesSortOrder, result);
 
       //load services to model
       App.store.loadMany(this.get('model'), result);

ambari-web/app/models/service.js

@@ -165,4 +165,24 @@ App.Service.DisplayNames = {
   'FLUME': 'Flume'
 };
 
+App.Service.servicesSortOrder = [
+  'HDFS',
+  'YARN',
+  'MAPREDUCE',
+  'MAPREDUCE2',
+  'TEZ',
+  'HBASE',
+  'HIVE',
+  'HCATALOG',
+  'WEBHCAT',
+  'FLUME',
+  'OOZIE',
+  'GANGLIA',
+  'NAGIOS',
+  'ZOOKEEPER',
+  'PIG',
+  'SQOOP',
+  'HUE'
+];
+
 App.Service.FIXTURES = [];

ambari-web/app/utils/misc.js

@@ -52,6 +52,17 @@ module.exports = {
     // Reuse ip variable for component counter.
     var d = ip.split('.');
     return ((((((+d[0])*256)+(+d[1]))*256)+(+d[2]))*256)+(+d[3]);
+  },
+
+  sortByOrder: function (sortOrder, array) {
+    var sorted = [];
+    for (var i = 0; i < sortOrder.length; i++)
+      for (var j = 0; j < array.length; j++) {
+        if (sortOrder[i] == ('get' in array[j] ? array[j].get('id') : array[j].id)) {
+          sorted.push(array[j]);
+        }
+      }
+    return sorted;
   }
   
 };

ambari-web/app/views/main/host/configs_service_menu.js

@@ -17,6 +17,7 @@
  */
 
 var App = require('app');
+var misc = require('utils/misc');
 
 App.MainHostServiceMenuView = Em.CollectionView.extend({
   content:function () {
@@ -27,14 +28,18 @@ App.MainHostServiceMenuView = Em.CollectionView.extend({
       hostComponents.forEach(function (hc) {
         var service = hc.get('service');
         var serviceName = service.get('serviceName');
-        if(!['PIG', 'SQOOP', 'HCATALOG', 'GANGLIA'].contains(serviceName)){
-          if (!services.findProperty('serviceName', serviceName)) {
-            services.push(service);
+        if (serviceName) {
+          if(!['PIG', 'SQOOP', 'HCATALOG', 'GANGLIA'].contains(serviceName)){
+            if (!services.findProperty('serviceName', serviceName)) {
+              services.push(service);
+            }
           }
+        } else {
+          console.warn("serviceName not found for " + hc.get('componentName'));
         }
       });
     }
-    return services;
+    return misc.sortByOrder(App.Service.servicesSortOrder, services);
   }.property('host'),
   
   host: function(){

ambari-web/app/views/main/service/menu.js

@@ -17,6 +17,7 @@
  */
 
 var App = require('app');
+var misc = require('utils/misc');
 
 App.MainServiceMenuView = Em.CollectionView.extend({
   content:function () {
@@ -26,39 +27,9 @@ App.MainServiceMenuView = Em.CollectionView.extend({
       }
       return true;
     });
-    return this.sortByOrder(this.get('servicesSortOrder'), items);
+    return misc.sortByOrder(App.Service.servicesSortOrder, items);
   }.property('App.router.mainServiceController.content', 'App.router.mainServiceController.content.length'),
 
-  servicesSortOrder: [
-    'HDFS',
-    'YARN',
-    'MAPREDUCE',
-    'MAPREDUCE2',
-    'TEZ',
-    'HBASE',
-    'HIVE',
-    'HCATALOG',
-    'WEBHCAT',
-    'FLUME',
-    'OOZIE',
-    'GANGLIA',
-    'NAGIOS',
-    'ZOOKEEPER',
-    'PIG',
-    'SQOOP',
-    'HUE'
-  ],
-  sortByOrder: function (sortOrder, array) {
-    var sorted = [];
-    for (var i = 0; i < sortOrder.length; i++)
-      for (var j = 0; j < array.length; j++) {
-        if (sortOrder[i] == array[j].get('id')) {
-          sorted.push(array[j]);
-        }
-      }
-    return sorted;
-  },
-
   didInsertElement:function () {
     App.router.location.addObserver('lastSetURL', this, 'renderOnRoute');
     this.renderOnRoute();