ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akovale...@apache.org
Subject git commit: AMBARI-4109. Manage config-groups dialog should persist only hitting Save (installer and reconfigure). (akovalenko)
Date Wed, 18 Dec 2013 16:52:48 GMT
Updated Branches:
  refs/heads/trunk 7fcaee967 -> 7b837b11f


AMBARI-4109. Manage config-groups dialog should persist only hitting Save (installer and reconfigure).
(akovalenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7b837b11
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7b837b11
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7b837b11

Branch: refs/heads/trunk
Commit: 7b837b11f4f9822cc4b6f6faa36c0a53b9e2ee54
Parents: 7fcaee9
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Wed Dec 18 18:47:58 2013 +0200
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Wed Dec 18 18:47:58 2013 +0200

----------------------------------------------------------------------
 .../controllers/main/service/info/configs.js    |  98 +++--
 .../service/manage_config_groups_controller.js  | 398 +++++--------------
 ambari-web/app/utils/ajax.js                    |   3 +-
 ambari-web/app/utils/config.js                  |  75 +++-
 .../main/service/manage_config_groups_view.js   |   3 +-
 5 files changed, 211 insertions(+), 366 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7b837b11/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index b39eb05..22c0346 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -1910,12 +1910,13 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
     var serviceData = (controller && controller.get('selectedService')) || this.get('content');
     var serviceName = serviceData.get('serviceName');
     var displayName = serviceData.get('displayName');
+    App.router.get('manageConfigGroupsController').set('isInstaller', !!controller);
     App.ModalPopup.show({
       header: Em.I18n.t('services.service.config_groups_popup.header').format(displayName),
       bodyClass: App.MainServiceManageConfigGroupView.extend({
         serviceName: serviceName,
         displayName: displayName,
-        controllerBinding: (!!controller) ? 'App.router.installerManageConfigGroupsController'
: 'App.router.manageConfigGroupsController'
+        controllerBinding: 'App.router.manageConfigGroupsController'
       }),
       classNames: ['sixty-percent-width-modal', 'manage-configuration-group-popup'],
       primary: Em.I18n.t('common.save'),
@@ -1925,7 +1926,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
         }
         // Save modified config-groups
         if (!!controller) {
-          controller.set('selectedService.configGroups', App.router.get('installerManageConfigGroupsController.configGroups'));
+          controller.set('selectedService.configGroups', App.router.get('manageConfigGroupsController.configGroups'));
           controller.selectedServiceObserver();
           if (controller.get('name') == "wizardStep7Controller") {
             App.config.persistWizardStep7ConfigGroups();
@@ -1938,68 +1939,79 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
         console.log("manageConfigurationGroups(): Saving modified config-groups: ", modifiedConfigGroups);
         var self = this;
         var errors = [];
-        var clearHostsPutCount = modifiedConfigGroups.toClearHosts.length;
-        var setHostsPutCount = modifiedConfigGroups.toSetHosts.length;
-        var finishFunction = function(error) {
-          if (error != null) {
+        var deleteQueriesCounter = modifiedConfigGroups.toClearHosts.length + modifiedConfigGroups.toDelete.length;
+        var createQueriesCounter = modifiedConfigGroups.toSetHosts.length + modifiedConfigGroups.toCreate.length;
+        var deleteQueriesRun = false;
+        var createQueriesRun = false;
+        var runNextQuery = function () {
+          if (!deleteQueriesRun && deleteQueriesCounter > 0) {
+            deleteQueriesRun = true;
+            modifiedConfigGroups.toClearHosts.forEach(function (cg) {
+              App.config.clearConfigurationGroupHosts(cg, finishFunction, finishFunction);
+            }, this);
+            modifiedConfigGroups.toDelete.forEach(function (cg) {
+              App.config.deleteConfigGroup(cg, finishFunction, finishFunction);
+            }, this);
+          } else if (!createQueriesRun && deleteQueriesCounter < 1) {
+            createQueriesRun = true;
+            modifiedConfigGroups.toSetHosts.forEach(function (cg) {
+              App.config.updateConfigurationGroup(cg, finishFunction, finishFunction);
+            }, this);
+            modifiedConfigGroups.toCreate.forEach(function (cg) {
+              App.config.createNewConfigurationGroup(cg.get('service.id'), cg.get('name'),
cg.get('description'), cg.get('hosts'),  false, finishFunction);
+            }, this);
+          }
+        };
+        var finishFunction = function (xhr, text, errorThrown) {
+          if (xhr && errorThrown) {
+            var error = xhr.status + "(" + errorThrown + ") ";
+            try {
+              var json = $.parseJSON(xhr.responseText);
+              error += json.message;
+            } catch (err) {
+            }
+            console.error('Error updating Config Group:', error);
             errors.push(error);
           }
-          if (--clearHostsPutCount <= 0) {
-            // Done with all the clear hosts PUTs
-            if (--setHostsPutCount < 0) {
-              // Done with all the PUTs
-              if (errors.length > 0) {
-                console.log(errors);
-                self.get('subViewController').set('errorMessage',
-                    errors.join(". "));
-              } else {
-                self.hide();
-              }
+          if (createQueriesRun) {
+            createQueriesCounter--;
+          } else {
+            deleteQueriesCounter--;
+          }
+          if (deleteQueriesCounter + createQueriesCounter < 1) {
+            if (errors.length > 0) {
+              console.log(errors);
+              self.get('subViewController').set('errorMessage', errors.join(". "));
             } else {
-              App.config.updateConfigurationGroup(modifiedConfigGroups.toSetHosts[setHostsPutCount],
finishFunction, finishFunction);
+              self.updateConfigGroupOnServicePage();
+              self.hide();
             }
+          } else {
+            runNextQuery();
           }
         };
-        this.updateConfigGroupOnServicePage();
-        modifiedConfigGroups.toClearHosts.forEach(function (cg) {
-          App.config.clearConfigurationGroupHosts(cg, finishFunction, finishFunction);
-        });
+       runNextQuery();
       },
       onSecondary: function () {
-        this.updateConfigGroupOnServicePage(true);
         this.hide();
       },
       onClose: function () {
-        this.updateConfigGroupOnServicePage(true);
         this.hide();
       },
       subViewController: function () {
-        return controller ? App.router.get('installerManageConfigGroupsController') : App.router.get('manageConfigGroupsController');
-      }.property('App.router.manageConfigGroupsController', 'App.router.installerManageConfigGroupsController'),
+        return App.router.get('manageConfigGroupsController');
+      }.property('App.router.manageConfigGroupsController'),
 
-      updateConfigGroupOnServicePage: function (onClose) {
+      updateConfigGroupOnServicePage: function () {
         var subViewController = this.get('subViewController');
         var selectedConfigGroup = subViewController.get('selectedConfigGroup');
         var managedConfigGroups = subViewController.get('configGroups');
-        // restore config groups hosts in wizards if Cancel or Close button is clicked
-        if (onClose && controller) {
-          var unusedHosts = controller.get('getAllHosts').slice().mapProperty('hostName');
-          var hostsToGroupMap = subViewController.get('loadedHostsToGroupMap');
-          for (var group in hostsToGroupMap) {
-            var groupToChange = managedConfigGroups.findProperty('name', group);
-            if (groupToChange) {
-              hostsToGroupMap[group].forEach(function (host) {
-                unusedHosts = unusedHosts.without(host);
-              }, this);
-              groupToChange.set('hosts', hostsToGroupMap[group]);
-            }
-          }
-          managedConfigGroups.findProperty('isDefault').set('hosts', unusedHosts);
-        }
         if (!controller) {
           controller = App.router.get('mainServiceInfoConfigsController');
+          controller.set('configGroups', managedConfigGroups);
+        } else {
+          controller.set('selectedService.configGroups', managedConfigGroups);
         }
-        controller.set('selectedService.configGroups', managedConfigGroups);
         //check whether selectedConfigGroup was selected
         if (selectedConfigGroup && controller.get('configGroups').someProperty('name',
selectedConfigGroup.get('name'))) {
           controller.set('selectedConfigGroup', selectedConfigGroup);

http://git-wip-us.apache.org/repos/asf/ambari/blob/7b837b11/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
index 5508da6..d22b853 100644
--- a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
+++ b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
@@ -26,16 +26,18 @@ App.ManageConfigGroupsController = Em.Controller.extend({
 
   isLoaded: false,
 
+  isInstaller: false,
+
   serviceName: null,
 
   configGroups: [],
 
+  originalConfigGroups: [],
+
   selectedConfigGroup: null,
 
   selectedHosts: [],
 
-  loadedHostsToGroupMap: {},
-
   resortConfigGroup: function() {
     var configGroups = Ember.copy(this.get('configGroups'));
     if(configGroups.length < 2){
@@ -54,20 +56,28 @@ App.ManageConfigGroupsController = Em.Controller.extend({
   }.observes('configGroups.@each.name'),
 
   loadConfigGroups: function (serviceName) {
-    this.set('serviceName', serviceName);
-    App.ajax.send({
-      name: 'service.load_config_groups',
-      data: {
-        serviceName: serviceName
-      },
-      sender: this,
-      success: 'onLoadConfigGroupsSuccess',
-      error: 'onLoadConfigGroupsError'
-    });
+    if (this.get('isInstaller')) {
+      this.set('serviceName', serviceName);
+      var configGroups = this.copyConfigGroups(App.router.get('wizardStep7Controller.selectedService.configGroups'));
+      var originalConfigGroups = this.copyConfigGroups(configGroups);
+      this.set('configGroups', configGroups);
+      this.set('originalConfigGroups', originalConfigGroups);
+      this.set('isLoaded', true);
+    } else {
+      this.set('serviceName', serviceName);
+      App.ajax.send({
+        name: 'service.load_config_groups',
+        data: {
+          serviceName: serviceName
+        },
+        sender: this,
+        success: 'onLoadConfigGroupsSuccess',
+        error: 'onLoadConfigGroupsError'
+      });
+    }
   },
 
   onLoadConfigGroupsSuccess: function (data) {
-    var loadedHostsToGroupMap = this.get('loadedHostsToGroupMap');
     var usedHosts = [];
     var unusedHosts = [];
     var serviceName = this.get('serviceName');
@@ -86,7 +96,6 @@ App.ManageConfigGroupsController = Em.Controller.extend({
       data.items.forEach(function (configGroup) {
         configGroup = configGroup.ConfigGroup;
         var hostNames = configGroup.hosts.mapProperty('host_name');
-        loadedHostsToGroupMap[configGroup.group_name] = hostNames.slice();
         var newConfigGroup = App.ConfigGroup.create({
           id: configGroup.id,
           name: configGroup.group_name,
@@ -119,7 +128,10 @@ App.ManageConfigGroupsController = Em.Controller.extend({
       }, this);
       defaultConfigGroup.set('childConfigGroups', configGroups);
       defaultConfigGroup.set('hosts', unusedHosts);
-      this.set('configGroups', [defaultConfigGroup].concat(configGroups));
+      var allGroups = [defaultConfigGroup].concat(configGroups);
+      this.set('configGroups', allGroups);
+      var originalGroups = this.copyConfigGroups(allGroups);
+      this.set('originalConfigGroups', originalGroups);
       this.loadProperties(groupToTypeToTagMap);
       this.set('isLoaded', true);
     }
@@ -263,291 +275,10 @@ App.ManageConfigGroupsController = Em.Controller.extend({
     if (this.get('isDeleteGroupDisabled')) {
       return;
     }
-    App.ajax.send({
-      name: 'config_groups.delete_config_group',
-      sender: this,
-      data: {
-        id: selectedConfigGroup.get('id')
-      }
-    });
-    //move hosts of group to default group (available hosts)
-    this.set('selectedHosts', selectedConfigGroup.get('hosts'));
-    this.deleteHosts();
-    this.get('configGroups').removeObject(selectedConfigGroup);
-    delete this.get('loadedHostsToGroupMap')[selectedConfigGroup.get('name')];
-    this.set('selectedConfigGroup', this.get('configGroups').findProperty('isDefault'));
-  },
-
-  /**
-   * rename new config group
-   */
-  renameConfigGroup: function () {
-    if(this.get('selectedConfigGroup.isDefault')) {
-      return;
-    }
-    var content = this;
-    var self = this;
-    this.renameGroupPopup = App.ModalPopup.show({
-      primary: Em.I18n.t('ok'),
-      secondary: Em.I18n.t('common.cancel'),
-      header: Em.I18n.t('services.service.config_groups.rename_config_group_popup.header'),
-      bodyClass: Ember.View.extend({
-        templateName: require('templates/main/service/new_config_group')
-      }),
-      configGroupName: "",
-      configGroupDesc: "",
-      content: content,
-      isDescriptionDirty: false,
-      validate: function () {
-        var warningMessage = '';
-        var originalGroup = self.get('selectedConfigGroup');
-        if (originalGroup.get('description') !== this.get('configGroupDesc') && !this.get('isDescriptionDirty'))
{
-          this.set('isDescriptionDirty', true);
-        }
-        if (originalGroup.get('name') === this.get('configGroupName')) {
-          if (this.get('isDescriptionDirty')) {
-            warningMessage = '';
-          } else {
-            warningMessage = Em.I18n.t("config.group.selection.dialog.err.name.exists");
-          }
-        } else {
-          if (self.get('configGroups').mapProperty('name').contains(this.get('configGroupName')))
{
-            warningMessage = Em.I18n.t("config.group.selection.dialog.err.name.exists");
-          }
-        }
-        this.set('warningMessage', warningMessage);
-      }.observes('configGroupName', 'configGroupDesc'),
-      enablePrimary: function () {
-        return this.get('configGroupName').length > 0 && !this.get('warningMessage');
-      }.property('warningMessage', 'configGroupName', 'configGroupDesc'),
-      onPrimary: function () {
-        if (!this.get('enablePrimary')) {
-          return false;
-        }
-        var copyHsots = this.get('content.loadedHostsToGroupMap')[this.get('content.selectedConfigGroup.name')];
-        delete this.get('content.loadedHostsToGroupMap')[this.get('content.selectedConfigGroup.name')];
-        this.get('content.loadedHostsToGroupMap')[this.get('configGroupName')] = copyHsots;
-        this.get('content.selectedConfigGroup').set('name', this.get('configGroupName'));
-        this.get('content.selectedConfigGroup').set('description', this.get('configGroupDesc'));
-        this.get('content.selectedConfigGroup.apiResponse').group_name = this.get('configGroupName');
-        this.get('content.selectedConfigGroup.apiResponse').description = this.get('configGroupDesc');
-
-        var configGroup = {
-          ConfigGroup: this.get('content.selectedConfigGroup.apiResponse')
-        };
-        App.ajax.send({
-          name: 'config_groups.update_config_group',
-          sender: this,
-          data: {
-            id: this.get('content.selectedConfigGroup.id'),
-            configGroup: configGroup
-          }
-        });
-        this.hide();
-      }
-    });
-    this.get('renameGroupPopup').set('configGroupName', this.get('selectedConfigGroup.name'));
-    this.get('renameGroupPopup').set('configGroupDesc', this.get('selectedConfigGroup.description'));
-  },
-
-  /**
-   * add new config group
-   */
-  addConfigGroup: function (isDuplicated) {
-    isDuplicated = isDuplicated === true ? true : false;
-    var content = this;
-    var self = this;
-    this.addGroupPopup = App.ModalPopup.show({
-      primary: Em.I18n.t('ok'),
-      secondary: Em.I18n.t('common.cancel'),
-      header: Em.I18n.t('services.service.config_groups.add_config_group_popup.header'),
-      bodyClass: Ember.View.extend({
-        templateName: require('templates/main/service/new_config_group')
-      }),
-      configGroupName: "",
-      configGroupDesc: "",
-      content: content,
-      warningMessage: '',
-      validate: function () {
-        var warningMessage = '';
-        if (self.get('configGroups').mapProperty('name').contains(this.get('configGroupName').trim()))
{
-          warningMessage = Em.I18n.t("config.group.selection.dialog.err.name.exists");
-        }
-        this.set('warningMessage', warningMessage);
-      }.observes('configGroupName'),
-      enablePrimary: function () {
-        return this.get('configGroupName').trim().length > 0 && !this.get('warningMessage');
-      }.property('warningMessage', 'configGroupName'),
-      onPrimary: function () {
-        if (!this.get('enablePrimary')) {
-          return false;
-        }
-        this.get('content').set('configGroupName', this.get('configGroupName').trim());
-        this.get('content').set('configGroupDesc', this.get('configGroupDesc'));
-        var desiredConfig = [];
-         if (isDuplicated) {
-          this.get('content.selectedConfigGroup.apiResponse.desired_configs').forEach(function(desired_config){
-            var properties = {};
-            this.get('content.selectedConfigGroup.properties').forEach(function(property){
-              properties[property.name] = property.value;
-            });
-            desiredConfig.push({
-              tag: 'version' + (new Date).getTime(),
-              type: desired_config.type,
-              properties : properties
-            })
-          }, this);
-        }
-        self.createNewConfigurationGroup(this.get('configGroupName').trim(),this.get('content.serviceName'),this.get('configGroupDesc'),
desiredConfig, this.get('content'));
-      }
-    });
-  },
-
-
-  createNewConfigurationGroup: function(configGroupName, serviceName, configGroupDesc, desiredConfigs,
sender) {
-    App.ajax.send({
-      name: 'config_groups.create',
-      sender: sender,
-      data: {
-        'group_name': configGroupName,
-        'service_id': serviceName,
-        'description': configGroupDesc,
-        'desired_configs': desiredConfigs
-      },
-      success: 'onAddNewConfigGroup',
-      error: 'onAddNewConfigGroupError'
-    });
-  },
-  /**
-   * On successful api resonse for creating new config group
-   */
-  onAddNewConfigGroup: function (data,response) {
-    var defaultConfigGroup = this.get('configGroups').findProperty('isDefault');
-    var desiredConfigs = jQuery.parseJSON(response.data)[0].ConfigGroup.desired_configs;
-    var properties = [];
-    var configSiteTags = [];
-    if (desiredConfigs && desiredConfigs.length > 0) {
-      desiredConfigs.forEach(function(configs){
-        var configSiteTag = App.ConfigSiteTag.create({
-          site: configs.type,
-          tag: configs.tag
-        });
-        configSiteTags.push(configSiteTag);
-      });
-      properties = this.get('selectedConfigGroup.properties');
-    }
-
-    var newConfigGroupData = App.ConfigGroup.create({
-      id: data.resources[0].ConfigGroup.id,
-      name: this.get('configGroupName'),
-      description: this.get('configGroupDesc'),
-      isDefault: false,
-      parentConfigGroup: defaultConfigGroup,
-      service: App.Service.find().findProperty('serviceName', this.get('serviceName')),
-      hosts: [],
-      configSiteTags: configSiteTags,
-      properties: properties
-    });
-    this.get('loadedHostsToGroupMap')[newConfigGroupData.get('name')] = [];
-    defaultConfigGroup.get('childConfigGroups').push(newConfigGroupData);
-    this.get('configGroups').pushObject(newConfigGroupData);
-    this.updateConfigGroup(data.resources[0].ConfigGroup.id);
-    this.addGroupPopup.hide();
-  },
-
-  onAddNewConfigGroupError: function() {
-    console.warn('Can\'t add configuration group');
-  },
-  /**
-   * update config group apiResponse property
-   */
-  updateConfigGroup: function (id) {
-    App.ajax.send({
-      name: 'config_groups.get_config_group_by_id',
-      sender: this,
-      data: {
-        'id': id
-      },
-      success: 'successLoadingConfigGroup'
-    });
-  },
-
-  successLoadingConfigGroup: function (data) {
-    if(data.ConfigGroup) {
-      var confGroup = this.get('configGroups').findProperty('id', data.ConfigGroup.id);
-      confGroup.set('apiResponse', data.ConfigGroup);
-    }
-  },
-
-  /**
-   * duplicate config group
-   */
-  duplicateConfigGroup: function() {
-    if(this.get('selectedConfigGroup.isDefault')) {
-      return;
-    }
-    this.addConfigGroup(true);
-    this.get('addGroupPopup').set('header',Em.I18n.t('services.service.config_groups.duplicate_config_group_popup.header'));
-    this.get('addGroupPopup').set('configGroupName', this.get('selectedConfigGroup.name')
+ ' Copy');
-    this.get('addGroupPopup').set('configGroupDesc', this.get('selectedConfigGroup.description')
+ ' (Copy)');
-  },
-
-  hostsModifiedConfigGroups: function () {
-    var groupsToClearHosts = [];
-    var groupsToSetHosts = [];
-    var groups = this.get('configGroups');
-    var loadedHostsToGroupMap = this.get('loadedHostsToGroupMap');
-    groups.forEach(function (group) {
-      if (!group.get('isDefault')) {
-        if (!(JSON.stringify(group.get('hosts').slice().sort()) === JSON.stringify(loadedHostsToGroupMap[group.get('name')].sort())))
{
-          groupsToClearHosts.push(group);
-          if (group.get('hosts').length) {
-            groupsToSetHosts.push(group);
-          }
-        }
-      }
-    });
-    return {
-      toClearHosts: groupsToClearHosts,
-      toSetHosts: groupsToSetHosts
-    };
-  }.property('selectedConfigGroup', 'selectedConfigGroup.hosts.@each'),
-  
-  isHostsModified: function () {
-    var modifiedGroups = this.get('hostsModifiedConfigGroups');
-    return !!(modifiedGroups.toClearHosts.length || modifiedGroups.toSetHosts.length);
-  }.property('hostsModifiedConfigGroups', 'hostsModifiedConfigGroups.length')
-});
-
-
-App.InstallerManageConfigGroupsController = App.ManageConfigGroupsController.extend({
-  name: 'installerManageConfigGroupsController',
-
-  loadConfigGroups: function (serviceName) {
-    this.set('serviceName', serviceName);
-    var loadedHostsToGroupMap = this.get('loadedHostsToGroupMap');
-    var configGroups = App.router.get('wizardStep7Controller.selectedService.configGroups');
-    configGroups.forEach(function (configGroup) {
-      if (!configGroup.get('isDefault')) {
-        loadedHostsToGroupMap[configGroup.name] = configGroup.hosts.slice();
-      }
-    });
-    this.set('configGroups', configGroups);
-    this.set('isLoaded', true);
-  },
-  /**
-   * delete selected config group
-   */
-  deleteConfigGroup: function () {
-    var selectedConfigGroup = this.get('selectedConfigGroup');
-    if (this.get('isDeleteGroupDisabled')) {
-      return;
-    }
     //move hosts of group to default group (available hosts)
     this.set('selectedHosts', selectedConfigGroup.get('hosts'));
     this.deleteHosts();
     this.get('configGroups').removeObject(selectedConfigGroup);
-    delete this.get('loadedHostsToGroupMap')[selectedConfigGroup.get('name')];
     this.set('selectedConfigGroup', this.get('configGroups').findProperty('isDefault'));
   },
   /**
@@ -595,9 +326,6 @@ App.InstallerManageConfigGroupsController = App.ManageConfigGroupsController.ext
         if (!this.get('enablePrimary')) {
           return false;
         }
-        var copyHsots = self.get('loadedHostsToGroupMap')[self.get('selectedConfigGroup.name')];
-        delete self.get('loadedHostsToGroupMap')[self.get('selectedConfigGroup.name')];
-        self.get('loadedHostsToGroupMap')[this.get('configGroupName')] = copyHsots;
         self.set('selectedConfigGroup.name', this.get('configGroupName'));
         self.set('selectedConfigGroup.description', this.get('configGroupDesc'));
         this.hide();
@@ -605,6 +333,7 @@ App.InstallerManageConfigGroupsController = App.ManageConfigGroupsController.ext
     });
     this.get('renameGroupPopup').validate();
   },
+
   /**
    * add new config group
    */
@@ -658,7 +387,6 @@ App.InstallerManageConfigGroupsController = App.ManageConfigGroupsController.ext
         } else {
           newConfigGroupData.set('properties', []);
         }
-        self.get('loadedHostsToGroupMap')[newConfigGroupData.get('name')] = [];
         self.get('configGroups').pushObject(newConfigGroupData);
         defaultConfigGroup.get('childConfigGroups').pushObject(newConfigGroupData);
         this.hide();
@@ -668,5 +396,73 @@ App.InstallerManageConfigGroupsController = App.ManageConfigGroupsController.ext
 
   duplicateConfigGroup: function() {
     this.addConfigGroup(true);
+  },
+
+  hostsModifiedConfigGroups: function () {
+    if (!this.get('isLoaded')) {
+      return false;
+    }
+    var groupsToClearHosts = [];
+    var groupsToDelete = [];
+    var groupsToSetHosts = [];
+    var groupsToCreate = [];
+    var groups = this.get('configGroups');
+    var originalGroups = this.get('originalConfigGroups');
+    var originalGroupsNames = originalGroups.mapProperty('name').without(originalGroups.findProperty('isDefault').get('name'));
+    groups.forEach(function (group) {
+      if (!group.get('isDefault')) {
+        var originalGroup = originalGroups.findProperty('name', group.get('name'));
+        if (originalGroup) {
+          if (!(JSON.stringify(group.get('hosts').slice().sort()) === JSON.stringify(originalGroup.get('hosts').sort())))
{
+            groupsToClearHosts.push(group.set('id', originalGroup.get('id')));
+            if (group.get('hosts').length) {
+              groupsToSetHosts.push(group.set('id', originalGroup.get('id')));
+            }
+          } else if (group.get('description') !== originalGroup.get('description')) {
+            groupsToSetHosts.push(group.set('id', originalGroup.get('id')));
+          }
+          originalGroupsNames = originalGroupsNames.without(group.get('name'));
+        } else {
+          groupsToCreate.push(group);
+        }
+      }
+    });
+    originalGroupsNames.forEach(function (groupName) {
+      groupsToDelete.push(originalGroups.findProperty('name', groupName));
+    }, this);
+    return {
+      toClearHosts: groupsToClearHosts,
+      toDelete: groupsToDelete,
+      toSetHosts: groupsToSetHosts,
+      toCreate: groupsToCreate
+    };
+  }.property('selectedConfigGroup.hosts.@each', 'selectedConfigGroup.description', 'configGroups',
'isLoaded'),
+
+  isHostsModified: function () {
+    var modifiedGroups = this.get('hostsModifiedConfigGroups');
+    if (!this.get('isLoaded')) {
+      return false;
+    }
+    return !!(modifiedGroups.toClearHosts.length || modifiedGroups.toSetHosts.length || modifiedGroups.toCreate.length
|| modifiedGroups.toDelete.length);
+  }.property('hostsModifiedConfigGroups'),
+
+  /**
+   * copy config groups to manage popup to give user choice whether or not save changes
+   * @param originGroups
+   * @return {Array}
+   */
+  copyConfigGroups: function (originGroups) {
+    var configGroups = [];
+    var defaultConfigGroup = App.ConfigGroup.create($.extend(false, {},originGroups.findProperty('isDefault')));
+    originGroups.forEach(function (configGroup) {
+      if (!configGroup.get('isDefault')) {
+        var copiedGroup = App.ConfigGroup.create($.extend(false, {}, configGroup));
+        copiedGroup.set('parentConfigGroup', defaultConfigGroup);
+        configGroups.pushObject(copiedGroup);
+      }
+    });
+    defaultConfigGroup.set('childConfigGroups', configGroups.slice());
+    configGroups.pushObject(defaultConfigGroup);
+    return configGroups;
   }
-})
+});
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/7b837b11/ambari-web/app/utils/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax.js b/ambari-web/app/utils/ajax.js
index c25d698..08c03ad 100644
--- a/ambari-web/app/utils/ajax.js
+++ b/ambari-web/app/utils/ajax.js
@@ -1192,7 +1192,8 @@ var urls = {
             "group_name": data.group_name,
             "tag": data.service_id,
             "description": data.description,
-            "desired_configs": data.desired_configs
+            "desired_configs": data.desired_configs,
+            "hosts": data.hosts
           }
         }])
       }

http://git-wip-us.apache.org/repos/asf/ambari/blob/7b837b11/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index c8a03d1..379b467 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -1078,7 +1078,7 @@ App.config = Em.Object.create({
           callback(selectedConfigGroup);
         } else {
           var newConfigGroupName = this.get('newConfigGroupName').trim();
-          var newConfigGroup = self.createNewConfigurationGroup(serviceId, newConfigGroupName,
isInstaller);
+          var newConfigGroup = self.createNewConfigurationGroup(serviceId, newConfigGroupName,
null, [], isInstaller);
           if (newConfigGroup) {
             newConfigGroup.set('parentConfigGroup', configGroups.findProperty('isDefault'));
             configGroups.pushObject(newConfigGroup);
@@ -1190,18 +1190,21 @@ App.config = Em.Object.create({
    *
    * @param serviceId   Service for which this group has to be created
    * @param configGroupName    Name of the new config-group
-   * @return  Returns the created config-group or error as
-   *        { configGroup: {id:4}, error: {...}}
+   * @param description    Description of the new config-group
+   * @param hosts    Hosts for the new config-group
+   * @param isInstaller    Determines whether send data to server or not
+   * @param callback    Callback function for Success or Error handling
+   * @return  Returns the created config-group
    */
-  createNewConfigurationGroup: function (serviceId, configGroupName, isInstaller) {
+  createNewConfigurationGroup: function (serviceId, configGroupName, description, hosts,
isInstaller, callback) {
     var newConfigGroupData = App.ConfigGroup.create({
       id: null,
       name: configGroupName,
-      description: "New configuration group created on " + new Date().toDateString(),
+      description: description || "New configuration group created on " + new Date().toDateString(),
       isDefault: false,
       parentConfigGroup: null,
       service: App.Service.find().findProperty('serviceName', serviceId),
-      hosts: [],
+      hosts: hosts || [],
       configSiteTags: [],
       properties: []
     });
@@ -1209,20 +1212,35 @@ App.config = Em.Object.create({
       newConfigGroupData.set('service', Em.Object.create({id: serviceId}));
       return newConfigGroupData;
     }
+    var dataHosts = [];
+    newConfigGroupData.get('hosts').forEach(function (_host) {
+      dataHosts.push({
+        host_name: _host
+      });
+    }, this);
     var sendData = {
       name: 'config_groups.create',
       data: {
         'group_name': configGroupName,
         'service_id': serviceId,
-        'description': newConfigGroupData.description
+        'description': newConfigGroupData.description,
+        'hosts': dataHosts
       },
       success: 'successFunction',
       error: 'errorFunction',
       successFunction: function (response) {
-        newConfigGroupData.id = response.resources[0].ConfigGroup.id;
+        if (callback) {
+          callback();
+        } else {
+          newConfigGroupData.id = response.resources[0].ConfigGroup.id;
+        }
       },
-      errorFunction: function () {
-        newConfigGroupData = null;
+      errorFunction: function (xhr, text, errorThrown) {
+        if (callback) {
+          callback(xhr, text, errorThrown);
+        } else {
+          newConfigGroupData = null;
+        }
         console.error('Error in creating new Config Group');
       }
     };
@@ -1230,7 +1248,7 @@ App.config = Em.Object.create({
     App.ajax.send(sendData);
     return newConfigGroupData;
   },
-  
+
   /**
    * PUTs the new configuration-group on the server.
    * Changes possible here are the name, description and
@@ -1243,7 +1261,7 @@ App.config = Em.Object.create({
       ConfigGroup: {
         group_name: configGroup.get('name'),
         description: configGroup.get('description'),
-        tag: configGroup.get('service.serviceName'),
+        tag: configGroup.get('service.id'),
         hosts: [],
         desired_configs: []
       }  
@@ -1274,15 +1292,8 @@ App.config = Em.Object.create({
         }
       },
       errorFunction: function (xhr, text, errorThrown) {
-        error = xhr.status + "(" + errorThrown + ") ";
-        try {
-          var json = $.parseJSON(xhr.responseText);
-          error += json.message;
-        } catch (err) {
-        }
-        console.error('Error updating Config Group:', error, configGroup);
         if(errorCallback) {
-          errorCallback(error);
+          errorCallback(xhr, text, errorThrown);
         }
       }
     };
@@ -1296,6 +1307,30 @@ App.config = Em.Object.create({
     this.updateConfigurationGroup(configGroup, successCallback, errorCallback);
   },
 
+  deleteConfigGroup: function (configGroup, successCallback, errorCallback) {
+    var sendData = {
+      name: 'config_groups.delete_config_group',
+      sender: this,
+      data: {
+        id: configGroup.get('id')
+      },
+      success: 'successFunction',
+      error: 'errorFunction',
+      successFunction: function () {
+        if(successCallback) {
+          successCallback();
+        }
+      },
+      errorFunction: function (xhr, text, errorThrown) {
+        if(errorCallback) {
+          errorCallback(xhr, text, errorThrown);
+        }
+      }
+    };
+    sendData.sender = sendData;
+    App.ajax.send(sendData);
+  },
+
   /**
    * Gets all the configuration-groups for the given service.
    * 

http://git-wip-us.apache.org/repos/asf/ambari/blob/7b837b11/ambari-web/app/views/main/service/manage_config_groups_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/manage_config_groups_view.js b/ambari-web/app/views/main/service/manage_config_groups_view.js
index 8186fd1..b7aa34e 100644
--- a/ambari-web/app/views/main/service/manage_config_groups_view.js
+++ b/ambari-web/app/views/main/service/manage_config_groups_view.js
@@ -42,7 +42,7 @@ App.MainServiceManageConfigGroupView = Em.View.extend({
       this.set('isRenameButtonDisabled', false);
       this.set('isDuplicateButtonDisabled', false);
     }
-  }.observes('controller.selectedConfigGroup', 'controller.isHostsModified'),
+  }.observes('controller.selectedConfigGroup'),
 
   onGroupSelect: function () {
     var selectedConfigGroup = this.get('selectedConfigGroup');
@@ -63,6 +63,7 @@ App.MainServiceManageConfigGroupView = Em.View.extend({
   }.observes('controller.isLoaded', 'controller.configGroups'),
 
   didInsertElement: function () {
+    this.set('controller.isLoaded', false);
     this.get('controller').loadConfigGroups(this.get('serviceName'));
     this.selectDefaultGroup();
     App.tooltip($('.properties-link'));


Mime
View raw message