Explorar o código

AMBARI-16972 Strange behavior of Add Version functionality (zhewang)

Zhe (Joe) Wang %!s(int64=9) %!d(string=hai) anos
pai
achega
1cfc09cfe2

+ 9 - 2
ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/AddVersionModal.js

@@ -140,10 +140,17 @@ angular.module('ambariAdminConsole')
                   parentScope.setStackIdActive(stack);
                 }
               });
+              parentScope.allVersions.push(response);
               angular.forEach(parentScope.allVersions, function(version) {
-                version.visible = (version.stackNameVersion === response.stackNameVersion);
+                var isPublicVersionsExist = false;
+                // If public VDF exists for a stack then default base stack version should be hidden
+                if (version.stackDefault) {
+                  isPublicVersionsExist = parentScope.allVersions.find(function(_version){
+                    return (version.stackNameVersion === _version.stackNameVersion && !_version.stackDefault);
+                  });
+                }
+                version.visible = (version.stackNameVersion === response.stackNameVersion) && !isPublicVersionsExist;
               });
-              parentScope.allVersions.push(response);
               parentScope.activeStackVersion = response;
               parentScope.selectedPublicRepoVersion = response;
               parentScope.setVersionSelected(response);