Repository: aurora Updated Branches: refs/heads/master d6bc8eb3c -> 62e7d2358
Revert to old Job Page tab names and add counts Changing the names of tabs causes unnecessary confusion. Revert to "active tasks/completed tasks" and add the instance count back to both. Reviewed at https://reviews.apache.org/r/63374/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/62e7d235 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/62e7d235 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/62e7d235 Branch: refs/heads/master Commit: 62e7d2358f089109f8bde266f24e96bc62fbd129 Parents: d6bc8eb Author: David McLaughlin <[email protected]> Authored: Fri Oct 27 13:10:00 2017 -0700 Committer: David McLaughlin <[email protected]> Committed: Fri Oct 27 13:10:00 2017 -0700 ---------------------------------------------------------------------- ui/src/main/js/components/JobHistory.js | 2 +- ui/src/main/js/components/JobStatus.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/62e7d235/ui/src/main/js/components/JobHistory.js ---------------------------------------------------------------------- diff --git a/ui/src/main/js/components/JobHistory.js b/ui/src/main/js/components/JobHistory.js index 74f6fcb..7eff462 100644 --- a/ui/src/main/js/components/JobHistory.js +++ b/ui/src/main/js/components/JobHistory.js @@ -9,7 +9,7 @@ import { getLastEventTime, isActive } from 'utils/Task'; export default function ({ tasks }) { const terminalTasks = sort(tasks.filter((t) => !isActive(t)), (t) => getLastEventTime(t), true); - return (<Tab id='history' name={`Job History (${terminalTasks.length})`}> + return (<Tab id='history' name={`Completed Tasks (${terminalTasks.length})`}> <PanelGroup><TaskList sortBy='latest' tasks={terminalTasks} /></PanelGroup> </Tab>); } http://git-wip-us.apache.org/repos/asf/aurora/blob/62e7d235/ui/src/main/js/components/JobStatus.js ---------------------------------------------------------------------- diff --git a/ui/src/main/js/components/JobStatus.js b/ui/src/main/js/components/JobStatus.js index 84e335c..8f7023b 100644 --- a/ui/src/main/js/components/JobStatus.js +++ b/ui/src/main/js/components/JobStatus.js @@ -11,7 +11,7 @@ import { isActive } from 'utils/Task'; export default function ({ configGroups, cronJob, onTaskViewChange, queryParams, tasks }) { const activeTasks = sort(tasks.filter(isActive), (t) => t.assignedTask.instanceId); const numberConfigs = isNully(cronJob) ? (isNully(configGroups) ? '' : configGroups.length) : 1; - return (<Tab id='status' name='Job Status'> + return (<Tab id='status' name={`Active Tasks (${activeTasks.length})`}> <PanelGroup> <Tabs activeTab={queryParams.taskView}
