diff --git a/awx/ui/client/features/output/output.strings.js b/awx/ui/client/features/output/output.strings.js index 822bb61dd1..982070837e 100644 --- a/awx/ui/client/features/output/output.strings.js +++ b/awx/ui/client/features/output/output.strings.js @@ -17,15 +17,12 @@ function OutputStrings (BaseString) { ARTIFACTS: t.s('Read-only view of artifacts added to the job template'), CANCEL: t.s('Cancel'), COLLAPSE_OUTPUT: t.s('Collapse Output'), - CREDENTIAL: t.s('View the Credential'), - DETAILS: t.s('Click for details'), DELETE: t.s('Delete'), DOWNLOAD_OUTPUT: t.s('Download Output'), - EVENT_ID: t.s('Event ID:'), + CREDENTIAL: t.s('View the Credential'), EXPAND_OUTPUT: t.s('Expand Output'), EXTRA_VARS: t.s('Read-only view of extra variables added to the job template'), HOST_LIMIT: t.s('When this field is true, the job\'s inventory belongs to an organization that has exceeded it\'s limit of hosts as defined by the system administrator.'), - HOST_STATUS: t.s('Status:'), INVENTORY: t.s('View the Inventory'), INVENTORY_SCM: t.s('View the Project'), INVENTORY_SCM_JOB: t.s('View Project checkout results'), diff --git a/awx/ui/client/features/output/render.service.js b/awx/ui/client/features/output/render.service.js index f50bc27b40..161aebceb3 100644 --- a/awx/ui/client/features/output/render.service.js +++ b/awx/ui/client/features/output/render.service.js @@ -35,7 +35,7 @@ const hasAnsi = input => re.test(input); let $scope; -function JobRenderService ($q, $compile, $sce, $window, strings) { +function JobRenderService ($q, $compile, $sce, $window) { this.init = (_$scope_, { toggles }) => { $scope = _$scope_; this.setScope(); @@ -132,7 +132,7 @@ function JobRenderService ($q, $compile, $sce, $window, strings) { return { html: '', count: 0 }; } - const html = this.buildRowHTML(this.records[uuid], null, null, event); + const html = this.buildRowHTML(this.records[uuid]); const count = 1; return { html, count }; @@ -193,7 +193,7 @@ function JobRenderService ($q, $compile, $sce, $window, strings) { return { html: '', count: 0 }; } - const html = this.buildRowHTML(this.records[uuid], null, null, event); + const html = this.buildRowHTML(this.records[uuid]); const count = 1; return { html, count }; @@ -226,10 +226,10 @@ function JobRenderService ($q, $compile, $sce, $window, strings) { const line = lines[i]; const isLastLine = i === lines.length - 1; - let row = this.buildRowHTML(record, ln, line, event); + let row = this.buildRowHTML(record, ln, line); if (record && record.isTruncated && isLastLine) { - row += this.buildRowHTML(record, null, null, event); + row += this.buildRowHTML(record); count++; } @@ -350,14 +350,14 @@ function JobRenderService ($q, $compile, $sce, $window, strings) { return list; }; - this.buildRowHTML = (record, ln, content, event) => { + this.buildRowHTML = (record, ln, content) => { let id = ''; let icon = ''; let timestamp = ''; let tdToggle = ''; let tdEvent = ''; let classList = ''; - let directives = `aw-tool-tip="${this.createToolTip(event, record)}" aw-tip-placement="top"`; + let directives = ''; if (record.isMissing) { return `
@@ -413,9 +413,9 @@ function JobRenderService ($q, $compile, $sce, $window, strings) { if (record && record.isClickable) { classList += ' at-Stdout-row--clickable'; - directives += ` ng-click="vm.showHostDetails('${record.id}', '${record.uuid}')" - `; + directives = `ng-click="vm.showHostDetails('${record.id}', '${record.uuid}')"`; } + return `
${tdToggle} @@ -426,16 +426,6 @@ function JobRenderService ($q, $compile, $sce, $window, strings) { `; }; - this.createToolTip = (event, record) => { - const status = strings.get('tooltips.HOST_STATUS'); - const eventID = strings.get('tooltips.EVENT_ID'); - const clickForDetails = strings.get('tooltips.DETAILS'); - - return record.isClickable - ? `${status} ${event.event_display}
${eventID} ${event.id}
${clickForDetails}` - : `${status} ${event.event_display}
${eventID} ${event.id}`; - }; - this.getTimestamp = created => { const date = new Date(created); const hour = date.getHours() < 10 ? `0${date.getHours()}` : date.getHours(); @@ -629,6 +619,6 @@ function JobRenderService ($q, $compile, $sce, $window, strings) { this.getCapacity = () => OUTPUT_EVENT_LIMIT - (this.getTailCounter() - this.getHeadCounter()); } -JobRenderService.$inject = ['$q', '$compile', '$sce', '$window', 'OutputStrings']; +JobRenderService.$inject = ['$q', '$compile', '$sce', '$window']; export default JobRenderService;