AMBARI-7030. Config History: integrate the current label for each config group.(xiwang)

ambari-web/app/controllers/main/dashboard/config_history_controller.js

@@ -31,7 +31,7 @@ App.MainConfigHistoryController = Em.ArrayController.extend(App.TableServerMixin
   filteredCount: 0,
   mockUrl: '/data/configurations/service_versions.json',
   realUrl: function () {
-    return App.apiPrefix + '/clusters/' + App.get('clusterName') + '/configurations/service_config_versions?<parameters>fields=service_config_version,user,group_id,group_name,createtime,service_name,service_config_version_note&minimal_response=true';
+    return App.apiPrefix + '/clusters/' + App.get('clusterName') + '/configurations/service_config_versions?<parameters>fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,service_config_version_note&minimal_response=true';
   }.property('App.clusterName'),
 
   /**
@@ -154,13 +154,9 @@ App.MainConfigHistoryController = Em.ArrayController.extend(App.TableServerMixin
    */
   load: function () {
     var dfd = $.Deferred();
-    var self = this;
-
     this.updateTotalCounter();
-    this.loadCurrentVersions().complete(function () {
-      self.loadConfigVersionsToModel().done(function () {
-        dfd.resolve();
-      });
+    this.loadConfigVersionsToModel().done(function () {
+      dfd.resolve();
     });
     return dfd.promise();
   },
@@ -181,24 +177,6 @@ App.MainConfigHistoryController = Em.ArrayController.extend(App.TableServerMixin
     return dfd.promise();
   },
 
-  loadCurrentVersions: function () {
-    return App.ajax.send({
-      name: 'service.serviceConfigVersions.get.current',
-      sender: this,
-      data: {},
-      success: 'loadCurrentVersionsSuccess'
-    })
-  },
-
-  loadCurrentVersionsSuccess: function (data, opt, params) {
-    var currentConfigVersions = {};
-
-    for (var service in data.Clusters.desired_service_config_versions) {
-      currentConfigVersions[service + '_' + data.Clusters.desired_service_config_versions[service][0].service_config_version] = true;
-    }
-    App.cache['currentConfigVersions'] = currentConfigVersions;
-  },
-
   updateTotalCounter: function () {
     return App.ajax.send({
       name: 'service.serviceConfigVersions.get.total',

ambari-web/app/controllers/main/service/info/configs.js

@@ -288,21 +288,24 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
 
   /**
    * load current service config version number
-   * set currentVersion
+   * set currentVersion (current version for default group)
    * @param data
    * @param opt
    * @param params
    */
   loadCurrentVersionsSuccess: function (data, opt, params) {
-    var currentConfigVersions = {};
     var self = this;
     for (var service in data.Clusters.desired_service_config_versions) {
-      currentConfigVersions[service + '_' + data.Clusters.desired_service_config_versions[service][0].service_config_version] = true;
       if (self.get('content.serviceName') == service) {
-        self.set('currentVersion', data.Clusters.desired_service_config_versions[service][0].service_config_version);
+        //current version of default config group
+        data.Clusters.desired_service_config_versions[service].forEach (function(version) {
+          if (version.group_id == null) {
+            self.set('currentVersion', version.service_config_version);
+          }
+        });
       }
     }
-    App.cache['currentConfigVersions'] = currentConfigVersions;
+
   },
 
   /**
@@ -324,7 +327,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
       success: 'loadSelectedVersionSuccess'
     }).complete(function () {
         self.loadServiceTagsAndGroups();
-      });
+    });
   },
 
   /**

ambari-web/app/mappers/service_config_version_mapper.js

@@ -35,12 +35,11 @@ App.serviceConfigVersionsMapper = App.QuickDataMapper.create({
   map: function (json) {
     var result = [];
     var itemIds = {};
-    var currentConfigVersions = App.cache['currentConfigVersions'];
+
     if (json && json.items) {
       json.items.forEach(function (item, index) {
         var parsedItem = this.parseIt(item, this.get('config'));
         parsedItem.id = parsedItem.service_name + '_' + parsedItem.version;
-        parsedItem.is_current = !!currentConfigVersions[parsedItem.id];
         parsedItem.is_requested = true;
         itemIds[parsedItem.id] = true;
         parsedItem.index = index;

ambari-web/app/utils/ajax/ajax.js

@@ -1894,7 +1894,7 @@ var urls = {
     }
   },
   'service.serviceConfigVersions.get': {
-    real: '/clusters/{clusterName}/configurations/service_config_versions?service_name={serviceName}&fields=service_config_version,user,group_id,group_name,createtime,service_name,service_config_version_note&minimal_response=true',
+    real: '/clusters/{clusterName}/configurations/service_config_versions?service_name={serviceName}&fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,service_config_version_note&minimal_response=true',
     mock: '/data/configurations/service_versions.json'
   },
   'service.serviceConfigVersions.get.current': {

ambari-web/app/views/common/configs/config_history_flow.js

@@ -141,8 +141,15 @@ App.ConfigHistoryFlowView = Em.View.extend({
     var startIndex = 0;
 
     serviceVersions.setEach('isDisplayed', false);
-    if (serviceVersions.findProperty('isCurrent')) {
-      serviceVersions.findProperty('isCurrent').set('isDisplayed', true);
+    //set the correct version to display
+    var allCurrent = serviceVersions.filterProperty('isCurrent');
+    if (this.get('isDefaultConfigGroupSelected')) {
+      // display current in default group
+      allCurrent.findProperty('groupName', null).set('isDisplayed', true);
+    }else {
+      // display current in selected group
+      var current = allCurrent.findProperty('groupName', this.get('selectedConfigGroupName'));
+      current ? current.set('isDisplayed', true) : allCurrent.findProperty('groupName', null).set('isDisplayed', true);
     }
 
     if (serviceVersions.length > 0) {
@@ -152,7 +159,7 @@ App.ConfigHistoryFlowView = Em.View.extend({
       this.set('startIndex', startIndex);
       this.adjustFlowView();
     }
-    this.keepInfoBarAtTop()
+    this.keepInfoBarAtTop();
   },
 
   /**