Selaa lähdekoodia

AMBARI-4062. Components in Select Group Hosts popup. (onechiporenko)

Oleg Nechiporenko 11 vuotta sitten
vanhempi
commit
3a1fc7db94

+ 15 - 2
ambari-web/app/app.js

@@ -60,7 +60,20 @@ module.exports = Em.Application.create({
   isHadoop2Stack: function(){
     return (stringUtils.compareVersions(this.get('currentStackVersionNumber'), "2.0") === 1 ||
       stringUtils.compareVersions(this.get('currentStackVersionNumber'), "2.0") === 0)
-  }.property('currentStackVersionNumber')
+  }.property('currentStackVersionNumber'),
+
+  /**
+   * If High Availability is enabled
+   * Based on <code>clusterStatus.isInstalled</code>, stack version, <code>SNameNode</code> availability
+   *
+   * @type {Boolean}
+   */
+  isHaEnabled: function() {
+    if (!this.clusterStatus.get('isInstalled')) return false;
+    if (!this.get('isHadoop2Stack')) return false;
+    return !this.HostComponent.find().someProperty('componentName', 'SECONDARY_NAMENODE');
+  }.property('clusterStatus.isInstalled')
+
 });
 
 /**
@@ -117,7 +130,7 @@ DS.attr.transforms.date = {
       return null;
     }
   }
-}
+};
 
 DS.attr.transforms.object = {
   from: function(serialized) {

+ 4 - 4
ambari-web/app/controllers/main/service/manage_config_groups_controller.js

@@ -19,7 +19,7 @@
 
 var App = require('app');
 var hostsManagement = require('utils/hosts');
-var serviceComponents = require('data/service_components');
+var componentHelper = require('utils/component');
 
 App.ManageConfigGroupsController = Em.Controller.extend({
   name: 'manageConfigGroupsController',
@@ -180,11 +180,11 @@ App.ManageConfigGroupsController = Em.Controller.extend({
    * @return {Array}
    */
   componentsForFilter: function() {
-    var components = serviceComponents.filterProperty('service_name',this.get('serviceName'));
+    var components = componentHelper.getInstalledComponents().filterProperty('serviceName', this.get('serviceName'));
     return components.map(function(component) {
       return Em.Object.create({
-        displayName: component.display_name,
-        componentName: component.component_name,
+        displayName: component.displayName,
+        componentName: component.id,
         selected: false
       });
     });

+ 2 - 1
ambari-web/app/utils/component.js

@@ -46,7 +46,8 @@ module.exports = {
         isMaster: component.get('isMaster'),
         isSlave: component.get('isSlave'),
         isClient: component.get('isClient'),
-        displayName: component.get('displayName')
+        displayName: component.get('displayName'),
+        serviceName: component.get('service.id')
       }));
     });