AMBARI-6448. User added properties are not shown in Add Service wizard and removed later by the wizard. (jaimin)

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

@@ -775,7 +775,7 @@ App.WizardStep7Controller = Em.Controller.extend({
    */
   getConfigTagsSuccess: function (data) {
     var installedServiceSites = [];
-    App.StackService.find().filterProperty('isSelected').filter(function (service) {
+    App.StackService.find().filterProperty('isInstalled').forEach(function (service) {
       installedServiceSites = installedServiceSites.concat(service.get('configTypes'));
     }, this);
     installedServiceSites = installedServiceSites.uniq();

ambari-web/app/utils/config.js

@@ -1012,9 +1012,9 @@ App.config = Em.Object.create({
   getServiceNameByConfigType: function (type) {
     var preDefinedServiceConfigs = this.get('preDefinedServiceConfigs');
     var service = preDefinedServiceConfigs.find(function (serviceConfig) {
-      return (serviceConfig.sites.contains(type));
+      return (serviceConfig.get('configTypes').contains(type));
     }, this);
-    return service && service.serviceName;
+    return service && service.get('serviceName');
   },
 
   /**