Repository: ambari Updated Branches: refs/heads/trunk 1f321e356 -> ea49b33c1
AMBARI-21978. UI need to add new fields to Repositories (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ea49b33c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ea49b33c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ea49b33c Branch: refs/heads/trunk Commit: ea49b33c143fb0e00f16594fdb7dbf396f374981 Parents: 1f321e3 Author: Alex Antonenko <aantone...@hortonworks.com> Authored: Tue Sep 19 12:51:38 2017 +0300 Committer: Alex Antonenko <aantone...@hortonworks.com> Committed: Tue Sep 19 12:51:38 2017 +0300 ---------------------------------------------------------------------- ambari-web/app/controllers/installer.js | 37 +++++++++++++++++++------- ambari-web/app/mappers/stack_mapper.js | 5 ++-- ambari-web/app/models/operating_system.js | 3 +-- ambari-web/app/models/repository.js | 4 ++- 4 files changed, 34 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ea49b33c/ambari-web/app/controllers/installer.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js index ea07b92..4c12a5b 100644 --- a/ambari-web/app/controllers/installer.js +++ b/ambari-web/app/controllers/installer.js @@ -703,18 +703,33 @@ App.InstallerController = App.WizardController.extend(App.Persist, { if(!existedMap[supportedOS.OperatingSystems.os_type]) { supportedOS.isSelected = false; existedOS.push(supportedOS); - } else if (stack_default) { // only overwrite if it is stack default, otherwise use url from /version_definition - existedMap[supportedOS.OperatingSystems.os_type].repositories.forEach(function (repo) { - supportedOS.repositories.forEach(function (supportedRepo) { - if (supportedRepo.Repositories.repo_id == repo.Repositories.repo_id) { - repo.Repositories.base_url = supportedRepo.Repositories.base_url; - repo.Repositories.default_base_url = supportedRepo.Repositories.default_base_url; - repo.Repositories.latest_base_url = supportedRepo.Repositories.latest_base_url; - } + } else { + if (stack_default) { // only overwrite if it is stack default, otherwise use url from /version_definition + existedMap[supportedOS.OperatingSystems.os_type].repositories.forEach(function (repo) { + supportedOS.repositories.forEach(function (supportedRepo) { + if (supportedRepo.Repositories.repo_id == repo.Repositories.repo_id) { + repo.Repositories.base_url = supportedRepo.Repositories.base_url; + repo.Repositories.default_base_url = supportedRepo.Repositories.default_base_url; + repo.Repositories.latest_base_url = supportedRepo.Repositories.latest_base_url; + repo.Repositories.components = supportedRepo.Repositories.components; + repo.Repositories.distribution = supportedRepo.Repositories.distribution; + } + }); }); - }); + } + else{ + existedMap[supportedOS.OperatingSystems.os_type].repositories.forEach(function (repo) { + supportedOS.repositories.forEach(function (supportedRepo) { + if (supportedRepo.Repositories.repo_id == repo.Repositories.repo_id) { + repo.Repositories.components = supportedRepo.Repositories.components; + repo.Repositories.distribution = supportedRepo.Repositories.distribution; + } + }); + }); + } } }); + App.stackMapper.map(data.versionDefinition); if (!this.decrementProperty('loadStacksRequestsCounter')) { @@ -796,7 +811,9 @@ App.InstallerController = App.WizardController.extend(App.Persist, { "Repositories": { "base_url": repository.get('baseUrl'), "repo_id": repository.get('repoId'), - "repo_name": repository.get('repoName') + "repo_name": repository.get('repoName'), + "components": repository.get('components'), + "distribution": repository.get('distribution') } }); }); http://git-wip-us.apache.org/repos/asf/ambari/blob/ea49b33c/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 88ffc73..07fb137 100644 --- a/ambari-web/app/mappers/stack_mapper.js +++ b/ambari-web/app/mappers/stack_mapper.js @@ -85,7 +85,9 @@ App.stackMapper = App.QuickDataMapper.create({ repo_name: 'repo_name', stack_name: 'stack_name', stack_version: 'stack_version', - operating_system_id: 'os_id' + operating_system_id: 'os_id', + components: 'components', + distribution: 'distribution' }, map: function(json) { @@ -141,7 +143,6 @@ App.stackMapper = App.QuickDataMapper.create({ stack.use_redhat_satellite = item.operating_systems[0].OperatingSystems.ambari_managed_repositories === false; stack.stack_services = servicesArray; stack.operating_systems = operatingSystemsArray; - App.store.safeLoadMany(modelRepo, resultRepo); App.store.safeLoadMany(modelOS, resultOS); App.store.safeLoadMany(modelServices, resultServices); http://git-wip-us.apache.org/repos/asf/ambari/blob/ea49b33c/ambari-web/app/models/operating_system.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/operating_system.js b/ambari-web/app/models/operating_system.js index 82cc91c..dd8dd02 100644 --- a/ambari-web/app/models/operating_system.js +++ b/ambari-web/app/models/operating_system.js @@ -28,10 +28,9 @@ App.OperatingSystem = DS.Model.extend({ stack: DS.belongsTo('App.Stack'), isSelected: DS.attr('boolean', {defaultValue: true}), isDeselected: Em.computed.not('isSelected'), - isNotFilled: Em.computed.someBy('repositories', 'isEmpty', true), isEmpty: Em.computed.everyBy('repositories', 'isEmpty', true) }); -App.OperatingSystem.FIXTURES = []; \ No newline at end of file +App.OperatingSystem.FIXTURES = []; http://git-wip-us.apache.org/repos/asf/ambari/blob/ea49b33c/ambari-web/app/models/repository.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/repository.js b/ambari-web/app/models/repository.js index aeb3ec6..c50750f 100644 --- a/ambari-web/app/models/repository.js +++ b/ambari-web/app/models/repository.js @@ -32,6 +32,8 @@ App.Repository = DS.Model.extend({ stackName: DS.attr('string'), stackVersion: DS.attr('string'), operatingSystem: DS.belongsTo('App.OperatingSystem'), + components: DS.attr('string'), + distribution: DS.attr('string'), validation: DS.attr('string', {defaultValue: ''}), validationClassName: Em.computed.getByKey('validationClassNameMap', 'validation', ''), @@ -78,4 +80,4 @@ App.Repository = DS.Model.extend({ }); -App.Repository.FIXTURES = []; \ No newline at end of file +App.Repository.FIXTURES = [];
