Repository: ambari Updated Branches: refs/heads/branch-2.5 96518477e -> 86b9a6cea
AMBARI-19190 Remove UI logic to set or expect hive_server_interactive_host. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/769611de Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/769611de Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/769611de Branch: refs/heads/branch-2.5 Commit: 769611debe73b9adeadd61155220c506d519cdf6 Parents: 9651847 Author: Andrii Tkach <atk...@apache.org> Authored: Tue Dec 13 20:42:28 2016 +0200 Committer: Andrii Tkach <atk...@apache.org> Committed: Wed Dec 14 12:52:15 2016 +0200 ---------------------------------------------------------------------- .../app/controllers/main/service/info/configs.js | 15 --------------- .../wizard/step7/assign_master_controller.js | 11 ----------- ambari-web/app/models/configs/theme/config_action.js | 6 +----- .../wizard/step7/assign_master_controller_test.js | 9 --------- 4 files changed, 1 insertion(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/769611de/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 130b1b5..e718835 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -607,21 +607,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.AddSecurityConfi serviceConfig.get('configs').push(App.ServiceConfigProperty.create(hProperty)); } }, this); - - App.ConfigAction.find().forEach(function(item){ - var hostComponentConfig = item.get('hostComponentConfig'); - var config = serviceConfig.get('configs').filterProperty('filename', hostComponentConfig.fileName).findProperty('name', hostComponentConfig.configName); - if (config){ - var componentHostName = App.HostComponent.find().findProperty('componentName', item.get('componentName')) ; - if (componentHostName) { - var setConfigValue = !config.get('value'); - if (setConfigValue) { - config.set('value', componentHostName.get('hostName')); - config.set('recommendedValue', componentHostName.get('hostName')); - } - } - } - }, this); }, /** http://git-wip-us.apache.org/repos/asf/ambari/blob/769611de/ambari-web/app/controllers/wizard/step7/assign_master_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js index 399000e..326f571 100644 --- a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js +++ b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js @@ -398,19 +398,8 @@ App.AssignMasterOnStep7Controller = Em.Controller.extend(App.BlueprintMixin, App self.clearComponentsToBeDeleted(configActionComponent.componentName); } - var hostComponentConfig = context.get('config.configAction.hostComponentConfig'); - var serviceConfigs = context.get('controller.stepConfigs').findProperty('serviceName', context.get('config.serviceName')).get('configs'); - var config = serviceConfigs.filterProperty('filename', hostComponentConfig.fileName).findProperty('name', hostComponentConfig.configName); - var oldValue = config.get('value'); - config.set('value', componentHostName); - config.set('recommendedValue', componentHostName); configActionComponent.hostName = componentHostName; self.get('configWidgetContext.config').set('configActionComponent', configActionComponent); - context.get('controller').loadConfigRecommendations([{ - "type": App.config.getConfigTagFromFileName(config.get('filename')), - "name": config.get('name'), - "old_value": oldValue - }]) }); }, http://git-wip-us.apache.org/repos/asf/ambari/blob/769611de/ambari-web/app/models/configs/theme/config_action.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/configs/theme/config_action.js b/ambari-web/app/models/configs/theme/config_action.js index 70c1e99..9105e1a 100644 --- a/ambari-web/app/models/configs/theme/config_action.js +++ b/ambari-web/app/models/configs/theme/config_action.js @@ -59,10 +59,6 @@ App.ConfigAction.FIXTURES = [ file_name: "hive-interactive-env.xml", if:'${hive-interactive-env/enable_hive_interactive}', then:'add', - else: 'delete', - host_component_config: { - configName: "hive_server_interactive_host", - fileName: "hive-interactive-env.xml" - } + else: 'delete' } ]; http://git-wip-us.apache.org/repos/asf/ambari/blob/769611de/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js b/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js index 053b900..0810c0d 100644 --- a/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js +++ b/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js @@ -405,14 +405,5 @@ describe('App.AssignMasterOnStep7Controller', function () { hostName: 'host1' }); }); - - it("config should be set", function() { - expect(config.get('value')).to.be.equal('host1'); - expect(config.get('recommendedValue')).to.be.equal('host1'); - }); - - it("config should be set (loadConfigRecommendations is called once)", function() { - expect(mock.loadConfigRecommendations.calledOnce).to.be.true; - }); }); }); \ No newline at end of file
