{{t common.copy}} http://git-wip-us.apache.org/repos/asf/ambari/blob/9f4df9fd/ambari-web/app/utils/ajax.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/ajax.js b/ambari-web/app/utils/ajax.js index 2d9a355..f520189 100644 --- a/ambari-web/app/utils/ajax.js +++ b/ambari-web/app/utils/ajax.js @@ -44,7 +44,7 @@ var urls = { 'testInProduction': true }, 'background_operations.get_by_request': { - 'real': '/clusters/{clusterName}/requests/{requestId}?fields=*,tasks/Tasks/command,tasks/Tasks/start_time,tasks/Tasks/end_time,tasks/Tasks/exit_code,tasks/Tasks/host_name,tasks/Tasks/id,tasks/Tasks/role,tasks/Tasks/status&minimal_response=true', + 'real': '/clusters/{clusterName}/requests/{requestId}?fields=*,tasks/Tasks/command,tasks/Tasks/command_detail,tasks/Tasks/start_time,tasks/Tasks/end_time,tasks/Tasks/exit_code,tasks/Tasks/host_name,tasks/Tasks/id,tasks/Tasks/role,tasks/Tasks/status&minimal_response=true', 'mock': '/data/background_operations/task_by_request{requestId}.json', 'testInProduction': true, 'format': function (data) { http://git-wip-us.apache.org/repos/asf/ambari/blob/9f4df9fd/ambari-web/app/utils/helper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js index 4399314..0cd61d4 100644 --- a/ambari-web/app/utils/helper.js +++ b/ambari-web/app/utils/helper.js @@ -205,11 +205,55 @@ App.format = { 'ZOOKEEPER_SERVICE_CHECK': 'ZooKeeper Service Check' }, + /** + * @type Object + */ + command: { + 'INSTALL': 'Install', + 'UNINSTALL': 'Uninstall', + 'START': 'Start', + 'STOP': 'Stop', + 'EXECUTE': 'Execute', + 'ABORT': 'Abort', + 'UPGRADE': 'Upgrade', + 'RESTART': 'Restart', + 'SERVICE_CHECK': 'Check', + 'DECOMMISSION,': 'Decommission,' + }, + + /** + * convert role to readable string + * @param role + */ role:function (role) { return this.components[role] ? this.components[role] : ''; }, /** + * convert command_detail to readable string, show the string for all tasks name + * @param command_detail + */ + commandDetail: function (command_detail) { + var detailArr = command_detail.split(' '); + var self = this; + var result = ''; + detailArr.forEach( function(item) { + // if the item has the pattern SERVICE/COMPONENT, drop the SERVICE part + if (item.contains('/')) { + item = item.split('/')[1]; + } + if (self.components[item]) { + result = result + ' ' + self.components[item]; + } else if (self.command[item]) { + result = result + ' ' + self.command[item]; + } else { + result = result + ' ' + item; + } + }); + return result; + }, + + /** * PENDING - Not queued yet for a host * QUEUED - Queued for a host * IN_PROGRESS - Host reported it is working http://git-wip-us.apache.org/repos/asf/ambari/blob/9f4df9fd/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 a41c07b..27d3ed7 100644 --- a/ambari-web/app/utils/host_progress_popup.js +++ b/ambari-web/app/utils/host_progress_popup.js @@ -269,6 +269,7 @@ App.HostPopup = Em.Object.create({ id: _task.Tasks.id, hostName: _task.Tasks.host_name, command: ( _task.Tasks.command.toLowerCase() != 'service_check') ? _task.Tasks.command.toLowerCase() : '', + commandDetail: App.format.commandDetail(_task.Tasks.command_detail), status: App.format.taskStatus(_task.Tasks.status), role: App.format.role(_task.Tasks.role), outputLog: Em.I18n.t('common.hostLog.popup.logDir.path') + Em.I18n.t('common.hostLog.popup.outputLog.value').format(_task.Tasks.id),