You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2016/03/03 22:49:31 UTC
ambari git commit: AMBARI-15274. Stack and Versions: integrate newly
registered versions to display in new look.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk f1c2b3da0 -> 8d4243c61
AMBARI-15274. Stack and Versions: integrate newly registered versions to display in new look.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8d4243c6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8d4243c6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8d4243c6
Branch: refs/heads/trunk
Commit: 8d4243c61b9dc1c5f29c2950d59b9ccdba4d6663
Parents: f1c2b3d
Author: Xi Wang <xi...@apache.org>
Authored: Wed Mar 2 16:25:36 2016 -0800
Committer: Xi Wang <xi...@apache.org>
Committed: Thu Mar 3 13:45:35 2016 -0800
----------------------------------------------------------------------
.../stackVersions/StackVersionsCreateCtrl.js | 20 ----
.../main/admin/stack_and_upgrade_controller.js | 2 +-
.../app/mappers/repository_version_mapper.js | 117 +------------------
ambari-web/app/styles/stack_versions.less | 12 +-
.../main/admin/stack_upgrade/versions.hbs | 1 -
.../admin/stack_and_upgrade_controller_test.js | 2 +-
6 files changed, 10 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8d4243c6/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 cf0ca2a..99464cf 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
@@ -238,26 +238,6 @@ angular.module('ambariAdminConsole')
});
};
-//
-// $scope.save = function () {
-// return Stack.validateBaseUrls($scope.skipValidation, $scope.osList, $scope.upgradeStack).then(function (invalidUrls) {
-// if (invalidUrls.length === 0) {
-// Stack.addRepo($scope.upgradeStack, $scope.actualVersion, $scope.osList)
-// .success(function () {
-// var versionName = $scope.upgradeStack.selected.stack_version + '.' + $scope.repoSubversion;
-// var stackName = $scope.upgradeStack.selected.stack_name;
-// Alert.success($t('versions.alerts.versionCreated', {stackName: stackName, versionName: versionName}));
-// $location.path('/stackVersions');
-// })
-// .error(function (data) {
-// Alert.error($t('versions.alerts.versionCreationError'), data.message);
-// });
-// } else {
-// Stack.highlightInvalidUrls(invalidUrls);
-// }
-// });
-// };
-
$scope.cancel = function () {
$scope.editVersionDisabled = true;
$location.path('/stackVersions');
http://git-wip-us.apache.org/repos/asf/ambari/blob/8d4243c6/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 06f8ae1..847544f 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
@@ -205,7 +205,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
*/
realRepoUrl: function () {
return App.get('apiPrefix') + App.get('stackVersionURL') +
- '/compatible_repository_versions?fields=*,operating_systems/*,operating_systems/repositories/*';
+ '/repository_versions?fields=*,RepositoryVersions/*,operating_systems/*,operating_systems/repositories/*';
}.property('App.stackVersionURL'),
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/8d4243c6/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 be85cd2..f096976 100644
--- a/ambari-web/app/mappers/repository_version_mapper.js
+++ b/ambari-web/app/mappers/repository_version_mapper.js
@@ -24,7 +24,7 @@ App.repoVersionMapper = App.QuickDataMapper.create({
modelServices: App.ServiceSimple,
modelRepoVersion: function (isCurrentStackOnly) {
- var repoVersionsKey = isCurrentStackOnly ? 'RepositoryVersions' : 'CompatibleRepositoryVersions';
+ var repoVersionsKey = 'RepositoryVersions';
return {
id: repoVersionsKey + '.id',
stack_version_id: repoVersionsKey + '.stackVersionId',
@@ -91,123 +91,10 @@ App.repoVersionMapper = App.QuickDataMapper.create({
var resultOS = [];
var resultRepo = [];
var resultService = [];
-
- var repoVersionsKey = isCurrentStackOnly ? 'RepositoryVersions' : 'CompatibleRepositoryVersions';
+ var repoVersionsKey = 'RepositoryVersions';
if (json && json.items) {
json.items.forEach(function (item) {
- ////////////// to test//////////////
- item[repoVersionsKey].release = {
- "stack_id": "HDP-2.2",
- "version": "2.2.4.1",
- "build": "885",
- "compatible_with": "", /* regex */
- "release_notes": "http://someurl"
- };
- if (item[repoVersionsKey].id % 2 ) {
- item[repoVersionsKey].type = "PATCH";
- item[repoVersionsKey].services = [
- {
- "name": "HDFS",
- "display_name": "HDFS",
- "versions": [
- {
- "version": "2.1.1",
- "version_id": "10",
- "components": [ "NAMENODE"]
- }
- ]
- },
- {
- "name": "YARN",
- "display_name": "YARN",
- "versions": [
- {
- "version": "2.7.1.2.3"
- }
- ]
- },
- {
- "name": "ZOOKEEPER",
- "display_name": "ZooKeeper",
- "versions": [
- {
- "version": "3.4.6.2.3"
- }
- ]
- },
- {
- "name": "wrong",
- "display_name": "MapReduce2",
- "versions": [
- {
- "version": "2.7.1.2.3"
- }
- ]
- },
- {
- "name": "AMBARI_METRICS",
- "display_name": "Ambari Metrics",
- "versions": [
- {
- "version": "0.1.0"
- }
- ]
- }
- ];
- } else {
- item[repoVersionsKey].services = [
- {
- "name": "HDFS",
- "display_name": "HDFS",
- "versions": [
- {
- "version": "2.1.1",
- "version_id": "10",
- "components": [ "NAMENODE"]
- }
- ]
- },
- {
- "name": "wrong",
- "display_name": "YARN",
- "versions": [
- {
- "version": "2.7.1.2.3"
- }
- ]
- },
- {
- "name": "wrong",
- "display_name": "ZooKeeper",
- "versions": [
- {
- "version": "3.4.6.2.3"
- }
- ]
- },
- {
- "name": "MAPREDUCE2",
- "display_name": "MapReduce2",
- "versions": [
- {
- "version": "2.7.1.2.3"
- }
- ]
- },
- {
- "name": "AMBARI_METRICS",
- "display_name": "Ambari Metrics",
- "versions": [
- {
- "version": "0.1.0"
- }
- ]
- }
- ];
- }
- //////////////////////////////
-
if (loadAll || (item[repoVersionsKey] && !App.StackVersion.find().someProperty('repositoryVersion.id', item[repoVersionsKey].id))) {
var repo = item;
var osArray = [];
http://git-wip-us.apache.org/repos/asf/ambari/blob/8d4243c6/ambari-web/app/styles/stack_versions.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/stack_versions.less b/ambari-web/app/styles/stack_versions.less
index 646e441..458a32e 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -157,11 +157,11 @@
}
}
.left-menu-table {
- padding: 10px 1px;
- margin-top: 87px;
+ padding: 10px 0px;
+ margin-top: 124px;
td.service-display-name {
- border: 2px solid #e4e4e4;
- border-left: none;
+ border-top: 2px solid #e4e4e4;
+ border-bottom: 2px solid #e4e4e4;
}
}
div.current-version-box {
@@ -327,8 +327,8 @@
height: 2px;
background: #e4e4e4;
position: relative;
- top: -25px;
- margin: 0px -15px 0px -15px;
+ top: -45px;
+ margin: 0px 0px 0px -15px;
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/8d4243c6/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
index 6e2b057..a9fc440 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
@@ -45,7 +45,6 @@
<div class="span2 left-menu-table">
<table class="table">
<thead>
- <tr><th>{{t common.default}}</th></tr>
</thead>
<tbody>
{{#each service in view.services}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/8d4243c6/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
index 1315477..385a31f 100644
--- a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
@@ -49,7 +49,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
});
it("should be valid", function() {
controller.propertyDidChange('realRepoUrl');
- expect(controller.get('realRepoUrl')).to.equal('apiPrefixstackVersionURL/compatible_repository_versions?fields=*,operating_systems/*,operating_systems/repositories/*');
+ expect(controller.get('realRepoUrl')).to.equal('apiPrefixstackVersionURL/repository_versions?fields=*,RepositoryVersions/*,operating_systems/*,operating_systems/repositories/*');
});
});