AMBARI-7026. Config History: FE change to integrate new name 'service_config_version' in api.(XIWANG)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b267bd82 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b267bd82 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b267bd82 Branch: refs/heads/branch-alerts-dev Commit: b267bd82817ede48b73c98274f0c4d19ee2a90a4 Parents: e20f15b Author: Xi Wang <xiw...@apache.org> Authored: Tue Aug 26 15:32:02 2014 -0700 Committer: Xi Wang <xiw...@apache.org> Committed: Wed Aug 27 11:10:16 2014 -0700 ---------------------------------------------------------------------- .../controllers/main/dashboard/config_history_controller.js | 6 +++--- ambari-web/app/controllers/main/service/info/configs.js | 6 +++--- ambari-web/app/mappers/service_config_version_mapper.js | 2 +- ambari-web/app/utils/ajax/ajax.js | 8 ++++---- ambari-web/app/views/common/configs/config_history_flow.js | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b267bd82/ambari-web/app/controllers/main/dashboard/config_history_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/dashboard/config_history_controller.js b/ambari-web/app/controllers/main/dashboard/config_history_controller.js index 002504a..d8a4722 100644 --- a/ambari-web/app/controllers/main/dashboard/config_history_controller.js +++ b/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/serviceconfigversions?<parameters>fields=serviceconfigversion,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,createtime,service_name,service_config_version_note&minimal_response=true'; }.property('App.clusterName'), /** @@ -193,8 +193,8 @@ App.MainConfigHistoryController = Em.ArrayController.extend(App.TableServerMixin loadCurrentVersionsSuccess: function (data, opt, params) { var currentConfigVersions = {}; - for (var service in data.Clusters.desired_serviceconfigversions) { - currentConfigVersions[service + '_' + data.Clusters.desired_serviceconfigversions[service].serviceconfigversion] = true; + 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; }, http://git-wip-us.apache.org/repos/asf/ambari/blob/b267bd82/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 8eee9cb..ab7afeb 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -296,10 +296,10 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM loadCurrentVersionsSuccess: function (data, opt, params) { var currentConfigVersions = {}; var self = this; - for (var service in data.Clusters.desired_serviceconfigversions) { - currentConfigVersions[service + '_' + data.Clusters.desired_serviceconfigversions[service].serviceconfigversion] = true; + 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_serviceconfigversions[service].serviceconfigversion); + self.set('currentVersion', data.Clusters.desired_service_config_versions[service][0].service_config_version); } } App.cache['currentConfigVersions'] = currentConfigVersions; http://git-wip-us.apache.org/repos/asf/ambari/blob/b267bd82/ambari-web/app/mappers/service_config_version_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/service_config_version_mapper.js b/ambari-web/app/mappers/service_config_version_mapper.js index 25d5aba..f3cca6c 100644 --- a/ambari-web/app/mappers/service_config_version_mapper.js +++ b/ambari-web/app/mappers/service_config_version_mapper.js @@ -23,7 +23,7 @@ App.serviceConfigVersionsMapper = App.QuickDataMapper.create({ config: { service_name: 'service_name', service_id: 'service_name', - version: "serviceconfigversion", + version: "service_config_version", create_time: 'createtime', group_id: 'group_id', group_name: 'group_name', http://git-wip-us.apache.org/repos/asf/ambari/blob/b267bd82/ambari-web/app/utils/ajax/ajax.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js index 3140595..7d0c23c 100644 --- a/ambari-web/app/utils/ajax/ajax.js +++ b/ambari-web/app/utils/ajax/ajax.js @@ -1894,19 +1894,19 @@ var urls = { } }, 'service.serviceConfigVersions.get': { - real: '/clusters/{clusterName}/configurations/serviceconfigversions?service_name={serviceName}&fields=serviceconfigversion,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,createtime,service_name,service_config_version_note&minimal_response=true', mock: '/data/configurations/service_versions.json' }, 'service.serviceConfigVersions.get.current': { - real: '/clusters/{clusterName}?fields=Clusters/desired_serviceconfigversions&minimal_response=true', + real: '/clusters/{clusterName}?fields=Clusters/desired_service_config_versions&minimal_response=true', mock: '' }, 'service.serviceConfigVersions.get.total': { - real: '/clusters/{clusterName}/configurations/serviceconfigversions?page_size=1&minimal_response=true', + real: '/clusters/{clusterName}/configurations/service_config_versions?page_size=1&minimal_response=true', mock: '' }, 'service.serviceConfigVersion.get': { - real: '/clusters/{clusterName}/configurations/serviceconfigversions?service_name={serviceName}&serviceconfigversion={serviceConfigVersion}', + real: '/clusters/{clusterName}/configurations/service_config_versions?service_name={serviceName}&service_config_version={serviceConfigVersion}', mock: '/data/configurations/service_version.json' }, 'service.serviceConfigVersion.revert': { http://git-wip-us.apache.org/repos/asf/ambari/blob/b267bd82/ambari-web/app/views/common/configs/config_history_flow.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/config_history_flow.js b/ambari-web/app/views/common/configs/config_history_flow.js index 0c0e686..280c674 100644 --- a/ambari-web/app/views/common/configs/config_history_flow.js +++ b/ambari-web/app/views/common/configs/config_history_flow.js @@ -285,8 +285,8 @@ App.ConfigHistoryFlowView = Em.View.extend({ data: { data: { "Clusters": { - "desired_serviceconfigversions": { - "serviceconfigversion": serviceConfigVersion.get('version'), + "desired_service_config_versions": { + "service_config_version": serviceConfigVersion.get('version'), "service_name": serviceConfigVersion.get('serviceName'), "service_config_version_note": serviceConfigVersion.get('serviceConfigNote') }