You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2015/01/28 12:31:38 UTC
ambari git commit: AMBARI-9358 Adapt UI to changes in Stacks API
response. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 5e930e44c -> c0ed966ff
AMBARI-9358 Adapt UI to changes in Stacks API response. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c0ed966f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c0ed966f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c0ed966f
Branch: refs/heads/trunk
Commit: c0ed966ff78f1d24dba6820463b9d728e02af615
Parents: 5e930e4
Author: Andrii Tkach <at...@hortonworks.com>
Authored: Tue Jan 27 19:32:22 2015 +0200
Committer: Andrii Tkach <at...@hortonworks.com>
Committed: Wed Jan 28 13:31:30 2015 +0200
----------------------------------------------------------------------
.../controllers/stackVersions/StackVersionsCreateCtrl.js | 3 +--
.../scripts/controllers/stackVersions/StackVersionsEditCtrl.js | 4 +---
.../app/controllers/main/admin/stack_and_upgrade_controller.js | 6 ++----
ambari-web/app/mappers/repository_version_mapper.js | 6 ++----
ambari-web/app/mappers/stack_mapper.js | 4 +---
ambari-web/app/mappers/stack_service_mapper.js | 4 +---
6 files changed, 8 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c0ed966f/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
index f31f4fc..97a7696 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
@@ -75,8 +75,7 @@ angular.module('ambariAdminConsole')
$scope.afterStackVersionChange = function () {
Stack.getSupportedOSList($scope.upgradeStack.selected.stack_name, $scope.upgradeStack.selected.stack_version)
.then(function (data) {
- //TODO map data.operating_systems after API is fixed
- var operatingSystems = data.operating_systems || data.operatingSystems;
+ var operatingSystems = data.operating_systems;
$scope.osList = operatingSystems.map(function (os) {
os.selected = false;
os.repositories.forEach(function(repo) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/c0ed966f/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
index cd1ceb0..0d0a363 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
@@ -76,9 +76,7 @@ angular.module('ambariAdminConsole')
angular.forEach($scope.osList, function (os) {
existingOSHash[os.OperatingSystems.os_type] = os;
});
- //TODO map data.operating_systems after API is fixed
- var operatingSystems = data.operating_systems || data.operatingSystems;
- var osList = operatingSystems.map(function (os) {
+ var osList = data.operating_systems.map(function (os) {
return existingOSHash[os.OperatingSystems.os_type] || {
OperatingSystems: {
os_type : os.OperatingSystems.os_type
http://git-wip-us.apache.org/repos/asf/ambari/blob/c0ed966f/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index f919af8..934daa2 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -79,9 +79,8 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
* @type {String}
*/
realRepoUrl: function () {
- //TODO correct url after api will be fixed
return App.get('apiPrefix') + App.get('stackVersionURL') +
- '/repository_versions?fields=*,operating_systems/*,operating_systems/repositories/*,operatingSystems/*,operatingSystems/repositories/*';
+ '/repository_versions?fields=*,operating_systems/*,operating_systems/repositories/*';
}.property('App.stackVersionURL'),
/**
@@ -95,9 +94,8 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
* @type {String}
*/
realStackUrl: function () {
- //TODO correct url after api will be fixed
return App.apiPrefix + '/clusters/' + App.get('clusterName') +
- '/stack_versions?fields=*,repository_versions/*,repository_versions/operating_systems/repositories/*,repository_versions/operatingSystems/repositories/*';
+ '/stack_versions?fields=*,repository_versions/*,repository_versions/operating_systems/repositories/*';
}.property('App.clusterName'),
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/c0ed966f/ambari-web/app/mappers/repository_version_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/repository_version_mapper.js b/ambari-web/app/mappers/repository_version_mapper.js
index e6e019d..6cfb317 100644
--- a/ambari-web/app/mappers/repository_version_mapper.js
+++ b/ambari-web/app/mappers/repository_version_mapper.js
@@ -78,10 +78,8 @@ App.repoVersionMapper = App.QuickDataMapper.create({
if (loadAll || (item.RepositoryVersions && !App.StackVersion.find().someProperty('repositoryVersion.id', item.RepositoryVersions.id))) {
var repo = item;
var osArray = [];
- //TODO iterate over item.operating_systems after API is fixed
- var operatingSystems = Em.get(item, 'operating_systems') || Em.get(item, 'operatingSystems');
- if (operatingSystems) {
- operatingSystems.forEach(function (os) {
+ if (item.operating_systems) {
+ item.operating_systems.forEach(function (os) {
os.id = item.RepositoryVersions.repository_version + os.OperatingSystems.os_type;
os.repository_version_id = repo.id;
var repoArray = [];
http://git-wip-us.apache.org/repos/asf/ambari/blob/c0ed966f/ambari-web/app/mappers/stack_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/stack_mapper.js b/ambari-web/app/mappers/stack_mapper.js
index e446d91..df6f8f4 100644
--- a/ambari-web/app/mappers/stack_mapper.js
+++ b/ambari-web/app/mappers/stack_mapper.js
@@ -80,9 +80,7 @@ App.stackMapper = App.QuickDataMapper.create({
stack.id = stack.stack_name + "-" + stack.stack_version;
- //TODO iterate over item.operating_systems after API is fixed
- var opSystems = Em.get(item, 'operating_systems') || Em.get(item, 'operatingSystems');
- opSystems.forEach(function(ops) {
+ item.operating_systems.forEach(function(ops) {
var operatingSystems = ops.OperatingSystems;
var repositoriesArray = [];
http://git-wip-us.apache.org/repos/asf/ambari/blob/c0ed966f/ambari-web/app/mappers/stack_service_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/stack_service_mapper.js b/ambari-web/app/mappers/stack_service_mapper.js
index 5954a4e..a27d819 100644
--- a/ambari-web/app/mappers/stack_service_mapper.js
+++ b/ambari-web/app/mappers/stack_service_mapper.js
@@ -81,9 +81,7 @@ App.stackServiceMapper = App.QuickDataMapper.create({
json.items.forEach(function (item) {
var stackService = item.StackServices;
var serviceComponents = [];
- //TODO iterate over item.components after API is fixed
- var components = Em.get(item, 'components') || Em.get(item, 'serviceComponents');
- components.forEach(function (serviceComponent) {
+ item.components.forEach(function (serviceComponent) {
var dependencies = serviceComponent.dependencies.map(function (dependecy) {
return { Dependencies: App.keysUnderscoreToCamelCase(App.permit(dependecy.Dependencies, ['component_name', 'scope'])) };
});