You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/01/23 19:03:10 UTC
[2/2] git commit: AMBARI-4396. Misc code cleanup. (onechiporenko)
AMBARI-4396. Misc code cleanup. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5ff51712
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5ff51712
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5ff51712
Branch: refs/heads/trunk
Commit: 5ff51712a8ef881db7970f0673578d8099df9350
Parents: 33092de
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Thu Jan 23 18:16:21 2014 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Thu Jan 23 20:02:58 2014 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/application.js | 3 +-
.../global/background_operations_controller.js | 1 -
ambari-web/app/controllers/main.js | 2 +-
.../app/controllers/main/admin/advanced.js | 2 +-
.../controllers/main/admin/authentication.js | 2 +-
.../app/controllers/main/admin/cluster.js | 9 +-
.../highAvailability/rollback_controller.js | 10 +--
.../admin/highAvailability/step2_controller.js | 4 +-
.../admin/highAvailability/step4_controller.js | 6 +-
.../admin/highAvailability/step6_controller.js | 2 +-
.../admin/highAvailability/step8_controller.js | 2 +-
.../security/security_progress_controller.js | 2 -
ambari-web/app/controllers/main/admin/user.js | 4 +-
.../app/controllers/main/admin/user/create.js | 2 +-
.../app/controllers/main/admin/user/edit.js | 2 +-
.../controllers/main/apps/item_controller.js | 2 +-
.../app/controllers/main/apps_controller.js | 5 +-
ambari-web/app/controllers/main/charts.js | 2 +-
.../main/host/addHost/step4_controller.js | 10 +--
.../app/controllers/main/host/add_controller.js | 1 -
ambari-web/app/controllers/main/host/details.js | 5 +-
.../main/mirroring/targetClusterController.js | 24 ++---
.../controllers/main/service/info/configs.js | 22 +++--
.../service/manage_config_groups_controller.js | 10 +--
.../main/service/reassign/step2_controller.js | 2 +-
.../main/service/reassign/step3_controller.js | 2 +-
.../main/service/reassign/step5_controller.js | 2 +-
.../main/service/reassign/step6_controller.js | 2 +-
.../wizard/slave_component_groups_controller.js | 2 +
.../wizard/stack_upgrade/step3_controller.js | 6 +-
.../app/controllers/wizard/step10_controller.js | 2 +-
.../app/controllers/wizard/step3_controller.js | 18 ++--
.../app/controllers/wizard/step5_controller.js | 4 +-
.../app/controllers/wizard/step6_controller.js | 5 +-
.../app/controllers/wizard/step7_controller.js | 18 ++--
.../app/controllers/wizard/step8_controller.js | 14 +--
.../app/controllers/wizard/step9_controller.js | 3 +-
ambari-web/app/data/HDP2/custom_configs.js | 2 +-
ambari-web/app/data/custom_configs.js | 2 +-
ambari-web/app/data/service_components.js | 2 +
ambari-web/app/data/services.js | 2 +-
ambari-web/app/data/statusCodes.js | 2 +-
ambari-web/app/mappers/cluster_mapper.js | 3 +-
ambari-web/app/mappers/runs_mapper.js | 2 +-
.../app/mappers/service_metrics_mapper.js | 3 +-
ambari-web/app/models/alert.js | 4 +-
ambari-web/app/models/app.js | 2 +-
ambari-web/app/models/authentication.js | 2 +-
ambari-web/app/models/cluster_states.js | 3 +-
ambari-web/app/models/dataset_job.js | 2 +
ambari-web/app/models/form.js | 2 +-
ambari-web/app/models/host.js | 4 +-
ambari-web/app/models/run.js | 1 +
ambari-web/app/models/service.js | 4 +-
ambari-web/app/models/service/yarn.js | 2 +-
ambari-web/app/models/service_config.js | 3 +-
ambari-web/app/router.js | 2 +-
.../app/routes/high_availability_routes.js | 2 +-
ambari-web/app/routes/installer.js | 14 ++-
.../main/mirroring/testConnectionResults.hbs | 6 +-
ambari-web/app/utils/ajax.js | 6 +-
ambari-web/app/utils/base64.js | 2 +-
ambari-web/app/utils/config.js | 28 +++---
.../yarn_defaults_provider.js | 3 +-
.../validators/service_configs_validator.js | 9 +-
ambari-web/app/utils/date.js | 4 +-
ambari-web/app/utils/db.js | 2 +-
ambari-web/app/utils/graph.js | 10 +--
ambari-web/app/utils/helper.js | 26 +++---
ambari-web/app/utils/host_progress_popup.js | 7 +-
ambari-web/app/utils/hosts.js | 1 -
ambari-web/app/utils/http_client.js | 6 +-
ambari-web/app/utils/number_utils.js | 15 ++--
ambari-web/app/utils/object_utils.js | 5 +-
ambari-web/app/utils/polling.js | 3 +-
ambari-web/app/utils/string_utils.js | 11 ++-
ambari-web/app/utils/updater.js | 6 +-
ambari-web/app/views/common/chart.js | 4 +-
ambari-web/app/views/common/chart/linear.js | 2 +-
.../app/views/common/chart/linear_time.js | 10 +--
.../app/views/common/configs/services_config.js | 2 +-
ambari-web/app/views/common/grid.js | 6 +-
ambari-web/app/views/common/metric.js | 4 +-
ambari-web/app/views/common/modal_popup.js | 1 +
.../app/views/common/rolling_restart_view.js | 4 +-
ambari-web/app/views/common/sort_view.js | 4 +-
ambari-web/app/views/common/time_range.js | 2 +-
ambari-web/app/views/experimental.js | 2 +-
ambari-web/app/views/main/admin.js | 2 +-
.../views/main/charts/heatmap/heatmap_host.js | 6 +-
ambari-web/app/views/main/dashboard.js | 3 +-
.../app/views/main/dashboard/service/hdfs.js | 3 +-
ambari-web/app/views/main/dashboard/widget.js | 9 +-
.../dashboard/widgets/node_managers_live.js | 2 +-
ambari-web/app/views/main/host/details.js | 3 +-
.../app/views/main/mirroring/jobs_view.js | 8 +-
.../views/main/service/info/metrics/yarn/qmr.js | 2 +-
.../app/views/main/service/info/summary.js | 18 +---
ambari-web/app/views/main/service/menu.js | 5 +-
.../views/main/service/reassign/step1_view.js | 2 +-
ambari-web/app/views/wizard/step1_view.js | 2 +
ambari-web/app/views/wizard/step9_view.js | 13 ++-
ambari-web/test/controllers/installer_test.js | 2 +-
.../test/controllers/main/admin/cluster_test.js | 4 +-
ambari-web/test/installer/step0_test.js | 6 +-
ambari-web/test/installer/step2_test.js | 44 +++++-----
ambari-web/test/login_test.js | 2 +-
ambari-web/test/utils/config_test.js | 4 +-
ambari-web/test/utils/validator_test.js | 92 ++++++++++----------
.../test/views/common/chart/linear_time_test.js | 10 +--
110 files changed, 317 insertions(+), 395 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/application.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/application.js b/ambari-web/app/controllers/application.js
index d825228..b0b91c6 100644
--- a/ambari-web/app/controllers/application.js
+++ b/ambari-web/app/controllers/application.js
@@ -29,8 +29,7 @@ App.ApplicationController = Em.Controller.extend({
clusterDisplayName: function () {
var name = this.get('clusterName');
- var displayName = name.length > 13 ? name.substr(0, 10) + "..." : name;
- return displayName;
+ return name.length > 13 ? name.substr(0, 10) + "..." : name;
}.property('clusterName'),
isClusterDataLoaded: function() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/global/background_operations_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/background_operations_controller.js b/ambari-web/app/controllers/global/background_operations_controller.js
index 4fec2ae..04a5339 100644
--- a/ambari-web/app/controllers/global/background_operations_controller.js
+++ b/ambari-web/app/controllers/global/background_operations_controller.js
@@ -228,7 +228,6 @@ App.BackgroundOperationsController = Em.Controller.extend({
/**
* Onclick handler for background operations number located right to logo
- * @return PopupObject For testing purposes
*/
showPopup: function(){
// load the checkbox on footer first, then show popup.
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main.js b/ambari-web/app/controllers/main.js
index 457eb8b..a928877 100644
--- a/ambari-web/app/controllers/main.js
+++ b/ambari-web/app/controllers/main.js
@@ -90,4 +90,4 @@ App.MainController = Em.Controller.extend({
);
}.observes("App.router.location.lastSetURL", "App.clusterStatus.isInstalled")
-})
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/admin/advanced.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/advanced.js b/ambari-web/app/controllers/main/admin/advanced.js
index 3fdab5b..805d967 100644
--- a/ambari-web/app/controllers/main/admin/advanced.js
+++ b/ambari-web/app/controllers/main/admin/advanced.js
@@ -51,4 +51,4 @@ App.MainAdminAdvancedController = Em.Controller.extend({
}
})
}
-})
\ No newline at end of file
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/admin/authentication.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/authentication.js b/ambari-web/app/controllers/main/admin/authentication.js
index 5826fda..336727b 100644
--- a/ambari-web/app/controllers/main/admin/authentication.js
+++ b/ambari-web/app/controllers/main/admin/authentication.js
@@ -39,4 +39,4 @@ App.MainAdminAuthenticationController = Em.Controller.extend({
}
},
content:App.Authentication.find(1)
-})
\ No newline at end of file
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/admin/cluster.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/cluster.js b/ambari-web/app/controllers/main/admin/cluster.js
index 88c4486..689de72 100644
--- a/ambari-web/app/controllers/main/admin/cluster.js
+++ b/ambari-web/app/controllers/main/admin/cluster.js
@@ -40,17 +40,14 @@ App.MainAdminClusterController = Em.Controller.extend({
updateUpgradeVersionSuccessCallback: function(data) {
var upgradeVersion = this.get('upgradeVersion') || App.defaultStackVersion;
- var currentStack = {};
- var upgradeStack = {};
var currentVersion = App.get('currentStackVersionNumber');
- var minUpgradeVersion = currentVersion;
upgradeVersion = upgradeVersion.replace(/HDP-/, '');
data.items.mapProperty('Versions.stack_version').forEach(function(version){
upgradeVersion = (stringUtils.compareVersions(upgradeVersion, version) === -1) ? version : upgradeVersion;
});
- currentStack = data.items.findProperty('Versions.stack_version', currentVersion);
- upgradeStack = data.items.findProperty('Versions.stack_version', upgradeVersion);
- minUpgradeVersion = upgradeStack.Versions.min_upgrade_version;
+ var currentStack = data.items.findProperty('Versions.stack_version', currentVersion);
+ var upgradeStack = data.items.findProperty('Versions.stack_version', upgradeVersion);
+ var minUpgradeVersion = upgradeStack.Versions.min_upgrade_version;
if(minUpgradeVersion && (stringUtils.compareVersions(minUpgradeVersion, currentVersion) === 1)){
upgradeVersion = currentVersion;
upgradeStack = currentStack;
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js
index df5e26e..0b74b46 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js
@@ -64,8 +64,6 @@ App.HighAvailabilityRollbackController = App.HighAvailabilityProgressPageControl
setCommandsAndTasks: function(tmpTasks) {
console.warn('func: setCommandsAndTasks');
var fTask = this.get('failedTask');
- var newCommands = [];
- var newTasks = [];
var index = [
'deleteSNameNode',
'startAllServices',
@@ -86,12 +84,12 @@ App.HighAvailabilityRollbackController = App.HighAvailabilityProgressPageControl
if(index > 6){
--index;
}
- newCommands = this.get('commands').splice(index);
+ var newCommands = this.get('commands').splice(index);
this.set('commands', newCommands);
- newTasks = tmpTasks.splice(index);
+ var newTasks = tmpTasks.splice(index);
for (var i = 0; i < newTasks.length; i++) {
newTasks[i].id = i;
- };
+ }
this.set('tasks', newTasks);
var hbaseTask = this.get('tasks').findProperty('command', 'restoreHBaseConfigs');
if (!App.Service.find().someProperty('serviceName', 'HBASE') && hbaseTask) {
@@ -243,7 +241,7 @@ App.HighAvailabilityRollbackController = App.HighAvailabilityProgressPageControl
},
stopStandbyNameNode: function(){
console.warn('func: stopStandbyNameNode');
- var hostName = this.get('content.masterComponentHosts').findProperty('isAddNameNode', true).hostName;;
+ var hostName = this.get('content.masterComponentHosts').findProperty('isAddNameNode', true).hostName;
this.stopComponent('NAMENODE', hostName);
},
stopNameNode: function(){
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/admin/highAvailability/step2_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/step2_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/step2_controller.js
index 6cf95b7..0db1711 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/step2_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/step2_controller.js
@@ -47,7 +47,7 @@ App.HighAvailabilityWizardStep2Controller = App.WizardStep5Controller.extend({
}else{
item.set('color','grey');
}
- })
+ });
mappingObject = Ember.Object.create({
host_name:item,
@@ -106,7 +106,7 @@ App.HighAvailabilityWizardStep2Controller = App.WizardStep5Controller.extend({
isAddNameNode: true,
zId: 1
}
- )
+ );
masterComponents.forEach(function (item) {
var componentObj = Ember.Object.create(item);
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/admin/highAvailability/step4_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/step4_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/step4_controller.js
index 12aba19..cc243a1 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/step4_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/step4_controller.js
@@ -43,7 +43,7 @@ App.HighAvailabilityWizardStep4Controller = Em.Controller.extend({
checkNnCheckPointStatus: function (data) {
var self = this;
var journalTransactionInfo = $.parseJSON(data.metrics.dfs.namenode.JournalTransactionInfo);
- var isInSafeMode = data.metrics.dfs.namenode.Safemode != "" ? true : false;
+ var isInSafeMode = (data.metrics.dfs.namenode.Safemode != "");
journalTransactionInfo = parseInt(journalTransactionInfo.LastAppliedOrWrittenTxId) - parseInt(journalTransactionInfo.MostRecentCheckpointTxId);
if(journalTransactionInfo <= 1 && isInSafeMode){
this.set("isNextEnabled", true);
@@ -61,7 +61,5 @@ App.HighAvailabilityWizardStep4Controller = Em.Controller.extend({
}
}
-
-
-})
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/admin/highAvailability/step6_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/step6_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/step6_controller.js
index 9870dbe..a44f5e0 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/step6_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/step6_controller.js
@@ -72,5 +72,5 @@ App.HighAvailabilityWizardStep6Controller = Em.Controller.extend({
}
}
-})
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/admin/highAvailability/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/step8_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/step8_controller.js
index cf49652..5220591 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/step8_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/step8_controller.js
@@ -22,5 +22,5 @@ App.HighAvailabilityWizardStep8Controller = Em.Controller.extend({
name:"highAvailabilityWizardStep8Controller"
-})
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/admin/security/security_progress_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/security/security_progress_controller.js b/ambari-web/app/controllers/main/admin/security/security_progress_controller.js
index 1e2e864..fc21161 100644
--- a/ambari-web/app/controllers/main/admin/security/security_progress_controller.js
+++ b/ambari-web/app/controllers/main/admin/security/security_progress_controller.js
@@ -243,9 +243,7 @@ App.MainAdminSecurityProgressController = Em.Controller.extend({
/**
* gets site config properties from server and sets it for every configuration
- * @param serviceConfigTags
*/
-
getAllConfigurations: function () {
var urlParams = [];
this.get('serviceConfigTags').forEach(function (_tag) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/admin/user.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/user.js b/ambari-web/app/controllers/main/admin/user.js
index f775c9a..327b9f7 100644
--- a/ambari-web/app/controllers/main/admin/user.js
+++ b/ambari-web/app/controllers/main/admin/user.js
@@ -61,7 +61,7 @@ App.MainAdminUserController = Em.Controller.extend({
} catch (err) {
}
- })
+ });
this.hide();
},
onSecondary:function () {
@@ -106,4 +106,4 @@ App.MainAdminUserController = Em.Controller.extend({
statusCode: require('data/statusCodes')
});
}
-})
\ No newline at end of file
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/admin/user/create.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/user/create.js b/ambari-web/app/controllers/main/admin/user/create.js
index 97cfc87..5b833a3 100644
--- a/ambari-web/app/controllers/main/admin/user/create.js
+++ b/ambari-web/app/controllers/main/admin/user/create.js
@@ -21,4 +21,4 @@ var App = require('app');
App.MainAdminUserCreateController = Em.Controller.extend({
name:'mainAdminUserCreateController',
content:false
-})
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/admin/user/edit.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/user/edit.js b/ambari-web/app/controllers/main/admin/user/edit.js
index 3824601..71c19ef 100644
--- a/ambari-web/app/controllers/main/admin/user/edit.js
+++ b/ambari-web/app/controllers/main/admin/user/edit.js
@@ -21,4 +21,4 @@ var App = require('app');
App.MainAdminUserEditController = App.MainAdminUserController.extend({
name:'mainAdminUserEditController',
content:false
-})
\ No newline at end of file
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/apps/item_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/apps/item_controller.js b/ambari-web/app/controllers/main/apps/item_controller.js
index 4534279..e046576 100644
--- a/ambari-web/app/controllers/main/apps/item_controller.js
+++ b/ambari-web/app/controllers/main/apps/item_controller.js
@@ -46,4 +46,4 @@ App.MainAppsItemController = Em.Controller.extend({
});
}.observes('content')
-})
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/apps_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/apps_controller.js b/ambari-web/app/controllers/main/apps_controller.js
index 3ef01c6..2b2f0af 100644
--- a/ambari-web/app/controllers/main/apps_controller.js
+++ b/ambari-web/app/controllers/main/apps_controller.js
@@ -337,7 +337,7 @@ App.MainAppsController = Em.ArrayController.extend({
filtersUsed = true;
}
}
- };
+ }
link = link.slice(0,link.length-1);
@@ -501,5 +501,4 @@ App.MainAppsController = Em.ArrayController.extend({
]
})
-
-})
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/charts.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/charts.js b/ambari-web/app/controllers/main/charts.js
index f364554..d7a45a7 100644
--- a/ambari-web/app/controllers/main/charts.js
+++ b/ambari-web/app/controllers/main/charts.js
@@ -20,4 +20,4 @@ var App = require('app');
App.MainChartsController = Em.ArrayController.extend({
name:'mainChartsController'
-})
\ No newline at end of file
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/host/addHost/step4_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/addHost/step4_controller.js b/ambari-web/app/controllers/main/host/addHost/step4_controller.js
index 90efb12..afa4628 100644
--- a/ambari-web/app/controllers/main/host/addHost/step4_controller.js
+++ b/ambari-web/app/controllers/main/host/addHost/step4_controller.js
@@ -53,13 +53,5 @@ App.AddHostStep4Controller= Em.Controller.extend({
return df.promise();
}
-
-
-
-
-
-
-
-
-})
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/host/add_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/add_controller.js b/ambari-web/app/controllers/main/host/add_controller.js
index 81eb0bb..68459ff 100644
--- a/ambari-web/app/controllers/main/host/add_controller.js
+++ b/ambari-web/app/controllers/main/host/add_controller.js
@@ -287,7 +287,6 @@ App.AddHostController = App.WizardController.extend({
/**
* Generate clients list for selected services and save it to model
- * @param stepController step4WizardController
*/
saveClients: function () {
var clients = [];
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/host/details.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js
index fa1ef5b..76d6d8e 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -370,7 +370,7 @@ App.MainHostDetailsController = Em.Controller.extend({
* send command to server to install selected host component
* @param event
*/
- addComponent: function (event, context) {
+ addComponent: function (event) {
var self = this;
var component = event.context;
var componentName = component.get('componentName').toUpperCase().toString();
@@ -683,7 +683,8 @@ App.MainHostDetailsController = Em.Controller.extend({
/**
* Performs either Decommission or Recommission by updating the hosts list on
* server.
- * @param decommission defines context for request (true for decommission and false for recommission)
+ * @param {Array} decommissionHostNames
+ * @param {Boolean} decommission defines context for request (true for decommission and false for recommission)
*/
doDatanodeDecommission: function(decommissionHostNames, decommission){
var self = this;
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/mirroring/targetClusterController.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/mirroring/targetClusterController.js b/ambari-web/app/controllers/main/mirroring/targetClusterController.js
index d018213..f16e5e2 100644
--- a/ambari-web/app/controllers/main/mirroring/targetClusterController.js
+++ b/ambari-web/app/controllers/main/mirroring/targetClusterController.js
@@ -27,16 +27,14 @@ App.MainMirroringTargetClusterController = Ember.Controller.extend({
return value;
}
var controller = App.router.get('mainMirroringTargetClusterController');
- var isNameNodeWebUrlError = controller.checkNameNodeWebUrlErrors();
- return isNameNodeWebUrlError;
+ return controller.checkNameNodeWebUrlErrors();
}.property('targetCluster.nameNodeWebUrl', 'model.targetCluster.nameNodeWebUrl'),
isNameNodeRpcUrlError: function (key, value) {
if (value) {
return value;
}
var controller = App.router.get('mainMirroringTargetClusterController');
- var isNameNodeRpcUrlError = controller.checkNameNodeRpcUrlErrors();
- return isNameNodeRpcUrlError;
+ return controller.checkNameNodeRpcUrlErrors();
}.property('targetCluster.nameNodeRpcUrl', 'model.targetCluster.nameNodeRpcUrl'),
isOozieServerUrlError: function (key, value) {
@@ -44,8 +42,7 @@ App.MainMirroringTargetClusterController = Ember.Controller.extend({
return value;
}
var controller = App.router.get('mainMirroringTargetClusterController');
- var isOozieServerUrlError = controller.checkOozieServerUrlErrors();
- return isOozieServerUrlError;
+ return controller.checkOozieServerUrlErrors();
}.property('targetCluster.oozieServerUrl', 'model.targetCluster.oozieServerUrl'),
isClusterNameError: function (key, value) {
@@ -53,8 +50,7 @@ App.MainMirroringTargetClusterController = Ember.Controller.extend({
return value;
}
var controller = App.router.get('mainMirroringTargetClusterController');
- var isClusterNameError = controller.checkClusterNameErrors();
- return isClusterNameError;
+ return controller.checkClusterNameErrors();
}.property('targetCluster.clusterName', 'model.targetCluster.clusterName'),
nameNodeWebUrlErrorMessage: null,
@@ -71,19 +67,11 @@ App.MainMirroringTargetClusterController = Ember.Controller.extend({
var isNameNodeRpcUrlError = this.checkNameNodeRpcUrlErrors();
var isOozieServerUrlError = this.checkOozieServerUrlErrors();
- if (isNameNodeWebUrlError || isNameNodeRpcUrlError || isOozieServerUrlError) {
- return false;
- }
- return true;
+ return !(isNameNodeWebUrlError || isNameNodeRpcUrlError || isOozieServerUrlError);
},
validate2: function () {
- var isClusterNameError = this.checkClusterNameErrors();
-
- if (isClusterNameError) {
- return false;
- }
- return true;
+ return !this.checkClusterNameErrors();
},
checkNameNodeWebUrlErrors: function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/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 c92bef8..2b8e6d0 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -370,8 +370,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
this.loadedGroupToOverrideSiteToTagMap[groupName] = {};
item.get('configSiteTags').forEach(function (siteTag) {
var site = siteTag.get('site');
- var tag = siteTag.get('tag');
- this.loadedGroupToOverrideSiteToTagMap[groupName][site] = tag;
+ this.loadedGroupToOverrideSiteToTagMap[groupName][site] = siteTag.get('tag');
}, this);
}, this);
}
@@ -692,7 +691,8 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
/**
* Determines which host components are running on each host.
- * @param status 'running' or 'unknown'
+ * @param {Array} services
+ * @param {String} status 'running' or 'unknown'
* @return Returned in the following format:
* {
* runningHosts: {
@@ -1206,13 +1206,14 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
* @param templateName
* @param expression
* @param name
- * @return {
+ * @return {Object}
+ * example: <code>{
* value: '...',
* overrides: {
* 'value1': [h1, h2],
* 'value2': [h3]
* }
- * }
+ * }</code>
*/
getGlobConfigValueWithOverrides: function (templateName, expression, name) {
var express = expression.match(/<(.*?)>/g);
@@ -1493,7 +1494,8 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
/**
* create global site object
- * @param tagName
+ * @param {String} tagName
+ * @param {Array} globalConfigs
* @return {Object}
*/
createGlobalSiteObj: function (tagName, globalConfigs) {
@@ -1580,6 +1582,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
* create site object
* @param siteName
* @param tagName
+ * @param siteObj
* @return {Object}
*/
createSiteObj: function (siteName, tagName, siteObj) {
@@ -1593,8 +1596,8 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
/**
* Set display names of the property from the puppet/global names
- * @param: displayNames: a field to be set with displayNames
- * @param names: array of property puppet/global names
+ * @param {Array} displayNames a field to be set with displayNames
+ * @param {Array} names array of property puppet/global names
*/
setPropertyDisplayNames: function (displayNames, names) {
var stepConfigs = this.get('stepConfigs').findProperty('serviceName', this.get('content.serviceName')).configs;
@@ -2025,7 +2028,8 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
/**
* If some configs are changed and user navigates away or select another config-group, show this popup with propose to save changes
- * @param {object} event - triggered event for seleting another config-group
+ * @param {String} path
+ * @param {object} event - triggered event for selecting another config-group
*/
showSavePopup: function (path, event) {
var _this = this;
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
index 511e7ec..ae20d9a 100644
--- a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
+++ b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
@@ -235,7 +235,7 @@ App.ManageConfigGroupsController = Em.Controller.extend({
*/
deleteHosts: function () {
if (this.get('isDeleteHostsDisabled')) {
- return false;
+ return;
}
var groupHosts = this.get('selectedConfigGroup.hosts');
var defaultGroupHosts = this.get('selectedConfigGroup.parentConfigGroup.hosts');
@@ -249,11 +249,7 @@ App.ManageConfigGroupsController = Em.Controller.extend({
isDeleteHostsDisabled: function () {
var selectedConfigGroup = this.get('selectedConfigGroup');
if (selectedConfigGroup) {
- if (selectedConfigGroup.isDefault || this.get('selectedHosts').length === 0) {
- return true;
- } else {
- return false;
- }
+ return selectedConfigGroup.isDefault || this.get('selectedHosts').length === 0;
}
return true;
}.property('selectedConfigGroup', 'selectedConfigGroup.hosts.length', 'selectedHosts.length'),
@@ -335,7 +331,7 @@ App.ManageConfigGroupsController = Em.Controller.extend({
}.property('warningMessage', 'configGroupName', 'configGroupDesc'),
onPrimary: function () {
if (!this.get('enablePrimary')) {
- return false;
+ return;
}
self.set('selectedConfigGroup.name', this.get('configGroupName'));
self.set('selectedConfigGroup.description', this.get('configGroupDesc'));
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/service/reassign/step2_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/reassign/step2_controller.js b/ambari-web/app/controllers/main/service/reassign/step2_controller.js
index 388c52f..2c62f17 100644
--- a/ambari-web/app/controllers/main/service/reassign/step2_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step2_controller.js
@@ -70,7 +70,7 @@ App.ReassignMasterWizardStep2Controller = App.WizardStep5Controller.extend({
}
}, this);
if (availableComponentHosts.length == 0) {
- return false;
+ return;
}
currentComponents.forEach(function (item) {
preparedAvailableHosts = availableComponentHosts.slice(0);
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/service/reassign/step3_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/reassign/step3_controller.js b/ambari-web/app/controllers/main/service/reassign/step3_controller.js
index bc17d42..62b508f 100644
--- a/ambari-web/app/controllers/main/service/reassign/step3_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step3_controller.js
@@ -18,4 +18,4 @@
var App = require('app');
-App.ReassignMasterWizardStep3Controller = Em.Controller.extend()
+App.ReassignMasterWizardStep3Controller = Em.Controller.extend();
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/service/reassign/step5_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/reassign/step5_controller.js b/ambari-web/app/controllers/main/service/reassign/step5_controller.js
index 2de3425..5e65e61 100644
--- a/ambari-web/app/controllers/main/service/reassign/step5_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step5_controller.js
@@ -20,4 +20,4 @@ var App = require('app');
App.ReassignMasterWizardStep5Controller = Em.Controller.extend({
-})
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/main/service/reassign/step6_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/reassign/step6_controller.js b/ambari-web/app/controllers/main/service/reassign/step6_controller.js
index 34158e7..612b793 100644
--- a/ambari-web/app/controllers/main/service/reassign/step6_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step6_controller.js
@@ -113,4 +113,4 @@ App.ReassignMasterWizardStep6Controller = App.HighAvailabilityProgressPageContro
this.onTaskError();
}
}
-})
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/wizard/slave_component_groups_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/slave_component_groups_controller.js b/ambari-web/app/controllers/wizard/slave_component_groups_controller.js
index cfa7567..c821f08 100644
--- a/ambari-web/app/controllers/wizard/slave_component_groups_controller.js
+++ b/ambari-web/app/controllers/wizard/slave_component_groups_controller.js
@@ -163,6 +163,7 @@ App.SlaveComponentGroupsController = Em.ArrayController.extend({
if(hosts){
return hosts.mapProperty('group').uniq();
}
+ return [];
}.property('hosts'),
componentGroups: function () {
@@ -287,6 +288,7 @@ App.SlaveComponentGroupsController = Em.ArrayController.extend({
if(hosts){
return hosts.filterProperty('group', group.name);
}
+ return [];
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/wizard/stack_upgrade/step3_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/stack_upgrade/step3_controller.js b/ambari-web/app/controllers/wizard/stack_upgrade/step3_controller.js
index b85f5a3..b246105 100644
--- a/ambari-web/app/controllers/wizard/stack_upgrade/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/stack_upgrade/step3_controller.js
@@ -346,10 +346,9 @@ App.StackUpgradeStep3Controller = Em.Controller.extend({
var tasks = data.tasks || [];
var process = this.get('processes').findProperty('isRunning', true);
// if process was finished then it terminates next poll
- var continuePolling = true;
this.progressOnProcess(tasks, process);
- continuePolling = this.statusOnProcess(tasks, process);
+ var continuePolling = this.statusOnProcess(tasks, process);
if(process.get('hosts').length && tasks.length){
process.get('hosts').forEach(function (host) {
var tasksPerHost = tasks.filterProperty('Tasks.host_name', host.name);
@@ -367,7 +366,6 @@ App.StackUpgradeStep3Controller = Em.Controller.extend({
* @param process
*/
progressOnProcess: function(actions, process){
- var progress = 0;
var actionsNumber = actions.length;
var completedActions = actions.filterProperty('Tasks.status', 'COMPLETED').length
+ actions.filterProperty('Tasks.status', 'FAILED').length
@@ -375,7 +373,7 @@ App.StackUpgradeStep3Controller = Em.Controller.extend({
+ actions.filterProperty('Tasks.status', 'TIMEDOUT').length;
var queuedActions = actions.filterProperty('Tasks.status', 'QUEUED').length;
var inProgressActions = actions.filterProperty('Tasks.status', 'IN_PROGRESS').length;
- progress = Math.ceil(((queuedActions * 0.09) + (inProgressActions * 0.35) + completedActions ) / actionsNumber * 100);
+ var progress = Math.ceil(((queuedActions * 0.09) + (inProgressActions * 0.35) + completedActions ) / actionsNumber * 100);
console.log('INFO: progress is: ' + progress);
process.set('progress', progress);
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/wizard/step10_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step10_controller.js b/ambari-web/app/controllers/wizard/step10_controller.js
index 3bea6b7..7b760ae 100644
--- a/ambari-web/app/controllers/wizard/step10_controller.js
+++ b/ambari-web/app/controllers/wizard/step10_controller.js
@@ -185,7 +185,7 @@ App.WizardStep10Controller = Em.Controller.extend({
this.loadOozieServer(component);
break;
case 'GANGLIA_SERVER':
- this.loadGanglia(component)
+ this.loadGanglia(component);
break;
case 'NAGIOS_SERVER':
this.loadNagios(component);
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/wizard/step3_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js b/ambari-web/app/controllers/wizard/step3_controller.js
index e84fefd..030994b 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/step3_controller.js
@@ -296,7 +296,7 @@ App.WizardStep3Controller = Em.Controller.extend({
disablePreviousSteps: function () {
App.router.get('installerController.isStepDisabled').filter(function (step) {
- if (step.step >= 0 && step.step <= 2) return true;
+ return step.step >= 0 && step.step <= 2;
}).setEach('value', this.get('isRegistrationInProgress'));
if (this.get('isRegistrationInProgress')) {
this.set('isSubmitDisabled', true);
@@ -780,7 +780,7 @@ App.WizardStep3Controller = Em.Controller.extend({
var host = {
name: _host.Hosts.host_name,
warnings: []
- }
+ };
if (!_host.Hosts.last_agent_env) {
// in some unusual circumstances when last_agent_env is not available from the _host,
// skip the _host and proceed to process the rest of the hosts.
@@ -804,7 +804,7 @@ App.WizardStep3Controller = Em.Controller.extend({
hosts: [_host.Hosts.host_name],
category: 'fileFolders',
onSingleHost: true
- }
+ };
warnings.push(warning);
}
host.warnings.push(warning);
@@ -824,7 +824,7 @@ App.WizardStep3Controller = Em.Controller.extend({
hosts: [_host.Hosts.host_name],
category: 'packages',
onSingleHost: true
- }
+ };
warnings.push(warning);
}
host.warnings.push(warning);
@@ -852,7 +852,7 @@ App.WizardStep3Controller = Em.Controller.extend({
'<p style="text-align: center">................</p>' +
'...' + process.command.substr(-230)) + '</td></tr></table>',
onSingleHost: true
- }
+ };
warnings.push(warning);
}
host.warnings.push(warning);
@@ -875,7 +875,7 @@ App.WizardStep3Controller = Em.Controller.extend({
hosts: [_host.Hosts.host_name],
category: 'services',
onSingleHost: true
- }
+ };
warnings.push(warning);
}
host.warnings.push(warning);
@@ -898,7 +898,7 @@ App.WizardStep3Controller = Em.Controller.extend({
hosts: [_host.Hosts.host_name],
category: 'users',
onSingleHost: true
- }
+ };
warnings.push(warning);
}
host.warnings.push(warning);
@@ -919,7 +919,7 @@ App.WizardStep3Controller = Em.Controller.extend({
hosts: [_host.Hosts.host_name],
category: 'misc',
onSingleHost: true
- }
+ };
warnings.push(warning);
}
host.warnings.push(warning);
@@ -938,7 +938,7 @@ App.WizardStep3Controller = Em.Controller.extend({
hosts: [_host.Hosts.host_name],
category: 'firewall',
onSingleHost: true
- }
+ };
warnings.push(warning);
}
host.warnings.push(warning);
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/wizard/step5_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step5_controller.js b/ambari-web/app/controllers/wizard/step5_controller.js
index b1f362d..571a1ae 100644
--- a/ambari-web/app/controllers/wizard/step5_controller.js
+++ b/ambari-web/app/controllers/wizard/step5_controller.js
@@ -605,7 +605,7 @@ App.WizardStep5Controller = Em.Controller.extend({
* @return {Boolean}
*/
removeComponent:function (componentName, zId) {
- var currentZooKeepers = this.get("selectedServicesMasters").filterProperty("component_name", componentName)
+ var currentZooKeepers = this.get("selectedServicesMasters").filterProperty("component_name", componentName);
//work only if the Zookeeper service is selected in previous step
if (!currentZooKeepers.length) {
@@ -650,7 +650,7 @@ App.WizardStep5Controller = Em.Controller.extend({
currentComponents.forEach(function (item) {
preparedAvailableHosts = availableComponentHosts.slice(0);
- preparedAvailableHosts.pushObject(this.get("hosts").findProperty("host_name", item.get("selectedHost")))
+ preparedAvailableHosts.pushObject(this.get("hosts").findProperty("host_name", item.get("selectedHost")));
preparedAvailableHosts.sort(this.sortHostsByConfig, this);
item.set("availableHosts", preparedAvailableHosts);
}, this);
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/wizard/step6_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step6_controller.js b/ambari-web/app/controllers/wizard/step6_controller.js
index 3bce938..8de5cce 100644
--- a/ambari-web/app/controllers/wizard/step6_controller.js
+++ b/ambari-web/app/controllers/wizard/step6_controller.js
@@ -89,10 +89,7 @@ App.WizardStep6Controller = Em.Controller.extend({
isError |= host.get('checkboxes').findProperty('title', header.get('label')).checked;
});
isError = !isError;
- if (isError) {
- return;
- }
- else {
+ if (!isError) {
self.set('errorMessage', '');
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index 009c89f..afd186d 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -191,8 +191,7 @@ App.WizardStep7Controller = Em.Controller.extend({
loadedGroupToOverrideSiteToTagMap[groupName] = {};
item.get('configSiteTags').forEach(function (siteTag) {
var site = siteTag.get('site');
- var tag = siteTag.get('tag');
- loadedGroupToOverrideSiteToTagMap[groupName][site] = tag;
+ loadedGroupToOverrideSiteToTagMap[groupName][site] = siteTag.get('tag');
}, this);
}, this);
}
@@ -579,7 +578,8 @@ App.WizardStep7Controller = Em.Controller.extend({
},
/**
- * @param: An array of display names
+ * @param {String} siteProperty
+ * @param {Array} displayNames An array of display names
*/
setDisplayMessage: function (siteProperty, displayNames) {
var displayMsg = null;
@@ -607,9 +607,9 @@ App.WizardStep7Controller = Em.Controller.extend({
/**
* Set display names of the property tfrom he puppet/global names
- * @param displayNames: a field to be set with displayNames
- * @param names: array of property puppet/global names
- * @param configProperties: array of config properties of the respective service to the name param
+ * @param {Array} displayNames a field to be set with displayNames
+ * @param {Array} names array of property puppet/global names
+ * @param {Array} configProperties array of config properties of the respective service to the name param
*/
setPropertyDisplayNames: function (displayNames, names, configProperties) {
names.forEach(function (_name, index) {
@@ -621,7 +621,7 @@ App.WizardStep7Controller = Em.Controller.extend({
/**
* Display Error Message with service name, its custom configuration name and displaynames on the page
- * @param customConfig: array with custom configuration, serviceName and displayNames relative to custom configuration
+ * @param {Array} customConfig array with custom configuration, serviceName and displayNames relative to custom configuration
*/
showCustomConfigErrMsg: function (customConfig) {
@@ -660,7 +660,7 @@ App.WizardStep7Controller = Em.Controller.extend({
var validComponents = Ember.A([]);
var seenComponents = {};
masterComponents.forEach(function(component){
- var cn = component.component
+ var cn = component.component;
var cdn = component.display_name;
if(component.serviceId===selectedServiceName && !seenComponents[cn]){
validComponents.pushObject(Ember.Object.create({
@@ -672,7 +672,7 @@ App.WizardStep7Controller = Em.Controller.extend({
}
});
slaveComponents.forEach(function(component){
- var cn = component.componentName
+ var cn = component.componentName;
var cdn = component.displayName;
var componentDef = scMaps.findProperty('component_name', cn);
if(componentDef!=null && selectedServiceName===componentDef.service_name && !seenComponents[cn]){
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index 63a3acd..b3632fd 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -247,13 +247,17 @@ App.WizardStep8Controller = Em.Controller.extend({
/**
* Set all site property that are derived from other puppet-variable
- * @return {
+ * @param {String} templateName
+ * @param {String} expression
+ * @param {String} name
+ * @return {Object}
+ * example: <code>{
* value: '...',
* overrides: {
* 'value1': [h1, h2],
* 'value2': [h3]
* }
- * }
+ * }</code>
*/
getGlobConfigValueWithOverrides: function (templateName, expression, name) {
@@ -787,7 +791,7 @@ App.WizardStep8Controller = Em.Controller.extend({
var url = App.apiPrefix + '/clusters/' + this.get('clusterName') + '/services?ServiceInfo/service_name=' + _service;
var data = {
"components": componentsData
- }
+ };
this.ajax({
type: 'POST',
@@ -1550,7 +1554,7 @@ App.WizardStep8Controller = Em.Controller.extend({
self.set('ajaxBusy', false);
self.doNextAjaxCall();
- }
+ };
params.error = function (xhr, status, error) {
var responseText = JSON.parse(xhr.responseText);
@@ -1563,7 +1567,7 @@ App.WizardStep8Controller = Em.Controller.extend({
App.router.get(self.get('content.controllerName')).setStepsEnable();
self.get('ajaxQueue').clear();
self.set('ajaxBusy', false);
- }
+ };
this.get('ajaxQueue').pushObject(params);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/controllers/wizard/step9_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step9_controller.js b/ambari-web/app/controllers/wizard/step9_controller.js
index a8e1489..f8f32b9 100644
--- a/ambari-web/app/controllers/wizard/step9_controller.js
+++ b/ambari-web/app/controllers/wizard/step9_controller.js
@@ -603,8 +603,7 @@ App.WizardStep9Controller = Em.Controller.extend({
if (this.isSuccess(polledData)) {
clusterStatus.status = 'STARTED';
var serviceStartTime = new Date().getTime();
- var timeToStart = ((parseInt(serviceStartTime) - parseInt(this.get('content.cluster.installStartTime'))) / 60000).toFixed(2);
- clusterStatus.installTime = timeToStart;
+ clusterStatus.installTime = ((parseInt(serviceStartTime) - parseInt(this.get('content.cluster.installStartTime'))) / 60000).toFixed(2);
} else {
clusterStatus.status = 'START FAILED'; // 'START FAILED' implies to step10 that installation was successful but start failed
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/data/HDP2/custom_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/custom_configs.js b/ambari-web/app/data/HDP2/custom_configs.js
index 4fdf3f8..ba1376b 100644
--- a/ambari-web/app/data/HDP2/custom_configs.js
+++ b/ambari-web/app/data/HDP2/custom_configs.js
@@ -124,4 +124,4 @@ module.exports =
"isQueue": true,
"filename": 'capacity-scheduler.xml'
}
- ]
+ ];
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/data/custom_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/custom_configs.js b/ambari-web/app/data/custom_configs.js
index 8f47e5a..b3d78aa 100644
--- a/ambari-web/app/data/custom_configs.js
+++ b/ambari-web/app/data/custom_configs.js
@@ -202,4 +202,4 @@ module.exports =
"filename": 'capacity-scheduler.xml',
"index": 12
}
- ]
\ No newline at end of file
+ ];
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/data/service_components.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/service_components.js b/ambari-web/app/data/service_components.js
index 81edc99..4590f07 100644
--- a/ambari-web/app/data/service_components.js
+++ b/ambari-web/app/data/service_components.js
@@ -16,6 +16,8 @@
* limitations under the License.
*/
+var App = require('app');
+
module.exports = new Ember.Set([
{
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/data/services.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/services.js b/ambari-web/app/data/services.js
index d4d5176..8da8346 100644
--- a/ambari-web/app/data/services.js
+++ b/ambari-web/app/data/services.js
@@ -174,4 +174,4 @@ module.exports = [
isHidden: !App.supports.storm,
description: Em.I18n.t('services.storm.description')
}
-]
+];
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/data/statusCodes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/statusCodes.js b/ambari-web/app/data/statusCodes.js
index df6a1d8..e96ad75 100644
--- a/ambari-web/app/data/statusCodes.js
+++ b/ambari-web/app/data/statusCodes.js
@@ -52,4 +52,4 @@ module.exports = {
503: function () {
console.log("Error code 503: Gateway timeout.");
}
-}
+};
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/mappers/cluster_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/cluster_mapper.js b/ambari-web/app/mappers/cluster_mapper.js
index e00b267..95b3075 100644
--- a/ambari-web/app/mappers/cluster_mapper.js
+++ b/ambari-web/app/mappers/cluster_mapper.js
@@ -41,8 +41,7 @@ App.clusterMapper = App.QuickDataMapper.create({
var hostOverridesArray = {};
json.Clusters.desired_configs[site].host_overrides.forEach(function(override){
var hostname = override.host_name;
- var tag = override.tag;
- hostOverridesArray[hostname] = tag;
+ hostOverridesArray[hostname] = override.tag;
});
configObj.set('hostOverrides', hostOverridesArray);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/mappers/runs_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/runs_mapper.js b/ambari-web/app/mappers/runs_mapper.js
index 198ddd2..ecf9ae1 100644
--- a/ambari-web/app/mappers/runs_mapper.js
+++ b/ambari-web/app/mappers/runs_mapper.js
@@ -32,7 +32,7 @@ App.runsMapper = App.QuickDataMapper.create({
iTotalRecords:json.iTotalRecords,
startIndex:parseInt(json.startIndex)+1,
endIndex:parseInt(json.endIndex)+1
- }
+ };
json.aaData.forEach(function(item, index) {
result.push(this.generateWorkflow(item, index));
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/mappers/service_metrics_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js b/ambari-web/app/mappers/service_metrics_mapper.js
index a4670ac..2737809 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -443,10 +443,9 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
if (component.host_components[0].metrics && component.host_components[0].metrics.yarn) {
var root = component.host_components[0].metrics.yarn.Queue.root;
- var queue = JSON.stringify({
+ component.queue = JSON.stringify({
'root': self.parseObject(root)
});
- component.queue = queue;
}
// extend config
finalConfig = jQuery.extend(finalConfig, yarnConfig);
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/models/alert.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/alert.js b/ambari-web/app/models/alert.js
index a9cd3c3..e2781d9 100644
--- a/ambari-web/app/models/alert.js
+++ b/ambari-web/app/models/alert.js
@@ -103,9 +103,7 @@ App.Alert = Em.Object.extend({
var diff = new Date().getTime() - d.getTime();
if (diff < 60000) {
diff = 60000 - diff;
- var newD = new Date(d.getTime() - diff );
- //console.log("Making time more than 1 minute. New time=",newD,", Old time=",d);
- return newD;
+ return new Date(d.getTime() - diff );
}
return d;
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/models/app.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/app.js b/ambari-web/app/models/app.js
index 2220cd7..7952e83 100644
--- a/ambari-web/app/models/app.js
+++ b/ambari-web/app/models/app.js
@@ -65,4 +65,4 @@ App.App.FIXTURES = [
execution_time: '134762957834',
runs: []
}
-]
+];
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/models/authentication.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/authentication.js b/ambari-web/app/models/authentication.js
index ba63a89..115f6d1 100644
--- a/ambari-web/app/models/authentication.js
+++ b/ambari-web/app/models/authentication.js
@@ -43,7 +43,7 @@ App.Authentication.FIXTURES = [
search_base_dn:"",
username_attribute:""
}
-]
+];
App.AuthenticationForm = App.Form.extend({
testResult:false,
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/models/cluster_states.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/cluster_states.js b/ambari-web/app/models/cluster_states.js
index 5f1dc37..f075111 100644
--- a/ambari-web/app/models/cluster_states.js
+++ b/ambari-web/app/models/cluster_states.js
@@ -53,7 +53,8 @@ App.clusterStatus = Ember.Object.create({
}.property('clusterState'),
/**
* get cluster data from server and update cluster status
- * @param isAsync: set this to true if the call is to be made asynchronously. if unspecified, false is assumed
+ * @param {Boolean} isAsync set this to true if the call is to be made asynchronously. if unspecified, false is assumed
+ * @param {Boolean} overrideLocaldb
* @return promise object for the get call
*/
updateFromServer: function(isAsync, overrideLocaldb) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/models/dataset_job.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/dataset_job.js b/ambari-web/app/models/dataset_job.js
index 156ca80..a761d7b 100644
--- a/ambari-web/app/models/dataset_job.js
+++ b/ambari-web/app/models/dataset_job.js
@@ -31,12 +31,14 @@ App.DataSetJob = DS.Model.extend({
if (this.get('startDate')) {
return $.timeago(this.get('startDate'));
}
+ return '';
}.property('startDate'),
endFormatted: function () {
if (this.get('endDate')) {
return $.timeago(this.get('endDate'));
}
+ return '';
}.property('endDate'),
healthClass: function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/models/form.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/form.js b/ambari-web/app/models/form.js
index 4e4774b..e301f09 100644
--- a/ambari-web/app/models/form.js
+++ b/ambari-web/app/models/form.js
@@ -67,7 +67,7 @@ App.Form = Em.View.extend({
isValid = false;
console.warn(this.get('name') + " IS INVALID : " + this.get('errorMessage'));
}
- })
+ });
return isValid;
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/models/host.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/host.js b/ambari-web/app/models/host.js
index 63bfc42..ccec977 100644
--- a/ambari-web/app/models/host.js
+++ b/ambari-web/app/models/host.js
@@ -222,9 +222,7 @@ App.Host = DS.Model.extend({
*/
healthToolTip: function(){
var hostComponents = this.get('hostComponents').filter(function(item){
- if(item.get('workStatus') !== App.HostComponentStatus.started){
- return true;
- }
+ return item.get('workStatus') !== App.HostComponentStatus.started;
});
var output = '';
switch (this.get('healthClass')){
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/models/run.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/run.js b/ambari-web/app/models/run.js
index 23cdda1..ef54ee0 100644
--- a/ambari-web/app/models/run.js
+++ b/ambari-web/app/models/run.js
@@ -109,6 +109,7 @@ App.Run = DS.Model.extend({
if (this.get('id').indexOf('mr_') === 0) {
return 'MapReduce';
}
+ return '';
}.property('id')
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/models/service.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service.js b/ambari-web/app/models/service.js
index 00a7611..dacbec1 100644
--- a/ambari-web/app/models/service.js
+++ b/ambari-web/app/models/service.js
@@ -131,10 +131,10 @@ App.Service = DS.Model.extend({
restartHC[host].forEach(function(c){
hcCount++;
hostsMsg += "<li>"+c+"</li>";
- })
+ });
hostsMsg += "</ul>";
}
- hostsMsg += "</ul>"
+ hostsMsg += "</ul>";
return this.t('services.service.config.restartService.TooltipMessage').format(hcCount, hostCount, hostsMsg);
}.property('restartRequiredHostsAndComponents')
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/models/service/yarn.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service/yarn.js b/ambari-web/app/models/service/yarn.js
index 9f03dc6..d4c8956 100644
--- a/ambari-web/app/models/service/yarn.js
+++ b/ambari-web/app/models/service/yarn.js
@@ -86,7 +86,7 @@ App.YARNService = App.Service.extend({
}
}
return names;
- }
+ };
allQueueNames = addQueues(queues, '');
}
this.set('allQueueNames', allQueueNames);
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/models/service_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js
index 6d6a1c1..b4c5026 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -78,6 +78,7 @@ App.ServiceConfigCategory = Ember.Object.extend({
case 'RegionServer':
return 'HBASE_REGIONSERVER';
}
+ return null;
}.property('name'),
@@ -89,7 +90,7 @@ App.ServiceConfigCategory = Ember.Object.extend({
}.property('name'),
isForSlaveComponent: function () {
- var slaveComponents = ['DataNode', 'TaskTracker', 'RegionServer']
+ var slaveComponents = ['DataNode', 'TaskTracker', 'RegionServer'];
return (slaveComponents.contains(this.get('name')));
}.property('name'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/router.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/router.js b/ambari-web/app/router.js
index e34894b..8b0bbc3 100644
--- a/ambari-web/app/router.js
+++ b/ambari-web/app/router.js
@@ -39,7 +39,7 @@ App.Router = Em.Router.extend({
this.get('addHostController').clear();
this.get('addServiceController').clear();
this.get('stackUpgradeController').clear();
- for (i = 1; i < 11; i++) {
+ for (var i = 1; i < 11; i++) {
this.set('wizardStep' + i + 'Controller.hasSubmitted', false);
this.set('wizardStep' + i + 'Controller.isDisabled', true);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/routes/high_availability_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/high_availability_routes.js b/ambari-web/app/routes/high_availability_routes.js
index 546118e..4cd755d 100644
--- a/ambari-web/app/routes/high_availability_routes.js
+++ b/ambari-web/app/routes/high_availability_routes.js
@@ -140,7 +140,7 @@ module.exports = Em.Route.extend({
var controller = router.get('highAvailabilityWizardController');
var highAvailabilityWizardStep2Controller = router.get('highAvailabilityWizardStep2Controller');
var addNN = highAvailabilityWizardStep2Controller.get('selectedServicesMasters').findProperty('isAddNameNode', true).get('selectedHost');
- var sNN = highAvailabilityWizardStep2Controller.get('selectedServicesMasters').findProperty('component_name','SECONDARY_NAMENODE').get('selectedHost')
+ var sNN = highAvailabilityWizardStep2Controller.get('selectedServicesMasters').findProperty('component_name','SECONDARY_NAMENODE').get('selectedHost');
if(addNN){
App.db.setRollBackHighAvailabilityWizardAddNNHost(addNN);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/routes/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/installer.js b/ambari-web/app/routes/installer.js
index 2caa17a..f589806 100644
--- a/ambari-web/app/routes/installer.js
+++ b/ambari-web/app/routes/installer.js
@@ -405,17 +405,13 @@ module.exports = Em.Route.extend({
},
back: Em.Router.transitionTo('step9'),
complete: function (router, context) {
- if (true) { // this function will be moved to installerController where it will validate
- var controller = router.get('installerController');
- controller.finish();
+ var controller = router.get('installerController');
+ controller.finish();
- // We need to do recovery based on whether we are in Add Host or Installer wizard
- controller.saveClusterState('DEFAULT');
+ // We need to do recovery based on whether we are in Add Host or Installer wizard
+ controller.saveClusterState('DEFAULT');
- router.transitionTo('main.index');
- } else {
- console.log('cluster installation failure');
- }
+ router.transitionTo('main.index');
}
}),
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/templates/main/mirroring/testConnectionResults.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/mirroring/testConnectionResults.hbs b/ambari-web/app/templates/main/mirroring/testConnectionResults.hbs
index 4c88f94..fb2934e 100644
--- a/ambari-web/app/templates/main/mirroring/testConnectionResults.hbs
+++ b/ambari-web/app/templates/main/mirroring/testConnectionResults.hbs
@@ -31,7 +31,7 @@
</td>
</tr>
<tr class="spacer">
- <td colspan="2"/>
+ <td colspan="2"></td>
</tr>
<tr>
<td>NameNode RPC..8020</td>
@@ -44,7 +44,7 @@
</td>
</tr>
<tr class="spacer">
- <td colspan="2"/>
+ <td colspan="2"></td>
</tr>
<tr>
<td>Oozie server..11000</td>
@@ -57,7 +57,7 @@
</td>
</tr>
<tr class="spacer">
- <td colspan="2"/>
+ <td colspan="2"></td>
</tr>
<tr {{bindAttr class="content.isClusterNameError:error"}}>
<td>{{t mirroring.targetcluster.enterClusterName}}</td>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/utils/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax.js b/ambari-web/app/utils/ajax.js
index ed2b77d..fb1ae7d 100644
--- a/ambari-web/app/utils/ajax.js
+++ b/ambari-web/app/utils/ajax.js
@@ -1187,7 +1187,7 @@ var urls = {
var statusCode = jQuery.extend({}, require('data/statusCodes'));
statusCode['403'] = function () {
console.log("Error code 403: Forbidden.");
- }
+ };
return {
statusCode: statusCode
};
@@ -1594,7 +1594,6 @@ if ($.mocho) {
ajax.reopen({
/**
* Don't use it anywhere except tests!
- * @deprecated
* @returns {Array}
*/
fakeGetUrlNames: function() {
@@ -1607,7 +1606,6 @@ if ($.mocho) {
/**
* Don't use it anywhere except tests!
- * @deprecated
* @param name
* @returns {*}
*/
@@ -1617,7 +1615,6 @@ if ($.mocho) {
/**
* Don't use it anywhere except tests!
- * @deprecated
* @param url
* @param data
* @returns {String}
@@ -1628,7 +1625,6 @@ if ($.mocho) {
/**
* Don't use it anywhere except tests!
- * @deprecated
* @param urlObj
* @param data
* @returns {Object}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/utils/base64.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/base64.js b/ambari-web/app/utils/base64.js
index fe2dfc9..17e91f2 100644
--- a/ambari-web/app/utils/base64.js
+++ b/ambari-web/app/utils/base64.js
@@ -56,7 +56,7 @@
// [https://gist.github.com/1020396] by [https://github.com/atk]
object.atob || (
object.atob = function (input) {
- input = input.replace(/=+$/, '')
+ input = input.replace(/=+$/, '');
if (input.length % 4 == 1) throw INVALID_CHARACTER_ERR;
for (
// initialize result and counters
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 5ee0bf7..18f6b1c 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -363,7 +363,7 @@ App.config = Em.Object.create({
if (a.name < b.name) return -1;
if (a.name > b.name) return 1;
return 0;
- }
+ };
return {
@@ -382,15 +382,12 @@ App.config = Em.Object.create({
mergePreDefinedWithStored: function (storedConfigs, advancedConfigs) {
var mergedConfigs = [];
var preDefinedConfigs = $.extend(true, [], this.get('preDefinedGlobalProperties').concat(this.get('preDefinedSiteProperties')));
- var preDefinedNames = [];
- var storedNames = [];
- var names = [];
var categoryMetaData = null;
storedConfigs = (storedConfigs) ? storedConfigs : [];
- preDefinedNames = preDefinedConfigs.mapProperty('name');
- storedNames = storedConfigs.mapProperty('name');
- names = preDefinedNames.concat(storedNames).uniq();
+ var preDefinedNames = preDefinedConfigs.mapProperty('name');
+ var storedNames = storedConfigs.mapProperty('name');
+ var names = preDefinedNames.concat(storedNames).uniq();
names.forEach(function (name) {
var stored = storedConfigs.findProperty('name', name);
var preDefined = preDefinedConfigs.findProperty('name', name);
@@ -528,13 +525,11 @@ App.config = Em.Object.create({
}
});
services.forEach(function (service) {
- var serviceConfig = {};
var configsByService = [];
var serviceConfigs = configs.filterProperty('serviceName', service.serviceName);
serviceConfigs.forEach(function (_config) {
- var serviceConfigProperty = {};
_config.isOverridable = (_config.isOverridable === undefined) ? true : _config.isOverridable;
- serviceConfigProperty = App.ServiceConfigProperty.create(_config);
+ var serviceConfigProperty = App.ServiceConfigProperty.create(_config);
this.updateHostOverrides(serviceConfigProperty, _config);
if (!storedConfigs) {
serviceConfigProperty.initialValue(localDB);
@@ -543,7 +538,7 @@ App.config = Em.Object.create({
serviceConfigProperty.validate();
configsByService.pushObject(serviceConfigProperty);
}, this);
- serviceConfig = this.createServiceConfig(service.serviceName);
+ var serviceConfig = this.createServiceConfig(service.serviceName);
serviceConfig.set('showConfig', service.showConfig);
// Use calculated default values for some configs
@@ -994,7 +989,8 @@ App.config = Em.Object.create({
* trim both trailing and leading spaces for host displayType and hive/oozie datebases url.
* for directory or directories displayType format string for further using.
* for password and values with spaces only do nothing.
- * @param property
+ * @param {Object} property
+ * @param {Boolean} isEmberObject
* @returns {*}
*/
trimProperty: function (property, isEmberObject) {
@@ -1040,7 +1036,7 @@ App.config = Em.Object.create({
* of {id:2, name:'New hardware group'}. In the case of dialog being cancelled,
* the callback is provided <code>null</code>
*
- * @param callback Callback function which is invoked when dialog
+ * @param {String} groupName
* is closed, cancelled or OK is pressed.
*/
@@ -1299,7 +1295,9 @@ App.config = Em.Object.create({
* Changes possible here are the name, description and
* host memberships of the configuration-group.
*
- * @param configGroup (App.ConfigGroup) Configuration group to update
+ * @param {App.ConfigGroup} configGroup Configuration group to update
+ * @param {Function} successCallback
+ * @param {Function} errorCallback
*/
updateConfigurationGroup: function (configGroup, successCallback, errorCallback) {
var putConfigGroup = {
@@ -1381,7 +1379,6 @@ App.config = Em.Object.create({
*
* @param serviceId
* (string) ID of the service. Ex: HDFS
- * @return Array of App.ConfigGroups
*/
getConfigGroupsForService: function (serviceId) {
@@ -1392,7 +1389,6 @@ App.config = Em.Object.create({
*
* @param hostName
* (string) host name used to register
- * @return Array of App.ConfigGroups
*/
getConfigGroupsForHost: function (hostName) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/utils/configs/defaults_providers/yarn_defaults_provider.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/configs/defaults_providers/yarn_defaults_provider.js b/ambari-web/app/utils/configs/defaults_providers/yarn_defaults_provider.js
index d651ad4..b75b395 100644
--- a/ambari-web/app/utils/configs/defaults_providers/yarn_defaults_provider.js
+++ b/ambari-web/app/utils/configs/defaults_providers/yarn_defaults_provider.js
@@ -293,8 +293,7 @@ App.YARNDefaultsProvider = App.DefaultsProvider.create({
*/
clusterDataIsValid: function () {
if (!this.get('clusterData')) return false;
- if (this.get('clusterData.ram') == null || this.get('clusterData.cpu') == null || this.get('clusterData.disk') == null || this.get('clusterData.hBaseInstalled') == null) return false;
- return true;
+ return !(this.get('clusterData.ram') == null || this.get('clusterData.cpu') == null || this.get('clusterData.disk') == null || this.get('clusterData.hBaseInstalled') == null);
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/utils/configs/validators/service_configs_validator.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/configs/validators/service_configs_validator.js b/ambari-web/app/utils/configs/validators/service_configs_validator.js
index ed8d9a6..d4dbd34 100644
--- a/ambari-web/app/utils/configs/validators/service_configs_validator.js
+++ b/ambari-web/app/utils/configs/validators/service_configs_validator.js
@@ -37,9 +37,7 @@ App.ServiceConfigsValidator = Em.Object.extend({
/**
* Validate the given config property with the available
- * {@param recommendedDefaults}. This can do cross-property
- * validations also.
- *
+ *
* @param config {App.ServiceConfigProperty}
* @return {string} No validation issues when <code>null</code> returned.
*/
@@ -100,10 +98,7 @@ App.ServiceConfigsValidator = Em.Object.extend({
return false;
}
// "-Xmx" can be only one
- if (value.match(/\-Xmx/ig).length != 1) {
- return false;
- }
- return true;
+ return value.match(/\-Xmx/ig).length == 1;
},
/**
* Parse Xmx size from raw value
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/utils/date.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/date.js b/ambari-web/app/utils/date.js
index e65f93e..0aa94a0 100644
--- a/ambari-web/app/utils/date.js
+++ b/ambari-web/app/utils/date.js
@@ -65,7 +65,7 @@ module.exports = {
* 1000000 ms = 16.66 mins
* 3500000 secs = 58.33 mins
* @param time
- * @param zeroValid, for the case to show 0 when time is 0, not null
+ * @param zeroValid for the case to show 0 when time is 0, not null
* @return string formatted date
*/
timingFormat:function (time, /* optional */ zeroValid) {
@@ -94,4 +94,4 @@ module.exports = {
return time + ' days';
}
}
-}
+};
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/utils/db.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/db.js b/ambari-web/app/utils/db.js
index 748ddd2..d56a48a 100644
--- a/ambari-web/app/utils/db.js
+++ b/ambari-web/app/utils/db.js
@@ -339,7 +339,7 @@ App.db.setWizardCurrentStep = function (wizardType, currentStep) {
*/
App.db.setLocalStorage = function () {
localStorage.setObject('ambari', App.db.data);
-}
+};
App.db.setSecurityWizardStatus = function (status) {
App.db.data = localStorage.getObject('ambari');
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/utils/graph.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/graph.js b/ambari-web/app/utils/graph.js
index ea50ec6..2104306 100644
--- a/ambari-web/app/utils/graph.js
+++ b/ambari-web/app/utils/graph.js
@@ -84,8 +84,8 @@ module.exports = {
* @param reduceOffSwitch
* @param startTime
* @param endTime
- * @param w
- * @param h
+ * @param svgw
+ * @param svgh
* @param element
*/
drawJobTasks:function (mapNodeLocal, mapRackLocal, mapOffSwitch, reduceOffSwitch, startTime, endTime, svgw, svgh, element) {
@@ -155,12 +155,12 @@ module.exports = {
.text("Task Attempt Duration");
- var dotInfo = new Array();
+ var dotInfo = [];
var mapDotInfo = function(d) {
var thisx = Math.round(x(d.x));
var thisy = Math.round(y(d.y));
if (!(thisx in dotInfo))
- dotInfo[thisx] = new Array();
+ dotInfo[thisx] = [];
var existing = dotInfo[thisx][thisy];
var newInfo = d.label + " \n" +
'Run-time: ' + self.durationFormatter(d.y) + ' \nWait-time: ' + self.durationFormatter(d.x-startTime) +
@@ -181,4 +181,4 @@ module.exports = {
this.addSeries(svgg, mapOffSwitch, 'brown', x, y, axisHeight+rmax, startTime, dotInfo);
this.addSeries(svgg, reduceOffSwitch, 'steelblue', x, y, axisHeight+rmax, startTime, dotInfo);
}
-}
+};
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/utils/helper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js
index e6df195..3c892cd 100644
--- a/ambari-web/app/utils/helper.js
+++ b/ambari-web/app/utils/helper.js
@@ -41,7 +41,6 @@ String.prototype.ip2long = function () {
// * returns 2: 11259375
// * example 3: ip2long('255.255.255.256');
// * returns 3: false
- var i = 0;
// PHP allows decimal, octal, and hexadecimal IP components.
// PHP allows between 1 (e.g. 127) to 4 (e.g 127.0.0.1) components.
var IP = this.match(/^([1-9]\d*|0[0-7]*|0x[\da-f]+)(?:\.([1-9]\d*|0[0-7]*|0x[\da-f]+))?(?:\.([1-9]\d*|0[0-7]*|0x[\da-f]+))?(?:\.([1-9]\d*|0[0-7]*|0x[\da-f]+))?$/i); // Verify IP format.
@@ -50,7 +49,7 @@ String.prototype.ip2long = function () {
}
// Reuse IP variable for component counter.
IP[0] = 0;
- for (i = 1; i < 5; i += 1) {
+ for (var i = 1; i < 5; i += 1) {
IP[0] += !!((IP[i] || '').length);
IP[i] = parseInt(IP[i]) || 0;
}
@@ -67,7 +66,7 @@ String.prototype.ip2long = function () {
String.prototype.capitalize = function () {
return this.charAt(0).toUpperCase() + this.slice(1);
-}
+};
Em.CoreObject.reopen({
t:function (key, attrs) {
@@ -101,7 +100,7 @@ Em.Handlebars.registerHelper('highlight', function (property, words, fn) {
});
return new Em.Handlebars.SafeString(property);
-})
+});
/**
* Replace {i} with argument. where i is number of argument to replace with
@@ -150,12 +149,12 @@ Number.prototype.toDaysHoursMinutes = function () {
formatted.m = (dateDiff / minK).toFixed(2);
return formatted;
-}
+};
Number.prototype.countPercentageRatio = function (maxValue) {
var usedValue = this;
return Math.round((usedValue / maxValue) * 100) + "%";
-}
+};
Number.prototype.long2ip = function () {
// http://kevin.vanzonneveld.net
@@ -166,7 +165,7 @@ Number.prototype.long2ip = function () {
return false;
return [this >>> 24, this >>> 16 & 0xFF, this >>> 8 & 0xFF, this & 0xFF].join('.');
-}
+};
/**
* Formats the given URL template by replacing keys in 'substitutes'
@@ -203,7 +202,7 @@ App.formatUrl = function (urlTemplate, substitutes, testUrl) {
hostName:App.test_hostname
};
jQuery.extend(allSubstitutes, substitutes);
- for (key in allSubstitutes) {
+ for (var key in allSubstitutes) {
var useKey = '{' + key + '}';
formatted = formatted.replace(new RegExp(useKey, 'g'), allSubstitutes[key]);
}
@@ -212,7 +211,7 @@ App.formatUrl = function (urlTemplate, substitutes, testUrl) {
}
}
return formatted;
-}
+};
/**
* Certain variables can have JSON in string
@@ -369,6 +368,7 @@ App.format = {
case 'LOGVIEWER_SERVER':
return 'Logviewer Server';
}
+ return '';
},
/**
@@ -396,7 +396,7 @@ App.popover = function(self, options) {
self.on("remove", function () {
$(this).trigger('mouseleave');
});
-}
+};
/**
* wrapper to bootstrap tooltip
@@ -409,7 +409,7 @@ App.tooltip = function(self, options) {
self.on("remove", function () {
$(this).trigger('mouseleave');
});
-}
+};
/*
* Helper function for bound property helper registration
@@ -421,7 +421,7 @@ App.registerBoundHelper = function(name, view) {
options.hash.contentBinding = property;
return Em.Handlebars.helpers.view.call(this, view, options);
});
-}
+};
/*
* Return singular or plural word based on Em.I18n property key.
@@ -466,4 +466,4 @@ App.registerBoundHelper('pluralize', Em.View.extend({
}
}
})
-)
+);
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/utils/host_progress_popup.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/host_progress_popup.js b/ambari-web/app/utils/host_progress_popup.js
index 41f1223..e20b7da 100644
--- a/ambari-web/app/utils/host_progress_popup.js
+++ b/ambari-web/app/utils/host_progress_popup.js
@@ -806,14 +806,15 @@ App.HostPopup = Em.Object.create({
* Create Clip Board
*/
createClipBoard: function () {
+ var logElement = $(".task-detail-log-maintext");
$(".task-detail-log-clipboard-wrap").html('<textarea class="task-detail-log-clipboard"></textarea>');
$(".task-detail-log-clipboard")
.html("stderr: \n" + $(".stderr").html() + "\n stdout:\n" + $(".stdout").html())
.css("display", "block")
- .width($(".task-detail-log-maintext").width())
- .height($(".task-detail-log-maintext").height())
+ .width(logElement.width())
+ .height(logElement.height())
.select();
- $(".task-detail-log-maintext").css("display", "none")
+ logElement.css("display", "none")
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/utils/hosts.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/hosts.js b/ambari-web/app/utils/hosts.js
index 60c5c9f..a532fda 100644
--- a/ambari-web/app/utils/hosts.js
+++ b/ambari-web/app/utils/hosts.js
@@ -49,7 +49,6 @@ module.exports = {
dialogMessage: popupDescription.dialogMessage,
warningMessage: null,
onPrimary: function () {
- console.debug('(old-selectedHosts)=', selectedHosts);
this.set('warningMessage', null);
var arrayOfSelectedHosts = [];
var selectedHosts = availableHosts.filterProperty('selected', true);
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff51712/ambari-web/app/utils/http_client.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/http_client.js b/ambari-web/app/utils/http_client.js
index 88d05ec..b11d27d 100644
--- a/ambari-web/app/utils/http_client.js
+++ b/ambari-web/app/utils/http_client.js
@@ -28,7 +28,7 @@ App.HttpClient = Em.Object.create({
* @param jqXHR
* @param textStatus
* @param errorThrown
- * @url api that invoked this callback function
+ * @param url api that invoked this callback function
*/
defaultErrorHandler: function (jqXHR, textStatus, errorThrown, url) {
try {
@@ -107,7 +107,7 @@ App.HttpClient = Em.Object.create({
* @param {number} interval - frequency request
*/
get: function (url, mapper, data, errorHandler, interval) {
- var eHandler = data.complete
+ var eHandler = data.complete;
if (!errorHandler && data.error) {
errorHandler = data.error;
}
@@ -118,7 +118,7 @@ App.HttpClient = Em.Object.create({
data = null;
mapper = null;
errorHandler = null;
- }
+ };
interval = "" + interval;
if (interval.match(/\d+/)) {