AMBARI-10185. Incorrect order of services in IE10 after adding AMS (alexantonenko)

ambari-web/app/assets/test/tests.js

@@ -130,6 +130,7 @@ var files = ['test/init_model_test',
   'test/mappers/status_mapper_test',
   'test/mappers/users_mapper_test',
   'test/mappers/stack_mapper_test',
+  'test/mappers/stack_service_mapper_test',
   'test/mappers/configs/stack_config_properties_mapper_test',
   'test/mappers/configs/config_groups_mapper_test',
   'test/mappers/configs/config_versions_mapper_test',

ambari-web/app/mappers/stack_service_mapper.js

@@ -78,8 +78,14 @@ App.stackServiceMapper = App.QuickDataMapper.create({
     var result = [];
     var stackServiceComponents = [];
     var nonInstallableServices = ['KERBEROS'];
-    this.rearrangeServicesForDisplayOrder(json.items, App.StackService.displayOrder);
-    json.items.forEach(function (item) {
+    var displayOrderLength = App.StackService.displayOrder.length;
+    var items = json.items.map(function (item, index) {
+      var displayOrderIndex = App.StackService.displayOrder.indexOf(item.StackServices.service_name);
+      return $.extend(item, {
+        index: displayOrderIndex == -1 ? displayOrderLength + index : displayOrderIndex
+      });
+    }).sortProperty('index');
+    items.forEach(function (item) {
       var stackService = item.StackServices;
       var serviceComponents = [];
       item.components.forEach(function (serviceComponent) {
@@ -123,14 +129,6 @@ App.stackServiceMapper = App.QuickDataMapper.create({
         });
       }, this);
     }, this);
-  },
-
-  rearrangeServicesForDisplayOrder: function (array, displayOrderArray) {
-    return array.sort(function (a, b) {
-      var aValue = displayOrderArray.indexOf(a.StackServices.service_name) != -1 ? displayOrderArray.indexOf(a.StackServices.service_name) : array.length;
-      var bValue = displayOrderArray.indexOf(b.StackServices.service_name) != -1 ? displayOrderArray.indexOf(b.StackServices.service_name) : array.length;
-      return aValue - bValue;
-    });
   }
 });
 

ambari-web/app/utils/misc.js

@@ -63,5 +63,5 @@ module.exports = {
         }
       }
     return sorted;
-  },
+  }
 };

ambari-web/test/mappers/stack_service_mapper_test.js

