AMBARI-11160. New required parameters for Hive and HBase on navigating back to Customize Services page after install failure (onechiporenko)

ambari-web/app/controllers/wizard.js

@@ -890,6 +890,7 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
         var configProperty = {
           id: _configProperties.get('id'),
           name: _configProperties.get('name'),
+          displayName: _configProperties.get('displayName'),
           value: _configProperties.get('value'),
           defaultValue: _configProperties.get('defaultValue'),
           description: _configProperties.get('description'),

ambari-web/app/controllers/wizard/step7_controller.js

@@ -265,10 +265,12 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
    * @method clearStep
    */
   clearStep: function () {
-    this.set('configValidationGlobalMessage', []);
-    this.set('submitButtonClicked', false);
-    this.set('isSubmitDisabled', true);
-    this.set('isRecommendedLoaded', false);
+    this.setProperties({
+      configValidationGlobalMessage: [],
+      submitButtonClicked: false,
+      isSubmitDisabled: true,
+      isRecommendedLoaded: false
+    });
     this.get('stepConfigs').clear();
     this.set('filter', '');
     this.get('filterColumns').setEach('selected', false);
@@ -582,6 +584,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
       }
     }
   },
+
   /**
    * On load function
    * @method loadStep
@@ -624,8 +627,8 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
     if (this.get('allSelectedServiceNames').contains('YARN')) {
       configs = App.config.fileConfigsIntoTextarea(configs, 'capacity-scheduler.xml');
     }
-    var dependendServices = ["STORM", "YARN"];
-    dependendServices.forEach(function (serviceName) {
+    var dependedServices = ["STORM", "YARN"];
+    dependedServices.forEach(function (serviceName) {
       if (this.get('allSelectedServiceNames').contains(serviceName)) {
         this.resolveServiceDependencyConfigs(serviceName, configs);
       }
@@ -639,17 +642,54 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
         self.addKerberosDescriptorConfigs(configs, self.get('wizardController.kerberosDescriptorConfigs') || []);
       }
       self.setStepConfigs(configs, storedConfigs);
+
+      var serviceConfigProperties = (self.get('content.serviceConfigProperties') || []).mapProperty('name');
+      var recommendedToDelete = self.get('_dependentConfigValues').filterProperty('toDelete');
+      recommendedToDelete.forEach(function (c) {
+        var name = Em.get(c, 'propertyName');
+        if (serviceConfigProperties.contains(name)) {
+          Em.set(self.get('_dependentConfigValues').findProperty('propertyName', name), 'toDelete', false);
+        }
+      });
+
       self.updateDependentConfigs();
       self.clearDependentConfigs();
       self.checkHostOverrideInstaller();
       self.activateSpecialConfigs();
       self.selectProperService();
+      self.restoreRecommendedConfigs();
       if (self.get('content.skipConfigStep')) {
         App.router.send('next');
       }
     });
   },
 
+  /**
+   * After user navigates back to step7, values for depended configs should be set to values set by user and not to default values
+   * @method restoreRecommendedConfigs
+   */
+  restoreRecommendedConfigs: function () {
+    var recommendationsConfigs = this.get('recommendationsConfigs') || {};
+    var serviceConfigProperties = this.get('content.serviceConfigProperties') || [];
+    var stepConfigs = this.get('stepConfigs');
+    Em.keys(recommendationsConfigs).forEach(function (file) {
+      (Em.keys(recommendationsConfigs[file].properties).concat(Em.keys(recommendationsConfigs[file].property_attributes || {}))).forEach(function (configName) {
+        stepConfigs.forEach(function (stepConfig) {
+          stepConfig.get('configs').filterProperty('name', configName).forEach(function (configProperty) {
+            if (Em.get(configProperty, 'filename').contains(file)) {
+              var scps = serviceConfigProperties.filterProperty('name', configName).filter(function (cp) {
+                return Em.get(cp, 'filename').contains(file);
+              });
+              if (scps.length) {
+                Em.set(configProperty, 'value', Em.get(scps[0], 'value'));
+              }
+            }
+          });
+        });
+      });
+    });
+  },
+
   /**
    * Mark descriptor properties in configuration object.
    *
@@ -1179,18 +1219,14 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
           // error popup before you can proceed
           return App.ModalPopup.show({
             header: Em.I18n.t('installer.step7.popup.mySQLWarning.header'),
-            bodyClass: Ember.View.extend({
-              template: Ember.Handlebars.compile(Em.I18n.t('installer.step7.popup.mySQLWarning.body'))
-            }),
+            body:Em.I18n.t('installer.step7.popup.mySQLWarning.body'),
             secondary: Em.I18n.t('installer.step7.popup.mySQLWarning.button.gotostep5'),
             primary: Em.I18n.t('installer.step7.popup.mySQLWarning.button.dismiss'),
             onSecondary: function () {
               var parent = this;
               return App.ModalPopup.show({
                 header: Em.I18n.t('installer.step7.popup.mySQLWarning.confirmation.header'),
-                bodyClass: Ember.View.extend({
-                  template: Ember.Handlebars.compile(Em.I18n.t('installer.step7.popup.mySQLWarning.confirmation.body'))
-                }),
+                body: Em.I18n.t('installer.step7.popup.mySQLWarning.confirmation.body'),
                 onPrimary: function () {
                   this.hide();
                   parent.hide();

ambari-web/app/mixins/common/configs/enhanced_configs.js

@@ -114,8 +114,10 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
    * @private
    */
   clearDependentConfigs: function() {
-    this.set('groupsToSave', {});
-    this.set('_dependentConfigValues', []);
+    this.setProperties({
+      groupsToSave: {},
+      _dependentConfigValues: []
+    });
   },
 
   onConfigGroupChangeForEnhanced: function() {
@@ -198,7 +200,7 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
 
   /**
    * sends request to get values for dependent configs
-   * @param {Object[]} changedConfigs - list of changed configs to track recommendations
+   * @param {{type: string, name: string}[]} changedConfigs - list of changed configs to track recommendations
    * @param {Boolean} initial
    * @param {Function} onComplete
    * @returns {$.ajax|null}
@@ -283,6 +285,7 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
    */
   dependenciesSuccess: function (data, opt, params) {
     this._saveRecommendedValues(data, params.initial, params.dataToSend.changed_configurations);
+    this.set("recommendationsConfigs", Em.get(data.resources[0] , "recommendations.blueprint.configurations"));
     if (!params.initial) {
       this.updateDependentConfigs();
     }

ambari-web/app/mixins/common/serverValidator.js

@@ -114,9 +114,6 @@ App.ServerValidatorMixin = Em.Mixin.create({
    * @returns {*}
    */
   loadServerSideConfigsRecommendations: function() {
-    if (this.get('recommendationsConfigs')) {
-      return $.Deferred().resolve();
-    }
     return App.ajax.send({
       'name': 'config.recommendations',
       'sender': this,

ambari-web/app/utils/config.js

@@ -517,6 +517,8 @@ App.config = Em.Object.create({
           configData.value = stored.value;
           configData.defaultValue = stored.defaultValue;
           configData.overrides = stored.overrides;
+          configData.displayName = stored.displayName;
+          configData.name = stored.name;
           configData.filename = stored.filename;
           configData.description = stored.description;
           configData.isVisible = stored.isVisible;
@@ -561,6 +563,7 @@ App.config = Em.Object.create({
             configData.isFinal = storedCfg.isFinal;
             configData.supportsFinal = storedCfg.supportsFinal;
             configData.showLabel = !!storedCfg.showLabel;
+            configData.displayName = storedCfg.displayName;
           } else if (isAdvanced) {
             advanced = advancedConfigs.filterProperty('filename', configData.filename).findProperty('name', configData.name);
             this.setPropertyFromStack(configData, advanced);
@@ -574,7 +577,7 @@ App.config = Em.Object.create({
 
   /**
    *
-   * @param configData {Object} Configs that will be binded to the view on step-7 of installer wizard
+   * @param configData {Object} Configs that will be bound to the view on step-7 of installer wizard
    * @param advanced {Object} Config property loaded from Server side stack definition
    */
   setPropertyFromStack: function (configData, advanced) {
@@ -589,6 +592,8 @@ App.config = Em.Object.create({
     }
     configData.defaultValue = configData.value;
     configData.filename = advanced ? advanced.filename : configData.filename;
+    configData.displayName = advanced && advanced.displayName ? advanced.displayName : configData.displayName;
+    configData.name = advanced && advanced.name ? advanced.name : configData.name;
     configData.description = advanced ? advanced.description : configData.description;
     configData.isFinal = !!(advanced && (advanced.isFinal === "true"));
     configData.supportsFinal = !!(advanced && advanced.supportsFinal);

ambari-web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "Ambari",
   "description": "Front-end package for the Apache Ambari Project",
-  "version": "1.7.0",
+  "version": "2.1.0",
   "homepage": "http://ambari.apache.org/",
   "repository": {
     "type": "git",

ambari-web/test/controllers/wizard/step7_test.js

@@ -2003,4 +2003,47 @@ describe('App.InstallerStep7Controller', function () {
 
   });
 
+  describe('#restoreRecommendedConfigs', function () {
+
+    var recommendationsConfigs = {
+      site: {
+        properties: {
+          a: 'recommendedA',
+          b: 'recommendedB'
+        }
+      }
+    };
+    var stepConfigs = [
+      Em.Object.create({
+        serviceName: 'srv',
+        configs: [
+          {name: 'a', value: '--', filename: 'site'},
+          {name: 'b', value: '--', filename: 'Custom site'}
+        ]
+      })
+    ];
+    var serviceConfigProperties = [
+      {name: 'a', value: 'valueA', filename: 'site'},
+      {name: 'b', value: 'valueB', filename: 'Custom site'}
+    ];
+
+    beforeEach(function() {
+      installerStep7Controller.reopen({
+        content: {
+          serviceConfigProperties: serviceConfigProperties
+        },
+        recommendationsConfigs: recommendationsConfigs,
+        stepConfigs: stepConfigs
+      });
+    });
+
+    it('should restore provided by user values', function () {
+      installerStep7Controller.restoreRecommendedConfigs();
+      var configs = installerStep7Controller.get('stepConfigs')[0].configs;
+      expect(Em.get(configs.findProperty('name', 'a'), 'value')).to.equal('valueA');
+      expect(Em.get(configs.findProperty('name', 'b'), 'value')).to.equal('valueB');
+    });
+
+  });
+
 });

ambari-web/test/controllers/wizard/step8_test.js

@@ -1713,7 +1713,13 @@ describe('App.WizardStep8Controller', function () {
 
   describe('#applyInstalledServicesConfigurationGroup', function() {
     beforeEach(function() {
-      sinon.stub($, 'ajax', Em.K);
+      sinon.stub($, 'ajax', function () {
+        return {
+          retry: function () {
+            return {then: Em.K}
+          }
+        }
+      });
       sinon.stub(App.router, 'get', function() {
         return configurationController;
       });