AMBARI-10603 RU: Admin>Versions is not showing HDP 2.3 after creating the repo version in Admin View and clicking on "Install On...". (ababiichuk)

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

@@ -91,7 +91,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
    */
   realRepoUrl: function () {
     return App.get('apiPrefix') + App.get('stackVersionURL') +
-      '/repository_versions?fields=*,operating_systems/*,operating_systems/repositories/*';
+      '/compatible_repository_versions?fields=*,operating_systems/*,operating_systems/repositories/*';
   }.property('App.stackVersionURL'),
 
   /**

ambari-web/app/mappers/repository_version_mapper.js

@@ -22,19 +22,22 @@ App.repoVersionMapper = App.QuickDataMapper.create({
   modelOperatingSystems: App.OS,
   modelRepositories: App.Repository,
 
-  modelRepoVersion: {
-    id: 'RepositoryVersions.id',
-    stack_version_id: 'RepositoryVersions.stackVersionId',
-    display_name: 'RepositoryVersions.display_name',
-    repository_version: 'RepositoryVersions.repository_version',
-    upgrade_pack: 'RepositoryVersions.upgrade_pack',
-    stack_version_type: 'RepositoryVersions.stack_name',
-    stack_version_number: 'RepositoryVersions.stack_version',
-    operating_systems_key: 'operating_systems',
-    operating_systems_type: 'array',
-    operating_systems: {
-      item: 'id'
-    }
+  modelRepoVersion: function (isCurrentStackOnly) {
+    var repoVersionsKey = isCurrentStackOnly ? 'RepositoryVersions' : 'CompatibleRepositoryVersions';
+    return {
+      id: repoVersionsKey + '.id',
+      stack_version_id: repoVersionsKey + '.stackVersionId',
+      display_name: repoVersionsKey + '.display_name',
+      repository_version: repoVersionsKey + '.repository_version',
+      upgrade_pack: repoVersionsKey + '.upgrade_pack',
+      stack_version_type: repoVersionsKey + '.stack_name',
+      stack_version_number: repoVersionsKey + '.stack_version',
+      operating_systems_key: 'operating_systems',
+      operating_systems_type: 'array',
+      operating_systems: {
+        item: 'id'
+      }
+    };
   },
 
   modelOS: {
@@ -64,7 +67,7 @@ App.repoVersionMapper = App.QuickDataMapper.create({
     stack_version : 'Repositories.stack_version'
   },
 
-  map: function (json, loadAll) {
+  map: function (json, loadAll, isCurrentStackOnly) {
     var modelRepoVersions = this.get('modelRepoVersions');
     var modelOperatingSystems = this.get('modelOperatingSystems');
     var modelRepositories = this.get('modelRepositories');
@@ -73,14 +76,16 @@ App.repoVersionMapper = App.QuickDataMapper.create({
     var resultOS = [];
     var resultRepo = [];
 
+    var repoVersionsKey = isCurrentStackOnly ? 'RepositoryVersions' : 'CompatibleRepositoryVersions';
+
     if (json && json.items) {
       json.items.forEach(function (item) {
-        if (loadAll || (item.RepositoryVersions && !App.StackVersion.find().someProperty('repositoryVersion.id', item.RepositoryVersions.id))) {
+        if (loadAll || (item[repoVersionsKey] && !App.StackVersion.find().someProperty('repositoryVersion.id', item[repoVersionsKey].id))) {
           var repo = item;
           var osArray = [];
           if (item.operating_systems) {
             item.operating_systems.forEach(function (os) {
-              os.id = item.RepositoryVersions.repository_version + os.OperatingSystems.os_type;
+              os.id = item[repoVersionsKey].repository_version + os.OperatingSystems.os_type;
               os.repository_version_id = repo.id;
               var repoArray = [];
               if (Em.get(os, 'repositories')) {
@@ -97,7 +102,7 @@ App.repoVersionMapper = App.QuickDataMapper.create({
             }, this);
           }
           repo.operating_systems = osArray;
-          resultRepoVersion.push(this.parseIt(repo, this.get('modelRepoVersion')));
+          resultRepoVersion.push(this.parseIt(repo, this.modelRepoVersion(isCurrentStackOnly)));
         }
       }, this);
     }

ambari-web/app/mappers/stack_version_mapper.js

@@ -77,7 +77,7 @@ App.stackVersionMapper = App.QuickDataMapper.create({
 
         if (item.repository_versions && item.repository_versions[0]) {
           item.repository_versions[0].RepositoryVersions.stackVersionId = item.ClusterStackVersions.id;
-          App.repoVersionMapper.map({"items": item.repository_versions }, true);
+          App.repoVersionMapper.map({"items": item.repository_versions }, true, true);
         }
         resultStack.push(this.parseIt(stack, this.get('modelStack')));
       }, this);

ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js

@@ -39,7 +39,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
       this.mock.withArgs('apiPrefix').returns('apiPrefix');
       this.mock.withArgs('stackVersionURL').returns('stackVersionURL');
       controller.propertyDidChange('realRepoUrl');
-      expect(controller.get('realRepoUrl')).to.equal('apiPrefixstackVersionURL/repository_versions?fields=*,operating_systems/*,operating_systems/repositories/*');
+      expect(controller.get('realRepoUrl')).to.equal('apiPrefixstackVersionURL/compatible_repository_versions?fields=*,operating_systems/*,operating_systems/repositories/*');
     });
   });