AMBARI-9358 Adapt UI to changes in Stacks API response. (atkach)

ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js

@@ -75,8 +75,7 @@ angular.module('ambariAdminConsole')
   $scope.afterStackVersionChange = function () {
     Stack.getSupportedOSList($scope.upgradeStack.selected.stack_name, $scope.upgradeStack.selected.stack_version)
     .then(function (data) {
-      //TODO map data.operating_systems after API is fixed
-      var operatingSystems = data.operating_systems || data.operatingSystems;
+      var operatingSystems = data.operating_systems;
         $scope.osList = operatingSystems.map(function (os) {
           os.selected = false;
           os.repositories.forEach(function(repo) {

ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js

@@ -76,9 +76,7 @@ angular.module('ambariAdminConsole')
       angular.forEach($scope.osList, function (os) {
         existingOSHash[os.OperatingSystems.os_type] = os;
       });
-      //TODO map data.operating_systems after API is fixed
-      var operatingSystems = data.operating_systems || data.operatingSystems;
-      var osList = operatingSystems.map(function (os) {
+      var osList = data.operating_systems.map(function (os) {
         return existingOSHash[os.OperatingSystems.os_type] || {
           OperatingSystems: {
             os_type : os.OperatingSystems.os_type

ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js

@@ -79,9 +79,8 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
    * @type {String}
    */
   realRepoUrl: function () {
-    //TODO correct url after api will be fixed
     return App.get('apiPrefix') + App.get('stackVersionURL') +
-      '/repository_versions?fields=*,operating_systems/*,operating_systems/repositories/*,operatingSystems/*,operatingSystems/repositories/*';
+      '/repository_versions?fields=*,operating_systems/*,operating_systems/repositories/*';
   }.property('App.stackVersionURL'),
 
   /**
@@ -95,9 +94,8 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
    * @type {String}
    */
   realStackUrl: function () {
-    //TODO correct url after api will be fixed
     return App.apiPrefix + '/clusters/' + App.get('clusterName') +
-      '/stack_versions?fields=*,repository_versions/*,repository_versions/operating_systems/repositories/*,repository_versions/operatingSystems/repositories/*';
+      '/stack_versions?fields=*,repository_versions/*,repository_versions/operating_systems/repositories/*';
   }.property('App.clusterName'),
 
   /**

ambari-web/app/mappers/repository_version_mapper.js

@@ -78,10 +78,8 @@ App.repoVersionMapper = App.QuickDataMapper.create({
         if (loadAll || (item.RepositoryVersions && !App.StackVersion.find().someProperty('repositoryVersion.id', item.RepositoryVersions.id))) {
           var repo = item;
           var osArray = [];
-          //TODO iterate over item.operating_systems after API is fixed
-          var operatingSystems = Em.get(item, 'operating_systems') || Em.get(item, 'operatingSystems');
-          if (operatingSystems) {
-            operatingSystems.forEach(function (os) {
+          if (item.operating_systems) {
+            item.operating_systems.forEach(function (os) {
               os.id = item.RepositoryVersions.repository_version + os.OperatingSystems.os_type;
               os.repository_version_id = repo.id;
               var repoArray = [];

ambari-web/app/mappers/stack_mapper.js

@@ -80,9 +80,7 @@ App.stackMapper = App.QuickDataMapper.create({
 
       stack.id = stack.stack_name + "-" + stack.stack_version;
 
-      //TODO iterate over item.operating_systems after API is fixed
-      var opSystems = Em.get(item, 'operating_systems') || Em.get(item, 'operatingSystems');
-      opSystems.forEach(function(ops) {
+      item.operating_systems.forEach(function(ops) {
         var operatingSystems = ops.OperatingSystems;
 
         var repositoriesArray = [];

ambari-web/app/mappers/stack_service_mapper.js

@@ -81,9 +81,7 @@ App.stackServiceMapper = App.QuickDataMapper.create({
     json.items.forEach(function (item) {
       var stackService = item.StackServices;
       var serviceComponents = [];
-      //TODO iterate over item.components after API is fixed
-      var components = Em.get(item, 'components') || Em.get(item, 'serviceComponents');
-      components.forEach(function (serviceComponent) {
+      item.components.forEach(function (serviceComponent) {
         var dependencies = serviceComponent.dependencies.map(function (dependecy) {
           return { Dependencies: App.keysUnderscoreToCamelCase(App.permit(dependecy.Dependencies, ['component_name', 'scope'])) };
         });