@@ -0,0 +1,235 @@
+/**
+ * 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('mappers/stack_service_mapper');
+
+describe('App.stackServiceMapper', function () {
+
+  describe('#map', function () {
+
+    var data = {
+        "items": [
+          {
+            "StackServices" : {
+              "comments" : "A high-throughput distributed messaging system",
+              "custom_commands" : [ ],
+              "display_name" : "Kafka",
+              "required_services" : [
+                "ZOOKEEPER"
+              ],
+              "service_check_supported" : true,
+              "service_name" : "KAFKA",
+              "service_version" : "0.8.1.2.2",
+              "stack_name" : "HDP",
+              "stack_version" : "2.2",
+              "config_types" : {
+                "kafka-broker" : {
+                  "supports" : {
+                    "adding_forbidden" : "false",
+                    "do_not_extend" : "false",
+                    "final" : "false"
+                  }
+                },
+                "kafka-env" : {
+                  "supports" : {
+                    "adding_forbidden" : "false",
+                    "do_not_extend" : "false",
+                    "final" : "false"
+                  }
+                },
+                "kafka-log4j" : {
+                  "supports" : {
+                    "adding_forbidden" : "false",
+                    "do_not_extend" : "false",
+                    "final" : "false"
+                  }
+                }
+              }
+            },
+            "components" : [
+              {
+                "StackServiceComponents" : {
+                  "cardinality" : "1+",
+                  "component_category" : "MASTER",
+                  "component_name" : "KAFKA_BROKER",
+                  "custom_commands" : [ ],
+                  "display_name" : "Kafka Broker",
+                  "is_client" : false,
+                  "is_master" : true,
+                  "service_name" : "KAFKA",
+                  "stack_name" : "HDP",
+                  "stack_version" : "2.2"
+                },
+                "dependencies" : [
+                  {
+                    "Dependencies" : {
+                      "component_name" : "ZOOKEEPER_SERVER",
+                      "dependent_component_name" : "KAFKA_BROKER",
+                      "dependent_service_name" : "KAFKA",
+                      "scope" : "cluster",
+                      "stack_name" : "HDP",
+                      "stack_version" : "2.2"
+                    }
+                  }
+                ]
+              }
+            ],
+            "artifacts" : [
+              {
+                "Artifacts" : {
+                  "artifact_name": "widget_descriptor"
+                }
+              }
+            ]
+          },
+          {
+            "StackServices" : {
+              "service_name" : "ZOOKEEPER"
+            },
+            "components" : [ ],
+            "artifacts" : [ ]
+          },
+          {
+            "StackServices" : {
+              "service_name" : "KERBEROS"
+            },
+            "components" : [ ],
+            "artifacts" : [ ]
+          },
+          {
+            "StackServices" : {
+              "service_name" : "HDFS"
+            },
+            "components" : [ ],
+            "artifacts" : [ ]
+          },
+          {
+            "StackServices" : {
+              "service_name" : "ACCUMULO"
+            },
+            "components" : [ ],
+            "artifacts" : [ ]
+          },
+          {
+            "StackServices" : {
+              "service_name" : "HIVE"
+            },
+            "components" : [
+              {
+                "StackServiceComponents" : {
+                  "component_name" : "MYSQL_SERVER",
+                  "custom_commands" : [
+                    "CLEAN"
+                  ]
+                },
+                "dependencies" : [ ]
+              }
+            ],
+            "artifacts" : [ ]
+          }
+        ]
+      },
+      sortedServiceNames = ["HDFS", "HIVE", "ZOOKEEPER", "KAFKA", "KERBEROS", "ACCUMULO"],
+      serviceResult = {
+        id: "KAFKA",
+        serviceName: "KAFKA",
+        displayName: "Kafka",
+        configTypes: {
+          "kafka-broker" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "kafka-env" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "kafka-log4j" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          }
+        },
+        comments: "A high-throughput distributed messaging system",
+        serviceVersion: "0.8.1.2.2",
+        stackName: "HDP",
+        isInstalled: false,
+        isInstallable: true,
+        serviceCheckSupported: true,
+        isServiceWithWidgets: true,
+        requiredServices: ["ZOOKEEPER"]
+      },
+      componentResult = {
+        id: "KAFKA_BROKER",
+        componentName: "KAFKA_BROKER",
+        displayName: "Kafka Broker",
+        cardinality: "1+",
+        customCommands: [],
+        serviceName: "KAFKA",
+        componentCategory: "MASTER",
+        isMaster: true,
+        isClient: false,
+        stackName: "HDP",
+        stackVersion: "2.2",
+        dependencies: [
+          {
+            componentName: "ZOOKEEPER_SERVER",
+            scope : "cluster"
+          }
+        ]
+      };
+
+    beforeEach(function () {
+      App.stackServiceMapper.clearStackModels();
+    });
+
+    afterEach(function () {
+    });
+
+    it('should sort and map data about services with their components', function () {
+      App.stackServiceMapper.map(data);
+      var services = App.StackService.find(),
+        components = App.StackServiceComponent.find(),
+        kafkaService = services.findProperty('serviceName', 'KAFKA');
+      expect(services.mapProperty('serviceName')).to.eql(sortedServiceNames);
+      expect(kafkaService.get('serviceComponents.length')).to.equal(1);
+      Em.keys(serviceResult).forEach(function (key) {
+        expect(kafkaService.get(key)).to.eql(serviceResult[key]);
+      });
+      Em.keys(componentResult).forEach(function (key) {
+        expect(kafkaService.get('serviceComponents').toArray()[0].get(key)).to.eql(componentResult[key]);
+      });
+      Em.keys(componentResult).forEach(function (key) {
+        expect(components.findProperty('componentName', 'KAFKA_BROKER').get(key)).to.eql(componentResult[key]);
+      });
+      expect(services.findProperty('serviceName', 'KERBEROS').get('isInstallable')).to.be.false;
+      expect(services.findProperty('serviceName', 'KERBEROS').get('isSelected')).to.be.false;
+      expect(components.findProperty('componentName', 'MYSQL_SERVER').get('customCommands')).to.be.empty;
+    });
+
+  });
+
+});